implemented gathering documents from multiple sources

Author: Mantas Marcinkevicius

DependencyInjection/Compiler/MappingPass.php

@@ -23,18 +23,44 @@
 
 class MappingPass implements CompilerPassInterface
 {
+    /**
+     * @var array
+     */
+    private $indexes = [];
+
+    /**
+     * @var string
+     */
+    private $defaultIndex = null;
+
     public function process(ContainerBuilder $container)
+    {
+        $kernelDir = $container->getParameter('kernel.project_dir');
+
+        foreach ($container->getParameter(Configuration::ONGR_SOURCE_DIR) as $dir) {
+            $this->handleDirectoryMapping($container, $kernelDir . $dir);
+        }
+
+        $container->setParameter(Configuration::ONGR_INDEXES, $this->indexes);
+        $container->setParameter(
+            Configuration::ONGR_DEFAULT_INDEX,
+            $this->defaultIndex ?? current(array_keys($this->indexes))
+        );
+    }
+
+    /**
+     * @param ContainerBuilder $container
+     * @param string $dir
+     *
+     * @throws \ReflectionException
+     */
+    private function handleDirectoryMapping(ContainerBuilder $container, string $dir): void
     {
         /** @var DocumentParser $parser */
         $parser = $container->get(DocumentParser::class);
-        $indexes = [];
-        $defaultIndex = null;
         $indexesOverride = $container->getParameter(Configuration::ONGR_INDEXES_OVERRIDE);
 
-        foreach ($this->getNamespaces(
-            $container->getParameter('kernel.project_dir')
-                .$container->getParameter(Configuration::ONGR_SOURCE_DIR)
-        ) as $namespace) {
+        foreach ($this->getNamespaces($dir) as $namespace) {
             $class = new \ReflectionClass($namespace);
             /** @var Index $document */
             $document = $parser->getIndexAnnotation($class);
@@ -46,8 +72,8 @@ public function process(ContainerBuilder $container)
                 $indexMetadata['settings'] = array_filter(array_merge_recursive(
                     $indexMetadata['settings'] ?? [],
                     [
-                        'number_of_replicas' =>$document->numberOfReplicas,
-                        'number_of_shards' =>$document->numberOfShards,
+                        'number_of_replicas' => $document->numberOfReplicas,
+                        'number_of_shards' => $document->numberOfShards,
                     ],
                     $indexesOverride[$namespace]['settings'] ?? []
                 ));
@@ -77,28 +103,23 @@ public function process(ContainerBuilder $container)
                 $indexServiceDefinition->setPublic(true);
 
                 $container->setDefinition($namespace, $indexServiceDefinition);
-                $indexes[$indexAlias] = $namespace;
+                $this->indexes[$indexAlias] = $namespace;
                 $isCurrentIndexDefault = $parser->isDefaultIndex($class);
-                if ($defaultIndex && $isCurrentIndexDefault) {
+                if ($this->defaultIndex && $isCurrentIndexDefault) {
                     throw new \RuntimeException(
                         sprintf(
                             'Only one index can be set as default. We found 2 indexes as default ones `%s` and `%s`',
-                            $defaultIndex,
+                            $this->defaultIndex,
                             $indexAlias
                         )
                     );
                 }
 
                 if ($isCurrentIndexDefault) {
-                    $defaultIndex = $indexAlias;
+                    $this->defaultIndex = $indexAlias;
                 }
             }
         }
-
-        $container->setParameter(Configuration::ONGR_INDEXES, $indexes);
-
-        $defaultIndex = $defaultIndex ?? current(array_keys($indexes));
-        $container->setParameter(Configuration::ONGR_DEFAULT_INDEX, $defaultIndex);
     }
 
     private function getNamespaces($directory): array

DependencyInjection/Configuration.php

@@ -57,11 +57,12 @@ public function getConfigTreeBuilder()
                 )
             ->end()
 
-            ->scalarNode('source_directory')
-                ->defaultValue('/src')
+            ->arrayNode('source_directories')
+                ->prototype('scalar')->end()
+                ->defaultValue(['/src'])
                 ->info(
-                    'If your project has different than `/src` source directory, you can specify it here '.
-                    'to look automatically for ES documents.'
+                    'If your project has different than `/src` source directory, or several of them,' .
+                    'you can specify them here to look automatically for ES documents.'
                 )
             ->end()
 

DependencyInjection/ONGRElasticsearchExtension.php

@@ -45,6 +45,6 @@ public function load(array $configs, ContainerBuilder $container)
 
         $container->setParameter(Configuration::ONGR_INDEXES_OVERRIDE, $config['indexes']);
         $container->setParameter(Configuration::ONGR_ANALYSIS_CONFIG, $config['analysis']);
-        $container->setParameter(Configuration::ONGR_SOURCE_DIR, $config['source_directory']);
+        $container->setParameter(Configuration::ONGR_SOURCE_DIR, $config['source_directories']);
     }
 }

Resources/doc/configuration.md

@@ -20,7 +20,8 @@ ongr_elasticsearch:
                 type: edge_ngram
                 min_gram: 1
                 max_gram: 20
-    source_directory: /src/AppBundle
+    source_directories: 
+        - /src/AppBundle
     logger: false 
     profiler: true
     cache: true
@@ -33,4 +34,4 @@ ongr_elasticsearch:
                 number_of_replicas: 2
                 number_of_shards: 3
             type: page # for 5.x ES compatibility
-```
+```

Tests/app/config/config_test.yml

@@ -4,7 +4,8 @@ framework:
     test: ~
 
 ongr_elasticsearch:
-    source_directory: /Tests/app/src #This parameters is when you have custom project source root, in this case tests has their own kernel and source directory.
+    source_directories: 
+        - /Tests/app/src #This parameters is when you have custom project source root, in this case tests has their own kernel and source directory.
     analysis:
         filter:
             edge_ngram_filter: #-> analyzer name
@@ -21,5 +22,5 @@ ongr_elasticsearch:
     indexes:
         ONGR\App\Entity\DummyDocumentInTheEntityDirectory:
             alias: field-data-index
-            hosts:
-                - localhost:9200
+            hosts:	
+                - localhost:9200