refactor to monitor service

This commit is contained in:
Alex Holliday committed 2025-07-24 13:50:21 -07:00
1 parent 12ff66fd3e
commit d59e2796e7
8 files changed
+421 -404

No files matched your search

+8 -4
View File
@@ -126,18 +126,22 @@ MonitorSchema.pre("findOneAndDelete", async function (next) {
try {
const doc = await this.model.findOne(this.getFilter());
if (doc.type === "pagespeed") {
if (!doc) {
throw new Error("Monitor not found");
}
if (doc?.type === "pagespeed") {
await PageSpeedCheck.deleteMany({ monitorId: doc._id });
} else if (doc.type === "hardware") {
} else if (doc?.type === "hardware") {
await HardwareCheck.deleteMany({ monitorId: doc._id });
} else {
await Check.deleteMany({ monitorId: doc._id });
}
// Deal with status pages
await StatusPage.updateMany({ monitors: doc._id }, { $pull: { monitors: doc._id } });
await StatusPage.updateMany({ monitors: doc?._id }, { $pull: { monitors: doc?._id } });
await MonitorStats.deleteMany({ monitorId: doc._id.toString() });
await MonitorStats.deleteMany({ monitorId: doc?._id.toString() });
next();
} catch (error) {
next(error);
+6 -7
View File
@@ -279,7 +279,6 @@ const calculateGroupStats = (group) => {
* @throws {Error}
*/
const getUptimeDetailsById = async ({ monitorId, dateRange, normalize }) => {
const stringService = ServiceRegistry.get(StringService.SERVICE_NAME);
try {
const dates = getDateRange(dateRange);
const formatLookup = {
@@ -595,16 +594,16 @@ const createBulkMonitors = async (req) => {
* @returns {Promise<Monitor>}
* @throws {Error}
*/
const deleteMonitor = async ({ monitorId }) => {
const deleteMonitor = async ({ teamId, monitorId }) => {
const stringService = ServiceRegistry.get(StringService.SERVICE_NAME);
try {
const monitor = await Monitor.findByIdAndDelete(monitorId);
const deletedMonitor = await Monitor.findOneAndDelete({ _id: monitorId, teamId });
if (!monitor) {
if (!deletedMonitor) {
throw new Error(stringService.getDbFindMonitorById(monitorId));
}
return monitor;
return deletedMonitor;
} catch (error) {
error.service = SERVICE_NAME;
error.method = "deleteMonitor";
@@ -654,9 +653,9 @@ const deleteMonitorsByUserId = async (userId) => {
* @returns {Promise<Monitor>}
* @throws {Error}
*/
const editMonitor = async (candidateId, candidateMonitor) => {
const editMonitor = async ({ monitorId, body }) => {
try {
const editedMonitor = await Monitor.findByIdAndUpdate(candidateId, candidateMonitor, {
const editedMonitor = await Monitor.findByIdAndUpdate(monitorId, body, {
new: true,
});
return editedMonitor;
@@ -138,6 +138,7 @@ const buildUptimeDetailsPipeline = (monitorId, dates, dateString) => {
{
$project: {
_id: 1,
teamId: 1,
name: 1,
status: 1,
interval: 1,