From b126830110587b916a50acd87e86de391a95e9a2 Mon Sep 17 00:00:00 2001
From: Alex Holliday <ajhollid@gmail.com>
Date: Wed, 31 Jul 2024 20:20:04 -0700
Subject: [PATCH 1/2] Add notifications to monitors before returning

---
 Server/db/mongo/modules/monitorModule.js | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/Server/db/mongo/modules/monitorModule.js b/Server/db/mongo/modules/monitorModule.js
index 6f795e35a..65dae92b2 100644
--- a/Server/db/mongo/modules/monitorModule.js
+++ b/Server/db/mongo/modules/monitorModule.js
@@ -2,6 +2,7 @@ const Monitor = require("../../../models/Monitor");
 const Check = require("../../../models/Check");
 const PageSpeedCheck = require("../../../models/PageSpeedCheck");
 const { errorMessages } = require("../../../utils/messages");
+const Notification = require("../../../models/Notification");
 
 /**
  * Get all monitors
@@ -119,7 +120,12 @@ const getMonitorsByUserId = async (req, res) => {
             createdAt: sortOrder,
           })
           .limit(limit);
-        return { ...monitor.toObject(), checks };
+
+        // Get notifications
+        const notifications = await Notification.find({
+          monitorId: monitor._id,
+        });
+        return { ...monitor.toObject(), checks, notifications };
       })
     );
     return monitorsWithChecks;

From 75a897716f437d1393982a68c3b7904e586544af Mon Sep 17 00:00:00 2001
From: Alex Holliday <ajhollid@gmail.com>
Date: Wed, 31 Jul 2024 20:22:11 -0700
Subject: [PATCH 2/2] Add notifcations to getMonitorById as well

---
 Server/db/mongo/modules/monitorModule.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/Server/db/mongo/modules/monitorModule.js b/Server/db/mongo/modules/monitorModule.js
index 65dae92b2..9bca432c2 100644
--- a/Server/db/mongo/modules/monitorModule.js
+++ b/Server/db/mongo/modules/monitorModule.js
@@ -64,7 +64,8 @@ const getMonitorById = async (req, res) => {
         createdAt: sortOrder,
       })
       .limit(limit);
-    const monitorWithChecks = { ...monitor.toObject(), checks };
+    const notifications = await Notification.find({ monitorId: monitor._id });
+    const monitorWithChecks = { ...monitor.toObject(), checks, notifications };
     return monitorWithChecks;
   } catch (error) {
     throw error;