MAGETWO-83204: "Hide from Product Page" option does not work for child of configurable product

Author: dhorytskyi

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

@@ -1058,12 +1058,7 @@ protected function _afterLoad()
      */
     public function cleanCache()
     {
-        if ($this->getId()) {
-            $this->_cacheManager->clean(
-                self::CACHE_TAG . '_' . $this->getId()
-            );
-        }
-        return $this;
+        return parent::cleanModelCache();
     }
 
     /**

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

@@ -1391,21 +1391,6 @@ public function testGetOptionByIdForProductWithoutOptions()
         $this->assertNull($this->model->getOptionById(100));
     }
 
-    public function testCleanCache()
-    {
-        //Without an ID cleanCache won't clean anything because the entity is
-        //not identified and it will be called later exactly once.
-        $this->model->setId(null);
-        $this->cacheManagerMock
-            ->expects($this->once())
-            ->method('clean');
-        $this->model->cleanCache();
-
-        //Now that ID is set clean will be called.
-        $this->model->setId(1);
-        $this->model->cleanCache();
-    }
-
     public function testGetCacheTags()
     {
         //If entity is identified getCacheTags has to return the same values

app/code/Magento/ConfigurableProduct/Model/Plugin/CleanCache.php

@@ -0,0 +1,57 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\ConfigurableProduct\Model\Plugin;
+
+use Magento\ConfigurableProduct\Model\Product\Type\Configurable;
+use Magento\Catalog\Api\ProductRepositoryInterface;
+use Magento\Catalog\Model\Product;
+
+/**
+ *  Extender of product identities for child of configurable products
+ */
+class ProductIdentitiesExtender
+{
+    /**
+     * @var Configurable
+     */
+    private $configurableType;
+
+    /**
+     * @var ProductRepositoryInterface
+     */
+    private $productRepository;
+
+    /**
+     * @param Configurable $configurableType
+     * @param ProductRepositoryInterface $productRepository
+     */
+    public function __construct(Configurable $configurableType, ProductRepositoryInterface $productRepository)
+    {
+        $this->configurableType = $configurableType;
+        $this->productRepository = $productRepository;
+    }
+
+    /**
+     * Add parent identities to product identities
+     *
+     * @param Product $subject
+     * @param \Closure $proceed
+     * @return array
+     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
+     */
+    public function aroundGetIdentities(Product $subject, \Closure $proceed)
+    {
+        $identities = $proceed();
+
+        foreach ($this->configurableType->getParentIdsByChild($subject->getId()) as $parentId) {
+            $parentProduct = $this->productRepository->getById($parentId);
+            $identities = array_merge($identities, $parentProduct->getIdentities());
+        }
+        $identities = array_unique($identities);
+
+        return $identities;
+    }
+}

app/code/Magento/ConfigurableProduct/Model/Plugin/ProductIdentitiesExtender.php

@@ -43,9 +43,6 @@ public function getTags($object)
 
         $result = $object->getIdentities();
 
-        foreach ($this->catalogProductTypeConfigurable->getParentIdsByChild($object->getId()) as $parentId) {
-            $result[] = \Magento\Catalog\Model\Product::CACHE_TAG . '_' . $parentId;
-        }
         return $result;
     }
 }

app/code/Magento/ConfigurableProduct/Model/Product/Cache/Tag/Configurable.php

@@ -169,7 +169,6 @@ public function getChildrenIds($parentId, $required = true)
      */
     public function getParentIdsByChild($childId)
     {
-        $parentIds = [];
         $select = $this->getConnection()
             ->select()
             ->from(['l' => $this->getMainTable()], [])
@@ -178,10 +177,7 @@ public function getParentIdsByChild($childId)
                 'e.' . $this->optionProvider->getProductEntityLinkField() . ' = l.parent_id',
                 ['e.entity_id']
             )->where('l.product_id IN(?)', $childId);
-
-        foreach ($this->getConnection()->fetchAll($select) as $row) {
-            $parentIds[] = $row['entity_id'];
-        }
+        $parentIds = $this->getConnection()->fetchCol($select);
 
         return $parentIds;
     }

app/code/Magento/ConfigurableProduct/Model/ResourceModel/Product/Type/Configurable.php

@@ -56,13 +56,6 @@ public function testGetTagsWithVariation()
             ->method('getIdentities')
             ->willReturn($identities);
 
-        $parentId = 4;
-        $this->typeResource->expects($this->once())
-            ->method('getParentIdsByChild')
-            ->willReturn([$parentId]);
-
-        $expected = array_merge($identities, [\Magento\Catalog\Model\Product::CACHE_TAG . '_' . $parentId]);
-
-        $this->assertEquals($expected, $this->model->getTags($product));
+        $this->assertEquals($identities, $this->model->getTags($product));
     }
 }

app/code/Magento/ConfigurableProduct/Test/Unit/Model/Product/Cache/Tag/ConfigurableTest.php

@@ -77,8 +77,4 @@
             </argument>
         </arguments>
     </virtualType>
-    <type name="Magento\Catalog\Model\Product">
-        <plugin name="clean_configurable_product_and_its_children_cache"
-                type="Magento\ConfigurableProduct\Model\Plugin\CleanCache"/>
-    </type>
 </config>

app/code/Magento/ConfigurableProduct/etc/adminhtml/di.xml

@@ -178,4 +178,7 @@
             </argument>
         </arguments>
     </type>
+    <type name="Magento\Catalog\Model\Product">
+        <plugin name="product_identities_extender" type="Magento\ConfigurableProduct\Model\Plugin\ProductIdentitiesExtender" />
+    </type>
 </config>