@dv4resi/dvss-backend-module-calendar-im 0.0.10 → 0.0.11

package/dist/index.d.ts

@@ -1835,6 +1835,8 @@ interface IBookingEventInstance {
     startDateLabel: string;
     seriesId?: string;
     iCalUId?: string;
+    uid?: string;
+    instanceKind?: EVENT_INSTANCE_KIND;
     transactionId?: string;
     subject?: string;
 }
@@ -2423,6 +2425,7 @@ interface IMicrosoftGraphEvent {
     seriesMasterId?: string;
     transactionId?: string;
     iCalUId?: string;
+    uid?: string;
     recurrence?: IMicrosoftGraphRecurrence;
     attendees?: IMicrosoftGraphAttendee[];
     organizer?: {
@@ -2565,6 +2568,7 @@ declare class MicrosoftCalendarBookingService extends BaseCalendarBookingManagem
     private deleteGraphEvent;
     private resolveSkipDatesIfAny;
     private findOccurrenceInstanceId;
+    private listAllEvents;
     private pickMailbox;
     private organizerUserMailbox;
     private assertMailbox;

package/dist/index.js

@@ -4050,11 +4050,43 @@ function graphEventsToInstances(response) {
     startDateLabel: graph.start.dateTime.slice(0, 10),
     seriesId: graph.seriesMasterId,
     iCalUId: graph.iCalUId,
+    uid: graph.uid,
+    instanceKind: graph.type ? GRAPH_TYPE_TO_INSTANCE_KIND[graph.type] : void 0,
     transactionId: graph.transactionId,
     subject: graph.subject
   }));
 }
 __name(graphEventsToInstances, "graphEventsToInstances");
+function toGraphWindowDateTime(dateLabel, timeLabel, timeZone) {
+  const local = `${dateLabel}T${timeLabel}`;
+  const offset = timeZone ? timeZoneOffset(local, timeZone) : void 0;
+  return offset ? `${local}${offset}` : local;
+}
+__name(toGraphWindowDateTime, "toGraphWindowDateTime");
+function timeZoneOffset(local, timeZone) {
+  try {
+    const zoneName = new Intl.DateTimeFormat("en-US", {
+      timeZone,
+      timeZoneName: "longOffset"
+    }).formatToParts(/* @__PURE__ */ new Date(`${local}Z`)).find((part) => part.type === "timeZoneName")?.value;
+    const match = zoneName ? /^GMT(?<offset>[+-]\d{2}:\d{2})?$/.exec(zoneName) : void 0;
+    if (!match) {
+      return void 0;
+    }
+    return match.groups?.offset ?? "+00:00";
+  } catch {
+    return void 0;
+  }
+}
+__name(timeZoneOffset, "timeZoneOffset");
+function toGraphRelativeUrl(link) {
+  if (!link) {
+    return void 0;
+  }
+  const parsed = new URL(link);
+  return `${parsed.pathname.replace(/^\/(?:v1\.0|beta)(?=\/)/, "")}${parsed.search}`;
+}
+__name(toGraphRelativeUrl, "toGraphRelativeUrl");
 function toGraphDateTime(dateLabel, timeLabel, isFullDay) {
   if (isFullDay || !timeLabel) {
     return `${dateLabel}T00:00:00`;
@@ -4084,6 +4116,10 @@ function _ts_metadata23(k, v) {
 }
 __name(_ts_metadata23, "_ts_metadata");
 var GRAPH_BATCH_MAX_SIZE = 20;
+var GRAPH_LIST_PAGE_SIZE = 100;
+var GRAPH_LIST_MAX_PAGES = 50;
+var WINDOW_START_TIME = "00:00:00";
+var WINDOW_END_TIME = "23:59:59";
 exports.MicrosoftCalendarBookingService = class MicrosoftCalendarBookingService extends BaseCalendarBookingManagement {
   static {
     __name(this, "MicrosoftCalendarBookingService");
@@ -4112,7 +4148,7 @@ exports.MicrosoftCalendarBookingService = class MicrosoftCalendarBookingService
           targetMailbox: mailboxEmail
         })
       }, integration, loggedInUserId);
-      const excludedDateResults = await this.resolveSkipDatesIfAny(graphEvent.id, request.event.schedule?.skipDates, mailboxEmail, this.organizerUserMailbox(organizerEmail), integration, loggedInUserId);
+      const excludedDateResults = await this.resolveSkipDatesIfAny(graphEvent.id, request.event.schedule?.skipDates, mailboxEmail, this.organizerUserMailbox(organizerEmail), request.event.timeZone, integration, loggedInUserId);
       const ref = graphEventToRef(graphEvent, {
         organizerUserEmail: this.organizerUserMailbox(organizerEmail),
         resourceId: roomEmail,
@@ -4146,7 +4182,7 @@ exports.MicrosoftCalendarBookingService = class MicrosoftCalendarBookingService
           targetMailbox: mailboxEmail
         })
       }, integration, loggedInUserId);
-      const excludedDateResults = await this.resolveSkipDatesIfAny(graphEvent.id ?? request.eventId, request.event.schedule?.skipDates, mailboxEmail, this.organizerUserMailbox(request.organizerUserEmail), integration, loggedInUserId);
+      const excludedDateResults = await this.resolveSkipDatesIfAny(graphEvent.id ?? request.eventId, request.event.schedule?.skipDates, mailboxEmail, this.organizerUserMailbox(request.organizerUserEmail), request.event.timeZone, integration, loggedInUserId);
       const ref = graphEventToRef(graphEvent, {
         organizerUserEmail: this.organizerUserMailbox(request.organizerUserEmail),
         resourceId: request.resourceEmail,
@@ -4268,18 +4304,15 @@ exports.MicrosoftCalendarBookingService = class MicrosoftCalendarBookingService
     try {
       const mailboxEmail = this.pickMailbox(request.organizerUserEmail, request.resourceEmail);
       this.assertMailbox(mailboxEmail);
-      const hasWindow = Boolean(request.startDateLabel && request.endDateLabel);
-      const url = hasWindow ? MICROSOFT_GRAPH_PATHS.userCalendarView(mailboxEmail, `${request.startDateLabel}T00:00:00`, `${request.endDateLabel}T23:59:59`) : MICROSOFT_GRAPH_PATHS.userCalendarEvents(mailboxEmail);
+      const url = request.startDateLabel && request.endDateLabel ? MICROSOFT_GRAPH_PATHS.userCalendarView(mailboxEmail, toGraphWindowDateTime(request.startDateLabel, WINDOW_START_TIME, request.timeZone), toGraphWindowDateTime(request.endDateLabel, WINDOW_END_TIME, request.timeZone)) : MICROSOFT_GRAPH_PATHS.userCalendarEvents(mailboxEmail);
       this.logger.info(loggedInUserId, this.getEvents.name, this.fileName, "List Microsoft Graph calendar events", {
         mailboxEmail,
         path: url,
-        hasTimeWindow: hasWindow
+        hasTimeWindow: Boolean(request.startDateLabel && request.endDateLabel)
+      });
+      const events = graphEventsToInstances({
+        value: await this.listAllEvents(url, request.timeZone, integration, loggedInUserId)
       });
-      const response = await this.microsoftApiClient.apiCall({
-        apiMethod: HTTP_METHOD.GET,
-        url
-      }, integration, loggedInUserId);
-      const events = graphEventsToInstances(response);
       this.logger.info(loggedInUserId, this.getEvents.name, this.fileName, "Listed Microsoft Graph calendar events", {
         mailboxEmail,
         count: events.length
@@ -4302,17 +4335,15 @@ exports.MicrosoftCalendarBookingService = class MicrosoftCalendarBookingService
       const mailboxEmail = this.pickMailbox(request.organizerUserEmail, request.resourceEmail);
       this.assertMailbox(mailboxEmail);
       this.assertEventId(request.seriesEventId);
-      const url = MICROSOFT_GRAPH_PATHS.userCalendarEventInstances(mailboxEmail, request.seriesEventId, `${request.startDateLabel}T00:00:00`, `${request.endDateLabel}T23:59:59`);
+      const url = MICROSOFT_GRAPH_PATHS.userCalendarEventInstances(mailboxEmail, request.seriesEventId, toGraphWindowDateTime(request.startDateLabel, WINDOW_START_TIME, request.timeZone), toGraphWindowDateTime(request.endDateLabel, WINDOW_END_TIME, request.timeZone));
       this.logger.info(loggedInUserId, this.getEventInstances.name, this.fileName, "List Microsoft Graph series instances", {
         mailboxEmail,
         seriesEventId: request.seriesEventId,
         path: url
       });
-      const response = await this.microsoftApiClient.apiCall({
-        apiMethod: HTTP_METHOD.GET,
-        url
-      }, integration, loggedInUserId);
-      const events = graphEventsToInstances(response);
+      const events = graphEventsToInstances({
+        value: await this.listAllEvents(url, request.timeZone, integration, loggedInUserId)
+      });
       this.logger.info(loggedInUserId, this.getEventInstances.name, this.fileName, "Listed Microsoft Graph series instances", {
         mailboxEmail,
         seriesEventId: request.seriesEventId,
@@ -4417,14 +4448,14 @@ exports.MicrosoftCalendarBookingService = class MicrosoftCalendarBookingService
    * created/updated and cancels it via the existing DELETE path. Best-effort per date — a
    * date that can't be resolved is reported `excluded: false`, not thrown.
    */
-  async resolveSkipDatesIfAny(seriesId, dates, mailboxEmail, organizerUserEmail, integration, loggedInUserId) {
+  async resolveSkipDatesIfAny(seriesId, dates, mailboxEmail, organizerUserEmail, timeZone, integration, loggedInUserId) {
     if (!dates?.length) {
       return void 0;
     }
     const results = [];
     for (const date of dates) {
       try {
-        const instanceId = await this.findOccurrenceInstanceId(seriesId, date, mailboxEmail, integration, loggedInUserId);
+        const instanceId = await this.findOccurrenceInstanceId(seriesId, date, mailboxEmail, timeZone, integration, loggedInUserId);
         if (!instanceId) {
           this.logger.warn(loggedInUserId, this.resolveSkipDatesIfAny.name, this.fileName, "Could not resolve skip-date occurrence", {
             seriesId,
@@ -4462,12 +4493,54 @@ exports.MicrosoftCalendarBookingService = class MicrosoftCalendarBookingService
     }
     return results;
   }
-  async findOccurrenceInstanceId(seriesId, date, mailboxEmail, integration, loggedInUserId) {
-    const response = await this.microsoftApiClient.apiCall({
-      apiMethod: HTTP_METHOD.GET,
-      url: MICROSOFT_GRAPH_PATHS.userCalendarView(mailboxEmail, `${date}T00:00:00`, `${date}T23:59:59`)
-    }, integration, loggedInUserId);
-    return (response.value ?? []).find((occurrence) => occurrence.seriesMasterId === seriesId)?.id;
+  /**
+   * The series' own instance on `date`. Lists the series' instances rather than the mailbox's
+   * whole calendarView, so a busy day can't push the occurrence off the returned page.
+   */
+  async findOccurrenceInstanceId(seriesId, date, mailboxEmail, timeZone, integration, loggedInUserId) {
+    if (!seriesId) {
+      return void 0;
+    }
+    const instances = await this.listAllEvents(MICROSOFT_GRAPH_PATHS.userCalendarEventInstances(mailboxEmail, seriesId, toGraphWindowDateTime(date, WINDOW_START_TIME, timeZone), toGraphWindowDateTime(date, WINDOW_END_TIME, timeZone)), timeZone, integration, loggedInUserId);
+    return instances.find((occurrence) => occurrence.seriesMasterId === seriesId)?.id;
+  }
+  /**
+   * GETs a Graph event listing and follows `@odata.nextLink` until the last page.
+   *
+   * Graph pages calendarView/instances listings (10 events by default), so reading only the first
+   * page silently drops every event past it — on a busy organizer mailbox that is the very series
+   * being looked up. `Prefer: outlook.timezone` makes Graph return `start`/`end` in the property's
+   * zone, so the date labels cut from them are local dates rather than UTC ones.
+   * @param url - The first page's path (calendarView / instances / events)
+   * @param timeZone - IANA zone to return event times in; UTC when absent
+   */
+  async listAllEvents(url, timeZone, integration, loggedInUserId) {
+    const headers = timeZone ? {
+      Prefer: `outlook.timezone="${timeZone}"`
+    } : void 0;
+    const events = [];
+    let nextUrl = `${url}${url.includes("?") ? "&" : "?"}$top=${GRAPH_LIST_PAGE_SIZE}`;
+    let pageCount = 0;
+    while (nextUrl && pageCount < GRAPH_LIST_MAX_PAGES) {
+      const response = await this.microsoftApiClient.apiCall({
+        apiMethod: HTTP_METHOD.GET,
+        url: nextUrl,
+        ...headers ? {
+          headers
+        } : {}
+      }, integration, loggedInUserId);
+      events.push(...response.value ?? []);
+      nextUrl = toGraphRelativeUrl(response["@odata.nextLink"]);
+      pageCount += 1;
+    }
+    if (nextUrl) {
+      this.logger.warn(loggedInUserId, this.listAllEvents.name, this.fileName, "Stopped following Graph pages at the page limit; listing truncated", {
+        url,
+        pageCount,
+        eventCount: events.length
+      });
+    }
+    return events;
   }
   /** Mailbox the Graph call targets: the organizing user if known, else the room. */
   pickMailbox(organizerEmail, roomEmail) {