Skip to content

Commit 499999d

Browse files
damcoudamcou
committed
MAGE-1260: use entity index options builders
1 parent 0c417ea commit 499999d

File tree

6 files changed

+14
-45
lines changed

6 files changed

+14
-45
lines changed

‎Service/AbstractIndexBuilder.php

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@ public function __construct(
2121
protected Emulation $emulation,
2222
protected ScopeCodeResolver $scopeCodeResolver,
2323
protected AlgoliaConnector $algoliaConnector,
24-
protected IndexOptionsBuilder $indexOptionsBuilder
2524
){}
2625

2726
/**

‎Service/AdditionalSection/IndexBuilder.php

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,7 @@ public function __construct(
3232
$logger,
3333
$emulation,
3434
$scopeCodeResolver,
35-
$algoliaConnector,
36-
$indexOptionsBuilder
35+
$algoliaConnector
3736
);
3837
}
3938

‎Service/Category/IndexBuilder.php

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@
1111
use Algolia\AlgoliaSearch\Service\AbstractIndexBuilder;
1212
use Algolia\AlgoliaSearch\Service\AlgoliaConnector;
1313
use Algolia\AlgoliaSearch\Service\Category\RecordBuilder as CategoryRecordBuilder;
14-
use Algolia\AlgoliaSearch\Service\IndexOptionsBuilder;
1514
use Magento\Catalog\Model\ResourceModel\Category\Collection;
1615
use Magento\Framework\App\Config\ScopeCodeResolver;
1716
use Magento\Framework\Exception\LocalizedException;
@@ -35,8 +34,7 @@ public function __construct(
3534
$logger,
3635
$emulation,
3736
$scopeCodeResolver,
38-
$algoliaConnector,
39-
$indexOptionsBuilder
37+
$algoliaConnector
4038
);
4139
}
4240

@@ -151,7 +149,7 @@ protected function buildIndexPage($storeId, $collection, $page, $pageSize, $cate
151149
}
152150
$collection->setCurPage($page)->setPageSize($pageSize);
153151
$collection->load();
154-
$indexOptions = $this->indexOptionsBuilder->buildWithComputedIndex(CategoryHelper::INDEX_NAME_SUFFIX, $storeId);
152+
$indexOptions = $this->indexOptionsBuilder->buildEntityIndexOptions($storeId);
155153
$indexData = $this->getCategoryRecords($storeId, $collection, $categoryIds);
156154
if (!empty($indexData['toIndex'])) {
157155
$this->logger->start('ADD/UPDATE TO ALGOLIA');

‎Service/Page/IndexBuilder.php

Lines changed: 4 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@
1010
use Algolia\AlgoliaSearch\Logger\DiagnosticsLogger;
1111
use Algolia\AlgoliaSearch\Service\AbstractIndexBuilder;
1212
use Algolia\AlgoliaSearch\Service\AlgoliaConnector;
13-
use Algolia\AlgoliaSearch\Service\IndexOptionsBuilder;
1413
use Magento\Framework\App\Config\ScopeCodeResolver;
1514
use Magento\Framework\Exception\NoSuchEntityException;
1615
use Magento\Store\Model\App\Emulation;
@@ -31,8 +30,7 @@ public function __construct(
3130
$logger,
3231
$emulation,
3332
$scopeCodeResolver,
34-
$algoliaConnector,
35-
$indexOptionsBuilder
33+
$algoliaConnector
3634
);
3735
}
3836

@@ -69,7 +67,7 @@ public function buildIndex($storeId, ?array $entityIds, ?array $options): void
6967
return;
7068
}
7169

72-
$indexOptions = $this->indexOptionsBuilder->buildWithComputedIndex(PageHelper::INDEX_NAME_SUFFIX, $storeId);
70+
$indexOptions = $this->indexOptionsBuilder->buildEntityIndexOptions($storeId);
7371

7472
$this->startEmulation($storeId);
7573

@@ -82,11 +80,7 @@ public function buildIndex($storeId, ?array $entityIds, ?array $options): void
8280

8381
if (isset($pages['toIndex']) && count($pages['toIndex'])) {
8482
$pagesToIndex = $pages['toIndex'];
85-
$toIndexOptions = $this->indexOptionsBuilder->buildWithComputedIndex(
86-
PageHelper::INDEX_NAME_SUFFIX,
87-
$storeId,
88-
$isFullReindex
89-
);
83+
$toIndexOptions = $this->indexOptionsBuilder->buildEntityIndexOptions($storeId, $isFullReindex);
9084

9185
foreach (array_chunk($pagesToIndex, 100) as $chunk) {
9286
try {
@@ -111,8 +105,7 @@ public function buildIndex($storeId, ?array $entityIds, ?array $options): void
111105
}
112106

113107
if ($isFullReindex) {
114-
$tempIndexName = $this->pageHelper->getTempIndexName($storeId);
115-
$tempIndexOptions = $this->indexOptionsBuilder->buildWithEnforcedIndex($tempIndexName, $storeId);
108+
$tempIndexOptions = $this->indexOptionsBuilder->buildEntityIndexOptions($storeId, true);
116109

117110
$this->algoliaConnector->copyQueryRules($indexOptions, $tempIndexOptions);
118111
$this->algoliaConnector->moveIndex($tempIndexOptions, $indexOptions);

‎Service/Product/IndexBuilder.php

Lines changed: 3 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@
1111
use Algolia\AlgoliaSearch\Logger\DiagnosticsLogger;
1212
use Algolia\AlgoliaSearch\Service\AbstractIndexBuilder;
1313
use Algolia\AlgoliaSearch\Service\AlgoliaConnector;
14-
use Algolia\AlgoliaSearch\Service\IndexOptionsBuilder;
1514
use Algolia\AlgoliaSearch\Service\Product\RecordBuilder as ProductRecordBuilder;
1615
use Magento\Catalog\Model\ResourceModel\Product\Collection;
1716
use Magento\Framework\App\Config\ScopeCodeResolver;
@@ -46,8 +45,7 @@ public function __construct(
4645
$logger,
4746
$emulation,
4847
$scopeCodeResolver,
49-
$algoliaConnector,
50-
$indexOptionsBuilder
48+
$algoliaConnector
5149
);
5250

5351
$this->priceIndexer = $indexerRegistry->get('catalog_product_price');
@@ -164,10 +162,7 @@ protected function rebuildEntityIds(int $storeId, array $productIds): void
164162
*/
165163
public function deleteInactiveProducts($storeId): void
166164
{
167-
$indexOptions = $this->indexOptionsBuilder->buildWithComputedIndex(
168-
ProductHelper::INDEX_NAME_SUFFIX,
169-
$storeId
170-
);
165+
$indexOptions = $this->indexOptionsBuilder->buildEntityIndexOptions($storeId);
171166
$client = $this->algoliaConnector->getClient($storeId);
172167
$objectIds = [];
173168
$counter = 0;
@@ -256,10 +251,7 @@ protected function buildIndexPage(
256251
$collection->load();
257252
$this->logger->log('Loaded ' . count($collection) . ' products');
258253
$this->logger->stop($logMessage);
259-
$indexOptions = $this->indexOptionsBuilder->buildWithComputedIndex(
260-
ProductHelper::INDEX_NAME_SUFFIX,
261-
$storeId
262-
);
254+
$indexOptions = $this->indexOptionsBuilder->buildEntityIndexOptions($storeId);
263255
$indexData = $this->getProductsRecords($storeId, $collection, $productIds);
264256
if (!empty($indexData['toIndex'])) {
265257
$this->logger->start('ADD/UPDATE TO ALGOLIA');

‎Service/Suggestion/IndexBuilder.php

Lines changed: 4 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@
1010
use Algolia\AlgoliaSearch\Logger\DiagnosticsLogger;
1111
use Algolia\AlgoliaSearch\Service\AbstractIndexBuilder;
1212
use Algolia\AlgoliaSearch\Service\AlgoliaConnector;
13-
use Algolia\AlgoliaSearch\Service\IndexOptionsBuilder;
1413
use Algolia\AlgoliaSearch\Service\Suggestion\RecordBuilder as SuggestionRecordBuilder;
1514
use Magento\Framework\App\Config\ScopeCodeResolver;
1615
use Magento\Framework\Exception\NoSuchEntityException;
@@ -35,8 +34,7 @@ public function __construct(
3534
$logger,
3635
$emulation,
3736
$scopeCodeResolver,
38-
$algoliaConnector,
39-
$indexOptionsBuilder
37+
$algoliaConnector
4038
);
4139
}
4240

@@ -113,10 +111,7 @@ protected function rebuildStoreSuggestionIndexPage(int $storeId, QueryCollection
113111
$collection = clone $collectionDefault;
114112
$collection->setCurPage($page)->setPageSize($pageSize);
115113
$collection->load();
116-
$indexOptions = $this->indexOptionsBuilder->buildWithComputedIndex(
117-
SuggestionHelper::INDEX_NAME_SUFFIX,
118-
$storeId
119-
);
114+
$indexOptions = $this->indexOptionsBuilder->buildEntityIndexOptions($storeId);
120115
$indexData = [];
121116

122117
/** @var Query $suggestion */
@@ -150,15 +145,8 @@ protected function moveStoreSuggestionIndex(int $storeId): void
150145
return;
151146
}
152147

153-
$tmpIndexOptions = $this->indexOptionsBuilder->buildWithComputedIndex(
154-
SuggestionHelper::INDEX_NAME_SUFFIX,
155-
$storeId,
156-
true
157-
);
158-
$indexOptions = $this->indexOptionsBuilder->buildWithComputedIndex(
159-
SuggestionHelper::INDEX_NAME_SUFFIX,
160-
$storeId,
161-
);
148+
$tmpIndexOptions = $this->indexOptionsBuilder->buildEntityIndexOptions($storeId, true);
149+
$indexOptions = $this->indexOptionsBuilder->buildEntityIndexOptions($storeId);
162150

163151
$this->algoliaConnector->copyQueryRules($indexOptions, $tmpIndexOptions);
164152
$this->algoliaConnector->moveIndex($tmpIndexOptions, $indexOptions);

0 commit comments

Comments
 (0)