MC-38593: Complex products children ids are not cached in Type class leading to multiple unnecessary db requests

Author: engcom-Echo

app/code/Magento/Bundle/Model/Plugin/Frontend/ProductIdentitiesExtender.php

@@ -20,6 +20,11 @@ class ProductIdentitiesExtender
      */
     private $type;
 
+    /**
+     * @var array
+     */
+    private $cacheChildrenIds = [];
+
     /**
      * @param BundleType $type
      */
@@ -40,12 +45,27 @@ public function afterGetIdentities(CatalogProduct $product, array $identities):
         if ($product->getTypeId() !== BundleType::TYPE_CODE) {
             return $identities;
         }
-        foreach ($this->type->getChildrenIds($product->getEntityId()) as $childIds) {
+        foreach ($this->getChildrenIds($product->getEntityId()) as $childIds) {
             foreach ($childIds as $childId) {
                 $identities[] = CatalogProduct::CACHE_TAG . '_' . $childId;
             }
         }
 
         return array_unique($identities);
     }
+
+    /**
+     * Get children ids with cache use
+     *
+     * @param mixed $entityId
+     * @return array
+     */
+    private function getChildrenIds($entityId)
+    {
+        if (!isset($this->cacheChildrenIds[$entityId])) {
+            $this->cacheChildrenIds[$entityId] = $this->type->getChildrenIds($entityId);
+        }
+
+        return $this->cacheChildrenIds[$entityId];
+    }
 }

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

@@ -17,6 +17,11 @@ class ProductIdentitiesExtender
      */
     private $type;
 
+    /**
+     * @var array
+     */
+    private $cacheParentIdsByChild = [];
+
     /**
      * @param BundleType $type
      */
@@ -39,9 +44,24 @@ public function afterGetIdentities(
         if ($product->getTypeId() !== BundleType::TYPE_CODE) {
             return $identities;
         }
-        foreach ($this->type->getParentIdsByChild($product->getEntityId()) as $parentId) {
+        foreach ($this->getParentIdsByChild($product->getEntityId()) as $parentId) {
             $identities[] = CatalogProduct::CACHE_TAG . '_' . $parentId;
         }
         return $identities;
     }
+
+    /**
+     * Get parent ids by child with cache use
+     *
+     * @param mixed $entityId
+     * @return array
+     */
+    private function getParentIdsByChild($entityId)
+    {
+        if (!isset($this->cacheParentIdsByChild[$entityId])) {
+            $this->cacheParentIdsByChild[$entityId] = $this->type->getParentIdsByChild($entityId);
+        }
+
+        return $this->cacheParentIdsByChild[$entityId];
+    }
 }

app/code/Magento/Bundle/Model/Product/Type.php

@@ -168,16 +168,6 @@ class Type extends \Magento\Catalog\Model\Product\Type\AbstractType
      */
     private $arrayUtility;
 
-    /**
-     * @var array
-     */
-    private $cacheChildrenIds = [];
-
-    /**
-     * @var array
-     */
-    private $cacheParentIdsByChild = [];
-
     /**
      * @param \Magento\Catalog\Model\Product\Option $catalogProductOption
      * @param \Magento\Eav\Model\Config $eavConfig
@@ -295,12 +285,7 @@ public function getRelationInfo()
      */
     public function getChildrenIds($parentId, $required = true)
     {
-        $cacheKey = $parentId . '-' . ($required ? 1 : 0);
-        if (!isset($this->cacheChildrenIds[$cacheKey])) {
-            $this->cacheChildrenIds[$cacheKey] = $this->_bundleSelection->getChildrenIds($parentId, $required);
-        }
-
-        return $this->cacheChildrenIds[$cacheKey];
+        return $this->_bundleSelection->getChildrenIds($parentId, $required);
     }
 
     /**
@@ -311,16 +296,7 @@ public function getChildrenIds($parentId, $required = true)
      */
     public function getParentIdsByChild($childId)
     {
-        if (is_array($childId) && count($childId) > 1) {
-            return $this->_bundleSelection->getParentIdsByChild($childId);
-        }
-
-        $cacheKey = is_array($childId) ? array_shift($childId) : $childId;
-        if (!isset($this->cacheParentIdsByChild[$cacheKey])) {
-            $this->cacheParentIdsByChild[$cacheKey] = $this->_bundleSelection->getParentIdsByChild($childId);
-        }
-
-        return $this->cacheParentIdsByChild[$cacheKey];
+        return $this->_bundleSelection->getParentIdsByChild($childId);
     }
 
     /**

app/code/Magento/Bundle/Test/Unit/Model/Plugin/Frontend/ProductIdentitiesExtenderTest.php

@@ -62,10 +62,10 @@ public function testAfterGetIdentities()
             Product::CACHE_TAG . '_' . 45,
             Product::CACHE_TAG . '_' . 24612,
         ];
-        $this->product->expects($this->once())
+        $this->product->expects($this->exactly(2))
             ->method('getEntityId')
             ->willReturn($id);
-        $this->product->expects($this->once())
+        $this->product->expects($this->exactly(2))
             ->method('getTypeId')
             ->willReturn(Type::TYPE_CODE);
         $this->type->expects($this->once())
@@ -74,5 +74,12 @@ public function testAfterGetIdentities()
             ->willReturn($childIds);
         $identities = $this->plugin->afterGetIdentities($this->product, $baseIdentities);
         $this->assertEquals($expectedIdentities, $identities);
+
+        $this->type->expects($this->never())
+            ->method('getChildrenIds')
+            ->with($id)
+            ->willReturn($childIds);
+        $identities = $this->plugin->afterGetIdentities($this->product, $baseIdentities);
+        $this->assertEquals($expectedIdentities, $identities);
     }
 }

app/code/Magento/Bundle/Test/Unit/Model/Plugin/ProductIdentitiesExtenderTest.php

@@ -70,10 +70,10 @@ public function testAfterGetIdentities()
             Product::CACHE_TAG . '_' . 5,
             Product::CACHE_TAG . '_' . 100500,
         ];
-        $this->product->expects($this->once())
+        $this->product->expects($this->exactly(2))
             ->method('getEntityId')
             ->willReturn($id);
-        $this->product->expects($this->once())
+        $this->product->expects($this->exactly(2))
             ->method('getTypeId')
             ->willReturn(Type::TYPE_CODE);
         $this->type->expects($this->once())
@@ -82,5 +82,12 @@ public function testAfterGetIdentities()
             ->willReturn($parentIds);
         $identities = $this->plugin->afterGetIdentities($this->product, $baseIdentities);
         $this->assertEquals($expectedIdentities, $identities);
+
+        $this->type->expects($this->never())
+            ->method('getParentIdsByChild')
+            ->with($id)
+            ->willReturn($parentIds);
+        $identities = $this->plugin->afterGetIdentities($this->product, $baseIdentities);
+        $this->assertEquals($expectedIdentities, $identities);
     }
 }