From 303f47a11733635ef56f9bebfb9e149109ec782b Mon Sep 17 00:00:00 2001 From: Alex Holliday Date: Tue, 4 Aug 2026 15:30:34 -0700 Subject: [PATCH] add opt out flag for recent checks --- .../maintenance-window.service.ts | 4 ++-- .../monitors/monitor.repository.interface.ts | 4 ++-- .../monitors/monitor.repository.mongo.ts | 18 +++++++++++++----- server/src/domain/monitors/monitor.service.ts | 2 +- server/src/domain/users/user.service.ts | 2 +- .../services/maintenanceWindowService.test.ts | 4 ++-- server/test/unit/services/userService.test.ts | 2 +- 7 files changed, 22 insertions(+), 14 deletions(-) diff --git a/server/src/domain/maintenance-windows/maintenance-window.service.ts b/server/src/domain/maintenance-windows/maintenance-window.service.ts index 350e755aa..dd27ba0b3 100644 --- a/server/src/domain/maintenance-windows/maintenance-window.service.ts +++ b/server/src/domain/maintenance-windows/maintenance-window.service.ts @@ -106,7 +106,7 @@ export class MaintenanceWindowService implements IMaintenanceWindowService { start: string; end: string; }) => { - const monitors = await this.monitorsRepository.findByIds(monitorIDs); + const monitors = await this.monitorsRepository.findByIds(monitorIDs, { includeRecentChecks: false }); const unauthorizedMonitors = monitors.filter((monitor) => monitor.teamId !== teamId); @@ -193,7 +193,7 @@ export class MaintenanceWindowService implements IMaintenanceWindowService { const update: Partial = rest; if (monitors !== undefined) { - const monitorDocs = await this.monitorsRepository.findByIds(monitors); + const monitorDocs = await this.monitorsRepository.findByIds(monitors, { includeRecentChecks: false }); const unauthorizedMonitors = monitorDocs.filter((monitor) => monitor.teamId !== teamId); if (unauthorizedMonitors.length > 0) { throw new AppError({ diff --git a/server/src/domain/monitors/monitor.repository.interface.ts b/server/src/domain/monitors/monitor.repository.interface.ts index e6e68863b..53c178a1d 100644 --- a/server/src/domain/monitors/monitor.repository.interface.ts +++ b/server/src/domain/monitors/monitor.repository.interface.ts @@ -27,9 +27,9 @@ export interface IMonitorsRepository { // collection fetch findAllForScheduling(): Promise; - findByTeamId(teamId: string, config: TeamQueryConfig): Promise; + findByTeamId(teamId: string, config: TeamQueryConfig, options?: { includeRecentChecks?: boolean }): Promise; findByTeamIdWithStats(teamId: string, config: TeamQueryConfig): Promise; - findByIds(monitorIds: string[]): Promise; + findByIds(monitorIds: string[], options?: { includeRecentChecks?: boolean }): Promise; // update updateById(monitorId: string, teamId: string, updates: Partial): Promise; diff --git a/server/src/domain/monitors/monitor.repository.mongo.ts b/server/src/domain/monitors/monitor.repository.mongo.ts index cdfbf4ca9..2411f3840 100644 --- a/server/src/domain/monitors/monitor.repository.mongo.ts +++ b/server/src/domain/monitors/monitor.repository.mongo.ts @@ -104,10 +104,15 @@ class MongoMonitorsRepository implements IMonitorsRepository { return { sort: { [field]: order === "asc" ? 1 : -1 } as const, skip: Math.max(page, 0) * rowsPerPage, limit: rowsPerPage }; }; - findByTeamId = async (teamId: string, config: TeamQueryConfig): Promise => { + findByTeamId = async (teamId: string, config: TeamQueryConfig, options?: { includeRecentChecks?: boolean }): Promise => { const query = this.queryBuilder(config, teamId); const { sort, skip, limit } = this.pageOptions(config); - const documents = await MonitorModel.find(query).sort(sort).skip(skip).limit(limit); + + const cursor = MonitorModel.find(query).sort(sort).skip(skip).limit(limit); + if (options?.includeRecentChecks === false) { + cursor.select({ recentChecks: 0 }); + } + const documents = await cursor; return this.mapDocuments(documents); }; @@ -126,15 +131,18 @@ class MongoMonitorsRepository implements IMonitorsRepository { return documents.map((doc) => this.toEntity(doc)); }; - findByIds = async (monitorIds: string[]): Promise => { + findByIds = async (monitorIds: string[], options?: { includeRecentChecks?: boolean }): Promise => { if (!monitorIds.length) { return []; } const objectIds = monitorIds.map((id) => new mongoose.Types.ObjectId(id)); - const pipeline: PipelineStage[] = [{ $match: { _id: { $in: objectIds } } }, ...this.uptimeStatsLookupStages]; - + const pipeline: PipelineStage[] = [ + { $match: { _id: { $in: objectIds } } }, + ...(options?.includeRecentChecks === false ? [{ $project: { recentChecks: 0 } } as PipelineStage] : []), + ...this.uptimeStatsLookupStages, + ]; const documents = await MonitorModel.aggregate(pipeline); return documents.map((doc) => this.toEntity(doc)); }; diff --git a/server/src/domain/monitors/monitor.service.ts b/server/src/domain/monitors/monitor.service.ts index 78a452044..31488c378 100644 --- a/server/src/domain/monitors/monitor.service.ts +++ b/server/src/domain/monitors/monitor.service.ts @@ -519,7 +519,7 @@ export class MonitorService implements IMonitorService { }; exportMonitorsToJSON = async ({ teamId }: { teamId: string }): Promise => { - const monitors = await this.monitorsRepository.findByTeamId(teamId, {}); + const monitors = await this.monitorsRepository.findByTeamId(teamId, {}, { includeRecentChecks: false }); if (monitors.length === 0) { throw new AppError({ message: "No monitors found to export.", service: SERVICE_NAME, method: "exportMonitorsToJSON", status: 400 }); diff --git a/server/src/domain/users/user.service.ts b/server/src/domain/users/user.service.ts index f3db2f3b5..f042863aa 100644 --- a/server/src/domain/users/user.service.ts +++ b/server/src/domain/users/user.service.ts @@ -324,7 +324,7 @@ export class UserService implements IUserService { } if (roles.includes("superadmin")) { - const monitors = await this.monitorsRepository.findByTeamId(teamId, {}); + const monitors = await this.monitorsRepository.findByTeamId(teamId, {}, { includeRecentChecks: false }); if (monitors) { await Promise.all(monitors.map((monitor) => this.scheduler.deleteJob(monitor))); } diff --git a/server/test/unit/services/maintenanceWindowService.test.ts b/server/test/unit/services/maintenanceWindowService.test.ts index e15f20d46..481dc5983 100644 --- a/server/test/unit/services/maintenanceWindowService.test.ts +++ b/server/test/unit/services/maintenanceWindowService.test.ts @@ -123,7 +123,7 @@ describe("MaintenanceWindowService", () => { await service.createMaintenanceWindow(defaultCreateParams); - expect(monitorsRepository.findByIds).toHaveBeenCalledWith(["mon-1", "mon-2"]); + expect(monitorsRepository.findByIds).toHaveBeenCalledWith(["mon-1", "mon-2"], { includeRecentChecks: false }); }); it("throws 403 when a monitor belongs to a different team", async () => { @@ -404,7 +404,7 @@ describe("MaintenanceWindowService", () => { body: { monitors: ["mon-1", "mon-2"] }, }); - expect(monitorsRepository.findByIds).toHaveBeenCalledWith(["mon-1", "mon-2"]); + expect(monitorsRepository.findByIds).toHaveBeenCalledWith(["mon-1", "mon-2"], { includeRecentChecks: false }); }); it("throws 403 when a new monitor belongs to a different team", async () => { diff --git a/server/test/unit/services/userService.test.ts b/server/test/unit/services/userService.test.ts index bce8769cf..5187a3c60 100644 --- a/server/test/unit/services/userService.test.ts +++ b/server/test/unit/services/userService.test.ts @@ -472,7 +472,7 @@ describe("UserService", () => { await service.deleteUser({ userId: "user-1", teamId: "team-1", roles: ["superadmin"] }); - expect(monitorsRepository.findByTeamId).toHaveBeenCalledWith("team-1", {}); + expect(monitorsRepository.findByTeamId).toHaveBeenCalledWith("team-1", {}, { includeRecentChecks: false }); expect(scheduler.deleteJob).toHaveBeenCalledTimes(2); expect(usersRepository.deleteById).toHaveBeenCalledWith("user-1"); });