@oneuptime/common 9.4.8 → 9.4.9

package/Models/DatabaseModels/OnCallDutyPolicyExecutionLogTimeline.ts

@@ -27,6 +27,7 @@ import Permission from "../../Types/Permission";
 import UserNotificationEventType from "../../Types/UserNotification/UserNotificationEventType";
 import { Column, Entity, Index, JoinColumn, ManyToOne } from "typeorm";
 import Alert from "./Alert";
+import AlertEpisode from "./AlertEpisode";
 
 @TableBillingAccessControl({
   create: PlanType.Growth,
@@ -288,6 +289,64 @@ export default class OnCallDutyPolicyExecutionLogTimeline extends BaseModel {
   })
   public triggeredByAlertId?: ObjectID = undefined;
 
+  @ColumnAccessControl({
+    create: [],
+    read: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.ReadProjectOnCallDutyPolicyExecutionLogTimeline,
+    ],
+    update: [],
+  })
+  @TableColumn({
+    manyToOneRelationColumn: "triggeredByAlertEpisodeId",
+    type: TableColumnType.Entity,
+    modelType: AlertEpisode,
+    title: "Alert Episode",
+    description:
+      "Relation to Alert Episode Resource in which this object belongs",
+  })
+  @ManyToOne(
+    () => {
+      return AlertEpisode;
+    },
+    {
+      eager: false,
+      nullable: true,
+      onDelete: "CASCADE",
+      orphanedRowAction: "nullify",
+    },
+  )
+  @JoinColumn({ name: "triggeredByAlertEpisodeId" })
+  public triggeredByAlertEpisode?: AlertEpisode = undefined;
+
+  @ColumnAccessControl({
+    create: [],
+    read: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.ReadProjectOnCallDutyPolicyExecutionLogTimeline,
+    ],
+    update: [],
+  })
+  @Index()
+  @TableColumn({
+    type: TableColumnType.ObjectID,
+    required: false,
+    canReadOnRelationQuery: true,
+    title: "Alert Episode ID",
+    description:
+      "ID of your OneUptime Alert Episode in which this object belongs",
+  })
+  @Column({
+    type: ColumnType.ObjectID,
+    nullable: true,
+    transformer: ObjectID.getDatabaseTransformer(),
+  })
+  public triggeredByAlertEpisodeId?: ObjectID = undefined;
+
   @ColumnAccessControl({
     create: [],
     read: [

package/Models/DatabaseModels/UserOnCallLog.ts

@@ -28,6 +28,7 @@ import Permission from "../../Types/Permission";
 import UserNotificationEventType from "../../Types/UserNotification/UserNotificationEventType";
 import UserNotificationExecutionStatus from "../../Types/UserNotification/UserNotificationExecutionStatus";
 import { Column, Entity, Index, JoinColumn, ManyToOne } from "typeorm";
+import AlertEpisode from "./AlertEpisode";
 import Alert from "./Alert";
 
 @EnableDocumentation()
@@ -433,6 +434,53 @@ export default class UserOnCallLog extends BaseModel {
   })
   public triggeredByAlertId?: ObjectID = undefined;
 
+  @ColumnAccessControl({
+    create: [],
+    read: [Permission.CurrentUser],
+    update: [],
+  })
+  @TableColumn({
+    manyToOneRelationColumn: "triggeredByAlertEpisodeId",
+    type: TableColumnType.Entity,
+    modelType: AlertEpisode,
+    title: "Triggered By Alert Episode",
+    description:
+      "Relation to Alert Episode which triggered this on-call duty policy.",
+  })
+  @ManyToOne(
+    () => {
+      return AlertEpisode;
+    },
+    {
+      eager: false,
+      nullable: true,
+      onDelete: "CASCADE",
+      orphanedRowAction: "nullify",
+    },
+  )
+  @JoinColumn({ name: "triggeredByAlertEpisodeId" })
+  public triggeredByAlertEpisode?: AlertEpisode = undefined;
+
+  @ColumnAccessControl({
+    create: [],
+    read: [Permission.CurrentUser],
+    update: [],
+  })
+  @TableColumn({
+    type: TableColumnType.ObjectID,
+    title: "Triggered By Alert Episode ID",
+    required: false,
+    description:
+      "ID of the Alert Episode which triggered this on-call escalation policy.",
+    example: "3c4d5e6f-7a8b-9c0d-1e2f-3a4b5c6d7e8f",
+  })
+  @Column({
+    type: ColumnType.ObjectID,
+    nullable: true,
+    transformer: ObjectID.getDatabaseTransformer(),
+  })
+  public triggeredByAlertEpisodeId?: ObjectID = undefined;
+
   @ColumnAccessControl({
     create: [],
     read: [Permission.CurrentUser],

package/Models/DatabaseModels/UserOnCallLogTimeline.ts

@@ -1,5 +1,6 @@
 import Incident from "./Incident";
 import Alert from "./Alert";
+import AlertEpisode from "./AlertEpisode";
 import OnCallDutyPolicy from "./OnCallDutyPolicy";
 import OnCallDutyPolicyEscalationRule from "./OnCallDutyPolicyEscalationRule";
 import OnCallDutyPolicyExecutionLog from "./OnCallDutyPolicyExecutionLog";
@@ -389,6 +390,54 @@ export default class UserOnCallLogTimeline extends BaseModel {
   })
   public triggeredByAlertId?: ObjectID = undefined;
 
+  @ColumnAccessControl({
+    create: [],
+    read: [Permission.CurrentUser],
+    update: [],
+  })
+  @TableColumn({
+    manyToOneRelationColumn: "triggeredByAlertEpisodeId",
+    type: TableColumnType.Entity,
+    modelType: AlertEpisode,
+    title: "Alert Episode",
+    description:
+      "Relation to Alert Episode Resource in which this object belongs",
+  })
+  @ManyToOne(
+    () => {
+      return AlertEpisode;
+    },
+    {
+      eager: false,
+      nullable: true,
+      onDelete: "CASCADE",
+      orphanedRowAction: "nullify",
+    },
+  )
+  @JoinColumn({ name: "triggeredByAlertEpisodeId" })
+  public triggeredByAlertEpisode?: AlertEpisode = undefined;
+
+  @ColumnAccessControl({
+    create: [],
+    read: [Permission.CurrentUser],
+    update: [],
+  })
+  @Index()
+  @TableColumn({
+    type: TableColumnType.ObjectID,
+    required: false,
+    canReadOnRelationQuery: true,
+    title: "Alert Episode ID",
+    description:
+      "ID of your OneUptime Alert Episode in which this object belongs",
+  })
+  @Column({
+    type: ColumnType.ObjectID,
+    nullable: true,
+    transformer: ObjectID.getDatabaseTransformer(),
+  })
+  public triggeredByAlertEpisodeId?: ObjectID = undefined;
+
   @ColumnAccessControl({
     create: [],
     read: [Permission.CurrentUser],

package/Server/API/UserOnCallLogTimelineAPI.ts

@@ -137,6 +137,11 @@ export default class UserNotificationLogTimelineAPI extends BaseAPI<
                   title: true,
                   description: true,
                 },
+                triggeredByAlertEpisodeId: true,
+                triggeredByAlertEpisode: {
+                  title: true,
+                  description: true,
+                },
               },
               props: {
                 isRoot: true,
@@ -153,7 +158,15 @@ export default class UserNotificationLogTimelineAPI extends BaseAPI<
 
           const notificationType: string = timelineItem.triggeredByIncidentId
             ? "Incident"
-            : "Alert";
+            : timelineItem.triggeredByAlertEpisodeId
+              ? "Alert Episode"
+              : "Alert";
+
+          const notificationTitle: string =
+            timelineItem.triggeredByIncident?.title ||
+            timelineItem.triggeredByAlertEpisode?.title ||
+            timelineItem.triggeredByAlert?.title ||
+            "";
 
           const host: Hostname = await DatabaseConfig.getHost();
           const httpProtocol: Protocol = await DatabaseConfig.getHttpProtocol();
@@ -163,7 +176,7 @@ export default class UserNotificationLogTimelineAPI extends BaseAPI<
             res,
             "/usr/src/Common/Server/Views/AcknowledgeUserOnCallNotification.ejs",
             {
-              title: `Acknowledge ${notificationType} - ${timelineItem.triggeredByIncident?.title || timelineItem.triggeredByAlert?.title}`,
+              title: `Acknowledge ${notificationType} - ${notificationTitle}`,
               message: `Do you want to acknowledge this ${notificationType}?`,
               acknowledgeText: `Acknowledge ${notificationType}`,
               acknowledgeUrl: new URL(
@@ -208,12 +221,16 @@ export default class UserNotificationLogTimelineAPI extends BaseAPI<
                 projectId: true,
                 triggeredByIncidentId: true,
                 triggeredByAlertId: true,
+                triggeredByAlertEpisodeId: true,
                 triggeredByAlert: {
                   title: true,
                 },
                 triggeredByIncident: {
                   title: true,
                 },
+                triggeredByAlertEpisode: {
+                  title: true,
+                },
                 acknowledgedAt: true,
                 isAcknowledged: true,
               },
@@ -233,13 +250,51 @@ export default class UserNotificationLogTimelineAPI extends BaseAPI<
           const host: Hostname = await DatabaseConfig.getHost();
           const httpProtocol: Protocol = await DatabaseConfig.getHttpProtocol();
 
+          // Determine the resource type and ID for routing
+          type ResourceInfo = {
+            type: string;
+            path: string;
+            id: ObjectID;
+            title: string;
+          };
+
+          const getResourceInfo: () => ResourceInfo = (): ResourceInfo => {
+            if (timelineItem.triggeredByIncidentId) {
+              return {
+                type: "Incident",
+                path: "incidents",
+                id: timelineItem.triggeredByIncidentId,
+                title: timelineItem.triggeredByIncident?.title || "",
+              };
+            }
+            if (timelineItem.triggeredByAlertEpisodeId) {
+              return {
+                type: "Alert Episode",
+                path: "alert-episodes",
+                id: timelineItem.triggeredByAlertEpisodeId,
+                title: timelineItem.triggeredByAlertEpisode?.title || "",
+              };
+            }
+            if (timelineItem.triggeredByAlertId) {
+              return {
+                type: "Alert",
+                path: "alerts",
+                id: timelineItem.triggeredByAlertId,
+                title: timelineItem.triggeredByAlert?.title || "",
+              };
+            }
+            return { type: "", path: "", id: new ObjectID(""), title: "" };
+          };
+
+          const resourceInfo: ResourceInfo = getResourceInfo();
+
           if (timelineItem.isAcknowledged) {
             // already acknowledged. Then show already acknowledged page with view details button.
 
             const viewDetailsRoute: Route = new Route(
               DashboardRoute.toString(),
             ).addRoute(
-              `/${timelineItem.projectId?.toString()}/${timelineItem.triggeredByIncidentId ? "incidents" : "alerts"}/${timelineItem.triggeredByIncidentId ? timelineItem.triggeredByIncidentId!.toString() : timelineItem.triggeredByAlertId!.toString()}`,
+              `/${timelineItem.projectId?.toString()}/${resourceInfo.path}/${resourceInfo.id.toString()}`,
             );
 
             const viewDetailsUrl: URL = new URL(
@@ -253,9 +308,9 @@ export default class UserNotificationLogTimelineAPI extends BaseAPI<
               res,
               "/usr/src/Common/Server/Views/ViewMessage.ejs",
               {
-                title: `Notification Already Acknowledged - ${timelineItem.triggeredByIncident?.title || timelineItem.triggeredByAlert?.title}`,
+                title: `Notification Already Acknowledged - ${resourceInfo.title}`,
                 message: `This notification has already been acknowledged.`,
-                viewDetailsText: `View ${timelineItem.triggeredByIncidentId ? "Incident" : "Alert"}`,
+                viewDetailsText: `View ${resourceInfo.type}`,
                 viewDetailsUrl: viewDetailsUrl.toString(),
               },
             );
@@ -274,33 +329,18 @@ export default class UserNotificationLogTimelineAPI extends BaseAPI<
             },
           });
 
-          // redirect to dashboard to incidents page.
-
-          if (timelineItem.triggeredByIncidentId) {
-            const incidentRoute: Route = new Route(
-              DashboardRoute.toString(),
-            ).addRoute(
-              `/${timelineItem.projectId?.toString()}/incidents/${timelineItem.triggeredByIncidentId!.toString()}`,
-            );
-
-            return Response.redirect(
-              req,
-              res,
-              new URL(httpProtocol, host, incidentRoute),
-            );
-          }
-
-          if (timelineItem.triggeredByAlertId) {
-            const alertRoute: Route = new Route(
+          // redirect to dashboard to the resource page.
+          if (resourceInfo.path) {
+            const resourceRoute: Route = new Route(
               DashboardRoute.toString(),
             ).addRoute(
-              `/${timelineItem.projectId?.toString()}/alerts/${timelineItem.triggeredByAlertId!.toString()}`,
+              `/${timelineItem.projectId?.toString()}/${resourceInfo.path}/${resourceInfo.id.toString()}`,
             );
 
             return Response.redirect(
               req,
               res,
-              new URL(httpProtocol, host, alertRoute),
+              new URL(httpProtocol, host, resourceRoute),
             );
           }
 

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

@@ -0,0 +1,71 @@
+import { MigrationInterface, QueryRunner } from "typeorm";
+
+export class MigrationName1769469813786 implements MigrationInterface {
+  public name = "MigrationName1769469813786";
+
+  public async up(queryRunner: QueryRunner): Promise<void> {
+    await queryRunner.query(
+      `ALTER TABLE "OnCallDutyPolicyExecutionLogTimeline" ADD "triggeredByAlertEpisodeId" uuid`,
+    );
+    await queryRunner.query(
+      `ALTER TABLE "UserOnCallLog" ADD "triggeredByAlertEpisodeId" uuid`,
+    );
+    await queryRunner.query(
+      `ALTER TABLE "UserOnCallLogTimeline" ADD "triggeredByAlertEpisodeId" 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(
+      `CREATE INDEX "IDX_1fda33fffd89b95dafa537f3be" ON "OnCallDutyPolicyExecutionLogTimeline" ("triggeredByAlertEpisodeId") `,
+    );
+    await queryRunner.query(
+      `CREATE INDEX "IDX_2c98f4eeddf1d00ec073b49352" ON "UserOnCallLogTimeline" ("triggeredByAlertEpisodeId") `,
+    );
+    await queryRunner.query(
+      `ALTER TABLE "OnCallDutyPolicyExecutionLogTimeline" ADD CONSTRAINT "FK_1fda33fffd89b95dafa537f3bef" FOREIGN KEY ("triggeredByAlertEpisodeId") REFERENCES "AlertEpisode"("_id") ON DELETE CASCADE ON UPDATE NO ACTION`,
+    );
+    await queryRunner.query(
+      `ALTER TABLE "UserOnCallLog" ADD CONSTRAINT "FK_114aa962f2bc3c6736a1469df36" FOREIGN KEY ("triggeredByAlertEpisodeId") REFERENCES "AlertEpisode"("_id") ON DELETE CASCADE ON UPDATE NO ACTION`,
+    );
+    await queryRunner.query(
+      `ALTER TABLE "UserOnCallLogTimeline" ADD CONSTRAINT "FK_2c98f4eeddf1d00ec073b493525" FOREIGN KEY ("triggeredByAlertEpisodeId") REFERENCES "AlertEpisode"("_id") ON DELETE CASCADE ON UPDATE NO ACTION`,
+    );
+  }
+
+  public async down(queryRunner: QueryRunner): Promise<void> {
+    await queryRunner.query(
+      `ALTER TABLE "UserOnCallLogTimeline" DROP CONSTRAINT "FK_2c98f4eeddf1d00ec073b493525"`,
+    );
+    await queryRunner.query(
+      `ALTER TABLE "UserOnCallLog" DROP CONSTRAINT "FK_114aa962f2bc3c6736a1469df36"`,
+    );
+    await queryRunner.query(
+      `ALTER TABLE "OnCallDutyPolicyExecutionLogTimeline" DROP CONSTRAINT "FK_1fda33fffd89b95dafa537f3bef"`,
+    );
+    await queryRunner.query(
+      `DROP INDEX "public"."IDX_2c98f4eeddf1d00ec073b49352"`,
+    );
+    await queryRunner.query(
+      `DROP INDEX "public"."IDX_1fda33fffd89b95dafa537f3be"`,
+    );
+    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 "triggeredByAlertEpisodeId"`,
+    );
+    await queryRunner.query(
+      `ALTER TABLE "UserOnCallLog" DROP COLUMN "triggeredByAlertEpisodeId"`,
+    );
+    await queryRunner.query(
+      `ALTER TABLE "OnCallDutyPolicyExecutionLogTimeline" DROP COLUMN "triggeredByAlertEpisodeId"`,
+    );
+  }
+}

package/Server/Infrastructure/Postgres/SchemaMigrations/1769517677937-RenameNotificationRuleTypes.ts

@@ -0,0 +1,67 @@
+import { MigrationInterface, QueryRunner } from "typeorm";
+import CaptureSpan from "../../../Utils/Telemetry/CaptureSpan";
+
+export class RenameNotificationRuleTypes1769517677937
+  implements MigrationInterface
+{
+  public name = "RenameNotificationRuleTypes1769517677937";
+
+  @CaptureSpan()
+  public async up(queryRunner: QueryRunner): Promise<void> {
+    /*
+     * 1. Update rules with "When on-call policy is executed" and incidentSeverityId (not null)
+     *    to "When incident on-call policy is executed"
+     */
+    await queryRunner.query(
+      `UPDATE "UserNotificationRule"
+       SET "ruleType" = 'When incident on-call policy is executed'
+       WHERE "ruleType" = 'When on-call policy is executed'
+       AND "incidentSeverityId" IS NOT NULL`,
+    );
+
+    /*
+     * 2. Update rules with "When on-call policy is executed" and alertSeverityId (not null)
+     *    to "When alert on-call policy is executed"
+     */
+    await queryRunner.query(
+      `UPDATE "UserNotificationRule"
+       SET "ruleType" = 'When alert on-call policy is executed'
+       WHERE "ruleType" = 'When on-call policy is executed'
+       AND "alertSeverityId" IS NOT NULL`,
+    );
+
+    /*
+     * 3. Update rules with "When episode on-call policy is executed"
+     *    to "When alert episode on-call policy is executed"
+     */
+    await queryRunner.query(
+      `UPDATE "UserNotificationRule"
+       SET "ruleType" = 'When alert episode on-call policy is executed'
+       WHERE "ruleType" = 'When episode on-call policy is executed'`,
+    );
+  }
+
+  @CaptureSpan()
+  public async down(queryRunner: QueryRunner): Promise<void> {
+    // Revert "When incident on-call policy is executed" back to "When on-call policy is executed"
+    await queryRunner.query(
+      `UPDATE "UserNotificationRule"
+       SET "ruleType" = 'When on-call policy is executed'
+       WHERE "ruleType" = 'When incident on-call policy is executed'`,
+    );
+
+    // Revert "When alert on-call policy is executed" back to "When on-call policy is executed"
+    await queryRunner.query(
+      `UPDATE "UserNotificationRule"
+       SET "ruleType" = 'When on-call policy is executed'
+       WHERE "ruleType" = 'When alert on-call policy is executed'`,
+    );
+
+    // Revert "When alert episode on-call policy is executed" back to "When episode on-call policy is executed"
+    await queryRunner.query(
+      `UPDATE "UserNotificationRule"
+       SET "ruleType" = 'When episode on-call policy is executed'
+       WHERE "ruleType" = 'When alert episode on-call policy is executed'`,
+    );
+  }
+}

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

@@ -234,6 +234,8 @@ import { MigrationName1769199303656 } from "./1769199303656-MigrationName";
 import { MigrationName1769202898645 } from "./1769202898645-MigrationName";
 import { MigrationName1769428619414 } from "./1769428619414-MigrationName";
 import { MigrationName1769428821686 } from "./1769428821686-MigrationName";
+import { MigrationName1769469813786 } from "./1769469813786-MigrationName";
+import { RenameNotificationRuleTypes1769517677937 } from "./1769517677937-RenameNotificationRuleTypes";
 
 export default [
   InitialMigration,
@@ -472,4 +474,6 @@ export default [
   MigrationName1769202898645,
   MigrationName1769428619414,
   MigrationName1769428821686,
+  MigrationName1769469813786,
+  RenameNotificationRuleTypes1769517677937,
 ];