Merge pull request #1716 from algolia/fix/MAGE-1244-fix-affected-products

MAGE-1244: Fix `$affectedProductIds` logic

Author: damcou

Model/Indexer/CategoryObserver.php

@@ -2,13 +2,17 @@
 
 namespace Algolia\AlgoliaSearch\Model\Indexer;
 
+use Algolia\AlgoliaSearch\Exception\DiagnosticsException;
 use Algolia\AlgoliaSearch\Model\Indexer\Category as CategoryIndexer;
 use Algolia\AlgoliaSearch\Service\AlgoliaCredentialsManager;
+use Algolia\AlgoliaSearch\Service\Product\BatchQueueProcessor as ProductBatchQueueProcessor;
 use Magento\Catalog\Model\Category as CategoryModel;
 use Magento\Catalog\Model\ResourceModel\Category as CategoryResourceModel;
 use Magento\Catalog\Model\ResourceModel\Product\Collection as ProductCollection;
 use Magento\Framework\App\ResourceConnection;
+use Magento\Framework\Exception\NoSuchEntityException;
 use Magento\Framework\Indexer\IndexerRegistry;
+use Magento\Store\Model\StoreManagerInterface;
 
 class CategoryObserver
 {
@@ -17,7 +21,9 @@ class CategoryObserver
 
     public function __construct(
         IndexerRegistry $indexerRegistry,
+        protected StoreManagerInterface $storeManager,
         protected ResourceConnection $resource,
+        protected ProductBatchQueueProcessor $productBatchQueueProcessor,
         protected AlgoliaCredentialsManager $algoliaCredentialsManager
     ) {
         $this->indexer = $indexerRegistry->get('algolia_categories');
@@ -52,8 +58,8 @@ public function afterSave(
             $changedProductIds = ($category->getChangedProductIds() !== null ? (array) $category->getChangedProductIds() : []);
 
             if (!$this->indexer->isScheduled()) {
-                CategoryIndexer::$affectedProductIds = array_unique(array_merge($changedProductIds, $collectionIds));
                 $this->indexer->reindexRow($category->getId());
+                $this->reindexAffectedProducts(array_unique(array_merge($changedProductIds, $collectionIds)));
             } else {
                 // missing logic, if scheduled, when category is saved w/out product, products need to be added to _cl
                 if (count($changedProductIds) === 0 && count($collectionIds) > 0) {
@@ -82,15 +88,29 @@ public function afterDelete(
             if (!$this->indexer->isScheduled()) {
                 /* we are using products position because getProductCollection() doesn't use correct store */
                 $productCollection = $category->getProductsPosition();
-                CategoryIndexer::$affectedProductIds = array_keys($productCollection);
-
                 $this->indexer->reindexRow($category->getId());
+                $this->reindexAffectedProducts(array_keys($productCollection));
             }
         });
 
         return $result;
     }
 
+    /**
+     * @param array $affectedProductIds
+     * @return void
+     * @throws DiagnosticsException
+     * @throws NoSuchEntityException
+     */
+    protected function reindexAffectedProducts(array $affectedProductIds): void
+    {
+        if (count($affectedProductIds) > 0) {
+            foreach (array_keys($this->storeManager->getStores()) as $storeId) {
+                $this->productBatchQueueProcessor->processBatch($storeId, $affectedProductIds);
+            }
+        }
+    }
+
     /**
      * @param array $productIds
      */

Service/Category/BatchQueueProcessor.php

@@ -10,13 +10,11 @@
 use Algolia\AlgoliaSearch\Model\Queue;
 use Algolia\AlgoliaSearch\Service\AlgoliaCredentialsManager;
 use Algolia\AlgoliaSearch\Service\Category\IndexBuilder as CategoryIndexBuilder;
-use Algolia\AlgoliaSearch\Service\Product\IndexBuilder as ProductIndexBuilder;
+use Magento\Framework\Exception\LocalizedException;
 use Magento\Framework\Exception\NoSuchEntityException;
 
 class BatchQueueProcessor implements BatchQueueProcessorInterface
 {
-    public static $affectedProductIds = [];
-
     public function __construct(
         protected Data $dataHelper,
         protected ConfigHelper $configHelper,
@@ -29,7 +27,7 @@ public function __construct(
      * @param int $storeId
      * @param array|null $entityIds
      * @return void
-     * @throws NoSuchEntityException
+     * @throws NoSuchEntityException|LocalizedException
      */
     public function processBatch(int $storeId, ?array $entityIds = null): void
     {
@@ -43,8 +41,6 @@ public function processBatch(int $storeId, ?array $entityIds = null): void
             return;
         }
 
-        $this->rebuildAffectedProducts($storeId);
-
         $categoriesPerPage = $this->configHelper->getNumberOfElementByPage();
 
         if (is_array($entityIds) && count($entityIds) > 0) {
@@ -56,37 +52,12 @@ public function processBatch(int $storeId, ?array $entityIds = null): void
         $this->processFullReindex($storeId, $categoriesPerPage);
     }
 
-    /**
-     * @param int $storeId
-     */
-    protected function rebuildAffectedProducts($storeId)
-    {
-        $affectedProducts = self::$affectedProductIds;
-        $affectedProductsCount = count($affectedProducts);
-
-        if ($affectedProductsCount > 0 && $this->configHelper->indexProductOnCategoryProductsUpdate($storeId)) {
-            $productsPerPage = $this->configHelper->getNumberOfElementByPage();
-            foreach (array_chunk($affectedProducts, $productsPerPage) as $chunk) {
-                /** @uses ProductIndexBuilder::buildIndexList() */
-                $this->queue->addToQueue(
-                    ProductIndexBuilder::class,
-                    'buildIndexList',
-                    [
-                        'storeId' => $storeId,
-                        'entityIds' => $chunk,
-                    ],
-                    count($chunk)
-                );
-            }
-        }
-    }
-
     /**
      * @param array $categoryIds
      * @param int $categoriesPerPage
      * @param int $storeId
      */
-    protected function processSpecificCategories($categoryIds, $categoriesPerPage, $storeId)
+    protected function processSpecificCategories(array $categoryIds, int $categoriesPerPage, int $storeId): void
     {
         foreach (array_chunk($categoryIds, $categoriesPerPage) as $chunk) {
             /** @uses CategoryIndexBuilder::buildIndexList */
@@ -106,10 +77,10 @@ protected function processSpecificCategories($categoryIds, $categoriesPerPage, $
      * @param int $storeId
      * @param int $categoriesPerPage
      *
-     * @throws Magento\Framework\Exception\LocalizedException
-     * @throws Magento\Framework\Exception\NoSuchEntityException
+     * @throws NoSuchEntityException
+     * @throws LocalizedException
      */
-    protected function processFullReindex($storeId, $categoriesPerPage)
+    protected function processFullReindex(int $storeId, int $categoriesPerPage): void
     {
         /** @uses IndicesConfigurator::saveConfigurationToAlgolia() */
         $this->queue->addToQueue(IndicesConfigurator::class, 'saveConfigurationToAlgolia', ['storeId' => $storeId]);