@oneuptime/common 9.4.11 → 9.4.13

package/Server/Services/UserOnCallLogService.ts

@@ -21,6 +21,8 @@ import Alert from "../../Models/DatabaseModels/Alert";
 import AlertService from "./AlertService";
 import AlertEpisode from "../../Models/DatabaseModels/AlertEpisode";
 import AlertEpisodeService from "./AlertEpisodeService";
+import IncidentEpisode from "../../Models/DatabaseModels/IncidentEpisode";
+import IncidentEpisodeService from "./IncidentEpisodeService";
 
 export class Service extends DatabaseService<Model> {
   public constructor() {
@@ -206,6 +208,34 @@ export class Service extends DatabaseService<Model> {
       });
     }
 
+    // get rule count for incident episodes.
+    let incidentEpisode: IncidentEpisode | null = null;
+    if (createdItem.triggeredByIncidentEpisodeId) {
+      incidentEpisode = await IncidentEpisodeService.findOneById({
+        id: createdItem.triggeredByIncidentEpisodeId,
+        props: {
+          isRoot: true,
+        },
+        select: {
+          incidentSeverityId: true,
+        },
+      });
+
+      ruleCount = await UserNotificationRuleService.countBy({
+        query: {
+          userId: createdItem.userId!,
+          projectId: createdItem.projectId!,
+          ruleType: notificationRuleType,
+          incidentSeverityId: incidentEpisode?.incidentSeverityId as ObjectID,
+        },
+        skip: 0,
+        limit: LIMIT_PER_PROJECT,
+        props: {
+          isRoot: true,
+        },
+      });
+    }
+
     if (ruleCount.toNumber() === 0) {
       // update this item to be processed.
       await this.updateOneById({
@@ -239,6 +269,7 @@ export class Service extends DatabaseService<Model> {
     /*
      * find immediate notification rule and alert the user.
      * Determine the alertSeverityId - can come from alert or alertEpisode
+     * Determine the incidentSeverityId - can come from incident or incidentEpisode
      */
     const alertSeverityIdForQuery: ObjectID | undefined =
       alert && alert.alertSeverityId
@@ -247,6 +278,13 @@ export class Service extends DatabaseService<Model> {
           ? (alertEpisode.alertSeverityId as ObjectID)
           : undefined;
 
+    const incidentSeverityIdForQuery: ObjectID | undefined =
+      incident && incident.incidentSeverityId
+        ? (incident.incidentSeverityId as ObjectID)
+        : incidentEpisode && incidentEpisode.incidentSeverityId
+          ? (incidentEpisode.incidentSeverityId as ObjectID)
+          : undefined;
+
     const immediateNotificationRule: Array<UserNotificationRule> =
       await UserNotificationRuleService.findBy({
         query: {
@@ -254,10 +292,7 @@ export class Service extends DatabaseService<Model> {
           projectId: createdItem.projectId!,
           notifyAfterMinutes: 0,
           ruleType: notificationRuleType,
-          incidentSeverityId:
-            incident && incident.incidentSeverityId
-              ? (incident?.incidentSeverityId as ObjectID)
-              : undefined,
+          incidentSeverityId: incidentSeverityIdForQuery,
           alertSeverityId: alertSeverityIdForQuery,
         },
         select: {
@@ -279,6 +314,8 @@ export class Service extends DatabaseService<Model> {
           triggeredByIncidentId: createdItem.triggeredByIncidentId,
           triggeredByAlertId: createdItem.triggeredByAlertId,
           triggeredByAlertEpisodeId: createdItem.triggeredByAlertEpisodeId,
+          triggeredByIncidentEpisodeId:
+            createdItem.triggeredByIncidentEpisodeId,
           userNotificationEventType: createdItem.userNotificationEventType!,
           onCallPolicyExecutionLogId:
             createdItem.onCallDutyPolicyExecutionLogId,

package/Server/Services/UserService.ts

@@ -3,8 +3,9 @@ import {
   IsBillingEnabled,
   NotificationSlackWebhookOnCreateUser,
 } from "../EnvironmentConfig";
-import { OnCreate, OnUpdate } from "../Types/Database/Hooks";
+import { OnCreate, OnDelete, OnUpdate } from "../Types/Database/Hooks";
 import UpdateBy from "../Types/Database/UpdateBy";
+import DeleteBy from "../Types/Database/DeleteBy";
 import logger from "../Utils/Logger";
 import DatabaseService from "./DatabaseService";
 import EmailVerificationTokenService from "./EmailVerificationTokenService";
@@ -198,6 +199,49 @@ export class Service extends DatabaseService<Model> {
     return { updateBy, carryForward: carryForward };
   }
 
+  @CaptureSpan()
+  protected override async onBeforeDelete(
+    deleteBy: DeleteBy<Model>,
+  ): Promise<OnDelete<Model>> {
+    // Check if the user is a member of any project
+    const users: Array<Model> = await this.findBy({
+      query: deleteBy.query,
+      select: {
+        _id: true,
+      },
+      props: {
+        isRoot: true,
+      },
+      limit: LIMIT_MAX,
+      skip: 0,
+    });
+
+    for (const user of users) {
+      const teamMembers: Array<TeamMember> = await TeamMemberService.findBy({
+        query: {
+          userId: user.id!,
+        },
+        select: {
+          _id: true,
+          projectId: true,
+        },
+        limit: LIMIT_MAX,
+        skip: 0,
+        props: {
+          isRoot: true,
+        },
+      });
+
+      if (teamMembers.length > 0) {
+        throw new BadDataException(
+          "You cannot delete your account because you are a member of one or more projects. Please leave all projects before deleting your account.",
+        );
+      }
+    }
+
+    return { deleteBy, carryForward: null };
+  }
+
   @CaptureSpan()
   protected override async onUpdateSuccess(
     onUpdate: OnUpdate<Model>,

package/Server/Services/WhatsAppService.ts

@@ -27,6 +27,7 @@ export class WhatsAppService extends BaseService {
       incidentId?: ObjectID | undefined;
       alertId?: ObjectID | undefined;
       alertEpisodeId?: ObjectID | undefined;
+      incidentEpisodeId?: ObjectID | undefined;
       scheduledMaintenanceId?: ObjectID | undefined;
       statusPageId?: ObjectID | undefined;
       statusPageAnnouncementId?: ObjectID | undefined;

package/Server/Services/WorkspaceNotificationLogService.ts

@@ -21,6 +21,8 @@ export interface WorkspaceLogData {
   // Relations to resources (optional)
   incidentId?: ObjectID | undefined;
   alertId?: ObjectID | undefined;
+  alertEpisodeId?: ObjectID | undefined;
+  incidentEpisodeId?: ObjectID | undefined;
   scheduledMaintenanceId?: ObjectID | undefined;
   userId?: ObjectID | undefined;
   teamId?: ObjectID | undefined;
@@ -75,6 +77,12 @@ export class Service extends DatabaseService<Model> {
     if (data.alertId) {
       log.alertId = data.alertId;
     }
+    if (data.alertEpisodeId) {
+      log.alertEpisodeId = data.alertEpisodeId;
+    }
+    if (data.incidentEpisodeId) {
+      log.incidentEpisodeId = data.incidentEpisodeId;
+    }
     if (data.scheduledMaintenanceId) {
       log.scheduledMaintenanceId = data.scheduledMaintenanceId;
     }
@@ -221,6 +229,8 @@ export class Service extends DatabaseService<Model> {
       // Optional resource associations
       incidentId?: ObjectID;
       alertId?: ObjectID;
+      alertEpisodeId?: ObjectID;
+      incidentEpisodeId?: ObjectID;
       scheduledMaintenanceId?: ObjectID;
       onCallDutyPolicyId?: ObjectID;
       statusPageId?: ObjectID;
@@ -256,6 +266,12 @@ export class Service extends DatabaseService<Model> {
     if (data.alertId) {
       logData.alertId = data.alertId;
     }
+    if (data.alertEpisodeId) {
+      logData.alertEpisodeId = data.alertEpisodeId;
+    }
+    if (data.incidentEpisodeId) {
+      logData.incidentEpisodeId = data.incidentEpisodeId;
+    }
     if (data.scheduledMaintenanceId) {
       logData.scheduledMaintenanceId = data.scheduledMaintenanceId;
     }

package/Server/Services/WorkspaceNotificationRuleService.ts

@@ -50,6 +50,8 @@ import WorkspaceNotificationLogService from "./WorkspaceNotificationLogService";
 import WorkspaceNotificationStatus from "../../Types/Workspace/WorkspaceNotificationStatus";
 import WorkspaceNotificationActionType from "../../Types/Workspace/WorkspaceNotificationActionType";
 import ExceptionMessages from "../../Types/Exception/ExceptionMessages";
+import IncidentEpisode from "../../Models/DatabaseModels/IncidentEpisode";
+import IncidentEpisodeService from "./IncidentEpisodeService";
 
 export interface MessageBlocksByWorkspaceType {
   workspaceType: WorkspaceType;
@@ -60,6 +62,7 @@ export interface NotificationFor {
   incidentId?: ObjectID | undefined;
   alertId?: ObjectID | undefined;
   alertEpisodeId?: ObjectID | undefined;
+  incidentEpisodeId?: ObjectID | undefined;
   scheduledMaintenanceId?: ObjectID | undefined;
   monitorId?: ObjectID | undefined;
   onCallDutyPolicyId?: ObjectID | undefined;
@@ -749,6 +752,14 @@ export class Service extends DatabaseService<WorkspaceNotificationRule> {
       return NotificationRuleEventType.Incident;
     }
 
+    if (notificationFor.alertEpisodeId) {
+      return NotificationRuleEventType.AlertEpisode;
+    }
+
+    if (notificationFor.incidentEpisodeId) {
+      return NotificationRuleEventType.IncidentEpisode;
+    }
+
     if (notificationFor.monitorId) {
       return NotificationRuleEventType.Monitor;
     }
@@ -1949,6 +1960,12 @@ export class Service extends DatabaseService<WorkspaceNotificationRule> {
         [NotificationRuleConditionCheckOn.AlertEpisodeSeverity]: undefined,
         [NotificationRuleConditionCheckOn.AlertEpisodeState]: undefined,
         [NotificationRuleConditionCheckOn.AlertEpisodeLabels]: undefined,
+        [NotificationRuleConditionCheckOn.IncidentEpisodeTitle]: undefined,
+        [NotificationRuleConditionCheckOn.IncidentEpisodeDescription]:
+          undefined,
+        [NotificationRuleConditionCheckOn.IncidentEpisodeSeverity]: undefined,
+        [NotificationRuleConditionCheckOn.IncidentEpisodeState]: undefined,
+        [NotificationRuleConditionCheckOn.IncidentEpisodeLabels]: undefined,
       };
     }
 
@@ -2031,6 +2048,12 @@ export class Service extends DatabaseService<WorkspaceNotificationRule> {
         [NotificationRuleConditionCheckOn.AlertEpisodeSeverity]: undefined,
         [NotificationRuleConditionCheckOn.AlertEpisodeState]: undefined,
         [NotificationRuleConditionCheckOn.AlertEpisodeLabels]: undefined,
+        [NotificationRuleConditionCheckOn.IncidentEpisodeTitle]: undefined,
+        [NotificationRuleConditionCheckOn.IncidentEpisodeDescription]:
+          undefined,
+        [NotificationRuleConditionCheckOn.IncidentEpisodeSeverity]: undefined,
+        [NotificationRuleConditionCheckOn.IncidentEpisodeState]: undefined,
+        [NotificationRuleConditionCheckOn.IncidentEpisodeLabels]: undefined,
       };
     }
 
@@ -2119,6 +2142,12 @@ export class Service extends DatabaseService<WorkspaceNotificationRule> {
         [NotificationRuleConditionCheckOn.AlertEpisodeSeverity]: undefined,
         [NotificationRuleConditionCheckOn.AlertEpisodeState]: undefined,
         [NotificationRuleConditionCheckOn.AlertEpisodeLabels]: undefined,
+        [NotificationRuleConditionCheckOn.IncidentEpisodeTitle]: undefined,
+        [NotificationRuleConditionCheckOn.IncidentEpisodeDescription]:
+          undefined,
+        [NotificationRuleConditionCheckOn.IncidentEpisodeSeverity]: undefined,
+        [NotificationRuleConditionCheckOn.IncidentEpisodeState]: undefined,
+        [NotificationRuleConditionCheckOn.IncidentEpisodeLabels]: undefined,
       };
     }
 
@@ -2185,6 +2214,12 @@ export class Service extends DatabaseService<WorkspaceNotificationRule> {
         [NotificationRuleConditionCheckOn.AlertEpisodeSeverity]: undefined,
         [NotificationRuleConditionCheckOn.AlertEpisodeState]: undefined,
         [NotificationRuleConditionCheckOn.AlertEpisodeLabels]: undefined,
+        [NotificationRuleConditionCheckOn.IncidentEpisodeTitle]: undefined,
+        [NotificationRuleConditionCheckOn.IncidentEpisodeDescription]:
+          undefined,
+        [NotificationRuleConditionCheckOn.IncidentEpisodeSeverity]: undefined,
+        [NotificationRuleConditionCheckOn.IncidentEpisodeState]: undefined,
+        [NotificationRuleConditionCheckOn.IncidentEpisodeLabels]: undefined,
       };
     }
 
@@ -2250,6 +2285,87 @@ export class Service extends DatabaseService<WorkspaceNotificationRule> {
         [NotificationRuleConditionCheckOn.AlertEpisodeSeverity]: undefined,
         [NotificationRuleConditionCheckOn.AlertEpisodeState]: undefined,
         [NotificationRuleConditionCheckOn.AlertEpisodeLabels]: undefined,
+        [NotificationRuleConditionCheckOn.IncidentEpisodeTitle]: undefined,
+        [NotificationRuleConditionCheckOn.IncidentEpisodeDescription]:
+          undefined,
+        [NotificationRuleConditionCheckOn.IncidentEpisodeSeverity]: undefined,
+        [NotificationRuleConditionCheckOn.IncidentEpisodeState]: undefined,
+        [NotificationRuleConditionCheckOn.IncidentEpisodeLabels]: undefined,
+      };
+    }
+
+    // Handle Incident Episode
+    if (data.notificationFor.incidentEpisodeId) {
+      logger.debug("Fetching incident episode details for ID:");
+      logger.debug(data.notificationFor.incidentEpisodeId);
+
+      const incidentEpisode: IncidentEpisode | null =
+        await IncidentEpisodeService.findOneById({
+          id: data.notificationFor.incidentEpisodeId,
+          select: {
+            title: true,
+            description: true,
+            incidentSeverity: true,
+            currentIncidentState: true,
+            labels: true,
+          },
+          props: {
+            isRoot: true,
+          },
+        });
+
+      if (!incidentEpisode) {
+        logger.debug("Incident Episode not found for ID:");
+        logger.debug(data.notificationFor.incidentEpisodeId);
+        throw new BadDataException("Incident Episode ID not found");
+      }
+
+      logger.debug("Incident Episode details retrieved:");
+      logger.debug(incidentEpisode);
+
+      return {
+        [NotificationRuleConditionCheckOn.MonitorName]: undefined,
+        [NotificationRuleConditionCheckOn.IncidentTitle]: undefined,
+        [NotificationRuleConditionCheckOn.IncidentDescription]: undefined,
+        [NotificationRuleConditionCheckOn.IncidentSeverity]: undefined,
+        [NotificationRuleConditionCheckOn.IncidentState]: undefined,
+        [NotificationRuleConditionCheckOn.MonitorType]: undefined,
+        [NotificationRuleConditionCheckOn.MonitorStatus]: undefined,
+        [NotificationRuleConditionCheckOn.AlertTitle]: undefined,
+        [NotificationRuleConditionCheckOn.AlertDescription]: undefined,
+        [NotificationRuleConditionCheckOn.AlertSeverity]: undefined,
+        [NotificationRuleConditionCheckOn.AlertState]: undefined,
+        [NotificationRuleConditionCheckOn.ScheduledMaintenanceTitle]: undefined,
+        [NotificationRuleConditionCheckOn.ScheduledMaintenanceDescription]:
+          undefined,
+        [NotificationRuleConditionCheckOn.ScheduledMaintenanceState]: undefined,
+        [NotificationRuleConditionCheckOn.IncidentLabels]: undefined,
+        [NotificationRuleConditionCheckOn.AlertLabels]: undefined,
+        [NotificationRuleConditionCheckOn.MonitorLabels]: undefined,
+        [NotificationRuleConditionCheckOn.ScheduledMaintenanceLabels]:
+          undefined,
+        [NotificationRuleConditionCheckOn.Monitors]: undefined,
+        [NotificationRuleConditionCheckOn.OnCallDutyPolicyName]: undefined,
+        [NotificationRuleConditionCheckOn.OnCallDutyPolicyDescription]:
+          undefined,
+        [NotificationRuleConditionCheckOn.OnCallDutyPolicyLabels]: undefined,
+        [NotificationRuleConditionCheckOn.AlertEpisodeTitle]: undefined,
+        [NotificationRuleConditionCheckOn.AlertEpisodeDescription]: undefined,
+        [NotificationRuleConditionCheckOn.AlertEpisodeSeverity]: undefined,
+        [NotificationRuleConditionCheckOn.AlertEpisodeState]: undefined,
+        [NotificationRuleConditionCheckOn.AlertEpisodeLabels]: undefined,
+        [NotificationRuleConditionCheckOn.IncidentEpisodeTitle]:
+          incidentEpisode.title || "",
+        [NotificationRuleConditionCheckOn.IncidentEpisodeDescription]:
+          incidentEpisode.description || "",
+        [NotificationRuleConditionCheckOn.IncidentEpisodeSeverity]:
+          incidentEpisode.incidentSeverity?._id?.toString() || "",
+        [NotificationRuleConditionCheckOn.IncidentEpisodeState]:
+          incidentEpisode.currentIncidentState?._id?.toString() || "",
+        [NotificationRuleConditionCheckOn.IncidentEpisodeLabels]:
+          incidentEpisode.labels?.map((label: Label) => {
+            return label._id?.toString() || "";
+          }) || [],
       };
     }
 

package/Server/Types/Database/Permissions/TenantPermission.ts

@@ -3,6 +3,7 @@ import Query from "../Query";
 import Select from "../Select";
 import BasePermission, { CheckPermissionBaseInterface } from "./BasePermission";
 import BaseModel from "../../../../Models/DatabaseModels/DatabaseBaseModel/DatabaseBaseModel";
+import Includes from "../../../../Types/BaseDatabase/Includes";
 import DatabaseCommonInteractionProps from "../../../../Types/BaseDatabase/DatabaseCommonInteractionProps";
 import BadDataException from "../../../../Types/Exception/BadDataException";
 import NotAuthorizedException from "../../../../Types/Exception/NotAuthorizedException";
@@ -61,6 +62,25 @@ export default class TenantPermission {
         projectIDs = props.userGlobalAccessPermission?.projectIds;
       }
 
+      /*
+       * Check if the query already has a filter on the tenant column (e.g., projectId filter)
+       * If so, only iterate through projects that match both the filter AND user's permissions
+       */
+      const existingTenantFilter: unknown = (query as any)[tenantColumn];
+      if (existingTenantFilter && existingTenantFilter instanceof Includes) {
+        const filterValues: Array<string> = (
+          existingTenantFilter as Includes
+        ).values.map((v: string | ObjectID | number) => {
+          return v.toString();
+        });
+        // Filter projectIDs to only include those that are in the filter
+        projectIDs = projectIDs.filter((pid: ObjectID) => {
+          return filterValues.includes(pid.toString());
+        });
+        // Remove the tenant filter from query since we're handling it via projectIDs iteration
+        delete (query as any)[tenantColumn];
+      }
+
       let lastException: Error | null = null;
 
       for (const projectId of projectIDs) {