WIP: switch from ACLAware to normal repository usage

src/Bundle/ChillCalendarBundle/Controller/MyInvitationsController.php

@@ -11,11 +11,9 @@ declare(strict_types=1);
 
 namespace Chill\CalendarBundle\Controller;
 
-use Chill\CalendarBundle\Repository\InviteACLAwareRepository;
+use Chill\CalendarBundle\Repository\InviteRepository;
 use Chill\MainBundle\Entity\User;
 use Chill\MainBundle\Pagination\PaginatorFactory;
-use Doctrine\ORM\NonUniqueResultException;
-use Doctrine\ORM\NoResultException;
 use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\Response;
@@ -24,12 +22,8 @@ use Symfony\Component\Routing\Annotation\Route;
 
 class MyInvitationsController extends AbstractController
 {
-    public function __construct(private readonly InviteACLAwareRepository $inviteACLAwareRepository, private readonly PaginatorFactory $paginator) {}
+    public function __construct(private readonly InviteRepository $inviteRepository, private readonly PaginatorFactory $paginator) {}
 
-    /**
-     * @throws NonUniqueResultException
-     * @throws NoResultException
-     */
     #[Route(path: '/{_locale}/calendar/invitations/my', name: 'chill_calendar_invitations_list_my')]
     public function myInvitations(Request $request): Response
     {
@@ -41,13 +35,18 @@ class MyInvitationsController extends AbstractController
             throw new UnauthorizedHttpException('you are not a user');
         }
 
-        $total = $this->inviteACLAwareRepository->countByUser($user);
+        $total = count($this->inviteRepository->findBy(['user' => $user]));
+        dump($total);
+        dump($this->inviteRepository->findBy(['user' => $user]));
         $paginator = $this->paginator->create($total);
-        $invitations = $this->inviteACLAwareRepository->findByUser(
-            $user,
+
+        dump($paginator->getCurrentPageFirstItemNumber());
+        dump($paginator->getItemsPerPage());
+        $invitations = $this->inviteRepository->findBy(
+            ['user' => $user],
             ['createdAt' => 'DESC'],
-            $paginator->getCurrentPageFirstItemNumber(),
-            $paginator->getItemsPerPage()
+//            $paginator->getCurrentPageFirstItemNumber(),
+//            $paginator->getItemsPerPage()
         );
 
         dump($invitations);

src/Bundle/ChillCalendarBundle/Repository/InviteACLAwareRepository.php

@@ -1,68 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-/*
- * Chill is a software for social workers
- *
- * For the full copyright and license information, please view
- * the LICENSE file that was distributed with this source code.
- */
-
-namespace Chill\CalendarBundle\Repository;
-
-use Chill\CalendarBundle\Entity\Invite;
-use Chill\MainBundle\Entity\User;
-use Doctrine\ORM\EntityManagerInterface;
-use Doctrine\ORM\NonUniqueResultException;
-use Doctrine\ORM\NoResultException;
-use Doctrine\ORM\QueryBuilder;
-
-readonly class InviteACLAwareRepository implements InviteACLAwareRepositoryInterface
-{
-    public function __construct(private EntityManagerInterface $em) {}
-
-    /**
-     * @throws NonUniqueResultException
-     * @throws NoResultException
-     */
-    public function countByUser(User $user): int
-    {
-        return $this->buildQueryByUser($user)
-            ->select('COUNT(i)')
-            ->getQuery()
-            ->getSingleScalarResult();
-    }
-
-    public function findByUser(User $user, ?array $orderBy = [], ?int $offset = null, ?int $limit = null): array
-    {
-        $qb = $this->buildQueryByUser($user)
-            ->select('i');
-
-        foreach ($orderBy as $sort => $order) {
-            $qb->addOrderBy('i.'.$sort, $order);
-        }
-
-        if (null !== $offset) {
-            $qb->setFirstResult($offset);
-        }
-
-        if (null !== $limit) {
-            $qb->setMaxResults($limit);
-        }
-
-        return $qb->getQuery()->getResult();
-    }
-
-    public function buildQueryByUser(User $user): QueryBuilder
-    {
-        $qb = $this->em->createQueryBuilder()
-            ->from(Invite::class, 'i');
-
-        $qb->where('i.user = :user');
-
-        $qb->setParameter('user', $user);
-
-        return $qb;
-    }
-}

src/Bundle/ChillCalendarBundle/Repository/InviteACLAwareRepositoryInterface.php

@@ -1,21 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-/*
- * Chill is a software for social workers
- *
- * For the full copyright and license information, please view
- * the LICENSE file that was distributed with this source code.
- */
-
-namespace Chill\CalendarBundle\Repository;
-
-use Chill\MainBundle\Entity\User;
-
-interface InviteACLAwareRepositoryInterface
-{
-    public function countByUser(User $user): int;
-
-    public function findByUser(User $user, ?array $orderBy = [], ?int $offset = null, ?int $limit = null): array;
-}

src/Bundle/ChillCalendarBundle/Repository/InviteRepository.php

@@ -16,9 +16,9 @@ use Doctrine\ORM\EntityManagerInterface;
 use Doctrine\ORM\EntityRepository;
 use Doctrine\Persistence\ObjectRepository;
 
-class InviteRepository implements ObjectRepository
+readonly class InviteRepository implements ObjectRepository
 {
-    private readonly EntityRepository $entityRepository;
+    private EntityRepository $entityRepository;
 
     public function __construct(EntityManagerInterface $em)
     {
@@ -41,7 +41,7 @@ class InviteRepository implements ObjectRepository
     /**
      * @return array|Invite[]
      */
-    public function findBy(array $criteria, ?array $orderBy = null, ?int $limit = null, ?int $offset = null)
+    public function findBy(array $criteria, ?array $orderBy = null, ?int $limit = null, ?int $offset = null): array
     {
         return $this->entityRepository->findBy($criteria, $orderBy, $limit, $offset);
     }

src/Bundle/ChillCalendarBundle/Resources/views/Invitations/listByUser.html.twig

@@ -10,7 +10,7 @@
 
     {% if invitations|length == 0 %}
         <p class="chill-no-data-statement">
-            {{ "There is no invitation items."|trans }}
+            {{ "invite.list.none"|trans }}
         </p>
     {% else %}
         {{ include ('@ChillCalendar/Invitations/_list_item.html.twig') }}

src/Bundle/ChillCalendarBundle/translations/messages.fr.yml

@@ -86,6 +86,8 @@ invite:
     declined: Refusé
     pending: En attente
     tentative: Accepté provisoirement
+    list:
+        none: Il n'y aucun invitation
 
 # exports
 Exports of calendar: Exports des rendez-vous