@oneuptime/common 11.3.20 → 11.3.22

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

@@ -0,0 +1,231 @@
+var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
+    var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
+    if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
+    else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
+    return c > 3 && r && Object.defineProperty(target, key, r), r;
+};
+var __metadata = (this && this.__metadata) || function (k, v) {
+    if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
+};
+import SortOrder from "../../Types/BaseDatabase/SortOrder";
+import DatabaseService from "./DatabaseService";
+import Model from "../../Models/DatabaseModels/IncidentReminderRule";
+import IncidentService from "./IncidentService";
+import IncidentStateService from "./IncidentStateService";
+import QueryHelper from "../Types/Database/QueryHelper";
+import LIMIT_MAX, { LIMIT_PER_PROJECT } from "../../Types/Database/LimitMax";
+import ObjectID from "../../Types/ObjectID";
+import CaptureSpan from "../Utils/Telemetry/CaptureSpan";
+import logger from "../Utils/Logger";
+import { IsBillingEnabled } from "../EnvironmentConfig";
+export class Service extends DatabaseService {
+    constructor() {
+        super(Model);
+        if (IsBillingEnabled) {
+            this.hardDeleteItemsOlderThanInDays("createdAt", 3 * 365); // 3 years
+        }
+    }
+    async onBeforeCreate(createBy) {
+        // Auto-assign order on creation
+        if (!createBy.data.order) {
+            const highestOrderRule = await this.findOneBy({
+                query: {
+                    projectId: createBy.data.projectId,
+                },
+                select: {
+                    order: true,
+                },
+                sort: {
+                    order: SortOrder.Descending,
+                },
+                props: {
+                    isRoot: true,
+                },
+            });
+            createBy.data.order = ((highestOrderRule === null || highestOrderRule === void 0 ? void 0 : highestOrderRule.order) || 0) + 1;
+        }
+        return {
+            createBy,
+            carryForward: null,
+        };
+    }
+    async onCreateSuccess(_onCreate, createdItem) {
+        if (createdItem.projectId) {
+            await this.refreshSchedulesForOpenIncidents(createdItem.projectId);
+        }
+        return createdItem;
+    }
+    async onUpdateSuccess(onUpdate, _updatedItemIds) {
+        const projectId = onUpdate.updateBy.props.tenantId;
+        if (projectId) {
+            await this.refreshSchedulesForOpenIncidents(projectId);
+        }
+        return onUpdate;
+    }
+    async onDeleteSuccess(onDelete, _itemIdsBeforeDelete) {
+        const projectId = onDelete.deleteBy.props.tenantId;
+        if (projectId) {
+            await this.refreshSchedulesForOpenIncidents(projectId);
+        }
+        return onDelete;
+    }
+    async refreshSchedulesForOpenIncidents(projectId) {
+        try {
+            const unresolvedStates = await IncidentStateService.findBy({
+                query: {
+                    projectId: projectId,
+                    isResolvedState: false,
+                },
+                select: {
+                    _id: true,
+                },
+                limit: LIMIT_PER_PROJECT,
+                skip: 0,
+                props: {
+                    isRoot: true,
+                },
+            });
+            const unresolvedStateIds = unresolvedStates
+                .map((state) => {
+                return state.id;
+            })
+                .filter(Boolean);
+            if (unresolvedStateIds.length === 0) {
+                return;
+            }
+            const openIncidents = await IncidentService.findBy({
+                query: {
+                    projectId: projectId,
+                    currentIncidentStateId: QueryHelper.any(unresolvedStateIds),
+                },
+                select: {
+                    _id: true,
+                },
+                limit: LIMIT_MAX,
+                skip: 0,
+                props: {
+                    isRoot: true,
+                },
+            });
+            for (const incident of openIncidents) {
+                try {
+                    await IncidentService.refreshReminderSchedule({
+                        incidentId: incident.id,
+                        projectId: projectId,
+                    });
+                }
+                catch (error) {
+                    logger.error(`Failed to refresh reminder schedule for incident ${incident.id}: ${error}`, { projectId: projectId === null || projectId === void 0 ? void 0 : projectId.toString() });
+                }
+            }
+        }
+        catch (error) {
+            logger.error(`Failed to refresh reminder schedules for open incidents: ${error}`, { projectId: projectId === null || projectId === void 0 ? void 0 : projectId.toString() });
+        }
+    }
+    async findMatchingRule(data) {
+        var _a;
+        // Get all enabled rules sorted by order. First matching rule wins.
+        const rules = await this.findBy({
+            query: {
+                projectId: data.projectId,
+                isEnabled: true,
+            },
+            sort: {
+                order: SortOrder.Ascending,
+            },
+            select: {
+                _id: true,
+                name: true,
+                order: true,
+                reminderIntervalInMinutes: true,
+                stopRemindersOnState: true,
+                incidentSeverities: {
+                    _id: true,
+                },
+                labels: {
+                    _id: true,
+                },
+            },
+            limit: 100,
+            skip: 0,
+            props: {
+                isRoot: true,
+            },
+        });
+        for (const rule of rules) {
+            if (rule.incidentSeverities && rule.incidentSeverities.length > 0) {
+                if (!data.incidentSeverityId) {
+                    continue;
+                }
+                const severityIds = rule.incidentSeverities.map((severity) => {
+                    var _a;
+                    return ((_a = severity.id) === null || _a === void 0 ? void 0 : _a.toString()) || "";
+                });
+                if (!severityIds.includes(data.incidentSeverityId.toString())) {
+                    continue;
+                }
+            }
+            if (rule.labels && rule.labels.length > 0) {
+                if (!data.labelIds || data.labelIds.length === 0) {
+                    continue;
+                }
+                const ruleLabelIds = rule.labels.map((label) => {
+                    var _a;
+                    return ((_a = label.id) === null || _a === void 0 ? void 0 : _a.toString()) || "";
+                });
+                const hasMatchingLabel = data.labelIds.some((labelId) => {
+                    return ruleLabelIds.includes(labelId.toString());
+                });
+                if (!hasMatchingLabel) {
+                    continue;
+                }
+            }
+            /*
+             * Rule matched: (no severities OR severity matches) AND
+             * (no labels OR labels intersect). A rule with neither matches all.
+             */
+            logger.debug(`Incident reminder rule ${rule.name || rule.id} matched for project ${data.projectId}`, { projectId: (_a = data.projectId) === null || _a === void 0 ? void 0 : _a.toString() });
+            return rule;
+        }
+        return null;
+    }
+}
+__decorate([
+    CaptureSpan(),
+    __metadata("design:type", Function),
+    __metadata("design:paramtypes", [Object]),
+    __metadata("design:returntype", Promise)
+], Service.prototype, "onBeforeCreate", null);
+__decorate([
+    CaptureSpan(),
+    __metadata("design:type", Function),
+    __metadata("design:paramtypes", [Object, Model]),
+    __metadata("design:returntype", Promise)
+], Service.prototype, "onCreateSuccess", null);
+__decorate([
+    CaptureSpan(),
+    __metadata("design:type", Function),
+    __metadata("design:paramtypes", [Object, Array]),
+    __metadata("design:returntype", Promise)
+], Service.prototype, "onUpdateSuccess", null);
+__decorate([
+    CaptureSpan(),
+    __metadata("design:type", Function),
+    __metadata("design:paramtypes", [Object, Array]),
+    __metadata("design:returntype", Promise)
+], Service.prototype, "onDeleteSuccess", null);
+__decorate([
+    CaptureSpan(),
+    __metadata("design:type", Function),
+    __metadata("design:paramtypes", [ObjectID]),
+    __metadata("design:returntype", Promise)
+], Service.prototype, "refreshSchedulesForOpenIncidents", null);
+__decorate([
+    CaptureSpan(),
+    __metadata("design:type", Function),
+    __metadata("design:paramtypes", [Object]),
+    __metadata("design:returntype", Promise)
+], Service.prototype, "findMatchingRule", null);
+export default new Service();
+//# sourceMappingURL=IncidentReminderRuleService.js.map

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

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

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

@@ -53,6 +53,7 @@ import logger from "../Utils/Logger";
 import Semaphore from "../Infrastructure/Semaphore";
 import IncidentFeedService from "./IncidentFeedService";
 import IncidentSlaService from "./IncidentSlaService";
+import IncidentReminderRuleService from "./IncidentReminderRuleService";
 import { setIsPublicForMarkdownImages } from "../Utils/InlineImageAccessTokenSync";
 import { IncidentFeedEventType } from "../../Models/DatabaseModels/IncidentFeed";
 import IncidentGroupingEngineService from "./IncidentGroupingEngineService";
@@ -157,6 +158,49 @@ export class Service extends DatabaseService {
         }
         return false;
     }
+    async refreshReminderSchedule(data) {
+        var _a;
+        const incident = await this.findOneById({
+            id: data.incidentId,
+            select: {
+                enableReminders: true,
+                incidentSeverityId: true,
+                labels: {
+                    _id: true,
+                },
+            },
+            props: {
+                isRoot: true,
+            },
+        });
+        if (!incident) {
+            return;
+        }
+        let nextReminderNotificationAt = null;
+        if (incident.enableReminders !== false) {
+            const matchingRule = await IncidentReminderRuleService.findMatchingRule({
+                projectId: data.projectId,
+                incidentSeverityId: incident.incidentSeverityId,
+                labelIds: (_a = incident.labels) === null || _a === void 0 ? void 0 : _a.map((label) => {
+                    return label.id;
+                }),
+            });
+            if (matchingRule &&
+                matchingRule.reminderIntervalInMinutes &&
+                !(await this.isIncidentResolved({ incidentId: data.incidentId }))) {
+                nextReminderNotificationAt = OneUptimeDate.addRemoveMinutes(OneUptimeDate.getCurrentDate(), matchingRule.reminderIntervalInMinutes);
+            }
+        }
+        await this.updateOneById({
+            id: data.incidentId,
+            data: {
+                nextReminderNotificationAt: nextReminderNotificationAt,
+            },
+            props: {
+                isRoot: true,
+            },
+        });
+    }
     async resolveIncident(incidentId, resolvedByUserId) {
         // check if the incident is already resolved.
         const isIncidentResolved = await this.isIncidentResolved({
@@ -873,6 +917,25 @@ export class Service extends DatabaseService {
                     userId: (_c = createdItem.createdByUserId) === null || _c === void 0 ? void 0 : _c.toString(),
                 });
             }
+        })
+            .then(async () => {
+            var _a, _b, _c;
+            // Schedule reminder notifications for incident if a matching reminder rule exists
+            try {
+                if (createdItem.projectId && createdItem.id) {
+                    await this.refreshReminderSchedule({
+                        incidentId: createdItem.id,
+                        projectId: createdItem.projectId,
+                    });
+                }
+            }
+            catch (error) {
+                logger.error(`Reminder scheduling failed in IncidentService.onCreateSuccess: ${error}`, {
+                    projectId: (_a = createdItem.projectId) === null || _a === void 0 ? void 0 : _a.toString(),
+                    incidentId: (_b = createdItem.id) === null || _b === void 0 ? void 0 : _b.toString(),
+                    userId: (_c = createdItem.createdByUserId) === null || _c === void 0 ? void 0 : _c.toString(),
+                });
+            }
         })
             .catch((error) => {
             var _a, _b, _c;
@@ -1296,6 +1359,21 @@ ${incident.remediationNotes || "No remediation notes provided."}
                         },
                     });
                 }
+                // Re-evaluate reminder schedule when reminders are enabled or disabled for this incident
+                if (Object.prototype.hasOwnProperty.call(updatedIncidentData, "enableReminders")) {
+                    try {
+                        await this.refreshReminderSchedule({
+                            incidentId: incidentId,
+                            projectId: projectId,
+                        });
+                    }
+                    catch (reminderError) {
+                        logger.error(`Reminder rescheduling failed in IncidentService.onUpdateSuccess: ${reminderError}`, {
+                            projectId: projectId === null || projectId === void 0 ? void 0 : projectId.toString(),
+                            incidentId: incidentId === null || incidentId === void 0 ? void 0 : incidentId.toString(),
+                        });
+                    }
+                }
                 // emit postmortem completion time metric when postmortemPostedAt is set
                 if (Object.prototype.hasOwnProperty.call(updatedIncidentData, "postmortemPostedAt") &&
                     updatedIncidentData["postmortemPostedAt"]) {
@@ -1468,6 +1546,25 @@ ${labels
                         shouldAddIncidentFeed = true;
                     }
                 }
+                /*
+                 * Re-match reminder rule on any labels change (including clearing all
+                 * labels), since labels can change which reminder rule matches.
+                 */
+                if (updatedIncidentData.labels &&
+                    Array.isArray(updatedIncidentData.labels)) {
+                    try {
+                        await this.refreshReminderSchedule({
+                            incidentId: incidentId,
+                            projectId: projectId,
+                        });
+                    }
+                    catch (reminderError) {
+                        logger.error(`Reminder rescheduling failed in IncidentService.onUpdateSuccess: ${reminderError}`, {
+                            projectId: projectId === null || projectId === void 0 ? void 0 : projectId.toString(),
+                            incidentId: incidentId === null || incidentId === void 0 ? void 0 : incidentId.toString(),
+                        });
+                    }
+                }
                 if (updatedIncidentData.incidentSeverity &&
                     updatedIncidentData.incidentSeverity._id) {
                     const incidentSeverity = await IncidentSeverityService.findOneBy({
@@ -1498,6 +1595,19 @@ ${incidentSeverity.name}
                                 incidentId: incidentId === null || incidentId === void 0 ? void 0 : incidentId.toString(),
                             });
                         }
+                        // Re-match reminder rule when severity changes
+                        try {
+                            await this.refreshReminderSchedule({
+                                incidentId: incidentId,
+                                projectId: projectId,
+                            });
+                        }
+                        catch (reminderError) {
+                            logger.error(`Reminder rescheduling failed in IncidentService.onUpdateSuccess: ${reminderError}`, {
+                                projectId: projectId === null || projectId === void 0 ? void 0 : projectId.toString(),
+                                incidentId: incidentId === null || incidentId === void 0 ? void 0 : incidentId.toString(),
+                            });
+                        }
                         // emit severity change metric
                         try {
                             const severityChangeMetric = new MutableMetric();
@@ -2496,6 +2606,12 @@ __decorate([
     __metadata("design:paramtypes", [Object]),
     __metadata("design:returntype", Promise)
 ], Service.prototype, "isIncidentAcknowledged", null);
+__decorate([
+    CaptureSpan(),
+    __metadata("design:type", Function),
+    __metadata("design:paramtypes", [Object]),
+    __metadata("design:returntype", Promise)
+], Service.prototype, "refreshReminderSchedule", null);
 __decorate([
     CaptureSpan(),
     __metadata("design:type", Function),