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

@@ -95,7 +95,10 @@ public function execute(
             implode(' AND ', $joinCondition),
             []
         );
-        if (!$this->hasSearchResultApplier()) {
+
+        if ($this->hasSearchResultApplier()) {
+            $select->columns(["{$stockStatusTableAlias}.stock_status AS is_salable"]);
+        } else {
             $select->where("{$stockStatusTableAlias}.stock_status = ?", StockStatusInterface::STATUS_IN_STOCK);
         }
 

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

@@ -201,7 +201,6 @@ private function categoryProductByCustomSortOrder(int $categoryId): array
         $searchCriteria = $this->searchResult->getSearchCriteria();
         $sortOrders = $searchCriteria->getSortOrders() ?? [];
         $sortOrders = array_merge(['is_salable' => \Magento\Framework\DB\Select::SQL_DESC], $sortOrders);
-        $defaultColumnsFilter = ['is_salable', 'position', 'name', 'price', 'entity_id'];
 
         $connection = $this->collection->getConnection();
         $query = clone $connection->select()
@@ -220,7 +219,7 @@ private function categoryProductByCustomSortOrder(int $categoryId): array
             'cat_index.product_id = e.entity_id'
             . ' AND cat_index.category_id = ' . $categoryId
             . ' AND cat_index.store_id = ' . $storeId,
-            ['cat_index.position AS cat_index_position']
+            ['cat_index.position']
         );
         foreach ($sortOrders as $field => $dir) {
             if ($field === 'name') {
@@ -244,7 +243,12 @@ private function categoryProductByCustomSortOrder(int $categoryId): array
                     ['price_index.max_price AS price']
                 );
             }
-            if (in_array($field, $defaultColumnsFilter, true)) {
+            $columnFilters = [];
+            $columnsParts = $query->getPart('columns');
+            foreach ($columnsParts as $columns) {
+                $columnFilters[] = $columns[2] ?? $columns[1];
+            }
+            if (in_array($field, $columnFilters, true)) {
                 $query->order(new \Zend_Db_Expr("{$field} {$dir}"));
             }
         }