add unit tests for excluded dates

Author: devksingh4

.editorconfig

@@ -8,6 +8,9 @@ indent_size = 2
 insert_final_newline = true
 trim_trailing_whitespace = true
 
+[*.ics]
+insert_final_newline = false
+
 [*.md]
 max_line_length = off
 trim_trailing_whitespace = false

package.json

@@ -21,7 +21,8 @@
     "lint": "yarn workspaces run lint",
     "prepare": "node .husky/install.mjs || true",
     "typecheck": "yarn workspaces run typecheck",
-    "test:unit": "cross-env RunEnvironment='dev' concurrently --names 'api,ui' 'vitest run --coverage --config tests/unit/vitest.config.ts tests/unit' 'yarn workspace infra-core-ui run test:unit'",
+    "test:unit": "cross-env RunEnvironment='dev' concurrently --names 'api,ui' 'yarn run test:unit-api' 'yarn workspace infra-core-ui run test:unit'",
+    "test:unit-api": "cross-env RunEnvironment='dev' vitest run --coverage --config tests/unit/vitest.config.ts tests/unit",
     "test:unit-ui": "yarn test:unit --ui",
     "test:unit-watch": "vitest tests/unit",
     "test:live": "vitest tests/live",

src/api/routes/ics.ts

@@ -171,12 +171,12 @@ const icalPlugin: FastifyPluginAsync = async (fastify, _options) => {
             event = event.repeating({
               ...repeatingIcalMap[rawEvent.repeats as EventRepeatOptions],
               until: moment.tz(rawEvent.repeatEnds, "America/Chicago"),
-              exclude: exclusions,
+              ...(exclusions.length > 0 && { exclude: exclusions }),
             });
           } else {
             event.repeating({
               ...repeatingIcalMap[rawEvent.repeats as EventRepeatOptions],
-              exclude: exclusions,
+              ...(exclusions.length > 0 && { exclude: exclusions }),
             });
           }
         }

tests/unit/data/acmWideCalendarRepeatExclude.ics

@@ -0,0 +1,103 @@
+BEGIN:VCALENDAR
+VERSION:2.0
+PRODID:-//sebbo.net//ical-generator//EN
+METHOD:PUBLISH
+NAME:ACM@UIUC - All Events
+X-WR-CALNAME:ACM@UIUC - All Events
+BEGIN:VTIMEZONE
+TZID:America/Chicago
+TZURL:http://tzurl.org/zoneinfo-outlook/America/Chicago
+X-LIC-LOCATION:America/Chicago
+BEGIN:DAYLIGHT
+TZOFFSETFROM:-0600
+TZOFFSETTO:-0500
+TZNAME:CDT
+DTSTART:19700308T020000
+RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=2SU
+END:DAYLIGHT
+BEGIN:STANDARD
+TZOFFSETFROM:-0500
+TZOFFSETTO:-0600
+TZNAME:CST
+DTSTART:19701101T020000
+RRULE:FREQ=YEARLY;BYMONTH=11;BYDAY=1SU
+END:STANDARD
+END:VTIMEZONE
+TIMEZONE-ID:America/Chicago
+X-WR-TIMEZONE:America/Chicago
+BEGIN:VEVENT
+UID:3138bead-b2c5-4bfe-bce4-4b478658cb78
+SEQUENCE:0
+DTSTAMP:20240822T155148
+DTSTART;TZID=America/Chicago:20240825T120000
+DTEND;TZID=America/Chicago:20240825T160000
+SUMMARY:Quad Day
+LOCATION:Main Quad
+DESCRIPTION:Host: ACM\nGoogle Maps Link: https://maps.app.goo.gl/2ZRYibtE7
+ Yem5TrP6\n\nJoin us on Quad Day to learn more about ACM and CS at Illinois
+ !
+ORGANIZER;CN="ACM@UIUC":mailto:ACM@UIUC
+END:VEVENT
+BEGIN:VEVENT
+UID:5bc69f3b-e958-4c80-b041-ddeae0385db8
+SEQUENCE:0
+DTSTAMP:20240822T155148
+DTSTART;TZID=America/Chicago:20240725T180000
+DTEND;TZID=America/Chicago:20240725T190000
+RRULE:FREQ=WEEKLY;UNTIL=20240905T190000
+SUMMARY:Infra Meeting
+LOCATION:ACM Middle Room
+DESCRIPTION:Host: Infrastructure Committee\n\nTest event.
+ORGANIZER;CN="ACM@UIUC":mailto:ACM@UIUC
+END:VEVENT
+BEGIN:VEVENT
+UID:4d38608d-90bf-4a58-8701-3f1b659a53db
+SEQUENCE:0
+DTSTAMP:20240822T155148
+DTSTART;TZID=America/Chicago:20240925T180000
+DTEND;TZID=America/Chicago:20240925T190000
+SUMMARY:Testing Paid and Featured Event
+LOCATION:ACM Middle Room
+DESCRIPTION:Host: Social Committee\n\nTest paid featured event.
+ORGANIZER;CN="ACM@UIUC":mailto:ACM@UIUC
+END:VEVENT
+BEGIN:VEVENT
+UID:accd7fe0-50ac-427b-8041-a2b3ddcd328e
+SEQUENCE:0
+DTSTAMP:20240822T155148
+DTSTART;TZID=America/Chicago:20240725T180000
+DTEND;TZID=America/Chicago:20240725T190000
+SUMMARY:Event in the past.
+LOCATION:ACM Middle Room
+DESCRIPTION:Host: Infrastructure Committee\n\nTest event in the past.
+ORGANIZER;CN="ACM@UIUC":mailto:ACM@UIUC
+END:VEVENT
+BEGIN:VEVENT
+UID:78be8f2b-3d1d-4481-90b6-85bfd84d38b4
+SEQUENCE:0
+DTSTAMP:20240822T155148
+DTSTART;TZID=America/Chicago:20240830T170000
+DTEND;TZID=America/Chicago:20240830T170000
+RRULE:FREQ=WEEKLY
+SUMMARY:Weekly Happy Hour
+LOCATION:Legends
+DESCRIPTION:Host: ACM\nGoogle Maps Link: https://goo.gl/maps/CXESXd3otbGZN
+ qFP7\n\nMeet and chat with your peers and fellow ACM members\, with food o
+ n us!
+ORGANIZER;CN="ACM@UIUC":mailto:ACM@UIUC
+END:VEVENT
+BEGIN:VEVENT
+UID:6ac35cf3-3a4d-4d45-957a-6fee8dea50a7
+SEQUENCE:0
+DTSTAMP:20240822T155148
+DTSTART;TZID=America/Chicago:20241220T012100
+DTEND;TZID=America/Chicago:20241220T022100
+RRULE:FREQ=WEEKLY;UNTIL=20251221T000000
+EXDATE;TZID=America/Chicago:20250627T012100
+SUMMARY:Test Title
+LOCATION:ACM Room (Siebel CS 1104)
+DESCRIPTION:Host: ACM\nGoogle Maps Link: https://maps.app.goo.gl/dwbBBBkfj
+ kgj8gvA8\n\nTest Description with now etag 1?
+ORGANIZER;CN="ACM@UIUC":mailto:ACM@UIUC
+END:VEVENT
+END:VCALENDAR

tests/unit/ical.test.ts

@@ -2,7 +2,10 @@ import { afterAll, expect, test, beforeEach, vi } from "vitest";
 import { ScanCommand, DynamoDBClient } from "@aws-sdk/client-dynamodb";
 import { mockClient } from "aws-sdk-client-mock";
 import init from "../../src/api/index.js";
-import { dynamoTableData } from "./mockEventData.testdata.js";
+import {
+  dynamoEventWithRepeatExclusion,
+  dynamoTableData,
+} from "./mockEventData.testdata.js";
 import { secretObject } from "./secret.testdata.js";
 import { readFile } from "fs/promises";
 
@@ -30,6 +33,27 @@ test("Test getting ACM-wide iCal calendar", async () => {
   );
 });
 
+test("Test getting ACM-wide iCal calendar with specific repeat exclusion", async () => {
+  const date = new Date(2024, 7, 22, 15, 51, 48); // August 22, 2024, at 15:51:48 (3:51:48 PM)
+  vi.setSystemTime(date);
+  ddbMock.on(ScanCommand).resolves({
+    Items: [...dynamoTableData, dynamoEventWithRepeatExclusion] as any,
+  });
+  const response = await app.inject({
+    method: "GET",
+    url: "/api/v1/ical",
+  });
+  expect(response.statusCode).toBe(200);
+  expect(response.headers["content-disposition"]).toEqual(
+    'attachment; filename="calendar.ics"',
+  );
+  expect(response.body).toEqual(
+    (
+      await readFile("./tests/unit/data/acmWideCalendarRepeatExclude.ics")
+    ).toString(),
+  );
+});
+
 test("Test getting non-existent iCal calendar fails", async () => {
   const date = new Date(2024, 7, 22, 15, 51, 48); // August 22, 2024, at 15:51:48 (3:51:48 PM)
   vi.setSystemTime(date);

tests/unit/mockEventData.testdata.ts

@@ -187,10 +187,63 @@ const dynamoTableDataUnmarshalledUpcomingOnly = dynamoTableData
   })
   .filter((x: any) => x.title !== "Event in the past.");
 
+const dynamoEventWithRepeatExclusion = {
+  id: {
+    S: "6ac35cf3-3a4d-4d45-957a-6fee8dea50a7",
+  },
+  createdAt: {
+    S: "2024-12-20T08:08:40.329Z",
+  },
+  description: {
+    S: "Test Description with now etag 1?",
+  },
+  end: {
+    S: "2024-12-20T02:21:00",
+  },
+  featured: {
+    BOOL: false,
+  },
+  host: {
+    S: "ACM",
+  },
+  location: {
+    S: "ACM Room (Siebel CS 1104)",
+  },
+  locationLink: {
+    S: "https://maps.app.goo.gl/dwbBBBkfjkgj8gvA8",
+  },
+  paidEventId: {
+    S: "asasasasasas",
+  },
+  repeatEnds: {
+    S: "2025-12-21T00:00:00",
+  },
+  repeatExcludes: {
+    L: [
+      {
+        S: "2025-06-27",
+      },
+    ],
+  },
+  repeats: {
+    S: "weekly",
+  },
+  start: {
+    S: "2024-12-20T01:21:00",
+  },
+  title: {
+    S: "Test Title",
+  },
+  updatedAt: {
+    S: "2025-03-21T03:34:50.228Z",
+  },
+};
+
 export {
   dynamoTableData,
   dynamoTableDataUnmarshalled,
   dynamoTableDataUnmarshalledUpcomingOnly,
   infraEventsOnly,
   infraEventsOnlyUnmarshalled,
+  dynamoEventWithRepeatExclusion,
 };