Fixed non deletion of Commit validation comment

app/config/services_test.yml

@@ -14,14 +14,21 @@ parameters:
     mailer_password: null
 
 services:
+    fake_comment_api:
+        class: Tests\AppBundle\Comments\FakeCommentApi
+        arguments:
+            - '@app.github.comments_api'
+            - '%repository_username%'
+            - '%repository_name%'
+            - '@twig'
     app.status_api:
         class: Tests\AppBundle\Issues\NullStatusApi
         arguments: ['@app.github.cached_labels_api', '%repository_username%', '%repository_name%']
     # Your integrations tests shouldn't post comments to github
     app.pullrequest_listener:
-        class: Tests\AppBundle\PullRequests\FakeListener
+        class: AppBundle\PullRequests\Listener
         arguments:
-            - '@app.comment_api'
-            - '@validator'
-            - '@twig'
+            - '@fake_comment_api'
             - '@app.commit.repository'
+            - '@validator'
+            - '@app.pull_request.repository'

src/AppBundle/Commits/Repository.php

@@ -2,6 +2,7 @@
 
 namespace AppBundle\Commits;
 
+use Github\Exception\RuntimeException;
 use Github\Api\GitData\Commits as CommitApi;
 use Github\Api\PullRequest as PullRequestApi;
 use Lpdigital\Github\Entity\Commit;
@@ -43,11 +44,15 @@ public function __construct(
 
     public function findAllByPullRequest(PullRequest $pullRequest)
     {
-        $responseApi = $this->pullRequestApi->commits(
-            $this->repositoryUsername,
-            $this->repositoryName,
-            $pullRequest->getNumber()
-        );
+        try {
+            $responseApi = $this->pullRequestApi->commits(
+                $this->repositoryUsername,
+                $this->repositoryName,
+                $pullRequest->getNumber()
+            );
+        } catch (RuntimeException $e) {
+            $responseApi = [];
+        }
 
         $commits = [];
         foreach ($responseApi as $commitApi) {

src/AppBundle/EventSubscriber/PullRequestSubscriber.php

@@ -144,21 +144,20 @@ public function removePullRequestValidationComment(GithubEvent $githubEvent)
             return;
         }
 
-        $this->container
+        $success = $this->container
             ->get('app.pullrequest_listener')
             ->removePullRequestValidationComment($pullRequest)
         ;
 
-        $githubEvent->addStatus([
-            'event' => 'pr_edited',
-            'action' => 'preston validation comment removed',
-            ])
-        ;
+        if ($success) {
+            $githubEvent->addStatus([
+                'event' => 'pr_edited',
+                'action' => 'preston validation comment removed',
+                ])
+            ;
+        }
     }
 
-    /**
-     * @todo: create functional test in WebhookController
-     */
     public function removeCommitValidationComment(GithubEvent $githubEvent)
     {
         $pullRequest = $githubEvent->getEvent()->pullRequest;
@@ -167,15 +166,17 @@ public function removeCommitValidationComment(GithubEvent $githubEvent)
             return;
         }
 
-        $this->container
+        $success = $this->container
             ->get('app.pullrequest_listener')
             ->removeCommitValidationComment($pullRequest)
         ;
 
-        $githubEvent->addStatus([
-            'event' => 'pr_edited',
-            'action' => 'preston validation commit comment removed',
-            ])
-        ;
+        if ($success) {
+            $githubEvent->addStatus([
+                'event' => 'pr_edited',
+                'action' => 'preston validation commit comment removed',
+                ])
+            ;
+        }
     }
 }

src/AppBundle/PullRequests/Listener.php

@@ -72,18 +72,26 @@ public function removePullRequestValidationComment(PullRequest $pullRequest)
                 self::TABLE_ERROR,
                 self::PRESTONBOT_NAME
             );
+
+            return true;
         }
+
+        return false;
     }
 
     public function removeCommitValidationComment(PullRequest $pullRequest)
     {
-        if (0 === $this->getErrorsFromCommits($pullRequest)) {
+        if (0 === count($this->getErrorsFromCommits($pullRequest))) {
             $this->repository->removeCommentsIfExists(
                 $pullRequest,
                 self::COMMIT_ERROR,
                 self::PRESTONBOT_NAME
             );
+
+            return true;
         }
+
+        return false;
     }
 
     /**

src/AppBundle/PullRequests/Repository.php

@@ -2,6 +2,7 @@
 
 namespace AppBundle\PullRequests;
 
+use Github\Exception\RuntimeException;
 use Github\Api\Issue\Comments as KnpCommentsApi;
 use AppBundle\Search\Repository as SearchRepository;
 use Lpdigital\Github\Entity\Comment;
@@ -12,7 +13,7 @@
  * As GitHub consider pull requests as specific issues
  * don't be surprised too much by the produced repository.
  */
-class Repository
+class Repository implements RepositoryInterface
 {
     private $searchRepository;
     private $knpCommentsApi;
@@ -64,13 +65,17 @@ public function findAllWithLabel($label, $base = 'develop')
 
     public function getComments(PullRequest $pullRequest)
     {
-        $commentsApi = $this->knpCommentsApi
-            ->all(
-                $this->repositoryUsername,
-                $this->repositoryName,
-                $pullRequest->getNumber()
-            )
-        ;
+        try {
+            $commentsApi = $this->knpCommentsApi
+                ->all(
+                    $this->repositoryUsername,
+                    $this->repositoryName,
+                    $pullRequest->getNumber()
+                )
+            ;
+        } catch (RuntimeException $e) {
+            $commentsApi = [];
+        }
 
         $comments = [];
         foreach ($commentsApi as $comment) {

src/AppBundle/PullRequests/RepositoryInterface.php

@@ -42,5 +42,5 @@ public function getCommentsByExpressionFrom(
      * @param PullRequest the pull request
      * @param $pattern expression to filter comments in CommentApi
      */
-    public function removeCommentsIfExists(PullRequest $pullRequest, $pattern);
+    public function removeCommentsIfExists(PullRequest $pullRequest, $pattern, $userLogin);
 }

tests/AppBundle/Comments/FakeCommentApi.php

@@ -0,0 +1,59 @@
+<?php
+
+namespace tests\AppBundle\Comments;
+
+use Github\Api\Issue\Comments as KnpCommentApi;
+use AppBundle\Comments\CommentApiInterface;
+use Lpdigital\Github\Entity\PullRequest;
+use Twig_Environment;
+
+/**
+ * Responsible of comments publication on repository.
+ */
+class FakeCommentApi implements CommentApiInterface
+{
+    /**
+     * @var KnpCommentApi
+     */
+    private $knpCommentApi;
+
+    /**
+     * @var string
+     */
+    private $repositoryUsername;
+
+    /**
+     * @var string
+     */
+    private $repositoryName;
+
+    /**
+     * @var Twig_Environment
+     */
+    private $twig;
+
+    public function __construct(KnpCommentApi $knpCommentApi, $repositoryUsername, $repositoryName, Twig_Environment $twig)
+    {
+        $this->knpCommentApi = $knpCommentApi;
+        $this->repositoryUsername = $repositoryUsername;
+        $this->repositoryName = $repositoryName;
+        $this->twig = $twig;
+    }
+
+    public function send(PullRequest $pullRequest, $comment)
+    {
+        return true;
+    }
+
+    public function sendWithTemplate(PullRequest $pullRequest, $templateName, $params)
+    {
+        $comment = $this->twig->render($templateName, $params);
+
+        return $comment;
+    }
+
+    public function remove($commentId)
+    {
+        return true;
+    }
+}

tests/AppBundle/Controller/WebhookControllerTest.php

@@ -93,6 +93,16 @@ public function getTests()
             'wrong_repository.pull_request.json',
             [],
         ];
+        $tests['Pull request synchronize'] = [
+            'pull_request',
+            'pull_request.synchronize.json',
+            [
+                [
+                    'event' => 'pr_edited',
+                    'action' => 'preston validation commit comment removed',
+                ],
+            ],
+        ];
 
         return $tests;
     }