Merge pull request #199 from cloud-atlas-ai/muness/issue198

Fix Multi-day Ongoing

Author: muness

src/icalUtils.ts

@@ -169,7 +169,26 @@ function processRecurringRules(event: any, sortedDaysToMatch: string[], excluded
 }
 
 function shouldIncludeOngoing(event: any, dayToMatch: string): boolean {
-  return moment(dayToMatch).isBetween(moment(event.start), moment(event.end), "day");
+  const day = moment(dayToMatch, 'YYYY-MM-DD').startOf('day');
+  const eventStartDay = moment(event.start).startOf('day');
+  const eventEndDay = moment(event.end).startOf('day');
+
+  // Avoid duplicating the initial occurrence; it's already included elsewhere.
+  if (day.isSame(eventStartDay, 'day')) {
+    return false;
+  }
+
+  // Include full days between start and end.
+  if (day.isBetween(eventStartDay, eventEndDay, 'day', '()')) {
+    return true;
+  }
+
+  // Include the ending day when the event continues past its start.
+  if (day.isSame(eventEndDay, 'day')) {
+    return moment(event.end).diff(eventEndDay, 'minutes') > 0;
+  }
+
+  return false;
 }
 
 export function filterMatchingEvents(icsArray: any[], daysToMatch: string[], showOngoing: boolean) {

tests/icalUtils.test.ts

@@ -81,6 +81,34 @@ END:VCALENDAR`;
       expect(withOngoing[0].summary).toBe('Multi-day Event');
     });
 
+    it('should show multi-day events on all spanned days only when showOngoing is enabled', () => {
+      const events = [{
+        summary: 'Spanning Event',
+        start: new Date('2025-10-09T09:00:00Z'),
+        end: new Date('2025-10-11T17:00:00Z'),
+        uid: 'spanning-event-uid'
+      }];
+
+      const dates = ['2025-10-09', '2025-10-10', '2025-10-11'];
+
+      // With showOngoing OFF: only the start date should include the event
+      const eventsOnDatesWithOngoingOff = dates.map(date => filterMatchingEvents(events, [date], false));
+      expect(eventsOnDatesWithOngoingOff[0]).toHaveLength(1); // 2025-10-09 (start)
+      expect(eventsOnDatesWithOngoingOff[1]).toHaveLength(0); // 2025-10-10 (middle)
+      expect(eventsOnDatesWithOngoingOff[2]).toHaveLength(0); // 2025-10-11 (end)
+
+      // With showOngoing ON: all dates from start to end should include the event
+      const eventsOnDatesWithOngoingOn = dates.map(date => filterMatchingEvents(events, [date], true));
+      expect(eventsOnDatesWithOngoingOn[0]).toHaveLength(1); // 2025-10-09 (start)
+      expect(eventsOnDatesWithOngoingOn[1]).toHaveLength(1); // 2025-10-10 (middle)
+      expect(eventsOnDatesWithOngoingOn[2]).toHaveLength(1); // 2025-10-11 (end)
+
+      // Sanity: verify correct event is returned
+      eventsOnDatesWithOngoingOn.forEach((res) => {
+        expect(res[0].summary).toBe('Spanning Event');
+      });
+    });
+
     it('should skip cancelled events', () => {
       const events = [{
         summary: 'Cancelled Event',
@@ -227,7 +255,7 @@ END:VCALENDAR`;
       ];
 
       const results = testDates.map(date => filterMatchingEvents(events, [date], false));
-      
+
       expect(results[0]).toHaveLength(1); // Original
       expect(results[1]).toHaveLength(1); // First recurrence
       expect(results[2]).toHaveLength(0); // Excluded