Merge pull request #367 from tienvx/fix-cant-finish-reduce-bug

Fix can't finish reduce bug
tienvx · Aug 20, 2019 · 51ce4e2 · 51ce4e2
2 parents f0fa085 + 3d174f5
commit 51ce4e2
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 8 deletions.
diff --git a/src/Command/ReduceBugCommand.php b/src/Command/ReduceBugCommand.php
@@ -3,13 +3,15 @@
 namespace Tienvx\Bundle\MbtBundle\Command;
 
 use Doctrine\DBAL\LockMode;
+use Doctrine\ORM\EntityManager;
 use Doctrine\ORM\EntityManagerInterface;
 use Exception;
 use Symfony\Component\Console\Input\InputArgument;
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Output\OutputInterface;
 use Symfony\Component\Messenger\MessageBusInterface;
 use Symfony\Component\Workflow\Registry;
+use Throwable;
 use Tienvx\Bundle\MbtBundle\Entity\Bug;
 use Tienvx\Bundle\MbtBundle\Entity\Task;
 use Tienvx\Bundle\MbtBundle\Helper\WorkflowHelper;
@@ -24,7 +26,7 @@ class ReduceBugCommand extends AbstractCommand
     private $reducerManager;
 
     /**
-     * @var EntityManagerInterface
+     * @var EntityManager
      */
     private $entityManager;
 
@@ -68,6 +70,7 @@ protected function configure()
      * @param OutputInterface $output
      *
      * @throws Exception
+     * @throws Throwable
      */
     protected function execute(InputInterface $input, OutputInterface $output)
     {
@@ -93,11 +96,14 @@ protected function execute(InputInterface $input, OutputInterface $output)
         $messagesCount = $reducer->dispatch($bug);
         if (0 === $messagesCount && 0 === $bug->getMessagesCount()) {
             $this->messageBus->dispatch(new FinishReduceBugMessage($bug->getId()));
-        } else {
+        } elseif ($messagesCount > 0) {
             $callback = function () use ($bug, $messagesCount) {
-                $this->entityManager->lock($bug, LockMode::PESSIMISTIC_WRITE);
+                // Reload the bug for the newest messages count.
+                $bug = $this->entityManager->find(Bug::class, $bug->getId(), LockMode::PESSIMISTIC_WRITE);
 
-                $bug->setMessagesCount($bug->getMessagesCount() + $messagesCount);
+                if ($bug instanceof Bug) {
+                    $bug->setMessagesCount($bug->getMessagesCount() + $messagesCount);
+                }
             };
 
             $this->entityManager->transactional($callback);

diff --git a/src/Reducer/AbstractReducer.php b/src/Reducer/AbstractReducer.php
@@ -3,6 +3,7 @@
 namespace Tienvx\Bundle\MbtBundle\Reducer;
 
 use Doctrine\DBAL\LockMode;
+use Doctrine\ORM\EntityManager;
 use Doctrine\ORM\EntityManagerInterface;
 use Exception;
 use Psr\Cache\InvalidArgumentException;
@@ -42,7 +43,7 @@ abstract class AbstractReducer implements ReducerInterface
     protected $graphBuilder;
 
     /**
-     * @var EntityManagerInterface
+     * @var EntityManager
      */
     private $entityManager;
 
@@ -109,10 +110,14 @@ public function handle(Bug $bug, Workflow $workflow, int $length, int $from, int
      */
     protected function updateSteps(Bug $bug, Steps $newSteps)
     {
-        $callback = function () use ($bug, $newSteps) {
-            $this->entityManager->lock($bug, LockMode::PESSIMISTIC_WRITE);
+        $length = $bug->getSteps()->getLength();
+        $callback = function () use ($bug, $newSteps, $length) {
+            // Reload the bug for the newest messages length.
+            $bug = $this->entityManager->find(Bug::class, $bug->getId(), LockMode::PESSIMISTIC_WRITE);
 
-            $bug->setSteps($newSteps);
+            if ($bug instanceof Bug && $length === $bug->getSteps()->getLength()) {
+                $bug->setSteps($newSteps);
+            }
         };
 
         $this->entityManager->transactional($callback);