From ce49270cf8c00476c032553af62fd57235636e67 Mon Sep 17 00:00:00 2001 From: Alex Holliday Date: Thu, 31 Jul 2025 12:00:27 -0700 Subject: [PATCH 1/2] remove unused diagnostic db module --- server/src/db/mongo/MongoDB.js | 27 ----------- .../src/db/mongo/modules/diagnosticModule.js | 48 ------------------- 2 files changed, 75 deletions(-) delete mode 100755 server/src/db/mongo/modules/diagnosticModule.js diff --git a/server/src/db/mongo/MongoDB.js b/server/src/db/mongo/MongoDB.js index 2e98a0335..0c6274320 100755 --- a/server/src/db/mongo/MongoDB.js +++ b/server/src/db/mongo/MongoDB.js @@ -1,32 +1,6 @@ import mongoose from "mongoose"; import AppSettings from "../models/AppSettings.js"; -//**************************************** -// Recovery Operations -//**************************************** -import * as recoveryModule from "./modules/recoveryModule.js"; - -//**************************************** -// Page Speed Checks -//**************************************** - -import * as pageSpeedCheckModule from "./modules/pageSpeedCheckModule.js"; - -//**************************************** -// Notifications -//**************************************** -import * as notificationModule from "./modules/notificationModule.js"; - -//**************************************** -// AppSettings -//**************************************** -import * as settingsModule from "./modules/settingsModule.js"; - -//**************************************** -// Diagnostic -//**************************************** -import * as diagnosticModule from "./modules/diagnosticModule.js"; - class MongoDB { static SERVICE_NAME = "MongoDB"; @@ -59,7 +33,6 @@ class MongoDB { this.notificationModule = notificationModule; this.settingsModule = settingsModule; this.statusPageModule = statusPageModule; - Object.assign(this, diagnosticModule); this.networkCheckModule = networkCheckModule; } diff --git a/server/src/db/mongo/modules/diagnosticModule.js b/server/src/db/mongo/modules/diagnosticModule.js deleted file mode 100755 index 8717720a3..000000000 --- a/server/src/db/mongo/modules/diagnosticModule.js +++ /dev/null @@ -1,48 +0,0 @@ -import Monitor from "../../models/Monitor.js"; -import { ObjectId } from "mongodb"; - -const SERVICE_NAME = "diagnosticModule"; -import { buildMonitorSummaryByTeamIdPipeline, buildMonitorsByTeamIdPipeline, buildFilteredMonitorsByTeamIdPipeline } from "./monitorModuleQueries.js"; - -const getMonitorsByTeamIdExecutionStats = async (req) => { - try { - let { limit, type, page, rowsPerPage, filter, field, order } = req.query; - limit = parseInt(limit); - page = parseInt(page); - rowsPerPage = parseInt(rowsPerPage); - if (field === undefined) { - field = "name"; - order = "asc"; - } - // Build match stage - const matchStage = { teamId: new ObjectId(req.params.teamId) }; - if (type !== undefined) { - matchStage.type = Array.isArray(type) ? { $in: type } : type; - } - - const summary = await Monitor.aggregate(buildMonitorSummaryByTeamIdPipeline({ matchStage })).explain("executionStats"); - - const monitors = await Monitor.aggregate(buildMonitorsByTeamIdPipeline({ matchStage, field, order })).explain("executionStats"); - - const filteredMonitors = await Monitor.aggregate( - buildFilteredMonitorsByTeamIdPipeline({ - matchStage, - filter, - page, - rowsPerPage, - field, - order, - limit, - type, - }) - ).explain("executionStats"); - - return { summary, monitors, filteredMonitors }; - } catch (error) { - error.service = SERVICE_NAME; - error.method = "getMonitorSummaryByTeamIdExecutionStats"; - throw error; - } -}; - -export { getMonitorsByTeamIdExecutionStats }; From 0779e5ea15122f16fddf4b880930e14c6c647d4b Mon Sep 17 00:00:00 2001 From: Alex Holliday Date: Thu, 31 Jul 2025 12:02:52 -0700 Subject: [PATCH 2/2] remove commented out imports --- server/src/db/mongo/modules/monitorModule.js | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/server/src/db/mongo/modules/monitorModule.js b/server/src/db/mongo/modules/monitorModule.js index 332122df4..76f055f94 100755 --- a/server/src/db/mongo/modules/monitorModule.js +++ b/server/src/db/mongo/modules/monitorModule.js @@ -1,15 +1,3 @@ -// import Monitor from "../../models/Monitor.js"; -// import MonitorStats from "../../models/MonitorStats.js"; -// import Check from "../../models/Check.js"; -// import PageSpeedCheck from "../../models/PageSpeedCheck.js"; -// import HardwareCheck from "../../models/HardwareCheck.js"; -// import ServiceRegistry from "../../../service/system/serviceRegistry.js"; -// import StringService from "../../../service/system/stringService.js"; -// import fs from "fs"; -// import path from "path"; -// import { fileURLToPath } from "url"; -// import { ObjectId } from "mongodb"; - import { buildUptimeDetailsPipeline, buildHardwareDetailsPipeline,