fix bug while canceling sending of message

Author: vlad

src/Doctrine/StateMachineExtension.php

@@ -15,7 +15,7 @@ trait StateMachineExtension
     private function isValidChangeState(array $stateMachine, $currentState, $newState)
     {
         if (isset($stateMachine[$currentState])) {
-            if (isset($stateMachine[$currentState][$newState])) {
+            if (key_exists($newState, $stateMachine[$currentState])) {
                 return true;
             }
         } else {

src/Domain/Message/MessageManager.php

@@ -90,7 +90,11 @@ public function cancelSending(Message $message): MessageScheduledEvent
             $this->entityManager->beginTransaction();
 
             if (!$message->isValidNewStatus(Message::STATUS_CANCELED)) {
-                throw new LogicException('Status is not valid');
+                throw new LogicException(sprintf(
+                    'Status of the message is not valid. Current "%s", need "%s"',
+                    $message->getStatus(),
+                    Message::STATUS_CANCELED
+                ));
             }
 
             $message->setStatus(Message::STATUS_CANCELED);
@@ -105,7 +109,7 @@ public function cancelSending(Message $message): MessageScheduledEvent
 
         } catch (LogicException $e) {
             $this->entityManager->rollback();
-            $m = sprintf('Logic was violated %s', $e->getMessage());
+            $m = sprintf('Logic was violated. %s', $e->getMessage());
             $this->logger->warning($m, ['exception' => $e, 'method' => __METHOD__, 'entityId' => $message->getId()]);
             throw new MessageManagerException($m);
 

src/Service/TaskService/TaskService.php

@@ -96,8 +96,12 @@ public function cancel(string $taskType, int $entityId): TaskCanceledEvent
                 throw new EntityNotFoundException('Task does not exist');
             }
 
-            if ($task->isValidNewStatus(Task::STATUS_CANCELED)) {
-                throw new LogicException('Status is not valid');
+            if (!$task->isValidNewStatus(Task::STATUS_CANCELED)) {
+                throw new LogicException(sprintf(
+                    'Status of the task is not valid. Current "%s", need "%s"',
+                    $task->getStatus(),
+                    Task::STATUS_CANCELED
+                ));
             }
 
             $task->setStatus(Task::STATUS_CANCELED);
@@ -139,8 +143,12 @@ public function onTaskExecuteEvent(TaskExecuteEvent $event): void
                 return;
             }
 
-            if ($task->isValidNewStatus(Task::STATUS_COMPLETED)) {
-                throw new LogicException('Status is not valid');
+            if (!$task->isValidNewStatus(Task::STATUS_COMPLETED)) {
+                throw new LogicException(sprintf(
+                    'Status of the task is not valid. Current "%s", need "%s"',
+                    $task->getStatus(),
+                    Task::STATUS_COMPLETED
+                ));
             }
 
             $task->setStatus(Task::STATUS_COMPLETED);