@oneuptime/common 7.0.4030 → 7.0.4034

package/Server/Services/OnCallDutyPolicyScheduleService.ts

@@ -30,6 +30,8 @@ import Timezone from "../../Types/Timezone";
 import logger from "../Utils/Logger";
 
 export class Service extends DatabaseService<OnCallDutyPolicySchedule> {
+  private layerUtil = new LayerUtil();
+
   public constructor() {
     super(OnCallDutyPolicySchedule);
   }
@@ -377,32 +379,43 @@ export class Service extends DatabaseService<OnCallDutyPolicySchedule> {
     rosterStartAt: Date | null;
     nextRosterStartAt: Date | null;
   }> {
-    logger.debug('refreshCurrentUserIdAndHandoffTimeInSchedule called with scheduleId: '+ scheduleId.toString());
+    logger.debug(
+      "refreshCurrentUserIdAndHandoffTimeInSchedule called with scheduleId: " +
+        scheduleId.toString(),
+    );
 
     // get previoius result.
-    logger.debug('Fetching previous schedule information for scheduleId: ' + scheduleId.toString());
+    logger.debug(
+      "Fetching previous schedule information for scheduleId: " +
+        scheduleId.toString(),
+    );
     const onCallSchedule: OnCallDutyPolicySchedule | null =
       await this.findOneById({
-      id: scheduleId,
-      select: {
-        currentUserIdOnRoster: true,
-        rosterHandoffAt: true,
-        nextUserIdOnRoster: true,
-        rosterNextHandoffAt: true,
-        rosterStartAt: true,
-        rosterNextStartAt: true,
-      },
-      props: {
-        isRoot: true,
-      },
+        id: scheduleId,
+        select: {
+          currentUserIdOnRoster: true,
+          rosterHandoffAt: true,
+          nextUserIdOnRoster: true,
+          rosterNextHandoffAt: true,
+          rosterStartAt: true,
+          rosterNextStartAt: true,
+        },
+        props: {
+          isRoot: true,
+        },
       });
 
     if (!onCallSchedule) {
-      logger.debug('Schedule not found for scheduleId: ' + scheduleId.toString());
+      logger.debug(
+        "Schedule not found for scheduleId: " + scheduleId.toString(),
+      );
       throw new BadDataException("Schedule not found");
     }
 
-    logger.debug('Previous schedule information fetched for scheduleId: ' + scheduleId.toString());
+    logger.debug(
+      "Previous schedule information fetched for scheduleId: " +
+        scheduleId.toString(),
+    );
 
     const previousInformation: {
       currentUserIdOnRoster: ObjectID | null;
@@ -422,7 +435,10 @@ export class Service extends DatabaseService<OnCallDutyPolicySchedule> {
 
     logger.debug(previousInformation);
 
-    logger.debug('Fetching new schedule information for scheduleId: ' + scheduleId.toString());
+    logger.debug(
+      "Fetching new schedule information for scheduleId: " +
+        scheduleId.toString(),
+    );
 
     const newInformation: {
       currentUserId: ObjectID | null;
@@ -435,41 +451,50 @@ export class Service extends DatabaseService<OnCallDutyPolicySchedule> {
 
     logger.debug(newInformation);
 
-    logger.debug('Updating schedule with new information for scheduleId: ' + scheduleId.toString());
+    logger.debug(
+      "Updating schedule with new information for scheduleId: " +
+        scheduleId.toString(),
+    );
 
     await this.updateOneById({
       id: scheduleId!,
       data: {
-      currentUserIdOnRoster: newInformation.currentUserId,
-      rosterHandoffAt: newInformation.handOffTimeAt,
-      nextUserIdOnRoster: newInformation.nextUserId,
-      rosterNextHandoffAt: newInformation.nextHandOffTimeAt,
-      rosterStartAt: newInformation.rosterStartAt,
-      rosterNextStartAt: newInformation.nextRosterStartAt,
+        currentUserIdOnRoster: newInformation.currentUserId,
+        rosterHandoffAt: newInformation.handOffTimeAt,
+        nextUserIdOnRoster: newInformation.nextUserId,
+        rosterNextHandoffAt: newInformation.nextHandOffTimeAt,
+        rosterStartAt: newInformation.rosterStartAt,
+        rosterNextStartAt: newInformation.nextRosterStartAt,
       },
       props: {
-      isRoot: true,
-      ignoreHooks: true,
+        isRoot: true,
+        ignoreHooks: true,
       },
     });
 
-    logger.debug('Sending notifications for schedule handoff for scheduleId: ' + scheduleId.toString());
+    logger.debug(
+      "Sending notifications for schedule handoff for scheduleId: " +
+        scheduleId.toString(),
+    );
 
     // send notification to the users.
     await this.sendNotificationToUserOnScheduleHandoff({
       scheduleId: scheduleId,
       previousInformation: previousInformation,
       newInformation: {
-      currentUserIdOnRoster: newInformation.currentUserId,
-      rosterHandoffAt: newInformation.handOffTimeAt,
-      nextUserIdOnRoster: newInformation.nextUserId,
-      nextHandOffTimeAt: newInformation.nextHandOffTimeAt,
-      rosterStartAt: newInformation.rosterStartAt,
-      nextRosterStartAt: newInformation.nextRosterStartAt,
+        currentUserIdOnRoster: newInformation.currentUserId,
+        rosterHandoffAt: newInformation.handOffTimeAt,
+        nextUserIdOnRoster: newInformation.nextUserId,
+        nextHandOffTimeAt: newInformation.nextHandOffTimeAt,
+        rosterStartAt: newInformation.rosterStartAt,
+        nextRosterStartAt: newInformation.nextRosterStartAt,
       },
     });
 
-    logger.debug('Returning new schedule information for scheduleId: ' + scheduleId.toString());
+    logger.debug(
+      "Returning new schedule information for scheduleId: " +
+        scheduleId.toString(),
+    );
 
     return newInformation;
   }
@@ -484,8 +509,10 @@ export class Service extends DatabaseService<OnCallDutyPolicySchedule> {
     nextHandOffTimeAt: Date | null;
     nextRosterStartAt: Date | null;
   }> {
-
-    logger.debug('getCurrrentUserIdAndHandoffTimeInSchedule called with scheduleId: ' + scheduleId.toString());
+    logger.debug(
+      "getCurrrentUserIdAndHandoffTimeInSchedule called with scheduleId: " +
+        scheduleId.toString(),
+    );
 
     const resultReturn: {
       rosterStartAt: Date | null;
@@ -503,48 +530,50 @@ export class Service extends DatabaseService<OnCallDutyPolicySchedule> {
       nextRosterStartAt: null,
     };
 
-    logger.debug('Fetching events for scheduleId: ' + scheduleId.toString());
+    logger.debug("Fetching events for scheduleId: " + scheduleId.toString());
     const events: Array<CalendarEvent> | null =
       await this.getEventByIndexInSchedule({
         scheduleId: scheduleId,
         getNumberOfEvents: 2,
       });
 
-    logger.debug('Events fetched: ' + JSON.stringify(events));
+    logger.debug("Events fetched: " + JSON.stringify(events));
 
     let currentEvent: CalendarEvent | null = events[0] || null;
     let nextEvent: CalendarEvent | null = events[1] || null;
 
-    logger.debug('Current event: ' + JSON.stringify(currentEvent));
-    logger.debug('Next event: ' + JSON.stringify(nextEvent));
+    logger.debug("Current event: " + JSON.stringify(currentEvent));
+    logger.debug("Next event: " + JSON.stringify(nextEvent));
 
     // if the current event start time in the future then the current event is the next event.
     if (currentEvent && OneUptimeDate.isInTheFuture(currentEvent.start)) {
-      logger.debug('Current event is in the future, treating it as next event.');
+      logger.debug(
+        "Current event is in the future, treating it as next event.",
+      );
       nextEvent = currentEvent;
       currentEvent = null;
     }
 
     if (currentEvent) {
-      logger.debug('Processing current event: ' + JSON.stringify(currentEvent));
+      logger.debug("Processing current event: " + JSON.stringify(currentEvent));
       const userId: string | undefined = currentEvent?.title; // this is user id in string.
 
       if (userId) {
-        logger.debug('Current userId: ' + userId);
+        logger.debug("Current userId: " + userId);
         resultReturn.currentUserId = new ObjectID(userId);
       }
 
       // get handOffTime
       const handOffTime: Date | undefined = currentEvent?.end; // this is user id in string.
       if (handOffTime) {
-        logger.debug('Current handOffTime: ' + handOffTime.toISOString());
+        logger.debug("Current handOffTime: " + handOffTime.toISOString());
         resultReturn.handOffTimeAt = handOffTime;
       }
 
       // get start time
       const startTime: Date | undefined = currentEvent?.start; // this is user id in string.
       if (startTime) {
-        logger.debug('Current rosterStartAt: ' + startTime.toISOString());
+        logger.debug("Current rosterStartAt: " + startTime.toISOString());
         resultReturn.rosterStartAt = startTime;
       }
     }
@@ -552,30 +581,30 @@ export class Service extends DatabaseService<OnCallDutyPolicySchedule> {
     // do the same for next event.
 
     if (nextEvent) {
-      logger.debug('Processing next event: ' + JSON.stringify(nextEvent));
+      logger.debug("Processing next event: " + JSON.stringify(nextEvent));
       const userId: string | undefined = nextEvent?.title; // this is user id in string.
 
       if (userId) {
-        logger.debug('Next userId: ' + userId);
+        logger.debug("Next userId: " + userId);
         resultReturn.nextUserId = new ObjectID(userId);
       }
 
       // get handOffTime
       const handOffTime: Date | undefined = nextEvent?.end; // this is user id in string.
       if (handOffTime) {
-        logger.debug('Next handOffTime: ' + handOffTime.toISOString());
+        logger.debug("Next handOffTime: " + handOffTime.toISOString());
         resultReturn.nextHandOffTimeAt = handOffTime;
       }
 
       // get start time
       const startTime: Date | undefined = nextEvent?.start; // this is user id in string.
       if (startTime) {
-        logger.debug('Next rosterStartAt: ' + startTime.toISOString());
+        logger.debug("Next rosterStartAt: " + startTime.toISOString());
         resultReturn.nextRosterStartAt = startTime;
       }
     }
 
-    logger.debug('Returning result: ' + JSON.stringify(resultReturn));
+    logger.debug("Returning result: " + JSON.stringify(resultReturn));
     return resultReturn;
   }
 
@@ -664,32 +693,36 @@ export class Service extends DatabaseService<OnCallDutyPolicySchedule> {
     scheduleId: ObjectID;
     getNumberOfEvents: number; // which event would you like to get. First event, second event, etc.
   }): Promise<Array<CalendarEvent>> {
-    logger.debug('getEventByIndexInSchedule called with data: ' + JSON.stringify(data));
+    logger.debug(
+      "getEventByIndexInSchedule called with data: " + JSON.stringify(data),
+    );
 
     const layerProps: Array<LayerProps> = await this.getScheduleLayerProps({
       scheduleId: data.scheduleId,
     });
 
-    logger.debug('Layer properties fetched: ' + JSON.stringify(layerProps));
+    logger.debug("Layer properties fetched: " + JSON.stringify(layerProps));
 
     if (layerProps.length === 0) {
-      logger.debug('No layers found for scheduleId: ' + data.scheduleId.toString());
+      logger.debug(
+        "No layers found for scheduleId: " + data.scheduleId.toString(),
+      );
       return [];
     }
 
     const currentStartTime: Date = OneUptimeDate.getCurrentDate();
-    logger.debug('Current start time: ' + currentStartTime.toISOString());
+    logger.debug("Current start time: " + currentStartTime.toISOString());
 
     const currentEndTime: Date = OneUptimeDate.addRemoveYears(
       currentStartTime,
       1,
     );
-    logger.debug('Current end time: ' + currentEndTime.toISOString());
+    logger.debug("Current end time: " + currentEndTime.toISOString());
 
     const numberOfEventsToGet: number = data.getNumberOfEvents;
-    logger.debug('Number of events to get: ' + numberOfEventsToGet);
+    logger.debug("Number of events to get: " + numberOfEventsToGet);
 
-    const events: Array<CalendarEvent> = LayerUtil.getMultiLayerEvents(
+    const events: Array<CalendarEvent> = this.layerUtil.getMultiLayerEvents(
       {
         layers: layerProps,
         calendarStartDate: currentStartTime,
@@ -700,7 +733,7 @@ export class Service extends DatabaseService<OnCallDutyPolicySchedule> {
       },
     );
 
-    logger.debug('Events fetched: ' + JSON.stringify(events));
+    logger.debug("Events fetched: " + JSON.stringify(events));
 
     return events;
   }
@@ -723,7 +756,7 @@ export class Service extends DatabaseService<OnCallDutyPolicySchedule> {
       1,
     );
 
-    const events: Array<CalendarEvent> = LayerUtil.getMultiLayerEvents(
+    const events: Array<CalendarEvent> = this.layerUtil.getMultiLayerEvents(
       {
         layers: layerProps,
         calendarStartDate: currentStartTime,

package/Types/OnCallDutyPolicy/Layer.ts

@@ -34,7 +34,7 @@ export interface PriorityCalendarEvents extends CalendarEvent {
 }
 
 export default class LayerUtil {
-  public static getEvents(
+  public getEvents(
     data: EventProps,
     options?:
       | {
@@ -44,11 +44,11 @@ export default class LayerUtil {
   ): Array<CalendarEvent> {
     let events: Array<CalendarEvent> = [];
 
-    if (!LayerUtil.isDataValid(data)) {
+    if (!this.isDataValid(data)) {
       return [];
     }
 
-    data = LayerUtil.sanitizeData(data);
+    data = this.sanitizeData(data);
 
     let start: Date = data.calendarStartDate;
     const end: Date = data.calendarEndDate;
@@ -78,7 +78,7 @@ export default class LayerUtil {
 
     // before we do this, we need to update the user index.
 
-    currentUserIndex = LayerUtil.getCurrentUserIndexBasedOnHandoffTime({
+    currentUserIndex = this.getCurrentUserIndexBasedOnHandoffTime({
       rotation,
       handOffTime,
       currentUserIndex,
@@ -89,7 +89,7 @@ export default class LayerUtil {
 
     // update handoff time to the same day as current start time
 
-    handOffTime = LayerUtil.moveHandsOffTimeAfterCurrentEventStartTime({
+    handOffTime = this.moveHandsOffTimeAfterCurrentEventStartTime({
       handOffTime,
       currentEventStartTime,
       rotation: data.rotation,
@@ -101,7 +101,7 @@ export default class LayerUtil {
 
     if (OneUptimeDate.isBefore(end, handOffTime)) {
       const trimmedStartAndEndTimes: Array<StartAndEndTime> =
-        LayerUtil.trimStartAndEndTimesBasedOnRestrictionTimes({
+        this.trimStartAndEndTimesBasedOnRestrictionTimes({
           eventStartTime: currentEventStartTime,
           eventEndTime: end,
           restrictionTimes: data.restrictionTimes,
@@ -109,7 +109,7 @@ export default class LayerUtil {
 
       events = [
         ...events,
-        ...LayerUtil.getCalendarEventsFromStartAndEndDates(
+        ...this.getCalendarEventsFromStartAndEndDates(
           trimmedStartAndEndTimes,
           data.users,
           currentUserIndex,
@@ -137,7 +137,7 @@ export default class LayerUtil {
           currentEventEndTime,
           1,
         );
-        handOffTime = LayerUtil.moveHandsOffTimeAfterCurrentEventStartTime({
+        handOffTime = this.moveHandsOffTimeAfterCurrentEventStartTime({
           handOffTime,
           currentEventStartTime,
           rotation: data.rotation,
@@ -155,7 +155,7 @@ export default class LayerUtil {
       // check restriction times. if the end time of the event is after the end time of the restriction times, we need to update the end time of the event.
 
       const trimmedStartAndEndTimes: Array<StartAndEndTime> =
-        LayerUtil.trimStartAndEndTimesBasedOnRestrictionTimes({
+        this.trimStartAndEndTimesBasedOnRestrictionTimes({
           eventStartTime: currentEventStartTime,
           eventEndTime: currentEventEndTime,
           restrictionTimes: data.restrictionTimes,
@@ -163,7 +163,7 @@ export default class LayerUtil {
 
       events = [
         ...events,
-        ...LayerUtil.getCalendarEventsFromStartAndEndDates(
+        ...this.getCalendarEventsFromStartAndEndDates(
           trimmedStartAndEndTimes,
           data.users,
           currentUserIndex,
@@ -185,14 +185,14 @@ export default class LayerUtil {
 
       // update the handoff time
 
-      handOffTime = LayerUtil.moveHandsOffTimeAfterCurrentEventStartTime({
+      handOffTime = this.moveHandsOffTimeAfterCurrentEventStartTime({
         handOffTime,
         currentEventStartTime,
         rotation: data.rotation,
       });
 
       // update the current user index
-      currentUserIndex = LayerUtil.incrementUserIndex(
+      currentUserIndex = this.incrementUserIndex(
         currentUserIndex,
         data.users.length,
       );
@@ -216,7 +216,7 @@ export default class LayerUtil {
     return events;
   }
 
-  private static sanitizeData(data: EventProps): EventProps {
+  private sanitizeData(data: EventProps): EventProps {
     if (!(data.restrictionTimes instanceof RestrictionTimes)) {
       data.restrictionTimes = RestrictionTimes.fromJSON(data.restrictionTimes);
     }
@@ -246,7 +246,7 @@ export default class LayerUtil {
     return data;
   }
 
-  private static isDataValid(data: EventProps): boolean {
+  private isDataValid(data: EventProps): boolean {
     // if calendar end time is before the start time then return an empty array.
     if (OneUptimeDate.isBefore(data.calendarEndDate, data.calendarStartDate)) {
       return false;
@@ -267,7 +267,7 @@ export default class LayerUtil {
     return true;
   }
 
-  private static moveHandsOffTimeAfterCurrentEventStartTime(data: {
+  private moveHandsOffTimeAfterCurrentEventStartTime(data: {
     handOffTime: Date;
     currentEventStartTime: Date;
     rotation: Recurring;
@@ -436,7 +436,7 @@ export default class LayerUtil {
     return handOffTime;
   }
 
-  private static getCurrentUserIndexBasedOnHandoffTime(data: {
+  private getCurrentUserIndexBasedOnHandoffTime(data: {
     rotation: Recurring;
     handOffTime: Date;
     currentUserIndex: number;
@@ -523,7 +523,7 @@ export default class LayerUtil {
         numberOfIntervalsBetweenStartAndHandoffTime * -1;
     }
 
-    currentUserIndex = LayerUtil.incrementUserIndex(
+    currentUserIndex = this.incrementUserIndex(
       currentUserIndex,
       data.users.length,
       numberOfIntervalsBetweenStartAndHandoffTime,
@@ -532,7 +532,7 @@ export default class LayerUtil {
     return currentUserIndex;
   }
 
-  public static trimStartAndEndTimesBasedOnRestrictionTimes(data: {
+  public trimStartAndEndTimesBasedOnRestrictionTimes(data: {
     eventStartTime: Date;
     eventEndTime: Date;
     restrictionTimes: RestrictionTimes;
@@ -565,7 +565,7 @@ export default class LayerUtil {
           data.eventStartTime,
         );
 
-      return LayerUtil.getEventsByDailyRestriction({
+      return this.getEventsByDailyRestriction({
         eventStartTime: data.eventStartTime,
         eventEndTime: data.eventEndTime,
         restrictionStartAndEndTime: restrictionTimes.dayRestrictionTimes,
@@ -576,13 +576,13 @@ export default class LayerUtil {
     }
 
     if (restrictionTimes.restictionType === RestrictionType.Weekly) {
-      return LayerUtil.getEventsByWeeklyRestriction(data);
+      return this.getEventsByWeeklyRestriction(data);
     }
 
     return [];
   }
 
-  public static getEventsByWeeklyRestriction(data: {
+  public getEventsByWeeklyRestriction(data: {
     eventStartTime: Date;
     eventEndTime: Date;
     restrictionTimes: RestrictionTimes;
@@ -604,11 +604,11 @@ export default class LayerUtil {
     }
 
     const restrictionStartAndEndTimes: Array<StartAndEndTime> =
-      LayerUtil.getWeeklyRestrictionTimesForWeek(data);
+      this.getWeeklyRestrictionTimesForWeek(data);
 
     for (const restrictionStartAndEndTime of restrictionStartAndEndTimes) {
       const trimmedStartAndEndTimesForRestriction: Array<StartAndEndTime> =
-        LayerUtil.getEventsByDailyRestriction({
+        this.getEventsByDailyRestriction({
           eventStartTime: data.eventStartTime,
           eventEndTime: data.eventEndTime,
           restrictionStartAndEndTime: restrictionStartAndEndTime,
@@ -626,7 +626,7 @@ export default class LayerUtil {
     return trimmedStartAndEndTimes;
   }
 
-  public static getWeeklyRestrictionTimesForWeek(data: {
+  public getWeeklyRestrictionTimesForWeek(data: {
     eventStartTime: Date;
     eventEndTime: Date;
     restrictionTimes: RestrictionTimes;
@@ -691,7 +691,7 @@ export default class LayerUtil {
     return startAndEndTimesOfWeeklyRestrictions;
   }
 
-  public static getEventsByDailyRestriction(data: {
+  public getEventsByDailyRestriction(data: {
     eventStartTime: Date;
     eventEndTime: Date;
     restrictionStartAndEndTime: StartAndEndTime;
@@ -727,7 +727,7 @@ export default class LayerUtil {
 
     // create a break clause. This loop executes 100 times at max.
 
-    const maxLoopCount: number = 100;
+    const maxLoopCount: number = 50;
     let loopCount: number = 0;
 
     while (!reachedTheEndOfTheCurrentEvent) {
@@ -836,7 +836,7 @@ export default class LayerUtil {
 
   // helper functions.
 
-  private static incrementUserIndex(
+  private incrementUserIndex(
     currentIndex: number,
     userArrayLength: number,
     incrementBy?: number,
@@ -858,7 +858,7 @@ export default class LayerUtil {
     return currentIndex;
   }
 
-  private static getCalendarEventsFromStartAndEndDates(
+  private getCalendarEventsFromStartAndEndDates(
     trimmedStartAndEndTimes: Array<StartAndEndTime>,
     users: Array<UserModel>,
     currentUserIndex: number,
@@ -882,7 +882,7 @@ export default class LayerUtil {
     return events;
   }
 
-  public static getMultiLayerEvents(
+  public getMultiLayerEvents(
     data: MultiLayerProps,
     options?:
       | {
@@ -894,7 +894,7 @@ export default class LayerUtil {
     let layerPriority: number = 1;
 
     for (const layer of data.layers) {
-      const layerEvents: Array<CalendarEvent> = LayerUtil.getEvents(
+      const layerEvents: Array<CalendarEvent> = this.getEvents(
         {
           users: layer.users,
           startDateTimeOfLayer: layer.startDateTimeOfLayer,
@@ -925,7 +925,7 @@ export default class LayerUtil {
     // now remove the overlapping events
 
     const nonOverlappingEvents: Array<CalendarEvent> =
-      LayerUtil.removeOverlappingEvents(events);
+      this.removeOverlappingEvents(events);
 
     if (options?.getNumberOfEvents !== undefined) {
       if (nonOverlappingEvents.length > options.getNumberOfEvents) {
@@ -936,7 +936,7 @@ export default class LayerUtil {
     return nonOverlappingEvents;
   }
 
-  public static removeOverlappingEvents(
+  public removeOverlappingEvents(
     events: PriorityCalendarEvents[],
   ): CalendarEvent[] {
     // now remove overlapping events by priority and trim them by priority. Lower priority number will be kept and higher priority number will be trimmed.
@@ -947,6 +947,17 @@ export default class LayerUtil {
 
     // now remove the overlapping events
 
+    // remove events where start time and end time are the same
+
+    events = events.filter((event: PriorityCalendarEvents) => {
+      return !OneUptimeDate.isSame(event.start, event.end);
+    });
+
+    // remove events where start time is after end time
+    events = events.filter((event: PriorityCalendarEvents) => {
+      return !OneUptimeDate.isBefore(event.end, event.start);
+    });
+
     const finalEvents: PriorityCalendarEvents[] = [];
 
     // sort events by start time
@@ -966,6 +977,16 @@ export default class LayerUtil {
     for (const event of events) {
       // trim the trimmed events by the current event based on priority
 
+      // if this event starts and end at the same time, we need to remove it
+      if (OneUptimeDate.isSame(event.start, event.end)) {
+        continue;
+      }
+
+      // if the end time of the event is before the start time, we need to remove it
+      if (OneUptimeDate.isBefore(event.end, event.start)) {
+        continue;
+      }
+
       for (const finalEvent of finalEvents) {
         // check if this final event overlaps with the current event
 
@@ -1027,17 +1048,26 @@ export default class LayerUtil {
 
       // if an event starts and end at the same time, we need to remove it
 
-      finalEvents.forEach((finalEvent: CalendarEvent, index: number) => {
+      for (let index: number = 0; index < finalEvents.length; index++) {
+        const finalEvent: PriorityCalendarEvents | undefined =
+          finalEvents[index];
+
+        if (!finalEvent) {
+          continue;
+        }
+
         if (OneUptimeDate.isSame(finalEvent.start, finalEvent.end)) {
           finalEvents.splice(index, 1);
+          index--; // Adjust index after removal
+          continue;
         }
 
         // if any event ends before it starts, we need to remove it
-
         if (OneUptimeDate.isBefore(finalEvent.end, finalEvent.start)) {
           finalEvents.splice(index, 1);
+          index--; // Adjust index after removal
         }
-      });
+      }
     }
 
     // convert PriorityCalendarEvents to CalendarEvents