@oneuptime/common 7.0.3526 → 7.0.3538

package/Server/Services/OnCallDutyPolicyExecutionLogService.ts

@@ -14,6 +14,9 @@ import OnCallDutyPolicy from "../../Models/DatabaseModels/OnCallDutyPolicy";
 import OnCallDutyPolicyService from "./OnCallDutyPolicyService";
 import ObjectID from "../../Types/ObjectID";
 import Color from "../../Types/Color";
+import AlertFeedService from "./AlertFeedService";
+import { AlertFeedEventType } from "../../Models/DatabaseModels/AlertFeed";
+import BadDataException from "../../Types/Exception/BadDataException";
 
 export class Service extends DatabaseService<Model> {
   public constructor() {
@@ -39,7 +42,7 @@ export class Service extends DatabaseService<Model> {
     _onCreate: OnCreate<Model>,
     createdItem: Model,
   ): Promise<Model> {
-    if (createdItem.triggeredByIncidentId) {
+    if (createdItem.triggeredByIncidentId || createdItem.triggeredByAlertId) {
       const onCallPolicy: OnCallDutyPolicy | null =
         await OnCallDutyPolicyService.findOneById({
           id: createdItem.onCallDutyPolicyId!,
@@ -54,13 +57,31 @@ export class Service extends DatabaseService<Model> {
         });
 
       if (onCallPolicy && onCallPolicy.id) {
-        await IncidentFeedService.createIncidentFeed({
-          incidentId: createdItem.triggeredByIncidentId,
-          projectId: createdItem.projectId!,
-          incidentFeedEventType: IncidentFeedEventType.OnCallPolicy,
-          displayColor: Yellow500,
-          feedInfoInMarkdown: `**On Call Policy Started Executing:** On Call Policy **${onCallPolicy.name}** started executing. Users on call on this policy will now be notified.`,
-        });
+        const feedInfoInMarkdown: string = `**On Call Policy Started Executing:** On Call Policy **${onCallPolicy.name}** started executing. Users on call on this policy will now be notified.`;
+
+        if (
+          onCallPolicy &&
+          onCallPolicy.id &&
+          createdItem.triggeredByIncidentId
+        ) {
+          await IncidentFeedService.createIncidentFeed({
+            incidentId: createdItem.triggeredByIncidentId,
+            projectId: createdItem.projectId!,
+            incidentFeedEventType: IncidentFeedEventType.OnCallPolicy,
+            displayColor: Yellow500,
+            feedInfoInMarkdown: feedInfoInMarkdown,
+          });
+        }
+
+        if (onCallPolicy && onCallPolicy.id && createdItem.triggeredByAlertId) {
+          await AlertFeedService.createAlertFeed({
+            alertId: createdItem.triggeredByAlertId,
+            projectId: createdItem.projectId!,
+            alertFeedEventType: AlertFeedEventType.OnCallPolicy,
+            displayColor: Yellow500,
+            feedInfoInMarkdown: feedInfoInMarkdown,
+          });
+        }
       }
     }
 
@@ -92,12 +113,27 @@ export class Service extends DatabaseService<Model> {
         },
       });
 
+      let userNotificationEventType: UserNotificationEventType | null = null;
+
+      if (createdItem.triggeredByIncidentId) {
+        userNotificationEventType = UserNotificationEventType.IncidentCreated;
+      }
+
+      if (createdItem.triggeredByAlertId) {
+        userNotificationEventType = UserNotificationEventType.AlertCreated;
+      }
+
+      if (!userNotificationEventType) {
+        throw new BadDataException("Invalid userNotificationEventType");
+      }
+
       await OnCallDutyPolicyEscalationRuleService.startRuleExecution(
         executionRule.id!,
         {
           projectId: createdItem.projectId!,
           triggeredByIncidentId: createdItem.triggeredByIncidentId,
-          userNotificationEventType: UserNotificationEventType.IncidentCreated,
+          triggeredByAlertId: createdItem.triggeredByAlertId,
+          userNotificationEventType: userNotificationEventType,
           onCallPolicyExecutionLogId: createdItem.id!,
           onCallPolicyId: createdItem.onCallDutyPolicyId!,
         },
@@ -107,7 +143,7 @@ export class Service extends DatabaseService<Model> {
         id: createdItem.id!,
         data: {
           status: OnCallDutyPolicyStatus.Executing,
-          statusMessage: "First escalation rule executed....",
+          statusMessage: "First escalation rule executed...",
         },
         props: {
           isRoot: true,
@@ -165,6 +201,7 @@ export class Service extends DatabaseService<Model> {
             status: true,
             statusMessage: true,
             triggeredByIncidentId: true,
+            triggeredByAlertId: true,
           },
           props: {
             isRoot: true,
@@ -174,7 +211,8 @@ export class Service extends DatabaseService<Model> {
 
       if (
         onCalldutyPolicyExecutionLog &&
-        onCalldutyPolicyExecutionLog.triggeredByIncidentId
+        (onCalldutyPolicyExecutionLog.triggeredByIncidentId ||
+          onCalldutyPolicyExecutionLog.triggeredByAlertId)
       ) {
         const onCallPolicy: OnCallDutyPolicy | null =
           await OnCallDutyPolicyService.findOneById({
@@ -190,22 +228,43 @@ export class Service extends DatabaseService<Model> {
           });
 
         if (onCallPolicy && onCallPolicy.id) {
-          await IncidentFeedService.createIncidentFeed({
-            incidentId: onCalldutyPolicyExecutionLog.triggeredByIncidentId,
-            projectId: onCalldutyPolicyExecutionLog.projectId!,
-            incidentFeedEventType: IncidentFeedEventType.OnCallPolicy,
-            displayColor: onCalldutyPolicyExecutionLog.status
-              ? this.getDisplayColorByStatus(
-                  onCalldutyPolicyExecutionLog.status,
-                )
-              : Blue500,
-            moreInformationInMarkdown: `**Status:** ${onCalldutyPolicyExecutionLog.status}
-            
-**Message:** ${onCalldutyPolicyExecutionLog.statusMessage}`,
-            feedInfoInMarkdown: `**On Call Policy Status Updated:** 
-
-On-call policy **${onCallPolicy.name}** status updated to **${onCalldutyPolicyExecutionLog.status}**`,
-          });
+          const moreInformationInMarkdown: string = `**Status:** ${onCalldutyPolicyExecutionLog.status}
+
+**Message:** ${onCalldutyPolicyExecutionLog.statusMessage}`;
+
+          const feedInfoInMarkdown: string = `**On Call Policy Status Updated:**
+
+On-call policy **${onCallPolicy.name}** status updated to **${onCalldutyPolicyExecutionLog.status}**`;
+
+          if (onCalldutyPolicyExecutionLog.triggeredByIncidentId) {
+            await IncidentFeedService.createIncidentFeed({
+              incidentId: onCalldutyPolicyExecutionLog.triggeredByIncidentId,
+              projectId: onCalldutyPolicyExecutionLog.projectId!,
+              incidentFeedEventType: IncidentFeedEventType.OnCallPolicy,
+              displayColor: onCalldutyPolicyExecutionLog.status
+                ? this.getDisplayColorByStatus(
+                    onCalldutyPolicyExecutionLog.status,
+                  )
+                : Blue500,
+              moreInformationInMarkdown: moreInformationInMarkdown,
+              feedInfoInMarkdown: feedInfoInMarkdown,
+            });
+          }
+
+          if (onCalldutyPolicyExecutionLog.triggeredByAlertId) {
+            await AlertFeedService.createAlertFeed({
+              alertId: onCalldutyPolicyExecutionLog.triggeredByAlertId,
+              projectId: onCalldutyPolicyExecutionLog.projectId!,
+              alertFeedEventType: AlertFeedEventType.OnCallPolicy,
+              displayColor: onCalldutyPolicyExecutionLog.status
+                ? this.getDisplayColorByStatus(
+                    onCalldutyPolicyExecutionLog.status,
+                  )
+                : Blue500,
+              moreInformationInMarkdown: moreInformationInMarkdown,
+              feedInfoInMarkdown: feedInfoInMarkdown,
+            });
+          }
         }
       }
     }

package/Server/Services/OnCallDutyPolicyExecutionLogTimelineService.ts

@@ -9,6 +9,8 @@ import Color from "../../Types/Color";
 import ObjectID from "../../Types/ObjectID";
 import logger from "../Utils/Logger";
 import { LIMIT_PER_PROJECT } from "../../Types/Database/LimitMax";
+import AlertFeedService from "./AlertFeedService";
+import { AlertFeedEventType } from "../../Models/DatabaseModels/AlertFeed";
 
 export class Service extends DatabaseService<Model> {
   public constructor() {
@@ -36,7 +38,7 @@ export class Service extends DatabaseService<Model> {
     }
   }
 
-  public async addToIncidentFeed(data: {
+  public async addToIncidentOrAlertFeed(data: {
     onCallDutyPolicyExecutionLogTimelineId: ObjectID;
   }): Promise<void> {
     logger.debug(
@@ -50,6 +52,7 @@ export class Service extends DatabaseService<Model> {
           _id: true,
           onCallDutyPolicyId: true,
           triggeredByIncidentId: true,
+          triggeredByAlertId: true,
           projectId: true,
           status: true,
           statusMessage: true,
@@ -89,7 +92,10 @@ export class Service extends DatabaseService<Model> {
       return;
     }
 
-    if (!onCallDutyPolicyExecutionLogTimeline.triggeredByIncidentId) {
+    if (
+      !onCallDutyPolicyExecutionLogTimeline.triggeredByIncidentId &&
+      !onCallDutyPolicyExecutionLogTimeline.triggeredByAlertId
+    ) {
       return;
     }
 
@@ -120,14 +126,26 @@ The on-call policy **${onCallDutyPolicyExecutionLogTimeline.onCallDutyPolicy.nam
 
         logger.debug("Feed Info in Markdown: " + feedInfoInMarkdown);
 
-        await IncidentFeedService.createIncidentFeed({
-          incidentId:
-            onCallDutyPolicyExecutionLogTimeline.triggeredByIncidentId,
-          projectId: onCallDutyPolicyExecutionLogTimeline.projectId!,
-          incidentFeedEventType: IncidentFeedEventType.OnCallPolicy,
-          displayColor: displayColor,
-          feedInfoInMarkdown: feedInfoInMarkdown,
-        });
+        if (onCallDutyPolicyExecutionLogTimeline.triggeredByIncidentId) {
+          await IncidentFeedService.createIncidentFeed({
+            incidentId:
+              onCallDutyPolicyExecutionLogTimeline.triggeredByIncidentId,
+            projectId: onCallDutyPolicyExecutionLogTimeline.projectId!,
+            incidentFeedEventType: IncidentFeedEventType.OnCallPolicy,
+            displayColor: displayColor,
+            feedInfoInMarkdown: feedInfoInMarkdown,
+          });
+        }
+
+        if (onCallDutyPolicyExecutionLogTimeline.triggeredByAlertId) {
+          await AlertFeedService.createAlertFeed({
+            alertId: onCallDutyPolicyExecutionLogTimeline.triggeredByAlertId,
+            projectId: onCallDutyPolicyExecutionLogTimeline.projectId!,
+            alertFeedEventType: AlertFeedEventType.OnCallPolicy,
+            displayColor: displayColor,
+            feedInfoInMarkdown: feedInfoInMarkdown,
+          });
+        }
 
         logger.debug("Incident Feed created");
       }
@@ -141,7 +159,7 @@ The on-call policy **${onCallDutyPolicyExecutionLogTimeline.onCallDutyPolicy.nam
     logger.debug("OnCallDutyPolicyExecutionLogTimelineService.onCreateSuccess");
     logger.debug(createdItem);
 
-    await this.addToIncidentFeed({
+    await this.addToIncidentOrAlertFeed({
       onCallDutyPolicyExecutionLogTimelineId: createdItem.id!,
     });
 
@@ -166,7 +184,7 @@ The on-call policy **${onCallDutyPolicyExecutionLogTimeline.onCallDutyPolicy.nam
       });
 
       for (const updatedItem of updatedItems) {
-        await this.addToIncidentFeed({
+        await this.addToIncidentOrAlertFeed({
           onCallDutyPolicyExecutionLogTimelineId: updatedItem.id as ObjectID,
         });
       }