@oneuptime/common 7.0.4917 → 7.0.4972

package/Server/Services/MailService.ts

@@ -21,6 +21,18 @@ export class MailService extends BaseService {
       mailServer?: EmailServer | undefined;
       userOnCallLogTimelineId?: ObjectID;
       projectId?: ObjectID | undefined;
+      incidentId?: ObjectID | undefined;
+      alertId?: ObjectID | undefined;
+      scheduledMaintenanceId?: ObjectID | undefined;
+      statusPageId?: ObjectID | undefined;
+      statusPageAnnouncementId?: ObjectID | undefined;
+      userId?: ObjectID | undefined;
+      // On-call policy related fields
+      onCallPolicyId?: ObjectID | undefined;
+      onCallPolicyEscalationRuleId?: ObjectID | undefined;
+      onCallDutyPolicyExecutionLogTimelineId?: ObjectID | undefined;
+      onCallScheduleId?: ObjectID | undefined;
+      teamId?: ObjectID | undefined;
     },
   ): Promise<HTTPResponse<EmptyResponseData>> {
     const body: JSONObject = {
@@ -48,6 +60,54 @@ export class MailService extends BaseService {
       body["projectId"] = options.projectId.toString();
     }
 
+    if (options?.incidentId) {
+      body["incidentId"] = options.incidentId.toString();
+    }
+
+    if (options?.alertId) {
+      body["alertId"] = options.alertId.toString();
+    }
+
+    if (options?.scheduledMaintenanceId) {
+      body["scheduledMaintenanceId"] =
+        options.scheduledMaintenanceId.toString();
+    }
+
+    if (options?.statusPageId) {
+      body["statusPageId"] = options.statusPageId.toString();
+    }
+
+    if (options?.statusPageAnnouncementId) {
+      body["statusPageAnnouncementId"] =
+        options.statusPageAnnouncementId.toString();
+    }
+
+    if (options?.userId) {
+      body["userId"] = options.userId.toString();
+    }
+
+    if (options?.onCallPolicyId) {
+      body["onCallPolicyId"] = options.onCallPolicyId.toString();
+    }
+
+    if (options?.onCallPolicyEscalationRuleId) {
+      body["onCallPolicyEscalationRuleId"] =
+        options.onCallPolicyEscalationRuleId.toString();
+    }
+
+    if (options?.onCallDutyPolicyExecutionLogTimelineId) {
+      body["onCallDutyPolicyExecutionLogTimelineId"] =
+        options.onCallDutyPolicyExecutionLogTimelineId.toString();
+    }
+
+    if (options?.onCallScheduleId) {
+      body["onCallScheduleId"] = options.onCallScheduleId.toString();
+    }
+
+    if (options?.teamId) {
+      body["teamId"] = options.teamId.toString();
+    }
+
     return await API.post<EmptyResponseData>(
       new URL(
         Protocol.HTTP,

package/Server/Services/OnCallDutyPolicyEscalationRuleUserService.ts

@@ -126,6 +126,9 @@ export class Service extends DatabaseService<Model> {
       pushNotificationMessage: pushMessage,
       eventType:
         NotificationSettingEventType.SEND_WHEN_USER_IS_ADDED_TO_ON_CALL_POLICY,
+      onCallPolicyId: createdModel.onCallDutyPolicy!.id!,
+      onCallPolicyEscalationRuleId:
+        createdModel.onCallDutyPolicyEscalationRule!.id!,
     });
 
     // add workspace message.
@@ -328,6 +331,9 @@ export class Service extends DatabaseService<Model> {
         pushNotificationMessage: pushMessage,
         eventType:
           NotificationSettingEventType.SEND_WHEN_USER_IS_REMOVED_FROM_ON_CALL_POLICY,
+        onCallPolicyId: deletedItem.onCallDutyPolicy!.id!,
+        onCallPolicyEscalationRuleId:
+          deletedItem.onCallDutyPolicyEscalationRule!.id!,
       });
     }
 

package/Server/Services/OnCallDutyPolicyScheduleService.ts

@@ -272,6 +272,10 @@ export class Service extends DatabaseService<OnCallDutyPolicySchedule> {
             pushNotificationMessage: pushMessage,
             eventType:
               NotificationSettingEventType.SEND_WHEN_USER_IS_NO_LONGER_ACTIVE_ON_ON_CALL_ROSTER,
+            onCallPolicyId: escalationRule.onCallDutyPolicy!.id!,
+            onCallPolicyEscalationRuleId:
+              escalationRule.onCallDutyPolicyEscalationRule!.id!,
+            onCallScheduleId: data.scheduleId,
           });
 
           // add end log for user.
@@ -388,6 +392,10 @@ export class Service extends DatabaseService<OnCallDutyPolicySchedule> {
             pushNotificationMessage: pushMessage,
             eventType:
               NotificationSettingEventType.SEND_WHEN_USER_IS_ON_CALL_ROSTER,
+            onCallPolicyId: escalationRule.onCallDutyPolicy!.id!,
+            onCallPolicyEscalationRuleId:
+              escalationRule.onCallDutyPolicyEscalationRule!.id!,
+            onCallScheduleId: data.scheduleId,
           });
 
           // add start log for user.
@@ -524,6 +532,10 @@ export class Service extends DatabaseService<OnCallDutyPolicySchedule> {
             pushNotificationMessage: pushMessage,
             eventType:
               NotificationSettingEventType.SEND_WHEN_USER_IS_NEXT_ON_CALL_ROSTER,
+            onCallPolicyId: escalationRule.onCallDutyPolicy!.id!,
+            onCallPolicyEscalationRuleId:
+              escalationRule.onCallDutyPolicyEscalationRule!.id!,
+            onCallScheduleId: data.scheduleId,
           });
 
           const onCallDutyPolicyId: ObjectID =

package/Server/Services/ProjectService.ts

@@ -45,7 +45,6 @@ import {
 import Color from "../../Types/Color";
 import LIMIT_MAX from "../../Types/Database/LimitMax";
 import OneUptimeDate from "../../Types/Date";
-import Email from "../../Types/Email";
 import EmailTemplateType from "../../Types/Email/EmailTemplateType";
 import BadDataException from "../../Types/Exception/BadDataException";
 import NotAuthorizedException from "../../Types/Exception/NotAuthorizedException";
@@ -1276,14 +1275,10 @@ export class ProjectService extends DatabaseService<Model> {
       return;
     }
 
-    const emails: Array<Email> = owners.map((owner: User) => {
-      return owner.email!;
-    });
-
-    for (const email of emails) {
+    for (const owner of owners) {
       MailService.sendMail(
         {
-          toEmail: email,
+          toEmail: owner.email!,
           templateType: EmailTemplateType.SimpleMessage,
           vars: {
             subject: subject,
@@ -1293,6 +1288,7 @@ export class ProjectService extends DatabaseService<Model> {
         },
         {
           projectId,
+          userId: owner.id!,
         },
       ).catch((err: Error) => {
         logger.error(err);

package/Server/Services/PushNotificationLogService.ts

@@ -0,0 +1,14 @@
+import { IsBillingEnabled } from "../EnvironmentConfig";
+import DatabaseService from "./DatabaseService";
+import Model from "../../Models/DatabaseModels/PushNotificationLog";
+
+export class Service extends DatabaseService<Model> {
+  public constructor() {
+    super(Model);
+    if (IsBillingEnabled) {
+      this.hardDeleteItemsOlderThanInDays("createdAt", 3);
+    }
+  }
+}
+
+export default new Service();

package/Server/Services/PushNotificationService.ts

@@ -14,11 +14,27 @@ import webpush from "web-push";
 import PushNotificationUtil from "../Utils/PushNotificationUtil";
 import { LIMIT_PER_PROJECT } from "../../Types/Database/LimitMax";
 import UserPush from "../../Models/DatabaseModels/UserPush";
+import PushNotificationLog from "../../Models/DatabaseModels/PushNotificationLog";
+import PushNotificationLogService from "./PushNotificationLogService";
+import PushStatus from "../../Types/PushNotification/PushStatus";
 
 export interface PushNotificationOptions {
   projectId?: ObjectID | undefined;
   isSensitive?: boolean;
   userOnCallLogTimelineId?: ObjectID | undefined;
+  // Optional relations for richer logging
+  incidentId?: ObjectID | undefined;
+  alertId?: ObjectID | undefined;
+  scheduledMaintenanceId?: ObjectID | undefined;
+  statusPageId?: ObjectID | undefined;
+  statusPageAnnouncementId?: ObjectID | undefined;
+  userId?: ObjectID | undefined;
+  // On-call policy related fields
+  onCallPolicyId?: ObjectID | undefined;
+  onCallPolicyEscalationRuleId?: ObjectID | undefined;
+  onCallDutyPolicyExecutionLogTimelineId?: ObjectID | undefined;
+  onCallScheduleId?: ObjectID | undefined;
+  teamId?: ObjectID | undefined;
 }
 
 export default class PushNotificationService {
@@ -50,12 +66,12 @@ export default class PushNotificationService {
     options: PushNotificationOptions = {},
   ): Promise<void> {
     logger.info(
-      `Sending push notification to ${request.deviceTokens?.length} devices`,
+      `Sending push notification to ${request.devices?.length} devices`,
     );
 
-    if (!request.deviceTokens || request.deviceTokens.length === 0) {
-      logger.error("No device tokens provided for push notification");
-      throw new Error("No device tokens provided");
+    if (!request.devices || request.devices.length === 0) {
+      logger.error("No devices provided for push notification");
+      throw new Error("No devices provided");
     }
 
     if (request.deviceType !== "web") {
@@ -64,15 +80,24 @@ export default class PushNotificationService {
     }
 
     logger.info(
-      `Sending web push notifications to ${request.deviceTokens.length} devices`,
+      `Sending web push notifications to ${request.devices.length} devices`,
     );
     logger.info(`Notification message: ${JSON.stringify(request.message)}`);
 
+    const deviceNames: (string | undefined)[] = request.devices
+      .map((device: { token: string; name?: string }) => {
+        return device.name;
+      })
+      .filter(Boolean);
+    if (deviceNames.length > 0) {
+      logger.info(`Device names: ${deviceNames.join(", ")}`);
+    }
+
     const promises: Promise<void>[] = [];
 
-    for (const deviceToken of request.deviceTokens) {
+    for (const device of request.devices) {
       promises.push(
-        this.sendWebPushNotification(deviceToken, request.message, options),
+        this.sendWebPushNotification(device.token, request.message, options),
       );
     }
 
@@ -82,13 +107,23 @@ export default class PushNotificationService {
     let errorCount: number = 0;
 
     results.forEach((result: any, index: number) => {
+      const device:
+        | {
+            token: string;
+            name?: string;
+          }
+        | undefined = request.devices[index];
+      const deviceInfo: string = device?.name
+        ? `device "${device.name}" (${index + 1})`
+        : `device ${index + 1}`;
+
       if (result.status === "fulfilled") {
         successCount++;
-        logger.info(`Device ${index + 1}: Notification sent successfully`);
+        logger.info(`${deviceInfo}: Notification sent successfully`);
       } else {
         errorCount++;
         logger.error(
-          `Failed to send notification to device ${index + 1}: ${result.reason}`,
+          `Failed to send notification to ${deviceInfo}: ${result.reason}`,
         );
       }
     });
@@ -97,6 +132,83 @@ export default class PushNotificationService {
       `Push notification results: ${successCount} successful, ${errorCount} failed`,
     );
 
+    // Create one push log per device if projectId provided
+    if (options.projectId) {
+      for (let i: number = 0; i < results.length; i++) {
+        const result: any = results[i];
+        const device:
+          | {
+              token: string;
+              name?: string;
+            }
+          | undefined = request.devices[i];
+        const log: PushNotificationLog = new PushNotificationLog();
+        log.projectId = options.projectId;
+        log.title = request.message.title || "";
+        log.body = options.isSensitive
+          ? "Sensitive message not logged"
+          : request.message.body || "";
+        log.deviceType = request.deviceType;
+
+        // Set device name if available
+        if (device?.name) {
+          log.deviceName = device.name;
+        }
+
+        // relations if provided
+        if (options.incidentId) {
+          log.incidentId = options.incidentId;
+        }
+        if (options.alertId) {
+          log.alertId = options.alertId;
+        }
+        if (options.scheduledMaintenanceId) {
+          log.scheduledMaintenanceId = options.scheduledMaintenanceId;
+        }
+        if (options.statusPageId) {
+          log.statusPageId = options.statusPageId;
+        }
+        if (options.statusPageAnnouncementId) {
+          log.statusPageAnnouncementId = options.statusPageAnnouncementId;
+        }
+        if (options.userId) {
+          log.userId = options.userId;
+        }
+        if (options.teamId) {
+          log.teamId = options.teamId;
+        }
+
+        // Set OnCall-related fields
+        if (options.onCallPolicyId) {
+          log.onCallDutyPolicyId = options.onCallPolicyId;
+        }
+        if (options.onCallPolicyEscalationRuleId) {
+          log.onCallDutyPolicyEscalationRuleId =
+            options.onCallPolicyEscalationRuleId;
+        }
+        if (options.onCallScheduleId) {
+          log.onCallDutyPolicyScheduleId = options.onCallScheduleId;
+        }
+
+        if (result.status === "fulfilled") {
+          log.status = PushStatus.Success;
+          log.statusMessage = "Push notification sent";
+        } else {
+          log.status = PushStatus.Error;
+          const reason: string =
+            (result &&
+              (result.reason?.message || result.reason?.toString?.())) ||
+            `Failed to send push notification`;
+          log.statusMessage = reason;
+        }
+
+        await PushNotificationLogService.create({
+          data: log,
+          props: { isRoot: true },
+        });
+      }
+    }
+
     // Update user on call log timeline status if provided
     if (options.userOnCallLogTimelineId) {
       const status: UserNotificationStatus =
@@ -213,6 +325,7 @@ export default class PushNotificationService {
       select: {
         deviceToken: true,
         deviceType: true,
+        deviceName: true,
         _id: true,
       },
       limit: LIMIT_PER_PROJECT,
@@ -229,12 +342,15 @@ export default class PushNotificationService {
       return;
     }
 
-    // Get web device tokens
-    const webDevices: string[] = [];
+    // Get web devices with tokens and names
+    const webDevices: Array<{ token: string; name?: string }> = [];
 
     for (const device of userPushDevices) {
       if (device.deviceType === "web") {
-        webDevices.push(device.deviceToken!);
+        webDevices.push({
+          token: device.deviceToken!,
+          name: device.deviceName || "Unknown Device",
+        });
       }
     }
 
@@ -242,7 +358,7 @@ export default class PushNotificationService {
     if (webDevices.length > 0) {
       await this.sendPushNotification(
         {
-          deviceTokens: webDevices,
+          devices: webDevices,
           message: message,
           deviceType: "web",
         },

package/Server/Services/ScheduledMaintenanceService.ts

@@ -251,6 +251,8 @@ export class Service extends DatabaseService<Model> {
               customTwilioConfig: ProjectCallSMSConfigService.toTwilioConfig(
                 statuspage.callSmsConfig,
               ),
+              statusPageId: statuspage.id!,
+              scheduledMaintenanceId: event.id!,
             }).catch((err: Error) => {
               logger.error(err);
             });
@@ -319,6 +321,8 @@ ${resourcesAffected ? `**Resources Affected:** ${resourcesAffected}` : ""}
                   statuspage.smtpConfig,
                 ),
                 projectId: statuspage.projectId!,
+                statusPageId: statuspage.id!,
+                scheduledMaintenanceId: event.id!,
               },
             ).catch((err: Error) => {
               logger.error(err);

package/Server/Services/SmsService.ts

@@ -26,6 +26,18 @@ export class SmsService extends BaseService {
       isSensitive?: boolean; // if true, message will not be logged
       userOnCallLogTimelineId?: ObjectID;
       customTwilioConfig?: TwilioConfig | undefined;
+      incidentId?: ObjectID | undefined;
+      alertId?: ObjectID | undefined;
+      scheduledMaintenanceId?: ObjectID | undefined;
+      statusPageId?: ObjectID | undefined;
+      statusPageAnnouncementId?: ObjectID | undefined;
+      userId?: ObjectID | undefined;
+      // On-call policy related fields
+      onCallPolicyId?: ObjectID | undefined;
+      onCallPolicyEscalationRuleId?: ObjectID | undefined;
+      onCallDutyPolicyExecutionLogTimelineId?: ObjectID | undefined;
+      onCallScheduleId?: ObjectID | undefined;
+      teamId?: ObjectID | undefined;
     },
   ): Promise<HTTPResponse<EmptyResponseData>> {
     const body: JSONObject = {
@@ -44,6 +56,19 @@ export class SmsService extends BaseService {
               options.customTwilioConfig.secondaryPhoneNumbers?.toString(),
           }
         : undefined,
+      incidentId: options.incidentId?.toString(),
+      alertId: options.alertId?.toString(),
+      scheduledMaintenanceId: options.scheduledMaintenanceId?.toString(),
+      statusPageId: options.statusPageId?.toString(),
+      statusPageAnnouncementId: options.statusPageAnnouncementId?.toString(),
+      userId: options.userId?.toString(),
+      onCallPolicyId: options.onCallPolicyId?.toString(),
+      onCallPolicyEscalationRuleId:
+        options.onCallPolicyEscalationRuleId?.toString(),
+      onCallDutyPolicyExecutionLogTimelineId:
+        options.onCallDutyPolicyExecutionLogTimelineId?.toString(),
+      onCallScheduleId: options.onCallScheduleId?.toString(),
+      teamId: options.teamId?.toString(),
     };
 
     return await API.post<EmptyResponseData>(

package/Server/Services/StatusPagePrivateUserService.ts

@@ -129,6 +129,7 @@ export class Service extends DatabaseService<Model> {
       },
       {
         projectId: statusPage.projectId,
+        statusPageId: statusPage.id!,
       },
     ).catch((err: Error) => {
       logger.error(err);

package/Server/Services/StatusPageService.ts

@@ -778,6 +778,7 @@ export class Service extends DatabaseService<StatusPage> {
             statuspage.smtpConfig,
           ),
           projectId: statuspage.projectId,
+          statusPageId: statuspage.id!,
         },
       ).catch((err: Error) => {
         logger.error(err);

package/Server/Services/StatusPageSubscriberService.ts

@@ -313,6 +313,7 @@ export class Service extends DatabaseService<Model> {
           customTwilioConfig: ProjectCallSMSConfigService.toTwilioConfig(
             statusPage.callSmsConfig,
           ),
+          statusPageId: createdItem.statusPageId!,
         },
       ).catch((err: Error) => {
         logger.error(err);
@@ -509,6 +510,7 @@ Stay informed about service availability! 🚀`;
           mailServer: ProjectSMTPConfigService.toEmailServer(
             statusPage.smtpConfig,
           ),
+          statusPageId: statusPage.id!,
         },
       ).catch((err: Error) => {
         logger.error(err);
@@ -635,6 +637,7 @@ Stay informed about service availability! 🚀`;
           mailServer: ProjectSMTPConfigService.toEmailServer(
             statusPage.smtpConfig,
           ),
+          statusPageId: statusPage.id!,
         },
       ).catch((err: Error) => {
         logger.error("Error sending subscription email:");

package/Server/Services/TeamMemberService.ts

@@ -140,6 +140,7 @@ export class TeamMemberService extends DatabaseService<TeamMember> {
           },
           {
             projectId: createBy.data.projectId!,
+            userId: user.id!,
           },
         ).catch((err: Error) => {
           logger.error(err);

package/Server/Services/UserCallService.ts

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

package/Server/Services/UserEmailService.ts

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