From ef23648941e530fb48301afd98680e18cad1a3af Mon Sep 17 00:00:00 2001
From: Alex Holliday <ajhollid@gmail.com>
Date: Thu, 9 Jan 2025 10:42:25 -0800
Subject: [PATCH] ommit checks from query if limit is null

---
 Server/db/mongo/modules/monitorModule.js | 95 ++++++++++++++----------
 1 file changed, 55 insertions(+), 40 deletions(-)

diff --git a/Server/db/mongo/modules/monitorModule.js b/Server/db/mongo/modules/monitorModule.js
index 7b554ff32..745aecf88 100644
--- a/Server/db/mongo/modules/monitorModule.js
+++ b/Server/db/mongo/modules/monitorModule.js
@@ -508,7 +508,6 @@ const getMonitorById = async (monitorId) => {
 const getMonitorsByTeamId = async (req) => {
 	let { limit, type, page, rowsPerPage, filter, field, order } = req.query;
 
-	// Parse ints
 	limit = parseInt(limit);
 	page = parseInt(page);
 	rowsPerPage = parseInt(rowsPerPage);
@@ -571,54 +570,67 @@ const getMonitorsByTeamId = async (req) => {
 					{ $sort: sort },
 					{ $skip: skip },
 					...(rowsPerPage ? [{ $limit: rowsPerPage }] : []),
-					{
-						$lookup: {
-							from: "checks",
-							let: { monitorId: "$_id" },
-							pipeline: [
+					...(limit
+						? [
 								{
-									$match: {
-										$expr: { $eq: ["$monitorId", "$$monitorId"] },
+									$lookup: {
+										from: "checks",
+										let: { monitorId: "$_id" },
+										pipeline: [
+											{
+												$match: {
+													$expr: { $eq: ["$monitorId", "$$monitorId"] },
+												},
+											},
+											{ $sort: { createdAt: -1 } },
+											...(limit ? [{ $limit: limit }] : []),
+										],
+										as: "standardchecks",
 									},
 								},
-								{ $sort: { createdAt: -1 } },
-								...(limit ? [{ $limit: limit }] : []),
-							],
-							as: "standardchecks",
-						},
-					},
-					{
-						$lookup: {
-							from: "pagespeedchecks",
-							let: { monitorId: "$_id" },
-							pipeline: [
+							]
+						: []),
+					...(limit
+						? [
 								{
-									$match: {
-										$expr: { $eq: ["$monitorId", "$$monitorId"] },
+									$lookup: {
+										from: "pagespeedchecks",
+										let: { monitorId: "$_id" },
+										pipeline: [
+											{
+												$match: {
+													$expr: { $eq: ["$monitorId", "$$monitorId"] },
+												},
+											},
+											{ $sort: { createdAt: -1 } },
+											...(limit ? [{ $limit: limit }] : []),
+										],
+										as: "pagespeedchecks",
 									},
 								},
-								{ $sort: { createdAt: -1 } },
-								...(limit ? [{ $limit: limit }] : []),
-							],
-							as: "pagespeedchecks",
-						},
-					},
-					{
-						$lookup: {
-							from: "hardwarechecks",
-							let: { monitorId: "$_id" },
-							pipeline: [
+							]
+						: []),
+					...(limit
+						? [
 								{
-									$match: {
-										$expr: { $eq: ["$monitorId", "$$monitorId"] },
+									$lookup: {
+										from: "hardwarechecks",
+										let: { monitorId: "$_id" },
+										pipeline: [
+											{
+												$match: {
+													$expr: { $eq: ["$monitorId", "$$monitorId"] },
+												},
+											},
+											{ $sort: { createdAt: -1 } },
+											...(limit ? [{ $limit: limit }] : []),
+										],
+										as: "hardwarechecks",
 									},
 								},
-								{ $sort: { createdAt: -1 } },
-								...(limit ? [{ $limit: limit }] : []),
-							],
-							as: "hardwarechecks",
-						},
-					},
+							]
+						: []),
+
 					{
 						$addFields: {
 							checks: {
@@ -662,6 +674,9 @@ const getMonitorsByTeamId = async (req) => {
 
 	let { monitors, summary } = results[0];
 	monitors = monitors.map((monitor) => {
+		if (!monitor.checks) {
+			return monitor;
+		}
 		monitor.checks = NormalizeData(monitor.checks, 10, 100);
 		return monitor;
 	});