MC-37006: Adding/removing disabled products to Magento flushes categories cache

Author: dhorytskyi

app/code/Magento/Catalog/Controller/Adminhtml/Product/Save.php

@@ -141,6 +141,10 @@ public function execute()
                 $canSaveCustomOptions = $product->getCanSaveCustomOptions();
                 $product->save();
                 $this->handleImageRemoveError($data, $product->getId());
+                $this->categoryLinkManagement->assignProductToCategories(
+                    $product->getSku(),
+                    $product->getCategoryIds()
+                );
                 $productId = $product->getEntityId();
                 $productAttributeSetId = $product->getAttributeSetId();
                 $productTypeId = $product->getTypeId();

app/code/Magento/Catalog/Model/Product.php

@@ -2358,6 +2358,22 @@ public function getImage()
         return parent::getImage();
     }
 
+    /**
+     * Get identities for related to product categories
+     *
+     * @param array $categoryIds
+     * @return array
+     */
+    private function getProductCategoryIdentities(array $categoryIds): array
+    {
+        $identities = [];
+        foreach ($categoryIds as $categoryId) {
+            $identities[] = self::CACHE_PRODUCT_CATEGORY_TAG . '_' . $categoryId;
+        }
+
+        return $identities;
+    }
+
     /**
      * Get identities
      *
@@ -2370,15 +2386,17 @@ public function getIdentities()
         $isStatusChanged = $this->getOrigData(self::STATUS) != $this->getData(self::STATUS) && !$this->isObjectNew();
         if ($isStatusChanged || $this->getStatus() == Status::STATUS_ENABLED) {
             if ($this->getIsChangedCategories()) {
-                foreach ($this->getAffectedCategoryIds() as $categoryId) {
-                    $identities[] = self::CACHE_PRODUCT_CATEGORY_TAG . '_' . $categoryId;
-                }
+                $identities = array_merge(
+                    $identities,
+                    $this->getProductCategoryIdentities($this->getAffectedCategoryIds())
+                );
             }
 
             if ($isStatusChanged || $this->isStockStatusChanged()) {
-                foreach ($this->getCategoryIds() as $categoryId) {
-                    $identities[] = self::CACHE_PRODUCT_CATEGORY_TAG . '_' . $categoryId;
-                }
+                $identities = array_merge(
+                    $identities,
+                    $this->getProductCategoryIdentities($this->getCategoryIds())
+                );
             }
         }
 

app/code/Magento/Catalog/Test/Unit/Controller/Adminhtml/Product/Initialization/HelperTest.php

@@ -125,7 +125,7 @@ protected function setUp(): void
     {
         $this->objectManager = new ObjectManager($this);
         $this->productLinkFactoryMock = $this->getMockBuilder(ProductLinkInterfaceFactory::class)
-            ->onlyMethods(['create'])
+            ->setMethods(['create'])
             ->disableOriginalConstructor()
             ->getMock();
         $this->productRepositoryMock = $this->createMock(ProductRepository::class);
@@ -149,12 +149,14 @@ protected function setUp(): void
             )
             ->disableOriginalConstructor()
             ->getMockForAbstractClass();
-        $productExtensionAttributes = $this->createMock(ProductExtensionInterface::class);
+        $productExtensionAttributes = $this->getMockBuilder(ProductExtensionInterface::class)
+            ->setMethods(['getCategoryLinks', 'setCategoryLinks'])
+            ->getMockForAbstractClass();
         $this->productMock->setExtensionAttributes($productExtensionAttributes);
 
         $this->customOptionFactoryMock = $this->getMockBuilder(ProductCustomOptionInterfaceFactory::class)
             ->disableOriginalConstructor()
-            ->onlyMethods(['create'])
+            ->setMethods(['create'])
             ->getMock();
         $this->productLinksMock = $this->createMock(ProductLinks::class);
         $this->linkTypeProviderMock = $this->createMock(LinkTypeProvider::class);
@@ -167,11 +169,11 @@ protected function setUp(): void
         $this->dateTimeFilterMock = $this->createMock(DateTime::class);
 
         $categoryLinkFactoryMock = $this->getMockBuilder(CategoryLinkInterfaceFactory::class)
-            ->onlyMethods(['create'])
+            ->setMethods(['create'])
             ->disableOriginalConstructor()
             ->getMock();
         $categoryLinkFactoryMock->method('create')
-            ->willReturnCallback(function() {
+            ->willReturnCallback(function () {
                 return $this->createMock(CategoryLinkInterface::class);
             });
 

dev/tests/integration/testsuite/Magento/Catalog/Controller/Adminhtml/Product/Initialization/HelperTest.php

@@ -43,7 +43,7 @@ public function testInitializeCategoriesFromData(string $sku, array $categoryIds
 
         $product = $this->initializationHelper->initializeFromData($product, $productData);
         $extensionAttributes = $product->getExtensionAttributes();
-        $linkedCategoryIds = array_map(function(CategoryLinkInterface $categoryLink) {
+        $linkedCategoryIds = array_map(function (CategoryLinkInterface $categoryLink) {
             return $categoryLink->getCategoryId();
         }, (array) $extensionAttributes->getCategoryLinks());
         $this->assertEquals($categoryIds, $linkedCategoryIds);
@@ -67,6 +67,10 @@ public function initializeCategoriesFromDataProvider(): array
                 'simple-3',
                 [10, 12, 13],
             ],
+            'change all categories' => [
+                'simple-3',
+                [4, 5]
+            ],
             'unassign all categories' => [
                 'simple-3',
                 [],

dev/tests/integration/testsuite/Magento/Catalog/_files/categories.php

@@ -12,11 +12,15 @@
 $productRepository = $objectManager->create(
     \Magento\Catalog\Api\ProductRepositoryInterface::class
 );
+$categoryRepository = $objectManager->create(
+    \Magento\Catalog\Api\CategoryRepositoryInterface::class
+);
 
 $categoryLinkRepository = $objectManager->create(
     \Magento\Catalog\Api\CategoryLinkRepositoryInterface::class,
     [
-        'productRepository' => $productRepository
+        'productRepository' => $productRepository,
+        'categoryRepository' => $categoryRepository,
     ]
 );