Merge pull request #24 from lartist/refacto

Refactoring

config/packages/framework.yaml

@@ -29,7 +29,7 @@ framework:
     webhook:
         routing:
             github:
-                service: App\Shared\Webhook\GithubWebhookParser
+                service: App\Shared\Infrastructure\Webhook\GithubWebhookParser
 
 when@test:
     framework:

config/routes.yaml

@@ -1,5 +1,5 @@
 controllers:
     resource:
-        path: ../src/Shared/Controller/
-        namespace: App\Shared\Controller
+        path: ../src/Shared/Infrastructure/Controller/
+        namespace: App\Shared\Infrastructure\Controller
     type: attribute

config/services.php

@@ -1,15 +1,13 @@
 <?php
 
-use App\PullRequest\Domain\Gateway\CommitterRepositoryInterface as PRCommitterRepositoryInterface;
 use App\PullRequest\Domain\Gateway\PullRequestRepositoryInterface;
-use App\PullRequest\Infrastructure\Adapter\RestGithubCommitterRepository as PRRestGithubCommitterRepository;
 use App\PullRequest\Infrastructure\Adapter\RestPullRequestRepository;
-use App\PullRequestDashboard\Domain\Gateway\CommitterRepositoryInterface;
 use App\PullRequestDashboard\Domain\Gateway\PullRequestCardRepositoryInterface;
 use App\PullRequestDashboard\Infrastructure\Adapter\GraphqlGithubPullRequestCardRepository;
-use App\PullRequestDashboard\Infrastructure\Adapter\RestGithubCommitterRepository;
-use App\Shared\Adapter\SpyMessageBus;
-use App\Shared\Factory\CommandFactory\CommandFactory;
+use App\Shared\Domain\Gateway\CommitterRepositoryInterface;
+use App\Shared\Infrastructure\Adapter\RestGithubCommitterRepository;
+use App\Shared\Infrastructure\Adapter\SpyMessageBus;
+use App\Shared\Infrastructure\Factory\CommandFactory\CommandFactory;
 use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator;
 use Symfony\Component\Messenger\MessageBusInterface;
 
@@ -26,6 +24,7 @@
         ->autoconfigure(true)
         ->bind('$pullRequestDashboardNumber', '%pull_request_dashboard_number%')
         ->bind('$webhookSecret', '%env(WEBHOOK_SECRET)%')
+        ->bind('$appVersion', '%app.version%')
     ;
 
     $services->load('App\\', '../src/')
@@ -35,6 +34,7 @@
             '../src/Kernel.php',
         ]);
 
+    // Note: The config about messenger.message_handler is not tested, be careful when you want to modify it
     $services->load('App\\PullRequest\\Application\\CommandHandler\\', '../src/PullRequest/Application/CommandHandler/')
         ->tag('messenger.message_handler');
 
@@ -44,7 +44,6 @@
     $services->alias(PullRequestRepositoryInterface::class, RestPullRequestRepository::class);
     $services->alias(PullRequestCardRepositoryInterface::class, GraphqlGithubPullRequestCardRepository::class);
     $services->alias(CommitterRepositoryInterface::class, RestGithubCommitterRepository::class);
-    $services->alias(PRCommitterRepositoryInterface::class, PRRestGithubCommitterRepository::class);
     $services->set(CommandFactory::class)
         ->args([tagged_iterator('app.shared.command_strategy')])
     ;
@@ -66,7 +65,6 @@
         $services->set(RestPullRequestRepository::class);
         $services->set(GraphqlGithubPullRequestCardRepository::class);
         $services->set(RestGithubCommitterRepository::class);
-        $services->set(PRRestGithubCommitterRepository::class);
         $services->alias(MessageBusInterface::class, SpyMessageBus::class);
     }
 };

phpunit.xml.dist

@@ -19,9 +19,9 @@
       <directory>tests/PullRequestDashboard/Infrastructure/Adapter</directory>
     </testsuite>
     <testsuite name="endtoend_tests">
-      <directory>tests/Shared/Controller</directory>
-      <directory>tests/Shared/Command</directory>
-      <directory>tests/Shared/Webhook</directory>
+      <directory>tests/Shared/Infrastructure/Controller</directory>
+      <directory>tests/Shared/Infrastructure/Command</directory>
+      <directory>tests/Shared/Infrastructure/Webhook</directory>
     </testsuite>
   </testsuites>
   <coverage/>

src/PullRequest/Application/CommandHandler/AddLabelByApprovalCountCommandHandler.php

@@ -7,8 +7,8 @@
 use App\PullRequest\Application\Command\AddLabelByApprovalCountCommand;
 use App\PullRequest\Domain\Aggregate\PullRequest\PullRequestId;
 use App\PullRequest\Domain\Exception\PullRequestNotFoundException;
-use App\PullRequest\Domain\Gateway\CommitterRepositoryInterface;
 use App\PullRequest\Domain\Gateway\PullRequestRepositoryInterface;
+use App\Shared\Domain\Gateway\CommitterRepositoryInterface;
 
 class AddLabelByApprovalCountCommandHandler
 {
@@ -24,7 +24,7 @@ public function __invoke(AddLabelByApprovalCountCommand $command): void
         if (null === $pullRequest) {
             throw new PullRequestNotFoundException();
         }
-        $pullRequest->addLabelByApprovalCount($this->committerRepository->findAll($pullRequest->getId()));
+        $pullRequest->addLabelByApprovalCount($this->committerRepository->findAll($pullRequest->getId()->repositoryOwner));
         $this->pullRequestRepository->update($pullRequest);
     }
 }

src/PullRequest/Domain/Aggregate/PullRequest/PullRequest.php

@@ -51,7 +51,6 @@ public function requestChanges(): void
      */
     public function addLabelByApprovalCount(array $committers): void
     {
-        // Todo: use enum instead
         $validApprovals = array_filter(
             $this->approvals,
             static fn (Approval $approval) => in_array($approval->author, $committers, true)

src/PullRequestDashboard/Application/CommandHandler/MovePullRequestCardToColumnByApprovalCountCommandHandler.php

@@ -7,8 +7,8 @@
 use App\PullRequestDashboard\Application\Command\MovePullRequestCardToColumnByApprovalCountCommand;
 use App\PullRequestDashboard\Domain\Aggregate\PullRequestCard\PullRequestCardId;
 use App\PullRequestDashboard\Domain\Exception\PullRequestCardNotFoundException;
-use App\PullRequestDashboard\Domain\Gateway\CommitterRepositoryInterface;
 use App\PullRequestDashboard\Domain\Gateway\PullRequestCardRepositoryInterface;
+use App\Shared\Domain\Gateway\CommitterRepositoryInterface;
 
 class MovePullRequestCardToColumnByApprovalCountCommandHandler
 {
@@ -33,7 +33,7 @@ public function __invoke(MovePullRequestCardToColumnByApprovalCountCommand $comm
             throw new PullRequestCardNotFoundException();
         }
 
-        $pullRequestCard->moveByApprovalCount($this->committersRepository->findAll($pullRequestCard->getId()));
+        $pullRequestCard->moveByApprovalCount($this->committersRepository->findAll($pullRequestCard->getId()->repositoryOwner));
         $this->pullRequestCardRepository->update($pullRequestCard);
     }
 }

src/PullRequestDashboard/Domain/Aggregate/PullRequestCard/PullRequestCard.php

@@ -51,7 +51,6 @@ public function moveColumnByLabel(string $label): void
      */
     public function moveByApprovalCount(array $committers): void
     {
-        // Todo: use enum
         $validApprovals = array_filter(
             $this->pullRequest->approvals,
             static fn (Approval $approval) => in_array($approval->author, $committers, true)

src/PullRequestDashboard/Infrastructure/Adapter/GraphqlGithubPullRequestCardRepository.php

@@ -11,7 +11,6 @@
 use App\PullRequestDashboard\Domain\Gateway\PullRequestCardRepositoryInterface;
 use Symfony\Contracts\HttpClient\HttpClientInterface;
 
-// Todo: to test and optimize
 class GraphqlGithubPullRequestCardRepository implements PullRequestCardRepositoryInterface
 {
     public function __construct(private readonly HttpClientInterface $githubClient)

src/Shared/Domain/Gateway/CommitterRepositoryInterface.php

@@ -0,0 +1,13 @@
+<?php
+
+declare(strict_types=1);
+
+namespace App\Shared\Domain\Gateway;
+
+interface CommitterRepositoryInterface
+{
+    /**
+     * @return string[]
+     */
+    public function findAll(string $organisation): array;
+}

src/Shared/Infrastructure/Adapter/InMemoryCommitterRepository.php

@@ -0,0 +1,18 @@
+<?php
+
+declare(strict_types=1);
+
+namespace App\Shared\Infrastructure\Adapter;
+
+use App\Shared\Domain\Gateway\CommitterRepositoryInterface;
+
+class InMemoryCommitterRepository implements CommitterRepositoryInterface
+{
+    public function findAll(string $organisation): array
+    {
+        return [
+            'lartist',
+            'nicosomb',
+        ];
+    }
+}

src/Shared/Infrastructure/Adapter/RestGithubCommitterRepository.php

@@ -0,0 +1,23 @@
+<?php
+
+declare(strict_types=1);
+
+namespace App\Shared\Infrastructure\Adapter;
+
+use App\Shared\Domain\Gateway\CommitterRepositoryInterface;
+use Symfony\Contracts\HttpClient\HttpClientInterface;
+
+class RestGithubCommitterRepository implements CommitterRepositoryInterface
+{
+    public function __construct(private readonly HttpClientInterface $githubClient)
+    {
+    }
+
+    public function findAll(string $organisation): array
+    {
+        return array_map(
+            fn (array $committer) => $committer['login'],
+            $this->githubClient->request('GET', '/orgs/'.$organisation.'/teams/committers/members')->toArray()
+        );
+    }
+}

src/Shared/Adapter/SpyMessageBus.php → src/Shared/Infrastructure/Adapter/SpyMessageBus.php

@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace App\Shared\Adapter;
+namespace App\Shared\Infrastructure\Adapter;
 
 use Symfony\Component\DependencyInjection\Attribute\When;
 use Symfony\Component\Messenger\Envelope;

src/Shared/Command/OnGithubEventCommand.php → src/Shared/Infrastructure/Command/OnGithubEventCommand.php

@@ -1,8 +1,8 @@
 <?php
 
-namespace App\Shared\Command;
+namespace App\Shared\Infrastructure\Command;
 
-use App\Shared\Event\GithubEvent;
+use App\Shared\Infrastructure\Event\GithubEvent;
 use Psr\EventDispatcher\EventDispatcherInterface;
 use Symfony\Component\Console\Attribute\AsCommand;
 use Symfony\Component\Console\Command\Command;

src/Shared/Controller/HealthcheckController.php → src/Shared/Infrastructure/Controller/HealthcheckController.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Shared\Controller;
+namespace App\Shared\Infrastructure\Controller;
 
 use App\PullRequest\Domain\Aggregate\PullRequest\PullRequestId;
 use App\PullRequest\Infrastructure\Adapter\RestPullRequestRepository;
@@ -19,17 +19,17 @@ public function __construct(
      * Endpoint for monitoring team to check if our bot is working properly.
      */
     #[Route('/healthcheck', name: 'healthcheck')]
-    public function healthcheck(): JsonResponse
+    public function healthcheck(string $appVersion): JsonResponse
     {
-        return $this->json($this->checkBotStatus());
+        return $this->json($this->checkBotStatus($appVersion));
     }
 
     /**
      * Function to check if our bot is working properly, and generate response.
      *
      * @return array<string, mixed>
      */
-    private function checkBotStatus(): array
+    private function checkBotStatus(string $appVersion): array
     {
         // Let's check all services in used.
         // -> We can add more services if needed here.
@@ -40,7 +40,7 @@ private function checkBotStatus(): array
         // Now, we build the global status.
         $status = [
             'status' => !in_array(false, array_values($checkServices)) ? 'OK' : 'KO',
-            'version' => $this->getParameter('app.version'),
+            'version' => $appVersion,
         ];
         foreach ($checkServices as $serviceName => $serviceStatus) {
             $status[$serviceName] = ['status' => $serviceStatus ? 'up' : 'down'];

src/Shared/Event/GithubEvent.php → src/Shared/Infrastructure/Event/GithubEvent.php

@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace App\Shared\Event;
+namespace App\Shared\Infrastructure\Event;
 
 class GithubEvent
 {