chore: merge with origin

Ni Nelli · Ni Nelli · commit 484b184a840f · 2025-10-24T13:48:06.000+09:00
diff --git a/src/Generators/NovaTestGenerator.php b/src/Generators/NovaTestGenerator.php
@@ -78,6 +78,7 @@ public function generateTests(): void
             'lower_entities' => $this->getPluralName(Str::snake($this->model)),
             'actions' => $actions,
             'filters' => $filters,
+            'models_namespace' => $this->getNamespace('models'),
         ]);
 
         $this->saveClass('tests', "Nova{$this->model}ResourceTest", $fileContent);
diff --git a/src/Generators/RequestsGenerator.php b/src/Generators/RequestsGenerator.php
@@ -76,6 +76,7 @@ protected function createRequest($method, $needToValidate = true, $parameters =
             'namespace' => $this->getNamespace('requests'),
             'servicesNamespace' => $this->getNamespace('services'),
             'entityNamespace' => $this->getModelClass($this->model),
+            'needToValidateWith' => !is_null(Arr::first($parameters, fn ($parameter) => $parameter['name'] === 'with.*')),
         ]);
 
         $this->saveClass('requests', "{$method}{$modelName}Request",
@@ -195,7 +196,7 @@ protected function getRules($name, $type, $required, $nullable, $present): array
             $rules[] = 'present';
         }
 
-        if ($name === 'order_by') {
+        if (in_array($name, ['order_by', 'with.*'])) {
             $rules[] = 'in:';
         }
 
diff --git a/stubs/nova_test.blade.php b/stubs/nova_test.blade.php
@@ -5,6 +5,7 @@
 use RonasIT\Support\Testing\ModelTestState;
 use RonasIT\Support\Traits\NovaTestTrait;
 use {{ $resource_namespace }};
+use {{ $models_namespace }}\User;
 
 class Nova{{ $resource_name }}Test extends TestCase
 {
diff --git a/stubs/request.blade.php b/stubs/request.blade.php
@@ -16,9 +16,13 @@ class {{ $method }}{{ $entity }}Request extends Request
     public function rules(): array
     {
 @if(!empty($parameters))
+@if($needToValidateWith)
+        $availableRelations = implode(',', $this->getAvailableRelations());
+
+@endif
         return [
 @foreach($parameters as $parameter)
-            '{{ $parameter['name'] }}' => '{!! implode('|', $parameter['rules']) !!}'@if ($parameter['name'] === 'order_by') . $this->getOrderableFields({{ Str::singular($entity) }}::class)@endif,
+            '{{ $parameter['name'] }}' => '{!! implode('|', $parameter['rules']) !!}'@if ($parameter['name'] === 'order_by') . $this->getOrderableFields({{ Str::singular($entity) }}::class)@elseif($parameter['name'] === 'with.*'){{ ' . $availableRelations' }}@endif,
 @endforeach
         ];
 @else
@@ -41,4 +45,13 @@ public function validateResolved(): void
         }
     }
 @endif
+@if($needToValidateWith)
+
+    //TODO: don't forget to review relations list
+    protected function getAvailableRelations(): array
+    {
+        return [
+        ];
+    }
+@endif
 }
diff --git a/tests/fixtures/CommandTest/get_request.php b/tests/fixtures/CommandTest/get_request.php
@@ -10,9 +10,11 @@ class GetPostRequest extends Request
 {
     public function rules(): array
     {
+        $availableRelations = implode(',', $this->getAvailableRelations());
+
         return [
             'with' => 'array',
-            'with.*' => 'string|required',
+            'with.*' => 'string|required|in:' . $availableRelations,
         ];
     }
 
@@ -26,4 +28,11 @@ public function validateResolved(): void
             throw new NotFoundHttpException(__('validation.exceptions.not_found', ['entity' => 'Post']));
         }
     }
+
+    //TODO: don't forget to review relations list
+    protected function getAvailableRelations(): array
+    {
+        return [
+        ];
+    }
 }
diff --git a/tests/fixtures/CommandTest/nova_test.php b/tests/fixtures/CommandTest/nova_test.php
@@ -7,6 +7,7 @@
 use RonasIT\Support\Testing\ModelTestState;
 use RonasIT\Support\Traits\NovaTestTrait;
 use App\Nova\PostResource;
+use RonasIT\Support\Tests\Support\Command\Models\User;
 
 class NovaPostResourceTest extends TestCase
 {
diff --git a/tests/fixtures/CommandTest/search_request.php b/tests/fixtures/CommandTest/search_request.php
@@ -9,6 +9,8 @@ class SearchPostsRequest extends Request
 {
     public function rules(): array
     {
+        $availableRelations = implode(',', $this->getAvailableRelations());
+
         return [
             'page' => 'integer',
             'per_page' => 'integer',
@@ -17,7 +19,14 @@ public function rules(): array
             'all' => 'boolean',
             'with' => 'array',
             'query' => 'string|nullable',
-            'with.*' => 'string',
+            'with.*' => 'string|in:' . $availableRelations,
+        ];
+    }
+
+    //TODO: don't forget to review relations list
+    protected function getAvailableRelations(): array
+    {
+        return [
         ];
     }
 }
diff --git a/tests/fixtures/CommandTest/search_request_subfolder_model.php b/tests/fixtures/CommandTest/search_request_subfolder_model.php
@@ -9,6 +9,8 @@ class SearchPostsRequest extends Request
 {
     public function rules(): array
     {
+        $availableRelations = implode(',', $this->getAvailableRelations());
+
         return [
             'page' => 'integer',
             'per_page' => 'integer',
@@ -17,7 +19,14 @@ public function rules(): array
             'all' => 'boolean',
             'with' => 'array',
             'query' => 'string|nullable',
-            'with.*' => 'string',
+            'with.*' => 'string|in:' . $availableRelations,
+        ];
+    }
+
+    //TODO: don't forget to review relations list
+    protected function getAvailableRelations(): array
+    {
+        return [
         ];
     }
 }
diff --git a/tests/fixtures/CommandTest/subfolder/nova_test.php b/tests/fixtures/CommandTest/subfolder/nova_test.php
@@ -7,6 +7,7 @@
 use RonasIT\Support\Testing\ModelTestState;
 use RonasIT\Support\Traits\NovaTestTrait;
 use App\Nova\Forum\PostResource;
+use RonasIT\Support\Tests\Support\Command\Models\User;
 
 class NovaPostResourceTest extends TestCase
 {
diff --git a/tests/fixtures/NovaTestGeneratorTest/created_resource_test.php b/tests/fixtures/NovaTestGeneratorTest/created_resource_test.php
@@ -7,6 +7,7 @@
 use RonasIT\Support\Testing\ModelTestState;
 use RonasIT\Support\Traits\NovaTestTrait;
 use App\Nova\WelcomeBonusResource;
+use RonasIT\Support\Tests\Support\Models\User;
 
 class NovaWelcomeBonusResourceTest extends TestCase
 {
diff --git a/tests/fixtures/RequestGeneratorTest/get_request.php b/tests/fixtures/RequestGeneratorTest/get_request.php
@@ -10,9 +10,11 @@ class GetPostRequest extends Request
 {
     public function rules(): array
     {
+        $availableRelations = implode(',', $this->getAvailableRelations());
+
         return [
             'with' => 'array',
-            'with.*' => 'string|required',
+            'with.*' => 'string|required|in:' . $availableRelations,
         ];
     }
 
@@ -26,4 +28,11 @@ public function validateResolved(): void
             throw new NotFoundHttpException(__('validation.exceptions.not_found', ['entity' => 'Post']));
         }
     }
+
+    //TODO: don't forget to review relations list
+    protected function getAvailableRelations(): array
+    {
+        return [
+        ];
+    }
 }
diff --git a/tests/fixtures/RequestGeneratorTest/search_request.php b/tests/fixtures/RequestGeneratorTest/search_request.php
@@ -9,6 +9,8 @@ class SearchPostsRequest extends Request
 {
     public function rules(): array
     {
+        $availableRelations = implode(',', $this->getAvailableRelations());
+
         return [
             'user_id' => 'integer|exists:users,id|required',
             'page' => 'integer',
@@ -19,7 +21,14 @@ public function rules(): array
             'with' => 'array',
             'order_by' => 'string|in:' . $this->getOrderableFields(Post::class),
             'query' => 'string|nullable',
-            'with.*' => 'string',
+            'with.*' => 'string|in:' . $availableRelations,
+        ];
+    }
+
+    //TODO: don't forget to review relations list
+    protected function getAvailableRelations(): array
+    {
+        return [
         ];
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -76,6 +76,7 @@ protected function createRequest($method, $needToValidate = true, $parameters =`
`76`	`76`	`'namespace' => $this->getNamespace('requests'),`
`77`	`77`	`'servicesNamespace' => $this->getNamespace('services'),`
`78`	`78`	`'entityNamespace' => $this->getModelClass($this->model),`
	`79`	`+ 'needToValidateWith' => !is_null(Arr::first($parameters, fn ($parameter) => $parameter['name'] === 'with.*')),`
`79`	`80`	`]);`
`80`	`81`
`81`	`82`	`$this->saveClass('requests', "{$method}{$modelName}Request",`
`@@ -195,7 +196,7 @@ protected function getRules($name, $type, $required, $nullable, $present): array`
`195`	`196`	`$rules[] = 'present';`
`196`	`197`	`}`
`197`	`198`
`198`		`- if ($name === 'order_by') {`
	`199`	`+ if (in_array($name, ['order_by', 'with.*'])) {`
`199`	`200`	`$rules[] = 'in:';`
`200`	`201`	`}`
`201`	`202`
Original file line number	Diff line number	Diff line change
`@@ -5,6 +5,7 @@`
`5`	`5`	`use RonasIT\Support\Testing\ModelTestState;`
`6`	`6`	`use RonasIT\Support\Traits\NovaTestTrait;`
`7`	`7`	`use {{ $resource_namespace }};`
	`8`	`+use {{ $models_namespace }}\User;`
`8`	`9`
`9`	`10`	`class Nova{{ $resource_name }}Test extends TestCase`
`10`	`11`	`{`
Original file line number	Diff line number	Diff line change
`@@ -10,9 +10,11 @@ class GetPostRequest extends Request`
`10`	`10`	`{`
`11`	`11`	`public function rules(): array`
`12`	`12`	`{`
	`13`	`+ $availableRelations = implode(',', $this->getAvailableRelations());`
	`14`	`+`
`13`	`15`	`return [`
`14`	`16`	`'with' => 'array',`
`15`		`- 'with.*' => 'string\|required',`
	`17`	`+ 'with.*' => 'string\|required\|in:' . $availableRelations,`
`16`	`18`	`];`
`17`	`19`	`}`
`18`	`20`
`@@ -26,4 +28,11 @@ public function validateResolved(): void`
`26`	`28`	`throw new NotFoundHttpException(__('validation.exceptions.not_found', ['entity' => 'Post']));`
`27`	`29`	`}`
`28`	`30`	`}`
	`31`	`+`
	`32`	`+ //TODO: don't forget to review relations list`
	`33`	`+ protected function getAvailableRelations(): array`
	`34`	`+ {`
	`35`	`+ return [`
	`36`	`+ ];`
	`37`	`+ }`
`29`	`38`	`}`
Original file line number	Diff line number	Diff line change
`@@ -7,6 +7,7 @@`
`7`	`7`	`use RonasIT\Support\Testing\ModelTestState;`
`8`	`8`	`use RonasIT\Support\Traits\NovaTestTrait;`
`9`	`9`	`use App\Nova\PostResource;`
	`10`	`+use RonasIT\Support\Tests\Support\Command\Models\User;`
`10`	`11`
`11`	`12`	`class NovaPostResourceTest extends TestCase`
`12`	`13`	`{`
Original file line number	Diff line number	Diff line change
`@@ -9,6 +9,8 @@ class SearchPostsRequest extends Request`
`9`	`9`	`{`
`10`	`10`	`public function rules(): array`
`11`	`11`	`{`
	`12`	`+ $availableRelations = implode(',', $this->getAvailableRelations());`
	`13`	`+`
`12`	`14`	`return [`
`13`	`15`	`'page' => 'integer',`
`14`	`16`	`'per_page' => 'integer',`
`@@ -17,7 +19,14 @@ public function rules(): array`
`17`	`19`	`'all' => 'boolean',`
`18`	`20`	`'with' => 'array',`
`19`	`21`	`'query' => 'string\|nullable',`
`20`		`- 'with.*' => 'string',`
	`22`	`+ 'with.*' => 'string\|in:' . $availableRelations,`
	`23`	`+ ];`
	`24`	`+ }`
	`25`	`+`
	`26`	`+ //TODO: don't forget to review relations list`
	`27`	`+ protected function getAvailableRelations(): array`
	`28`	`+ {`
	`29`	`+ return [`
`21`	`30`	`];`
`22`	`31`	`}`
`23`	`32`	`}`