@oneuptime/common 8.0.5580 → 8.0.5581

package/Server/Services/IncidentInternalNoteService.ts

@@ -9,6 +9,8 @@ import { LIMIT_PER_PROJECT } from "../../Types/Database/LimitMax";
 import IncidentService from "./IncidentService";
 import Incident from "../../Models/DatabaseModels/Incident";
 import CaptureSpan from "../Utils/Telemetry/CaptureSpan";
+import File from "../../Models/DatabaseModels/File";
+import FileAttachmentMarkdownUtil from "../Utils/FileAttachmentMarkdownUtil";
 
 export class Service extends DatabaseService<Model> {
   public constructor() {
@@ -21,6 +23,7 @@ export class Service extends DatabaseService<Model> {
     incidentId: ObjectID;
     projectId: ObjectID;
     note: string;
+    attachmentFileIds?: Array<ObjectID>;
   }): Promise<Model> {
     const internalNote: Model = new Model();
     internalNote.createdByUserId = data.userId;
@@ -28,6 +31,16 @@ export class Service extends DatabaseService<Model> {
     internalNote.projectId = data.projectId;
     internalNote.note = data.note;
 
+    if (data.attachmentFileIds && data.attachmentFileIds.length > 0) {
+      internalNote.attachments = data.attachmentFileIds.map(
+        (fileId: ObjectID) => {
+          const file: File = new File();
+          file.id = fileId;
+          return file;
+        },
+      );
+    }
+
     return this.create({
       data: internalNote,
       props: {
@@ -51,6 +64,11 @@ export class Service extends DatabaseService<Model> {
         incidentId: incidentId,
       });
 
+    const attachmentsMarkdown: string = await this.getAttachmentsMarkdown(
+      createdItem.id!,
+      "/incident-internal-note/attachment",
+    );
+
     await IncidentFeedService.createIncidentFeedItem({
       incidentId: createdItem.incidentId!,
       projectId: createdItem.projectId!,
@@ -60,7 +78,7 @@ export class Service extends DatabaseService<Model> {
 
       feedInfoInMarkdown: `📄 posted **private note** for this [Incident ${incidentNumber}](${(await IncidentService.getIncidentLinkInDashboard(createdItem.projectId!, incidentId)).toString()}):
 
-${createdItem.note}
+${(createdItem.note || "") + attachmentsMarkdown}
           `,
       workspaceNotification: {
         sendWorkspaceNotification: true,
@@ -105,6 +123,11 @@ ${createdItem.note}
       for (const updatedItem of updatedItems) {
         const incident: Incident = updatedItem.incident!;
 
+        const attachmentsMarkdown: string = await this.getAttachmentsMarkdown(
+          updatedItem.id!,
+          "/incident-internal-note/attachment",
+        );
+
         await IncidentFeedService.createIncidentFeedItem({
           incidentId: updatedItem.incidentId!,
           projectId: updatedItem.projectId!,
@@ -114,7 +137,7 @@ ${createdItem.note}
 
           feedInfoInMarkdown: `📄 updated **Private Note** for this [Incident ${incident.incidentNumber}](${(await IncidentService.getIncidentLinkInDashboard(incident.projectId!, incident.id!)).toString()})
 
-${updatedItem.note}
+${(updatedItem.note || "") + attachmentsMarkdown}
           `,
           workspaceNotification: {
             sendWorkspaceNotification: true,
@@ -125,6 +148,57 @@ ${updatedItem.note}
     }
     return onUpdate;
   }
+
+  private async getAttachmentsMarkdown(
+    modelId: ObjectID,
+    attachmentApiPath: string,
+  ): Promise<string> {
+    if (!modelId) {
+      return "";
+    }
+
+    const noteWithAttachments: Model | null = await this.findOneById({
+      id: modelId,
+      select: {
+        attachments: {
+          _id: true,
+        },
+      },
+      props: {
+        isRoot: true,
+      },
+    });
+
+    if (!noteWithAttachments || !noteWithAttachments.attachments) {
+      return "";
+    }
+
+    const attachmentIds: Array<ObjectID> = noteWithAttachments.attachments
+      .map((file: File) => {
+        if (file.id) {
+          return file.id;
+        }
+
+        if (file._id) {
+          return new ObjectID(file._id);
+        }
+
+        return null;
+      })
+      .filter((id: ObjectID | null): id is ObjectID => {
+        return Boolean(id);
+      });
+
+    if (!attachmentIds.length) {
+      return "";
+    }
+
+    return await FileAttachmentMarkdownUtil.buildAttachmentMarkdown({
+      modelId,
+      attachmentIds,
+      attachmentApiPath,
+    });
+  }
 }
 
 export default new Service();

package/Server/Services/IncidentPublicNoteService.ts

@@ -12,6 +12,8 @@ import IncidentService from "./IncidentService";
 import Incident from "../../Models/DatabaseModels/Incident";
 import CaptureSpan from "../Utils/Telemetry/CaptureSpan";
 import StatusPageSubscriberNotificationStatus from "../../Types/StatusPage/StatusPageSubscriberNotificationStatus";
+import File from "../../Models/DatabaseModels/File";
+import FileAttachmentMarkdownUtil from "../Utils/FileAttachmentMarkdownUtil";
 
 export class Service extends DatabaseService<Model> {
   public constructor() {
@@ -24,6 +26,7 @@ export class Service extends DatabaseService<Model> {
     incidentId: ObjectID;
     projectId: ObjectID;
     note: string;
+    attachmentFileIds?: Array<ObjectID>;
   }): Promise<Model> {
     const publicNote: Model = new Model();
     publicNote.createdByUserId = data.userId;
@@ -32,6 +35,16 @@ export class Service extends DatabaseService<Model> {
     publicNote.note = data.note;
     publicNote.postedAt = OneUptimeDate.getCurrentDate();
 
+    if (data.attachmentFileIds && data.attachmentFileIds.length > 0) {
+      publicNote.attachments = data.attachmentFileIds.map(
+        (fileId: ObjectID) => {
+          const file: File = new File();
+          file.id = fileId;
+          return file;
+        },
+      );
+    }
+
     return this.create({
       data: publicNote,
       props: {
@@ -84,6 +97,11 @@ export class Service extends DatabaseService<Model> {
         incidentId: incidentId,
       });
 
+    const attachmentsMarkdown: string = await this.getAttachmentsMarkdown(
+      createdItem.id!,
+      "/incident-public-note/attachment",
+    );
+
     await IncidentFeedService.createIncidentFeedItem({
       incidentId: createdItem.incidentId!,
       projectId: createdItem.projectId!,
@@ -92,7 +110,7 @@ export class Service extends DatabaseService<Model> {
       userId: userId || undefined,
       feedInfoInMarkdown: `📄 posted **public note** for this [Incident ${incidentNumber}](${(await IncidentService.getIncidentLinkInDashboard(projectId!, incidentId!)).toString()}) on status page:
 
-${createdItem.note}
+${(createdItem.note || "") + attachmentsMarkdown}
           `,
       workspaceNotification: {
         sendWorkspaceNotification: true,
@@ -138,6 +156,11 @@ ${createdItem.note}
       for (const updatedItem of updatedItems) {
         const incident: Incident = updatedItem.incident!;
 
+        const attachmentsMarkdown: string = await this.getAttachmentsMarkdown(
+          updatedItem.id!,
+          "/incident-public-note/attachment",
+        );
+
         await IncidentFeedService.createIncidentFeedItem({
           incidentId: updatedItem.incidentId!,
           projectId: updatedItem.projectId!,
@@ -147,7 +170,7 @@ ${createdItem.note}
 
           feedInfoInMarkdown: `📄 updated **Public Note** for this [Incident ${incident.incidentNumber}](${(await IncidentService.getIncidentLinkInDashboard(incident.projectId!, incident.id!)).toString()})
         
-${updatedItem.note}
+${(updatedItem.note || "") + attachmentsMarkdown}
                   `,
           workspaceNotification: {
             sendWorkspaceNotification: true,
@@ -158,6 +181,57 @@ ${updatedItem.note}
     }
     return onUpdate;
   }
+
+  private async getAttachmentsMarkdown(
+    modelId: ObjectID,
+    attachmentApiPath: string,
+  ): Promise<string> {
+    if (!modelId) {
+      return "";
+    }
+
+    const noteWithAttachments: Model | null = await this.findOneById({
+      id: modelId,
+      select: {
+        attachments: {
+          _id: true,
+        },
+      },
+      props: {
+        isRoot: true,
+      },
+    });
+
+    if (!noteWithAttachments || !noteWithAttachments.attachments) {
+      return "";
+    }
+
+    const attachmentIds: Array<ObjectID> = noteWithAttachments.attachments
+      .map((file: File) => {
+        if (file.id) {
+          return file.id;
+        }
+
+        if (file._id) {
+          return new ObjectID(file._id);
+        }
+
+        return null;
+      })
+      .filter((id: ObjectID | null): id is ObjectID => {
+        return Boolean(id);
+      });
+
+    if (!attachmentIds.length) {
+      return "";
+    }
+
+    return await FileAttachmentMarkdownUtil.buildAttachmentMarkdown({
+      modelId,
+      attachmentIds,
+      attachmentApiPath,
+    });
+  }
 }
 
 export default new Service();

package/Server/Services/ScheduledMaintenanceInternalNoteService.ts

@@ -9,6 +9,8 @@ import { LIMIT_PER_PROJECT } from "../../Types/Database/LimitMax";
 import ScheduledMaintenance from "../../Models/DatabaseModels/ScheduledMaintenance";
 import ScheduledMaintenanceService from "./ScheduledMaintenanceService";
 import CaptureSpan from "../Utils/Telemetry/CaptureSpan";
+import File from "../../Models/DatabaseModels/File";
+import FileAttachmentMarkdownUtil from "../Utils/FileAttachmentMarkdownUtil";
 
 export class Service extends DatabaseService<Model> {
   public constructor() {
@@ -21,6 +23,7 @@ export class Service extends DatabaseService<Model> {
     scheduledMaintenanceId: ObjectID;
     projectId: ObjectID;
     note: string;
+    attachmentFileIds?: Array<ObjectID>;
   }): Promise<Model> {
     const internalNote: Model = new Model();
     internalNote.createdByUserId = data.userId;
@@ -28,6 +31,16 @@ export class Service extends DatabaseService<Model> {
     internalNote.projectId = data.projectId;
     internalNote.note = data.note;
 
+    if (data.attachmentFileIds && data.attachmentFileIds.length > 0) {
+      internalNote.attachments = data.attachmentFileIds.map(
+        (fileId: ObjectID) => {
+          const file: File = new File();
+          file.id = fileId;
+          return file;
+        },
+      );
+    }
+
     return this.create({
       data: internalNote,
       props: {
@@ -52,6 +65,11 @@ export class Service extends DatabaseService<Model> {
         scheduledMaintenanceId: scheduledMaintenanceId,
       });
 
+    const attachmentsMarkdown: string = await this.getAttachmentsMarkdown(
+      createdItem.id!,
+      "/scheduled-maintenance-internal-note/attachment",
+    );
+
     await ScheduledMaintenanceFeedService.createScheduledMaintenanceFeedItem({
       scheduledMaintenanceId: createdItem.scheduledMaintenanceId!,
       projectId: createdItem.projectId!,
@@ -62,7 +80,7 @@ export class Service extends DatabaseService<Model> {
 
       feedInfoInMarkdown: `📄 posted **private note** for this [Scheduled Maintenance ${scheduledMaintenanceNumber}](${(await ScheduledMaintenanceService.getScheduledMaintenanceLinkInDashboard(createdItem.projectId!, scheduledMaintenanceId)).toString()}):
     
-${createdItem.note}
+    ${(createdItem.note || "") + attachmentsMarkdown}
               `,
       workspaceNotification: {
         sendWorkspaceNotification: true,
@@ -109,6 +127,11 @@ ${createdItem.note}
         const scheduledMaintenance: ScheduledMaintenance =
           updatedItem.scheduledMaintenance!;
 
+        const attachmentsMarkdown: string = await this.getAttachmentsMarkdown(
+          updatedItem.id!,
+          "/scheduled-maintenance-internal-note/attachment",
+        );
+
         await ScheduledMaintenanceFeedService.createScheduledMaintenanceFeedItem(
           {
             scheduledMaintenanceId: updatedItem.scheduledMaintenanceId!,
@@ -120,7 +143,7 @@ ${createdItem.note}
 
             feedInfoInMarkdown: `📄 updated **Private Note** for this [Scheduled Maintenance ${scheduledMaintenance.scheduledMaintenanceNumber}](${(await ScheduledMaintenanceService.getScheduledMaintenanceLinkInDashboard(scheduledMaintenance.projectId!, scheduledMaintenance.id!)).toString()})
         
-${updatedItem.note}
+${(updatedItem.note || "") + attachmentsMarkdown}
                   `,
             workspaceNotification: {
               sendWorkspaceNotification: true,
@@ -132,6 +155,57 @@ ${updatedItem.note}
     }
     return onUpdate;
   }
+
+  private async getAttachmentsMarkdown(
+    modelId: ObjectID,
+    attachmentApiPath: string,
+  ): Promise<string> {
+    if (!modelId) {
+      return "";
+    }
+
+    const noteWithAttachments: Model | null = await this.findOneById({
+      id: modelId,
+      select: {
+        attachments: {
+          _id: true,
+        },
+      },
+      props: {
+        isRoot: true,
+      },
+    });
+
+    if (!noteWithAttachments || !noteWithAttachments.attachments) {
+      return "";
+    }
+
+    const attachmentIds: Array<ObjectID> = noteWithAttachments.attachments
+      .map((file: File) => {
+        if (file.id) {
+          return file.id;
+        }
+
+        if (file._id) {
+          return new ObjectID(file._id);
+        }
+
+        return null;
+      })
+      .filter((id: ObjectID | null): id is ObjectID => {
+        return Boolean(id);
+      });
+
+    if (!attachmentIds.length) {
+      return "";
+    }
+
+    return await FileAttachmentMarkdownUtil.buildAttachmentMarkdown({
+      modelId,
+      attachmentIds,
+      attachmentApiPath,
+    });
+  }
 }
 
 export default new Service();

package/Server/Services/ScheduledMaintenancePublicNoteService.ts

@@ -12,6 +12,8 @@ import ScheduledMaintenanceService from "./ScheduledMaintenanceService";
 import ScheduledMaintenance from "../../Models/DatabaseModels/ScheduledMaintenance";
 import CaptureSpan from "../Utils/Telemetry/CaptureSpan";
 import StatusPageSubscriberNotificationStatus from "../../Types/StatusPage/StatusPageSubscriberNotificationStatus";
+import File from "../../Models/DatabaseModels/File";
+import FileAttachmentMarkdownUtil from "../Utils/FileAttachmentMarkdownUtil";
 
 export class Service extends DatabaseService<Model> {
   public constructor() {
@@ -63,6 +65,11 @@ export class Service extends DatabaseService<Model> {
         scheduledMaintenanceId: scheduledMaintenanceId,
       });
 
+    const attachmentsMarkdown: string = await this.getAttachmentsMarkdown(
+      createdItem.id!,
+      "/scheduled-maintenance-public-note/attachment",
+    );
+
     await ScheduledMaintenanceFeedService.createScheduledMaintenanceFeedItem({
       scheduledMaintenanceId: createdItem.scheduledMaintenanceId!,
       projectId: createdItem.projectId!,
@@ -72,7 +79,7 @@ export class Service extends DatabaseService<Model> {
       userId: userId || undefined,
       feedInfoInMarkdown: `📄 posted **public note** for this [Scheduled Maintenance ${scheduledMaintenanceNumber}](${(await ScheduledMaintenanceService.getScheduledMaintenanceLinkInDashboard(projectId!, scheduledMaintenanceId!)).toString()}) on status page:
     
-${createdItem.note}
+${(createdItem.note || "") + attachmentsMarkdown}
               `,
       workspaceNotification: {
         sendWorkspaceNotification: true,
@@ -119,6 +126,11 @@ ${createdItem.note}
         const scheduledMaintenance: ScheduledMaintenance =
           updatedItem.scheduledMaintenance!;
 
+        const attachmentsMarkdown: string = await this.getAttachmentsMarkdown(
+          updatedItem.id!,
+          "/scheduled-maintenance-public-note/attachment",
+        );
+
         await ScheduledMaintenanceFeedService.createScheduledMaintenanceFeedItem(
           {
             scheduledMaintenanceId: updatedItem.scheduledMaintenanceId!,
@@ -130,7 +142,7 @@ ${createdItem.note}
 
             feedInfoInMarkdown: `📄 updated **Public Note** for this [Scheduled Maintenance ${scheduledMaintenance.scheduledMaintenanceNumber}](${(await ScheduledMaintenanceService.getScheduledMaintenanceLinkInDashboard(scheduledMaintenance.projectId!, scheduledMaintenance.id!)).toString()})
         
-${updatedItem.note}
+${(updatedItem.note || "") + attachmentsMarkdown}
                   `,
             workspaceNotification: {
               sendWorkspaceNotification: true,
@@ -149,6 +161,7 @@ ${updatedItem.note}
     scheduledMaintenanceId: ObjectID;
     projectId: ObjectID;
     note: string;
+    attachmentFileIds?: Array<ObjectID>;
   }): Promise<Model> {
     const publicNote: Model = new Model();
     publicNote.createdByUserId = data.userId;
@@ -157,6 +170,16 @@ ${updatedItem.note}
     publicNote.note = data.note;
     publicNote.postedAt = OneUptimeDate.getCurrentDate();
 
+    if (data.attachmentFileIds && data.attachmentFileIds.length > 0) {
+      publicNote.attachments = data.attachmentFileIds.map(
+        (fileId: ObjectID) => {
+          const file: File = new File();
+          file.id = fileId;
+          return file;
+        },
+      );
+    }
+
     return this.create({
       data: publicNote,
       props: {
@@ -164,6 +187,57 @@ ${updatedItem.note}
       },
     });
   }
+
+  private async getAttachmentsMarkdown(
+    modelId: ObjectID,
+    attachmentApiPath: string,
+  ): Promise<string> {
+    if (!modelId) {
+      return "";
+    }
+
+    const noteWithAttachments: Model | null = await this.findOneById({
+      id: modelId,
+      select: {
+        attachments: {
+          _id: true,
+        },
+      },
+      props: {
+        isRoot: true,
+      },
+    });
+
+    if (!noteWithAttachments || !noteWithAttachments.attachments) {
+      return "";
+    }
+
+    const attachmentIds: Array<ObjectID> = noteWithAttachments.attachments
+      .map((file: File) => {
+        if (file.id) {
+          return file.id;
+        }
+
+        if (file._id) {
+          return new ObjectID(file._id);
+        }
+
+        return null;
+      })
+      .filter((id: ObjectID | null): id is ObjectID => {
+        return Boolean(id);
+      });
+
+    if (!attachmentIds.length) {
+      return "";
+    }
+
+    return await FileAttachmentMarkdownUtil.buildAttachmentMarkdown({
+      modelId,
+      attachmentIds,
+      attachmentApiPath,
+    });
+  }
 }
 
 export default new Service();

package/Server/Services/ScheduledMaintenanceService.ts

@@ -27,7 +27,7 @@ import User from "../../Models/DatabaseModels/User";
 import Recurring from "../../Types/Events/Recurring";
 import OneUptimeDate from "../../Types/Date";
 import UpdateBy from "../Types/Database/UpdateBy";
-import { FileRoute } from "../../ServiceRoute";
+import { StatusPageApiRoute } from "../../ServiceRoute";
 import Dictionary from "../../Types/Dictionary";
 import EmailTemplateType from "../../Types/Email/EmailTemplateType";
 import SMS from "../../Types/SMS/SMS";
@@ -280,6 +280,8 @@ ${resourcesAffected ? `**Resources Affected:** ${resourcesAffected}` : ""}
 
           if (subscriber.subscriberEmail) {
             // send email here.
+            const statusPageIdString: string | null =
+              statuspage.id?.toString() || statuspage._id?.toString() || null;
 
             MailService.sendMail(
               {
@@ -289,12 +291,13 @@ ${resourcesAffected ? `**Resources Affected:** ${resourcesAffected}` : ""}
                 vars: {
                   statusPageName: statusPageName,
                   statusPageUrl: statusPageURL,
-                  logoUrl: statuspage.logoFileId
-                    ? new URL(httpProtocol, host)
-                        .addRoute(FileRoute)
-                        .addRoute("/image/" + statuspage.logoFileId)
-                        .toString()
-                    : "",
+                  logoUrl:
+                    statuspage.logoFileId && statusPageIdString
+                      ? new URL(httpProtocol, host)
+                          .addRoute(StatusPageApiRoute)
+                          .addRoute(`/logo/${statusPageIdString}`)
+                          .toString()
+                      : "",
                   isPublicStatusPage: statuspage.isPublicStatusPage
                     ? "true"
                     : "false",

package/Server/Services/StatusPagePrivateUserService.ts

@@ -5,7 +5,7 @@ import logger from "../Utils/Logger";
 import DatabaseService from "./DatabaseService";
 import MailService from "./MailService";
 import StatusPageService from "./StatusPageService";
-import { FileRoute } from "../../ServiceRoute";
+import { StatusPageApiRoute } from "../../ServiceRoute";
 import CaptureSpan from "../Utils/Telemetry/CaptureSpan";
 import Hostname from "../../Types/API/Hostname";
 import Protocol from "../../Types/API/Protocol";
@@ -106,6 +106,8 @@ export class Service extends DatabaseService<Model> {
     const host: Hostname = await DatabaseConfig.getHost();
 
     const httpProtocol: Protocol = await DatabaseConfig.getHttpProtocol();
+    const statusPageIdString: string | null =
+      statusPage.id?.toString() || statusPage._id?.toString() || null;
 
     MailService.sendMail(
       {
@@ -115,12 +117,13 @@ export class Service extends DatabaseService<Model> {
         vars: {
           statusPageName: statusPageName!,
           statusPageUrl: statusPageURL,
-          logoUrl: statusPage.logoFileId
-            ? new URL(httpProtocol, host)
-                .addRoute(FileRoute)
-                .addRoute("/image/" + statusPage.logoFileId)
-                .toString()
-            : "",
+          logoUrl:
+            statusPage.logoFileId && statusPageIdString
+              ? new URL(httpProtocol, host)
+                  .addRoute(StatusPageApiRoute)
+                  .addRoute(`/logo/${statusPageIdString}`)
+                  .toString()
+              : "",
           homeURL: statusPageURL,
           tokenVerifyUrl: URL.fromString(statusPageURL)
             .addRoute("/reset-password/" + token)

package/Server/Services/StatusPageService.ts

@@ -42,7 +42,7 @@ import StatusPageSubscriberService from "./StatusPageSubscriberService";
 import StatusPageSubscriber from "../../Models/DatabaseModels/StatusPageSubscriber";
 import MailService from "./MailService";
 import EmailTemplateType from "../../Types/Email/EmailTemplateType";
-import { FileRoute } from "../../ServiceRoute";
+import { StatusPageApiRoute } from "../../ServiceRoute";
 import ProjectSMTPConfigService from "./ProjectSmtpConfigService";
 import StatusPageResource from "../../Models/DatabaseModels/StatusPageResource";
 import StatusPageResourceService from "./StatusPageResourceService";
@@ -750,6 +750,9 @@ export class Service extends DatabaseService<StatusPage> {
     const statusPageName: string =
       statuspage.pageTitle || statuspage.name || "Status Page";
 
+    const statusPageIdString: string | null =
+      statuspage.id?.toString() || statuspage._id?.toString() || null;
+
     const report: StatusPageReport = await this.getReportByStatusPage({
       statusPageId: statuspage.id!,
       historyDays: statuspage.reportDataInDays || 14,
@@ -777,12 +780,13 @@ export class Service extends DatabaseService<StatusPage> {
             statusPageUrl: statusPageURL,
             hasResources: report.totalResources > 0 ? "true" : "false",
             report: report as any,
-            logoUrl: statuspage.logoFileId
-              ? new URL(httpProtocol, host)
-                  .addRoute(FileRoute)
-                  .addRoute("/image/" + statuspage.logoFileId)
-                  .toString()
-              : "",
+            logoUrl:
+              statuspage.logoFileId && statusPageIdString
+                ? new URL(httpProtocol, host)
+                    .addRoute(StatusPageApiRoute)
+                    .addRoute(`/logo/${statusPageIdString}`)
+                    .toString()
+                : "",
             isPublicStatusPage: statuspage.isPublicStatusPage
               ? "true"
               : "false",
@@ -806,6 +810,7 @@ export class Service extends DatabaseService<StatusPage> {
     if (data.email) {
       // force send to this email instead of sending to all subscribers.
       await sendEmail(data.email, null);
+      return; // don't notify subscribers when explicitly sending a test email.
     }
 
     const subscribers: Array<StatusPageSubscriber> =