updated fixture and tried to adjust the files to the new EventPartici…

…pation Dictionary

src/Resources/src/components/dashboard/Day.vue

@@ -131,7 +131,7 @@ const props = defineProps<{
 const day = props.guestData ? props.guestData : dashboardStore.getDay(props.weekID, props.dayID);
 const weekday = computed(() => translateWeekday(day.date, locale));
 const emptyDay = Object.keys(day.meals).length === 0;
-const isEventDay = day.event !== null;
+const isEventDay = day.events.EventParticipation !== null;
 const date = computed(() => {
   if (day === null || day === undefined) {
     return '';

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

@@ -17,30 +17,30 @@
       <span
         class="inline-block grow self-start break-words text-[12px] font-bold leading-[20px] tracking-[0.5px] text-primary-1 max-[380px]:basis-9/12 min-[380px]:self-center min-[380px]:text-note"
       >
-        {{ getEventById(day.event.eventId)?.title }}
+        {{ getEventById(day.events.EventParticipation.eventId)?.title }}
       </span>
       <div class="flex w-fit flex-row items-center gap-1 self-end justify-self-end max-[380px]:basis-3/12">
         <GuestButton
-          v-if="!day.isLocked && day.event.isPublic"
+          v-if="!day.isLocked && day.events.isPublic"
           :dayID="dayId"
           :index="0"
           :invitation="Invitation.EVENT"
           :icon-white="false"
           class="col-start-1 w-[24px] text-center"
         />
         <EventPopup
-          :event-title="getEventById(day.event.eventId)?.title"
+          :event-title="getEventById(day.events.EventParticipation.eventId)?.title"
           :date="day.date.date"
         />
         <ParticipationCounter
           :limit="0"
           :mealCSS="!day.isLocked ? 'bg-primary-4' : 'bg-[#80909F]'"
         >
-          {{ day.event?.participations }}
+          {{ day.events.EventParticipation?.participations }}
         </ParticipationCounter>
         <CheckBox
           :isActive="new Date(day.date.date) > new Date()"
-          :isChecked="day.event?.isParticipating ?? false"
+          :isChecked="day.events.EventParticipation?.isParticipating ?? false"
           @click="handleClick"
         />
       </div>
@@ -76,7 +76,7 @@ async function handleClick() {
     return;
   }
   addLock(props.dayId);
-  if (props.day.event?.isParticipating === false) {
+  if (props.day.events.EventParticipation?.isParticipating === false) {
     await joinEvent(props.day.date.date);
   } else {
     await leaveEvent(props.day.date.date);

src/Resources/src/components/menu/MenuDay.vue

@@ -70,7 +70,7 @@
 import MenuInput from '@/components/menu/MenuInput.vue';
 import { Ref, computed, onMounted, ref, watch } from 'vue';
 import { Dish } from '@/stores/dishesStore';
-import { MealDTO, DayDTO } from '@/interfaces/DayDTO';
+import { MealDTO, DayDTO, EventDTO } from '@/interfaces/DayDTO';
 import { useDishes } from '@/stores/dishesStore';
 import { translateWeekdayWithoutRef } from '@/tools/localeHelper';
 import { useI18n } from 'vue-i18n';
@@ -168,17 +168,17 @@ watch(selectedDishTwo, () => {
 
 watch(selectedEventOne, () => {
   if (selectedEventOne.value !== null && selectedEventOne.value !== undefined) {
-    props.modelValue.event = selectedEventOne.value.id;
+    props.modelValue.events = selectedEventOne.value.id;
   } else {
     props.modelValue.event = null;
   }
 });
 
 watch(selectedEventTwo, () => {
   if (selectedEventTwo.value !== null && selectedEventTwo.value !== undefined) {
-    props.modelValue.event = selectedEventTwo.value.id;
+    props.modelValue.eventId = selectedEventTwo.value.id;
   } else {
-    props.modelValue.event = null;
+    props.modelValue.eventId = null;
   }
 });
 
@@ -192,9 +192,9 @@ onMounted(() => {
   );
 
   // set Event from modelValue to be the initial value of the selectedEvent
-  selectedEventOne.value = getEventById(props.modelValue.event);
+  selectedEventOne.value = getEventById(props.modelValue.eventId);
   // set Event from modelValue to be the initial value of the selectedEvent
-  selectedEventTwo.value = getEventById(props.modelValue.event);
+  selectedEventTwo.value = getEventById(props.EventDTO.eventId);
 });
 
 

src/Resources/src/interfaces/DayDTO.ts

@@ -12,7 +12,7 @@ export interface DayDTO {
     meals: Dictionary<MealDTO[]>;
     enabled: boolean;
     id: number;
-    event: number | null;
+    events: Dictionary<EventDTO[]>;
     date: DateTime;
     lockDate: DateTime;
 }
@@ -22,3 +22,8 @@ export interface MealDTO {
     mealId: number | null;
     participationLimit: number;
 }
+
+export interface EventDTO {
+    eventSlug: string | null;
+    eventId: number | null;
+}

src/Resources/src/stores/dashboardStore.ts

@@ -49,9 +49,9 @@ class DashboardStore extends Store<Dashboard> {
         for (const week of Object.values(this.state.weeks)) {
             for (const day of Object.values(week.days)) {
                 if (
-                    day.event !== null &&
-                    day.event !== undefined &&
-                    day.event.participationId === eventParticipationId
+                    day.events.EventParticipation.eventId !== null &&
+                    day.events.EventParticipation.eventId !== undefined &&
+                    day.events.EventParticipation.eventId === eventParticipationId
                 ) {
                     return day;
                 }
@@ -136,15 +136,15 @@ class DashboardStore extends Store<Dashboard> {
 
     public updateEventParticipation(weekId: number, dayId: number, eventId: number, participations: number) {
         const day = this.getDay(weekId, dayId);
-        if (day !== null && day !== undefined && day.event !== null && day.event.eventId === eventId) {
-            day.event.participations = participations;
+        if (day !== null && day !== undefined && day.events.Dictionary !== null && day.events.Dictionary.eventId === eventId) {
+            day.events.EventParticipation.participations = participations;
         }
     }
 
     public setIsParticipatingEvent(participationId: number, isParticipating: boolean) {
         const day = this.getDayByEventParticipationId(participationId);
         if (day !== undefined) {
-            day.event.isParticipating = isParticipating;
+            day.events.EventParticipation.isParticipating = isParticipating;
         }
     }
 

src/Resources/tests/unit/fixtures/getEvents.json

@@ -7,6 +7,12 @@
   },
   {
     "id": 48,
+    "title": "Lunch Roulette",
+    "slug": "lunch-roulette",
+    "public": true
+  },
+  {
+    "id": 49,
     "title": "Alumni Afterwork",
     "slug": "alumni-afterwork",
     "public": true

src/Resources/tests/unit/stores/dashboardStore.spec.ts

@@ -93,10 +93,10 @@ describe('Test dashboardStore', () => {
         const weekId = 7218;
         const dayId = 36088;
         const eventId = 537;
-        expect(dashboardStore.getDay(weekId, dayId).event.participations).toEqual(0);
-        expect(dashboardStore.getDay(weekId, dayId).event.eventId).toEqual(eventId);
+        expect(dashboardStore.getDay(weekId, dayId).events.participations).toEqual(0);
+        expect(dashboardStore.getDay(weekId, dayId).events.eventId).toEqual(eventId);
         const participations = 17;
         dashboardStore.updateEventParticipation(weekId, dayId, eventId, participations);
-        expect(dashboardStore.getDay(weekId, dayId).event.participations).toEqual(participations);
+        expect(dashboardStore.getDay(weekId, dayId).events.participations).toEqual(participations);
     });
 });