From 352ce35b40cc68b3d7830619198e78e58946c259 Mon Sep 17 00:00:00 2001 From: Carina Wollendorfer <30310907+CarinaWolli@users.noreply.github.com> Date: Tue, 25 Oct 2022 21:16:16 +0200 Subject: [PATCH] fix updating already deleted booking (#5201) Co-authored-by: CarinaWolli Co-authored-by: alannnc --- .../app-store/zapier/lib/nodeScheduler.ts | 21 +++++++++++-------- .../features/bookings/lib/handleNewBooking.ts | 2 +- 2 files changed, 13 insertions(+), 10 deletions(-) diff --git a/packages/app-store/zapier/lib/nodeScheduler.ts b/packages/app-store/zapier/lib/nodeScheduler.ts index 6aa7b0bdab..f0096a9f43 100644 --- a/packages/app-store/zapier/lib/nodeScheduler.ts +++ b/packages/app-store/zapier/lib/nodeScheduler.ts @@ -49,7 +49,8 @@ export async function scheduleTrigger( export async function cancelScheduledJobs( booking: { uid: string; scheduledJobs?: string[] }, - appId?: string | null + appId?: string | null, + isReschedule?: boolean ) { let scheduledJobs = booking.scheduledJobs || []; @@ -70,14 +71,16 @@ export async function cancelScheduledJobs( scheduledJobs = []; } - await prisma.booking.update({ - where: { - uid: booking.uid, - }, - data: { - scheduledJobs: scheduledJobs, - }, - }); + if (!isReschedule) { + await prisma.booking.update({ + where: { + uid: booking.uid, + }, + data: { + scheduledJobs: scheduledJobs, + }, + }); + } }); } } diff --git a/packages/features/bookings/lib/handleNewBooking.ts b/packages/features/bookings/lib/handleNewBooking.ts index 65af9330f7..3f37f65306 100644 --- a/packages/features/bookings/lib/handleNewBooking.ts +++ b/packages/features/bookings/lib/handleNewBooking.ts @@ -887,7 +887,7 @@ async function handler(req: NextApiRequest & { userId?: number | undefined }) { subscribersMeetingEnded.forEach((subscriber) => { if (rescheduleUid && originalRescheduledBooking) { - cancelScheduledJobs(originalRescheduledBooking); + cancelScheduledJobs(originalRescheduledBooking, undefined, true); } if (booking && booking.status === BookingStatus.ACCEPTED) { scheduleTrigger(booking, subscriber.subscriberUrl, subscriber);