Merge pull request #844 from bluewave-labs/fix/incidents-remove-checks

Remove checks from monitor query

Client/src/Pages/Incidents/index.jsx

@@ -28,7 +28,7 @@ const Incidents = () => {
       const res = await networkService.getMonitorsByTeamId(
         authState.authToken,
         authState.user.teamId,
-        1,
+        -1,
         null,
         null,
         null,
@@ -36,6 +36,7 @@ const Incidents = () => {
         null,
         null
       );
+      console.log(res.data.data);
       // Reduce to a lookup object for 0(1) lookup
       if (res?.data?.data?.monitors?.length > 0) {
         const monitorLookup = res.data.data.monitors.reduce((acc, monitor) => {

Server/controllers/monitorController.js

@@ -271,7 +271,6 @@ const getMonitorsByTeamId = async (req, res, next) => {
   try {
     const teamId = req.params.teamId;
     const monitors = await req.db.getMonitorsByTeamId(req, res);
-
     return res.json({
       success: true,
       msg: successMessages.MONITOR_GET_BY_USER_ID(teamId),

Server/db/mongo/modules/monitorModule.js

@@ -373,12 +373,18 @@ const getMonitorsByTeamId = async (req, res) => {
       sortOrder = -1;
     } else sortOrder = -1;
 
-    // This effectively removes limit, returning all checks
-    if (limit === undefined) limit = 0;
-
     const monitors = await Monitor.find(monitorQuery)
       .skip(skip)
       .limit(rowsPerPage);
+
+    // Early return if limit is set to -1, indicating we don't want any checks
+    if (limit === "-1") {
+      return { monitors, monitorCount: monitorsCount };
+    }
+
+    // This effectively removes limit, returning all checks
+    if (limit === undefined) limit = 0;
+
     // Map each monitor to include its associated checks
     const monitorsWithChecks = await Promise.all(
       monitors.map(async (monitor) => {