Merge pull request #2275 from magento-tsg/2.1.13-develop-pr49

[TSG] Backporting for 2.1 (pr49) (2.1.13)

Author: Alexander Akimov

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

@@ -1132,19 +1132,21 @@ public function getIdentities()
     {
         $identities = [];
         if ($this->getId()) {
-            $identities[] = self::CACHE_TAG . '_' . $this->getId();
-        }
-        if ($this->getId()
-            && (
-                $this->hasDataChanges()
-                || $this->isDeleted()
-                || $this->dataHasChangedFor(self::KEY_INCLUDE_IN_MENU)
-            )
-        ) {
-            $identities[] = Product::CACHE_PRODUCT_CATEGORY_TAG . '_' . $this->getId();
-        }
-        if ($this->getId() && $this->isObjectNew()) {
-            $identities[] = self::CACHE_TAG;
+            if ($this->getAffectedCategoryIds()) {
+                foreach (array_unique($this->getAffectedCategoryIds()) as $affectedCategoryId) {
+                    $identities[] = self::CACHE_TAG . '_' . $affectedCategoryId;
+                }
+            } else {
+                $identities[] = self::CACHE_TAG . '_' . $this->getId();
+            }
+
+            if ($this->hasDataChanges() || $this->isDeleted() || $this->dataHasChangedFor(self::KEY_INCLUDE_IN_MENU)) {
+                $identities[] = Product::CACHE_PRODUCT_CATEGORY_TAG . '_' . $this->getId();
+            }
+
+            if ($this->isObjectNew()) {
+                $identities[] = self::CACHE_TAG;
+            }
         }
 
         return $identities;

app/code/Magento/Catalog/Test/Unit/Model/CategoryTest.php

@@ -655,4 +655,22 @@ public function testGetIdentities()
         $category->setId(42);
         $this->assertNotEmpty($category->getIdentities());
     }
+
+    /**
+     * @return void
+     */
+    public function testGetIdentitiesWithAffectedCategories()
+    {
+        $category = $this->getCategoryModel();
+        $expectedIdentities = [
+            'catalog_category_1',
+            'catalog_category_2',
+            'catalog_category_3',
+            'catalog_category_product_1',
+        ];
+        $category->setId(1);
+        $category->setAffectedCategoryIds([1,2,3]);
+
+        $this->assertEquals($expectedIdentities, $category->getIdentities());
+    }
 }