fix(calendar-rate): adjust google calendar api rate limit

Author: migpovrap

package.json

@@ -33,6 +33,7 @@
     "next": "^16.0.0",
     "next-themes": "^0.4.6",
     "nodemailer": "^7.0.5",
+    "p-limit": "^7.2.0",
     "pg": "^8.15.6",
     "react": "^19.0.0",
     "react-day-picker": "^9.11.1",

src/app/api/calendar/notion-webhook/route.ts

@@ -1,5 +1,7 @@
 import { NextRequest, NextResponse } from "next/server";
+import pLimit from "p-limit";
 import { Client } from "@notionhq/client";
+import { google } from "googleapis";
 import crypto from "crypto";
 import fs from "fs/promises";
 import path from "path";
@@ -10,7 +12,7 @@ import {
   NotionApiResponse,
   mapNotionResultToPage,
 } from "@/types/notion";
-import { syncAllEventsToCalendar, getOrCreateUserCalendar } from "@/utils/googleCalendar";
+import { syncAllEventsToCalendar } from "@/utils/googleCalendar";
 import { getAllUsers } from "@/utils/dbUtils";
 
 const NOTION_API_KEY = process.env.NOTION_API_KEY!;
@@ -58,35 +60,60 @@ async function fetchAllNotionEvents(): Promise<NotionEvent[]> {
   return pages.map(parseNotionPageToEvent);
 }
 
+async function getExistingNEIISTCalendars() {
+  const SCOPES = ["https://www.googleapis.com/auth/calendar"];
+  const serviceAccountKey = JSON.parse(process.env.GOOGLE_SERVICE_ACCOUNT_KEY!);
+  const auth = new google.auth.GoogleAuth({
+    credentials: serviceAccountKey,
+    scopes: SCOPES,
+  });
+  const calendar = google.calendar({ version: "v3", auth });
+
+  const response = await calendar.calendarList.list();
+  const calendars = response.data.items || [];
+  return calendars.filter((cal) => cal.summary?.startsWith("NEIIST-"));
+}
+
 async function syncAllEventsToGoogleCalendars(events: NotionEvent[]) {
   const allUsers = await getAllUsers();
-  const users = allUsers.filter((u) => u.email && u.istid);
+  const existingCalendars = await getExistingNEIISTCalendars();
+  const calendarByIstid = new Map<string, { id: string; summary: string }>();
+
+  existingCalendars.forEach((cal) => {
+    const istidMatch = cal.description?.match(/istid:([a-zA-Z0-9]+)/);
+    if (istidMatch) {
+      calendarByIstid.set(istidMatch[1], { id: cal.id!, summary: cal.summary! });
+    }
+  });
+
+  const usersWithCalendars = allUsers.filter(
+    (u) => u.email && u.istid && calendarByIstid.has(u.istid)
+  );
+
+  const limit = pLimit(2);
 
   const results = await Promise.all(
-    users.map(async (user) => {
-      try {
-        const alternativeEmailRaw = user.alternativeEmailVerified
-          ? user.alternativeEmail
-          : undefined;
-        const alternativeEmail = alternativeEmailRaw ?? undefined;
-        const calendarId = await getOrCreateUserCalendar(
-          user.email!,
-          user.istid,
-          user.name,
-          alternativeEmail
-        );
-        const stats = await syncAllEventsToCalendar(
-          calendarId,
-          events,
-          user.email!,
-          alternativeEmail
-        );
-        return stats;
-      } catch (error) {
-        console.error(`✗ Error syncing calendar for ${user.istid}:`, error);
-        return { updated: 0, deleted: 0, unchanged: 0 };
-      }
-    })
+    usersWithCalendars.map((user) =>
+      limit(async () => {
+        try {
+          const alternativeEmailRaw = user.alternativeEmailVerified
+            ? user.alternativeEmail
+            : undefined;
+          const alternativeEmail = alternativeEmailRaw ?? undefined;
+          const calendarId = calendarByIstid.get(user.istid)!.id;
+          const stats = await syncAllEventsToCalendar(
+            calendarId,
+            events,
+            user.email!,
+            alternativeEmail
+          );
+          return stats;
+        } catch (error) {
+          console.error(`Error syncing calendar for ${user.istid}:`, error);
+          return { updated: 0, deleted: 0, unchanged: 0 };
+        }
+      })
+    )
   );
 
   const totals = results.reduce(

yarn.lock

@@ -2991,6 +2991,13 @@ p-limit@^3.0.2:
   dependencies:
     yocto-queue "^0.1.0"
 
+p-limit@^7.2.0:
+  version "7.2.0"
+  resolved "https://registry.yarnpkg.com/p-limit/-/p-limit-7.2.0.tgz#afcf6b5a86d093660140497dda0e640dd01a7b3b"
+  integrity sha512-ATHLtwoTNDloHRFFxFJdHnG6n2WUeFjaR8XQMFdKIv0xkXjrER8/iG9iu265jOM95zXHAfv9oTkqhrfbIzosrQ==
+  dependencies:
+    yocto-queue "^1.2.1"
+
 p-locate@^4.1.0:
   version "4.1.0"
   resolved "https://registry.yarnpkg.com/p-locate/-/p-locate-4.1.0.tgz#a3428bb7088b3a60292f66919278b7c297ad4f07"
@@ -4013,3 +4020,8 @@ yocto-queue@^0.1.0:
   version "0.1.0"
   resolved "https://registry.yarnpkg.com/yocto-queue/-/yocto-queue-0.1.0.tgz#0294eb3dee05028d31ee1a5fa2c556a6aaf10a1b"
   integrity sha512-rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q==
+
+yocto-queue@^1.2.1:
+  version "1.2.1"
+  resolved "https://registry.yarnpkg.com/yocto-queue/-/yocto-queue-1.2.1.tgz#36d7c4739f775b3cbc28e6136e21aa057adec418"
+  integrity sha512-AyeEbWOu/TAXdxlV9wmGcR0+yh2j3vYPGOECcIj2S7MkrLyC7ne+oye2BKTItt0ii2PHk4cDy+95+LshzbXnGg==