Merge pull request #183 from RonasIT/unify-prepare-relations

refactor: unify prepareRelations into a single method

Author: DenTray

src/DTO/RelationsDTO.php

@@ -11,9 +11,4 @@ public function __construct(
         public array $belongsToMany = [],
     ) {
     }
-
-    public function toArray(): array
-    {
-        return get_object_vars($this);
-    }
 }

src/Generators/EntityGenerator.php

@@ -36,7 +36,7 @@ abstract class EntityGenerator
 
     protected $paths = [];
     protected $model;
-    protected $modelSubFolder = null;
+    protected $modelSubFolder = '';
     protected $fields;
     protected $relations = [];
     protected $crudOptions;
@@ -289,4 +289,15 @@ protected function isStubExists(string $stubName, ?string $generationType = null
 
         return true;
     }
+
+    protected function prepareRelations(): array
+    {
+        $result = [];
+
+        foreach ($this->relations as $relationType => $relations) {
+            $result[$relationType] = array_map(fn ($relation) => class_basename($relation), $relations);
+        }
+
+        return $result;
+    }
 }

src/Generators/MigrationGenerator.php

@@ -33,17 +33,6 @@ public function generate(): void
         event(new SuccessCreateMessage("Created a new Migration: {$entities}_create_table"));
     }
 
-    protected function prepareRelations(): array
-    {
-        $result = [];
-
-        foreach ($this->relations->toArray() as $relationType => $relations) {
-            $result[$relationType] = array_map(fn ($relation) => Str::afterLast($relation, '/'), $relations);
-        }
-
-        return $result;
-    }
-
     protected function isJson(string $typeName): bool
     {
         return $typeName === 'json';

src/Generators/ModelGenerator.php

@@ -113,7 +113,7 @@ protected function insertImport(string &$classContent, string $import): void
         }
     }
 
-    public function prepareRelations(): array
+    protected function prepareRelations(): array
     {
         $result = [];
 
@@ -187,7 +187,7 @@ protected function shouldImportRelation(string $relation): bool
     {
         $relationNamespace = when(Str::contains($relation, '/'), fn () => Str::beforeLast($relation, '/'), '');
 
-        return $relationNamespace != $this->modelSubFolder;
+        return $relationNamespace !== $this->modelSubFolder;
     }
 
     protected function generateClassNamespace(string $className, ?string $folder = null): string

src/Generators/SeederGenerator.php

@@ -64,21 +64,6 @@ protected function createEntitySeeder(): void
         event(new SuccessCreateMessage($createMessage));
     }
 
-    protected function prepareRelations(): array
-    {
-        $result = [];
-
-        foreach ($this->relations as $type => $relationsByType) {
-            $result[$type] = [];
-
-            foreach ($relationsByType as $relation) {
-                $result[$type][] = class_basename($relation);
-            }
-        }
-
-        return $result;
-    }
-
     protected function appendSeederToList(): void
     {
         $content = file_get_contents($this->databaseSeederPath);

stubs/model.blade.php

@@ -44,4 +44,4 @@ class {{ $entity }} extends Model
     @include(config('entity-generator.stubs.relation'), $relation)
 
 @endforeach
-}
+}

tests/ModelGeneratorTest.php

@@ -177,6 +177,20 @@ className: SuccessCreateMessage::class,
         );
     }
 
+    public function testCreateWithSubFoldersRelations()
+    {
+        $this
+            ->artisan('make:entity Post -S title -A Forum/Author')
+            ->assertSuccessful();
+
+        $this->assertGeneratedFileEquals('new_model_with_subfolers_relations.php', 'app/Models/Post.php');
+
+        $this->assertEventPushed(
+            className: SuccessCreateMessage::class,
+            message: 'Created a new Model: Post',
+        );
+    }
+
     public function testCreateModelWithoutDateFields()
     {
         $this

tests/Support/Model/ModelMockTrait.php

@@ -28,6 +28,7 @@ public function mockFilesystem(): void
         $fileSystemMock->models = [
             'Comment.php' => file_get_contents(getcwd() . '/tests/Support/Models/WelcomeBonus.php'),
             'User.php' => file_get_contents(getcwd() . '/tests/Support/Models/WelcomeBonus.php'),
+            'Forum/Author.php' => file_get_contents(getcwd() . '/tests/Support/Models/WelcomeBonus.php'),
         ];
 
         $fileSystemMock->setStructure();

tests/fixtures/CommandTest/model.php

@@ -16,4 +16,4 @@ class Post extends Model
     ];
 
     protected $hidden = ['pivot'];
-}
+}

tests/fixtures/CommandTest/subfolder/model.php

@@ -16,4 +16,4 @@ class Post extends Model
     ];
 
     protected $hidden = ['pivot'];
-}
+}