From 26ed7139230d89a24a8089a94992c4acb21e72ce Mon Sep 17 00:00:00 2001 From: Alex Holliday Date: Fri, 19 Dec 2025 19:10:06 +0000 Subject: [PATCH] extract getStartState --- server/src/services/business/CheckService.ts | 20 ++--------------- .../src/services/business/IncidentService.ts | 22 ++----------------- .../src/services/business/MonitorService.ts | 19 ++-------------- server/src/utils/TimeUtils.ts | 19 ++++++++++++++++ 4 files changed, 25 insertions(+), 55 deletions(-) create mode 100644 server/src/utils/TimeUtils.ts diff --git a/server/src/services/business/CheckService.ts b/server/src/services/business/CheckService.ts index 971d081ad..5ee36598c 100644 --- a/server/src/services/business/CheckService.ts +++ b/server/src/services/business/CheckService.ts @@ -9,7 +9,7 @@ import type { import mongoose from "mongoose"; import ApiError from "@/utils/ApiError.js"; import { getChildLogger } from "@/logger/Logger.js"; -import { stat } from "node:fs"; +import { getStartDate } from "@/utils/TimeUtils.js"; const SERVICE_NAME = "CheckService"; const logger = getChildLogger(SERVICE_NAME); @@ -42,22 +42,6 @@ class CheckService implements ICheckService { this.SERVICE_NAME = SERVICE_NAME; } - private getStartDate(range: string): Date { - const now = new Date(); - switch (range) { - case "2h": - return new Date(now.getTime() - 2 * 60 * 60 * 1000); - case "24h": - return new Date(now.getTime() - 24 * 60 * 60 * 1000); - case "7d": - return new Date(now.getTime() - 7 * 24 * 60 * 60 * 1000); - case "30d": - return new Date(now.getTime() - 30 * 24 * 60 * 60 * 1000); - default: - throw new ApiError("Invalid range parameter", 400); - } - } - private isCapturePayload = (payload: any): payload is ICapturePayload => { if (!payload || typeof payload !== "object") return false; @@ -241,7 +225,7 @@ class CheckService implements ICheckService { range: string ) => { let match; - const startDate = this.getStartDate(range); + const startDate = getStartDate(range); if (monitorId) { const authorized = await Monitor.exists({ diff --git a/server/src/services/business/IncidentService.ts b/server/src/services/business/IncidentService.ts index c4bf07980..09c5832f3 100644 --- a/server/src/services/business/IncidentService.ts +++ b/server/src/services/business/IncidentService.ts @@ -9,8 +9,8 @@ import { import type { ResolutionType } from "@/db/models/index.js"; import mongoose from "mongoose"; import { getChildLogger } from "@/logger/Logger.js"; -import ApiError from "@/utils/ApiError.js"; import { ThresholdEvaluationResult } from "@/services/infrastructure/StatusService.js"; +import { getStartDate } from "@/utils/TimeUtils.js"; type IncidentPopulated = Omit & { monitorId: IMonitor; @@ -66,24 +66,6 @@ class IncidentService implements IIncidentService { this.SERVICE_NAME = SERVICE_NAME; } - private getStartDate(range: string): Date { - const now = new Date(); - switch (range) { - case "all": - return new Date(0); - case "2h": - return new Date(now.getTime() - 2 * 60 * 60 * 1000); - case "24h": - return new Date(now.getTime() - 24 * 60 * 60 * 1000); - case "7d": - return new Date(now.getTime() - 7 * 24 * 60 * 60 * 1000); - case "30d": - return new Date(now.getTime() - 30 * 24 * 60 * 60 * 1000); - default: - throw new ApiError("Invalid range parameter", 400); - } - } - handleStatusChange = async (updatedMonitor: IMonitor, lastCheck: ICheck) => { if (updatedMonitor.status === "down") { const incident = await this.create( @@ -216,7 +198,7 @@ class IncidentService implements IIncidentService { resolved?: boolean, resolutionType?: ResolutionType ) => { - const startDate = this.getStartDate(range); + const startDate = getStartDate(range); const match = { teamId: teamId, ...(monitorId && { monitorId }), diff --git a/server/src/services/business/MonitorService.ts b/server/src/services/business/MonitorService.ts index 6c18e4936..eaad9003a 100644 --- a/server/src/services/business/MonitorService.ts +++ b/server/src/services/business/MonitorService.ts @@ -7,6 +7,7 @@ import { IJobQueue } from "@/services/infrastructure/JobQueue.js"; import { MonitorWithChecksResponse } from "@/types/index.js"; import { MonitorStatus, MonitorType } from "@/db/models/monitors/Monitor.js"; import { Entitlements } from "@/types/entitlements.js"; +import { getStartDate } from "@/utils/TimeUtils.js"; export interface IImportedMonitor { name: string; @@ -239,22 +240,6 @@ class MonitorService implements IMonitorService { return monitor; }; - private getStartDate(range: string): Date { - const now = new Date(); - switch (range) { - case "1h": - return new Date(now.getTime() - 1 * 60 * 60 * 1000); - case "24h": - return new Date(now.getTime() - 24 * 60 * 60 * 1000); - case "7d": - return new Date(now.getTime() - 7 * 24 * 60 * 60 * 1000); - case "30d": - return new Date(now.getTime() - 30 * 24 * 60 * 60 * 1000); - default: - throw new ApiError("Invalid range parameter", 400); - } - } - private getBaseGroup = (): Record => { return { _id: { $dateTrunc: { date: "$createdAt", unit: "minute" } }, @@ -681,7 +666,7 @@ class MonitorService implements IMonitorService { throw new ApiError("Monitor not found", 404); } - const startDate = this.getStartDate(range); + const startDate = getStartDate(range); if (range === "24h" || range === "7d" || range === "30d") { return await this.getEmbedChecksOtherRanges(monitor, range, startDate); diff --git a/server/src/utils/TimeUtils.ts b/server/src/utils/TimeUtils.ts new file mode 100644 index 000000000..34fb62f51 --- /dev/null +++ b/server/src/utils/TimeUtils.ts @@ -0,0 +1,19 @@ +import ApiError from "@/utils/ApiError.js"; + +export const getStartDate = (range: string): Date => { + const now = new Date(); + switch (range) { + case "all": + return new Date(0); + case "1h": + return new Date(now.getTime() - 1 * 60 * 60 * 1000); + case "24h": + return new Date(now.getTime() - 24 * 60 * 60 * 1000); + case "7d": + return new Date(now.getTime() - 7 * 24 * 60 * 60 * 1000); + case "30d": + return new Date(now.getTime() - 30 * 24 * 60 * 60 * 1000); + default: + throw new ApiError("Invalid range parameter", 400); + } +};