ACP2E-322:'Move out of stock to the bottom' automating sorting is not updated when product's stock changes

Author: pradeep1819

app/code/Magento/CatalogInventory/Model/ResourceModel/StockStatusApplier.php

@@ -0,0 +1,41 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\CatalogInventory\Model\ResourceModel;
+
+/**
+ * Search Result Applier getters and setters
+ */
+class StockStatusApplier implements StockStatusApplierInterface
+{
+    /**
+     * Storefront search result applier flag
+     *
+     * @var bool
+     */
+    private $searchResultApplier = false;
+
+    /**
+     * Set flag, if the request is originated from SearchResultApplier
+     *
+     * @param bool $status
+     */
+    public function setSearchResultApplier(bool $status): void
+    {
+        $this->searchResultApplier = $status;
+    }
+
+    /**
+     * Get flag, if the request is originated from SearchResultApplier
+     *
+     * @return bool
+     */
+    public function hasSearchResultApplier() : bool
+    {
+        return $this->searchResultApplier;
+    }
+}

app/code/Magento/CatalogInventory/Model/ResourceModel/StockStatusApplierInterface.php

@@ -0,0 +1,29 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\CatalogInventory\Model\ResourceModel;
+
+/**
+ * Search Result Applier interface.
+ */
+interface StockStatusApplierInterface
+{
+
+    /**
+     * Set flag, if the request is originated from SearchResultApplier
+     *
+     * @param bool $status
+     */
+    public function setSearchResultApplier(bool $status): void;
+
+    /**
+     * Get flag, if the request is originated from SearchResultApplier
+     *
+     * @return bool
+     */
+    public function hasSearchResultApplier() : bool;
+}

app/code/Magento/CatalogInventory/Model/ResourceModel/StockStatusFilter.php

@@ -12,6 +12,7 @@
 use Magento\CatalogInventory\Model\Stock;
 use Magento\Framework\App\ResourceConnection;
 use Magento\Framework\DB\Select;
+use Magento\Framework\App\ObjectManager;
 
 /**
  * Generic in-stock status filter
@@ -20,13 +21,6 @@ class StockStatusFilter implements StockStatusFilterInterface
 {
     private const TABLE_NAME = 'cataloginventory_stock_status';
 
-    /**
-     * Storefront search result applier flag
-     *
-     * @var bool
-     */
-    private $searchResultApplier = false;
-
     /**
      * @var ResourceConnection
      */
@@ -37,36 +31,25 @@ class StockStatusFilter implements StockStatusFilterInterface
      */
     private $stockConfiguration;
 
+    /**
+     * @var StockStatusApplierInterface
+     */
+    private $stockStatusApplier;
+
     /**
      * @param ResourceConnection $resource
      * @param StockConfigurationInterface $stockConfiguration
+     * @param StockStatusApplierInterface|null $stockStatusApplier
      */
     public function __construct(
         ResourceConnection $resource,
-        StockConfigurationInterface $stockConfiguration
+        StockConfigurationInterface $stockConfiguration,
+        ?StockStatusApplierInterface $stockStatusApplier = null
     ) {
         $this->resource = $resource;
         $this->stockConfiguration = $stockConfiguration;
-    }
-
-    /**
-     * Set flag, if the request is originated from SearchResultApplier
-     *
-     * @param bool $status
-     */
-    public function setSearchResultApplier(bool $status): void
-    {
-        $this->searchResultApplier = $status;
-    }
-
-    /**
-     * Get flag, if the request is originated from SearchResultApplier
-     *
-     * @return bool
-     */
-    public function hasSearchResultApplier() : bool
-    {
-        return $this->searchResultApplier;
+        $this->stockStatusApplier = $stockStatusApplier
+            ?? ObjectManager::getInstance()->get(StockStatusApplierInterface::class);
     }
 
     /**
@@ -96,7 +79,7 @@ public function execute(
             []
         );
 
-        if ($this->hasSearchResultApplier()) {
+        if ($this->stockStatusApplier->hasSearchResultApplier()) {
             $select->columns(["{$stockStatusTableAlias}.stock_status AS is_salable"]);
         } else {
             $select->where("{$stockStatusTableAlias}.stock_status = ?", StockStatusInterface::STATUS_IN_STOCK);

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

@@ -33,6 +33,7 @@
 
     <preference for="Magento\CatalogInventory\Model\ResourceModel\QtyCounterInterface" type="Magento\CatalogInventory\Model\ResourceModel\Stock" />
     <preference for="Magento\CatalogInventory\Model\ResourceModel\StockStatusFilterInterface" type="Magento\CatalogInventory\Model\ResourceModel\StockStatusFilter" />
+    <preference for="Magento\CatalogInventory\Model\ResourceModel\StockStatusApplierInterface" type="Magento\CatalogInventory\Model\ResourceModel\StockStatusApplier" />
     <type name="Magento\Catalog\Model\Product\Attribute\Repository">
         <plugin name="filterCustomAttribute" type="Magento\CatalogInventory\Model\Plugin\FilterCustomAttribute" />
     </type>

app/code/Magento/Elasticsearch/Model/ResourceModel/Fulltext/Collection/SearchResultApplier.php

@@ -7,6 +7,7 @@
 namespace Magento\Elasticsearch\Model\ResourceModel\Fulltext\Collection;
 
 use Magento\Catalog\Api\Data\ProductInterface;
+use Magento\CatalogInventory\Model\ResourceModel\StockStatusApplierInterface;
 use Magento\CatalogInventory\Model\ResourceModel\StockStatusFilterInterface;
 use Magento\CatalogSearch\Model\ResourceModel\Fulltext\Collection\SearchResultApplierInterface;
 use Magento\Framework\Api\Search\SearchResultInterface;
@@ -57,6 +58,11 @@ class SearchResultApplier implements SearchResultApplierInterface
      */
     private $stockStatusFilter;
 
+    /**
+     * @var StockStatusApplierInterface
+     */
+    private $stockStatusApplier;
+
     /**
      * @param Collection $collection
      * @param SearchResultInterface $searchResult
@@ -65,6 +71,7 @@ class SearchResultApplier implements SearchResultApplierInterface
      * @param ScopeConfigInterface|null $scopeConfig
      * @param MetadataPool|null $metadataPool
      * @param StockStatusFilterInterface|null $stockStatusFilter
+     * @param StockStatusApplierInterface|null $stockStatusApplier
      */
     public function __construct(
         Collection $collection,
@@ -73,7 +80,8 @@ public function __construct(
         int $currentPage,
         ?ScopeConfigInterface $scopeConfig = null,
         ?MetadataPool $metadataPool = null,
-        ?StockStatusFilterInterface $stockStatusFilter = null
+        ?StockStatusFilterInterface $stockStatusFilter = null,
+        ?StockStatusApplierInterface $stockStatusApplier = null
     ) {
         $this->collection = $collection;
         $this->searchResult = $searchResult;
@@ -82,7 +90,9 @@ public function __construct(
         $this->scopeConfig = $scopeConfig ?? ObjectManager::getInstance()->get(ScopeConfigInterface::class);
         $this->metadataPool = $metadataPool ?? ObjectManager::getInstance()->get(MetadataPool::class);
         $this->stockStatusFilter = $stockStatusFilter
-            ?: ObjectManager::getInstance()->get(StockStatusFilterInterface::class);
+            ?? ObjectManager::getInstance()->get(StockStatusFilterInterface::class);
+        $this->stockStatusApplier = $stockStatusApplier
+            ?? ObjectManager::getInstance()->get(StockStatusApplierInterface::class);
     }
 
     /**
@@ -212,7 +222,7 @@ private function categoryProductByCustomSortOrder(int $categoryId): array
             ['e' => $this->collection->getTable('catalog_product_entity')],
             ['e.entity_id']
         );
-        $this->stockStatusFilter->setSearchResultApplier(true);
+        $this->stockStatusApplier->setSearchResultApplier(true);
         $query = $this->stockStatusFilter->execute($query, 'e', 'stockItem');
         $query->join(
             ['cat_index' => $this->collection->getTable('catalog_category_product_index_store' . $storeId)],