fix: bookings for guests added by organizer get cancelled when rescheduled by kart1ka · Pull Request #17820 · calcom/cal.diy

kart1ka · 2024-11-24T21:59:45Z

What does this PR do?

Fixes Bookings for Guests Added by Organiser or Team Owner get cancelled when the booking is rescheduled #17813 (GitHub issue number)
Fixes CAL-XXXX (Linear issue number - should be visible at the bottom of the GitHub issue description)

Screencast.from.25-11-24.12.25.13.AM.IST.webm

Mandatory Tasks (DO NOT REMOVE)

I have self-reviewed the code (A decent size PR without self-review might be rejected).
I have updated the developer docs in /docs if this PR makes changes that would require a documentation change. If N/A, write N/A here and check the checkbox.
I confirm automated tests are in place that prove my fix is effective or that my feature works.

How should this be tested?

Create a booking on team pro example account.
Login to team pro example account and Go to /bookings/incoming page.
Add guests to that booking.
Now Reschedule the booking.
Notice that the guests that were just added (by team pro example) are now included in the rescheduled booking.

…duled

vercel · 2024-11-24T21:59:51Z

@kart1ka is attempting to deploy a commit to the cal Team on Vercel.

A member of the Team first needs to authorize it.

graphite-app · 2024-11-24T22:00:12Z

Graphite Automations

"Add consumer team as reviewer" took an action on this PR • (11/24/24)

1 reviewer was added to this PR based on Keith Williams's automation.

"Add community label" took an action on this PR • (11/24/24)

1 label was added to this PR based on Keith Williams's automation.

"Add ready-for-e2e label" took an action on this PR • (11/26/24)

1 label was added to this PR based on Keith Williams's automation.

Praashh

LGTM!!

github-actions · 2024-11-26T10:37:07Z

E2E results are ready!

Workflow #47135.1 latest results

…eduled

anikdhabal

Working fine, but I will check the code once before shipping

github-actions · 2024-12-17T00:23:19Z

This PR is being marked as stale due to inactivity.

Praashh

@kart1ka can you please resolve merge conflicts?

kart1ka · 2024-12-17T07:09:01Z

@kart1ka can you please resolve merge conflicts?

On it.

…eduled

kart1ka · 2024-12-17T09:11:42Z

@kart1ka can you please resolve merge conflicts?

Merge conflicts resolved.

…eduled

github-actions · 2025-02-07T00:21:56Z

This PR is being marked as stale due to inactivity.

…eduled

CLAassistant · 2025-02-07T13:29:46Z

All committers have signed the CLA.

TusharBhatt1 · 2025-02-11T10:49:09Z

@kart1ka tested and LGTM , once the comment is resolved , let's take this ahead

…eduled

kart1ka · 2025-02-11T11:53:30Z

@kart1ka tested and LGTM , once the comment is resolved , let's take this ahead

Done

TusharBhatt1

Tested works well , LGTM !

anikdhabal · 2025-02-11T14:09:40Z

+
+  if (originalRescheduledBooking) {
+    const eventHosts = eventType.hosts.length
+      ? eventType.hosts
+      : eventType.users.map((user) => ({ user, isFixed: false }));
+
+    // For round-robin bookings, find the host from original rescheduled booking
+    const originalRoundRobinHost = eventHosts.find(
+      (host) =>
+        !host.isFixed &&
+        originalRescheduledBooking?.attendees.some((attendee) => attendee.email === host.user.email)
+    )?.user;
+
+    const isSameRRHost = !!originalRescheduledBooking?.userId && eventType.rescheduleWithSameRoundRobinHost;
+
+    // Get the list of team members for original rescheduled booking
+    const originalRescheduledBookingTeamMembers = (
+      isTeamEventType && eventType.schedulingType === SchedulingType.ROUND_ROBIN && !isSameRRHost
+        ? [...users.slice(0, -1), originalRoundRobinHost]
+        : [...users]
+    ).filter((user) => user?.email !== organizerUser.email);
+
+    // Get guests that were added by the booker in the original booking


@kart1ka Is this the right place for the changes? I think we should fix the addGuest handler and find out why it is causing this error. It should be similar to how we normally do it from the booking page. Not confident about the recent changes

…en rescheduled (#17820)" This reverts commit e29b42a.

…duled (#17820) * fix: bookings for guests added by organizer get cancelled when rescheduled * chore --------- Co-authored-by: Tushar Bhatt <95581504+TusharBhatt1@users.noreply.github.com>

…duled (calcom#17820) * fix: bookings for guests added by organizer get cancelled when rescheduled * chore --------- Co-authored-by: Tushar Bhatt <95581504+TusharBhatt1@users.noreply.github.com>

fix: bookings for guests added by organizer get cancelled when resche…

6f8b964

…duled

graphite-app Bot added the community Created by Linear-GitHub Sync label Nov 24, 2024

graphite-app Bot requested a review from a team November 24, 2024 21:59

github-actions Bot added bookings area: bookings, availability, timezones, double booking teams area: teams, round robin, collective, managed event-types 🐛 bug Something isn't working labels Nov 24, 2024

Praashh reviewed Nov 26, 2024

View reviewed changes

Comment thread packages/lib/bookingSuccessRedirect.ts

Praashh approved these changes Nov 26, 2024

View reviewed changes

graphite-app Bot added the ready-for-e2e label Nov 26, 2024

anikdhabal marked this pull request as draft November 26, 2024 18:48

Merge branch 'main' into fix/guests-bookings-get-cancelled-when-resch…

c3884be

…eduled

anikdhabal marked this pull request as ready for review December 1, 2024 16:22

anikdhabal reviewed Dec 2, 2024

View reviewed changes

anikdhabal marked this pull request as draft December 2, 2024 19:30

github-actions Bot added the Stale label Dec 17, 2024

Praashh suggested changes Dec 17, 2024

View reviewed changes

Merge branch 'main' into fix/guests-bookings-get-cancelled-when-resch…

b43b762

…eduled

github-actions Bot removed the Stale label Dec 18, 2024

kart1ka added 3 commits December 20, 2024 11:32

Merge branch 'main' into fix/guests-bookings-get-cancelled-when-resch…

a3a1d24

…eduled

Merge branch 'main' into fix/guests-bookings-get-cancelled-when-resch…

979b0ba

…eduled

Merge branch 'main' into fix/guests-bookings-get-cancelled-when-resch…

acb0d4c

…eduled

anikdhabal marked this pull request as ready for review January 20, 2025 10:33

github-actions Bot added the Stale label Feb 7, 2025

kart1ka and others added 2 commits February 7, 2025 06:59

Merge branch 'main' into fix/guests-bookings-get-cancelled-when-resch…

6772d15

…eduled

Merge branch 'main' into fix/guests-bookings-get-cancelled-when-resch…

37d5cb9

…eduled

TusharBhatt1 reviewed Feb 11, 2025

View reviewed changes

Comment thread packages/features/bookings/lib/handleNewBooking.ts Outdated

kart1ka and others added 3 commits February 11, 2025 16:34

Merge branch 'main' into fix/guests-bookings-get-cancelled-when-resch…

2fd4616

…eduled

chore

f97937e

Merge branch 'main' into fix/guests-bookings-get-cancelled-when-resch…

c56b9a1

…eduled

TusharBhatt1 approved these changes Feb 11, 2025

View reviewed changes

TusharBhatt1 merged commit e29b42a into calcom:main Feb 11, 2025

anikdhabal reviewed Feb 11, 2025

View reviewed changes

keithwillcode added a commit that referenced this pull request Feb 11, 2025

revert: "fix: bookings for guests added by organizer get cancelled wh…

5286033

…en rescheduled (#17820)" This reverts commit e29b42a.

anikdhabal mentioned this pull request Feb 11, 2025

Revert "fix: bookings for guests added by organizer get cancelled when rescheduled" #19242

Closed

Conversation

kart1ka commented Nov 24, 2024

What does this PR do?

Mandatory Tasks (DO NOT REMOVE)

How should this be tested?

Uh oh!

vercel Bot commented Nov 24, 2024

Uh oh!

graphite-app Bot commented Nov 24, 2024 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Graphite Automations

Uh oh!

Uh oh!

Praashh left a comment

Choose a reason for hiding this comment

Uh oh!

github-actions Bot commented Nov 26, 2024 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

E2E results are ready!

Uh oh!

anikdhabal left a comment • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

github-actions Bot commented Dec 17, 2024

Uh oh!

Praashh left a comment

Choose a reason for hiding this comment

Uh oh!

kart1ka commented Dec 17, 2024

Uh oh!

kart1ka commented Dec 17, 2024

Uh oh!

github-actions Bot commented Feb 7, 2025

Uh oh!

CLAassistant commented Feb 7, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Uh oh!

TusharBhatt1 commented Feb 11, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

kart1ka commented Feb 11, 2025

Uh oh!

TusharBhatt1 left a comment

Choose a reason for hiding this comment

Uh oh!

anikdhabal Feb 11, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

5 participants

graphite-app Bot commented Nov 24, 2024 •

edited

Loading

github-actions Bot commented Nov 26, 2024 •

edited

Loading

anikdhabal left a comment •

edited

Loading

CLAassistant commented Feb 7, 2025 •

edited

Loading

TusharBhatt1 commented Feb 11, 2025 •

edited

Loading

anikdhabal Feb 11, 2025 •

edited

Loading