@oneuptime/common 7.0.4917 → 7.0.4972

package/Server/Services/UserNotificationRuleService.ts

@@ -72,6 +72,7 @@ export class Service extends DatabaseService<Model> {
       userNotificationLogId: ObjectID;
       userBelongsToTeamId?: ObjectID | undefined;
       onCallDutyPolicyExecutionLogTimelineId?: ObjectID | undefined;
+      onCallScheduleId?: ObjectID | undefined;
     },
   ): Promise<void> {
     // get user notification log and see if this rule has already been executed. If so then skip.
@@ -295,6 +296,14 @@ export class Service extends DatabaseService<Model> {
         MailService.sendMail(emailMessage, {
           userOnCallLogTimelineId: updatedLog.id!,
           projectId: options.projectId,
+          alertId: alert.id!,
+          userId: notificationRuleItem.userId!,
+          onCallPolicyId: options.onCallPolicyId,
+          onCallPolicyEscalationRuleId: options.onCallPolicyEscalationRuleId,
+          teamId: options.userBelongsToTeamId,
+          onCallDutyPolicyExecutionLogTimelineId:
+            options.onCallDutyPolicyExecutionLogTimelineId,
+          onCallScheduleId: options.onCallScheduleId,
         }).catch(async (err: Error) => {
           await UserOnCallLogTimelineService.updateOneById({
             id: updatedLog.id!,
@@ -340,6 +349,14 @@ export class Service extends DatabaseService<Model> {
         MailService.sendMail(emailMessage, {
           userOnCallLogTimelineId: updatedLog.id!,
           projectId: options.projectId,
+          incidentId: incident.id!,
+          userId: notificationRuleItem.userId!,
+          onCallPolicyId: options.onCallPolicyId,
+          onCallPolicyEscalationRuleId: options.onCallPolicyEscalationRuleId,
+          teamId: options.userBelongsToTeamId,
+          onCallDutyPolicyExecutionLogTimelineId:
+            options.onCallDutyPolicyExecutionLogTimelineId,
+          onCallScheduleId: options.onCallScheduleId,
         }).catch(async (err: Error) => {
           await UserOnCallLogTimelineService.updateOneById({
             id: updatedLog.id!,
@@ -402,11 +419,19 @@ export class Service extends DatabaseService<Model> {
           updatedLog.id!,
         );
 
-        // send email.
+        // send sms.
 
         SmsService.sendSms(smsMessage, {
           projectId: alert.projectId,
           userOnCallLogTimelineId: updatedLog.id!,
+          alertId: alert.id!,
+          userId: notificationRuleItem.userId!,
+          onCallPolicyId: options.onCallPolicyId,
+          onCallPolicyEscalationRuleId: options.onCallPolicyEscalationRuleId,
+          teamId: options.userBelongsToTeamId,
+          onCallDutyPolicyExecutionLogTimelineId:
+            options.onCallDutyPolicyExecutionLogTimelineId,
+          onCallScheduleId: options.onCallScheduleId,
         }).catch(async (err: Error) => {
           await UserOnCallLogTimelineService.updateOneById({
             id: updatedLog.id!,
@@ -447,11 +472,19 @@ export class Service extends DatabaseService<Model> {
             updatedLog.id!,
           );
 
-        // send email.
+        // send sms.
 
         SmsService.sendSms(smsMessage, {
           projectId: incident.projectId,
           userOnCallLogTimelineId: updatedLog.id!,
+          incidentId: incident.id!,
+          userId: notificationRuleItem.userId!,
+          onCallPolicyId: options.onCallPolicyId,
+          onCallPolicyEscalationRuleId: options.onCallPolicyEscalationRuleId,
+          teamId: options.userBelongsToTeamId,
+          onCallDutyPolicyExecutionLogTimelineId:
+            options.onCallDutyPolicyExecutionLogTimelineId,
+          onCallScheduleId: options.onCallScheduleId,
         }).catch(async (err: Error) => {
           await UserOnCallLogTimelineService.updateOneById({
             id: updatedLog.id!,
@@ -514,11 +547,19 @@ export class Service extends DatabaseService<Model> {
             updatedLog.id!,
           );
 
-        // send email.
+        // send call.
 
         CallService.makeCall(callRequest, {
           projectId: alert.projectId,
           userOnCallLogTimelineId: updatedLog.id!,
+          alertId: alert.id!,
+          userId: notificationRuleItem.userId!,
+          onCallPolicyId: options.onCallPolicyId,
+          onCallPolicyEscalationRuleId: options.onCallPolicyEscalationRuleId,
+          teamId: options.userBelongsToTeamId,
+          onCallDutyPolicyExecutionLogTimelineId:
+            options.onCallDutyPolicyExecutionLogTimelineId,
+          onCallScheduleId: options.onCallScheduleId,
         }).catch(async (err: Error) => {
           await UserOnCallLogTimelineService.updateOneById({
             id: updatedLog.id!,
@@ -558,11 +599,19 @@ export class Service extends DatabaseService<Model> {
             updatedLog.id!,
           );
 
-        // send email.
+        // send call.
 
         CallService.makeCall(callRequest, {
           projectId: incident.projectId,
           userOnCallLogTimelineId: updatedLog.id!,
+          incidentId: incident.id!,
+          userId: notificationRuleItem.userId!,
+          onCallPolicyId: options.onCallPolicyId,
+          onCallPolicyEscalationRuleId: options.onCallPolicyEscalationRuleId,
+          teamId: options.userBelongsToTeamId,
+          onCallDutyPolicyExecutionLogTimelineId:
+            options.onCallDutyPolicyExecutionLogTimelineId,
+          onCallScheduleId: options.onCallScheduleId,
         }).catch(async (err: Error) => {
           await UserOnCallLogTimelineService.updateOneById({
             id: updatedLog.id!,
@@ -633,13 +682,28 @@ export class Service extends DatabaseService<Model> {
         // send push notification.
         PushNotificationService.sendPushNotification(
           {
-            deviceTokens: [notificationRuleItem.userPush.deviceToken!],
+            devices: [
+              {
+                token: notificationRuleItem.userPush.deviceToken!,
+                ...(notificationRuleItem.userPush.deviceName && {
+                  name: notificationRuleItem.userPush.deviceName,
+                }),
+              },
+            ],
             message: pushMessage,
             deviceType: notificationRuleItem.userPush.deviceType!,
           },
           {
             projectId: options.projectId,
             userOnCallLogTimelineId: updatedLog.id!,
+            alertId: alert.id!,
+            userId: notificationRuleItem.userId!,
+            onCallPolicyId: options.onCallPolicyId,
+            onCallPolicyEscalationRuleId: options.onCallPolicyEscalationRuleId,
+            teamId: options.userBelongsToTeamId,
+            onCallDutyPolicyExecutionLogTimelineId:
+              options.onCallDutyPolicyExecutionLogTimelineId,
+            onCallScheduleId: options.onCallScheduleId,
           },
         ).catch(async (err: Error) => {
           await UserOnCallLogTimelineService.updateOneById({
@@ -689,13 +753,28 @@ export class Service extends DatabaseService<Model> {
         // send push notification.
         PushNotificationService.sendPushNotification(
           {
-            deviceTokens: [notificationRuleItem.userPush.deviceToken!],
+            devices: [
+              {
+                token: notificationRuleItem.userPush.deviceToken!,
+                ...(notificationRuleItem.userPush.deviceName && {
+                  name: notificationRuleItem.userPush.deviceName,
+                }),
+              },
+            ],
             message: pushMessage,
             deviceType: notificationRuleItem.userPush.deviceType!,
           },
           {
             projectId: options.projectId,
             userOnCallLogTimelineId: updatedLog.id!,
+            incidentId: incident.id!,
+            userId: notificationRuleItem.userId!,
+            onCallPolicyId: options.onCallPolicyId,
+            onCallPolicyEscalationRuleId: options.onCallPolicyEscalationRuleId,
+            teamId: options.userBelongsToTeamId,
+            onCallDutyPolicyExecutionLogTimelineId:
+              options.onCallDutyPolicyExecutionLogTimelineId,
+            onCallScheduleId: options.onCallScheduleId,
           },
         ).catch(async (err: Error) => {
           await UserOnCallLogTimelineService.updateOneById({

package/Server/Services/UserNotificationSettingService.ts

@@ -39,6 +39,17 @@ export class Service extends DatabaseService<UserNotificationSetting> {
     smsMessage: SMSMessage;
     callRequestMessage: CallRequestMessage;
     pushNotificationMessage: PushNotificationMessage;
+    incidentId?: ObjectID | undefined;
+    alertId?: ObjectID | undefined;
+    scheduledMaintenanceId?: ObjectID | undefined;
+    statusPageId?: ObjectID | undefined;
+    statusPageAnnouncementId?: ObjectID | undefined;
+    teamId?: ObjectID | undefined;
+    // OnCall-related fields
+    onCallPolicyId?: ObjectID | undefined;
+    onCallPolicyEscalationRuleId?: ObjectID | undefined;
+    onCallDutyPolicyExecutionLogTimelineId?: ObjectID | undefined;
+    onCallScheduleId?: ObjectID | undefined;
   }): Promise<void> {
     if (!data.projectId) {
       throw new BadDataException(
@@ -91,6 +102,19 @@ export class Service extends DatabaseService<UserNotificationSetting> {
             },
             {
               projectId: data.projectId,
+              incidentId: data.incidentId,
+              alertId: data.alertId,
+              scheduledMaintenanceId: data.scheduledMaintenanceId,
+              statusPageId: data.statusPageId,
+              statusPageAnnouncementId: data.statusPageAnnouncementId,
+              userId: data.userId,
+              teamId: data.teamId,
+              // OnCall-related fields
+              onCallPolicyId: data.onCallPolicyId,
+              onCallPolicyEscalationRuleId: data.onCallPolicyEscalationRuleId,
+              onCallDutyPolicyExecutionLogTimelineId:
+                data.onCallDutyPolicyExecutionLogTimelineId,
+              onCallScheduleId: data.onCallScheduleId,
             },
           ).catch((err: Error) => {
             logger.error(err);
@@ -123,6 +147,19 @@ export class Service extends DatabaseService<UserNotificationSetting> {
             },
             {
               projectId: data.projectId,
+              incidentId: data.incidentId,
+              alertId: data.alertId,
+              scheduledMaintenanceId: data.scheduledMaintenanceId,
+              statusPageId: data.statusPageId,
+              statusPageAnnouncementId: data.statusPageAnnouncementId,
+              userId: data.userId,
+              teamId: data.teamId,
+              // OnCall-related fields
+              onCallPolicyId: data.onCallPolicyId,
+              onCallPolicyEscalationRuleId: data.onCallPolicyEscalationRuleId,
+              onCallDutyPolicyExecutionLogTimelineId:
+                data.onCallDutyPolicyExecutionLogTimelineId,
+              onCallScheduleId: data.onCallScheduleId,
             },
           ).catch((err: Error) => {
             logger.error(err);
@@ -155,6 +192,19 @@ export class Service extends DatabaseService<UserNotificationSetting> {
             },
             {
               projectId: data.projectId,
+              incidentId: data.incidentId,
+              alertId: data.alertId,
+              scheduledMaintenanceId: data.scheduledMaintenanceId,
+              statusPageId: data.statusPageId,
+              statusPageAnnouncementId: data.statusPageAnnouncementId,
+              userId: data.userId,
+              teamId: data.teamId,
+              // OnCall-related fields
+              onCallPolicyId: data.onCallPolicyId,
+              onCallPolicyEscalationRuleId: data.onCallPolicyEscalationRuleId,
+              onCallDutyPolicyExecutionLogTimelineId:
+                data.onCallDutyPolicyExecutionLogTimelineId,
+              onCallScheduleId: data.onCallScheduleId,
             },
           ).catch((err: Error) => {
             logger.error(err);
@@ -172,6 +222,14 @@ export class Service extends DatabaseService<UserNotificationSetting> {
           data.pushNotificationMessage,
           {
             projectId: data.projectId,
+            userId: data.userId,
+            teamId: data.teamId,
+            // OnCall-related fields
+            onCallPolicyId: data.onCallPolicyId,
+            onCallPolicyEscalationRuleId: data.onCallPolicyEscalationRuleId,
+            onCallDutyPolicyExecutionLogTimelineId:
+              data.onCallDutyPolicyExecutionLogTimelineId,
+            onCallScheduleId: data.onCallScheduleId,
           },
         ).catch((err: Error) => {
           logger.error(err);

package/Server/Services/UserOnCallLogService.ts

@@ -250,6 +250,7 @@ export class Service extends DatabaseService<Model> {
           userBelongsToTeamId: createdItem.userBelongsToTeamId,
           onCallDutyPolicyExecutionLogTimelineId:
             createdItem.onCallDutyPolicyExecutionLogTimelineId,
+          onCallScheduleId: createdItem.onCallDutyScheduleId,
         },
       );
     }

package/Server/Services/UserSmsService.ts

@@ -165,6 +165,7 @@ export class Service extends DatabaseService<Model> {
       {
         projectId: item.projectId,
         isSensitive: true,
+        userId: item.userId!,
       },
     ).catch((err: Error) => {
       logger.error(err);

package/Server/Services/WorkspaceNotificationLogService.ts

@@ -0,0 +1,276 @@
+import { IsBillingEnabled } from "../EnvironmentConfig";
+import DatabaseService from "./DatabaseService";
+import Model from "../../Models/DatabaseModels/WorkspaceNotificationLog";
+import WorkspaceNotificationStatus from "../../Types/Workspace/WorkspaceNotificationStatus";
+import WorkspaceNotificationActionType from "../../Types/Workspace/WorkspaceNotificationActionType";
+import WorkspaceType from "../../Types/Workspace/WorkspaceType";
+import ObjectID from "../../Types/ObjectID";
+import DatabaseCommonInteractionProps from "../../Types/BaseDatabase/DatabaseCommonInteractionProps";
+
+export interface WorkspaceLogData {
+  projectId: ObjectID;
+  workspaceType: WorkspaceType;
+  channelId?: string | undefined;
+  channelName?: string | undefined;
+  threadId?: string | undefined;
+  message?: string | undefined;
+  actionType: WorkspaceNotificationActionType;
+  status: WorkspaceNotificationStatus;
+  statusMessage?: string | undefined;
+
+  // Relations to resources (optional)
+  incidentId?: ObjectID | undefined;
+  alertId?: ObjectID | undefined;
+  scheduledMaintenanceId?: ObjectID | undefined;
+  userId?: ObjectID | undefined;
+  teamId?: ObjectID | undefined;
+  onCallDutyPolicyId?: ObjectID | undefined;
+  onCallDutyPolicyEscalationRuleId?: ObjectID | undefined;
+  onCallDutyPolicyScheduleId?: ObjectID | undefined;
+  statusPageId?: ObjectID | undefined;
+  statusPageAnnouncementId?: ObjectID | undefined;
+}
+
+export class Service extends DatabaseService<Model> {
+  public constructor() {
+    super(Model);
+    if (IsBillingEnabled) {
+      this.hardDeleteItemsOlderThanInDays("createdAt", 3);
+    }
+  }
+
+  public async createWorkspaceLog(
+    data: WorkspaceLogData,
+    props: DatabaseCommonInteractionProps,
+  ): Promise<Model> {
+    const log: Model = new Model();
+
+    // Required fields
+    log.projectId = data.projectId;
+    log.workspaceType = data.workspaceType;
+    log.actionType = data.actionType;
+    log.status = data.status;
+
+    // Optional fields
+    if (data.channelId) {
+      log.channelId = data.channelId;
+    }
+    if (data.channelName) {
+      log.channelName = data.channelName;
+    }
+    if (data.threadId) {
+      log.threadId = data.threadId;
+    }
+    if (data.message) {
+      log.message = data.message;
+    }
+    if (data.statusMessage) {
+      log.statusMessage = data.statusMessage;
+    }
+
+    // Resource relations
+    if (data.incidentId) {
+      log.incidentId = data.incidentId;
+    }
+    if (data.alertId) {
+      log.alertId = data.alertId;
+    }
+    if (data.scheduledMaintenanceId) {
+      log.scheduledMaintenanceId = data.scheduledMaintenanceId;
+    }
+    if (data.userId) {
+      log.userId = data.userId;
+    }
+    if (data.teamId) {
+      log.teamId = data.teamId;
+    }
+    if (data.onCallDutyPolicyId) {
+      log.onCallDutyPolicyId = data.onCallDutyPolicyId;
+    }
+    if (data.onCallDutyPolicyEscalationRuleId) {
+      log.onCallDutyPolicyEscalationRuleId =
+        data.onCallDutyPolicyEscalationRuleId;
+    }
+    if (data.onCallDutyPolicyScheduleId) {
+      log.onCallDutyPolicyScheduleId = data.onCallDutyPolicyScheduleId;
+    }
+    if (data.statusPageId) {
+      log.statusPageId = data.statusPageId;
+    }
+    if (data.statusPageAnnouncementId) {
+      log.statusPageAnnouncementId = data.statusPageAnnouncementId;
+    }
+
+    return await this.create({
+      data: log,
+      props,
+    });
+  }
+
+  public async logCreateChannel(
+    data: {
+      projectId: ObjectID;
+      workspaceType: WorkspaceType;
+      channelId: string;
+      channelName: string;
+      // Optional resource associations
+      incidentId?: ObjectID;
+      alertId?: ObjectID;
+      scheduledMaintenanceId?: ObjectID;
+      onCallDutyPolicyId?: ObjectID;
+      statusPageId?: ObjectID;
+      statusPageAnnouncementId?: ObjectID;
+    },
+    props: DatabaseCommonInteractionProps,
+  ): Promise<Model> {
+    const logData: WorkspaceLogData = {
+      projectId: data.projectId,
+      workspaceType: data.workspaceType,
+      channelId: data.channelId,
+      channelName: data.channelName,
+      actionType: WorkspaceNotificationActionType.CreateChannel,
+      status: WorkspaceNotificationStatus.Success,
+      statusMessage: "Channel created successfully",
+      message: `Channel "${data.channelName}" was created`,
+    };
+
+    // Add resource associations only if they exist
+    if (data.incidentId) {
+      logData.incidentId = data.incidentId;
+    }
+    if (data.alertId) {
+      logData.alertId = data.alertId;
+    }
+    if (data.scheduledMaintenanceId) {
+      logData.scheduledMaintenanceId = data.scheduledMaintenanceId;
+    }
+    if (data.onCallDutyPolicyId) {
+      logData.onCallDutyPolicyId = data.onCallDutyPolicyId;
+    }
+    if (data.statusPageId) {
+      logData.statusPageId = data.statusPageId;
+    }
+    if (data.statusPageAnnouncementId) {
+      logData.statusPageAnnouncementId = data.statusPageAnnouncementId;
+    }
+
+    return await this.createWorkspaceLog(logData, props);
+  }
+
+  public async logInviteUser(
+    data: {
+      projectId: ObjectID;
+      workspaceType: WorkspaceType;
+      channelId: string;
+      channelName: string;
+      userId: ObjectID;
+      // Optional resource associations
+      incidentId?: ObjectID;
+      alertId?: ObjectID;
+      scheduledMaintenanceId?: ObjectID;
+      onCallDutyPolicyId?: ObjectID;
+      statusPageId?: ObjectID;
+      statusPageAnnouncementId?: ObjectID;
+    },
+    props: DatabaseCommonInteractionProps,
+  ): Promise<Model> {
+    const logData: WorkspaceLogData = {
+      projectId: data.projectId,
+      workspaceType: data.workspaceType,
+      channelId: data.channelId,
+      channelName: data.channelName,
+      userId: data.userId,
+      actionType: WorkspaceNotificationActionType.InviteUser,
+      status: WorkspaceNotificationStatus.Success,
+      statusMessage: "User invited to channel successfully",
+      message: `User was invited to channel "${data.channelName}"`,
+    };
+
+    // Add resource associations only if they exist
+    if (data.incidentId) {
+      logData.incidentId = data.incidentId;
+    }
+    if (data.alertId) {
+      logData.alertId = data.alertId;
+    }
+    if (data.scheduledMaintenanceId) {
+      logData.scheduledMaintenanceId = data.scheduledMaintenanceId;
+    }
+    if (data.onCallDutyPolicyId) {
+      logData.onCallDutyPolicyId = data.onCallDutyPolicyId;
+    }
+    if (data.statusPageId) {
+      logData.statusPageId = data.statusPageId;
+    }
+    if (data.statusPageAnnouncementId) {
+      logData.statusPageAnnouncementId = data.statusPageAnnouncementId;
+    }
+
+    return await this.createWorkspaceLog(logData, props);
+  }
+
+  public async logButtonPressed(
+    data: {
+      projectId: ObjectID;
+      workspaceType: WorkspaceType;
+      channelId?: string;
+      channelName?: string;
+      threadId?: string;
+      userId: ObjectID;
+      buttonAction: string;
+      // Optional resource associations
+      incidentId?: ObjectID;
+      alertId?: ObjectID;
+      scheduledMaintenanceId?: ObjectID;
+      onCallDutyPolicyId?: ObjectID;
+      statusPageId?: ObjectID;
+      statusPageAnnouncementId?: ObjectID;
+    },
+    props: DatabaseCommonInteractionProps,
+  ): Promise<Model> {
+    const logData: WorkspaceLogData = {
+      projectId: data.projectId,
+      workspaceType: data.workspaceType,
+      userId: data.userId,
+      actionType: WorkspaceNotificationActionType.ButtonPressed,
+      status: WorkspaceNotificationStatus.Success,
+      statusMessage: "Button interaction completed",
+      message: `User pressed button: ${data.buttonAction}`,
+    };
+
+    // Add optional properties only if they exist
+    if (data.channelId) {
+      logData.channelId = data.channelId;
+    }
+    if (data.channelName) {
+      logData.channelName = data.channelName;
+    }
+    if (data.threadId) {
+      logData.threadId = data.threadId;
+    }
+
+    // Add resource associations only if they exist
+    if (data.incidentId) {
+      logData.incidentId = data.incidentId;
+    }
+    if (data.alertId) {
+      logData.alertId = data.alertId;
+    }
+    if (data.scheduledMaintenanceId) {
+      logData.scheduledMaintenanceId = data.scheduledMaintenanceId;
+    }
+    if (data.onCallDutyPolicyId) {
+      logData.onCallDutyPolicyId = data.onCallDutyPolicyId;
+    }
+    if (data.statusPageId) {
+      logData.statusPageId = data.statusPageId;
+    }
+    if (data.statusPageAnnouncementId) {
+      logData.statusPageAnnouncementId = data.statusPageAnnouncementId;
+    }
+
+    return await this.createWorkspaceLog(logData, props);
+  }
+}
+
+export default new Service();