MAGE-1122 Integrate with 3.15

Author: cammonro

Service/Product/IndexBuilder.php

@@ -26,15 +26,16 @@ class IndexBuilder extends AbstractIndexBuilder implements UpdatableIndexBuilder
     protected IndexerInterface $priceIndexer;
 
     public function __construct(
-        protected ConfigHelper       $configHelper,
-        protected DiagnosticsLogger  $logger,
-        protected Emulation          $emulation,
-        protected ScopeCodeResolver  $scopeCodeResolver,
-        protected AlgoliaHelper      $algoliaHelper,
-        protected ProductHelper      $productHelper,
-        protected ResourceConnection $resource,
-        protected ManagerInterface   $eventManager,
-        IndexerRegistry              $indexerRegistry
+        protected ConfigHelper             $configHelper,
+        protected DiagnosticsLogger        $logger,
+        protected Emulation                $emulation,
+        protected ScopeCodeResolver        $scopeCodeResolver,
+        protected AlgoliaHelper            $algoliaHelper,
+        protected ProductHelper            $productHelper,
+        protected ResourceConnection       $resource,
+        protected ManagerInterface         $eventManager,
+        protected MissingPriceIndexHandler $missingPriceIndexHandler,
+        IndexerRegistry                    $indexerRegistry
     ){
         parent::__construct($configHelper, $logger, $emulation, $scopeCodeResolver, $algoliaHelper);
 
@@ -106,12 +107,6 @@ public function buildIndex(int $storeId, ?array $entityIds, ?array $options): vo
      */
     protected function rebuildEntityIds(int $storeId, array $productIds): void
     {
-        if ($this->isIndexingEnabled($storeId) === false) {
-            return;
-        }
-
-        $this->checkPriceIndex($productIds);
-
         $this->startEmulation($storeId);
         $this->logger->start('Indexing');
         try {
@@ -239,6 +234,11 @@ protected function buildIndexPage(
                 'store'      => $storeId
             ]
         );
+
+        if ($this->configHelper->isAutoPriceIndexingEnabled($storeId)) {
+            $this->missingPriceIndexHandler->refreshPriceIndex($collection);
+        }
+
         $logMessage = 'LOADING: ' . $this->logger->getStoreName($storeId) . ',
             collection page: ' . $page . ',
             pageSize: ' . $pageSize;

Service/Product/MissingPriceIndexHandler.php

@@ -2,7 +2,8 @@
 
 namespace Algolia\AlgoliaSearch\Service\Product;
 
-use Algolia\AlgoliaSearch\Helper\Logger;
+use Algolia\AlgoliaSearch\Exception\DiagnosticsException;
+use Algolia\AlgoliaSearch\Logger\DiagnosticsLogger;
 use Magento\Catalog\Model\ResourceModel\Product\Collection as ProductCollection;
 use Magento\Catalog\Model\ResourceModel\Product\CollectionFactory;
 use Magento\Framework\App\ResourceConnection;
@@ -24,7 +25,7 @@ class MissingPriceIndexHandler
     public function __construct(
         protected CollectionFactory $productCollectionFactory,
         protected ResourceConnection $resourceConnection,
-        protected Logger $logger,
+        protected DiagnosticsLogger $diagnostics,
         IndexerRegistry $indexerRegistry
     )
     {
@@ -34,19 +35,23 @@ public function __construct(
     /**
      * @param string[]|ProductCollection $products
      * @return string[] Array of product IDs that were reindexed by this repair operation
+     * @throws DiagnosticsException
      */
     public function refreshPriceIndex(array|ProductCollection $products): array
     {
+        $this->diagnostics->startProfiling(__METHOD__);
         $reindexIds = $this->getProductIdsToReindex($products);
         if (empty($reindexIds)) {
+            $this->diagnostics->stopProfiling(__METHOD__);
             return [];
         }
 
-        $this->logger->log(__("Pricing records missing or invalid for %1 product(s)", count($reindexIds)));
-        $this->logger->log(__("Reindexing product ID(s): %1", implode(', ', $reindexIds)));
+        $this->diagnostics->log(__("Pricing records missing or invalid for %1 product(s)", count($reindexIds)));
+        $this->diagnostics->log(__("Reindexing product ID(s): %1", implode(', ', $reindexIds)));
 
         $this->indexer->reindexList($reindexIds);
 
+        $this->diagnostics->stopProfiling(__METHOD__);
         return $reindexIds;
     }
 
@@ -122,7 +127,7 @@ protected function getProductIdsFromCollection(ProductCollection $collection): a
         try {
             $joins = $select->getPart(Zend_Db_Select::FROM);
         } catch (\Zend_Db_Select_Exception $e) {
-            $this->logger->error("Unable to build query for missing product prices: " . $e->getMessage());
+            $this->diagnostics->error("Unable to build query for missing product prices: " . $e->getMessage());
             return [];
         }