only use CoreOrganizationList for events/ical

Author: devksingh4

src/api/routes/events.ts

@@ -2,7 +2,7 @@ import "zod-openapi/extend";
 import { FastifyPluginAsync, FastifyRequest } from "fastify";
 import { AppRoles } from "../../common/roles.js";
 import { z } from "zod";
-import { AllOrganizationList } from "@acm-uiuc/js-shared";
+import { CoreOrganizationList } from "@acm-uiuc/js-shared";
 import {
   DeleteItemCommand,
   GetItemCommand,
@@ -111,7 +111,7 @@ const baseSchema = z.object({
     description: "Google Maps link for easy navigation to the event location.",
     example: "https://maps.app.goo.gl/dwbBBBkfjkgj8gvA8",
   }),
-  host: z.enum(AllOrganizationList as [string, ...string[]]),
+  host: z.enum(CoreOrganizationList as [string, ...string[]]),
   featured: z.boolean().default(false).openapi({
     description:
       "Whether or not the event should be shown on the ACM @ UIUC website home page (and added to Discord, as available).",
@@ -165,7 +165,7 @@ const eventsPlugin: FastifyPluginAsyncZodOpenApi = async (
                 "If true, only get events which are marked as featured.",
             }),
             host: z
-              .enum(AllOrganizationList as [string, ...string[]])
+              .enum(CoreOrganizationList as [string, ...string[]])
               .optional()
               .openapi({
                 description: "Retrieve events only for a specific host.",

src/api/routes/ics.ts

@@ -14,7 +14,7 @@ import ical, {
 } from "ical-generator";
 import moment from "moment";
 import { getVtimezoneComponent } from "@touch4it/ical-timezones";
-import { AllOrganizationList } from "@acm-uiuc/js-shared";
+import { CoreOrganizationList } from "@acm-uiuc/js-shared";
 import { CLIENT_HTTP_CACHE_POLICY, EventRepeatOptions } from "./events.js";
 import rateLimiter from "api/plugins/rateLimiter.js";
 import { getCacheCounter } from "api/functions/cache.js";
@@ -43,7 +43,7 @@ function generateHostName(host: string) {
 
 const icalPlugin: FastifyPluginAsync = async (fastify, _options) => {
   fastify.register(rateLimiter, {
-    limit: AllOrganizationList.length,
+    limit: CoreOrganizationList.length,
     duration: 30,
     rateLimitIdentifier: "ical",
   });
@@ -53,7 +53,7 @@ const icalPlugin: FastifyPluginAsync = async (fastify, _options) => {
       schema: withTags(["iCalendar Integration"], {
         params: z.object({
           host: z
-            .optional(z.enum(AllOrganizationList as [string, ...string[]]))
+            .optional(z.enum(CoreOrganizationList as [string, ...string[]]))
             .openapi({ description: "Host to get calendar for." }),
         }),
         summary:
@@ -87,7 +87,7 @@ const icalPlugin: FastifyPluginAsync = async (fastify, _options) => {
         reply.header("etag", etag);
       }
       if (host) {
-        if (!AllOrganizationList.includes(host)) {
+        if (!CoreOrganizationList.includes(host)) {
           throw new ValidationError({
             message: `Invalid host parameter "${host}" in path.`,
           });

src/common/policies/events.ts

@@ -1,11 +1,11 @@
 import { string, z } from "zod";
 import { createPolicy } from "./evaluator.js";
-import { AllOrganizationList } from "@acm-uiuc/js-shared";
+import { CoreOrganizationList } from "@acm-uiuc/js-shared";
 import { FastifyRequest } from "fastify";
 
 export const hostRestrictionPolicy = createPolicy(
   "EventsHostRestrictionPolicy",
-  z.object({ host: z.array(z.enum(AllOrganizationList)) }),
+  z.object({ host: z.array(z.enum(CoreOrganizationList)) }),
   (request: FastifyRequest & { username?: string }, params) => {
     if (request.method === "GET") {
       return {

tests/live/ical.test.ts

@@ -1,13 +1,12 @@
-import { expect, test } from "vitest";
-import { AllOrganizationList } from "@acm-uiuc/js-shared";
+import { describe, expect, test } from "vitest";
+import { CoreOrganizationList } from "@acm-uiuc/js-shared";
 import ical from "node-ical";
 const baseEndpoint = `https://core.aws.qa.acmuiuc.org`;
 
 const delay = (ms: number) => new Promise((resolve) => setTimeout(resolve, ms));
 
 const fetchWithRateLimit = async (url: string) => {
   const response = await fetch(url);
-  expect(response.status).toBe(200);
 
   // Check rate limit headers
   const remaining = parseInt(
@@ -26,19 +25,29 @@ const fetchWithRateLimit = async (url: string) => {
   return response;
 };
 
-test("Get calendars with rate limit handling", { timeout: 45000 }, async () => {
-  for (const org of AllOrganizationList) {
-    const response = await fetchWithRateLimit(
-      `${baseEndpoint}/api/v1/ical/${org}`,
-    );
-    expect(response.status).toBe(200);
-    expect(response.headers.get("Content-Disposition")).toEqual(
-      'attachment; filename="calendar.ics"',
-    );
-    const calendar = ical.sync.parseICS(await response.text());
-    expect(calendar["vcalendar"]["type"]).toEqual("VCALENDAR");
-  }
-});
+describe(
+  "Get calendars per organization with rate limit handling",
+  { timeout: 450000 },
+  async () => {
+    for (const org of CoreOrganizationList) {
+      test(`Get ${org} calendar`, async () => {
+        await delay(Math.random() * 200);
+        const response = await fetchWithRateLimit(
+          `${baseEndpoint}/api/v1/ical/${org}`,
+        );
+        if (!response.ok) {
+          console.log(response);
+        }
+        expect(response.status).toBe(200);
+        expect(response.headers.get("Content-Disposition")).toEqual(
+          'attachment; filename="calendar.ics"',
+        );
+        const calendar = ical.sync.parseICS(await response.text());
+        expect(calendar["vcalendar"]["type"]).toEqual("VCALENDAR");
+      });
+    }
+  },
+);
 
 test("Check that the ical base works", { timeout: 45000 }, async () => {
   const response = await fetchWithRateLimit(