@oneuptime/common 9.5.2 → 9.5.4

package/Server/Services/IncidentService.ts

@@ -44,9 +44,6 @@ import Metric, {
 import OneUptimeDate from "../../Types/Date";
 import TelemetryUtil from "../Utils/Telemetry/Telemetry";
 import logger from "../Utils/Logger";
-import Semaphore, {
-  SemaphoreMutex,
-} from "../../Server/Infrastructure/Semaphore";
 import IncidentFeedService from "./IncidentFeedService";
 import IncidentSlaService from "./IncidentSlaService";
 import { IncidentFeedEventType } from "../../Models/DatabaseModels/IncidentFeed";
@@ -65,6 +62,7 @@ import MetricType from "../../Models/DatabaseModels/MetricType";
 import UpdateBy from "../Types/Database/UpdateBy";
 import OnCallDutyPolicy from "../../Models/DatabaseModels/OnCallDutyPolicy";
 import Dictionary from "../../Types/Dictionary";
+import ProjectService from "./ProjectService";
 import IncidentTemplateService from "./IncidentTemplateService";
 import IncidentTemplate from "../../Models/DatabaseModels/IncidentTemplate";
 import LLMService, {
@@ -333,35 +331,6 @@ export class Service extends DatabaseService<Model> {
     return incident;
   }
 
-  @CaptureSpan()
-  public async getExistingIncidentNumberForProject(data: {
-    projectId: ObjectID;
-  }): Promise<number> {
-    // get last incident number.
-    const lastIncident: Model | null = await this.findOneBy({
-      query: {
-        projectId: data.projectId,
-      },
-      select: {
-        incidentNumber: true,
-      },
-      sort: {
-        createdAt: SortOrder.Descending,
-      },
-      props: {
-        isRoot: true,
-      },
-    });
-
-    if (!lastIncident) {
-      return 0;
-    }
-
-    return lastIncident.incidentNumber
-      ? Number(lastIncident.incidentNumber)
-      : 0;
-  }
-
   protected override async onBeforeUpdate(
     updateBy: UpdateBy<Model>,
   ): Promise<OnUpdate<Model>> {
@@ -593,39 +562,16 @@ export class Service extends DatabaseService<Model> {
       initialIncidentStateId = incidentState.id;
     }
 
-    let mutex: SemaphoreMutex | null = null;
-
-    try {
-      mutex = await Semaphore.lock({
-        key: projectId.toString(),
-        namespace: "IncidentService.incident-create",
-        lockTimeout: 15000,
-        acquireTimeout: 20000,
-      });
-
-      logger.debug(
-        "Mutex acquired - IncidentService.incident-create " +
-          projectId.toString() +
-          " at " +
-          OneUptimeDate.getCurrentDateAsFormattedString(),
-      );
-    } catch (err) {
-      logger.debug(
-        "Mutex acquire failed - IncidentService.incident-create " +
-          projectId.toString() +
-          " at " +
-          OneUptimeDate.getCurrentDateAsFormattedString(),
-      );
-      logger.error(err);
-    }
-
-    const incidentNumberForThisIncident: number =
-      (await this.getExistingIncidentNumberForProject({
-        projectId: projectId,
-      })) + 1;
+    const incidentCounterResult: {
+      counter: number;
+      prefix: string | undefined;
+    } = await ProjectService.incrementAndGetIncidentCounter(projectId);
 
     createBy.data.currentIncidentStateId = initialIncidentStateId;
-    createBy.data.incidentNumber = incidentNumberForThisIncident;
+    createBy.data.incidentNumber = incidentCounterResult.counter;
+    createBy.data.incidentNumberWithPrefix = incidentCounterResult.prefix
+      ? `${incidentCounterResult.prefix}${incidentCounterResult.counter}`
+      : `#${incidentCounterResult.counter}`;
 
     if (
       (createBy.data.createdByUserId ||
@@ -672,9 +618,7 @@ export class Service extends DatabaseService<Model> {
 
     return {
       createBy,
-      carryForward: {
-        mutex: mutex,
-      },
+      carryForward: null,
     };
   }
 
@@ -698,6 +642,7 @@ export class Service extends DatabaseService<Model> {
       select: {
         projectId: true,
         incidentNumber: true,
+        incidentNumberWithPrefix: true,
         title: true,
         description: true,
         incidentSeverity: {
@@ -731,9 +676,6 @@ export class Service extends DatabaseService<Model> {
       throw new BadDataException("Incident not found");
     }
 
-    // Release mutex immediately
-    this.releaseMutexAsync(onCreate, createdItem.projectId!);
-
     // Execute operations sequentially with error handling
     Promise.resolve()
       .then(async () => {
@@ -928,7 +870,11 @@ export class Service extends DatabaseService<Model> {
       const createdByUserId: ObjectID | undefined | null =
         incident.createdByUserId || incident.createdByUser?.id;
 
-      let feedInfoInMarkdown: string = `#### 🚨 Incident ${incident.incidentNumber?.toString()} Created: 
+      const incidentNumberDisplay: string =
+        incident.incidentNumberWithPrefix ||
+        "#" + incident.incidentNumber?.toString();
+
+      let feedInfoInMarkdown: string = `#### 🚨 Incident ${incidentNumberDisplay} Created:
         
 **${incident.title || "No title provided."}**:
 
@@ -1082,8 +1028,9 @@ ${incident.remediationNotes || "No remediation notes provided."}
           createdItem.changeMonitorStatusToId,
           true, // notifyMonitorOwners
           createdItem.rootCause ||
-            "Status was changed because Incident #" +
-              createdItem.incidentNumber?.toString() +
+            "Status was changed because Incident " +
+              (createdItem.incidentNumberWithPrefix ||
+                "#" + createdItem.incidentNumber?.toString()) +
               " was created.",
           createdItem.createdStateLog,
           onCreate.createBy.props,
@@ -1095,37 +1042,6 @@ ${incident.remediationNotes || "No remediation notes provided."}
     }
   }
 
-  @CaptureSpan()
-  private releaseMutexAsync(
-    onCreate: OnCreate<Model>,
-    projectId: ObjectID,
-  ): void {
-    // Release mutex in background without blocking
-    if (onCreate.carryForward && onCreate.carryForward.mutex) {
-      const mutex: SemaphoreMutex = onCreate.carryForward.mutex;
-
-      setImmediate(async () => {
-        try {
-          await Semaphore.release(mutex);
-          logger.debug(
-            "Mutex released - IncidentService.incident-create " +
-              projectId.toString() +
-              " at " +
-              OneUptimeDate.getCurrentDateAsFormattedString(),
-          );
-        } catch (err) {
-          logger.debug(
-            "Mutex release failed - IncidentService.incident-create " +
-              projectId.toString() +
-              " at " +
-              OneUptimeDate.getCurrentDateAsFormattedString(),
-          );
-          logger.error(err);
-        }
-      });
-    }
-  }
-
   @CaptureSpan()
   public async disableActiveMonitoringIfManualIncident(
     incidentId: ObjectID,
@@ -1351,6 +1267,7 @@ ${incident.remediationNotes || "No remediation notes provided."}
           select: {
             projectId: true,
             incidentNumber: true,
+            incidentNumberWithPrefix: true,
           },
           props: {
             isRoot: true,
@@ -1359,7 +1276,9 @@ ${incident.remediationNotes || "No remediation notes provided."}
 
         const projectId: ObjectID = incident!.projectId!;
         const incidentNumber: number = incident!.incidentNumber!;
-        const incidentLabel: string = `Incident ${incidentNumber}`;
+        const incidentNumberDisplay: string =
+          incident!.incidentNumberWithPrefix || "#" + incidentNumber;
+        const incidentLabel: string = `Incident ${incidentNumberDisplay}`;
         const incidentLink: URL = await this.getIncidentLinkInDashboard(
           projectId,
           incidentId,
@@ -1700,8 +1619,8 @@ ${incidentSeverity.name}
                 }),
                 changeNewMonitorStatusTo,
                 true, // notifyMonitorOwners
-                "Status was changed because Incident #" +
-                  incidentNumber?.toString() +
+                "Status was changed because Incident " +
+                  incidentNumberDisplay +
                   " was updated.",
                 undefined,
                 onUpdate.updateBy.props,
@@ -2369,13 +2288,15 @@ ${incidentSeverity.name}
   }
 
   @CaptureSpan()
-  public async getIncidentNumber(data: {
-    incidentId: ObjectID;
-  }): Promise<number | null> {
+  public async getIncidentNumber(data: { incidentId: ObjectID }): Promise<{
+    number: number | null;
+    numberWithPrefix: string | null;
+  }> {
     const incident: Model | null = await this.findOneById({
       id: data.incidentId,
       select: {
         incidentNumber: true,
+        incidentNumberWithPrefix: true,
       },
       props: {
         isRoot: true,
@@ -2386,7 +2307,10 @@ ${incidentSeverity.name}
       throw new BadDataException("Incident not found.");
     }
 
-    return incident.incidentNumber ? Number(incident.incidentNumber) : null;
+    return {
+      number: incident.incidentNumber ? Number(incident.incidentNumber) : null,
+      numberWithPrefix: incident.incidentNumberWithPrefix || null,
+    };
   }
 
   /**

package/Server/Services/IncidentStateTimelineService.ts

@@ -426,10 +426,15 @@ export class Service extends DatabaseService<IncidentStateTimeline> {
       stateEmoji = "🔴";
     }
 
-    const incidentNumber: number | null =
-      await IncidentService.getIncidentNumber({
-        incidentId: createdItem.incidentId,
-      });
+    const incidentNumberResult: {
+      number: number | null;
+      numberWithPrefix: string | null;
+    } = await IncidentService.getIncidentNumber({
+      incidentId: createdItem.incidentId,
+    });
+    const incidentNumberDisplay: string =
+      incidentNumberResult.numberWithPrefix ||
+      "#" + incidentNumberResult.number;
 
     const projectId: ObjectID = createdItem.projectId!;
     const incidentId: ObjectID = createdItem.incidentId!;
@@ -441,7 +446,7 @@ export class Service extends DatabaseService<IncidentStateTimeline> {
       displayColor: incidentState?.color,
       feedInfoInMarkdown:
         stateEmoji +
-        ` Changed **[Incident ${incidentNumber}](${(await IncidentService.getIncidentLinkInDashboard(projectId!, incidentId!)).toString()}) State** to **` +
+        ` Changed **[Incident ${incidentNumberDisplay}](${(await IncidentService.getIncidentLinkInDashboard(projectId!, incidentId!)).toString()}) State** to **` +
         stateName +
         "**",
       moreInformationInMarkdown: `**Cause:**
@@ -549,7 +554,7 @@ ${createdItem.rootCause}`,
         },
         sendMessageBeforeArchiving: {
           _type: "WorkspacePayloadMarkdown",
-          text: `**[Incident ${incidentNumber}](${(
+          text: `**[Incident ${incidentNumberDisplay}](${(
             await IncidentService.getIncidentLinkInDashboard(
               createdItem.projectId!,
               createdItem.incidentId!,

package/Server/Services/Index.ts

@@ -181,6 +181,7 @@ import IncidentEpisodeRoleMemberService from "./IncidentEpisodeRoleMemberService
 import IncidentEpisodeOwnerTeamService from "./IncidentEpisodeOwnerTeamService";
 import IncidentEpisodeOwnerUserService from "./IncidentEpisodeOwnerUserService";
 import IncidentEpisodeStateTimelineService from "./IncidentEpisodeStateTimelineService";
+import IncidentEpisodePublicNoteService from "./IncidentEpisodePublicNoteService";
 import AlertGroupingRuleService from "./AlertGroupingRuleService";
 import IncidentSlaRuleService from "./IncidentSlaRuleService";
 import IncidentSlaService from "./IncidentSlaService";
@@ -400,6 +401,7 @@ const services: Array<BaseService> = [
   IncidentEpisodeOwnerTeamService,
   IncidentEpisodeOwnerUserService,
   IncidentEpisodeStateTimelineService,
+  IncidentEpisodePublicNoteService,
   AlertGroupingRuleService,
   IncidentSlaRuleService,
   IncidentSlaService,

package/Server/Services/OnCallDutyPolicyExecutionLogService.ts

@@ -87,34 +87,46 @@ export class Service extends DatabaseService<Model> {
           const projectId: ObjectID | undefined = createdItem.projectId;
           const incidentId: ObjectID | undefined =
             createdItem.triggeredByIncidentId;
-          const incidentNumber: number | null =
-            await IncidentService.getIncidentNumber({
-              incidentId: incidentId,
-            });
-          incidentOrAlertLink = `[Incident ${incidentNumber}](${(await IncidentService.getIncidentLinkInDashboard(projectId!, incidentId!)).toString()})`;
+          const incidentNumberResult: {
+            number: number | null;
+            numberWithPrefix: string | null;
+          } = await IncidentService.getIncidentNumber({
+            incidentId: incidentId,
+          });
+          const incidentNumberDisplay: string =
+            incidentNumberResult.numberWithPrefix ||
+            "#" + incidentNumberResult.number;
+          incidentOrAlertLink = `[Incident ${incidentNumberDisplay}](${(await IncidentService.getIncidentLinkInDashboard(projectId!, incidentId!)).toString()})`;
         }
 
         if (createdItem.triggeredByAlertId) {
-          const alertNumber: number | null = await AlertService.getAlertNumber({
+          const alertNumberResult: {
+            number: number | null;
+            numberWithPrefix: string | null;
+          } = await AlertService.getAlertNumber({
             alertId: createdItem.triggeredByAlertId,
           });
-          incidentOrAlertLink = `[Alert ${alertNumber}](${(await AlertService.getAlertLinkInDashboard(createdItem.projectId!, createdItem.triggeredByAlertId)).toString()})`;
+          incidentOrAlertLink = `[Alert ${alertNumberResult.numberWithPrefix || "#" + alertNumberResult.number}](${(await AlertService.getAlertLinkInDashboard(createdItem.projectId!, createdItem.triggeredByAlertId)).toString()})`;
         }
 
         if (createdItem.triggeredByAlertEpisodeId) {
-          const episodeNumber: number | null =
-            await AlertEpisodeService.getEpisodeNumber({
-              episodeId: createdItem.triggeredByAlertEpisodeId,
-            });
-          incidentOrAlertLink = `[Alert Episode ${episodeNumber}](${(await AlertEpisodeService.getEpisodeLinkInDashboard(createdItem.projectId!, createdItem.triggeredByAlertEpisodeId)).toString()})`;
+          const alertEpisodeNumberResult: {
+            number: number | null;
+            numberWithPrefix: string | null;
+          } = await AlertEpisodeService.getEpisodeNumber({
+            episodeId: createdItem.triggeredByAlertEpisodeId,
+          });
+          incidentOrAlertLink = `[Alert Episode ${alertEpisodeNumberResult.numberWithPrefix || "#" + alertEpisodeNumberResult.number}](${(await AlertEpisodeService.getEpisodeLinkInDashboard(createdItem.projectId!, createdItem.triggeredByAlertEpisodeId)).toString()})`;
         }
 
         if (createdItem.triggeredByIncidentEpisodeId) {
-          const episodeNumber: number | null =
-            await IncidentEpisodeService.getEpisodeNumber({
-              episodeId: createdItem.triggeredByIncidentEpisodeId,
-            });
-          incidentOrAlertLink = `[Incident Episode ${episodeNumber}](${(await IncidentEpisodeService.getEpisodeLinkInDashboard(createdItem.projectId!, createdItem.triggeredByIncidentEpisodeId)).toString()})`;
+          const incidentEpisodeNumberResult: {
+            number: number | null;
+            numberWithPrefix: string | null;
+          } = await IncidentEpisodeService.getEpisodeNumber({
+            episodeId: createdItem.triggeredByIncidentEpisodeId,
+          });
+          incidentOrAlertLink = `[Incident Episode ${incidentEpisodeNumberResult.numberWithPrefix || "#" + incidentEpisodeNumberResult.number}](${(await IncidentEpisodeService.getEpisodeLinkInDashboard(createdItem.projectId!, createdItem.triggeredByIncidentEpisodeId)).toString()})`;
         }
 
         const feedInfoInMarkdown: string = `**📞 On Call Policy Started Executing:** On Call Policy **${onCallPolicy.name}** started executing for ${incidentOrAlertLink}. Users on call on this policy will now be notified.`;
@@ -366,37 +378,47 @@ export class Service extends DatabaseService<Model> {
               onCalldutyPolicyExecutionLog.projectId;
             const incidentId: ObjectID | undefined =
               onCalldutyPolicyExecutionLog.triggeredByIncidentId;
-            const incidentNumber: number | null =
-              await IncidentService.getIncidentNumber({
-                incidentId: incidentId,
-              });
-            incidentOrAlertLink = `[Incident ${incidentNumber}](${(await IncidentService.getIncidentLinkInDashboard(projectId!, incidentId!)).toString()})`;
+            const incidentNumberResult: {
+              number: number | null;
+              numberWithPrefix: string | null;
+            } = await IncidentService.getIncidentNumber({
+              incidentId: incidentId,
+            });
+            const incidentNumberDisplay: string =
+              incidentNumberResult.numberWithPrefix ||
+              "#" + incidentNumberResult.number;
+            incidentOrAlertLink = `[Incident ${incidentNumberDisplay}](${(await IncidentService.getIncidentLinkInDashboard(projectId!, incidentId!)).toString()})`;
           }
 
           if (onCalldutyPolicyExecutionLog.triggeredByAlertId) {
-            const alertNumber: number | null =
-              await AlertService.getAlertNumber({
-                alertId: onCalldutyPolicyExecutionLog.triggeredByAlertId,
-              });
-            incidentOrAlertLink = `[Alert ${alertNumber}](${(await AlertService.getAlertLinkInDashboard(onCalldutyPolicyExecutionLog.projectId!, onCalldutyPolicyExecutionLog.triggeredByAlertId)).toString()})`;
+            const alertNumberResult: {
+              number: number | null;
+              numberWithPrefix: string | null;
+            } = await AlertService.getAlertNumber({
+              alertId: onCalldutyPolicyExecutionLog.triggeredByAlertId,
+            });
+            incidentOrAlertLink = `[Alert ${alertNumberResult.numberWithPrefix || "#" + alertNumberResult.number}](${(await AlertService.getAlertLinkInDashboard(onCalldutyPolicyExecutionLog.projectId!, onCalldutyPolicyExecutionLog.triggeredByAlertId)).toString()})`;
           }
 
           if (onCalldutyPolicyExecutionLog.triggeredByAlertEpisodeId) {
-            const episodeNumber: number | null =
-              await AlertEpisodeService.getEpisodeNumber({
-                episodeId:
-                  onCalldutyPolicyExecutionLog.triggeredByAlertEpisodeId,
-              });
-            incidentOrAlertLink = `[Alert Episode ${episodeNumber}](${(await AlertEpisodeService.getEpisodeLinkInDashboard(onCalldutyPolicyExecutionLog.projectId!, onCalldutyPolicyExecutionLog.triggeredByAlertEpisodeId)).toString()})`;
+            const alertEpisodeNumberResult: {
+              number: number | null;
+              numberWithPrefix: string | null;
+            } = await AlertEpisodeService.getEpisodeNumber({
+              episodeId: onCalldutyPolicyExecutionLog.triggeredByAlertEpisodeId,
+            });
+            incidentOrAlertLink = `[Alert Episode ${alertEpisodeNumberResult.numberWithPrefix || "#" + alertEpisodeNumberResult.number}](${(await AlertEpisodeService.getEpisodeLinkInDashboard(onCalldutyPolicyExecutionLog.projectId!, onCalldutyPolicyExecutionLog.triggeredByAlertEpisodeId)).toString()})`;
           }
 
           if (onCalldutyPolicyExecutionLog.triggeredByIncidentEpisodeId) {
-            const episodeNumber: number | null =
-              await IncidentEpisodeService.getEpisodeNumber({
-                episodeId:
-                  onCalldutyPolicyExecutionLog.triggeredByIncidentEpisodeId,
-              });
-            incidentOrAlertLink = `[Incident Episode ${episodeNumber}](${(await IncidentEpisodeService.getEpisodeLinkInDashboard(onCalldutyPolicyExecutionLog.projectId!, onCalldutyPolicyExecutionLog.triggeredByIncidentEpisodeId)).toString()})`;
+            const incidentEpisodeNumberResult: {
+              number: number | null;
+              numberWithPrefix: string | null;
+            } = await IncidentEpisodeService.getEpisodeNumber({
+              episodeId:
+                onCalldutyPolicyExecutionLog.triggeredByIncidentEpisodeId,
+            });
+            incidentOrAlertLink = `[Incident Episode ${incidentEpisodeNumberResult.numberWithPrefix || "#" + incidentEpisodeNumberResult.number}](${(await IncidentEpisodeService.getEpisodeLinkInDashboard(onCalldutyPolicyExecutionLog.projectId!, onCalldutyPolicyExecutionLog.triggeredByIncidentEpisodeId)).toString()})`;
           }
 
           const feedInfoInMarkdown: string = `**${this.getEmojiByStatus(onCalldutyPolicyExecutionLog.status)} On Call Policy Status Updated for ${incidentOrAlertLink}:**

package/Server/Services/OnCallDutyPolicyExecutionLogTimelineService.ts

@@ -167,36 +167,48 @@ export class Service extends DatabaseService<Model> {
             onCallDutyPolicyExecutionLogTimeline.projectId;
           const incidentId: ObjectID | undefined =
             onCallDutyPolicyExecutionLogTimeline.triggeredByIncidentId;
-          const incidentNumber: number | null =
-            await IncidentService.getIncidentNumber({
-              incidentId: incidentId,
-            });
-          incidentOrAlertLink = `[Incident ${incidentNumber}](${(await IncidentService.getIncidentLinkInDashboard(projectId!, incidentId!)).toString()})`;
+          const incidentNumberResult: {
+            number: number | null;
+            numberWithPrefix: string | null;
+          } = await IncidentService.getIncidentNumber({
+            incidentId: incidentId,
+          });
+          const incidentNumberDisplay: string =
+            incidentNumberResult.numberWithPrefix ||
+            "#" + incidentNumberResult.number;
+          incidentOrAlertLink = `[Incident ${incidentNumberDisplay}](${(await IncidentService.getIncidentLinkInDashboard(projectId!, incidentId!)).toString()})`;
         }
 
         if (onCallDutyPolicyExecutionLogTimeline.triggeredByAlertId) {
-          const alertNumber: number | null = await AlertService.getAlertNumber({
+          const alertNumberResult: {
+            number: number | null;
+            numberWithPrefix: string | null;
+          } = await AlertService.getAlertNumber({
             alertId: onCallDutyPolicyExecutionLogTimeline.triggeredByAlertId,
           });
-          incidentOrAlertLink = `[Alert ${alertNumber}](${(await AlertService.getAlertLinkInDashboard(onCallDutyPolicyExecutionLogTimeline.projectId!, onCallDutyPolicyExecutionLogTimeline.triggeredByAlertId)).toString()})`;
+          incidentOrAlertLink = `[Alert ${alertNumberResult.numberWithPrefix || "#" + alertNumberResult.number}](${(await AlertService.getAlertLinkInDashboard(onCallDutyPolicyExecutionLogTimeline.projectId!, onCallDutyPolicyExecutionLogTimeline.triggeredByAlertId)).toString()})`;
         }
 
         if (onCallDutyPolicyExecutionLogTimeline.triggeredByAlertEpisodeId) {
-          const episodeNumber: number | null =
-            await AlertEpisodeService.getEpisodeNumber({
-              episodeId:
-                onCallDutyPolicyExecutionLogTimeline.triggeredByAlertEpisodeId,
-            });
-          incidentOrAlertLink = `[Alert Episode ${episodeNumber}](${(await AlertEpisodeService.getEpisodeLinkInDashboard(onCallDutyPolicyExecutionLogTimeline.projectId!, onCallDutyPolicyExecutionLogTimeline.triggeredByAlertEpisodeId)).toString()})`;
+          const alertEpisodeNumberResult: {
+            number: number | null;
+            numberWithPrefix: string | null;
+          } = await AlertEpisodeService.getEpisodeNumber({
+            episodeId:
+              onCallDutyPolicyExecutionLogTimeline.triggeredByAlertEpisodeId,
+          });
+          incidentOrAlertLink = `[Alert Episode ${alertEpisodeNumberResult.numberWithPrefix || "#" + alertEpisodeNumberResult.number}](${(await AlertEpisodeService.getEpisodeLinkInDashboard(onCallDutyPolicyExecutionLogTimeline.projectId!, onCallDutyPolicyExecutionLogTimeline.triggeredByAlertEpisodeId)).toString()})`;
         }
 
         if (onCallDutyPolicyExecutionLogTimeline.triggeredByIncidentEpisodeId) {
-          const episodeNumber: number | null =
-            await IncidentEpisodeService.getEpisodeNumber({
-              episodeId:
-                onCallDutyPolicyExecutionLogTimeline.triggeredByIncidentEpisodeId,
-            });
-          incidentOrAlertLink = `[Incident Episode ${episodeNumber}](${(await IncidentEpisodeService.getEpisodeLinkInDashboard(onCallDutyPolicyExecutionLogTimeline.projectId!, onCallDutyPolicyExecutionLogTimeline.triggeredByIncidentEpisodeId)).toString()})`;
+          const incidentEpisodeNumberResult: {
+            number: number | null;
+            numberWithPrefix: string | null;
+          } = await IncidentEpisodeService.getEpisodeNumber({
+            episodeId:
+              onCallDutyPolicyExecutionLogTimeline.triggeredByIncidentEpisodeId,
+          });
+          incidentOrAlertLink = `[Incident Episode ${incidentEpisodeNumberResult.numberWithPrefix || "#" + incidentEpisodeNumberResult.number}](${(await IncidentEpisodeService.getEpisodeLinkInDashboard(onCallDutyPolicyExecutionLogTimeline.projectId!, onCallDutyPolicyExecutionLogTimeline.triggeredByIncidentEpisodeId)).toString()})`;
         }
 
         let feedInfoInMarkdown: string = `**${this.getEmojiBasedOnStatus(status)} ${incidentOrAlertLink} On-Call Alert ${status} to ${await UserService.getUserMarkdownString(