MAGE-1260: use entity index options builders

Author: damcou

Service/Product/BackendSearch.php

@@ -6,7 +6,6 @@
 use Algolia\AlgoliaSearch\Helper\ConfigHelper;
 use Algolia\AlgoliaSearch\Helper\Entity\ProductHelper;
 use Algolia\AlgoliaSearch\Service\AlgoliaConnector;
-use Algolia\AlgoliaSearch\Service\IndexOptionsBuilder;
 use Magento\Framework\Exception\NoSuchEntityException;
 
 class BackendSearch
@@ -30,9 +29,9 @@ public function __construct(
      */
     public function getSearchResult(string $query, int $storeId, ?array $searchParams = null, ?string $targetedIndex = null): array
     {
-        $indexName = $targetedIndex !== null ?
-            $targetedIndex :
-            $this->productHelper->getIndexName($storeId);
+        $indexOptions = $targetedIndex !== null ?
+            $this->indexOptionsBuilder->buildWithEnforcedIndex($targetedIndex, $storeId) :
+            $this->indexOptionsBuilder->buildEntityIndexOptions($storeId);
 
         $numberOfResults = 1000;
         if ($this->configHelper->isInstantEnabled()) {
@@ -60,7 +59,6 @@ public function getSearchResult(string $query, int $storeId, ?array $searchParam
             $params = array_merge($params, $searchParams);
         }
 
-        $indexOptions = $this->indexOptionsBuilder->buildWithEnforcedIndex($indexName, $storeId);
         $response = $this->algoliaConnector->query($indexOptions, $query, $params);
         $answer = reset($response['results']);