Skip to content

Commit f9c11c2

Browse files
authored
fix: (Reschedule) Email Settings being ignored for RR event (calcom#21520)
* fix: delete dilog button not visible * fix: (Reschedule) Email Settings being ignored for RR event * update
1 parent 30060f0 commit f9c11c2

1 file changed

Lines changed: 17 additions & 7 deletions

File tree

packages/emails/email-manager.ts

Lines changed: 17 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -189,18 +189,28 @@ export const sendRoundRobinRescheduledEmailsAndSMS = async (
189189
teamMembersAndAttendees: Person[],
190190
eventTypeMetadata?: EventTypeMetadata
191191
) => {
192-
if (eventTypeDisableHostEmail(eventTypeMetadata)) return;
193-
194192
const calendarEvent = formatCalEvent(calEvent);
195193
const emailsAndSMSToSend: Promise<unknown>[] = [];
196194
const successfullyReScheduledSMS = new EventSuccessfullyReScheduledSMS(calEvent);
197195

198196
for (const person of teamMembersAndAttendees) {
199-
emailsAndSMSToSend.push(
200-
sendEmail(() => new OrganizerRescheduledEmail({ calEvent: calendarEvent, teamMember: person }))
201-
);
202-
if (person.phoneNumber) {
203-
emailsAndSMSToSend.push(successfullyReScheduledSMS.sendSMSToAttendee(person));
197+
const isAttendee = calendarEvent.attendees.some((attendee) => attendee.email === person.email);
198+
const isTeamMember = !!calendarEvent.team?.members.some((member) => member.email === person.email);
199+
200+
if (isAttendee && !isTeamMember) {
201+
if (!eventTypeDisableAttendeeEmail(eventTypeMetadata)) {
202+
emailsAndSMSToSend.push(sendEmail(() => new AttendeeRescheduledEmail(calendarEvent, person)));
203+
if (person.phoneNumber) {
204+
emailsAndSMSToSend.push(successfullyReScheduledSMS.sendSMSToAttendee(person));
205+
}
206+
}
207+
} else if (!eventTypeDisableHostEmail(eventTypeMetadata)) {
208+
emailsAndSMSToSend.push(
209+
sendEmail(() => new OrganizerRescheduledEmail({ calEvent: calendarEvent, teamMember: person }))
210+
);
211+
if (person.phoneNumber) {
212+
emailsAndSMSToSend.push(successfullyReScheduledSMS.sendSMSToAttendee(person));
213+
}
204214
}
205215
}
206216

0 commit comments

Comments
 (0)