Merge branch 'master' into 140-use-NovaResource-class-in-NovaTestGenerator-instead-of-Model

Author: DenTray

src/Commands/MakeEntityCommand.php

@@ -313,7 +313,7 @@ protected function convertToPascalCase(string $entityName): string
         $pascalEntityName = Str::studly($entityName);
 
         if ($entityName !== $pascalEntityName) {
-            $this->info("{$entityName} was converted to {$pascalEntityName}");
+            $this->warn("{$entityName} was converted to {$pascalEntityName}");
         }
 
         return $pascalEntityName;

src/Generators/EntityGenerator.php

@@ -328,4 +328,20 @@ protected function checkResourceExists(string $path, string $resourceName, ?stri
             throw new ResourceAlreadyExistsException($filePath);
         }
     }
+
+    protected function getRelationName(string $relation, string $type): string
+    {
+        $relationName = Str::snake($relation);
+
+        if ($this->isPluralRelation($type)) {
+            $relationName = Str::plural($relationName);
+        }
+
+        return $relationName;
+    }
+
+    protected function isPluralRelation(string $relation): bool
+    {
+        return in_array($relation, ['hasMany', 'belongsToMany']);
+    }
 }

src/Generators/ModelGenerator.php

@@ -9,11 +9,6 @@
 
 class ModelGenerator extends EntityGenerator
 {
-    protected const array PLURAL_NUMBER_REQUIRED = [
-        'belongsToMany',
-        'hasMany',
-    ];
-
     public function generate(): void
     {
         $this->checkResourceExists('models', $this->model, $this->modelSubFolder);
@@ -160,17 +155,6 @@ protected function getCasts(array $fields): array
         return $result;
     }
 
-    private function getRelationName(string $relation, string $type): string
-    {
-        $relationName = Str::snake($relation);
-
-        if (in_array($type, self::PLURAL_NUMBER_REQUIRED)) {
-            $relationName = Str::plural($relationName);
-        }
-
-        return $relationName;
-    }
-
     protected function getImportedRelations(): array
     {
         $result = [];
@@ -259,7 +243,7 @@ protected function isRequired(string $typeName): bool
 
     protected function getRelationType(string $model, string $relation): string
     {
-        if (in_array($relation, self::PLURAL_NUMBER_REQUIRED)) {
+        if ($this->isPluralRelation($relation)) {
             return "Collection<{$model}>";
         }
 

src/Generators/RequestsGenerator.php

@@ -79,6 +79,7 @@ protected function createRequest($method, $needToValidate = true, $parameters =
             'servicesNamespace' => $this->generateNamespace($this->paths['services']),
             'entityNamespace' => $this->getModelClass($this->model),
             'needToValidateWith' => !is_null(Arr::first($parameters, fn ($parameter) => $parameter['name'] === 'with.*')),
+            'availableRelations' => $this->getAvailableRelations(),
         ]);
 
         $this->saveClass('requests', "{$method}{$modelName}Request",
@@ -135,15 +136,15 @@ protected function getSearchValidationParameters(): array
             'per_page',
         ]);
 
-        $parameters['array'] = ['with'];
-
         $parameters['string'] = ['order_by'];
 
         $parameters['string-nullable'] = ['query'];
 
+        $parameters['array'] = ['with'];
+
         $parameters['string-required'] = ['with.*'];
 
-        return $this->getValidationParameters($parameters, false);
+        return $this->getValidationParameters($parameters, true);
     }
 
     public function getValidationParameters($parameters, $requiredAvailable): array
@@ -187,7 +188,7 @@ protected function getRules($name, $type, $required, $nullable, $present): array
         }
 
         if ($required) {
-            $rules[] = 'required';
+            array_unshift($rules, 'required');
         }
 
         if ($nullable) {
@@ -208,6 +209,22 @@ protected function getRules($name, $type, $required, $nullable, $present): array
         ];
     }
 
+    protected function getAvailableRelations(): array
+    {
+        $availableRelations = [];
+
+        $relations = $this->prepareRelations();
+
+        foreach ($relations as $type => $entities) {
+            array_push(
+                $availableRelations,
+                ...Arr::map($entities, fn ($entity) => $this->getRelationName($entity, $type)),
+            );
+        }
+
+        return $availableRelations;
+    }
+
     private function getEntityName($method): string
     {
         if ($method === self::SEARCH_METHOD) {

stubs/request.blade.php

@@ -50,8 +50,15 @@ public function validateResolved(): void
     //TODO: don't forget to review relations list
     protected function getAvailableRelations(): array
     {
+@if(!empty($availableRelations))
         return [
+@foreach($availableRelations as $relation)
+            '{{ $relation }}',
+@endforeach
         ];
+@else
+        return [];
+@endif
     }
 @endif
 }

tests/fixtures/CommandTest/get_request.php

@@ -14,7 +14,7 @@ public function rules(): array
 
         return [
             'with' => 'array',
-            'with.*' => 'string|required|in:' . $availableRelations,
+            'with.*' => 'required|string|in:' . $availableRelations,
         ];
     }
 
@@ -32,7 +32,6 @@ public function validateResolved(): void
     //TODO: don't forget to review relations list
     protected function getAvailableRelations(): array
     {
-        return [
-        ];
+        return [];
     }
 }

tests/fixtures/CommandTest/search_request.php

@@ -17,16 +17,15 @@ public function rules(): array
             'order_by' => 'string|in:' . $this->getOrderableFields(Post::class),
             'desc' => 'boolean',
             'all' => 'boolean',
-            'with' => 'array',
             'query' => 'string|nullable',
-            'with.*' => 'string|in:' . $availableRelations,
+            'with' => 'array',
+            'with.*' => 'required|string|in:' . $availableRelations,
         ];
     }
 
     //TODO: don't forget to review relations list
     protected function getAvailableRelations(): array
     {
-        return [
-        ];
+        return [];
     }
 }

tests/fixtures/CommandTest/search_request_subfolder_model.php

@@ -17,16 +17,15 @@ public function rules(): array
             'order_by' => 'string|in:' . $this->getOrderableFields(Post::class),
             'desc' => 'boolean',
             'all' => 'boolean',
-            'with' => 'array',
             'query' => 'string|nullable',
-            'with.*' => 'string|in:' . $availableRelations,
+            'with' => 'array',
+            'with.*' => 'required|string|in:' . $availableRelations,
         ];
     }
 
     //TODO: don't forget to review relations list
     protected function getAvailableRelations(): array
     {
-        return [
-        ];
+        return [];
     }
 }

tests/fixtures/RequestGeneratorTest/create_request.php

@@ -9,7 +9,7 @@ class CreatePostRequest extends Request
     public function rules(): array
     {
         return [
-            'user_id' => 'integer|exists:users,id|required',
+            'user_id' => 'required|integer|exists:users,id',
             'is_draft' => 'boolean',
             'is_published' => 'boolean|present',
         ];

tests/fixtures/RequestGeneratorTest/get_request.php

@@ -14,7 +14,7 @@ public function rules(): array
 
         return [
             'with' => 'array',
-            'with.*' => 'string|required|in:' . $availableRelations,
+            'with.*' => 'required|string|in:' . $availableRelations,
         ];
     }
 
@@ -33,6 +33,8 @@ public function validateResolved(): void
     protected function getAvailableRelations(): array
     {
         return [
+            'comments',
+            'user',
         ];
     }
 }