Introduced Welcome feature

app/Resources/views/markdown/welcome.md.twig

@@ -1,9 +1,3 @@
-{% if nb.contrib === 0 %}
 Hello {{ username }}!
 
 Thank you for this first pull request on the PrestaShop project, and welcome in this Open Source community!
-{% elseif nb.contrib === 1%}
-Hey {{ username }}! 
-
-This is your second PR on the PrestaShop project: thank you for being part of our Open Source community!
-{% endif %}

app/config/services.yml

@@ -49,15 +49,6 @@ services:
         class: Github\Api\Issue\Labels
         factory: ['@app.github.issues_api', labels]
 
-    app.github.gitdata_api:
-        class: Github\Api\GitData
-        factory: ['@app.github.client', api]
-        arguments: [gitData]
-
-    app.github.commits_api:
-        class: Github\Api\GitData\Commits
-        factory: ['@app.github.gitdata_api', commits]
-
 # Application GitHub API
 
     app.github.cached_labels_api:
@@ -144,7 +135,7 @@ services:
     app.commit.repository:
         class: AppBundle\Commits\Repository
         arguments:
-            - '@app.github.commits_api'
+            - '@app.repository_repository'
             - '@app.github.pullrequests_api'
             - '%repository_username%'
             - '%repository_name%'

src/AppBundle/Commits/Repository.php

@@ -3,15 +3,16 @@
 namespace AppBundle\Commits;
 
 use Github\Exception\RuntimeException;
-use Github\Api\GitData\Commits as CommitApi;
+use AppBundle\Repositories\Repository as CommitsApi;
+
 use Github\Api\PullRequest as PullRequestApi;
 use Lpdigital\Github\Entity\Commit;
 use Lpdigital\Github\Entity\PullRequest;
 
 class Repository implements RepositoryInterface
 {
     /**
-     * @var CommitApi
+     * @var CommitsApi
      */
     private $commitsApi;
 
@@ -31,7 +32,7 @@ class Repository implements RepositoryInterface
     private $repositoryName;
 
     public function __construct(
-        CommitApi $commitsApi,
+        CommitsApi $commitsApi,
         PullRequestApi $pullRequestApi,
         $repositoryUsername,
         $repositoryName
@@ -54,6 +55,34 @@ public function findAllByPullRequest(PullRequest $pullRequest)
             $responseApi = [];
         }
 
+        return $this->buildCommits($responseApi);
+    }
+
+    public function findAllByBranchAndUserLogin($branch, $userLogin)
+    {
+        $responseApi = $this->commitsApi
+            ->getCommits()
+            ->all(
+            $this->repositoryUsername,
+            $this->repositoryName,
+            ['sha' => $branch]
+        );
+
+        $commits = $this->buildCommits($responseApi);
+        $userCommits = [];
+
+        foreach ($commits as $commit) {
+            $authorName = $commit->getAuthor()->getName();
+            if ($authorName === $userLogin) {
+                $userCommits[] = $commit;
+            }
+        }
+
+        return $userCommits;
+    }
+
+    private function buildCommits($responseApi)
+    {
         $commits = [];
         foreach ($responseApi as $commitApi) {
             $commits[] = Commit::createFromData($commitApi['commit']);

src/AppBundle/Commits/RepositoryInterface.php

@@ -6,5 +6,7 @@
 
 interface RepositoryInterface
 {
+    public function findAllByBranchAndUserLogin($branch, $userLogin);
+
     public function findAllByPullRequest(PullRequest $pullRequest);
 }

src/AppBundle/EventSubscriber/PullRequestSubscriber.php

@@ -103,7 +103,7 @@ public function checkCommits(GitHubEvent $githubEvent)
     public function checkForNewTranslations(GitHubEvent $githubEvent)
     {
         $event = $githubEvent->getEvent();
-        $pullRequest = $githubEvent->getEvent()->pullRequest;
+        $pullRequest = $event->pullRequest;
         $diff = Diff::create(file_get_contents($pullRequest->getDiffUrl()));
 
         if ($found = $diff->additions()->contains(self::TRANS_PATTERN)->match()) {
@@ -125,6 +125,15 @@ public function checkForNewTranslations(GitHubEvent $githubEvent)
 
     public function welcomePeople(GitHubEvent $githubEvent)
     {
+        $pullRequest = $githubEvent->getEvent()->pullRequest;
+        $sender = $githubEvent->getEvent()->sender;
+        $branch = $pullRequest->getBase()['ref'];
+
+        $this->container
+            ->get('app.pullrequest_listener')
+            ->welcomePeople($pullRequest, $sender, $branch)
+        ;
+
         $githubEvent->addStatus([
             'event' => 'pr_opened',
             'action' => 'user welcomed',

src/AppBundle/PullRequests/Listener.php

@@ -121,12 +121,25 @@ public function removeCommitValidationComment(PullRequest $pullRequest)
         return false;
     }
 
+    public function welcomePeople(PullRequest $pullRequest, User $sender, $branch)
+    {
+        $userCommits = $this->commitRepository->findAllByBranchAndUserLogin($branch, $sender);
+
+        if (0 === count($userCommits)) {
+            $this->commentApi->sendWithTemplate(
+                $pullRequest,
+                'markdown/welcome.md.twig',
+                ['username' => $pullRequest->getUser()->getLogin()]
+            );
+        }
+    }
+
     /**
      * Wrap the validation of commits.
      * 
      * @return array error messages if any.
      */
-    public function getErrorsFromCommits(PullRequest $pullRequest)
+    private function getErrorsFromCommits(PullRequest $pullRequest)
     {
         $commits = $this->commitRepository->findAllByPullRequest($pullRequest);
         $commitsErrors = [];

src/AppBundle/Repositories/Repository.php

@@ -69,6 +69,11 @@ public function getApi()
         return $this->repositoryApi;
     }
 
+    public function getCommits()
+    {
+        return $this->repositoryApi->commits();
+    }
+
     public function getMembers()
     {
         return $this->repositoryApi