Feature/#260047 event participation

.gitignore

@@ -47,3 +47,5 @@ tests/e2e/cypress/videos/
 tests/e2e/cypress/screenshots/
 test_ci_cypress.sh
 tests/e2e/cypress/e2e/FillDBWithStuff.cy.ts
+tests/e2e/cypress/downloads/result.pdf
+src/Resources/style/output.css.map

Dockerfile

@@ -67,6 +67,8 @@ RUN \
     && find public -type f -not -name "*.php" -exec chmod 644 '{}' \+
 
 RUN echo "* * * * * /var/www/meals/bin/console meals:keep-alive-connection > /dev/stdout" >> /etc/crontabs/www-data
+RUN chmod +x "/container/entrypoint"
+RUN chmod +x "/container/scripts/wait-for"
 
 ENTRYPOINT ["/container/entrypoint"]
 

README.md

@@ -122,12 +122,21 @@ Point your web browser to https://meals.test  :tada:
 
 :memo:  Don't forget to add `127.0.0.1 meals.test` to your local hosts file if not done automatically via ddev.
 
-To run End-to-End testing via cypress run te following command:
+To run End-to-End testing via cypress run the following command:
 ```
 make run-cypress
 ```
 You need to start the devbox before running any tests with cypress.
 
+## Component testing
+
+To run specific component tests with JEST in isolation:
+```
+ddev exec yarn --cwd=src/Resources test -- -t "<test-filename> <testname>"
+```
+`<test-filename>` for a file with the name `xyz.spec.ts` would be `xyz`
+`<testname>` is optional, if no testname is specified the whole file is run
+
 ## Troubleshooting
 
 ### SQLSTATE[42S22]: Column not found: 1054 Unknown column
@@ -186,3 +195,13 @@ IDP_CLIENT_SECRET=client-secret
   * 505: The settlement request was already processed or the request is invalid
 *CashController 6xx*
   * 601: The amount of cash that will be added, has to be more than zero
+*EventController 7xx*
+  * 701: Event creation parameters are missing
+*EventParticipationController 8xx*
+  * 801: User has no permission to enter or leave
+  * 802: User could not join the event
+  * 803: User could not leave the event
+*MealGuestController 9xx*
+  * 901: Could not find the Invitation for the given hash
+  * 902: Parameters were not provided (eg. firstname and lastname)
+  * 903: An unknown error occured on joining the event as a guest

config/packages/mercure.yaml

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

config/packages/security.yaml

@@ -80,9 +80,9 @@ security:
         - { path: ^/api/guest-invitation, roles: [IS_AUTHENTICATED_ANONYMOUSLY] }
         - { path: ^/api/environmentals, roles: [IS_AUTHENTICATED_ANONYMOUSLY] }
         - { path: ^/api/user, roles: [IS_AUTHENTICATED_ANONYMOUSLY] }
+        - { path: ^/api/event/invitation/\S*, roles: [IS_AUTHENTICATED_ANONYMOUSLY] }
         - { path: '^/participation/slots-status/\d{4}-\d{2}-\d{2}$', roles: [IS_AUTHENTICATED_ANONYMOUSLY] }
         - { path: '^/participation/count-status/\d{4}-\d{2}-\d{2}$', roles: [IS_AUTHENTICATED_ANONYMOUSLY] }
-        - { path: ^/language-switch, roles: [IS_AUTHENTICATED_ANONYMOUSLY] }
         - { path: ^/css, roles: [IS_AUTHENTICATED_ANONYMOUSLY] }
         - { path: ^/js, roles: [IS_AUTHENTICATED_ANONYMOUSLY] }
         - { path: ^/images, roles: [IS_AUTHENTICATED_ANONYMOUSLY] }

config/services.yaml

@@ -47,11 +47,10 @@ parameters:
     app.secret: '%env(APP_SECRET)%'
 
     mealz.lock_toggle_participation_at: '-1 day 16:00'
-    mealz.meal.price: 3.60
+    mealz.meal.price: 4.13
     mealz.meal.search_timestamp: '2000-01-01'
     mealz.meal.new_flag_counter: 2
-    mealz.meal.combined.price: 5.60
-
+    mealz.meal.combined.price: 6.13
     # PDO Session Handler options
     # Define table and column names to store session data
     app.session.handler.pdo.options:
@@ -294,4 +293,4 @@ services:
 
     # Interface implementations
     App\Mealz\UserBundle\Repository\ProfileRepositoryInterface: '@App\Mealz\UserBundle\Repository\ProfileRepository'
-    App\Mealz\UserBundle\Repository\RoleRepositoryInterface: '@App\Mealz\UserBundle\Repository\RoleRepository'
+    App\Mealz\UserBundle\Repository\RoleRepositoryInterface: '@App\Mealz\UserBundle\Repository\RoleRepository'

psalm.baseline.xml

@@ -153,8 +153,7 @@
     </UndefinedClass>
   </file>
   <file src="src/Mealz/MealBundle/Service/Doorman.php">
-    <UndefinedInterfaceMethod occurrences="2">
-      <code>getProfile</code>
+    <UndefinedInterfaceMethod occurrences="3">
       <code>getProfile</code>
     </UndefinedInterfaceMethod>
   </file>

src/Mealz/MealBundle/Controller/ApiController.php

@@ -80,7 +80,7 @@ public function getDashboardData(ParticipationCountService $partCountSrv): JsonR
                 'days' => [],
                 'isEnabled' => $week->isEnabled(),
             ];
-            /* @var Day $day */
+            /** @var Day $day */
             foreach ($week->getDays() as $day) {
                 $participationsPerDay = $partCountSrv->getParticipationByDay($day);
 
@@ -102,6 +102,7 @@ public function getDashboardData(ParticipationCountService $partCountSrv): JsonR
                     'slots' => [],
                     'meals' => [],
                     'isEnabled' => $day->isEnabled(),
+                    'event' => $this->apiSrv->getEventParticipationData($day, $profile),
                 ];
 
                 $this->addSlots($response[$week->getId()]['days'][$day->getId()]['slots'], $slots, $day, $activeParticipations);
@@ -168,6 +169,8 @@ public function list(): JSONResponse
             $list['meals'] = $list['meals'] + $this->getDishData($meal);
         }
 
+        $list['event'] = $this->apiSrv->getEventParticipationInfo($day);
+
         $list['day'] = $day->getDateTime();
 
         return new JsonResponse($list, 200);

src/Mealz/MealBundle/Controller/EventController.php

@@ -0,0 +1,163 @@
+<?php
+
+declare(strict_types=1);
+
+namespace App\Mealz\MealBundle\Controller;
+
+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;
+use Symfony\Component\EventDispatcher\EventDispatcherInterface;
+use Symfony\Component\HttpFoundation\JsonResponse;
+use Symfony\Component\HttpFoundation\Request;
+
+/**
+ * @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;
+        $this->eventPartSrv = $eventPartSrv;
+    }
+
+    public function getEventList(): JsonResponse
+    {
+        $events = $this->eventRepo->findBy(['deleted' => 0]);
+
+        return new JsonResponse($events, 200);
+    }
+
+    /**
+     * @Security("is_granted('ROLE_KITCHEN_STAFF')")
+     */
+    public function new(Request $request): JsonResponse
+    {
+        $parameters = json_decode($request->getContent(), true);
+        if (false === isset($parameters['title']) || false === isset($parameters['public'])) {
+            return new JsonResponse(['message' => '701: Event creation parameters are not set'], 500);
+        }
+
+        $event = new Event($parameters['title'], $parameters['public']);
+        $this->em->persist($event);
+        $this->em->flush();
+
+        return new JsonResponse(null, 200);
+    }
+
+    /**
+     * @Security("is_granted('ROLE_KITCHEN_STAFF')")
+     */
+    public function update(Request $request, Event $event): JsonResponse
+    {
+        try {
+            $parameters = json_decode($request->getContent(), true);
+
+            if (true === isset($parameters['title'])) {
+                $event->setTitle($parameters['title']);
+            }
+
+            if (true === isset($parameters['public'])) {
+                $event->setPublic($parameters['public']);
+            }
+
+            $this->em->persist($event);
+            $this->em->flush();
+
+            return new JsonResponse($event, 200);
+        } catch (Exception $e) {
+            $this->logException($e);
+
+            return new JsonResponse(['message' => $e->getMessage(), 500]);
+        }
+    }
+
+    /**
+     * @Security("is_granted('ROLE_KITCHEN_STAFF')")
+     */
+    public function delete(Event $event): JsonResponse
+    {
+        try {
+            $event->setDeleted(true);
+
+            $this->em->persist($event);
+            $this->em->flush();
+
+            return new JsonResponse(null, 200);
+        } catch (Exception $e) {
+            $this->logException($e);
+
+            return new JsonResponse(['message' => $e->getMessage(), 500]);
+        }
+    }
+
+    public function join(DateTime $date): JsonResponse
+    {
+        $profile = $this->getProfile();
+        if (null === $profile) {
+            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(['message' => '802: User could not join the event'], 500);
+        }
+
+        $this->eventDispatcher->dispatch(new EventParticipationUpdateEvent($eventParticipation));
+
+        return new JsonResponse($this->eventPartSrv->getEventParticipationData($day, $profile), 200);
+    }
+
+    public function leave(DateTime $date): JsonResponse
+    {
+        $profile = $this->getProfile();
+        if (null === $profile) {
+            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(['message' => '802: User could not leave the event'], 500);
+        }
+
+        $this->eventDispatcher->dispatch(new EventParticipationUpdateEvent($eventParticipation));
+
+        return new JsonResponse($this->eventPartSrv->getEventParticipationData($day, $profile), 200);
+    }
+
+    public function getEventParticipants(DateTime $date): JsonResponse
+    {
+        $day = $this->dayRepo->getDayByDate($date);
+
+        if (null === $day) {
+            return new JsonResponse(['message' => 'Could not find day'], 404);
+        }
+
+        return new JsonResponse($this->eventPartSrv->getParticipants($day), 200);
+    }
+}

src/Mealz/MealBundle/Controller/MealAdminController.php

@@ -13,6 +13,7 @@
 use App\Mealz\MealBundle\Repository\WeekRepositoryInterface;
 use App\Mealz\MealBundle\Service\DayService;
 use App\Mealz\MealBundle\Service\DishService;
+use App\Mealz\MealBundle\Service\EventParticipationService;
 use App\Mealz\MealBundle\Service\WeekService;
 use DateTime;
 use DateTimeZone;
@@ -35,6 +36,7 @@ class MealAdminController extends BaseController
     private DayRepositoryInterface $dayRepository;
     private DayService $dayService;
     private DishService $dishService;
+    private EventParticipationService $eventService;
     private EntityManagerInterface $em;
 
     public function __construct(
@@ -45,6 +47,7 @@ public function __construct(
         DayRepositoryInterface $dayRepository,
         DayService $dayService,
         DishService $dishService,
+        EventParticipationService $eventService,
         EntityManagerInterface $em
     ) {
         $this->eventDispatcher = $eventDispatcher;
@@ -54,6 +57,7 @@ public function __construct(
         $this->dayRepository = $dayRepository;
         $this->dayService = $dayService;
         $this->dishService = $dishService;
+        $this->eventService = $eventService;
         $this->em = $em;
     }
 
@@ -113,7 +117,7 @@ public function new(DateTime $date, Request $request): JsonResponse
                 $this->handleNewDay($dayData, $weekDays[$dayIndex++]);
             }
         } catch (Exception $e) {
-            return new JsonResponse(['message' => $e->getMessage()], 500);
+            return new JsonResponse(['message' => 'NoErrorNumber: ' . $e->getMessage()], 500);
         }
 
         $this->em->persist($week);
@@ -213,6 +217,7 @@ private function handleDay(array $day)
         }
 
         $this->setLockParticipationForDay($dayEntity, $day);
+        $this->eventService->handleEventParticipation($dayEntity, $day['event']);
 
         $mealCollection = $day['meals'];
         /*
@@ -244,6 +249,7 @@ private function handleNewDay($dayData, Day $day)
         }
 
         $this->setLockParticipationForDay($day, $dayData);
+        $this->eventService->handleEventParticipation($day, $dayData['event']);
 
         $mealCollection = $dayData['meals'];
         // max 2 main meals allowed