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

Author: dhorytskyi

app/code/Magento/CatalogSearch/Model/Layer/Filter/Price.php

@@ -18,7 +18,7 @@
 class Price extends AbstractFilter
 {
     /** Price delta for filter  */
-    public const PRICE_DELTA = 0.001;
+    public const PRICE_DELTA = 0.01;
 
     /**
      * @var \Magento\Catalog\Model\Layer\Filter\DataProvider\Price
@@ -142,7 +142,7 @@ public function apply(\Magento\Framework\App\RequestInterface $request)
 
         $this->getLayer()->getProductCollection()->addFieldToFilter(
             'price',
-            ['from' => $from, 'to' =>  empty($to) || $from == $to ? $to : $to - self::PRICE_DELTA]
+            ['from' => $from, 'to' =>  $to]
         );
 
         $this->getLayer()->getState()->addFilter(
@@ -190,10 +190,6 @@ protected function _renderRangeLabel($fromPrice, $toPrice, $isLast = false)
         } elseif ($fromPrice == $toPrice && $this->dataProvider->getOnePriceIntervalValue()) {
             return $formattedFromPrice;
         } else {
-            if ($fromPrice != $toPrice) {
-                $toPrice -= .01;
-            }
-
             return __('%1 - %2', $formattedFromPrice, $this->priceCurrency->format($toPrice));
         }
     }
@@ -274,8 +270,8 @@ protected function getFrom($from)
     private function prepareData($key, $count, $isLast = false)
     {
         [$from, $to] = explode('_', $key);
-        if ($isLast) {
-            $to = '';
+        if (!$isLast && !empty($to) && $to != $from) {
+            $to -= self::PRICE_DELTA;
         }
         $label = $this->_renderRangeLabel($from, $to, $isLast);
         $value = $from . '-' . $to . $this->dataProvider->getAdditionalRequestData();

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

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

dev/tests/integration/testsuite/Magento/CatalogSearch/Model/Layer/Filter/PriceTest.php

@@ -86,7 +86,7 @@ public function testApplyWithCustomCurrencyRate()
         $filters = $this->model->getLayer()->getState()->getFilters();
         $this->assertArrayHasKey(0, $filters);
         $this->assertEquals(
-            '<span class="price">$100.00</span> - <span class="price">$199.99</span>',
+            '<span class="price">$100.00</span> - <span class="price">$200.00</span>',
             (string)$filters[0]->getLabel()
         );
     }
@@ -119,7 +119,12 @@ public function testGetSetCurrencyRate()
      * @magentoConfigFixture current_store catalog/layered_navigation/price_range_calculation manual
      * @magentoConfigFixture current_store catalog/layered_navigation/price_range_step 10
      * @magentoConfigFixture current_store catalog/layered_navigation/price_range_max_intervals 2
-     * @magentoDataFixture Magento/CatalogSearch/_files/products_with_different_price.php
+     * @magentoDataFixture Magento/Catalog/_files/categories_no_products.php
+     * @magentoDataFixture Magento\Catalog\Test\Fixture\Product with:{"category_ids":[4], "price":11}
+     * @magentoDataFixture Magento\Catalog\Test\Fixture\Product with:{"category_ids":[4], "price":13}
+     * @magentoDataFixture Magento\Catalog\Test\Fixture\Product with:{"category_ids":[4], "price":22}
+     * @magentoDataFixture Magento\Catalog\Test\Fixture\Product with:{"category_ids":[4], "price":22}
+     * @magentoDataFixture Magento\Catalog\Test\Fixture\Product with:{"category_ids":[4], "price":110}
      */
     public function testGetItemsWithManualAlgorithm(): void
     {

dev/tests/integration/testsuite/Magento/CatalogSearch/_files/products_with_different_price.php

@@ -61,7 +61,6 @@ public function create()
                 ->create();
         }
         $this->data[SearchCriteria::SORT_ORDERS] = [$this->sortOrderBuilder->create()];
-        $this->filters = [];
         return parent::create();
     }
 
@@ -78,8 +77,6 @@ public function addFilter(\Magento\Framework\Api\Filter $filter)
     }
 
     /**
-     * Set sort order
-     *
      * @param string $field
      * @param string $direction
      * @return $this