+3
![coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com>](/assets/img/avatar_default.png)



![Devin AI <158243242+devin-ai-integration[bot]@users.noreply.github.com>](/assets/img/avatar_default.png)
![coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com>](/assets/img/avatar_default.png)



Carina Wollendorfer
GitHub
amit@cal.com <samit91848@gmail.com>
coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com>
Devin AI <158243242+devin-ai-integration[bot]@users.noreply.github.com>
amit@cal.com <samit91848@gmail.com>
Amit Sharma
CarinaWolli
coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com>
Udit Takkar
Benny Joo
cal.com
Morgan
44a3a9eabb
* feat: add 5 new workflow triggers for booking events
- Add BOOKING_REJECTED, BOOKING_REQUESTED, BOOKING_PAYMENT_INITIATED, BOOKING_PAID, BOOKING_NO_SHOW_UPDATED to WorkflowTriggerEvents enum
- Update workflow constants to include new trigger options
- Implement workflow trigger logic for booking rejected and requested events
- Add translations for new workflow triggers following {enum}_trigger format
- Generate updated Prisma types for new schema changes
Co-Authored-By: amit@cal.com <samit91848@gmail.com>
* fix: type check, remove as any
* feat: add workflow trigger for BOOKING_REQUESTED in handleNewBooking.ts
- Add WorkflowTriggerEvents import to handleNewBooking.ts
- Implement workflow trigger logic for BOOKING_REQUESTED in else block
- Filter workflows by BOOKING_REQUESTED trigger and call scheduleWorkflowReminders
- Use proper calendar event object construction without type casting
- Add error handling for workflow reminder scheduling
Co-Authored-By: amit@cal.com <samit91848@gmail.com>
* fix: resolve type errors in workflow trigger implementations
- Add proper database includes for user information in handleConfirmation.ts
- Fix ExtendedCalendarEvent type structure with correct hosts mapping
- Add missing properties to calendar event objects in handleMarkNoShow.ts
- Ensure all workflow triggers follow proper type patterns
Co-Authored-By: amit@cal.com <samit91848@gmail.com>
* feat: add workflow test configurations for new booking triggers
- Add workflow configurations for BOOKING_REQUESTED and BOOKING_PAYMENT_INITIATED in fresh-booking.test.ts
- Add workflow configuration for BOOKING_REJECTED in confirm.handler.test.ts
- Enable previously skipped confirm.handler.test.ts
- Remove workflow test assertions temporarily until triggers are fully functional
- Maintain webhook test coverage while adding workflow test infrastructure
Co-Authored-By: amit@cal.com <samit91848@gmail.com>
* fix: add missing mockSuccessfulVideoMeetingCreation import to confirm.handler.test.ts
- Import mockSuccessfulVideoMeetingCreation from bookingScenario utils
- Add mock call to BOOKING_REJECTED workflow test case
- Resolves ReferenceError that was causing unit test CI failure
Co-Authored-By: amit@cal.com <samit91848@gmail.com>
* add new triggers
* refactor: improve _scheduleWorkflowReminders readability and add missing booking trigger events
- Extract complex conditional logic into helper functions (isImmediateTrigger, isTimeBased, shouldProcessWorkflow)
- Add missing workflow trigger events with immediate execution logic
- Update test workflows to use different actions (EMAIL_ATTENDEE, SMS_ATTENDEE) for better differentiation
- Fix translation function mock in confirm.handler.test.ts using mockNoTranslations utility
- Maintain existing functionality while improving code maintainability
Co-Authored-By: amit@cal.com <samit91848@gmail.com>
* only show customt emplate for form triggers
* filter outside scheduleWorkflowReminder
* fix type check
* chore: add more tests
* test: add comprehensive unit tests for handleMarkNoShow with webhook and workflow coverage
- Create handleMarkNoShow.test.ts following confirm.handler.test.ts pattern
- Add expectBookingNoShowUpdatedWebhookToHaveBeenFired utility function
- Test both webhook and workflow triggers for BOOKING_NO_SHOW_UPDATED
- Cover attendee/host no-show scenarios, multiple attendees, and error cases
- All 6 unit tests pass with proper mocking of external dependencies
Co-Authored-By: amit@cal.com <samit91848@gmail.com>
* Revert "test: add comprehensive unit tests for handleMarkNoShow with webhook and workflow coverage"
This reverts commit 764299220279f0c012392dec24d3150246bfc4ad.
* fix: add new workflow triggers to api/v2
* update swagger docs
* fix: e2e
* fix type check
* fix tests, add test for before after events
* fix unit tests
* revert confirm.handler.test
* fix: unit tests
* dummy form variables
* add routing forms to active on dropdown
* add migration file
* Ui fixes for variables dropdown
* remove other translation keys
* review fixes
* allow routing forms for activeOn
* use repository function to get routing forms
* remove unnecessary code
* adjust logic in update handler
* add triggers to api v2
* remvoe unused file
* rename to getAcitveOnOptions handler
* remove routingFormOptions handler
* clean up getActiveOnOptions
* refactor WorkflowService
* remove logs
* remove unused
* fix: type check
* fix: missed before after events for recurring
* fix: calendarEvent handleMarkNoShow
* fix error message
Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com>
* don't query disabled routing forms
* create tasker function
* add tasker code
* move isFormTrigger function
* small adjustments + todo comments
* remove email to host action for form triggers
* throw trpc error if email to host is added as step
* fix dialog on how to use form responses as variables
* remove add variable dropdown for form triggers
* remove form workfows in event workflows tab
* improvements for workflow logic on form submission
* review fixes
* base setup for seperate schedule functions (evt and form)
* add missing BOOKING_PAID workflow trigger
* fix pathname
* fix: test for BOOKING_REQUESTED
* fix activeOn ids
* pass hideBranding and smsReminderNumber
* adjustments to reminderScheduler
* create empty scheduelForForm functions
* pass locale and timezone with form user
* pass formData instead of responses
* pass timeFormat and locale
* reusable function for email sending and reminder creation
* implement scheduleEmailReminderForForm
* remove added editor field from merge conflict
* don't support cal.ai action with form triggers
* throw bad request if form trigger and cal.ai is combined
* add tests for scheduleFormWorkflows
* add form submission tests
* remove form response varibe info
* clean up workflow actions
* fixes for getting template options
* pass triggerType to getAllWorkflows
* move reusable logic to scheduleSMSReminder
* add formdata to param type
* type fixes for text reminder managers
* implement scheduleSMSReminderForForm
* fix import
* fix isAuthorizedToAddActiveOnIds
* disble whatsapp action
* implement triggerFormSubmittedNoEventWorkflow
* code clean up
* Merge branch 'devin/1755107037-add-workflow-triggers' into feat/routing-form-workflow-triggers
* fix type errors
* remove async from getSubmitterEmail
* fix type errors
* revert cal.ai changes
* fix type error
* add sublogger
* code clean up
* fix type errors
* remove label for attendee whatsapp action
* code clean up
* fixes saving teams on org workflows
* fix type error
* code improvements for activeOn ids
* Revert "code improvements for activeOn ids"
This reverts commit 0a3590a4e2ce541b17d63483ad86ed458795a6a3.
* improve variable name
* fix unit tests
* small fixes
* type fixes
* remove unused translation keys
* fix merge conflict issues
* code clean up
* remove SMS action support
* remove more SMS code
* add missing imports
* set custom template for form action
* type fixes
* fix tasker endpoint
* fix duplicate check
* fix workfows.test.ts
* use repository funciton to getHideBranding
* code clean up
* fix hasDuplicateSubmission
* code clean up
* select only needed properties
* remove repository functions
* Revert "remove repository functions"
This reverts commit 7aa47b1c59c9abd7f964ebf26f746934c53a44f4.
* add scheduleWorkflows function
* Revert "add scheduleWorkflows function"
This reverts commit fe5db4fe3b65e2743c95475d585300cab98beed7.
* move type to /types
* Revert "move type to /types"
This reverts commit 91e0152154594b3772a801a426260068a8ccea54.
* revert changes causing type errors
* remove import
* remove unused import
* Revert "remove unused import"
This reverts commit 1916768c875ea5d0ac5598ccb8f9c796c5622dc9.
* revert changed from attempt to fix type errors
* pass object to gt all workflows
* fix isAuthorized check
* trigger filtering
* remove form submitted no event booked code
* remove form submitted no event from schema
* remove more code
* remove test
* fixes
* add getSubmitterEmail function
* add missing workflow DTOs
* small fixes
* use activeOnWithChildren
* fix active on when switching trigger type
* remove add variable dropdown
* add getAllWorkflowsFromRoutingForm to WorkflowService
* fix error caused by undefined evt
* fix type error
* fix type error
* fix tests
* code clean up
* remove console.log
* remove template text form from triggers
* add routing form repoditory function
* fix bug with key
* add missing trigger in update-workflow.input.ts
* ForEvt and ForForm function for aiPhoneCallManager
* chore: add support for form workflows on api v2
* fixup! chore: add support for form workflows on api v2
* use only repository functions in update handler
* move all prisma queries from list.handler
* review suggestions
* chore: handle workflows api v2
* chore: handle workflows api v2, split in 2 endpoints
* fix workflow step creation
* remove connect agent and fixes types
* add type to workflow
* chore: use workflow type in apiv2 WorkflowsOutputService
* update worklfow type on update
* chore: use workflow type in apiv2 WorkflowsOutputService
* fix template body for torm trigger
* some UI fixes for email subject/body
* resetting email body when changing form triggers
* use type field to query workflows
* clean up all old active on values
* remove responseId from all funciton calls
* remove undefined from updateTemplate
* refactor: split routing form and event-type workflows code
* refactor: split routing form and event-type workflows code
* fix template text when adding action
* chore: don't rename WorkflowActivationDto to avoid ci blocking
* refine update schedule to use only allowed actions
* fix type error
* don't allow whatsapp action with form trigger
* fix type error
* return early if activeOn array is empty
* fix: from step type in BaseFormWorkflowStepDto
* fixup! fix: from step type in BaseFormWorkflowStepDto
* move all prisma calls to repository (service/workflows.ts)
* use FORM_TRIGGER_WORKFLOW_EVENTS for form queries
* use userRepository
* use FORM_TRIGGER_WORKFLOW_EVENTS in isFormTrigger
* code clean up
* code clean up
* add back trpc import
* fix agent repository functions
---------
Co-authored-by: Devin AI <158243242+devin-ai-integration[bot]@users.noreply.github.com>
Co-authored-by: amit@cal.com <samit91848@gmail.com>
Co-authored-by: Amit Sharma <74371312+Amit91848@users.noreply.github.com>
Co-authored-by: CarinaWolli <wollencarina@gmail.com>
Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com>
Co-authored-by: Udit Takkar <53316345+Udit-takkar@users.noreply.github.com>
Co-authored-by: Benny Joo <sldisek783@gmail.com>
Co-authored-by: cal.com <morgan@cal.com>
Co-authored-by: Morgan <33722304+ThyMinimalDev@users.noreply.github.com>
295 lines
9.6 KiB
TypeScript
295 lines
9.6 KiB
TypeScript
import dayjs from "@calcom/dayjs";
|
|
import {
|
|
getAttendeeToBeUsedInSMS,
|
|
getSMSMessageWithVariables,
|
|
shouldUseTwilio,
|
|
} from "@calcom/ee/workflows/lib/reminders/utils";
|
|
import { SENDER_ID } from "@calcom/lib/constants";
|
|
import logger from "@calcom/lib/logger";
|
|
import { safeStringify } from "@calcom/lib/safeStringify";
|
|
import { getTranslation } from "@calcom/lib/server/i18n";
|
|
import type { TimeFormat } from "@calcom/lib/timeFormat";
|
|
import type { PrismaClient } from "@calcom/prisma";
|
|
import prisma from "@calcom/prisma";
|
|
import type { Prisma } from "@calcom/prisma/client";
|
|
import { WorkflowTemplates, WorkflowActions, WorkflowMethods } from "@calcom/prisma/enums";
|
|
import { WorkflowTriggerEvents } from "@calcom/prisma/enums";
|
|
import type { CalEventResponses, RecurringEvent } from "@calcom/types/Calendar";
|
|
|
|
import { isAttendeeAction } from "../actionHelperFunctions";
|
|
import { getSenderId } from "../alphanumericSenderIdSupport";
|
|
import { IMMEDIATE_WORKFLOW_TRIGGER_EVENTS } from "../constants";
|
|
import { WorkflowOptOutContactRepository } from "../repository/workflowOptOutContact";
|
|
import { WorkflowOptOutService } from "../service/workflowOptOutService";
|
|
import type { ScheduleReminderArgs } from "./emailReminderManager";
|
|
import { scheduleSmsOrFallbackEmail, sendSmsOrFallbackEmail } from "./messageDispatcher";
|
|
import * as twilio from "./providers/twilioProvider";
|
|
import smsReminderTemplate from "./templates/smsReminderTemplate";
|
|
|
|
export enum timeUnitLowerCase {
|
|
DAY = "day",
|
|
MINUTE = "minute",
|
|
YEAR = "year",
|
|
}
|
|
const log = logger.getSubLogger({ prefix: ["[smsReminderManager]"] });
|
|
|
|
export type AttendeeInBookingInfo = {
|
|
name: string;
|
|
firstName?: string;
|
|
lastName?: string;
|
|
email: string;
|
|
phoneNumber?: string | null;
|
|
timeZone: string;
|
|
language: { locale: string };
|
|
};
|
|
|
|
export type BookingInfo = {
|
|
uid?: string | null;
|
|
bookerUrl: string;
|
|
attendees: AttendeeInBookingInfo[];
|
|
organizer: {
|
|
language: { locale: string };
|
|
name: string;
|
|
email: string;
|
|
timeZone: string;
|
|
timeFormat?: TimeFormat;
|
|
username?: string;
|
|
};
|
|
eventType?: {
|
|
slug: string;
|
|
recurringEvent?: RecurringEvent | null;
|
|
customReplyToEmail?: string | null;
|
|
};
|
|
startTime: string;
|
|
endTime: string;
|
|
title: string;
|
|
location?: string | null;
|
|
additionalNotes?: string | null;
|
|
responses?: CalEventResponses | null;
|
|
metadata?: Prisma.JsonValue;
|
|
cancellationReason?: string | null;
|
|
rescheduleReason?: string | null;
|
|
hideOrganizerEmail?: boolean;
|
|
};
|
|
|
|
export type ScheduleTextReminderAction = Extract<
|
|
WorkflowActions,
|
|
"SMS_ATTENDEE" | "SMS_NUMBER" | "WHATSAPP_ATTENDEE" | "WHATSAPP_NUMBER"
|
|
>;
|
|
|
|
export type ScheduleTextReminderArgs = ScheduleReminderArgs & {
|
|
reminderPhone: string | null;
|
|
message: string;
|
|
action: ScheduleTextReminderAction;
|
|
userId?: number | null;
|
|
teamId?: number | null;
|
|
isVerificationPending?: boolean;
|
|
prisma?: PrismaClient;
|
|
verifiedAt: Date | null;
|
|
};
|
|
export const scheduleSMSReminder = async (args: ScheduleTextReminderArgs & { evt: BookingInfo }) => {
|
|
const {
|
|
evt,
|
|
reminderPhone,
|
|
triggerEvent,
|
|
action,
|
|
timeSpan,
|
|
message = "",
|
|
workflowStepId,
|
|
template,
|
|
sender,
|
|
userId,
|
|
teamId,
|
|
isVerificationPending = false,
|
|
seatReferenceUid,
|
|
verifiedAt,
|
|
} = args;
|
|
|
|
if (!verifiedAt) {
|
|
log.warn(`Workflow step ${workflowStepId} not yet verified`);
|
|
return;
|
|
}
|
|
|
|
if (reminderPhone && (await WorkflowOptOutContactRepository.isOptedOut(reminderPhone))) {
|
|
log.warn(
|
|
`Phone number opted out of SMS workflows`,
|
|
safeStringify({ workflowStep: workflowStepId, eventUid: evt.uid })
|
|
);
|
|
return;
|
|
}
|
|
|
|
const { startTime, endTime } = evt;
|
|
const uid = evt.uid as string;
|
|
const timeUnit: timeUnitLowerCase | undefined = timeSpan.timeUnit?.toLocaleLowerCase() as timeUnitLowerCase;
|
|
let scheduledDate = null;
|
|
|
|
const senderID = getSenderId(reminderPhone, sender || SENDER_ID);
|
|
|
|
//SMS_ATTENDEE action does not need to be verified
|
|
//isVerificationPending is from all already existing workflows (once they edit their workflow, they will also have to verify the number)
|
|
async function getIsNumberVerified() {
|
|
if (action === WorkflowActions.SMS_ATTENDEE) return true;
|
|
const verifiedNumber = await prisma.verifiedNumber.findFirst({
|
|
where: {
|
|
OR: [{ userId }, { teamId }],
|
|
phoneNumber: reminderPhone || "",
|
|
},
|
|
});
|
|
if (!!verifiedNumber) return true;
|
|
return isVerificationPending;
|
|
}
|
|
const isNumberVerified = await getIsNumberVerified();
|
|
|
|
if (triggerEvent === WorkflowTriggerEvents.BEFORE_EVENT) {
|
|
scheduledDate = timeSpan.time && timeUnit ? dayjs(startTime).subtract(timeSpan.time, timeUnit) : null;
|
|
} else if (triggerEvent === WorkflowTriggerEvents.AFTER_EVENT) {
|
|
scheduledDate = timeSpan.time && timeUnit ? dayjs(endTime).add(timeSpan.time, timeUnit) : null;
|
|
}
|
|
|
|
if (reminderPhone && isNumberVerified) {
|
|
const useTwilio = shouldUseTwilio(triggerEvent, scheduledDate);
|
|
if (useTwilio) {
|
|
const attendeeToBeUsedInSMS = getAttendeeToBeUsedInSMS(action, evt, reminderPhone);
|
|
|
|
const name = action === WorkflowActions.SMS_ATTENDEE ? attendeeToBeUsedInSMS.name : "";
|
|
const attendeeName =
|
|
action === WorkflowActions.SMS_ATTENDEE ? evt.organizer.name : attendeeToBeUsedInSMS.name;
|
|
const timeZone =
|
|
action === WorkflowActions.SMS_ATTENDEE ? attendeeToBeUsedInSMS.timeZone : evt.organizer.timeZone;
|
|
|
|
let smsMessage = message;
|
|
|
|
if (smsMessage) {
|
|
smsMessage = await getSMSMessageWithVariables(smsMessage, evt, attendeeToBeUsedInSMS, action);
|
|
} else if (template === WorkflowTemplates.REMINDER) {
|
|
smsMessage =
|
|
smsReminderTemplate(
|
|
false,
|
|
evt.organizer.language.locale,
|
|
action,
|
|
evt.organizer.timeFormat,
|
|
evt.startTime,
|
|
evt.title,
|
|
timeZone,
|
|
attendeeName,
|
|
name
|
|
) || message;
|
|
}
|
|
|
|
if (smsMessage.length > 0) {
|
|
const smsMessageWithoutOptOut = smsMessage;
|
|
|
|
if (process.env.TWILIO_OPT_OUT_ENABLED === "true") {
|
|
smsMessage = await WorkflowOptOutService.addOptOutMessage(
|
|
smsMessage,
|
|
evt.organizer.language.locale
|
|
);
|
|
}
|
|
// Allows debugging generated email content without waiting for sendgrid to send emails
|
|
log.debug(`Sending sms for trigger ${triggerEvent}`, smsMessage);
|
|
|
|
if (IMMEDIATE_WORKFLOW_TRIGGER_EVENTS.includes(triggerEvent)) {
|
|
try {
|
|
await sendSmsOrFallbackEmail({
|
|
twilioData: {
|
|
phoneNumber: reminderPhone,
|
|
body: smsMessage,
|
|
sender: senderID,
|
|
bodyWithoutOptOut: smsMessageWithoutOptOut,
|
|
bookingUid: evt.uid,
|
|
userId,
|
|
teamId,
|
|
},
|
|
fallbackData: isAttendeeAction(action)
|
|
? {
|
|
email: evt.attendees[0].email,
|
|
t: await getTranslation(evt.attendees[0].language.locale, "common"),
|
|
replyTo: evt.organizer.email,
|
|
}
|
|
: undefined,
|
|
});
|
|
} catch (error) {
|
|
log.error(`Error sending SMS with error ${error}`);
|
|
}
|
|
}
|
|
|
|
if (
|
|
(triggerEvent === WorkflowTriggerEvents.BEFORE_EVENT ||
|
|
triggerEvent === WorkflowTriggerEvents.AFTER_EVENT) &&
|
|
scheduledDate
|
|
) {
|
|
try {
|
|
// schedule at least 15 minutes in advance and at most 2 hours in advance
|
|
const scheduledNotification = await scheduleSmsOrFallbackEmail({
|
|
twilioData: {
|
|
phoneNumber: reminderPhone,
|
|
body: smsMessage,
|
|
scheduledDate: scheduledDate.toDate(),
|
|
sender: senderID,
|
|
bookingUid: evt.uid,
|
|
userId,
|
|
teamId,
|
|
},
|
|
fallbackData: isAttendeeAction(action)
|
|
? {
|
|
email: evt.attendees[0].email,
|
|
t: await getTranslation(evt.attendees[0].language.locale, "common"),
|
|
replyTo: evt.organizer.email,
|
|
workflowStepId,
|
|
}
|
|
: undefined,
|
|
});
|
|
|
|
if (scheduledNotification?.sid) {
|
|
await prisma.workflowReminder.create({
|
|
data: {
|
|
bookingUid: uid,
|
|
workflowStepId: workflowStepId,
|
|
method: WorkflowMethods.SMS,
|
|
scheduledDate: scheduledDate.toDate(),
|
|
scheduled: true,
|
|
referenceId: scheduledNotification.sid,
|
|
seatReferenceId: seatReferenceUid,
|
|
},
|
|
});
|
|
}
|
|
} catch (error) {
|
|
log.error(`Error scheduling SMS with error ${error}`);
|
|
}
|
|
}
|
|
}
|
|
return;
|
|
}
|
|
|
|
if (!useTwilio && scheduledDate) {
|
|
// Write to DB and send to CRON if scheduled reminder date is past 2 hours from now
|
|
await prisma.workflowReminder.create({
|
|
data: {
|
|
bookingUid: uid,
|
|
workflowStepId: workflowStepId,
|
|
method: WorkflowMethods.SMS,
|
|
scheduledDate: scheduledDate.toDate(),
|
|
scheduled: false,
|
|
seatReferenceId: seatReferenceUid,
|
|
},
|
|
});
|
|
}
|
|
}
|
|
};
|
|
|
|
export const deleteScheduledSMSReminder = async (reminderId: number, referenceId: string | null) => {
|
|
try {
|
|
if (referenceId) {
|
|
await twilio.cancelSMS(referenceId);
|
|
}
|
|
|
|
await prisma.workflowReminder.delete({
|
|
where: {
|
|
id: reminderId,
|
|
},
|
|
});
|
|
} catch (error) {
|
|
log.error(`Error canceling reminder with error ${error}`);
|
|
}
|
|
};
|