From e3573a9b77fbce78fedff38601a0e8e4c252d946 Mon Sep 17 00:00:00 2001
From: Simon Larsen <simonlarsen@oneuptime.com>
Date: Wed, 27 Aug 2025 09:55:19 +0100
Subject: [PATCH] fix: Refactor monitor not found error handling to use
 centralized exception messages

---
 Common/Server/Services/MonitorService.ts         |  9 +++++----
 .../Services/WorkspaceNotificationRuleService.ts |  3 ++-
 Common/Server/Utils/Monitor/MonitorResource.ts   |  3 ++-
 Common/Types/Exception/ExceptionMessages.ts      |  8 ++++++++
 .../ProcessIncomingRequestIngest.ts              | 16 +++++-----------
 5 files changed, 22 insertions(+), 17 deletions(-)
 create mode 100644 Common/Types/Exception/ExceptionMessages.ts

diff --git a/Common/Server/Services/MonitorService.ts b/Common/Server/Services/MonitorService.ts
index 93cca4643a..c0ccbd94a5 100644
--- a/Common/Server/Services/MonitorService.ts
+++ b/Common/Server/Services/MonitorService.ts
@@ -67,6 +67,7 @@ import QueryOperator from "../../Types/BaseDatabase/QueryOperator";
 import { FindWhere } from "../../Types/BaseDatabase/Query";
 import logger from "../Utils/Logger";
 import PushNotificationUtil from "../Utils/PushNotificationUtil";
+import ExceptionMessages from "../../Types/Exception/ExceptionMessages";
 
 export class Service extends DatabaseService<Model> {
   public constructor() {
@@ -162,11 +163,11 @@ export class Service extends DatabaseService<Model> {
         });
 
         if (!monitor) {
-          throw new BadDataException("Monitor not found.");
+          throw new BadDataException(ExceptionMessages.MonitorNotFound);
         }
 
         if (!monitor.id) {
-          throw new BadDataException("Monitor id not found.");
+          throw new BadDataException(ExceptionMessages.MonitorNotFound);
         }
 
         projectId = monitor.projectId!;
@@ -1389,7 +1390,7 @@ ${createdItem.description?.trim() || "No description provided."}
     });
 
     if (!monitor) {
-      throw new BadDataException("Monitor not found.");
+      throw new BadDataException(ExceptionMessages.MonitorNotFound);
     }
 
     return (monitor.postUpdatesToWorkspaceChannels || []).filter(
@@ -1419,7 +1420,7 @@ ${createdItem.description?.trim() || "No description provided."}
     });
 
     if (!monitor) {
-      throw new BadDataException("Monitor not found.");
+      throw new BadDataException(ExceptionMessages.MonitorNotFound);
     }
 
     return monitor.name || "";
diff --git a/Common/Server/Services/WorkspaceNotificationRuleService.ts b/Common/Server/Services/WorkspaceNotificationRuleService.ts
index f95d2df698..d3be71595d 100644
--- a/Common/Server/Services/WorkspaceNotificationRuleService.ts
+++ b/Common/Server/Services/WorkspaceNotificationRuleService.ts
@@ -49,6 +49,7 @@ import WorkspaceNotificationLog from "../../Models/DatabaseModels/WorkspaceNotif
 import WorkspaceNotificationLogService from "./WorkspaceNotificationLogService";
 import WorkspaceNotificationStatus from "../../Types/Workspace/WorkspaceNotificationStatus";
 import WorkspaceNotificationActionType from "../../Types/Workspace/WorkspaceNotificationActionType";
+import ExceptionMessages from "../../Types/Exception/ExceptionMessages";
 
 export interface MessageBlocksByWorkspaceType {
   workspaceType: WorkspaceType;
@@ -1911,7 +1912,7 @@ export class Service extends DatabaseService<WorkspaceNotificationRule> {
       if (!monitor) {
         logger.debug("Monitor not found for ID:");
         logger.debug(data.notificationFor.monitorId);
-        throw new BadDataException("Monitor ID not found");
+        throw new BadDataException(ExceptionMessages.MonitorNotFound);
       }
 
       const monitorLabels: Array<Label> = monitor?.labels || [];
diff --git a/Common/Server/Utils/Monitor/MonitorResource.ts b/Common/Server/Utils/Monitor/MonitorResource.ts
index ff4d7a13a3..0a8fb164da 100644
--- a/Common/Server/Utils/Monitor/MonitorResource.ts
+++ b/Common/Server/Utils/Monitor/MonitorResource.ts
@@ -58,6 +58,7 @@ import CaptureSpan from "../Telemetry/CaptureSpan";
 import MetricType from "../../../Models/DatabaseModels/MetricType";
 import MonitorLog from "../../../Models/AnalyticsModels/MonitorLog";
 import MonitorLogService from "../../Services/MonitorLogService";
+import ExceptionMessages from "../../../Types/Exception/ExceptionMessages";
 
 export default class MonitorResourceUtil {
   @CaptureSpan()
@@ -109,7 +110,7 @@ export default class MonitorResourceUtil {
 
     if (!monitor) {
       logger.debug(`${dataToProcess.monitorId.toString()} Monitor not found`);
-      throw new BadDataException("Monitor not found");
+      throw new BadDataException(ExceptionMessages.MonitorNotFound);
     }
 
     if (!monitor.projectId) {
diff --git a/Common/Types/Exception/ExceptionMessages.ts b/Common/Types/Exception/ExceptionMessages.ts
new file mode 100644
index 0000000000..023c5bdf01
--- /dev/null
+++ b/Common/Types/Exception/ExceptionMessages.ts
@@ -0,0 +1,8 @@
+
+
+enum ExceptionMessages{
+  MonitorNotFound= "Monitor not found."
+};
+
+
+export default ExceptionMessages;
\ No newline at end of file
diff --git a/IncomingRequestIngest/Jobs/IncomingRequestIngest/ProcessIncomingRequestIngest.ts b/IncomingRequestIngest/Jobs/IncomingRequestIngest/ProcessIncomingRequestIngest.ts
index a6af28ecf6..56b6262b55 100644
--- a/IncomingRequestIngest/Jobs/IncomingRequestIngest/ProcessIncomingRequestIngest.ts
+++ b/IncomingRequestIngest/Jobs/IncomingRequestIngest/ProcessIncomingRequestIngest.ts
@@ -31,17 +31,11 @@ QueueWorker.getWorker(
         `Successfully processed incoming request ingestion job: ${job.name}`,
       );
     } catch (error) {
-      // If monitor is disabled (maintenance / manual incident / explicitly disabled),
-      // we don't want to treat this as a failed job because the ingestion attempt
-      // has effectively "succeeded" (there's nothing actionable to do) and retrying
-      // only creates noise in the failed jobs list.
-      const message: string = (error as Error)?.message || "";
-      if (
-        error instanceof BadDataException && message &&
-        message.toString().toLowerCase().includes("monitor is disabled")
-      ) {
-        // Swallow error so BullMQ marks job as completed.
-        return;
+      // Certain BadDataException cases are expected / non-actionable and should not fail the job.
+      // These include disabled monitors (manual, maintenance, explicitly disabled) and missing monitors
+      // (e.g. secret key referencing a deleted monitor). Retrying provides no value and only creates noise.
+      if (error instanceof BadDataException){
+
       }
 
       logger.error(`Error processing incoming request ingestion job:`);