Merge pull request #1719 from algolia/fix/MAGE-1222-scoped-currency-codes

MAGE-1222 scoped currency codes

Author: cammonro

Helper/ConfigHelper.php

@@ -1190,17 +1190,32 @@ public function setSorting(array $sorting, string $scope = Magento\Framework\App
     }
 
     /**
-     * @param $storeId
-     * @return string
      * @throws Magento\Framework\Exception\NoSuchEntityException
      */
-    public function getCurrencyCode($storeId = null)
+    public function getCurrencyCode(int $storeId = null): string
     {
         /** @var Magento\Store\Model\Store $store */
         $store = $this->storeManager->getStore($storeId);
         return $store->getCurrentCurrencyCode();
     }
 
+    /**
+     * Obtain the store scoped currency configuration or fall back to all allowed currencies
+     * @return array
+     */
+    public function getAllowedCurrencies(?int $storeId = null): array
+    {
+        $configured = explode(
+            ',',
+            $this->configInterface->getValue(
+                DirCurrency::XML_PATH_CURRENCY_ALLOW,
+                ScopeInterface::SCOPE_STORE,
+                $storeId
+            ) ?? ''
+        );
+        return $configured ?: $this->dirCurrency->getConfigAllowCurrencies();
+    }
+
     /**
      * @param $storeId
      * @return bool
@@ -1483,6 +1498,8 @@ public function showSuggestionsOnNoResultsPage($storeId = null)
     }
 
     /**
+     * NOTE: This method is currently only used in integration tests and was removed from the general implementation
+     * TODO: Evaluate use cases with product permissions where we may need to restore this functionality
      * @param $groupId
      * @return array
      */

Service/Product/FacetBuilder.php

@@ -5,7 +5,6 @@
 use Algolia\AlgoliaSearch\Helper\ConfigHelper;
 use Magento\Customer\Api\GroupExcludedWebsiteRepositoryInterface;
 use Magento\Customer\Model\ResourceModel\Group\Collection as GroupCollection;
-use Magento\Directory\Model\Currency as CurrencyHelper;
 use Magento\Framework\Exception\LocalizedException;
 use Magento\Framework\Exception\NoSuchEntityException;
 use Magento\Store\Model\StoreManagerInterface;
@@ -29,7 +28,6 @@ class FacetBuilder
     public function __construct(
         protected ConfigHelper                            $configHelper,
         protected StoreManagerInterface                   $storeManager,
-        protected CurrencyHelper                          $currencyManager,
         protected GroupCollection                         $groupCollection,
         protected GroupExcludedWebsiteRepositoryInterface $groupExcludedWebsiteRepository,
     )
@@ -196,7 +194,7 @@ protected function addCategoryFacets(int $storeId, array $facets): array
     protected function getPricingAttributes(int $storeId): array
     {
         $pricingAttributes = [];
-        $currencies = $this->currencyManager->getConfigAllowCurrencies();
+        $currencies = $this->configHelper->getAllowedCurrencies($storeId);
         foreach ($currencies as $currencyCode) {
             $pricingAttributes[] = self::FACET_ATTRIBUTE_PRICE . '.' . $currencyCode . '.default';
             $pricingAttributes = array_merge($pricingAttributes, $this->getGroupPricingAttributes($storeId, $currencyCode));

Test/Unit/Service/Product/FacetBuilderTest.php

@@ -9,33 +9,29 @@
 use Algolia\AlgoliaSearch\Service\Product\FacetBuilder;
 use Magento\Customer\Api\GroupExcludedWebsiteRepositoryInterface;
 use Magento\Customer\Model\ResourceModel\Group\Collection as GroupCollection;
-use Magento\Directory\Model\Currency as CurrencyHelper;
 use Magento\Framework\Exception\LocalizedException;
 use Magento\Framework\Exception\NoSuchEntityException;
 use Magento\Store\Model\StoreManagerInterface;
 use PHPUnit\Framework\TestCase;
 
 class FacetBuilderTest extends TestCase
 {
-    protected FacetBuilder $facetBuilder;
-    protected ConfigHelper $configHelper;
-    protected StoreManagerInterface $storeManager;
-    protected CurrencyHelper $currencyManager;
-    protected GroupCollection $groupCollection;
-    protected GroupExcludedWebsiteRepositoryInterface $groupExcludedWebsiteRepository;
+    protected ?FacetBuilder $facetBuilder;
+    protected ?ConfigHelper $configHelper;
+    protected ?StoreManagerInterface $storeManager;
+    protected ?GroupCollection $groupCollection;
+    protected ?GroupExcludedWebsiteRepositoryInterface $groupExcludedWebsiteRepository;
 
     protected function setUp(): void
     {
         $this->configHelper = $this->createMock(ConfigHelper::class);
         $this->storeManager = $this->createMock(StoreManagerInterface::class);
-        $this->currencyManager = $this->createMock(CurrencyHelper::class);
         $this->groupCollection = $this->createMock(GroupCollection::class);
         $this->groupExcludedWebsiteRepository = $this->createMock(GroupExcludedWebsiteRepositoryInterface::class);
 
         $this->facetBuilder = new FacetBuilderTestable(
             $this->configHelper,
             $this->storeManager,
-            $this->currencyManager,
             $this->groupCollection,
             $this->groupExcludedWebsiteRepository
         );
@@ -54,8 +50,8 @@ protected function mockFacets(): void
 
     protected function mockStoreConfig($storeId, $websiteId): void
     {
-        $this->currencyManager
-            ->method('getConfigAllowCurrencies')
+        $this->configHelper
+            ->method('getAllowedCurrencies')
             ->willReturn(['EUR', 'USD']);
 
         $storeMock = $this->createMock(\Magento\Store\Api\Data\StoreInterface::class);

composer.json

@@ -3,7 +3,7 @@
   "description": "Algolia Search & Discovery extension for Magento 2",
   "type": "magento2-module",
   "license": ["MIT"],
-  "version": "3.15.0",
+  "version": "3.16.0-dev",
   "require": {
     "php": "~8.1|~8.2|~8.3",
     "magento/framework": "~103.0",

etc/module.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:Module/etc/module.xsd">
-    <module name="Algolia_AlgoliaSearch" setup_version="3.15.0">
+    <module name="Algolia_AlgoliaSearch" setup_version="3.16.0-dev">
         <sequence>
             <module name="Magento_Theme"/>
             <module name="Magento_Backend"/>