MAGETWO-54682: Fast load of product options

mslabko · mslabko · commit f1d8711d1b8f · 2016-07-19T19:12:51.000+03:00
- MAGETWO-55404: Make lightweight product price resolver for configurable product
 -- rename interface
diff --git a/app/code/Magento/Catalog/Model/ResourceModel/Product/Indexer/LinkedProductSelectBuilderByIndexPrice.php b/app/code/Magento/Catalog/Model/ResourceModel/Product/Indexer/LinkedProductSelectBuilderByIndexPrice.php
@@ -8,12 +8,9 @@
 use Magento\Catalog\Model\Product;
 use Magento\Framework\DB\Select;
 use Magento\Store\Model\Store;
-use Magento\Catalog\Model\ResourceModel\Product\ProductProviderByPriceInterface;
+use Magento\Catalog\Model\ResourceModel\Product\LinkedProductSelectBuilderInterface;
 
-/**
- * Class ProductProviderByIndexPrice
- */
-class ProductProviderByIndexPrice implements ProductProviderByPriceInterface
+class LinkedProductSelectBuilderByIndexPrice implements LinkedProductSelectBuilderInterface
 {
     /**
      * @var \Magento\Store\Model\StoreManagerInterface
@@ -48,7 +45,7 @@ public function __construct(
     /**
      * {@inheritdoc}
      */
-    public function getSelect($productId)
+    public function build($productId)
     {
         return [$this->resource->getConnection()->select()
             ->from(['t' => $this->resource->getTableName('catalog_product_index_price')], 'entity_id')
diff --git a/app/code/Magento/Catalog/Model/ResourceModel/Product/LinkedProductSelectBuilderByBasePrice.php b/app/code/Magento/Catalog/Model/ResourceModel/Product/LinkedProductSelectBuilderByBasePrice.php
@@ -9,10 +9,7 @@
 use Magento\Framework\DB\Select;
 use Magento\Store\Model\Store;
 
-/**
- * Class ProductProviderByBasePrice
- */
-class ProductProviderByBasePrice implements ProductProviderByPriceInterface
+class LinkedProductSelectBuilderByBasePrice implements LinkedProductSelectBuilderInterface
 {
     /**
      * @var \Magento\Store\Model\StoreManagerInterface
@@ -55,7 +52,7 @@ public function __construct(
     /**
      * {@inheritdoc}
      */
-    public function getSelect($productId)
+    public function build($productId)
     {
         $priceAttribute = $this->eavConfig->getAttribute(Product::ENTITY, 'price');
         $priceSelect = $this->resource->getConnection()->select()
diff --git a/app/code/Magento/Catalog/Model/ResourceModel/Product/LinkedProductSelectBuilderBySpecialPrice.php b/app/code/Magento/Catalog/Model/ResourceModel/Product/LinkedProductSelectBuilderBySpecialPrice.php
@@ -9,10 +9,7 @@
 use Magento\Framework\DB\Select;
 use Magento\Store\Model\Store;
 
-/**
- * Class ProductProviderBySpecialPrice
- */
-class ProductProviderBySpecialPrice implements ProductProviderByPriceInterface
+class LinkedProductSelectBuilderBySpecialPrice implements LinkedProductSelectBuilderInterface
 {
     /**
      * @var \Magento\Store\Model\StoreManagerInterface
@@ -71,7 +68,7 @@ public function __construct(
     /**
      * {@inheritdoc}
      */
-    public function getSelect($productId)
+    public function build($productId)
     {
         $connection = $this->resource->getConnection();
         $specialPriceAttribute = $this->eavConfig->getAttribute(Product::ENTITY, 'special_price');
diff --git a/app/code/Magento/Catalog/Model/ResourceModel/Product/LinkedProductSelectBuilderByTierPrice.php b/app/code/Magento/Catalog/Model/ResourceModel/Product/LinkedProductSelectBuilderByTierPrice.php
@@ -8,7 +8,7 @@
 use Magento\Catalog\Model\Product;
 use Magento\Framework\DB\Select;
 
-class ProductProviderByTierPrice implements ProductProviderByPriceInterface
+class LinkedProductSelectBuilderByTierPrice implements LinkedProductSelectBuilderInterface
 {
     /**
      * Default website id
@@ -56,7 +56,7 @@ public function __construct(
     /**
      * {@inheritdoc}
      */
-    public function getSelect($productId)
+    public function build($productId)
     {
         $priceSelect = $this->resource->getConnection()->select()
                 ->from(['t' => $this->resource->getTableName('catalog_product_entity_tier_price')], 'entity_id')
diff --git a/app/code/Magento/Catalog/Model/ResourceModel/Product/LinkedProductSelectBuilderComposite.php b/app/code/Magento/Catalog/Model/ResourceModel/Product/LinkedProductSelectBuilderComposite.php
@@ -0,0 +1,36 @@
+<?php
+/**
+ * Copyright © 2016 Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\Catalog\Model\ResourceModel\Product;
+
+class LinkedProductSelectBuilderComposite implements LinkedProductSelectBuilderInterface
+{
+    /**
+     * @var LinkedProductSelectBuilderInterface[]
+     */
+    private $linkedProductSelectBuilder;
+
+    /**
+     * @param LinkedProductSelectBuilderInterface[] $linkedProductSelectBuilder
+     */
+    public function __construct($linkedProductSelectBuilder)
+    {
+        $this->linkedProductSelectBuilder = $linkedProductSelectBuilder;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function build($productId)
+    {
+        $select = [];
+        foreach ($this->linkedProductSelectBuilder as $productSelectBuilder) {
+            $select = array_merge($select, $productSelectBuilder->build($productId));
+        }
+
+        return $select;
+    }
+}
diff --git a/app/code/Magento/Catalog/Model/ResourceModel/Product/LinkedProductSelectBuilderInterface.php b/app/code/Magento/Catalog/Model/ResourceModel/Product/LinkedProductSelectBuilderInterface.php
@@ -8,11 +8,11 @@
 /**
  * Provide Select object for retrieve product id with minimal price
  */
-interface ProductProviderByPriceInterface
+interface LinkedProductSelectBuilderInterface
 {
     /**
      * @param int $productId
      * @return \Magento\Framework\DB\Select[]
      */
-    public function getSelect($productId);
+    public function build($productId);
 }
diff --git a/app/code/Magento/Catalog/Model/ResourceModel/Product/ProductProviderByPriceComposite.php b/app/code/Magento/Catalog/Model/ResourceModel/Product/ProductProviderByPriceComposite.php
diff --git a/app/code/Magento/Catalog/etc/di.xml b/app/code/Magento/Catalog/etc/di.xml
@@ -537,14 +537,14 @@
             </argument>
         </arguments>
     </type>
-    <preference for="Magento\Catalog\Model\ResourceModel\Product\ProductProviderByPriceInterface" type="Magento\Catalog\Model\ResourceModel\Product\ProductProviderByPriceComposite" />
-    <type name="Magento\Catalog\Model\ResourceModel\Product\ProductProviderByPriceComposite">
-        <arguments>
-            <argument name="productProviderByPrice" xsi:type="array">
-                <item name="basePrice" xsi:type="object">Magento\Catalog\Model\ResourceModel\Product\ProductProviderByBasePrice</item>
-                <item name="specialPrice" xsi:type="object">Magento\Catalog\Model\ResourceModel\Product\ProductProviderBySpecialPrice</item>
-                <item name="tierPrice" xsi:type="object">Magento\Catalog\Model\ResourceModel\Product\ProductProviderByTierPrice</item>
-                <item name="indexPrice" xsi:type="object">Magento\Catalog\Model\ResourceModel\Product\Indexer\ProductProviderByIndexPrice</item>
+    <preference for="Magento\Catalog\Model\ResourceModel\Product\LinkedProductSelectBuilderInterface" type="Magento\Catalog\Model\ResourceModel\Product\LinkedProductSelectBuilderComposite" />
+    <type name="Magento\Catalog\Model\ResourceModel\Product\LinkedProductSelectBuilderComposite">
+        <arguments>
+            <argument name="linkedProductSelectBuilder" xsi:type="array">
+                <item name="basePrice" xsi:type="object">Magento\Catalog\Model\ResourceModel\Product\LinkedProductSelectBuilderByBasePrice</item>
+                <item name="specialPrice" xsi:type="object">Magento\Catalog\Model\ResourceModel\Product\LinkedProductSelectBuilderBySpecialPrice</item>
+                <item name="tierPrice" xsi:type="object">Magento\Catalog\Model\ResourceModel\Product\LinkedProductSelectBuilderByTierPrice</item>
+                <item name="indexPrice" xsi:type="object">Magento\Catalog\Model\ResourceModel\Product\Indexer\LinkedProductSelectBuilderByIndexPrice</item>
             </argument>
         </arguments>
     </type>
diff --git a/app/code/Magento/CatalogRule/Model/ResourceModel/Product/LinkedProductSelectBuilderByCatalogRulePrice.php b/app/code/Magento/CatalogRule/Model/ResourceModel/Product/LinkedProductSelectBuilderByCatalogRulePrice.php
@@ -8,12 +8,9 @@
 use Magento\Catalog\Model\Product;
 use Magento\Framework\DB\Select;
 use Magento\Store\Model\Store;
-use Magento\Catalog\Model\ResourceModel\Product\ProductProviderByPriceInterface;
+use Magento\Catalog\Model\ResourceModel\Product\LinkedProductSelectBuilderInterface;
 
-/**
- * Class ProductProviderByRulePrice
- */
-class ProductProviderByRulePrice implements ProductProviderByPriceInterface
+class LinkedProductSelectBuilderByCatalogRulePrice implements LinkedProductSelectBuilderInterface
 {
     /**
      * @var \Magento\Store\Model\StoreManagerInterface
@@ -64,7 +61,7 @@ public function __construct(
     /**
      * {@inheritdoc}
      */
-    public function getSelect($productId)
+    public function build($productId)
     {
         $timestamp = $this->localeDate->scopeTimeStamp($this->storeManager->getStore());
         $currentDate = $this->dateTime->formatDate($timestamp, false);
diff --git a/app/code/Magento/CatalogRule/etc/di.xml b/app/code/Magento/CatalogRule/etc/di.xml
@@ -33,10 +33,10 @@
             </argument>
         </arguments>
     </virtualType>
-    <type name="Magento\Catalog\Model\ResourceModel\Product\ProductProviderByPriceComposite">
+    <type name="Magento\Catalog\Model\ResourceModel\Product\LinkedProductSelectBuilderComposite">
         <arguments>
-            <argument name="productProviderByPrice" xsi:type="array">
-                <item name="rulePrice" xsi:type="object">Magento\CatalogRule\Model\ResourceModel\Product\ProductProviderByRulePrice</item>
+            <argument name="linkedProductSelectBuilder" xsi:type="array">
+                <item name="catalogRulePrice" xsi:type="object">Magento\CatalogRule\Model\ResourceModel\Product\LinkedProductSelectBuilderByCatalogRulePrice</item>
             </argument>
         </arguments>
     </type>
diff --git a/app/code/Magento/ConfigurableProduct/Pricing/Price/ConfigurableOptionsProvider.php b/app/code/Magento/ConfigurableProduct/Pricing/Price/ConfigurableOptionsProvider.php
@@ -24,9 +24,9 @@ class ConfigurableOptionsProvider implements ConfigurableOptionsProviderInterfac
     private $resource;
 
     /**
-     * @var \Magento\Catalog\Model\ResourceModel\Product\ProductProviderByPriceInterface
+     * @var \Magento\Catalog\Model\ResourceModel\Product\LinkedProductSelectBuilderInterface
      */
-    private $productProviderByPrice;
+    private $linkedProductSelectBuilder;
 
     /**
      * @var \Magento\Catalog\Model\ResourceModel\Product\CollectionFactory
@@ -41,20 +41,20 @@ class ConfigurableOptionsProvider implements ConfigurableOptionsProviderInterfac
     /**
      * @param \Magento\ConfigurableProduct\Model\Product\Type\Configurable $configurable
      * @param \Magento\Framework\App\ResourceConnection $resourceConnection
-     * @param \Magento\Catalog\Model\ResourceModel\Product\ProductProviderByPriceInterface $productProviderByPrice
+     * @param \Magento\Catalog\Model\ResourceModel\Product\LinkedProductSelectBuilderInterface $linkedProductSelectBuilder
      * @param \Magento\Catalog\Model\ResourceModel\Product\CollectionFactory $collectionFactory
      * @param \Magento\Framework\App\RequestSafetyInterface $requestSafety
      */
     public function __construct(
         \Magento\ConfigurableProduct\Model\Product\Type\Configurable $configurable,
         \Magento\Framework\App\ResourceConnection $resourceConnection,
-        \Magento\Catalog\Model\ResourceModel\Product\ProductProviderByPriceInterface $productProviderByPrice,
+        \Magento\Catalog\Model\ResourceModel\Product\LinkedProductSelectBuilderInterface $linkedProductSelectBuilder,
         \Magento\Catalog\Model\ResourceModel\Product\CollectionFactory $collectionFactory,
         \Magento\Framework\App\RequestSafetyInterface $requestSafety
     ) {
         $this->configurable = $configurable;
         $this->resource = $resourceConnection;
-        $this->productProviderByPrice = $productProviderByPrice;
+        $this->linkedProductSelectBuilder = $linkedProductSelectBuilder;
         $this->collectionFactory = $collectionFactory;
         $this->requestSafety = $requestSafety;
     }
@@ -67,7 +67,7 @@ public function getProducts(ProductInterface $product)
         if (!isset($this->products[$product->getId()])) {
             if ($this->requestSafety->isSafeMethod()) {
                 $productIds = $this->resource->getConnection()->fetchCol(
-                    '(' . implode(') UNION (', $this->productProviderByPrice->getSelect($product->getId())) . ')'
+                    '(' . implode(') UNION (', $this->linkedProductSelectBuilder->build($product->getId())) . ')'
                 );
 
                 $this->products[$product->getId()] = $this->collectionFactory->create()

Original file line number	Diff line number	Diff line change
`@@ -8,11 +8,11 @@`
`8`	`8`	`/**`
`9`	`9`	`* Provide Select object for retrieve product id with minimal price`
`10`	`10`	`*/`
`11`		`-interface ProductProviderByPriceInterface`
	`11`	`+interface LinkedProductSelectBuilderInterface`
`12`	`12`	`{`
`13`	`13`	`/**`
`14`	`14`	`* @param int $productId`
`15`	`15`	`* @return \Magento\Framework\DB\Select[]`
`16`	`16`	`*/`
`17`		`- public function getSelect($productId);`
	`17`	`+ public function build($productId);`
`18`	`18`	`}`