Merge pull request #667 from akeneo/release/104.0.7

Release/104.0.7
akeneo · Nov 30, 2023 · 685bd65 · 685bd65
2 parents 6003d33 + 3cdde6f
commit 685bd65
Show file tree

Hide file tree

Showing 5 changed files with 20 additions and 85 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -463,3 +463,6 @@
 
 ### Version 104.0.6 :
 * PGTO-393: Replace the sku by the child product UUID in tmp related table
+
+### Version 104.0.7 :
+* PGTO-397: Never delete products in a virtual category
diff --git a/Job/Product.php b/Job/Product.php
@@ -3002,9 +3002,24 @@ public function setCategories(): void
         $productIds = implode(',', array_unique(array_column($productCategoryInsertData, 0)));
         $productCategoryExclusion = implode(',', $notInWhere);
         if (!empty($productIds) && !empty($productCategoryExclusion)) {
+            $virtualCategories = [];
+            $visualMerchandiserRuleTable = $connection->getTableName('visual_merchandiser_rule');
+            if ($connection->isTableExists($visualMerchandiserRuleTable)) {
+                $virtualCategories = $connection->fetchCol(
+                    $connection->select()
+                        ->from($visualMerchandiserRuleTable, ['category_id'])
+                        ->where('is_active = ?', 1)
+                        ->where('store_id = ?', 0)
+                );
+            }
+            if (empty($virtualCategories)) {
+                $virtualCategories = [0];
+            }
+            $virtualCategories = join(',', $virtualCategories);
+
             $connection->delete(
                 $categoryProductTable,
-                new \Zend_Db_Expr("product_id IN ($productIds) AND (product_id, category_id) NOT IN ($productCategoryExclusion)")
+                new \Zend_Db_Expr("product_id IN ($productIds) AND category_id NOT IN ($virtualCategories) AND (product_id, category_id) NOT IN ($productCategoryExclusion)")
             );
         }
     }

diff --git a/Plugin/RebuildDynamicCategories.php b/Plugin/RebuildDynamicCategories.php
diff --git a/composer.json b/composer.json
@@ -14,7 +14,7 @@
     "nyholm/psr7": "^1.5"
   },
   "type": "magento2-module",
-  "version": "104.0.6",
+  "version": "104.0.7",
   "license": [
     "OSL-3.0",
     "AFL-3.0"

diff --git a/etc/di.xml b/etc/di.xml
@@ -12,10 +12,6 @@
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:ObjectManager/etc/config.xsd">
     <preference for="Akeneo\Connector\Api\LogRepositoryInterface" type="Akeneo\Connector\Model\LogRepository"/>
 
-    <type name="Akeneo\Connector\Job\Product">
-        <plugin name="akeneo_job_product_visual_merchandiser_rebuild" type="Akeneo\Connector\Plugin\RebuildDynamicCategories"/>
-    </type>
-
     <type name="Magento\Framework\View\Element\UiComponent\DataProvider\CollectionFactory">
         <arguments>
             <argument name="collections" xsi:type="array">