Update ElementIndexerService.php

add method to delete jobs in queue

Update Elasticsearch.php

Add deleting also for assets

Author: sfsmfc

src/Elasticsearch.php

@@ -100,6 +100,21 @@ function (Event $event) {
                 }
             );
 
+            // Remove asset from the index upon deletion
+            Event::on(
+                Asset::class,
+                Asset::EVENT_AFTER_DELETE,
+                function (Event $event) {
+                    /** @var Asset $asset */
+                    $asset = $event->sender;
+                    try {
+                        $this->elementIndexerService->deleteElement($asset);
+                    } catch (Exception $e) {
+                        // Noop, the element must have already been deleted
+                    }
+                }
+            );
+
             // Index entry, asset & products upon save (creation or update)
             Event::on(Entry::class, Entry::EVENT_AFTER_SAVE, [$this, 'onElementSaved']);
             Event::on(Asset::class, Asset::EVENT_AFTER_SAVE, [$this, 'onElementSaved']);

src/services/ElementIndexerService.php

@@ -22,7 +22,9 @@
 use craft\helpers\UrlHelper;
 use lhs\elasticsearch\Elasticsearch as ElasticsearchPlugin;
 use lhs\elasticsearch\exceptions\IndexElementException;
+use lhs\elasticsearch\jobs\IndexElementJob;
 use lhs\elasticsearch\records\ElasticsearchRecord;
+use yii\db\Query;
 
 /**
  */
@@ -94,6 +96,7 @@ public function indexElement(Element $element): ?string
 
     /**
      * Removes an entry from  the Elasticsearch index
+     *
      * @param Element $element The entry to delete
      * @return int The number of rows deleted
      * @throws \yii\elasticsearch\Exception If the entry to be deleted cannot be found
@@ -102,11 +105,46 @@ public function deleteElement(Element $element): int
     {
         Craft::info("Deleting entry #{$element->id}: {$element->url}", __METHOD__);
 
+        $this->deleteElementFromQueue($element);
+
         ElasticsearchRecord::$siteId = $element->siteId;
 
         return ElasticsearchRecord::deleteAll(['_id' => $element->id]);
     }
 
+    /**
+     * Removes all entries for an element from queue
+     * @param Element $element
+     * @return void
+     * @throws \yii\base\InvalidConfigException
+     */
+    protected function deleteElementFromQueue(Element $element): void
+    {
+        $job = new IndexElementJob(
+            [
+                'siteId' => $element->getSite()->id,
+                'elementId' => $element->id,
+                'type' => get_class($element),
+            ]
+        );
+
+        $queueService = Craft::$app->getQueue();
+        $queueClass = get_class($queueService);
+
+        $entries = (new Query())
+            ->from($queueClass::TABLE)
+            ->where([
+                'job' => Craft::$app->getQueue()->serializer->serialize($job)
+            ])->all();
+
+        foreach ($entries as $entry) {
+            if (isset($entry['id'])) {
+                $methodName = $queueService instanceof \yii\queue\db\Queue ? 'remove' : 'release';
+                $queueService->$methodName($entry['id']);
+            }
+        }
+    }
+
     /**
      * Get the reason why an entry should NOT be reindex.
      * @param Element $element The element to consider for reindexing