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

Author: dhorytskyi

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">$200.00</span>',
+            '<span class="price">$100.00</span> - <span class="price">$199.99</span>',
             (string)$filters[0]->getLabel()
         );
     }

dev/tests/integration/testsuite/Magento/LayeredNavigation/Block/Navigation/AbstractFiltersTest.php

@@ -121,7 +121,20 @@ protected function getCategoryFiltersAndAssert(
 
         if ($attributeData['is_filterable']) {
             $this->assertNotNull($filter);
-            $this->assertEquals($expectation, $this->prepareFilterItems($filter));
+            $preparedItems = $this->prepareFilterItems($filter);
+            $this->assertCount(count($expectation), $preparedItems);
+
+            foreach ($preparedItems as $key => $preparedItem) {
+                $this->assertEquals($expectation[$key], $preparedItem);
+                $item = $filter->getItems()[$key];
+                $this->createNavigationBlockInstance();
+                $this->navigationBlock->getRequest()->setParams($this->getRequestParams($item->getValueString()));
+                $this->navigationBlock->getLayer()->setCurrentCategory($category);
+                $this->navigationBlock->setLayout($this->layout);
+                $collectionSize = $this->navigationBlock->getLayer()->getProductCollection()->count();
+                $this->assertEquals($expectation[$key]['count'], $collectionSize);
+                $this->assertEquals($collectionSize, $item->getData('count'));
+            }
         } else {
             $this->assertNull($filter);
         }
@@ -351,19 +364,22 @@ protected function loadCategory(string $categoryName, int $storeId): CategoryInt
      */
     protected function createNavigationBlockInstance(): void
     {
-        $layerResolver = $this->objectManager->create(Resolver::class);
-
         if ($this->getLayerType() === Resolver::CATALOG_LAYER_SEARCH) {
-            $layerResolver->create(Resolver::CATALOG_LAYER_SEARCH);
-            $this->navigationBlock = $this->objectManager->create(
-                SearchNavigationBlock::class,
-                [
-                    'layerResolver' => $layerResolver,
-                ]
-            );
+            $class = SearchNavigationBlock::class;
+            $this->objectManager->removeSharedInstance('searchFilterList');
         } else {
-            $this->navigationBlock = $this->objectManager->create(CategoryNavigationBlock::class);
+            $class = CategoryNavigationBlock::class;
+            $this->objectManager->removeSharedInstance('categoryFilterList');
         }
+
+        $layerResolver = $this->objectManager->create(Resolver::class);
+        $layerResolver->create($this->getLayerType());
+        $this->navigationBlock = $this->objectManager->create(
+            $class,
+            [
+                'layerResolver' => $layerResolver,
+            ]
+        );
     }
 
     /**

dev/tests/integration/testsuite/Magento/LayeredNavigation/Block/Navigation/Category/PriceFilterTest.php

@@ -98,7 +98,7 @@ public function getFiltersDataProvider(): array
                 'products_data' => ['simple1000' => 10.00, 'simple1001' => 20.00, 'simple1002' => 50.00],
                 'expectation' => [
                     ['label' => '$0.00 - $19.99', 'value' => '0-20', 'count' => 1],
-                    ['label' => '$20.00 and above', 'value' => '20-50', 'count' => 2],
+                    ['label' => '$20.00 and above', 'value' => '20-50.01', 'count' => 2],
                 ],
             ],
             'improved_calculation_variation_with_big_price_difference' => [
@@ -109,7 +109,7 @@ public function getFiltersDataProvider(): array
                 'products_data' => ['simple1000' => 10.00, 'simple1001' => 20.00, 'simple1002' => 300.00],
                 'expectation' => [
                     ['label' => '$0.00 - $19.99', 'value' => '0-20', 'count' => 1],
-                    ['label' => '$20.00 and above', 'value' => '20-300', 'count' => 2],
+                    ['label' => '$20.00 and above', 'value' => '20-300.01', 'count' => 2],
                 ],
             ],
             'manual_calculation_with_price_step_200' => [
@@ -156,7 +156,7 @@ public function getFiltersDataProvider(): array
                 'products_data' => ['simple1000' => 10.00, 'simple1001' => 20.00, 'simple1002' => 30.00],
                 'expectation' => [
                     ['label' => '$10.00 - $19.99', 'value' => '10-20', 'count' => 1],
-                    ['label' => '$20.00 and above', 'value' => '20-30', 'count' => 2],
+                    ['label' => '$20.00 and above', 'value' => '20-30.01', 'count' => 2],
                 ],
             ],
         ];

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

@@ -75,6 +75,8 @@ public function getItems(
         for ($key = 0; $key < $dataSize; $key++) {
             if (isset($data[$key + 1])) {
                 $data[$key]['to'] = $data[$key + 1]['from'];
+            } else {
+                $data[$key]['to'] = max($data[$key]['to'], $aggregations['max'] + 0.01);
             }
         }