Merge pull request #638 from tienvx/log-new-bug

Log new bug
tienvx · Jul 26, 2022 · 91eb056 · 91eb056
2 parents cbe7a79 + a04a649
commit 91eb056
Show file tree

Hide file tree

Showing 87 changed files with 459 additions and 401 deletions.
diff --git a/README.md b/README.md
@@ -24,9 +24,9 @@ vendor/bin/phpunit
 ## Validate code with coding standards
 
 ```shell
-phpcs --standard=PSR12 src tests
+phpcs --standard=PSR12 src tests config
 php-cs-fixer fix --diff --dry-run
-phpstan analyse src tests
+phpstan analyse src tests config
 ```
 
 ## Built With

diff --git a/src/EventListener/EntitySubscriber.php b/src/EventListener/EntitySubscriber.php
@@ -11,13 +11,10 @@
 
 class EntitySubscriber implements EventSubscriber
 {
-    protected MessageBusInterface $messageBus;
-
     protected string $reducer;
 
-    public function __construct(MessageBusInterface $messageBus)
+    public function __construct(protected MessageBusInterface $messageBus)
     {
-        $this->messageBus = $messageBus;
     }
 
     public function postPersist(LifecycleEventArgs $args): void

diff --git a/src/Generator/RandomGenerator.php b/src/Generator/RandomGenerator.php
@@ -20,21 +20,12 @@ class RandomGenerator extends AbstractGenerator
     public const MAX_TRANSITION_COVERAGE = 100;
     public const MAX_PLACE_COVERAGE = 100;
 
-    protected PetrinetHelperInterface $petrinetHelper;
-    protected MarkingHelperInterface $markingHelper;
-    protected ModelHelperInterface $modelHelper;
-    protected GuardedTransitionServiceInterface $transitionService;
-
     public function __construct(
-        PetrinetHelperInterface $petrinetHelper,
-        MarkingHelperInterface $markingHelper,
-        ModelHelperInterface $modelHelper,
-        GuardedTransitionServiceInterface $transitionService
+        protected PetrinetHelperInterface $petrinetHelper,
+        protected MarkingHelperInterface $markingHelper,
+        protected ModelHelperInterface $modelHelper,
+        protected GuardedTransitionServiceInterface $transitionService
     ) {
-        $this->petrinetHelper = $petrinetHelper;
-        $this->markingHelper = $markingHelper;
-        $this->modelHelper = $modelHelper;
-        $this->transitionService = $transitionService;
     }
 
     public static function getName(): string

diff --git a/src/Message/CreateBugMessage.php b/src/Message/CreateBugMessage.php
@@ -0,0 +1,28 @@
+<?php
+
+namespace Tienvx\Bundle\MbtBundle\Message;
+
+class CreateBugMessage implements MessageInterface
+{
+    public function __construct(
+        protected int $taskId,
+        protected array $steps,
+        protected string $message
+    ) {
+    }
+
+    public function getTaskId(): int
+    {
+        return $this->taskId;
+    }
+
+    public function getSteps(): array
+    {
+        return $this->steps;
+    }
+
+    public function getMessage(): string
+    {
+        return $this->message;
+    }
+}
diff --git a/src/Message/RecordVideoMessage.php b/src/Message/RecordVideoMessage.php
@@ -4,11 +4,8 @@
 
 class RecordVideoMessage implements MessageInterface
 {
-    protected int $bugId;
-
-    public function __construct(int $bugId)
+    public function __construct(protected int $bugId)
     {
-        $this->bugId = $bugId;
     }
 
     public function getBugId(): int

diff --git a/src/Message/ReduceBugMessage.php b/src/Message/ReduceBugMessage.php
@@ -4,11 +4,8 @@
 
 class ReduceBugMessage implements MessageInterface
 {
-    protected int $id;
-
-    public function __construct(int $id)
+    public function __construct(protected int $id)
     {
-        $this->id = $id;
     }
 
     public function getId(): int

diff --git a/src/Message/ReduceStepsMessage.php b/src/Message/ReduceStepsMessage.php
@@ -4,17 +4,12 @@
 
 class ReduceStepsMessage implements MessageInterface
 {
-    protected int $bugId;
-    protected int $length;
-    protected int $from;
-    protected int $to;
-
-    public function __construct(int $bugId, int $length, int $from, int $to)
-    {
-        $this->bugId = $bugId;
-        $this->length = $length;
-        $this->from = $from;
-        $this->to = $to;
+    public function __construct(
+        protected int $bugId,
+        protected int $length,
+        protected int $from,
+        protected int $to
+    ) {
     }
 
     public function getBugId(): int

diff --git a/src/Message/ReportBugMessage.php b/src/Message/ReportBugMessage.php
@@ -4,11 +4,8 @@
 
 class ReportBugMessage implements MessageInterface
 {
-    protected int $bugId;
-
-    public function __construct(int $bugId)
+    public function __construct(protected int $bugId)
     {
-        $this->bugId = $bugId;
     }
 
     public function getBugId(): int

diff --git a/src/Message/RunTaskMessage.php b/src/Message/RunTaskMessage.php
@@ -4,11 +4,8 @@
 
 class RunTaskMessage implements MessageInterface
 {
-    protected int $id;
-
-    public function __construct(int $id)
+    public function __construct(protected int $id)
     {
-        $this->id = $id;
     }
 
     public function getId(): int

diff --git a/src/MessageHandler/CreateBugMessageHandler.php b/src/MessageHandler/CreateBugMessageHandler.php
@@ -0,0 +1,45 @@
+<?php
+
+namespace Tienvx\Bundle\MbtBundle\MessageHandler;
+
+use Symfony\Component\Messenger\Handler\MessageHandlerInterface;
+use Tienvx\Bundle\MbtBundle\Entity\Bug;
+use Tienvx\Bundle\MbtBundle\Exception\UnexpectedValueException;
+use Tienvx\Bundle\MbtBundle\Message\CreateBugMessage;
+use Tienvx\Bundle\MbtBundle\Model\BugInterface;
+use Tienvx\Bundle\MbtBundle\Model\TaskInterface;
+use Tienvx\Bundle\MbtBundle\Repository\TaskRepositoryInterface;
+use Tienvx\Bundle\MbtBundle\Service\ConfigInterface;
+
+class CreateBugMessageHandler implements MessageHandlerInterface
+{
+    public function __construct(
+        protected ConfigInterface $config,
+        protected TaskRepositoryInterface $taskRepository
+    ) {
+    }
+
+    public function __invoke(CreateBugMessage $message): void
+    {
+        $task = $this->taskRepository->find($message->getTaskId());
+
+        if (!$task instanceof TaskInterface) {
+            throw new UnexpectedValueException(sprintf(
+                'Can not create bug for task %d: task not found',
+                $message->getTaskId()
+            ));
+        }
+
+        $this->taskRepository->addBug($task, $this->createBug($message->getSteps(), $message->getMessage()));
+    }
+
+    public function createBug(array $steps, string $message): BugInterface
+    {
+        $bug = new Bug();
+        $bug->setTitle($this->config->getDefaultBugTitle());
+        $bug->setSteps($steps);
+        $bug->setMessage($message);
+
+        return $bug;
+    }
+}
diff --git a/src/MessageHandler/RecordVideoMessageHandler.php b/src/MessageHandler/RecordVideoMessageHandler.php
@@ -8,11 +8,8 @@
 
 class RecordVideoMessageHandler implements MessageHandlerInterface
 {
-    protected BugHelperInterface $bugHelper;
-
-    public function __construct(BugHelperInterface $bugHelper)
+    public function __construct(protected BugHelperInterface $bugHelper)
     {
-        $this->bugHelper = $bugHelper;
     }
 
     public function __invoke(RecordVideoMessage $message): void

diff --git a/src/MessageHandler/ReduceBugMessageHandler.php b/src/MessageHandler/ReduceBugMessageHandler.php
@@ -8,11 +8,8 @@
 
 class ReduceBugMessageHandler implements MessageHandlerInterface
 {
-    protected BugHelperInterface $bugHelper;
-
-    public function __construct(BugHelperInterface $bugHelper)
+    public function __construct(protected BugHelperInterface $bugHelper)
     {
-        $this->bugHelper = $bugHelper;
     }
 
     public function __invoke(ReduceBugMessage $message): void

diff --git a/src/MessageHandler/ReduceStepsMessageHandler.php b/src/MessageHandler/ReduceStepsMessageHandler.php
@@ -8,11 +8,8 @@
 
 class ReduceStepsMessageHandler implements MessageHandlerInterface
 {
-    protected BugHelperInterface $bugHelper;
-
-    public function __construct(BugHelperInterface $bugHelper)
+    public function __construct(protected BugHelperInterface $bugHelper)
     {
-        $this->bugHelper = $bugHelper;
     }
 
     public function __invoke(ReduceStepsMessage $message): void

diff --git a/src/MessageHandler/ReportBugMessageHandler.php b/src/MessageHandler/ReportBugMessageHandler.php
@@ -8,11 +8,8 @@
 
 class ReportBugMessageHandler implements MessageHandlerInterface
 {
-    protected BugHelperInterface $bugHelper;
-
-    public function __construct(BugHelperInterface $bugHelper)
+    public function __construct(protected BugHelperInterface $bugHelper)
     {
-        $this->bugHelper = $bugHelper;
     }
 
     public function __invoke(ReportBugMessage $message): void

diff --git a/src/MessageHandler/RunTaskMessageHandler.php b/src/MessageHandler/RunTaskMessageHandler.php
@@ -8,11 +8,8 @@
 
 class RunTaskMessageHandler implements MessageHandlerInterface
 {
-    protected TaskHelperInterface $taskHelper;
-
-    public function __construct(TaskHelperInterface $taskHelper)
+    public function __construct(protected TaskHelperInterface $taskHelper)
     {
-        $this->taskHelper = $taskHelper;
     }
 
     public function __invoke(RunTaskMessage $message): void

diff --git a/src/Model/Bug/Step.php b/src/Model/Bug/Step.php
@@ -8,10 +8,6 @@
 
 class Step implements StepInterface, NodeIdentifierInterface
 {
-    protected ColorInterface $color;
-    protected array $places;
-    protected int $transition;
-
     public function __serialize(): array
     {
         return [
@@ -28,11 +24,12 @@ public function __unserialize(array $data)
         $this->transition = $data['transition'];
     }
 
-    public function __construct(array $places, ColorInterface $color, int $transition)
-    {
+    public function __construct(
+        protected array $places,
+        protected ColorInterface $color,
+        protected int $transition
+    ) {
         $this->setPlaces($places);
-        $this->setColor($color);
-        $this->setTransition($transition);
     }
 
     public function __clone()

diff --git a/src/Model/Values.php b/src/Model/Values.php
@@ -4,9 +4,7 @@
 
 class Values implements ValuesInterface
 {
-    protected array $values = [];
-
-    public function __construct(array $values = [])
+    public function __construct(protected array $values = [])
     {
         $this->values = [];
 

diff --git a/src/Plugin/PluginManager.php b/src/Plugin/PluginManager.php
@@ -7,13 +7,10 @@
 
 class PluginManager implements PluginManagerInterface
 {
-    protected ServiceLocator $locator;
-    protected array $plugins;
-
-    public function __construct(ServiceLocator $locator, array $plugins)
-    {
-        $this->locator = $locator;
-        $this->plugins = $plugins;
+    public function __construct(
+        protected ServiceLocator $locator,
+        protected array $plugins
+    ) {
     }
 
     public function all(): array

diff --git a/src/Reducer/DispatcherTemplate.php b/src/Reducer/DispatcherTemplate.php
@@ -10,11 +10,8 @@ abstract class DispatcherTemplate implements DispatcherInterface
 {
     protected const MIN_STEPS = 3;
 
-    protected MessageBusInterface $messageBus;
-
-    public function __construct(MessageBusInterface $messageBus)
+    public function __construct(protected MessageBusInterface $messageBus)
     {
-        $this->messageBus = $messageBus;
     }
 
     public function dispatch(BugInterface $bug): int

diff --git a/src/Reducer/HandlerTemplate.php b/src/Reducer/HandlerTemplate.php
@@ -5,29 +5,23 @@
 use Symfony\Component\Messenger\MessageBusInterface;
 use Throwable;
 use Tienvx\Bundle\MbtBundle\Exception\StepsNotConnectedException;
+use Tienvx\Bundle\MbtBundle\Message\CreateBugMessage;
 use Tienvx\Bundle\MbtBundle\Message\ReduceBugMessage;
 use Tienvx\Bundle\MbtBundle\Model\BugInterface;
 use Tienvx\Bundle\MbtBundle\Repository\BugRepositoryInterface;
+use Tienvx\Bundle\MbtBundle\Service\ConfigInterface;
 use Tienvx\Bundle\MbtBundle\Service\Step\Builder\StepsBuilderInterface;
 use Tienvx\Bundle\MbtBundle\Service\Step\Runner\BugStepsRunner;
 
 abstract class HandlerTemplate implements HandlerInterface
 {
-    protected BugRepositoryInterface $bugRepository;
-    protected MessageBusInterface $messageBus;
-    protected BugStepsRunner $stepsRunner;
-    protected StepsBuilderInterface $stepsBuilder;
-
     public function __construct(
-        BugRepositoryInterface $bugRepository,
-        MessageBusInterface $messageBus,
-        BugStepsRunner $stepsRunner,
-        StepsBuilderInterface $stepsBuilder
+        protected BugRepositoryInterface $bugRepository,
+        protected MessageBusInterface $messageBus,
+        protected BugStepsRunner $stepsRunner,
+        protected StepsBuilderInterface $stepsBuilder,
+        protected ConfigInterface $config
     ) {
-        $this->bugRepository = $bugRepository;
-        $this->messageBus = $messageBus;
-        $this->stepsRunner = $stepsRunner;
-        $this->stepsBuilder = $stepsBuilder;
     }
 
     public function handle(BugInterface $bug, int $from, int $to): void
@@ -50,6 +44,12 @@ function (Throwable $throwable) use ($bug, $newSteps): void {
                 if ($throwable->getMessage() === $bug->getMessage()) {
                     $this->bugRepository->updateSteps($bug, $newSteps);
                     $this->messageBus->dispatch(new ReduceBugMessage($bug->getId()));
+                } elseif ($this->config->shouldCreateNewBugWhileReducing()) {
+                    $this->messageBus->dispatch(new CreateBugMessage(
+                        $bug->getTask()->getId(),
+                        $newSteps,
+                        $throwable->getMessage()
+                    ));
                 }
             }
         );