@oneuptime/common 7.0.3717 → 7.0.3786

package/build/dist/Server/Services/IncidentPublicNoteService.js

@@ -5,10 +5,25 @@ import IncidentFeedService from "./IncidentFeedService";
 import { IncidentFeedEventType } from "../../Models/DatabaseModels/IncidentFeed";
 import { Blue500, Indigo500 } from "../../Types/BrandColors";
 import { LIMIT_PER_PROJECT } from "../../Types/Database/LimitMax";
+import IncidentService from "./IncidentService";
 export class Service extends DatabaseService {
     constructor() {
         super(Model);
     }
+    async addNote(data) {
+        const publicNote = new Model();
+        publicNote.createdByUserId = data.userId;
+        publicNote.incidentId = data.incidentId;
+        publicNote.projectId = data.projectId;
+        publicNote.note = data.note;
+        publicNote.postedAt = OneUptimeDate.getCurrentDate();
+        return this.create({
+            data: publicNote,
+            props: {
+                isRoot: true,
+            },
+        });
+    }
     async onBeforeCreate(createBy) {
         if (!createBy.data.postedAt) {
             createBy.data.postedAt = OneUptimeDate.getCurrentDate();
@@ -21,16 +36,25 @@ export class Service extends DatabaseService {
     async onCreateSuccess(_onCreate, createdItem) {
         var _a;
         const userId = createdItem.createdByUserId || ((_a = createdItem.createdByUser) === null || _a === void 0 ? void 0 : _a.id);
-        await IncidentFeedService.createIncidentFeed({
+        const incidentId = createdItem.incidentId;
+        const projectId = createdItem.projectId;
+        const incidentNumber = await IncidentService.getIncidentNumber({
+            incidentId: incidentId,
+        });
+        await IncidentFeedService.createIncidentFeedItem({
             incidentId: createdItem.incidentId,
             projectId: createdItem.projectId,
             incidentFeedEventType: IncidentFeedEventType.PublicNote,
             displayColor: Indigo500,
             userId: userId || undefined,
-            feedInfoInMarkdown: `**Posted public note for this incident on status page**
+            feedInfoInMarkdown: `📄 posted **public note** for this [Incident ${incidentNumber}](${(await IncidentService.getIncidentLinkInDashboard(projectId, incidentId)).toString()}) on status page:
 
 ${createdItem.note}
           `,
+            workspaceNotification: {
+                sendWorkspaceNotification: true,
+                notifyUserId: userId || undefined,
+            },
         });
         return createdItem;
     }
@@ -55,16 +79,20 @@ ${createdItem.note}
             });
             const userId = onUpdate.updateBy.props.userId;
             for (const updatedItem of updatedItems) {
-                await IncidentFeedService.createIncidentFeed({
+                await IncidentFeedService.createIncidentFeedItem({
                     incidentId: updatedItem.incidentId,
                     projectId: updatedItem.projectId,
                     incidentFeedEventType: IncidentFeedEventType.PublicNote,
                     displayColor: Blue500,
                     userId: userId || undefined,
-                    feedInfoInMarkdown: `**Updated Public Note**
+                    feedInfoInMarkdown: `📄 **Updated Public Note**
   
 ${updatedItem.note}
             `,
+                    workspaceNotification: {
+                        sendWorkspaceNotification: true,
+                        notifyUserId: userId || undefined,
+                    },
                 });
             }
         }

package/build/dist/Server/Services/IncidentPublicNoteService.js.map

@@ -1 +1 @@
-{"version":3,"file":"IncidentPublicNoteService.js","sourceRoot":"","sources":["../../../../Server/Services/IncidentPublicNoteService.ts"],"names":[],"mappings":"AAEA,OAAO,eAAe,MAAM,mBAAmB,CAAC;AAChD,OAAO,aAAa,MAAM,kBAAkB,CAAC;AAC7C,OAAO,KAAK,MAAM,iDAAiD,CAAC;AACpE,OAAO,mBAAmB,MAAM,uBAAuB,CAAC;AACxD,OAAO,EAAE,qBAAqB,EAAE,MAAM,0CAA0C,CAAC;AACjF,OAAO,EAAE,OAAO,EAAE,SAAS,EAAE,MAAM,yBAAyB,CAAC;AAE7D,OAAO,EAAE,iBAAiB,EAAE,MAAM,+BAA+B,CAAC;AAElE,MAAM,OAAO,OAAQ,SAAQ,eAAsB;IACjD;QACE,KAAK,CAAC,KAAK,CAAC,CAAC;IACf,CAAC;IAEkB,KAAK,CAAC,cAAc,CACrC,QAAyB;QAEzB,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,QAAQ,EAAE,CAAC;YAC5B,QAAQ,CAAC,IAAI,CAAC,QAAQ,GAAG,aAAa,CAAC,cAAc,EAAE,CAAC;QAC1D,CAAC;QAED,OAAO;YACL,QAAQ,EAAE,QAAQ;YAClB,YAAY,EAAE,IAAI;SACnB,CAAC;IACJ,CAAC;IAEe,KAAK,CAAC,eAAe,CACnC,SAA0B,EAC1B,WAAkB;;QAElB,MAAM,MAAM,GACV,WAAW,CAAC,eAAe,KAAI,MAAA,WAAW,CAAC,aAAa,0CAAE,EAAE,CAAA,CAAC;QAE/D,MAAM,mBAAmB,CAAC,kBAAkB,CAAC;YAC3C,UAAU,EAAE,WAAW,CAAC,UAAW;YACnC,SAAS,EAAE,WAAW,CAAC,SAAU;YACjC,qBAAqB,EAAE,qBAAqB,CAAC,UAAU;YACvD,YAAY,EAAE,SAAS;YACvB,MAAM,EAAE,MAAM,IAAI,SAAS;YAC3B,kBAAkB,EAAE;;EAExB,WAAW,CAAC,IAAI;WACP;SACN,CAAC,CAAC;QAEH,OAAO,WAAW,CAAC;IACrB,CAAC;IAEe,KAAK,CAAC,eAAe,CACnC,QAAyB,EACzB,eAAgC;QAEhC,IAAI,QAAQ,CAAC,QAAQ,CAAC,IAAI,CAAC,IAAI,EAAE,CAAC;YAChC,MAAM,YAAY,GAAiB,MAAM,IAAI,CAAC,MAAM,CAAC;gBACnD,KAAK,EAAE,QAAQ,CAAC,QAAQ,CAAC,KAAK;gBAC9B,KAAK,EAAE,iBAAiB;gBACxB,IAAI,EAAE,CAAC;gBACP,KAAK,EAAE;oBACL,MAAM,EAAE,IAAI;iBACb;gBACD,MAAM,EAAE;oBACN,UAAU,EAAE,IAAI;oBAChB,SAAS,EAAE,IAAI;oBACf,IAAI,EAAE,IAAI;oBACV,eAAe,EAAE,IAAI;oBACrB,aAAa,EAAE;wBACb,GAAG,EAAE,IAAI;qBACV;iBACF;aACF,CAAC,CAAC;YAEH,MAAM,MAAM,GACV,QAAQ,CAAC,QAAQ,CAAC,KAAK,CAAC,MAAM,CAAC;YAEjC,KAAK,MAAM,WAAW,IAAI,YAAY,EAAE,CAAC;gBACvC,MAAM,mBAAmB,CAAC,kBAAkB,CAAC;oBAC3C,UAAU,EAAE,WAAW,CAAC,UAAW;oBACnC,SAAS,EAAE,WAAW,CAAC,SAAU;oBACjC,qBAAqB,EAAE,qBAAqB,CAAC,UAAU;oBACvD,YAAY,EAAE,OAAO;oBACrB,MAAM,EAAE,MAAM,IAAI,SAAS;oBAE3B,kBAAkB,EAAE;;EAE5B,WAAW,CAAC,IAAI;aACL;iBACJ,CAAC,CAAC;YACL,CAAC;QACH,CAAC;QACD,OAAO,QAAQ,CAAC;IAClB,CAAC;CACF;AAED,eAAe,IAAI,OAAO,EAAE,CAAC"}
+{"version":3,"file":"IncidentPublicNoteService.js","sourceRoot":"","sources":["../../../../Server/Services/IncidentPublicNoteService.ts"],"names":[],"mappings":"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"}

package/build/dist/Server/Services/IncidentService.js

@@ -37,8 +37,7 @@ import { IncidentFeedEventType } from "../../Models/DatabaseModels/IncidentFeed"
 import { Gray500, Red500 } from "../../Types/BrandColors";
 import LabelService from "./LabelService";
 import IncidentSeverityService from "./IncidentSeverityService";
-import WorkspaceNotificationRuleService from "./WorkspaceNotificationRuleService";
-import NotificationRuleEventType from "../../Types/Workspace/NotificationRules/EventType";
+import IncidentWorkspaceMessages from "../Utils/Workspace/WorkspaceMessages/Incident";
 export class Service extends DatabaseService {
     constructor() {
         super(Model);
@@ -46,6 +45,40 @@ export class Service extends DatabaseService {
             this.hardDeleteItemsOlderThanInDays("createdAt", 120);
         }
     }
+    async isIncidentResolved(data) {
+        const incident = await this.findOneBy({
+            query: {
+                _id: data.incidentId,
+            },
+            select: {
+                projectId: true,
+                currentIncidentState: {
+                    order: true,
+                },
+            },
+            props: {
+                isRoot: true,
+            },
+        });
+        if (!incident) {
+            throw new BadDataException("Incident not found");
+        }
+        if (!incident.projectId) {
+            throw new BadDataException("Incient Project ID not found");
+        }
+        const resolvedIncidentState = await IncidentStateService.getResolvedIncidentState({
+            projectId: incident.projectId,
+            props: {
+                isRoot: true,
+            },
+        });
+        const currentIncidentStateOrder = incident.currentIncidentState.order;
+        const resolvedIncidentStateOrder = resolvedIncidentState.order;
+        if (currentIncidentStateOrder >= resolvedIncidentStateOrder) {
+            return true;
+        }
+        return false;
+    }
     async isIncidentAcknowledged(data) {
         const incident = await this.findOneBy({
             query: {
@@ -80,11 +113,55 @@ export class Service extends DatabaseService {
         }
         return false;
     }
+    async resolveIncident(incidentId, resolvedByUserId) {
+        const incident = await this.findOneById({
+            id: incidentId,
+            select: {
+                projectId: true,
+                incidentNumber: true,
+            },
+            props: {
+                isRoot: true,
+            },
+        });
+        if (!incident || !incident.projectId) {
+            throw new BadDataException("Incident not found.");
+        }
+        const incidentState = await IncidentStateService.findOneBy({
+            query: {
+                projectId: incident.projectId,
+                isResolvedState: true,
+            },
+            select: {
+                _id: true,
+            },
+            props: {
+                isRoot: true,
+            },
+        });
+        if (!incidentState || !incidentState.id) {
+            throw new BadDataException("Acknowledged state not found for this project. Please add acknowledged state from settings.");
+        }
+        const incidentStateTimeline = new IncidentStateTimeline();
+        incidentStateTimeline.projectId = incident.projectId;
+        incidentStateTimeline.incidentId = incidentId;
+        incidentStateTimeline.incidentStateId = incidentState.id;
+        incidentStateTimeline.createdByUserId = resolvedByUserId;
+        await IncidentStateTimelineService.create({
+            data: incidentStateTimeline,
+            props: {
+                isRoot: true,
+            },
+        });
+        // store incident metric
+        return incident;
+    }
     async acknowledgeIncident(incidentId, acknowledgedByUserId) {
         const incident = await this.findOneById({
             id: incidentId,
             select: {
                 projectId: true,
+                incidentNumber: true,
             },
             props: {
                 isRoot: true,
@@ -120,6 +197,7 @@ export class Service extends DatabaseService {
             },
         });
         // store incident metric
+        return incident;
     }
     async getExistingIncidentNumberForProject(data) {
         // get last incident number.
@@ -198,21 +276,11 @@ export class Service extends DatabaseService {
             if (createBy.data.createdByUser && createBy.data.createdByUser.id) {
                 userId = createBy.data.createdByUser.id;
             }
-            const user = await UserService.findOneBy({
-                query: {
-                    _id: userId === null || userId === void 0 ? void 0 : userId.toString(),
-                },
-                select: {
-                    _id: true,
-                    name: true,
-                    email: true,
-                },
-                props: {
-                    isRoot: true,
-                },
-            });
-            if (user) {
-                createBy.data.rootCause = `Incident created by ${user.name} (${user.email})`;
+            if (userId) {
+                createBy.data.rootCause = `Incident created by ${await UserService.getUserMarkdownString({
+                    userId: userId,
+                    projectId: projectId,
+                })}`;
             }
         }
         return {
@@ -223,7 +291,7 @@ export class Service extends DatabaseService {
         };
     }
     async onCreateSuccess(onCreate, createdItem) {
-        var _a, _b, _c, _d, _e;
+        var _a, _b, _c, _d, _e, _f, _g, _h;
         // these should never be null.
         if (!createdItem.projectId) {
             throw new BadDataException("projectId is required");
@@ -231,6 +299,33 @@ export class Service extends DatabaseService {
         if (!createdItem.id) {
             throw new BadDataException("id is required");
         }
+        const incident = await this.findOneById({
+            id: createdItem.id,
+            select: {
+                projectId: true,
+                incidentNumber: true,
+                title: true,
+                description: true,
+                incidentSeverity: {
+                    name: true,
+                },
+                rootCause: true,
+                remediationNotes: true,
+                currentIncidentState: {
+                    name: true,
+                },
+                monitors: {
+                    name: true,
+                    _id: true,
+                },
+            },
+            props: {
+                isRoot: true,
+            },
+        });
+        if (!incident) {
+            throw new BadDataException("Incident not found");
+        }
         // release the mutex.
         if (onCreate.carryForward && onCreate.carryForward.mutex) {
             const mutex = onCreate.carryForward.mutex;
@@ -251,30 +346,83 @@ export class Service extends DatabaseService {
             }
         }
         const createdByUserId = createdItem.createdByUserId || ((_a = createdItem.createdByUser) === null || _a === void 0 ? void 0 : _a.id);
-        await IncidentFeedService.createIncidentFeed({
-            incidentId: createdItem.id,
+        // send message to workspaces - slack, teams,   etc.
+        const workspaceResult = await IncidentWorkspaceMessages.createChannelsAndInviteUsersToChannels({
             projectId: createdItem.projectId,
-            incidentFeedEventType: IncidentFeedEventType.IncidentCreated,
-            displayColor: Red500,
-            feedInfoInMarkdown: `**Incident #${(_b = createdItem.incidentNumber) === null || _b === void 0 ? void 0 : _b.toString()} Created**: 
+            incidentId: createdItem.id,
+            incidentNumber: createdItem.incidentNumber,
+        });
+        if (workspaceResult && ((_b = workspaceResult.channelsCreated) === null || _b === void 0 ? void 0 : _b.length) > 0) {
+            // update incident with these channels.
+            await this.updateOneById({
+                id: createdItem.id,
+                data: {
+                    postUpdatesToWorkspaceChannels: workspaceResult.channelsCreated || [],
+                },
+                props: {
+                    isRoot: true,
+                },
+            });
+        }
+        let feedInfoInMarkdown = `#### 🚨 Incident ${(_c = createdItem.incidentNumber) === null || _c === void 0 ? void 0 : _c.toString()} Created: 
       
-**Incident Title**:
+**${createdItem.title || "No title provided."}**:
 
-${createdItem.title || "No title provided."}
+${createdItem.description || "No description provided."}
 
-**Description**:
+`;
+        if ((_d = incident.currentIncidentState) === null || _d === void 0 ? void 0 : _d.name) {
+            feedInfoInMarkdown += `🔴 **Incident State**: ${incident.currentIncidentState.name} \n\n`;
+        }
+        if ((_e = incident.incidentSeverity) === null || _e === void 0 ? void 0 : _e.name) {
+            feedInfoInMarkdown += `⚠️ **Severity**: ${incident.incidentSeverity.name} \n\n`;
+        }
+        if (incident.monitors && incident.monitors.length > 0) {
+            feedInfoInMarkdown += `🌎 **Resources Affected**:\n`;
+            for (const monitor of incident.monitors) {
+                feedInfoInMarkdown += `- [${monitor.name}](${(await MonitorService.getMonitorLinkInDashboard(createdItem.projectId, monitor.id)).toString()})\n`;
+            }
+            feedInfoInMarkdown += `\n\n`;
+        }
+        if (createdItem.rootCause) {
+            feedInfoInMarkdown += `\n
+📄 **Root Cause**:
 
-${createdItem.description || "No description provided."}
+${createdItem.rootCause || "No root cause provided."}
 
-      `,
+`;
+        }
+        if (createdItem.remediationNotes) {
+            feedInfoInMarkdown += `\n 
+🎯 **Remediation Notes**:
+
+${createdItem.remediationNotes || "No remediation notes provided."}
+
+
+`;
+        }
+        const incidentCreateMessageBlocks = await IncidentWorkspaceMessages.getIncidentCreateMessageBlocks({
+            incidentId: createdItem.id,
+            projectId: createdItem.projectId,
+        });
+        await IncidentFeedService.createIncidentFeedItem({
+            incidentId: createdItem.id,
+            projectId: createdItem.projectId,
+            incidentFeedEventType: IncidentFeedEventType.IncidentCreated,
+            displayColor: Red500,
+            feedInfoInMarkdown: feedInfoInMarkdown,
             userId: createdByUserId || undefined,
+            workspaceNotification: {
+                appendMessageBlocks: incidentCreateMessageBlocks,
+                sendWorkspaceNotification: true,
+            },
         });
         if (!createdItem.currentIncidentStateId) {
             throw new BadDataException("currentIncidentStateId is required");
         }
         if (createdItem.changeMonitorStatusToId && createdItem.projectId) {
             // change status of all the monitors.
-            await MonitorService.changeMonitorStatus(createdItem.projectId, ((_c = createdItem.monitors) === null || _c === void 0 ? void 0 : _c.map((monitor) => {
+            await MonitorService.changeMonitorStatus(createdItem.projectId, ((_f = createdItem.monitors) === null || _f === void 0 ? void 0 : _f.map((monitor) => {
                 return new ObjectID(monitor._id || "");
             })) || [], createdItem.changeMonitorStatusToId, true, // notifyMonitorOwners
             createdItem.rootCause ||
@@ -295,24 +443,6 @@ ${createdItem.description || "No description provided."}
                 isRoot: true,
             },
         });
-        await IncidentFeedService.createIncidentFeed({
-            incidentId: createdItem.id,
-            projectId: createdItem.projectId,
-            incidentFeedEventType: IncidentFeedEventType.RootCause,
-            displayColor: Red500,
-            feedInfoInMarkdown: `**Root Cause**
-
-${createdItem.rootCause || "No root cause provided."}`,
-        });
-        await IncidentFeedService.createIncidentFeed({
-            incidentId: createdItem.id,
-            projectId: createdItem.projectId,
-            incidentFeedEventType: IncidentFeedEventType.RemediationNotes,
-            displayColor: Red500,
-            feedInfoInMarkdown: `**Remediation Notes**
-
-${createdItem.remediationNotes || "No remediation notes provided."}`,
-        });
         // add owners.
         if (onCreate.createBy.miscDataProps &&
             (onCreate.createBy.miscDataProps["ownerTeams"] ||
@@ -321,8 +451,8 @@ ${createdItem.remediationNotes || "No remediation notes provided."}`,
                 [], onCreate.createBy.miscDataProps["ownerTeams"] ||
                 [], false, onCreate.createBy.props);
         }
-        if (((_d = createdItem.onCallDutyPolicies) === null || _d === void 0 ? void 0 : _d.length) &&
-            ((_e = createdItem.onCallDutyPolicies) === null || _e === void 0 ? void 0 : _e.length) > 0) {
+        if (((_g = createdItem.onCallDutyPolicies) === null || _g === void 0 ? void 0 : _g.length) &&
+            ((_h = createdItem.onCallDutyPolicies) === null || _h === void 0 ? void 0 : _h.length) > 0) {
             for (const policy of createdItem.onCallDutyPolicies) {
                 await OnCallDutyPolicyService.executePolicy(new ObjectID(policy._id), {
                     triggeredByIncidentId: createdItem.id,
@@ -345,30 +475,6 @@ ${createdItem.remediationNotes || "No remediation notes provided."}`,
                 });
             }
         }
-        // // send message to workspaces - slack, teams,   etc.
-        // const createdChannels: {
-        //   channelsCreated: Array<WorkspaceChannel>;
-        // } | null = await this.notifyWorkspaceOnIncidentCreate({
-        //   projectId: createdItem.projectId,
-        //   incidentId: createdItem.id!,
-        //   incidentNumber: createdItem.incidentNumber!,
-        // });
-        // if (
-        //   createdChannels &&
-        //   createdChannels.channelsCreated &&
-        //   createdChannels.channelsCreated.length > 0
-        // ) {
-        //   // update incident with these channels.
-        //   await this.updateOneById({
-        //     id: createdItem.id!,
-        //     data: {
-        //       postUpdatesToWorkspaceChannels: createdChannels.channelsCreated,
-        //     },
-        //     props: {
-        //       isRoot: true,
-        //     },
-        //   });
-        // }
         return createdItem;
     }
     async getIncidentIdentifiedDate(incidentId) {
@@ -505,8 +611,20 @@ ${createdItem.remediationNotes || "No remediation notes provided."}`,
         }
         if (updatedItemIds.length > 0) {
             for (const incidentId of updatedItemIds) {
+                const incident = await this.findOneById({
+                    id: incidentId,
+                    select: {
+                        projectId: true,
+                        incidentNumber: true,
+                    },
+                    props: {
+                        isRoot: true,
+                    },
+                });
+                const projectId = incident.projectId;
+                const incidentNumber = incident.incidentNumber;
                 let shouldAddIncidentFeed = false;
-                let feedInfoInMarkdown = "**Incident was updated.**";
+                let feedInfoInMarkdown = `**[Incident ${incidentNumber}](${(await this.getIncidentLinkInDashboard(projectId, incidentId)).toString()}) was updated.**`;
                 const createdByUserId = onUpdate.updateBy.props.userId;
                 if (onUpdate.updateBy.data.title) {
                     // add incident feed.
@@ -518,7 +636,7 @@ ${onUpdate.updateBy.data.title || "No title provided."}
                 if (onUpdate.updateBy.data.rootCause) {
                     if (onUpdate.updateBy.data.title) {
                         // add incident feed.
-                        feedInfoInMarkdown += `\n\n**Root Cause**: 
+                        feedInfoInMarkdown += `\n\n**📄 Root Cause**: 
 ${onUpdate.updateBy.data.rootCause || "No root cause provided."}
   `;
                         shouldAddIncidentFeed = true;
@@ -533,7 +651,7 @@ ${onUpdate.updateBy.data.rootCause || "No root cause provided."}
                 }
                 if (onUpdate.updateBy.data.remediationNotes) {
                     // add incident feed.
-                    feedInfoInMarkdown += `\n\n**Remediation Notes**: 
+                    feedInfoInMarkdown += `\n\n**🎯 Remediation Notes**: 
 ${onUpdate.updateBy.data.remediationNotes || "No remediation notes provided."}
         `;
                     shouldAddIncidentFeed = true;
@@ -566,7 +684,7 @@ ${onUpdate.updateBy.data.remediationNotes || "No remediation notes provided."}
                         },
                     });
                     if (labels.length > 0) {
-                        feedInfoInMarkdown += `\n\n**Labels**:
+                        feedInfoInMarkdown += `\n\n**🏷️ Labels**:
 
 ${labels
                             .map((label) => {
@@ -591,20 +709,23 @@ ${labels
                         },
                     });
                     if (incidentSeverity) {
-                        feedInfoInMarkdown += `\n\n**Incident Severity**:
+                        feedInfoInMarkdown += `\n\n**⚠️ Incident Severity**:
 ${incidentSeverity.name}
 `;
                         shouldAddIncidentFeed = true;
                     }
                 }
                 if (shouldAddIncidentFeed) {
-                    await IncidentFeedService.createIncidentFeed({
+                    await IncidentFeedService.createIncidentFeedItem({
                         incidentId: incidentId,
                         projectId: onUpdate.updateBy.props.tenantId,
                         incidentFeedEventType: IncidentFeedEventType.IncidentUpdated,
                         displayColor: Gray500,
                         feedInfoInMarkdown: feedInfoInMarkdown,
                         userId: createdByUserId || undefined,
+                        workspaceNotification: {
+                            sendWorkspaceNotification: true,
+                        },
                     });
                 }
             }
@@ -1009,110 +1130,40 @@ ${incidentSeverity.name}
             logger.error(err);
         });
     }
-    async notifyWorkspaceOnIncidentCreate(data) {
-        try {
-            // we will notify the workspace about the incident creation with the bot tokken which is in WorkspaceProjectAuth Table.
-            return await WorkspaceNotificationRuleService.createInviteAndPostToChannelsBasedOnRules({
-                projectId: data.projectId,
-                notificationFor: {
-                    incidentId: data.incidentId,
-                },
-                notificationRuleEventType: NotificationRuleEventType.Incident,
-                channelNameSiffix: data.incidentNumber.toString(),
-                messageBlocks: await this.getWorkspaceMessageBlocksForIncidentCreate({
-                    incidentId: data.incidentId,
-                }),
-            });
-        }
-        catch (err) {
-            // log the error and continue.
-            logger.error(err);
-            return null;
+    async getWorkspaceChannelForIncident(data) {
+        const incident = await this.findOneById({
+            id: data.incidentId,
+            select: {
+                postUpdatesToWorkspaceChannels: true,
+            },
+            props: {
+                isRoot: true,
+            },
+        });
+        if (!incident) {
+            throw new BadDataException("Incident not found.");
         }
+        return (incident.postUpdatesToWorkspaceChannels || []).filter((channel) => {
+            if (!data.workspaceType) {
+                return true;
+            }
+            return channel.workspaceType === data.workspaceType;
+        });
     }
-    async getWorkspaceMessageBlocksForIncidentCreate(data) {
-        var _a, _b;
+    async getIncidentNumber(data) {
         const incident = await this.findOneById({
             id: data.incidentId,
             select: {
-                projectId: true,
                 incidentNumber: true,
-                title: true,
-                description: true,
-                incidentSeverity: {
-                    name: true,
-                },
-                rootCause: true,
-                remediationNotes: true,
-                currentIncidentState: {
-                    name: true,
-                },
             },
             props: {
                 isRoot: true,
             },
         });
         if (!incident) {
-            throw new BadDataException("Incident not found");
-        }
-        const blocks = [];
-        if (incident.incidentNumber) {
-            const markdownBlock1 = {
-                _type: "WorkspacePayloadMarkdown",
-                text: `**Incident #${incident.incidentNumber} Created**`,
-            };
-            blocks.push(markdownBlock1);
-        }
-        if (incident.title) {
-            const markdownBlock2 = {
-                _type: "WorkspacePayloadMarkdown",
-                text: `**Incident Title**:
-${incident.title}`,
-            };
-            blocks.push(markdownBlock2);
-        }
-        if (incident.description) {
-            const markdownBlock3 = {
-                _type: "WorkspacePayloadMarkdown",
-                text: `**Description**:
-${incident.description}`,
-            };
-            blocks.push(markdownBlock3);
-        }
-        if ((_a = incident.incidentSeverity) === null || _a === void 0 ? void 0 : _a.name) {
-            const markdownBlock4 = {
-                _type: "WorkspacePayloadMarkdown",
-                text: `**Severity**:
-${incident.incidentSeverity.name}`,
-            };
-            blocks.push(markdownBlock4);
-        }
-        if (incident.rootCause) {
-            const markdownBlock5 = {
-                _type: "WorkspacePayloadMarkdown",
-                text: `**Root Cause**:
-${incident.rootCause}`,
-            };
-            blocks.push(markdownBlock5);
-        }
-        if (incident.remediationNotes) {
-            const markdownBlock6 = {
-                _type: "WorkspacePayloadMarkdown",
-                text: `**Remediation Notes**:
-${incident.remediationNotes}`,
-            };
-            blocks.push(markdownBlock6);
-        }
-        if ((_b = incident.currentIncidentState) === null || _b === void 0 ? void 0 : _b.name) {
-            const markdownBlock7 = {
-                _type: "WorkspacePayloadMarkdown",
-                text: `**Incident State**:
-${incident.currentIncidentState.name}`,
-            };
-            blocks.push(markdownBlock7);
+            throw new BadDataException("Incident not found.");
         }
-        // TODO: Add buttons to Post Private Note, Ack Incident, Resolve Incident. etc.
-        return blocks;
+        return incident.incidentNumber || null;
     }
 }
 export default new Service();