@oneuptime/common 7.0.3517 → 7.0.3538

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

@@ -14,6 +14,8 @@ import MonitorStatusTimeline from "Common/Models/DatabaseModels/MonitorStatusTim
 import ScheduledMaintenancePublicNote from "Common/Models/DatabaseModels/ScheduledMaintenancePublicNote";
 import ScheduledMaintenanceStateTimeline from "Common/Models/DatabaseModels/ScheduledMaintenanceStateTimeline";
 import { IsBillingEnabled } from "../EnvironmentConfig";
+import ScheduledMaintenanceFeedService from "./ScheduledMaintenanceFeedService";
+import { ScheduledMaintenanceFeedEventType } from "../../Models/DatabaseModels/ScheduledMaintenanceFeed";
 export class Service extends DatabaseService {
     constructor() {
         super(ScheduledMaintenanceStateTimeline);
@@ -101,6 +103,28 @@ export class Service extends DatabaseService {
                 isRoot: true,
             },
         });
+        const scheduledMaintenanceState = await ScheduledMaintenanceStateService.findOneBy({
+            query: {
+                _id: createdItem.scheduledMaintenanceStateId.toString(),
+            },
+            props: {
+                isRoot: true,
+            },
+            select: {
+                _id: true,
+                color: true,
+                name: true,
+            },
+        });
+        const stateName = (scheduledMaintenanceState === null || scheduledMaintenanceState === void 0 ? void 0 : scheduledMaintenanceState.name) || "";
+        await ScheduledMaintenanceFeedService.createScheduledMaintenanceFeed({
+            scheduledMaintenanceId: createdItem.scheduledMaintenanceId,
+            projectId: createdItem.projectId,
+            scheduledMaintenanceFeedEventType: ScheduledMaintenanceFeedEventType.ScheduledMaintenanceStateChanged,
+            displayColor: scheduledMaintenanceState === null || scheduledMaintenanceState === void 0 ? void 0 : scheduledMaintenanceState.color,
+            feedInfoInMarkdown: "**Scheduled Maintenance State** changed to **" + stateName + "**",
+            userId: createdItem.createdByUserId || onCreate.createBy.props.userId,
+        });
         // TODO: DELETE THIS WHEN WORKFLOW IS IMPLEMENMTED.
         // check if this is resolved state, and if it is then resolve all the monitors.
         const isResolvedState = await ScheduledMaintenanceStateService.findOneBy({

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

@@ -1 +1 @@
-{"version":3,"file":"ScheduledMaintenanceStateTimelineService.js","sourceRoot":"","sources":["../../../../Server/Services/ScheduledMaintenanceStateTimelineService.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"ScheduledMaintenanceStateTimelineService.js","sourceRoot":"","sources":["../../../../Server/Services/ScheduledMaintenanceStateTimelineService.ts"],"names":[],"mappings":"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"}

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

@@ -25,13 +25,15 @@ import UserEmail from "Common/Models/DatabaseModels/UserEmail";
 import Model from "Common/Models/DatabaseModels/UserNotificationRule";
 import UserOnCallLog from "Common/Models/DatabaseModels/UserOnCallLog";
 import UserOnCallLogTimeline from "Common/Models/DatabaseModels/UserOnCallLogTimeline";
+import AlertService from "./AlertService";
+import AlertSeverityService from "./AlertSeverityService";
 export class Service extends DatabaseService {
     constructor() {
         super(Model);
     }
     async executeNotificationRuleItem(userNotificationRuleId, options) {
         // get user notification log and see if this rule has already been executed. If so then skip.
-        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t, _u, _v;
+        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t, _u, _v, _w, _x, _y, _z, _0;
         const userOnCallLog = await UserOnCallLogService.findOneById({
             id: options.userNotificationLogId,
             props: {
@@ -114,12 +116,16 @@ export class Service extends DatabaseService {
         if (options.triggeredByIncidentId) {
             logTimelineItem.triggeredByIncidentId = options.triggeredByIncidentId;
         }
+        if (options.triggeredByAlertId) {
+            logTimelineItem.triggeredByAlertId = options.triggeredByAlertId;
+        }
         if (options.onCallDutyPolicyExecutionLogTimelineId) {
             logTimelineItem.onCallDutyPolicyExecutionLogTimelineId =
                 options.onCallDutyPolicyExecutionLogTimelineId;
         }
         // add status and status message and save.
         let incident = null;
+        let alert = null;
         if (options.userNotificationEventType ===
             UserNotificationEventType.IncidentCreated &&
             options.triggeredByIncidentId) {
@@ -146,18 +152,75 @@ export class Service extends DatabaseService {
                 },
             });
         }
-        if (!incident) {
-            throw new BadDataException("Incident not found.");
+        if (options.userNotificationEventType ===
+            UserNotificationEventType.AlertCreated &&
+            options.triggeredByAlertId) {
+            alert = await AlertService.findOneById({
+                id: options.triggeredByAlertId,
+                props: {
+                    isRoot: true,
+                },
+                select: {
+                    _id: true,
+                    title: true,
+                    description: true,
+                    projectId: true,
+                    project: {
+                        name: true,
+                    },
+                    currentAlertState: {
+                        name: true,
+                    },
+                    alertSeverity: {
+                        name: true,
+                    },
+                },
+            });
+        }
+        if (!incident && !alert) {
+            throw new BadDataException("Incident or Alert not found.");
         }
         if (((_a = notificationRuleItem.userEmail) === null || _a === void 0 ? void 0 : _a.email) &&
             ((_b = notificationRuleItem.userEmail) === null || _b === void 0 ? void 0 : _b.isVerified)) {
-            // send email.
+            // send email for alert.
+            if (options.userNotificationEventType ===
+                UserNotificationEventType.AlertCreated &&
+                alert) {
+                // create an error log.
+                logTimelineItem.status = UserNotificationStatus.Sending;
+                logTimelineItem.statusMessage = `Sending email to ${(_c = notificationRuleItem.userEmail) === null || _c === void 0 ? void 0 : _c.email.toString()}`;
+                logTimelineItem.userEmailId = notificationRuleItem.userEmail.id;
+                const updatedLog = await UserOnCallLogTimelineService.create({
+                    data: logTimelineItem,
+                    props: {
+                        isRoot: true,
+                    },
+                });
+                const emailMessage = await this.generateEmailTemplateForAlertCreated((_d = notificationRuleItem.userEmail) === null || _d === void 0 ? void 0 : _d.email, alert, updatedLog.id);
+                // send email.
+                MailService.sendMail(emailMessage, {
+                    userOnCallLogTimelineId: updatedLog.id,
+                    projectId: options.projectId,
+                }).catch(async (err) => {
+                    await UserOnCallLogTimelineService.updateOneById({
+                        id: updatedLog.id,
+                        data: {
+                            status: UserNotificationStatus.Error,
+                            statusMessage: err.message || "Error sending email.",
+                        },
+                        props: {
+                            isRoot: true,
+                        },
+                    });
+                });
+            }
+            // send email for incident
             if (options.userNotificationEventType ===
                 UserNotificationEventType.IncidentCreated &&
                 incident) {
                 // create an error log.
                 logTimelineItem.status = UserNotificationStatus.Sending;
-                logTimelineItem.statusMessage = `Sending email to ${(_c = notificationRuleItem.userEmail) === null || _c === void 0 ? void 0 : _c.email.toString()}`;
+                logTimelineItem.statusMessage = `Sending email to ${(_e = notificationRuleItem.userEmail) === null || _e === void 0 ? void 0 : _e.email.toString()}`;
                 logTimelineItem.userEmailId = notificationRuleItem.userEmail.id;
                 const updatedLog = await UserOnCallLogTimelineService.create({
                     data: logTimelineItem,
@@ -165,7 +228,7 @@ export class Service extends DatabaseService {
                         isRoot: true,
                     },
                 });
-                const emailMessage = await this.generateEmailTemplateForIncidentCreated((_d = notificationRuleItem.userEmail) === null || _d === void 0 ? void 0 : _d.email, incident, updatedLog.id);
+                const emailMessage = await this.generateEmailTemplateForIncidentCreated((_f = notificationRuleItem.userEmail) === null || _f === void 0 ? void 0 : _f.email, incident, updatedLog.id);
                 // send email.
                 MailService.sendMail(emailMessage, {
                     userOnCallLogTimelineId: updatedLog.id,
@@ -185,11 +248,11 @@ export class Service extends DatabaseService {
             }
         }
         // if you have an email but is not verified, then create a log.
-        if (((_e = notificationRuleItem.userEmail) === null || _e === void 0 ? void 0 : _e.email) &&
-            !((_f = notificationRuleItem.userEmail) === null || _f === void 0 ? void 0 : _f.isVerified)) {
+        if (((_g = notificationRuleItem.userEmail) === null || _g === void 0 ? void 0 : _g.email) &&
+            !((_h = notificationRuleItem.userEmail) === null || _h === void 0 ? void 0 : _h.isVerified)) {
             // create an error log.
             logTimelineItem.status = UserNotificationStatus.Error;
-            logTimelineItem.statusMessage = `Email notification not sent because email ${(_g = notificationRuleItem.userEmail) === null || _g === void 0 ? void 0 : _g.email.toString()} is not verified.`;
+            logTimelineItem.statusMessage = `Email notification not sent because email ${(_j = notificationRuleItem.userEmail) === null || _j === void 0 ? void 0 : _j.email.toString()} is not verified.`;
             await UserOnCallLogTimelineService.create({
                 data: logTimelineItem,
                 props: {
@@ -198,15 +261,47 @@ export class Service extends DatabaseService {
             });
         }
         // send sms.
-        if (((_h = notificationRuleItem.userSms) === null || _h === void 0 ? void 0 : _h.phone) &&
-            ((_j = notificationRuleItem.userSms) === null || _j === void 0 ? void 0 : _j.isVerified)) {
-            // send sms.
+        if (((_k = notificationRuleItem.userSms) === null || _k === void 0 ? void 0 : _k.phone) &&
+            ((_l = notificationRuleItem.userSms) === null || _l === void 0 ? void 0 : _l.isVerified)) {
+            //send sms for alert
+            if (options.userNotificationEventType ===
+                UserNotificationEventType.AlertCreated &&
+                alert) {
+                // create an error log.
+                logTimelineItem.status = UserNotificationStatus.Sending;
+                logTimelineItem.statusMessage = `Sending SMS to ${(_m = notificationRuleItem.userSms) === null || _m === void 0 ? void 0 : _m.phone.toString()}.`;
+                logTimelineItem.userSmsId = notificationRuleItem.userSms.id;
+                const updatedLog = await UserOnCallLogTimelineService.create({
+                    data: logTimelineItem,
+                    props: {
+                        isRoot: true,
+                    },
+                });
+                const smsMessage = await this.generateSmsTemplateForAlertCreated(notificationRuleItem.userSms.phone, alert, updatedLog.id);
+                // send email.
+                SmsService.sendSms(smsMessage, {
+                    projectId: alert.projectId,
+                    userOnCallLogTimelineId: updatedLog.id,
+                }).catch(async (err) => {
+                    await UserOnCallLogTimelineService.updateOneById({
+                        id: updatedLog.id,
+                        data: {
+                            status: UserNotificationStatus.Error,
+                            statusMessage: err.message || "Error sending SMS.",
+                        },
+                        props: {
+                            isRoot: true,
+                        },
+                    });
+                });
+            }
+            // send sms for incident
             if (options.userNotificationEventType ===
                 UserNotificationEventType.IncidentCreated &&
                 incident) {
                 // create an error log.
                 logTimelineItem.status = UserNotificationStatus.Sending;
-                logTimelineItem.statusMessage = `Sending SMS to ${(_k = notificationRuleItem.userSms) === null || _k === void 0 ? void 0 : _k.phone.toString()}.`;
+                logTimelineItem.statusMessage = `Sending SMS to ${(_o = notificationRuleItem.userSms) === null || _o === void 0 ? void 0 : _o.phone.toString()}.`;
                 logTimelineItem.userSmsId = notificationRuleItem.userSms.id;
                 const updatedLog = await UserOnCallLogTimelineService.create({
                     data: logTimelineItem,
@@ -233,11 +328,11 @@ export class Service extends DatabaseService {
                 });
             }
         }
-        if (((_l = notificationRuleItem.userSms) === null || _l === void 0 ? void 0 : _l.phone) &&
-            !((_m = notificationRuleItem.userSms) === null || _m === void 0 ? void 0 : _m.isVerified)) {
+        if (((_p = notificationRuleItem.userSms) === null || _p === void 0 ? void 0 : _p.phone) &&
+            !((_q = notificationRuleItem.userSms) === null || _q === void 0 ? void 0 : _q.isVerified)) {
             // create a log.
             logTimelineItem.status = UserNotificationStatus.Error;
-            logTimelineItem.statusMessage = `SMS not sent because phone ${(_o = notificationRuleItem.userSms) === null || _o === void 0 ? void 0 : _o.phone.toString()} is not verified.`;
+            logTimelineItem.statusMessage = `SMS not sent because phone ${(_r = notificationRuleItem.userSms) === null || _r === void 0 ? void 0 : _r.phone.toString()} is not verified.`;
             await UserOnCallLogTimelineService.create({
                 data: logTimelineItem,
                 props: {
@@ -246,41 +341,77 @@ export class Service extends DatabaseService {
             });
         }
         // send call.
-        if (((_p = notificationRuleItem.userCall) === null || _p === void 0 ? void 0 : _p.phone) &&
-            ((_q = notificationRuleItem.userCall) === null || _q === void 0 ? void 0 : _q.isVerified)) {
-            // send call.
-            logTimelineItem.status = UserNotificationStatus.Sending;
-            logTimelineItem.statusMessage = `Making a call to ${(_r = notificationRuleItem.userCall) === null || _r === void 0 ? void 0 : _r.phone.toString()}.`;
-            logTimelineItem.userCallId = notificationRuleItem.userCall.id;
-            const updatedLog = await UserOnCallLogTimelineService.create({
-                data: logTimelineItem,
-                props: {
-                    isRoot: true,
-                },
-            });
-            const callRequest = await this.generateCallTemplateForIncidentCreated((_s = notificationRuleItem.userCall) === null || _s === void 0 ? void 0 : _s.phone, incident, updatedLog.id);
-            // send email.
-            CallService.makeCall(callRequest, {
-                projectId: incident.projectId,
-                userOnCallLogTimelineId: updatedLog.id,
-            }).catch(async (err) => {
-                await UserOnCallLogTimelineService.updateOneById({
-                    id: updatedLog.id,
-                    data: {
-                        status: UserNotificationStatus.Error,
-                        statusMessage: err.message || "Error making call.",
+        if (((_s = notificationRuleItem.userCall) === null || _s === void 0 ? void 0 : _s.phone) &&
+            ((_t = notificationRuleItem.userCall) === null || _t === void 0 ? void 0 : _t.isVerified)) {
+            // send call for alert
+            if (options.userNotificationEventType ===
+                UserNotificationEventType.AlertCreated &&
+                alert) {
+                // create an error log.
+                logTimelineItem.status = UserNotificationStatus.Sending;
+                logTimelineItem.statusMessage = `Making a call to ${(_u = notificationRuleItem.userCall) === null || _u === void 0 ? void 0 : _u.phone.toString()}.`;
+                logTimelineItem.userCallId = notificationRuleItem.userCall.id;
+                const updatedLog = await UserOnCallLogTimelineService.create({
+                    data: logTimelineItem,
+                    props: {
+                        isRoot: true,
                     },
+                });
+                const callRequest = await this.generateCallTemplateForAlertCreated((_v = notificationRuleItem.userCall) === null || _v === void 0 ? void 0 : _v.phone, alert, updatedLog.id);
+                // send email.
+                CallService.makeCall(callRequest, {
+                    projectId: alert.projectId,
+                    userOnCallLogTimelineId: updatedLog.id,
+                }).catch(async (err) => {
+                    await UserOnCallLogTimelineService.updateOneById({
+                        id: updatedLog.id,
+                        data: {
+                            status: UserNotificationStatus.Error,
+                            statusMessage: err.message || "Error making call.",
+                        },
+                        props: {
+                            isRoot: true,
+                        },
+                    });
+                });
+            }
+            if (options.userNotificationEventType ===
+                UserNotificationEventType.IncidentCreated &&
+                incident) {
+                // send call for incident
+                logTimelineItem.status = UserNotificationStatus.Sending;
+                logTimelineItem.statusMessage = `Making a call to ${(_w = notificationRuleItem.userCall) === null || _w === void 0 ? void 0 : _w.phone.toString()}.`;
+                logTimelineItem.userCallId = notificationRuleItem.userCall.id;
+                const updatedLog = await UserOnCallLogTimelineService.create({
+                    data: logTimelineItem,
                     props: {
                         isRoot: true,
                     },
                 });
-            });
+                const callRequest = await this.generateCallTemplateForIncidentCreated((_x = notificationRuleItem.userCall) === null || _x === void 0 ? void 0 : _x.phone, incident, updatedLog.id);
+                // send email.
+                CallService.makeCall(callRequest, {
+                    projectId: incident.projectId,
+                    userOnCallLogTimelineId: updatedLog.id,
+                }).catch(async (err) => {
+                    await UserOnCallLogTimelineService.updateOneById({
+                        id: updatedLog.id,
+                        data: {
+                            status: UserNotificationStatus.Error,
+                            statusMessage: err.message || "Error making call.",
+                        },
+                        props: {
+                            isRoot: true,
+                        },
+                    });
+                });
+            }
         }
-        if (((_t = notificationRuleItem.userCall) === null || _t === void 0 ? void 0 : _t.phone) &&
-            !((_u = notificationRuleItem.userCall) === null || _u === void 0 ? void 0 : _u.isVerified)) {
+        if (((_y = notificationRuleItem.userCall) === null || _y === void 0 ? void 0 : _y.phone) &&
+            !((_z = notificationRuleItem.userCall) === null || _z === void 0 ? void 0 : _z.isVerified)) {
             // create a log.
             logTimelineItem.status = UserNotificationStatus.Error;
-            logTimelineItem.statusMessage = `Call not sent because phone ${(_v = notificationRuleItem.userCall) === null || _v === void 0 ? void 0 : _v.phone.toString()} is not verified.`;
+            logTimelineItem.statusMessage = `Call not sent because phone ${(_0 = notificationRuleItem.userCall) === null || _0 === void 0 ? void 0 : _0.phone.toString()} is not verified.`;
             await UserOnCallLogTimelineService.create({
                 data: logTimelineItem,
                 props: {
@@ -289,6 +420,42 @@ export class Service extends DatabaseService {
             });
         }
     }
+    async generateCallTemplateForAlertCreated(to, alert, userOnCallLogTimelineId) {
+        const host = await DatabaseConfig.getHost();
+        const httpProtocol = await DatabaseConfig.getHttpProtocol();
+        const callRequest = {
+            to: to,
+            data: [
+                {
+                    sayMessage: "This is a call from OneUptime",
+                },
+                {
+                    sayMessage: "A new alert has been created",
+                },
+                {
+                    sayMessage: alert.title,
+                },
+                {
+                    introMessage: "To acknowledge this alert press 1",
+                    numDigits: 1,
+                    timeoutInSeconds: 10,
+                    noInputMessage: "You have not entered any input. Good bye",
+                    onInputCallRequest: {
+                        "1": {
+                            sayMessage: "You have acknowledged this alert. Good bye",
+                        },
+                        default: {
+                            sayMessage: "Invalid input. Good bye",
+                        },
+                    },
+                    responseUrl: new URL(httpProtocol, host, new Route(AppApiRoute.toString())
+                        .addRoute(new UserOnCallLogTimeline().crudApiPath)
+                        .addRoute("/call/gather-input/" + userOnCallLogTimelineId.toString())),
+                },
+            ],
+        };
+        return callRequest;
+    }
     async generateCallTemplateForIncidentCreated(to, incident, userOnCallLogTimelineId) {
         const host = await DatabaseConfig.getHost();
         const httpProtocol = await DatabaseConfig.getHttpProtocol();
@@ -325,6 +492,19 @@ export class Service extends DatabaseService {
         };
         return callRequest;
     }
+    async generateSmsTemplateForAlertCreated(to, alert, userOnCallLogTimelineId) {
+        const host = await DatabaseConfig.getHost();
+        const httpProtocol = await DatabaseConfig.getHttpProtocol();
+        const shortUrl = await ShortLinkService.saveShortLinkFor(new URL(httpProtocol, host, new Route(AppApiRoute.toString())
+            .addRoute(new UserOnCallLogTimeline().crudApiPath)
+            .addRoute("/acknowledge/" + userOnCallLogTimelineId.toString())));
+        const url = await ShortLinkService.getShortenedUrl(shortUrl);
+        const sms = {
+            to,
+            message: `This is a message from OneUptime. A new alert has been created. ${alert.title}. To acknowledge this alert, please click on the following link ${url.toString()}`,
+        };
+        return sms;
+    }
     async generateSmsTemplateForIncidentCreated(to, incident, userOnCallLogTimelineId) {
         const host = await DatabaseConfig.getHost();
         const httpProtocol = await DatabaseConfig.getHttpProtocol();
@@ -338,6 +518,28 @@ export class Service extends DatabaseService {
         };
         return sms;
     }
+    async generateEmailTemplateForAlertCreated(to, alert, userOnCallLogTimelineId) {
+        const host = await DatabaseConfig.getHost();
+        const httpProtocol = await DatabaseConfig.getHttpProtocol();
+        const vars = {
+            alertTitle: alert.title,
+            projectName: alert.project.name,
+            currentState: alert.currentAlertState.name,
+            alertDescription: await Markdown.convertToHTML(alert.description || "", MarkdownContentType.Email),
+            alertSeverity: alert.alertSeverity.name,
+            alertViewLink: (await AlertService.getAlertLinkInDashboard(alert.projectId, alert.id)).toString(),
+            acknowledgeAlertLink: new URL(httpProtocol, host, new Route(AppApiRoute.toString())
+                .addRoute(new UserOnCallLogTimeline().crudApiPath)
+                .addRoute("/acknowledge/" + userOnCallLogTimelineId.toString())).toString(),
+        };
+        const emailMessage = {
+            toEmail: to,
+            templateType: EmailTemplateType.AcknowledgeAlert,
+            vars: vars,
+            subject: "ACTION REQUIRED: Alert created - " + alert.title,
+        };
+        return emailMessage;
+    }
     async generateEmailTemplateForIncidentCreated(to, incident, userOnCallLogTimelineId) {
         const host = await DatabaseConfig.getHost();
         const httpProtocol = await DatabaseConfig.getHttpProtocol();
@@ -369,6 +571,9 @@ export class Service extends DatabaseService {
         if (options.triggeredByIncidentId) {
             userOnCallLog.triggeredByIncidentId = options.triggeredByIncidentId;
         }
+        if (options.triggeredByAlertId) {
+            userOnCallLog.triggeredByAlertId = options.triggeredByAlertId;
+        }
         userOnCallLog.userNotificationEventType = options.userNotificationEventType;
         if (options.onCallPolicyExecutionLogId) {
             userOnCallLog.onCallDutyPolicyExecutionLogId =
@@ -414,7 +619,8 @@ export class Service extends DatabaseService {
             carryForward: null,
         };
     }
-    async addDefaultNotificationRuleForUser(projectId, userId, email) {
+    async addDefaultIncidentNotificationRuleForUser(data) {
+        const { projectId, userId, userEmail } = data;
         const incidentSeverities = await IncidentSeverityService.findBy({
             query: {
                 projectId,
@@ -428,40 +634,64 @@ export class Service extends DatabaseService {
                 _id: true,
             },
         });
-        //check userEmail
-        let userEmail = await UserEmailService.findOneBy({
+        // create for incident severities.
+        for (const incidentSeverity of incidentSeverities) {
+            //check if this rule already exists.
+            const existingRule = await this.findOneBy({
+                query: {
+                    projectId,
+                    userId,
+                    userEmailId: userEmail.id,
+                    incidentSeverityId: incidentSeverity.id,
+                    ruleType: NotificationRuleType.ON_CALL_EXECUTED,
+                },
+                props: {
+                    isRoot: true,
+                },
+            });
+            if (existingRule) {
+                continue; // skip this rule.
+            }
+            const notificationRule = new Model();
+            notificationRule.projectId = projectId;
+            notificationRule.userId = userId;
+            notificationRule.userEmailId = userEmail.id;
+            notificationRule.incidentSeverityId = incidentSeverity.id;
+            notificationRule.notifyAfterMinutes = 0;
+            notificationRule.ruleType = NotificationRuleType.ON_CALL_EXECUTED;
+            await this.create({
+                data: notificationRule,
+                props: {
+                    isRoot: true,
+                },
+            });
+        }
+    }
+    async addDefaultAlertNotificationRulesForUser(data) {
+        const { projectId, userId, userEmail } = data;
+        const alertSeverities = await AlertSeverityService.findBy({
             query: {
                 projectId,
-                userId,
-                email,
             },
             props: {
                 isRoot: true,
             },
+            limit: LIMIT_PER_PROJECT,
+            skip: 0,
+            select: {
+                _id: true,
+            },
         });
-        if (!userEmail) {
-            userEmail = new UserEmail();
-            userEmail.projectId = projectId;
-            userEmail.userId = userId;
-            userEmail.email = email;
-            userEmail.isVerified = true;
-            userEmail = await UserEmailService.create({
-                data: userEmail,
-                props: {
-                    isRoot: true,
-                },
-            });
-        }
-        // create for incident severities.
-        for (const incidentSeverity of incidentSeverities) {
+        // create for Alert severities.
+        for (const alertSeverity of alertSeverities) {
             //check if this rule already exists.
             const existingRule = await this.findOneBy({
                 query: {
                     projectId,
                     userId,
                     userEmailId: userEmail.id,
-                    incidentSeverityId: incidentSeverity.id,
-                    ruleType: NotificationRuleType.ON_CALL_INCIDENT_CREATED,
+                    alertSeverityId: alertSeverity.id,
+                    ruleType: NotificationRuleType.ON_CALL_EXECUTED,
                 },
                 props: {
                     isRoot: true,
@@ -474,9 +704,9 @@ export class Service extends DatabaseService {
             notificationRule.projectId = projectId;
             notificationRule.userId = userId;
             notificationRule.userEmailId = userEmail.id;
-            notificationRule.incidentSeverityId = incidentSeverity.id;
+            notificationRule.alertSeverityId = alertSeverity.id;
             notificationRule.notifyAfterMinutes = 0;
-            notificationRule.ruleType = NotificationRuleType.ON_CALL_INCIDENT_CREATED;
+            notificationRule.ruleType = NotificationRuleType.ON_CALL_EXECUTED;
             await this.create({
                 data: notificationRule,
                 props: {
@@ -484,6 +714,43 @@ export class Service extends DatabaseService {
                 },
             });
         }
+    }
+    async addDefaultNotificationRuleForUser(projectId, userId, email) {
+        let userEmail = await UserEmailService.findOneBy({
+            query: {
+                projectId,
+                userId,
+                email,
+            },
+            props: {
+                isRoot: true,
+            },
+        });
+        if (!userEmail) {
+            userEmail = new UserEmail();
+            userEmail.projectId = projectId;
+            userEmail.userId = userId;
+            userEmail.email = email;
+            userEmail.isVerified = true;
+            userEmail = await UserEmailService.create({
+                data: userEmail,
+                props: {
+                    isRoot: true,
+                },
+            });
+        }
+        // add default incident rules for user
+        await this.addDefaultIncidentNotificationRuleForUser({
+            projectId,
+            userId,
+            userEmail,
+        });
+        // add default alert rules for user, just like the incident
+        await this.addDefaultAlertNotificationRulesForUser({
+            projectId,
+            userId,
+            userEmail,
+        });
         //check if this rule already exists.
         const existingRuleOnCall = await this.findOneBy({
             query: {