From 578eb33b911e4986549a7c503a9d4d9613f57b2f Mon Sep 17 00:00:00 2001
From: Alex Holliday <ajhollid@gmail.com>
Date: Tue, 13 Aug 2024 10:32:29 -0700
Subject: [PATCH] Refactored getMonitorStats for clarity

---
 Client/src/Pages/Monitors/Details/index.jsx |  2 +-
 Server/db/mongo/modules/monitorModule.js    | 48 ++++++++++++---------
 Server/validation/joi.js                    |  2 +-
 3 files changed, 29 insertions(+), 23 deletions(-)

diff --git a/Client/src/Pages/Monitors/Details/index.jsx b/Client/src/Pages/Monitors/Details/index.jsx
index e2c0eb91b..5f3ddf9fc 100644
--- a/Client/src/Pages/Monitors/Details/index.jsx
+++ b/Client/src/Pages/Monitors/Details/index.jsx
@@ -119,7 +119,7 @@ const DetailsPage = () => {
   const fetchMonitor = useCallback(async () => {
     try {
       const res = await axiosInstance.get(
-        `/monitors/stats/${monitorId}?filter=${dateRange}&numToDisplay=50&normalize=true`,
+        `/monitors/stats/${monitorId}?dateRange=${dateRange}&numToDisplay=50&normalize=true`,
         {
           headers: {
             Authorization: `Bearer ${authToken}`,
diff --git a/Server/db/mongo/modules/monitorModule.js b/Server/db/mongo/modules/monitorModule.js
index 7dbcb675e..1d53db978 100644
--- a/Server/db/mongo/modules/monitorModule.js
+++ b/Server/db/mongo/modules/monitorModule.js
@@ -149,7 +149,7 @@ const getMonitorStatsById = async (req) => {
 
   try {
     const { monitorId } = req.params;
-    let { status, limit, sortOrder, filter, numToDisplay, normalize } =
+    let { status, limit, sortOrder, dateRange, numToDisplay, normalize } =
       req.query;
 
     // This effectively removes limit, returning all checks
@@ -161,37 +161,44 @@ const getMonitorStatsById = async (req) => {
     // Get monitor
     const monitor = await Monitor.findById(monitorId);
 
+    // Determine if this is a pagespeed monitor or an http/ping monitor
     let model =
       monitor.type === "http" || monitor.type === "ping"
         ? Check
         : PageSpeedCheck;
 
+    // Build monitor stats object
     const monitorStats = {
       ...monitor.toObject(),
     };
-    // Get all checks to calculate stats
+
+    // Start building query
     const checksQuery = { monitorId: monitor._id };
+
     // Get all checks
     const checksAll = await model.find(checksQuery).sort({
       createdAt: sortOrder,
     });
 
     if (monitor.type === "http" || monitor.type === "ping") {
-      // Get checks in 24 hours
-      checksQuery.createdAt = { $gte: filterLookup.day };
-      const checks24Hours = await model.find(checksQuery).sort({
-        createdAt: sortOrder,
-      });
-      // Get checks in 30 days
-      checksQuery.createdAt = { $gte: filterLookup.month };
-      const checks30Days = await model.find(checksQuery).sort({
-        createdAt: sortOrder,
-      });
-      // Get checks in 60 mins
-      checksQuery.createdAt = { $gte: filterLookup.hour };
-      const checks60Mins = await model
-        .find(checksQuery)
-        .sort({ createdAt: sortOrder });
+      const checksQuery24Hours = {
+        ...checksQuery,
+        createdAt: { $gte: filterLookup.day },
+      };
+      const checksQuery30Days = {
+        ...checksQuery,
+        createdAt: { $gte: filterLookup.month },
+      };
+      const checksQuery60Mins = {
+        ...checksQuery,
+        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 }),
+      ]);
 
       // HTTP/PING Specific stats
       monitorStats.avgResponseTime24hours =
@@ -202,14 +209,13 @@ const getMonitorStatsById = async (req) => {
     }
 
     //Get checks for dateRange
-
     if (status !== undefined) {
       checksQuery.status = status;
     }
 
     // Filter checks by "day", "week", or "month"
-    if (filter !== undefined) {
-      checksQuery.createdAt = { $gte: filterLookup[filter] };
+    if (dateRange !== undefined) {
+      checksQuery.createdAt = { $gte: filterLookup[dateRange] };
     }
 
     let dateRangeChecks = await model
@@ -236,7 +242,7 @@ const getMonitorStatsById = async (req) => {
       dateRangeChecks = NormalizeData(dateRangeChecks, 1, 100);
     }
 
-    // Add common stats
+    // Add common stats and stats that depend on the dateRange
     monitorStats.uptimeDuration = calculateUptimeDuration(checksAll);
     monitorStats.lastChecked = getLastChecked(checksAll);
     monitorStats.latestResponseTime = getLatestResponseTime(checksAll);
diff --git a/Server/validation/joi.js b/Server/validation/joi.js
index 74bf5ed92..fe7090083 100644
--- a/Server/validation/joi.js
+++ b/Server/validation/joi.js
@@ -126,7 +126,7 @@ const getMonitorByIdQueryValidation = joi.object({
   status: joi.boolean(),
   sortOrder: joi.string().valid("asc", "desc"),
   limit: joi.number(),
-  filter: joi.string().valid("day", "week", "month"),
+  dateRange: joi.string().valid("day", "week", "month"),
   numToDisplay: joi.number(),
   normalize: joi.boolean(),
 });