Merge pull request #3 from pvelx/develop

fix bugs

Author: pvelx

config/services.yaml

@@ -3,9 +3,6 @@
 
 # Put parameters here that don't need to change on each machine where the app is deployed
 # https://symfony.com/doc/current/best_practices/configuration.html#application-related-configuration
-parameters:
-  env(RABBITMQ_DSN): 'amqp://rebbitmq:secret@rabbitmq:5672/%2f'
-
 
 services:
   # default configuration for services in *this* file

docker/Dockerfile

@@ -14,11 +14,8 @@ RUN apk add --no-cache \
     unzip \
     zlib-dev \
     linux-headers \
-    rabbitmq-c-dev
-
-
-# Optional, force UTC as server time
-RUN echo "UTC" > /etc/timezone
+    rabbitmq-c-dev \
+    supervisor
 
 
 # Install composer
@@ -54,7 +51,6 @@ RUN pecl install amqp && docker-php-ext-enable amqp
 RUN pecl install grpc-1.33.1
 RUN docker-php-ext-enable grpc
 
-RUN apk add --no-cache supervisor
 RUN rm /etc/supervisord.conf
 COPY supervisor/ /etc/supervisor/
 

src/Domain/Message/Dto/ScheduleSendingMessage.php

@@ -23,7 +23,7 @@ class ScheduleSendingMessage
 
     /**
      * @var DateTime
-     * @JMS\Type("DateTime<'Y-m-d H:i:s'>")
+     * @JMS\Type("DateTime<'U'>")
      */
     private $execTime;
 

src/Domain/Message/Entity/Message.php

@@ -60,6 +60,7 @@ class Message
 
     /**
      * @ORM\Column(type="datetime")
+     * @JMS\Type("DateTime<'U'>")
      * @JMS\Expose()
      */
     private $execTime;

src/Service/TaskService/Config.php

@@ -15,7 +15,7 @@ class Config
         self::TASK_TYPE_SENDING_PUSH => SendingTimeMessageTriggeredEvent::class
     ];
 
-    static public function getEventByType($type): BaseEvent
+    static public function getEventByType($type): string
     {
         return self::$bindTaskTypeToEvent[$type];
     }

src/Service/TaskService/TaskService.php

@@ -141,7 +141,6 @@ public function cancel(string $taskType, int $entityId): TaskCanceledEvent
     public function onTaskExecuteEvent(TaskExecuteEvent $event): void
     {
         try {
-            $this->entityManager->beginTransaction();
             $task = $this->repository->findOneByExternalId($event->getTaskId());
 
             if (null === $task) {
@@ -163,12 +162,10 @@ public function onTaskExecuteEvent(TaskExecuteEvent $event): void
             $task->setStatus(Task::STATUS_COMPLETED);
             $this->entityManager->persist($task);
             $this->entityManager->flush();
-            $this->entityManager->commit();
 
             $eventClass = Config::getEventByType($task->getTaskType());
             $this->eventDispatcher->dispatch(new $eventClass($task->getId(), $task->getEntityId()));
         } catch (Throwable $e) {
-            $this->entityManager->rollback();
             $this->logger->error(
                 'Error while handle the task',
                 ['exception' => $e, 'method' => __METHOD__, 'entityId' => $event->getTaskId()]