fix: move interfaces to contracts and use Elastic client in service provider instead of our own

Author: tommie1001

config/elasticsearch.php

@@ -1,9 +1,9 @@
 <?php
 
 return [
-    'host' => env('ELASTIC_HOST', 'localhost:9200'),
-    'index' => env('ELASTIC_INDEX', 'index'),
-    'enabled' => env('ELASTIC_ENABLED', false),
+    'host' => env('ELASTICSEARCH_HOST', 'localhost:9200'),
+    'index' => env('ELASTICSEARCH_INDEX', 'index'),
+    'enabled' => env('ELASTICSEARCH_ENABLED', false),
     'models' => [
         // define your model classes here that needs to be indexed
     ],

src/Client.php

@@ -7,7 +7,7 @@
 use Elastic\Elasticsearch\Client as ElasticsearchClient;
 use Elastic\Elasticsearch\Response\Elasticsearch;
 use Illuminate\Support\Collection;
-use Swis\Laravel\Elasticsearch\Interfaces\SearchResultInterface;
+use Swis\Laravel\Elasticsearch\Contracts\SearchResultInterface;
 
 class Client
 {

src/Commands/ElasticsearchCreateIndex.php

@@ -6,18 +6,18 @@
 
 use Elastic\Elasticsearch\Client;
 use Illuminate\Console\Command;
-use Swis\Laravel\Elasticsearch\Interfaces\IndexMappingBuilderInterface;
+use Swis\Laravel\Elasticsearch\Contracts\IndexMappingBuilderInterface;
 
 class ElasticsearchCreateIndex extends Command
 {
     protected $signature = 'elasticsearch:create-index {--index= : index that needs to be created (index from config is used if option is omitted)}';
 
     protected $description = 'Creates index in elasticsearch';
 
-    public function getConfigBuilderClass(): array
+    public function getIndexMapping(): array
     {
         return app()->bound(IndexMappingBuilderInterface::class) ?
-            app(IndexMappingBuilderInterface::class)->buildIndexMappingUsing() :
+            app(IndexMappingBuilderInterface::class)->indexMapping() :
             config('elasticsearch.index_mapping');
     }
 
@@ -27,7 +27,7 @@ public function handle(Client $client): int
 
         $client->indices()->create([
             'index' => $index,
-            'body' => $this->getConfigBuilderClass(),
+            'body' => $this->getIndexMapping(),
         ]);
 
         $this->info(sprintf('Index "%s" created', $index));

src/Commands/ElasticsearchRefreshIndex.php

@@ -6,7 +6,7 @@
 
 use Illuminate\Console\Command;
 use Illuminate\Support\Collection;
-use Swis\Laravel\Elasticsearch\Interfaces\IndexableInterface;
+use Swis\Laravel\Elasticsearch\Contracts\IndexableInterface;
 
 class ElasticsearchRefreshIndex extends Command
 {

src/Concerns/SyncsWithIndex.php

@@ -6,8 +6,8 @@
 
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Support\Collection;
-use Swis\Laravel\Elasticsearch\Interfaces\DocumentInterface;
-use Swis\Laravel\Elasticsearch\Interfaces\IndexableInterface;
+use Swis\Laravel\Elasticsearch\Contracts\DocumentInterface;
+use Swis\Laravel\Elasticsearch\Contracts\IndexableInterface;
 use Swis\Laravel\Elasticsearch\Jobs\DeleteDocument;
 use Swis\Laravel\Elasticsearch\Jobs\IndexDocument;
 

src/Document.php

@@ -5,7 +5,7 @@
 namespace Swis\Laravel\Elasticsearch;
 
 use Illuminate\Support\Carbon;
-use Swis\Laravel\Elasticsearch\Interfaces\DocumentInterface;
+use Swis\Laravel\Elasticsearch\Contracts\DocumentInterface;
 
 class Document implements DocumentInterface
 {

src/Interfaces/DocumentInterface.php

@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace Swis\Laravel\Elasticsearch\Interfaces;
+namespace Swis\Laravel\Elasticsearch\Contracts;
 
 use Illuminate\Support\Carbon;
 

src/Interfaces/IndexMappingBuilderInterface.php

@@ -2,9 +2,9 @@
 
 declare(strict_types=1);
 
-namespace Swis\Laravel\Elasticsearch\Interfaces;
+namespace Swis\Laravel\Elasticsearch\Contracts;
 
 interface IndexMappingBuilderInterface
 {
-    public function buildIndexMappingUsing(): array;
+    public function indexMapping(): array;
 }

src/Interfaces/IndexableInterface.php

@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace Swis\Laravel\Elasticsearch\Interfaces;
+namespace Swis\Laravel\Elasticsearch\Contracts;
 
 use Illuminate\Support\Collection;
 use Swis\Laravel\Elasticsearch\Document;

src/Interfaces/SearchResultInterface.php

@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace Swis\Laravel\Elasticsearch\Interfaces;
+namespace Swis\Laravel\Elasticsearch\Contracts;
 
 interface SearchResultInterface
 {

src/Jobs/IndexDocument.php

@@ -10,7 +10,7 @@
 use Illuminate\Foundation\Bus\Dispatchable;
 use Illuminate\Queue\InteractsWithQueue;
 use Illuminate\Queue\SerializesModels;
-use Swis\Laravel\Elasticsearch\Interfaces\IndexableInterface;
+use Swis\Laravel\Elasticsearch\Contracts\IndexableInterface;
 
 class IndexDocument implements ShouldQueue
 {

src/LaravelElasticServiceProvider.php

@@ -4,6 +4,7 @@
 
 namespace Swis\Laravel\Elasticsearch;
 
+use Elastic\Elasticsearch\Client;
 use Elastic\Elasticsearch\ClientBuilder;
 use Spatie\LaravelPackageTools\Commands\InstallCommand;
 use Spatie\LaravelPackageTools\Package;

src/SearchResult.php

@@ -6,7 +6,7 @@
 
 use Illuminate\Contracts\Support\Arrayable;
 use Illuminate\Support\Carbon;
-use Swis\Laravel\Elasticsearch\Interfaces\SearchResultInterface;
+use Swis\Laravel\Elasticsearch\Contracts\SearchResultInterface;
 
 /** @phpstan-ignore-next-line */
 class SearchResult implements Arrayable, SearchResultInterface