refactor: change adding getOrderableFields to generated SearchRequest

refs: #194

Author: Ni Nelli

src/Generators/RequestsGenerator.php

@@ -195,6 +195,10 @@ protected function getRules($name, $type, $required, $nullable, $present): array
             $rules[] = 'present';
         }
 
+        if ($name === 'order_by') {
+            $rules[] = 'in:';
+        }
+
         return [
             'name' => $name,
             'rules' => $rules

stubs/request.blade.php

@@ -18,11 +18,7 @@ public function rules(): array
 @if(!empty($parameters))
         return [
 @foreach($parameters as $parameter)
-    @if($method === $requestsGenerator::SEARCH_METHOD && $parameter['name'] === 'order_by')
-        '{{ $parameter['name'] }}' => '{{ implode('|', $parameter['rules']) }}|in:' . self::getOrderableFields({{ Str::singular($entity) }}::class),
-@continue;
-    @endif
-        '{{ $parameter['name'] }}' => '{{ implode('|', $parameter['rules']) }}',
+            '{{ $parameter['name'] }}' => '{!! implode('|', $parameter['rules']) !!}'@if ($parameter['name'] === 'order_by') . $this->getOrderableFields({{ Str::singular($entity) }}::class)@endif,
 @endforeach
         ];
 @else

tests/CommandTest.php

@@ -126,7 +126,7 @@ public function testCallCommandSubFoldersModel()
         $this->assertGeneratedFileEquals('service.php', 'app/Services/PostService.php');
         $this->assertGeneratedFileEquals('create_request.php', 'app/Http/Requests/Post/CreatePostRequest.php');
         $this->assertGeneratedFileEquals('get_request.php', 'app/Http/Requests/Post/GetPostRequest.php');
-        $this->assertGeneratedFileEquals('subfolder/search_request.php', 'app/Http/Requests/Post/SearchPostsRequest.php');
+        $this->assertGeneratedFileEquals('search_request_subfolder_model.php', 'app/Http/Requests/Post/SearchPostsRequest.php');
         $this->assertGeneratedFileEquals('update_request.php', 'app/Http/Requests/Post/UpdatePostRequest.php');
         $this->assertGeneratedFileEquals('delete_request.php', 'app/Http/Requests/Post/DeletePostRequest.php');
         $this->assertGeneratedFileEquals('controller.php', 'app/Http/Controllers/PostController.php');

tests/fixtures/CommandTest/search_request.php

@@ -12,7 +12,7 @@ public function rules(): array
         return [
             'page' => 'integer',
             'per_page' => 'integer',
-            'order_by' => 'string|in:' . self::getOrderableFields(Post::class),
+            'order_by' => 'string|in:' . $this->getOrderableFields(Post::class),
             'desc' => 'boolean',
             'all' => 'boolean',
             'with' => 'array',

tests/fixtures/CommandTest/subfolder/search_request.php renamed to tests/fixtures/CommandTest/search_request_subfolder_model.php

@@ -12,7 +12,7 @@ public function rules(): array
         return [
             'page' => 'integer',
             'per_page' => 'integer',
-            'order_by' => 'string|in:' . self::getOrderableFields(Post::class),
+            'order_by' => 'string|in:' . $this->getOrderableFields(Post::class),
             'desc' => 'boolean',
             'all' => 'boolean',
             'with' => 'array',

tests/fixtures/RequestGeneratorTest/search_request.php

@@ -17,7 +17,7 @@ public function rules(): array
             'desc' => 'boolean',
             'all' => 'boolean',
             'with' => 'array',
-            'order_by' => 'string|in:' . self::getOrderableFields(Post::class),
+            'order_by' => 'string|in:' . $this->getOrderableFields(Post::class),
             'query' => 'string|nullable',
             'with.*' => 'string',
         ];