Skip to content

Seated booking rescheduling.#5427

Merged
emrysal merged 140 commits intomainfrom
fix/reschedule-on-booking-with-seats-5340
Mar 14, 2023
Merged

Seated booking rescheduling.#5427
emrysal merged 140 commits intomainfrom
fix/reschedule-on-booking-with-seats-5340

Conversation

@alannnc
Copy link
Copy Markdown
Contributor

@alannnc alannnc commented Nov 8, 2022 •
edited by emrysal
Loading

What does this PR do?

  • Add new table bookingSeatsReferences that saves every data of the new attendee in a new row so it can be linked to a single booking. This data wasn't being saved anywhere.
  • Book page can now receive a rescheduleUid as a uniqueAttendeeId too that links to a bookingSeatReference
  • Reschedule logic for booking with seats
  • Adds test to reschedule with seats

Fixes #5340

Environment: Staging(main branch) / Production

Type of change

  • Bug fix (non-breaking change which fixes an issue)
  • Chore (refactoring code, technical debt, workflow improvements)

How should this be tested?

  • Config event type as seats with booking
  • Reserve/cancel/reschedule flows

Checklist

  • I haven't performed a self-review of my own code and corrected any misspellings
  • I haven't commented my code, particularly in hard-to-understand areas
  • I haven't checked if my changes generate no new warnings
  • I haven't checked if new and existing unit tests pass locally with my changes

@alannnc alannnc linked an issue Nov 8, 2022 that may be closed by this pull request
[CAL-310] As an attendee I can't manage a multi-seat booking through my email if someone joined after me. #5340
Closed
@vercel
Copy link
Copy Markdown

vercel bot commented Nov 8, 2022 •
edited
Loading

The latest updates on your projects. Learn more about Vercel for Git ↗︎

Name Status Preview Comments Updated
cal ✅ Ready (Inspect) Visit Preview 💬 Add your feedback Mar 14, 2023 at 4:09AM (UTC)
1 Ignored Deployment
Name Status Preview Comments Updated
ui ⬜️ Ignored (Inspect) Visit Preview Mar 14, 2023 at 4:09AM (UTC)

@what-the-diff
Copy link
Copy Markdown

what-the-diff bot commented Nov 8, 2022

  • Reschedule logic for booking with seats
  • Fixing rescheduling bug when attendee is not the last one in a booking with seats (attendees were being removed from event calendar)

@alannnc alannnc changed the title WIP-already-reschedule-success-emails-missing WIP-reschedule-on-booking-with-seats Nov 8, 2022
@github-actions github-actions bot added the ❗️ migrations contains migration files label Feb 2, 2023
@emrysal
Copy link
Copy Markdown
Contributor

emrysal commented Mar 13, 2023 •
edited
Loading

After having booked Seat one, it still shows 2 / 2:
image

Edit: This happens only if you refresh the page after clicking back, if you click on the availability page to go to the booking page it is properly updated.

@emrysal
Copy link
Copy Markdown
Contributor

emrysal commented Mar 13, 2023 •
edited
Loading

image

This could be correct, I have booking entries per each seat.

@alannnc
Copy link
Copy Markdown
Contributor Author

alannnc commented Mar 13, 2023

@emrysal Yeah it's part of the same bug I think, right now it's creating 2 booking when it should be one with many bookingSeats.

alannnc and others added 15 commits March 13, 2023 14:36
@alannnc
Fix seats booking creation
c8bce42
@emrysal
Fall through normal booking for initial booking, handleSeats for seco…
67fc5f5 
…ndary/reschedule
@emrysal
Simplification of fetching booking
b1478de
@emrysal
Enable seats for round-robin events
f0b60bd
@emrysal
A lot harder than I expected
cb6b907
@emrysal
ignore-owner-if-seat-reference-given
5c25711
@emrysal
Return seatReferenceUid when second seat
922bad6
@emrysal
negate userIsOwner
62018ae
@alannnc
Fix booking seats with a link without bookingUid
c20d15c
@emrysal
Needed a time check otherwise the attendee will be in the older booking
535fd43
@alannnc
Merge branch 'fix/reschedule-on-booking-with-seats-5340' of ssh://git…
54ccc6f 
…hub.com/calcom/cal.com into fix/reschedule-on-booking-with-seats-5340
@emrysal
Merge branch 'main' into fix/reschedule-on-booking-with-seats-5340
5a7b9bb
@emrysal
Can't open dialog twice in test..
a604306
@emrysal
Allow passing the booking ID from the server
2f47240
@emrysal
Fixed isCancelled check, fixed test
13e40a1
emrysal
emrysal approved these changes Mar 14, 2023
View reviewed changes
Copy link
Copy Markdown
Contributor

@emrysal emrysal left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Now passes all tests

  • Booking initial seat creates the booking
  • Booking secondary seat creates a second bookingSeat
  • Rescheduling by bookingUid reschedules the entire booking and all attendees
  • Rescheduling by attendeeUuid reschedules just the attendee
  • Cancelling by attendeeUuid doesn't cancel the event for everyone
  • Cancelling as an organizer does.

@hussamkhatib hussamkhatib mentioned this pull request Mar 21, 2023
Closed
@CarinaWolli CarinaWolli mentioned this pull request Mar 23, 2023
Merged
1 task
@hariombalhara hariombalhara mentioned this pull request Apr 3, 2023
Merged
1 task
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@emrysal emrysal emrysal approved these changes

@joeauyeung joeauyeung Awaiting requested review from joeauyeung

@hariombalhara hariombalhara Awaiting requested review from hariombalhara

@CarinaWolli CarinaWolli Awaiting requested review from CarinaWolli

@roae roae Awaiting requested review from roae

@keithwillcode keithwillcode Awaiting requested review from keithwillcode

@zomars zomars Awaiting requested review from zomars

Assignees

@emrysal emrysal

@alannnc alannnc

@joeauyeung joeauyeung

Labels

🐛 bug Something isn't working core area: core, team members only High priority Created by Linear-GitHub Sync ❗️ migrations contains migration files

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

[CAL-310] As an attendee I can't manage a multi-seat booking through my email if someone joined after me.

6 participants

@alannnc @PeerRich @zomars @joeauyeung @roae @emrysal