ACP2E-165: [Magento Cloud] min_price and max_price DB values are set to non-zero when configurable product stock status is Out Of Stock and child products are Out Of Stock and Disabled

Author: bubasuma

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

@@ -49,18 +49,18 @@ public function process(Select $select)
     {
         // Does not make sense to extend query if out of stock products won't appear in tables for indexing
         if ($this->stockConfig->isShowOutOfStock()) {
-            $select->join(
-                ['si' => $this->resource->getTableName('cataloginventory_stock_item')],
-                'si.product_id = l.product_id',
+            $stockIndexTableName = $this->resource->getTableName('cataloginventory_stock_status');
+            $select->joinInner(
+                ['child_stock_default' => $stockIndexTableName],
+                'child_stock_default.product_id = l.product_id',
                 []
-            );
-            $select->join(
-                ['si_parent' => $this->resource->getTableName('cataloginventory_stock_item')],
-                'si_parent.product_id = l.parent_id',
+            )->joinInner(
+                ['parent_stock_default' => $stockIndexTableName],
+                'parent_stock_default.product_id = le.entity_id',
                 []
+            )->where(
+                'child_stock_default.stock_status = 1 OR parent_stock_default.stock_status = 0'
             );
-            $select->where('si.is_in_stock = ?', Stock::STOCK_IN_STOCK);
-            $select->orWhere('si_parent.is_in_stock = ?', Stock::STOCK_OUT_OF_STOCK);
         }
 
         return $select;

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

@@ -82,6 +82,11 @@ class Configurable implements DimensionalIndexerInterface
      */
     private $baseSelectProcessor;
 
+    /**
+     * @var PopulateIndexTableInterface
+     */
+    private $populateOptionsIndexTable;
+
     /**
      * @param BaseFinalPrice $baseFinalPrice
      * @param IndexTableStructureFactory $indexTableStructureFactory
@@ -91,9 +96,9 @@ class Configurable implements DimensionalIndexerInterface
      * @param BasePriceModifier $basePriceModifier
      * @param bool $fullReindexAction
      * @param string $connectionName
-     * @param ScopeConfigInterface $scopeConfig
+     * @param ScopeConfigInterface|null $scopeConfig
      * @param BaseSelectProcessorInterface|null $baseSelectProcessor
-     *
+     * @param PopulateIndexTableInterface|null $populateOptionsIndexTable
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
      */
     public function __construct(
@@ -106,7 +111,8 @@ public function __construct(
         $fullReindexAction = false,
         $connectionName = 'indexer',
         ScopeConfigInterface $scopeConfig = null,
-        ?BaseSelectProcessorInterface $baseSelectProcessor = null
+        ?BaseSelectProcessorInterface $baseSelectProcessor = null,
+        ?PopulateIndexTableInterface $populateOptionsIndexTable = null
     ) {
         $this->baseFinalPrice = $baseFinalPrice;
         $this->indexTableStructureFactory = $indexTableStructureFactory;
@@ -119,6 +125,8 @@ public function __construct(
         $this->scopeConfig = $scopeConfig ?: ObjectManager::getInstance()->get(ScopeConfigInterface::class);
         $this->baseSelectProcessor = $baseSelectProcessor ?:
             ObjectManager::getInstance()->get(BaseSelectProcessorInterface::class);
+        $this->populateOptionsIndexTable = $populateOptionsIndexTable
+            ?: ObjectManager::getInstance()->get(PopulateIndexTableInterface::class);
     }
 
     /**
@@ -228,7 +236,7 @@ private function fillTemporaryOptionsTable(string $temporaryOptionsTableName, ar
         if ($entityIds !== null) {
             $select->where('le.entity_id IN (?)', $entityIds, \Zend_Db::INT_TYPE);
         }
-        $this->tableMaintainer->insertFromSelect($select, $temporaryOptionsTableName, []);
+        $this->populateOptionsIndexTable->execute($select, $temporaryOptionsTableName);
     }
 
     /**

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

@@ -0,0 +1,39 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\ConfigurableProduct\Model\ResourceModel\Product\Indexer\Price;
+
+use Magento\Catalog\Model\Indexer\Product\Price\TableMaintainer;
+use Magento\Framework\DB\Select;
+
+/**
+ * Populate index table with data from select
+ */
+class PopulateIndexTable implements PopulateIndexTableInterface
+{
+    /**
+     * @var TableMaintainer
+     */
+    private $tableMaintainer;
+
+    /**
+     * @param TableMaintainer $tableMaintainer
+     */
+    public function __construct(
+        TableMaintainer $tableMaintainer
+    ) {
+        $this->tableMaintainer = $tableMaintainer;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function execute(Select $select, string $indexTableName): void
+    {
+        $this->tableMaintainer->insertFromSelect($select, $indexTableName, []);
+    }
+}

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

@@ -0,0 +1,24 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\ConfigurableProduct\Model\ResourceModel\Product\Indexer\Price;
+
+use Magento\Framework\DB\Select;
+
+/**
+ * Populate index table with data from select statement
+ */
+interface PopulateIndexTableInterface
+{
+    /**
+     * Insert data from select statement into index table
+     *
+     * @param Select $select
+     * @param string $indexTableName
+     */
+    public function execute(Select $select, string $indexTableName): void;
+}

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

@@ -17,6 +17,7 @@
     <preference for="Magento\ConfigurableProduct\Pricing\Price\LowestPriceOptionsProviderInterface" type="Magento\ConfigurableProduct\Pricing\Price\LowestPriceOptionsProvider" />
     <preference for="Magento\ConfigurableProduct\Model\AttributeOptionProviderInterface" type="Magento\ConfigurableProduct\Model\AttributeOptionProvider" />
     <preference for="Magento\ConfigurableProduct\Model\ResourceModel\Attribute\OptionSelectBuilderInterface" type="Magento\ConfigurableProduct\Model\ResourceModel\Attribute\OptionSelectBuilder" />
+    <preference for="Magento\ConfigurableProduct\Model\ResourceModel\Product\Indexer\Price\PopulateIndexTableInterface" type="\Magento\ConfigurableProduct\Model\ResourceModel\Product\Indexer\Price\PopulateIndexTable" />
 
     <type name="Magento\CatalogInventory\Model\Quote\Item\QuantityValidator\Initializer\Option">
         <plugin name="configurable_product" type="Magento\ConfigurableProduct\Model\Quote\Item\QuantityValidator\Initializer\Option\Plugin\ConfigurableProduct" sortOrder="50" />