From e887c2308a9ff055b44d6986793ed6426a645605 Mon Sep 17 00:00:00 2001 From: Alex Holliday Date: Wed, 11 Mar 2026 11:50:51 -0700 Subject: [PATCH 1/3] type MWController --- .../maintenanceWindowController.ts | 40 +++++++++---------- .../IMaintenanceWindowsRepository.ts | 4 +- .../MongoMaintenanceWindowsRepository.ts | 8 ++-- .../business/maintenanceWindowService.ts | 30 ++++++++++---- .../validation/maintenanceWindowValidation.ts | 6 +-- 5 files changed, 52 insertions(+), 36 deletions(-) diff --git a/server/src/controllers/maintenanceWindowController.ts b/server/src/controllers/maintenanceWindowController.ts index ed16911bf..cd2174c1b 100644 --- a/server/src/controllers/maintenanceWindowController.ts +++ b/server/src/controllers/maintenanceWindowController.ts @@ -9,25 +9,18 @@ import { deleteMaintenanceWindowByIdParamValidation, } from "@/validation/maintenanceWindowValidation.js"; import { requireTeamId } from "@/controllers/controllerUtils.js"; - -const SERVICE_NAME = "maintenanceWindowController"; +import { IMaintenanceWindowService } from "@/service/index.js"; class MaintenanceWindowController { - static SERVICE_NAME = SERVICE_NAME; - private maintenanceWindowService: any; - constructor(maintenanceWindowService: any) { + private maintenanceWindowService: IMaintenanceWindowService; + constructor(maintenanceWindowService: IMaintenanceWindowService) { this.maintenanceWindowService = maintenanceWindowService; } - get serviceName() { - return MaintenanceWindowController.SERVICE_NAME; - } - createMaintenanceWindows = async (req: Request, res: Response, next: NextFunction) => { try { createMaintenanceWindowBodyValidation.parse(req.body); const teamId = requireTeamId(req?.user?.teamId); - await this.maintenanceWindowService.createMaintenanceWindow({ teamId, body: req.body }); return res.status(200).json({ @@ -58,11 +51,18 @@ class MaintenanceWindowController { getMaintenanceWindowsByTeamId = async (req: Request, res: Response, next: NextFunction) => { try { - getMaintenanceWindowsByTeamIdQueryValidation.parse(req.query); + const validatedQuery = getMaintenanceWindowsByTeamIdQueryValidation.parse(req.query); const teamId = requireTeamId(req?.user?.teamId); - const maintenanceWindows = await this.maintenanceWindowService.getMaintenanceWindowsByTeamId({ teamId, query: req.query }); + const maintenanceWindows = await this.maintenanceWindowService.getMaintenanceWindowsByTeamId({ + teamId, + active: validatedQuery.active, + page: validatedQuery.page, + rowsPerPage: validatedQuery.rowsPerPage, + field: validatedQuery.field, + order: validatedQuery.order, + }); return res.status(200).json({ success: true, @@ -76,12 +76,12 @@ class MaintenanceWindowController { getMaintenanceWindowsByMonitorId = async (req: Request, res: Response, next: NextFunction) => { try { - getMaintenanceWindowsByMonitorIdParamValidation.parse(req.params); + const validatedParams = getMaintenanceWindowsByMonitorIdParamValidation.parse(req.params); const teamId = requireTeamId(req?.user?.teamId); const maintenanceWindows = await this.maintenanceWindowService.getMaintenanceWindowsByMonitorId({ - monitorId: req.params.monitorId as string, + monitorId: validatedParams.monitorId, teamId, }); @@ -96,11 +96,11 @@ class MaintenanceWindowController { }; deleteMaintenanceWindow = async (req: Request, res: Response, next: NextFunction) => { try { - deleteMaintenanceWindowByIdParamValidation.parse(req.params); + const validatedParams = deleteMaintenanceWindowByIdParamValidation.parse(req.params); const teamId = requireTeamId(req?.user?.teamId); - await this.maintenanceWindowService.deleteMaintenanceWindow({ id: req.params.id as string, teamId }); + await this.maintenanceWindowService.deleteMaintenanceWindow({ id: validatedParams.id, teamId }); return res.status(200).json({ success: true, @@ -113,14 +113,14 @@ class MaintenanceWindowController { editMaintenanceWindow = async (req: Request, res: Response, next: NextFunction) => { try { - editMaintenanceWindowByIdParamValidation.parse(req.params); - editMaintenanceByIdWindowBodyValidation.parse(req.body); + const validatedParams = editMaintenanceWindowByIdParamValidation.parse(req.params); + const validatedBody = editMaintenanceByIdWindowBodyValidation.parse(req.body); const teamId = requireTeamId(req.user?.teamId); const editedMaintenanceWindow = await this.maintenanceWindowService.editMaintenanceWindow({ - id: req.params.id as string, - body: req.body, + id: validatedParams.id, + body: validatedBody, teamId, }); return res.status(200).json({ diff --git a/server/src/repositories/maintenance-windows/IMaintenanceWindowsRepository.ts b/server/src/repositories/maintenance-windows/IMaintenanceWindowsRepository.ts index 1bcb02347..fca63ac35 100644 --- a/server/src/repositories/maintenance-windows/IMaintenanceWindowsRepository.ts +++ b/server/src/repositories/maintenance-windows/IMaintenanceWindowsRepository.ts @@ -5,12 +5,12 @@ export interface IMaintenanceWindowsRepository { // fetch findById(id: string, teamId: string): Promise; findByMonitorId(monitorId: string, teamId: string): Promise; - findByTeamId(teamId: string, active: boolean, page: number, rowsPerPage: number, field: string, order: string): Promise; + findByTeamId(teamId: string, page: number, rowsPerPage: number, field?: string, order?: string, active?: boolean): Promise; // update updateById(id: string, teamId: string, data: Partial): Promise; // delete deleteById(id: string, teamId: string): Promise; // other - countByTeamId(teamId: string, active: boolean): Promise; + countByTeamId(teamId: string, active?: boolean): Promise; } diff --git a/server/src/repositories/maintenance-windows/MongoMaintenanceWindowsRepository.ts b/server/src/repositories/maintenance-windows/MongoMaintenanceWindowsRepository.ts index 4aadf9cc2..d924613ee 100644 --- a/server/src/repositories/maintenance-windows/MongoMaintenanceWindowsRepository.ts +++ b/server/src/repositories/maintenance-windows/MongoMaintenanceWindowsRepository.ts @@ -75,11 +75,11 @@ class MongoMaintenanceWindowsRepository implements IMaintenanceWindowsRepository findByTeamId = async ( teamId: string, - active: boolean, page: number, rowsPerPage: number, - field: string, - order: string + field?: string, + order?: string, + active?: boolean ): Promise => { const maintenanceQuery: Record = { teamId }; @@ -126,7 +126,7 @@ class MongoMaintenanceWindowsRepository implements IMaintenanceWindowsRepository } return this.toEntity(deleted); }; - countByTeamId = async (teamId: string, active: boolean) => { + countByTeamId = async (teamId: string, active?: boolean) => { const maintenanceQuery: Record = { teamId }; if (active !== undefined) maintenanceQuery.active = active; diff --git a/server/src/service/business/maintenanceWindowService.ts b/server/src/service/business/maintenanceWindowService.ts index abf513eb5..1db2df9ca 100644 --- a/server/src/service/business/maintenanceWindowService.ts +++ b/server/src/service/business/maintenanceWindowService.ts @@ -10,7 +10,11 @@ export interface IMaintenanceWindowService { getMaintenanceWindowById(params: { id: string; teamId: string }): Promise; getMaintenanceWindowsByTeamId(params: { teamId: string; - query: Record; + active?: boolean; + page?: number; + rowsPerPage?: number; + field?: string; + order?: string; }): Promise<{ maintenanceWindows: MaintenanceWindow[]; maintenanceWindowCount: number }>; getMaintenanceWindowsByMonitorId(params: { monitorId: string; teamId: string }): Promise; deleteMaintenanceWindow(params: { id: string; teamId: string }): Promise; @@ -72,14 +76,26 @@ export class MaintenanceWindowService implements IMaintenanceWindowService { return await this.maintenanceWindowsRepository.findById(id, teamId); }; - getMaintenanceWindowsByTeamId = async ({ teamId, query }: { teamId: string; query: any }) => { - let { active, page, rowsPerPage, field, order } = query || {}; - + getMaintenanceWindowsByTeamId = async ({ + teamId, + active, + page, + rowsPerPage, + field, + order, + }: { + teamId: string; + active?: boolean; + page?: number; + rowsPerPage?: number; + field?: string; + order?: string; + }) => { active = typeof active === "undefined" ? undefined : ParseBoolean(active); - page = parseInt(page) || 0; - rowsPerPage = parseInt(rowsPerPage) || 10; + page = page ?? 0; + rowsPerPage = rowsPerPage ?? 10; - const maintenanceWindows = await this.maintenanceWindowsRepository.findByTeamId(teamId, active, page, rowsPerPage, field, order); + const maintenanceWindows = await this.maintenanceWindowsRepository.findByTeamId(teamId, page, rowsPerPage, field, order, active); const maintenanceWindowCount = await this.maintenanceWindowsRepository.countByTeamId(teamId, active); return { maintenanceWindows, maintenanceWindowCount }; }; diff --git a/server/src/validation/maintenanceWindowValidation.ts b/server/src/validation/maintenanceWindowValidation.ts index e09ac2989..3470f4c38 100644 --- a/server/src/validation/maintenanceWindowValidation.ts +++ b/server/src/validation/maintenanceWindowValidation.ts @@ -45,9 +45,9 @@ export const editMaintenanceByIdWindowBodyValidation = z.object({ active: z.boolean().optional(), name: z.string().optional(), repeat: z.number().optional(), - start: z.coerce.date().optional(), - end: z.coerce.date().optional(), - expiry: z.coerce.date().optional(), + start: z.string().optional(), + end: z.string().optional(), + expiry: z.string().optional(), monitors: z.array(z.unknown()).optional(), duration: z.number().optional(), durationUnit: z.enum(["seconds", "minutes", "hours", "days"]).optional(), From 456237ba4e4c33d8b52b6ac56b28e17b7f4e3c8b Mon Sep 17 00:00:00 2001 From: Alex Holliday Date: Wed, 11 Mar 2026 12:00:19 -0700 Subject: [PATCH 2/3] tighten date typing --- .../src/controllers/maintenanceWindowController.ts | 4 ++-- .../service/business/maintenanceWindowService.ts | 2 -- .../src/validation/maintenanceWindowValidation.ts | 14 ++++++++------ 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/server/src/controllers/maintenanceWindowController.ts b/server/src/controllers/maintenanceWindowController.ts index cd2174c1b..d2338cd51 100644 --- a/server/src/controllers/maintenanceWindowController.ts +++ b/server/src/controllers/maintenanceWindowController.ts @@ -19,9 +19,9 @@ class MaintenanceWindowController { createMaintenanceWindows = async (req: Request, res: Response, next: NextFunction) => { try { - createMaintenanceWindowBodyValidation.parse(req.body); + const validatedBody = createMaintenanceWindowBodyValidation.parse(req.body); const teamId = requireTeamId(req?.user?.teamId); - await this.maintenanceWindowService.createMaintenanceWindow({ teamId, body: req.body }); + await this.maintenanceWindowService.createMaintenanceWindow({ teamId, body: validatedBody }); return res.status(200).json({ success: true, diff --git a/server/src/service/business/maintenanceWindowService.ts b/server/src/service/business/maintenanceWindowService.ts index 1db2df9ca..98b803bd1 100644 --- a/server/src/service/business/maintenanceWindowService.ts +++ b/server/src/service/business/maintenanceWindowService.ts @@ -1,6 +1,5 @@ import { IMaintenanceWindowsRepository, IMonitorsRepository } from "@/repositories/index.js"; import type { MaintenanceWindow } from "@/types/index.js"; -import { ParseBoolean } from "@/utils/utils.js"; import { AppError } from "@/utils/AppError.js"; const SERVICE_NAME = "maintenanceWindowService"; @@ -91,7 +90,6 @@ export class MaintenanceWindowService implements IMaintenanceWindowService { field?: string; order?: string; }) => { - active = typeof active === "undefined" ? undefined : ParseBoolean(active); page = page ?? 0; rowsPerPage = rowsPerPage ?? 10; diff --git a/server/src/validation/maintenanceWindowValidation.ts b/server/src/validation/maintenanceWindowValidation.ts index 3470f4c38..7cac8d1ad 100644 --- a/server/src/validation/maintenanceWindowValidation.ts +++ b/server/src/validation/maintenanceWindowValidation.ts @@ -1,6 +1,8 @@ import { z } from "zod"; import { booleanCoercion } from "./shared.js"; +const dateToString = z.coerce.date().transform((d) => d.toISOString()); + //**************************************** // Maintenance Window Validations //**************************************** @@ -11,10 +13,10 @@ export const createMaintenanceWindowBodyValidation = z.object({ active: z.boolean().optional(), duration: z.number().min(1, "Duration is required"), durationUnit: z.enum(["seconds", "minutes", "hours", "days"]), - start: z.coerce.date(), - end: z.coerce.date(), + start: dateToString, + end: dateToString, repeat: z.number().min(0, "Repeat must be a non-negative number"), - expiry: z.coerce.date().optional(), + expiry: dateToString.optional(), }); export const getMaintenanceWindowByIdParamValidation = z.object({ @@ -45,9 +47,9 @@ export const editMaintenanceByIdWindowBodyValidation = z.object({ active: z.boolean().optional(), name: z.string().optional(), repeat: z.number().optional(), - start: z.string().optional(), - end: z.string().optional(), - expiry: z.string().optional(), + start: dateToString.optional(), + end: dateToString.optional(), + expiry: dateToString.optional(), monitors: z.array(z.unknown()).optional(), duration: z.number().optional(), durationUnit: z.enum(["seconds", "minutes", "hours", "days"]).optional(), From 42f6c42ae14437790340c4423c88b82c2c1ce7e9 Mon Sep 17 00:00:00 2001 From: Alex Holliday Date: Wed, 11 Mar 2026 12:04:28 -0700 Subject: [PATCH 3/3] fix discarded validation, tighten types --- server/src/controllers/maintenanceWindowController.ts | 4 ++-- server/src/validation/maintenanceWindowValidation.ts | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/server/src/controllers/maintenanceWindowController.ts b/server/src/controllers/maintenanceWindowController.ts index d2338cd51..2e0294db1 100644 --- a/server/src/controllers/maintenanceWindowController.ts +++ b/server/src/controllers/maintenanceWindowController.ts @@ -33,11 +33,11 @@ class MaintenanceWindowController { }; getMaintenanceWindowById = async (req: Request, res: Response, next: NextFunction) => { try { - getMaintenanceWindowByIdParamValidation.parse(req.params); + const validatedParams = getMaintenanceWindowByIdParamValidation.parse(req.params); const teamId = requireTeamId(req.user?.teamId); - const maintenanceWindow = await this.maintenanceWindowService.getMaintenanceWindowById({ id: req.params.id as string, teamId }); + const maintenanceWindow = await this.maintenanceWindowService.getMaintenanceWindowById({ id: validatedParams.id, teamId }); return res.status(200).json({ success: true, diff --git a/server/src/validation/maintenanceWindowValidation.ts b/server/src/validation/maintenanceWindowValidation.ts index 7cac8d1ad..bee06e7bc 100644 --- a/server/src/validation/maintenanceWindowValidation.ts +++ b/server/src/validation/maintenanceWindowValidation.ts @@ -50,7 +50,7 @@ export const editMaintenanceByIdWindowBodyValidation = z.object({ start: dateToString.optional(), end: dateToString.optional(), expiry: dateToString.optional(), - monitors: z.array(z.unknown()).optional(), + monitors: z.array(z.string()).optional(), duration: z.number().optional(), durationUnit: z.enum(["seconds", "minutes", "hours", "days"]).optional(), });