Merge remote-tracking branch 'origin/master' into add-resource-not-exists-exception

artengin · artengin · commit f246aa08cd8c · 2025-11-03T17:00:41.000+03:00
diff --git a/src/Generators/ControllerGenerator.php b/src/Generators/ControllerGenerator.php
@@ -4,17 +4,12 @@
 
 use Illuminate\Contracts\Filesystem\FileNotFoundException;
 use RonasIT\Support\Events\SuccessCreateMessage;
-use RonasIT\Support\Exceptions\ResourceAlreadyExistsException;
 
 class ControllerGenerator extends EntityGenerator
 {
     public function generate(): void
     {
-        if ($this->classExists('controllers', "{$this->model}Controller")) {
-            $path = $this->getClassPath('controllers', "{$this->model}Controller");
-
-            throw new ResourceAlreadyExistsException($path);
-        }
+        $this->checkResourceExists('controllers', "{$this->model}Controller");
 
         $this->checkResourceNotExists('services', "{$this->model}Controller", "{$this->model}Service");
 
diff --git a/src/Generators/EntityGenerator.php b/src/Generators/EntityGenerator.php
@@ -15,6 +15,7 @@
 use RonasIT\Support\Exceptions\ClassNotExistsException;
 use RonasIT\Support\Exceptions\ResourceNotExistsException;
 use RonasIT\Support\Exceptions\IncorrectClassPathException;
+use RonasIT\Support\Exceptions\ResourceAlreadyExistsException;
 
 /**
  * @property Filesystem $fs
@@ -320,6 +321,15 @@ protected function checkConfigHasCorrectPaths(): void
         }
     }
 
+    protected function checkResourceExists(string $path, string $resourceName, ?string $subFolder = null): void
+    {
+        if ($this->classExists($path, $resourceName, $subFolder)) {
+            $filePath = $this->getClassPath($path, $resourceName, $subFolder);
+
+            throw new ResourceAlreadyExistsException($filePath);
+        }
+    }
+
     protected function checkResourceNotExists(string $path, string $entity, string $resourceName, ?string $subFolder = null): void
     {
         if (!$this->classExists($path, $resourceName, $subFolder)) {
diff --git a/src/Generators/FactoryGenerator.php b/src/Generators/FactoryGenerator.php
@@ -8,7 +8,6 @@
 use InvalidArgumentException;
 use RonasIT\Support\Exceptions\FakerMethodNotFoundException;
 use RonasIT\Support\Events\SuccessCreateMessage;
-use RonasIT\Support\Exceptions\ResourceAlreadyExistsException;
 
 class FactoryGenerator extends EntityGenerator
 {
@@ -28,11 +27,7 @@ public function generate(): void
     {
         $this->checkResourceNotExists('models', "{$this->model}Factory", $this->model, $this->modelSubFolder);
 
-        if ($this->classExists('factories', "{$this->model}Factory")) {
-            $path = $this->getClassPath('factories', "{$this->model}Factory");
-
-            throw new ResourceAlreadyExistsException($path);
-        }
+        $this->checkResourceExists('factories', "{$this->model}Factory");
 
         if (!$this->isStubExists('factory')) {
             return;
diff --git a/src/Generators/ModelGenerator.php b/src/Generators/ModelGenerator.php
@@ -5,7 +5,6 @@
 use Illuminate\Support\Arr;
 use Illuminate\Support\Str;
 use RonasIT\Support\Events\SuccessCreateMessage;
-use RonasIT\Support\Exceptions\ResourceAlreadyExistsException;
 
 class ModelGenerator extends EntityGenerator
 {
@@ -16,11 +15,7 @@ class ModelGenerator extends EntityGenerator
 
     public function generate(): void
     {
-        if ($this->classExists('models', $this->model, $this->modelSubFolder)) {
-            $path = $this->getClassPath('models', $this->model, $this->modelSubFolder);
-
-            throw new ResourceAlreadyExistsException($path);
-        }
+        $this->checkResourceExists('models', $this->model, $this->modelSubFolder);
 
         if ($this->isStubExists('model') && (!$this->hasRelations() || $this->isStubExists('relation', 'model'))) {
             $this->createNamespace('models', $this->modelSubFolder);
diff --git a/src/Generators/NovaResourceGenerator.php b/src/Generators/NovaResourceGenerator.php
@@ -7,6 +7,7 @@
 use Illuminate\Support\Facades\DB;
 use Laravel\Nova\NovaServiceProvider;
 use RonasIT\Support\Events\SuccessCreateMessage;
+use RonasIT\Support\Exceptions\ClassNotExistsException;
 use RonasIT\Support\Exceptions\ResourceAlreadyExistsException;
 use RonasIT\Support\Support\CommandLineNovaField;
 use RonasIT\Support\Support\DatabaseNovaField;
@@ -56,11 +57,7 @@ public function generate(): void
         if (class_exists(NovaServiceProvider::class)) {
             $this->checkResourceNotExists('models', "{$this->model} Nova resource", $this->model, $this->modelSubFolder);
 
-            if ($this->classExists('nova', "{$this->model}Resource")) {
-                $path = $this->getClassPath('nova', "{$this->model}Resource", $this->modelSubFolder);
-
-                throw new ResourceAlreadyExistsException($path);
-            }
+            $this->checkResourceExists('nova', "{$this->model}Resource", $this->modelSubFolder);
 
             if (!$this->isStubExists('nova_resource')) {
                 return;
diff --git a/src/Generators/NovaTestGenerator.php b/src/Generators/NovaTestGenerator.php
@@ -12,7 +12,6 @@
 use RecursiveIteratorIterator;
 use RecursiveDirectoryIterator;
 use Illuminate\Support\Arr;
-use RonasIT\Support\Exceptions\ResourceAlreadyExistsException;
 
 class NovaTestGenerator extends AbstractTestsGenerator
 {
@@ -21,12 +20,7 @@ class NovaTestGenerator extends AbstractTestsGenerator
     public function generate(): void
     {
         if (class_exists(NovaServiceProvider::class)) {
-            if ($this->classExists('nova', "Nova{$this->model}ResourceTest")) {
-
-                $path = $this->getClassPath('nova', "Nova{$this->model}ResourceTest");
-
-                throw new ResourceAlreadyExistsException($path);
-            }
+            $this->checkResourceExists('nova', "Nova{$this->model}ResourceTest");
 
             $novaResources = $this->getCommonNovaResources();
 
diff --git a/src/Generators/RepositoryGenerator.php b/src/Generators/RepositoryGenerator.php
@@ -10,6 +10,8 @@ public function generate(): void
     {
         $this->checkResourceNotExists('models', "{$this->model}Repository", $this->model, $this->modelSubFolder);
 
+        $this->checkResourceExists('repositories', "{$this->model}Repository");
+
         if (!$this->isStubExists('repository')) {
             return;
         }
diff --git a/src/Generators/RequestsGenerator.php b/src/Generators/RequestsGenerator.php
@@ -67,6 +67,8 @@ protected function createRequest($method, $needToValidate = true, $parameters =
         $requestsFolder = $this->model;
         $modelName = $this->getEntityName($method);
 
+        $this->checkResourceExists('requests', "{$requestsFolder}/{$method}{$modelName}Request");
+
         $content = $this->getStub('request', [
             'method' => $method,
             'entity' => $modelName,
diff --git a/src/Generators/ResourceGenerator.php b/src/Generators/ResourceGenerator.php
@@ -4,7 +4,6 @@
 
 use Illuminate\Support\Arr;
 use RonasIT\Support\Events\SuccessCreateMessage;
-use RonasIT\Support\Exceptions\ResourceAlreadyExistsException;
 
 class ResourceGenerator extends EntityGenerator
 {
@@ -25,11 +24,7 @@ public function generateCollectionResource(): void
     {
         $pluralName = $this->getPluralName($this->model);
 
-        if ($this->classExists('resources', "{$pluralName}CollectionResource")) {
-            $path = $this->getClassPath('resources', "{$pluralName}CollectionResource");
-
-            throw new ResourceAlreadyExistsException($path);
-        }
+        $this->checkResourceExists('resources', "{$this->model}/{$pluralName}CollectionResource");
 
         $collectionResourceContent = $this->getStub('collection_resource', [
             'singular_name' => $this->model,
@@ -44,11 +39,7 @@ public function generateCollectionResource(): void
 
     public function generateResource(): void
     {
-        if ($this->classExists('resources', "{$this->model}Resource")) {
-            $path = $this->getClassPath('resources', "{$this->model}Resource");
-
-            throw new ResourceAlreadyExistsException($path);
-        }
+        $this->checkResourceExists('resources', "{$this->model}/{$this->model}Resource");
 
         $resourceContent = $this->getStub('resource', [
             'entity' => $this->model,
diff --git a/src/Generators/SeederGenerator.php b/src/Generators/SeederGenerator.php
@@ -20,6 +20,8 @@ public function __construct()
 
     public function generate(): void
     {
+        $this->checkResourceExists('seeders', "{$this->model}Seeder");
+
         if (!$this->isStubExists('seeder') || !$this->isStubExists('database_empty_seeder')) {
             return;
         }
diff --git a/src/Generators/ServiceGenerator.php b/src/Generators/ServiceGenerator.php
@@ -11,6 +11,8 @@ public function generate(): void
     {
         $this->checkResourceNotExists('repositories', "{$this->model}Service", "{$this->model}Repository");
 
+        $this->checkResourceExists('services', "{$this->model}Service");
+
         if (!$this->isStubExists('service')) {
             return;
         }
diff --git a/src/Generators/TestsGenerator.php b/src/Generators/TestsGenerator.php
@@ -6,6 +6,13 @@
 
 class TestsGenerator extends AbstractTestsGenerator
 {
+    public function generate(): void
+    {
+        $this->checkResourceExists('tests', "{$this->model}Test");
+
+        parent::generate();
+    }
+
     public function getTestClassName(): string
     {
         return "{$this->model}Test";
diff --git a/tests/NovaResourceGeneratorTest.php b/tests/NovaResourceGeneratorTest.php
@@ -56,17 +56,17 @@ public function testCreateNovaTestAlreadyExists()
         $this->mockNovaServiceProviderExists();
 
         $this->mockClass(NovaResourceGenerator::class, [
-            $this->classExistsMethodCall(['models', 'Post']),
-            $this->classExistsMethodCall(['nova', 'PostResource']),
+            $this->classExistsMethodCall(['models', 'Forum/Post']),
+            $this->classExistsMethodCall(['nova', 'Forum/PostResource']),
         ]);
 
         $this->assertExceptionThrew(
             className: ResourceAlreadyExistsException::class,
-            message: 'Cannot create PostResource cause it already exists. Remove app/Nova/PostResource.php and run command again.',
+            message: 'Cannot create PostResource cause it already exists. Remove app/Nova/Forum/PostResource.php and run command again.',
         );
 
         app(NovaResourceGenerator::class)
-            ->setModel('Post')
+            ->setModel('Forum/Post')
             ->generate();
     }
 
diff --git a/tests/RepositoryGeneratorTest.php b/tests/RepositoryGeneratorTest.php
@@ -4,6 +4,7 @@
 
 use RonasIT\Support\Events\WarningEvent;
 use RonasIT\Support\Events\SuccessCreateMessage;
+use RonasIT\Support\Exceptions\ResourceAlreadyExistsException;
 use RonasIT\Support\Generators\RepositoryGenerator;
 use RonasIT\Support\Exceptions\ResourceNotExistsException;
 use RonasIT\Support\Tests\Support\Repository\RepositoryMockTrait;
@@ -66,4 +67,21 @@ className: WarningEvent::class,
             message: 'Generation of repository has been skipped cause the view incorrect_stub from the config entity-generator.stubs.repository is not exists. Please check that config has the correct view name value.',
         );
     }
+
+    public function testRepositoryAlreadyExists()
+    {
+        $this->mockClass(RepositoryGenerator::class, [
+            $this->classExistsMethodCall(['models', 'Post']),
+            $this->classExistsMethodCall(['repositories', 'PostRepository']),
+        ]);
+
+        $this->assertExceptionThrew(
+            className: ResourceAlreadyExistsException::class,
+            message: "Cannot create PostRepository cause it already exists. Remove app/Repositories/PostRepository.php and run command again.",
+        );
+
+        app(RepositoryGenerator::class)
+            ->setModel('Post')
+            ->generate();
+    }
 }
diff --git a/tests/RequestGeneratorTest.php b/tests/RequestGeneratorTest.php
@@ -3,12 +3,17 @@
 namespace RonasIT\Support\Tests;
 
 use RonasIT\Support\DTO\RelationsDTO;
-use RonasIT\Support\Events\SuccessCreateMessage;
 use RonasIT\Support\Events\WarningEvent;
+use PHPUnit\Framework\Attributes\DataProvider;
+use RonasIT\Support\Events\SuccessCreateMessage;
 use RonasIT\Support\Generators\RequestsGenerator;
+use RonasIT\Support\Exceptions\ResourceAlreadyExistsException;
+use RonasIT\Support\Tests\Support\Repository\RepositoryMockTrait;
 
 class RequestGeneratorTest extends TestCase
 {
+    use RepositoryMockTrait;
+
     public function testCreateRequests()
     {
         app(RequestsGenerator::class)
@@ -58,4 +63,72 @@ className: WarningEvent::class,
             message: 'Generation of request has been skipped cause the view incorrect_stub from the config entity-generator.stubs.request is not exists. Please check that config has the correct view name value.',
         );
     }
+
+    public static function crudRequestsProvider(): array
+    {
+        return [
+            [
+                'type' => 'Create',
+                'character' => 'C',
+            ],
+            [
+                'type' => 'Get',
+                'character' => 'R',
+            ],
+            [
+                'type' => 'Update',
+                'character' => 'U',
+            ],
+            [
+                'type' => 'Delete',
+                'character' => 'D',
+            ],
+        ];
+    }
+
+    #[DataProvider('crudRequestsProvider')]
+    public function testRequestAlreadyExists(string $type, string $character)
+    {
+        $this->mockClass(RequestsGenerator::class, [
+            $this->classExistsMethodCall(['requests', "Post/{$type}PostRequest"]),
+        ]);
+
+        $this->assertExceptionThrew(
+            className: ResourceAlreadyExistsException::class,
+            message: "Cannot create {$type}PostRequest cause it already exists. Remove app/Http/Requests/Post/{$type}PostRequest.php and run command again.",
+        );
+
+        app(RequestsGenerator::class)
+            ->setModel('Post')
+            ->setRelations(new RelationsDTO(
+                belongsTo: ['User'],
+            ))
+            ->setCrudOptions([$character])
+            ->generate();
+    }
+
+    public function testSearchRequestAlreadyExists()
+    {
+        $this->mockClass(RequestsGenerator::class, [
+            $this->classExistsMethodCall(['requests', 'Post/GetPostRequest'], false),
+            $this->classExistsMethodCall(['requests', 'Post/SearchPostsRequest']),
+        ]);
+
+        $this->assertExceptionThrew(
+            className: ResourceAlreadyExistsException::class,
+            message: "Cannot create SearchPostsRequest cause it already exists. Remove app/Http/Requests/Post/SearchPostsRequest.php and run command again.",
+        );
+
+        app(RequestsGenerator::class)
+            ->setModel('Post')
+            ->setRelations(new RelationsDTO(
+                belongsTo: ['User'],
+            ))
+            ->setFields([
+                'boolean-required' => ['is_published'],
+                'integer' => ['user_id'],
+            ])
+            ->setCrudOptions(['R'])
+            ->generate();
+    }
 }
diff --git a/tests/ResourceGeneratorTest.php b/tests/ResourceGeneratorTest.php
@@ -15,12 +15,12 @@ class ResourceGeneratorTest extends TestCase
     public function testResourceAlreadyExists()
     {
         $this->mockClass(ResourceGenerator::class, [
-            $this->classExistsMethodCall(['resources', 'PostResource']),
+            $this->classExistsMethodCall(['resources', 'Post/PostResource']),
         ]);
 
         $this->assertExceptionThrew(
             className: ResourceAlreadyExistsException::class,
-            message: 'Cannot create PostResource cause it already exists. Remove app/Http/Resources/PostResource.php and run command again.',
+            message: 'Cannot create PostResource cause it already exists. Remove app/Http/Resources/Post/PostResource.php and run command again.',
         );
 
         app(ResourceGenerator::class)
@@ -31,13 +31,13 @@ className: ResourceAlreadyExistsException::class,
     public function testCollectionResourceAlreadyExists()
     {
         $this->mockClass(ResourceGenerator::class, [
-            $this->classExistsMethodCall(['resources', 'PostResource'], false),
-            $this->classExistsMethodCall(['resources', 'PostsCollectionResource']),
+            $this->classExistsMethodCall(['resources', 'Post/PostResource'], false),
+            $this->classExistsMethodCall(['resources', 'Post/PostsCollectionResource']),
         ]);
 
         $this->assertExceptionThrew(
             className: ResourceAlreadyExistsException::class,
-            message: 'Cannot create PostsCollectionResource cause it already exists. Remove app/Http/Resources/PostsCollectionResource.php and run command again.',
+            message: 'Cannot create PostsCollectionResource cause it already exists. Remove app/Http/Resources/Post/PostsCollectionResource.php and run command again.',
         );
 
         app(ResourceGenerator::class)
diff --git a/tests/SeederGeneratorTest.php b/tests/SeederGeneratorTest.php
diff --git a/tests/ServiceGeneratorTest.php b/tests/ServiceGeneratorTest.php
diff --git a/tests/TestGeneratorTest.php b/tests/TestGeneratorTest.php

Original file line number	Diff line number	Diff line change
`@@ -10,6 +10,8 @@ public function generate(): void`
`10`	`10`	`{`
`11`	`11`	`$this->checkResourceNotExists('models', "{$this->model}Repository", $this->model, $this->modelSubFolder);`
`12`	`12`
	`13`	`+ $this->checkResourceExists('repositories', "{$this->model}Repository");`
	`14`	`+`
`13`	`15`	`if (!$this->isStubExists('repository')) {`
`14`	`16`	`return;`
`15`	`17`	`}`
Original file line number	Diff line number	Diff line change
`@@ -20,6 +20,8 @@ public function __construct()`
`20`	`20`
`21`	`21`	`public function generate(): void`
`22`	`22`	`{`
	`23`	`+ $this->checkResourceExists('seeders', "{$this->model}Seeder");`
	`24`	`+`
`23`	`25`	`if (!$this->isStubExists('seeder') \|\| !$this->isStubExists('database_empty_seeder')) {`
`24`	`26`	`return;`
`25`	`27`	`}`