Merge branch 'ACP2E-3053' of https://github.com/adobe-commerce-tier-4/magento2ce into T4-PR-04-08-2024

Author: chittima

app/code/Magento/Elasticsearch/ElasticAdapter/SearchAdapter/Aggregation/Interval.php

@@ -99,6 +99,11 @@ public function load($limit, $offset = null, $lower = null, $upper = null)
             $to = ['lt' => $upper - self::DELTA];
         }
 
+        if ($lower === null && $upper === null) {
+            $from = ['gte' => 0];
+            $to = ['lt' => 0];
+        }
+
         $requestQuery = $this->prepareBaseRequestQuery($from, $to);
         $requestQuery = array_merge_recursive(
             $requestQuery,
@@ -128,6 +133,11 @@ public function loadPrevious($data, $index, $lower = null)
             $to = ['lt' => $data - self::DELTA];
         }
 
+        if ($lower === null && $data === 0.0) {
+            $from = ['gte' => 0];
+            $to = ['lt' => 0];
+        }
+
         $requestQuery = $this->prepareBaseRequestQuery($from, $to);
         $requestQuery = array_merge_recursive(
             $requestQuery,

dev/tests/integration/testsuite/Magento/Elasticsearch/_files/requests.xml

@@ -56,6 +56,38 @@
         <from>0</from>
         <size>10</size>
     </request>
+    <request query="one_aggregations_with_null" index="catalogsearch_fulltext">
+        <dimensions>
+            <dimension name="scope" value="default"/>
+        </dimensions>
+        <queries>
+            <query xsi:type="boolQuery" name="one_aggregations" boost="2">
+                <queryReference clause="must" ref="fulltext_search_query"/>
+            </query>
+
+            <query xsi:type="matchQuery" name="fulltext_search_query" value="$fulltext_search_query$" boost="5">
+                <match field="description" boost="2"/>
+            </query>
+        </queries>
+        <aggregations>
+            <bucket xsi:type="termBucket" name="weight_bucket" field="weight">
+                <metrics>
+                    <metric type="count"/>
+                </metrics>
+            </bucket>
+            <bucket xsi:type="rangeBucket" name="price_bucket" field="price">
+                <metrics>
+                    <metric type="count"/>
+                </metrics>
+                <ranges>
+                    <range from="" to=""/>
+                </ranges>
+            </bucket>
+            <bucket xsi:type="dynamicBucket" method="manual" name="dynamic_price" field="price" />
+        </aggregations>
+        <from>0</from>
+        <size>10</size>
+    </request>
     <request query="one_wildcard" index="catalogsearch_fulltext">
         <dimensions>
             <dimension name="scope" value="default"/>