MAGE-878: include non visible product to index logic updated.

algolia · Jul 10, 2024 · 5c87a66 · 5c87a66
1 parent 5d4170d
commit 5c87a66
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 5 deletions.
diff --git a/Helper/Data.php b/Helper/Data.php
@@ -376,7 +376,7 @@ public function rebuildStoreProductIndex(int $storeId, array $productIds): void
         $this->logger->start('Indexing');
         try {
             $this->logger->start('ok');
-            $onlyVisible = $this->configHelper->includeNonVisibleProductsInIndex();
+            $onlyVisible = !$this->configHelper->includeNonVisibleProductsInIndex($storeId);
             $collection = $this->productHelper->getProductCollectionQuery($storeId, $productIds, $onlyVisible);
             $size = $collection->getSize();
             if (!empty($productIds)) {
@@ -421,7 +421,8 @@ public function rebuildProductIndex(int $storeId, ?array $productIds, int $page,
         if ($this->isIndexingEnabled($storeId) === false) {
             return;
         }
-        $collection = $this->productHelper->getProductCollectionQuery($storeId, null, $useTmpIndex);
+        $onlyVisible = !$this->configHelper->includeNonVisibleProductsInIndex($storeId);
+        $collection = $this->productHelper->getProductCollectionQuery($storeId, null, $onlyVisible);
         $this->rebuildStoreProductIndexPage($storeId, $collection, $page, $pageSize, null, $productIds, $useTmpIndex);
     }
 
@@ -928,7 +929,8 @@ public function getIndexDataByStoreIds(): array
      */
     protected function deleteInactiveIds($storeId, $objectIds, $indexName): void
     {
-        $collection = $this->productHelper->getProductCollectionQuery($storeId, $objectIds);
+        $onlyVisible = !$this->configHelper->includeNonVisibleProductsInIndex($storeId);
+        $collection = $this->productHelper->getProductCollectionQuery($storeId, $objectIds, $onlyVisible);
         $dbIds = $collection->getAllIds();
         $collection = null;
         $idsToDeleteFromAlgolia = array_diff($objectIds, $dbIds);

diff --git a/Model/Indexer/Product.php b/Model/Indexer/Product.php
@@ -95,7 +95,8 @@ public function execute($productIds)
             }
 
             $useTmpIndex = $this->configHelper->isQueueActive($storeId);
-            $collection = $this->productHelper->getProductCollectionQuery($storeId, $productIds, $useTmpIndex);
+            $onlyVisible = !$this->configHelper->includeNonVisibleProductsInIndex();
+            $collection = $this->productHelper->getProductCollectionQuery($storeId, $productIds, $onlyVisible);
             $size = $collection->getSize();
 
             $pages = ceil($size / $productsPerPage);

diff --git a/ViewModel/Recommend/Cart.php b/ViewModel/Recommend/Cart.php
@@ -64,7 +64,8 @@ public function getAllCartItems()
             $cartItems[] = $item->getProductId();
         }
         $storeId = $this->storeManager->getStore()->getId();
-        $cartProductCollection = $this->productHelper->getProductCollectionQuery($storeId, array_unique($cartItems));
+        $onlyVisible = !$this->configHelper->includeNonVisibleProductsInIndex();
+        $cartProductCollection = $this->productHelper->getProductCollectionQuery($storeId, array_unique($cartItems), $onlyVisible);
         if ($cartProductCollection->getSize() > 0 ){
             foreach ($cartProductCollection as $product) {
                 $visibleCartItem[] = $product->getId();