From 29b09ce85d5ea2fa3467f49797509ef7248a1a06 Mon Sep 17 00:00:00 2001 From: Joe Au-Yeung <65426560+joeauyeung@users.noreply.github.com> Date: Wed, 25 May 2022 10:29:38 -0400 Subject: [PATCH] Resolve if can't find event on google cal (#2860) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * Resolve if can't find event on google cal * Change order of console.error Co-authored-by: Omar López Co-authored-by: Omar López Co-authored-by: Peer Richelsen --- .../googlecalendar/lib/CalendarService.ts | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/packages/app-store/googlecalendar/lib/CalendarService.ts b/packages/app-store/googlecalendar/lib/CalendarService.ts index ae2c33ba8d..9b2c1f8b0c 100644 --- a/packages/app-store/googlecalendar/lib/CalendarService.ts +++ b/packages/app-store/googlecalendar/lib/CalendarService.ts @@ -102,10 +102,13 @@ export default class GoogleCalendarService implements Calendar { dateTime: calEventRaw.endTime, timeZone: calEventRaw.organizer.timeZone, }, - attendees: [{...calEventRaw.organizer, organizer: true }, ... calEventRaw.attendees.map((attendee) => ({ - ...attendee, - responseStatus: "accepted", - }))], + attendees: [ + { ...calEventRaw.organizer, organizer: true }, + ...calEventRaw.attendees.map((attendee) => ({ + ...attendee, + responseStatus: "accepted", + })), + ], reminders: { useDefault: true, }, @@ -235,8 +238,10 @@ export default class GoogleCalendarService implements Calendar { }, function (err: GoogleCalError | null, event) { if (err) { - if (err.code === 410) resolve(); + /* 410 is when an event is already deleted on the Google cal before on cal.com + 404 is when the event is on a different calendar */ console.error("There was an error contacting google calendar service: ", err); + if (err.code === (410 || 404)) return resolve(); return reject(err); } return resolve(event?.data);