Merge pull request #1648 from algolia/feat/MAGE-1095-data-helper-refactoring

Mage-1095: Data Helper refactoring

Author: damcou

Controller/Adminhtml/Reindex/Save.php

@@ -9,6 +9,7 @@
 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;
@@ -19,37 +20,15 @@ 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;
     }
 
     /**
@@ -220,7 +199,7 @@ protected function checkAndReindex($product, $stores)
             $productIds = [$product->getId()];
             $productIds = array_merge($productIds, $this->productHelper->getParentProductIds($productIds));
 
-            $this->dataHelper->rebuildStoreProductIndex($storeId, $productIds);
+            $this->productIndexBuilder->rebuildEntityIds($storeId, $productIds);
             $this->messageManager->addSuccessMessage(
                 __(
                     'The Product "%1" (%2) has been reindexed for store "%3 / %4 / %5".',

Helper/AdapterHelper.php

@@ -3,8 +3,8 @@
 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
@@ -14,7 +14,7 @@ class AdapterHelper
 
     public function __construct(
         protected CatalogSearchDataHelper $catalogSearchHelper,
-        protected AlgoliaDataHelper $algoliaHelper,
+        protected BackendSearch $backendSearch,
         protected FiltersHelper $filtersHelper,
         protected ConfigHelper $configHelper,
         protected AlgoliaCredentialsManager $algoliaCredentialsManager
@@ -52,7 +52,7 @@ public function getDocumentsFromAlgolia()
             }
         }
 
-        return $this->algoliaHelper->getSearchResult($algoliaQuery, $storeId, $searchParams, $targetedIndex);
+        return $this->backendSearch->getSearchResult($algoliaQuery, $storeId, $searchParams, $targetedIndex);
     }
 
     /**