Issue #330: Move common logic to Core module

Signed-off-by: alexmerlin <[email protected]>
dotkernel · Dec 1, 2024 · 982d341 · 982d341
1 parent abd7cd5
commit 982d341
Show file tree

Hide file tree

Showing 45 changed files with 108 additions and 103 deletions.
diff --git a/src/Admin/src/Command/AdminCreateCommand.php b/src/Admin/src/Command/AdminCreateCommand.php
@@ -10,8 +10,8 @@
 use Api\App\Exception\BadRequestException;
 use Api\App\Exception\ConflictException;
 use Api\App\Exception\NotFoundException;
-use Api\App\Message;
 use Core\Admin\Entity\AdminRole;
+use Core\App\Message;
 use Symfony\Component\Console\Attribute\AsCommand;
 use Symfony\Component\Console\Command\Command;
 use Symfony\Component\Console\Input\InputInterface;

diff --git a/src/Admin/src/InputFilter/Input/FirstNameInput.php b/src/Admin/src/InputFilter/Input/FirstNameInput.php
@@ -4,7 +4,7 @@
 
 namespace Api\Admin\InputFilter\Input;
 
-use Api\App\Message;
+use Core\App\Message;
 use Laminas\Filter\StringTrim;
 use Laminas\Filter\StripTags;
 use Laminas\InputFilter\Input;

diff --git a/src/Admin/src/InputFilter/Input/IdentityInput.php b/src/Admin/src/InputFilter/Input/IdentityInput.php
@@ -4,7 +4,7 @@
 
 namespace Api\Admin\InputFilter\Input;
 
-use Api\App\Message;
+use Core\App\Message;
 use Laminas\Filter\StringTrim;
 use Laminas\Filter\StripTags;
 use Laminas\InputFilter\Input;

diff --git a/src/Admin/src/InputFilter/Input/LastNameInput.php b/src/Admin/src/InputFilter/Input/LastNameInput.php
@@ -4,7 +4,7 @@
 
 namespace Api\Admin\InputFilter\Input;
 
-use Api\App\Message;
+use Core\App\Message;
 use Laminas\Filter\StringTrim;
 use Laminas\Filter\StripTags;
 use Laminas\InputFilter\Input;

diff --git a/src/Admin/src/InputFilter/Input/PasswordConfirmInput.php b/src/Admin/src/InputFilter/Input/PasswordConfirmInput.php
@@ -4,7 +4,7 @@
 
 namespace Api\Admin\InputFilter\Input;
 
-use Api\App\Message;
+use Core\App\Message;
 use Laminas\Filter\StringTrim;
 use Laminas\Filter\StripTags;
 use Laminas\InputFilter\Input;

diff --git a/src/Admin/src/InputFilter/Input/PasswordInput.php b/src/Admin/src/InputFilter/Input/PasswordInput.php
@@ -4,7 +4,7 @@
 
 namespace Api\Admin\InputFilter\Input;
 
-use Api\App\Message;
+use Core\App\Message;
 use Laminas\Filter\StringTrim;
 use Laminas\Filter\StripTags;
 use Laminas\InputFilter\Input;

diff --git a/src/Admin/src/InputFilter/Input/StatusInput.php b/src/Admin/src/InputFilter/Input/StatusInput.php
@@ -4,8 +4,8 @@
 
 namespace Api\Admin\InputFilter\Input;
 
-use Api\App\Message;
 use Core\Admin\Enum\AdminStatusEnum;
+use Core\App\Message;
 use Laminas\Filter\StringTrim;
 use Laminas\Filter\StripTags;
 use Laminas\InputFilter\Input;

diff --git a/src/Admin/src/Service/AdminRoleService.php b/src/Admin/src/Service/AdminRoleService.php
@@ -7,9 +7,9 @@
 use Api\Admin\Collection\AdminRoleCollection;
 use Api\App\Exception\BadRequestException;
 use Api\App\Exception\NotFoundException;
-use Api\App\Message;
 use Core\Admin\Entity\AdminRole;
 use Core\Admin\Repository\AdminRoleRepository;
+use Core\App\Message;
 use Dot\DependencyInjection\Attribute\Inject;
 
 use function in_array;
@@ -54,6 +54,9 @@ public function getAdminRoles(array $params = []): AdminRoleCollection
             throw (new BadRequestException())->setMessages([sprintf(Message::INVALID_VALUE, 'order')]);
         }
 
-        return $this->adminRoleRepository->getAdminRoles($params);
+        $qb = $this->adminRoleRepository->getAdminRoles($params);
+        $qb->getQuery()->useQueryCache(true);
+
+        return new AdminRoleCollection($qb, false);
     }
 }
diff --git a/src/Admin/src/Service/AdminService.php b/src/Admin/src/Service/AdminService.php
@@ -8,10 +8,10 @@
 use Api\App\Exception\BadRequestException;
 use Api\App\Exception\ConflictException;
 use Api\App\Exception\NotFoundException;
-use Api\App\Message;
 use Core\Admin\Entity\Admin;
 use Core\Admin\Enum\AdminStatusEnum;
 use Core\Admin\Repository\AdminRepository;
+use Core\App\Message;
 use Dot\DependencyInjection\Attribute\Inject;
 
 use function in_array;
@@ -110,7 +110,10 @@ public function getAdmins(array $params = []): AdminCollection
             throw (new BadRequestException())->setMessages([sprintf(Message::INVALID_VALUE, 'order')]);
         }
 
-        return $this->adminRepository->getAdmins($params);
+        $qb = $this->adminRepository->getAdmins($params);
+        $qb->getQuery()->useQueryCache(true);
+
+        return new AdminCollection($qb, false);
     }
 
     /**

diff --git a/src/App/src/Attribute/BaseDeprecation.php b/src/App/src/Attribute/BaseDeprecation.php
@@ -5,7 +5,7 @@
 namespace Api\App\Attribute;
 
 use Api\App\Exception\DeprecationSunsetException;
-use Api\App\Message;
+use Core\App\Message;
 use Laminas\Validator\Date;
 
 use function sprintf;

diff --git a/src/App/src/Factory/HandlerDelegatorFactory.php b/src/App/src/Factory/HandlerDelegatorFactory.php
@@ -6,7 +6,7 @@
 
 use Api\App\Exception\RuntimeException;
 use Api\App\Handler\AbstractHandler;
-use Api\App\Message;
+use Core\App\Message;
 use Mezzio\Hal\HalResponseFactory;
 use Mezzio\Hal\ResourceGenerator;
 use Psr\Container\ContainerExceptionInterface;

diff --git a/src/App/src/Handler/AbstractHandler.php b/src/App/src/Handler/AbstractHandler.php
@@ -13,8 +13,8 @@
 use Api\App\Exception\NotFoundException;
 use Api\App\Exception\RuntimeException;
 use Api\App\Exception\UnauthorizedException;
-use Api\App\Message;
 use Core\App\Entity\EntityInterface;
+use Core\App\Message;
 use Dot\Mail\Exception\MailException;
 use Exception;
 use Fig\Http\Message\StatusCodeInterface;

diff --git a/src/App/src/Handler/ErrorReportHandler.php b/src/App/src/Handler/ErrorReportHandler.php
@@ -7,8 +7,8 @@
 use Api\App\Attribute\MethodDeprecation;
 use Api\App\Exception\ForbiddenException;
 use Api\App\Exception\UnauthorizedException;
-use Api\App\Message;
 use Api\App\Service\ErrorReportServiceInterface;
+use Core\App\Message;
 use Dot\DependencyInjection\Attribute\Inject;
 use Fig\Http\Message\StatusCodeInterface;
 use Psr\Http\Message\ResponseInterface;

diff --git a/src/App/src/Helper/PaginationHelper.php b/src/App/src/Helper/PaginationHelper.php
diff --git a/src/App/src/Middleware/AuthorizationMiddleware.php b/src/App/src/Middleware/AuthorizationMiddleware.php
@@ -4,11 +4,11 @@
 
 namespace Api\App\Middleware;
 
-use Api\App\Message;
 use Core\Admin\Entity\Admin;
 use Core\Admin\Repository\AdminRepository;
 use Core\App\Entity\Guest;
 use Core\App\Entity\RoleInterface;
+use Core\App\Message;
 use Core\User\Entity\User;
 use Core\User\Repository\UserRepository;
 use Core\User\UserIdentity;

diff --git a/src/App/src/Middleware/DeprecationMiddleware.php b/src/App/src/Middleware/DeprecationMiddleware.php
@@ -7,7 +7,7 @@
 use Api\App\Attribute\MethodDeprecation;
 use Api\App\Attribute\ResourceDeprecation;
 use Api\App\Exception\DeprecationConflictException;
-use Api\App\Message;
+use Core\App\Message;
 use Dot\DependencyInjection\Attribute\Inject;
 use Laminas\Stratigility\MiddlewarePipe;
 use Mezzio\Middleware\LazyLoadingMiddleware;

diff --git a/src/App/src/Service/ErrorReportService.php b/src/App/src/Service/ErrorReportService.php
@@ -6,7 +6,7 @@
 
 use Api\App\Exception\ForbiddenException;
 use Api\App\Exception\UnauthorizedException;
-use Api\App\Message;
+use Core\App\Message;
 use Dot\DependencyInjection\Attribute\Inject;
 use Psr\Http\Message\ServerRequestInterface;
 use RuntimeException;

diff --git a/src/Core/src/Admin/src/Repository/AdminRepository.php b/src/Core/src/Admin/src/Repository/AdminRepository.php
@@ -4,10 +4,10 @@
 
 namespace Core\Admin\Repository;
 
-use Api\Admin\Collection\AdminCollection;
-use Api\App\Helper\PaginationHelper;
 use Core\Admin\Entity\Admin;
+use Core\App\Helper\PaginationHelper;
 use Doctrine\ORM\EntityRepository;
+use Doctrine\ORM\QueryBuilder;
 use Dot\DependencyInjection\Attribute\Entity;
 
 /**
@@ -30,21 +30,17 @@ public function saveAdmin(Admin $admin): Admin
         return $admin;
     }
 
-    public function getAdmins(array $filters = []): AdminCollection
+    public function getAdmins(array $filters = []): QueryBuilder
     {
         $page = PaginationHelper::getOffsetAndLimit($filters);
 
-        $query = $this
+        return $this
             ->getEntityManager()
             ->createQueryBuilder()
             ->select(['admin'])
             ->from(Admin::class, 'admin')
             ->orderBy($filters['order'] ?? 'admin.created', $filters['dir'] ?? 'desc')
             ->setFirstResult($page['offset'])
-            ->setMaxResults($page['limit'])
-            ->getQuery()
-            ->useQueryCache(true);
-
-        return new AdminCollection($query, false);
+            ->setMaxResults($page['limit']);
     }
 }
diff --git a/src/Core/src/Admin/src/Repository/AdminRoleRepository.php b/src/Core/src/Admin/src/Repository/AdminRoleRepository.php
@@ -4,10 +4,10 @@
 
 namespace Core\Admin\Repository;
 
-use Api\Admin\Collection\AdminRoleCollection;
-use Api\App\Helper\PaginationHelper;
 use Core\Admin\Entity\AdminRole;
+use Core\App\Helper\PaginationHelper;
 use Doctrine\ORM\EntityRepository;
+use Doctrine\ORM\QueryBuilder;
 use Dot\DependencyInjection\Attribute\Entity;
 
 /**
@@ -16,21 +16,17 @@
 #[Entity(name: AdminRole::class)]
 class AdminRoleRepository extends EntityRepository
 {
-    public function getAdminRoles(array $filters = []): AdminRoleCollection
+    public function getAdminRoles(array $filters = []): QueryBuilder
     {
         $page = PaginationHelper::getOffsetAndLimit($filters);
 
-        $query = $this
+        return $this
             ->getEntityManager()
             ->createQueryBuilder()
             ->select(['role'])
             ->from(AdminRole::class, 'role')
             ->orderBy($filters['order'] ?? 'role.created', $filters['dir'] ?? 'desc')
             ->setFirstResult($page['offset'])
-            ->setMaxResults($page['limit'])
-            ->getQuery()
-            ->useQueryCache(true);
-
-        return new AdminRoleCollection($query, false);
+            ->setMaxResults($page['limit']);
     }
 }
diff --git a/src/Core/src/App/src/Helper/PaginationHelper.php b/src/Core/src/App/src/Helper/PaginationHelper.php
@@ -0,0 +1,33 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Core\App\Helper;
+
+use function array_key_exists;
+
+class PaginationHelper
+{
+    public const LIMIT = 10;
+
+    public static function getOffsetAndLimit(array $filters = []): array
+    {
+        $page = (int) ($filters['page'] ?? 1);
+
+        if (array_key_exists('all', $filters)) {
+            $offset = 0;
+            $limit  = 1_000;
+        } elseif ($page > 0) {
+            $offset = ($page - 1) * self::LIMIT;
+            $limit  = self::LIMIT;
+        } else {
+            $offset = 0;
+            $limit  = self::LIMIT;
+        }
+
+        return [
+            'offset' => $offset,
+            'limit'  => $limit,
+        ];
+    }
+}
diff --git a/src/App/src/Message.php → src/Core/src/App/src/Message.php b/src/App/src/Message.php → src/Core/src/App/src/Message.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace Api\App;
+namespace Core\App;
 
 class Message
 {

diff --git a/src/Core/src/User/src/Entity/UserAvatar.php b/src/Core/src/User/src/Entity/UserAvatar.php
@@ -4,9 +4,9 @@
 
 namespace Core\User\Entity;
 
-use Api\User\EventListener\UserAvatarEventListener;
 use Core\App\Entity\AbstractEntity;
 use Core\App\Entity\TimestampsTrait;
+use Core\User\EventListener\UserAvatarEventListener;
 use Core\User\Repository\UserAvatarRepository;
 use Doctrine\ORM\Mapping as ORM;
 

diff --git a/...EventListener/UserAvatarEventListener.php → ...EventListener/UserAvatarEventListener.php b/...EventListener/UserAvatarEventListener.php → ...EventListener/UserAvatarEventListener.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace Api\User\EventListener;
+namespace Core\User\EventListener;
 
 use Core\User\Entity\UserAvatar;
 use Dot\DependencyInjection\Attribute\Inject;

diff --git a/src/Core/src/User/src/Repository/UserRepository.php b/src/Core/src/User/src/Repository/UserRepository.php
@@ -4,14 +4,14 @@
 
 namespace Core\User\Repository;
 
-use Api\App\Helper\PaginationHelper;
-use Api\App\Message;
-use Api\User\Collection\UserCollection;
 use Core\Admin\Entity\Admin;
 use Core\App\Entity\OAuthClient;
+use Core\App\Helper\PaginationHelper;
+use Core\App\Message;
 use Core\User\Entity\User;
 use Core\User\Enum\UserStatusEnum;
 use Doctrine\ORM\EntityRepository;
+use Doctrine\ORM\QueryBuilder;
 use Dot\DependencyInjection\Attribute\Entity;
 use League\OAuth2\Server\Entities\ClientEntityInterface;
 use League\OAuth2\Server\Exception\OAuthServerException;
@@ -32,7 +32,7 @@ public function deleteUser(User $user): void
         $this->getEntityManager()->flush();
     }
 
-    public function getUsers(array $filters = []): UserCollection
+    public function getUsers(array $filters = []): QueryBuilder
     {
         $page = PaginationHelper::getOffsetAndLimit($filters);
 
@@ -78,9 +78,7 @@ public function getUsers(array $filters = []): UserCollection
             $qb->andWhere('roles.name = :role')->setParameter('role', $filters['role']);
         }
 
-        $qb->getQuery()->useQueryCache(true);
-
-        return new UserCollection($qb, false);
+        return $qb;
     }
 
     public function saveUser(User $user): User