MAGETWO-91798: Implement GroupedProduct Price indexer

Author: slopukhov

app/code/Magento/ConfigurableProduct/Model/ResourceModel/Product/Indexer/Price/Configurable.php

@@ -12,8 +12,6 @@
 use Magento\Catalog\Model\ResourceModel\Product\Indexer\Price\Query\BaseFinalPrice;
 use Magento\Catalog\Model\ResourceModel\Product\Indexer\Price\IndexTableStructureFactory;
 use Magento\Catalog\Model\ResourceModel\Product\Indexer\Price\IndexTableStructure;
-use Magento\Store\Model\Indexer\WebsiteDimensionProvider;
-use Magento\Customer\Model\Indexer\CustomerGroupDimensionProvider;
 
 /**
  * Configurable Products Price Indexer Resource model
@@ -62,11 +60,6 @@ class Configurable implements DimensionalIndexerInterface
      */
     private $connection;
 
-    /**
-     * @var string
-     */
-    private $productType;
-
     /**
      * @var BasePriceModifier
      */
@@ -81,7 +74,6 @@ class Configurable implements DimensionalIndexerInterface
      * @param BasePriceModifier $basePriceModifier
      * @param bool $fullReindexAction
      * @param string $connectionName
-     * @param string $productType
      */
     public function __construct(
         BaseFinalPrice $baseFinalPrice,
@@ -91,13 +83,11 @@ public function __construct(
         \Magento\Framework\App\ResourceConnection $resource,
         BasePriceModifier $basePriceModifier,
         $fullReindexAction = false,
-        $connectionName = 'indexer',
-        $productType = \Magento\ConfigurableProduct\Model\Product\Type\Configurable::TYPE_CODE
+        $connectionName = 'indexer'
     ) {
         $this->baseFinalPrice = $baseFinalPrice;
         $this->indexTableStructureFactory = $indexTableStructureFactory;
         $this->tableMaintainer = $tableMaintainer;
-        $this->productType = $productType;
         $this->connectionName = $connectionName;
         $this->metadataPool = $metadataPool;
         $this->resource = $resource;
@@ -126,7 +116,11 @@ public function executeByDimension(array $dimensions, \Traversable $entityIds =
             'maxPriceField' => 'max_price',
             'tierPriceField' => 'tier_price',
         ]);
-        $select = $this->baseFinalPrice->getQuery($dimensions, $this->productType, iterator_to_array($entityIds));
+        $select = $this->baseFinalPrice->getQuery(
+            $dimensions,
+            \Magento\ConfigurableProduct\Model\Product\Type\Configurable::TYPE_CODE,
+            iterator_to_array($entityIds)
+        );
         $query = $select->insertFromSelect($temporaryPriceTable->getTableName(), [], false);
         $this->tableMaintainer->getConnection()->query($query);
 
@@ -135,6 +129,8 @@ public function executeByDimension(array $dimensions, \Traversable $entityIds =
     }
 
     /**
+     * Apply configurable option
+     *
      * @param IndexTableStructure $temporaryPriceTable
      * @param array $dimensions
      * @param array $entityIds
@@ -203,14 +199,6 @@ private function fillTemporaryOptionsTable(string $temporaryOptionsTableName, ar
         if ($entityIds !== null) {
             $select->where('le.entity_id IN (?)', $entityIds);
         }
-        foreach ($dimensions as $dimension) {
-            if ($dimension->getName() === WebsiteDimensionProvider::DIMENSION_NAME) {
-                $select->where('website_id = ?', $dimension->getValue());
-            }
-            if ($dimension->getName() === CustomerGroupDimensionProvider::DIMENSION_NAME) {
-                $select->where('customer_group_id = ?', $dimension->getValue());
-            }
-        }
         $query = $select->insertFromSelect($temporaryOptionsTableName);
         $this->getConnection()->query($query);
     }

app/code/Magento/Downloadable/Model/ResourceModel/Indexer/Price.php

@@ -17,8 +17,6 @@
 use Magento\Catalog\Model\ResourceModel\Product\Indexer\Price\Query\BaseFinalPrice;
 use Magento\Catalog\Model\ResourceModel\Product\Indexer\Price\IndexTableStructureFactory;
 use Magento\Catalog\Model\ResourceModel\Product\Indexer\Price\IndexTableStructure;
-use Magento\Store\Model\Indexer\WebsiteDimensionProvider;
-use Magento\Customer\Model\Indexer\CustomerGroupDimensionProvider;
 
 /**
  * Downloadable Product Price Indexer Resource model
@@ -61,11 +59,6 @@ class Price implements DimensionalIndexerInterface
      */
     private $connection;
 
-    /**
-     * @var string
-     */
-    private $productType;
-
     /**
      * @var Config
      */
@@ -83,10 +76,8 @@ class Price implements DimensionalIndexerInterface
      * @param MetadataPool $metadataPool
      * @param Config $eavConfig
      * @param ResourceConnection $resource
-     * @param string $connectionName
-     * @param string $productType
      * @param BasePriceModifier $basePriceModifier
-     * @param array $priceModifiers
+     * @param string $connectionName
      */
     public function __construct(
         BaseFinalPrice $baseFinalPrice,
@@ -96,13 +87,11 @@ public function __construct(
         Config $eavConfig,
         ResourceConnection $resource,
         BasePriceModifier $basePriceModifier,
-        $connectionName = 'indexer',
-        $productType = Type::TYPE_DOWNLOADABLE
+        $connectionName = 'indexer'
     ) {
         $this->baseFinalPrice = $baseFinalPrice;
         $this->indexTableStructureFactory = $indexTableStructureFactory;
         $this->tableMaintainer = $tableMaintainer;
-        $this->productType = $productType;
         $this->connectionName = $connectionName;
         $this->metadataPool = $metadataPool;
         $this->resource = $resource;
@@ -136,6 +125,7 @@ public function executeByDimension(array $dimensions, \Traversable $entityIds =
 
     /**
      * Calculate and apply Downloadable links price to index
+     *
      * @param IndexTableStructure $temporaryPriceTable
      * @param array $dimensions
      * @return $this
@@ -159,8 +149,10 @@ private function applyDownloadableLink(
 
     /**
      * Retrieve catalog_product attribute instance by attribute code
+     *
      * @param string $attributeCode
      * @return \Magento\Eav\Model\Entity\Attribute\AbstractAttribute
+     * @throws \Magento\Framework\Exception\LocalizedException
      */
     protected function getAttribute($attributeCode)
     {
@@ -169,6 +161,7 @@ protected function getAttribute($attributeCode)
 
     /**
      * Put data into catalog product price indexer Downloadable links price  temp table
+     *
      * @param string $temporaryDownloadableTableName
      * @param array $dimensions
      * @return void
@@ -211,22 +204,13 @@ private function fillTemporaryTable(string $temporaryDownloadableTableName, arra
                 'max_price' => new \Zend_Db_Expr('SUM(' . $ifPrice . ')'),
             ]
         );
-
-        foreach ($dimensions as $dimension) {
-            if ($dimension->getName() === WebsiteDimensionProvider::DIMENSION_NAME) {
-                $select->where('`i`.website_id = ?', $dimension->getValue());
-            }
-            if ($dimension->getName() === CustomerGroupDimensionProvider::DIMENSION_NAME) {
-                $select->where('`i`.customer_group_id = ?', $dimension->getValue());
-            }
-        }
-
         $query = $select->insertFromSelect($temporaryDownloadableTableName);
         $this->getConnection()->query($query);
     }
 
     /**
      * Update data in the catalog product price indexer temp table
+     *
      * @param string $temporaryPriceTableName
      * @param string $temporaryDownloadableTableName
      * @return void
@@ -259,6 +243,25 @@ private function updateTemporaryDownloadableTable(
         $this->getConnection()->query($query);
     }
 
+    /**
+     * Fill final price
+     *
+     * @param array $dimensions
+     * @param \Traversable $entityIds
+     * @param IndexTableStructure $temporaryPriceTable
+     * @throws \Magento\Framework\Exception\LocalizedException
+     * @throws \Zend_Db_Select_Exception
+     */
+    private function fillFinalPrice(
+        array $dimensions,
+        \Traversable $entityIds,
+        IndexTableStructure $temporaryPriceTable
+    ) {
+        $select = $this->baseFinalPrice->getQuery($dimensions, Type::TYPE_DOWNLOADABLE, iterator_to_array($entityIds));
+        $query = $select->insertFromSelect($temporaryPriceTable->getTableName(), [], false);
+        $this->tableMaintainer->getConnection()->query($query);
+    }
+
     /**
      * Get connection
      *
@@ -270,6 +273,7 @@ private function getConnection(): \Magento\Framework\DB\Adapter\AdapterInterface
         if ($this->connection === null) {
             $this->connection = $this->resource->getConnection($this->connectionName);
         }
+
         return $this->connection;
     }
 
@@ -283,21 +287,4 @@ private function getTable($tableName)
     {
         return $this->resource->getTableName($tableName, $this->connectionName);
     }
-
-    /**
-     * @param array $dimensions
-     * @param \Traversable $entityIds
-     * @param IndexTableStructure $temporaryPriceTable
-     * @throws \Magento\Framework\Exception\LocalizedException
-     * @throws \Zend_Db_Select_Exception
-     */
-    private function fillFinalPrice(
-        array $dimensions,
-        \Traversable $entityIds,
-        IndexTableStructure $temporaryPriceTable
-    ) {
-        $select = $this->baseFinalPrice->getQuery($dimensions, $this->productType, iterator_to_array($entityIds));
-        $query = $select->insertFromSelect($temporaryPriceTable->getTableName(), [], false);
-        $this->tableMaintainer->getConnection()->query($query);
-    }
 }

app/code/Magento/GroupedProduct/Model/ResourceModel/Product/Indexer/Price/Grouped.php

@@ -104,18 +104,20 @@ public function executeByDimension(array $dimensions, \Traversable $entityIds =
             'maxPriceField' => 'max_price',
             'tierPriceField' => 'tier_price',
         ]);
-        $query = $this->_prepareGroupedProductPriceDataSelect($dimensions, iterator_to_array($entityIds))
+        $query = $this->prepareGroupedProductPriceDataSelect($dimensions, iterator_to_array($entityIds))
             ->insertFromSelect($temporaryPriceTable->getTableName());
         $this->getConnection()->query($query);
     }
 
     /**
      * Prepare data index select for Grouped products prices
+     *
      * @param $dimensions
      * @param int|array $entityIds the parent entity ids limitation
      * @return \Magento\Framework\DB\Select
+     * @throws \Exception
      */
-    protected function _prepareGroupedProductPriceDataSelect($dimensions, $entityIds = null)
+    protected function prepareGroupedProductPriceDataSelect($dimensions, $entityIds = null)
     {
         $select = $this->getConnection()->select();
 
@@ -130,7 +132,7 @@ protected function _prepareGroupedProductPriceDataSelect($dimensions, $entityIds
             'e.' . $linkField . ' = l.product_id AND l.link_type_id=' . Link::LINK_TYPE_GROUPED,
             []
         );
-        //aditional infromation about inner products
+        //additional information about inner products
         $select->joinLeft(
             ['le' => $this->getTable('catalog_product_entity')],
             'le.entity_id = l.linked_product_id',
@@ -172,9 +174,18 @@ protected function _prepareGroupedProductPriceDataSelect($dimensions, $entityIds
         return $select;
     }
 
-    private function getTable($tableName)
+    /**
+     * Get main table
+     *
+     * @param array $dimensions
+     * @return string
+     */
+    private function getMainTable($dimensions)
     {
-        return $this->resource->getTableName($tableName, $this->connectionName);
+        if ($this->fullReindexAction) {
+            return $this->tableMaintainer->getMainReplicaTable($dimensions);
+        }
+        return $this->tableMaintainer->getMainTable($dimensions);
     }
 
     /**
@@ -193,16 +204,13 @@ private function getConnection(): \Magento\Framework\DB\Adapter\AdapterInterface
     }
 
     /**
-     * Get main table
+     * Get table
      *
-     * @param array $dimensions
+     * @param string $tableName
      * @return string
      */
-    private function getMainTable($dimensions)
+    private function getTable($tableName)
     {
-        if ($this->fullReindexAction) {
-            return $this->tableMaintainer->getMainReplicaTable($dimensions);
-        }
-        return $this->tableMaintainer->getMainTable($dimensions);
+        return $this->resource->getTableName($tableName, $this->connectionName);
     }
 }