#28628: GraphQL price range numeric values

- Fixed tests
magento · Jun 17, 2020 · 622e2ae · 622e2ae
1 parent a9d0a72
commit 622e2ae
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 11 deletions.
diff --git a/app/code/Magento/Elasticsearch/SearchAdapter/Aggregation/Builder/Dynamic.php b/app/code/Magento/Elasticsearch/SearchAdapter/Aggregation/Builder/Dynamic.php
@@ -46,9 +46,7 @@ public function build(
         /** @var DynamicBucket $bucket */
         $algorithm = $this->algorithmRepository->get($bucket->getMethod(), ['dataProvider' => $dataProvider]);
         $data = $algorithm->getItems($bucket, $dimensions, $this->getEntityStorage($queryResult));
-        $resultData = $this->prepareData($data);
-
-        return $resultData;
+        return $this->prepareData($data);
     }
 
     /**
@@ -78,7 +76,8 @@ private function prepareData($data)
         $resultData = [];
         foreach ($data as $value) {
             $rangeName = "{$value['from']}_{$value['to']}";
-            $resultData[$rangeName] = array_merge(['value' => $rangeName], $value);
+            $value['value'] = $rangeName;
+            $resultData[$rangeName] = $value;
         }
 
         return $resultData;

diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Catalog/ProductSearchTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Catalog/ProductSearchTest.php
@@ -570,8 +570,8 @@ public function testSearchAndFilterByCustomAttribute()
                      ],
                     [
                         'count' => 1,
-                        'label' => '40-*',
-                        'value' => '40_*',
+                        'label' => '40-50',
+                        'value' => '40_50',
 
                     ],
                  ],
@@ -1431,8 +1431,8 @@ public function testFilterProductsForExactMatchingName()
                         'count' => 1,
                     ],
                     [
-                        'label' => '20-*',
-                        'value' => '20_*',
+                        'label' => '20-30',
+                        'value' => '20_30',
                         'count' => 1,
                     ]
                 ]

diff --git a/...uite/Magento/LayeredNavigation/Block/Navigation/Category/Configurable/PriceFilterTest.php b/...uite/Magento/LayeredNavigation/Block/Navigation/Category/Configurable/PriceFilterTest.php
@@ -76,7 +76,7 @@ public function getFiltersDataProvider(): array
                     ],
                     [
                         'label' => '<span class="price">$60.00</span> and above',
-                        'value' => '60-',
+                        'value' => '60-70',
                         'count' => 1,
                     ],
                 ],
@@ -94,7 +94,7 @@ public function getFiltersDataProvider(): array
                     ],
                     [
                         'label' => '<span class="price">$50.00</span> and above',
-                        'value' => '50-',
+                        'value' => '50-60',
                         'count' => 1,
                     ],
                 ],

diff --git a/...on/testsuite/Magento/LayeredNavigation/Block/Navigation/Search/Bundle/PriceFilterTest.php b/...on/testsuite/Magento/LayeredNavigation/Block/Navigation/Search/Bundle/PriceFilterTest.php
@@ -32,7 +32,7 @@ public function testGetFilters(): void
             ['is_filterable_in_search' => 1],
             [
                 ['label' => '$10.00 - $19.99', 'value' => '10-20', 'count' => 1],
-                ['label' => '$20.00 and above', 'value' => '20-', 'count' => 1],
+                ['label' => '$20.00 and above', 'value' => '20-30', 'count' => 1],
             ]
         );
     }