@oneuptime/common 9.5.3 → 9.5.4

package/Server/Services/IncidentEpisodeService.ts

@@ -34,11 +34,11 @@ import { LIMIT_PER_PROJECT } from "../../Types/Database/LimitMax";
 import NotificationRuleWorkspaceChannel from "../../Types/Workspace/NotificationRules/NotificationRuleWorkspaceChannel";
 import WorkspaceType from "../../Types/Workspace/WorkspaceType";
 import IncidentService from "./IncidentService";
-import Semaphore, { SemaphoreMutex } from "../Infrastructure/Semaphore";
 import OnCallDutyPolicyService from "./OnCallDutyPolicyService";
 import OnCallDutyPolicy from "../../Models/DatabaseModels/OnCallDutyPolicy";
 import UserNotificationEventType from "../../Types/UserNotification/UserNotificationEventType";
 import IncidentGroupingRuleService from "./IncidentGroupingRuleService";
+import ProjectService from "./ProjectService";
 import IncidentGroupingRule from "../../Models/DatabaseModels/IncidentGroupingRule";
 
 export class Service extends DatabaseService<Model> {
@@ -49,32 +49,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>,
@@ -88,108 +62,77 @@ export class Service extends DatabaseService<Model> {
     const projectId: ObjectID =
       createBy.props.tenantId || createBy.data.projectId!;
 
-    let mutex: SemaphoreMutex | null = null;
+    // Get the created state for episodes
+    const incidentState: IncidentState | null =
+      await IncidentStateService.findOneBy({
+        query: {
+          projectId: projectId,
+          isCreatedState: true,
+        },
+        select: {
+          _id: true,
+        },
+        props: {
+          isRoot: true,
+        },
+      });
 
-    try {
-      // Acquire mutex to prevent race conditions when generating episode numbers
-      try {
-        mutex = await Semaphore.lock({
-          key: projectId.toString(),
-          namespace: "IncidentEpisode.create",
-        });
-      } catch (err) {
-        logger.error(err);
-      }
+    if (!incidentState || !incidentState.id) {
+      throw new BadDataException(
+        "Created incident state not found for this project. Please add created incident state from settings.",
+      );
+    }
 
-      // Get the created state for episodes
-      const incidentState: IncidentState | null =
-        await IncidentStateService.findOneBy({
-          query: {
-            projectId: projectId,
-            isCreatedState: true,
-          },
+    createBy.data.currentIncidentStateId = incidentState.id;
+
+    // Auto-generate episode number
+    const episodeCounterResult: {
+      counter: number;
+      prefix: string | undefined;
+    } = await ProjectService.incrementAndGetIncidentEpisodeCounter(projectId);
+
+    createBy.data.episodeNumber = episodeCounterResult.counter;
+    createBy.data.episodeNumberWithPrefix = episodeCounterResult.prefix
+      ? `${episodeCounterResult.prefix}${episodeCounterResult.counter}`
+      : `#${episodeCounterResult.counter}`;
+
+    // Set initial lastIncidentAddedAt
+    if (!createBy.data.lastIncidentAddedAt) {
+      createBy.data.lastIncidentAddedAt = OneUptimeDate.getCurrentDate();
+    }
+
+    // Set declaredAt if not provided
+    if (!createBy.data.declaredAt) {
+      createBy.data.declaredAt = OneUptimeDate.getCurrentDate();
+    }
+
+    // Copy showEpisodeOnStatusPage from grouping rule if available
+    if (createBy.data.incidentGroupingRuleId) {
+      const groupingRule: IncidentGroupingRule | null =
+        await IncidentGroupingRuleService.findOneById({
+          id: createBy.data.incidentGroupingRuleId,
           select: {
-            _id: true,
+            showEpisodeOnStatusPage: true,
           },
           props: {
             isRoot: true,
           },
         });
 
-      if (!incidentState || !incidentState.id) {
-        throw new BadDataException(
-          "Created incident state not found for this project. Please add created incident state from settings.",
-        );
-      }
-
-      createBy.data.currentIncidentStateId = incidentState.id;
-
-      // Auto-generate episode number
-      const episodeNumberForThisEpisode: number =
-        (await this.getExistingEpisodeNumberForProject({
-          projectId: projectId,
-        })) + 1;
-
-      createBy.data.episodeNumber = episodeNumberForThisEpisode;
-
-      // Set initial lastIncidentAddedAt
-      if (!createBy.data.lastIncidentAddedAt) {
-        createBy.data.lastIncidentAddedAt = OneUptimeDate.getCurrentDate();
+      if (groupingRule) {
+        createBy.data.isVisibleOnStatusPage =
+          groupingRule.showEpisodeOnStatusPage ?? true;
       }
-
-      // Set declaredAt if not provided
-      if (!createBy.data.declaredAt) {
-        createBy.data.declaredAt = OneUptimeDate.getCurrentDate();
-      }
-
-      // Copy showEpisodeOnStatusPage from grouping rule if available
-      if (createBy.data.incidentGroupingRuleId) {
-        const groupingRule: IncidentGroupingRule | null =
-          await IncidentGroupingRuleService.findOneById({
-            id: createBy.data.incidentGroupingRuleId,
-            select: {
-              showEpisodeOnStatusPage: true,
-            },
-            props: {
-              isRoot: true,
-            },
-          });
-
-        if (groupingRule) {
-          createBy.data.isVisibleOnStatusPage =
-            groupingRule.showEpisodeOnStatusPage ?? true;
-        }
-      }
-
-      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;
     }
+
+    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");
     }
@@ -256,7 +199,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."}**
 
@@ -1047,13 +990,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,
@@ -1064,7 +1009,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,
+    };
   }
 }
 

package/Server/Services/IncidentEpisodeStateTimelineService.ts

@@ -358,13 +358,15 @@ export class Service extends DatabaseService<IncidentEpisodeStateTimeline> {
         id: createdItem.incidentEpisodeId,
         select: {
           episodeNumber: true,
+          episodeNumberWithPrefix: true,
         },
         props: {
           isRoot: true,
         },
       });
 
-    const episodeNumber: number = episode?.episodeNumber || 0;
+    const episodeDisplayNumber: string =
+      episode?.episodeNumberWithPrefix || "#" + (episode?.episodeNumber || 0);
 
     await IncidentEpisodeFeedService.createIncidentEpisodeFeedItem({
       incidentEpisodeId: createdItem.incidentEpisodeId!,
@@ -374,7 +376,7 @@ export class Service extends DatabaseService<IncidentEpisodeStateTimeline> {
       displayColor: incidentState?.color,
       feedInfoInMarkdown:
         stateEmoji +
-        ` Changed **Episode ${episodeNumber} State** to **` +
+        ` Changed **Episode ${episodeDisplayNumber} State** to **` +
         stateName +
         "**",
       moreInformationInMarkdown: createdItem.rootCause

package/Server/Services/IncidentInternalNoteService.ts

@@ -85,10 +85,15 @@ export class Service extends DatabaseService<Model> {
 
     const incidentId: ObjectID = createdItem.incidentId!;
 
-    const incidentNumber: number | null =
-      await IncidentService.getIncidentNumber({
-        incidentId: incidentId,
-      });
+    const incidentNumberResult: {
+      number: number | null;
+      numberWithPrefix: string | null;
+    } = await IncidentService.getIncidentNumber({
+      incidentId: incidentId,
+    });
+    const incidentNumberDisplay: string =
+      incidentNumberResult.numberWithPrefix ||
+      "#" + incidentNumberResult.number;
 
     const attachmentsMarkdown: string = await this.getAttachmentsMarkdown(
       createdItem.id!,
@@ -102,7 +107,7 @@ export class Service extends DatabaseService<Model> {
       displayColor: Blue500,
       userId: userId || undefined,
 
-      feedInfoInMarkdown: `📄 posted **private note** for this [Incident ${incidentNumber}](${(await IncidentService.getIncidentLinkInDashboard(createdItem.projectId!, incidentId)).toString()}):
+      feedInfoInMarkdown: `📄 posted **private note** for this [Incident ${incidentNumberDisplay}](${(await IncidentService.getIncidentLinkInDashboard(createdItem.projectId!, incidentId)).toString()}):
 
 ${(createdItem.note || "") + attachmentsMarkdown}
           `,

package/Server/Services/IncidentMemberService.ts

@@ -136,10 +136,15 @@ export class Service extends DatabaseService<Model> {
           }
         }
 
-        const incidentNumber: number | null =
-          await IncidentService.getIncidentNumber({
-            incidentId: incidentId,
-          });
+        const incidentNumberResult: {
+          number: number | null;
+          numberWithPrefix: string | null;
+        } = await IncidentService.getIncidentNumber({
+          incidentId: incidentId,
+        });
+        const incidentNumberDisplay: string =
+          incidentNumberResult.numberWithPrefix ||
+          "#" + incidentNumberResult.number;
 
         if (user && user.name) {
           await IncidentFeedService.createIncidentFeedItem({
@@ -147,7 +152,7 @@ export class Service extends DatabaseService<Model> {
             projectId: projectId,
             incidentFeedEventType: IncidentFeedEventType.IncidentMemberRemoved,
             displayColor: Red500,
-            feedInfoInMarkdown: `👤 Removed **${user.name.toString()}** (${user.email?.toString()}) as **${roleName}** from [Incident ${incidentNumber}](${(await IncidentService.getIncidentLinkInDashboard(projectId!, incidentId!)).toString()}).`,
+            feedInfoInMarkdown: `👤 Removed **${user.name.toString()}** (${user.email?.toString()}) as **${roleName}** from [Incident ${incidentNumberDisplay}](${(await IncidentService.getIncidentLinkInDashboard(projectId!, incidentId!)).toString()}).`,
             userId: deleteByUserId || undefined,
             workspaceNotification: {
               sendWorkspaceNotification: true,
@@ -192,10 +197,15 @@ export class Service extends DatabaseService<Model> {
         }
       }
 
-      const incidentNumber: number | null =
-        await IncidentService.getIncidentNumber({
-          incidentId: incidentId,
-        });
+      const incidentNumberResult: {
+        number: number | null;
+        numberWithPrefix: string | null;
+      } = await IncidentService.getIncidentNumber({
+        incidentId: incidentId,
+      });
+      const incidentNumberDisplay: string =
+        incidentNumberResult.numberWithPrefix ||
+        "#" + incidentNumberResult.number;
 
       if (userId) {
         await IncidentFeedService.createIncidentFeedItem({
@@ -208,7 +218,7 @@ export class Service extends DatabaseService<Model> {
               userId: userId,
               projectId: projectId,
             },
-          )}** as **${roleName}** to [Incident ${incidentNumber}](${(await IncidentService.getIncidentLinkInDashboard(projectId!, incidentId!)).toString()}).`,
+          )}** as **${roleName}** to [Incident ${incidentNumberDisplay}](${(await IncidentService.getIncidentLinkInDashboard(projectId!, incidentId!)).toString()}).`,
           userId: createdByUserId || undefined,
           workspaceNotification: {
             sendWorkspaceNotification: true,

package/Server/Services/IncidentOwnerTeamService.ts

@@ -72,10 +72,15 @@ export class Service extends DatabaseService<Model> {
           },
         });
 
-        const incidentNumber: number | null =
-          await IncidentService.getIncidentNumber({
-            incidentId: incidentId,
-          });
+        const incidentNumberResult: {
+          number: number | null;
+          numberWithPrefix: string | null;
+        } = await IncidentService.getIncidentNumber({
+          incidentId: incidentId,
+        });
+        const incidentNumberDisplay: string =
+          incidentNumberResult.numberWithPrefix ||
+          "#" + incidentNumberResult.number;
 
         if (team && team.name) {
           await IncidentFeedService.createIncidentFeedItem({
@@ -83,7 +88,7 @@ export class Service extends DatabaseService<Model> {
             projectId: projectId,
             incidentFeedEventType: IncidentFeedEventType.OwnerTeamRemoved,
             displayColor: Red500,
-            feedInfoInMarkdown: `👨🏻‍👩🏻‍👦🏻 Removed team **${team.name}** from the [Incident ${incidentNumber}](${(await IncidentService.getIncidentLinkInDashboard(projectId!, incidentId!)).toString()}) as the owner.`,
+            feedInfoInMarkdown: `👨🏻‍👩🏻‍👦🏻 Removed team **${team.name}** from the [Incident ${incidentNumberDisplay}](${(await IncidentService.getIncidentLinkInDashboard(projectId!, incidentId!)).toString()}) as the owner.`,
             userId: deleteByUserId || undefined,
             workspaceNotification: {
               sendWorkspaceNotification: true,
@@ -122,17 +127,22 @@ export class Service extends DatabaseService<Model> {
       });
 
       if (team && team.name) {
-        const incidentNumber: number | null =
-          await IncidentService.getIncidentNumber({
-            incidentId: incidentId,
-          });
+        const incidentNumberResult: {
+          number: number | null;
+          numberWithPrefix: string | null;
+        } = await IncidentService.getIncidentNumber({
+          incidentId: incidentId,
+        });
+        const incidentNumberDisplay: string =
+          incidentNumberResult.numberWithPrefix ||
+          "#" + incidentNumberResult.number;
 
         await IncidentFeedService.createIncidentFeedItem({
           incidentId: incidentId,
           projectId: projectId,
           incidentFeedEventType: IncidentFeedEventType.OwnerTeamAdded,
           displayColor: Gray500,
-          feedInfoInMarkdown: `👨🏻‍👩🏻‍👦🏻 Added team **${team.name}** to the [Incident ${incidentNumber}](${(await IncidentService.getIncidentLinkInDashboard(projectId!, incidentId!)).toString()}) as the owner.`,
+          feedInfoInMarkdown: `👨🏻‍👩🏻‍👦🏻 Added team **${team.name}** to the [Incident ${incidentNumberDisplay}](${(await IncidentService.getIncidentLinkInDashboard(projectId!, incidentId!)).toString()}) as the owner.`,
           userId: createdByUserId || undefined,
           workspaceNotification: {
             sendWorkspaceNotification: true,

package/Server/Services/IncidentOwnerUserService.ts

@@ -73,10 +73,15 @@ export class Service extends DatabaseService<Model> {
           },
         });
 
-        const incidentNumber: number | null =
-          await IncidentService.getIncidentNumber({
-            incidentId: incidentId,
-          });
+        const incidentNumberResult: {
+          number: number | null;
+          numberWithPrefix: string | null;
+        } = await IncidentService.getIncidentNumber({
+          incidentId: incidentId,
+        });
+        const incidentNumberDisplay: string =
+          incidentNumberResult.numberWithPrefix ||
+          "#" + incidentNumberResult.number;
 
         if (user && user.name) {
           await IncidentFeedService.createIncidentFeedItem({
@@ -84,7 +89,7 @@ export class Service extends DatabaseService<Model> {
             projectId: projectId,
             incidentFeedEventType: IncidentFeedEventType.OwnerUserRemoved,
             displayColor: Red500,
-            feedInfoInMarkdown: `👨🏻‍💻 Removed **${user.name.toString()}** (${user.email?.toString()}) from the [Incident ${incidentNumber}](${(await IncidentService.getIncidentLinkInDashboard(projectId!, incidentId!)).toString()}) as the owner.`,
+            feedInfoInMarkdown: `👨🏻‍💻 Removed **${user.name.toString()}** (${user.email?.toString()}) from the [Incident ${incidentNumberDisplay}](${(await IncidentService.getIncidentLinkInDashboard(projectId!, incidentId!)).toString()}) as the owner.`,
             userId: deleteByUserId || undefined,
             workspaceNotification: {
               sendWorkspaceNotification: true,
@@ -112,10 +117,15 @@ export class Service extends DatabaseService<Model> {
       createdItem.createdByUserId || onCreate.createBy.props.userId;
 
     if (incidentId && userId && projectId) {
-      const incidentNumber: number | null =
-        await IncidentService.getIncidentNumber({
-          incidentId: incidentId,
-        });
+      const incidentNumberResult: {
+        number: number | null;
+        numberWithPrefix: string | null;
+      } = await IncidentService.getIncidentNumber({
+        incidentId: incidentId,
+      });
+      const incidentNumberDisplay: string =
+        incidentNumberResult.numberWithPrefix ||
+        "#" + incidentNumberResult.number;
 
       if (userId) {
         await IncidentFeedService.createIncidentFeedItem({
@@ -128,7 +138,7 @@ export class Service extends DatabaseService<Model> {
               userId: userId,
               projectId: projectId,
             },
-          )}** to the [Incident ${incidentNumber}](${(await IncidentService.getIncidentLinkInDashboard(projectId!, incidentId!)).toString()}) as the owner.`,
+          )}** to the [Incident ${incidentNumberDisplay}](${(await IncidentService.getIncidentLinkInDashboard(projectId!, incidentId!)).toString()}) as the owner.`,
           userId: createdByUserId || undefined,
           workspaceNotification: {
             sendWorkspaceNotification: true,

package/Server/Services/IncidentPublicNoteService.ts

@@ -118,10 +118,15 @@ export class Service extends DatabaseService<Model> {
 
     const incidentId: ObjectID = createdItem.incidentId!;
     const projectId: ObjectID = createdItem.projectId!;
-    const incidentNumber: number | null =
-      await IncidentService.getIncidentNumber({
-        incidentId: incidentId,
-      });
+    const incidentNumberResult: {
+      number: number | null;
+      numberWithPrefix: string | null;
+    } = await IncidentService.getIncidentNumber({
+      incidentId: incidentId,
+    });
+    const incidentNumberDisplay: string =
+      incidentNumberResult.numberWithPrefix ||
+      "#" + incidentNumberResult.number;
 
     const attachmentsMarkdown: string = await this.getAttachmentsMarkdown(
       createdItem.id!,
@@ -134,7 +139,7 @@ export class Service extends DatabaseService<Model> {
       incidentFeedEventType: IncidentFeedEventType.PublicNote,
       displayColor: Indigo500,
       userId: userId || undefined,
-      feedInfoInMarkdown: `📄 posted **public note** for this [Incident ${incidentNumber}](${(await IncidentService.getIncidentLinkInDashboard(projectId!, incidentId!)).toString()}) on status page:
+      feedInfoInMarkdown: `📄 posted **public note** for this [Incident ${incidentNumberDisplay}](${(await IncidentService.getIncidentLinkInDashboard(projectId!, incidentId!)).toString()}) on status page:
 
 ${(createdItem.note || "") + attachmentsMarkdown}
           `,