Feature/#261412 event booking

config/packages/mercure.yaml

@@ -10,4 +10,5 @@ mercure:
                     - participation-updates
                     - meal-offer-updates
                     - slot-allocation-updates
+                    - event-participation-updates
                     - keep-alive-connection

src/Mealz/MealBundle/Controller/EventController.php

@@ -4,11 +4,12 @@
 
 namespace App\Mealz\MealBundle\Controller;
 
-use App\Mealz\MealBundle\Entity\Day;
 use App\Mealz\MealBundle\Entity\Event;
 use App\Mealz\MealBundle\Event\EventParticipationUpdateEvent;
+use App\Mealz\MealBundle\Repository\DayRepositoryInterface;
 use App\Mealz\MealBundle\Repository\EventRepositoryInterface;
 use App\Mealz\MealBundle\Service\EventParticipationService;
+use DateTime;
 use Doctrine\ORM\EntityManagerInterface;
 use Exception;
 use Sensio\Bundle\FrameworkExtraBundle\Configuration\Security;
@@ -17,21 +18,24 @@
 use Symfony\Component\HttpFoundation\Request;
 
 /**
- * @Security("is_granted('ROLE_KITCHEN_STAFF')")
+ * @Security("is_granted('ROLE_USER')")
  */
 class EventController extends BaseListController
 {
+    private DayRepositoryInterface $dayRepo;
     private EntityManagerInterface $em;
     private EventRepositoryInterface $eventRepo;
     private EventDispatcherInterface $eventDispatcher;
     private EventParticipationService $eventPartSrv;
 
     public function __construct(
+        DayRepositoryInterface $dayRepoInterface,
         EntityManagerInterface $entityManager,
         EventRepositoryInterface $eventRepository,
         EventDispatcherInterface $eventDispatcher,
         EventParticipationService $eventPartSrv
     ) {
+        $this->dayRepo = $dayRepoInterface;
         $this->em = $entityManager;
         $this->eventRepo = $eventRepository;
         $this->eventDispatcher = $eventDispatcher;
@@ -45,6 +49,9 @@ public function getEventList(): JsonResponse
         return new JsonResponse($events, 200);
     }
 
+    /**
+     * @Security("is_granted('ROLE_KITCHEN_STAFF')")
+     */
     public function new(Request $request): JsonResponse
     {
         $parameters = json_decode($request->getContent(), true);
@@ -59,6 +66,9 @@ public function new(Request $request): JsonResponse
         return new JsonResponse(null, 200);
     }
 
+    /**
+     * @Security("is_granted('ROLE_KITCHEN_STAFF')")
+     */
     public function update(Request $request, Event $event): JsonResponse
     {
         try {
@@ -83,6 +93,9 @@ public function update(Request $request, Event $event): JsonResponse
         }
     }
 
+    /**
+     * @Security("is_granted('ROLE_KITCHEN_STAFF')")
+     */
     public function delete(Event $event): JsonResponse
     {
         try {
@@ -99,37 +112,41 @@ public function delete(Event $event): JsonResponse
         }
     }
 
-    public function join(Day $day): JsonResponse
+    public function join(DateTime $date): JsonResponse
     {
         $profile = $this->getProfile();
         if (null === $profile) {
-            return new JsonResponse(['messasge' => '801: User is not allowed to join'], 403);
+            return new JsonResponse(['message' => '801: User is not allowed to join'], 403);
         }
 
+        $day = $this->dayRepo->getDayByDate($date);
+
         $eventParticipation = $this->eventPartSrv->join($profile, $day);
         if (null === $eventParticipation) {
-            return new JsonResponse(['messasge' => '802: User could not join the event'], 500);
+            return new JsonResponse(['message' => '802: User could not join the event'], 500);
         }
 
         $this->eventDispatcher->dispatch(new EventParticipationUpdateEvent($eventParticipation));
 
-        return new JsonResponse(['isParticipating' => true], 200);
+        return new JsonResponse($this->eventPartSrv->getEventParticipationData($day, $profile), 200);
     }
 
-    public function leave(Day $day): JsonResponse
+    public function leave(DateTime $date): JsonResponse
     {
         $profile = $this->getProfile();
         if (null === $profile) {
-            return new JsonResponse(['messasge' => '801: User is not allowed to leave'], 403);
+            return new JsonResponse(['message' => '801: User is not allowed to leave'], 403);
         }
 
+        $day = $this->dayRepo->getDayByDate($date);
+
         $eventParticipation = $this->eventPartSrv->leave($profile, $day);
         if (null === $eventParticipation) {
-            return new JsonResponse(['messasge' => '802: User could not leave the event'], 500);
+            return new JsonResponse(['message' => '802: User could not leave the event'], 500);
         }
 
         $this->eventDispatcher->dispatch(new EventParticipationUpdateEvent($eventParticipation));
 
-        return new JsonResponse(['isParticipating' => false], 200);
+        return new JsonResponse($this->eventPartSrv->getEventParticipationData($day, $profile), 200);
     }
 }

src/Mealz/MealBundle/Entity/EventParticipation.php

@@ -96,14 +96,4 @@ public function getParticipants(): ArrayCollection
 
         return new ArrayCollection($this->participants->toArray());
     }
-
-    public function addParticipant(Participant $participant): void
-    {
-        $this->participants->add($participant);
-    }
-
-    public function removeParticipant(Participant $participant): bool
-    {
-        return $this->participants->removeElement($participant);
-    }
 }

src/Mealz/MealBundle/Event/Subscriber/EventParticipationUpdateSubscriber.php

@@ -11,7 +11,7 @@
 
 class EventParticipationUpdateSubscriber implements EventSubscriberInterface
 {
-    private const PUBLISH_TOPIC = 'event-participation-update';
+    private const PUBLISH_TOPIC = 'event-participation-updates';
     private const PUBLISH_MSG_TYPE = 'eventParticipationUpdate';
 
     private PublisherInterface $publisher;
@@ -28,11 +28,11 @@ public function __construct(
     public static function getSubscribedEvents(): array
     {
         return [
-            EventParticipationUpdateEvent::class => 'onUpdate',
+            EventParticipationUpdateEvent::class => 'onEventParticipationUpdate',
         ];
     }
 
-    public function onUpdate(EventParticipationUpdateEvent $event): void
+    public function onEventParticipationUpdate(EventParticipationUpdateEvent $event): void
     {
         $eventParticipation = $event->getEventParticipation();
 

src/Mealz/MealBundle/EventListener/ParticipantPersistenceListener.php

@@ -5,27 +5,30 @@
 use App\Mealz\MealBundle\Entity\Participant;
 use Doctrine\ORM\AbstractQuery;
 use Doctrine\ORM\EntityManager;
-use Doctrine\ORM\Event\LifecycleEventArgs;
+use Doctrine\ORM\Event\PrePersistEventArgs;
+use Doctrine\ORM\Event\PreUpdateEventArgs;
+use Doctrine\ORM\Query;
+use Doctrine\ORM\QueryBuilder;
 
 /**
  * listener that ensures that there won't be duplicate entries for the same participant in the database.
  */
 class ParticipantPersistenceListener
 {
-    public function prePersist(LifecycleEventArgs $args): void
+    public function prePersist(PrePersistEventArgs $args): void
     {
-        $entity = $args->getEntity();
-        $entityManager = $args->getEntityManager();
+        $entity = $args->getObject();
+        $entityManager = $args->getObjectManager();
 
         if ($entity instanceof Participant) {
             $this->checkUniqueParticipant($entity, $entityManager);
         }
     }
 
-    public function preUpdate(LifecycleEventArgs $args): void
+    public function preUpdate(PreUpdateEventArgs $args): void
     {
-        $entity = $args->getEntity();
-        $entityManager = $args->getEntityManager();
+        $entity = $args->getObject();
+        $entityManager = $args->getObjectManager();
 
         if ($entity instanceof Participant) {
             $this->checkUniqueParticipant($entity, $entityManager);
@@ -43,6 +46,19 @@ private function participantExists(Participant $participant, EntityManager $enti
     {
         $queryBuilder = $entityManager->createQueryBuilder();
 
+        if (null !== $participant->getMeal()) {
+            $query = $this->buildQueryMealParticipantExists($participant, $queryBuilder);
+        } elseif (null !== $participant->getEvent()) {
+            $query = $this->buildQueryEventParticipantExists($participant, $queryBuilder);
+        } else {
+            return false;
+        }
+
+        return $query->execute(null, AbstractQuery::HYDRATE_SINGLE_SCALAR) > 0;
+    }
+
+    private function buildQueryMealParticipantExists(Participant $participant, QueryBuilder $queryBuilder): Query
+    {
         $queryBuilder
             ->select('COUNT(p.id)')
             ->from('MealzMealBundle:Participant', 'p')
@@ -58,8 +74,30 @@ private function participantExists(Participant $participant, EntityManager $enti
         $query = $queryBuilder->getQuery();
         $query->setParameter('meal', $participant->getMeal()->getId());
         $query->setParameter('profile', $participant->getProfile()->getUsername());
-        $query->useResultCache(false);
+        $query->disableResultCache();
 
-        return $query->execute(null, AbstractQuery::HYDRATE_SINGLE_SCALAR) > 0;
+        return $query;
+    }
+
+    private function buildQueryEventParticipantExists(Participant $participant, QueryBuilder $queryBuilder): Query
+    {
+        $queryBuilder
+            ->select('COUNT(p.id)')
+            ->from('MealzMealBundle:Participant', 'p')
+            ->join('p.event', 'e')
+            ->join('p.profile', 'u')
+            ->where('e = :event AND u = :profile')
+        ;
+        if ($participant->getId()) {
+            $queryBuilder->andWhere('p.id != :id');
+            $queryBuilder->setParameter('id', $participant->getId());
+        }
+
+        $query = $queryBuilder->getQuery();
+        $query->setParameter('event', $participant->getEvent()->getId());
+        $query->setParameter('profile', $participant->getProfile()->getUsername());
+        $query->disableResultCache();
+
+        return $query;
     }
 }

src/Mealz/MealBundle/Resources/config/routing.yml

@@ -188,12 +188,12 @@ MealzMealBundle_api_events_delete:
   methods: [ DELETE ]
 
 MealzMealBundle_api_events_join:
-  path: /api/events/participation
+  path: /api/events/participation/{date}
   defaults: { _controller: App\Mealz\MealBundle\Controller\EventController::join }
   methods: [ POST ]
 
 MealzMealBundle_api_events_leave:
-  path: /api/events/participation
+  path: /api/events/participation/{date}
   defaults: { _controller: App\Mealz\MealBundle\Controller\EventController::leave }
   methods: [ DELETE ]
 

src/Mealz/MealBundle/Service/EventParticipationService.php

@@ -54,6 +54,7 @@ public function getEventParticipationData(Day $day, Profile $profile): ?array
 
         return [
             'eventId' => $eventParticipation->getEvent()->getId(),
+            'participationId' => $eventParticipation->getId(),
             'participations' => count($eventParticipation->getParticipants()),
             'isParticipating' => null !== $eventParticipation->getParticipant($profile),
         ];
@@ -68,8 +69,6 @@ public function join(Profile $profile, Day $day): ?EventParticipation
                 $this->em->persist($participation);
                 $this->em->flush();
 
-                $eventParticipation->addParticipant($participation);
-
                 return $eventParticipation;
             }
         }
@@ -82,7 +81,6 @@ public function leave(Profile $profile, Day $day): ?EventParticipation
         $eventParticipation = $day->getEvent();
         $participation = $eventParticipation->getParticipant($profile);
 
-        $eventParticipation->removeParticipant($participation);
         $this->em->remove($participation);
         $this->em->flush();
 

src/Mealz/MealBundle/Tests/Controller/AbstractControllerTestCase.php

@@ -5,6 +5,9 @@
 namespace App\Mealz\MealBundle\Tests\Controller;
 
 use App\Mealz\AccountingBundle\Entity\Transaction;
+use App\Mealz\MealBundle\Entity\Day;
+use App\Mealz\MealBundle\Entity\Event;
+use App\Mealz\MealBundle\Entity\EventParticipation;
 use App\Mealz\MealBundle\Entity\Meal;
 use App\Mealz\MealBundle\Entity\Participant;
 use App\Mealz\MealBundle\Repository\MealRepositoryInterface;
@@ -155,6 +158,15 @@ protected function createParticipant(Profile $profile, Meal $meal): Participant
         return $participant;
     }
 
+    protected function createEventParticipation(Day $day, Event $event): EventParticipation
+    {
+        $eventParticipation = new EventParticipation($day, $event);
+        $day->setEvent($eventParticipation);
+        $this->persistAndFlushAll([$eventParticipation, $day]);
+
+        return $eventParticipation;
+    }
+
     /**
      * Helper method to get the recent meal.
      */