ACP2E-316: Some product are missed from layered navigation with manually configured price ranges

Author: dhorytskyi

app/code/Magento/Elasticsearch/SearchAdapter/Aggregation/Builder/Dynamic.php

@@ -46,8 +46,7 @@ public function build(
         /** @var DynamicBucket $bucket */
         $algorithm = $this->algorithmRepository->get($bucket->getMethod(), ['dataProvider' => $dataProvider]);
         $data = $algorithm->getItems($bucket, $dimensions, $this->getEntityStorage($queryResult));
-        $stats = $queryResult['aggregations'][$bucket->getName()] ?? [];
-        return $this->prepareData($data, $stats);
+        return $this->prepareData($data);
     }
 
     /**
@@ -74,17 +73,12 @@ private function getEntityStorage(array $queryResult)
      * Prepare result data
      *
      * @param array $data
-     * @param array $stats
      * @return array
      */
-    private function prepareData(array $data, array $stats): array
+    private function prepareData($data)
     {
         $resultData = [];
-        foreach ($data as $key => $value) {
-            if (!isset($data[$key+1])) {
-                $value['to'] = !isset($stats['max']) ? $value['to'] : $stats['max'];
-                $value['to'] += 0.01;
-            }
+        foreach ($data as $value) {
             $rangeName = "{$value['from']}_{$value['to']}";
             $value['value'] = $rangeName;
             $resultData[$rangeName] = $value;

lib/internal/Magento/Framework/Search/Dynamic/Algorithm/Manual.php

@@ -49,6 +49,11 @@ public function getItems(
         $dbRanges = $this->processRange($dbRanges, $options['max_intervals_number']);
         $data = $this->dataProvider->prepareData($range, $dbRanges);
 
+        $aggregations = $this->dataProvider->getAggregations($entityStorage);
+        if ($aggregations['max']) {
+            $data[array_key_last($data)]['to'] = $aggregations['max'] + 0.01;
+        }
+
         return $data;
     }