Merge branch 'main' into chore_Upgrades_and_syncs_Stripe_across_all_packages

apps/web/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@calcom/web",
-  "version": "3.5.0",
+  "version": "3.5.1",
   "private": true,
   "scripts": {
     "analyze": "ANALYZE=true next build",

packages/core/builders/CalendarEvent/class.ts

@@ -17,7 +17,7 @@ class CalendarEventClass implements CalendarEvent {
   organizer!: Person;
   attendees!: Person[];
   description?: string | null;
-  team?: { name: string; members: Person[] };
+  team?: { name: string; members: Person[]; id: number };
   location?: string | null;
   conferenceData?: ConferenceData;
   additionalInformation?: AdditionalInformation;

packages/features/bookings/lib/handleCancelBooking.ts

@@ -72,7 +72,12 @@ async function getBookingToDelete(id: number | undefined, uid: string | undefine
               hideBranding: true,
             },
           },
-          teamId: true,
+          team: {
+            select: {
+              id: true,
+              name: true,
+            },
+          },
           recurringEvent: true,
           title: true,
           eventName: true,
@@ -151,11 +156,10 @@ async function handler(req: CustomRequest) {
 
   const teamId = await getTeamIdFromEventType({
     eventType: {
-      team: { id: bookingToDelete.eventType?.teamId ?? null },
+      team: { id: bookingToDelete.eventType?.team?.id ?? null },
       parentId: bookingToDelete?.eventType?.parentId ?? null,
     },
   });
-
   const triggerForUser = !teamId || (teamId && bookingToDelete.eventType?.parentId);
 
   const subscriberOptions = {
@@ -255,7 +259,9 @@ async function handler(req: CustomRequest) {
       ? [bookingToDelete?.user.destinationCalendar]
       : [],
     cancellationReason: cancellationReason,
-    ...(teamMembers && { team: { name: "", members: teamMembers } }),
+    ...(teamMembers && {
+      team: { name: bookingToDelete?.eventType?.team?.name || "Nameless", members: teamMembers, id: teamId! },
+    }),
     seatsPerTimeSlot: bookingToDelete.eventType?.seatsPerTimeSlot,
     seatsShowAttendees: bookingToDelete.eventType?.seatsShowAttendees,
   };
@@ -408,7 +414,7 @@ async function handler(req: CustomRequest) {
   if (bookingToDelete.location === DailyLocationType) {
     bookingToDelete.user.credentials.push({
       ...FAKE_DAILY_CREDENTIAL,
-      teamId: bookingToDelete.eventType?.teamId || null,
+      teamId: bookingToDelete.eventType?.team?.id || null,
     });
   }
 
@@ -540,10 +546,10 @@ async function handler(req: CustomRequest) {
     let eventTypeOwnerId;
     if (bookingToDelete.eventType?.owner) {
       eventTypeOwnerId = bookingToDelete.eventType.owner.id;
-    } else if (bookingToDelete.eventType?.teamId) {
+    } else if (bookingToDelete.eventType?.team?.id) {
       const teamOwner = await prisma.membership.findFirst({
         where: {
-          teamId: bookingToDelete.eventType.teamId,
+          teamId: bookingToDelete.eventType?.team.id,
           role: MembershipRole.OWNER,
         },
         select: {

packages/features/bookings/lib/handleNewBooking.ts

@@ -1079,7 +1079,6 @@ async function handler(
       },
     };
   });
-
   const teamMembers = await Promise.all(teamMemberPromises);
 
   const attendeesList = [...invitee, ...guests];
@@ -1887,6 +1886,7 @@ async function handler(
     evt.team = {
       members: teamMembers,
       name: eventType.team?.name || "Nameless",
+      id: eventType.team?.id ?? 0,
     };
   }
 

packages/types/Calendar.d.ts

@@ -160,6 +160,7 @@ export interface CalendarEvent {
   team?: {
     name: string;
     members: TeamMember[];
+    id: number;
   };
   location?: string | null;
   conferenceCredentialId?: number;