Uncodedtech
diff --git a/‎apps/api/v2/src/modules/organizations/teams/workflows/controllers/org-team-workflows.controller.e2e-spec.ts‎
Lines changed: 60 additions & 0 deletions b/‎apps/api/v2/src/modules/organizations/teams/workflows/controllers/org-team-workflows.controller.e2e-spec.ts‎
Lines changed: 60 additions & 0 deletions
diff --git a/‎apps/api/v2/src/modules/workflows/inputs/create-form-workflow.ts‎
Lines changed: 12 additions & 3 deletions b/‎apps/api/v2/src/modules/workflows/inputs/create-form-workflow.ts‎
Lines changed: 12 additions & 3 deletions
diff --git a/‎apps/api/v2/src/modules/workflows/inputs/update-form-workflow.input.ts‎
Lines changed: 12 additions & 3 deletions b/‎apps/api/v2/src/modules/workflows/inputs/update-form-workflow.input.ts‎
Lines changed: 12 additions & 3 deletions
diff --git a/‎apps/api/v2/src/modules/workflows/inputs/workflow-trigger.input.ts‎
Lines changed: 39 additions & 2 deletions b/‎apps/api/v2/src/modules/workflows/inputs/workflow-trigger.input.ts‎
Lines changed: 39 additions & 2 deletions
diff --git a/‎apps/api/v2/src/modules/workflows/outputs/routing-form-workflow.output.ts‎
Lines changed: 1 addition & 1 deletion b/‎apps/api/v2/src/modules/workflows/outputs/routing-form-workflow.output.ts‎
Lines changed: 1 addition & 1 deletion
diff --git a/‎apps/api/v2/src/modules/workflows/services/workflows.input.service.ts‎
Lines changed: 15 additions & 13 deletions b/‎apps/api/v2/src/modules/workflows/services/workflows.input.service.ts‎
Lines changed: 15 additions & 13 deletions
@@ -27,8 +27,10 @@ import {
   BEFORE_EVENT,
   DAY,
   FORM_SUBMITTED,
+  FORM_SUBMITTED_NO_EVENT,
   OnAfterEventTriggerDto,
   OnBeforeEventTriggerDto,
+  OnFormSubmittedNoEventTriggerDto,
   OnFormSubmittedTriggerDto,
 } from "@/modules/workflows/inputs/workflow-trigger.input";
 import {
@@ -471,6 +473,64 @@ describe("OrganizationsTeamsWorkflowsController (E2E)", () => {
         });
     });
 
+    it("should create a new routing form workflow with  allowed actions and offset trigger", async () => {
+      const validWorkflow = structuredClone(
+        sampleCreateWorkflowRoutingFormDto
+      ) as unknown as CreateFormWorkflowDto;
+      validWorkflow.steps = [
+        {
+          stepNumber: 1,
+          action: "email_attendee",
+          recipient: ATTENDEE,
+          template: REMINDER,
+          sender: "CalcomE2EStep1",
+          includeCalendarEvent: true,
+          message: {
+            subject: "Upcoming: {EVENT_NAME}",
+            html: "<p>Reminder for your event {EVENT_NAME}.</p>",
+          },
+        },
+      ];
+
+      validWorkflow.trigger = {
+        type: FORM_SUBMITTED_NO_EVENT,
+        offset: {
+          value: 1,
+          unit: DAY,
+        },
+      };
+      return request(app.getHttpServer())
+        .post(`${basePath}/routing-form`)
+        .set({ Authorization: `Bearer cal_test_${apiKeyString}` })
+        .send(validWorkflow)
+        .expect(201)
+        .then((response) => {
+          const responseBody: GetRoutingFormWorkflowOutput = response.body;
+          expect(responseBody.status).toEqual(SUCCESS_STATUS);
+          expect(responseBody.data).toBeDefined();
+          expect(responseBody.data.name).toEqual(sampleCreateWorkflowRoutingFormDto.name);
+          expect(responseBody.data.type).toEqual("routing-form");
+
+          if (responseBody.data.activation instanceof WorkflowFormActivationDto) {
+            expect(responseBody.data.activation.isActiveOnAllRoutingForms).toEqual(
+              sampleCreateWorkflowRoutingFormDto.activation.isActiveOnAllRoutingForms
+            );
+          }
+
+          expect(responseBody.data.trigger.type).toEqual(validWorkflow.trigger.type);
+          expect(responseBody.data.steps).toHaveLength(sampleCreateWorkflowRoutingFormDto.steps.length);
+          expect(responseBody.data.steps.find((step) => step.stepNumber === 1)?.id).toBeDefined();
+          expect(responseBody.data.steps.find((step) => step.stepNumber === 1)?.sender).toEqual(
+            "CalcomE2EStep1"
+          );
+
+          const trigger = validWorkflow.trigger as OnFormSubmittedNoEventTriggerDto;
+          expect(responseBody.data.trigger?.type).toEqual(trigger.type);
+          expect(responseBody.data.trigger?.offset?.unit).toEqual(trigger.offset.unit);
+          expect(responseBody.data.trigger?.offset?.value).toEqual(trigger.offset.value);
+        });
+    });
+
     it("should create a new workflow", async () => {
       return request(app.getHttpServer())
         .post(basePath)
 
@@ -13,7 +13,9 @@ import {
 import {
   RoutingFormWorkflowTriggerDto,
   FORM_SUBMITTED,
+  FORM_SUBMITTED_NO_EVENT,
   FORM_WORKFLOW_TRIGGER_TYPES,
+  OnFormSubmittedNoEventTriggerDto,
   OnFormSubmittedTriggerDto,
 } from "./workflow-trigger.input";
 
@@ -39,6 +41,7 @@ export class WorkflowFormActivationDto {
 
 @ApiExtraModels(
   OnFormSubmittedTriggerDto,
+  OnFormSubmittedNoEventTriggerDto,
   WorkflowEmailAddressStepDto,
   WorkflowEmailAttendeeStepDto,
   RoutingFormWorkflowTriggerDto,
@@ -59,17 +62,23 @@ export class CreateFormWorkflowDto {
 
   @ApiProperty({
     description: `Trigger configuration for the routing-form workflow, allowed triggers are ${FORM_WORKFLOW_TRIGGER_TYPES.toString()}`,
-    oneOf: [{ $ref: getSchemaPath(OnFormSubmittedTriggerDto) }],
+    oneOf: [
+      { $ref: getSchemaPath(OnFormSubmittedTriggerDto) },
+      { $ref: getSchemaPath(OnFormSubmittedNoEventTriggerDto) },
+    ],
   })
   @ValidateNested()
   @Type(() => RoutingFormWorkflowTriggerDto, {
     keepDiscriminatorProperty: true,
     discriminator: {
       property: "type",
-      subTypes: [{ value: OnFormSubmittedTriggerDto, name: FORM_SUBMITTED }],
+      subTypes: [
+        { value: OnFormSubmittedTriggerDto, name: FORM_SUBMITTED },
+        { value: OnFormSubmittedNoEventTriggerDto, name: FORM_SUBMITTED_NO_EVENT },
+      ],
     },
   })
-  trigger!: OnFormSubmittedTriggerDto;
+  trigger!: OnFormSubmittedTriggerDto | OnFormSubmittedNoEventTriggerDto;
 
   @ApiProperty({
     description: `Steps to execute as part of the routing-form workflow, allowed steps are ${FORM_ALLOWED_STEP_ACTIONS.toString()}`,
 
@@ -18,13 +18,16 @@ import {
 } from "./workflow-step.input";
 import {
   OnFormSubmittedTriggerDto,
+  OnFormSubmittedNoEventTriggerDto,
   FORM_SUBMITTED,
+  FORM_SUBMITTED_NO_EVENT,
   FORM_WORKFLOW_TRIGGER_TYPES,
   RoutingFormWorkflowTriggerDto,
 } from "./workflow-trigger.input";
 
 @ApiExtraModels(
   OnFormSubmittedTriggerDto,
+  OnFormSubmittedNoEventTriggerDto,
   UpdateEmailAddressWorkflowStepDto,
   UpdateEmailAttendeeWorkflowStepDto,
   UpdateEmailHostWorkflowStepDto,
@@ -48,18 +51,24 @@ export class UpdateFormWorkflowDto {
 
   @ApiPropertyOptional({
     description: `Trigger configuration for the routing-form workflow, allowed triggers are ${FORM_WORKFLOW_TRIGGER_TYPES}`,
-    oneOf: [{ $ref: getSchemaPath(OnFormSubmittedTriggerDto) }],
+    oneOf: [
+      { $ref: getSchemaPath(OnFormSubmittedTriggerDto) },
+      { $ref: getSchemaPath(OnFormSubmittedNoEventTriggerDto) },
+    ],
   })
   @IsOptional()
   @ValidateNested()
   @Type(() => RoutingFormWorkflowTriggerDto, {
     keepDiscriminatorProperty: true,
     discriminator: {
       property: "type",
-      subTypes: [{ value: OnFormSubmittedTriggerDto, name: FORM_SUBMITTED }],
+      subTypes: [
+        { value: OnFormSubmittedTriggerDto, name: FORM_SUBMITTED },
+        { value: OnFormSubmittedNoEventTriggerDto, name: FORM_SUBMITTED_NO_EVENT },
+      ],
     },
   })
-  trigger?: OnFormSubmittedTriggerDto;
+  trigger?: OnFormSubmittedTriggerDto | OnFormSubmittedNoEventTriggerDto;
 
   @ApiPropertyOptional({
     description: `Steps to execute as part of the routing-form workflow, allowed steps are ${FORM_ALLOWED_STEP_ACTIONS.toString()}`,
 
@@ -12,13 +12,14 @@ 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 FORM_SUBMITTED_NO_EVENT = "formSubmittedNoEvent";
 export const BOOKING_REJECTED = "bookingRejected";
 export const BOOKING_REQUESTED = "bookingRequested";
 export const BOOKING_PAYMENT_INITIATED = "bookingPaymentInitiated";
 export const BOOKING_PAID = "bookingPaid";
 export const BOOKING_NO_SHOW_UPDATED = "bookingNoShowUpdated";
 
-export const FORM_WORKFLOW_TRIGGER_TYPES = [FORM_SUBMITTED] as const;
+export const FORM_WORKFLOW_TRIGGER_TYPES = [FORM_SUBMITTED, FORM_SUBMITTED_NO_EVENT] as const;
 
 export const EVENT_TYPE_WORKFLOW_TRIGGER_TYPES = [
   BEFORE_EVENT,
@@ -44,6 +45,7 @@ export const WORKFLOW_TRIGGER_TYPES = [
   AFTER_HOSTS_CAL_VIDEO_NO_SHOW,
   AFTER_GUESTS_CAL_VIDEO_NO_SHOW,
   FORM_SUBMITTED,
+  FORM_SUBMITTED_NO_EVENT,
   BOOKING_REJECTED,
   BOOKING_REQUESTED,
   BOOKING_PAYMENT_INITIATED,
@@ -60,13 +62,27 @@ export const WORKFLOW_TRIGGER_TO_ENUM = {
   [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,
+  [FORM_SUBMITTED_NO_EVENT]: WorkflowTriggerEvents.FORM_SUBMITTED_NO_EVENT,
   [BOOKING_REJECTED]: WorkflowTriggerEvents.BOOKING_REJECTED,
   [BOOKING_REQUESTED]: WorkflowTriggerEvents.BOOKING_REQUESTED,
   [BOOKING_PAYMENT_INITIATED]: WorkflowTriggerEvents.BOOKING_PAYMENT_INITIATED,
   [BOOKING_NO_SHOW_UPDATED]: WorkflowTriggerEvents.BOOKING_NO_SHOW_UPDATED,
   [BOOKING_PAID]: WorkflowTriggerEvents.BOOKING_PAID,
 } as const;
 
+export const ENUM_ROUTING_FORM_WORFLOW_TRIGGERS = [
+  WORKFLOW_TRIGGER_TO_ENUM[FORM_SUBMITTED_NO_EVENT],
+  WORKFLOW_TRIGGER_TO_ENUM[FORM_SUBMITTED],
+];
+
+export const ENUM_OFFSET_WORFLOW_TRIGGERS = [
+  WORKFLOW_TRIGGER_TO_ENUM[FORM_SUBMITTED_NO_EVENT],
+  WORKFLOW_TRIGGER_TO_ENUM[BEFORE_EVENT],
+  WORKFLOW_TRIGGER_TO_ENUM[AFTER_EVENT],
+  WORKFLOW_TRIGGER_TO_ENUM[AFTER_GUESTS_CAL_VIDEO_NO_SHOW],
+  WORKFLOW_TRIGGER_TO_ENUM[AFTER_HOSTS_CAL_VIDEO_NO_SHOW],
+];
+
 export const ENUM_TO_WORKFLOW_TRIGGER = {
   [WorkflowTriggerEvents.BEFORE_EVENT]: BEFORE_EVENT,
   [WorkflowTriggerEvents.EVENT_CANCELLED]: EVENT_CANCELLED,
@@ -76,6 +92,7 @@ export const ENUM_TO_WORKFLOW_TRIGGER = {
   [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.FORM_SUBMITTED_NO_EVENT]: FORM_SUBMITTED_NO_EVENT,
   [WorkflowTriggerEvents.BOOKING_REJECTED]: BOOKING_REJECTED,
   [WorkflowTriggerEvents.BOOKING_REQUESTED]: BOOKING_REQUESTED,
   [WorkflowTriggerEvents.BOOKING_PAYMENT_INITIATED]: BOOKING_PAYMENT_INITIATED,
@@ -205,7 +222,8 @@ export class OnNoShowUpdateTriggerDto {
 
 export class TriggerOffsetDTO {
   @ApiProperty({
-    description: "Offset before/after the trigger time; required for BEFORE_EVENT and AFTER_EVENT only",
+    description:
+      "Offset before/after the trigger time; required for BEFORE_EVENT, AFTER_EVENT, and FORM_SUBMITTED_NO_EVENT",
     type: WorkflowTriggerOffsetDto,
   })
   @ValidateNested()
@@ -261,3 +279,22 @@ export class OnFormSubmittedTriggerDto {
   @IsIn([FORM_SUBMITTED])
   type: typeof FORM_SUBMITTED = FORM_SUBMITTED;
 }
+
+export class OnFormSubmittedNoEventTriggerDto extends TriggerOffsetDTO {
+  @ApiProperty({
+    description: "Trigger type for the workflow",
+    example: FORM_SUBMITTED_NO_EVENT,
+  })
+  @IsString()
+  @IsIn([FORM_SUBMITTED_NO_EVENT])
+  type: typeof FORM_SUBMITTED_NO_EVENT = FORM_SUBMITTED_NO_EVENT;
+}
+
+export const OffsetTriggerDTOInstances = [
+  OnFormSubmittedNoEventTriggerDto,
+  OnBeforeEventTriggerDto,
+  OnAfterEventTriggerDto,
+  OnAfterCalVideoGuestsNoShowTriggerDto,
+  OnAfterEventTriggerDto,
+];
+export type OffsetTriggerDTOInstancesType = InstanceType<(typeof OffsetTriggerDTOInstances)[number]>;
@@ -35,7 +35,7 @@ export class RoutingFormWorkflowTriggerOutputDto {
   type!: WorkflowFormTriggerType;
 
   @ApiPropertyOptional({
-    description: "Offset details (present for BEFORE_EVENT/AFTER_EVENT)",
+    description: "Offset details (present for BEFORE_EVENT/AFTER_EVENT/FORM_SUBMITTED_NO_EVENT)",
     type: WorkflowTriggerOffsetOutputDto,
   })
   @Expose()
 
@@ -21,8 +21,8 @@ import {
   WHATSAPP_NUMBER,
 } from "../inputs/workflow-step.input";
 import {
-  OnAfterEventTriggerDto,
-  OnBeforeEventTriggerDto,
+  OffsetTriggerDTOInstances,
+  OffsetTriggerDTOInstancesType,
   TIME_UNIT_TO_ENUM,
   WORKFLOW_TRIGGER_TO_ENUM,
 } from "../inputs/workflow-trigger.input";
@@ -31,6 +31,12 @@ import {
 export class WorkflowsInputService {
   constructor(private readonly teamsVerifiedResourcesRepository: TeamsVerifiedResourcesRepository) {}
 
+  private _isOffsetTrigger(
+    trigger: UpdateEventTypeWorkflowDto["trigger"] | UpdateFormWorkflowDto["trigger"]
+  ): trigger is OffsetTriggerDTOInstancesType {
+    return OffsetTriggerDTOInstances.some((Instance) => trigger instanceof Instance);
+  }
+
   private async _getTeamPhoneNumberFromVerifiedId(teamId: number, verifiedPhoneId: number) {
     const phoneResource = await this.teamsVerifiedResourcesRepository.getTeamVerifiedPhoneNumberById(
       verifiedPhoneId,
@@ -135,17 +141,13 @@ export class WorkflowsInputService {
       ? WORKFLOW_TRIGGER_TO_ENUM[updateDto?.trigger?.type]
       : currentData.trigger;
 
-    const timeUnitForZod =
-      updateDto.trigger instanceof OnBeforeEventTriggerDto ||
-      updateDto.trigger instanceof OnAfterEventTriggerDto
-        ? updateDto?.trigger?.offset?.unit ?? currentData.timeUnit ?? null
-        : undefined;
-
-    const time =
-      updateDto.trigger instanceof OnBeforeEventTriggerDto ||
-      updateDto.trigger instanceof OnAfterEventTriggerDto
-        ? updateDto?.trigger?.offset?.value ?? currentData?.time ?? null
-        : null;
+    const timeUnitForZod = this._isOffsetTrigger(updateDto.trigger)
+      ? updateDto?.trigger?.offset?.unit ?? currentData.timeUnit ?? null
+      : undefined;
+
+    const time = this._isOffsetTrigger(updateDto.trigger)
+      ? updateDto?.trigger?.offset?.value ?? currentData?.time ?? null
+      : null;
 
     const timeUnit = timeUnitForZod ? TIME_UNIT_TO_ENUM[timeUnitForZod] : null;