460 import event without organiser (#579)

Co-authored-by: Camille Moussu <cmoussu@linagora.com>

src/components/Calendar/handlers/eventHandlers.ts

@@ -10,7 +10,7 @@ import {
 } from "@/features/Calendars/services";
 import { getEvent } from "@/features/Events/EventApi";
 import { CalendarEvent } from "@/features/Events/EventsTypes";
-import { userAttendee } from "@/features/User/models/attendee";
+import { updateAttendeesAfterTimeChange } from "@/features/Events/updateEventHelpers/updateAttendeesAfterTimeChange";
 import { createAttendee } from "@/features/User/models/attendee.mapper";
 import { getDeltaInMilliseconds } from "@/utils/dateUtils";
 import {
@@ -258,55 +258,3 @@ export const createEventHandlers = (props: EventHandlersProps) => {
     handleEventResize,
   };
 };
-
-export const updateAttendeesAfterTimeChange = (
-  event: CalendarEvent,
-  timeChanged?: boolean,
-  attendees?: userAttendee[]
-): CalendarEvent => {
-  const { attendee, organizer } = event;
-  if (!attendee || !organizer) return event;
-
-  const organizerAddr = organizer.cal_address;
-
-  const markNeedsAction = (att: userAttendee): userAttendee => ({
-    ...att,
-    partstat: "NEEDS-ACTION",
-    rsvp: "TRUE",
-  });
-
-  const getExistingOrDefault = (addr: string, fallback: userAttendee) =>
-    attendee.find((a) => a?.cal_address === addr) ?? fallback;
-
-  if (attendees) {
-    const updatedAttendees = attendees.map((att) => {
-      const existing = getExistingOrDefault(
-        att.cal_address,
-        markNeedsAction(att)
-      );
-      return timeChanged ? markNeedsAction(existing) : existing;
-    });
-
-    const organizerEntry = getExistingOrDefault(organizerAddr, {
-      ...organizer,
-      role: "CHAIR",
-      cutype: "INDIVIDUAL",
-      partstat: "NEEDS-ACTION",
-      rsvp: "TRUE",
-    });
-
-    return {
-      ...event,
-      attendee: [...updatedAttendees, organizerEntry],
-    };
-  }
-  const updatedAttendees = attendee.map((att) => {
-    if (att.cal_address === organizerAddr) return att;
-    return timeChanged ? markNeedsAction(att) : att;
-  });
-
-  return {
-    ...event,
-    attendee: updatedAttendees,
-  };
-};

src/features/Events/EventUpdateModal.tsx

@@ -1,5 +1,5 @@
 import { useAppDispatch, useAppSelector } from "@/app/hooks";
-import { updateAttendeesAfterTimeChange } from "@/components/Calendar/handlers/eventHandlers";
+import { updateAttendeesAfterTimeChange } from "@/features/Events/updateEventHelpers/updateAttendeesAfterTimeChange";
 import { ResponsiveDialog } from "@/components/Dialog";
 import EventFormFields from "@/components/Event/EventFormFields";
 import { addDays } from "@/components/Event/utils/dateRules";

src/features/Events/updateEventHelpers/updateAttendeesAfterTimeChange.ts

@@ -0,0 +1,67 @@
+import { userAttendee } from "@/features/User/models/attendee";
+import { CalendarEvent } from "../EventsTypes";
+
+export const updateAttendeesAfterTimeChange = (
+  event: CalendarEvent,
+  timeChanged?: boolean,
+  attendees?: userAttendee[]
+): CalendarEvent => {
+  const { attendee, organizer } = event;
+  if (!attendee) return event;
+
+  const organizerAddr = organizer?.cal_address;
+
+  const markNeedsAction = (att: userAttendee): userAttendee => ({
+    ...att,
+    partstat: "NEEDS-ACTION",
+    rsvp: "TRUE",
+  });
+
+  const getExistingOrDefault = (addr: string, fallback: userAttendee) =>
+    attendee.find((a) => a?.cal_address === addr) ?? fallback;
+
+  if (attendees) {
+    const updatedAttendees = attendees.map((att) => {
+      const existing = getExistingOrDefault(
+        att.cal_address,
+        markNeedsAction(att)
+      );
+      return timeChanged ? markNeedsAction(existing) : existing;
+    });
+
+    // Only append organizer entry if organizer exists
+    const organizerEntry =
+      organizer && organizerAddr
+        ? getExistingOrDefault(organizerAddr, {
+            ...organizer,
+            role: "CHAIR",
+            cutype: "INDIVIDUAL",
+            partstat: "NEEDS-ACTION",
+            rsvp: "TRUE",
+          })
+        : null;
+
+    const deduped = organizerEntry
+      ? updatedAttendees.filter(
+          (attendee) => attendee.cal_address !== organizerAddr
+        )
+      : updatedAttendees;
+
+    return {
+      ...event,
+      attendee: organizerEntry
+        ? [...deduped, organizerEntry]
+        : updatedAttendees,
+    };
+  }
+
+  const updatedAttendees = attendee.map((att) => {
+    if (organizerAddr && att.cal_address === organizerAddr) return att;
+    return timeChanged ? markNeedsAction(att) : att;
+  });
+
+  return {
+    ...event,
+    attendee: updatedAttendees,
+  };
+};