Merge branch 'ACP2E-2928' of https://github.com/adobe-commerce-tier-4/magento2ce into T4-PR-03-18-2024

Author: thiaramus

app/code/Magento/Elasticsearch/SearchAdapter/Filter/Builder/Range.php

@@ -26,17 +26,19 @@ public function __construct(
     }
 
     /**
+     * Add the range filters
+     *
      * @param RequestFilterInterface|RangeFilterRequest $filter
      * @return array
      */
     public function buildFilter(RequestFilterInterface $filter)
     {
         $filterQuery = [];
         $fieldName = $this->fieldMapper->getFieldName($filter->getField());
-        if ($filter->getFrom()) {
+        if ($filter->getFrom() !== null) {
             $filterQuery['range'][$fieldName]['gte'] = $filter->getFrom();
         }
-        if ($filter->getTo()) {
+        if ($filter->getTo() !== null) {
             $filterQuery['range'][$fieldName]['lte'] = $filter->getTo();
         }
         return [$filterQuery];

dev/tests/api-functional/testsuite/Magento/GraphQl/CatalogGraphQl/ProductSearchTest.php

@@ -371,4 +371,90 @@ private function getProductSearchQueryWithMatchType(
         }
         QUERY;
     }
+
+    #[
+        DataFixture(CategoryFixture::class, as: 'category'),
+        DataFixture(
+            ProductFixture::class,
+            [
+                'price' => 0,
+                'category_ids' => ['$category.id$'],
+            ],
+            'product1'
+        ),
+        DataFixture(
+            ProductFixture::class,
+            [
+                'price' => 0.5,
+                'category_ids' => ['$category.id$'],
+            ],
+            'product2'
+        ),
+        DataFixture(
+            ProductFixture::class,
+            [
+                'price' => 1,
+                'category_ids' => ['$category.id$'],
+            ],
+            'product3'
+        ),
+        DataFixture(
+            ProductFixture::class,
+            [
+                'price' => 1.5,
+                'category_ids' => ['$category.id$'],
+            ],
+            'product4'
+        ),
+    ]
+    public function testProductSearchWithZeroPriceProducts()
+    {
+
+        $response = $this->graphQlQuery($this->getSearchQueryBasedOnPriceRange(0, null));
+        $this->assertEquals(4, $response['products']['totalResult']);
+
+        $response = $this->graphQlQuery($this->getSearchQueryBasedOnPriceRange(0, 0));
+        $this->assertEquals(1, $response['products']['totalResult']);
+
+        $response = $this->graphQlQuery($this->getSearchQueryBasedOnPriceRange(0.5, null));
+        $this->assertEquals(3, $response['products']['totalResult']);
+
+        $response = $this->graphQlQuery($this->getSearchQueryBasedOnPriceRange(0, 1));
+        $this->assertEquals(3, $response['products']['totalResult']);
+    }
+
+    /**
+     * Prepare search query for products with price range
+     *
+     * @param float $priceFrom
+     * @param float|null $priceTo
+     * @return string
+     */
+    private function getSearchQueryBasedOnPriceRange(float $priceFrom, null|float $priceTo): string
+    {
+        $priceToFilter = $priceTo !== null ? ',to:"' . $priceTo . '"' : '';
+        return <<<QUERY
+        query {
+          products(
+            pageSize: 10
+            currentPage: 1,
+            filter: {price:{from:"$priceFrom" $priceToFilter}}
+          ) {
+            totalResult: total_count
+            productItems: items {
+              sku
+              urlKey: url_key
+              price: price_range {
+                fullPrice: minimum_price {
+                  finalPrice: final_price {
+                    currency
+                    value
+                  }
+                }
+              }
+            }
+          }
+        }
+        QUERY;
+    }
 }