@oneuptime/common 8.0.5312 → 8.0.5326

package/Server/API/UserWhatsAppAPI.ts

@@ -0,0 +1,136 @@
+import UserMiddleware from "../Middleware/UserAuthorization";
+import UserWhatsAppService, {
+  Service as UserWhatsAppServiceType,
+} from "../Services/UserWhatsAppService";
+import {
+  ExpressRequest,
+  ExpressResponse,
+  NextFunction,
+  OneUptimeRequest,
+} from "../Utils/Express";
+import Response from "../Utils/Response";
+import BaseAPI from "./BaseAPI";
+import BadDataException from "../../Types/Exception/BadDataException";
+import UserWhatsApp from "../../Models/DatabaseModels/UserWhatsApp";
+
+export default class UserWhatsAppAPI extends BaseAPI<
+  UserWhatsApp,
+  UserWhatsAppServiceType
+> {
+  public constructor() {
+    super(UserWhatsApp, UserWhatsAppService);
+
+    this.router.post(
+      `${new this.entityType().getCrudApiPath()?.toString()}/verify`,
+      UserMiddleware.getUserMiddleware,
+      async (req: ExpressRequest, res: ExpressResponse, next: NextFunction) => {
+        try {
+          req = req as OneUptimeRequest;
+
+          if (!req.body.itemId) {
+            return Response.sendErrorResponse(
+              req,
+              res,
+              new BadDataException("Invalid item ID"),
+            );
+          }
+
+          if (!req.body.code) {
+            return Response.sendErrorResponse(
+              req,
+              res,
+              new BadDataException("Invalid code"),
+            );
+          }
+
+          const item: UserWhatsApp | null = await this.service.findOneById({
+            id: req.body["itemId"],
+            props: {
+              isRoot: true,
+            },
+            select: {
+              userId: true,
+              verificationCode: true,
+              isVerified: true,
+            },
+          });
+
+          if (!item) {
+            return Response.sendErrorResponse(
+              req,
+              res,
+              new BadDataException("Item not found"),
+            );
+          }
+
+          if (item.isVerified) {
+            return Response.sendErrorResponse(
+              req,
+              res,
+              new BadDataException("WhatsApp number already verified"),
+            );
+          }
+
+          if (
+            item.userId?.toString() !==
+            (req as OneUptimeRequest)?.userAuthorization?.userId?.toString()
+          ) {
+            return Response.sendErrorResponse(
+              req,
+              res,
+              new BadDataException("Invalid user ID"),
+            );
+          }
+
+          if (item.verificationCode !== req.body["code"]) {
+            return Response.sendErrorResponse(
+              req,
+              res,
+              new BadDataException("Invalid code"),
+            );
+          }
+
+          await this.service.updateOneById({
+            id: item.id!,
+            props: {
+              isRoot: true,
+            },
+            data: {
+              isVerified: true,
+            },
+          });
+
+          return Response.sendEmptySuccessResponse(req, res);
+        } catch (err) {
+          return next(err);
+        }
+      },
+    );
+
+    this.router.post(
+      `${new this.entityType()
+        .getCrudApiPath()
+        ?.toString()}/resend-verification-code`,
+      UserMiddleware.getUserMiddleware,
+      async (req: ExpressRequest, res: ExpressResponse, next: NextFunction) => {
+        try {
+          req = req as OneUptimeRequest;
+
+          if (!req.body.itemId) {
+            return Response.sendErrorResponse(
+              req,
+              res,
+              new BadDataException("Invalid item ID"),
+            );
+          }
+
+          await this.service.resendVerificationCode(req.body.itemId);
+
+          return Response.sendEmptySuccessResponse(req, res);
+        } catch (err) {
+          return next(err);
+        }
+      },
+    );
+  }
+}

package/Server/Infrastructure/Postgres/SchemaMigrations/1759838763506-MigrationName.ts

@@ -0,0 +1,105 @@
+import { MigrationInterface, QueryRunner } from "typeorm";
+
+export class MigrationName1759838763506 implements MigrationInterface {
+  public name = "MigrationName1759838763506";
+
+  public async up(queryRunner: QueryRunner): Promise<void> {
+    await queryRunner.query(
+      `ALTER TABLE "WhatsAppLog" DROP COLUMN "whatsAppText"`,
+    );
+    await queryRunner.query(
+      `ALTER TABLE "Project" ADD "enableWhatsAppNotifications" boolean NOT NULL DEFAULT false`,
+    );
+    await queryRunner.query(`ALTER TABLE "WhatsAppLog" ADD "messageText" text`);
+    await queryRunner.query(
+      `ALTER TABLE "UserNotificationRule" ADD "userWhatsAppId" uuid`,
+    );
+    await queryRunner.query(
+      `ALTER TABLE "UserNotificationSetting" ADD "alertByWhatsApp" boolean NOT NULL DEFAULT false`,
+    );
+    await queryRunner.query(
+      `ALTER TABLE "UserOnCallLogTimeline" ADD "userWhatsAppId" uuid`,
+    );
+    await queryRunner.query(
+      `ALTER TABLE "OnCallDutyPolicyScheduleLayer" ALTER COLUMN "rotation" SET DEFAULT '{"_type":"Recurring","value":{"intervalType":"Day","intervalCount":{"_type":"PositiveNumber","value":1}}}'`,
+    );
+    await queryRunner.query(
+      `ALTER TABLE "OnCallDutyPolicyScheduleLayer" ALTER COLUMN "restrictionTimes" SET DEFAULT '{"_type":"RestrictionTimes","value":{"restictionType":"None","dayRestrictionTimes":null,"weeklyRestrictionTimes":[]}}'`,
+    );
+    await queryRunner.query(
+      `ALTER TABLE "WhatsAppLog" ALTER COLUMN "whatsAppCostInUSDCents" SET NOT NULL`,
+    );
+    await queryRunner.query(
+      `ALTER TABLE "WhatsAppLog" ALTER COLUMN "whatsAppCostInUSDCents" SET DEFAULT '0'`,
+    );
+    await queryRunner.query(
+      `ALTER TABLE "UserWhatsApp" ALTER COLUMN "verificationCode" SET NOT NULL`,
+    );
+    await queryRunner.query(
+      `CREATE INDEX "IDX_98e71cf97956e7938195be8451" ON "WhatsAppLog" ("whatsAppCostInUSDCents") `,
+    );
+    await queryRunner.query(
+      `CREATE INDEX "IDX_73297560a1a70e4fe47eac2986" ON "UserNotificationRule" ("userWhatsAppId") `,
+    );
+    await queryRunner.query(
+      `CREATE INDEX "IDX_0a67c82e4e093ae5c89d2d76bd" ON "UserOnCallLogTimeline" ("userWhatsAppId") `,
+    );
+    await queryRunner.query(
+      `ALTER TABLE "UserNotificationRule" ADD CONSTRAINT "FK_73297560a1a70e4fe47eac29861" FOREIGN KEY ("userWhatsAppId") REFERENCES "UserWhatsApp"("_id") ON DELETE CASCADE ON UPDATE NO ACTION`,
+    );
+    await queryRunner.query(
+      `ALTER TABLE "UserOnCallLogTimeline" ADD CONSTRAINT "FK_0a67c82e4e093ae5c89d2d76bdf" FOREIGN KEY ("userWhatsAppId") REFERENCES "UserWhatsApp"("_id") ON DELETE CASCADE ON UPDATE NO ACTION`,
+    );
+  }
+
+  public async down(queryRunner: QueryRunner): Promise<void> {
+    await queryRunner.query(
+      `ALTER TABLE "UserOnCallLogTimeline" DROP CONSTRAINT "FK_0a67c82e4e093ae5c89d2d76bdf"`,
+    );
+    await queryRunner.query(
+      `ALTER TABLE "UserNotificationRule" DROP CONSTRAINT "FK_73297560a1a70e4fe47eac29861"`,
+    );
+    await queryRunner.query(
+      `DROP INDEX "public"."IDX_0a67c82e4e093ae5c89d2d76bd"`,
+    );
+    await queryRunner.query(
+      `DROP INDEX "public"."IDX_73297560a1a70e4fe47eac2986"`,
+    );
+    await queryRunner.query(
+      `DROP INDEX "public"."IDX_98e71cf97956e7938195be8451"`,
+    );
+    await queryRunner.query(
+      `ALTER TABLE "UserWhatsApp" ALTER COLUMN "verificationCode" DROP NOT NULL`,
+    );
+    await queryRunner.query(
+      `ALTER TABLE "WhatsAppLog" ALTER COLUMN "whatsAppCostInUSDCents" DROP DEFAULT`,
+    );
+    await queryRunner.query(
+      `ALTER TABLE "WhatsAppLog" ALTER COLUMN "whatsAppCostInUSDCents" DROP NOT NULL`,
+    );
+    await queryRunner.query(
+      `ALTER TABLE "OnCallDutyPolicyScheduleLayer" ALTER COLUMN "restrictionTimes" SET DEFAULT '{"_type": "RestrictionTimes", "value": {"restictionType": "None", "dayRestrictionTimes": null, "weeklyRestrictionTimes": []}}'`,
+    );
+    await queryRunner.query(
+      `ALTER TABLE "OnCallDutyPolicyScheduleLayer" ALTER COLUMN "rotation" SET DEFAULT '{"_type": "Recurring", "value": {"intervalType": "Day", "intervalCount": {"_type": "PositiveNumber", "value": 1}}}'`,
+    );
+    await queryRunner.query(
+      `ALTER TABLE "UserOnCallLogTimeline" DROP COLUMN "userWhatsAppId"`,
+    );
+    await queryRunner.query(
+      `ALTER TABLE "UserNotificationSetting" DROP COLUMN "alertByWhatsApp"`,
+    );
+    await queryRunner.query(
+      `ALTER TABLE "UserNotificationRule" DROP COLUMN "userWhatsAppId"`,
+    );
+    await queryRunner.query(
+      `ALTER TABLE "WhatsAppLog" DROP COLUMN "messageText"`,
+    );
+    await queryRunner.query(
+      `ALTER TABLE "Project" DROP COLUMN "enableWhatsAppNotifications"`,
+    );
+    await queryRunner.query(
+      `ALTER TABLE "WhatsAppLog" ADD "whatsAppText" character varying(500) NOT NULL`,
+    );
+  }
+}

package/Server/Infrastructure/Postgres/SchemaMigrations/1759839342566-MigrationName.ts

@@ -0,0 +1,71 @@
+import { MigrationInterface, QueryRunner } from "typeorm";
+
+export class MigrationName1759839342566 implements MigrationInterface {
+  public name = "MigrationName1759839342566";
+
+  public async up(queryRunner: QueryRunner): Promise<void> {
+    await queryRunner.query(
+      `ALTER TABLE "GlobalConfig" ADD "metaWhatsAppAccessToken" text`,
+    );
+    await queryRunner.query(
+      `ALTER TABLE "GlobalConfig" ADD CONSTRAINT "UQ_83bd5d0c54a21bfe12316fa6520" UNIQUE ("metaWhatsAppAccessToken")`,
+    );
+    await queryRunner.query(
+      `ALTER TABLE "GlobalConfig" ADD "metaWhatsAppPhoneNumberId" character varying(100)`,
+    );
+    await queryRunner.query(
+      `ALTER TABLE "GlobalConfig" ADD CONSTRAINT "UQ_ef032cda9dd2fac68daeedd7bd2" UNIQUE ("metaWhatsAppPhoneNumberId")`,
+    );
+    await queryRunner.query(
+      `ALTER TABLE "GlobalConfig" ADD "metaWhatsAppBusinessAccountId" character varying(100)`,
+    );
+    await queryRunner.query(
+      `ALTER TABLE "GlobalConfig" ADD CONSTRAINT "UQ_607e6e88215689951d9b3645f00" UNIQUE ("metaWhatsAppBusinessAccountId")`,
+    );
+    await queryRunner.query(
+      `ALTER TABLE "GlobalConfig" ADD "metaWhatsAppAppId" character varying(100)`,
+    );
+    await queryRunner.query(
+      `ALTER TABLE "GlobalConfig" ADD CONSTRAINT "UQ_e67fd0998ca781ec7db0e573e91" UNIQUE ("metaWhatsAppAppId")`,
+    );
+    await queryRunner.query(
+      `ALTER TABLE "GlobalConfig" ADD "metaWhatsAppAppSecret" text`,
+    );
+    await queryRunner.query(
+      `ALTER TABLE "GlobalConfig" ADD CONSTRAINT "UQ_d4669bf754f937bae16c4a1837c" UNIQUE ("metaWhatsAppAppSecret")`,
+    );
+  }
+
+  public async down(queryRunner: QueryRunner): Promise<void> {
+    await queryRunner.query(
+      `ALTER TABLE "GlobalConfig" DROP CONSTRAINT "UQ_d4669bf754f937bae16c4a1837c"`,
+    );
+    await queryRunner.query(
+      `ALTER TABLE "GlobalConfig" DROP COLUMN "metaWhatsAppAppSecret"`,
+    );
+    await queryRunner.query(
+      `ALTER TABLE "GlobalConfig" DROP CONSTRAINT "UQ_e67fd0998ca781ec7db0e573e91"`,
+    );
+    await queryRunner.query(
+      `ALTER TABLE "GlobalConfig" DROP COLUMN "metaWhatsAppAppId"`,
+    );
+    await queryRunner.query(
+      `ALTER TABLE "GlobalConfig" DROP CONSTRAINT "UQ_607e6e88215689951d9b3645f00"`,
+    );
+    await queryRunner.query(
+      `ALTER TABLE "GlobalConfig" DROP COLUMN "metaWhatsAppBusinessAccountId"`,
+    );
+    await queryRunner.query(
+      `ALTER TABLE "GlobalConfig" DROP CONSTRAINT "UQ_ef032cda9dd2fac68daeedd7bd2"`,
+    );
+    await queryRunner.query(
+      `ALTER TABLE "GlobalConfig" DROP COLUMN "metaWhatsAppPhoneNumberId"`,
+    );
+    await queryRunner.query(
+      `ALTER TABLE "GlobalConfig" DROP CONSTRAINT "UQ_83bd5d0c54a21bfe12316fa6520"`,
+    );
+    await queryRunner.query(
+      `ALTER TABLE "GlobalConfig" DROP COLUMN "metaWhatsAppAccessToken"`,
+    );
+  }
+}

package/Server/Infrastructure/Postgres/SchemaMigrations/Index.ts

@@ -174,6 +174,8 @@ import { MigrationName1758798730753 } from "./1758798730753-MigrationName";
 import { MigrationName1759175457008 } from "./1759175457008-MigrationName";
 import { MigrationName1759232954703 } from "./1759232954703-MigrationName";
 import { RenameUserTwoFactorAuthToUserTotpAuth1759234532998 } from "./1759234532998-MigrationName";
+import { MigrationName1759838763506 } from "./1759838763506-MigrationName";
+import { MigrationName1759839342566 } from "./1759839342566-MigrationName";
 
 export default [
   InitialMigration,
@@ -352,4 +354,6 @@ export default [
   MigrationName1759175457008,
   MigrationName1759232954703,
   RenameUserTwoFactorAuthToUserTotpAuth1759234532998,
+  MigrationName1759838763506,
+  MigrationName1759839342566,
 ];

package/Server/Services/Index.ts

@@ -91,6 +91,7 @@ import ServiceCopilotCodeRepositoryService from "./ServiceCopilotCodeRepositoryS
 import ShortLinkService from "./ShortLinkService";
 // SMS Log Service
 import SmsLogService from "./SmsLogService";
+import WhatsAppLogService from "./WhatsAppLogService";
 import SmsService from "./SmsService";
 import SpanService from "./SpanService";
 import StatusPageAnnouncementService from "./StatusPageAnnouncementService";
@@ -126,6 +127,7 @@ import UserService from "./UserService";
 import UserTotpAuthService from "./UserTotpAuthService";
 import UserWebAuthnService from "./UserWebAuthnService";
 import UserSmsService from "./UserSmsService";
+import UserWhatsAppService from "./UserWhatsAppService";
 import WorkflowLogService from "./WorkflowLogService";
 // Workflows.
 import WorkflowService from "./WorkflowService";
@@ -250,6 +252,7 @@ const services: Array<BaseService> = [
 
   ShortLinkService,
   SmsLogService,
+  WhatsAppLogService,
   SmsService,
 
   StatusPageAnnouncementService,
@@ -281,6 +284,7 @@ const services: Array<BaseService> = [
   UserOnCallLogService,
   UserOnCallLogTimelineService,
   UserSmsService,
+  UserWhatsAppService,
   UserTotpAuthService,
   UserWebAuthnService,
 

package/Server/Services/MonitorService.ts

@@ -69,6 +69,8 @@ import logger from "../Utils/Logger";
 import PushNotificationUtil from "../Utils/PushNotificationUtil";
 import ExceptionMessages from "../../Types/Exception/ExceptionMessages";
 import Project from "../../Models/DatabaseModels/Project";
+import { createWhatsAppMessageFromTemplate } from "../Utils/WhatsAppTemplateUtil";
+import { WhatsAppMessagePayload } from "../../Types/WhatsApp/WhatsAppMessage";
 
 export class Service extends DatabaseService<Model> {
   public constructor() {
@@ -1191,6 +1193,19 @@ ${createdItem.description?.trim() || "No description provided."}
         ],
       };
 
+      const eventType: NotificationSettingEventType =
+        NotificationSettingEventType.SEND_MONITOR_NOTIFICATION_WHEN_NO_PROBES_ARE_MONITORING_THE_MONITOR;
+
+      const whatsAppMessage: WhatsAppMessagePayload =
+        createWhatsAppMessageFromTemplate({
+          eventType,
+          templateVariables: {
+            monitor_name: monitor.name!,
+            probe_status: enabledStatus,
+            monitor_link: vars["monitorViewLink"] || "",
+          },
+        });
+
       await UserNotificationSettingService.sendUserNotification({
         userId: owner.id!,
         projectId: monitor.projectId!,
@@ -1205,8 +1220,8 @@ ${createdItem.description?.trim() || "No description provided."}
             monitorId: monitor.id!.toString(),
             monitorName: monitor.name!,
           }),
-        eventType:
-          NotificationSettingEventType.SEND_MONITOR_NOTIFICATION_WHEN_NO_PROBES_ARE_MONITORING_THE_MONITOR,
+        whatsAppMessage,
+        eventType,
       });
     }
   }
@@ -1298,6 +1313,19 @@ ${createdItem.description?.trim() || "No description provided."}
         ],
       };
 
+      const eventType: NotificationSettingEventType =
+        NotificationSettingEventType.SEND_MONITOR_NOTIFICATION_WHEN_PORBE_STATUS_CHANGES;
+
+      const whatsAppMessage: WhatsAppMessagePayload =
+        createWhatsAppMessageFromTemplate({
+          eventType,
+          templateVariables: {
+            monitor_name: monitor.name!,
+            probe_status: status,
+            monitor_link: vars["monitorViewLink"] || "",
+          },
+        });
+
       await UserNotificationSettingService.sendUserNotification({
         userId: owner.id!,
         projectId: monitor.projectId!,
@@ -1309,8 +1337,8 @@ ${createdItem.description?.trim() || "No description provided."}
             monitorName: monitor.name!,
             monitorId: monitor.id!.toString(),
           }),
-        eventType:
-          NotificationSettingEventType.SEND_MONITOR_NOTIFICATION_WHEN_PORBE_STATUS_CHANGES,
+        whatsAppMessage,
+        eventType,
       });
     }
   }

package/Server/Services/OnCallDutyPolicyEscalationRuleScheduleService.ts

@@ -20,6 +20,8 @@ import { OnCallDutyPolicyFeedEventType } from "../../Models/DatabaseModels/OnCal
 import { Gray500, Red500 } from "../../Types/BrandColors";
 import PushNotificationMessage from "../../Types/PushNotification/PushNotificationMessage";
 import PushNotificationUtil from "../Utils/PushNotificationUtil";
+import { createWhatsAppMessageFromTemplate } from "../Utils/WhatsAppTemplateUtil";
+import { WhatsAppMessagePayload } from "../../Types/WhatsApp/WhatsAppMessage";
 
 export class Service extends DatabaseService<Model> {
   public constructor() {
@@ -135,6 +137,21 @@ export class Service extends DatabaseService<Model> {
         policyName: createdModel.onCallDutyPolicy?.name || "No name provided",
       });
 
+    const eventType: NotificationSettingEventType =
+      NotificationSettingEventType.SEND_WHEN_USER_IS_ADDED_TO_ON_CALL_POLICY;
+
+    const whatsAppMessage: WhatsAppMessagePayload =
+      createWhatsAppMessageFromTemplate({
+        eventType,
+        templateVariables: {
+          on_call_policy_name:
+            createdModel.onCallDutyPolicy?.name || "No name provided",
+          schedule_name: scheduleName,
+          on_call_context: `schedule ${scheduleName}`,
+          policy_link: vars["onCallPolicyViewLink"] || "",
+        },
+      });
+
     await UserNotificationSettingService.sendUserNotification({
       userId: sendEmailToUserId,
       projectId: createdModel!.projectId!,
@@ -142,8 +159,8 @@ export class Service extends DatabaseService<Model> {
       smsMessage: sms,
       callRequestMessage: callMessage,
       pushNotificationMessage: pushMessage,
-      eventType:
-        NotificationSettingEventType.SEND_WHEN_USER_IS_ADDED_TO_ON_CALL_POLICY,
+      whatsAppMessage,
+      eventType,
     });
 
     // add workspace message.
@@ -317,6 +334,21 @@ export class Service extends DatabaseService<Model> {
           policyName: deletedItem.onCallDutyPolicy?.name || "No name provided",
         });
 
+      const eventType: NotificationSettingEventType =
+        NotificationSettingEventType.SEND_WHEN_USER_IS_REMOVED_FROM_ON_CALL_POLICY;
+
+      const whatsAppMessage: WhatsAppMessagePayload =
+        createWhatsAppMessageFromTemplate({
+          eventType,
+          templateVariables: {
+            on_call_policy_name:
+              deletedItem.onCallDutyPolicy?.name || "No name provided",
+            schedule_name: scheduleName,
+            on_call_context: `schedule ${scheduleName}`,
+            policy_link: vars["onCallPolicyViewLink"] || "",
+          },
+        });
+
       await UserNotificationSettingService.sendUserNotification({
         userId: sendEmailToUserId,
         projectId: deletedItem!.projectId!,
@@ -324,8 +356,8 @@ export class Service extends DatabaseService<Model> {
         smsMessage: sms,
         callRequestMessage: callMessage,
         pushNotificationMessage: pushMessage,
-        eventType:
-          NotificationSettingEventType.SEND_WHEN_USER_IS_REMOVED_FROM_ON_CALL_POLICY,
+        whatsAppMessage,
+        eventType,
       });
     }
 

package/Server/Services/OnCallDutyPolicyEscalationRuleTeamService.ts

@@ -20,6 +20,8 @@ import { OnCallDutyPolicyFeedEventType } from "../../Models/DatabaseModels/OnCal
 import { Gray500, Red500 } from "../../Types/BrandColors";
 import PushNotificationMessage from "../../Types/PushNotification/PushNotificationMessage";
 import PushNotificationUtil from "../Utils/PushNotificationUtil";
+import { createWhatsAppMessageFromTemplate } from "../Utils/WhatsAppTemplateUtil";
+import { WhatsAppMessagePayload } from "../../Types/WhatsApp/WhatsAppMessage";
 import Team from "../../Models/DatabaseModels/Team";
 import OnCallDutyPolicyTimeLogService from "./OnCallDutyPolicyTimeLogService";
 import OneUptimeDate from "../../Types/Date";
@@ -134,6 +136,20 @@ export class Service extends DatabaseService<Model> {
           policyName: createdModel.onCallDutyPolicy?.name || "No name provided",
         });
 
+      const eventType: NotificationSettingEventType =
+        NotificationSettingEventType.SEND_WHEN_USER_IS_ADDED_TO_ON_CALL_POLICY;
+
+      const whatsAppMessage: WhatsAppMessagePayload =
+        createWhatsAppMessageFromTemplate({
+          eventType,
+          templateVariables: {
+            on_call_policy_name:
+              createdModel.onCallDutyPolicy?.name || "No name provided",
+            on_call_context: `team ${temaName}`,
+            policy_link: vars["onCallPolicyViewLink"] || "",
+          },
+        });
+
       await UserNotificationSettingService.sendUserNotification({
         userId: sendEmailToUserId,
         projectId: createdModel!.projectId!,
@@ -141,8 +157,8 @@ export class Service extends DatabaseService<Model> {
         smsMessage: sms,
         callRequestMessage: callMessage,
         pushNotificationMessage: pushMessage,
-        eventType:
-          NotificationSettingEventType.SEND_WHEN_USER_IS_ADDED_TO_ON_CALL_POLICY,
+        whatsAppMessage,
+        eventType,
       });
 
       // add start log
@@ -322,6 +338,20 @@ export class Service extends DatabaseService<Model> {
               deletedItem.onCallDutyPolicy?.name || "No name provided",
           });
 
+        const eventType: NotificationSettingEventType =
+          NotificationSettingEventType.SEND_WHEN_USER_IS_REMOVED_FROM_ON_CALL_POLICY;
+
+        const whatsAppMessage: WhatsAppMessagePayload =
+          createWhatsAppMessageFromTemplate({
+            eventType,
+            templateVariables: {
+              on_call_policy_name:
+                deletedItem.onCallDutyPolicy?.name || "No name provided",
+              on_call_context: `team ${teamName}`,
+              policy_link: vars["onCallPolicyViewLink"] || "",
+            },
+          });
+
         UserNotificationSettingService.sendUserNotification({
           userId: sendEmailToUserId,
           projectId: deletedItem!.projectId!,
@@ -329,8 +359,8 @@ export class Service extends DatabaseService<Model> {
           smsMessage: sms,
           callRequestMessage: callMessage,
           pushNotificationMessage: pushMessage,
-          eventType:
-            NotificationSettingEventType.SEND_WHEN_USER_IS_REMOVED_FROM_ON_CALL_POLICY,
+          whatsAppMessage,
+          eventType,
         });
 
         // end time log

package/Server/Services/OnCallDutyPolicyEscalationRuleUserService.ts

@@ -22,7 +22,9 @@ import PushNotificationMessage from "../../Types/PushNotification/PushNotificati
 import PushNotificationUtil from "../Utils/PushNotificationUtil";
 import OnCallDutyPolicyTimeLogService from "./OnCallDutyPolicyTimeLogService";
 import OneUptimeDate from "../../Types/Date";
+import { createWhatsAppMessageFromTemplate } from "../Utils/WhatsAppTemplateUtil";
 import logger from "../Utils/Logger";
+import { WhatsAppMessagePayload } from "../../Types/WhatsApp/WhatsAppMessage";
 
 export class Service extends DatabaseService<Model> {
   public constructor() {
@@ -117,6 +119,20 @@ export class Service extends DatabaseService<Model> {
         policyName: createdModel.onCallDutyPolicy?.name || "",
       });
 
+    const eventType: NotificationSettingEventType =
+      NotificationSettingEventType.SEND_WHEN_USER_IS_ADDED_TO_ON_CALL_POLICY;
+
+    const whatsAppMessage: WhatsAppMessagePayload =
+      createWhatsAppMessageFromTemplate({
+        eventType,
+        templateVariables: {
+          on_call_policy_name:
+            createdModel.onCallDutyPolicy?.name || "No name provided",
+          on_call_context: `escalation rule ${createdModel.onCallDutyPolicyEscalationRule?.name || "No name provided"}`,
+          policy_link: vars["onCallPolicyViewLink"] || "",
+        },
+      });
+
     await UserNotificationSettingService.sendUserNotification({
       userId: sendEmailToUserId,
       projectId: createdModel!.projectId!,
@@ -124,8 +140,8 @@ export class Service extends DatabaseService<Model> {
       smsMessage: sms,
       callRequestMessage: callMessage,
       pushNotificationMessage: pushMessage,
-      eventType:
-        NotificationSettingEventType.SEND_WHEN_USER_IS_ADDED_TO_ON_CALL_POLICY,
+      whatsAppMessage,
+      eventType,
       onCallPolicyId: createdModel.onCallDutyPolicy!.id!,
       onCallPolicyEscalationRuleId:
         createdModel.onCallDutyPolicyEscalationRule!.id!,
@@ -322,6 +338,20 @@ export class Service extends DatabaseService<Model> {
           policyName: deletedItem.onCallDutyPolicy?.name || "",
         });
 
+      const eventType: NotificationSettingEventType =
+        NotificationSettingEventType.SEND_WHEN_USER_IS_REMOVED_FROM_ON_CALL_POLICY;
+
+      const whatsAppMessage: WhatsAppMessagePayload =
+        createWhatsAppMessageFromTemplate({
+          eventType,
+          templateVariables: {
+            on_call_policy_name:
+              deletedItem.onCallDutyPolicy?.name || "No name provided",
+            on_call_context: `escalation rule ${deletedItem.onCallDutyPolicyEscalationRule?.name || "No name provided"}`,
+            policy_link: vars["onCallPolicyViewLink"] || "",
+          },
+        });
+
       UserNotificationSettingService.sendUserNotification({
         userId: sendEmailToUserId,
         projectId: deletedItem!.projectId!,
@@ -329,8 +359,8 @@ export class Service extends DatabaseService<Model> {
         smsMessage: sms,
         callRequestMessage: callMessage,
         pushNotificationMessage: pushMessage,
-        eventType:
-          NotificationSettingEventType.SEND_WHEN_USER_IS_REMOVED_FROM_ON_CALL_POLICY,
+        whatsAppMessage,
+        eventType,
         onCallPolicyId: deletedItem.onCallDutyPolicy!.id!,
         onCallPolicyEscalationRuleId:
           deletedItem.onCallDutyPolicyEscalationRule!.id!,