MC-37726: Price filter uses base currency for ranges

Author: cspruiell

app/code/Magento/CatalogGraphQl/Model/Resolver/Aggregations.php

@@ -74,7 +74,9 @@ public function resolve(
             if (isset($results['price_bucket'])) {
                 foreach ($results['price_bucket']['options'] as &$value) {
                     list($from, $to) = explode('-', $value['label']);
-                    $newLabel = $this->priceCurrency->convertAndRound($from) . '-' . $this->priceCurrency->convertAndRound($to);
+                    $newLabel = $this->priceCurrency->convertAndRound($from)
+                        . '-'
+                        . $this->priceCurrency->convertAndRound($to);
                     $value['label'] = $newLabel;
                     $value['value'] = str_replace('-', '_', $newLabel);
                 }

dev/tests/api-functional/testsuite/Magento/GraphQl/Catalog/ProductSearchAggregationsTest.php

@@ -7,6 +7,11 @@
 
 namespace Magento\GraphQl\Catalog;
 
+use Magento\Config\App\Config\Type\System;
+use Magento\Config\Model\ResourceModel\Config;
+use Magento\Directory\Model\Currency;
+use Magento\Store\Model\ScopeInterface;
+use Magento\Store\Model\Store;
 use Magento\TestFramework\Helper\Bootstrap;
 use Magento\TestFramework\TestCase\GraphQlAbstract;
 
@@ -22,28 +27,9 @@ public function testAggregationBooleanAttribute()
             . 'MC-36768: Custom attribute not appears in elasticsearch'
         );
 
-        $skus= '"search_product_1", "search_product_2", "search_product_3", "search_product_4" ,"search_product_5"';
-        $query = <<<QUERY
-{
-    products(filter: {sku: {in: [{$skus}]}}){
-    items{
-      id
-      sku
-      name
-    }
-    aggregations{
-      label
-      attribute_code
-      count
-      options{
-        label
-        value
-        count
-      }
-    }
-  }
-}
-QUERY;
+        $query = $this->getGraphQlQuery(
+            '"search_product_1", "search_product_2", "search_product_3", "search_product_4" ,"search_product_5"'
+        );
 
         $result = $this->graphQlQuery($query);
 
@@ -69,4 +55,107 @@ function ($a) {
         $this->assertCount(2, $booleanAggregation['options']);
         $this->assertContainsEquals(['label' => '0', 'value'=> '0', 'count' => '2'], $booleanAggregation['options']);
     }
+
+    /**
+     * @magentoApiDataFixture Magento/Catalog/_files/products_for_search.php
+     */
+    public function testAggregationPriceRanges()
+    {
+        $query = $this->getGraphQlQuery(
+            '"search_product_1", "search_product_2", "search_product_3", "search_product_4" ,"search_product_5"'
+        );
+        $result = $this->graphQlQuery($query);
+
+        $this->assertArrayNotHasKey('errors', $result);
+        $this->assertArrayHasKey('aggregations', $result['products']);
+
+        $priceAggregation = array_filter(
+            $result['products']['aggregations'],
+            function ($a) {
+                return $a['attribute_code'] == 'price';
+            }
+        );
+        $this->assertNotEmpty($priceAggregation);
+        $priceAggregation = reset($priceAggregation);
+        $this->assertEquals('Price', $priceAggregation['label']);
+        $this->assertEquals(4, $priceAggregation['count']);
+        $expectedOptions = [
+            ['label' => '10-20', 'value'=> '10_20', 'count' => '2'],
+            ['label' => '20-30', 'value'=> '20_30', 'count' => '1'],
+            ['label' => '30-40', 'value'=> '30_40', 'count' => '1'],
+            ['label' => '40-50', 'value'=> '40_50', 'count' => '1']
+        ];
+        $this->assertEquals($expectedOptions, $priceAggregation['options']);
+    }
+
+    /**
+     * @magentoApiDataFixture Magento/Store/_files/second_store_with_second_currency.php
+     * @magentoApiDataFixture Magento/Catalog/_files/products_for_search.php
+     */
+    public function testAggregationPriceRangesWithCurrencyHeader()
+    {
+        // add USD as allowed (not default) currency
+        $objectManager = Bootstrap::getObjectManager();
+        /* @var Store $store */
+        $store = $objectManager->create(Store::class);
+        $store->load('fixture_second_store');
+        /** @var Config $configResource */
+        $configResource = $objectManager->get(Config::class);
+        $configResource->saveConfig(
+            Currency::XML_PATH_CURRENCY_ALLOW,
+            'USD',
+            ScopeInterface::SCOPE_STORES,
+            $store->getId()
+        );
+        // Configuration cache clean is required to reload currency setting
+        /** @var System $config */
+        $config = $objectManager->get(System::class);
+        $config->clean();
+
+        $headerMap['Store'] = 'fixture_second_store';
+        $headerMap['Content-Currency'] = 'USD';
+        $query = $this->getGraphQlQuery(
+            '"search_product_1", "search_product_2", "search_product_3", "search_product_4" ,"search_product_5"'
+        );
+        $result = $this->graphQlQuery($query, [], '', $headerMap);
+        $this->assertArrayNotHasKey('errors', $result);
+        $this->assertArrayHasKey('aggregations', $result['products']);
+        $priceAggregation = array_filter(
+            $result['products']['aggregations'],
+            function ($a) {
+                return $a['attribute_code'] == 'price';
+            }
+        );
+        $this->assertNotEmpty($priceAggregation);
+        $priceAggregation = reset($priceAggregation);
+        $this->assertEquals('Price', $priceAggregation['label']);
+        $this->assertEquals(4, $priceAggregation['count']);
+        $expectedOptions = [
+            ['label' => '10-20', 'value'=> '10_20', 'count' => '2'],
+            ['label' => '20-30', 'value'=> '20_30', 'count' => '1'],
+            ['label' => '30-40', 'value'=> '30_40', 'count' => '1'],
+            ['label' => '40-50', 'value'=> '40_50', 'count' => '1']
+        ];
+        $this->assertEquals($expectedOptions, $priceAggregation['options']);
+    }
+
+    private function getGraphQlQuery(string $skus)
+    {
+        return <<<QUERY
+{
+    products(filter: {sku: {in: [{$skus}]}}){
+    aggregations{
+      label
+      attribute_code
+      count
+      options{
+        label
+        value
+        count
+      }
+    }
+  }
+}
+QUERY;
+    }
 }