MC-42243: Sorting by price is incorrect if price for shared catalog is 0

Author: dhorytskyi

app/code/Magento/Catalog/Model/ResourceModel/Product/Collection.php

@@ -1768,7 +1768,7 @@ public function addAttributeToSort($attribute, $dir = self::SORT_ORDER_ASC)
             $this->addPriceData();
             if ($this->_productLimitationFilters->isUsingPriceIndex()) {
                 $this->getSelect()->order(
-                    new \Zend_Db_Expr("price_index.min_price = 0, price_index.min_price {$dir}")
+                    new \Zend_Db_Expr("price_index.min_price IS NULL, price_index.min_price {$dir}")
                 );
                 return $this;
             }

app/code/Magento/Catalog/Model/ResourceModel/Product/Indexer/Price/Query/BaseFinalPrice.php

@@ -216,11 +216,11 @@ public function getQuery(array $dimensions, string $productType, array $entityId
         $select->columns(
             [
                 //orig_price in catalog_product_index_price_final_tmp
-                'price' => $connection->getIfNullSql($price, 0),
+                'price' => $price,
                 //price in catalog_product_index_price_final_tmp
-                'final_price' => $connection->getIfNullSql($finalPrice, 0),
-                'min_price' => $connection->getIfNullSql($finalPrice, 0),
-                'max_price' => $connection->getIfNullSql($finalPrice, 0),
+                'final_price' => $finalPrice,
+                'min_price' => $finalPrice,
+                'max_price' => $finalPrice,
                 'tier_price' => $tierPrice,
             ]
         );

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

@@ -60,7 +60,6 @@ public function process(Select $select)
                 []
             );
             $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

@@ -251,8 +251,8 @@ private function updateTemporaryTable(string $temporaryPriceTableName, string $t
         // adds price of custom option, that was applied in DefaultPrice::_applyCustomOption
         $selectForCrossUpdate->columns(
             [
-                'min_price' => new \Zend_Db_Expr('i.min_price - i.price + io.min_price'),
-                'max_price' => new \Zend_Db_Expr('i.max_price - i.price + io.max_price'),
+                'min_price' => 'io.min_price',
+                'max_price' => 'io.max_price',
                 'tier_price' => 'io.tier_price',
             ]
         );

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

@@ -78,7 +78,7 @@ public function apply()
             $sortDirection = $sortOrder['price'];
             $this->collection->getSelect()
                 ->order(
-                    new \Zend_Db_Expr("price_index.min_price = 0, price_index.min_price {$sortDirection}")
+                    new \Zend_Db_Expr("price_index.min_price IS NULL, price_index.min_price {$sortDirection}")
                 );
         } else {
             $orderList = join(',', $ids);