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/StockStatusFilter.php

@@ -19,6 +19,12 @@
 class StockStatusFilter implements StockStatusFilterInterface
 {
     private const TABLE_NAME = 'cataloginventory_stock_status';
+
+    /**
+     * @var bool|null
+     */
+    private ?bool $searchResultApplier = null;
+
     /**
      * @var ResourceConnection
      */
@@ -41,6 +47,26 @@ public function __construct(
         $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 getSearchResultApplier() : bool
+    {
+        return $this->searchResultApplier;
+    }
+
     /**
      * @inheritDoc
      */
@@ -67,7 +93,9 @@ public function execute(
             implode(' AND ', $joinCondition),
             []
         );
-        $select->where("{$stockStatusTableAlias}.stock_status = ?", StockStatusInterface::STATUS_IN_STOCK);
+        if (!$this->getSearchResultApplier()) {
+            $select->where("{$stockStatusTableAlias}.stock_status = ?", StockStatusInterface::STATUS_IN_STOCK);
+        }
 
         return $select;
     }

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

@@ -7,17 +7,13 @@
 namespace Magento\Elasticsearch\Model\ResourceModel\Fulltext\Collection;
 
 use Magento\Catalog\Api\Data\ProductInterface;
+use Magento\CatalogInventory\Model\ResourceModel\StockStatusFilterInterface;
 use Magento\CatalogSearch\Model\ResourceModel\Fulltext\Collection\SearchResultApplierInterface;
 use Magento\Framework\Api\Search\SearchResultInterface;
 use Magento\Framework\App\Config\ScopeConfigInterface;
 use Magento\Framework\App\ObjectManager;
 use Magento\Framework\Data\Collection;
 use Magento\Framework\EntityManager\MetadataPool;
-use Magento\InventoryApi\Api\Data\StockInterface;
-use Magento\InventoryCatalogApi\Api\DefaultStockProviderInterface;
-use Magento\InventoryIndexer\Model\StockIndexTableNameResolverInterface;
-use Magento\InventorySalesApi\Model\StockByWebsiteIdResolverInterface;
-use Magento\Store\Model\StoreManagerInterface;
 
 /**
  * Resolve specific attributes for search criteria.
@@ -55,24 +51,9 @@ class SearchResultApplier implements SearchResultApplierInterface
     private $metadataPool;
 
     /**
-     * @var StoreManagerInterface
+     * @var StockStatusFilterInterface
      */
-    protected $_storeManager;
-
-    /**
-     * @var StockByWebsiteIdResolverInterface
-     */
-    private $stockByWebsiteIdResolver;
-
-    /**
-     * @var StockIndexTableNameResolverInterface|mixed
-     */
-    private $stockIndexTableNameResolver;
-
-    /**
-     * @var DefaultStockProviderInterface
-     */
-    private $defaultStockProvider;
+    private $stockStatusFilter;
 
     /**
      * @param Collection $collection
@@ -81,11 +62,7 @@ class SearchResultApplier implements SearchResultApplierInterface
      * @param int $currentPage
      * @param ScopeConfigInterface|null $scopeConfig
      * @param MetadataPool|null $metadataPool
-     * @param StoreManagerInterface|null $storeManager
-     * @param StockByWebsiteIdResolverInterface|null $stockByWebsiteIdResolver
-     * @param StockIndexTableNameResolverInterface|null $stockIndexTableNameResolver
-     * @param DefaultStockProviderInterface|null $defaultStockProvider
-     * @SuppressWarnings(PHPMD.ExcessiveParameterList)
+     * @param StockStatusFilterInterface|null $stockStatusFilter
      */
     public function __construct(
         Collection $collection,
@@ -94,21 +71,16 @@ public function __construct(
         int $currentPage,
         ?ScopeConfigInterface $scopeConfig = null,
         ?MetadataPool $metadataPool = null,
-        ?StoreManagerInterface $storeManager = null,
-        ?StockByWebsiteIdResolverInterface $stockByWebsiteIdResolver = null,
-        ?StockIndexTableNameResolverInterface $stockIndexTableNameResolver = null,
-        ?DefaultStockProviderInterface $defaultStockProvider = null
+        ?StockStatusFilterInterface $stockStatusFilter = null
     ) {
         $this->collection = $collection;
         $this->searchResult = $searchResult;
         $this->size = $size;
         $this->currentPage = $currentPage;
         $this->scopeConfig = $scopeConfig ?? ObjectManager::getInstance()->get(ScopeConfigInterface::class);
         $this->metadataPool = $metadataPool ?? ObjectManager::getInstance()->get(MetadataPool::class);
-        $this->_storeManager = $storeManager ?? ObjectManager::getInstance()->get(StoreManagerInterface::class);
-        $this->stockByWebsiteIdResolver = $stockByWebsiteIdResolver ?? ObjectManager::getInstance()->get(StockByWebsiteIdResolverInterface::class);
-        $this->stockIndexTableNameResolver = $stockIndexTableNameResolver ?? ObjectManager::getInstance()->get(StockIndexTableNameResolverInterface::class);
-        $this->defaultStockProvider = $defaultStockProvider ?? ObjectManager::getInstance()->get(DefaultStockProviderInterface::class);
+        $this->stockStatusFilter = $stockStatusFilter
+            ?: ObjectManager::getInstance()->get(StockStatusFilterInterface::class);
     }
 
     /**
@@ -223,9 +195,6 @@ private function getProductIdsBySaleability(): array
      */
     private function categoryProductByCustomSortOrder(int $categoryId): array
     {
-        $websiteId = $this->_storeManager->getStore()->getWebsiteId();
-        $stock = $this->stockByWebsiteIdResolver->execute($websiteId);
-        $stockTable = $this->stockIndexTableNameResolver->execute((int)$stock->getStockId());
         $storeId = $this->collection->getStoreId();
         $searchCriteria = $this->searchResult->getSearchCriteria();
         $sortOrders = $searchCriteria->getSortOrders() ?? [];
@@ -242,20 +211,8 @@ private function categoryProductByCustomSortOrder(int $categoryId): array
             ['e' => $this->collection->getTable('catalog_product_entity')],
             ['e.entity_id']
         );
-
-        if (!$this->isDefaultStock($stock)) {
-            $query->join(
-                ['inventory_stock' => $stockTable],
-                'inventory_stock.sku = e.sku',
-                ['inventory_stock.is_salable']
-            );
-        } else {
-            $query->join(
-                ['stock_status_index' => $this->collection->getTable('cataloginventory_stock_status')],
-                'stock_status_index.product_id = e.entity_id',
-                ['stock_status_index.stock_status AS is_salable']
-            );
-        }
+        $this->stockStatusFilter->setSearchResultApplier(true);
+        $query = $this->stockStatusFilter->execute($query, 'e', 'stockItem');
         $query->join(
             ['cat_index' => $this->collection->getTable('catalog_category_product_index_store' . $storeId)],
             'cat_index.product_id = e.entity_id'
@@ -310,15 +267,4 @@ private function hasShowOutOfStockStatus(): bool
             \Magento\Store\Model\ScopeInterface::SCOPE_STORE
         );
     }
-
-    /**
-     * Checks if inventory stock is DB view
-     *
-     * @param StockInterface $stock
-     * @return bool
-     */
-    private function isDefaultStock(StockInterface $stock): bool
-    {
-        return (int)$stock->getStockId() === $this->defaultStockProvider->getId();
-    }
 }