Issue #3396152 by mkalkbrenner, neclimdul: PostCreateIndexDocumentsEv…

…ent misses the index
mkalkbrenner · Oct 24, 2023 · 2f2ebec · 2f2ebec
1 parent 4fccfb5
commit 2f2ebec
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 5 deletions.
diff --git a/src/Event/AbstractSearchApiItemSolariumDocumentEvent.php b/src/Event/AbstractSearchApiItemSolariumDocumentEvent.php
@@ -2,14 +2,14 @@
 
 namespace Drupal\search_api_solr\Event;
 
-use Drupal\Component\EventDispatcher\Event;
+use Drupal\search_api\IndexInterface;
 use Drupal\search_api\Item\ItemInterface;
 use Solarium\Core\Query\DocumentInterface;
 
 /**
  * Search API Solr event base class.
  */
-abstract class AbstractSearchApiItemSolariumDocumentEvent extends Event {
+abstract class AbstractSearchApiItemSolariumDocumentEvent extends AbstractIndexAwareEvent {
 
   /**
    * The search_api query.
@@ -33,7 +33,8 @@ abstract class AbstractSearchApiItemSolariumDocumentEvent extends Event {
    * @param \Solarium\Core\Query\DocumentInterface $solarium_document
    *   The solarium document.
    */
-  public function __construct(ItemInterface $search_api_item, DocumentInterface $solarium_document) {
+  public function __construct(ItemInterface $search_api_item, DocumentInterface $solarium_document, IndexInterface $index) {
+    parent::__construct($index);
     $this->searchApiItem = $search_api_item;
     $this->solariumDocument = $solarium_document;
   }

diff --git a/src/Plugin/search_api/backend/SearchApiSolrBackend.php b/src/Plugin/search_api/backend/SearchApiSolrBackend.php
@@ -1273,7 +1273,7 @@ public function getDocuments(IndexInterface $index, array $items, UpdateQuery $u
       $boost_terms = [];
 
       /** @var \Solarium\QueryType\Update\Query\Document $doc */
-      $event = new PreCreateIndexDocumentEvent($item, $update_query->createDocument());
+      $event = new PreCreateIndexDocumentEvent($item, $update_query->createDocument(), $index);
       $this->dispatch($event);
       $doc = $event->getSolariumDocument();
 
@@ -1440,7 +1440,7 @@ public function getDocuments(IndexInterface $index, array $items, UpdateQuery $u
       }
 
       if ($doc) {
-        $event = new PostCreateIndexDocumentEvent($item, $doc);
+        $event = new PostCreateIndexDocumentEvent($item, $doc, $index);
         $this->dispatch($event);
         $documents[] = $event->getSolariumDocument();
       }