diff --git a/packages/features/ee/workflows/api/scheduleSMSReminders.ts b/packages/features/ee/workflows/api/scheduleSMSReminders.ts index fe88358c64..4d831dfb2f 100644 --- a/packages/features/ee/workflows/api/scheduleSMSReminders.ts +++ b/packages/features/ee/workflows/api/scheduleSMSReminders.ts @@ -134,7 +134,12 @@ async function handler(req: NextApiRequest, res: NextApiResponse) { ); } - if (message?.length && message?.length > 0 && sendTo) { + if ( + message?.length && + message?.length > 0 && + sendTo && + reminder.workflowStep.action !== WorkflowActions.SMS_ATTENDEE + ) { const scheduledSMS = await twilio.scheduleSMS(sendTo, message, reminder.scheduledDate, senderID); await prisma.workflowReminder.update({ diff --git a/packages/features/ee/workflows/api/scheduleWhatsappReminders.ts b/packages/features/ee/workflows/api/scheduleWhatsappReminders.ts index 276163a305..ff88ace841 100644 --- a/packages/features/ee/workflows/api/scheduleWhatsappReminders.ts +++ b/packages/features/ee/workflows/api/scheduleWhatsappReminders.ts @@ -1,11 +1,11 @@ /* Schedule any workflow reminder that falls within 7 days for WHATSAPP */ -import { WorkflowActions, WorkflowMethods } from "@prisma/client"; import type { NextApiRequest, NextApiResponse } from "next"; import dayjs from "@calcom/dayjs"; import { defaultHandler } from "@calcom/lib/server"; import { getTimeFormatStringFromUserTimeFormat } from "@calcom/lib/timeFormat"; import prisma from "@calcom/prisma"; +import { WorkflowActions, WorkflowMethods } from "@calcom/prisma/enums"; import { getWhatsappTemplateFunction } from "../lib/actionHelperFunctions"; import * as twilio from "../lib/reminders/smsProviders/twilioProvider"; @@ -90,7 +90,12 @@ async function handler(req: NextApiRequest, res: NextApiResponse) { userName ); - if (message?.length && message?.length > 0 && sendTo) { + if ( + message?.length && + message?.length > 0 && + sendTo && + reminder.workflowStep.action !== WorkflowActions.WHATSAPP_ATTENDEE + ) { const scheduledSMS = await twilio.scheduleSMS(sendTo, message, reminder.scheduledDate, "", true); await prisma.workflowReminder.update({ diff --git a/packages/features/ee/workflows/lib/reminders/smsReminderManager.ts b/packages/features/ee/workflows/lib/reminders/smsReminderManager.ts index b9d8aa3ada..47f70ff7fc 100644 --- a/packages/features/ee/workflows/lib/reminders/smsReminderManager.ts +++ b/packages/features/ee/workflows/lib/reminders/smsReminderManager.ts @@ -136,7 +136,7 @@ export const scheduleSMSReminder = async ( // Allows debugging generated email content without waiting for sendgrid to send emails log.debug(`Sending sms for trigger ${triggerEvent}`, message); - if (message.length > 0 && reminderPhone && isNumberVerified) { + if (message.length > 0 && reminderPhone && isNumberVerified && action !== WorkflowActions.SMS_ATTENDEE) { //send SMS when event is booked/cancelled/rescheduled if ( triggerEvent === WorkflowTriggerEvents.NEW_EVENT || diff --git a/packages/features/ee/workflows/lib/reminders/whatsappReminderManager.ts b/packages/features/ee/workflows/lib/reminders/whatsappReminderManager.ts index ac88303932..39ade64e88 100644 --- a/packages/features/ee/workflows/lib/reminders/whatsappReminderManager.ts +++ b/packages/features/ee/workflows/lib/reminders/whatsappReminderManager.ts @@ -1,9 +1,14 @@ import type { TimeUnit } from "@prisma/client"; -import { WorkflowTriggerEvents, WorkflowTemplates, WorkflowActions, WorkflowMethods } from "@prisma/client"; import dayjs from "@calcom/dayjs"; import logger from "@calcom/lib/logger"; import prisma from "@calcom/prisma"; +import { + WorkflowTriggerEvents, + WorkflowTemplates, + WorkflowActions, + WorkflowMethods, +} from "@calcom/prisma/enums"; import * as twilio from "./smsProviders/twilioProvider"; import type { BookingInfo, timeUnitLowerCase } from "./smsReminderManager"; @@ -135,7 +140,12 @@ export const scheduleWhatsappReminder = async ( // Allows debugging generated whatsapp content without waiting for twilio to send whatsapp messages log.debug(`Sending Whatsapp for trigger ${triggerEvent}`, message); - if (message.length > 0 && reminderPhone && isNumberVerified) { + if ( + message.length > 0 && + reminderPhone && + isNumberVerified && + action !== WorkflowActions.WHATSAPP_ATTENDEE + ) { //send WHATSAPP when event is booked/cancelled/rescheduled if ( triggerEvent === WorkflowTriggerEvents.NEW_EVENT ||