Merge remote-tracking branch 'magento-l3/ACP2E-331' into L3_PR_21-12-13

Author: veloraven

app/code/Magento/Catalog/Model/Api/SearchCriteria/CollectionProcessor/ConditionProcessor/ProductCategoryCondition.php

@@ -10,7 +10,6 @@
 use Magento\Framework\Api\SearchCriteria\CollectionProcessor\ConditionProcessor\CustomConditionInterface;
 use Magento\Catalog\Model\ResourceModel\Product\Collection;
 use Magento\Framework\Api\Filter;
-use Magento\Framework\Data\Collection\AbstractDb;
 use Magento\Framework\Exception\NoSuchEntityException as CategoryDoesNotExistException;
 
 /**
@@ -63,12 +62,12 @@ public function build(Filter $filter): string
             )->where(
                 $this->resourceConnection->getConnection()->prepareSqlCondition(
                     'cat.category_id',
-                    [$this->mapConditionType($filter->getConditionType()) => $this->getCategoryIds($filter)]
+                    ['in' => $this->getCategoryIds($filter)]
                 )
             );
 
         $selectCondition = [
-            'in' => $categorySelect
+            $this->mapConditionType($filter->getConditionType()) => $categorySelect
         ];
 
         return $this->resourceConnection->getConnection()
@@ -116,12 +115,7 @@ private function getCategoryIds(Filter $filter): array
      */
     private function mapConditionType(string $conditionType): string
     {
-        $conditionsMap = [
-            'eq' => 'in',
-            'neq' => 'nin',
-            'like' => 'in',
-            'nlike' => 'nin',
-        ];
-        return $conditionsMap[$conditionType] ?? $conditionType;
+        $ninConditions = ['nin', 'neq', 'nlike'];
+        return in_array($conditionType, $ninConditions, true) ? 'nin' : 'in';
     }
 }

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

@@ -247,7 +247,8 @@ private function conditionProvider()
                     'simple-product-9',
                     'simple-product-10',
                     'simple-product-11',
-                    'simple-product-12'
+                    'simple-product-12',
+                    'simple-product-13',
                 ]
             ],
 
@@ -272,7 +273,8 @@ private function conditionProvider()
                     'simple-product-9',
                     'simple-product-10',
                     'simple-product-11',
-                    'simple-product-12'
+                    'simple-product-12',
+                    'simple-product-13',
                 ]
             ],
 
@@ -386,7 +388,8 @@ private function conditionProvider()
                     'simple-product-9',
                     'simple-product-10',
                     'simple-product-11',
-                    'simple-product-12'
+                    'simple-product-12',
+                    'simple-product-13',
                 ]
             ],
 
@@ -416,20 +419,18 @@ private function conditionProvider()
                     'simple-product-9',
                     'simple-product-10',
                     'simple-product-11',
-                    'simple-product-12'
+                    'simple-product-12',
+                    'simple-product-13',
                 ]
             ],
 
             // 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'
+                    'simple-product-8',
+                    'simple-product-13',
                 ]
             ],
         ];

dev/tests/integration/testsuite/Magento/CatalogRule/_files/conditions_to_collection/products.php

@@ -173,6 +173,19 @@
         'qty' => 42,
         'categories' => ['Category 1.1.1'],
     ],
+    [
+        'type-id' => 'simple',
+        'attribute-set-id' => $attributeSetGuardians->getId(),
+        'website-ids' => [1],
+        'name' => 'Simple Product 13',
+        'sku' => 'simple-product-13',
+        'price' => 10,
+        'visibility' => \Magento\Catalog\Model\Product\Visibility::VISIBILITY_BOTH,
+        'status' => \Magento\Catalog\Model\Product\Attribute\Source\Status::STATUS_ENABLED,
+        'stock-data' => ['use_config_manage_stock' => 1, 'qty' => 22, 'is_in_stock' => 1],
+        'qty' => 42,
+        'categories' => [],
+    ],
 ];
 
 foreach ($productsData as $productData) {