updates

Signed-off-by: alexmerlin <[email protected]>
dotkernel · Jul 11, 2024 · d4e5d18 · d4e5d18
1 parent f8411d1
commit d4e5d18
Show file tree

Hide file tree

Showing 9 changed files with 42 additions and 1 deletion.
diff --git a/config/pipeline.php b/config/pipeline.php
@@ -61,7 +61,7 @@
     $app->pipe(ImplicitOptionsMiddleware::class);
     $app->pipe(MethodNotAllowedMiddleware::class);
 
-//    $app->pipe(ContentNegotiationMiddleware::class);
+    $app->pipe(ContentNegotiationMiddleware::class);
     $app->pipe(DeprecationMiddleware::class);
 
     $app->pipe(ResponseHeaderMiddleware::class);

diff --git a/src/Admin/src/Service/AdminRoleService.php b/src/Admin/src/Service/AdminRoleService.php
@@ -12,6 +12,9 @@
 use Api\App\Message;
 use Dot\DependencyInjection\Attribute\Inject;
 
+use function in_array;
+use function sprintf;
+
 class AdminRoleService implements AdminRoleServiceInterface
 {
     #[Inject(

diff --git a/src/Admin/src/Service/AdminService.php b/src/Admin/src/Service/AdminService.php
@@ -13,6 +13,9 @@
 use Api\App\Message;
 use Dot\DependencyInjection\Attribute\Inject;
 
+use function in_array;
+use function sprintf;
+
 class AdminService implements AdminServiceInterface
 {
     #[Inject(

diff --git a/src/User/src/Handler/UserHandler.php b/src/User/src/Handler/UserHandler.php
@@ -61,6 +61,9 @@ public function get(ServerRequestInterface $request): ResponseInterface
         return $this->createResponse($request, $user);
     }
 
+    /**
+     * @throws BadRequestException
+     */
     public function getCollection(ServerRequestInterface $request): ResponseInterface
     {
         return $this->createResponse($request, $this->userService->getUsers($request->getQueryParams()));

diff --git a/src/User/src/Handler/UserRoleHandler.php b/src/User/src/Handler/UserRoleHandler.php
@@ -4,6 +4,7 @@
 
 namespace Api\User\Handler;
 
+use Api\App\Exception\BadRequestException;
 use Api\App\Exception\NotFoundException;
 use Api\App\Handler\HandlerTrait;
 use Api\User\Service\UserRoleServiceInterface;
@@ -42,6 +43,9 @@ public function get(ServerRequestInterface $request): ResponseInterface
         return $this->createResponse($request, $role);
     }
 
+    /**
+     * @throws BadRequestException
+     */
     public function getCollection(ServerRequestInterface $request): ResponseInterface
     {
         return $this->createResponse($request, $this->roleService->getRoles($request->getQueryParams()));

diff --git a/src/User/src/OpenAPI.php b/src/User/src/OpenAPI.php
@@ -539,6 +539,11 @@
             description: 'List of user roles',
             content: new OA\JsonContent(ref: '#/components/schemas/UserRoleCollection'),
         ),
+        new OA\Response(
+            response: StatusCodeInterface::STATUS_BAD_REQUEST,
+            description: 'Bad Request',
+            content: new OA\JsonContent(ref: '#/components/schemas/ErrorMessage'),
+        ),
         new OA\Response(
             response: StatusCodeInterface::STATUS_NOT_FOUND,
             description: 'Not Found',

diff --git a/src/User/src/Service/UserRoleService.php b/src/User/src/Service/UserRoleService.php
@@ -4,13 +4,17 @@
 
 namespace Api\User\Service;
 
+use Api\App\Exception\BadRequestException;
 use Api\App\Exception\NotFoundException;
 use Api\App\Message;
 use Api\User\Collection\UserRoleCollection;
 use Api\User\Entity\UserRole;
 use Api\User\Repository\UserRoleRepository;
 use Dot\DependencyInjection\Attribute\Inject;
 
+use function in_array;
+use function sprintf;
+
 class UserRoleService implements UserRoleServiceInterface
 {
     #[Inject(
@@ -34,8 +38,22 @@ public function findOneBy(array $params = []): UserRole
         return $role;
     }
 
+    /**
+     * @throws BadRequestException
+     */
     public function getRoles(array $params = []): UserRoleCollection
     {
+        $values = [
+            'role.name',
+            'role.created',
+            'role.updated',
+        ];
+
+        $params['order'] = $params['order'] ?? 'role.created';
+        if (! in_array($params['order'], $values)) {
+            throw (new BadRequestException())->setMessages([sprintf(Message::INVALID_VALUE, 'order')]);
+        }
+
         return $this->roleRepository->getRoles($params);
     }
 }
diff --git a/src/User/src/Service/UserRoleServiceInterface.php b/src/User/src/Service/UserRoleServiceInterface.php
@@ -4,6 +4,7 @@
 
 namespace Api\User\Service;
 
+use Api\App\Exception\BadRequestException;
 use Api\App\Exception\NotFoundException;
 use Api\User\Collection\UserRoleCollection;
 use Api\User\Entity\UserRole;
@@ -15,5 +16,8 @@ interface UserRoleServiceInterface
      */
     public function findOneBy(array $params = []): UserRole;
 
+    /**
+     * @throws BadRequestException
+     */
     public function getRoles(array $params = []): UserRoleCollection;
 }
diff --git a/src/User/src/Service/UserService.php b/src/User/src/Service/UserService.php
@@ -25,6 +25,7 @@
 use RuntimeException;
 
 use function date;
+use function in_array;
 use function sprintf;
 
 class UserService implements UserServiceInterface