MC-37726: Price filter uses base currency for ranges

Author: cspruiell

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

@@ -78,6 +78,54 @@ public function testProductWithSinglePrice()
         $this->assertPrices($expectedPriceRange, $product['price_range']);
     }
 
+    /**
+     * @magentoApiDataFixture Magento/Catalog/_files/products.php
+     * @magentoConfigFixture default_store currency/options/allow EUR,USD
+     */
+    public function testProductWithSinglePriceNonDefaultCurrency()
+    {
+        $skus = ['simple'];
+        $query = $this->getProductQuery($skus);
+        $headerMap = [
+            'Content-Currency' => 'EUR'
+        ];
+        $result = $this->graphQlQuery($query, [], '', $headerMap);
+
+        $this->assertArrayNotHasKey('errors', $result);
+        $this->assertNotEmpty($result['products']['items']);
+        $product = $result['products']['items'][0];
+        $this->assertNotEmpty($product['price_range']);
+
+        $expectedPriceRange = [
+            "minimum_price" => [
+                "regular_price" => [
+                    "value" => 20
+                ],
+                "final_price" => [
+                    "value" => 20
+                ],
+                "discount" => [
+                    "amount_off" => 0,
+                    "percent_off" => 0
+                ]
+            ],
+            "maximum_price" => [
+                "regular_price" => [
+                    "value" => 20
+                ],
+                "final_price" => [
+                    "value" => 20
+                ],
+                "discount" => [
+                    "amount_off" => 0,
+                    "percent_off" => 0
+                ]
+            ]
+        ];
+
+        $this->assertPrices($expectedPriceRange, $product['price_range'], 'EUR');
+    }
+
     /**
      * Pricing for Simple, Grouped and Configurable products with no special or tier prices configured
      *
@@ -909,7 +957,7 @@ private function getQueryConfigurableProductAndVariants(array $sku): string
       name
       sku
       price_range {
-        minimum_price {regular_price 
+        minimum_price {regular_price
         {
          value
          currency
@@ -949,13 +997,13 @@ private function getQueryConfigurableProductAndVariants(array $sku): string
       ... on ConfigurableProduct{
         variants{
           product{
-           
+
             sku
             price_range {
         minimum_price {regular_price {value}
           final_price {
             value
-            
+
           }
           discount {
             amount_off
@@ -965,11 +1013,11 @@ private function getQueryConfigurableProductAndVariants(array $sku): string
         maximum_price {
           regular_price {
             value
-           
+
           }
           final_price {
             value
-            
+
           }
           discount {
             amount_off
@@ -985,7 +1033,7 @@ private function getQueryConfigurableProductAndVariants(array $sku): string
               final_price{value}
                 quantity
               }
-            
+
             }
           }
         }

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

@@ -89,31 +89,12 @@ function ($a) {
     }
 
     /**
-     * @magentoApiDataFixture Magento/Store/_files/second_store_with_second_currency.php
      * @magentoApiDataFixture Magento/Catalog/_files/products_for_search.php
+     * @magentoConfigFixture default_store currency/options/allow EUR,USD
      */
     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';
+        $headerMap['Content-Currency'] = 'EUR';
         $query = $this->getGraphQlQuery(
             '"search_product_1", "search_product_2", "search_product_3", "search_product_4" ,"search_product_5"'
         );
@@ -131,10 +112,10 @@ function ($a) {
         $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']
+            ['label' => '20-40', 'value'=> '20_40', 'count' => '2'],
+            ['label' => '40-60', 'value'=> '40_60', 'count' => '1'],
+            ['label' => '60-80', 'value'=> '60_80', 'count' => '1'],
+            ['label' => '80-100', 'value'=> '80_100', 'count' => '1']
         ];
         $this->assertEquals($expectedOptions, $priceAggregation['options']);
     }