Merge pull request #218 from RonasIT/216-entities-name

[216] convert entity and relation names to PascalCase

Author: DenTray

src/Commands/MakeEntityCommand.php

@@ -124,6 +124,7 @@ public function handle(): void
         $this->checkConfigs();
         $this->listenEvents();
         $this->parseRelations();
+        $this->entityName = $this->convertToPascalCase($this->entityName);
 
         try {
             $this->generate();
@@ -238,19 +239,20 @@ protected function getCrudOptions(): array
     protected function parseRelations(): void
     {
         $this->relations = new RelationsDTO(
-            hasOne: $this->trimRelations($this->option('has-one')),
-            hasMany: $this->trimRelations($this->option('has-many')),
-            belongsTo: $this->trimRelations($this->option('belongs-to')),
-            belongsToMany: $this->trimRelations($this->option('belongs-to-many')),
+            hasOne: $this->prepareRelations($this->option('has-one')),
+            hasMany: $this->prepareRelations($this->option('has-many')),
+            belongsTo: $this->prepareRelations($this->option('belongs-to')),
+            belongsToMany: $this->prepareRelations($this->option('belongs-to-many')),
         );
     }
 
-    protected function trimRelations(array $relations): array
+    protected function prepareRelations(array $relations): array
     {
-        return array_map(
-            callback: fn ($relation) => Str::trim($relation, '/'),
-            array: $relations,
-        );
+        return array_map(function ($relation) {
+            $relation = Str::trim($relation, '/');
+
+            return $this->convertToPascalCase($relation);
+        }, $relations);
     }
 
     protected function getFields(): array
@@ -305,4 +307,15 @@ protected function listenEvents(): void
             listener: fn (WarningEvent $event) => $this->warn($event->message),
         );
     }
+
+    protected function convertToPascalCase(string $entityName): string
+    {
+        $pascalEntityName = Str::studly($entityName);
+
+        if ($entityName !== $pascalEntityName) {
+            $this->info("{$entityName} was converted to {$pascalEntityName}");
+        }
+
+        return $pascalEntityName;
+    }
 }

src/Generators/EntityGenerator.php

@@ -53,7 +53,7 @@ public function setCrudOptions(array $crudOptions): self
 
     public function setModel(string $model): self
     {
-        $this->model = Str::studly($model);
+        $this->model = $model;
 
         return $this;
     }

tests/ModelGeneratorTest.php

@@ -153,7 +153,10 @@ className: SuccessCreateMessage::class,
     public function testCreateModelHasMultipleRelationsWithAnotherModel()
     {
         $this
-            ->artisan('make:entity Forum/Post -A User -E User --only-model')
+            ->artisan('make:entity Forum/post -A user -E /user --only-model')
+            ->expectsOutput('user was converted to User')
+            ->expectsOutput('user was converted to User')
+            ->expectsOutput('post was converted to Post')
             ->assertSuccessful();
 
         $this->assertGeneratedFileEquals('new_model_with_many_relations.php', 'app/Models/Forum/Post.php');