list calendar by period: date range and query acl aware

src/Bundle/ChillCalendarBundle/Controller/CalendarController.php

@@ -14,11 +14,14 @@ namespace Chill\CalendarBundle\Controller;
 use Chill\CalendarBundle\Entity\Calendar;
 use Chill\CalendarBundle\Form\CalendarType;
 use Chill\CalendarBundle\RemoteCalendar\Connector\RemoteCalendarConnectorInterface;
+use Chill\CalendarBundle\Repository\CalendarACLAwareRepositoryInterface;
 use Chill\CalendarBundle\Repository\CalendarRepository;
 use Chill\MainBundle\Entity\User;
 use Chill\MainBundle\Pagination\PaginatorFactory;
 use Chill\MainBundle\Repository\UserRepository;
 use Chill\MainBundle\Security\Authorization\AuthorizationHelper;
+use Chill\MainBundle\Templating\Listing\FilterOrderHelper;
+use Chill\MainBundle\Templating\Listing\FilterOrderHelperFactoryInterface;
 use Chill\PersonBundle\Entity\AccompanyingPeriod;
 use Chill\PersonBundle\Entity\Person;
 use Chill\ThirdPartyBundle\Entity\ThirdParty;
@@ -37,11 +40,11 @@ use Symfony\Component\Serializer\SerializerInterface;
 
 class CalendarController extends AbstractController
 {
-    private AuthorizationHelper $authorizationHelper;
-
     private CalendarRepository $calendarRepository;
 
-    private EventDispatcherInterface $eventDispatcher;
+    private CalendarACLAwareRepositoryInterface $calendarACLAwareRepository;
+
+    private FilterOrderHelperFactoryInterface $filterOrderHelperFactory;
 
     private LoggerInterface $logger;
 
@@ -54,18 +57,18 @@ class CalendarController extends AbstractController
     private UserRepository $userRepository;
 
     public function __construct(
-        AuthorizationHelper $authorizationHelper,
         CalendarRepository $calendarRepository,
-        EventDispatcherInterface $eventDispatcher,
+        CalendarACLAwareRepositoryInterface $calendarACLAwareRepository,
+        FilterOrderHelperFactoryInterface $filterOrderHelperFactory,
         LoggerInterface $logger,
         PaginatorFactory $paginator,
         RemoteCalendarConnectorInterface $remoteCalendarConnector,
         SerializerInterface $serializer,
         UserRepository $userRepository
     ) {
-        $this->authorizationHelper = $authorizationHelper;
         $this->calendarRepository = $calendarRepository;
-        $this->eventDispatcher = $eventDispatcher;
+        $this->calendarACLAwareRepository = $calendarACLAwareRepository;
+        $this->filterOrderHelperFactory = $filterOrderHelperFactory;
         $this->logger = $logger;
         $this->paginator = $paginator;
         $this->remoteCalendarConnector = $remoteCalendarConnector;
@@ -193,48 +196,39 @@ class CalendarController extends AbstractController
     /**
      * Lists all Calendar entities.
      *
-     * @Route("/{_locale}/calendar/calendar/", name="chill_calendar_calendar_list")
+     * @Route("/{_locale}/calendar/calendar/by-period/{id}", name="chill_calendar_calendar_list_by_period")
      */
-    public function listAction(Request $request): Response
+    public function listActionByCourse(AccompanyingPeriod $accompanyingPeriod): Response
     {
-        $view = null;
+        $filterOrder = $this->buildListFilterOrder();
+        ['from' => $from, 'to' => $to] = $filterOrder->getDateRangeData('startDate');
 
-        [$user, $accompanyingPeriod] = $this->getEntity($request);
-
-        /*
-         dead code ?
-        if ($user instanceof User) {
-            $calendarItems = $this->calendarRepository->findByUser($user);
-
-            $view = '@ChillCalendar/Calendar/listByUser.html.twig';
-
-            return $this->render($view, [
-                'calendarItems' => $calendarItems,
-                'user' => $user,
-            ]);
-        }
-         */
-
-        if ($accompanyingPeriod instanceof AccompanyingPeriod) {
-            $total = $this->calendarRepository->countByAccompanyingPeriod($accompanyingPeriod);
+            $total = $this->calendarACLAwareRepository
+                ->countByAccompanyingPeriod($accompanyingPeriod, $from, $to);
             $paginator = $this->paginator->create($total);
-            $calendarItems = $this->calendarRepository->findBy(
-                ['accompanyingPeriod' => $accompanyingPeriod],
+            $calendarItems = $this->calendarACLAwareRepository->findByAccompanyingPeriod(
+                $accompanyingPeriod,
+                $from,
+                $to,
                 ['startDate' => 'DESC'],
-                $paginator->getItemsPerPage(),
-                $paginator->getCurrentPageFirstItemNumber()
+                $paginator->getCurrentPageFirstItemNumber(),
+                $paginator->getItemsPerPage()
             );
 
-            $view = '@ChillCalendar/Calendar/listByAccompanyingCourse.html.twig';
-
-            return $this->render($view, [
+            return $this->render('@ChillCalendar/Calendar/listByAccompanyingCourse.html.twig', [
                 'calendarItems' => $calendarItems,
                 'accompanyingCourse' => $accompanyingPeriod,
                 'paginator' => $paginator,
+                'filterOrder' => $filterOrder,
             ]);
-        }
+    }
 
-        throw new Exception('Unable to list actions.');
+    private function buildListFilterOrder(): FilterOrderHelper
+    {
+        $filterOrder = $this->filterOrderHelperFactory->create(self::class);
+        $filterOrder->addDateRange('startDate', 'chill_calendar.start date filter', new \DateTimeImmutable('3 days ago'), null);
+
+        return $filterOrder->build();
     }
 
     /**