Ensure logo path is present when loading teams

mariusklocke · Dec 9, 2023 · 83fb441 · 83fb441
1 parent d99ce00
commit 83fb441
Show file tree

Hide file tree

Showing 10 changed files with 123 additions and 64 deletions.
diff --git a/src/Infrastructure/API/GraphQL/TeamType.php b/src/Infrastructure/API/GraphQL/TeamType.php
@@ -29,6 +29,12 @@ public function __construct()
                     ],
                     'contact' => [
                         'type' => ContactType::getInstance()
+                    ],
+                    'logo_id' => [
+                        'type' => Type::string(),
+                    ],
+                    'logo_path' => [
+                        'type' => Type::string()
                     ]
                 ];
             }

diff --git a/src/Infrastructure/API/Logos/DeleteAction.php b/src/Infrastructure/API/Logos/DeleteAction.php
@@ -5,18 +5,21 @@
 
 use HexagonalPlayground\Application\Repository\TeamRepositoryInterface;
 use HexagonalPlayground\Infrastructure\API\ActionInterface;
+use HexagonalPlayground\Infrastructure\Filesystem\TeamLogoRepository;
 use Psr\Http\Message\ResponseInterface;
 use Psr\Http\Message\ServerRequestInterface;
 use Psr\Log\LoggerInterface;
 
 class DeleteAction implements ActionInterface
 {
-    use TeamLogoTrait;
+    use TeamFinderTrait;
+    private TeamLogoRepository $teamLogoRepository;
     private LoggerInterface $logger;
 
-    public function __construct(TeamRepositoryInterface $teamRepository, LoggerInterface $logger)
+    public function __construct(TeamRepositoryInterface $teamRepository, TeamLogoRepository $teamLogoRepository, LoggerInterface $logger)
     {
         $this->teamRepository = $teamRepository;
+        $this->teamLogoRepository = $teamLogoRepository;
         $this->logger = $logger;
     }
 
@@ -25,7 +28,7 @@ public function __invoke(ServerRequestInterface $request, ResponseInterface $res
         $team = $this->findTeam($request->getQueryParams());
 
         if ($team->getLogoId() !== null) {
-            $this->deleteLogo($team->getLogoId());
+            $this->teamLogoRepository->delete($team->getLogoId());
             $team->setLogoId(null);
             $this->teamRepository->save($team);
             $this->teamRepository->flush();

diff --git a/src/Infrastructure/API/Logos/GetAction.php b/src/Infrastructure/API/Logos/GetAction.php
@@ -5,16 +5,20 @@
 
 use HexagonalPlayground\Application\Repository\TeamRepositoryInterface;
 use HexagonalPlayground\Infrastructure\API\ActionInterface;
+use HexagonalPlayground\Infrastructure\Filesystem\TeamLogoRepository;
 use Psr\Http\Message\ResponseInterface;
 use Psr\Http\Message\ServerRequestInterface;
 
 class GetAction implements ActionInterface
 {
-    use TeamLogoTrait;
+    use TeamFinderTrait;
 
-    public function __construct(TeamRepositoryInterface $teamRepository)
+    private TeamLogoRepository $teamLogoRepository;
+
+    public function __construct(TeamRepositoryInterface $teamRepository, TeamLogoRepository $teamLogoRepository)
     {
         $this->teamRepository = $teamRepository;
+        $this->teamLogoRepository = $teamLogoRepository;
     }
 
     public function __invoke(ServerRequestInterface $request, ResponseInterface $response, array $args): ResponseInterface
@@ -25,8 +29,8 @@ public function __invoke(ServerRequestInterface $request, ResponseInterface $res
             return $response->withStatus(404);
         }
 
-        return $response
-            ->withStatus(302)
-            ->withHeader('Location', $this->buildPublicPath($team->getLogoId()));
+        $location = $this->teamLogoRepository->generatePublicPath($team->getLogoId());
+
+        return $response->withStatus(302)->withHeader('Location', $location);
     }
 }
diff --git a/src/Infrastructure/API/Logos/TeamFinderTrait.php b/src/Infrastructure/API/Logos/TeamFinderTrait.php
@@ -0,0 +1,23 @@
+<?php
+declare(strict_types=1);
+
+namespace HexagonalPlayground\Infrastructure\API\Logos;
+
+use HexagonalPlayground\Application\Repository\TeamRepositoryInterface;
+use HexagonalPlayground\Application\TypeAssert;
+use HexagonalPlayground\Domain\Team;
+
+trait TeamFinderTrait
+{
+    private TeamRepositoryInterface $teamRepository;
+
+    private function findTeam(array $queryParams): Team
+    {
+        TypeAssert::assertString($queryParams['teamId'], 'teamId');
+
+        /** @var Team $team */
+        $team = $this->teamRepository->find($queryParams['teamId']);
+
+        return $team;
+    }
+}
diff --git a/src/Infrastructure/API/Logos/TeamLogoTrait.php b/src/Infrastructure/API/Logos/TeamLogoTrait.php
diff --git a/src/Infrastructure/API/Logos/UploadAction.php b/src/Infrastructure/API/Logos/UploadAction.php
@@ -7,19 +7,22 @@
 use HexagonalPlayground\Domain\Exception\InternalException;
 use HexagonalPlayground\Domain\Exception\InvalidInputException;
 use HexagonalPlayground\Infrastructure\API\ActionInterface;
+use HexagonalPlayground\Infrastructure\Filesystem\TeamLogoRepository;
 use Psr\Http\Message\ResponseInterface;
 use Psr\Http\Message\ServerRequestInterface;
 use Psr\Http\Message\UploadedFileInterface;
 use Psr\Log\LoggerInterface;
 
 class UploadAction implements ActionInterface
 {
-    use TeamLogoTrait;
+    use TeamFinderTrait;
+    private TeamLogoRepository $teamLogoRepository;
     private LoggerInterface $logger;
 
-    public function __construct(TeamRepositoryInterface $teamRepository, LoggerInterface $logger)
+    public function __construct(TeamRepositoryInterface $teamRepository, TeamLogoRepository $teamLogoRepository, LoggerInterface $logger)
     {
         $this->teamRepository = $teamRepository;
+        $this->teamLogoRepository = $teamLogoRepository;
         $this->logger = $logger;
     }
 
@@ -41,10 +44,10 @@ public function __invoke(ServerRequestInterface $request, ResponseInterface $res
         $this->checkUploadedFile($file);
 
         if ($team->getLogoId() !== null) {
-            $this->deleteLogo($team->getLogoId());
+            $this->teamLogoRepository->delete($team->getLogoId());
         }
 
-        $fileId = $this->saveLogo($file);
+        $fileId = $this->teamLogoRepository->save($file);
         $team->setLogoId($fileId);
         $this->teamRepository->save($team);
         $this->teamRepository->flush();

diff --git a/src/Infrastructure/Filesystem/TeamLogoRepository.php b/src/Infrastructure/Filesystem/TeamLogoRepository.php
@@ -0,0 +1,35 @@
+<?php
+declare(strict_types=1);
+
+namespace HexagonalPlayground\Infrastructure\Filesystem;
+
+use HexagonalPlayground\Domain\Util\Uuid;
+use HexagonalPlayground\Infrastructure\Config;
+use Psr\Http\Message\UploadedFileInterface;
+
+class TeamLogoRepository
+{
+    public function delete(string $logoId): void
+    {
+        unlink($this->generateStoragePath($logoId));
+    }
+
+    public function generatePublicPath(string $logoId): string
+    {
+        return join('/', [Config::getInstance()->appLogosPublicPath, "$logoId.webp"]);
+    }
+
+    private function generateStoragePath(string $logoId): string
+    {
+        return join(DIRECTORY_SEPARATOR, [Config::getInstance()->appLogosPath, "$logoId.webp"]);
+    }
+
+    public function save(UploadedFileInterface $uploadedFile): string
+    {
+        $logoId = Uuid::create();
+
+        $uploadedFile->moveTo($this->generateStoragePath($logoId));
+
+        return $logoId;
+    }
+}
diff --git a/src/Infrastructure/Persistence/Read/Hydrator.php b/src/Infrastructure/Persistence/Read/Hydrator.php
@@ -61,7 +61,7 @@ public function hydrateMany(iterable $rows, ?string $groupBy = null): array
      * @param array $row
      * @return array
      */
-    private function hydrate(array $row): array
+    protected function hydrate(array $row): array
     {
         $result = [];
 

diff --git a/src/Infrastructure/Persistence/Read/TeamHydrator.php b/src/Infrastructure/Persistence/Read/TeamHydrator.php
@@ -0,0 +1,27 @@
+<?php
+declare(strict_types=1);
+
+namespace HexagonalPlayground\Infrastructure\Persistence\Read;
+
+use HexagonalPlayground\Infrastructure\Filesystem\TeamLogoRepository;
+
+class TeamHydrator extends Hydrator
+{
+    private TeamLogoRepository $teamLogoRepository;
+
+    public function __construct(iterable $fields, TeamLogoRepository $teamLogoRepository)
+    {
+        parent::__construct($fields);
+        $this->teamLogoRepository = $teamLogoRepository;
+    }
+
+    protected function hydrate(array $row): array
+    {
+        $team = parent::hydrate($row);
+        if ($team['logo_id'] !== null) {
+            $team['logo_path'] = $this->teamLogoRepository->generatePublicPath($team['logo_id']);
+        }
+
+        return $team;
+    }
+}
diff --git a/src/Infrastructure/Persistence/Read/TeamRepository.php b/src/Infrastructure/Persistence/Read/TeamRepository.php
@@ -3,6 +3,7 @@
 
 namespace HexagonalPlayground\Infrastructure\Persistence\Read;
 
+use HexagonalPlayground\Infrastructure\Filesystem\TeamLogoRepository;
 use HexagonalPlayground\Infrastructure\Persistence\Read\Criteria\EqualityFilter;
 use HexagonalPlayground\Infrastructure\Persistence\Read\Criteria\Filter;
 use HexagonalPlayground\Infrastructure\Persistence\Read\Field\DateTimeField;
@@ -11,6 +12,12 @@
 
 class TeamRepository extends AbstractRepository
 {
+    public function __construct(ReadDbGatewayInterface $gateway, TeamLogoRepository $teamLogoRepository)
+    {
+        parent::__construct($gateway);
+        $this->hydrator = new TeamHydrator($this->getFieldDefinitions(), $teamLogoRepository);
+    }
+
     protected function getTableName(): string
     {
         return 'teams';
@@ -27,7 +34,8 @@ protected function getFieldDefinitions(): array
                 new StringField('first_name', false),
                 new StringField('last_name', false),
                 new StringField('phone', false)
-            ])
+            ]),
+            new StringField('logo_id', true)
         ];
     }