Merge remote-tracking branch 'origin/MAGETWO-33583' into Troll_S31

Author: Roman Ganin

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

@@ -836,12 +836,12 @@ public function eavReindexCallback()
     public function reindex()
     {
         if ($this->_catalogProduct->isDataForProductCategoryIndexerWasChanged($this) || $this->isDeleted()) {
-            $this->_productFlatIndexerProcessor->reindexRow($this->getEntityId());
-            $categoryIndexer = $this->indexerRegistry->get(Indexer\Product\Category::INDEXER_ID);
-            if (!$categoryIndexer->isScheduled()) {
-                $categoryIndexer->reindexRow($this->getId());
+            $productCategoryIndexer = $this->indexerRegistry->get(Indexer\Product\Category::INDEXER_ID);
+            if (!$productCategoryIndexer->isScheduled()) {
+                $productCategoryIndexer->reindexRow($this->getId());
             }
         }
+        $this->_productFlatIndexerProcessor->reindexRow($this->getEntityId());
     }
 
     /**
@@ -2013,7 +2013,12 @@ public function getIdentities()
                 $identities[] = self::CACHE_PRODUCT_CATEGORY_TAG . '_' . $categoryId;
             }
         }
-        return $identities;
+        if ($this->getOrigData('status') > $this->getData('status')) {
+            foreach ($this->getData('category_ids') as $categoryId) {
+                $identities[] = self::CACHE_PRODUCT_CATEGORY_TAG . '_' . $categoryId;
+            }
+        }
+        return array_unique($identities);
     }
 
     /**

app/code/Magento/Catalog/etc/di.xml

@@ -89,6 +89,7 @@
                     <item name="entity_id" xsi:type="string">entity_id</item>
                     <item name="store_id" xsi:type="string">store_id</item>
                     <item name="visibility" xsi:type="string">visibility</item>
+                    <item name="status" xsi:type="string">status</item>
                 </item>
             </argument>
             <argument name="productRepository" xsi:type="object">Magento\Catalog\Api\ProductRepositoryInterface\Proxy</argument>

dev/tests/unit/testsuite/Magento/Catalog/Model/ProductTest.php

@@ -383,15 +383,20 @@ public function testIndexerAfterDeleteCommitProduct()
     public function testReindex($productChanged, $isScheduled, $productFlatCount, $categoryIndexerCount)
     {
         $this->model->setData('entity_id', 1);
-        $this->_catalogProduct->expects($this->once())->method('isDataForProductCategoryIndexerWasChanged')->willReturn($productChanged);
+        $this->_catalogProduct->expects($this->once())
+            ->method('isDataForProductCategoryIndexerWasChanged')
+            ->willReturn($productChanged);
+        if ($productChanged) {
+            $this->indexerRegistryMock->expects($this->exactly($productFlatCount))
+                ->method('get')
+                ->with(\Magento\Catalog\Model\Indexer\Product\Category::INDEXER_ID)
+                ->will($this->returnValue($this->categoryIndexerMock));
+            $this->categoryIndexerMock->expects($this->any())
+                ->method('isScheduled')
+                ->will($this->returnValue($isScheduled));
+            $this->categoryIndexerMock->expects($this->exactly($categoryIndexerCount))->method('reindexRow');
+        }
         $this->productFlatProcessor->expects($this->exactly($productFlatCount))->method('reindexRow');
-        $this->indexerRegistryMock->expects($this->exactly($productFlatCount))
-            ->method('get')
-            ->with(\Magento\Catalog\Model\Indexer\Product\Category::INDEXER_ID)
-            ->will($this->returnValue($this->categoryIndexerMock));
-        $this->categoryIndexerMock->expects($this->any())->method('isScheduled')->will($this->returnValue($isScheduled));
-        $this->categoryIndexerMock->expects($this->exactly($categoryIndexerCount))->method('reindexRow');
-
         $this->model->reindex();
     }
 
@@ -400,7 +405,7 @@ public function getProductReindexProvider()
         return array(
             'set 1' => [true, false, 1, 1],
             'set 2' => [true, true, 1, 0],
-            'set 3' => [false, false, 0, 0]
+            'set 3' => [false, false, 1, 0]
         );
     }
 
@@ -465,6 +470,21 @@ public function getIdentitiesProvider()
                     'affected_category_ids' => [1],
                     'is_changed_categories' => true
                 ]
+            ],
+            [
+                [0 => 'catalog_product_1', 1 => 'catalog_category_product_1'],
+                ['id' => 1, 'name' => 'value', 'category_ids' => [1], 'status' => 2],
+                ['id' => 1, 'name' => 'value', 'category_ids' => [1], 'status' => 1],
+            ],
+            [
+                [0 => 'catalog_product_1'],
+                ['id' => 1, 'name' => 'value', 'category_ids' => [1], 'status' => 1],
+                ['id' => 1, 'name' => 'value', 'category_ids' => [1], 'status' => 2],
+            ],
+            [
+                [0 => 'catalog_product_1'],
+                ['id' => 1, 'name' => 'value', 'category_ids' => [1], 'status' => 2],
+                ['id' => 1, 'name' => 'value', 'category_ids' => [], 'status' => 1],
             ]
         ];
     }