Merge remote-tracking branch 'origin/calendar/synchro-msgraph' into calendar/finalization

src/Bundle/ChillCalendarBundle/Controller/CalendarController.php

@@ -14,18 +14,20 @@ 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;
+use DateTimeImmutable;
 use Exception;
 use Psr\Log\LoggerInterface;
 use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
-use Symfony\Component\EventDispatcher\EventDispatcherInterface;
 use Symfony\Component\Form\Extension\Core\Type\SubmitType;
 use Symfony\Component\Form\Form;
 use Symfony\Component\Form\FormInterface;
@@ -37,11 +39,11 @@ use Symfony\Component\Serializer\SerializerInterface;
 
 class CalendarController extends AbstractController
 {
-    private AuthorizationHelper $authorizationHelper;
+    private CalendarACLAwareRepositoryInterface $calendarACLAwareRepository;
 
     private CalendarRepository $calendarRepository;
 
-    private EventDispatcherInterface $eventDispatcher;
+    private FilterOrderHelperFactoryInterface $filterOrderHelperFactory;
 
     private LoggerInterface $logger;
 
@@ -54,18 +56,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;
@@ -165,7 +167,7 @@ class CalendarController extends AbstractController
 
             $params = $this->buildParamsToUrl($user, $accompanyingPeriod);
 
-            return $this->redirectToRoute('chill_calendar_calendar_list', $params);
+            return $this->redirectToRoute('chill_calendar_calendar_list_by_period', $params);
         }
 
         if ($form->isSubmitted() && !$form->isValid()) {
@@ -214,48 +216,31 @@ 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);
+        $total = $this->calendarACLAwareRepository
+            ->countByAccompanyingPeriod($accompanyingPeriod, $from, $to);
+        $paginator = $this->paginator->create($total);
+        $calendarItems = $this->calendarACLAwareRepository->findByAccompanyingPeriod(
+            $accompanyingPeriod,
+            $from,
+            $to,
+            ['startDate' => 'DESC'],
+            $paginator->getCurrentPageFirstItemNumber(),
+            $paginator->getItemsPerPage()
+        );
 
-        /*
-         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);
-            $paginator = $this->paginator->create($total);
-            $calendarItems = $this->calendarRepository->findBy(
-                ['accompanyingPeriod' => $accompanyingPeriod],
-                ['startDate' => 'DESC'],
-                $paginator->getItemsPerPage(),
-                $paginator->getCurrentPageFirstItemNumber()
-            );
-
-            $view = '@ChillCalendar/Calendar/listByAccompanyingCourse.html.twig';
-
-            return $this->render($view, [
-                'calendarItems' => $calendarItems,
-                'accompanyingCourse' => $accompanyingPeriod,
-                'paginator' => $paginator,
-            ]);
-        }
-
-        throw new Exception('Unable to list actions.');
+        return $this->render('@ChillCalendar/Calendar/listByAccompanyingCourse.html.twig', [
+            'calendarItems' => $calendarItems,
+            'accompanyingCourse' => $accompanyingPeriod,
+            'paginator' => $paginator,
+            'filterOrder' => $filterOrder,
+        ]);
     }
 
     /**
@@ -328,7 +313,7 @@ class CalendarController extends AbstractController
 
             $params = $this->buildParamsToUrl($user, $accompanyingPeriod);
 
-            return $this->redirectToRoute('chill_calendar_calendar_list', $params);
+            return $this->redirectToRoute('chill_calendar_calendar_list_by_period', $params);
         }
 
         if ($form->isSubmitted() && !$form->isValid()) {
@@ -421,6 +406,14 @@ class CalendarController extends AbstractController
         ]);
     }
 
+    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();
+    }
+
     private function buildParamsToUrl(?User $user, ?AccompanyingPeriod $accompanyingPeriod): array
     {
         $params = [];
@@ -430,7 +423,7 @@ class CalendarController extends AbstractController
         }
 
         if (null !== $accompanyingPeriod) {
-            $params['accompanying_period_id'] = $accompanyingPeriod->getId();
+            $params['id'] = $accompanyingPeriod->getId();
         }
 
         return $params;

src/Bundle/ChillCalendarBundle/Controller/InviteApiController.php

@@ -13,6 +13,7 @@ namespace Chill\CalendarBundle\Controller;
 
 use Chill\CalendarBundle\Entity\Calendar;
 use Chill\CalendarBundle\Entity\Invite;
+use Chill\CalendarBundle\Messenger\Message\InviteUpdateMessage;
 use Chill\CalendarBundle\Security\Voter\InviteVoter;
 use Chill\MainBundle\Entity\User;
 use Doctrine\ORM\EntityManagerInterface;
@@ -20,6 +21,7 @@ use Symfony\Component\HttpFoundation\JsonResponse;
 use Symfony\Component\HttpFoundation\Response;
 use Symfony\Component\HttpKernel\Exception\AccessDeniedHttpException;
 use Symfony\Component\HttpKernel\Exception\BadRequestHttpException;
+use Symfony\Component\Messenger\MessageBusInterface;
 use Symfony\Component\Routing\Annotation\Route;
 use Symfony\Component\Security\Core\Security;
 use function in_array;
@@ -28,12 +30,15 @@ class InviteApiController
 {
     private EntityManagerInterface $entityManager;
 
+    private MessageBusInterface $messageBus;
+
     private Security $security;
 
-    public function __construct(Security $security, EntityManagerInterface $entityManager)
+    public function __construct(EntityManagerInterface $entityManager, MessageBusInterface $messageBus, Security $security)
     {
-        $this->security = $security;
         $this->entityManager = $entityManager;
+        $this->messageBus = $messageBus;
+        $this->security = $security;
     }
 
     /**
@@ -57,13 +62,15 @@ class InviteApiController
             throw new AccessDeniedHttpException('not allowed to answer on this invitation');
         }
 
-        if (!in_array($answer, Invite::STATUSES, true) || Invite::PENDING === $answer) {
+        if (!in_array($answer, Invite::STATUSES, true)) {
             throw new BadRequestHttpException('answer not valid');
         }
 
         $invite->setStatus($answer);
         $this->entityManager->flush();
 
+        $this->messageBus->dispatch(new InviteUpdateMessage($invite, $this->security->getUser()));
+
         return new JsonResponse(null, Response::HTTP_ACCEPTED, [], false);
     }
 }

src/Bundle/ChillCalendarBundle/Controller/RemoteCalendarConnectAzureController.php

@@ -44,9 +44,7 @@ class RemoteCalendarConnectAzureController
 
         return $this->clientRegistry
             ->getClient('azure') // key used in config/packages/knpu_oauth2_client.yaml
-            ->redirect([
-                'https://graph.microsoft.com/.default', 'offline_access',
-            ]);
+            ->redirect(['https://graph.microsoft.com/.default', 'offline_access'], []);
     }
 
     /**
@@ -59,7 +57,7 @@ class RemoteCalendarConnectAzureController
 
         try {
             /** @var AccessToken $token */
-            $token = $client->getAccessToken();
+            $token = $client->getAccessToken([]);
 
             $this->MSGraphTokenStorage->setToken($token);
         } catch (IdentityProviderException $e) {

src/Bundle/ChillCalendarBundle/Controller/RemoteCalendarMSGraphSyncController.php

@@ -0,0 +1,54 @@
+<?php
+
+/**
+ * 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.
+ */
+
+declare(strict_types=1);
+
+namespace Chill\CalendarBundle\Controller;
+
+use Chill\CalendarBundle\Messenger\Message\MSGraphChangeNotificationMessage;
+use JsonException;
+use Symfony\Component\HttpFoundation\Request;
+use Symfony\Component\HttpFoundation\Response;
+use Symfony\Component\HttpKernel\Exception\BadRequestHttpException;
+use Symfony\Component\Messenger\MessageBusInterface;
+use Symfony\Component\Routing\Annotation\Route;
+use const JSON_THROW_ON_ERROR;
+
+class RemoteCalendarMSGraphSyncController
+{
+    private MessageBusInterface $messageBus;
+
+    public function __construct(MessageBusInterface $messageBus)
+    {
+        $this->messageBus = $messageBus;
+    }
+
+    /**
+     * @Route("/public/incoming-hook/calendar/msgraph/events/{userId}", name="chill_calendar_remote_msgraph_incoming_webhook_events",
+     * methods={"POST"})
+     */
+    public function webhookCalendarReceiver(int $userId, Request $request): Response
+    {
+        if ($request->query->has('validationToken')) {
+            return new Response($request->query->get('validationToken'), Response::HTTP_OK, [
+                'content-type' => 'text/plain',
+            ]);
+        }
+
+        try {
+            $body = json_decode($request->getContent(), true, 512, JSON_THROW_ON_ERROR);
+        } catch (JsonException $e) {
+            throw new BadRequestHttpException('could not decode json', $e);
+        }
+
+        $this->messageBus->dispatch(new MSGraphChangeNotificationMessage($body, $userId));
+
+        return new Response('', Response::HTTP_ACCEPTED);
+    }
+}