Merge pull request #192 from RonasIT/188_Remove-service_with_trait-logic-generation

feat: Remove service_with_trait logic generation

Author: DenTray

src/Commands/MakeEntityCommand.php

@@ -90,7 +90,7 @@ class MakeEntityCommand extends Command
     protected $rules = [
         'only' => [
             'only-api' => [ResourceGenerator::class, ControllerGenerator::class, RequestsGenerator::class, TestsGenerator::class],
-            'only-entity' => [MigrationGenerator::class, ModelGenerator::class, ServiceGenerator::class, RepositoryGenerator::class, FactoryGenerator::class, SeederGenerator::class],
+            'only-entity' => [MigrationGenerator::class, ModelGenerator::class, RepositoryGenerator::class, ServiceGenerator::class, FactoryGenerator::class, SeederGenerator::class],
             'only-model' => [ModelGenerator::class],
             'only-repository' => [RepositoryGenerator::class],
             'only-service' => [ServiceGenerator::class],

src/Generators/ServiceGenerator.php

@@ -10,31 +10,23 @@ class ServiceGenerator extends EntityGenerator
 {
     public function generate(): void
     {
-        if ($this->classExists('repositories', "{$this->model}Repository")) {
-            $stub = 'service';
-        } else {
-            $stub = 'service_with_trait';
-
-            if (!$this->classExists('models', $this->model)) {
-                // TODO: pass $this->modelSubfolder to Exception after refactoring in https://github.com/RonasIT/laravel-entity-generator/issues/179
-                $this->throwFailureException(
-                    exceptionClass: ClassNotExistsException::class,
-                    failureMessage: "Cannot create {$this->model}Service cause {$this->model} Model does not exists.",
-                    recommendedMessage: "Create a {$this->model} Model by himself or run command 'php artisan make:entity {$this->model} --only-model'.",
-                );
-            }
+        if (!$this->classExists('repositories', "{$this->model}Repository")) {
+            $this->throwFailureException(
+                exceptionClass: ClassNotExistsException::class,
+                failureMessage: "Cannot create {$this->model}Service cause {$this->model}Repository does not exists.",
+                recommendedMessage: "Create a {$this->model}Repository by himself or run command 'php artisan make:entity {$this->model} --only-repository'.",
+            );
         }
 
-        if (!$this->isStubExists($stub)) {
+        if (!$this->isStubExists('service')) {
             return;
         }
 
-        $serviceContent = $this->getStub($stub, [
+        $serviceContent = $this->getStub('service', [
             'entity' => $this->model,
             'fields' => $this->getFields(),
             'namespace' => $this->getOrCreateNamespace('services'),
             'repositoriesNamespace' => $this->getOrCreateNamespace('repositories'),
-            'modelsNamespace' => $this->getOrCreateNamespace('models')
         ]);
 
         $this->saveClass('services', "{$this->model}Service", $serviceContent);

stubs/service_with_trait.blade.php

@@ -14,17 +14,16 @@ class ServiceGeneratorTest extends TestCase
 {
     use GeneratorMockTrait;
 
-    public function testMissingModel()
+    public function testMissingRepository()
     {
         $this->mockClass(ServiceGenerator::class, [
             $this->classExistsMethodCall(['repositories', 'PostRepository'], false),
-            $this->classExistsMethodCall(['models', 'Post'], false),
         ]);
 
         $this->assertExceptionThrew(
             className: ClassNotExistsException::class,
-            message: 'Cannot create PostService cause Post Model does not exists. '
-            . "Create a Post Model by himself or run command 'php artisan make:entity Post --only-model'",
+            message: 'Cannot create PostService cause PostRepository does not exists. '
+            . "Create a PostRepository by himself or run command 'php artisan make:entity Post --only-repository'",
         );
 
         app(ServiceGenerator::class)
@@ -34,57 +33,7 @@ className: ClassNotExistsException::class,
         Event::assertNothingDispatched();
     }
 
-    public function testCreateWithTrait()
-    {
-        $this->mockClass(ServiceGenerator::class, [
-            $this->classExistsMethodCall(['repositories', 'PostRepository'], false),
-            $this->classExistsMethodCall(['models', 'Post']),
-        ]);
-
-        app(ServiceGenerator::class)
-            ->setRelations(new RelationsDTO(
-                hasMany: ['Comment'],
-                belongsTo: ['User'],
-            ))
-            ->setFields([
-                'integer-required' => ['media_id'],
-                'string-required' => ['body'],
-                'string' => ['title']
-            ])
-            ->setModel('Post')
-            ->generate();
-
-        $this->assertGeneratedFileEquals('service_with_trait.php', 'app/Services/PostService.php');
-
-        $this->assertEventPushed(
-            className: SuccessCreateMessage::class,
-            message: 'Created a new Service: PostService',
-        );
-    }
-
-    public function testCreateWithTraitStubNotExist()
-    {
-        config(['entity-generator.stubs.service_with_trait' => 'incorrect_stub']);
-
-        $this->mockClass(ServiceGenerator::class, [
-            $this->classExistsMethodCall(['repositories', 'PostRepository'], false),
-            $this->classExistsMethodCall(['models', 'Post']),
-        ]);
-
-        app(ServiceGenerator::class)
-            ->setFields([])
-            ->setModel('Post')
-            ->generate();
-
-        $this->assertFileDoesNotExist('app/Services/PostService.php');
-
-        $this->assertEventPushed(
-            className: WarningEvent::class,
-            message: 'Generation of service with trait has been skipped cause the view incorrect_stub from the config entity-generator.stubs.service_with_trait is not exists. Please check that config has the correct view name value.',
-        );
-    }
-
-    public function testCreateWithoutTrait()
+    public function testCreate()
     {
         $this->mockClass(ServiceGenerator::class, [
             $this->classExistsMethodCall(['repositories', 'PostRepository']),
@@ -104,15 +53,15 @@ public function testCreateWithoutTrait()
             ->setModel('Post')
             ->generate();
 
-        $this->assertGeneratedFileEquals('service_without_trait.php', 'app/Services/PostService.php');
+        $this->assertGeneratedFileEquals('service.php', 'app/Services/PostService.php');
 
         $this->assertEventPushed(
             className: SuccessCreateMessage::class,
             message: 'Created a new Service: PostService',
         );
     }
 
-    public function testCreateWithoutTraitStubNotExist()
+    public function testCreateStubNotExist()
     {
         config(['entity-generator.stubs.service' => 'incorrect_stub']);