Merge pull request #7109 from magento-engcom/MC-41862

MC-41862: Stock status resets to saleable when the product is saved from Admin

Author: sidolov

app/code/Magento/CatalogInventory/Model/ResourceModel/Indexer/Stock/DefaultStock.php

@@ -8,6 +8,7 @@
 
 use Magento\Catalog\Model\ResourceModel\Product\Indexer\AbstractIndexer;
 use Magento\CatalogInventory\Model\Stock;
+use Magento\Framework\App\ObjectManager;
 use Magento\Framework\DB\Adapter\AdapterInterface;
 use Magento\CatalogInventory\Api\StockConfigurationInterface;
 use Magento\CatalogInventory\Model\Indexer\Stock\Action\Full;
@@ -26,22 +27,16 @@
 class DefaultStock extends AbstractIndexer implements StockInterface
 {
     /**
-     * Current Product Type Id
-     *
      * @var string
      */
     protected $_typeId;
 
     /**
-     * Product Type is composite flag
-     *
      * @var bool
      */
     protected $_isComposite = false;
 
     /**
-     * Core store config
-     *
      * @var \Magento\Framework\App\Config\ScopeConfigInterface
      */
     protected $_scopeConfig;
@@ -58,12 +53,15 @@ class DefaultStock extends AbstractIndexer implements StockInterface
     protected $stockConfiguration;
 
     /**
-     * Param for switching logic which depends on action type (full reindex or partial)
-     *
      * @var string
      */
     private $actionType;
 
+    /**
+     * @var GetStatusExpression
+     */
+    private $getStatusExpression;
+
     /**
      * Class constructor
      *
@@ -72,16 +70,21 @@ class DefaultStock extends AbstractIndexer implements StockInterface
      * @param \Magento\Eav\Model\Config $eavConfig
      * @param \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig
      * @param string $connectionName
+     * @param \Magento\CatalogInventory\Model\ResourceModel\Indexer\Stock\GetStatusExpression|null $getStatusExpression
      */
     public function __construct(
         \Magento\Framework\Model\ResourceModel\Db\Context $context,
         \Magento\Framework\Indexer\Table\StrategyInterface $tableStrategy,
         \Magento\Eav\Model\Config $eavConfig,
         \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig,
-        $connectionName = null
+        $connectionName = null,
+        \Magento\CatalogInventory\Model\ResourceModel\Indexer\Stock\GetStatusExpression $getStatusExpression = null
     ) {
         $this->_scopeConfig = $scopeConfig;
         parent::__construct($context, $tableStrategy, $eavConfig, $connectionName);
+        $this->getStatusExpression = $getStatusExpression ?: ObjectManager::getInstance()->get(
+            \Magento\CatalogInventory\Model\ResourceModel\Indexer\Stock\GetStatusExpression::class
+        );
     }
 
     /**
@@ -251,6 +254,10 @@ protected function _getStockStatusSelect($entityIds = null, $usePrimaryTable = f
             . ' AND mcpei.attribute_id = ' . $this->_getAttribute('status')->getId()
             . ' AND mcpei.value = ' . ProductStatus::STATUS_ENABLED,
             []
+        )->joinLeft(
+            ['css' => 'cataloginventory_stock_status'],
+            'css.product_id = e.entity_id',
+            []
         )->columns(
             ['qty' => $qtyExpr]
         )->where(
@@ -292,14 +299,14 @@ protected function _prepareIndexTable($entityIds = null)
      */
     protected function _updateIndex($entityIds)
     {
-        $this->deleteOldRecords($entityIds);
         $connection = $this->getConnection();
         $select = $this->_getStockStatusSelect($entityIds, true);
         $select = $this->getQueryProcessorComposite()->processQuery($select, $entityIds, true);
         $query = $connection->query($select);
 
         $i = 0;
         $data = [];
+        $savedEntityIds = [];
         while ($row = $query->fetch(\PDO::FETCH_ASSOC)) {
             $i++;
             $data[] = [
@@ -309,6 +316,7 @@ protected function _updateIndex($entityIds)
                 'qty' => (double)$row['qty'],
                 'stock_status' => (int)$row['status'],
             ];
+            $savedEntityIds[] = (int)$row['entity_id'];
             if ($i % 1000 == 0) {
                 $this->_updateIndexTable($data);
                 $data = [];
@@ -317,6 +325,7 @@ protected function _updateIndex($entityIds)
 
         $this->_updateIndexTable($data);
 
+        $this->deleteOldRecords(array_diff($entityIds, $savedEntityIds));
         return $this;
     }
 
@@ -376,21 +385,7 @@ public function getIdxTable($table = null)
      */
     protected function getStatusExpression(AdapterInterface $connection, $isAggregate = false)
     {
-        $isInStockExpression = $isAggregate ? 'MAX(cisi.is_in_stock)' : 'cisi.is_in_stock';
-        if ($this->_isManageStock()) {
-            $statusExpr = $connection->getCheckSql(
-                'cisi.use_config_manage_stock = 0 AND cisi.manage_stock = 0',
-                1,
-                $isInStockExpression
-            );
-        } else {
-            $statusExpr = $connection->getCheckSql(
-                'cisi.use_config_manage_stock = 0 AND cisi.manage_stock = 1',
-                $isInStockExpression,
-                1
-            );
-        }
-        return $statusExpr;
+        return $this->getStatusExpression->execute($this->getTypeId(), $connection, $isAggregate);
     }
 
     /**

app/code/Magento/CatalogInventory/Model/ResourceModel/Indexer/Stock/GetStatusExpression.php

@@ -0,0 +1,52 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\CatalogInventory\Model\ResourceModel\Indexer\Stock;
+
+use InvalidArgumentException;
+use Magento\CatalogInventory\Model\ResourceModel\Indexer\Stock\StatusExpression\ExpressionInterface;
+use Magento\Framework\DB\Adapter\AdapterInterface;
+use Zend_Db_Expr;
+
+class GetStatusExpression
+{
+    /**
+     * @var array
+     */
+    private $statusExpressions;
+
+    /**
+     * @param array $statusExpressions
+     */
+    public function __construct(array $statusExpressions = [])
+    {
+        foreach ($statusExpressions as $expression) {
+            if (!($expression instanceof ExpressionInterface)) {
+                throw new InvalidArgumentException(
+                    'Expressions must implement '
+                    .'\Magento\CatalogInventory\Model\ResourceModel\Indexer\Stock\StatusExpression\ExpressionInterface'
+                    .' interface'
+                );
+            }
+        }
+        $this->statusExpressions = $statusExpressions;
+    }
+
+    /**
+     * Returns stock status expression for MySQL query.
+     *
+     * @param string $productType
+     * @param AdapterInterface $connection
+     * @param bool $isAggregate
+     * @return Zend_Db_Expr|null
+     */
+    public function execute(string $productType, AdapterInterface $connection, bool $isAggregate): ?Zend_Db_Expr
+    {
+        $expression = $this->statusExpressions[$productType] ?? $this->statusExpressions['default'];
+        return $expression->getExpression($connection, $isAggregate);
+    }
+}

app/code/Magento/CatalogInventory/Model/ResourceModel/Indexer/Stock/StatusExpression/DefaultExpression.php

@@ -0,0 +1,61 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\CatalogInventory\Model\ResourceModel\Indexer\Stock\StatusExpression;
+
+use Magento\CatalogInventory\Model\Configuration;
+use Magento\Framework\App\Config\ScopeConfigInterface;
+use Magento\Framework\DB\Adapter\AdapterInterface;
+use Magento\Store\Model\ScopeInterface;
+use Zend_Db_Expr;
+
+class DefaultExpression implements ExpressionInterface
+{
+    /**
+     * @var ScopeConfigInterface
+     */
+    private $scopeConfig;
+
+    /**
+     * @param ScopeConfigInterface $scopeConfig
+     */
+    public function __construct(ScopeConfigInterface $scopeConfig)
+    {
+        $this->scopeConfig = $scopeConfig;
+    }
+
+    /**
+     * Returns status expressions for MySQL query
+     *
+     * @ingeritdoc
+     * @param AdapterInterface $connection
+     * @param bool $isAggregate
+     * @return Zend_Db_Expr
+     */
+    public function getExpression(AdapterInterface $connection, bool $isAggregate): Zend_Db_Expr
+    {
+        $isManageStock = $this->scopeConfig->isSetFlag(
+            Configuration::XML_PATH_MANAGE_STOCK,
+            ScopeInterface::SCOPE_STORE
+        );
+
+        $isInStockExpression = $isAggregate ? 'MAX(cisi.is_in_stock)' : 'cisi.is_in_stock';
+        if ($isManageStock) {
+            $statusExpr = $connection->getCheckSql(
+                'cisi.use_config_manage_stock = 0 AND cisi.manage_stock = 0',
+                1,
+                $isInStockExpression
+            );
+        } else {
+            $statusExpr = $connection->getCheckSql(
+                'cisi.use_config_manage_stock = 0 AND cisi.manage_stock = 1',
+                $isInStockExpression,
+                1
+            );
+        }
+        return $statusExpr;
+    }
+}

app/code/Magento/CatalogInventory/Model/ResourceModel/Indexer/Stock/StatusExpression/ExpressionInterface.php

@@ -0,0 +1,25 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\CatalogInventory\Model\ResourceModel\Indexer\Stock\StatusExpression;
+
+use Magento\Framework\DB\Adapter\AdapterInterface;
+use Zend_Db_Expr;
+
+/**
+ * Interface for composite status expressions for MySQL query.
+ */
+interface ExpressionInterface
+{
+    /**
+     * Returns status expressions for MySQL query
+     *
+     * @param AdapterInterface $connection
+     * @param bool $isAggregate
+     * @return Zend_Db_Expr
+     */
+    public function getExpression(AdapterInterface $connection, bool $isAggregate): Zend_Db_Expr;
+}

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

@@ -133,4 +133,11 @@
     <type name="Magento\Catalog\Controller\Adminhtml\Product\Action\Attribute\Save">
         <plugin name="massAction" type="Magento\CatalogInventory\Plugin\MassUpdateProductAttribute" />
     </type>
+    <type name="Magento\CatalogInventory\Model\ResourceModel\Indexer\Stock\GetStatusExpression">
+        <arguments>
+            <argument name="statusExpressions" xsi:type="array">
+                <item name="default" xsi:type="object">Magento\CatalogInventory\Model\ResourceModel\Indexer\Stock\StatusExpression\DefaultExpression</item>
+            </argument>
+        </arguments>
+    </type>
 </config>

dev/tests/api-functional/testsuite/Magento/GraphQl/Catalog/CategoryProductsVariantsTest.php

@@ -18,6 +18,7 @@
 class CategoryProductsVariantsTest extends GraphQlAbstract
 {
     /**
+     * @magentoApiDataFixture Magento/Catalog/_files/reindex_catalog_inventory_stock.php
      * @magentoApiDataFixture Magento/ConfigurableProduct/_files/product_configurable.php
      * @throws \Magento\Framework\Exception\NoSuchEntityException
      */

dev/tests/api-functional/testsuite/Magento/GraphQl/Sales/ReorderTest.php

@@ -56,7 +56,6 @@ protected function setUp(): void
         } catch (NoSuchEntityException $e) {
         }
     }
-
     /**
      * @magentoApiDataFixture Magento/Sales/_files/customer_order_item_with_product_and_custom_options.php
      */
@@ -188,15 +187,17 @@ public function testReorderWithLowStock()
     }
 
     /**
-     * Assert that simple product is not available.
+     * Assert that simple product is not available
      */
     private function assertProductNotAvailable()
     {
         $response = $this->makeReorderForDefaultCustomer();
         $expectedResponse = [
             'userInputErrors' => [
                 [
-                    'path' => ['orderNumber'],
+                    'path' => [
+                        'orderNumber'
+                    ],
                     'code' => 'NOT_SALABLE',
                 ],
             ],

dev/tests/integration/testsuite/Magento/Catalog/_files/products_list_rollback.php

@@ -6,6 +6,9 @@
 declare(strict_types=1);
 
 /** @var \Magento\Framework\Registry $registry */
+
+use Magento\Framework\Indexer\IndexerRegistry;
+
 $registry = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get(\Magento\Framework\Registry::class);
 
 $registry->unregister('isSecureArea');
@@ -37,6 +40,9 @@
     //Product already removed
 }
 
+\Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get(IndexerRegistry::class)
+    ->get(Magento\CatalogInventory\Model\Indexer\Stock\Processor::INDEXER_ID)
+    ->reindexAll();
 
 $registry->unregister('isSecureArea');
 $registry->register('isSecureArea', false);

dev/tests/integration/testsuite/Magento/Catalog/_files/reindex_catalog_inventory_stock.php

@@ -0,0 +1,12 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+use Magento\CatalogInventory\Model\Indexer\Stock\Processor;
+use Magento\Framework\Indexer\IndexerRegistry;
+use Magento\TestFramework\Helper\Bootstrap;
+
+Bootstrap::getObjectManager()->get(IndexerRegistry::class)->get(Processor::INDEXER_ID)->reindexAll();

dev/tests/integration/testsuite/Magento/ConfigurableProduct/Block/Product/View/Type/ConfigurableViewOnCategoryPageTest.php

@@ -102,6 +102,7 @@ public function testOutOfStockProductWithDisabledConfigView(): void
     }
 
     /**
+     * @magentoDataFixture Magento/Catalog/_files/reindex_catalog_inventory_stock.php
      * @magentoDataFixture Magento/ConfigurableProduct/_files/configurable_product_with_category.php
      *
      * @return void