Small optimizations

Signed-off-by: alexmerlin <[email protected]>

Author: alexmerlin

src/Admin/src/Handler/Admin/DeleteAdminResourceHandler.php

@@ -5,10 +5,8 @@
 namespace Api\Admin\Handler\Admin;
 
 use Api\App\Handler\AbstractHandler;
-use Core\Admin\Entity\Admin;
 use Core\Admin\Service\AdminServiceInterface;
 use Core\App\Exception\NotFoundException;
-use Core\App\Message;
 use Dot\DependencyInjection\Attribute\Inject;
 use Psr\Http\Message\ResponseInterface;
 use Psr\Http\Message\ServerRequestInterface;
@@ -28,12 +26,9 @@ public function __construct(
      */
     public function handle(ServerRequestInterface $request): ResponseInterface
     {
-        $admin = $this->adminService->getAdminRepository()->find($request->getAttribute('uuid'));
-        if (! $admin instanceof Admin) {
-            throw new NotFoundException(Message::ADMIN_NOT_FOUND);
-        }
-
-        $this->adminService->getAdminRepository()->deleteAdmin($admin);
+        $this->adminService->getAdminRepository()->deleteAdmin(
+            $this->adminService->find($request->getAttribute('uuid'))
+        );
 
         return $this->noContentResponse();
     }

src/Admin/src/Handler/Admin/GetAdminResourceHandler.php

@@ -5,10 +5,8 @@
 namespace Api\Admin\Handler\Admin;
 
 use Api\App\Handler\AbstractHandler;
-use Core\Admin\Entity\Admin;
 use Core\Admin\Service\AdminServiceInterface;
 use Core\App\Exception\NotFoundException;
-use Core\App\Message;
 use Dot\DependencyInjection\Attribute\Inject;
 use Psr\Http\Message\ResponseInterface;
 use Psr\Http\Message\ServerRequestInterface;
@@ -28,11 +26,9 @@ public function __construct(
      */
     public function handle(ServerRequestInterface $request): ResponseInterface
     {
-        $admin = $this->adminService->getAdminRepository()->find($request->getAttribute('uuid'));
-        if (! $admin instanceof Admin) {
-            throw new NotFoundException(Message::ADMIN_NOT_FOUND);
-        }
-
-        return $this->createResponse($request, $admin);
+        return $this->createResponse(
+            $request,
+            $this->adminService->find($request->getAttribute('uuid'))
+        );
     }
 }

src/Admin/src/Handler/Admin/PatchAdminResourceHandler.php

@@ -6,12 +6,10 @@
 
 use Api\Admin\InputFilter\UpdateAdminInputFilter;
 use Api\App\Handler\AbstractHandler;
-use Core\Admin\Entity\Admin;
 use Core\Admin\Service\AdminServiceInterface;
 use Core\App\Exception\BadRequestException;
 use Core\App\Exception\ConflictException;
 use Core\App\Exception\NotFoundException;
-use Core\App\Message;
 use Dot\DependencyInjection\Attribute\Inject;
 use Psr\Http\Message\ResponseInterface;
 use Psr\Http\Message\ServerRequestInterface;
@@ -40,10 +38,7 @@ public function handle(ServerRequestInterface $request): ResponseInterface
             throw (new BadRequestException())->setMessages($this->inputFilter->getMessages());
         }
 
-        $admin = $this->adminService->getAdminRepository()->find($request->getAttribute('uuid'));
-        if (! $admin instanceof Admin) {
-            throw new NotFoundException(Message::ADMIN_NOT_FOUND);
-        }
+        $admin = $this->adminService->find($request->getAttribute('uuid'));
 
         $this->adminService->updateAdmin($admin, (array) $this->inputFilter->getValues());
 

src/Admin/src/Handler/Admin/Role/GetAdminRoleResourceHandler.php

@@ -5,10 +5,8 @@
 namespace Api\Admin\Handler\Admin\Role;
 
 use Api\App\Handler\AbstractHandler;
-use Core\Admin\Entity\AdminRole;
 use Core\Admin\Service\AdminRoleServiceInterface;
 use Core\App\Exception\NotFoundException;
-use Core\App\Message;
 use Dot\DependencyInjection\Attribute\Inject;
 use Psr\Http\Message\ResponseInterface;
 use Psr\Http\Message\ServerRequestInterface;
@@ -28,11 +26,9 @@ public function __construct(
      */
     public function handle(ServerRequestInterface $request): ResponseInterface
     {
-        $adminRole = $this->adminRoleService->getAdminRoleRepository()->find($request->getAttribute('uuid'));
-        if (! $adminRole instanceof AdminRole) {
-            throw new NotFoundException(Message::ROLE_NOT_FOUND);
-        }
-
-        return $this->createResponse($request, $adminRole);
+        return $this->createResponse(
+            $request,
+            $this->adminRoleService->find($request->getAttribute('uuid'))
+        );
     }
 }

src/Core/src/Admin/src/Service/AdminRoleService.php

@@ -4,7 +4,10 @@
 
 namespace Core\Admin\Service;
 
+use Core\Admin\Entity\AdminRole;
 use Core\Admin\Repository\AdminRoleRepository;
+use Core\App\Exception\NotFoundException;
+use Core\App\Message;
 use Dot\DependencyInjection\Attribute\Inject;
 
 class AdminRoleService implements AdminRoleServiceInterface
@@ -21,4 +24,17 @@ public function getAdminRoleRepository(): AdminRoleRepository
     {
         return $this->adminRoleRepository;
     }
+
+    /**
+     * @throws NotFoundException
+     */
+    public function find(string $id): AdminRole
+    {
+        $adminRole = $this->adminRoleRepository->find($id);
+        if (! $adminRole instanceof AdminRole) {
+            throw new NotFoundException(Message::ROLE_NOT_FOUND);
+        }
+
+        return $adminRole;
+    }
 }

src/Core/src/Admin/src/Service/AdminRoleServiceInterface.php

@@ -4,9 +4,16 @@
 
 namespace Core\Admin\Service;
 
+use Core\Admin\Entity\AdminRole;
 use Core\Admin\Repository\AdminRoleRepository;
+use Core\App\Exception\NotFoundException;
 
 interface AdminRoleServiceInterface
 {
     public function getAdminRoleRepository(): AdminRoleRepository;
+
+    /**
+     * @throws NotFoundException
+     */
+    public function find(string $id): AdminRole;
 }

src/Core/src/Admin/src/Service/AdminService.php

@@ -64,6 +64,19 @@ public function deleteAdmin(Admin $admin): void
         $this->adminRepository->deleteAdmin($admin);
     }
 
+    /**
+     * @throws NotFoundException
+     */
+    public function find(string $id): Admin
+    {
+        $admin = $this->adminRepository->find($id);
+        if (! $admin instanceof Admin) {
+            throw new NotFoundException(Message::ADMIN_NOT_FOUND);
+        }
+
+        return $admin;
+    }
+
     /**
      * @throws BadRequestException
      * @throws ConflictException

src/Core/src/Admin/src/Service/AdminServiceInterface.php

@@ -22,6 +22,11 @@ public function createAdmin(array $data = []): Admin;
 
     public function deleteAdmin(Admin $admin): void;
 
+    /**
+     * @throws NotFoundException
+     */
+    public function find(string $id): Admin;
+
     /**
      * @throws BadRequestException
      * @throws ConflictException

src/Core/src/User/src/Service/UserRoleService.php

@@ -4,6 +4,9 @@
 
 namespace Core\User\Service;
 
+use Core\App\Exception\NotFoundException;
+use Core\App\Message;
+use Core\User\Entity\UserRole;
 use Core\User\Repository\UserRoleRepository;
 use Dot\DependencyInjection\Attribute\Inject;
 
@@ -13,12 +16,25 @@ class UserRoleService implements UserRoleServiceInterface
         UserRoleRepository::class,
     )]
     public function __construct(
-        protected UserRoleRepository $roleRepository,
+        protected UserRoleRepository $userRoleRepository,
     ) {
     }
 
-    public function getRoleRepository(): UserRoleRepository
+    public function getUserRoleRepository(): UserRoleRepository
     {
-        return $this->roleRepository;
+        return $this->userRoleRepository;
+    }
+
+    /**
+     * @throws NotFoundException
+     */
+    public function find(string $id): UserRole
+    {
+        $userRole = $this->userRoleRepository->find($id);
+        if (! $userRole instanceof UserRole) {
+            throw new NotFoundException(Message::ROLE_NOT_FOUND);
+        }
+
+        return $userRole;
     }
 }

src/Core/src/User/src/Service/UserRoleServiceInterface.php

@@ -4,9 +4,16 @@
 
 namespace Core\User\Service;
 
+use Core\App\Exception\NotFoundException;
+use Core\User\Entity\UserRole;
 use Core\User\Repository\UserRoleRepository;
 
 interface UserRoleServiceInterface
 {
-    public function getRoleRepository(): UserRoleRepository;
+    public function getUserRoleRepository(): UserRoleRepository;
+
+    /**
+     * @throws NotFoundException
+     */
+    public function find(string $id): UserRole;
 }