MC-37726: Price filter uses base currency for ranges

Author: cspruiell

app/code/Magento/CatalogGraphQl/DataProvider/Product/LayeredNavigation/Builder/Price.php

@@ -72,7 +72,7 @@ public function build(AggregationInterface $aggregation, ?int $storeId): array
             );
         }
 
-        return [$result];
+        return [self::PRICE_BUCKET => $result];
     }
 
     /**

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

@@ -7,10 +7,12 @@
 
 namespace Magento\CatalogGraphQl\Model\Resolver;
 
+use Magento\CatalogGraphQl\DataProvider\Product\LayeredNavigation\LayerBuilder;
+use Magento\Directory\Model\PriceCurrency;
+use Magento\Framework\App\ObjectManager;
 use Magento\Framework\GraphQl\Config\Element\Field;
 use Magento\Framework\GraphQl\Query\ResolverInterface;
 use Magento\Framework\GraphQl\Schema\Type\ResolveInfo;
-use Magento\CatalogGraphQl\DataProvider\Product\LayeredNavigation\LayerBuilder;
 use Magento\Store\Api\Data\StoreInterface;
 
 /**
@@ -28,16 +30,24 @@ class Aggregations implements ResolverInterface
      */
     private $layerBuilder;
 
+    /**
+     * @var PriceCurrency
+     */
+    private $priceCurrency;
+
     /**
      * @param \Magento\CatalogGraphQl\Model\Resolver\Layer\DataProvider\Filters $filtersDataProvider
+     * @param PriceCurrency $priceCurrency
      * @param LayerBuilder $layerBuilder
      */
     public function __construct(
         \Magento\CatalogGraphQl\Model\Resolver\Layer\DataProvider\Filters $filtersDataProvider,
-        LayerBuilder $layerBuilder
+        LayerBuilder $layerBuilder,
+        PriceCurrency $priceCurrency = null
     ) {
         $this->filtersDataProvider = $filtersDataProvider;
         $this->layerBuilder = $layerBuilder;
+        $this->priceCurrency = $priceCurrency ?: ObjectManager::getInstance()->get(PriceCurrency::class);
     }
 
     /**
@@ -60,7 +70,16 @@ public function resolve(
             /** @var StoreInterface $store */
             $store = $context->getExtensionAttributes()->getStore();
             $storeId = (int)$store->getId();
-            return $this->layerBuilder->build($aggregations, $storeId);
+            $results = $this->layerBuilder->build($aggregations, $storeId);
+            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);
+                    $value['label'] = $newLabel;
+                    $value['value'] = str_replace('-', '_', $newLabel);
+                }
+            }
+            return $results;
         } else {
             return [];
         }