Merge branch 'main' into calendar-error-fix-busy-times

joeauyeung · web-flow · commit 4cef0e91214a · 2025-07-30T20:50:37.000-04:00
diff --git a/packages/app-store/_utils/getCalendar.ts b/packages/app-store/_utils/getCalendar.ts
@@ -49,7 +49,6 @@ export const getCalendar = async (
     log.warn(`calendar of type ${calendarType} is not implemented`);
     return null;
   }
-  log.info("Got calendarApp", calendarApp.lib.CalendarService);
   const CalendarService = calendarApp.lib.CalendarService;
   return new CalendarService(credential);
 };
diff --git a/packages/features/bookings/lib/handleNewBooking/ensureAvailableUsers.ts b/packages/features/bookings/lib/handleNewBooking/ensureAvailableUsers.ts
@@ -222,7 +222,7 @@ const _ensureAvailableUsers = async (
 
     if (!dateRanges.length) {
       loggerWithEventDetails.error(
-        `User does not have availability at this time.`,
+        `User ${user.id} does not have availability at this time.`,
         piiFreeInputDataForLogging
       );
       return;
diff --git a/packages/lib/CalendarManager.ts b/packages/lib/CalendarManager.ts
@@ -267,7 +267,10 @@ export const getBusyCalendarTimes = async (
       );
     }
   } catch (e) {
-    log.warn("Error getting busy calendar times", safeStringify(e));
+    log.warn(`Error getting calendar availability`, {
+      selectedCalendarIds: selectedCalendars.map((calendar) => calendar.externalId),
+      error: safeStringify(e),
+    });
     return { success: false, data: [{ start: startDate, end: endDate, source: "error-placeholder" }] };
   }
   return { success: true, data: results.reduce((acc, availability) => acc.concat(availability), []) };

Original file line number	Diff line number	Diff line change
`@@ -49,7 +49,6 @@ export const getCalendar = async (`
`49`	`49`	log.warn(`calendar of type ${calendarType} is not implemented`);
`50`	`50`	`return null;`
`51`	`51`	`}`
`52`		`- log.info("Got calendarApp", calendarApp.lib.CalendarService);`
`53`	`52`	`const CalendarService = calendarApp.lib.CalendarService;`
`54`	`53`	`return new CalendarService(credential);`
`55`	`54`	`};`
Original file line number	Diff line number	Diff line change
`@@ -267,7 +267,10 @@ export const getBusyCalendarTimes = async (`
`267`	`267`	`);`
`268`	`268`	`}`
`269`	`269`	`} catch (e) {`
`270`		`- log.warn("Error getting busy calendar times", safeStringify(e));`
	`270`	+ log.warn(`Error getting calendar availability`, {
	`271`	`+ selectedCalendarIds: selectedCalendars.map((calendar) => calendar.externalId),`
	`272`	`+ error: safeStringify(e),`
	`273`	`+ });`
`271`	`274`	`return { success: false, data: [{ start: startDate, end: endDate, source: "error-placeholder" }] };`
`272`	`275`	`}`
`273`	`276`	`return { success: true, data: results.reduce((acc, availability) => acc.concat(availability), []) };`