Change relationship of team members and bookings to many-to-many by joeauyeung · Pull Request #6553 · calcom/cal.com

joeauyeung · 2023-01-18T16:51:32Z

What does this PR do?

This PR changes the relationship between team members and bookings to a many-to-many relationship. This should help with future bug fixes and features surrounding teams.

Fixes #6582

TODO:
Ensure that all features involving team members and bookings are working correctly

Environment: Staging(main branch) / Production

Type of change

For both round robin and collective team events
- Create a booking under these two team event types
- Log into a second team member and check that you can reschedule and cancel these bookings
- Do the same but adding seats, requires confirmation, reoccurring, and payments
- Also check that workflows are scheduled & emails are being sent to all team members associated with those bookings

Checklist

I haven't added tests that prove my fix is effective or that my feature works
I haven't checked if new and existing unit tests pass locally with my changes

…ings

vercel · 2023-01-18T16:51:37Z

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	Feb 8, 2023 at 8:02PM (UTC)
cal-com-storybook	✅ Ready (Inspect)	Visit Preview	💬 Add your feedback	Feb 8, 2023 at 8:02PM (UTC)
ui	✅ Ready (Inspect)	Visit Preview	💬 Add your feedback	Feb 8, 2023 at 8:02PM (UTC)

…ings

zomars · 2023-02-08T19:30:02Z

Just to be sure. What problem is this PR solving specifically?

…ings

This reverts commit 606e538. # Conflicts: # packages/prisma/schema.prisma

zomars

Will block to address some questions. Maybe I'm missing some context on why this PR is necessary as well. But still I cannot merge a PR that I cannot understand yet.

zomars · 2023-02-08T19:32:39Z

packages/prisma/schema.prisma

  appId                String?
  destinationCalendars DestinationCalendar[]
  invalid              Boolean?              @default(false)
+  bookingReferences    BookingReference[]


zomars · 2023-02-08T19:33:04Z

packages/prisma/schema.prisma

  externalCalendarId String?
  deleted            Boolean?
  credentialId       Int?
+  credential         Credential? @relation(fields: [credentialId], references: [id])


What are we using this for?

zomars · 2023-02-08T19:35:36Z

packages/prisma/schema.prisma

  id                    Int                  @id @default(autoincrement())
  uid                   String               @unique
-  user                  User?                @relation(fields: [userId], references: [id])
+  user                  User[]


Some observations:

Are we trying to keep track of attendees here?

How do we differentiate between an owner and attendee?

What does it means that a Booking has a ´user´?

zomars · 2023-02-08T19:38:25Z

packages/trpc/server/routers/viewer/workflows.tsx

-                      name: booking.user.name || "",
-                      email: booking.user.email,
-                      timeZone: booking.user.timeZone,
+                      language: { locale: booking.user[0]?.locale || "" },


I'm not a fan of polluting with ´booking.user[0]´ everywhere. It is not legible. Let's either set a constant (const organizer = booking.user[0]) or rethink where to save the organizer.

joeauyeung · 2023-05-23T16:08:03Z

Closing for now and reevaluate at a later date.

joeauyeung added 9 commits January 16, 2023 16:07

Change schema user - booking many-to-many relationship

5fd411f

Collective team event write members to booking DB

d4b507c

Show bookings for team members

349f948

Merge branch 'main' into change-relationship-of-team-members-and-book…

7f72f3c

…ings

Write team members to round robin booking

720c3d0

Fix text color error

1d1ea39

Add credential relationship to booking reference

7f78a8b

Reference booking references when canceling

470edfa

Delete duplicate evt in cancelation

3d79530

github-actions bot added the ❗️ migrations contains migration files label Jan 18, 2023

vercel bot deployed to Preview – cal January 18, 2023 16:57 View deployment

joeauyeung added 3 commits January 18, 2023 12:04

Fix CalEvent in CalendarEventBuilder

c51f3ba

Grab first user for each app

c9f1f58

Grab locale from first user

cc66f14

vercel bot deployed to Preview – cal January 18, 2023 17:25 View deployment

joeauyeung added 2 commits January 18, 2023 13:10

Attendee request, iterate through attendees to send

afcf189

Hide attendees only on seats

8a40f7d

vercel bot deployed to Preview – cal January 18, 2023 18:33 View deployment

joeauyeung added 4 commits January 18, 2023 13:59

Scheduled emails show team members

aa4b039

Allow users of bookings to make changes

ce36c6a

Show team members on booking page

9fcbbff

Fix adding team members to evt

92d2362

vercel bot deployed to Preview – cal January 18, 2023 20:50 View deployment

Fix team email toAddresses

55a13ed

vercel bot deployed to Preview – cal January 18, 2023 21:20 View deployment

joeauyeung added 2 commits January 18, 2023 16:40

Fix types in bookings

12f2226

WIP

5aedbc4

vercel bot deployed to Preview – cal January 19, 2023 20:11 View deployment

More type fixes

1999675

joeauyeung added 🧹 Improvements Improvements to existing features. Mostly UX/UI teams area: teams, round robin, collective, managed event-types labels Jan 26, 2023

joeauyeung changed the title ~~WIP Change relationship of team members and bookings to many-to-many~~ Change relationship of team members and bookings to many-to-many Jan 26, 2023

zomars force-pushed the main branch from 606e538 to 23de92f Compare January 26, 2023 20:32

joeauyeung requested a review from a team January 26, 2023 20:57

joeauyeung marked this pull request as ready for review January 26, 2023 20:57

Remove console.logs

ebf2212

vercel bot had a problem deploying to Preview – cal January 26, 2023 21:15 Failure

Merge branch 'main' into change-relationship-of-team-members-and-book…

7ebaccd

…ings

vercel bot had a problem deploying to Preview – cal January 26, 2023 22:12 Failure

Merge branch 'main' into change-relationship-of-team-members-and-book…

8ef556c

…ings

vercel bot had a problem deploying to Preview – cal January 27, 2023 17:35 Failure

vercel bot had a problem deploying to Preview – ui January 27, 2023 17:35 Failure

Merge branch 'main' into change-relationship-of-team-members-and-book…

3fd8dad

…ings

vercel bot had a problem deploying to Preview – ui February 6, 2023 05:52 Failure

vercel bot had a problem deploying to Preview – cal February 6, 2023 05:53 Failure

Merge branch 'main' into change-relationship-of-team-members-and-book…

d848b6e

…ings

vercel bot had a problem deploying to Preview – cal February 8, 2023 19:35 Failure

vercel bot deployed to Preview – ui February 8, 2023 19:36 View deployment

Revert "Adds deployment settings to DB (#6706)"

681b6f4

This reverts commit 606e538. # Conflicts: # packages/prisma/schema.prisma

zomars force-pushed the change-relationship-of-team-members-and-bookings branch from fa37ec8 to 681b6f4 Compare February 8, 2023 19:42

Update RadioAreaGroup.tsx

60bcf4a

zomars suggested changes Feb 8, 2023

View reviewed changes

vercel bot deployed to Preview – ui February 8, 2023 19:58 View deployment

vercel bot deployed to Preview – cal February 8, 2023 20:02 View deployment

joeauyeung marked this pull request as draft February 13, 2023 21:59

joeauyeung closed this May 23, 2023

keithwillcode deleted the change-relationship-of-team-members-and-bookings branch September 17, 2025 11:45

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Change relationship of team members and bookings to many-to-many#6553

Change relationship of team members and bookings to many-to-many#6553
joeauyeung wants to merge 38 commits intomainfrom
change-relationship-of-team-members-and-bookings

joeauyeung commented Jan 18, 2023 •

edited

Loading

Uh oh!

vercel bot commented Jan 18, 2023 •

edited

Loading

Uh oh!

zomars commented Feb 8, 2023

Uh oh!

zomars left a comment

Uh oh!

zomars Feb 8, 2023

Uh oh!

zomars Feb 8, 2023

Uh oh!

zomars Feb 8, 2023

Uh oh!

zomars Feb 8, 2023

Uh oh!

joeauyeung commented May 23, 2023 •

edited

Loading

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

Conversation

joeauyeung commented Jan 18, 2023 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

What does this PR do?

Type of change

Checklist

Uh oh!

vercel bot commented Jan 18, 2023 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

zomars commented Feb 8, 2023

Uh oh!

zomars left a comment

Choose a reason for hiding this comment

Uh oh!

zomars Feb 8, 2023

Choose a reason for hiding this comment

Uh oh!

zomars Feb 8, 2023

Choose a reason for hiding this comment

Uh oh!

zomars Feb 8, 2023

Choose a reason for hiding this comment

Uh oh!

zomars Feb 8, 2023

Choose a reason for hiding this comment

Uh oh!

joeauyeung commented May 23, 2023 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

joeauyeung commented Jan 18, 2023 •

edited

Loading

vercel bot commented Jan 18, 2023 •

edited

Loading

joeauyeung commented May 23, 2023 •

edited

Loading