From 34ce3af412d483b04ddfedd367984fa5ec4142fe Mon Sep 17 00:00:00 2001
From: Alex Holliday <ajhollid@gmail.com>
Date: Tue, 3 Sep 2024 15:04:29 -0700
Subject: [PATCH] Add 7 days uptime percentage stat

---
 Server/db/mongo/modules/monitorModule.js | 17 ++++++++++++-----
 1 file changed, 12 insertions(+), 5 deletions(-)

diff --git a/Server/db/mongo/modules/monitorModule.js b/Server/db/mongo/modules/monitorModule.js
index e0718a0bb..b913519b6 100644
--- a/Server/db/mongo/modules/monitorModule.js
+++ b/Server/db/mongo/modules/monitorModule.js
@@ -281,6 +281,10 @@ const getMonitorStatsById = async (req) => {
         ...checksQuery,
         createdAt: { $gte: filterLookup.day },
       };
+      const checksQuery7Days = {
+        ...checksQuery,
+        createdAt: { $gte: filterLookup.week },
+      };
       const checksQuery30Days = {
         ...checksQuery,
         createdAt: { $gte: filterLookup.month },
@@ -290,15 +294,18 @@ const getMonitorStatsById = async (req) => {
         createdAt: { $gte: filterLookup.hour },
       };
 
-      const [checks24Hours, checks30Days, checks60Mins] = await Promise.all([
-        model.find(checksQuery24Hours).sort({ createdAt: sortOrder }),
-        model.find(checksQuery30Days).sort({ createdAt: sortOrder }),
-        model.find(checksQuery60Mins).sort({ createdAt: sortOrder }),
-      ]);
+      const [checks24Hours, checks7Days, checks30Days, checks60Mins] =
+        await Promise.all([
+          model.find(checksQuery24Hours).sort({ createdAt: sortOrder }),
+          model.find(checksQuery7Days).sort({ createdAt: sortOrder }),
+          model.find(checksQuery30Days).sort({ createdAt: sortOrder }),
+          model.find(checksQuery60Mins).sort({ createdAt: sortOrder }),
+        ]);
 
       // HTTP/PING Specific stats
       monitorStats.avgResponseTime24hours =
         getAverageResponseTime24Hours(checks24Hours);
+      monitorStats.uptime7Days = getUptimePercentage(checks7Days);
       monitorStats.uptime24Hours = getUptimePercentage(checks24Hours);
       monitorStats.uptime30Days = getUptimePercentage(checks30Days);
       monitorStats.statusBar = getStatusBarValues(monitor, checks60Mins);