Fix migration

buld: validation placeholder stub on test and add option on create migration
KoalaFacade · Dec 5, 2022 · aee612b · aee612b
2 parents fb217b8 + dbcec06
commit aee612b
Show file tree

Hide file tree

Showing 14 changed files with 233 additions and 117 deletions.
diff --git a/src/Commands/Concerns/HasOptions.php b/src/Commands/Concerns/HasOptions.php
@@ -18,4 +18,15 @@ protected function resolveFactoryOption(): bool
     {
         return (bool) $this->option(key: 'factory');
     }
+
+    /**
+     * @return string|null
+     */
+    protected function resolveTableName(): string | null
+    {
+        /** @var string|null $name */
+        $name = $this->option(key: 'create') ?: $this->option(key: 'table');
+
+        return $name;
+    }
 }
diff --git a/src/Commands/MakeMigrationCommand.php b/src/Commands/MakeMigrationCommand.php
@@ -8,15 +8,16 @@
 use Illuminate\Support\Str;
 use KoalaFacade\DiamondConsole\Actions\Stub\CopyStubAction;
 use KoalaFacade\DiamondConsole\Commands\Concerns\HasArguments;
+use KoalaFacade\DiamondConsole\Commands\Concerns\HasOptions;
 use KoalaFacade\DiamondConsole\Commands\Concerns\InteractsWithPath;
 use KoalaFacade\DiamondConsole\DataTransferObjects\CopyStubData;
 use KoalaFacade\DiamondConsole\DataTransferObjects\PlaceholderData;
 
 class MakeMigrationCommand extends Command
 {
-    use HasArguments, InteractsWithPath;
+    use HasArguments, HasOptions, InteractsWithPath;
 
-    protected $signature = 'diamond:migration {name} {--force}';
+    protected $signature = 'diamond:migration {name} {--create=} {--table=} {--force}';
 
     protected $description = 'create new migration';
 
@@ -29,11 +30,21 @@ public function handle(): void
 
         $destinationPath = base_path(path: 'database/migrations');
 
-        $stubPath = $this->resolvePathForStub(name: 'migration');
+        $stub = 'migration';
 
-        $tableName = Str::snake(Str::pluralStudly($this->resolveNameArgument()));
+        if ($this->option('create')) {
+            $stub .= '-create';
+        } elseif ($this->option('table')) {
+            $stub .= '-table';
+        }
 
-        $fileName = Carbon::now()->format(format: 'Y_m_d_his') . '_create_' . $tableName . '_table.php';
+        $stubPath = $this->resolvePathForStub(name: $stub);
+
+        $migrationName = Str::snake($this->resolveNameArgument());
+
+        $fileName = Carbon::now()->format(format: 'Y_m_d_his') . '_' . $migrationName . '.php';
+
+        $tableName = $this->resolveTableName() ? Str::snake(Str::pluralStudly($this->resolveTableName())) : '';
 
         $placeholders = new PlaceholderData(tableName: $tableName);
 

diff --git a/src/Commands/MakeModelCommand.php b/src/Commands/MakeModelCommand.php
@@ -5,6 +5,7 @@
 use Illuminate\Console\Command;
 use Illuminate\Contracts\Filesystem\FileNotFoundException;
 use Illuminate\Support\Facades\Artisan;
+use Illuminate\Support\Str;
 use KoalaFacade\DiamondConsole\Actions\Filesystem\FilePresentAction;
 use KoalaFacade\DiamondConsole\Actions\Stub\CopyStubAction;
 use KoalaFacade\DiamondConsole\Commands\Concerns\HasArguments;
@@ -59,7 +60,7 @@ class: $this->resolveClassNameByFile(name: $fileName),
                 withForce: $this->resolveForceOption()
             );
 
-        if ($filePresent) {
+        if ($filePresent && ! $this->resolveForceOption()) {
             $this->warn(string: $fileName . ' already exists.');
 
             return;
@@ -100,7 +101,9 @@ protected function resolveFactory(string $fileName): void
     protected function resolveMigration(string $fileName): void
     {
         if ($this->option(key: 'migration')) {
-            Artisan::call(command: 'diamond:migration ' . $this->resolveClassNameByFile(name: $fileName));
+            $tableName = $this->resolveClassNameByFile(name: $fileName);
+
+            Artisan::call(command: 'diamond:migration Create' . Str::pluralStudly($tableName) . 'Table --create=' . $tableName);
         }
     }
 }
diff --git a/stubs/migration-create.stub b/stubs/migration-create.stub
@@ -0,0 +1,31 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+return new class extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up(): void
+    {
+        Schema::create(table: '{{ table_name }}', callback: function (Blueprint $table) {
+            $table->id();
+            $table->timestamps();
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down(): void
+    {
+        Schema::dropIfExists(table: '{{ table_name }}');
+    }
+};
diff --git a/stubs/migration-table.stub b/stubs/migration-table.stub
@@ -0,0 +1,32 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+return new class extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up(): void
+    {
+        Schema::table(table: '{{ table_name }}', callback: function (Blueprint $table) {
+            //
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down(): void
+    {
+        Schema::table(table: '{{ table_name }}', callback: function (Blueprint $table) {
+            //
+        });
+    }
+};
diff --git a/stubs/migration.stub b/stubs/migration.stub
@@ -13,10 +13,7 @@ return new class extends Migration
      */
     public function up(): void
     {
-        Schema::create(table: '{{ tableName }}', callback: function (Blueprint $table) {
-            $table->id();
-            $table->timestamps();
-        });
+        //
     }
 
     /**
@@ -26,6 +23,6 @@ return new class extends Migration
      */
     public function down(): void
     {
-        Schema::dropIfExists(table: '{{ tableName }}');
+        //
     }
 };
diff --git a/tests/Feature/Commands/GenerateActionTest.php b/tests/Feature/Commands/GenerateActionTest.php
@@ -3,6 +3,8 @@
 namespace Tests\Feature\Commands;
 
 use Illuminate\Support\Facades\Artisan;
+use Illuminate\Support\Facades\File;
+use Illuminate\Support\Str;
 use KoalaFacade\DiamondConsole\Exceptions\FileAlreadyExistException;
 
 it(description: 'can generate new action class')
@@ -17,6 +19,10 @@
 
         expect(filePresent(fileName: $fileName))
             ->toBeTrue();
+
+        $actionFile = File::get(path: basePath() . domainPath() . $fileName);
+
+        expect(value: Str::contains(haystack: $actionFile, needles: ['{{ class }}', '{{ namespace }}']))->toBeFalse();
     })
     ->group('commands');
 
@@ -33,6 +39,10 @@
 
         expect(filePresent(fileName: $fileName))
             ->toBeTrue();
+
+        $actionFile = File::get(path: basePath() . domainPath() . $fileName);
+
+        expect(value: Str::contains(haystack: $actionFile, needles: ['{{ class }}', '{{ namespace }}']))->toBeFalse();
     })
     ->group(groups: 'commands');
 

diff --git a/tests/Feature/Commands/MakeDTOTest.php → tests/Feature/Commands/GenerateDTOTest.php b/tests/Feature/Commands/MakeDTOTest.php → tests/Feature/Commands/GenerateDTOTest.php
@@ -3,6 +3,8 @@
 namespace Tests\Feature\Commands;
 
 use Illuminate\Support\Facades\Artisan;
+use Illuminate\Support\Facades\File;
+use Illuminate\Support\Str;
 use KoalaFacade\DiamondConsole\Exceptions\FileAlreadyExistException;
 
 it(description: 'can generate new DTO')
@@ -15,18 +17,27 @@
         Artisan::call(command: 'diamond:dto PostData Post');
 
         expect(filePresent($fileName))->toBeTrue();
+
+        $dtoFile = File::get(path: basePath() . domainPath() . $fileName);
+
+        expect(value: Str::contains(haystack: $dtoFile, needles: ['{{ class }}', '{{ namespace }}']))->toBeFalse();
     })
     ->group(groups: 'commands');
 
 it(description: 'can force generate exists DTO')
     ->tap(function () {
-        expect(filePresent(fileName: '/Post/DataTransferObjects/StoreUserAction.php'))->toBeFalse();
+        $fileName = '/Post/DataTransferObjects/PostData.php';
+        expect(filePresent(fileName: $fileName))->toBeFalse();
 
         Artisan::call(command: 'diamond:install');
         Artisan::call(command: 'diamond:dto PostData Post');
         Artisan::call(command: 'diamond:dto PostData Post --force');
 
-        expect(filePresent(fileName: '/Post/DataTransferObjects/PostData.php'))->toBeTrue();
+        expect(filePresent(fileName: $fileName))->toBeTrue();
+
+        $dtoFile = File::get(path: basePath() . domainPath() . $fileName);
+
+        expect(value: Str::contains(haystack: $dtoFile, needles: ['{{ class }}', '{{ namespace }}']))->toBeFalse();
     })
     ->group(groups: 'commands');
 

diff --git a/tests/Feature/Commands/GenerateEnumTest.php b/tests/Feature/Commands/GenerateEnumTest.php
@@ -3,9 +3,12 @@
 namespace Tests\Feature\Commands;
 
 use Illuminate\Support\Facades\Artisan;
+use Illuminate\Support\Facades\File;
+use Illuminate\Support\Str;
 use KoalaFacade\DiamondConsole\Exceptions\FileAlreadyExistException;
 
 it(description: 'can generate new enum')
+    ->skip(version_compare(PHP_VERSION, '8.1.0', '<'), 'code contains php 8.1 feature cause this test run in ' . PHP_VERSION)
     ->tap(function () {
         $fileName = '/Post/Enums/PostStatus.php';
 
@@ -15,11 +18,15 @@
         Artisan::call(command: 'diamond:enum PostStatus Post');
 
         expect(filePresent($fileName))->toBeTrue();
+
+        $enumFile = File::get(path: basePath() . domainPath() . $fileName);
+
+        expect(value: Str::contains(haystack: $enumFile, needles: ['{{ class }}', '{{ namespace }}']))->toBeFalse();
     })
-    ->group(groups: 'commands')
-    ->skip(version_compare(PHP_VERSION, '8.1.0', '<='), 'code contains php 8.1 feature cause this test run in ' . PHP_VERSION);
+    ->group(groups: 'commands');
 
 it(description: 'can force generate exists enum')
+    ->skip(version_compare(PHP_VERSION, '8.1.0', '<'), 'code contains php 8.1 feature cause this test run in ' . PHP_VERSION)
     ->tap(function () {
         $fileName = '/Post/Enums/PostStatus.php';
 
@@ -30,16 +37,19 @@
         Artisan::call(command: 'diamond:enum PostStatus Post --force');
 
         expect(filePresent($fileName))->toBeTrue();
+
+        $enumFile = File::get(path: basePath() . domainPath() . $fileName);
+
+        expect(value: Str::contains(haystack: $enumFile, needles: ['{{ class }}', '{{ namespace }}']))->toBeFalse();
     })
-    ->group(groups: 'commands')
-    ->skip(version_compare(PHP_VERSION, '8.1.0', '<='), 'code contains php 8.1 feature cause this test run in ' . PHP_VERSION);
+    ->group(groups: 'commands');
 
 it(description: 'file already exist')
+    ->skip(version_compare(PHP_VERSION, '8.1.0', '<'), 'code contains php 8.1 feature cause this test run in ' . PHP_VERSION)
     ->tap(function () {
         Artisan::call(command: 'diamond:install');
         Artisan::call(command: 'diamond:enum PostStatus Post');
         Artisan::call(command: 'diamond:enum PostStatus Post');
     })
-    ->skip(version_compare(PHP_VERSION, '8.1.0', '<='), 'code contains php 8.1 feature cause this test run in ' . PHP_VERSION)
     ->group(groups: 'commands')
     ->throws(exception: FileAlreadyExistException::class);
diff --git a/tests/Feature/Commands/GenerateFactoryTest.php b/tests/Feature/Commands/GenerateFactoryTest.php
@@ -27,6 +27,12 @@
                 )
             )->toBeTrue();
 
+        $factoryContractFile = File::get(path: $factoryContractPath);
+        $factoryConcreteFile = File::get(path: $factoryConcretePath);
+
+        expect(value: Str::contains(haystack: $factoryContractFile, needles: ['{{ class }}', '{{ namespace }}']))->toBeFalse();
+        expect(value: Str::contains(haystack: $factoryConcreteFile, needles: ['{{ class }}', '{{ namespace }}']))->toBeFalse();
+
         File::delete([$factoryContractPath, $factoryConcretePath]);
     }
 )->group('commands');
@@ -65,6 +71,12 @@
                 )
             )->toBeTrue();
 
+        $factoryContractFile = File::get(path: $factoryContractPath);
+        $factoryConcreteFile = File::get(path: $factoryConcretePath);
+
+        expect(value: Str::contains(haystack: $factoryContractFile, needles: ['{{ class }}', '{{ namespace }}']))->toBeFalse();
+        expect(value: Str::contains(haystack: $factoryConcreteFile, needles: ['{{ class }}', '{{ namespace }}']))->toBeFalse();
+
         File::delete([$factoryContractPath, $factoryConcretePath]);
     }
 )->group('commands');
diff --git a/tests/Feature/Commands/GenerateMailTest.php b/tests/Feature/Commands/GenerateMailTest.php
@@ -3,6 +3,8 @@
 namespace Tests\Feature\Commands;
 
 use Illuminate\Support\Facades\Artisan;
+use Illuminate\Support\Facades\File;
+use Illuminate\Support\Str;
 use KoalaFacade\DiamondConsole\Exceptions\FileAlreadyExistException;
 
 it(description: 'can generate new mail class')
@@ -15,6 +17,10 @@
         Artisan::call(command: 'diamond:mail UserApproved User');
 
         expect(filePresent($fileName, prefix: infrastructurePath()))->toBeTrue();
+
+        $mailFile = File::get(path: basePath() . infrastructurePath() . $fileName);
+
+        expect(value: Str::contains(haystack: $mailFile, needles: ['{{ class }}', '{{ namespace }}']))->toBeFalse();
     })
     ->group('commands');
 
@@ -29,6 +35,10 @@
         Artisan::call(command: 'diamond:mail UserApproved User --force');
 
         expect(filePresent($fileName, prefix: infrastructurePath()))->toBeTrue();
+
+        $mailFile = File::get(path: basePath() . infrastructurePath() . $fileName);
+
+        expect(value: Str::contains(haystack: $mailFile, needles: ['{{ class }}', '{{ namespace }}']))->toBeFalse();
     })
     ->group(groups: 'commands');