Add ability to change available indices

Author: pionl

composer.json

@@ -8,6 +8,7 @@
     }
   ],
   "require": {
+    "php": ">=7.4",
     "illuminate/support": ">=5.5",
     "elasticsearch/elasticsearch": "^7",
     "erichard/elasticsearch-query-builder": "dev-collapse-and-improvments#b0ddd4f6fe59cdf5b4288ea39f6fe089b596c7a0"

config/lelastico.php

@@ -1,6 +1,7 @@
 <?php
 
 use Illuminate\Support\Str;
+use Lelastico\IndicesService;
 
 return [
     // https://www.elastic.co/guide/en/elasticsearch/client/php-api/current/configuration.html
@@ -11,4 +12,5 @@
     'indices' => [],
     'log_failure' => true,
     'debugbar_log' => app()->isLocal() && function_exists('debugbar'),
+    'service' => IndicesService::class,
 ];

src/Console/UpdateIndicesCommand.php

@@ -5,6 +5,7 @@
 use Elasticsearch\Client;
 use Exception;
 use Illuminate\Console\Command;
+use Lelastico\Contracts\IndicesServiceContract;
 use Lelastico\Indices\AbstractElasticIndex;
 
 class UpdateIndicesCommand extends Command
@@ -35,16 +36,14 @@ class UpdateIndicesCommand extends Command
      *
      * @throws Exception
      */
-    public function handle()
+    public function handle(Client $client, IndicesServiceContract $indicesServiceContract)
     {
         // Get arguments
         $reCreatedIndex = $this->option('f');
         $deleteIndex = $this->option('d');
         $indexOnly = $this->option('only');
 
-        // Reuse same client
-        $client = resolve(Client::class);
-        $indices = config('lelastico.indices', []);
+        $indices = $indicesServiceContract->getAvailableIndices();
 
         if (empty($indices)) {
             $this->warn('No elastic search indices');

src/Contracts/IndicesServiceContract.php

@@ -0,0 +1,8 @@
+<?php
+
+namespace Lelastico\Contracts;
+
+interface IndicesServiceContract
+{
+    public function getAvailableIndices(): array;
+}

src/IndicesService.php

@@ -0,0 +1,21 @@
+<?php
+
+namespace Lelastico;
+
+use Illuminate\Contracts\Config\Repository;
+use Lelastico\Contracts\IndicesServiceContract;
+
+class IndicesService implements IndicesServiceContract
+{
+    protected Repository $configRepository;
+
+    public function __construct(Repository $configRepository)
+    {
+        $this->configRepository = $configRepository;
+    }
+
+    public function getAvailableIndices(): array
+    {
+        return $this->configRepository->get(LelasticoServiceProvider::CONFIG_NAME.'.indices', []);
+    }
+}

src/LelasticoServiceProvider.php

@@ -4,11 +4,15 @@
 
 use Elasticsearch\Client;
 use Elasticsearch\ClientBuilder;
+use Illuminate\Contracts\Config\Repository;
 use Illuminate\Support\ServiceProvider;
 use Lelastico\Console\UpdateIndicesCommand;
+use Lelastico\Contracts\IndicesServiceContract;
 
 class LelasticoServiceProvider extends ServiceProvider
 {
+    const CONFIG_NAME = 'lelastico';
+
     /**
      * @var string
      */
@@ -17,31 +21,32 @@ class LelasticoServiceProvider extends ServiceProvider
      * @var string
      */
     protected $configFileName;
-    /**
-     * @var string
-     */
-    protected $configName;
 
     public function __construct($app)
     {
         parent::__construct($app);
-        $this->configName = 'lelastico';
-        $this->configFileName = $this->configName.'.php';
+
+        $this->configFileName = self::CONFIG_NAME.'.php';
         $this->configDefaultFilePath = __DIR__.'/../config/'.$this->configFileName;
     }
 
     public function register()
     {
-        $this->app->singleton(Client::class, function () {
-            return ClientBuilder::create()
-                                ->setHosts(config('lelastico.hosts'))
-                                ->build();
-        });
-
         // Merge config
         $this->mergeConfigFrom(
-            $this->configDefaultFilePath, $this->configName
+            $this->configDefaultFilePath, self::CONFIG_NAME
         );
+
+        $repositoryConfig = $this->app->get(Repository::class);
+
+        $this->app->singleton(Client::class, function () use ($repositoryConfig) {
+            return ClientBuilder::create()
+                ->setHosts($repositoryConfig->get(self::CONFIG_NAME.'.hosts'))
+                ->build();
+        });
+
+        $serviceFromConfig = $repositoryConfig->get(self::CONFIG_NAME.'.service');
+        $this->app->singleton(IndicesServiceContract::class, $serviceFromConfig);
     }
 
     public function boot()