Merge branch 'release/3.15.0-dev' into epic/MAGE-997

Author: cammonro

Api/IndexBuilder/IndexBuilderInterface.php

@@ -0,0 +1,10 @@
+<?php
+
+namespace Algolia\AlgoliaSearch\Api\IndexBuilder;
+
+interface IndexBuilderInterface
+{
+    public function buildIndex(int $storeId, ?array $entityIds, ?array $options): void;
+
+    public function buildIndexFull(int $storeId, ?array $options): void;
+}

Api/IndexBuilder/UpdatableIndexBuilderInterface.php

@@ -0,0 +1,8 @@
+<?php
+
+namespace Algolia\AlgoliaSearch\Api\IndexBuilder;
+
+interface UpdatableIndexBuilderInterface extends IndexBuilderInterface
+{
+    public function buildIndexList(int $storeId, ?array $entityIds, ?array $options): void;
+}

Block/Adminhtml/LandingPage/SearchConfiguration.php

@@ -22,9 +22,6 @@ class SearchConfiguration extends \Magento\Backend\Block\Template
     /** @var Data */
     private $coreHelper;
 
-    /** @var int */
-    protected $planLevel;
-
     /**
      * @param Context $context
      * @param SessionManagerInterface $backendSession

Block/Configuration.php

@@ -247,7 +247,8 @@ public function getConfiguration()
             'indexName' => $coreHelper->getBaseIndexName(),
             'apiKey' => $algoliaHelper->generateSearchSecuredApiKey(
                 $config->getSearchOnlyAPIKey(),
-                $attributesToFilter
+                $attributesToFilter,
+                $this->getStoreId()
             ),
             'attributeFilter' => $attributesToFilter,
             'facets' => $facets,

CHANGELOG.md

@@ -1,5 +1,24 @@
 # CHANGE LOG
 
+## 3.15.0-beta.1
+
+## Updates
+- Added support for Multi-Application IDs
+
+## 3.14.3
+
+### Updates
+- Updated PHP client version in the composer file
+- Tests: added new integration scenarios including multi-stores ones.
+
+### Bug Fixes
+- Fixed landing page typing error
+- Improved query method for alternate root categories - Thank you @igorfigueiredogen
+- Fixed an error where a missing prefix can throw errors with strong types added to ConfigHelper
+- Fixed an error where stale cache data was preventing ranking applied on replica
+- Fixed reindexing issue with NeuralSearch
+- Tests : Fixed current integration tests
+
 ## 3.14.2
 
 ### Updates

Console/Command/ReplicaSyncCommand.php

@@ -11,7 +11,7 @@
 use Algolia\AlgoliaSearch\Exceptions\ExceededRetriesException;
 use Algolia\AlgoliaSearch\Helper\Entity\ProductHelper;
 use Algolia\AlgoliaSearch\Service\StoreNameFetcher;
-use Magento\Framework\App\State;
+use Magento\Framework\App\State as AppState;
 use Magento\Framework\Console\Cli;
 use Magento\Framework\Exception\LocalizedException;
 use Magento\Framework\Exception\NoSuchEntityException;
@@ -27,12 +27,12 @@ public function __construct(
         protected ReplicaManagerInterface $replicaManager,
         protected ProductHelper           $productHelper,
         protected StoreManagerInterface   $storeManager,
-        State                             $state,
+        AppState                          $appState,
         StoreNameFetcher                  $storeNameFetcher,
         ?string                           $name = null
     )
     {
-        parent::__construct($state, $storeNameFetcher, $name);
+        parent::__construct($appState, $storeNameFetcher, $name);
     }
 
     protected function getReplicaCommandName(): string

Controller/Adminhtml/Landingpage/Save.php

@@ -107,13 +107,15 @@ public function execute()
                 $data['configuration'] = $data['algolia_configuration'];
                 if ($this->configHelper->isCustomerGroupsEnabled($data['store_id'])) {
                     $configuration = json_decode($data['algolia_configuration'], true);
-                    $priceConfig = $configuration['price'.$data['price_key']];
-                    $customerGroups = $this->customerGroupCollectionFactory->create();
-                    $store = $this->storeManager->getStore($data['store_id']);
-                    $baseCurrencyCode = $store->getBaseCurrencyCode();
-                    foreach ($customerGroups as $group) {
-                        $groupId = (int) $group->getData('customer_group_id');
-                        $configuration['price.'.$baseCurrencyCode.'.group_'.$groupId] = $priceConfig;
+                    if (isset($configuration['price'.$data['price_key']])) {
+                        $priceConfig = $configuration['price'.$data['price_key']];
+                        $customerGroups = $this->customerGroupCollectionFactory->create();
+                        $store = $this->storeManager->getStore($data['store_id']);
+                        $baseCurrencyCode = $store->getBaseCurrencyCode();
+                        foreach ($customerGroups as $group) {
+                            $groupId = (int) $group->getData('customer_group_id');
+                            $configuration['price.'.$baseCurrencyCode.'.group_'.$groupId] = $priceConfig;
+                        }
                     }
                     $data['configuration'] = json_encode($configuration);
                 }

Controller/Adminhtml/Reindex/Save.php

@@ -9,47 +9,27 @@
 use Algolia\AlgoliaSearch\Exception\UnknownSkuException;
 use Algolia\AlgoliaSearch\Helper\Data as DataHelper;
 use Algolia\AlgoliaSearch\Helper\Entity\ProductHelper;
+use Algolia\AlgoliaSearch\Service\Product\IndexBuilder as ProductIndexBuilder;
 use Magento\Backend\App\Action\Context;
 use Magento\Catalog\Api\ProductRepositoryInterface;
 use Magento\Framework\Controller\ResultFactory;
+use Magento\Framework\Exception\LocalizedException;
 use Magento\Framework\Exception\NoSuchEntityException;
 use Magento\Store\Model\StoreManagerInterface;
 
 class Save extends \Magento\Backend\App\Action
 {
     public const MAX_SKUS = 10;
 
-    /** @var ProductRepositoryInterface */
-    protected $productRepository;
-
-    /** @var StoreManagerInterface */
-    protected $storeManager;
-
-    /** @var DataHelper */
-    protected $dataHelper;
-
-    /** @var ProductHelper */
-    protected $productHelper;
-
-    /**
-     * @param Context $context
-     * @param ProductRepositoryInterface $productRepository
-     * @param StoreManagerInterface $storeManager
-     * @param DataHelper $dataHelper
-     * @param ProductHelper $productHelper
-     */
     public function __construct(
-        Context $context,
-        ProductRepositoryInterface $productRepository,
-        StoreManagerInterface $storeManager,
-        DataHelper $dataHelper,
-        ProductHelper $productHelper
+        protected Context $context,
+        protected ProductRepositoryInterface $productRepository,
+        protected StoreManagerInterface $storeManager,
+        protected DataHelper $dataHelper,
+        protected ProductHelper $productHelper,
+        protected ProductIndexBuilder $productIndexBuilder
     ) {
         parent::__construct($context);
-        $this->storeManager = $storeManager;
-        $this->dataHelper = $dataHelper;
-        $this->productHelper = $productHelper;
-        $this->productRepository = $productRepository;
     }
 
     /**
@@ -131,6 +111,7 @@ public function execute()
      * @param $stores
      * @return void
      * @throws NoSuchEntityException
+     * @throws LocalizedException
      */
     protected function checkAndReindex($product, $stores)
     {
@@ -220,7 +201,7 @@ protected function checkAndReindex($product, $stores)
             $productIds = [$product->getId()];
             $productIds = array_merge($productIds, $this->productHelper->getParentProductIds($productIds));
 
-            $this->dataHelper->rebuildStoreProductIndex($storeId, $productIds);
+            $this->productIndexBuilder->buildIndexList($storeId, $productIds);
             $this->messageManager->addSuccessMessage(
                 __(
                     'The Product "%1" (%2) has been reindexed for store "%3 / %4 / %5".',

Exception/DiagnosticsException.php

@@ -0,0 +1,10 @@
+<?php
+
+namespace Algolia\AlgoliaSearch\Exception;
+
+use Magento\Framework\Exception\LocalizedException;
+
+class DiagnosticsException extends LocalizedException
+{
+
+}

Helper/AdapterHelper.php

@@ -3,43 +3,23 @@
 namespace Algolia\AlgoliaSearch\Helper;
 
 use Algolia\AlgoliaSearch\Helper\Adapter\FiltersHelper;
-use Algolia\AlgoliaSearch\Helper\Data as AlgoliaDataHelper;
+use Algolia\AlgoliaSearch\Service\AlgoliaCredentialsManager;
+use Algolia\AlgoliaSearch\Service\Product\BackendSearch;
 use Magento\CatalogSearch\Helper\Data as CatalogSearchDataHelper;
 
 class AdapterHelper
 {
     public const INSTANTSEARCH_ORDER_PARAM = 'sortBy';
     public const BACKEND_ORDER_PARAM = 'product_list_order';
 
-    /** @var CatalogSearchDataHelper */
-    private $catalogSearchHelper;
-
-    /** @var AlgoliaDataHelper */
-    private $algoliaHelper;
-
-    /** @var FiltersHelper */
-    private $filtersHelper;
-
-    /** @var ConfigHelper */
-    private $configHelper;
-
-    /**
-     * @param CatalogSearchDataHelper $catalogSearchHelper
-     * @param AlgoliaDataHelper $algoliaHelper
-     * @param FiltersHelper $filtersHelper
-     * @param ConfigHelper $configHelper
-     */
     public function __construct(
-        CatalogSearchDataHelper $catalogSearchHelper,
-        AlgoliaDataHelper $algoliaHelper,
-        FiltersHelper $filtersHelper,
-        ConfigHelper $configHelper
-    ) {
-        $this->catalogSearchHelper = $catalogSearchHelper;
-        $this->algoliaHelper = $algoliaHelper;
-        $this->filtersHelper = $filtersHelper;
-        $this->configHelper = $configHelper;
-    }
+        protected CatalogSearchDataHelper $catalogSearchHelper,
+        protected BackendSearch $backendSearch,
+        protected FiltersHelper $filtersHelper,
+        protected ConfigHelper $configHelper,
+        protected AlgoliaCredentialsManager $algoliaCredentialsManager
+    )
+    {}
 
     /**
      * Get search result from Algolia
@@ -72,7 +52,7 @@ public function getDocumentsFromAlgolia()
             }
         }
 
-        return $this->algoliaHelper->getSearchResult($algoliaQuery, $storeId, $searchParams, $targetedIndex);
+        return $this->backendSearch->getSearchResult($algoliaQuery, $storeId, $searchParams, $targetedIndex);
     }
 
     /**
@@ -142,8 +122,7 @@ public function isAllowed()
         $storeId = $this->getStoreId();
 
         return
-            $this->configHelper->getApplicationID($storeId)
-            && $this->configHelper->getAPIKey($storeId)
+            $this->algoliaCredentialsManager->checkCredentials($storeId)
             && $this->configHelper->isEnabledFrontEnd($storeId)
             && $this->configHelper->makeSeoRequest($storeId);
     }