refactor: enhance logging and improve incident feed notification mess…

…ages across multiple services
OneUptime · Jan 15, 2025 · a84e32f · a84e32f
1 parent c09d973
commit a84e32f
Show file tree

Hide file tree

Showing 7 changed files with 29 additions and 5 deletions.
diff --git a/Common/Server/Services/IncidentFeedService.ts b/Common/Server/Services/IncidentFeedService.ts
@@ -1,9 +1,11 @@
+import IncidentFeed from "Common/Models/DatabaseModels/IncidentFeed";
 import { Blue500 } from "../../Types/BrandColors";
 import Color from "../../Types/Color";
 import OneUptimeDate from "../../Types/Date";
 import BadDataException from "../../Types/Exception/BadDataException";
 import ObjectID from "../../Types/ObjectID";
 import { IsBillingEnabled } from "../EnvironmentConfig";
+import logger from "../Utils/Logger";
 import DatabaseService from "./DatabaseService";
 import Model, {
   IncidentFeedEventType,
@@ -28,6 +30,10 @@ export class Service extends DatabaseService<Model> {
     userId?: ObjectID | undefined;
     postedAt?: Date | undefined;
   }): Promise<Model> {
+
+    logger.debug("IncidentFeedService.createIncidentFeed");
+    logger.debug(data);
+
     const incidentFeed: Model = new Model();
 
     if (!data.incidentId) {
@@ -68,12 +74,19 @@ export class Service extends DatabaseService<Model> {
       incidentFeed.moreInformationInMarkdown = data.moreInformationInMarkdown;
     }
 
-    return await this.create({
+    const createdIncidentFeed: IncidentFeed  =  await this.create({
       data: incidentFeed,
       props: {
         isRoot: true,
       },
     });
+
+    logger.debug("Incident Feed created");
+    logger.debug(createdIncidentFeed);
+
+    return createdIncidentFeed;
+
+
   }
 }
 

diff --git a/Common/UI/Components/InfoCard/InfoCard.tsx b/Common/UI/Components/InfoCard/InfoCard.tsx
@@ -13,7 +13,7 @@ const InfoCard: FunctionComponent<ComponentProps> = (
 ): ReactElement => {
   return (
     <div
-      className={`rounded-md bg-white shadow-md p-5 ${props.className || ""}`}
+      className={`rounded-md bg-white shadow p-5 ${props.className || ""}`}
     >
       <div>
         <FieldLabelElement title={props.title} />

diff --git a/Dashboard/src/Components/Monitor/SummaryView/Screenshot.tsx b/Dashboard/src/Components/Monitor/SummaryView/Screenshot.tsx
@@ -14,7 +14,7 @@ const SummarysScreenshot: FunctionComponent<ComponentProps> = (
     <div className="w-fit">
       <div className="">
         <img
-          className="rounded-md w-fit h-fit shadow-md m-1"
+          className="rounded-md w-fit h-fit shadow m-1"
           src={`data:image/png;base64,${props.screenshot}`}
           alt={props.screenshotName}
         />

diff --git a/Worker/Jobs/Incident/SendNotificationToSubscribers.ts b/Worker/Jobs/Incident/SendNotificationToSubscribers.ts
@@ -52,6 +52,7 @@ RunCron(
         _id: true,
         title: true,
         description: true,
+        projectId: true,
         monitors: {
           _id: true,
         },
@@ -65,7 +66,8 @@ RunCron(
     const httpProtocol: Protocol = await DatabaseConfig.getHttpProtocol();
 
     for (const incident of incidents) {
-      const incidentFeedText: string = `Notification sent to Status Page Subscribers on Incident Creation`;
+      const incidentFeedText: string = `**Subscriber Incident Created Notification Sent**:
+      Notification sent to status page subscribers because this incident was created.`;
 
       if (!incident.monitors || incident.monitors.length === 0) {
         continue;
@@ -269,13 +271,20 @@ RunCron(
         }
       }
 
+      debugger;
+
+      logger.debug("Creating incident feed for subscriber notification");
+
       await IncidentFeedService.createIncidentFeed({
         incidentId: incident.id!,
         projectId: incident.projectId!,
         incidentFeedEventType: IncidentFeedEventType.SubscriberNotificationSent,
         displayColor: Blue500,
         feedInfoInMarkdown: incidentFeedText,
       });
+
+      logger.debug("Incident Feed created");
     }
+
   },
 );
diff --git a/Worker/Jobs/IncidentOwners/SendCreatedResourceNotification.ts b/Worker/Jobs/IncidentOwners/SendCreatedResourceNotification.ts
@@ -67,7 +67,7 @@ RunCron(
     });
 
     for (const incident of incidents) {
-      const incidentFeedText: string = `**Incident Created Notification Sent**:
+      const incidentFeedText: string = `**Owner Incident Created Notification Sent**:
 Notification sent to owners of this incident because this incident was created.`;
       let moreIncidentFeedInformationInMarkdown: string = "";
 

diff --git a/Worker/Jobs/IncidentPublicNote/SendNotificationToSubscribers.ts b/Worker/Jobs/IncidentPublicNote/SendNotificationToSubscribers.ts
@@ -59,6 +59,7 @@ RunCron(
           _id: true,
           note: true,
           incidentId: true,
+          projectId: true,
         },
       });
 

diff --git a/Worker/Jobs/IncidentStateTimeline/SendNotificationToSubscribers.ts b/Worker/Jobs/IncidentStateTimeline/SendNotificationToSubscribers.ts
@@ -52,6 +52,7 @@ RunCron(
         skip: 0,
         select: {
           _id: true,
+          projectId: true,
           incidentId: true,
           incidentStateId: true,
           incidentState: {