@oneuptime/common 9.5.2 → 9.5.4

package/Server/Services/ProjectService.ts

@@ -81,6 +81,7 @@ import CaptureSpan from "../Utils/Telemetry/CaptureSpan";
 import DatabaseConfig from "../DatabaseConfig";
 import DatabaseCommonInteractionProps from "../../Types/BaseDatabase/DatabaseCommonInteractionProps";
 import PositiveNumber from "../../Types/PositiveNumber";
+import Semaphore, { SemaphoreMutex } from "../Infrastructure/Semaphore";
 
 export interface CurrentPlan {
   plan: PlanType | null;
@@ -277,6 +278,27 @@ export class ProjectService extends DatabaseService<Model> {
     data.data.utmContent = user.utmContent!;
     data.data.utmUrl = user.utmUrl!;
 
+    // Set default number prefixes.
+    if (!data.data.incidentNumberPrefix) {
+      data.data.incidentNumberPrefix = "INC-";
+    }
+
+    if (!data.data.alertNumberPrefix) {
+      data.data.alertNumberPrefix = "ALT-";
+    }
+
+    if (!data.data.scheduledMaintenanceNumberPrefix) {
+      data.data.scheduledMaintenanceNumberPrefix = "SM-";
+    }
+
+    if (!data.data.incidentEpisodeNumberPrefix) {
+      data.data.incidentEpisodeNumberPrefix = "IE-";
+    }
+
+    if (!data.data.alertEpisodeNumberPrefix) {
+      data.data.alertEpisodeNumberPrefix = "AE-";
+    }
+
     return Promise.resolve({ createBy: data, carryForward: null });
   }
 
@@ -1589,6 +1611,211 @@ export class ProjectService extends DatabaseService<Model> {
     );
   }
 
+  @CaptureSpan()
+  public async incrementAndGetIncidentCounter(
+    projectId: ObjectID,
+  ): Promise<{ counter: number; prefix: string | undefined }> {
+    const mutex: SemaphoreMutex = await Semaphore.lock({
+      key: projectId.toString(),
+      namespace: "ProjectService.incidentCounter",
+    });
+
+    try {
+      await this.atomicIncrementColumnValueByOne({
+        id: projectId,
+        columnName: "incidentCounter",
+      });
+
+      const project: Model | null = await this.findOneById({
+        id: projectId,
+        select: {
+          incidentCounter: true,
+          incidentNumberPrefix: true,
+        },
+        props: {
+          isRoot: true,
+        },
+      });
+
+      if (!project || project.incidentCounter === undefined) {
+        throw new BadDataException(
+          `Could not read incidentCounter for project ${projectId.toString()}`,
+        );
+      }
+
+      return {
+        counter: project.incidentCounter,
+        prefix: project.incidentNumberPrefix,
+      };
+    } finally {
+      await Semaphore.release(mutex);
+    }
+  }
+
+  @CaptureSpan()
+  public async incrementAndGetAlertCounter(
+    projectId: ObjectID,
+  ): Promise<{ counter: number; prefix: string | undefined }> {
+    const mutex: SemaphoreMutex = await Semaphore.lock({
+      key: projectId.toString(),
+      namespace: "ProjectService.alertCounter",
+    });
+
+    try {
+      await this.atomicIncrementColumnValueByOne({
+        id: projectId,
+        columnName: "alertCounter",
+      });
+
+      const project: Model | null = await this.findOneById({
+        id: projectId,
+        select: {
+          alertCounter: true,
+          alertNumberPrefix: true,
+        },
+        props: {
+          isRoot: true,
+        },
+      });
+
+      if (!project || project.alertCounter === undefined) {
+        throw new BadDataException(
+          `Could not read alertCounter for project ${projectId.toString()}`,
+        );
+      }
+
+      return {
+        counter: project.alertCounter,
+        prefix: project.alertNumberPrefix,
+      };
+    } finally {
+      await Semaphore.release(mutex);
+    }
+  }
+
+  @CaptureSpan()
+  public async incrementAndGetScheduledMaintenanceCounter(
+    projectId: ObjectID,
+  ): Promise<{ counter: number; prefix: string | undefined }> {
+    const mutex: SemaphoreMutex = await Semaphore.lock({
+      key: projectId.toString(),
+      namespace: "ProjectService.scheduledMaintenanceCounter",
+    });
+
+    try {
+      await this.atomicIncrementColumnValueByOne({
+        id: projectId,
+        columnName: "scheduledMaintenanceCounter",
+      });
+
+      const project: Model | null = await this.findOneById({
+        id: projectId,
+        select: {
+          scheduledMaintenanceCounter: true,
+          scheduledMaintenanceNumberPrefix: true,
+        },
+        props: {
+          isRoot: true,
+        },
+      });
+
+      if (!project || project.scheduledMaintenanceCounter === undefined) {
+        throw new BadDataException(
+          `Could not read scheduledMaintenanceCounter for project ${projectId.toString()}`,
+        );
+      }
+
+      return {
+        counter: project.scheduledMaintenanceCounter,
+        prefix: project.scheduledMaintenanceNumberPrefix,
+      };
+    } finally {
+      await Semaphore.release(mutex);
+    }
+  }
+
+  @CaptureSpan()
+  public async incrementAndGetIncidentEpisodeCounter(
+    projectId: ObjectID,
+  ): Promise<{ counter: number; prefix: string | undefined }> {
+    const mutex: SemaphoreMutex = await Semaphore.lock({
+      key: projectId.toString(),
+      namespace: "ProjectService.incidentEpisodeCounter",
+    });
+
+    try {
+      await this.atomicIncrementColumnValueByOne({
+        id: projectId,
+        columnName: "incidentEpisodeCounter",
+      });
+
+      const project: Model | null = await this.findOneById({
+        id: projectId,
+        select: {
+          incidentEpisodeCounter: true,
+          incidentEpisodeNumberPrefix: true,
+        },
+        props: {
+          isRoot: true,
+        },
+      });
+
+      if (!project || project.incidentEpisodeCounter === undefined) {
+        throw new BadDataException(
+          `Could not read incidentEpisodeCounter for project ${projectId.toString()}`,
+        );
+      }
+
+      return {
+        counter: project.incidentEpisodeCounter,
+        prefix: project.incidentEpisodeNumberPrefix,
+      };
+    } finally {
+      await Semaphore.release(mutex);
+    }
+  }
+
+  @CaptureSpan()
+  public async incrementAndGetAlertEpisodeCounter(
+    projectId: ObjectID,
+  ): Promise<{ counter: number; prefix: string | undefined }> {
+    const mutex: SemaphoreMutex = await Semaphore.lock({
+      key: projectId.toString(),
+      namespace: "ProjectService.alertEpisodeCounter",
+    });
+
+    try {
+      await this.atomicIncrementColumnValueByOne({
+        id: projectId,
+        columnName: "alertEpisodeCounter",
+      });
+
+      const project: Model | null = await this.findOneById({
+        id: projectId,
+        select: {
+          alertEpisodeCounter: true,
+          alertEpisodeNumberPrefix: true,
+        },
+        props: {
+          isRoot: true,
+        },
+      });
+
+      if (!project || project.alertEpisodeCounter === undefined) {
+        throw new BadDataException(
+          `Could not read alertEpisodeCounter for project ${projectId.toString()}`,
+        );
+      }
+
+      return {
+        counter: project.alertEpisodeCounter,
+        prefix: project.alertEpisodeNumberPrefix,
+      };
+    } finally {
+      await Semaphore.release(mutex);
+    }
+  }
+
   @CaptureSpan()
   public async isSMSNotificationsEnabled(
     projectId: ObjectID,

package/Server/Services/ScheduledMaintenanceInternalNoteService.ts

@@ -86,10 +86,12 @@ export class Service extends DatabaseService<Model> {
     const scheduledMaintenanceId: ObjectID =
       createdItem.scheduledMaintenanceId!;
 
-    const scheduledMaintenanceNumber: number | null =
-      await ScheduledMaintenanceService.getScheduledMaintenanceNumber({
-        scheduledMaintenanceId: scheduledMaintenanceId,
-      });
+    const scheduledMaintenanceNumberResult: {
+      number: number | null;
+      numberWithPrefix: string | null;
+    } = await ScheduledMaintenanceService.getScheduledMaintenanceNumber({
+      scheduledMaintenanceId: scheduledMaintenanceId,
+    });
 
     const attachmentsMarkdown: string = await this.getAttachmentsMarkdown(
       createdItem.id!,
@@ -104,7 +106,7 @@ export class Service extends DatabaseService<Model> {
       displayColor: Blue500,
       userId: userId || undefined,
 
-      feedInfoInMarkdown: `📄 posted **private note** for this [Scheduled Maintenance ${scheduledMaintenanceNumber}](${(await ScheduledMaintenanceService.getScheduledMaintenanceLinkInDashboard(createdItem.projectId!, scheduledMaintenanceId)).toString()}):
+      feedInfoInMarkdown: `📄 posted **private note** for this [Scheduled Maintenance ${scheduledMaintenanceNumberResult.numberWithPrefix || "#" + scheduledMaintenanceNumberResult.number}](${(await ScheduledMaintenanceService.getScheduledMaintenanceLinkInDashboard(createdItem.projectId!, scheduledMaintenanceId)).toString()}):
     
     ${(createdItem.note || "") + attachmentsMarkdown}
               `,
@@ -140,6 +142,7 @@ export class Service extends DatabaseService<Model> {
           },
           scheduledMaintenance: {
             scheduledMaintenanceNumber: true,
+            scheduledMaintenanceNumberWithPrefix: true,
             projectId: true,
             _id: true,
           },
@@ -167,7 +170,7 @@ export class Service extends DatabaseService<Model> {
             displayColor: Blue500,
             userId: userId || undefined,
 
-            feedInfoInMarkdown: `📄 updated **Private Note** for this [Scheduled Maintenance ${scheduledMaintenance.scheduledMaintenanceNumber}](${(await ScheduledMaintenanceService.getScheduledMaintenanceLinkInDashboard(scheduledMaintenance.projectId!, scheduledMaintenance.id!)).toString()})
+            feedInfoInMarkdown: `📄 updated **Private Note** for this [Scheduled Maintenance ${scheduledMaintenance.scheduledMaintenanceNumberWithPrefix || "#" + scheduledMaintenance.scheduledMaintenanceNumber}](${(await ScheduledMaintenanceService.getScheduledMaintenanceLinkInDashboard(scheduledMaintenance.projectId!, scheduledMaintenance.id!)).toString()})
         
 ${(updatedItem.note || "") + attachmentsMarkdown}
                   `,

package/Server/Services/ScheduledMaintenancePublicNoteService.ts

@@ -60,10 +60,12 @@ export class Service extends DatabaseService<Model> {
     const scheduledMaintenanceId: ObjectID =
       createdItem.scheduledMaintenanceId!;
     const projectId: ObjectID = createdItem.projectId!;
-    const scheduledMaintenanceNumber: number | null =
-      await ScheduledMaintenanceService.getScheduledMaintenanceNumber({
-        scheduledMaintenanceId: scheduledMaintenanceId,
-      });
+    const scheduledMaintenanceNumberResult: {
+      number: number | null;
+      numberWithPrefix: string | null;
+    } = await ScheduledMaintenanceService.getScheduledMaintenanceNumber({
+      scheduledMaintenanceId: scheduledMaintenanceId,
+    });
 
     const attachmentsMarkdown: string = await this.getAttachmentsMarkdown(
       createdItem.id!,
@@ -77,7 +79,7 @@ export class Service extends DatabaseService<Model> {
         ScheduledMaintenanceFeedEventType.PublicNote,
       displayColor: Indigo500,
       userId: userId || undefined,
-      feedInfoInMarkdown: `📄 posted **public note** for this [Scheduled Maintenance ${scheduledMaintenanceNumber}](${(await ScheduledMaintenanceService.getScheduledMaintenanceLinkInDashboard(projectId!, scheduledMaintenanceId!)).toString()}) on status page:
+      feedInfoInMarkdown: `📄 posted **public note** for this [Scheduled Maintenance ${scheduledMaintenanceNumberResult.numberWithPrefix || "#" + scheduledMaintenanceNumberResult.number}](${(await ScheduledMaintenanceService.getScheduledMaintenanceLinkInDashboard(projectId!, scheduledMaintenanceId!)).toString()}) on status page:
     
 ${(createdItem.note || "") + attachmentsMarkdown}
               `,
@@ -108,6 +110,7 @@ ${(createdItem.note || "") + attachmentsMarkdown}
           scheduledMaintenance: {
             _id: true,
             scheduledMaintenanceNumber: true,
+            scheduledMaintenanceNumberWithPrefix: true,
             projectId: true,
           },
           projectId: true,
@@ -140,7 +143,7 @@ ${(createdItem.note || "") + attachmentsMarkdown}
             displayColor: Blue500,
             userId: userId || undefined,
 
-            feedInfoInMarkdown: `📄 updated **Public Note** for this [Scheduled Maintenance ${scheduledMaintenance.scheduledMaintenanceNumber}](${(await ScheduledMaintenanceService.getScheduledMaintenanceLinkInDashboard(scheduledMaintenance.projectId!, scheduledMaintenance.id!)).toString()})
+            feedInfoInMarkdown: `📄 updated **Public Note** for this [Scheduled Maintenance ${scheduledMaintenance.scheduledMaintenanceNumberWithPrefix || "#" + scheduledMaintenance.scheduledMaintenanceNumber}](${(await ScheduledMaintenanceService.getScheduledMaintenanceLinkInDashboard(scheduledMaintenance.projectId!, scheduledMaintenance.id!)).toString()})
         
 ${(updatedItem.note || "") + attachmentsMarkdown}
                   `,

package/Server/Services/ScheduledMaintenanceService.ts

@@ -59,6 +59,7 @@ import NotificationRuleWorkspaceChannel from "../../Types/Workspace/Notification
 import { MessageBlocksByWorkspaceType } from "./WorkspaceNotificationRuleService";
 import ScheduledMaintenanceWorkspaceMessages from "../Utils/Workspace/WorkspaceMessages/ScheduledMaintenance";
 import CaptureSpan from "../Utils/Telemetry/CaptureSpan";
+import ProjectService from "./ProjectService";
 import StatusPageSubscriberNotificationTemplateService, {
   Service as StatusPageSubscriberNotificationTemplateServiceClass,
 } from "./StatusPageSubscriberNotificationTemplateService";
@@ -74,35 +75,6 @@ export class Service extends DatabaseService<Model> {
     }
   }
 
-  @CaptureSpan()
-  public async getExistingScheduledMaintenanceNumberForProject(data: {
-    projectId: ObjectID;
-  }): Promise<number> {
-    // get last scheduledMaintenance number.
-    const lastScheduledMaintenance: Model | null = await this.findOneBy({
-      query: {
-        projectId: data.projectId,
-      },
-      select: {
-        scheduledMaintenanceNumber: true,
-      },
-      sort: {
-        createdAt: SortOrder.Descending,
-      },
-      props: {
-        isRoot: true,
-      },
-    });
-
-    if (!lastScheduledMaintenance) {
-      return 0;
-    }
-
-    return lastScheduledMaintenance.scheduledMaintenanceNumber
-      ? Number(lastScheduledMaintenance.scheduledMaintenanceNumber)
-      : 0;
-  }
-
   @CaptureSpan()
   public async notififySubscribersOnEventScheduled(
     scheduledEvents: Array<Model>,
@@ -751,13 +723,20 @@ ${resourcesAffected ? `**Resources Affected:** ${resourcesAffected}` : ""}
     createBy.data.currentScheduledMaintenanceStateId =
       scheduledMaintenanceState.id;
 
-    const scheduledMaintenanceNumberForThisScheduledMaintenance: number =
-      (await this.getExistingScheduledMaintenanceNumberForProject({
-        projectId: projectId,
-      })) + 1;
+    const scheduledMaintenanceCounterResult: {
+      counter: number;
+      prefix: string | undefined;
+    } =
+      await ProjectService.incrementAndGetScheduledMaintenanceCounter(
+        projectId,
+      );
 
     createBy.data.scheduledMaintenanceNumber =
-      scheduledMaintenanceNumberForThisScheduledMaintenance;
+      scheduledMaintenanceCounterResult.counter;
+    createBy.data.scheduledMaintenanceNumberWithPrefix =
+      scheduledMaintenanceCounterResult.prefix
+        ? `${scheduledMaintenanceCounterResult.prefix}${scheduledMaintenanceCounterResult.counter}`
+        : `#${scheduledMaintenanceCounterResult.counter}`;
 
     // get next notification date.
 
@@ -808,6 +787,7 @@ ${resourcesAffected ? `**Resources Affected:** ${resourcesAffected}` : ""}
       select: {
         projectId: true,
         scheduledMaintenanceNumber: true,
+        scheduledMaintenanceNumberWithPrefix: true,
         title: true,
         description: true,
         currentScheduledMaintenanceState: {
@@ -971,7 +951,7 @@ ${resourcesAffected ? `**Resources Affected:** ${resourcesAffected}` : ""}
         scheduledMaintenance.createdByUserId ||
         scheduledMaintenance.createdByUser?.id;
 
-      let feedInfoInMarkdown: string = `#### 🕒 Scheduled Maintenance ${scheduledMaintenance.scheduledMaintenanceNumber?.toString()} Created: 
+      let feedInfoInMarkdown: string = `#### 🕒 Scheduled Maintenance ${scheduledMaintenance.scheduledMaintenanceNumberWithPrefix || "#" + scheduledMaintenance.scheduledMaintenanceNumber?.toString()} Created:
             
 **${scheduledMaintenance.title || "No title provided."}**:
       
@@ -1641,11 +1621,15 @@ ${labels
   @CaptureSpan()
   public async getScheduledMaintenanceNumber(data: {
     scheduledMaintenanceId: ObjectID;
-  }): Promise<number | null> {
+  }): Promise<{
+    number: number | null;
+    numberWithPrefix: string | null;
+  }> {
     const scheduledMaintenance: Model | null = await this.findOneById({
       id: data.scheduledMaintenanceId,
       select: {
         scheduledMaintenanceNumber: true,
+        scheduledMaintenanceNumberWithPrefix: true,
       },
       props: {
         isRoot: true,
@@ -1656,9 +1640,13 @@ ${labels
       throw new BadDataException("ScheduledMaintenance not found.");
     }
 
-    return scheduledMaintenance.scheduledMaintenanceNumber
-      ? Number(scheduledMaintenance.scheduledMaintenanceNumber)
-      : null;
+    return {
+      number: scheduledMaintenance.scheduledMaintenanceNumber
+        ? Number(scheduledMaintenance.scheduledMaintenanceNumber)
+        : null,
+      numberWithPrefix:
+        scheduledMaintenance.scheduledMaintenanceNumberWithPrefix || null,
+    };
   }
 
   @CaptureSpan()

package/Server/Services/ScheduledMaintenanceStateTimelineService.ts

@@ -429,10 +429,12 @@ export class Service extends DatabaseService<ScheduledMaintenanceStateTimeline>
       stateEmoji = "🕒";
     }
 
-    const scheduledMaintenanceNumber: number | null =
-      await ScheduledMaintenanceService.getScheduledMaintenanceNumber({
-        scheduledMaintenanceId: createdItem.scheduledMaintenanceId,
-      });
+    const scheduledMaintenanceNumberResult: {
+      number: number | null;
+      numberWithPrefix: string | null;
+    } = await ScheduledMaintenanceService.getScheduledMaintenanceNumber({
+      scheduledMaintenanceId: createdItem.scheduledMaintenanceId,
+    });
 
     const projectId: ObjectID = createdItem.projectId!;
     const scheduledMaintenanceId: ObjectID =
@@ -446,7 +448,7 @@ export class Service extends DatabaseService<ScheduledMaintenanceStateTimeline>
       displayColor: scheduledMaintenanceState?.color,
       feedInfoInMarkdown:
         stateEmoji +
-        ` Changed **[Scheduled Maintenance ${scheduledMaintenanceNumber}](${(await ScheduledMaintenanceService.getScheduledMaintenanceLinkInDashboard(projectId!, scheduledMaintenanceId!)).toString()}) State** to **` +
+        ` Changed **[Scheduled Maintenance ${scheduledMaintenanceNumberResult.numberWithPrefix || "#" + scheduledMaintenanceNumberResult.number}](${(await ScheduledMaintenanceService.getScheduledMaintenanceLinkInDashboard(projectId!, scheduledMaintenanceId!)).toString()}) State** to **` +
         stateName +
         "**",
       userId: createdItem.createdByUserId || onCreate.createBy.props.userId,
@@ -573,7 +575,7 @@ export class Service extends DatabaseService<ScheduledMaintenanceStateTimeline>
         },
         sendMessageBeforeArchiving: {
           _type: "WorkspacePayloadMarkdown",
-          text: `**[Scheduled Event ${scheduledMaintenanceNumber}](${(
+          text: `**[Scheduled Event ${scheduledMaintenanceNumberResult.numberWithPrefix || "#" + scheduledMaintenanceNumberResult.number}](${(
             await ScheduledMaintenanceService.getScheduledMaintenanceLinkInDashboard(
               createdItem.projectId!,
               createdItem.scheduledMaintenanceId!,

package/Server/Services/UserNotificationRuleService.ts

@@ -257,6 +257,7 @@ export class Service extends DatabaseService<Model> {
           },
           rootCause: true,
           incidentNumber: true,
+          incidentNumberWithPrefix: true,
         },
       });
     }
@@ -286,6 +287,7 @@ export class Service extends DatabaseService<Model> {
             name: true,
           },
           alertNumber: true,
+          alertNumberWithPrefix: true,
         },
       });
     }
@@ -315,6 +317,7 @@ export class Service extends DatabaseService<Model> {
             name: true,
           },
           episodeNumber: true,
+          episodeNumberWithPrefix: true,
           rootCause: true,
         },
       });
@@ -347,6 +350,7 @@ export class Service extends DatabaseService<Model> {
             name: true,
           },
           episodeNumber: true,
+          episodeNumberWithPrefix: true,
           rootCause: true,
         },
       });
@@ -1244,6 +1248,9 @@ export class Service extends DatabaseService<Model> {
             ...(alertEpisode.episodeNumber !== undefined && {
               episodeNumber: alertEpisode.episodeNumber,
             }),
+            ...(alertEpisode.episodeNumberWithPrefix && {
+              episodeNumberWithPrefix: alertEpisode.episodeNumberWithPrefix,
+            }),
           });
 
         PushNotificationService.sendPushNotification(
@@ -1371,7 +1378,7 @@ export class Service extends DatabaseService<Model> {
 
     const incidentIdentifier: string =
       incident.incidentNumber !== undefined
-        ? `Incident number ${incident.incidentNumber}, ${incident.title || "Incident"}`
+        ? `Incident number ${incident.incidentNumberWithPrefix || incident.incidentNumber}, ${incident.title || "Incident"}`
         : incident.title || "Incident";
 
     const callRequest: CallRequest = {
@@ -1425,8 +1432,9 @@ export class Service extends DatabaseService<Model> {
 
     const httpProtocol: Protocol = await DatabaseConfig.getHttpProtocol();
 
-    const episodeIdentifier: string =
-      alertEpisode.episodeNumber !== undefined
+    const episodeIdentifier: string = alertEpisode.episodeNumberWithPrefix
+      ? `Alert episode ${alertEpisode.episodeNumberWithPrefix}, ${alertEpisode.title || "Alert Episode"}`
+      : alertEpisode.episodeNumber !== undefined
         ? `Alert episode number ${alertEpisode.episodeNumber}, ${alertEpisode.title || "Alert Episode"}`
         : alertEpisode.title || "Alert Episode";
 
@@ -1493,7 +1501,7 @@ export class Service extends DatabaseService<Model> {
 
     const alertIdentifier: string =
       alert.alertNumber !== undefined
-        ? `#${alert.alertNumber} (${alert.title || "Alert"})`
+        ? `${alert.alertNumberWithPrefix || "#" + alert.alertNumber} (${alert.title || "Alert"})`
         : alert.title || "Alert";
 
     const sms: SMS = {
@@ -1526,7 +1534,7 @@ export class Service extends DatabaseService<Model> {
 
     const incidentIdentifier: string =
       incident.incidentNumber !== undefined
-        ? `#${incident.incidentNumber} (${incident.title || "Incident"})`
+        ? `${incident.incidentNumberWithPrefix || "#" + incident.incidentNumber} (${incident.title || "Incident"})`
         : incident.title || "Incident";
 
     const sms: SMS = {
@@ -1557,8 +1565,9 @@ export class Service extends DatabaseService<Model> {
     );
     const url: URL = await ShortLinkService.getShortenedUrl(shortUrl);
 
-    const episodeIdentifier: string =
-      alertEpisode.episodeNumber !== undefined
+    const episodeIdentifier: string = alertEpisode.episodeNumberWithPrefix
+      ? `${alertEpisode.episodeNumberWithPrefix} (${alertEpisode.title || "Alert Episode"})`
+      : alertEpisode.episodeNumber !== undefined
         ? `#${alertEpisode.episodeNumber} (${alertEpisode.title || "Alert Episode"})`
         : alertEpisode.title || "Alert Episode";
 
@@ -1726,9 +1735,10 @@ export class Service extends DatabaseService<Model> {
       episode_title: alertEpisode.title || "",
       acknowledge_url: acknowledgeUrl.toString(),
       episode_number:
-        alertEpisode.episodeNumber !== undefined
+        alertEpisode.episodeNumberWithPrefix ||
+        (alertEpisode.episodeNumber !== undefined
           ? alertEpisode.episodeNumber.toString()
-          : "",
+          : ""),
       episode_link: episodeLinkOnDashboard,
     };
 
@@ -1752,9 +1762,9 @@ export class Service extends DatabaseService<Model> {
     const host: Hostname = await DatabaseConfig.getHost();
     const httpProtocol: Protocol = await DatabaseConfig.getHttpProtocol();
 
-    const alertNumber: string = alert.alertNumber
-      ? `#${alert.alertNumber}`
-      : "";
+    const alertNumber: string =
+      alert.alertNumberWithPrefix ||
+      (alert.alertNumber ? `#${alert.alertNumber}` : "");
 
     const vars: Dictionary<string> = {
       alertTitle: alert.title!,
@@ -1797,9 +1807,9 @@ export class Service extends DatabaseService<Model> {
     const host: Hostname = await DatabaseConfig.getHost();
     const httpProtocol: Protocol = await DatabaseConfig.getHttpProtocol();
 
-    const incidentNumber: string = incident.incidentNumber
-      ? `#${incident.incidentNumber}`
-      : "";
+    const incidentNumber: string =
+      incident.incidentNumberWithPrefix ||
+      (incident.incidentNumber ? `#${incident.incidentNumber}` : "");
 
     const vars: Dictionary<string> = {
       incidentTitle: incident.title!,
@@ -1883,6 +1893,7 @@ export class Service extends DatabaseService<Model> {
               _id: true,
               title: true,
               alertNumber: true,
+              alertNumberWithPrefix: true,
               monitor: {
                 _id: true,
                 name: true,
@@ -1915,9 +1926,9 @@ export class Service extends DatabaseService<Model> {
       const alertRows: string[] = [];
       for (const alert of alerts) {
         const alertTitle: string = alert.title || "Untitled Alert";
-        const alertNumber: string = alert.alertNumber
-          ? `#${alert.alertNumber}`
-          : "";
+        const alertNumber: string =
+          alert.alertNumberWithPrefix ||
+          (alert.alertNumber ? `#${alert.alertNumber}` : "");
         const alertLink: string = (
           await AlertService.getAlertLinkInDashboard(
             alertEpisode.projectId!,
@@ -1956,9 +1967,9 @@ export class Service extends DatabaseService<Model> {
       }
     }
 
-    const episodeNumber: string = alertEpisode.episodeNumber
-      ? `#${alertEpisode.episodeNumber}`
-      : "";
+    const episodeNumber: string =
+      alertEpisode.episodeNumberWithPrefix ||
+      (alertEpisode.episodeNumber ? `#${alertEpisode.episodeNumber}` : "");
 
     const vars: Dictionary<string> = {
       alertEpisodeTitle: alertEpisode.title!,

package/Server/Utils/AI/IncidentEpisodeAIContextBuilder.ts

@@ -48,6 +48,7 @@ export default class IncidentEpisodeAIContextBuilder {
           rootCause: true,
           projectId: true,
           episodeNumber: true,
+          episodeNumberWithPrefix: true,
           incidentSeverity: {
             name: true,
             color: true,
@@ -141,6 +142,7 @@ export default class IncidentEpisodeAIContextBuilder {
             title: true,
             description: true,
             incidentNumber: true,
+            incidentNumberWithPrefix: true,
             createdAt: true,
             rootCause: true,
             remediationNotes: true,
@@ -230,7 +232,7 @@ export default class IncidentEpisodeAIContextBuilder {
 
     // Basic episode information
     contextText += "# Incident Episode Information\n\n";
-    contextText += `**Episode Number:** #${episode.episodeNumber || "N/A"}\n\n`;
+    contextText += `**Episode Number:** ${episode.episodeNumberWithPrefix || "#" + (episode.episodeNumber || "N/A")}\n\n`;
     contextText += `**Title:** ${episode.title || "N/A"}\n\n`;
     contextText += `**Description:** ${episode.description || "N/A"}\n\n`;
     contextText += `**Severity:** ${episode.incidentSeverity?.name || "N/A"}\n\n`;
@@ -269,7 +271,7 @@ export default class IncidentEpisodeAIContextBuilder {
           continue;
         }
 
-        contextText += `## Incident #${incident.incidentNumber || "N/A"}: ${incident.title || "Untitled"}\n\n`;
+        contextText += `## Incident ${incident.incidentNumberWithPrefix || "#" + (incident.incidentNumber || "N/A")}: ${incident.title || "Untitled"}\n\n`;
         contextText += `- **Severity:** ${incident.incidentSeverity?.name || "N/A"}\n`;
         contextText += `- **State:** ${incident.currentIncidentState?.name || "N/A"}\n`;
         contextText += `- **Created:** ${incident.createdAt ? OneUptimeDate.getDateAsFormattedString(incident.createdAt) : "N/A"}\n`;