Fix - add team members to emails

apps/web/pages/api/email.ts

@@ -35,6 +35,17 @@ const handler = async (req: NextApiRequest, res: NextApiResponse) => {
     uid: "xxyPr4cg2xx4XoS2KeMEQy",
     metadata: {},
     recurringEvent: null,
+    team: {
+      name: "Team example",
+      members: [
+        { name: "team member 1", email: "team@example.com" },
+        { name: "team member 2", email: "team2@example.com" },
+        { name: "team member 3", email: "team3@example.com" },
+        { name: "team member 4", email: "team4@example.com" },
+        { name: "team member 5", email: "team5@example.com" },
+        { name: "team member 6", email: "team6@example.com" },
+      ],
+    },
     appsStatus: [
       {
         appName: "Outlook Calendar",

apps/web/public/static/locales/en/common.json

@@ -1599,5 +1599,6 @@
   "booking_with_payment_cancelled_already_paid": "A refund for this booking payment it's on the way.",
   "booking_with_payment_cancelled_refunded": "This booking payment has been refunded.",
   "booking_confirmation_failed": "Booking confirmation failed",
-  "get_started_zapier_templates": "Get started with Zapier templates"
+  "get_started_zapier_templates": "Get started with Zapier templates",
+  "team_member": "Team member"
 }

packages/core/EventManager.ts

@@ -1,7 +1,7 @@
-import { DestinationCalendar } from "@prisma/client";
+import type { DestinationCalendar } from "@prisma/client";
 import merge from "lodash/merge";
 import { v5 as uuidv5 } from "uuid";
-import { z } from "zod";
+import type { z } from "zod";
 
 import { FAKE_DAILY_CREDENTIAL } from "@calcom/app-store/dailyvideo/lib/VideoApiAdapter";
 import { getEventLocationTypeFromApp } from "@calcom/app-store/locations";
@@ -10,7 +10,7 @@ import getApps from "@calcom/app-store/utils";
 import prisma from "@calcom/prisma";
 import { createdEventSchema } from "@calcom/prisma/zod-utils";
 import type { AdditionalInformation, CalendarEvent, NewCalendarEventType } from "@calcom/types/Calendar";
-import { CredentialPayload, CredentialWithAppName } from "@calcom/types/Credential";
+import type { CredentialPayload, CredentialWithAppName } from "@calcom/types/Credential";
 import type { Event } from "@calcom/types/Event";
 import type {
   CreateUpdateResult,
@@ -255,8 +255,10 @@ export default class EventManager {
       results.push(result);
     }
 
-    // Update all calendar events.
-    results.push(...(await this.updateAllCalendarEvents(evt, booking)));
+    // If there is a calendar reference, update all calendar events.
+    if (booking.references.some((reference) => reference.type.includes("_calendar"))) {
+      results.push(...(await this.updateAllCalendarEvents(evt, booking)));
+    }
 
     const bookingPayment = booking?.payment;
 

packages/emails/email-manager.ts

@@ -1,4 +1,5 @@
-import { TFunction } from "next-i18next";
+import { cloneDeep } from "lodash";
+import type { TFunction } from "next-i18next";
 
 import type { CalendarEvent, Person } from "@calcom/types/Calendar";
 
@@ -12,8 +13,10 @@ import AttendeeScheduledEmail from "./templates/attendee-scheduled-email";
 import AttendeeWasRequestedToRescheduleEmail from "./templates/attendee-was-requested-to-reschedule-email";
 import BrokenIntegrationEmail from "./templates/broken-integration-email";
 import DisabledAppEmail from "./templates/disabled-app-email";
-import FeedbackEmail, { Feedback } from "./templates/feedback-email";
-import ForgotPasswordEmail, { PasswordReset } from "./templates/forgot-password-email";
+import type { Feedback } from "./templates/feedback-email";
+import FeedbackEmail from "./templates/feedback-email";
+import type { PasswordReset } from "./templates/forgot-password-email";
+import ForgotPasswordEmail from "./templates/forgot-password-email";
 import OrganizerCancelledEmail from "./templates/organizer-cancelled-email";
 import OrganizerLocationChangeEmail from "./templates/organizer-location-change-email";
 import OrganizerPaymentRefundFailedEmail from "./templates/organizer-payment-refund-failed-email";
@@ -22,10 +25,12 @@ import OrganizerRequestReminderEmail from "./templates/organizer-request-reminde
 import OrganizerRequestedToRescheduleEmail from "./templates/organizer-requested-to-reschedule-email";
 import OrganizerRescheduledEmail from "./templates/organizer-rescheduled-email";
 import OrganizerScheduledEmail from "./templates/organizer-scheduled-email";
-import TeamInviteEmail, { TeamInvite } from "./templates/team-invite-email";
+import type { TeamInvite } from "./templates/team-invite-email";
+import TeamInviteEmail from "./templates/team-invite-email";
 
 export const sendScheduledEmails = async (calEvent: CalendarEvent) => {
   const emailsToSend: Promise<unknown>[] = [];
+  const clonedEvent = cloneDeep(calEvent);
 
   emailsToSend.push(
     ...calEvent.attendees.map((attendee) => {
@@ -43,19 +48,37 @@ export const sendScheduledEmails = async (calEvent: CalendarEvent) => {
   emailsToSend.push(
     new Promise((resolve, reject) => {
       try {
-        const scheduledEmail = new OrganizerScheduledEmail(calEvent);
+        const scheduledEmail = new OrganizerScheduledEmail(clonedEvent);
         resolve(scheduledEmail.sendEmail());
       } catch (e) {
         reject(console.error("OrganizerScheduledEmail.sendEmail failed", e));
       }
     })
   );
 
+  if (clonedEvent.team) {
+    for (const teamMember of clonedEvent.team.members) {
+      emailsToSend.push(
+        new Promise((resolve, reject) => {
+          try {
+            const scheduledEmail = new OrganizerScheduledEmail(clonedEvent, undefined, teamMember);
+            resolve(scheduledEmail.sendEmail());
+          } catch (e) {
+            reject(console.error("OrganizerScheduledEmail.sendEmail failed", e));
+          }
+        })
+      );
+    }
+  }
+
   await Promise.all(emailsToSend);
 };
 
 export const sendRescheduledEmails = async (calEvent: CalendarEvent) => {
   const emailsToSend: Promise<unknown>[] = [];
+
+  const clonedEvent = cloneDeep(calEvent);
+
   // @TODO: we should obtain who is rescheduling the event and send them a different email
   emailsToSend.push(
     ...calEvent.attendees.map((attendee) => {
@@ -73,14 +96,29 @@ export const sendRescheduledEmails = async (calEvent: CalendarEvent) => {
   emailsToSend.push(
     new Promise((resolve, reject) => {
       try {
-        const scheduledEmail = new OrganizerRescheduledEmail(calEvent);
+        const scheduledEmail = new OrganizerRescheduledEmail(clonedEvent);
         resolve(scheduledEmail.sendEmail());
       } catch (e) {
         reject(console.error("OrganizerRescheduledEmail.sendEmail failed", e));
       }
     })
   );
 
+  if (clonedEvent.team) {
+    for (const teamMember of clonedEvent.team.members) {
+      emailsToSend.push(
+        new Promise((resolve, reject) => {
+          try {
+            const scheduledEmail = new OrganizerRescheduledEmail(clonedEvent, undefined, teamMember);
+            resolve(scheduledEmail.sendEmail());
+          } catch (e) {
+            reject(console.error("OrganizerRescheduledEmail.sendEmail failed", e));
+          }
+        })
+      );
+    }
+  }
+
   await Promise.all(emailsToSend);
 };
 
@@ -161,6 +199,8 @@ export const sendDeclinedEmails = async (calEvent: CalendarEvent) => {
 export const sendCancelledEmails = async (calEvent: CalendarEvent) => {
   const emailsToSend: Promise<unknown>[] = [];
 
+  const clonedEvent = cloneDeep(calEvent);
+
   emailsToSend.push(
     ...calEvent.attendees.map((attendee) => {
       return new Promise((resolve, reject) => {
@@ -177,14 +217,29 @@ export const sendCancelledEmails = async (calEvent: CalendarEvent) => {
   emailsToSend.push(
     new Promise((resolve, reject) => {
       try {
-        const scheduledEmail = new OrganizerCancelledEmail(calEvent);
+        const scheduledEmail = new OrganizerCancelledEmail(clonedEvent);
         resolve(scheduledEmail.sendEmail());
       } catch (e) {
         reject(console.error("OrganizerCancelledEmail.sendEmail failed", e));
       }
     })
   );
 
+  if (clonedEvent.team?.members) {
+    for (const teamMember of clonedEvent.team.members) {
+      emailsToSend.push(
+        new Promise((resolve, reject) => {
+          try {
+            const scheduledEmail = new OrganizerCancelledEmail(clonedEvent, undefined, teamMember);
+            resolve(scheduledEmail.sendEmail());
+          } catch (e) {
+            reject(console.error("OrganizerCancelledEmail.sendEmail failed", e));
+          }
+        })
+      );
+    }
+  }
+
   await Promise.all(emailsToSend);
 };
 

packages/emails/src/components/WhoInfo.tsx

@@ -1,4 +1,4 @@
-import { TFunction } from "next-i18next";
+import type { TFunction } from "next-i18next";
 
 import type { CalendarEvent } from "@calcom/types/Calendar";
 
@@ -35,6 +35,14 @@ export function WhoInfo(props: { calEvent: CalendarEvent; t: TFunction }) {
               email={attendee.email}
             />
           ))}
+          {props.calEvent.team?.members.map((member) => (
+            <PersonInfo
+              key={member.id || member.name}
+              name={member.name}
+              role={t("team_member")}
+              email={member.email}
+            />
+          ))}
         </>
       }
       withSpacer

packages/emails/src/templates/OrganizerScheduledEmail.tsx

@@ -7,6 +7,7 @@ export const OrganizerScheduledEmail = (
     calEvent: CalendarEvent;
     attendee: Person;
     newSeat?: boolean;
+    teamMember?: Person;
   } & Partial<React.ComponentProps<typeof BaseScheduledEmail>>
 ) => {
   let subject;
@@ -26,10 +27,10 @@ export const OrganizerScheduledEmail = (
     title = "new_event_scheduled";
   }
 
-  const t = props.calEvent.organizer.language.translate;
+  const t = props.teamMember?.language.translate || props.calEvent.organizer.language.translate;
   return (
     <BaseScheduledEmail
-      timeZone={props.calEvent.organizer.timeZone}
+      timeZone={props.teamMember?.timeZone || props.calEvent.organizer.timeZone}
       t={t}
       subject={t(subject)}
       title={t(title)}

packages/emails/templates/attendee-scheduled-email.ts

@@ -1,5 +1,6 @@
-import { createEvent, DateArray } from "ics";
-import { TFunction } from "next-i18next";
+import type { DateArray } from "ics";
+import { createEvent } from "ics";
+import type { TFunction } from "next-i18next";
 import { RRule } from "rrule";
 
 import dayjs from "@calcom/dayjs";
@@ -47,10 +48,18 @@ export default class AttendeeScheduledEmail extends BaseEmail {
       description: this.getTextBody(),
       duration: { minutes: dayjs(this.calEvent.endTime).diff(dayjs(this.calEvent.startTime), "minute") },
       organizer: { name: this.calEvent.organizer.name, email: this.calEvent.organizer.email },
-      attendees: this.calEvent.attendees.map((attendee: Person) => ({
-        name: attendee.name,
-        email: attendee.email,
-      })),
+      attendees: [
+        ...this.calEvent.attendees.map((attendee: Person) => ({
+          name: attendee.name,
+          email: attendee.email,
+        })),
+        ...(this.calEvent.team?.members
+          ? this.calEvent.team?.members.map((member: Person) => ({
+              name: member.name,
+              email: member.email,
+            }))
+          : []),
+      ],
       ...{ recurrenceRule },
       status: "CONFIRMED",
     });

packages/emails/templates/organizer-cancelled-email.ts

@@ -5,15 +5,7 @@ import OrganizerScheduledEmail from "./organizer-scheduled-email";
 
 export default class OrganizerCancelledEmail extends OrganizerScheduledEmail {
   protected getNodeMailerPayload(): Record<string, unknown> {
-    const toAddresses = [this.calEvent.organizer.email];
-    if (this.calEvent.team) {
-      this.calEvent.team.members.forEach((member) => {
-        const memberAttendee = this.calEvent.attendees.find((attendee) => attendee.name === member);
-        if (memberAttendee) {
-          toAddresses.push(memberAttendee.email);
-        }
-      });
-    }
+    const toAddresses = [this.teamMember?.email || this.calEvent.organizer.email];
 
     return {
       from: `${APP_NAME} <${this.getMailerOptions().from}>`,

packages/emails/templates/organizer-rescheduled-email.ts

@@ -5,15 +5,7 @@ import OrganizerScheduledEmail from "./organizer-scheduled-email";
 
 export default class OrganizerRescheduledEmail extends OrganizerScheduledEmail {
   protected getNodeMailerPayload(): Record<string, unknown> {
-    const toAddresses = [this.calEvent.organizer.email];
-    if (this.calEvent.team) {
-      this.calEvent.team.members.forEach((member) => {
-        const memberAttendee = this.calEvent.attendees.find((attendee) => attendee.name === member);
-        if (memberAttendee) {
-          toAddresses.push(memberAttendee.email);
-        }
-      });
-    }
+    const toAddresses = [this.teamMember?.email || this.calEvent.organizer.email];
 
     return {
       icalEvent: {

packages/emails/templates/organizer-scheduled-email.ts

@@ -1,5 +1,6 @@
-import { createEvent, DateArray, Person } from "ics";
-import { TFunction } from "next-i18next";
+import type { DateArray, Person } from "ics";
+import { createEvent } from "ics";
+import type { TFunction } from "next-i18next";
 import { RRule } from "rrule";
 
 import dayjs from "@calcom/dayjs";
@@ -14,13 +15,15 @@ export default class OrganizerScheduledEmail extends BaseEmail {
   calEvent: CalendarEvent;
   t: TFunction;
   newSeat?: boolean;
+  teamMember?: Person;
 
-  constructor(calEvent: CalendarEvent, newSeat?: boolean) {
+  constructor(calEvent: CalendarEvent, newSeat?: boolean, teamMember?: Person) {
     super();
     this.name = "SEND_BOOKING_CONFIRMATION";
     this.calEvent = calEvent;
     this.t = this.calEvent.organizer.language.translate;
     this.newSeat = newSeat;
+    this.teamMember = teamMember;
   }
 
   protected getiCalEventAsString(): string | undefined {
@@ -43,10 +46,18 @@ export default class OrganizerScheduledEmail extends BaseEmail {
       duration: { minutes: dayjs(this.calEvent.endTime).diff(dayjs(this.calEvent.startTime), "minute") },
       organizer: { name: this.calEvent.organizer.name, email: this.calEvent.organizer.email },
       ...{ recurrenceRule },
-      attendees: this.calEvent.attendees.map((attendee: Person) => ({
-        name: attendee.name,
-        email: attendee.email,
-      })),
+      attendees: [
+        ...this.calEvent.attendees.map((attendee: Person) => ({
+          name: attendee.name,
+          email: attendee.email,
+        })),
+        ...(this.calEvent.team?.members
+          ? this.calEvent.team?.members.map((member: Person) => ({
+              name: member.name,
+              email: member.email,
+            }))
+          : []),
+      ],
       status: "CONFIRMED",
     });
     if (icsEvent.error) {
@@ -56,15 +67,7 @@ export default class OrganizerScheduledEmail extends BaseEmail {
   }
 
   protected getNodeMailerPayload(): Record<string, unknown> {
-    const toAddresses = [this.calEvent.organizer.email];
-    if (this.calEvent.team) {
-      this.calEvent.team.members.forEach((member) => {
-        const memberAttendee = this.calEvent.attendees.find((attendee) => attendee.name === member);
-        if (memberAttendee) {
-          toAddresses.push(memberAttendee.email);
-        }
-      });
-    }
+    const toAddresses = [this.teamMember?.email || this.calEvent.organizer.email];
 
     return {
       icalEvent: {
@@ -79,6 +82,7 @@ export default class OrganizerScheduledEmail extends BaseEmail {
       html: renderEmail("OrganizerScheduledEmail", {
         calEvent: this.calEvent,
         attendee: this.calEvent.organizer,
+        teamMember: this.teamMember,
         newSeat: this.newSeat,
       }),
       text: this.getTextBody(),