Merge pull request #405 from AOEpeople/feature/#261405-participations…

…-api-events

Feature/#261405 participations api events

src/Mealz/MealBundle/Controller/ApiController.php

@@ -169,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/Service/ApiService.php

@@ -118,8 +118,25 @@ public function isParamValid($parameters, $key, $type): bool
             && $type === gettype($parameters[$key]);
     }
 
-    public function getEventParticipationData(Day $day, Profile $profile): ?array
+    public function getEventParticipationData(Day $day, Profile $profile = null): ?array
     {
         return $this->eventPartSrv->getEventParticipationData($day, $profile);
     }
+
+    public function getEventParticipationInfo(Day $day): ?array
+    {
+        if (null === $day->getEvent()) {
+            return null;
+        }
+
+        return [
+            'name' => $day->getEvent()->getEvent()->getTitle(),
+            'participants' => $this->getEventParticipants($day),
+        ];
+    }
+
+    private function getEventParticipants(Day $day): array
+    {
+        return $this->eventPartSrv->getParticipants($day);
+    }
 }

src/Mealz/MealBundle/Service/EventParticipationService.php

@@ -45,19 +45,24 @@ public function handleEventParticipation(Day $day, int $eventId = null)
         }
     }
 
-    public function getEventParticipationData(Day $day, Profile $profile): ?array
+    public function getEventParticipationData(Day $day, Profile $profile = null): ?array
     {
         $eventParticipation = $day->getEvent();
         if (null === $eventParticipation) {
             return null;
         }
 
-        return [
+        $participationData = [
             'eventId' => $eventParticipation->getEvent()->getId(),
             'participationId' => $eventParticipation->getId(),
             'participations' => count($eventParticipation->getParticipants()),
-            'isParticipating' => null !== $eventParticipation->getParticipant($profile),
         ];
+
+        if (null !== $profile) {
+            $participationData['isParticipating'] = null !== $eventParticipation->getParticipant($profile);
+        }
+
+        return $participationData;
     }
 
     public function join(Profile $profile, Day $day): ?EventParticipation
@@ -87,6 +92,19 @@ public function leave(Profile $profile, Day $day): ?EventParticipation
         return $eventParticipation;
     }
 
+    public function getParticipants(Day $day): array
+    {
+        $eventParticipation = $day->getEvent();
+        if (null === $eventParticipation) {
+            return [];
+        }
+
+        return array_map(
+            fn (Participant $participant) => $participant->getProfile()->getFullName(),
+            $day->getEvent()->getParticipants()->toArray()
+        );
+    }
+
     private function addEventToDay(Day $day, ?Event $event)
     {
         // new eventparticipation

src/Resources/src/components/dashboard/EventData.vue

@@ -26,7 +26,7 @@
       <ParticipationCounter
         class="justify-self-end"
         :limit="0"
-        :mealCSS="new Date(day.date.date) > new Date() ? 'bg-primary-4' : 'bg-[#80909F]'"
+        :mealCSS="!day.isLocked ? 'bg-primary-4' : 'bg-[#80909F]'"
       >
         {{ day.event?.participations }}
       </ParticipationCounter>

src/Resources/src/locales/de.json

@@ -157,7 +157,11 @@
       "503": "Die Anfrage zum Ausgleich ist fehlgeschlagen.",
       "504": "Das Profil für den Ausgleich konnte nicht gefunden werden.",
       "505": "Diese Anfrage zum Ausgleich wurde entweder bereits bearbeitet, oder ist ungültig.",
-      "601": "Der Betrag der dem Konto hinzugefügt werden soll, muss mehr als 0 sein."
+      "601": "Der Betrag der dem Konto hinzugefügt werden soll, muss mehr als 0 sein.",
+      "701": "Es wurden noch nicht alle Details zu dem Event eingefügt",
+      "801": "Keine Berechtigung zum beitreten oder verlassen",
+      "802": "Dem Event konnte nicht beigetreten werden",
+      "803": "Das Event konnte nicht verlassen werden"
     },
     "success": {
       "menu": {

src/Resources/src/locales/en.json

@@ -157,7 +157,11 @@
       "503": "The settlement request failed.",
       "504": "The profile for the settlement request could not be found.",
       "505": "The settlement request has either already been processed or the request is invalid.",
-      "601": "The amount to add to the account must be more than 0."
+      "601": "The amount to add to the account must be more than 0.",
+      "701": "Event creation parameters are missing",
+      "801": "No permission to enter or leave the event",
+      "802": "Couldn't join the event",
+      "803": "Couldn't leave the event"
     },
     "success": {
       "menu": {

src/Resources/src/stores/eventsStore.ts

@@ -153,6 +153,10 @@ export function useEvents() {
         }
     }
 
+    /**
+     * Joins an event on a specific date and emits an {EventParticipationResponse}
+     * @param date The date the event is on (format: 'YYYY-mm-dd hh:MM:ss')
+     */
     async function joinEvent(date: string) {
         const { error, response } = await postJoinEvent(date);
 
@@ -165,6 +169,10 @@ export function useEvents() {
         }
     }
 
+    /**
+     * Leaves an event on a specific date
+     * @param date The date the event is on (format: 'YYYY-mm-dd hh:MM:ss')
+     */
     async function leaveEvent(date: string) {
         const { error, response } = await deleteLeaveEvent(date);
 

src/Resources/src/views/Menu.vue

@@ -66,7 +66,7 @@ const {
 const { CategoriesState, fetchCategories } = useCategories();
 const { t } = useI18n();
 const router = useRouter();
-const { fetchEvents, EventsState } = useEvents();
+const { fetchEvents } = useEvents();
 
 
 const props = withDefaults(defineProps<{