NGSTACK-836 parent child indexer

netgen · Mar 22, 2024 · 047fd32 · 047fd32
1 parent 9af5bf6
commit 047fd32
Show file tree

Hide file tree

Showing 36 changed files with 1,691 additions and 9 deletions.
diff --git a/bundle/DependencyInjection/Configuration.php b/bundle/DependencyInjection/Configuration.php
@@ -25,6 +25,8 @@ public function getConfigTreeBuilder(): TreeBuilder
         $this->addIndexableFieldTypeSection($rootNode);
         $this->addSearchResultExtractorSection($rootNode);
         $this->addAsynchronousIndexingSection($rootNode);
+        $this->addParentChildIndexingSection($rootNode);
+
 
         return $treeBuilder;
     }
@@ -73,4 +75,15 @@ private function addAsynchronousIndexingSection(ArrayNodeDefinition $nodeDefinit
                 ->end()
             ->end();
     }
+
+    private function addParentChildIndexingSection(ArrayNodeDefinition $nodeDefinition): void
+    {
+        $nodeDefinition
+            ->children()
+                ->booleanNode('use_parent_child_indexing')
+                    ->info('Use parent child indexing')
+                    ->defaultFalse()
+                ->end()
+            ->end();
+    }
 }
diff --git a/lib/Container/Compiler/AsynchronousIndexingPass.php b/lib/Container/Compiler/AsynchronousIndexingPass.php
@@ -37,6 +37,7 @@ public function process(ContainerBuilder $container): void
             ->setDecoratedService(CoreContentEventSubscriber::class)
             ->setArguments([
                 new Reference('netgen.ibexa_search_extra.asynchronous_indexing.messenger.bus'),
+                new Reference('ibexa.api.service.location'),
             ]);
 
         $container

diff --git a/lib/Core/Search/Common/EventSubscriber/ContentEventSubscriber.php b/lib/Core/Search/Common/EventSubscriber/ContentEventSubscriber.php
@@ -12,6 +12,7 @@
 use Ibexa\Contracts\Core\Repository\Events\Content\PublishVersionEvent;
 use Ibexa\Contracts\Core\Repository\Events\Content\RevealContentEvent;
 use Ibexa\Contracts\Core\Repository\Events\Content\UpdateContentMetadataEvent;
+use Ibexa\Contracts\Core\Repository\LocationService;
 use Netgen\IbexaSearchExtra\Core\Search\Common\Messenger\Message\Search\Content\CopyContent;
 use Netgen\IbexaSearchExtra\Core\Search\Common\Messenger\Message\Search\Content\DeleteContent;
 use Netgen\IbexaSearchExtra\Core\Search\Common\Messenger\Message\Search\Content\DeleteTranslation;
@@ -25,8 +26,11 @@
 
 class ContentEventSubscriber implements EventSubscriberInterface
 {
+    private array $contentParentLocations = [];
     public function __construct(
         private readonly MessageBusInterface $messageBus,
+        private readonly LocationService $locationService,
+
     ) {}
 
     public static function getSubscribedEvents(): array
@@ -55,26 +59,24 @@ public function onCopyContent(CopyContentEvent $event): void
 
     public function onBeforeDeleteContent(BeforeDeleteContentEvent $event): void
     {
+        $contentLocations = $this->locationService->loadLocations($event->getContentInfo());
         try {
-            $event->getContentInfo()->getMainLocation()?->parentLocationId;
+            foreach ($contentLocations as $contentLocation){
+                $this->contentParentLocations[] = $contentLocation->parentLocationId;
+            }
         } catch (Throwable) {
             // does nothing
         }
     }
 
     public function onDeleteContent(DeleteContentEvent $event): void
     {
-        try {
-            $mainLocationParentLocationId = $event->getContentInfo()->getMainLocation()?->parentLocationId;
-        } catch (Throwable) {
-            $mainLocationParentLocationId = null;
-        }
-
+        $parentLocationIds = $this->contentParentLocations ?? [];
         $this->messageBus->dispatch(
             new DeleteContent(
                 $event->getContentInfo()->id,
                 $event->getLocations(),
-                $mainLocationParentLocationId,
+                $parentLocationIds,
             ),
         );
     }

diff --git a/lib/Core/Search/Common/Messenger/Message/Search/Content/DeleteContent.php b/lib/Core/Search/Common/Messenger/Message/Search/Content/DeleteContent.php
@@ -12,6 +12,6 @@ final class DeleteContent
     public function __construct(
         public readonly int $contentId,
         public readonly array $locationIds,
-        public readonly ?int $mainLocationParentLocationId,
+        public readonly ?array $parentLocationIds,
     ) {}
 }
diff --git a/...ore/Search/Common/Messenger/MessageHandler/Search/ParentChildIndexing/AncestorIndexer.php b/...ore/Search/Common/Messenger/MessageHandler/Search/ParentChildIndexing/AncestorIndexer.php
@@ -0,0 +1,82 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Netgen\IbexaSearchExtra\Core\Search\Common\Messenger\MessageHandler\Search\ParentChildIndexing;
+
+use Netgen\IbexaSearchExtra\Core\Search\Solr\ParentChildReindexAncestorResolver;
+use Ibexa\Contracts\Core\Persistence\Content\Handler as ContentHandler;
+use Ibexa\Contracts\Core\Persistence\Content\Location;
+use Ibexa\Contracts\Core\Repository\Exceptions\NotFoundException;
+use Ibexa\Contracts\Core\Search\VersatileHandler;
+
+final class AncestorIndexer
+{
+    public function __construct(
+        private readonly VersatileHandler $searchHandler,
+        private readonly ContentHandler $contentHandler,
+        private readonly ParentChildReindexAncestorResolver $ancestorResolver,
+    ) {}
+
+    public function indexSingle(Location $location): void
+    {
+        $ancestor = $this->ancestorResolver->resolveAncestor($location);
+
+
+        if ($ancestor === null) {
+            return;
+        }
+
+        try {
+            $content = $this->contentHandler->load($ancestor->contentId);
+        } catch (NotFoundException) {
+            return;
+        }
+
+        $this->searchHandler->indexContent($content);
+        $this->searchHandler->indexLocation($ancestor);
+    }
+
+    /**
+     * @param \Ibexa\Contracts\Core\Persistence\Content\Location $location
+     */
+    public function indexSingleForDeleteContent(Location $location): void
+    {
+        $ancestor = $this->ancestorResolver->resolveAncestorForDeleteContent($location);
+
+        if ($ancestor === null) {
+            return;
+        }
+
+        try {
+            $content = $this->contentHandler->load($ancestor->contentId);
+        } catch (NotFoundException) {
+            return;
+        }
+
+        $this->searchHandler->indexContent($content);
+        $this->searchHandler->indexLocation($ancestor);
+    }
+
+    /**
+     * @param \Ibexa\Contracts\Core\Persistence\Content\Location[] $locations
+     */
+    public function indexMultiple(array $locations): void
+    {
+        foreach ($locations as $location) {
+            $this->indexSingle($location);
+        }
+    }
+
+    /***
+     * @param \Ibexa\Contracts\Core\Persistence\Content\Location[] $locations
+     */
+    public function indexMultipleForDeleteContent(array $locations): void
+    {
+        $this->indexMultiple($locations);
+
+        foreach ($locations as $location) {
+            $this->indexSingleForDeleteContent($location);
+        }
+    }
+}
diff --git a/...Common/Messenger/MessageHandler/Search/ParentChildIndexing/Content/CopyContentHandler.php b/...Common/Messenger/MessageHandler/Search/ParentChildIndexing/Content/CopyContentHandler.php
@@ -0,0 +1,26 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Netgen\IbexaSearchExtra\Core\Search\Common\Messenger\MessageHandler\Search\ParentChildIndexing\Content;
+
+use Netgen\IbexaSearchExtra\Core\Search\Common\Messenger\MessageHandler\Search\ParentChildIndexing\AncestorIndexer;
+use Ibexa\Contracts\Core\Persistence\Content\Location\Handler as LocationHandler;
+use Netgen\IbexaSearchExtra\Core\Search\Common\Messenger\Message\Search\Content\CopyContent;
+
+final class CopyContentHandler
+{
+    public function __construct(
+        private readonly LocationHandler $locationHandler,
+        private readonly AncestorIndexer $ancestorIndexer,
+    ) {}
+
+    public function __invoke(CopyContent $message): void
+    {
+        $this->ancestorIndexer->indexMultiple(
+            $this->locationHandler->loadLocationsByContent(
+                $message->contentId,
+            ),
+        );
+    }
+}
diff --git a/...mmon/Messenger/MessageHandler/Search/ParentChildIndexing/Content/DeleteContentHandler.php b/...mmon/Messenger/MessageHandler/Search/ParentChildIndexing/Content/DeleteContentHandler.php
@@ -0,0 +1,53 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Netgen\IbexaSearchExtra\Core\Search\Common\Messenger\MessageHandler\Search\ParentChildIndexing\Content;
+
+use Netgen\IbexaSearchExtra\Core\Search\Common\Messenger\MessageHandler\Search\ParentChildIndexing\AncestorIndexer;
+use Ibexa\Contracts\Core\Persistence\Content\Location\Handler as LocationHandler;
+use Ibexa\Contracts\Core\Repository\Exceptions\NotFoundException;
+use Netgen\IbexaSearchExtra\Core\Search\Common\Messenger\Message\Search\Content\DeleteContent;
+use Psr\Log\LoggerInterface;
+use Psr\Log\NullLogger;
+
+use function sprintf;
+
+final class DeleteContentHandler
+{
+    public function __construct(
+        private readonly LocationHandler $locationHandler,
+        private readonly AncestorIndexer $ancestorIndexer,
+        private readonly LoggerInterface $logger = new NullLogger(),
+    ) {}
+
+    public function __invoke(DeleteContent $message): void
+    {
+        if ($message->parentLocationIds === []) {
+            $this->logger->info(
+                sprintf(
+                    '%s: Could not find main Location parent Location ID for deleted Content #%d, aborting',
+                    $this::class,
+                    $message->contentId,
+                ),
+            );
+
+            return;
+        }
+        $locations = [];
+        foreach ($message->parentLocationIds as $locationId) {
+            try {
+                $locations[] = $this->locationHandler->load($locationId);
+            } catch (NotFoundException) {
+                $this->logger->info(
+                sprintf(
+                    '%s: Location #%d is gone, aborting',
+                    $this::class,
+                    $locationId,
+                ),
+            );
+            }
+        }
+        $this->ancestorIndexer->indexMultipleForDeleteContent($locations);
+    }
+}
diff --git a/.../Messenger/MessageHandler/Search/ParentChildIndexing/Content/DeleteTranslationHandler.php b/.../Messenger/MessageHandler/Search/ParentChildIndexing/Content/DeleteTranslationHandler.php
@@ -0,0 +1,56 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Netgen\IbexaSearchExtra\Core\Search\Common\Messenger\MessageHandler\Search\ParentChildIndexing\Content;
+
+use Netgen\IbexaSearchExtra\Core\Search\Common\Messenger\MessageHandler\Search\ParentChildIndexing\AncestorIndexer;
+use Ibexa\Contracts\Core\Persistence\Content\ContentInfo;
+use Ibexa\Contracts\Core\Persistence\Content\Handler as ContentHandler;
+use Ibexa\Contracts\Core\Persistence\Content\Location\Handler as LocationHandler;
+use Ibexa\Contracts\Core\Repository\Exceptions\NotFoundException;
+use Netgen\IbexaSearchExtra\Core\Search\Common\Messenger\Message\Search\Content\DeleteTranslation;
+use Psr\Log\LoggerInterface;
+use Psr\Log\NullLogger;
+use Symfony\Component\Messenger\Attribute\AsMessageHandler;
+
+use function sprintf;
+
+final class DeleteTranslationHandler
+{
+    public function __construct(
+        private readonly ContentHandler $contentHandler,
+        private readonly LocationHandler $locationHandler,
+        private readonly AncestorIndexer $ancestorIndexer,
+        private readonly LoggerInterface $logger = new NullLogger(),
+    ) {}
+
+    public function __invoke(DeleteTranslation $message): void
+    {
+        try {
+            $contentInfo = $this->contentHandler->loadContentInfo(
+                $message->contentId,
+            );
+        } catch (NotFoundException) {
+            $this->logger->info(
+                sprintf(
+                    '%s: Content #%d is gone, aborting',
+                    $this::class,
+                    $message->contentId,
+                ),
+            );
+
+            return;
+        }
+
+        if ($contentInfo->status !== ContentInfo::STATUS_PUBLISHED) {
+            return;
+        }
+
+        $this->ancestorIndexer->indexMultiple(
+            $this->locationHandler->loadLocationsByContent(
+                $message->contentId,
+            ),
+        );
+    }
+}
diff --git a/...Common/Messenger/MessageHandler/Search/ParentChildIndexing/Content/HideContentHandler.php b/...Common/Messenger/MessageHandler/Search/ParentChildIndexing/Content/HideContentHandler.php
@@ -0,0 +1,26 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Netgen\IbexaSearchExtra\Core\Search\Common\Messenger\MessageHandler\Search\ParentChildIndexing\Content;
+
+use Netgen\IbexaSearchExtra\Core\Search\Common\Messenger\MessageHandler\Search\ParentChildIndexing\AncestorIndexer;
+use Ibexa\Contracts\Core\Persistence\Content\Location\Handler as LocationHandler;
+use Netgen\IbexaSearchExtra\Core\Search\Common\Messenger\Message\Search\Content\HideContent;
+
+final class HideContentHandler
+{
+    public function __construct(
+        private readonly LocationHandler $locationHandler,
+        private readonly AncestorIndexer $ancestorIndexer,
+    ) {}
+
+    public function __invoke(HideContent $message): void
+    {
+        $this->ancestorIndexer->indexMultiple(
+            $this->locationHandler->loadLocationsByContent(
+                $message->contentId,
+            ),
+        );
+    }
+}
diff --git a/...mon/Messenger/MessageHandler/Search/ParentChildIndexing/Content/PublishVersionHandler.php b/...mon/Messenger/MessageHandler/Search/ParentChildIndexing/Content/PublishVersionHandler.php
@@ -0,0 +1,27 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Netgen\IbexaSearchExtra\Core\Search\Common\Messenger\MessageHandler\Search\ParentChildIndexing\Content;
+
+use Netgen\IbexaSearchExtra\Core\Search\Common\Messenger\MessageHandler\Search\ParentChildIndexing\AncestorIndexer;
+use Ibexa\Contracts\Core\Persistence\Content\Location\Handler as LocationHandler;
+use Netgen\IbexaSearchExtra\Core\Search\Common\Messenger\Message\Search\Content\PublishVersion;
+use Symfony\Component\Messenger\Attribute\AsMessageHandler;
+
+final class PublishVersionHandler
+{
+    public function __construct(
+        private readonly LocationHandler $locationHandler,
+        private readonly AncestorIndexer $ancestorIndexer,
+    ) {}
+
+    public function __invoke(PublishVersion $message): void
+    {
+        $this->ancestorIndexer->indexMultiple(
+            $this->locationHandler->loadLocationsByContent(
+                $message->contentId,
+            ),
+        );
+    }
+}
diff --git a/...mmon/Messenger/MessageHandler/Search/ParentChildIndexing/Content/RevealContentHandler.php b/...mmon/Messenger/MessageHandler/Search/ParentChildIndexing/Content/RevealContentHandler.php
@@ -0,0 +1,26 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Netgen\IbexaSearchExtra\Core\Search\Common\Messenger\MessageHandler\Search\ParentChildIndexing\Content;
+
+use Netgen\IbexaSearchExtra\Core\Search\Common\Messenger\MessageHandler\Search\ParentChildIndexing\AncestorIndexer;
+use Ibexa\Contracts\Core\Persistence\Content\Location\Handler as LocationHandler;
+use Netgen\IbexaSearchExtra\Core\Search\Common\Messenger\Message\Search\Content\RevealContent;
+
+final class RevealContentHandler
+{
+    public function __construct(
+        private readonly LocationHandler $locationHandler,
+        private readonly AncestorIndexer $ancestorIndexer,
+    ) {}
+
+    public function __invoke(RevealContent $message): void
+    {
+        $this->ancestorIndexer->indexMultiple(
+            $this->locationHandler->loadLocationsByContent(
+                $message->contentId,
+            ),
+        );
+    }
+}