feat: form submitted workflow triggers #1

apps/api/v2/src/modules/workflows/inputs/create-workflow.input.ts

@@ -39,13 +39,15 @@ import {
   BOOKING_REJECTED,
   BOOKING_REQUESTED,
   EVENT_CANCELLED,
+  FORM_SUBMITTED,
   NEW_EVENT,
   OnAfterCalVideoGuestsNoShowTriggerDto,
   OnAfterCalVideoHostsNoShowTriggerDto,
   OnAfterEventTriggerDto,
   OnBeforeEventTriggerDto,
   OnCancelTriggerDto,
   OnCreationTriggerDto,
+  OnFormSubmittedTriggerDto,
   OnNoShowUpdateTriggerDto,
   OnPaidTriggerDto,
   OnPaymentInitiatedTriggerDto,
@@ -83,6 +85,7 @@ export type TriggerDtoType =
   | OnRescheduleTriggerDto
   | OnCancelTriggerDto
   | OnAfterCalVideoGuestsNoShowTriggerDto
+  | OnFormSubmittedTriggerDto
   | OnRejectedTriggerDto
   | OnRequestedTriggerDto
   | OnPaymentInitiatedTriggerDto
@@ -93,6 +96,7 @@ export type TriggerDtoType =
 @ApiExtraModels(
   OnBeforeEventTriggerDto,
   OnAfterEventTriggerDto,
+  OnFormSubmittedTriggerDto,
   OnCancelTriggerDto,
   OnCreationTriggerDto,
   OnRescheduleTriggerDto,
@@ -132,6 +136,7 @@ export class CreateWorkflowDto {
       { $ref: getSchemaPath(OnRescheduleTriggerDto) },
       { $ref: getSchemaPath(OnAfterCalVideoGuestsNoShowTriggerDto) },
       { $ref: getSchemaPath(OnAfterCalVideoHostsNoShowTriggerDto) },
+      { $ref: getSchemaPath(OnFormSubmittedTriggerDto) },
       { $ref: getSchemaPath(OnRejectedTriggerDto) },
       { $ref: getSchemaPath(OnRequestedTriggerDto) },
       { $ref: getSchemaPath(OnPaidTriggerDto) },
@@ -151,6 +156,7 @@ export class CreateWorkflowDto {
         { value: OnRescheduleTriggerDto, name: RESCHEDULE_EVENT },
         { value: OnAfterCalVideoGuestsNoShowTriggerDto, name: AFTER_GUESTS_CAL_VIDEO_NO_SHOW },
         { value: OnAfterCalVideoHostsNoShowTriggerDto, name: AFTER_HOSTS_CAL_VIDEO_NO_SHOW },
+        { value: OnFormSubmittedTriggerDto, name: FORM_SUBMITTED },
         { value: OnRequestedTriggerDto, name: BOOKING_REQUESTED },
         { value: OnRejectedTriggerDto, name: BOOKING_REJECTED },
         { value: OnPaymentInitiatedTriggerDto, name: BOOKING_PAYMENT_INITIATED },
@@ -171,7 +177,7 @@ export class CreateWorkflowDto {
     | OnPaymentInitiatedTriggerDto
     | OnNoShowUpdateTriggerDto
     | OnAfterCalVideoGuestsNoShowTriggerDto
-    | OnAfterCalVideoHostsNoShowTriggerDto;
+    | OnFormSubmittedTriggerDto
 
   @ApiProperty({
     description: "Steps to execute as part of the workflow",

apps/api/v2/src/modules/workflows/inputs/update-workflow.input.ts

@@ -36,6 +36,8 @@ import {
   AFTER_GUESTS_CAL_VIDEO_NO_SHOW,
   OnAfterCalVideoHostsNoShowTriggerDto,
   AFTER_HOSTS_CAL_VIDEO_NO_SHOW,
+  OnFormSubmittedTriggerDto,
+  FORM_SUBMITTED,
   OnNoShowUpdateTriggerDto,
   OnRejectedTriggerDto,
   OnRequestedTriggerDto,
@@ -126,6 +128,7 @@ export class UpdateWhatsAppAttendeePhoneWorkflowStepDto extends WorkflowPhoneWha
 @ApiExtraModels(
   OnBeforeEventTriggerDto,
   OnAfterEventTriggerDto,
+  OnFormSubmittedTriggerDto,
   OnCancelTriggerDto,
   OnCreationTriggerDto,
   OnRescheduleTriggerDto,
@@ -170,6 +173,7 @@ export class UpdateWorkflowDto {
       { $ref: getSchemaPath(OnRescheduleTriggerDto) },
       { $ref: getSchemaPath(OnAfterCalVideoGuestsNoShowTriggerDto) },
       { $ref: getSchemaPath(OnAfterCalVideoHostsNoShowTriggerDto) },
+      { $ref: getSchemaPath(OnFormSubmittedTriggerDto) },
       { $ref: getSchemaPath(OnRejectedTriggerDto) },
       { $ref: getSchemaPath(OnRequestedTriggerDto) },
       { $ref: getSchemaPath(OnPaidTriggerDto) },
@@ -190,6 +194,7 @@ export class UpdateWorkflowDto {
         { value: OnRescheduleTriggerDto, name: RESCHEDULE_EVENT },
         { value: OnAfterCalVideoGuestsNoShowTriggerDto, name: AFTER_GUESTS_CAL_VIDEO_NO_SHOW },
         { value: OnAfterCalVideoHostsNoShowTriggerDto, name: AFTER_HOSTS_CAL_VIDEO_NO_SHOW },
+        { value: OnFormSubmittedTriggerDto, name: FORM_SUBMITTED },
         { value: OnRequestedTriggerDto, name: BOOKING_REQUESTED },
         { value: OnRejectedTriggerDto, name: BOOKING_REJECTED },
         { value: OnPaymentInitiatedTriggerDto, name: BOOKING_PAYMENT_INITIATED },

apps/api/v2/src/modules/workflows/inputs/workflow-trigger.input.ts

@@ -11,6 +11,7 @@ export const AFTER_EVENT = "afterEvent";
 export const RESCHEDULE_EVENT = "rescheduleEvent";
 export const AFTER_HOSTS_CAL_VIDEO_NO_SHOW = "afterHostsCalVideoNoShow";
 export const AFTER_GUESTS_CAL_VIDEO_NO_SHOW = "afterGuestsCalVideoNoShow";
+export const FORM_SUBMITTED = "formSubmitted";
 export const BOOKING_REJECTED = "bookingRejected";
 export const BOOKING_REQUESTED = "bookingRequested";
 export const BOOKING_PAYMENT_INITIATED = "bookingPaymentInitiated";
@@ -24,6 +25,7 @@ export const WORKFLOW_TRIGGER_TYPES = [
   RESCHEDULE_EVENT,
   AFTER_HOSTS_CAL_VIDEO_NO_SHOW,
   AFTER_GUESTS_CAL_VIDEO_NO_SHOW,
+  FORM_SUBMITTED,
   BOOKING_REJECTED,
   BOOKING_REQUESTED,
   BOOKING_PAYMENT_INITIATED,
@@ -39,6 +41,7 @@ export const WORKFLOW_TRIGGER_TO_ENUM = {
   [RESCHEDULE_EVENT]: WorkflowTriggerEvents.RESCHEDULE_EVENT,
   [AFTER_HOSTS_CAL_VIDEO_NO_SHOW]: WorkflowTriggerEvents.AFTER_HOSTS_CAL_VIDEO_NO_SHOW,
   [AFTER_GUESTS_CAL_VIDEO_NO_SHOW]: WorkflowTriggerEvents.AFTER_GUESTS_CAL_VIDEO_NO_SHOW,
+  [FORM_SUBMITTED]: WorkflowTriggerEvents.FORM_SUBMITTED,
   [BOOKING_REJECTED]: WorkflowTriggerEvents.BOOKING_REJECTED,
   [BOOKING_REQUESTED]: WorkflowTriggerEvents.BOOKING_REQUESTED,
   [BOOKING_PAYMENT_INITIATED]: WorkflowTriggerEvents.BOOKING_PAYMENT_INITIATED,
@@ -54,6 +57,7 @@ export const ENUM_TO_WORKFLOW_TRIGGER = {
   [WorkflowTriggerEvents.RESCHEDULE_EVENT]: RESCHEDULE_EVENT,
   [WorkflowTriggerEvents.AFTER_HOSTS_CAL_VIDEO_NO_SHOW]: AFTER_HOSTS_CAL_VIDEO_NO_SHOW,
   [WorkflowTriggerEvents.AFTER_GUESTS_CAL_VIDEO_NO_SHOW]: AFTER_GUESTS_CAL_VIDEO_NO_SHOW,
+  [WorkflowTriggerEvents.FORM_SUBMITTED]: FORM_SUBMITTED,
   [WorkflowTriggerEvents.BOOKING_REJECTED]: BOOKING_REJECTED,
   [WorkflowTriggerEvents.BOOKING_REQUESTED]: BOOKING_REQUESTED,
   [WorkflowTriggerEvents.BOOKING_PAYMENT_INITIATED]: BOOKING_PAYMENT_INITIATED,
@@ -133,34 +137,44 @@ export class OnRejectedTriggerDto {
   @ApiProperty({
     description: "Trigger type for the workflow",
   })
+  @IsString()
+  @IsIn([BOOKING_REJECTED])
   type: typeof BOOKING_REJECTED = BOOKING_REJECTED;
 }
 
 export class OnRequestedTriggerDto {
   @ApiProperty({
     description: "Trigger type for the workflow",
   })
+  @IsString()
+  @IsIn([BOOKING_REQUESTED])
   type: typeof BOOKING_REQUESTED = BOOKING_REQUESTED;
 }
 
 export class OnPaymentInitiatedTriggerDto {
   @ApiProperty({
     description: "Trigger type for the workflow",
   })
+  @IsString()
+  @IsIn([BOOKING_PAYMENT_INITIATED])
   type: typeof BOOKING_PAYMENT_INITIATED = BOOKING_PAYMENT_INITIATED;
 }
 
 export class OnPaidTriggerDto {
   @ApiProperty({
     description: "Trigger type for the workflow",
   })
+  @IsString()
+  @IsIn([BOOKING_PAID])
   type: typeof BOOKING_PAID = BOOKING_PAID;
 }
 
 export class OnNoShowUpdateTriggerDto {
   @ApiProperty({
     description: "Trigger type for the workflow",
   })
+  @IsString()
+  @IsIn([BOOKING_NO_SHOW_UPDATED])
   type: typeof BOOKING_NO_SHOW_UPDATED = BOOKING_NO_SHOW_UPDATED;
 }
 
@@ -213,3 +227,12 @@ export class OnAfterCalVideoHostsNoShowTriggerDto extends TriggerOffsetDTO {
   @IsIn([AFTER_HOSTS_CAL_VIDEO_NO_SHOW])
   type: typeof AFTER_HOSTS_CAL_VIDEO_NO_SHOW = AFTER_HOSTS_CAL_VIDEO_NO_SHOW;
 }
+export class OnFormSubmittedTriggerDto {
+  @ApiProperty({
+    description: "Trigger type for the workflow",
+    example: FORM_SUBMITTED,
+  })
+  @IsString()
+  @IsIn([FORM_SUBMITTED])
+  type: typeof FORM_SUBMITTED = FORM_SUBMITTED;
+}

apps/api/v2/src/modules/workflows/services/workflows.input.service.ts

@@ -143,10 +143,11 @@ export class WorkflowsInputService {
     const updateData: TUpdateInputSchema = {
       id: workflowIdToUse,
       name: updateDto.name ?? currentData.name,
-      activeOn:
+      activeOnEventTypeIds:
         updateDto?.activation?.activeOnEventTypeIds ??
         currentData?.activeOn.map((active) => active.eventTypeId) ??
         [],
+      activeOnRoutingFormIds: updateDto?.activation?.activeOnRoutingFormIds ?? [],
       steps: mappedSteps,
       trigger: triggerForZod,
       time:

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

@@ -1438,6 +1438,7 @@
   "new_event_trigger": "when new event is booked",
   "email_host_action": "send email to host",
   "email_attendee_action": "send email to attendees",
+  "email_attendee_action_form": "Send email to submitted email address",
   "sms_attendee_action": "Send SMS to attendee",
   "sms_number_action": "send SMS to a specific number",
   "send_reminder_sms": "Easily send meeting reminders via SMS to your attendees",
@@ -1509,6 +1510,8 @@
   "may_require_confirmation": "May require confirmation",
   "nr_event_type_one": "{{count}} event type",
   "nr_event_type_other": "{{count}} event types",
+  "nr_routing_form_one": "{{count}} routing form",
+  "nr_routing_form_other": "{{count}} routing forms",
   "count_team_one": "{{count}} team",
   "count_team_other": "{{count}} teams",
   "add_action": "Add action",
@@ -1625,7 +1628,9 @@
   "2fa_required": "Two factor authentication required",
   "incorrect_2fa": "Incorrect two factor authentication code",
   "which_event_type_apply": "Which event type will this apply to?",
+  "which_routing_form_apply": "Which routing form will this apply to?",
   "apply_to_all_event_types": "Apply to all, including future event types",
+  "apply_to_all_routing_forms": "Apply to all, including future routing forms",
   "apply_to_all_teams": "Apply to all team and user event types",
   "which_team_apply": "Which team will this apply to?",
   "no_workflows_description": "Workflows enable simple automation to send notifications & reminders enabling you to build processes around your events.",
@@ -3670,6 +3675,7 @@
   "webhook_metadata": "Metadata",
   "stats": "Stats",
   "booking_status": "Booking status",
+  "form_submitted_trigger": "When routing form is submitted",
   "visit": "Visit",
   "location_custom_label_input_label": "Custom label on booking page",
   "meeting_link": "Meeting link",

packages/app-store/routing-forms/lib/formSubmissionUtils.test.ts

@@ -5,7 +5,13 @@ import { describe, it, vi, expect, beforeEach, afterEach } from "vitest";
 
 import getWebhooks from "@calcom/features/webhooks/lib/getWebhooks";
 import { sendGenericWebhookPayload } from "@calcom/features/webhooks/lib/sendPayload";
-import { WebhookTriggerEvents } from "@calcom/prisma/enums";
+import { WorkflowService } from "@calcom/lib/server/service/workflows";
+import {
+  WebhookTriggerEvents,
+  WorkflowTriggerEvents,
+  WorkflowActions,
+  WorkflowTemplates,
+} from "@calcom/prisma/enums";
 
 import { _onFormSubmission } from "./formSubmissionUtils";
 
@@ -30,6 +36,14 @@ vi.mock("@calcom/features/tasker", () => {
   return { default: Promise.resolve(tasker) };
 });
 
+// Mock workflow dependencies
+vi.mock("@calcom/lib/server/service/workflows", () => ({
+  WorkflowService: {
+    getAllWorkflowsFromRoutingForm: vi.fn(() => Promise.resolve([])),
+    scheduleFormWorkflows: vi.fn(() => Promise.resolve()),
+  },
+}));
+
 const mockSendEmail = vi.fn(() => Promise.resolve());
 const mockResponseEmailConstructor = vi.fn();
 vi.mock("../emails/templates/response-email", () => ({
@@ -49,7 +63,7 @@ describe("_onFormSubmission", () => {
       { id: "field-1", identifier: "email", label: "Email", type: "email" },
       { id: "field-2", identifier: "name", label: "Name", type: "text" },
     ],
-    user: { id: 1, email: "[email protected]" },
+    user: { id: 1, email: "[email protected]", timeFormat: 12, locale: "en" },
     teamId: null,
     settings: { emailOwnerOnSubmission: true },
   };
@@ -83,47 +97,59 @@ describe("_onFormSubmission", () => {
       });
       expect(sendGenericWebhookPayload).toHaveBeenCalledTimes(1);
     });
+  });
 
-    it("should schedule FORM_SUBMITTED_NO_EVENT webhooks via tasker", async () => {
-      const tasker = await (await import("@calcom/features/tasker")).default;
-      const mockWebhook = { id: "wh-no-event-1", secret: "secret" };
-      const chosenAction = { type: "customPageMessage" as const, value: "test" };
+  describe("Workflows", () => {
+    it("should call WorkflowService.scheduleFormWorkflows for FORM_SUBMITTED workflows", async () => {
+      const mockWorkflows = [
+        {
+          id: 1,
+          name: "Form Submitted Workflow",
+          userId: 1,
+          teamId: null,
+          trigger: WorkflowTriggerEvents.FORM_SUBMITTED,
+          time: null,
+          timeUnit: null,
+          steps: [
+            {
+              id: 1,
+              action: WorkflowActions.EMAIL_ATTENDEE,
+              sendTo: null,
+              reminderBody: "Thank you for your submission!",
+              emailSubject: "Form Received",
+              template: WorkflowTemplates.CUSTOM,
+              verifiedAt: new Date(),
+              includeCalendarEvent: false,
+              numberVerificationPending: false,
+              numberRequired: false,
+            },
+          ],
+        },
+      ];
 
-      vi.mocked(getWebhooks).mockImplementation(async (options) => {
-        if (options.triggerEvent === WebhookTriggerEvents.FORM_SUBMITTED_NO_EVENT) {
-          return [mockWebhook as any];
-        }
-        return [];
-      });
+      vi.mocked(WorkflowService.getAllWorkflowsFromRoutingForm).mockResolvedValueOnce(mockWorkflows as any);
 
-      await _onFormSubmission(mockForm as any, mockResponse, responseId, chosenAction);
+      await _onFormSubmission(mockForm as any, mockResponse, responseId);
 
-      expect(getWebhooks).toHaveBeenCalledWith(
-        expect.objectContaining({
-          triggerEvent: WebhookTriggerEvents.FORM_SUBMITTED_NO_EVENT,
-        })
-      );
-      expect(tasker.create).toHaveBeenCalledWith(
-        "triggerFormSubmittedNoEventWebhook",
-        {
-          responseId,
-          form: {
-            id: mockForm.id,
-            name: mockForm.name,
-            teamId: mockForm.teamId,
+      expect(WorkflowService.getAllWorkflowsFromRoutingForm).toHaveBeenCalledWith(mockForm);
+      expect(WorkflowService.scheduleFormWorkflows).toHaveBeenCalledWith({
+        workflows: mockWorkflows,
+        responses: {
+          email: {
+            value: "[email protected]",
+            response: "[email protected]",
           },
-          responses: {
-            email: {
-              value: "[email protected]",
-              response: "[email protected]",
-            },
-            name: { value: "Test Name", response: "Test Name" },
-          },
-          redirect: chosenAction,
-          webhook: mockWebhook,
+          name: { value: "Test Name", response: "Test Name" },
+        },
+        responseId,
+        form: {
+          ...mockForm,
+          fields: mockForm.fields.map((field) => ({
+            type: field.type,
+            identifier: field.identifier,
+          })),
         },
-        { scheduledAt: expect.any(Date) }
-      );
+      });
     });
   });
 
@@ -133,7 +159,7 @@ describe("_onFormSubmission", () => {
         ...mockForm,
         teamId: 1,
         userWithEmails: ["[email protected]", "[email protected]"],
-        user: { id: 1, email: "[email protected]" },
+        user: { id: 1, email: "[email protected]", timeFormat: 12, locale: "en" },
       };
 
       await _onFormSubmission(teamForm as any, mockResponse, responseId);