@oneuptime/common 7.0.3827 → 7.0.3840

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

@@ -0,0 +1,69 @@
+import { MigrationInterface, QueryRunner } from "typeorm";
+
+export class MigrationName1741904597606 implements MigrationInterface {
+  public name = "MigrationName1741904597606";
+
+  public async up(queryRunner: QueryRunner): Promise<void> {
+    await queryRunner.query(
+      `CREATE TABLE "OnCallDutyPolicyUserOverride" ("_id" uuid NOT NULL DEFAULT uuid_generate_v4(), "createdAt" TIMESTAMP WITH TIME ZONE NOT NULL DEFAULT now(), "updatedAt" TIMESTAMP WITH TIME ZONE NOT NULL DEFAULT now(), "deletedAt" TIMESTAMP WITH TIME ZONE, "version" integer NOT NULL, "projectId" uuid NOT NULL, "onCallDutyPolicyId" uuid, "name" character varying(100) NOT NULL, "description" character varying(500), "createdByUserId" uuid, "overrideUserId" uuid NOT NULL, "routeAlertsToUserId" uuid NOT NULL, "startsAt" TIMESTAMP WITH TIME ZONE NOT NULL, "endsAt" TIMESTAMP WITH TIME ZONE NOT NULL, "deletedByUserId" uuid, CONSTRAINT "PK_41b216c8e71d15182fe67b75fec" PRIMARY KEY ("_id"))`,
+    );
+    await queryRunner.query(
+      `CREATE INDEX "IDX_75b4e0f9bc53be5cdaa55b2936" ON "OnCallDutyPolicyUserOverride" ("projectId") `,
+    );
+    await queryRunner.query(
+      `CREATE INDEX "IDX_6a13404edca5d177b3ad539995" ON "OnCallDutyPolicyUserOverride" ("onCallDutyPolicyId") `,
+    );
+    await queryRunner.query(
+      `CREATE INDEX "IDX_b0bdac6c10d7ed30e696aded2c" ON "OnCallDutyPolicyUserOverride" ("name") `,
+    );
+    await queryRunner.query(
+      `ALTER TABLE "OnCallDutyPolicyUserOverride" ADD CONSTRAINT "FK_75b4e0f9bc53be5cdaa55b29361" FOREIGN KEY ("projectId") REFERENCES "Project"("_id") ON DELETE CASCADE ON UPDATE NO ACTION`,
+    );
+    await queryRunner.query(
+      `ALTER TABLE "OnCallDutyPolicyUserOverride" ADD CONSTRAINT "FK_6a13404edca5d177b3ad539995d" FOREIGN KEY ("onCallDutyPolicyId") REFERENCES "OnCallDutyPolicy"("_id") ON DELETE CASCADE ON UPDATE NO ACTION`,
+    );
+    await queryRunner.query(
+      `ALTER TABLE "OnCallDutyPolicyUserOverride" ADD CONSTRAINT "FK_c21b1df32e40e739a66d638a3c7" FOREIGN KEY ("createdByUserId") REFERENCES "User"("_id") ON DELETE SET NULL ON UPDATE NO ACTION`,
+    );
+    await queryRunner.query(
+      `ALTER TABLE "OnCallDutyPolicyUserOverride" ADD CONSTRAINT "FK_4b3f696aaaf327b245ebeb3d146" FOREIGN KEY ("overrideUserId") REFERENCES "User"("_id") ON DELETE SET NULL ON UPDATE NO ACTION`,
+    );
+    await queryRunner.query(
+      `ALTER TABLE "OnCallDutyPolicyUserOverride" ADD CONSTRAINT "FK_8771068ec4c16763a7ff796895d" FOREIGN KEY ("routeAlertsToUserId") REFERENCES "User"("_id") ON DELETE SET NULL ON UPDATE NO ACTION`,
+    );
+    await queryRunner.query(
+      `ALTER TABLE "OnCallDutyPolicyUserOverride" ADD CONSTRAINT "FK_810a8cd7f838a8e141fd750a9d5" FOREIGN KEY ("deletedByUserId") REFERENCES "User"("_id") ON DELETE SET NULL ON UPDATE NO ACTION`,
+    );
+  }
+
+  public async down(queryRunner: QueryRunner): Promise<void> {
+    await queryRunner.query(
+      `ALTER TABLE "OnCallDutyPolicyUserOverride" DROP CONSTRAINT "FK_810a8cd7f838a8e141fd750a9d5"`,
+    );
+    await queryRunner.query(
+      `ALTER TABLE "OnCallDutyPolicyUserOverride" DROP CONSTRAINT "FK_8771068ec4c16763a7ff796895d"`,
+    );
+    await queryRunner.query(
+      `ALTER TABLE "OnCallDutyPolicyUserOverride" DROP CONSTRAINT "FK_4b3f696aaaf327b245ebeb3d146"`,
+    );
+    await queryRunner.query(
+      `ALTER TABLE "OnCallDutyPolicyUserOverride" DROP CONSTRAINT "FK_c21b1df32e40e739a66d638a3c7"`,
+    );
+    await queryRunner.query(
+      `ALTER TABLE "OnCallDutyPolicyUserOverride" DROP CONSTRAINT "FK_6a13404edca5d177b3ad539995d"`,
+    );
+    await queryRunner.query(
+      `ALTER TABLE "OnCallDutyPolicyUserOverride" DROP CONSTRAINT "FK_75b4e0f9bc53be5cdaa55b29361"`,
+    );
+    await queryRunner.query(
+      `DROP INDEX "public"."IDX_b0bdac6c10d7ed30e696aded2c"`,
+    );
+    await queryRunner.query(
+      `DROP INDEX "public"."IDX_6a13404edca5d177b3ad539995"`,
+    );
+    await queryRunner.query(
+      `DROP INDEX "public"."IDX_75b4e0f9bc53be5cdaa55b2936"`,
+    );
+    await queryRunner.query(`DROP TABLE "OnCallDutyPolicyUserOverride"`);
+  }
+}

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

@@ -0,0 +1,29 @@
+import { MigrationInterface, QueryRunner } from "typeorm";
+
+export class MigrationName1741908200702 implements MigrationInterface {
+  public name = "MigrationName1741908200702";
+
+  public async up(queryRunner: QueryRunner): Promise<void> {
+    await queryRunner.query(
+      `DROP INDEX "public"."IDX_b0bdac6c10d7ed30e696aded2c"`,
+    );
+    await queryRunner.query(
+      `ALTER TABLE "OnCallDutyPolicyUserOverride" DROP COLUMN "name"`,
+    );
+    await queryRunner.query(
+      `ALTER TABLE "OnCallDutyPolicyUserOverride" DROP COLUMN "description"`,
+    );
+  }
+
+  public async down(queryRunner: QueryRunner): Promise<void> {
+    await queryRunner.query(
+      `ALTER TABLE "OnCallDutyPolicyUserOverride" ADD "description" character varying(500)`,
+    );
+    await queryRunner.query(
+      `ALTER TABLE "OnCallDutyPolicyUserOverride" ADD "name" character varying(100) NOT NULL`,
+    );
+    await queryRunner.query(
+      `CREATE INDEX "IDX_b0bdac6c10d7ed30e696aded2c" ON "OnCallDutyPolicyUserOverride" ("name") `,
+    );
+  }
+}

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

@@ -0,0 +1,35 @@
+import { MigrationInterface, QueryRunner } from "typeorm";
+
+export class MigrationName1741955609393 implements MigrationInterface {
+  public name = "MigrationName1741955609393";
+
+  public async up(queryRunner: QueryRunner): Promise<void> {
+    await queryRunner.query(
+      `ALTER TABLE "GlobalConfig" RENAME COLUMN "twilioPhoneNumber" TO "twilioPrimaryPhoneNumber"`,
+    );
+    await queryRunner.query(
+      `ALTER TABLE "ProjectCallSMSConfig" RENAME COLUMN "twilioPhoneNumber" TO "twilioPrimaryPhoneNumber"`,
+    );
+    await queryRunner.query(
+      `ALTER TABLE "GlobalConfig" ADD "twilioSecondaryPhoneNumbers" character varying(500)`,
+    );
+    await queryRunner.query(
+      `ALTER TABLE "ProjectCallSMSConfig" ADD "twilioSecondaryPhoneNumbers" character varying(500)`,
+    );
+  }
+
+  public async down(queryRunner: QueryRunner): Promise<void> {
+    await queryRunner.query(
+      `ALTER TABLE "ProjectCallSMSConfig" DROP COLUMN "twilioSecondaryPhoneNumbers"`,
+    );
+    await queryRunner.query(
+      `ALTER TABLE "GlobalConfig" DROP COLUMN "twilioSecondaryPhoneNumbers"`,
+    );
+    await queryRunner.query(
+      `ALTER TABLE "ProjectCallSMSConfig" RENAME COLUMN "twilioPrimaryPhoneNumber" TO "twilioPhoneNumber"`,
+    );
+    await queryRunner.query(
+      `ALTER TABLE "GlobalConfig" RENAME COLUMN "twilioPrimaryPhoneNumber" TO "twilioPhoneNumber"`,
+    );
+  }
+}

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

@@ -0,0 +1,23 @@
+import { MigrationInterface, QueryRunner } from "typeorm";
+
+export class MigrationName1741955752685 implements MigrationInterface {
+  public name = "MigrationName1741955752685";
+
+  public async up(queryRunner: QueryRunner): Promise<void> {
+    await queryRunner.query(
+      `ALTER TABLE "GlobalConfig" DROP CONSTRAINT "UQ_c223b66a0ca2fa8095cb7a6c7cc"`,
+    );
+    await queryRunner.query(
+      `ALTER TABLE "ProjectCallSMSConfig" DROP CONSTRAINT "UQ_50235223d7fd7b0c27063bfb08e"`,
+    );
+  }
+
+  public async down(queryRunner: QueryRunner): Promise<void> {
+    await queryRunner.query(
+      `ALTER TABLE "ProjectCallSMSConfig" ADD CONSTRAINT "UQ_50235223d7fd7b0c27063bfb08e" UNIQUE ("twilioPrimaryPhoneNumber")`,
+    );
+    await queryRunner.query(
+      `ALTER TABLE "GlobalConfig" ADD CONSTRAINT "UQ_c223b66a0ca2fa8095cb7a6c7cc" UNIQUE ("twilioPrimaryPhoneNumber")`,
+    );
+  }
+}

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

@@ -0,0 +1,23 @@
+import { MigrationInterface, QueryRunner } from "typeorm";
+
+export class MigrationName1741957080431 implements MigrationInterface {
+  public name = "MigrationName1741957080431";
+
+  public async up(queryRunner: QueryRunner): Promise<void> {
+    await queryRunner.query(
+      `ALTER TABLE "UserOnCallLog" ADD "overridedByUserId" uuid`,
+    );
+    await queryRunner.query(
+      `ALTER TABLE "UserOnCallLog" ADD CONSTRAINT "FK_702b8c74c8f0d7fb220bc407776" FOREIGN KEY ("overridedByUserId") REFERENCES "User"("_id") ON DELETE CASCADE ON UPDATE NO ACTION`,
+    );
+  }
+
+  public async down(queryRunner: QueryRunner): Promise<void> {
+    await queryRunner.query(
+      `ALTER TABLE "UserOnCallLog" DROP CONSTRAINT "FK_702b8c74c8f0d7fb220bc407776"`,
+    );
+    await queryRunner.query(
+      `ALTER TABLE "UserOnCallLog" DROP COLUMN "overridedByUserId"`,
+    );
+  }
+}

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

@@ -0,0 +1,23 @@
+import { MigrationInterface, QueryRunner } from "typeorm";
+
+export class MigrationName1741959216297 implements MigrationInterface {
+  public name = "MigrationName1741959216297";
+
+  public async up(queryRunner: QueryRunner): Promise<void> {
+    await queryRunner.query(
+      `ALTER TABLE "OnCallDutyPolicyExecutionLogTimeline" ADD "overridedByUserId" uuid`,
+    );
+    await queryRunner.query(
+      `ALTER TABLE "OnCallDutyPolicyExecutionLogTimeline" ADD CONSTRAINT "FK_356ab0badd7e70f4d25045dcbf3" FOREIGN KEY ("overridedByUserId") REFERENCES "User"("_id") ON DELETE CASCADE ON UPDATE NO ACTION`,
+    );
+  }
+
+  public async down(queryRunner: QueryRunner): Promise<void> {
+    await queryRunner.query(
+      `ALTER TABLE "OnCallDutyPolicyExecutionLogTimeline" DROP CONSTRAINT "FK_356ab0badd7e70f4d25045dcbf3"`,
+    );
+    await queryRunner.query(
+      `ALTER TABLE "OnCallDutyPolicyExecutionLogTimeline" DROP COLUMN "overridedByUserId"`,
+    );
+  }
+}

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

@@ -112,6 +112,12 @@ import { MigrationName1740597525803 } from "./1740597525803-MigrationName";
 import { MigrationName1740598793630 } from "./1740598793630-MigrationName";
 import { MigrationName1741031019972 } from "./1741031019972-MigrationName";
 import { MigrationName1741209339971 } from "./1741209339971-MigrationName";
+import { MigrationName1741904597606 } from "./1741904597606-MigrationName";
+import { MigrationName1741908200702 } from "./1741908200702-MigrationName";
+import { MigrationName1741955609393 } from "./1741955609393-MigrationName";
+import { MigrationName1741955752685 } from "./1741955752685-MigrationName";
+import { MigrationName1741957080431 } from "./1741957080431-MigrationName";
+import { MigrationName1741959216297 } from "./1741959216297-MigrationName";
 
 export default [
   InitialMigration,
@@ -228,4 +234,10 @@ export default [
   MigrationName1740598793630,
   MigrationName1741031019972,
   MigrationName1741209339971,
+  MigrationName1741904597606,
+  MigrationName1741908200702,
+  MigrationName1741955609393,
+  MigrationName1741955752685,
+  MigrationName1741957080431,
+  MigrationName1741959216297,
 ];

package/Server/Services/CallService.ts

@@ -35,7 +35,10 @@ export class CallService extends BaseService {
         ? {
             accountSid: options.customTwilioConfig.accountSid!,
             authToken: options.customTwilioConfig.authToken!,
-            phoneNumber: options.customTwilioConfig.phoneNumber.toString(),
+            primaryPhoneNumber:
+              options.customTwilioConfig.primaryPhoneNumber.toString(),
+            secondaryPhoneNumbers:
+              options.customTwilioConfig.secondaryPhoneNumbers?.toString(),
           }
         : undefined,
     };

package/Server/Services/Index.ts

@@ -156,6 +156,7 @@ import WorkspaceProjectAuthTokenService from "./WorkspaceProjectAuthTokenService
 import WorkspaceUserAuthTokenService from "./WorkspaceUserAuthTokenService";
 import WorkspaceSettingService from "./WorkspaceSettingService";
 import WorkspaceNotificationRuleService from "./WorkspaceNotificationRuleService";
+import OnCallDutyPolicyUserOverrideService from "./OnCallDutyPolicyUserOverrideService";
 
 const services: Array<BaseService> = [
   AcmeCertificateService,
@@ -218,6 +219,7 @@ const services: Array<BaseService> = [
   OnCallDutyPolicyExecutionLogService,
   OnCallDutyPolicyExecutionLogTimelineService,
   OnCallDutyPolicyService,
+  OnCallDutyPolicyUserOverrideService,
 
   ProjectService,
   ProjectSmtpConfigService,

package/Server/Services/OnCallDutyPolicyEscalationRuleService.ts

@@ -31,8 +31,76 @@ import OnCallDutyPolicyEscalationRuleUser from "Common/Models/DatabaseModels/OnC
 import OnCallDutyPolicyExecutionLogTimeline from "Common/Models/DatabaseModels/OnCallDutyPolicyExecutionLogTimeline";
 import User from "Common/Models/DatabaseModels/User";
 import logger from "../Utils/Logger";
+import OnCallDutyPolicyUserOverride from "../../Models/DatabaseModels/OnCallDutyPolicyUserOverride";
+import OnCallDutyPolicyUserOverrideService from "./OnCallDutyPolicyUserOverrideService";
 
 export class Service extends DatabaseService<Model> {
+  public async getRouteAlertToUserId(data: {
+    userId: ObjectID;
+    onCallDutyPolicyId: ObjectID;
+    projectId: ObjectID;
+  }): Promise<ObjectID | null> {
+    logger.debug(
+      `Getting route alert to user id for userId: ${data.userId.toString()}`,
+    );
+
+    const currentDate: Date = OneUptimeDate.getCurrentDate();
+
+    const alertRoutedTo: Array<OnCallDutyPolicyUserOverride> =
+      await OnCallDutyPolicyUserOverrideService.findBy({
+        query: {
+          overrideUserId: data.userId,
+          onCallDutyPolicyId: QueryHelper.equalToOrNull(
+            data.onCallDutyPolicyId,
+          ), // find global overrides as well. If this is null, then it will find global overrides.
+          projectId: data.projectId,
+          startsAt: QueryHelper.lessThanEqualTo(currentDate),
+          endsAt: QueryHelper.greaterThanEqualTo(currentDate),
+        },
+        props: {
+          isRoot: true,
+        },
+        limit: LIMIT_PER_PROJECT,
+        skip: 0,
+        select: {
+          routeAlertsToUserId: true,
+          onCallDutyPolicyId: true,
+        },
+      });
+
+    logger.debug(`Found alert routed to: ${JSON.stringify(alertRoutedTo)}`);
+
+    // local override takes precedence over global override.
+    const localOverride: OnCallDutyPolicyUserOverride | undefined =
+      alertRoutedTo.find((item: OnCallDutyPolicyUserOverride) => {
+        return (
+          item.onCallDutyPolicyId?.toString() ===
+          data.onCallDutyPolicyId.toString()
+        );
+      });
+
+    if (localOverride && localOverride.routeAlertsToUserId) {
+      logger.debug(
+        `Route alert to user id found: ${localOverride.routeAlertsToUserId.toString()}`,
+      );
+      return localOverride.routeAlertsToUserId;
+    }
+
+    const globalOverride: OnCallDutyPolicyUserOverride | undefined =
+      alertRoutedTo.find((item: OnCallDutyPolicyUserOverride) => {
+        return !item.onCallDutyPolicyId;
+      });
+
+    if (globalOverride && globalOverride.routeAlertsToUserId) {
+      logger.debug(
+        `Route alert to user id found: ${globalOverride.routeAlertsToUserId.toString()}`,
+      );
+      return globalOverride.routeAlertsToUserId;
+    }
+
+    return null;
+  }
+
   public async startRuleExecution(
     ruleId: ObjectID,
     options: {
@@ -190,13 +258,31 @@ export class Service extends DatabaseService<Model> {
       ): Promise<void> => {
         // This is where user is notified.
 
+        // get route alert to user id.
+        let routeAlertToUserId: ObjectID | null = null;
+
+        if (options.onCallPolicyId) {
+          routeAlertToUserId = await this.getRouteAlertToUserId({
+            userId,
+            onCallDutyPolicyId: options.onCallPolicyId,
+            projectId: options.projectId,
+          });
+        }
+
+        const alertSentToUserId: ObjectID = routeAlertToUserId || userId;
+
         logger.debug(
-          `Starting notification rule execution for userId: ${userId.toString()}`,
+          `Starting notification rule execution for userId: ${alertSentToUserId.toString()}`,
         );
         let log: OnCallDutyPolicyExecutionLogTimeline = getNewLog();
         log.statusMessage = "Sending notification to user.";
         log.status = OnCallDutyExecutionLogTimelineStatus.Executing;
-        log.alertSentToUserId = userId;
+        log.alertSentToUserId = alertSentToUserId;
+
+        if (routeAlertToUserId) {
+          log.overridedByUserId = userId;
+        }
+
         if (teamId) {
           log.userBelongsToTeamId = teamId;
         }
@@ -213,7 +299,7 @@ export class Service extends DatabaseService<Model> {
         });
 
         await UserNotificationRuleService.startUserNotificationRulesExecution(
-          userId,
+          alertSentToUserId,
           {
             userNotificationEventType: options.userNotificationEventType!,
             triggeredByIncidentId: options.triggeredByIncidentId || undefined,
@@ -225,6 +311,7 @@ export class Service extends DatabaseService<Model> {
             onCallDutyPolicyExecutionLogTimelineId: log.id!,
             projectId: options.projectId,
             onCallScheduleId: scheduleId || undefined,
+            overridedByUserId: routeAlertToUserId ? userId : undefined,
           },
         );
       };

package/Server/Services/OnCallDutyPolicyExecutionLogTimelineService.ts

@@ -104,6 +104,10 @@ export class Service extends DatabaseService<Model> {
             name: true,
             _id: true,
           },
+          overridedByUser: {
+            name: true,
+            _id: true,
+          },
         },
         props: {
           isRoot: true,
@@ -166,7 +170,7 @@ export class Service extends DatabaseService<Model> {
           incidentOrAlertLink = `[Alert ${alertNumber}](${(await AlertService.getAlertLinkInDashboard(onCallDutyPolicyExecutionLogTimeline.projectId!, onCallDutyPolicyExecutionLogTimeline.triggeredByAlertId)).toString()})`;
         }
 
-        const feedInfoInMarkdown: string = `**${this.getEmojiBasedOnStatus(status)} ${incidentOrAlertLink} On-Call Alert ${status} to ${await UserService.getUserMarkdownString(
+        let feedInfoInMarkdown: string = `**${this.getEmojiBasedOnStatus(status)} ${incidentOrAlertLink} On-Call Alert ${status} to ${await UserService.getUserMarkdownString(
           {
             userId: onCallDutyPolicyExecutionLogTimeline.alertSentToUserId!,
             projectId: onCallDutyPolicyExecutionLogTimeline.projectId!,
@@ -180,6 +184,18 @@ The on-call policy **[${onCallDutyPolicyExecutionLogTimeline.onCallDutyPolicy.na
           },
         )} was alerted. The status of this alert is **${status}** with the message: \`${onCallDutyPolicyExecutionLogTimeline.statusMessage}\`. ${onCallDutyPolicyExecutionLogTimeline.userBelongsToTeam?.name ? "The alert was sent because the user belogs to the team **" + onCallDutyPolicyExecutionLogTimeline.userBelongsToTeam?.name + "**" : ""} ${onCallDutyPolicyExecutionLogTimeline.isAcknowledged ? "The alert was acknowledged at **" + onCallDutyPolicyExecutionLogTimeline.acknowledgedAt + "**" : ""}`;
 
+        if (onCallDutyPolicyExecutionLogTimeline.overridedByUser) {
+          feedInfoInMarkdown += `The alert was supposed to be sent to **${await UserService.getUserMarkdownString(
+            {
+              userId: onCallDutyPolicyExecutionLogTimeline.overridedByUser.id!,
+              projectId: onCallDutyPolicyExecutionLogTimeline.projectId!,
+            },
+          )}** but was routed to **${await UserService.getUserMarkdownString({
+            userId: onCallDutyPolicyExecutionLogTimeline.alertSentToUserId!,
+            projectId: onCallDutyPolicyExecutionLogTimeline.projectId!,
+          })}** instead, because of an override rule.`;
+        }
+
         logger.debug("Feed Info in Markdown: " + feedInfoInMarkdown);
 
         if (onCallDutyPolicyExecutionLogTimeline.triggeredByIncidentId) {

package/Server/Services/OnCallDutyPolicyUserOverrideService.ts

@@ -0,0 +1,77 @@
+import DatabaseService from "./DatabaseService";
+import ObjectID from "../../Types/ObjectID";
+import DatabaseConfig from "../DatabaseConfig";
+import URL from "../../Types/API/URL";
+import OnCallDutyPolicyUserOverride from "../../Models/DatabaseModels/OnCallDutyPolicyUserOverride";
+import CreateBy from "../Types/Database/CreateBy";
+import { OnCreate } from "../Types/Database/Hooks";
+import OneUptimeDate from "../../Types/Date";
+import BadDataException from "../../Types/Exception/BadDataException";
+
+export class Service extends DatabaseService<OnCallDutyPolicyUserOverride> {
+  public constructor() {
+    super(OnCallDutyPolicyUserOverride);
+  }
+
+  protected override async onBeforeCreate(
+    createBy: CreateBy<OnCallDutyPolicyUserOverride>,
+  ): Promise<OnCreate<OnCallDutyPolicyUserOverride>> {
+    if (!createBy.data.startsAt || !createBy.data.endsAt) {
+      throw new BadDataException("Start time and end time are required");
+    }
+
+    // make sure start time is before end time
+    if (OneUptimeDate.isAfter(createBy.data.startsAt, createBy.data.endsAt)) {
+      throw new BadDataException("Start time must be before end time");
+    }
+
+    // make sure overrideUser and routealertsToUser are not the same
+    const overrideUserId: ObjectID | undefined | null =
+      createBy.data.overrideUserId || createBy.data.overrideUser?.id;
+
+    if (!overrideUserId) {
+      throw new BadDataException("Override user is required");
+    }
+
+    const routeAlertsToUserId: ObjectID | undefined | null =
+      createBy.data.routeAlertsToUserId || createBy.data.routeAlertsToUser?.id;
+
+    if (!routeAlertsToUserId) {
+      throw new BadDataException("Route alerts to user is required");
+    }
+
+    if (overrideUserId.toString() === routeAlertsToUserId.toString()) {
+      throw new BadDataException(
+        "Override user and route alerts to user cannot be the same",
+      );
+    }
+
+    return {
+      createBy,
+      carryForward: null,
+    };
+  }
+
+  public async getOnCallDutyPolicyUserOverrideLinkInDashboard(data: {
+    projectId: ObjectID;
+    onCallDutyPolicyId?: ObjectID | undefined; // if this is null then this is a global override
+    onCallDutyPolicyUserOverrideId: ObjectID;
+  }): Promise<URL> {
+    const projectId: ObjectID = data.projectId;
+    const onCallDutyPolicyId: ObjectID | undefined = data.onCallDutyPolicyId;
+    const onCallDutyPolicyUserOverrideId: ObjectID =
+      data.onCallDutyPolicyUserOverrideId;
+
+    const dashboardUrl: URL = await DatabaseConfig.getDashboardUrl();
+
+    if (!onCallDutyPolicyId) {
+      return URL.fromString(dashboardUrl.toString()).addRoute(
+        `/${projectId.toString()}/on-call-duty/user-overrides/${onCallDutyPolicyUserOverrideId.toString()}`,
+      );
+    }
+    return URL.fromString(dashboardUrl.toString()).addRoute(
+      `/${projectId.toString()}/on-call-duty/policies/${onCallDutyPolicyId.toString()}/user-overrides/${onCallDutyPolicyUserOverrideId.toString()}`,
+    );
+  }
+}
+export default new Service();

package/Server/Services/ProjectCallSMSConfigService.ts

@@ -2,6 +2,7 @@ import DatabaseService from "./DatabaseService";
 import TwilioConfig from "../../Types/CallAndSMS/TwilioConfig";
 import BadDataException from "../../Types/Exception/BadDataException";
 import Model from "Common/Models/DatabaseModels/ProjectCallSMSConfig";
+import Phone from "../../Types/Phone";
 
 export class Service extends DatabaseService<Model> {
   public constructor() {
@@ -25,7 +26,7 @@ export class Service extends DatabaseService<Model> {
       );
     }
 
-    if (!projectCallSmsConfig.twilioPhoneNumber) {
+    if (!projectCallSmsConfig.twilioPrimaryPhoneNumber) {
       throw new BadDataException(
         "Project Call and SMS Config twilio phone number is not set",
       );
@@ -40,7 +41,16 @@ export class Service extends DatabaseService<Model> {
     return {
       accountSid: projectCallSmsConfig.twilioAccountSID.toString(),
       authToken: projectCallSmsConfig.twilioAuthToken.toString(),
-      phoneNumber: projectCallSmsConfig.twilioPhoneNumber,
+      primaryPhoneNumber: projectCallSmsConfig.twilioPrimaryPhoneNumber,
+      secondaryPhoneNumbers:
+        projectCallSmsConfig.twilioSecondaryPhoneNumbers &&
+        projectCallSmsConfig.twilioSecondaryPhoneNumbers.length > 0
+          ? projectCallSmsConfig.twilioSecondaryPhoneNumbers
+              .split(",")
+              .map((phone: string) => {
+                return new Phone(phone);
+              })
+          : [],
     };
   }
 }

package/Server/Services/SmsService.ts

@@ -36,7 +36,10 @@ export class SmsService extends BaseService {
         ? {
             accountSid: options.customTwilioConfig.accountSid!,
             authToken: options.customTwilioConfig.authToken!,
-            phoneNumber: options.customTwilioConfig.phoneNumber.toString(),
+            primaryPhoneNumber:
+              options.customTwilioConfig.primaryPhoneNumber.toString(),
+            secondaryPhoneNumbers:
+              options.customTwilioConfig.secondaryPhoneNumbers?.toString(),
           }
         : undefined,
     };

package/Server/Services/StatusPageSubscriberService.ts

@@ -262,7 +262,8 @@ export class Service extends DatabaseService<Model> {
             _id: true,
             twilioAccountSID: true,
             twilioAuthToken: true,
-            twilioPhoneNumber: true,
+            twilioPrimaryPhoneNumber: true,
+            twilioSecondaryPhoneNumbers: true,
           },
         },
         props: {
@@ -795,7 +796,8 @@ export class Service extends DatabaseService<Model> {
           _id: true,
           twilioAccountSID: true,
           twilioAuthToken: true,
-          twilioPhoneNumber: true,
+          twilioPrimaryPhoneNumber: true,
+          twilioSecondaryPhoneNumbers: true,
         },
         subscriberTimezones: true,
         reportDataInDays: true,

package/Server/Services/UserNotificationRuleService.ts

@@ -839,6 +839,7 @@ export class Service extends DatabaseService<Model> {
       userBelongsToTeamId?: ObjectID | undefined;
       onCallDutyPolicyExecutionLogTimelineId?: ObjectID | undefined;
       onCallScheduleId?: ObjectID | undefined;
+      overridedByUserId?: ObjectID | undefined;
     },
   ): Promise<void> {
     // add user notification log.
@@ -887,6 +888,10 @@ export class Service extends DatabaseService<Model> {
     userOnCallLog.status = UserNotificationExecutionStatus.Scheduled;
     userOnCallLog.statusMessage = "Scheduled";
 
+    if (options.overridedByUserId) {
+      userOnCallLog.overridedByUserId = options.overridedByUserId;
+    }
+
     await UserOnCallLogService.create({
       data: userOnCallLog,
       props: {

package/Types/CallAndSMS/TwilioConfig.ts

@@ -3,5 +3,6 @@ import Phone from "../Phone";
 export default interface TwilioConfig {
   accountSid: string;
   authToken: string;
-  phoneNumber: Phone;
+  primaryPhoneNumber: Phone;
+  secondaryPhoneNumbers: Phone[];
 }

package/Types/Permission.ts

@@ -512,6 +512,11 @@ enum Permission {
   DeleteProjectOnCallDutyPolicyEscalationRule = "DeleteProjectOnCallDutyPolicyEscalationRule",
   ReadProjectOnCallDutyPolicyEscalationRule = "ReadProjectOnCallDutyPolicyEscalationRule",
 
+  CreateOnCallDutyPolicyUserOverride = "CreateOnCallDutyPolicyUserOverride",
+  EditOnCallDutyPolicyUserOverride = "EditOnCallDutyPolicyUserOverride",
+  DeleteOnCallDutyPolicyUserOverride = "DeleteOnCallDutyPolicyUserOverride",
+  ReadOnCallDutyPolicyUserOverride = "ReadOnCallDutyPolicyUserOverride",
+
   // Resource Permissions (Team Permission)
   CreateProjectOnCallDutyPolicyEscalationRuleUser = "CreateProjectOnCallDutyPolicyEscalationRuleUser",
   EditProjectOnCallDutyPolicyEscalationRuleUser = "EditProjectOnCallDutyPolicyEscalationRuleUser",
@@ -2378,6 +2383,39 @@ export class PermissionHelper {
         isAccessControlPermission: false,
       },
 
+      {
+        permission: Permission.CreateOnCallDutyPolicyUserOverride,
+        title: "Create On-Call Duty Policy User Override",
+        description:
+          "This permission can create on-call duty policy user override this project.",
+        isAssignableToTenant: true,
+        isAccessControlPermission: false,
+      },
+      {
+        permission: Permission.DeleteOnCallDutyPolicyUserOverride,
+        title: "Delete On-Call Duty Policy User Override",
+        description:
+          "This permission can delete on-call duty policy user override of this project.",
+        isAssignableToTenant: true,
+        isAccessControlPermission: false,
+      },
+      {
+        permission: Permission.EditOnCallDutyPolicyUserOverride,
+        title: "Edit On-Call Duty Policy User Override",
+        description:
+          "This permission can edit on-call duty policy user override of this project.",
+        isAssignableToTenant: true,
+        isAccessControlPermission: false,
+      },
+      {
+        permission: Permission.ReadOnCallDutyPolicyUserOverride,
+        title: "Read On-Call Duty Policy User Override",
+        description:
+          "This permission can read on-call duty policy user override of this project.",
+        isAssignableToTenant: true,
+        isAccessControlPermission: false,
+      },
+
       {
         permission: Permission.CreateProjectOnCallDutyPolicy,
         title: "Create On-Call Duty Policy",