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

Author: dhorytskyi

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

@@ -305,7 +305,7 @@ private function getTotalTierPriceExpression(\Zend_Db_Expr $priceExpression)
     private function getTierPriceExpressionForTable($tableAlias, \Zend_Db_Expr $priceExpression): \Zend_Db_Expr
     {
         return $this->getConnection()->getCheckSql(
-            sprintf('%s.value = 0', $tableAlias),
+            sprintf('%s.percentage_value IS NOT NULL', $tableAlias),
             sprintf(
                 'ROUND(%s * (1 - ROUND(%s.percentage_value * cwd.rate, 4) / 100), 4)',
                 $priceExpression,

dev/tests/integration/testsuite/Magento/Catalog/Model/ProductPriceTest.php

@@ -133,4 +133,20 @@ public function testGetMinPriceForComposite(): void
         $product = $collection->getFirstItem();
         $this->assertEquals(20, $product->getData('min_price'));
     }
+
+    /**
+     * @magentoDbIsolation disabled
+     * @magentoDataFixture Magento/Catalog/_files/simple_product_with_tier_price_equal_zero.php
+     */
+    public function testGetMinPriceWhenTierPriceEqualZero()
+    {
+        $product = $this->productRepository->get('simple-2');
+        $collection = Bootstrap::getObjectManager()->create(Collection::class);
+        $collection->addIdFilter($product->getId());
+        $collection->addPriceData(0);
+        $collection->load();
+        $product = $collection->getFirstItem();
+        $this->assertEquals(0, $product->getData('tier_price'));
+        $this->assertEquals(0, $product->getData('min_price'));
+    }
 }

dev/tests/integration/testsuite/Magento/Catalog/_files/simple_product_with_tier_price_equal_zero.php

@@ -0,0 +1,34 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+use Magento\Catalog\Api\Data\ProductTierPriceExtension;
+use Magento\Catalog\Api\Data\ProductTierPriceInterface;
+use Magento\Catalog\Api\ProductRepositoryInterface;
+use Magento\Store\Api\WebsiteRepositoryInterface;
+use Magento\TestFramework\Helper\Bootstrap;
+use Magento\TestFramework\Workaround\Override\Fixture\Resolver;
+
+Resolver::getInstance()->requireDataFixture('Magento/Catalog/_files/product_simple_without_custom_options.php');
+
+$objectManager = Bootstrap::getObjectManager();
+
+$adminWebsite = $objectManager->get(WebsiteRepositoryInterface::class)
+    ->get('admin');
+$tierPriceExtensionAttributes = $objectManager->create(ProductTierPriceExtension::class)
+    ->setWebsiteId($adminWebsite->getId());
+$tierPrices = [];
+$tierPrice = $objectManager->create(ProductTierPriceInterface::class)
+    ->setCustomerGroupId(0)
+    ->setQty(1)
+    ->setValue(0)
+    ->setExtensionAttributes($tierPriceExtensionAttributes);
+$tierPrices[] = $tierPrice;
+
+$productRepository = $objectManager->get(ProductRepositoryInterface::class);
+$product = $productRepository->get('simple-2', false, null, true);
+$product->setTierPrices($tierPrices);
+$productRepository->save($product);

dev/tests/integration/testsuite/Magento/Catalog/_files/simple_product_with_tier_price_equal_zero_rollback.php

@@ -0,0 +1,10 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+use Magento\TestFramework\Workaround\Override\Fixture\Resolver;
+
+Resolver::getInstance()->requireDataFixture('Magento/Catalog/_files/product_simple_without_custom_options_rollback.php');