From a4d6f7da6274935161f23c2069420372e28caa8d Mon Sep 17 00:00:00 2001 From: Leo Giovanetti Date: Fri, 13 Jan 2023 15:29:42 -0300 Subject: [PATCH] Fixing GCal emailing notif and sequential deleting (#6460) --- packages/app-store/googlecalendar/lib/CalendarService.ts | 2 +- packages/features/bookings/lib/handleCancelBooking.ts | 9 +++++---- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/packages/app-store/googlecalendar/lib/CalendarService.ts b/packages/app-store/googlecalendar/lib/CalendarService.ts index 9e516b05e3..42c6a7c916 100644 --- a/packages/app-store/googlecalendar/lib/CalendarService.ts +++ b/packages/app-store/googlecalendar/lib/CalendarService.ts @@ -273,7 +273,7 @@ export default class GoogleCalendarService implements Calendar { auth: myGoogleAuth, calendarId: calendarId ? calendarId : defaultCalendarId, eventId: uid, - sendNotifications: true, + sendNotifications: false, sendUpdates: "all", }, function (err: GoogleCalError | null, event) { diff --git a/packages/features/bookings/lib/handleCancelBooking.ts b/packages/features/bookings/lib/handleCancelBooking.ts index 99a41e8769..0f87754973 100644 --- a/packages/features/bookings/lib/handleCancelBooking.ts +++ b/packages/features/bookings/lib/handleCancelBooking.ts @@ -306,15 +306,16 @@ async function handler(req: NextApiRequest & { userId?: number }) { ) { bookingToDelete.user.credentials .filter((credential) => credential.type.endsWith("_calendar")) - .forEach((credential) => { + .forEach(async (credential) => { const calendar = getCalendar(credential); - updatedBookings.forEach((updBooking) => { + for (const updBooking of updatedBookings) { const bookingRef = updBooking.references.find((ref) => ref.type.includes("_calendar")); if (bookingRef) { const { uid, externalCalendarId } = bookingRef; - apiDeletes.push(calendar?.deleteEvent(uid, evt, externalCalendarId) as Promise); + const deletedEvent = await calendar?.deleteEvent(uid, evt, externalCalendarId); + apiDeletes.push(deletedEvent); } - }); + } }); } else { apiDeletes.push(calendar?.deleteEvent(uid, evt, externalCalendarId) as Promise);