Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix: Booking Cancelled Webhook - Organiser webhook payload is missing id. #14697 #14745

Merged
merged 11 commits into from
May 6, 2024
Merged

fix: Booking Cancelled Webhook - Organiser webhook payload is missing id. #14697 #14745

Changes from 3 commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
aabc7a5
fix: include id information to be consistent with create/reschedule f…
vikaspatil0021 Apr 25, 2024
9cf1a26
fix: include username as well
vikaspatil0021 Apr 25, 2024
a85be4c
Merge branch 'main' into fix/missing-id
Udit-takkar Apr 25, 2024
d533e7b
Merge branch 'calcom:main' into fix/missing-id
vikaspatil0021 Apr 26, 2024
fc3c4fa
Merge branch 'main' into fix/missing-id
vikaspatil0021 Apr 26, 2024
cc0add6
function expectBookingCancelledWebhookToHaveBeenFired created
vikaspatil0021 Apr 26, 2024
00cf9b7
Merge branch 'main' into fix/missing-id
vikaspatil0021 Apr 27, 2024
a1a1b0a
Merge branch 'main' into fix/missing-id
vikaspatil0021 Apr 28, 2024
abdbc7d
chore: undo yarn.lock
Udit-takkar May 6, 2024
ea010c1
Merge branch 'main' into fix/missing-id
Udit-takkar May 6, 2024
a6ff2a0
Merge branch 'main' into fix/missing-id
Udit-takkar May 6, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
8 changes: 6 additions & 2 deletions packages/features/bookings/lib/handleCancelBooking.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -200,6 +200,8 @@ async function handler(req: CustomRequest) {
id: bookingToDelete.userId,
},
select: {
id: true,
username:true,
name: true,
email: true,
timeZone: true,
Expand Down Expand Up @@ -255,6 +257,8 @@ async function handler(req: CustomRequest) {
startTime: bookingToDelete?.startTime ? dayjs(bookingToDelete.startTime).format() : "",
endTime: bookingToDelete?.endTime ? dayjs(bookingToDelete.endTime).format() : "",
organizer: {
id: organizer.id,
username: organizer.username || undefined,
email: bookingToDelete?.userPrimaryEmail ?? organizer.email,
name: organizer.name ?? "Nameless",
timeZone: organizer.timeZone,
Expand All @@ -272,8 +276,8 @@ async function handler(req: CustomRequest) {
destinationCalendar: bookingToDelete?.destinationCalendar
? [bookingToDelete?.destinationCalendar]
: bookingToDelete?.user.destinationCalendar
? [bookingToDelete?.user.destinationCalendar]
: [],
? [bookingToDelete?.user.destinationCalendar]
: [],
cancellationReason: cancellationReason,
...(teamMembers && {
team: { name: bookingToDelete?.eventType?.team?.name || "Nameless", members: teamMembers, id: teamId! },
Expand Down