Merge remote-tracking branch 'origin/MC-33487' into 2.4.1-develop-pr25

Author: serhii-balko

app/code/Magento/CatalogRule/Model/Rule/Condition/ConditionsToSearchCriteriaMapper.php

@@ -7,43 +7,46 @@
 
 namespace Magento\CatalogRule\Model\Rule\Condition;
 
-use Magento\Framework\Exception\InputException;
-use Magento\Rule\Model\Condition\ConditionInterface;
 use Magento\CatalogRule\Model\Rule\Condition\Combine as CombinedCondition;
 use Magento\CatalogRule\Model\Rule\Condition\Product as SimpleCondition;
 use Magento\Framework\Api\CombinedFilterGroup as FilterGroup;
+use Magento\Framework\Api\CombinedFilterGroupFactory;
 use Magento\Framework\Api\Filter;
+use Magento\Framework\Api\FilterFactory;
 use Magento\Framework\Api\SearchCriteria;
+use Magento\Framework\Api\SearchCriteriaBuilderFactory;
+use Magento\Framework\Exception\InputException;
+use Magento\Rule\Model\Condition\ConditionInterface;
 
 /**
  * Maps catalog price rule conditions to search criteria
  */
 class ConditionsToSearchCriteriaMapper
 {
     /**
-     * @var \Magento\Framework\Api\SearchCriteriaBuilderFactory
+     * @var SearchCriteriaBuilderFactory
      */
     private $searchCriteriaBuilderFactory;
 
     /**
-     * @var \Magento\Framework\Api\CombinedFilterGroupFactory
+     * @var CombinedFilterGroupFactory
      */
     private $combinedFilterGroupFactory;
 
     /**
-     * @var \Magento\Framework\Api\FilterFactory
+     * @var FilterFactory
      */
     private $filterFactory;
 
     /**
-     * @param \Magento\Framework\Api\SearchCriteriaBuilderFactory $searchCriteriaBuilderFactory
-     * @param \Magento\Framework\Api\CombinedFilterGroupFactory $combinedFilterGroupFactory
-     * @param \Magento\Framework\Api\FilterFactory $filterFactory
+     * @param SearchCriteriaBuilderFactory $searchCriteriaBuilderFactory
+     * @param CombinedFilterGroupFactory $combinedFilterGroupFactory
+     * @param FilterFactory $filterFactory
      */
     public function __construct(
-        \Magento\Framework\Api\SearchCriteriaBuilderFactory $searchCriteriaBuilderFactory,
-        \Magento\Framework\Api\CombinedFilterGroupFactory $combinedFilterGroupFactory,
-        \Magento\Framework\Api\FilterFactory $filterFactory
+        SearchCriteriaBuilderFactory $searchCriteriaBuilderFactory,
+        CombinedFilterGroupFactory $combinedFilterGroupFactory,
+        FilterFactory $filterFactory
     ) {
         $this->searchCriteriaBuilderFactory = $searchCriteriaBuilderFactory;
         $this->combinedFilterGroupFactory = $combinedFilterGroupFactory;
@@ -74,7 +77,7 @@ public function mapConditionsToSearchCriteria(CombinedCondition $conditions): Se
      * Convert condition to filter group
      *
      * @param ConditionInterface $condition
-     * @return null|\Magento\Framework\Api\CombinedFilterGroup|\Magento\Framework\Api\Filter
+     * @return null|FilterGroup|Filter
      * @throws InputException
      */
     private function mapConditionToFilterGroup(ConditionInterface $condition)
@@ -94,7 +97,7 @@ private function mapConditionToFilterGroup(ConditionInterface $condition)
      * Convert combined condition to filter group
      *
      * @param Combine $combinedCondition
-     * @return null|\Magento\Framework\Api\CombinedFilterGroup
+     * @return null|FilterGroup
      * @throws InputException
      */
     private function mapCombinedConditionToFilterGroup(CombinedCondition $combinedCondition)
@@ -111,7 +114,7 @@ private function mapCombinedConditionToFilterGroup(CombinedCondition $combinedCo
             // This required to solve cases when condition is configured like:
             // "If ALL/ANY of these conditions are FALSE" - we need to reverse SQL operator for this "FALSE"
             if ((bool)$combinedCondition->getValue() === false) {
-                $this->reverseSqlOperatorInFilter($filter);
+                $this->reverseSqlOperatorInFilterRecursively($filter);
             }
 
             $filters[] = $filter;
@@ -183,6 +186,24 @@ private function getGlueForArrayValues(string $operator): string
         return 'any';
     }
 
+    /**
+     * Recursively reverse sql conditions to their corresponding negative analog for the entire FilterGroup
+     *
+     * @param Filter|FilterGroup $filter
+     * @return void
+     * @throws InputException
+     */
+    private function reverseSqlOperatorInFilterRecursively($filter): void
+    {
+        if ($filter instanceof FilterGroup) {
+            foreach ($filter->getFilters() as &$currentFilter) {
+                $this->reverseSqlOperatorInFilterRecursively($currentFilter);
+            }
+        } else {
+            $this->reverseSqlOperatorInFilter($filter);
+        }
+    }
+
     /**
      * Reverse sql conditions to their corresponding negative analog
      *

dev/tests/integration/testsuite/Magento/CatalogRule/Model/ResourceModel/Product/ConditionsToCollectionApplierTest.php

@@ -416,6 +416,19 @@ private function conditionProvider()
                     'simple-product-12'
                 ]
             ],
+
+            // test filter for case "If ALL/ANY of these conditions are FALSE" with multiple levels
+            'variation 22' => [
+                'condition' => $this->getConditionsForVariation22(),
+                'expected-sku' => [
+                    'simple-product-1',
+                    'simple-product-2',
+                    'simple-product-3',
+                    'simple-product-4',
+                    'simple-product-7',
+                    'simple-product-8'
+                ]
+            ],
         ];
     }
 
@@ -1008,6 +1021,39 @@ private function getConditionsForVariation21()
         return $this->getCombineConditionFromArray($conditions);
     }
 
+    private function getConditionsForVariation22()
+    {
+        $category1Name = 'Category 1';
+
+        $category1Id = $this->categoryCollectionFactory
+            ->create()
+            ->addAttributeToFilter('name', $category1Name)
+            ->getAllIds();
+
+        $conditions = [
+            'type' => \Magento\CatalogRule\Model\Rule\Condition\Combine::class,
+            'aggregator' => 'all',
+            'value' => 0,
+            'conditions' => [
+                [
+                    'type' => \Magento\CatalogRule\Model\Rule\Condition\Combine::class,
+                    'aggregator' => 'all',
+                    'value' => 1,
+                    'conditions' => [
+                        [
+                            'type' => \Magento\CatalogRule\Model\Rule\Condition\Product::class,
+                            'operator' => '==',
+                            'value' => implode(',', $category1Id),
+                            'attribute' => 'category_ids'
+                        ]
+                    ]
+                ]
+            ]
+        ];
+
+        return $this->getCombineConditionFromArray($conditions);
+    }
+
     private function getCombineConditionFromArray(array $data)
     {
         $combinedCondition = $this->combinedConditionFactory->create();