Merge branch 'main' into dependabot/npm_and_yarn/frontend/vue-i18n-11.1.2

Author: MalteSchwitters

backend/src/main/java/org/eventplanner/events/application/usecases/EventUseCase.java

@@ -78,6 +78,8 @@ public class EventUseCase {
         signedInUser.assertHasPermission(Permission.READ_EVENTS);
         var event = this.eventRepository.findByKey(key)
             .filter(evt -> filterForVisibility(signedInUser, evt))
+            .map(eventService::removeInvalidSlotAssignments)
+            .map(evt -> clearConfidentialData(signedInUser, evt))
             .orElseThrow();
         return clearConfidentialData(signedInUser, event);
     }
@@ -114,6 +116,7 @@ public class EventUseCase {
 
         var event = this.eventRepository.findByKey(eventKey).orElseThrow();
         log.info("Updating event {}", event.getName());
+        event = eventService.removeInvalidSlotAssignments(event);
         var previousState = event.getState();
 
         if (signedInUser.hasPermission(Permission.WRITE_EVENT_DETAILS)) {

frontend/package-lock.json

@@ -50,7 +50,7 @@
         "tailwindcss": "^3.4.17",
         "typescript": "^5.7.3",
         "typescript-eslint": "^8.26.0",
-        "vite": "^6.2.0",
+        "vite": "^6.2.1",
         "vite-plugin-pwa": "^0.21.1",
         "vite-svg-loader": "^5.1.0",
         "vue-tsc": "^2.2.4"

frontend/package.json

@@ -11,7 +11,7 @@ import type {
 } from '@/application';
 import { saveBlobToFile, saveStringToFile } from '@/common/utils/DownloadUtils.ts';
 import type { Event, EventKey, EventService, PositionKey, Registration, RegistrationKey, RegistrationService, UserKey } from '@/domain';
-import { EventState, EventType, SlotCriticality } from '@/domain';
+import { EventState, EventType } from '@/domain';
 import type { ResolvedRegistrationSlot } from '@/domain/aggregates/ResolvedRegistrationSlot';
 
 export class EventUseCase {
@@ -205,18 +205,18 @@ export class EventUseCase {
 
     public filterForWaitingList(event: Event, registrations: ResolvedRegistrationSlot[]): ResolvedRegistrationSlot[] {
         if ([EventState.Draft, EventState.OpenForSignup].includes(event.state)) {
-            // crew is not public yet, so all registrations are on the waiting list-admin
+            // crew is not public yet, so all registrations are on the waiting list
             return registrations.filter((it) => it.registration !== undefined);
         }
         return registrations.filter((it) => it.registration !== undefined && it.slot === undefined);
     }
 
     public filterForCrew(event: Event, registrations: ResolvedRegistrationSlot[]): ResolvedRegistrationSlot[] {
         if ([EventState.Draft, EventState.OpenForSignup].includes(event.state)) {
-            // crew is not public yet, so all registrations are on the waiting list-admin
+            // crew is not public yet, so all registrations are on the waiting list
             return [];
         }
-        return registrations.filter((it) => it.slot && (it.registration || it.slot.criticality >= SlotCriticality.Important));
+        return registrations.filter((it) => it.slot !== undefined);
     }
 
     public async leaveEvents(events: Event[]): Promise<void> {

frontend/src/application/usecases/EventUseCase.ts

@@ -110,6 +110,7 @@ export class EventService {
      * @param event
      */
     private optimizeSlots(event: Event): Event {
+        console.log('🏎️ Optimizing slots');
         // this.debugSlots(event);
         for (let i = 0; i < event.slots.length; i++) {
             const slot = event.slots[i];
@@ -229,22 +230,10 @@ export class EventService {
         return event;
     }
 
-    public isSlotFilled(event: Event | null | undefined, slotkey: SlotKey): boolean {
-        if (!event) {
-            return false;
-        }
-        const slot = event.slots.find((it) => it.key === slotkey);
-        return slot !== undefined && slot.assignedRegistrationKey !== undefined;
-    }
-
     public hasOpenRequiredSlots(event: Event, positions?: PositionKey[]): boolean {
         return this.hasOpenSlots(event, positions, SlotCriticality.Required);
     }
 
-    public hasOpenImportantSlots(event: Event, positions?: PositionKey[]): boolean {
-        return this.hasOpenSlots(event, positions, SlotCriticality.Important);
-    }
-
     public hasOpenSlots(event: Event, positions?: PositionKey[], criticality: number = 0): boolean {
         const openSlots = event.slots.filter(
             (it) =>

frontend/src/domain/services/EventService.ts

@@ -202,7 +202,7 @@
                                         </RouterLink>
                                         <span v-else-if="it.name" class="truncate">{{ it.name }}</span>
                                         <span v-else-if="it.user?.key" class="italic text-error"> Unbekannter Nutzer </span>
-                                        <span v-else class="truncate italic text-error">Noch nicht besetzt</span>
+                                        <span v-else class="truncate italic text-error text-opacity-75">Noch nicht besetzt</span>
                                         <span class="flex-grow"></span>
                                         <span :style="{ background: it.position.color }" class="position ml-auto text-xs">
                                             {{ it.position.name }}
@@ -413,9 +413,6 @@ async function fetchTeam(event: Event): Promise<void> {
     const registrations = await eventUseCase.resolveRegistrations(event);
     team.value = eventUseCase.filterForCrew(event, registrations);
     waitingList.value = eventUseCase.filterForWaitingList(event, registrations);
-    // const slots = await usersUseCase.resolveEventSlots(event);
-    // team.value = slots.filter((it) => it.criticality >= 1 || it.userName);
-    // waitingList.value = await usersUseCase.resolveWaitingList(event);
 }
 
 async function choosePositionAndJoinEvent(evt: Event): Promise<void> {