Merge pull request #46 from boherm/improve-welcome-command

PrestaShop · Jun 11, 2024 · 1f01408 · 1f01408
2 parents 2e2536c + ec17e48
commit 1f01408
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 2 deletions.
diff --git a/src/PullRequest/Infrastructure/Adapter/RestPullRequestRepository.php b/src/PullRequest/Infrastructure/Adapter/RestPullRequestRepository.php
@@ -139,6 +139,8 @@ public function addWelcomeComment(PullRequestId $pullRequestId, string $contribu
             // Then we need to format the new comment with the new contributor.
             $welcomeComment = $this->twig->render('pr_comments/welcome.html.twig', [
                 'contributor' => $contributor,
+                'repositoryOwner' => $pullRequestId->repositoryOwner,
+                'repositoryName' => $pullRequestId->repositoryName,
             ]);
 
             // We add the comment to the PR.

diff --git a/src/Shared/Infrastructure/Adapter/RestGithubCommitterRepository.php b/src/Shared/Infrastructure/Adapter/RestGithubCommitterRepository.php
@@ -35,7 +35,7 @@ function (ItemInterface $item) use ($owner, $repo, $committer) {
                 $lastCommit = $this->githubClient->request('GET', '/repos/'.$owner.'/'.$repo.'/commits',
                     [
                         'query' => [
-                            'committer' => $committer,
+                            'author' => $committer,
                             'per_page' => 1,
                         ],
                     ]

diff --git a/templates/pr_comments/welcome.html.twig b/templates/pr_comments/welcome.html.twig
@@ -1,4 +1,6 @@
 <!-- PR_WELCOME -->
 Hello @{{ contributor }}!
 
-This is your first pull request on the PrestaShop project. Thank you, and welcome to this Open Source community!
+This is your first pull request on [{{ repositoryName }}](https://github.com/{{ repositoryOwner }}/{{ repositoryName }}/) repository of the PrestaShop project.
+
+Thank you, and welcome to this Open Source community!