Make sure issue has status "needs review" before trying to find reviewer

Author: Nyholm

src/Service/TaskHandler/SuggestReviewerHandler.php

@@ -6,9 +6,12 @@
 
 use App\Api\Issue\IssueApi;
 use App\Api\PullRequest\PullRequestApi;
+use App\Api\Status\Status;
+use App\Api\Status\StatusApi;
 use App\Command\SuggestReviewerCommand;
 use App\Entity\Task;
 use App\Service\RepositoryProvider;
+use App\Service\TaskScheduler;
 
 /**
  * @author Tobias Nyholm <[email protected]>
@@ -18,12 +21,16 @@ class SuggestReviewerHandler implements TaskHandlerInterface
     private $issueApi;
     private $repositoryProvider;
     private $pullRequestApi;
+    private $statusApi;
+    private $scheduler;
 
-    public function __construct(PullRequestApi $pullRequestApi, IssueApi $issueApi, RepositoryProvider $repositoryProvider)
+    public function __construct(PullRequestApi $pullRequestApi, IssueApi $issueApi, RepositoryProvider $repositoryProvider, StatusApi $statusApi, TaskScheduler $scheduler)
     {
         $this->issueApi = $issueApi;
         $this->repositoryProvider = $repositoryProvider;
         $this->pullRequestApi = $pullRequestApi;
+        $this->statusApi = $statusApi;
+        $this->scheduler = $scheduler;
     }
 
     /**
@@ -32,8 +39,16 @@ public function __construct(PullRequestApi $pullRequestApi, IssueApi $issueApi,
     public function handle(Task $task): void
     {
         $repository = $this->repositoryProvider->getRepository($task->getRepositoryFullName());
-        if (!$this->issueApi->hasActivity($repository, $task->getNumber())) {
+        if ($this->issueApi->hasActivity($repository, $task->getNumber())) {
+            return;
+        }
+
+        $status = $this->statusApi->getIssueStatus($task->getNumber(), $repository);
+        if (Status::NEEDS_REVIEW === $status || null === $status) {
             $this->pullRequestApi->findReviewer($repository, $task->getNumber(), SuggestReviewerCommand::TYPE_SUGGEST);
+        } else {
+            // Try again later
+            $this->scheduler->runLater($repository, $task->getNumber(), Task::ACTION_SUGGEST_REVIEWER, new \DateTimeImmutable('+20hours'));
         }
     }
 

src/Subscriber/FindReviewerSubscriber.php

@@ -55,7 +55,7 @@ public function onComment(GitHubEvent $event)
         }
 
         // Search for "review"
-        if (preg_match('~\@carsonbot(\W[^(status)].*|\W)(\breviewer\b|\breview\b)~i', $data['comment']['body'] ?? '')) {
+        if (preg_match('~\@'.$this->botUsername.'(\W[^(status)].*|\W)(\breviewer\b|\breview\b)~i', $data['comment']['body'] ?? '')) {
             $number = $data['issue']['number'];
             $this->pullRequestApi->findReviewer($event->getRepository(), $number, SuggestReviewerCommand::TYPE_DEMAND);
             $event->setResponseData([