Merge pull request #4 from pvelx/develop

renamed adapter of trigger service

Author: pvelx

config/packages/messenger.yaml

@@ -20,4 +20,4 @@ framework:
       # sync: 'sync://'
 
     routing:
-      'App\Service\TaskServerGrpcAdapter\BusMessage\TaskExecuteMessage': async
+      'App\Service\TriggerServiceGrpcAdapter\BusMessage\TriggerExecutedMessage': async

config/services.yaml

@@ -30,23 +30,23 @@ services:
   # add more service definitions when explicit configuration is needed
   # please note that last definitions always *replace* previous ones
 
-  App\Service\TaskServerGrpcAdapter\TaskServerGrpcAdapter:
+  App\Service\TriggerServiceGrpcAdapter\TriggerServiceGrpcAdapter:
     arguments:
       $host: '%env(TASK_GRPC_SERVER_HOST)%'
 
-  App\Contract\TaskServerAdapter\TaskServerAdapterInterface:
-    alias: App\Service\TaskServerGrpcAdapter\TaskServerGrpcAdapter
+  App\Contract\TriggerServiceAdapter\TriggerServiceAdapterInterface:
+    alias: App\Service\TriggerServiceGrpcAdapter\TriggerServiceGrpcAdapter
 
   task_server_grpc_adapter.serializer:
     class: App\Serializer\AmqpMessageSerializer
     arguments:
-      $messageClass: App\Service\TaskServerGrpcAdapter\BusMessage\TaskExecuteMessage
+      $messageClass: App\Service\TriggerServiceGrpcAdapter\BusMessage\TriggerExecutedMessage
 
   App\Service\TaskService\TaskService:
     tags:
       - name: kernel.event_listener
-        event: App\Service\TaskServerGrpcAdapter\Event\TaskExecuteEvent
-        method: onTaskExecuteEvent
+        event: App\Service\TriggerServiceGrpcAdapter\Event\TriggerExecutedEvent
+        method: onTriggerExecutedEvent
 
   App\Domain\Message\MessageManager:
     tags:

src/Contract/TaskServerAdapter/TaskServerAdapterExceptionInterface.php

@@ -0,0 +1,9 @@
+<?php declare(strict_types=1);
+
+
+namespace App\Contract\TriggerServiceAdapter;
+
+interface TriggerServiceAdapterExceptionInterface extends \Throwable
+{
+
+}

src/Contract/TriggerServiceAdapter/TriggerServiceAdapterExceptionInterface.php

@@ -1,24 +1,24 @@
 <?php declare(strict_types=1);
 
 
-namespace App\Contract\TaskServerAdapter;
+namespace App\Contract\TriggerServiceAdapter;
 
 use Proto\Request;
 use Proto\Response;
 
-interface TaskServerAdapterInterface
+interface TriggerServiceAdapterInterface
 {
     /**
      * @param Request $request
      * @return Response
-     * @throws TaskServerAdapterExceptionInterface
+     * @throws TriggerServiceAdapterExceptionInterface
      */
     public function create(Request $request): Response;
 
     /**
      * @param Request $request
      * @return Response
-     * @throws TaskServerAdapterExceptionInterface
+     * @throws TriggerServiceAdapterExceptionInterface
      */
     public function delete(Request $request): Response;
 }

src/Contract/TaskServerAdapter/TaskServerAdapterInterface.php renamed to src/Contract/TriggerServiceAdapter/TriggerServiceAdapterInterface.php

@@ -16,6 +16,6 @@ class MailerMockService implements MailerInterface
      */
     public function send(string $recipient, string $text)
     {
-
+        //TODO make me
     }
 }

src/Service/MailerMockService/MailerMockService.php

@@ -3,14 +3,14 @@
 
 namespace App\Service\TaskService;
 
-use App\Contract\TaskServerAdapter\TaskServerAdapterInterface;
+use App\Contract\TriggerServiceAdapter\TriggerServiceAdapterInterface;
 use App\Contract\TaskService\TaskServiceInterface;
 use App\Service\TaskService\Entity\Task;
 use App\Service\TaskService\Event\TaskCanceledEvent;
 use App\Service\TaskService\Event\TaskCreatedEvent;
 use App\Service\TaskService\Exception\TaskServiceException;
 use App\Service\TaskService\Repository\TaskRepository;
-use App\Service\TaskServerGrpcAdapter\Event\TaskExecuteEvent;
+use App\Service\TriggerServiceGrpcAdapter\Event\TriggerExecutedEvent;
 use DateTime;
 use Doctrine\ORM\EntityManagerInterface;
 use Doctrine\ORM\EntityNotFoundException;
@@ -23,21 +23,21 @@
 
 class TaskService implements TaskServiceInterface
 {
-    private $taskServerAdapter;
+    private $triggerServiceAdapter;
     private $entityManager;
     private $eventDispatcher;
     private $repository;
     private $logger;
 
     public function __construct(
-        TaskServerAdapterInterface $taskServerAdapter,
+        TriggerServiceAdapterInterface $triggerServiceAdapter,
         EntityManagerInterface $entityManager,
         EventDispatcherInterface $eventDispatcher,
         TaskRepository $repository,
         LoggerInterface $logger
     )
     {
-        $this->taskServerAdapter = $taskServerAdapter;
+        $this->triggerServiceAdapter = $triggerServiceAdapter;
         $this->entityManager = $entityManager;
         $this->eventDispatcher = $eventDispatcher;
         $this->repository = $repository;
@@ -59,7 +59,7 @@ public function create(DateTime $execTime, string $taskType, int $entityId): Tas
             $request = new Request();
             $request->setExecTime($execTime->getTimestamp());
 
-            $response = $this->taskServerAdapter->create($request);
+            $response = $this->triggerServiceAdapter->create($request);
 
             $task = (new Task())
                 ->setStatus(Task::STATUS_PENDING)
@@ -108,7 +108,7 @@ public function cancel(string $taskType, int $entityId): TaskCanceledEvent
             $request = (new Request())
                 ->setId($task->getExternalId());
 
-            $response = $this->taskServerAdapter->delete($request);
+            $response = $this->triggerServiceAdapter->delete($request);
             if ($response->getStatus() != 'ok') {
                 throw new RuntimeException('Deleting in task server was failed');
             }
@@ -136,9 +136,9 @@ public function cancel(string $taskType, int $entityId): TaskCanceledEvent
     }
 
     /**
-     * @param TaskExecuteEvent $event
+     * @param TriggerExecutedEvent $event
      */
-    public function onTaskExecuteEvent(TaskExecuteEvent $event): void
+    public function onTriggerExecutedEvent(TriggerExecutedEvent $event): void
     {
         try {
             $task = $this->repository->findOneByExternalId($event->getTaskId());

src/Service/TaskServerGrpcAdapter/Exception/TaskServerGrpcAdapterException.php

@@ -1,10 +1,10 @@
 <?php declare(strict_types=1);
 
 
-namespace App\Service\TaskServerGrpcAdapter;
+namespace App\Service\TriggerServiceGrpcAdapter;
 
-use App\Service\TaskServerGrpcAdapter\BusMessage\TaskExecuteMessage;
-use App\Service\TaskServerGrpcAdapter\Event\TaskExecuteEvent;
+use App\Service\TriggerServiceGrpcAdapter\BusMessage\TriggerExecutedMessage;
+use App\Service\TriggerServiceGrpcAdapter\Event\TriggerExecutedEvent;
 use Symfony\Component\Messenger\Handler\MessageHandlerInterface;
 use Symfony\Contracts\EventDispatcher\EventDispatcherInterface;
 
@@ -17,8 +17,8 @@ public function __construct(EventDispatcherInterface $dispatcher)
         $this->dispatcher = $dispatcher;
     }
 
-    public function __invoke(TaskExecuteMessage $message)
+    public function __invoke(TriggerExecutedMessage $message)
     {
-        $this->dispatcher->dispatch(new TaskExecuteEvent($message->getTaskId()));
+        $this->dispatcher->dispatch(new TriggerExecutedEvent($message->getTaskId()));
     }
 }

src/Service/TaskService/TaskService.php

@@ -1,10 +1,10 @@
 <?php declare(strict_types=1);
 
 
-namespace App\Service\TaskServerGrpcAdapter\BusMessage;
+namespace App\Service\TriggerServiceGrpcAdapter\BusMessage;
 
 
-class TaskExecuteMessage
+class TriggerExecutedMessage
 {
     private $taskId;