Make and re-index command + tests

Author: pdphilip

src/Commands/MakeCommand.php

@@ -4,41 +4,41 @@
 
 namespace PDPhilip\Elasticsearch\Commands;
 
-use Illuminate\Console\GeneratorCommand;
+use Illuminate\Console\Command;
+use Illuminate\Support\Facades\File;
 use Illuminate\Support\Str;
 use OmniTerm\HasOmniTerm;
 
-class MakeCommand extends GeneratorCommand
+class MakeCommand extends Command
 {
     use HasOmniTerm;
 
     protected $signature = 'elastic:make {name : The name of the Elasticsearch model}';
 
     protected $description = 'Create a new Elasticsearch model';
 
-    protected $type = 'Model';
-
     public function handle(): int
     {
         $name = Str::studly($this->argument('name'));
-
         $namespace = $this->resolveNamespace($name);
         $class = class_basename(str_replace('/', '\\', $name));
         $fullClass = $namespace.'\\'.$class;
         $path = $this->getModelPath($name);
 
-        if (file_exists($path)) {
+        if (File::exists($path)) {
             $this->newLine();
             $this->omni->statusError('Model already exists', $fullClass);
             $this->newLine();
 
             return self::FAILURE;
         }
 
-        $this->makeDirectory($path);
+        $directory = dirname($path);
+        if (! File::isDirectory($directory)) {
+            File::makeDirectory($directory, 0755, true);
+        }
 
-        $stub = $this->buildStub($namespace, $class);
-        $this->files->put($path, $stub);
+        File::put($path, $this->buildFromStub($namespace, $class));
 
         $this->newLine();
         $this->omni->statusSuccess('Model created', $fullClass);
@@ -48,11 +48,25 @@ public function handle(): int
         return self::SUCCESS;
     }
 
-    protected function getStub(): string
+    // ======================================================================
+    // Code Generation
+    // ======================================================================
+
+    private function buildFromStub(string $namespace, string $class): string
     {
-        return __DIR__.'/../../resources/stubs/ElasticModel.php.stub';
+        $stub = File::get(__DIR__.'/../../resources/stubs/ElasticModel.php.stub');
+
+        return str_replace(
+            ['{{ namespace }}', '{{ class }}'],
+            [$namespace, $class],
+            $stub
+        );
     }
 
+    // ======================================================================
+    // Helpers
+    // ======================================================================
+
     private function resolveNamespace(string $name): string
     {
         $parts = explode('/', str_replace('\\', '/', $name));
@@ -71,15 +85,4 @@ private function getModelPath(string $name): string
 
         return app_path('Models/'.$name.'.php');
     }
-
-    private function buildStub(string $namespace, string $class): string
-    {
-        $stub = $this->files->get($this->getStub());
-
-        return str_replace(
-            ['{{ namespace }}', '{{ class }}'],
-            [$namespace, $class],
-            $stub
-        );
-    }
 }

src/Commands/ReIndexCommand.php

@@ -14,6 +14,7 @@
 use PDPhilip\Elasticsearch\Eloquent\Model;
 use PDPhilip\Elasticsearch\Schema\Blueprint;
 use PDPhilip\Elasticsearch\Schema\Builder as SchemaBuilder;
+use PDPhilip\Elasticsearch\Utils\Helpers;
 
 class ReIndexCommand extends Command
 {
@@ -29,6 +30,8 @@ class ReIndexCommand extends Command
 
     private string $connectionName;
 
+    private Connection $connection;
+
     private SchemaBuilder $schema;
 
     private Closure $mappingDefinition;
@@ -248,8 +251,8 @@ private function setupFromModel(Model $model): void
         $this->connectionName = $model->getConnectionName();
 
         /** @var Connection $connection */
-        $connection = DB::connection($this->connectionName);
-        $this->schema = $connection->getSchemaBuilder();
+        $this->connection = DB::connection($this->connectionName);
+        $this->schema = $this->connection->getSchemaBuilder();
 
         $this->mappingDefinition = fn (Blueprint $index) => $model::mappingDefinition($index);
     }
@@ -406,7 +409,8 @@ private function copyToTemp(): bool
                 return false;
             }
 
-            $this->omni->success('Copy complete — '.($result['created'] ?? 0).' docs created');
+            $this->tempCount = (int) ($result['created'] ?? 0);
+            $this->omni->success('Copy complete — '.$this->tempCount.' docs created');
 
             return true;
         } catch (Exception $e) {
@@ -425,8 +429,6 @@ private function verifyTemp(): bool
     {
         $this->omni->divider('Phase 4: Verify Temp');
 
-        $this->tempCount = $this->countDocs($this->tempIndexName);
-
         $this->omni->tableHeader('Metric', 'Value');
         $this->omni->tableRow('Original count', number_format($this->originalCount));
         $this->omni->tableRow('Temp count', number_format($this->tempCount));
@@ -516,7 +518,8 @@ private function copyBack(): bool
 
                 $failures = $result['failures'] ?? [];
                 if (empty($failures)) {
-                    $this->omni->success('Copy back complete — '.($result['created'] ?? 0).' docs');
+                    $this->finalCount = (int) ($result['created'] ?? 0);
+                    $this->omni->success('Copy back complete — '.$this->finalCount.' docs');
 
                     return true;
                 }
@@ -544,8 +547,6 @@ private function verifyFinal(): bool
     {
         $this->omni->divider('Phase 8: Verify Final');
 
-        $this->finalCount = $this->countDocs($this->indexName);
-
         $this->omni->tableHeader('Metric', 'Value');
         $this->omni->tableRow('Original snapshot', number_format($this->originalCount));
         $this->omni->tableRow('Temp count', number_format($this->tempCount));
@@ -561,8 +562,8 @@ private function verifyFinal(): bool
         $this->omni->warning('Final count mismatch ('.$this->finalCount.' vs '.$this->tempCount.') — running catch-up');
 
         try {
-            $this->schema->reindex($this->tempIndexName, $this->indexName);
-            $this->finalCount = $this->countDocs($this->indexName);
+            $result = $this->schema->reindex($this->tempIndexName, $this->indexName);
+            $this->finalCount = (int) ($result['created'] ?? 0) + (int) ($result['updated'] ?? 0);
 
             if ($this->countsMatch($this->tempCount, $this->finalCount)) {
                 $this->omni->success('Catch-up resolved the mismatch');
@@ -668,7 +669,9 @@ private function mappingMismatches(): array
     {
         $currentMapping = $this->schema->getFieldsMapping($this->indexName);
 
-        $blueprint = new Blueprint($this->indexName);
+        $blueprint = Helpers::getLaravelCompatabilityVersion() >= 12
+            ? new Blueprint($this->connection, $this->indexName)
+            : new Blueprint($this->indexName);
         ($this->mappingDefinition)($blueprint);
 
         $mismatches = [];

tests/MakeCommandTest.php

@@ -0,0 +1,100 @@
+<?php
+
+declare(strict_types=1);
+
+use Illuminate\Support\Facades\File;
+
+beforeEach(function () {
+    $this->modelsPath = app_path('Models');
+
+    if (! File::isDirectory($this->modelsPath)) {
+        File::makeDirectory($this->modelsPath, 0755, true);
+    }
+});
+
+afterEach(function () {
+    File::cleanDirectory($this->modelsPath);
+});
+
+it('creates a model file', function () {
+    $this->artisan('elastic:make', ['name' => 'Product'])
+        ->assertSuccessful();
+
+    $path = app_path('Models/Product.php');
+    expect(File::exists($path))->toBeTrue();
+
+    $content = File::get($path);
+    expect($content)
+        ->toContain('namespace App\Models;')
+        ->toContain('class Product extends Eloquent')
+        ->toContain("protected \$connection = 'elasticsearch';");
+});
+
+it('fails when the model already exists', function () {
+    $path = app_path('Models/Product.php');
+    File::put($path, '<?php // existing');
+
+    $this->artisan('elastic:make', ['name' => 'Product'])
+        ->assertFailed();
+});
+
+it('creates a model in a subdirectory', function () {
+    $this->artisan('elastic:make', ['name' => 'Elastic/SearchLog'])
+        ->assertSuccessful();
+
+    $path = app_path('Models/Elastic/SearchLog.php');
+    expect(File::exists($path))->toBeTrue();
+
+    $content = File::get($path);
+    expect($content)
+        ->toContain('namespace App\Models\Elastic;')
+        ->toContain('class SearchLog extends Eloquent');
+});
+
+it('converts the name to StudlyCase', function () {
+    $this->artisan('elastic:make', ['name' => 'audit_log'])
+        ->assertSuccessful();
+
+    $path = app_path('Models/AuditLog.php');
+    expect(File::exists($path))->toBeTrue();
+
+    $content = File::get($path);
+    expect($content)->toContain('class AuditLog extends Eloquent');
+});
+
+it('includes the mapping definition from the stub', function () {
+    $this->artisan('elastic:make', ['name' => 'Event'])
+        ->assertSuccessful();
+
+    $content = File::get(app_path('Models/Event.php'));
+    expect($content)
+        ->toContain('implements HasMappingDefinition')
+        ->toContain('public static function mappingDefinition(Blueprint $index): void')
+        ->toContain("\$index->date('created_at');")
+        ->toContain("\$index->date('updated_at');");
+});
+
+it('includes the docblock from the stub', function () {
+    $this->artisan('elastic:make', ['name' => 'Metric'])
+        ->assertSuccessful();
+
+    $content = File::get(app_path('Models/Metric.php'));
+    expect($content)
+        ->toContain('App\Models\Metric')
+        ->toContain('@property string $id')
+        ->toContain('@property Carbon $created_at')
+        ->toContain('@property Carbon $updated_at');
+});
+
+it('creates nested subdirectories', function () {
+    $this->artisan('elastic:make', ['name' => 'Analytics/Events/ClickEvent'])
+        ->assertSuccessful();
+
+    $path = app_path('Models/Analytics/Events/ClickEvent.php');
+    expect(File::exists($path))->toBeTrue();
+
+    $content = File::get($path);
+    expect($content)
+        ->toContain('namespace App\Models\Analytics\Events;')
+        ->toContain('class ClickEvent extends Eloquent');
+});

tests/Models/ReIndexTarget.php

@@ -0,0 +1,29 @@
+<?php
+
+declare(strict_types=1);
+
+namespace PDPhilip\Elasticsearch\Tests\Models;
+
+use PDPhilip\Elasticsearch\Eloquent\HasMappingDefinition;
+use PDPhilip\Elasticsearch\Eloquent\Model;
+use PDPhilip\Elasticsearch\Schema\Blueprint;
+use PDPhilip\Elasticsearch\Tests\Concerns\TestsWithIdStrategies;
+
+class ReIndexTarget extends Model implements HasMappingDefinition
+{
+    use TestsWithIdStrategies;
+
+    protected $connection = 'elasticsearch';
+
+    protected $table = 're_index_targets';
+
+    protected static $unguarded = true;
+
+    public static function mappingDefinition(Blueprint $index): void
+    {
+        $index->keyword('status');
+        $index->text('name');
+        $index->date('created_at');
+        $index->date('updated_at');
+    }
+}

tests/QueryElasticsearchSpecificTest.php

@@ -127,6 +127,13 @@
 
 });
 
+it('counts nested queries', function () {
+    $count = Post::where('status',2)->whereNestedObject('comments', function (Builder $query) {
+        $query->where('country', 'USA');
+    })->count();
+    expect($count)->toBe(2);
+});
+
 it('can search with field boosting', function () {
     $users = User::search('John', 'best_fields', ['name' => 5, 'description' => 1])->get();
     expect($users)->toHaveCount(2)