Merge pull request #71 from matt-in-a-hat/fix-reindex-all-job-index-n…

…ame-error Fix ReindexAllJob error using class name for index name
wilr · Jul 18, 2024 · c584e2a · c584e2a
2 parents 1fe0229 + 78c6712
commit c584e2a
Show file tree

Hide file tree

Showing 7 changed files with 45 additions and 36 deletions.
diff --git a/src/Extensions/AlgoliaObjectExtension.php b/src/Extensions/AlgoliaObjectExtension.php
@@ -236,7 +236,7 @@ public function doImmediateIndexInAlgolia(): bool
                 return true;
             }
         } catch (Throwable $e) {
-            Injector::inst()->create(LoggerInterface::class)->error($e);
+            Injector::inst()->get(LoggerInterface::class)->error($e);
 
             $schema = DataObject::getSchema();
             $table = $schema->tableForField($this->owner->ClassName, 'AlgoliaError');
@@ -291,7 +291,7 @@ public function removeFromAlgolia(): bool
 
                 $this->markAsRemovedFromAlgoliaIndex();
             } catch (Throwable $e) {
-                Injector::inst()->create(LoggerInterface::class)->error($e);
+                Injector::inst()->get(LoggerInterface::class)->error($e);
 
                 return false;
             }

diff --git a/src/Jobs/AlgoliaDeleteItemJob.php b/src/Jobs/AlgoliaDeleteItemJob.php
@@ -55,7 +55,7 @@ public function process()
             $indexer = Injector::inst()->create(AlgoliaIndexer::class);
             $indexer->deleteItem($this->itemClass, $this->itemUUID);
         } catch (Throwable $e) {
-            Injector::inst()->create(LoggerInterface::class)->error($e);
+            Injector::inst()->get(LoggerInterface::class)->error($e);
         }
 
         $this->isComplete = true;

diff --git a/src/Jobs/AlgoliaReindexAllJob.php b/src/Jobs/AlgoliaReindexAllJob.php
@@ -104,49 +104,58 @@ public function process()
             return;
         }
 
+        $algoliaService = Injector::inst()->create(AlgoliaService::class);
         $task = new AlgoliaReindex();
 
         $batchSize = $task->config()->get('batch_size');
         $batching = $this->config()->get('use_batching');
 
         foreach ($remainingChildren as $class => $ids) {
-            $take = array_slice($ids, 0, $batchSize);
-            $this->indexData[$class] = array_slice($ids, $batchSize);
+            foreach ($algoliaService->indexes as $indexName => $index) {
+                $classes = (isset($index['includeClasses'])) ? $index['includeClasses'] : [];
 
-            if (!empty($take)) {
-                $this->currentStep += count($take);
-                $errors = [];
+                if (!in_array($class, $classes)) {
+                    continue;
+                }
 
-                try {
-                    if ($batching) {
-                        if ($task->indexItems($class, DataObject::get($class)->filter('ID', $take), false)) {
-                            $this->addMessage('Successfully indexing ' . $class . ' [' . implode(', ', $take) . ']');
-                        } else {
-                            $this->addMessage('Error indexing ' . $class . ' [' . implode(', ', $take) . ']');
-                        }
-                    } else {
-                        $items = DataObject::get($class)->filter('ID', $take);
+                $take = array_slice($ids, 0, $batchSize);
+                $this->indexData[$class] = array_slice($ids, $batchSize);
+
+                if (!empty($take)) {
+                    $this->currentStep += count($take);
+                    $errors = [];
 
-                        foreach ($items as $item) {
-                            if ($task->indexItem($item)) {
-                                $this->addMessage('Successfully indexed ' . $class . ' [' . $item->ID . ']');
+                    try {
+                        if ($batching) {
+                            if ($task->indexItems($indexName, DataObject::get($class)->filter('ID', $take), false)) {
+                                $this->addMessage('Successfully indexing ' . $class . ' [' . implode(', ', $take) . ']');
                             } else {
-                                $this->addMessage('Error indexing ' . $class . ' [' . $item->ID . ']');
+                                $this->addMessage('Error indexing ' . $class . ' [' . implode(', ', $take) . ']');
+                            }
+                        } else {
+                            $items = DataObject::get($class)->filter('ID', $take);
+
+                            foreach ($items as $item) {
+                                if ($task->indexItem($item)) {
+                                    $this->addMessage('Successfully indexed ' . $class . ' [' . $item->ID . ']');
+                                } else {
+                                    $this->addMessage('Error indexing ' . $class . ' [' . $item->ID . ']');
+                                }
                             }
                         }
-                    }
 
-                    $errors = $task->getErrors();
-                } catch (Throwable $e) {
-                    $errors[] = $e->getMessage();
-                }
+                        $errors = $task->getErrors();
+                    } catch (Throwable $e) {
+                        $errors[] = $e->getMessage();
+                    }
 
-                if (!empty($errors)) {
-                    $this->addMessage(implode(', ', $errors));
-                    $task->clearErrors();
+                    if (!empty($errors)) {
+                        $this->addMessage(implode(', ', $errors));
+                        $task->clearErrors();
+                    }
+                } else {
+                    unset($this->indexData[$class]);
                 }
-            } else {
-                unset($this->indexData[$class]);
             }
         }
     }

diff --git a/src/Service/AlgoliaIndexer.php b/src/Service/AlgoliaIndexer.php
@@ -324,7 +324,7 @@ public function exportAttributesFromRelationship($item, $relationship, $attribut
 
             $attributes->push($relationship, $data);
         } catch (Throwable $e) {
-            Injector::inst()->create(LoggerInterface::class)->error($e);
+            Injector::inst()->get(LoggerInterface::class)->error($e);
         }
     }
 

diff --git a/src/Service/AlgoliaPageCrawler.php b/src/Service/AlgoliaPageCrawler.php
@@ -117,7 +117,7 @@ public function getMainContent(): string
                 }
             }
         } catch (Throwable $e) {
-            Injector::inst()->create(LoggerInterface::class)->error($e);
+            Injector::inst()->get(LoggerInterface::class)->error($e);
         }
 
         SSViewer::set_themes($oldThemes);

diff --git a/src/Service/AlgoliaService.php b/src/Service/AlgoliaService.php
@@ -141,7 +141,7 @@ public function initIndexes($item = null, $excludeReplicas = true)
                 return [];
             }
         } catch (Throwable $e) {
-            Injector::inst()->create(LoggerInterface::class)->error($e);
+            Injector::inst()->get(LoggerInterface::class)->error($e);
 
             if (Director::isDev()) {
                 Debug::message($e->getMessage());
@@ -277,7 +277,7 @@ function ($replica) {
 
                         $index->setSettings($data['indexSettings']);
                     } catch (Throwable $e) {
-                        Injector::inst()->create(LoggerInterface::class)->error($e);
+                        Injector::inst()->get(LoggerInterface::class)->error($e);
 
 
                         return false;

diff --git a/src/Tasks/AlgoliaReindex.php b/src/Tasks/AlgoliaReindex.php
@@ -308,7 +308,7 @@ public function indexBatch($indexName, $items): bool
 
             return true;
         } catch (Throwable $e) {
-            Injector::inst()->create(LoggerInterface::class)->error($e);
+            Injector::inst()->get(LoggerInterface::class)->error($e);
 
             if (Director::isDev()) {
                 Debug::message($e->getMessage());