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

Author: dhorytskyi

app/code/Magento/AdvancedSearch/Model/ResourceModel/Index.php

@@ -107,7 +107,6 @@ protected function _getCatalogProductPriceData($productIds = null)
                     $this->tableResolver->resolve('catalog_product_index_price', $dimensions),
                     ['entity_id', 'customer_group_id', 'website_id', 'min_price']
                 );
-                $select->where('min_price IS NOT NULL');
                 if ($productIds) {
                     $select->where('entity_id IN (?)', $productIds);
                 }

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

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

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

@@ -394,16 +394,8 @@ private function getSelectForUpdate(string $sourceTable): Select
         );
         $select->columns(
             [
-                'min_price' => $connection->getCheckSql(
-                    'i.min_price IS NOT NULL',
-                    'i.min_price + io.min_price',
-                    'NULL'
-                ),
-                'max_price' => $connection->getCheckSql(
-                    'i.max_price IS NOT NULL',
-                    'i.max_price + io.max_price',
-                    'NULL'
-                ),
+                'min_price' => new ColumnValueExpression('i.min_price + io.min_price'),
+                'max_price' => new ColumnValueExpression('i.max_price + io.max_price'),
                 'tier_price' => $connection->getCheckSql(
                     'i.tier_price IS NOT NULL',
                     'i.tier_price + io.tier_price',

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' => $price,
+                'price' => $connection->getIfNullSql($price, 0),
                 //price in catalog_product_index_price_final_tmp
-                'final_price' => $finalPrice,
-                'min_price' => $finalPrice,
-                'max_price' => $finalPrice,
+                'final_price' => $connection->getIfNullSql($finalPrice, 0),
+                'min_price' => $connection->getIfNullSql($finalPrice, 0),
+                'max_price' => $connection->getIfNullSql($finalPrice, 0),
                 'tier_price' => $tierPrice,
             ]
         );

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

@@ -60,6 +60,7 @@ 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

@@ -149,8 +149,8 @@ public function executeByDimensions(array $dimensions, \Traversable $entityIds)
         );
         $this->tableMaintainer->insertFromSelect($select, $temporaryPriceTable->getTableName(), []);
 
-        $this->applyConfigurableOption($temporaryPriceTable, $dimensions, iterator_to_array($entityIds));
         $this->basePriceModifier->modifyPrice($temporaryPriceTable, iterator_to_array($entityIds));
+        $this->applyConfigurableOption($temporaryPriceTable, $dimensions, iterator_to_array($entityIds));
     }
 
     /**
@@ -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' => 'io.min_price',
-                'max_price' => 'io.max_price',
+                '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'),
                 'tier_price' => 'io.tier_price',
             ]
         );

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

@@ -69,22 +69,11 @@ public function apply()
         foreach ($items as $item) {
             $ids[] = (int)$item->getId();
         }
+        $orderList = join(',', $ids);
         $this->collection->getSelect()
             ->where('e.entity_id IN (?)', $ids)
-            ->reset(\Magento\Framework\DB\Select::ORDER);
-        $sortOrder = $this->searchResult->getSearchCriteria()
-            ->getSortOrders();
-        if (!empty($sortOrder['price']) && $this->collection->getLimitationFilters()->isUsingPriceIndex()) {
-            $sortDirection = $sortOrder['price'];
-            $this->collection->getSelect()
-                ->order(
-                    new \Zend_Db_Expr("price_index.min_price IS NULL, price_index.min_price {$sortDirection}")
-                );
-        } else {
-            $orderList = join(',', $ids);
-            $this->collection->getSelect()
-                ->order(new \Zend_Db_Expr("FIELD(e.entity_id,$orderList)"));
-        }
+            ->reset(\Magento\Framework\DB\Select::ORDER)
+            ->order(new \Zend_Db_Expr("FIELD(e.entity_id,$orderList)"));
     }
 
     /**