Merge remote-tracking branch 'origin/MAGETWO-48790' into pr-379

Author: mslabko

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

@@ -66,6 +66,11 @@ class Product extends AbstractResource
      */
     protected $defaultAttributes;
 
+    /**
+     * @var array
+     */
+    protected $availableCategoryIdsCache = [];
+
     /**
      * @param \Magento\Eav\Model\Entity\Context $context
      * @param \Magento\Store\Model\StoreManagerInterface $storeManager
@@ -465,18 +470,22 @@ public function getAvailableInCategories($object)
     {
         // is_parent=1 ensures that we'll get only category IDs those are direct parents of the product, instead of
         // fetching all parent IDs, including those are higher on the tree
-        $select = $this->getConnection()->select()->distinct()->from(
-            $this->getTable('catalog_category_product_index'),
-            ['category_id']
-        )->where(
-            'product_id = ? AND is_parent = 1',
-            (int)$object->getEntityId()
-        )->where(
-            'visibility != ?',
-            \Magento\Catalog\Model\Product\Visibility::VISIBILITY_NOT_VISIBLE
-        );
-
-        return $this->getConnection()->fetchCol($select);
+        $entityId = (int)$object->getEntityId();
+        if (!isset($this->availableCategoryIdsCache[$entityId])) {
+            $this->availableCategoryIdsCache[$entityId] = $this->getConnection()->fetchCol(
+                $this->getConnection()->select()->distinct()->from(
+                    $this->getTable('catalog_category_product_index'),
+                    ['category_id']
+                )->where(
+                    'product_id = ? AND is_parent = 1',
+                    $entityId
+                )->where(
+                    'visibility != ?',
+                    \Magento\Catalog\Model\Product\Visibility::VISIBILITY_NOT_VISIBLE
+                )
+            );
+        }
+        return $this->availableCategoryIdsCache[$entityId];
     }
 
     /**

app/code/Magento/CatalogRule/Model/Rule.php

@@ -337,7 +337,7 @@ public function callbackValidateProduct($args)
     protected function _getWebsitesMap()
     {
         $map = [];
-        $websites = $this->_storeManager->getWebsites(true);
+        $websites = $this->_storeManager->getWebsites();
         foreach ($websites as $website) {
             // Continue if website has no store to be able to create catalog rule for website without store
             if ($website->getDefaultStore() === null) {

app/code/Magento/CatalogRule/Test/Unit/Model/RuleTest.php

@@ -163,7 +163,7 @@ public function testCallbackValidateProduct($validate)
             'created_at' => '2014-06-25 13:14:30',
             'updated_at' => '2014-06-25 14:37:15'
         ];
-        $this->storeManager->expects($this->any())->method('getWebsites')->with(true)
+        $this->storeManager->expects($this->any())->method('getWebsites')->with(false)
             ->will($this->returnValue([$this->websiteModel, $this->websiteModel]));
         $this->websiteModel->expects($this->at(0))->method('getId')
             ->will($this->returnValue('1'));

app/code/Magento/CatalogRuleConfigurable/Plugin/CatalogRule/Model/ConfigurableProductsProvider.php

@@ -11,6 +11,11 @@ class ConfigurableProductsProvider
     /** @var \Magento\Framework\App\ResourceConnection */
     private $resource;
 
+    /**
+     * @var array
+     */
+    private $productIds = [];
+
     /**
      * @param \Magento\Framework\App\ResourceConnection $resource
      */
@@ -25,13 +30,17 @@ public function __construct(\Magento\Framework\App\ResourceConnection $resource)
      */
     public function getIds(array $ids)
     {
-        $connection = $this->resource->getConnection();
-        return $connection->fetchCol(
-            $connection
-                ->select()
-                ->from(['e' => $this->resource->getTableName('catalog_product_entity')], ['e.entity_id'])
-                ->where('e.type_id = ?', \Magento\ConfigurableProduct\Model\Product\Type\Configurable::TYPE_CODE)
-                ->where('e.entity_id IN (?)', $ids)
-        );
+        $key =  md5(json_encode($ids));
+        if (!isset($this->productIds[$key])) {
+            $connection = $this->resource->getConnection();
+            $this->productIds[$key] = $connection->fetchCol(
+                $connection
+                    ->select()
+                    ->from(['e' => $this->resource->getTableName('catalog_product_entity')], ['e.entity_id'])
+                    ->where('e.type_id = ?', \Magento\ConfigurableProduct\Model\Product\Type\Configurable::TYPE_CODE)
+                    ->where('e.entity_id IN (?)', $ids)
+            );
+        }
+        return $this->productIds[$key];
     }
 }

app/code/Magento/CatalogRuleConfigurable/Plugin/CatalogRule/Model/Rule/ConfigurableProductHandler.php

@@ -20,6 +20,11 @@ class ConfigurableProductHandler
     /** @var ConfigurableProductsProvider */
     private $configurableProductsProvider;
 
+    /**
+     * @var array
+     */
+    private $childrenProducts = [];
+
     /**
      * @param \Magento\ConfigurableProduct\Model\ResourceModel\Product\Type\Configurable $configurable
      * @param ConfigurableProductsProvider $configurableProductsProvider
@@ -42,7 +47,10 @@ public function afterGetMatchingProductIds(\Magento\CatalogRule\Model\Rule $rule
     {
         $configurableProductIds = $this->configurableProductsProvider->getIds(array_keys($productIds));
         foreach ($configurableProductIds as $productId) {
-            $subProductIds = $this->configurable->getChildrenIds($productId)[0];
+            if (!isset($this->childrenProducts[$productId])) {
+                $this->childrenProducts[$productId] = $this->configurable->getChildrenIds($productId)[0];
+            }
+            $subProductIds = $this->childrenProducts[$productId];
             $parentValidationResult = isset($productIds[$productId])
                 ? array_filter($productIds[$productId])
                 : [];