From 725e3715896907ff9072887e34427f46bed807e6 Mon Sep 17 00:00:00 2001 From: Nafies Luthfi Date: Thu, 11 Oct 2018 10:15:30 +0800 Subject: [PATCH] Add create and update form request stubs --- src/CrudMake.php | 12 ++ src/Generators/FormRequestGenerator.php | 47 ++++++++ src/stubs/requests/create-request.stub | 45 +++++++ src/stubs/requests/update-request.stub | 31 +++++ .../FullCrudFormRequestOptionsTest.php | 131 +++++++++++++++++++++ 5 files changed, 266 insertions(+) create mode 100644 src/Generators/FormRequestGenerator.php create mode 100644 src/stubs/requests/create-request.stub create mode 100644 src/stubs/requests/update-request.stub diff --git a/src/CrudMake.php b/src/CrudMake.php index 5426eb4..757de13 100644 --- a/src/CrudMake.php +++ b/src/CrudMake.php @@ -56,6 +56,10 @@ class CrudMake extends GeneratorCommand $this->generateResources(); $this->generateTestFiles(); + if ($this->option('form-requests')) { + $this->generateRequestClasses(); + } + $this->info('CRUD files generated successfully!'); } @@ -116,4 +120,12 @@ class CrudMake extends GeneratorCommand app('Luthfi\CrudGenerator\Generators\IndexViewGenerator', ['command' => $this])->generate(); app('Luthfi\CrudGenerator\Generators\ShowViewGenerator', ['command' => $this])->generate(); } + + /** + * Generate Form Requests + */ + public function generateRequestClasses() + { + app('Luthfi\CrudGenerator\Generators\FormRequestGenerator', ['command' => $this])->generate(); + } } diff --git a/src/Generators/FormRequestGenerator.php b/src/Generators/FormRequestGenerator.php new file mode 100644 index 0000000..74948b6 --- /dev/null +++ b/src/Generators/FormRequestGenerator.php @@ -0,0 +1,47 @@ +modelNames['model_name']; + $pluralModelName = $this->modelNames['plural_model_name']; + + $requestPath = $this->makeDirectory(app_path('Http/Requests/'.$pluralModelName)); + $createRequestPath = $requestPath.'/CreateRequest.php'; + $this->generateFile($createRequestPath, $this->getContent('requests/create-request')); + + $updateRequestPath = $requestPath.'/UpdateRequest.php'; + $this->generateFile($updateRequestPath, $this->getContent('requests/update-request')); + + $this->command->info($modelName.' Form Requests generated.'); + } + + /** + * {@inheritDoc} + */ + public function getContent(string $stubName) + { + $stub = $this->getStubFileContent($stubName); + + $controllerFileContent = $this->replaceStubString($stub); + + $appNamespace = $this->getAppNamespace(); + + $controllerFileContent = str_replace( + "App\Http\Controllers", + "{$appNamespace}Http\Controllers", + $controllerFileContent + ); + + return $controllerFileContent; + } +} diff --git a/src/stubs/requests/create-request.stub b/src/stubs/requests/create-request.stub new file mode 100644 index 0000000..72557f6 --- /dev/null +++ b/src/stubs/requests/create-request.stub @@ -0,0 +1,45 @@ +user()->can('create', new Master); + } + + /** + * Get the validation rules that apply to the request. + * + * @return array + */ + public function rules() + { + return [ + 'name' => 'required|max:60', + 'description' => 'nullable|max:255', + ]; + } + + /** + * Save proposal to database. + * + * @return \fullMstr + */ + public function save() + { + $newMaster = $this->validated(); + $newMaster['creator_id'] = auth()->id(); + + return Master::create($newMaster); + } +} diff --git a/src/stubs/requests/update-request.stub b/src/stubs/requests/update-request.stub new file mode 100644 index 0000000..2173556 --- /dev/null +++ b/src/stubs/requests/update-request.stub @@ -0,0 +1,31 @@ +user()->can('update', $this->route('master')); + } + + /** + * Get the validation rules that apply to the request. + * + * @return array + */ + public function rules() + { + return [ + 'name' => 'required|max:60', + 'description' => 'nullable|max:255', + ]; + } +} diff --git a/tests/CommandOptions/FullCrudFormRequestOptionsTest.php b/tests/CommandOptions/FullCrudFormRequestOptionsTest.php index 9dda61f..7c6fdb3 100644 --- a/tests/CommandOptions/FullCrudFormRequestOptionsTest.php +++ b/tests/CommandOptions/FullCrudFormRequestOptionsTest.php @@ -3,10 +3,41 @@ namespace Tests\CommandOptions; use Tests\TestCase; +use Illuminate\Contracts\Console\Kernel; class FullCrudFormRequestOptionsTest extends TestCase { /** @test */ + public function it_can_generate_form_request_classes() + { + $this->artisan('make:crud', ['name' => $this->model_name, '--no-interaction' => true, '--form-requests' => true]); + + $this->assertNotContains("{$this->model_name} model already exists.", app(Kernel::class)->output()); + + $this->assertFileExists(app_path($this->model_name.'.php')); + $this->assertFileExists(app_path("Http/Controllers/{$this->model_name}Controller.php")); + $this->assertFileExists(app_path("Http/Requests/{$this->plural_model_name}/CreateRequest.php")); + $this->assertFileExists(app_path("Http/Requests/{$this->plural_model_name}/UpdateRequest.php")); + + $migrationFilePath = database_path('migrations/'.date('Y_m_d_His').'_create_'.$this->table_name.'_table.php'); + $this->assertFileExists($migrationFilePath); + + $this->assertFileExists(resource_path("views/{$this->table_name}/index.blade.php")); + $this->assertFileExists(resource_path("views/{$this->table_name}/create.blade.php")); + $this->assertFileExists(resource_path("views/{$this->table_name}/edit.blade.php")); + $this->assertFileNotExists(resource_path("views/{$this->table_name}/forms.blade.php")); + + $localeConfig = config('app.locale'); + $this->assertFileExists(resource_path("lang/{$localeConfig}/{$this->lang_name}.php")); + + $this->assertFileExists(base_path("routes/web.php")); + $this->assertFileExists(app_path("Policies/{$this->model_name}Policy.php")); + $this->assertFileExists(database_path("factories/{$this->model_name}Factory.php")); + $this->assertFileExists(base_path("tests/Unit/Models/{$this->model_name}Test.php")); + $this->assertFileExists(base_path("tests/Feature/Manage{$this->model_name}Test.php")); + } + + /** @test */ public function it_can_generate_controller_file_with_form_requests_class() { $this->artisan('make:crud', ['name' => $this->model_name, '--no-interaction' => true, '--form-requests' => true]); @@ -124,4 +155,104 @@ class {$this->model_name}Controller extends Controller "; $this->assertEquals($ctrlClassContent, file_get_contents(app_path("Http/Controllers/{$this->model_name}Controller.php"))); } + + /** @test */ + public function it_generates_correct_create_form_request_file_content() + { + $this->artisan('make:crud', ['name' => $this->model_name, '--no-interaction' => true, '--form-requests' => true]); + + $classFilePath = app_path("Http/Requests/{$this->plural_model_name}/CreateRequest.php"); + + $this->assertFileExists($classFilePath); + $formRequestClassContent = "plural_model_name}; + +use {$this->full_model_name}; +use Illuminate\Foundation\Http\FormRequest; + +class CreateRequest extends FormRequest +{ + /** + * Determine if the user is authorized to make this request. + * + * @return bool + */ + public function authorize() + { + return \$this->user()->can('create', new {$this->model_name}); + } + + /** + * Get the validation rules that apply to the request. + * + * @return array + */ + public function rules() + { + return [ + 'name' => 'required|max:60', + 'description' => 'nullable|max:255', + ]; + } + + /** + * Save proposal to database. + * + * @return \\{$this->full_model_name} + */ + public function save() + { + \$new{$this->model_name} = \$this->validated(); + \$new{$this->model_name}['creator_id'] = auth()->id(); + + return {$this->model_name}::create(\$new{$this->model_name}); + } +} +"; + $this->assertEquals($formRequestClassContent, file_get_contents($classFilePath)); + } + + /** @test */ + public function it_generates_correct_update_form_request_file_content() + { + $this->artisan('make:crud', ['name' => $this->model_name, '--no-interaction' => true, '--form-requests' => true]); + + $classFilePath = app_path("Http/Requests/{$this->plural_model_name}/UpdateRequest.php"); + + $this->assertFileExists($classFilePath); + $formRequestClassContent = "plural_model_name}; + +use Illuminate\Foundation\Http\FormRequest; + +class UpdateRequest extends FormRequest +{ + /** + * Determine if the user is authorized to make this request. + * + * @return bool + */ + public function authorize() + { + return \$this->user()->can('update', \$this->route('{$this->lang_name}')); + } + + /** + * Get the validation rules that apply to the request. + * + * @return array + */ + public function rules() + { + return [ + 'name' => 'required|max:60', + 'description' => 'nullable|max:255', + ]; + } +} +"; + $this->assertEquals($formRequestClassContent, file_get_contents($classFilePath)); + } }