NGSTACK-843 register elasticsearch services in compiler pass

netgen · Aug 16, 2024 · b628a66 · b628a66
1 parent 33dd70d
commit b628a66
Show file tree

Hide file tree

Showing 2 changed files with 28 additions and 23 deletions.
diff --git a/lib/Container/Compiler/ElasticsearchExtensibleDocumentFactoryPass.php b/lib/Container/Compiler/ElasticsearchExtensibleDocumentFactoryPass.php
@@ -7,6 +7,8 @@
 use Ibexa\Contracts\Core\Persistence\Content\Handler;
 use Ibexa\Elasticsearch\DocumentMapper\DocumentFactoryInterface;
 use Netgen\IbexaSearchExtra\Core\Search\Elasticsearch\DocumentMapper\DocumentFactory;
+use Netgen\IbexaSearchExtra\Core\Search\Elasticsearch\Query\CriterionVisitor\Content\VisibilityVisitor as ContentVisibilityVisitor;
+use Netgen\IbexaSearchExtra\Core\Search\Elasticsearch\Query\CriterionVisitor\Location\VisibilityVisitor as LocationVisibilityVisitor;
 use Symfony\Component\DependencyInjection\Compiler\CompilerPassInterface;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Component\DependencyInjection\Definition;
@@ -28,8 +30,34 @@ public function process(ContainerBuilder $container): void
         $this->processVisitors($container, 'content_translation');
         $this->processVisitors($container, 'location');
         $this->processVisitors($container, 'location_translation');
+
+        $this->processDocumentFactory($container);
+
+        $container
+            ->register(ContentVisibilityVisitor::class, ContentVisibilityVisitor::class)
+            ->addTag('ibexa.search.elasticsearch.query.content.criterion.visitor');
+
+        $container
+            ->register(LocationVisibilityVisitor::class, LocationVisibilityVisitor::class)
+            ->addTag('ibexa.search.elasticsearch.query.location.criterion.visitor');
     }
 
+    public function processDocumentFactory(ContainerBuilder $container): void
+    {
+        $container
+            ->register(DocumentFactory::class, DocumentFactory::class)
+            ->setDecoratedService(DocumentFactoryInterface::class)
+            ->setArguments([
+                new Reference('.inner'),
+                new Reference(Handler::class),
+                new Reference('netgen.ibexa_search_extra.elasticsearch.field_mapper.content.aggregate'),
+                new Reference('netgen.ibexa_search_extra.elasticsearch.field_mapper.location.aggregate'),
+                new Reference('netgen.ibexa_search_extra.elasticsearch.field_mapper.content_translation.aggregate'),
+                new Reference('netgen.ibexa_search_extra.elasticsearch.field_mapper.location_translation.aggregate'),
+                new Reference('netgen.ibexa_search_extra.elasticsearch.field_mapper.block.aggregate'),
+                new Reference('netgen.ibexa_search_extra.elasticsearch.field_mapper.block_translation.aggregate'),
+            ]);
+    }
 
     private function processVisitors(ContainerBuilder $container, string $name): void
     {

diff --git a/lib/Resources/config/search/elasticsearch/document_factory.yaml b/lib/Resources/config/search/elasticsearch/document_factory.yaml
@@ -16,26 +16,3 @@ services:
 
     netgen.ibexa_search_extra.elasticsearch.field_mapper.location.aggregate:
         class: Netgen\IbexaSearchExtra\Core\Search\Elasticsearch\DocumentMapper\LocationFieldMapper\Aggregate
-
-    netgen.ibexa_search_extra.elastic_search.content.visibility_visitor:
-        class: Netgen\IbexaSearchExtra\Core\Search\Elasticsearch\Query\CriterionVisitor\Content\VisibilityVisitor
-        tags:
-            - {name: ibexa.search.elasticsearch.query.content.criterion.visitor}
-
-    netgen.ibexa_search_extra.elastic_search.location.visibility_visitor:
-        class: Netgen\IbexaSearchExtra\Core\Search\Elasticsearch\Query\CriterionVisitor\Location\VisibilityVisitor
-        tags:
-            - {name: ibexa.search.elasticsearch.query.location.criterion.visitor}
-
-    netgen.ibexa_search_extra.elastic_search.document_factory:
-        class: Netgen\IbexaSearchExtra\Core\Search\Elasticsearch\DocumentMapper\DocumentFactory
-        decorates: Ibexa\Elasticsearch\DocumentMapper\DocumentFactoryInterface
-        arguments:
-            - '@.inner'
-            - '@Ibexa\Contracts\Core\Persistence\Content\Handler'
-            - 'netgen.ibexa_search_extra.elasticsearch.field_mapper.content.aggregate'
-            - 'netgen.ibexa_search_extra.elasticsearch.field_mapper.location.aggregate'
-            - 'netgen.ibexa_search_extra.elasticsearch.field_mapper.content_translation.aggregate'
-            - 'netgen.ibexa_search_extra.elasticsearch.field_mapper.location_translation.aggregate'
-            - 'netgen.ibexa_search_extra.elasticsearch.field_mapper.block.aggregate'
-            - 'netgen.ibexa_search_extra.elasticsearch.field_mapper.block_translation.aggregate'