@oneuptime/common 9.5.2 → 9.5.4

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

@@ -0,0 +1,181 @@
+import { MigrationInterface, QueryRunner } from "typeorm";
+
+export class MigrationName1770232207959 implements MigrationInterface {
+  public name = "MigrationName1770232207959";
+
+  public async up(queryRunner: QueryRunner): Promise<void> {
+    await queryRunner.query(
+      `CREATE TABLE "IncidentEpisodePublicNote" ("_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, "incidentEpisodeId" uuid NOT NULL, "createdByUserId" uuid, "deletedByUserId" uuid, "note" text NOT NULL, "subscriberNotificationStatusOnNoteCreated" character varying NOT NULL DEFAULT 'Pending', "subscriberNotificationStatusMessage" text, "shouldStatusPageSubscribersBeNotifiedOnNoteCreated" boolean NOT NULL DEFAULT true, "isOwnerNotified" boolean NOT NULL DEFAULT false, "postedAt" TIMESTAMP WITH TIME ZONE, "postedFromSlackMessageId" character varying, CONSTRAINT "PK_7ac3241d9cf7bdf5ecac42c9c98" PRIMARY KEY ("_id"))`,
+    );
+    await queryRunner.query(
+      `CREATE INDEX "IDX_46268b7b996f3b8129136d12d2" ON "IncidentEpisodePublicNote" ("projectId") `,
+    );
+    await queryRunner.query(
+      `CREATE INDEX "IDX_885de505291c2f6f4f86b988ca" ON "IncidentEpisodePublicNote" ("incidentEpisodeId") `,
+    );
+    await queryRunner.query(
+      `CREATE INDEX "IDX_2e0c6dd840bbc05b9a5117f882" ON "IncidentEpisodePublicNote" ("isOwnerNotified") `,
+    );
+    await queryRunner.query(
+      `CREATE INDEX "IDX_784fb865a857417194a37034ed" ON "IncidentEpisodePublicNote" ("postedFromSlackMessageId") `,
+    );
+    await queryRunner.query(
+      `CREATE TABLE "IncidentEpisodePublicNoteFile" ("incidentEpisodePublicNoteId" uuid NOT NULL, "fileId" uuid NOT NULL, CONSTRAINT "PK_546f0c2cf908ebf301fb164a1ed" PRIMARY KEY ("incidentEpisodePublicNoteId", "fileId"))`,
+    );
+    await queryRunner.query(
+      `CREATE INDEX "IDX_8e439d24c574141d9a66d74fa5" ON "IncidentEpisodePublicNoteFile" ("incidentEpisodePublicNoteId") `,
+    );
+    await queryRunner.query(
+      `CREATE INDEX "IDX_0dfcd7747b6e55239df9bbaac5" ON "IncidentEpisodePublicNoteFile" ("fileId") `,
+    );
+    await queryRunner.query(
+      `ALTER TABLE "IncidentGroupingRule" ADD "showEpisodeOnStatusPage" boolean NOT NULL DEFAULT false`,
+    );
+    await queryRunner.query(
+      `ALTER TABLE "IncidentEpisode" ADD "isVisibleOnStatusPage" boolean NOT NULL DEFAULT false`,
+    );
+    await queryRunner.query(
+      `ALTER TABLE "IncidentEpisode" ADD "declaredAt" TIMESTAMP WITH TIME ZONE`,
+    );
+    await queryRunner.query(
+      `ALTER TABLE "IncidentEpisode" ADD "shouldStatusPageSubscribersBeNotifiedOnEpisodeCreated" boolean NOT NULL DEFAULT true`,
+    );
+    await queryRunner.query(
+      `ALTER TABLE "IncidentEpisode" ADD "subscriberNotificationStatusOnEpisodeCreated" character varying NOT NULL DEFAULT 'Pending'`,
+    );
+    await queryRunner.query(
+      `ALTER TABLE "IncidentEpisode" ADD "subscriberNotificationStatusMessage" text`,
+    );
+    await queryRunner.query(
+      `ALTER TABLE "StatusPage" ADD "showEpisodesOnStatusPage" boolean NOT NULL DEFAULT true`,
+    );
+    await queryRunner.query(
+      `ALTER TABLE "IncidentEpisodeStateTimeline" ADD "shouldStatusPageSubscribersBeNotified" boolean NOT NULL DEFAULT true`,
+    );
+    await queryRunner.query(
+      `ALTER TABLE "IncidentEpisodeStateTimeline" ADD "subscriberNotificationStatus" character varying NOT NULL DEFAULT 'Pending'`,
+    );
+    await queryRunner.query(
+      `ALTER TABLE "IncidentEpisodeStateTimeline" ADD "subscriberNotificationStatusMessage" text`,
+    );
+    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_9d7bfebab97dc56583df143ae8" ON "IncidentGroupingRule" ("showEpisodeOnStatusPage") `,
+    );
+    await queryRunner.query(
+      `CREATE INDEX "IDX_298e3524e859ddb920c05e1072" ON "IncidentEpisode" ("isVisibleOnStatusPage") `,
+    );
+    await queryRunner.query(
+      `CREATE INDEX "IDX_30d4a06d51be505b6233185906" ON "IncidentEpisode" ("declaredAt") `,
+    );
+    await queryRunner.query(
+      `ALTER TABLE "IncidentEpisodePublicNote" ADD CONSTRAINT "FK_46268b7b996f3b8129136d12d21" FOREIGN KEY ("projectId") REFERENCES "Project"("_id") ON DELETE CASCADE ON UPDATE NO ACTION`,
+    );
+    await queryRunner.query(
+      `ALTER TABLE "IncidentEpisodePublicNote" ADD CONSTRAINT "FK_885de505291c2f6f4f86b988ca6" FOREIGN KEY ("incidentEpisodeId") REFERENCES "IncidentEpisode"("_id") ON DELETE CASCADE ON UPDATE NO ACTION`,
+    );
+    await queryRunner.query(
+      `ALTER TABLE "IncidentEpisodePublicNote" ADD CONSTRAINT "FK_7711bde5254d7c1021bbbb0f944" FOREIGN KEY ("createdByUserId") REFERENCES "User"("_id") ON DELETE SET NULL ON UPDATE NO ACTION`,
+    );
+    await queryRunner.query(
+      `ALTER TABLE "IncidentEpisodePublicNote" ADD CONSTRAINT "FK_96d88a43c5479b67ddd7c70df16" FOREIGN KEY ("deletedByUserId") REFERENCES "User"("_id") ON DELETE SET NULL ON UPDATE NO ACTION`,
+    );
+    await queryRunner.query(
+      `ALTER TABLE "IncidentEpisodePublicNoteFile" ADD CONSTRAINT "FK_8e439d24c574141d9a66d74fa5c" FOREIGN KEY ("incidentEpisodePublicNoteId") REFERENCES "IncidentEpisodePublicNote"("_id") ON DELETE CASCADE ON UPDATE CASCADE`,
+    );
+    await queryRunner.query(
+      `ALTER TABLE "IncidentEpisodePublicNoteFile" ADD CONSTRAINT "FK_0dfcd7747b6e55239df9bbaac59" FOREIGN KEY ("fileId") REFERENCES "File"("_id") ON DELETE CASCADE ON UPDATE CASCADE`,
+    );
+  }
+
+  public async down(queryRunner: QueryRunner): Promise<void> {
+    await queryRunner.query(
+      `ALTER TABLE "IncidentEpisodePublicNoteFile" DROP CONSTRAINT "FK_0dfcd7747b6e55239df9bbaac59"`,
+    );
+    await queryRunner.query(
+      `ALTER TABLE "IncidentEpisodePublicNoteFile" DROP CONSTRAINT "FK_8e439d24c574141d9a66d74fa5c"`,
+    );
+    await queryRunner.query(
+      `ALTER TABLE "IncidentEpisodePublicNote" DROP CONSTRAINT "FK_96d88a43c5479b67ddd7c70df16"`,
+    );
+    await queryRunner.query(
+      `ALTER TABLE "IncidentEpisodePublicNote" DROP CONSTRAINT "FK_7711bde5254d7c1021bbbb0f944"`,
+    );
+    await queryRunner.query(
+      `ALTER TABLE "IncidentEpisodePublicNote" DROP CONSTRAINT "FK_885de505291c2f6f4f86b988ca6"`,
+    );
+    await queryRunner.query(
+      `ALTER TABLE "IncidentEpisodePublicNote" DROP CONSTRAINT "FK_46268b7b996f3b8129136d12d21"`,
+    );
+    await queryRunner.query(
+      `DROP INDEX "public"."IDX_30d4a06d51be505b6233185906"`,
+    );
+    await queryRunner.query(
+      `DROP INDEX "public"."IDX_298e3524e859ddb920c05e1072"`,
+    );
+    await queryRunner.query(
+      `DROP INDEX "public"."IDX_9d7bfebab97dc56583df143ae8"`,
+    );
+    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 "IncidentEpisodeStateTimeline" DROP COLUMN "subscriberNotificationStatusMessage"`,
+    );
+    await queryRunner.query(
+      `ALTER TABLE "IncidentEpisodeStateTimeline" DROP COLUMN "subscriberNotificationStatus"`,
+    );
+    await queryRunner.query(
+      `ALTER TABLE "IncidentEpisodeStateTimeline" DROP COLUMN "shouldStatusPageSubscribersBeNotified"`,
+    );
+    await queryRunner.query(
+      `ALTER TABLE "StatusPage" DROP COLUMN "showEpisodesOnStatusPage"`,
+    );
+    await queryRunner.query(
+      `ALTER TABLE "IncidentEpisode" DROP COLUMN "subscriberNotificationStatusMessage"`,
+    );
+    await queryRunner.query(
+      `ALTER TABLE "IncidentEpisode" DROP COLUMN "subscriberNotificationStatusOnEpisodeCreated"`,
+    );
+    await queryRunner.query(
+      `ALTER TABLE "IncidentEpisode" DROP COLUMN "shouldStatusPageSubscribersBeNotifiedOnEpisodeCreated"`,
+    );
+    await queryRunner.query(
+      `ALTER TABLE "IncidentEpisode" DROP COLUMN "declaredAt"`,
+    );
+    await queryRunner.query(
+      `ALTER TABLE "IncidentEpisode" DROP COLUMN "isVisibleOnStatusPage"`,
+    );
+    await queryRunner.query(
+      `ALTER TABLE "IncidentGroupingRule" DROP COLUMN "showEpisodeOnStatusPage"`,
+    );
+    await queryRunner.query(
+      `DROP INDEX "public"."IDX_0dfcd7747b6e55239df9bbaac5"`,
+    );
+    await queryRunner.query(
+      `DROP INDEX "public"."IDX_8e439d24c574141d9a66d74fa5"`,
+    );
+    await queryRunner.query(`DROP TABLE "IncidentEpisodePublicNoteFile"`);
+    await queryRunner.query(
+      `DROP INDEX "public"."IDX_784fb865a857417194a37034ed"`,
+    );
+    await queryRunner.query(
+      `DROP INDEX "public"."IDX_2e0c6dd840bbc05b9a5117f882"`,
+    );
+    await queryRunner.query(
+      `DROP INDEX "public"."IDX_885de505291c2f6f4f86b988ca"`,
+    );
+    await queryRunner.query(
+      `DROP INDEX "public"."IDX_46268b7b996f3b8129136d12d2"`,
+    );
+    await queryRunner.query(`DROP TABLE "IncidentEpisodePublicNote"`);
+  }
+}

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

@@ -0,0 +1,35 @@
+import { MigrationInterface, QueryRunner } from "typeorm";
+
+export class MigrationName1770237245069 implements MigrationInterface {
+  public name = "MigrationName1770237245069";
+
+  public async up(queryRunner: QueryRunner): Promise<void> {
+    await queryRunner.query(
+      `ALTER TABLE "StatusPage" ADD "showEpisodeHistoryInDays" integer NOT NULL DEFAULT '14'`,
+    );
+    await queryRunner.query(
+      `ALTER TABLE "StatusPage" ADD "showEpisodeLabelsOnStatusPage" boolean NOT NULL DEFAULT false`,
+    );
+    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":[]}}'`,
+    );
+  }
+
+  public async down(queryRunner: QueryRunner): Promise<void> {
+    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 "StatusPage" DROP COLUMN "showEpisodeLabelsOnStatusPage"`,
+    );
+    await queryRunner.query(
+      `ALTER TABLE "StatusPage" DROP COLUMN "showEpisodeHistoryInDays"`,
+    );
+  }
+}

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

@@ -0,0 +1,57 @@
+import { MigrationInterface, QueryRunner } from "typeorm";
+
+export class MigrationName1770237245070 implements MigrationInterface {
+  public name = "MigrationName1770237245070";
+
+  public async up(queryRunner: QueryRunner): Promise<void> {
+    // Add counter columns with default 0
+    await queryRunner.query(
+      `ALTER TABLE "Project" ADD "incidentCounter" integer NOT NULL DEFAULT '0'`,
+    );
+    await queryRunner.query(
+      `ALTER TABLE "Project" ADD "alertCounter" integer NOT NULL DEFAULT '0'`,
+    );
+    await queryRunner.query(
+      `ALTER TABLE "Project" ADD "scheduledMaintenanceCounter" integer NOT NULL DEFAULT '0'`,
+    );
+    await queryRunner.query(
+      `ALTER TABLE "Project" ADD "incidentEpisodeCounter" integer NOT NULL DEFAULT '0'`,
+    );
+    await queryRunner.query(
+      `ALTER TABLE "Project" ADD "alertEpisodeCounter" integer NOT NULL DEFAULT '0'`,
+    );
+
+    // Backfill from MAX of each entity table (including soft-deleted rows)
+    await queryRunner.query(
+      `UPDATE "Project" SET "incidentCounter" = COALESCE((SELECT MAX("incidentNumber") FROM "Incident" WHERE "Incident"."projectId" = "Project"."_id"), 0)`,
+    );
+    await queryRunner.query(
+      `UPDATE "Project" SET "alertCounter" = COALESCE((SELECT MAX("alertNumber") FROM "Alert" WHERE "Alert"."projectId" = "Project"."_id"), 0)`,
+    );
+    await queryRunner.query(
+      `UPDATE "Project" SET "scheduledMaintenanceCounter" = COALESCE((SELECT MAX("scheduledMaintenanceNumber") FROM "ScheduledMaintenance" WHERE "ScheduledMaintenance"."projectId" = "Project"."_id"), 0)`,
+    );
+    await queryRunner.query(
+      `UPDATE "Project" SET "incidentEpisodeCounter" = COALESCE((SELECT MAX("episodeNumber") FROM "IncidentEpisode" WHERE "IncidentEpisode"."projectId" = "Project"."_id"), 0)`,
+    );
+    await queryRunner.query(
+      `UPDATE "Project" SET "alertEpisodeCounter" = COALESCE((SELECT MAX("episodeNumber") FROM "AlertEpisode" WHERE "AlertEpisode"."projectId" = "Project"."_id"), 0)`,
+    );
+  }
+
+  public async down(queryRunner: QueryRunner): Promise<void> {
+    await queryRunner.query(
+      `ALTER TABLE "Project" DROP COLUMN "alertEpisodeCounter"`,
+    );
+    await queryRunner.query(
+      `ALTER TABLE "Project" DROP COLUMN "incidentEpisodeCounter"`,
+    );
+    await queryRunner.query(
+      `ALTER TABLE "Project" DROP COLUMN "scheduledMaintenanceCounter"`,
+    );
+    await queryRunner.query(`ALTER TABLE "Project" DROP COLUMN "alertCounter"`);
+    await queryRunner.query(
+      `ALTER TABLE "Project" DROP COLUMN "incidentCounter"`,
+    );
+  }
+}

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

@@ -0,0 +1,83 @@
+import { MigrationInterface, QueryRunner } from "typeorm";
+
+export class MigrationName1770407024682 implements MigrationInterface {
+  public name = "MigrationName1770407024682";
+
+  public async up(queryRunner: QueryRunner): Promise<void> {
+    await queryRunner.query(
+      `ALTER TABLE "Project" ADD "incidentNumberPrefix" character varying(100)`,
+    );
+    await queryRunner.query(
+      `ALTER TABLE "Project" ADD "alertNumberPrefix" character varying(100)`,
+    );
+    await queryRunner.query(
+      `ALTER TABLE "Project" ADD "scheduledMaintenanceNumberPrefix" character varying(100)`,
+    );
+    await queryRunner.query(
+      `ALTER TABLE "Project" ADD "incidentEpisodeNumberPrefix" character varying(100)`,
+    );
+    await queryRunner.query(
+      `ALTER TABLE "Project" ADD "alertEpisodeNumberPrefix" character varying(100)`,
+    );
+    await queryRunner.query(
+      `ALTER TABLE "IncidentEpisode" ADD "episodeNumberWithPrefix" character varying(100)`,
+    );
+    await queryRunner.query(
+      `ALTER TABLE "Incident" ADD "incidentNumberWithPrefix" character varying(100)`,
+    );
+    await queryRunner.query(
+      `ALTER TABLE "AlertEpisode" ADD "episodeNumberWithPrefix" character varying(100)`,
+    );
+    await queryRunner.query(
+      `ALTER TABLE "Alert" ADD "alertNumberWithPrefix" character varying(100)`,
+    );
+    await queryRunner.query(
+      `ALTER TABLE "ScheduledMaintenance" ADD "scheduledMaintenanceNumberWithPrefix" character varying(100)`,
+    );
+    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":[]}}'`,
+    );
+  }
+
+  public async down(queryRunner: QueryRunner): Promise<void> {
+    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 "ScheduledMaintenance" DROP COLUMN "scheduledMaintenanceNumberWithPrefix"`,
+    );
+    await queryRunner.query(
+      `ALTER TABLE "Alert" DROP COLUMN "alertNumberWithPrefix"`,
+    );
+    await queryRunner.query(
+      `ALTER TABLE "AlertEpisode" DROP COLUMN "episodeNumberWithPrefix"`,
+    );
+    await queryRunner.query(
+      `ALTER TABLE "Incident" DROP COLUMN "incidentNumberWithPrefix"`,
+    );
+    await queryRunner.query(
+      `ALTER TABLE "IncidentEpisode" DROP COLUMN "episodeNumberWithPrefix"`,
+    );
+    await queryRunner.query(
+      `ALTER TABLE "Project" DROP COLUMN "alertEpisodeNumberPrefix"`,
+    );
+    await queryRunner.query(
+      `ALTER TABLE "Project" DROP COLUMN "incidentEpisodeNumberPrefix"`,
+    );
+    await queryRunner.query(
+      `ALTER TABLE "Project" DROP COLUMN "scheduledMaintenanceNumberPrefix"`,
+    );
+    await queryRunner.query(
+      `ALTER TABLE "Project" DROP COLUMN "alertNumberPrefix"`,
+    );
+    await queryRunner.query(
+      `ALTER TABLE "Project" DROP COLUMN "incidentNumberPrefix"`,
+    );
+  }
+}

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

@@ -249,6 +249,10 @@ import { MigrationName1769774527481 } from "./1769774527481-MigrationName";
 import { MigrationName1769780297584 } from "./1769780297584-MigrationName";
 import { MigrationName1769802715014 } from "./1769802715014-MigrationName";
 import { MigrationName1770054293299 } from "./1770054293299-MigrationName";
+import { MigrationName1770232207959 } from "./1770232207959-MigrationName";
+import { MigrationName1770237245069 } from "./1770237245069-MigrationName";
+import { MigrationName1770237245070 } from "./1770237245070-MigrationName";
+import { MigrationName1770407024682 } from "./1770407024682-MigrationName";
 
 export default [
   InitialMigration,
@@ -502,4 +506,8 @@ export default [
   MigrationName1769780297584,
   MigrationName1769802715014,
   MigrationName1770054293299,
+  MigrationName1770232207959,
+  MigrationName1770237245069,
+  MigrationName1770237245070,
+  MigrationName1770407024682,
 ];

package/Server/Services/AlertEpisodeMemberService.ts

@@ -120,6 +120,7 @@ export class Service extends DatabaseService<Model> {
       id: createdItem.alertId,
       select: {
         alertNumber: true,
+        alertNumberWithPrefix: true,
         title: true,
       },
       props: {
@@ -132,6 +133,7 @@ export class Service extends DatabaseService<Model> {
       id: createdItem.alertEpisodeId,
       select: {
         episodeNumber: true,
+        episodeNumberWithPrefix: true,
         title: true,
       },
       props: {
@@ -145,7 +147,7 @@ export class Service extends DatabaseService<Model> {
       projectId: createdItem.projectId,
       alertEpisodeFeedEventType: AlertEpisodeFeedEventType.AlertAdded,
       displayColor: Yellow500,
-      feedInfoInMarkdown: `**Alert #${alert?.alertNumber || "N/A"}** added to episode: ${alert?.title || "No title"}`,
+      feedInfoInMarkdown: `**Alert ${alert?.alertNumberWithPrefix || "#" + (alert?.alertNumber || "N/A")}** added to episode: ${alert?.title || "No title"}`,
       userId: createdItem.addedByUserId || undefined,
     });
 
@@ -155,7 +157,7 @@ export class Service extends DatabaseService<Model> {
       projectId: createdItem.projectId,
       alertFeedEventType: AlertFeedEventType.AddedToEpisode,
       displayColor: Yellow500,
-      feedInfoInMarkdown: `Added to **Episode #${episode?.episodeNumber || "N/A"}**: ${episode?.title || "No title"}`,
+      feedInfoInMarkdown: `Added to **Episode ${episode?.episodeNumberWithPrefix || "#" + (episode?.episodeNumber || "N/A")}**: ${episode?.title || "No title"}`,
       userId: createdItem.addedByUserId || undefined,
     });
 
@@ -228,6 +230,7 @@ export class Service extends DatabaseService<Model> {
                 id: member.alertEpisodeId,
                 select: {
                   episodeNumber: true,
+                  episodeNumberWithPrefix: true,
                   title: true,
                 },
                 props: {
@@ -250,7 +253,7 @@ export class Service extends DatabaseService<Model> {
               projectId: member.projectId,
               alertFeedEventType: AlertFeedEventType.RemovedFromEpisode,
               displayColor: Green500,
-              feedInfoInMarkdown: `Removed from **Episode #${episode?.episodeNumber || "N/A"}**: ${episode?.title || "No title"}`,
+              feedInfoInMarkdown: `Removed from **Episode ${episode?.episodeNumberWithPrefix || "#" + (episode?.episodeNumber || "N/A")}**: ${episode?.title || "No title"}`,
             });
           }
         }

package/Server/Services/AlertEpisodeService.ts

@@ -40,10 +40,10 @@ import NotificationRuleWorkspaceChannel from "../../Types/Workspace/Notification
 import WorkspaceType from "../../Types/Workspace/WorkspaceType";
 import Typeof from "../../Types/Typeof";
 import AlertService from "./AlertService";
-import Semaphore, { SemaphoreMutex } from "../Infrastructure/Semaphore";
 import OnCallDutyPolicyService from "./OnCallDutyPolicyService";
 import OnCallDutyPolicy from "../../Models/DatabaseModels/OnCallDutyPolicy";
 import UserNotificationEventType from "../../Types/UserNotification/UserNotificationEventType";
+import ProjectService from "./ProjectService";
 
 export class Service extends DatabaseService<Model> {
   public constructor() {
@@ -53,32 +53,6 @@ export class Service extends DatabaseService<Model> {
     }
   }
 
-  @CaptureSpan()
-  public async getExistingEpisodeNumberForProject(data: {
-    projectId: ObjectID;
-  }): Promise<number> {
-    const lastEpisode: Model | null = await this.findOneBy({
-      query: {
-        projectId: data.projectId,
-      },
-      select: {
-        episodeNumber: true,
-      },
-      sort: {
-        episodeNumber: SortOrder.Descending,
-      },
-      props: {
-        isRoot: true,
-      },
-    });
-
-    if (!lastEpisode) {
-      return 0;
-    }
-
-    return lastEpisode.episodeNumber ? Number(lastEpisode.episodeNumber) : 0;
-  }
-
   @CaptureSpan()
   protected override async onBeforeCreate(
     createBy: CreateBy<Model>,
@@ -90,83 +64,52 @@ export class Service extends DatabaseService<Model> {
     const projectId: ObjectID =
       createBy.props.tenantId || createBy.data.projectId!;
 
-    let mutex: SemaphoreMutex | null = null;
-
-    try {
-      // Acquire mutex to prevent race conditions when generating episode numbers
-      try {
-        mutex = await Semaphore.lock({
-          key: projectId.toString(),
-          namespace: "AlertEpisode.create",
-        });
-      } catch (err) {
-        logger.error(err);
-      }
-
-      // Get the created state for episodes
-      const alertState: AlertState | null = await AlertStateService.findOneBy({
-        query: {
-          projectId: projectId,
-          isCreatedState: true,
-        },
-        select: {
-          _id: true,
-        },
-        props: {
-          isRoot: true,
-        },
-      });
-
-      if (!alertState || !alertState.id) {
-        throw new BadDataException(
-          "Created alert state not found for this project. Please add created alert state from settings.",
-        );
-      }
+    // Get the created state for episodes
+    const alertState: AlertState | null = await AlertStateService.findOneBy({
+      query: {
+        projectId: projectId,
+        isCreatedState: true,
+      },
+      select: {
+        _id: true,
+      },
+      props: {
+        isRoot: true,
+      },
+    });
 
-      createBy.data.currentAlertStateId = alertState.id;
+    if (!alertState || !alertState.id) {
+      throw new BadDataException(
+        "Created alert state not found for this project. Please add created alert state from settings.",
+      );
+    }
 
-      // Auto-generate episode number
-      const episodeNumberForThisEpisode: number =
-        (await this.getExistingEpisodeNumberForProject({
-          projectId: projectId,
-        })) + 1;
+    createBy.data.currentAlertStateId = alertState.id;
 
-      createBy.data.episodeNumber = episodeNumberForThisEpisode;
+    // Auto-generate episode number
+    const episodeCounterResult: {
+      counter: number;
+      prefix: string | undefined;
+    } = await ProjectService.incrementAndGetAlertEpisodeCounter(projectId);
 
-      // Set initial lastAlertAddedAt
-      if (!createBy.data.lastAlertAddedAt) {
-        createBy.data.lastAlertAddedAt = OneUptimeDate.getCurrentDate();
-      }
+    createBy.data.episodeNumber = episodeCounterResult.counter;
+    createBy.data.episodeNumberWithPrefix = episodeCounterResult.prefix
+      ? `${episodeCounterResult.prefix}${episodeCounterResult.counter}`
+      : `#${episodeCounterResult.counter}`;
 
-      return { createBy, carryForward: { mutex } };
-    } catch (error) {
-      // Release the mutex if it was acquired and an error occurred
-      if (mutex) {
-        try {
-          await Semaphore.release(mutex);
-        } catch (err) {
-          logger.error(err);
-        }
-      }
-      throw error;
+    // Set initial lastAlertAddedAt
+    if (!createBy.data.lastAlertAddedAt) {
+      createBy.data.lastAlertAddedAt = OneUptimeDate.getCurrentDate();
     }
+
+    return { createBy, carryForward: null };
   }
 
   @CaptureSpan()
   protected override async onCreateSuccess(
-    onCreate: OnCreate<Model>,
+    _onCreate: OnCreate<Model>,
     createdItem: Model,
   ): Promise<Model> {
-    // Release the mutex acquired in onBeforeCreate
-    const mutex: SemaphoreMutex | null = onCreate.carryForward?.mutex || null;
-    if (mutex) {
-      try {
-        await Semaphore.release(mutex);
-      } catch (err) {
-        logger.error(err);
-      }
-    }
-
     if (!createdItem.projectId) {
       throw new BadDataException("projectId is required");
     }
@@ -233,7 +176,7 @@ export class Service extends DatabaseService<Model> {
       return;
     }
 
-    let feedInfoInMarkdown: string = `#### Episode ${episode.episodeNumber?.toString()} Created
+    let feedInfoInMarkdown: string = `#### Episode ${episode.episodeNumberWithPrefix || "#" + episode.episodeNumber?.toString()} Created
 
 **${episode.title || "No title provided."}**
 
@@ -897,13 +840,15 @@ export class Service extends DatabaseService<Model> {
   }
 
   @CaptureSpan()
-  public async getEpisodeNumber(data: {
-    episodeId: ObjectID;
-  }): Promise<number | null> {
+  public async getEpisodeNumber(data: { episodeId: ObjectID }): Promise<{
+    number: number | null;
+    numberWithPrefix: string | null;
+  }> {
     const episode: Model | null = await this.findOneById({
       id: data.episodeId,
       select: {
         episodeNumber: true,
+        episodeNumberWithPrefix: true,
       },
       props: {
         isRoot: true,
@@ -914,7 +859,10 @@ export class Service extends DatabaseService<Model> {
       throw new BadDataException("Episode not found.");
     }
 
-    return episode.episodeNumber ? Number(episode.episodeNumber) : null;
+    return {
+      number: episode.episodeNumber ? Number(episode.episodeNumber) : null,
+      numberWithPrefix: episode.episodeNumberWithPrefix || null,
+    };
   }
 
   @CaptureSpan()

package/Server/Services/AlertEpisodeStateTimelineService.ts

@@ -350,13 +350,15 @@ export class Service extends DatabaseService<AlertEpisodeStateTimeline> {
       id: createdItem.alertEpisodeId,
       select: {
         episodeNumber: true,
+        episodeNumberWithPrefix: true,
       },
       props: {
         isRoot: true,
       },
     });
 
-    const episodeNumber: number = episode?.episodeNumber || 0;
+    const episodeDisplayNumber: string =
+      episode?.episodeNumberWithPrefix || "#" + (episode?.episodeNumber || 0);
 
     await AlertEpisodeFeedService.createAlertEpisodeFeedItem({
       alertEpisodeId: createdItem.alertEpisodeId!,
@@ -365,7 +367,7 @@ export class Service extends DatabaseService<AlertEpisodeStateTimeline> {
       displayColor: alertState?.color,
       feedInfoInMarkdown:
         stateEmoji +
-        ` Changed **Episode ${episodeNumber} State** to **` +
+        ` Changed **Episode ${episodeDisplayNumber} State** to **` +
         stateName +
         "**",
       moreInformationInMarkdown: createdItem.rootCause