Merge pull request #3394 from bluewave-labs/develop

develop -> master 3.5.1 release

README.md

@@ -46,11 +46,11 @@ You can see the latest build of [Checkmate](https://checkmate-demo.bluewavelabs.
 
 ## User's guide
 
-Usage instructions can be found [here](https://checkmate.so/docs). 
+Usage instructions can be found [here](https://docs.checkmate.so/checkmate-2.1). It's still WIP and some of the information there might be outdated as we continuously add features weekly. Rest assured, we are doing our best! :)
 
 ## Installation
 
-See installation instructions in [Checkmate documentation portal](https://checkmate.so/docs). 
+See installation instructions in [Checkmate documentation portal](https://docs.checkmate.so/checkmate-2.1/users-guide/quickstart). 
 
 Alternatively, you can also use [Elestio](https://elest.io/open-source/checkmate), [K8s](./charts/helm/checkmate/INSTALLATION.md), [Sive Host](https://sive.host) (South Africa) or [Pikapods](https://www.pikapods.com/) to quickly spin off a Checkmate instance. If you would like to monitor your server infrastructure, you'll need [Capture agent](https://github.com/bluewave-labs/capture). Capture repository also contains the installation instructions.
 
@@ -157,11 +157,12 @@ Here's how you can contribute:
 
 0. Star this repo :)
 1. Check [Contributor's guideline](https://github.com/bluewave-labs/Checkmate/blob/develop/CONTRIBUTING.md). First timers are encouraged to check `good-first-issue` tag.
-2. Read a detailed structure of [Checkmate](https://deepwiki.com/bluewave-labs/Checkmate) if you would like to deep dive into the architecture.
+2. Check [project structure](https://docs.checkmate.so/checkmate-2.1/developers-guide/general-project-structure) and [high level overview](https://bluewavelabs.gitbook.io/checkmate/developers-guide/high-level-overview).
-3. Open an issue if you believe you've encountered a bug.
+3. Read a detailed structure of [Checkmate](https://deepwiki.com/bluewave-labs/Checkmate) if you would like to deep dive into the architecture.
-4. Check for good-first-issue's if you are a newcomer.
+4. Open an issue if you believe you've encountered a bug.
-5. Make a pull request to add new features/make quality-of-life improvements/fix bugs.
+5. Check for good-first-issue's if you are a newcomer.
-6. Check out this interactive walkthrough of the `Checkmate` codebase on CodeCanvas [here](https://www.code-canvas.com/?session=unauthenticatedGithub&repo=Checkmate&owner=bluewave-labs&branch=develop&OnboardingTutorial=true). To refine existing dataflow simulation or create new ones, follow the quick tutorial [here](https://docs.code-canvas.com/updating-diagram).
+6. Make a pull request to add new features/make quality-of-life improvements/fix bugs.
+7. Check out this interactive walkthrough of the `Checkmate` codebase on CodeCanvas [here](https://www.code-canvas.com/?session=unauthenticatedGithub&repo=Checkmate&owner=bluewave-labs&branch=develop&OnboardingTutorial=true). To refine existing dataflow simulation or create new ones, follow the quick tutorial [here](https://docs.code-canvas.com/updating-diagram).
 
 <a href="https://github.com/bluewave-labs/checkmate/graphs/contributors">
   <img src="https://contrib.rocks/image?repo=bluewave-labs/checkmate" />
@@ -174,3 +175,9 @@ Here's how you can contribute:
 Thanks to [Gitbook](https://gitbook.io/) for giving us a free tier for their documentation platform, and [Poeditor](https://poeditor.com/) providing us a free account to use their i18n services. If you would like to sponsor Checkmate, please send an email to hello@bluewavelabs.ca
 
 If you would like to sponsor a feature, [see this page](https://checkmate.so/sponsored-features).
+
+Also check other developer and contributor-friendly projects of BlueWave:
+
+- [VerifyWise](https://github.com/bluewave-labs/verifywise), the first open source AI governance platform.
+- [DataRoom](https://github.com/bluewave-labs/bluewave-dataroom), an secure file sharing application, aka dataroom.
+- [Guidefox](https://github.com/bluewave-labs/guidefox), an application that helps new users learn how to use your product via hints, tours, popups and banners.

client/package-lock.json

@@ -83,6 +83,7 @@
 		"node_modules/@babel/core": {
 			"version": "7.29.0",
 			"license": "MIT",
+			"peer": true,
 			"dependencies": {
 				"@babel/code-frame": "^7.29.0",
 				"@babel/generator": "^7.29.0",
@@ -353,6 +354,7 @@
 		"node_modules/@emotion/react": {
 			"version": "11.14.0",
 			"license": "MIT",
+			"peer": true,
 			"dependencies": {
 				"@babel/runtime": "^7.18.3",
 				"@emotion/babel-plugin": "^11.13.5",
@@ -390,6 +392,7 @@
 		"node_modules/@emotion/styled": {
 			"version": "11.14.1",
 			"license": "MIT",
+			"peer": true,
 			"dependencies": {
 				"@babel/runtime": "^7.18.3",
 				"@emotion/babel-plugin": "^11.13.5",
@@ -1159,6 +1162,7 @@
 		"node_modules/@mui/material": {
 			"version": "7.3.7",
 			"license": "MIT",
+			"peer": true,
 			"dependencies": {
 				"@babel/runtime": "^7.28.4",
 				"@mui/core-downloads-tracker": "^7.3.7",
@@ -1263,6 +1267,7 @@
 		"node_modules/@mui/system": {
 			"version": "7.3.7",
 			"license": "MIT",
+			"peer": true,
 			"dependencies": {
 				"@babel/runtime": "^7.28.4",
 				"@mui/private-theming": "^7.3.7",
@@ -2303,6 +2308,7 @@
 			"version": "24.5.2",
 			"devOptional": true,
 			"license": "MIT",
+			"peer": true,
 			"dependencies": {
 				"undici-types": "~7.12.0"
 			}
@@ -2318,6 +2324,7 @@
 		"node_modules/@types/react": {
 			"version": "18.3.27",
 			"license": "MIT",
+			"peer": true,
 			"dependencies": {
 				"@types/prop-types": "*",
 				"csstype": "^3.2.2"
@@ -2439,6 +2446,7 @@
 			"version": "8.15.0",
 			"dev": true,
 			"license": "MIT",
+			"peer": true,
 			"bin": {
 				"acorn": "bin/acorn"
 			},
@@ -2763,6 +2771,7 @@
 				}
 			],
 			"license": "MIT",
+			"peer": true,
 			"dependencies": {
 				"baseline-browser-mapping": "^2.9.0",
 				"caniuse-lite": "^1.0.30001759",
@@ -3194,7 +3203,8 @@
 		},
 		"node_modules/dayjs": {
 			"version": "1.11.13",
-			"license": "MIT"
+			"license": "MIT",
+			"peer": true
 		},
 		"node_modules/debug": {
 			"version": "4.4.3",
@@ -3576,6 +3586,7 @@
 			"version": "8.57.1",
 			"dev": true,
 			"license": "MIT",
+			"peer": true,
 			"dependencies": {
 				"@eslint-community/eslint-utils": "^4.2.0",
 				"@eslint-community/regexpp": "^4.6.1",
@@ -4320,6 +4331,7 @@
 				}
 			],
 			"license": "MIT",
+			"peer": true,
 			"dependencies": {
 				"@babel/runtime": "^7.27.6"
 			},
@@ -5103,6 +5115,7 @@
 			"resolved": "https://registry.npmjs.org/maplibre-gl/-/maplibre-gl-5.19.0.tgz",
 			"integrity": "sha512-REhYUN8gNP3HlcIZS6QU2uy8iovl31cXsrNDkCcqWSQbCkcpdYLczqDz5PVIwNH42UQNyvukjes/RoHPDrOUmQ==",
 			"license": "BSD-3-Clause",
+			"peer": true,
 			"dependencies": {
 				"@mapbox/geojson-rewind": "^0.5.2",
 				"@mapbox/jsonlint-lines-primitives": "^2.0.2",
@@ -5750,6 +5763,7 @@
 		"node_modules/react-dom": {
 			"version": "18.3.1",
 			"license": "MIT",
+			"peer": true,
 			"dependencies": {
 				"loose-envify": "^1.1.0",
 				"scheduler": "^0.23.2"
@@ -5761,6 +5775,7 @@
 		"node_modules/react-hook-form": {
 			"version": "7.71.1",
 			"license": "MIT",
+			"peer": true,
 			"engines": {
 				"node": ">=18.0.0"
 			},
@@ -5960,7 +5975,8 @@
 		},
 		"node_modules/redux": {
 			"version": "5.0.1",
-			"license": "MIT"
+			"license": "MIT",
+			"peer": true
 		},
 		"node_modules/redux-persist": {
 			"version": "6.0.0",
@@ -6106,10 +6122,11 @@
 			"license": "Unlicense"
 		},
 		"node_modules/rollup": {
-			"version": "4.57.1",
+			"version": "4.59.0",
 			"resolved": "https://registry.npmjs.org/rollup/-/rollup-4.59.0.tgz",
 			"integrity": "sha512-2oMpl67a3zCH9H79LeMcbDhXW/UmWG/y2zuqnF2jQq5uq9TbM9TVyXvA4+t+ne2IIkBdrLpAaRQAvo7YI/Yyeg==",
 			"license": "MIT",
+			"peer": true,
 			"dependencies": {
 				"@types/estree": "1.0.8"
 			},
@@ -6898,6 +6915,7 @@
 			"version": "5.9.3",
 			"devOptional": true,
 			"license": "Apache-2.0",
+			"peer": true,
 			"bin": {
 				"tsc": "bin/tsc",
 				"tsserver": "bin/tsserver"
@@ -7033,6 +7051,7 @@
 			"resolved": "https://registry.npmjs.org/vite/-/vite-6.4.1.tgz",
 			"integrity": "sha512-+Oxm7q9hDoLMyJOYfUYBuHQo+dkAloi33apOPP56pzj+vsdJDzr+j1NISE5pyaAuKL4A3UD34qd0lx5+kfKp2g==",
 			"license": "MIT",
+			"peer": true,
 			"dependencies": {
 				"esbuild": "^0.25.0",
 				"fdir": "^6.4.4",

client/src/Components/common/charts/HeatmapResponseTimeTooltip.tsx

@@ -57,8 +57,7 @@ export const HeatmapResponseTimeTooltip = ({
 						{formatDateWithTz(check?.createdAt, "ddd, MMMM D, YYYY, HH:mm A", uiTimezone)}
 					</Typography>
 					<Typography>
-						{t("common.labels.responseTime")}:{" "}
+						{t("common.labels.responseTime")}: {check.originalResponseTime.toFixed()} ms
-						{check?.originalResponseTime?.toFixed() ?? "N/A"} ms
 					</Typography>
 					<Typography textTransform={"capitalize"}>
 						Status:{" "}

client/src/Components/inputs/Slider.tsx

@@ -11,26 +11,20 @@ import type { ResponsiveStyleValue } from "@mui/system";
 interface SliderInputProps extends SliderProps {
 	sx?: SliderProps["sx"];
 	showValue?: boolean;
-	formatDisplayValue?: (value: number) => string;
 }
 
 export const SliderInput = forwardRef<HTMLSpanElement, SliderInputProps>(
-	({ sx, showValue = false, formatDisplayValue, ...props }, ref) => {
+	({ sx, showValue = false, ...props }, ref) => {
 		const theme = useTheme();
 		const additionalSx = Array.isArray(sx) ? sx : sx ? [sx] : [];
 
-		const displayValue =
-			showValue && formatDisplayValue && typeof props.value === "number"
-				? formatDisplayValue(props.value)
-				: props.value;
-
 		return (
 			<Stack
 				gap={theme.spacing(8)}
 				direction={"row"}
 				alignItems={"center"}
 			>
-				{showValue && <Typography>{displayValue}</Typography>}
+				{showValue && <Typography>{props.value}</Typography>}
 				<Slider
 					{...props}
 					ref={ref}
@@ -69,21 +63,12 @@ interface SliderWithLabelProps extends SliderProps {
 	fieldLabel?: string;
 	required?: boolean;
 	showValue?: boolean;
-	formatDisplayValue?: (value: number) => string;
 	sliderMaxWidth?: ResponsiveStyleValue<number | string>;
 }
 
 export const SliderWithLabel = forwardRef<HTMLSpanElement, SliderWithLabelProps>(
 	(
-		{
+		{ fieldLabel, required, showValue = true, value, sliderMaxWidth = "100%", ...props },
-			fieldLabel,
-			required,
-			showValue = true,
-			formatDisplayValue,
-			value,
-			sliderMaxWidth = "100%",
-			...props
-		},
 		ref
 	) => {
 		const theme = useTheme();
@@ -97,7 +82,6 @@ export const SliderWithLabel = forwardRef<HTMLSpanElement, SliderWithLabelProps>
 					<SliderInput
 						{...props}
 						showValue={showValue}
-						formatDisplayValue={formatDisplayValue}
 						value={value}
 						ref={ref}
 					/>

client/src/Hooks/useSettingsForm.ts

@@ -1,14 +1,14 @@
 import { useMemo } from "react";
 import { settingsSchema } from "@/Validation/settings";
 import type { Settings } from "@/Types/Settings";
-import type { SettingsFormInput } from "@/Validation/settings";
+import type { SettingsFormData } from "@/Validation/settings";
 
 interface UseSettingsFormOptions {
 	data?: Settings | null;
 }
 export const useSettingsForm = ({ data = null }: UseSettingsFormOptions = {}) => {
 	return useMemo(() => {
-		const defaults: SettingsFormInput = {
+		const defaults: SettingsFormData = {
 			systemEmailIgnoreTLS: data?.systemEmailIgnoreTLS ?? false,
 			systemEmailRequireTLS: data?.systemEmailRequireTLS ?? false,
 			systemEmailRejectUnauthorized: data?.systemEmailRejectUnauthorized ?? true,

client/src/Hooks/useStatusPageForm.ts

@@ -27,14 +27,12 @@ export const useStatusPageForm = ({
 			companyName: data?.companyName || "",
 			url: data?.url || generateDefaultUrl(),
 			timezone: data?.timezone || Intl.DateTimeFormat().resolvedOptions().timeZone,
-			type: data?.type || ["uptime"],
 			color: data?.color || "#4169E1",
 			monitors: data?.monitors || [],
 			isPublished: data?.isPublished ?? false,
 			showCharts: data?.showCharts ?? true,
 			showUptimePercentage: data?.showUptimePercentage ?? true,
 			showAdminLoginLink: data?.showAdminLoginLink ?? false,
-			showInfrastructure: data?.showInfrastructure ?? false,
 			customCSS: data?.customCSS || "",
 			logo: transformLogo(data?.logo),
 		};

client/src/Pages/CreateMonitor/index.tsx

@@ -302,49 +302,49 @@ const CreateMonitorPage = () => {
 									>
 										<RadioWithDescription
 											value="http"
-											label={t("pages.common.monitors.monitorTypes.optionHttp")}
+											label={t("pages.createMonitor.form.type.optionHttp")}
 											description={t(
 												"pages.createMonitor.form.type.optionHttpDescription"
 											)}
 										/>
 										<RadioWithDescription
 											value="ping"
-											label={t("pages.common.monitors.monitorTypes.optionPing")}
+											label={t("pages.createMonitor.form.type.optionPing")}
 											description={t(
 												"pages.createMonitor.form.type.optionPingDescription"
 											)}
 										/>
 										<RadioWithDescription
 											value="docker"
-											label={t("pages.common.monitors.monitorTypes.optionDocker")}
+											label={t("pages.createMonitor.form.type.optionDocker")}
 											description={t(
 												"pages.createMonitor.form.type.optionDockerDescription"
 											)}
 										/>
 										<RadioWithDescription
 											value="port"
-											label={t("pages.common.monitors.monitorTypes.optionPort")}
+											label={t("pages.createMonitor.form.type.optionPort")}
 											description={t(
 												"pages.createMonitor.form.type.optionPortDescription"
 											)}
 										/>
 										<RadioWithDescription
 											value="game"
-											label={t("pages.common.monitors.monitorTypes.optionGame")}
+											label={t("pages.createMonitor.form.type.optionGame")}
 											description={t(
 												"pages.createMonitor.form.type.optionGameDescription"
 											)}
 										/>
 										<RadioWithDescription
 											value="grpc"
-											label={t("pages.common.monitors.monitorTypes.optionGrpc")}
+											label={t("pages.createMonitor.form.type.optionGrpc")}
 											description={t(
 												"pages.createMonitor.form.type.optionGrpcDescription"
 											)}
 										/>
 										<RadioWithDescription
 											value="websocket"
-											label={t("pages.common.monitors.monitorTypes.optionWebSocket")}
+											label={t("pages.createMonitor.form.type.optionWebSocket")}
 											description={t(
 												"pages.createMonitor.form.type.optionWebSocketDescription"
 											)}

client/src/Pages/Settings/index.tsx

@@ -20,7 +20,7 @@ import { useGet, usePatch, usePost, useLazyGet } from "@/Hooks/UseApi";
 import { useToast } from "@/Hooks/UseToast";
 import { useSettingsForm } from "@/Hooks/useSettingsForm";
 import { useIsAdmin } from "@/Hooks/useIsAdmin.js";
-import type { SettingsFormData, SettingsFormInput } from "@/Validation/settings";
+import type { SettingsFormData } from "@/Validation/settings";
 import { useState } from "react";
 import { Controller } from "react-hook-form";
 import { TextField, Button, FieldLabel, SliderWithLabel } from "@/Components/inputs";
@@ -37,7 +37,6 @@ import {
 } from "@/Features/UI/uiSlice.js";
 import timezones from "@/Utils/timezones.json";
 import type { RootState } from "@/Types/state";
-import { CHECK_TTL_SENTINEL } from "@/Types/Check";
 
 interface Timezone {
 	id: string;
@@ -89,7 +88,7 @@ export const SettingsPage = () => {
 	// Initialize form with schema and defaults
 	const { schema, defaults } = useSettingsForm({ data: fetchedSettings?.settings });
 
-	const form = useForm<SettingsFormInput, unknown, SettingsFormData>({
+	const form = useForm<SettingsFormData>({
 		resolver: zodResolver(schema),
 		defaultValues: defaults,
 		mode: "onChange",
@@ -256,7 +255,28 @@ export const SettingsPage = () => {
 			delete (dataToSend as any).systemEmailPassword;
 		}
 
-		const result = await patch("/settings", dataToSend as SettingsFormData);
+		// Convert undefined to empty string for backend unsetting
+		const processedData = Object.entries(dataToSend).reduce((acc, [key, value]) => {
+			const typedKey = key as keyof SettingsFormData;
+			if (value === undefined) {
+				(acc as any)[typedKey] = "";
+			} else if (typeof value === "object" && value !== null) {
+				// Handle nested objects like globalThresholds
+				// Convert 0 to "" for unsetting thresholds
+				(acc as any)[typedKey] = Object.entries(value).reduce(
+					(nested, [nestedKey, nestedValue]) => ({
+						...nested,
+						[nestedKey]: nestedValue === undefined ? "" : nestedValue,
+					}),
+					{}
+				);
+			} else {
+				(acc as any)[typedKey] = value;
+			}
+			return acc;
+		}, {} as Partial<SettingsFormData>);
+
+		const result = await patch("/settings", processedData as SettingsFormData);
 
 		if (result?.success) {
 			// Update API key state from response
@@ -442,43 +462,6 @@ export const SettingsPage = () => {
 					/>
 				)}
 
-				{/* Check Retention */}
-				{isAdmin && (
-					<ConfigBox
-						title={t("pages.settings.form.retention.title")}
-						subtitle={t("pages.settings.form.retention.description")}
-						rightContent={
-							<Controller
-								name="checkTTL"
-								control={form.control}
-								defaultValue={defaults.checkTTL}
-								render={({ field }) => (
-									<SliderWithLabel
-										{...field}
-										fieldLabel={t("pages.settings.form.retention.option.days.label")}
-										min={1}
-										max={CHECK_TTL_SENTINEL}
-										sliderMaxWidth={{ xs: "100%", md: "50%" }}
-										value={field.value || 30}
-										onChange={(_, value) => field.onChange(value)}
-										valueLabelDisplay="auto"
-										valueLabelFormat={(value: number) =>
-											value >= CHECK_TTL_SENTINEL
-												? t("pages.settings.form.retention.option.days.unlimited")
-												: `${value}`
-										}
-										formatDisplayValue={(value: number) =>
-											value >= CHECK_TTL_SENTINEL
-												? t("pages.settings.form.retention.option.days.unlimited")
-												: `${value}`
-										}
-									/>
-								)}
-							/>
-						}
-					/>
-				)}
-
 				{/* Global Thresholds */}
 				{isAdmin && (
 					<ConfigBox

client/src/Pages/StatusPage/Create/index.tsx

@@ -21,28 +21,19 @@ import {
 
 import { useTheme } from "@mui/material/styles";
 import { useTranslation } from "react-i18next";
-import { useEffect, useMemo, useState } from "react";
+import { useEffect, useState } from "react";
 import { useForm, Controller } from "react-hook-form";
 import { zodResolver } from "@hookform/resolvers/zod";
 import { useStatusPageForm } from "@/Hooks/useStatusPageForm";
 import type { StatusPageFormData } from "@/Validation/statusPage";
 import { useGet, usePost, usePut, useDelete } from "@/Hooks/UseApi";
 import type { Monitor } from "@/Types/Monitor";
-import type { MonitorDisplayType, StatusPageResponse } from "@/Types/StatusPage";
+import type { StatusPageResponse } from "@/Types/StatusPage";
-import { getMonitorTypeLabel } from "@/Types/StatusPage";
 import timezones from "@/Utils/timezones.json";
 import { useNavigate, useParams } from "react-router-dom";
 import axios from "axios";
 import { HeaderConfigStatusControls } from "./Components/HeaderConfigStatusControls";
 
-const monitorsUrl = (() => {
-	const params = new URLSearchParams();
-	["http", "ping", "port", "docker", "game", "grpc", "websocket", "hardware"].forEach(
-		(type) => params.append("type", type)
-	);
-	return `/monitors/team?${params.toString()}`;
-})();
-
 interface TimezoneOption {
 	_id: string;
 	name: string;
@@ -58,11 +49,11 @@ const CreateStatusPage = () => {
 
 	// Fetch existing status page data when configuring
 	const { data: statusPageData, isLoading: isLoadingStatusPage } =
-		useGet<StatusPageResponse>(
+		useGet<StatusPageResponse>(isCreate ? null : `/status-page/${url}?type=uptime`);
-			isCreate ? null : `/status-page/${url}?type=uptime&type=infrastructure`
-		);
 
-	const { data: monitorsResponse } = useGet<Monitor[]>(monitorsUrl);
+	const { data: monitorsResponse } = useGet<Monitor[]>(
+		"/monitors/team?type=http&type=ping&type=port&type=docker"
+	);
 	const monitors = monitorsResponse ?? [];
 
 	const { post, loading: isSubmittingPost } = usePost();
@@ -90,24 +81,6 @@ const CreateStatusPage = () => {
 		reset(defaults);
 	}, [defaults, reset]);
 
-	const watchedMonitorIds: string[] = form.watch("monitors") ?? [];
-	const computedTypes: MonitorDisplayType[] = useMemo(() => {
-		const selectedMonitors = (watchedMonitorIds ?? [])
-			.map((id) => monitors.find((m) => m.id === id))
-			.filter((m): m is Monitor => m !== undefined);
-
-		const typesSet = new Set<MonitorDisplayType>();
-		selectedMonitors.forEach((m) => {
-			typesSet.add(m.type === "hardware" ? "infrastructure" : "uptime");
-		});
-
-		return typesSet.size ? Array.from(typesSet) : ["uptime"];
-	}, [watchedMonitorIds, monitors]);
-
-	useEffect(() => {
-		form.setValue("type", computedTypes);
-	}, [computedTypes]);
-
 	const onError = (errors: any) => {
 		logger.debug("Status page validation errors", errors);
 	};
@@ -130,6 +103,7 @@ const CreateStatusPage = () => {
 
 	const onSubmit = async (data: StatusPageFormData) => {
 		const fd = new FormData();
+		fd.append("type", "uptime");
 		fd.append("isPublished", String(data.isPublished));
 		if (data.companyName) fd.append("companyName", data.companyName);
 		if (data.url) fd.append("url", data.url);
@@ -138,16 +112,11 @@ const CreateStatusPage = () => {
 		fd.append("showCharts", String(data.showCharts));
 		fd.append("showUptimePercentage", String(data.showUptimePercentage));
 		fd.append("showAdminLoginLink", String(data.showAdminLoginLink));
-		fd.append("showInfrastructure", String(data.showInfrastructure));
 
 		data.monitors.forEach((monitorId) => {
 			fd.append("monitors[]", monitorId);
 		});
 
-		data.type.forEach((type) => {
-			fd.append("type[]", type);
-		});
-
 		// Handle logo upload
 		if (data.logo === null) {
 			// Signal to remove the logo
@@ -334,9 +303,7 @@ const CreateStatusPage = () => {
 																		}}
 																	>
 																		<GripVertical size={20} />
-																		<Typography
+																		<Typography flexGrow={1}>{monitor.name}</Typography>
-																			flexGrow={1}
-																		>{`${monitor.name} (${getMonitorTypeLabel(monitor.type, t)})`}</Typography>
 																		<IconButton
 																			size="small"
 																			onClick={() => {
@@ -458,23 +425,6 @@ const CreateStatusPage = () => {
 								/>
 							)}
 						/>
-						<Controller
-							name="showInfrastructure"
-							control={control}
-							render={({ field }) => (
-								<FormControlLabel
-									control={
-										<Checkbox
-											checked={field.value}
-											onChange={field.onChange}
-										/>
-									}
-									label={t(
-										"pages.statusPages.form.features.option.showInfrastructure.label"
-									)}
-								/>
-							)}
-						/>
 						{/* <Controller
 							name="showUptimePercentage"
 							control={control}

client/src/Pages/StatusPage/Status/Components/InfrastructureMetrics.tsx

@@ -1,246 +0,0 @@
-import Stack from "@mui/material/Stack";
-import Typography from "@mui/material/Typography";
-import { Gauge } from "@/Components/design-elements";
-import { useTheme } from "@mui/material/styles";
-import { useTranslation } from "react-i18next";
-import prettyBytes from "pretty-bytes";
-import type { Monitor } from "@/Types/Monitor";
-import Grid from "@mui/material/Grid";
-import useMediaQuery from "@mui/material/useMediaQuery";
-import Box from "@mui/material/Box";
-import { LAYOUT, SPACING } from "@/Utils/Theme/constants";
-
-const GAUGE_RADIUS = 60;
-const GAUGE_STROKE_WIDTH = 12;
-const PERCENTAGE_MULTIPLIER = 100;
-
-interface StatusPageMonitor extends Monitor {
-	checks?: Monitor["recentChecks"];
-}
-
-interface MetricDetail {
-	label: string;
-	value: string;
-}
-
-interface MetricConfig {
-	key: string;
-	label: string;
-	hasData: boolean;
-	progress: number;
-	details: MetricDetail[];
-}
-
-const MetricDetailRow = ({ label, value }: MetricDetail) => {
-	const theme = useTheme();
-	return (
-		<Stack
-			direction="row"
-			justifyContent="space-between"
-		>
-			<Typography
-				variant="body2"
-				color={theme.palette.text.secondary}
-			>
-				{label}
-			</Typography>
-			<Typography variant="body2">{value}</Typography>
-		</Stack>
-	);
-};
-
-interface MetricItemProps {
-	label: string;
-	progress: number;
-	details?: MetricDetail[];
-}
-
-const MetricItem = ({ label, progress, details }: MetricItemProps) => {
-	const theme = useTheme();
-	const isSmall = useMediaQuery(theme.breakpoints.down("md"));
-	return (
-		<Grid
-			size={isSmall ? 12 : 4}
-			sx={{
-				display: "flex",
-				flexDirection: "column",
-				alignItems: "center",
-				textAlign: "center",
-				gap: theme.spacing(SPACING.LG),
-				padding: theme.spacing(LAYOUT.XS),
-				borderRight: isSmall ? "none" : `1px solid ${theme.palette.divider}`,
-				borderBottom: isSmall ? `1px solid ${theme.palette.divider}` : "none",
-				"&:last-child": {
-					borderRight: "none",
-					borderBottom: "none",
-					paddingBottom: theme.spacing(SPACING.LG),
-				},
-			}}
-		>
-			<Box
-				display="flex"
-				flexDirection="column"
-				alignItems="center"
-			>
-				<Gauge
-					progress={progress}
-					radius={GAUGE_RADIUS}
-					strokeWidth={GAUGE_STROKE_WIDTH}
-				/>
-				<Typography variant="body2">{label}</Typography>
-			</Box>
-			{details && details.length > 0 && (
-				<Box
-					width="100%"
-					paddingX={theme.spacing(LAYOUT.LG)}
-				>
-					{details.map((detail) => (
-						<MetricDetailRow
-							key={detail.label}
-							label={detail.label}
-							value={detail.value}
-						/>
-					))}
-				</Box>
-			)}
-		</Grid>
-	);
-};
-
-type LatestCheck = NonNullable<Monitor["recentChecks"]>[number];
-
-const buildCpuMetric = (
-	check: LatestCheck,
-	t: (key: string) => string
-): MetricConfig | null => {
-	if (!check.cpu || typeof check.cpu.usage_percent !== "number") {
-		return null;
-	}
-	const usagePercent = (check.cpu.usage_percent ?? 0) * PERCENTAGE_MULTIPLIER;
-	return {
-		key: "cpu",
-		label: t("pages.statusPages.monitorsList.infrastructure.cpu"),
-		hasData: true,
-		progress: usagePercent,
-		details: [
-			{
-				label: t("pages.statusPages.monitorsList.infrastructure.usage"),
-				value: `${usagePercent.toFixed(2)}%`,
-			},
-		],
-	};
-};
-
-const buildMemoryMetric = (
-	check: LatestCheck,
-	t: (key: string) => string
-): MetricConfig | null => {
-	if (
-		!check.memory ||
-		typeof check.memory.usage_percent !== "number" ||
-		typeof check.memory.used_bytes !== "number" ||
-		typeof check.memory.total_bytes !== "number"
-	) {
-		return null;
-	}
-	return {
-		key: "memory",
-		label: t("pages.statusPages.monitorsList.infrastructure.memory"),
-		hasData: true,
-		progress: (check.memory.usage_percent ?? 0) * PERCENTAGE_MULTIPLIER,
-		details: [
-			{
-				label: t("pages.statusPages.monitorsList.infrastructure.used"),
-				value: prettyBytes(check.memory.used_bytes ?? 0),
-			},
-			{
-				label: t("pages.statusPages.monitorsList.infrastructure.total"),
-				value: prettyBytes(check.memory.total_bytes ?? 0),
-			},
-		],
-	};
-};
-
-const buildDiskMetric = (
-	check: LatestCheck,
-	t: (key: string) => string
-): MetricConfig | null => {
-	if (!check.disk || check.disk.length === 0) {
-		return null;
-	}
-	const disks = check.disk;
-	const avgUsagePercent =
-		(disks.reduce((acc, disk) => acc + (disk?.usage_percent ?? 0), 0) / disks.length) *
-		PERCENTAGE_MULTIPLIER;
-	const totalUsedBytes = disks.reduce((acc, disk) => acc + (disk?.used_bytes ?? 0), 0);
-	const totalTotalBytes = disks.reduce((acc, disk) => acc + (disk?.total_bytes ?? 0), 0);
-
-	return {
-		key: "disk",
-		label: t("pages.statusPages.monitorsList.infrastructure.disk"),
-		hasData: true,
-		progress: avgUsagePercent,
-		details: [
-			{
-				label: t("pages.statusPages.monitorsList.infrastructure.used"),
-				value: prettyBytes(totalUsedBytes),
-			},
-			{
-				label: t("pages.statusPages.monitorsList.infrastructure.total"),
-				value: prettyBytes(totalTotalBytes),
-			},
-		],
-	};
-};
-
-export const InfrastructureMetrics = ({ monitor }: { monitor: StatusPageMonitor }) => {
-	const theme = useTheme();
-	const { t } = useTranslation();
-
-	const latestCheck = monitor.recentChecks?.[0] ?? monitor.checks?.[0];
-
-	if (!latestCheck) {
-		return (
-			<Typography
-				variant="body2"
-				color={theme.palette.text.secondary}
-			>
-				{t("pages.statusPages.monitorsList.noData")}
-			</Typography>
-		);
-	}
-
-	const metrics: MetricConfig[] = [
-		buildCpuMetric(latestCheck, t),
-		buildMemoryMetric(latestCheck, t),
-		buildDiskMetric(latestCheck, t),
-	].filter((m): m is MetricConfig => m !== null);
-
-	if (metrics.length === 0) {
-		return (
-			<Typography
-				variant="body2"
-				color={theme.palette.text.secondary}
-			>
-				{t("pages.statusPages.monitorsList.noData")}
-			</Typography>
-		);
-	}
-
-	return (
-		<Grid
-			container
-			alignItems="center"
-			padding={theme.spacing(LAYOUT.XS)}
-		>
-			{metrics.map(({ key, label, progress, details }) => (
-				<MetricItem
-					key={key}
-					label={label}
-					progress={progress}
-					details={details}
-				/>
-			))}
-		</Grid>
-	);
-};

client/src/Pages/StatusPage/Status/Components/MonitorsList.tsx

@@ -5,16 +5,13 @@ import Typography from "@mui/material/Typography";
 import { HistogramResponseTime, HeatmapResponseTime } from "@/Components/common";
 import { StatusLabel, BaseBox } from "@/Components/design-elements";
 import { SwitchComponent } from "@/Components/inputs";
-import { InfrastructureMetrics } from "@/Pages/StatusPage/Status/Components/InfrastructureMetrics";
 
-import { useTheme, type Theme } from "@mui/material/styles";
+import { useTheme } from "@mui/material/styles";
 import { useSelector } from "react-redux";
 import { useState } from "react";
 import type { Monitor } from "@/Types/Monitor";
 import type { StatusPage } from "@/Types/StatusPage";
-import { getMonitorTypeLabel } from "@/Types/StatusPage";
 import type { RootState } from "@/Types/state";
-import { LAYOUT, SPACING } from "@/Utils/Theme/constants";
 
 interface StatusPageMonitor extends Monitor {
 	checks?: Monitor["recentChecks"];
@@ -25,124 +22,29 @@ interface MonitorsListProps {
 	monitors: StatusPageMonitor[];
 }
 
-const getMonitorBadgeStyles = (monitorType: string, theme: Theme) => {
-	const bg =
-		monitorType === "hardware" ? theme.palette.info.light : theme.palette.success.light;
-	return {
-		backgroundColor: bg,
-		color: theme.palette.background.paper,
-		padding: `${theme.spacing(SPACING.SM)} ${theme.spacing(SPACING.LG)}`,
-		borderRadius: theme.shape.borderRadius,
-	};
-};
-
-const MonitorHeader = ({
-	monitor,
-	showURL,
-}: {
-	monitor: StatusPageMonitor;
-	showURL: boolean;
-}) => {
-	const theme = useTheme();
-	const { t } = useTranslation();
-
-	return (
-		<Stack
-			direction="row"
-			alignItems="center"
-			justifyContent="space-between"
-			gap={theme.spacing(LAYOUT.XS)}
-			mb={theme.spacing(LAYOUT.XS)}
-		>
-			<Box sx={{ overflow: "hidden", minWidth: 0, flex: 1 }}>
-				<Stack
-					direction="row"
-					alignItems="center"
-					gap={theme.spacing(SPACING.LG)}
-					mb={theme.spacing(SPACING.SM)}
-				>
-					<Typography
-						variant="h6"
-						sx={{ overflow: "hidden", textOverflow: "ellipsis", whiteSpace: "nowrap" }}
-					>
-						{monitor.name}
-					</Typography>
-					<Typography
-						variant="caption"
-						sx={getMonitorBadgeStyles(monitor.type ?? "", theme)}
-					>
-						{getMonitorTypeLabel(monitor.type, t)}
-					</Typography>
-				</Stack>
-				{showURL && monitor.url && (
-					<Typography
-						variant="body2"
-						color={theme.palette.text.secondary}
-						sx={{ overflow: "hidden", textOverflow: "ellipsis", whiteSpace: "nowrap" }}
-					>
-						{monitor.url}
-					</Typography>
-				)}
-			</Box>
-			<StatusLabel status={monitor.status} />
-		</Stack>
-	);
-};
-
-const MonitorContent = ({
-	monitor,
-	statusPage,
-	chartType,
-}: {
-	monitor: StatusPageMonitor;
-	statusPage: StatusPage;
-	chartType: string;
-}) => {
-	const theme = useTheme();
-
-	if (monitor.type === "hardware") {
-		if (statusPage.showInfrastructure === false) return null;
-		return <InfrastructureMetrics monitor={monitor} />;
-	}
-
-	if (statusPage.showCharts === false) return null;
-
-	const checks = monitor.checks?.slice().reverse() ?? [];
-	return (
-		<Box sx={{ overflow: "hidden", minWidth: 0, flex: 1, mb: theme.spacing(SPACING.LG) }}>
-			{chartType === "histogram" ? (
-				<HistogramResponseTime
-					height={{ xs: 50, md: 100 }}
-					gap={{ xs: theme.spacing(SPACING.SM), md: theme.spacing(LAYOUT.SM) }}
-					checks={checks}
-				/>
-			) : (
-				<HeatmapResponseTime checks={checks} />
-			)}
-		</Box>
-	);
-};
-
 export const MonitorsList = ({ statusPage, monitors }: MonitorsListProps) => {
 	const theme = useTheme();
 	const { t } = useTranslation();
+
 	const showURL = useSelector((state: RootState) => state.ui?.showURL);
+
 	const [chartType, setChartType] = useState<"histogram" | "heatmap">("histogram");
 
 	return (
-		<Stack gap={theme.spacing(LAYOUT.MD)}>
+		<Stack gap={theme.spacing(8)}>
-			{statusPage.showCharts && (
+			{statusPage.showCharts !== false && (
 				<Stack
-					direction="row"
+					direction={"row"}
-					alignItems="center"
+					alignItems={"center"}
-					gap={theme.spacing(LAYOUT.SM)}
 				>
 					<Typography>{t("pages.statusPages.monitorsList.chartTypeHeatmap")}</Typography>
 					<SwitchComponent
 						dualOption
 						value={chartType}
 						checked={chartType === "histogram"}
-						onChange={(e) => setChartType(e.target.checked ? "histogram" : "heatmap")}
+						onChange={(e) => {
+							setChartType(e.target.checked ? "histogram" : "heatmap");
+						}}
 					/>
 					<Typography>
 						{t("pages.statusPages.monitorsList.chartTypeHistogram")}
@@ -150,22 +52,59 @@ export const MonitorsList = ({ statusPage, monitors }: MonitorsListProps) => {
 				</Stack>
 			)}
 
-			{monitors.map((monitor) => (
+			{monitors?.map((monitor) => {
-				<BaseBox
+				return (
-					key={monitor.id}
+					<BaseBox
-					padding={theme.spacing(LAYOUT.MD)}
+						key={monitor.id}
-				>
+						padding={theme.spacing(4)}
-					<MonitorHeader
+					>
-						monitor={monitor}
+						<Stack
-						showURL={showURL}
+							direction="row"
-					/>
+							alignItems="center"
-					<MonitorContent
+							justifyContent="space-between"
-						monitor={monitor}
+							gap={theme.spacing(4)}
-						statusPage={statusPage}
+							mb={statusPage.showCharts !== false ? theme.spacing(4) : 0}
-						chartType={chartType}
+						>
-					/>
+							<Box sx={{ overflow: "hidden", minWidth: 0, flex: 1 }}>
-				</BaseBox>
+								<Typography
-			))}
+									variant="h6"
+									sx={{
+										overflow: "hidden",
+										textOverflow: "ellipsis",
+										whiteSpace: "nowrap",
+									}}
+								>
+									{monitor.name}
+								</Typography>
+								{showURL && (
+									<Typography
+										variant="body2"
+										color="text.secondary"
+									>
+										{monitor.url}
+									</Typography>
+								)}
+							</Box>
+							<StatusLabel status={monitor.status} />
+						</Stack>
+						{statusPage.showCharts !== false && (
+							<Box sx={{ overflow: "hidden", minWidth: 0, flex: 1 }}>
+								{chartType === "histogram" ? (
+									<HistogramResponseTime
+										height={{ xs: 50, md: 100 }}
+										gap={{ xs: theme.spacing(0.5), md: theme.spacing(5) }}
+										checks={monitor?.checks?.slice().reverse() ?? []}
+									/>
+								) : (
+									<HeatmapResponseTime
+										checks={monitor?.checks?.slice().reverse() ?? []}
+									/>
+								)}
+							</Box>
+						)}
+					</BaseBox>
+				);
+			})}
 		</Stack>
 	);
 };

client/src/Pages/StatusPage/Status/index.tsx

@@ -23,22 +23,16 @@ const StatusPageView = () => {
 	const isSmall = useMediaQuery(theme.breakpoints.down("md"));
 	const isPublic = location.pathname.startsWith("/status/public");
 
-	const apiUrl = url ? `/status-page/${url}?type=uptime&type=infrastructure` : null;
+	const apiUrl = url ? `/status-page/${url}?type=uptime` : null;
 
-	const { data, isLoading, error } = useGet<StatusPageResponse>(
+	const { data, isLoading, error } = useGet<StatusPageResponse>(apiUrl);
-		apiUrl,
-		{},
-		{
-			refreshInterval: 10000,
-		}
-	);
 
 	const statusPage = data?.statusPage;
 	const monitors = data?.monitors ?? [];
 
 	if (!statusPage) return null;
 
-	if (monitors.length === 0) {
+	if (monitors?.length === 0) {
 		return (
 			<BasePage
 				loading={isLoading}

client/src/Pages/StatusPage/StatusPages/Components/StatusPagesTable.tsx

@@ -97,7 +97,7 @@ export const StatusPagesTable = ({
 			{
 				id: "type",
 				content: t("common.table.headers.type"),
-				render: (row) => row.type.join(", "),
+				render: (row) => row.type,
 			},
 			{
 				id: "status",

client/src/Types/Check.ts

@@ -1,5 +1,3 @@
-export const CHECK_TTL_SENTINEL = 366;
-
 export interface CheckMetadata {
 	monitorId: string;
 	teamId: string;
@@ -127,6 +125,9 @@ export interface Check {
 	timings?: CheckTimings;
 	statusCode: number;
 	message: string;
+	ack: boolean;
+	ackAt?: string | null;
+	expiry: string;
 	cpu?: CheckCpuInfo;
 	memory?: CheckMemoryInfo;
 	disk?: CheckDiskInfo[];
@@ -139,6 +140,7 @@ export interface Check {
 	seo?: number;
 	performance?: number;
 	audits?: CheckAudits;
+	__v: number;
 	createdAt: string;
 	updatedAt: string;
 }
@@ -241,7 +243,10 @@ export interface ChecksSummary {
 	downChecks: number;
 }
 
-export type CheckSnapshot = Omit<Check, "metadata" | "__v" | "updatedAt"> & {
+export type CheckSnapshot = Omit<
+	Check,
+	"metadata" | "ack" | "ackAt" | "expiry" | "__v" | "updatedAt"
+> & {
 	originalResponseTime: number;
 };
 

client/src/Types/Notification.ts

@@ -5,7 +5,6 @@ export const NotificationChannels = [
 	"webhook",
 	"pager_duty",
 	"matrix",
-	"teams",
 ] as const;
 export type NotificationChannel = (typeof NotificationChannels)[number];
 

client/src/Types/StatusPage.ts

@@ -1,31 +1,10 @@
-import type { Monitor, MonitorType } from "@/Types/Monitor";
+import type { Monitor } from "@/Types/Monitor";
-export type MonitorDisplayType = "uptime" | "infrastructure";
-
-export const MONITOR_TYPE_KEYS: Partial<Record<MonitorType, string>> = {
-	http: "pages.common.monitors.monitorTypes.optionHttp",
-	ping: "pages.common.monitors.monitorTypes.optionPing",
-	docker: "pages.common.monitors.monitorTypes.optionDocker",
-	port: "pages.common.monitors.monitorTypes.optionPort",
-	game: "pages.common.monitors.monitorTypes.optionGame",
-	grpc: "pages.common.monitors.monitorTypes.optionGrpc",
-	websocket: "pages.common.monitors.monitorTypes.optionWebSocket",
-	hardware: "pages.common.monitors.monitorTypes.optionHardware",
-	pagespeed: "pages.common.monitors.monitorTypes.optionPagespeed",
-};
-
-export const getMonitorTypeLabel = (
-	type: MonitorType,
-	t: (key: string) => string
-): string => {
-	const key = MONITOR_TYPE_KEYS[type];
-	return key ? t(key) : type;
-};
 
 export interface StatusPage {
 	id: string;
 	userId: string;
 	teamId: string;
-	type: MonitorDisplayType[];
+	type: string;
 	companyName: string;
 	url: string;
 	timezone?: string;
@@ -41,7 +20,6 @@ export interface StatusPage {
 	showCharts: boolean;
 	showUptimePercentage: boolean;
 	showAdminLoginLink: boolean;
-	showInfrastructure: boolean;
 	customCSS: string;
 	createdAt: string;
 	updatedAt: string;

client/src/Validation/notifications.ts

@@ -45,11 +45,6 @@ const matrixSchema = baseSchema.extend({
 	accessToken: z.string().min(1, "Access token is required"),
 });
 
-const teamsSchema = baseSchema.extend({
-	type: z.literal("teams"),
-	address: z.string().min(1, "Webhook URL is required").url("Please enter a valid URL"),
-});
-
 export const notificationSchema = z.discriminatedUnion("type", [
 	emailSchema,
 	slackSchema,
@@ -57,7 +52,6 @@ export const notificationSchema = z.discriminatedUnion("type", [
 	webhookSchema,
 	pagerDutySchema,
 	matrixSchema,
-	teamsSchema,
 ]);
 
 export type NotificationFormData = z.infer<typeof notificationSchema>;

client/src/Validation/settings.ts

@@ -1,4 +1,3 @@
-import { CHECK_TTL_SENTINEL } from "@/Types/Check";
 import { z } from "zod";
 
 export const settingsSchema = z.object({
@@ -7,42 +6,39 @@ export const settingsSchema = z.object({
 	systemEmailRejectUnauthorized: z.boolean(),
 	systemEmailConnectionHost: z
 		.string()
-		.transform((val) => (val.trim() === "" ? null : val.trim()))
+		.transform((val) => (val.trim() === "" ? undefined : val.trim()))
 		.optional(),
 	systemEmailSecure: z.boolean().optional(),
 	systemEmailPool: z.boolean().optional(),
 	showURL: z.boolean().optional(),
-	checkTTL: z
+	checkTTL: z.number().int().min(1, "Please enter a value").max(365, "Maximum 365 days"),
-		.number()
-		.int()
-		.min(1, "Please enter a value")
-		.max(CHECK_TTL_SENTINEL, `Maximum ${CHECK_TTL_SENTINEL}`),
 	pagespeedApiKey: z
 		.string()
-		.transform((val) => (val.trim() === "" ? null : val.trim()))
+		.transform((val) => (val.trim() === "" ? undefined : val.trim()))
 		.optional(),
 	systemEmailHost: z
 		.string()
 		.regex(/^[a-zA-Z0-9.-]*$/, "Invalid hostname or IP address")
-		.transform((val) => (val.trim() === "" ? null : val.trim()))
+		.transform((val) => (val.trim() === "" ? undefined : val.trim()))
 		.optional(),
 	systemEmailPort: z.number().int().min(1).max(65535).optional(),
 	systemEmailAddress: z
+		.string()
 		.email("Please enter a valid email address")
 		.or(z.literal(""))
-		.transform((val) => (val === "" ? null : val.toLowerCase().trim()))
+		.transform((val) => (val === "" ? undefined : val.toLowerCase().trim()))
 		.optional(),
 	systemEmailUser: z
 		.string()
-		.transform((val) => (val.trim() === "" ? null : val.trim()))
+		.transform((val) => (val.trim() === "" ? undefined : val.trim()))
 		.optional(),
 	systemEmailPassword: z
 		.string()
-		.transform((val) => (val.trim() === "" ? null : val.trim()))
+		.transform((val) => (val.trim() === "" ? undefined : val.trim()))
 		.optional(),
 	systemEmailTLSServername: z
 		.string()
-		.transform((val) => (val.trim() === "" ? null : val.trim()))
+		.transform((val) => (val.trim() === "" ? undefined : val.trim()))
 		.optional(),
 	globalThresholds: z.object({
 		cpu: z.number().int().min(1).max(100),
@@ -52,5 +48,4 @@ export const settingsSchema = z.object({
 	}),
 });
 
-export type SettingsFormInput = z.input<typeof settingsSchema>;
 export type SettingsFormData = z.infer<typeof settingsSchema>;

client/src/Validation/statusPage.ts

@@ -14,16 +14,12 @@ export const statusPageSchema = z.object({
 			"URL can only contain lowercase letters, numbers, and hyphens"
 		),
 	timezone: z.string().optional(),
-	type: z
-		.array(z.enum(["uptime", "infrastructure"]))
-		.min(1, "At least one type is required"),
 	color: z.string().min(1, "Color is required"),
 	monitors: z.array(z.string()).min(1, "At least one monitor is required"),
 	isPublished: z.boolean(),
 	showCharts: z.boolean(),
 	showUptimePercentage: z.boolean(),
 	showAdminLoginLink: z.boolean(),
-	showInfrastructure: z.boolean(),
 	customCSS: z.string().optional(),
 	logo: z
 		.object({

client/src/Validation/validation.js

@@ -288,13 +288,7 @@ const logoImageValidation = joi
 	.optional(); // Make entire object optional
 
 const statusPageValidation = joi.object({
-	type: joi
+	type: joi.string().valid("uptime").required(),
-		.alternatives()
-		.try(
-			joi.string().valid("uptime", "infrastructure"),
-			joi.array().items(joi.string().valid("uptime", "infrastructure"))
-		)
-		.required(),
 	isPublished: joi.bool(),
 	companyName: joi
 		.string()
@@ -323,7 +317,6 @@ const statusPageValidation = joi.object({
 	showUptimePercentage: joi.boolean(),
 	showCharts: joi.boolean(),
 	showAdminLoginLink: joi.boolean(),
-	showInfrastructure: joi.boolean(),
 });
 
 const settingsValidation = joi.object({

client/src/locales/en.json

@@ -401,23 +401,12 @@
 				},
 				"status": {
 					"down": "down",
-					"breached": "threshold exceeded",
+					"breached": "breached",
 					"initializing": "initializing",
 					"maintenance": "maintenance",
 					"paused": "paused",
 					"total": "total",
 					"up": "up"
-				},
-				"monitorTypes": {
-					"optionDocker": "Docker",
-					"optionGame": "Game",
-					"optionHttp": "HTTP(S)",
-					"optionPing": "Ping",
-					"optionPort": "Port",
-					"optionPagespeed": "PageSpeed",
-					"optionHardware": "Infrastructure",
-					"optionGrpc": "gRPC",
-					"optionWebSocket": "WebSocket"
 				}
 			}
 		},
@@ -545,12 +534,19 @@
 				},
 				"type": {
 					"description": "Select the type of check to perform",
+					"optionDocker": "Docker",
 					"optionDockerDescription": "Use Docker to monitor if a container is running.",
+					"optionGame": "Game",
 					"optionGameDescription": "Monitor if a specific game server is online.",
+					"optionGrpc": "gRPC",
 					"optionGrpcDescription": "Monitor gRPC services using the standard Health Checking Protocol.",
+					"optionWebSocket": "WebSocket",
 					"optionWebSocketDescription": "Monitor WebSocket endpoints for connection health and response time.",
+					"optionHttp": "HTTP(S)",
 					"optionHttpDescription": "Use HTTP(S) to monitor your website or API endpoint.",
+					"optionPing": "Ping",
 					"optionPingDescription": "Use ICMP Ping to monitor if a server is online.",
+					"optionPort": "Port",
 					"optionPortDescription": "Monitor if a specific port on a server is open.",
 					"title": "Type"
 				},
@@ -1045,7 +1041,7 @@
 				},
 				"stats": {
 					"title": "Monitor history",
-					"description": "Clear all monitoring history and statistics for your team. This action is irreversible.",
+					"description": "Define how long you want to retain historical data. You can also clear all existing data.",
 					"option": {
 						"clear": {
 							"label": "Clear all stats. This is irreversible."
@@ -1056,16 +1052,6 @@
 						"description": "This cannot be undone"
 					}
 				},
-				"retention": {
-					"title": "Check retention",
-					"description": "Set how long check data is retained before being automatically cleaned up.",
-					"option": {
-						"days": {
-							"label": "Retention period (days)",
-							"unlimited": "Unlimited"
-						}
-					}
-				},
 				"thresholds": {
 					"title": "Global Thresholds",
 					"description": "Set global CPU, Memory, Disk, and Temperature thresholds for infrastructure monitoring. These apply to all hardware monitors unless overridden.",
@@ -1182,22 +1168,7 @@
 			},
 			"monitorsList": {
 				"chartTypeHeatmap": "Heatmap",
-				"chartTypeHistogram": "Histogram",
+				"chartTypeHistogram": "Histogram"
-				"noData": "No data available",
-				"infrastructure": {
-					"title": "Infrastructure",
-					"cpu": "CPU",
-					"memory": "RAM",
-					"memoryText": "Memory",
-					"disk": "Disk",
-					"usage": "Usage",
-					"used": "Used",
-					"total": "Total"
-				},
-				"uptime": {
-					"title": "Uptime",
-					"responseTime": "Response time"
-				}
 			},
 			"statusBar": {
 				"allDown": "All systems are down",
@@ -1289,9 +1260,6 @@
 						},
 						"showAdminLoginLink": {
 							"label": "Show admin login link"
-						},
-						"showInfrastructure": {
-							"label": "Show infrastructure metrics"
 						}
 					}
 				}

server/eslint.config.js

@@ -32,14 +32,11 @@ export default [
 		languageOptions: {
 			parser: tseslint.parser,
 			parserOptions: {
-				projectService: {
+				projectService: true,
-					allowDefaultProject: ["jest.config.ts"],
-				},
 				tsconfigRootDir: import.meta.dirname,
 			},
 		},
 		rules: {
-			"@typescript-eslint/no-unused-vars": ["error", { argsIgnorePattern: "^_" }], // Ignore unused variables that start with '_'
 			"@typescript-eslint/no-explicit-any": "warn", // Warn on 'any' types
 			"mocha/max-top-level-suites": "warn", // Warn if there are too many top-level suites instead of failing
 		},

server/openapi.json

@@ -510,24 +510,42 @@
 				"summary": "Get monitors by team",
 				"description": "Get monitors filtered by team with optional parameters",
 				"parameters": [
+					{
+						"name": "status",
+						"in": "query",
+						"description": "Filter by monitor status (up/down)",
+						"schema": {
+							"type": "boolean"
+						}
+					},
 					{
 						"name": "type",
 						"in": "query",
 						"description": "Filter by monitor type",
 						"schema": {
-							"oneOf": [
+							"type": "string",
-								{
+							"enum": ["http", "ping", "pagespeed", "hardware", "docker", "port"]
-									"type": "string",
+						}
-									"enum": ["http", "ping", "pagespeed", "docker", "hardware", "port", "game", "grpc", "websocket"]
+					},
-								},
+					{
-								{
+						"name": "page",
-									"type": "array",
+						"in": "query",
-									"items": {
+						"description": "Page number for pagination",
-										"type": "string",
+						"schema": {
-										"enum": ["http", "ping", "pagespeed", "docker", "hardware", "port", "game", "grpc", "websocket"]
+							"type": "integer",
-									}
+							"minimum": 1,
-								}
+							"default": 1
-							]
+						}
+					},
+					{
+						"name": "rowsPerPage",
+						"in": "query",
+						"description": "Number of monitors per page",
+						"schema": {
+							"type": "integer",
+							"minimum": 1,
+							"maximum": 100,
+							"default": 10
 						}
 					},
 					{
@@ -537,6 +555,15 @@
 						"schema": {
 							"type": "string"
 						}
+					},
+					{
+						"name": "field",
+						"in": "query",
+						"description": "Field to filter on",
+						"schema": {
+							"type": "string",
+							"enum": ["name", "url", "description"]
+						}
 					}
 				],
 				"responses": {
@@ -729,7 +756,7 @@
 					}
 				]
 			},
-			"patch": {
+			"put": {
 				"tags": ["monitors"],
 				"summary": "Update monitor",
 				"description": "Update an existing monitor",
@@ -3541,19 +3568,22 @@
 			},
 			"CreateMonitorRequest": {
 				"type": "object",
-				"required": ["name", "type", "url"],
+				"required": ["name", "description", "type", "url", "interval"],
 				"properties": {
 					"name": {
 						"type": "string",
+						"minLength": 1,
+						"maxLength": 100,
 						"example": "My Website Monitor"
 					},
 					"description": {
 						"type": "string",
+						"maxLength": 500,
 						"example": "Monitors the main website homepage"
 					},
 					"type": {
 						"type": "string",
-						"enum": ["http", "ping", "pagespeed", "hardware", "docker", "port", "game", "grpc", "websocket"],
+						"enum": ["http", "ping", "pagespeed", "hardware", "docker", "port"],
 						"example": "http"
 					},
 					"url": {
@@ -3563,34 +3593,14 @@
 					},
 					"interval": {
 						"type": "integer",
+						"minimum": 30,
+						"maximum": 3600,
 						"example": 300,
 						"description": "Check interval in seconds"
 					},
-					"statusWindowSize": {
-						"type": "integer",
-						"minimum": 1,
-						"maximum": 20,
-						"default": 5
-					},
-					"statusWindowThreshold": {
-						"type": "integer",
-						"minimum": 1,
-						"maximum": 100,
-						"default": 60
-					},
 					"isActive": {
-						"type": "boolean"
-					},
-					"ignoreTlsErrors": {
 						"type": "boolean",
-						"default": false
+						"default": true
-					},
-					"useAdvancedMatching": {
-						"type": "boolean",
-						"default": false
-					},
-					"port": {
-						"type": "integer"
 					},
 					"notifications": {
 						"type": "array",
@@ -3599,62 +3609,51 @@
 						},
 						"description": "Array of notification IDs to associate with this monitor"
 					},
-					"secret": {
+					"httpOptions": {
-						"type": "string"
+						"type": "object",
-					},
+						"properties": {
-					"jsonPath": {
+							"method": {
-						"type": "string"
+								"type": "string",
-					},
+								"enum": ["GET", "POST", "PUT", "DELETE", "HEAD"],
-					"expectedValue": {
+								"default": "GET"
-						"type": "string"
+							},
-					},
+							"headers": {
-					"matchMethod": {
+								"type": "object",
-						"type": "string",
+								"additionalProperties": {
-						"enum": ["equal", "include", "regex", ""]
+									"type": "string"
-					},
+								}
-					"cpuAlertThreshold": {
+							},
-						"type": "number"
+							"body": {
-					},
+								"type": "string",
-					"memoryAlertThreshold": {
+								"description": "Request body for POST/PUT requests"
-						"type": "number"
+							},
-					},
+							"timeout": {
-					"diskAlertThreshold": {
+								"type": "integer",
-						"type": "number"
+								"minimum": 1000,
-					},
+								"maximum": 30000,
-					"tempAlertThreshold": {
+								"default": 5000,
-						"type": "number"
+								"description": "Request timeout in milliseconds"
-					},
+							}
-					"gameId": {
-						"type": "string"
-					},
-					"grpcServiceName": {
-						"type": "string",
-						"default": ""
-					},
-					"selectedDisks": {
-						"type": "array",
-						"items": {
-							"type": "string"
 						}
 					},
-					"group": {
+					"assertions": {
-						"type": "string",
-						"nullable": true,
-						"maxLength": 50
-					},
-					"geoCheckEnabled": {
-						"type": "boolean"
-					},
-					"geoCheckLocations": {
 						"type": "array",
 						"items": {
-							"type": "string",
+							"type": "object",
-							"enum": ["northAmerica", "southAmerica", "europe", "asia", "africa", "oceania"]
+							"properties": {
+								"type": {
+									"type": "string",
+									"enum": ["status-code", "response-time", "body-contains", "header-contains"]
+								},
+								"comparison": {
+									"type": "string",
+									"enum": ["equals", "not-equals", "greater-than", "less-than", "contains", "not-contains"]
+								},
+								"value": {
+									"type": "string"
+								}
+							}
 						}
-					},
-					"geoCheckInterval": {
-						"type": "integer",
-						"minimum": 300000
 					}
 				}
 			},
@@ -3662,32 +3661,21 @@
 				"type": "object",
 				"properties": {
 					"name": {
-						"type": "string"
-					},
-					"type": {
 						"type": "string",
-						"enum": ["http", "ping", "pagespeed", "hardware", "docker", "port", "game", "grpc", "websocket", "unknown"]
+						"minLength": 1,
-					},
+						"maxLength": 100
-					"url": {
-						"type": "string"
-					},
-					"statusWindowSize": {
-						"type": "integer",
-						"minimum": 1,
-						"maximum": 20,
-						"default": 5
-					},
-					"statusWindowThreshold": {
-						"type": "integer",
-						"minimum": 1,
-						"maximum": 100,
-						"default": 60
 					},
 					"description": {
-						"type": "string"
+						"type": "string",
+						"maxLength": 500
 					},
 					"interval": {
-						"type": "integer"
+						"type": "integer",
+						"minimum": 30,
+						"maximum": 3600
+					},
+					"isActive": {
+						"type": "boolean"
 					},
 					"notifications": {
 						"type": "array",
@@ -3695,72 +3683,47 @@
 							"type": "string"
 						}
 					},
-					"secret": {
+					"httpOptions": {
-						"type": "string"
+						"type": "object",
-					},
+						"properties": {
-					"ignoreTlsErrors": {
+							"method": {
-						"type": "boolean"
+								"type": "string",
-					},
+								"enum": ["GET", "POST", "PUT", "DELETE", "HEAD"]
-					"useAdvancedMatching": {
+							},
-						"type": "boolean"
+							"headers": {
-					},
+								"type": "object",
-					"jsonPath": {
+								"additionalProperties": {
-						"type": "string"
+									"type": "string"
-					},
+								}
-					"expectedValue": {
+							},
-						"type": "string"
+							"body": {
-					},
+								"type": "string"
-					"matchMethod": {
+							},
-						"type": "string",
+							"timeout": {
-						"enum": ["equal", "include", "regex", ""]
+								"type": "integer",
-					},
+								"minimum": 1000,
-					"port": {
+								"maximum": 30000
-						"type": "integer",
+							}
-						"minimum": 1,
-						"maximum": 65535
-					},
-					"cpuAlertThreshold": {
-						"type": "number"
-					},
-					"memoryAlertThreshold": {
-						"type": "number"
-					},
-					"diskAlertThreshold": {
-						"type": "number"
-					},
-					"tempAlertThreshold": {
-						"type": "number"
-					},
-					"gameId": {
-						"type": "string"
-					},
-					"grpcServiceName": {
-						"type": "string"
-					},
-					"selectedDisks": {
-						"type": "array",
-						"items": {
-							"type": "string"
 						}
 					},
-					"group": {
+					"assertions": {
-						"type": "string",
-						"nullable": true,
-						"maxLength": 50
-					},
-					"geoCheckEnabled": {
-						"type": "boolean"
-					},
-					"geoCheckLocations": {
 						"type": "array",
 						"items": {
-							"type": "string",
+							"type": "object",
-							"enum": ["northAmerica", "southAmerica", "europe", "asia", "africa", "oceania"]
+							"properties": {
+								"type": {
+									"type": "string",
+									"enum": ["status-code", "response-time", "body-contains", "header-contains"]
+								},
+								"comparison": {
+									"type": "string",
+									"enum": ["equals", "not-equals", "greater-than", "less-than", "contains", "not-contains"]
+								},
+								"value": {
+									"type": "string"
+								}
+							}
 						}
-					},
-					"geoCheckInterval": {
-						"type": "integer",
-						"minimum": 300000
 					}
 				}
 			},

server/package.json

@@ -8,7 +8,7 @@
 		"test": "NODE_OPTIONS=--experimental-vm-modules c8 jest --runInBand",
 		"dev": "nodemon --exec tsx src/index.js",
 		"start": "node --watch ./dist/index.js",
-		"build": "tsc && tsc-alias && cp -r src/templates dist/templates",
+		"build": "tsc && tsc-alias",
 		"lint": "eslint .",
 		"lint-fix": "eslint --fix .",
 		"format": "prettier --write .",

server/src/app.ts

@@ -4,7 +4,7 @@ import cors from "cors";
 import helmet from "helmet";
 import compression from "compression";
 import cookieParser from "cookie-parser";
-import swaggerUi, { type JsonObject } from "swagger-ui-express";
+import swaggerUi from "swagger-ui-express";
 import { handleErrors } from "@/middleware/handleErrors.js";
 import { generalApiLimiter } from "@/middleware/rateLimiter.js";
 import { sanitizeBody, sanitizeQuery } from "@/middleware/sanitization.js";
@@ -24,7 +24,7 @@ export const createApp = ({
 	controllers: InitializedControllers;
 	envSettings: EnvConfig;
 	frontendPath: string;
-	openApiSpec: JsonObject;
+	openApiSpec: any;
 }) => {
 	const allowedOrigin = envSettings.clientHost;
 	const app = express();

server/src/config/controllers.ts

@@ -31,7 +31,7 @@ export interface InitializedControllers {
 export const initializeControllers = (services: InitializedServices): InitializedControllers => {
 	return {
 		authController: new AuthController(services.userService),
-		monitorController: new MonitorController(services.monitorService, services.notificationsService),
+		monitorController: new MonitorController(services.monitorService),
 		settingsController: new SettingsController(services.settingsService, services.emailService),
 		checkController: new CheckController(services.checkService),
 		geoCheckController: new GeoCheckController(services.geoChecksService),

server/src/config/routes.ts

@@ -1,9 +1,6 @@
-import type { Application } from "express";
 import { createVerifyJWT } from "../middleware/verifyJWT.js";
 import { createVerifyStatusPageAccess } from "../middleware/verifyStatusPageAccess.js";
 import { authApiLimiter } from "../middleware/rateLimiter.js";
-import type { InitializedControllers } from "./controllers.js";
-import type { InitializedServices } from "./services.js";
 
 import AuthRoutes from "../routes/authRoute.js";
 import InviteRoutes from "../routes/inviteRoute.js";
@@ -20,7 +17,7 @@ import NotificationRoutes from "../routes/notificationRoute.js";
 
 import IncidentRoutes from "../routes/incidentRoute.js";
 
-export const setupRoutes = (app: Application, controllers: InitializedControllers, services: InitializedServices) => {
+export const setupRoutes = (app: any, controllers: Record<string, any>, services: Record<string, any>) => {
 	const verifyJWT = createVerifyJWT(services.settingsService);
 	const authRoutes = new AuthRoutes(controllers.authController, verifyJWT);
 	const monitorRoutes = new MonitorRoutes(controllers.monitorController);

server/src/config/services.ts

@@ -27,7 +27,6 @@ import {
 	DiscordProvider,
 	PagerDutyProvider,
 	MatrixProvider,
-	TeamsProvider,
 	// Interfaces
 	INetworkService,
 	IEmailService,
@@ -229,7 +228,6 @@ export const initializeServices = async ({
 	const discordProvider = new DiscordProvider(logger);
 	const pagerDutyProvider = new PagerDutyProvider(logger);
 	const matrixProvider = new MatrixProvider(logger);
-	const teamsProvider = new TeamsProvider(logger);
 
 	const notificationsService = new NotificationsService(
 		notificationsRepository,
@@ -240,7 +238,6 @@ export const initializeServices = async ({
 		discordProvider,
 		pagerDutyProvider,
 		matrixProvider,
-		teamsProvider,
 		settingsService,
 		logger,
 		notificationMessageBuilder
@@ -252,7 +249,6 @@ export const initializeServices = async ({
 		statusService,
 		notificationsService,
 		checkService,
-		settingsService,
 		bufferService,
 		incidentService,
 		maintenanceWindowsRepository,

server/src/controllers/authController.ts

@@ -1,6 +1,7 @@
 import { Request, Response, NextFunction } from "express";
 import { AppError } from "@/utils/AppError.js";
-import { requireTeamId, requireUserEmail, requireUserId, requireUserRoles } from "@/controllers/controllerUtils.js";
+import { requireTeamId, requireUserRoles } from "./controllerUtils.js";
+import type { UserRole } from "@/types/user.js";
 
 import {
 	registrationBodyValidation,
@@ -19,33 +20,15 @@ import {
 	editSuperadminUserByIdBodyValidation,
 	editUserPasswordByIdBodyValidation,
 } from "@/validation/userValidation.js";
-import { IUserService } from "@/service/index.js";
 
 const SERVICE_NAME = "authController";
 
-export interface IAuthController {
+class AuthController {
-	registerUser(req: Request, res: Response, next: NextFunction): Promise<Response | void>;
-	createUser(req: Request, res: Response, next: NextFunction): Promise<Response | void>;
-	loginUser(req: Request, res: Response, next: NextFunction): Promise<Response | void>;
-	editUser(req: Request, res: Response, next: NextFunction): Promise<Response | void>;
-	checkSuperadminExists(req: Request, res: Response, next: NextFunction): Promise<Response | void>;
-	requestRecovery(req: Request, res: Response, next: NextFunction): Promise<Response | void>;
-	validateRecovery(req: Request, res: Response, next: NextFunction): Promise<Response | void>;
-	resetPassword(req: Request, res: Response, next: NextFunction): Promise<Response | void>;
-	deleteUser(req: Request, res: Response, next: NextFunction): Promise<Response | void>;
-	deleteUserById(req: Request, res: Response, next: NextFunction): Promise<Response | void>;
-	getAllUsers(req: Request, res: Response, next: NextFunction): Promise<Response | void>;
-	getUserById(req: Request, res: Response, next: NextFunction): Promise<Response | void>;
-	editUserById(req: Request, res: Response, next: NextFunction): Promise<Response | void>;
-	editUserPasswordById(req: Request, res: Response, next: NextFunction): Promise<Response | void>;
-}
-
-class AuthController implements IAuthController {
 	static SERVICE_NAME = SERVICE_NAME;
 
-	private userService: IUserService;
+	private userService: any;
 
-	constructor(userService: IUserService) {
+	constructor(userService: any) {
 		this.userService = userService;
 	}
 
@@ -58,12 +41,11 @@ class AuthController implements IAuthController {
 			const newUser = req.body.user;
 			const newUserToken = req.body.token;
 			if (newUser?.email) {
-				const newUserEmail = requireUserEmail(newUser.email);
+				newUser.email = newUser.email.toLowerCase();
-				newUser.email = newUserEmail.toLowerCase();
 			}
-			const validatedBody = registrationBodyValidation.parse(newUser);
+			registrationBodyValidation.parse(newUser);
 
-			const { user, token } = await this.userService.registerUser(validatedBody, newUserToken, req?.file ?? null);
+			const { user, token } = await this.userService.registerUser(newUser, newUserToken, req.file);
 			res.status(200).json({
 				success: true,
 				msg: "User registered successfully",
@@ -80,11 +62,11 @@ class AuthController implements IAuthController {
 			if (userData?.email) {
 				userData.email = userData.email.toLowerCase();
 			}
-			const validatedBody = createUserBodyValidation.parse(userData);
+			createUserBodyValidation.parse(userData);
 
 			const teamId = requireTeamId(req.user?.teamId);
-			const actorRoles = requireUserRoles(req.user?.role);
+			const actorRoles = requireUserRoles(req.user?.role) as UserRole[];
-			const newUser = await this.userService.createUser(validatedBody, teamId, actorRoles, req?.file ?? null);
+			const newUser = await this.userService.createUser(userData, teamId, actorRoles, req.file);
 			res.status(201).json({
 				success: true,
 				msg: "User created successfully",
@@ -118,10 +100,8 @@ class AuthController implements IAuthController {
 
 	editUser = async (req: Request, res: Response, next: NextFunction) => {
 		try {
-			const validatedBody = editUserBodyValidation.parse(req.body);
+			editUserBodyValidation.parse(req.body);
-			const userId = requireUserId(req.user?.id);
+			const updatedUser = await this.userService.editUser(req.body, req.file, req.user);
-			const userEmail = requireUserEmail(req.user?.email);
-			const updatedUser = await this.userService.editUser(validatedBody, req?.file ?? null, userId, userEmail);
 
 			res.status(200).json({
 				success: true,
@@ -190,15 +170,7 @@ class AuthController implements IAuthController {
 
 	deleteUser = async (req: Request, res: Response, next: NextFunction) => {
 		try {
-			const userId = requireUserId(req.user?.id);
+			await this.userService.deleteUser(req.user);
-			const teamId = requireTeamId(req.user?.teamId);
-			const roles = requireUserRoles(req.user?.role);
-
-			await this.userService.deleteUser({
-				userId,
-				teamId,
-				roles,
-			});
 			return res.status(200).json({
 				success: true,
 				msg: "User deleted successfully",
@@ -210,12 +182,9 @@ class AuthController implements IAuthController {
 
 	deleteUserById = async (req: Request, res: Response, next: NextFunction) => {
 		try {
-			const validatedParams = getUserByIdParamValidation.parse(req.params);
+			getUserByIdParamValidation.parse(req.params);
-			const targetUserId = validatedParams.userId;
+			const targetUserId = req.params.userId;
-			const actorId = requireUserId(req.user?.id);
+			await this.userService.deleteUserById(req.user, targetUserId);
-			const actorTeamId = requireTeamId(req.user?.teamId);
-			const actorRoles = requireUserRoles(req.user?.role);
-			await this.userService.deleteUserById({ actorId, actorTeamId, actorRoles, targetUserId });
 			return res.status(200).json({
 				success: true,
 				msg: "User removed successfully",
@@ -240,9 +209,19 @@ class AuthController implements IAuthController {
 
 	getUserById = async (req: Request, res: Response, next: NextFunction) => {
 		try {
-			const validatedParams = getUserByIdParamValidation.parse(req.params);
+			getUserByIdParamValidation.parse(req.params);
-			const actorRoles = requireUserRoles(req.user?.role);
+			const userId = req?.params?.userId;
-			const user = await this.userService.getUserById(actorRoles, validatedParams.userId);
+			const roles = req?.user?.role;
+
+			if (!userId) {
+				throw new Error("No user ID in request");
+			}
+
+			if (!roles || roles.length === 0) {
+				throw new Error("No roles in request");
+			}
+
+			const user = await this.userService.getUserById(roles, userId);
 
 			return res.status(200).json({ success: true, msg: "ok", data: user });
 		} catch (error) {
@@ -252,19 +231,24 @@ class AuthController implements IAuthController {
 
 	editUserById = async (req: Request, res: Response, next: NextFunction) => {
 		try {
-			const actorRoles = requireUserRoles(req.user?.role);
+			const roles = req?.user?.role;
-			const actorId = requireUserId(req.user?.id);
 
-			if (!actorRoles.includes("superadmin")) {
+			if (!roles || !roles.includes("superadmin")) {
 				throw new AppError({ message: "Unauthorized", status: 403 });
 			}
 
-			const validatedParams = editUserByIdParamValidation.parse(req.params);
+			const userId = req.params.userId as string;
-			// If this is superadmin self edit, allow "superadmin" role
+			const user = { ...req.body };
-			const validatedBody =
-				validatedParams.userId === actorId ? editSuperadminUserByIdBodyValidation.parse(req.body) : editUserByIdBodyValidation.parse(req.body);
 
-			await this.userService.editUserById(validatedParams.userId, validatedBody);
+			editUserByIdParamValidation.parse(req.params);
+			// If this is superadmin self edit, allow "superadmin" role
+			if (userId === req.user?.id) {
+				editSuperadminUserByIdBodyValidation.parse(req.body);
+			} else {
+				editUserByIdBodyValidation.parse(req.body);
+			}
+
+			await this.userService.editUserById(userId, user);
 			return res.status(200).json({ success: true, msg: "ok" });
 		} catch (error) {
 			next(error);
@@ -273,14 +257,16 @@ class AuthController implements IAuthController {
 
 	editUserPasswordById = async (req: Request, res: Response, next: NextFunction) => {
 		try {
-			const actorRoles = requireUserRoles(req.user?.role);
+			const roles = req?.user?.role;
-			if (!actorRoles.includes("superadmin")) {
+			if (!roles || !roles.includes("superadmin")) {
 				throw new AppError({ message: "Unauthorized", status: 403 });
 			}
 
-			const validatedParams = editUserByIdParamValidation.parse(req.params);
+			const userId = req.params.userId as string;
-			const validatedBody = editUserPasswordByIdBodyValidation.parse(req.body);
+			editUserByIdParamValidation.parse(req.params);
-			await this.userService.setPasswordByUserId(validatedParams.userId, validatedBody.password);
+			editUserPasswordByIdBodyValidation.parse(req.body);
+			const updatedPassword = req.body.password;
+			await this.userService.setPasswordByUserId(userId, updatedPassword);
 			return res.status(200).json({ success: true, msg: "Password reset successfully" });
 		} catch (error) {
 			next(error);

server/src/controllers/checkController.ts

@@ -4,28 +4,18 @@ import {
 	getChecksParamValidation,
 	getChecksQueryValidation,
 	getTeamChecksQueryValidation,
-	getChecksSummaryByTeamIdQueryValidation,
 	deleteChecksParamValidation,
+	deleteChecksByTeamIdParamValidation,
+	updateChecksTTLBodyValidation,
 } from "@/validation/checkValidation.js";
-import { ICheckService } from "@/service/index.js";
-import { requireTeamId } from "@/controllers/controllerUtils.js";
 
 const SERVICE_NAME = "checkController";
 
-export interface ICheckController {
+class CheckController {
-	serviceName: string;
-	getChecksByMonitor: (req: Request, res: Response, next: NextFunction) => Promise<Response | void>;
-	getChecksByTeam: (req: Request, res: Response, next: NextFunction) => Promise<Response | void>;
-	getChecksSummaryByTeamId: (req: Request, res: Response, next: NextFunction) => Promise<Response | void>;
-	deleteChecks: (req: Request, res: Response, next: NextFunction) => Promise<Response | void>;
-	deleteChecksByTeamId: (req: Request, res: Response, next: NextFunction) => Promise<Response | void>;
-}
-
-class CheckController implements ICheckController {
 	static SERVICE_NAME = SERVICE_NAME;
 
-	private checkService: ICheckService;
+	private checkService: any;
-	constructor(checkService: ICheckService) {
+	constructor(checkService: any) {
 		this.checkService = checkService;
 	}
 
@@ -35,20 +25,13 @@ class CheckController implements ICheckController {
 
 	getChecksByMonitor = async (req: Request, res: Response, next: NextFunction) => {
 		try {
-			const validatedParams = getChecksParamValidation.parse(req.params);
+			getChecksParamValidation.parse(req.params);
-			const validatedQuery = getChecksQueryValidation.parse(req.query);
+			getChecksQueryValidation.parse(req.query);
-
-			const teamId = requireTeamId(req.user?.teamId);
 
 			const result = await this.checkService.getChecksByMonitor({
-				monitorId: validatedParams.monitorId,
+				monitorId: req?.params?.monitorId,
-				teamId,
+				query: req?.query,
-				sortOrder: validatedQuery.sortOrder,
+				teamId: req?.user?.teamId,
-				dateRange: validatedQuery.dateRange,
-				filter: validatedQuery.filter,
-				page: validatedQuery.page,
-				rowsPerPage: validatedQuery.rowsPerPage,
-				status: validatedQuery.status,
 			});
 
 			return res.status(200).json({
@@ -63,16 +46,10 @@ class CheckController implements ICheckController {
 
 	getChecksByTeam = async (req: Request, res: Response, next: NextFunction) => {
 		try {
-			const validatedQuery = getTeamChecksQueryValidation.parse(req.query);
+			getTeamChecksQueryValidation.parse(req.query);
-			const teamId = requireTeamId(req.user?.teamId);
-
 			const checkData = await this.checkService.getChecksByTeam({
-				teamId,
+				teamId: req?.user?.teamId,
-				sortOrder: validatedQuery.sortOrder,
+				query: req?.query,
-				dateRange: validatedQuery.dateRange,
-				page: validatedQuery.page,
-				rowsPerPage: validatedQuery.rowsPerPage,
-				filter: validatedQuery.filter,
 			});
 			return res.status(200).json({
 				success: true,
@@ -86,11 +63,8 @@ class CheckController implements ICheckController {
 
 	getChecksSummaryByTeamId = async (req: Request, res: Response, next: NextFunction) => {
 		try {
-			const validatedQuery = getChecksSummaryByTeamIdQueryValidation.parse(req.query);
+			const dateRange = req.query?.dateRange || "hour";
-			const teamId = requireTeamId(req.user?.teamId);
+			const summary = await this.checkService.getChecksSummaryByTeamId({ teamId: req?.user?.teamId, dateRange });
-			const dateRange = validatedQuery.dateRange ?? "hour";
-
-			const summary = await this.checkService.getChecksSummaryByTeamId({ teamId, dateRange });
 			return res.status(200).json({
 				success: true,
 				msg: "Checks summary retrieved successfully",
@@ -103,12 +77,11 @@ class CheckController implements ICheckController {
 
 	deleteChecks = async (req: Request, res: Response, next: NextFunction) => {
 		try {
-			const validatedParams = deleteChecksParamValidation.parse(req.params);
+			deleteChecksParamValidation.parse(req.params);
-			const teamId = requireTeamId(req.user?.teamId);
 
 			const deletedCount = await this.checkService.deleteChecks({
-				monitorId: validatedParams.monitorId,
+				monitorId: req.params.monitorId as string,
-				teamId,
+				teamId: req?.user?.teamId,
 			});
 
 			return res.status(200).json({
@@ -123,9 +96,9 @@ class CheckController implements ICheckController {
 
 	deleteChecksByTeamId = async (req: Request, res: Response, next: NextFunction) => {
 		try {
-			const teamId = requireTeamId(req.user?.teamId);
+			deleteChecksByTeamIdParamValidation.parse(req.params);
 
-			const deletedCount = await this.checkService.deleteChecksByTeamId({ teamId });
+			const deletedCount = await this.checkService.deleteChecksByTeamId({ teamId: req?.user?.teamId });
 
 			return res.status(200).json({
 				success: true,
@@ -136,6 +109,24 @@ class CheckController implements ICheckController {
 			next(error);
 		}
 	};
+
+	updateChecksTTL = async (req: Request, res: Response, next: NextFunction) => {
+		try {
+			updateChecksTTLBodyValidation.parse(req.body);
+
+			await this.checkService.updateChecksTTL({
+				teamId: req?.user?.teamId,
+				ttl: req?.body?.ttl,
+			});
+
+			return res.status(200).json({
+				success: true,
+				msg: "Checks TTL updated successfully",
+			});
+		} catch (error) {
+			next(error);
+		}
+	};
 }
 
 export default CheckController;

server/src/controllers/controllerUtils.ts

@@ -1,25 +1,24 @@
 import { AppError } from "@/utils/AppError.js";
-import { Monitor, type MonitorType, MonitorTypes, UserRole } from "@/types/index.js";
+import { type MonitorType, MonitorTypes } from "@/types/index.js";
-import sslChecker, { SSLDetails } from "ssl-checker";
-type SSLCheckerType = typeof sslChecker;
 
-export const fetchMonitorCertificate = async (checker: SSLCheckerType, monitor: Monitor): Promise<SSLDetails> => {
+const fetchMonitorCertificate = async (sslChecker: any, monitor: any): Promise<any> => {
 	const monitorUrl = new URL(monitor.url);
 	const hostname = monitorUrl.hostname;
-	const cert = await checker(hostname);
+	const cert = await sslChecker(hostname);
+	// Throw an error if no cert or if cert.validTo is not present
 	if (cert?.validTo === null || cert?.validTo === undefined) {
 		throw new Error("Certificate not found");
 	}
 	return cert;
 };
-export const requireString = (value: unknown, fieldName: string): string => {
+const requireString = (value: unknown, fieldName: string): string => {
 	if (typeof value === "string" && value.trim().length > 0) {
 		return value;
 	}
 	throw new AppError({ message: `${fieldName} is required`, status: 400 });
 };
 
-export const optionalString = (value: unknown, fieldName: string): string | undefined => {
+const optionalString = (value: unknown, fieldName: string): string | undefined => {
 	if (value === undefined) {
 		return undefined;
 	}
@@ -29,7 +28,7 @@ export const optionalString = (value: unknown, fieldName: string): string | unde
 	throw new AppError({ message: `${fieldName} must be a string`, status: 400 });
 };
 
-export const optionalNumber = (value: unknown, fieldName: string): number | undefined => {
+const optionalNumber = (value: unknown, fieldName: string): number | undefined => {
 	if (value === undefined) {
 		return undefined;
 	}
@@ -45,7 +44,7 @@ export const optionalNumber = (value: unknown, fieldName: string): number | unde
 	throw new AppError({ message: `${fieldName} must be a number`, status: 400 });
 };
 
-export const optionalBoolean = (value: unknown, fieldName: string): boolean | undefined => {
+const optionalBoolean = (value: unknown, fieldName: string): boolean | undefined => {
 	if (value === undefined) {
 		return undefined;
 	}
@@ -63,7 +62,7 @@ export const optionalBoolean = (value: unknown, fieldName: string): boolean | un
 	throw new AppError({ message: `${fieldName} must be a boolean`, status: 400 });
 };
 
-export const parseMonitorTypeFilter = (value: unknown): MonitorType | MonitorType[] | undefined => {
+const parseMonitorTypeFilter = (value: unknown): MonitorType | MonitorType[] | undefined => {
 	const parseSingle = (input: unknown): MonitorType => {
 		if (typeof input !== "string") {
 			throw new AppError({ message: "Monitor type must be a string", status: 400 });
@@ -83,7 +82,7 @@ export const parseMonitorTypeFilter = (value: unknown): MonitorType | MonitorTyp
 	return parseSingle(value);
 };
 
-export const parseSortOrder = (value: unknown): "asc" | "desc" | undefined => {
+const parseSortOrder = (value: unknown): "asc" | "desc" | undefined => {
 	if (value === undefined) {
 		return undefined;
 	}
@@ -93,36 +92,42 @@ export const parseSortOrder = (value: unknown): "asc" | "desc" | undefined => {
 	throw new AppError({ message: "order must be either 'asc' or 'desc'", status: 400 });
 };
 
-export const requireTeamId = (teamId?: string): string => {
+const requireTeamId = (teamId?: string): string => {
 	if (!teamId) {
 		throw new AppError({ message: "Team ID is required", status: 400 });
 	}
 	return teamId;
 };
 
-export const requireUserId = (userId?: string): string => {
+const requireUserId = (userId?: string): string => {
 	if (!userId) {
 		throw new AppError({ message: "User ID is required", status: 400 });
 	}
 	return userId;
 };
-export const requireUserEmail = (userEmail?: string): string => {
+const requireUserEmail = (userEmail?: string): string => {
 	if (!userEmail) {
 		throw new AppError({ message: "User email is required", status: 400 });
 	}
 	return userEmail;
 };
 
-export const requireFirstName = (firstName?: string): string => {
+export const requireUserRoles = (userRoles?: string[]): string[] => {
-	if (!firstName) {
-		throw new AppError({ message: "First name is required", status: 400 });
-	}
-	return firstName;
-};
-
-export const requireUserRoles = (userRoles?: UserRole[]): UserRole[] => {
 	if (!userRoles || userRoles.length === 0) {
 		throw new AppError({ message: "User roles are required", status: 400 });
 	}
 	return userRoles;
 };
+
+export {
+	fetchMonitorCertificate,
+	requireString,
+	optionalString,
+	optionalNumber,
+	optionalBoolean,
+	parseMonitorTypeFilter,
+	parseSortOrder,
+	requireTeamId,
+	requireUserId,
+	requireUserEmail,
+};

server/src/controllers/diagnosticController.ts

@@ -1,18 +1,12 @@
-import { IDiagnosticService } from "@/service/index.js";
 import { Request, Response, NextFunction } from "express";
 
 const SERVICE_NAME = "diagnosticController";
-
+class DiagnosticController {
-export interface IDiagnosticController {
-	getSystemStats: (req: Request, res: Response, next: NextFunction) => Promise<Response | void>;
-}
-
-class DiagnosticController implements IDiagnosticController {
 	static SERVICE_NAME = SERVICE_NAME;
 
-	private diagnosticService: IDiagnosticService;
+	private diagnosticService: any;
 
-	constructor(diagnosticService: IDiagnosticService) {
+	constructor(diagnosticService: any) {
 		this.diagnosticService = diagnosticService;
 	}
 

server/src/controllers/geoCheckController.ts

@@ -1,15 +1,10 @@
 import { Request, Response, NextFunction } from "express";
 import { getChecksParamValidation, getChecksQueryValidation } from "@/validation/checkValidation.js";
 import type { IGeoChecksService } from "@/service/business/geoChecksService.js";
-import { requireTeamId } from "./controllerUtils.js";
-import { AppError } from "@/utils/AppError.js";
 
 const SERVICE_NAME = "geoCheckController";
 
-export interface IGeoCheckController {
+class GeoCheckController {
-	getGeoChecksByMonitor: (req: Request, res: Response, next: NextFunction) => Promise<Response | void>;
-}
-class GeoCheckController implements IGeoCheckController {
 	static SERVICE_NAME = SERVICE_NAME;
 
 	private geoChecksService: IGeoChecksService;
@@ -23,29 +18,13 @@ class GeoCheckController implements IGeoCheckController {
 
 	getGeoChecksByMonitor = async (req: Request, res: Response, next: NextFunction) => {
 		try {
-			const validatedParams = getChecksParamValidation.parse(req.params);
+			getChecksParamValidation.parse(req.params);
-			const validatedQuery = getChecksQueryValidation.parse(req.query);
+			getChecksQueryValidation.parse(req.query);
-
-			if (!validatedQuery.continent || validatedQuery.continent.length === 0) {
-				throw new AppError({
-					message: "At least one continent must be specified",
-					service: SERVICE_NAME,
-					method: "getGeoChecksByMonitor",
-					details: { monitorId: validatedParams.monitorId },
-					status: 400,
-				});
-			}
-
-			const teamId = requireTeamId(req.user?.teamId);
 
 			const result = await this.geoChecksService.getGeoChecksByMonitor({
-				monitorId: validatedParams.monitorId,
+				monitorId: req?.params?.monitorId as string,
-				teamId: teamId,
+				query: req?.query,
-				sortOrder: validatedQuery.sortOrder,
+				teamId: req?.user?.teamId as string,
-				dateRange: validatedQuery.dateRange,
-				page: validatedQuery.page,
-				rowsPerPage: validatedQuery.rowsPerPage,
-				continent: validatedQuery.continent,
 			});
 
 			return res.status(200).json({

server/src/controllers/incidentController.ts

@@ -1,37 +1,35 @@
 import { AppError } from "@/utils/AppError.js";
 import { Request, Response, NextFunction } from "express";
 import { requireTeamId, requireUserId, requireUserEmail } from "./controllerUtils.js";
-import { IIncidentService } from "@/service/index.js";
-import { getIncidentsByTeamQueryValidation, getIncidentSummaryQueryValidation } from "@/validation/incidentValidation.js";
 
-const SERVICE_NAME = "IncidentController";
+const SERVICE_NAME = "incidentController";
 
-export interface IIncidentController {
+class IncidentController {
-	getIncidentsByTeam: (req: Request, res: Response, next: NextFunction) => Promise<Response | void>;
+	static SERVICE_NAME = SERVICE_NAME;
-	getIncidentSummary: (req: Request, res: Response, next: NextFunction) => Promise<Response | void>;
+
-	getIncidentById: (req: Request, res: Response, next: NextFunction) => Promise<Response | void>;
+	private incidentService: any;
-	resolveIncidentManually: (req: Request, res: Response, next: NextFunction) => Promise<Response | void>;
+	constructor(incidentService: any) {
-}
-class IncidentController implements IIncidentController {
-	private incidentService: IIncidentService;
-	constructor(incidentService: IIncidentService) {
 		this.incidentService = incidentService;
 	}
 
+	get serviceName() {
+		return IncidentController.SERVICE_NAME;
+	}
+
 	getIncidentsByTeam = async (req: Request, res: Response, next: NextFunction) => {
 		try {
-			const validatedQuery = getIncidentsByTeamQueryValidation.parse(req.query);
+			const { sortOrder, dateRange, page, rowsPerPage, status, monitorId, resolutionType } = req.query || {};
 
 			const teamId = requireTeamId(req.user?.teamId);
 			const result = await this.incidentService.getIncidentsByTeam(
 				teamId,
-				validatedQuery.sortOrder,
+				sortOrder,
-				validatedQuery.dateRange,
+				dateRange,
-				validatedQuery.page,
+				page,
-				validatedQuery.rowsPerPage,
+				rowsPerPage,
-				validatedQuery.status,
+				status,
-				validatedQuery.monitorId,
+				monitorId,
-				validatedQuery.resolutionType
+				resolutionType
 			);
 
 			return res.status(200).json({
@@ -47,9 +45,10 @@ class IncidentController implements IIncidentController {
 	getIncidentSummary = async (req: Request, res: Response, next: NextFunction) => {
 		try {
 			const teamId = requireTeamId(req.user?.teamId);
-			const validatedQuery = getIncidentSummaryQueryValidation.parse(req.query);
 
-			const summary = await this.incidentService.getIncidentSummary(teamId, validatedQuery.limit);
+			const limit = req.query.limit ? parseInt(req.query.limit as string, 10) : 10;
+
+			const summary = await this.incidentService.getIncidentSummary(teamId, limit);
 			return res.status(200).json({
 				success: true,
 				msg: "Incident summary retrieved successfully",

server/src/controllers/inviteController.ts

@@ -1,19 +1,12 @@
 import { Request, Response, NextFunction } from "express";
 import { inviteBodyValidation, inviteVerificationBodyValidation } from "@/validation/authValidation.js";
-import { requireFirstName, requireTeamId, requireUserRoles } from "@/controllers/controllerUtils.js";
+import { requireTeamId, requireUserRoles } from "@/controllers/controllerUtils.js";
-import { IInviteService } from "@/service/index.js";
 const SERVICE_NAME = "inviteController";
 
-export interface IInviteController {
+class InviteController {
-	getInviteToken: (req: Request, res: Response, next: NextFunction) => Promise<Response | void>;
-	sendInviteEmail: (req: Request, res: Response, next: NextFunction) => Promise<Response | void>;
-	verifyInviteToken: (req: Request, res: Response, next: NextFunction) => Promise<Response | void>;
-}
-
-class InviteController implements IInviteController {
 	static SERVICE_NAME = SERVICE_NAME;
-	private inviteService: IInviteService;
+	private inviteService: any;
-	constructor(inviteService: IInviteService) {
+	constructor(inviteService: any) {
 		this.inviteService = inviteService;
 	}
 
@@ -41,9 +34,8 @@ class InviteController implements IInviteController {
 
 	sendInviteEmail = async (req: Request, res: Response, next: NextFunction) => {
 		try {
-			const teamId = requireTeamId(req.user?.teamId);
+			const teamId = requireTeamId(req?.user?.teamId);
-			const userRoles = requireUserRoles(req.user?.role);
+			const userRoles = requireUserRoles(req?.user?.role);
-			const firstName = requireFirstName(req.user?.firstName);
 
 			const inviteRequest = req.body;
 			inviteRequest.teamId = teamId;
@@ -51,7 +43,7 @@ class InviteController implements IInviteController {
 
 			const inviteToken = await this.inviteService.sendInviteEmail({
 				invite: inviteRequest,
-				firstName,
+				firstName: req?.user?.firstName,
 				userRoles,
 			});
 			return res.status(200).json({

server/src/controllers/logController.ts

@@ -1,16 +1,11 @@
-import { ILogger } from "@/utils/logger.js";
 import { Request, Response, NextFunction } from "express";
 
 const SERVICE_NAME = "LogController";
 
-export interface ILogController {
-	getLogs: (req: Request, res: Response, next: NextFunction) => Promise<void>;
-}
-
 class LogController {
 	static SERVICE_NAME = SERVICE_NAME;
-	private logger: ILogger;
+	private logger: any;
-	constructor(logger: ILogger) {
+	constructor(logger: any) {
 		this.logger = logger;
 	}
 	get serviceName() {
@@ -19,7 +14,7 @@ class LogController {
 
 	getLogs = async (req: Request, res: Response, next: NextFunction) => {
 		try {
-			const logs = this.logger.getLogs();
+			const logs = await this.logger.getLogs();
 			res.status(200).json({
 				success: true,
 				msg: "Logs fetched successfully",

server/src/controllers/maintenanceWindowController.ts

@@ -9,37 +9,26 @@ import {
 	deleteMaintenanceWindowByIdParamValidation,
 } from "@/validation/maintenanceWindowValidation.js";
 import { requireTeamId } from "@/controllers/controllerUtils.js";
-import { IMaintenanceWindowService } from "@/service/index.js";
 
-export interface IMaintenanceWindowController {
+const SERVICE_NAME = "maintenanceWindowController";
-	createMaintenanceWindows: (req: Request, res: Response, next: NextFunction) => Promise<Response | void>;
+
-	getMaintenanceWindowById: (req: Request, res: Response, next: NextFunction) => Promise<Response | void>;
+class MaintenanceWindowController {
-	getMaintenanceWindowsByTeamId: (req: Request, res: Response, next: NextFunction) => Promise<Response | void>;
+	static SERVICE_NAME = SERVICE_NAME;
-	getMaintenanceWindowsByMonitorId: (req: Request, res: Response, next: NextFunction) => Promise<Response | void>;
+	private maintenanceWindowService: any;
-	deleteMaintenanceWindow: (req: Request, res: Response, next: NextFunction) => Promise<Response | void>;
+	constructor(maintenanceWindowService: any) {
-	editMaintenanceWindow: (req: Request, res: Response, next: NextFunction) => Promise<Response | void>;
-}
-class MaintenanceWindowController implements IMaintenanceWindowController {
-	private maintenanceWindowService: IMaintenanceWindowService;
-	constructor(maintenanceWindowService: IMaintenanceWindowService) {
 		this.maintenanceWindowService = maintenanceWindowService;
 	}
 
+	get serviceName() {
+		return MaintenanceWindowController.SERVICE_NAME;
+	}
+
 	createMaintenanceWindows = async (req: Request, res: Response, next: NextFunction) => {
 		try {
-			const validatedBody = createMaintenanceWindowBodyValidation.parse(req.body);
+			createMaintenanceWindowBodyValidation.parse(req.body);
 			const teamId = requireTeamId(req?.user?.teamId);
 
-			const monitorIDs = validatedBody.monitors;
+			await this.maintenanceWindowService.createMaintenanceWindow({ teamId, body: req.body });
-			const name = validatedBody.name;
-			const active = validatedBody.active ?? true;
-			const duration = validatedBody.duration;
-			const durationUnit = validatedBody.durationUnit;
-			const repeat = validatedBody.repeat;
-			const start = validatedBody.start;
-			const end = validatedBody.end;
-
-			await this.maintenanceWindowService.createMaintenanceWindow({ teamId, monitorIDs, name, active, duration, durationUnit, repeat, start, end });
 
 			return res.status(200).json({
 				success: true,
@@ -51,11 +40,11 @@ class MaintenanceWindowController implements IMaintenanceWindowController {
 	};
 	getMaintenanceWindowById = async (req: Request, res: Response, next: NextFunction) => {
 		try {
-			const validatedParams = getMaintenanceWindowByIdParamValidation.parse(req.params);
+			getMaintenanceWindowByIdParamValidation.parse(req.params);
 
 			const teamId = requireTeamId(req.user?.teamId);
 
-			const maintenanceWindow = await this.maintenanceWindowService.getMaintenanceWindowById({ id: validatedParams.id, teamId });
+			const maintenanceWindow = await this.maintenanceWindowService.getMaintenanceWindowById({ id: req.params.id as string, teamId });
 
 			return res.status(200).json({
 				success: true,
@@ -69,18 +58,11 @@ class MaintenanceWindowController implements IMaintenanceWindowController {
 
 	getMaintenanceWindowsByTeamId = async (req: Request, res: Response, next: NextFunction) => {
 		try {
-			const validatedQuery = getMaintenanceWindowsByTeamIdQueryValidation.parse(req.query);
+			getMaintenanceWindowsByTeamIdQueryValidation.parse(req.query);
 
 			const teamId = requireTeamId(req?.user?.teamId);
 
-			const maintenanceWindows = await this.maintenanceWindowService.getMaintenanceWindowsByTeamId({
+			const maintenanceWindows = await this.maintenanceWindowService.getMaintenanceWindowsByTeamId({ teamId, query: req.query });
-				teamId,
-				active: validatedQuery.active,
-				page: validatedQuery.page,
-				rowsPerPage: validatedQuery.rowsPerPage,
-				field: validatedQuery.field,
-				order: validatedQuery.order,
-			});
 
 			return res.status(200).json({
 				success: true,
@@ -94,12 +76,12 @@ class MaintenanceWindowController implements IMaintenanceWindowController {
 
 	getMaintenanceWindowsByMonitorId = async (req: Request, res: Response, next: NextFunction) => {
 		try {
-			const validatedParams = getMaintenanceWindowsByMonitorIdParamValidation.parse(req.params);
+			getMaintenanceWindowsByMonitorIdParamValidation.parse(req.params);
 
 			const teamId = requireTeamId(req?.user?.teamId);
 
 			const maintenanceWindows = await this.maintenanceWindowService.getMaintenanceWindowsByMonitorId({
-				monitorId: validatedParams.monitorId,
+				monitorId: req.params.monitorId as string,
 				teamId,
 			});
 
@@ -114,11 +96,11 @@ class MaintenanceWindowController implements IMaintenanceWindowController {
 	};
 	deleteMaintenanceWindow = async (req: Request, res: Response, next: NextFunction) => {
 		try {
-			const validatedParams = deleteMaintenanceWindowByIdParamValidation.parse(req.params);
+			deleteMaintenanceWindowByIdParamValidation.parse(req.params);
 
 			const teamId = requireTeamId(req?.user?.teamId);
 
-			await this.maintenanceWindowService.deleteMaintenanceWindow({ id: validatedParams.id, teamId });
+			await this.maintenanceWindowService.deleteMaintenanceWindow({ id: req.params.id as string, teamId });
 
 			return res.status(200).json({
 				success: true,
@@ -131,14 +113,14 @@ class MaintenanceWindowController implements IMaintenanceWindowController {
 
 	editMaintenanceWindow = async (req: Request, res: Response, next: NextFunction) => {
 		try {
-			const validatedParams = editMaintenanceWindowByIdParamValidation.parse(req.params);
+			editMaintenanceWindowByIdParamValidation.parse(req.params);
-			const validatedBody = editMaintenanceByIdWindowBodyValidation.parse(req.body);
+			editMaintenanceByIdWindowBodyValidation.parse(req.body);
 
 			const teamId = requireTeamId(req.user?.teamId);
 
 			const editedMaintenanceWindow = await this.maintenanceWindowService.editMaintenanceWindow({
-				id: validatedParams.id,
+				id: req.params.id as string,
-				body: validatedBody,
+				body: req.body,
 				teamId,
 			});
 			return res.status(200).json({

server/src/controllers/monitorController.ts

@@ -1,8 +1,9 @@
 import { Request, Response, NextFunction } from "express";
-import { updateNotificationsValidation } from "@/validation/notificationValidation.js";
+
 import {
 	getMonitorByIdParamValidation,
 	getMonitorByIdQueryValidation,
+	getMonitorsByTeamIdParamValidation,
 	getMonitorsByTeamIdQueryValidation,
 	getMonitorsWithChecksQueryValidation,
 	createMonitorBodyValidation,
@@ -11,48 +12,31 @@ import {
 	getCertificateParamValidation,
 	getHardwareDetailsByIdParamValidation,
 	getHardwareDetailsByIdQueryValidation,
-	getUptimeDetailsByIdParamValidation,
-	getUptimeDetailsByIdQueryValidation,
-	importMonitorsBodyValidation,
 } from "@/validation/monitorValidation.js";
 import sslChecker from "ssl-checker";
-import { fetchMonitorCertificate, requireTeamId, requireUserId } from "@/controllers/controllerUtils.js";
+import {
+	fetchMonitorCertificate,
+	requireString,
+	optionalString,
+	optionalNumber,
+	optionalBoolean,
+	parseMonitorTypeFilter,
+	parseSortOrder,
+	requireTeamId,
+	requireUserId,
+} from "./controllerUtils.js";
 import { AppError } from "@/utils/AppError.js";
-import { IMonitorService, INotificationsService } from "@/service/index.js";
+import { IMonitorService } from "@/service/index.js";
 import { GeoContinent } from "@/types/geoCheck.js";
 
 const SERVICE_NAME = "monitorController";
-
+class MonitorController {
-export interface IMonitorController {
-	getMonitorCertificate: (req: Request, res: Response, next: NextFunction) => Promise<Response | void>;
-	getUptimeDetailsById: (req: Request, res: Response, next: NextFunction) => Promise<Response | void>;
-	getHardwareDetailsById: (req: Request, res: Response, next: NextFunction) => Promise<Response | void>;
-	getPageSpeedDetailsById: (req: Request, res: Response, next: NextFunction) => Promise<Response | void>;
-	getGeoChecksByMonitorId: (req: Request, res: Response, next: NextFunction) => Promise<Response | void>;
-	getMonitorById: (req: Request, res: Response, next: NextFunction) => Promise<Response | void>;
-	createMonitor: (req: Request, res: Response, next: NextFunction) => Promise<Response | void>;
-	importMonitorsFromJSON: (req: Request, res: Response, next: NextFunction) => Promise<Response | void>;
-	deleteMonitor: (req: Request, res: Response, next: NextFunction) => Promise<Response | void>;
-	deleteAllMonitors: (req: Request, res: Response, next: NextFunction) => Promise<Response | void>;
-	editMonitor: (req: Request, res: Response, next: NextFunction) => Promise<Response | void>;
-	pauseMonitor: (req: Request, res: Response, next: NextFunction) => Promise<Response | void>;
-	addDemoMonitors: (req: Request, res: Response, next: NextFunction) => Promise<Response | void>;
-	getMonitorsByTeamId: (req: Request, res: Response, next: NextFunction) => Promise<Response | void>;
-	getMonitorsWithChecksByTeamId: (req: Request, res: Response, next: NextFunction) => Promise<Response | void>;
-	exportMonitorsToJSON: (req: Request, res: Response, next: NextFunction) => Promise<Response | void>;
-	getAllGames: (req: Request, res: Response, next: NextFunction) => Promise<Response | void>;
-	getGroupsByTeamId: (req: Request, res: Response, next: NextFunction) => Promise<Response | void>;
-	updateNotifications: (req: Request, res: Response, next: NextFunction) => Promise<Response | void>;
-}
-class MonitorController implements IMonitorController {
 	static SERVICE_NAME = SERVICE_NAME;
 
 	private monitorService: IMonitorService;
-	private notificationsService: INotificationsService;
 
-	constructor(monitorService: IMonitorService, notificationsService: INotificationsService) {
+	constructor(monitorService: IMonitorService) {
 		this.monitorService = monitorService;
-		this.notificationsService = notificationsService;
 	}
 
 	get serviceName() {
@@ -61,9 +45,10 @@ class MonitorController implements IMonitorController {
 
 	getMonitorCertificate = async (req: Request, res: Response, next: NextFunction) => {
 		try {
-			const validatedParams = getCertificateParamValidation.parse(req.params);
+			getCertificateParamValidation.parse(req.params);
-			const teamId = requireTeamId(req.user?.teamId);
+			const teamId = requireTeamId(req?.user?.teamId);
-			const monitor = await this.monitorService.getMonitorById({ teamId, monitorId: validatedParams.monitorId });
+			const monitorId = requireString(req.params?.monitorId, "Monitor ID");
+			const monitor = await this.monitorService.getMonitorById({ teamId, monitorId });
 			const certificate = await fetchMonitorCertificate(sslChecker, monitor);
 
 			return res.status(200).json({
@@ -80,18 +65,16 @@ class MonitorController implements IMonitorController {
 
 	getUptimeDetailsById = async (req: Request, res: Response, next: NextFunction) => {
 		try {
-			const validatedParams = getUptimeDetailsByIdParamValidation.parse(req.params);
+			const monitorId = requireString(req?.params?.monitorId, "Monitor ID");
-			const validatedQuery = getUptimeDetailsByIdQueryValidation.parse(req.query);
+			const dateRange = requireString(req?.query?.dateRange, "dateRange");
-
+			const normalize = optionalBoolean(req?.query?.normalize, "normalize");
-			const monitorId = validatedParams.monitorId;
+			const teamId = requireTeamId(req?.user?.teamId);
-			const dateRange = validatedQuery.dateRange;
-
-			const teamId = requireTeamId(req.user?.teamId);
 
 			const data = await this.monitorService.getUptimeDetailsById({
 				teamId,
 				monitorId,
 				dateRange,
+				normalize,
 			});
 			return res.status(200).json({
 				success: true,
@@ -105,12 +88,12 @@ class MonitorController implements IMonitorController {
 
 	getHardwareDetailsById = async (req: Request, res: Response, next: NextFunction) => {
 		try {
-			const validatedParams = getHardwareDetailsByIdParamValidation.parse(req.params);
+			getHardwareDetailsByIdParamValidation.parse(req.params);
-			const validatedQuery = getHardwareDetailsByIdQueryValidation.parse(req.query);
+			getHardwareDetailsByIdQueryValidation.parse(req.query);
 
-			const monitorId = validatedParams.monitorId;
+			const monitorId = requireString(req?.params?.monitorId, "Monitor ID");
-			const dateRange = validatedQuery.dateRange || "recent";
+			const dateRange = optionalString(req?.query?.dateRange, "dateRange") || "recent";
-			const teamId = requireTeamId(req.user?.teamId);
+			const teamId = requireTeamId(req?.user?.teamId);
 
 			const data = await this.monitorService.getHardwareDetailsById({
 				teamId,
@@ -129,12 +112,12 @@ class MonitorController implements IMonitorController {
 	};
 	getPageSpeedDetailsById = async (req: Request, res: Response, next: NextFunction) => {
 		try {
-			const validatedParams = getHardwareDetailsByIdParamValidation.parse(req.params);
+			getHardwareDetailsByIdParamValidation.parse(req.params);
-			const validatedQuery = getHardwareDetailsByIdQueryValidation.parse(req.query);
+			getHardwareDetailsByIdQueryValidation.parse(req.query);
 
-			const monitorId = validatedParams.monitorId;
+			const monitorId = requireString(req?.params?.monitorId, "Monitor ID");
-			const dateRange = validatedQuery.dateRange || "recent";
+			const dateRange = requireString(req?.query?.dateRange, "dateRange");
-			const teamId = requireTeamId(req.user?.teamId);
+			const teamId = requireTeamId(req?.user?.teamId);
 
 			const data = await this.monitorService.getPageSpeedDetailsById({
 				teamId,
@@ -154,14 +137,18 @@ class MonitorController implements IMonitorController {
 
 	getGeoChecksByMonitorId = async (req: Request, res: Response, next: NextFunction) => {
 		try {
-			const validatedParams = getMonitorByIdParamValidation.parse(req.params);
+			getMonitorByIdParamValidation.parse(req.params);
-			const validatedQuery = getMonitorByIdQueryValidation.parse(req.query);
+			getMonitorByIdQueryValidation.parse(req.query);
 
-			const monitorId = validatedParams.monitorId;
+			const monitorId = requireString(req?.params?.monitorId, "Monitor ID");
-			const dateRange = validatedQuery.dateRange || "recent";
+			const dateRange = requireString(req?.query?.dateRange, "dateRange");
-			const continentParam = validatedQuery.continent;
+			const continentParam = req?.query?.continent;
-			const continents = continentParam ? (Array.isArray(continentParam) ? continentParam : [continentParam]) : undefined;
+			const continents = continentParam
-			const teamId = requireTeamId(req.user?.teamId);
+				? Array.isArray(continentParam)
+					? (continentParam as GeoContinent[])
+					: [continentParam as GeoContinent]
+				: undefined;
+			const teamId = requireTeamId(req?.user?.teamId);
 
 			const data = await this.monitorService.getGeoChecksByMonitorId({
 				teamId,
@@ -182,10 +169,11 @@ class MonitorController implements IMonitorController {
 
 	getMonitorById = async (req: Request, res: Response, next: NextFunction) => {
 		try {
-			const validatedParams = getMonitorByIdParamValidation.parse(req.params);
+			getMonitorByIdParamValidation.parse(req.params);
+			getMonitorByIdQueryValidation.parse(req.query);
 
-			const teamId = requireTeamId(req.user?.teamId);
+			const teamId = requireTeamId(req?.user?.teamId);
-			const monitorId = validatedParams.monitorId;
+			const monitorId = requireString(req?.params?.monitorId, "Monitor ID");
 
 			const monitor = await this.monitorService.getMonitorById({ teamId, monitorId });
 
@@ -201,12 +189,12 @@ class MonitorController implements IMonitorController {
 
 	createMonitor = async (req: Request, res: Response, next: NextFunction) => {
 		try {
-			const validatedBody = createMonitorBodyValidation.parse(req.body);
+			createMonitorBodyValidation.parse(req.body);
 
-			const userId = requireUserId(req.user?.id);
+			const userId = requireString(req?.user?.id, "User ID");
-			const teamId = requireTeamId(req.user?.teamId);
+			const teamId = requireTeamId(req?.user?.teamId);
 
-			const monitor = await this.monitorService.createMonitor(teamId, userId, validatedBody);
+			const monitor = await this.monitorService.createMonitor(teamId, userId, req.body);
 
 			return res.status(200).json({
 				success: true,
@@ -220,10 +208,14 @@ class MonitorController implements IMonitorController {
 
 	importMonitorsFromJSON = async (req: Request, res: Response, next: NextFunction) => {
 		try {
-			const teamId = requireTeamId(req.user?.teamId);
+			const teamId = requireTeamId(req?.user?.teamId);
-			const userId = requireUserId(req.user?.id);
+			const userId = requireUserId(req?.user?.id);
-			const validatedBody = importMonitorsBodyValidation.parse(req.body);
+
-			const monitors = validatedBody.monitors;
+			const { monitors } = req.body;
+
+			if (!monitors || !Array.isArray(monitors)) {
+				throw new AppError({ message: "Invalid request: monitors array is required", status: 400 });
+			}
 
 			const result = await this.monitorService.importMonitorsFromJSON({ teamId, userId, monitors });
 
@@ -239,9 +231,9 @@ class MonitorController implements IMonitorController {
 
 	deleteMonitor = async (req: Request, res: Response, next: NextFunction) => {
 		try {
-			const validatedParams = getMonitorByIdParamValidation.parse(req.params);
+			getMonitorByIdParamValidation.parse(req.params);
-			const teamId = requireTeamId(req.user?.teamId);
+			const monitorId = requireString(req?.params?.monitorId, "Monitor ID");
-			const monitorId = validatedParams.monitorId;
+			const teamId = requireTeamId(req?.user?.teamId);
 
 			const deletedMonitor = await this.monitorService.deleteMonitor({ teamId, monitorId });
 
@@ -257,7 +249,8 @@ class MonitorController implements IMonitorController {
 
 	deleteAllMonitors = async (req: Request, res: Response, next: NextFunction) => {
 		try {
-			const teamId = requireTeamId(req.user?.teamId);
+			const teamId = requireTeamId(req?.user?.teamId);
+
 			const deletedCount = await this.monitorService.deleteAllMonitors({ teamId });
 
 			return res.status(200).json({
@@ -271,12 +264,12 @@ class MonitorController implements IMonitorController {
 
 	editMonitor = async (req: Request, res: Response, next: NextFunction) => {
 		try {
-			const validatedParams = getMonitorByIdParamValidation.parse(req.params);
+			getMonitorByIdParamValidation.parse(req.params);
-			const validatedBody = editMonitorBodyValidation.parse(req.body);
+			editMonitorBodyValidation.parse(req.body);
-			const monitorId = validatedParams.monitorId;
+			const monitorId = requireString(req?.params?.monitorId, "Monitor ID");
-			const teamId = requireTeamId(req.user?.teamId);
+			const teamId = requireTeamId(req?.user?.teamId);
 
-			const editedMonitor = await this.monitorService.editMonitor({ teamId, monitorId, body: validatedBody });
+			const editedMonitor = await this.monitorService.editMonitor({ teamId, monitorId, body: req.body });
 
 			return res.status(200).json({
 				success: true,
@@ -290,10 +283,10 @@ class MonitorController implements IMonitorController {
 
 	pauseMonitor = async (req: Request, res: Response, next: NextFunction) => {
 		try {
-			const validatedParams = pauseMonitorParamValidation.parse(req.params);
+			pauseMonitorParamValidation.parse(req.params);
 
-			const monitorId = validatedParams.monitorId;
+			const monitorId = requireString(req?.params?.monitorId, "Monitor ID");
-			const teamId = requireTeamId(req.user?.teamId);
+			const teamId = requireTeamId(req?.user?.teamId);
 
 			const monitor = await this.monitorService.pauseMonitor({ teamId, monitorId });
 
@@ -309,8 +302,8 @@ class MonitorController implements IMonitorController {
 
 	addDemoMonitors = async (req: Request, res: Response, next: NextFunction) => {
 		try {
-			const id = requireUserId(req.user?.id);
+			const id = requireString(req?.user?.id, "User ID");
-			const teamId = requireTeamId(req.user?.teamId);
+			const teamId = requireTeamId(req?.user?.teamId);
 			const demoMonitors = await this.monitorService.addDemoMonitors({ userId: id, teamId });
 
 			return res.status(200).json({
@@ -323,13 +316,32 @@ class MonitorController implements IMonitorController {
 		}
 	};
 
+	sendTestEmail = async (req: Request, res: Response, next: NextFunction) => {
+		try {
+			const { to } = req.body;
+			if (!to || typeof to !== "string") {
+				throw new AppError({ message: "Invalid 'to' email address", status: 400 });
+			}
+
+			const messageId = await this.monitorService.sendTestEmail({ to });
+			return res.status(200).json({
+				success: true,
+				msg: "Test email sent successfully",
+				data: { messageId },
+			});
+		} catch (error) {
+			next(error);
+		}
+	};
+
 	getMonitorsByTeamId = async (req: Request, res: Response, next: NextFunction) => {
 		try {
-			const validatedQuery = getMonitorsByTeamIdQueryValidation.parse(req.query);
+			getMonitorsByTeamIdParamValidation.parse(req.params);
+			getMonitorsByTeamIdQueryValidation.parse(req.query);
 
-			const teamId = requireTeamId(req.user?.teamId);
+			const teamId = requireTeamId(req?.user?.teamId);
-			const type = validatedQuery.type;
+			const type = parseMonitorTypeFilter(req.query?.type);
-			const filter = validatedQuery.filter;
+			const filter = optionalString(req.query?.filter, "filter");
 
 			const monitors = await this.monitorService.getMonitorsByTeamId({ teamId, type, filter });
 
@@ -345,16 +357,17 @@ class MonitorController implements IMonitorController {
 
 	getMonitorsWithChecksByTeamId = async (req: Request, res: Response, next: NextFunction) => {
 		try {
-			const validatedQuery = getMonitorsWithChecksQueryValidation.parse(req.query);
+			getMonitorsByTeamIdParamValidation.parse(req.params);
-
+			getMonitorsWithChecksQueryValidation.parse(req.query);
-			const limit = validatedQuery.limit;
+			const explain = optionalBoolean(req?.query?.explain, "explain");
-			const page = validatedQuery.page;
+			const limit = optionalNumber(req?.query?.limit, "limit");
-			const rowsPerPage = validatedQuery.rowsPerPage;
+			const page = optionalNumber(req?.query?.page, "page");
-			const filter = validatedQuery.filter;
+			const rowsPerPage = optionalNumber(req?.query?.rowsPerPage, "rowsPerPage");
-			const field = validatedQuery.field;
+			const filter = optionalString(req?.query?.filter, "filter");
-			const order = validatedQuery.order;
+			const field = optionalString(req?.query?.field, "field");
-			const type = validatedQuery.type;
+			const order = parseSortOrder(req?.query?.order);
-			const teamId = requireTeamId(req.user?.teamId);
+			const type = parseMonitorTypeFilter(req?.query?.type);
+			const teamId = requireTeamId(req?.user?.teamId);
 
 			const monitors = await this.monitorService.getMonitorsWithChecksByTeamId({
 				teamId,
@@ -365,6 +378,7 @@ class MonitorController implements IMonitorController {
 				filter,
 				field,
 				order,
+				explain,
 			});
 
 			return res.status(200).json({
@@ -378,7 +392,11 @@ class MonitorController implements IMonitorController {
 
 	exportMonitorsToJSON = async (req: Request, res: Response, next: NextFunction) => {
 		try {
-			const teamId = requireTeamId(req.user?.teamId);
+			const teamId = req?.user?.teamId;
+			if (!teamId) {
+				throw new AppError({ message: "Team ID is required", status: 400 });
+			}
+
 			const json = await this.monitorService.exportMonitorsToJSON({ teamId });
 
 			return res.status(200).json({
@@ -406,7 +424,11 @@ class MonitorController implements IMonitorController {
 
 	getGroupsByTeamId = async (req: Request, res: Response, next: NextFunction) => {
 		try {
-			const teamId = requireTeamId(req.user?.teamId);
+			const teamId = req?.user?.teamId;
+			if (!teamId) {
+				throw new AppError({ message: "Team ID is required", status: 400 });
+			}
+
 			const groups = await this.monitorService.getGroupsByTeamId({ teamId });
 
 			return res.status(200).json({
@@ -417,42 +439,6 @@ class MonitorController implements IMonitorController {
 			next(error);
 		}
 	};
-
-	updateNotifications = async (req: Request, res: Response, next: NextFunction) => {
-		try {
-			updateNotificationsValidation.parse(req.body);
-
-			const teamId = requireTeamId(req.user?.teamId);
-			const { monitorIds, notificationIds, action } = req.body;
-
-			// Verify all requested notification IDs actually belong to this team
-			const teamNotifications = await this.notificationsService.findNotificationsByTeamId(teamId);
-			const validNotificationIds = teamNotifications.map((n) => n.id);
-
-			const invalidIds = notificationIds.filter((id: string) => !validNotificationIds.includes(id));
-			if (invalidIds.length > 0) {
-				throw new AppError({
-					message: `The following notification IDs are invalid or do not belong to your team: ${invalidIds.join(", ")}`,
-					status: 403,
-				});
-			}
-
-			const modifiedCount = await this.monitorService.updateNotifications({
-				teamId,
-				monitorIds,
-				notificationIds,
-				action,
-			});
-
-			return res.status(200).json({
-				success: true,
-				msg: `Notifications updated successfully on ${modifiedCount} monitor(s)`,
-				data: { modifiedCount },
-			});
-		} catch (error) {
-			next(error);
-		}
-	};
 }
 
 export default MonitorController;

server/src/controllers/notificationController.ts

@@ -1,30 +1,16 @@
 import { Request, Response, NextFunction } from "express";
 
-import {
+import { Notification } from "@/types/index.js";
-	createNotificationBodyValidation,
+import { createNotificationBodyValidation } from "@/validation/notificationValidation.js";
-	deleteNotificationParamValidation,
-	getNotificationByIdParamValidation,
-	testNotificationBodyValidation,
-	editNotificationParamValidation,
-	testAllNotificationsBodyValidation,
-} from "@/validation/notificationValidation.js";
 import { AppError } from "@/utils/AppError.js";
-import { INotificationsService } from "@/service/index.js";
-import { requireTeamId, requireUserId } from "./controllerUtils.js";
 import { IMonitorsRepository } from "@/repositories/index.js";
+import { INotificationsService } from "@/service/index.js";
+import { requireTeamId } from "./controllerUtils.js";
 
 const SERVICE_NAME = "NotificationController";
 
-export interface INotificationController {
+class NotificationController {
-	testNotification: (req: Request, res: Response, next: NextFunction) => Promise<Response | void>;
+	static SERVICE_NAME = SERVICE_NAME;
-	createNotification: (req: Request, res: Response, next: NextFunction) => Promise<Response | void>;
-	getNotificationsByTeamId: (req: Request, res: Response, next: NextFunction) => Promise<Response | void>;
-	deleteNotification: (req: Request, res: Response, next: NextFunction) => Promise<Response | void>;
-	getNotificationById: (req: Request, res: Response, next: NextFunction) => Promise<Response | void>;
-	editNotification: (req: Request, res: Response, next: NextFunction) => Promise<Response | void>;
-	testAllNotifications: (req: Request, res: Response, next: NextFunction) => Promise<Response | void>;
-}
-class NotificationController implements INotificationController {
 	private notificationsService: INotificationsService;
 	private monitorsRepository: IMonitorsRepository;
 	constructor(notificationsService: INotificationsService, monitorsRepository: IMonitorsRepository) {
@@ -32,9 +18,13 @@ class NotificationController implements INotificationController {
 		this.monitorsRepository = monitorsRepository;
 	}
 
+	get serviceName() {
+		return NotificationController.SERVICE_NAME;
+	}
+
 	testNotification = async (req: Request, res: Response, next: NextFunction) => {
 		try {
-			const notification = testNotificationBodyValidation.parse(req.body);
+			const notification: Notification = req.body;
 			const success = await this.notificationsService.sendTestNotification(notification);
 
 			if (!success) {
@@ -44,7 +34,6 @@ class NotificationController implements INotificationController {
 			return res.status(200).json({
 				success: true,
 				msg: "Notification sent successfully",
-				details: { service: SERVICE_NAME },
 			});
 		} catch (error) {
 			next(error);
@@ -53,12 +42,23 @@ class NotificationController implements INotificationController {
 
 	createNotification = async (req: Request, res: Response, next: NextFunction) => {
 		try {
-			const validatedBody = createNotificationBodyValidation.parse(req.body);
+			createNotificationBodyValidation.parse(req.body);
 
-			const teamId = requireTeamId(req.user?.teamId);
+			const body = req.body;
-			const userId = requireUserId(req.user?.id);
 
-			const notification = await this.notificationsService.createNotification(validatedBody, userId, teamId);
+			const teamId = req?.user?.teamId;
+			if (!teamId) {
+				throw new AppError({ message: "Team ID is required", status: 400 });
+			}
+
+			const userId = req?.user?.id;
+			if (!userId) {
+				throw new AppError({ message: "User ID is required", status: 400 });
+			}
+			body.userId = userId;
+			body.teamId = teamId;
+
+			const notification = await this.notificationsService.createNotification(body);
 			return res.status(200).json({
 				success: true,
 				msg: "Notification created successfully",
@@ -71,7 +71,11 @@ class NotificationController implements INotificationController {
 
 	getNotificationsByTeamId = async (req: Request, res: Response, next: NextFunction) => {
 		try {
-			const teamId = requireTeamId(req.user?.teamId);
+			const teamId = req?.user?.teamId;
+			if (!teamId) {
+				throw new AppError({ message: "Team ID is required", status: 400 });
+			}
+
 			const notifications = await this.notificationsService.findNotificationsByTeamId(teamId);
 
 			return res.status(200).json({
@@ -86,10 +90,17 @@ class NotificationController implements INotificationController {
 
 	deleteNotification = async (req: Request, res: Response, next: NextFunction) => {
 		try {
-			const teamId = requireTeamId(req.user?.teamId);
+			const teamId = req?.user?.teamId;
-			const validatedParams = deleteNotificationParamValidation.parse(req.params);
+			if (!teamId) {
+				throw new AppError({ message: "Team ID is required", status: 400 });
+			}
 
-			await this.notificationsService.deleteById(validatedParams.id, teamId);
+			const notificationId = req.params.id as string;
+			if (!notificationId) {
+				throw new AppError({ message: "Notification ID is required", status: 400 });
+			}
+
+			await this.notificationsService.deleteById(notificationId, teamId);
 			return res.status(200).json({
 				success: true,
 				msg: "Notification deleted successfully",
@@ -102,9 +113,12 @@ class NotificationController implements INotificationController {
 	getNotificationById = async (req: Request, res: Response, next: NextFunction) => {
 		try {
 			const teamId = requireTeamId(req.user?.teamId);
-			const validatedParams = getNotificationByIdParamValidation.parse(req.params);
+			const notificationId = req.params.id as string;
+			if (!notificationId) {
+				throw new AppError({ message: "Notification ID is required", status: 400 });
+			}
 
-			const notification = await this.notificationsService.findById(validatedParams.id, teamId);
+			const notification = await this.notificationsService.findById(notificationId, teamId);
 
 			return res.status(200).json({
 				success: true,
@@ -118,13 +132,14 @@ class NotificationController implements INotificationController {
 
 	editNotification = async (req: Request, res: Response, next: NextFunction) => {
 		try {
-			const validatedBody = createNotificationBodyValidation.parse(req.body);
+			createNotificationBodyValidation.parse(req.body);
-			const validatedParams = editNotificationParamValidation.parse(req.params);
 
 			const teamId = requireTeamId(req.user?.teamId);
-			const notificationId = validatedParams.id;
+			const notificationId = req.params.id as string;
-
+			if (!notificationId) {
-			const editedNotification = await this.notificationsService.updateById(notificationId, teamId, validatedBody);
+				throw new AppError({ message: "Notification ID is required", status: 400 });
+			}
+			const editedNotification = await this.notificationsService.updateById(notificationId, teamId, req.body);
 			return res.status(200).json({
 				success: true,
 				msg: "Notification updated successfully",
@@ -137,13 +152,15 @@ class NotificationController implements INotificationController {
 
 	testAllNotifications = async (req: Request, res: Response, next: NextFunction) => {
 		try {
-			const validatedBody = testAllNotificationsBodyValidation.parse(req.body);
+			const monitorId = req.body.monitorId;
+			const teamId = req?.user?.teamId;
+			if (!teamId) {
+				throw new AppError({ message: "Team ID is required", status: 400 });
+			}
 
-			const teamId = requireTeamId(req.user?.teamId);
+			const monitor = await this.monitorsRepository.findById(monitorId, teamId);
-
-			const monitor = await this.monitorsRepository.findById(validatedBody.monitorId, teamId);
-			const notifications = monitor.notifications || [];
 
+			const notifications = monitor.notifications;
 			if (notifications.length === 0) {
 				throw new AppError({ message: "No notifications", status: 400 });
 			}

server/src/controllers/queueController.ts

@@ -1,19 +1,11 @@
-import { ISuperSimpleQueue } from "@/service/index.js";
 import { Request, Response, NextFunction } from "express";
 
 const SERVICE_NAME = "JobQueueController";
 
-export interface IJobQueueController {
+class JobQueueController {
-	getMetrics(req: Request, res: Response, next: NextFunction): Promise<void>;
-	getJobs(req: Request, res: Response, next: NextFunction): Promise<Response | void>;
-	getAllMetrics(req: Request, res: Response, next: NextFunction): Promise<Response | void>;
-	flushQueue(req: Request, res: Response, next: NextFunction): Promise<Response | void>;
-}
-
-class JobQueueController implements IJobQueueController {
 	static SERVICE_NAME = SERVICE_NAME;
-	private jobQueue: ISuperSimpleQueue;
+	private jobQueue: any;
-	constructor(jobQueue: ISuperSimpleQueue) {
+	constructor(jobQueue: any) {
 		this.jobQueue = jobQueue;
 	}
 
@@ -61,6 +53,18 @@ class JobQueueController implements IJobQueueController {
 		}
 	};
 
+	addJob = async (req: Request, res: Response, next: NextFunction) => {
+		try {
+			await this.jobQueue.addJob(Math.random().toString(36).substring(7));
+			return res.status(200).json({
+				success: true,
+				msg: "Job added to queue successfully",
+			});
+		} catch (error) {
+			next(error);
+		}
+	};
+
 	flushQueue = async (req: Request, res: Response, next: NextFunction) => {
 		try {
 			const result = await this.jobQueue.flushQueues();
@@ -73,5 +77,18 @@ class JobQueueController implements IJobQueueController {
 			next(error);
 		}
 	};
+
+	checkQueueHealth = async (req: Request, res: Response, next: NextFunction) => {
+		try {
+			const stuckQueues = await this.jobQueue.checkQueueHealth();
+			return res.status(200).json({
+				success: true,
+				msg: "Queue health checked successfully",
+				data: stuckQueues,
+			});
+		} catch (error) {
+			next(error);
+		}
+	};
 }
 export default JobQueueController;

server/src/controllers/settingsController.ts

@@ -2,23 +2,14 @@ import { Request, Response, NextFunction } from "express";
 import { updateAppSettingsBodyValidation } from "@/validation/settingsValidation.js";
 import { sendTestEmailBodyValidation } from "@/validation/notificationValidation.js";
 import { AppError } from "@/utils/AppError.js";
-import { IEmailService, ISettingsService } from "@/service/index.js";
-import { Settings } from "@/types/settings.js";
 
 const SERVICE_NAME = "SettingsController";
 
-export interface ISettingsController {
+class SettingsController {
-	serviceName: string;
-	getAppSettings(req: Request, res: Response, next: NextFunction): Promise<Response | void>;
-	updateAppSettings(req: Request, res: Response, next: NextFunction): Promise<Response | void>;
-	sendTestEmail(req: Request, res: Response, next: NextFunction): Promise<Response | void>;
-}
-
-class SettingsController implements ISettingsController {
 	static SERVICE_NAME = SERVICE_NAME;
-	private settingsService: ISettingsService;
+	private settingsService: any;
-	private emailService: IEmailService;
+	private emailService: any;
-	constructor(settingsService: ISettingsService, emailService: IEmailService) {
+	constructor(settingsService: any, emailService: any) {
 		this.settingsService = settingsService;
 		this.emailService = emailService;
 	}
@@ -27,11 +18,11 @@ class SettingsController implements ISettingsController {
 		return SettingsController.SERVICE_NAME;
 	}
 
-	buildAppSettings = (dbSettings: Settings) => {
+	buildAppSettings = (dbSettings: any) => {
-		const sanitizedSettings: Record<string, unknown> = { ...dbSettings };
+		const sanitizedSettings = { ...dbSettings };
 		delete sanitizedSettings.version;
 		delete sanitizedSettings.jwtSecret;
-		const returnSettings: Record<string, unknown | null> = {
+		const returnSettings = {
 			pagespeedKeySet: false,
 			emailPasswordSet: false,
 			settings: null,
@@ -66,9 +57,9 @@ class SettingsController implements ISettingsController {
 
 	updateAppSettings = async (req: Request, res: Response, next: NextFunction) => {
 		try {
-			const validatedBody = updateAppSettingsBodyValidation.parse(req.body);
+			updateAppSettingsBodyValidation.parse(req.body);
 
-			const updatedSettings = await this.settingsService.updateDbSettings(validatedBody);
+			const updatedSettings = await this.settingsService.updateDbSettings(req.body);
 			const returnSettings = this.buildAppSettings(updatedSettings);
 			return res.status(200).json({
 				success: true,
@@ -104,9 +95,6 @@ class SettingsController implements ISettingsController {
 			const context = { testName: "Monitoring System" };
 
 			const html = await this.emailService.buildEmail("testEmailTemplate", context);
-			if (!html) {
-				throw new AppError({ message: "Failed to build email template.", status: 500 });
-			}
 			const messageId = await this.emailService.sendEmail(to, subject, html, {
 				systemEmailHost,
 				systemEmailPort,

server/src/controllers/statusPageController.ts

@@ -15,16 +15,7 @@ import { NormalizeData } from "@/utils/dataUtils.js";
 
 const SERVICE_NAME = "statusPageController";
 
-export interface IStatusPageController {
+class StatusPageController {
-	readonly serviceName: string;
-	createStatusPage(req: Request, res: Response, next: NextFunction): Promise<Response | void>;
-	updateStatusPage(req: Request, res: Response, next: NextFunction): Promise<Response | void>;
-	getStatusPageByUrl(req: Request, res: Response, next: NextFunction): Promise<Response | void>;
-	getStatusPagesByTeamId(req: Request, res: Response, next: NextFunction): Promise<Response | void>;
-	deleteStatusPage(req: Request, res: Response, next: NextFunction): Promise<Response | void>;
-}
-
-class StatusPageController implements IStatusPageController {
 	static SERVICE_NAME = SERVICE_NAME;
 	private statusPageService: IStatusPageService;
 	private monitorsRepository: IMonitorsRepository;
@@ -75,7 +66,7 @@ class StatusPageController implements IStatusPageController {
 			if (statusPage === null) {
 				throw new AppError({ message: "Status page not found", status: 404 });
 			}
-			res.status(200).json({
+			return res.status(200).json({
 				success: true,
 				msg: "Status page updated successfully",
 				data: statusPage,

server/src/db/migration/0002_convertChecksToTimeSeries.ts

@@ -1,5 +1,4 @@
 import mongoose from "mongoose";
-import type { Document, AnyBulkWriteOperation } from "mongodb";
 
 const CHECKS_COLLECTION = "checks";
 const BACKUP_COLLECTION = "checks_backup";
@@ -86,7 +85,7 @@ const createTimeSeriesCollection = async (backedUp: boolean) => {
 	}
 };
 
-const validateDocument = (doc: Document): boolean => {
+const validateDocument = (doc: any): boolean => {
 	if (!doc.createdAt) {
 		return false;
 	}
@@ -96,7 +95,7 @@ const validateDocument = (doc: Document): boolean => {
 	return true;
 };
 
-const storeFailedDocument = async (doc: Document, reason: string) => {
+const storeFailedDocument = async (doc: any, reason: string) => {
 	const db = getDb();
 	await db.collection(FAILED_DOCS_COLLECTION).insertOne({
 		originalDoc: doc,
@@ -125,8 +124,8 @@ const migrateBackupData = async (backedUp: boolean): Promise<MigrationStats> =>
 		stats.totalSource = await source.countDocuments();
 
 		const cursor = source.find().addCursorFlag("noCursorTimeout", true);
-		const operations: AnyBulkWriteOperation<Document>[] = [];
+		const operations: any[] = [];
-		const invalidDocs: Document[] = [];
+		const invalidDocs: any[] = [];
 
 		while (await cursor.hasNext()) {
 			const doc = await cursor.next();
@@ -140,7 +139,6 @@ const migrateBackupData = async (backedUp: boolean): Promise<MigrationStats> =>
 			}
 
 			const { _id, monitorId, teamId, type, ...rest } = doc;
-			void _id;
 			const metadata = { monitorId, teamId, type };
 			operations.push({ insertOne: { document: { ...rest, metadata } } });
 

server/src/db/migration/0003_cleanupDuplicateMonitorStats.ts

@@ -42,10 +42,10 @@ export async function cleanupDuplicateMonitorStats(): Promise<void> {
 			const monitorId = duplicate._id;
 			const { ids, updatedAts } = duplicate;
 
-			type DocPair = { id: string; updatedAt: Date };
+			type DocPair = { id: any; updatedAt: Date };
 
 			// Create array of {id, updatedAt} pairs and sort by updatedAt descending
-			const docs: DocPair[] = ids.map((id: string, index: number) => ({
+			const docs: DocPair[] = ids.map((id: any, index: number) => ({
 				id,
 				updatedAt: updatedAts[index],
 			}));

server/src/db/migration/0004_fixInfrastructureThresholds.ts

@@ -37,8 +37,7 @@ export async function fixInfrastructureThresholds(): Promise<void> {
 			const update: Record<string, number> = {};
 
 			for (const field of thresholdFields) {
-				const value = monitor.get(field);
+				if ((monitor as any)[field] === 0 || (monitor as any)[field] === 5) {
-				if (value === 0 || value === 5) {
 					update[field] = 100;
 				}
 			}

server/src/db/migration/0005_migrateStatusPageTypeToArray.ts

@@ -1,45 +0,0 @@
-import mongoose from "mongoose";
-import { logger } from "@/utils/logger.js";
-import StatusPageModel from "../models/StatusPage.js";
-
-export async function migrateStatusPageTypeToArray(): Promise<void> {
-	const SERVICE_NAME = "Migration:MigrateStatusPageTypeToArray";
-
-	try {
-		logger.info({ service: SERVICE_NAME, message: "Starting migration of StatusPage type field from string to array" });
-
-		const db = mongoose.connection.db;
-		if (!db) {
-			throw new Error("Database connection is not initialized");
-		}
-
-		const result = await StatusPageModel.updateMany(
-			{
-				$expr: {
-					$eq: [{ $type: "$type" }, "string"], // only scalar string, not existing array
-				},
-			},
-			[
-				{
-					$set: {
-						type: ["$type"],
-					},
-				},
-			]
-		);
-
-		if (result.modifiedCount === 0) {
-			logger.info({ service: SERVICE_NAME, message: "No StatusPage documents needed migration" });
-			return;
-		}
-
-		logger.info({
-			service: SERVICE_NAME,
-			message: `Migration complete. Converted ${result.modifiedCount} StatusPage document(s) from string type to array type`,
-		});
-	} catch (error) {
-		const errorMessage = error instanceof Error ? error.message : String(error);
-		logger.error({ service: SERVICE_NAME, message: `Error during StatusPage type migration: ${errorMessage}` });
-		throw error;
-	}
-}

server/src/db/migration/index.ts

@@ -3,8 +3,6 @@ import { convertChecksToTimeSeries } from "./0002_convertChecksToTimeSeries.js";
 import { cleanupDuplicateMonitorStats } from "./0003_cleanupDuplicateMonitorStats.js";
 import { fixInfrastructureThresholds } from "./0004_fixInfrastructureThresholds.js";
 import MigrationModel from "../models/Migration.js";
-import { migrateStatusPageTypeToArray } from "./0005_migrateStatusPageTypeToArray.js";
-import type { ILogger } from "@/utils/logger.js";
 
 type MigrationEntry = {
 	name: string;
@@ -16,10 +14,9 @@ const migrations: MigrationEntry[] = [
 	{ name: "0002_convertChecksToTimeSeries", execute: convertChecksToTimeSeries },
 	{ name: "0003_cleanupDuplicateMonitorStats", execute: cleanupDuplicateMonitorStats },
 	{ name: "0004_fixInfrastructureThresholds", execute: fixInfrastructureThresholds },
-	{ name: "0005_migrateStatusPageTypeToArray", execute: migrateStatusPageTypeToArray },
 ];
 
-const runMigrations = async (logger?: ILogger) => {
+const runMigrations = async (logger?: { info: Function; error: Function }) => {
 	try {
 		logger?.info({ message: "Running migrations", service: "Migrations" });
 		for (const migration of migrations) {
@@ -46,7 +43,7 @@ const runMigrations = async (logger?: ILogger) => {
 		logger?.info({ message: "Migrations completed", service: "Migrations" });
 	} catch (error) {
 		const err = error as Error;
-		logger?.error({ message: "Migration failed", service: "Migrations", details: { error: err?.message }, stack: err?.stack });
+		logger?.error({ message: "Migration failed", service: "Migrations", details: err?.message, stack: err?.stack });
 		throw error;
 	}
 };

server/src/db/models/Check.ts

@@ -21,10 +21,13 @@ type CheckMetadataDocument = Omit<CheckMetadata, "monitorId" | "teamId"> & {
 	type: MonitorType;
 };
 
-type CheckDocumentBase = Omit<Check, "id" | "metadata" | "createdAt" | "updatedAt"> & {
+type CheckDocumentBase = Omit<Check, "id" | "metadata" | "expiry" | "ackAt" | "createdAt" | "updatedAt"> & {
 	metadata: CheckMetadataDocument;
+	expiry: Date;
+	ackAt?: Date | null;
 	createdAt: Date;
 	updatedAt: Date;
+	__v: number;
 };
 
 interface CheckDocument extends CheckDocumentBase {
@@ -222,7 +225,18 @@ const CheckSchema = new Schema<CheckDocument>(
 		message: {
 			type: String,
 		},
-
+		expiry: {
+			type: Date,
+			default: Date.now,
+		},
+		ack: {
+			type: Boolean,
+			default: false,
+		},
+		ackAt: {
+			type: Date,
+			default: undefined,
+		},
 		cpu: {
 			type: cpuSchema,
 			default: () => ({}),

server/src/db/models/MaintenanceWindow.ts

@@ -1,5 +1,5 @@
 import { Schema, model, type Types } from "mongoose";
-import type { MaintenanceWindow } from "@/types/maintenanceWindow.js";
+import type { MaintenanceWindow, DurationUnit } from "@/types/maintenanceWindow.js";
 
 type MaintenanceWindowDocumentBase = Omit<MaintenanceWindow, "id" | "monitorId" | "teamId" | "start" | "end" | "createdAt" | "updatedAt"> & {
 	monitorId: Types.ObjectId;

server/src/db/models/Monitor.ts

@@ -1,18 +1,6 @@
-import { Schema, model, Types } from "mongoose";
+import { Schema, model, Types, type UpdateQuery } from "mongoose";
 import type { Monitor, MonitorMatchMethod, CheckSnapshot } from "@/types/monitor.js";
 import { MonitorTypes, MonitorStatuses } from "@/types/monitor.js";
-import type {
-	CheckAudits,
-	CheckCaptureInfo,
-	CheckCpuInfo,
-	CheckDiskInfo,
-	CheckErrorInfo,
-	CheckHostInfo,
-	CheckMemoryInfo,
-	CheckNetworkInterfaceInfo,
-	GotTimings,
-	ILighthouseAudit,
-} from "@/types/check.js";
 
 type CheckSnapshotDocument = Omit<CheckSnapshot, "createdAt"> & { createdAt: Date };
 
@@ -35,167 +23,13 @@ interface MonitorDocument extends MonitorDocumentBase {
 	updatedAt: Date;
 }
 
-const snapshotTimingPhasesSchema = new Schema<GotTimings["phases"]>(
-	{
-		wait: { type: Number },
-		dns: { type: Number },
-		tcp: { type: Number },
-		tls: { type: Number },
-		request: { type: Number },
-		firstByte: { type: Number },
-		download: { type: Number },
-		total: { type: Number },
-	},
-	{ _id: false }
-);
-
-const snapshotTimingsSchema = new Schema<GotTimings>(
-	{
-		start: { type: Number },
-		socket: { type: Number },
-		lookup: { type: Number },
-		connect: { type: Number },
-		secureConnect: { type: Number },
-		upload: { type: Number },
-		response: { type: Number },
-		end: { type: Number },
-		phases: { type: snapshotTimingPhasesSchema },
-	},
-	{ _id: false }
-);
-
-const snapshotCpuSchema = new Schema<CheckCpuInfo>(
-	{
-		physical_core: { type: Number },
-		logical_core: { type: Number },
-		frequency: { type: Number },
-		current_frequency: { type: Number },
-		temperature: { type: [Number] },
-		free_percent: { type: Number },
-		usage_percent: { type: Number },
-	},
-	{ _id: false }
-);
-
-const snapshotMemorySchema = new Schema<CheckMemoryInfo>(
-	{
-		total_bytes: { type: Number },
-		available_bytes: { type: Number },
-		used_bytes: { type: Number },
-		usage_percent: { type: Number },
-	},
-	{ _id: false }
-);
-
-const snapshotDiskSchema = new Schema<CheckDiskInfo>(
-	{
-		device: { type: String },
-		mountpoint: { type: String },
-		total_bytes: { type: Number },
-		free_bytes: { type: Number },
-		used_bytes: { type: Number },
-		usage_percent: { type: Number },
-		total_inodes: { type: Number },
-		free_inodes: { type: Number },
-		used_inodes: { type: Number },
-		inodes_usage_percent: { type: Number },
-		read_bytes: { type: Number },
-		write_bytes: { type: Number },
-		read_time: { type: Number },
-		write_time: { type: Number },
-	},
-	{ _id: false }
-);
-
-const snapshotHostSchema = new Schema<CheckHostInfo>(
-	{
-		os: { type: String },
-		platform: { type: String },
-		kernel_version: { type: String },
-		pretty_name: { type: String },
-	},
-	{ _id: false }
-);
-
-const snapshotErrorSchema = new Schema<CheckErrorInfo>(
-	{
-		metric: { type: [String] },
-		err: { type: String },
-	},
-	{ _id: false }
-);
-
-const snapshotCaptureSchema = new Schema<CheckCaptureInfo>(
-	{
-		version: { type: String },
-		mode: { type: String },
-	},
-	{ _id: false }
-);
-
-const snapshotNetworkInterfaceSchema = new Schema<CheckNetworkInterfaceInfo>(
-	{
-		name: { type: String },
-		bytes_sent: { type: Number },
-		bytes_recv: { type: Number },
-		packets_sent: { type: Number },
-		packets_recv: { type: Number },
-		err_in: { type: Number },
-		err_out: { type: Number },
-		drop_in: { type: Number },
-		drop_out: { type: Number },
-		fifo_in: { type: Number },
-		fifo_out: { type: Number },
-	},
-	{ _id: false }
-);
-
-const snapshotLighthouseAuditSchema = new Schema<ILighthouseAudit>(
-	{
-		id: { type: String },
-		title: { type: String },
-		score: { type: Number },
-		displayValue: { type: String },
-		numericValue: { type: Number },
-		numericUnit: { type: String },
-	},
-	{ _id: false }
-);
-
-const snapshotAuditsSchema = new Schema<CheckAudits>(
-	{
-		cls: { type: snapshotLighthouseAuditSchema },
-		si: { type: snapshotLighthouseAuditSchema },
-		fcp: { type: snapshotLighthouseAuditSchema },
-		lcp: { type: snapshotLighthouseAuditSchema },
-		tbt: { type: snapshotLighthouseAuditSchema },
-	},
-	{ _id: false }
-);
-
 const checkSnapshotSchema = new Schema<CheckSnapshotDocument>(
 	{
 		id: { type: String, required: true },
 		status: { type: Boolean, required: true },
-		responseTime: { type: Number },
-		timings: { type: snapshotTimingsSchema },
-		statusCode: { type: Number },
-		message: { type: String },
-		cpu: { type: snapshotCpuSchema },
-		memory: { type: snapshotMemorySchema },
-		disk: { type: [snapshotDiskSchema] },
-		host: { type: snapshotHostSchema },
-		errors: { type: [snapshotErrorSchema] },
-		capture: { type: snapshotCaptureSchema },
-		net: { type: [snapshotNetworkInterfaceSchema] },
-		accessibility: { type: Number },
-		bestPractices: { type: Number },
-		seo: { type: Number },
-		performance: { type: Number },
-		audits: { type: snapshotAuditsSchema },
 		createdAt: { type: Date, required: true },
 	},
-	{ _id: false }
+	{ _id: false, strict: false }
 );
 
 const MonitorSchema = new Schema<MonitorDocument>(

server/src/db/models/Notification.ts

@@ -25,7 +25,7 @@ const NotificationSchema = new Schema<NotificationDocument>(
 		},
 		type: {
 			type: String,
-			enum: ["email", "slack", "discord", "webhook", "pager_duty", "matrix", "teams"] as NotificationChannel[],
+			enum: ["email", "slack", "discord", "webhook", "pager_duty", "matrix"] as NotificationChannel[],
 			required: true,
 		},
 		notificationName: {

server/src/db/models/StatusPage.ts

@@ -43,9 +43,9 @@ const StatusPageSchema = new Schema<StatusPageDocument>(
 			required: true,
 		},
 		type: {
-			type: [String],
+			type: String,
 			required: true,
-			default: ["uptime"],
+			default: "uptime",
 			enum: StatusPageTypes,
 		},
 		companyName: {
@@ -100,10 +100,6 @@ const StatusPageSchema = new Schema<StatusPageDocument>(
 			type: Boolean,
 			default: false,
 		},
-		showInfrastructure: {
-			type: Boolean,
-			default: false,
-		},
 		customCSS: {
 			type: String,
 			default: "",

server/src/middleware/handleErrors.ts

@@ -1,18 +1,15 @@
 import type { NextFunction, Request, Response } from "express";
 import { logger } from "@/utils/logger.js";
-import { AppError } from "@/utils/AppError.js";
 
-const handleErrors = (error: unknown, req: Request, res: Response, _next: NextFunction) => {
+const handleErrors = (error: any, req: Request, res: Response, next: NextFunction) => {
-	const status = error instanceof AppError ? error.status || 500 : 500;
+	const status = error.status || 500;
-	const message = error instanceof AppError ? error.message : "Server error";
+	const message = error.message || "Server error";
-	const service = error instanceof AppError ? error.service : "unknownService";
+	const service = error.service || "unknownService";
-	const method = error instanceof AppError ? error.method : "unknownMethod";
 	logger.error({
 		message: message,
 		service: service,
-		method: method,
+		method: error.method,
-		stack: error instanceof AppError ? error.stack : undefined,
+		stack: error.stack,
-		details: error instanceof AppError ? error.details : undefined,
 	});
 	res.status(status).json({
 		status,

server/src/middleware/sanitization.ts

@@ -1,9 +1,7 @@
 import type { Request, Response, NextFunction } from "express";
 import DOMPurify from "isomorphic-dompurify";
 
-export function sanitizeInput(input: string, options?: object): string;
+export const sanitizeInput = (input: any, options = {}) => {
-export function sanitizeInput(input: unknown, options?: object): unknown;
-export function sanitizeInput(input: unknown, options = {}): unknown {
 	if (typeof input !== "string") {
 		return input;
 	}
@@ -17,9 +15,9 @@ export function sanitizeInput(input: unknown, options = {}): unknown {
 	};
 
 	return DOMPurify.sanitize(input, defaultConfig);
-}
+};
 
-export const sanitizeObject = (obj: unknown, options = {}): unknown => {
+export const sanitizeObject = (obj: Record<string, any>, options = {}): Record<string, any> => {
 	if (typeof obj !== "object" || obj === null) {
 		return obj;
 	}
@@ -28,7 +26,7 @@ export const sanitizeObject = (obj: unknown, options = {}): unknown => {
 		return obj.map((item) => sanitizeObject(item, options));
 	}
 
-	const sanitized: Record<string, unknown> = {};
+	const sanitized: Record<string, any> = {};
 	for (const [key, value] of Object.entries(obj)) {
 		if (typeof value === "string") {
 			sanitized[key] = sanitizeInput(value, options);
@@ -54,12 +52,7 @@ export const sanitizeBody = (options = {}): ((req: Request, res: Response, next:
 export const sanitizeQuery = (options = {}): ((req: Request, res: Response, next: NextFunction) => void) => {
 	return (req: Request, res: Response, next: NextFunction) => {
 		if (req.query && typeof req.query === "object") {
-			for (const key of Object.keys(req.query)) {
+			req.query = sanitizeObject(req.query, options);
-				const value = req.query[key];
-				if (typeof value === "string") {
-					req.query[key] = sanitizeInput(value, options);
-				}
-			}
 		}
 		next();
 	};

server/src/middleware/verifyJWT.ts

@@ -2,17 +2,12 @@ import { NextFunction, Request, Response } from "express";
 
 import jwt from "jsonwebtoken";
 import { AppError } from "@/utils/AppError.js";
-import type { ISettingsService } from "@/service/system/settingsService.js";
+import { Settings } from "@/types/settings.js";
-import type { User } from "@/types/user.js";
 
 const SERVICE_NAME = "verifyJWT";
 const TOKEN_PREFIX = "Bearer ";
 
-const isUser = (payload: unknown): payload is User => {
+export const createVerifyJWT = (settingsService: { getSettings: () => Settings }) => {
-	return typeof payload === "object" && payload !== null && "id" in payload && "teamId" in payload && "role" in payload;
-};
-
-export const createVerifyJWT = (settingsService: ISettingsService) => {
 	return (req: Request, res: Response, next: NextFunction) => {
 		const token = req.headers["authorization"];
 		// Make sure a token is provided
@@ -36,22 +31,21 @@ export const createVerifyJWT = (settingsService: ISettingsService) => {
 			next(error);
 			return;
 		}
-		jwt.verify(parsedToken, jwtSecret, (err: jwt.VerifyErrors | null, decoded: jwt.JwtPayload | string | undefined) => {
+		jwt.verify(parsedToken, jwtSecret, (err: any, decoded: any) => {
 			if (err) {
 				const error = new AppError({
-					message: err instanceof Error ? err.message : "Failed to authenticate token",
+					message: "Failed to authenticate token",
+					details: err,
 					status: 401,
 					service: SERVICE_NAME,
-					details: err instanceof Error ? { error: err } : undefined,
 					method: "verifyJWT",
 				});
 				next(error);
 				return;
-			} else if (isUser(decoded)) {
+			} else {
+				// Token is valid, carry on
 				req.user = decoded;
 				next();
-			} else {
-				next(new AppError({ message: "Invalid token payload", status: 401, service: SERVICE_NAME, method: "verifyJWT" }));
 			}
 		});
 	};

server/src/repositories/checks/IChecksRepository.ts

@@ -47,5 +47,4 @@ export interface IChecksRepository {
 	deleteByMonitorId(monitorId: string): Promise<number>;
 	deleteByTeamId(teamId: string): Promise<number>;
 	deleteByMonitorIdsNotIn(monitorIds: string[]): Promise<number>;
-	deleteOlderThan(date: Date): Promise<number>;
 }

server/src/repositories/checks/MongoChecksRepistory.ts

@@ -13,10 +13,9 @@ import type {
 	GotTimings,
 	MonitorType,
 } from "@/types/index.js";
-import { CheckModel, type CheckDocument } from "@/db/models/index.js";
+import { CheckModel, MonitorModel, type CheckDocument } from "@/db/models/index.js";
 import mongoose from "mongoose";
 import { getDateForRange } from "@/utils/dataUtils.js";
-import { ILogger } from "@/utils/logger.js";
 
 const SERVICE_NAME = "StatusService";
 
@@ -27,8 +26,8 @@ type HardwareUpChecks = { totalChecks: number };
 class MongoChecksRepository implements IChecksRepository {
 	static SERVICE_NAME = SERVICE_NAME;
 
-	private logger: ILogger;
+	private logger: any;
-	constructor(logger: ILogger) {
+	constructor(logger: any) {
 		this.logger = logger;
 	}
 
@@ -47,6 +46,13 @@ class MongoChecksRepository implements IChecksRepository {
 			return value instanceof Date ? value.toISOString() : new Date(value).toISOString();
 		};
 
+		const toOptionalDateString = (value?: Date | string | null): string | undefined => {
+			if (!value) {
+				return undefined;
+			}
+			return toDateString(value);
+		};
+
 		const mapTimings = (timings?: GotTimings): GotTimings => {
 			const phases = timings?.phases ?? {
 				wait: 0,
@@ -165,6 +171,9 @@ class MongoChecksRepository implements IChecksRepository {
 			timings: mapTimings(doc.timings),
 			statusCode: doc.statusCode ?? 0,
 			message: doc.message ?? "",
+			ack: doc.ack ?? false,
+			ackAt: toOptionalDateString(doc.ackAt),
+			expiry: toDateString(doc.expiry),
 			cpu: mapCpu(doc.cpu),
 			memory: mapMemory(doc.memory),
 			disk: mapDisks(doc.disk),
@@ -177,6 +186,7 @@ class MongoChecksRepository implements IChecksRepository {
 			seo: doc.seo,
 			performance: doc.performance,
 			audits: mapAudits(doc.audits),
+			__v: doc.__v ?? 0,
 			createdAt: toDateString(doc.createdAt),
 			updatedAt: toDateString(doc.updatedAt),
 		};
@@ -227,7 +237,7 @@ class MongoChecksRepository implements IChecksRepository {
 		status: boolean | undefined
 	) => {
 		// Match
-		const matchStage: Record<string, unknown> = {
+		const matchStage: Record<string, any> = {
 			"metadata.monitorId": new mongoose.Types.ObjectId(monitorId),
 			...(typeof status !== "undefined" && { status }),
 			...(getDateForRange(dateRange) && {
@@ -279,7 +289,7 @@ class MongoChecksRepository implements IChecksRepository {
 	};
 
 	findByTeamId = async (sortOrder: string, dateRange: string, filter: string, page: number, rowsPerPage: number, teamId: string) => {
-		const matchStage: Record<string, unknown> = {
+		const matchStage: Record<string, any> = {
 			"metadata.teamId": new mongoose.Types.ObjectId(teamId),
 			...(getDateForRange(dateRange) && {
 				createdAt: {
@@ -348,7 +358,7 @@ class MongoChecksRepository implements IChecksRepository {
 		);
 
 		const mapped = results.reduce<LatestChecksMap>((acc, { monitorId, docs }) => {
-			acc[monitorId] = docs.map((doc: CheckDocument) => this.toEntity(doc));
+			acc[monitorId] = docs.map((doc: any) => this.toEntity(doc as CheckDocument));
 			return acc;
 		}, {});
 		return mapped;
@@ -402,31 +412,6 @@ class MongoChecksRepository implements IChecksRepository {
 		return result.deletedCount ?? 0;
 	};
 
-	deleteOlderThan = async (cutoffDate: Date, batchDays: number = 30): Promise<number> => {
-		// Find the oldest check that is older than the cutoff
-		const oldest = await CheckModel.findOne({ createdAt: { $lt: cutoffDate } })
-			.sort({ createdAt: 1 })
-			.select({ createdAt: 1 });
-		if (!oldest?.createdAt) return 0;
-
-		let totalDeleted = 0;
-		let batchStart = new Date(oldest.createdAt);
-		const batchMs = batchDays * 24 * 60 * 60 * 1000;
-
-		// Delete in 30 day chunks until we reach the cutoff
-		while (batchStart < cutoffDate) {
-			// Advance startTime by batchMs to get to the end of last batch
-			const nextStart = batchStart.getTime() + batchMs;
-			const batchEnd = new Date(Math.min(nextStart, cutoffDate.getTime()));
-			const result = await CheckModel.deleteMany({
-				createdAt: { $gte: batchStart, $lt: batchEnd },
-			});
-			totalDeleted += result.deletedCount ?? 0;
-			batchStart = batchEnd;
-		}
-
-		return totalDeleted;
-	};
 	private findUptimeDateRangeChecks = async (
 		monitorType: Exclude<MonitorType, "hardware" | "pagespeed">,
 		monitorObjectId: mongoose.Types.ObjectId,

server/src/repositories/geo-checks/MongoGeoChecksRepository.ts

@@ -1,8 +1,8 @@
 import { IGeoChecksRepository } from "./IGeoChecksRepository.js";
 import type { GeoCheck, GeoCheckMetadata, GeoCheckResult, GroupedGeoCheck, GeoContinent, FlatGeoCheck } from "@/types/geoCheck.js";
 import type { FlatGeoChecksQueryResult } from "./IGeoChecksRepository.js";
-import { GeoCheckMetadataDocument, GeoCheckModel, type GeoCheckDocument } from "@/db/models/index.js";
+import { GeoCheckModel, type GeoCheckDocument } from "@/db/models/index.js";
-import mongoose, { PipelineStage } from "mongoose";
+import mongoose from "mongoose";
 import { getDateForRange } from "@/utils/dataUtils.js";
 import { ILogger } from "@/utils/logger.js";
 
@@ -31,13 +31,13 @@ class MongoGeoChecksRepository implements IGeoChecksRepository {
 			return value instanceof Date ? value.toISOString() : new Date(value).toISOString();
 		};
 
-		const mapMetadata = (metadata: GeoCheckMetadataDocument): GeoCheckMetadata => ({
+		const mapMetadata = (metadata: any): GeoCheckMetadata => ({
 			monitorId: toStringId(metadata.monitorId),
 			teamId: toStringId(metadata.teamId),
 			type: metadata.type,
 		});
 
-		const mapResults = (results: GeoCheckResult[]): GeoCheckResult[] => {
+		const mapResults = (results: any[]): GeoCheckResult[] => {
 			if (!results || !Array.isArray(results)) {
 				return [];
 			}
@@ -89,12 +89,12 @@ class MongoGeoChecksRepository implements IGeoChecksRepository {
 				}))
 			);
 			return docs.map((doc) => this.toEntity(doc));
-		} catch (error: unknown) {
+		} catch (error: any) {
 			this.logger.error({
-				message: error instanceof Error ? `Failed to createGeoChecks: ${error.message}` : "Failed to createGeoChecks",
+				message: `Failed to createGeoChecks: ${error.message}`,
 				service: SERVICE_NAME,
 				method: "createGeoChecks",
-				stack: error instanceof Error ? error.stack : undefined,
+				stack: error.stack,
 			});
 			throw error;
 		}
@@ -109,7 +109,7 @@ class MongoGeoChecksRepository implements IGeoChecksRepository {
 		continents?: GeoContinent[]
 	): Promise<FlatGeoChecksQueryResult> => {
 		try {
-			const matchStage: Record<string, unknown> = {
+			const matchStage: Record<string, any> = {
 				"metadata.monitorId": new mongoose.Types.ObjectId(monitorId),
 				...(getDateForRange(dateRange) && {
 					createdAt: {
@@ -125,8 +125,22 @@ class MongoGeoChecksRepository implements IGeoChecksRepository {
 				skip = page * rowsPerPage;
 			}
 
+			if (continents && continents.length > 0) {
+				const pipeline: any[] = [
+					{ $match: matchStage },
+					{ $unwind: "$results" },
+					{
+						$match: {
+							"results.location.continent": { $in: continents },
+						},
+					},
+				];
+			} else {
+				const pipeline: any[] = [{ $match: matchStage }, { $unwind: "$results" }];
+			}
+
 			// Common pipeline stages for both paths
-			const pipeline: PipelineStage[] = [
+			const pipeline: any[] = [
 				{ $match: matchStage },
 				{ $unwind: "$results" },
 				// Filter by continent if specified
@@ -160,7 +174,7 @@ class MongoGeoChecksRepository implements IGeoChecksRepository {
 			];
 
 			// Count pipeline
-			const countPipeline: PipelineStage[] = [
+			const countPipeline: any[] = [
 				{ $match: matchStage },
 				{ $unwind: "$results" },
 				...(continents && continents.length > 0
@@ -192,12 +206,12 @@ class MongoGeoChecksRepository implements IGeoChecksRepository {
 			}));
 
 			return { geoChecksCount, geoChecks };
-		} catch (error: unknown) {
+		} catch (error: any) {
 			this.logger.error({
-				message: error instanceof Error ? `Error finding geo checks by monitor ID: ${error.message}` : "Error finding geo checks by monitor ID",
+				message: `Error finding geo checks by monitor ID: ${error.message}`,
 				service: SERVICE_NAME,
 				method: "findByMonitorId",
-				stack: error instanceof Error ? error.stack : undefined,
+				stack: error.stack,
 			});
 			throw error;
 		}
@@ -213,15 +227,11 @@ class MongoGeoChecksRepository implements IGeoChecksRepository {
 				},
 			}).sort({ createdAt: -1 });
 			return docs.map(this.toEntity);
-		} catch (error: unknown) {
+		} catch (error: any) {
 			this.logger.error({
-				message:
+				message: `Error finding geo checks by monitor ID and date range: ${error.message}`,
-					error instanceof Error
-						? `Error finding geo checks by monitor ID and date range: ${error.message}`
-						: "Error finding geo checks by monitor ID and date range",
 				service: SERVICE_NAME,
 				method: "findByMonitorIdAndDateRange",
-				stack: error instanceof Error ? error.stack : undefined,
 			});
 			throw error;
 		}
@@ -235,7 +245,7 @@ class MongoGeoChecksRepository implements IGeoChecksRepository {
 		continents?: GeoContinent[]
 	): Promise<GroupedGeoCheck[]> => {
 		try {
-			const pipeline: PipelineStage[] = [
+			const pipeline: any[] = [
 				// Match geo checks for this monitor in date range
 				{
 					$match: {
@@ -315,12 +325,11 @@ class MongoGeoChecksRepository implements IGeoChecksRepository {
 
 			const results = await GeoCheckModel.aggregate(pipeline);
 			return results as GroupedGeoCheck[];
-		} catch (error: unknown) {
+		} catch (error: any) {
 			this.logger.error({
-				message: error instanceof Error ? `Error finding grouped geo checks: ${error.message}` : "Error finding grouped geo checks",
+				message: `Error finding grouped geo checks: ${error.message}`,
 				service: SERVICE_NAME,
 				method: "findGroupedByMonitorIdAndDateRange",
-				stack: error instanceof Error ? error.stack : undefined,
 			});
 			throw error;
 		}
@@ -332,12 +341,11 @@ class MongoGeoChecksRepository implements IGeoChecksRepository {
 				"metadata.monitorId": new mongoose.Types.ObjectId(monitorId),
 			});
 			return result.deletedCount || 0;
-		} catch (error: unknown) {
+		} catch (error: any) {
 			this.logger.error({
-				message: error instanceof Error ? `Error deleting geo checks by monitor ID: ${error.message}` : "Error deleting geo checks by monitor ID",
+				message: `Error deleting geo checks by monitor ID: ${error.message}`,
 				service: SERVICE_NAME,
 				method: "deleteByMonitorId",
-				stack: error instanceof Error ? error.stack : undefined,
 			});
 			throw error;
 		}
@@ -349,12 +357,11 @@ class MongoGeoChecksRepository implements IGeoChecksRepository {
 				"metadata.teamId": new mongoose.Types.ObjectId(teamId),
 			});
 			return result.deletedCount || 0;
-		} catch (error: unknown) {
+		} catch (error: any) {
 			this.logger.error({
-				message: error instanceof Error ? `Error deleting geo checks by team ID: ${error.message}` : "Error deleting geo checks by team ID",
+				message: `Error deleting geo checks by team ID: ${error.message}`,
 				service: SERVICE_NAME,
 				method: "deleteByTeamId",
-				stack: error instanceof Error ? error.stack : undefined,
 			});
 			throw error;
 		}
@@ -365,12 +372,11 @@ class MongoGeoChecksRepository implements IGeoChecksRepository {
 			const objectIds = monitorIds.map((id) => new mongoose.Types.ObjectId(id));
 			const result = await GeoCheckModel.deleteMany({ "metadata.monitorId": { $nin: objectIds } });
 			return result.deletedCount || 0;
-		} catch (error: unknown) {
+		} catch (error: any) {
 			this.logger.error({
-				message: error instanceof Error ? `Error deleting orphaned geo checks: ${error.message}` : "Error deleting orphaned geo checks",
+				message: `Error deleting orphaned geo checks: ${error.message}`,
 				service: SERVICE_NAME,
 				method: "deleteByMonitorIdsNotIn",
-				stack: error instanceof Error ? error.stack : undefined,
 			});
 			throw error;
 		}

server/src/repositories/incidents/MongoIncidentRepository.ts

@@ -32,8 +32,8 @@ class MongoIncidentRepository implements IIncidentsRepository {
 		status?: boolean;
 		monitorId?: string;
 		resolutionType?: string;
-	}): Record<string, unknown> {
+	}): Record<string, any> {
-		const matchStage: Record<string, unknown> = {
+		const matchStage: Record<string, any> = {
 			teamId: new mongoose.Types.ObjectId(teamId),
 			...(status !== undefined && { status }),
 			...(monitorId && { monitorId: new mongoose.Types.ObjectId(monitorId) }),

server/src/repositories/maintenance-windows/IMaintenanceWindowsRepository.ts

@@ -5,12 +5,12 @@ export interface IMaintenanceWindowsRepository {
 	// fetch
 	findById(id: string, teamId: string): Promise<MaintenanceWindow>;
 	findByMonitorId(monitorId: string, teamId: string): Promise<MaintenanceWindow[]>;
-	findByTeamId(teamId: string, page: number, rowsPerPage: number, field?: string, order?: string, active?: boolean): Promise<MaintenanceWindow[]>;
+	findByTeamId(teamId: string, active: boolean, page: number, rowsPerPage: number, field: string, order: string): Promise<MaintenanceWindow[]>;
 
 	// update
 	updateById(id: string, teamId: string, data: Partial<MaintenanceWindow>): Promise<MaintenanceWindow>;
 	// delete
 	deleteById(id: string, teamId: string): Promise<MaintenanceWindow>;
 	// other
-	countByTeamId(teamId: string, active?: boolean): Promise<number>;
+	countByTeamId(teamId: string, active: boolean): Promise<number>;
 }

server/src/repositories/maintenance-windows/MongoMaintenanceWindowsRepository.ts

@@ -1,7 +1,7 @@
 import type { MaintenanceWindow } from "@/types/index.js";
 import { type MaintenanceWindowDocument, MaintenanceWindowModel } from "@/db/models/index.js";
 import { IMaintenanceWindowsRepository } from "./IMaintenanceWindowsRepository.js";
-import mongoose, { SortOrder } from "mongoose";
+import mongoose from "mongoose";
 import { AppError } from "@/utils/AppError.js";
 
 class MongoMaintenanceWindowsRepository implements IMaintenanceWindowsRepository {
@@ -75,13 +75,13 @@ class MongoMaintenanceWindowsRepository implements IMaintenanceWindowsRepository
 
 	findByTeamId = async (
 		teamId: string,
+		active: boolean,
 		page: number,
 		rowsPerPage: number,
-		field?: string,
+		field: string,
-		order?: string,
+		order: string
-		active?: boolean
 	): Promise<MaintenanceWindow[]> => {
-		const maintenanceQuery: Record<string, unknown> = { teamId };
+		const maintenanceQuery: Record<string, any> = { teamId };
 
 		if (active !== undefined) maintenanceQuery.active = active;
 
@@ -92,7 +92,7 @@ class MongoMaintenanceWindowsRepository implements IMaintenanceWindowsRepository
 		}
 
 		// Sorting
-		const sort: Record<string, SortOrder> = {};
+		const sort: Record<string, any> = {};
 		if (field !== undefined && order !== undefined) {
 			sort[field] = order === "asc" ? 1 : -1;
 		}
@@ -126,8 +126,8 @@ class MongoMaintenanceWindowsRepository implements IMaintenanceWindowsRepository
 		}
 		return this.toEntity(deleted);
 	};
-	countByTeamId = async (teamId: string, active?: boolean) => {
+	countByTeamId = async (teamId: string, active: boolean) => {
-		const maintenanceQuery: Record<string, unknown> = { teamId };
+		const maintenanceQuery: Record<string, any> = { teamId };
 
 		if (active !== undefined) maintenanceQuery.active = active;
 

server/src/repositories/monitors/IMonitorsRepository.ts

@@ -41,7 +41,6 @@ export interface IMonitorsRepository {
 	findMonitorsSummaryByTeamId(teamId: string, config?: SummaryConfig): Promise<MonitorsSummary>;
 	findGroupsByTeamId(teamId: string): Promise<string[]>;
 	removeNotificationFromMonitors(notificationId: string): Promise<void>;
-	updateNotifications(teamId: string, monitorIds: string[], notificationIds: string[], action: "add" | "remove" | "set"): Promise<number>;
 	deleteByTeamIdsNotIn(teamIds: string[]): Promise<number>;
 	findAllMonitorIds(): Promise<string[]>;
 }

server/src/repositories/monitors/MongoMonitorsRepository.ts

@@ -1,9 +1,8 @@
 import { MonitorModel } from "@/db/models/index.js";
 import type { MonitorDocument, CheckSnapshotDocument } from "@/db/models/index.js";
-import type { Monitor, MonitorsSummary, CheckSnapshot } from "@/types/index.js";
+import type { Monitor, MonitorsSummary, CheckSnapshot, Check } from "@/types/index.js";
 import mongoose, { type FilterQuery, type PipelineStage } from "mongoose";
 import type { IMonitorsRepository, TeamQueryConfig, SummaryConfig } from "./IMonitorsRepository.js";
-import { MongoBulkWriteError } from "mongodb";
 import { AppError } from "@/utils/AppError.js";
 
 class MongoMonitorsRepository implements IMonitorsRepository {
@@ -21,9 +20,12 @@ class MongoMonitorsRepository implements IMonitorsRepository {
 		try {
 			const inserted = await MonitorModel.insertMany(payload, { ordered: false });
 			return this.mapDocuments(inserted);
-		} catch (error: unknown) {
+		} catch (error: any) {
-			if (error instanceof MongoBulkWriteError && "insertedDocs" in error && Array.isArray(error.insertedDocs) && error.insertedDocs.length > 0) {
+			if (error.name === "MongoBulkWriteError" || error.name === "BulkWriteError") {
-				return this.mapDocuments(error.insertedDocs);
+				const insertedDocs = error.insertedDocs || [];
+				if (insertedDocs.length > 0) {
+					return this.mapDocuments(insertedDocs);
+				}
 			}
 			throw error;
 		}
@@ -44,7 +46,7 @@ class MongoMonitorsRepository implements IMonitorsRepository {
 	};
 
 	findByTeamId = async (teamId: string, config: TeamQueryConfig): Promise<Monitor[] | null> => {
-		const { page = 0, rowsPerPage = 0, filter, field = "createdAt", order = "desc", type } = config ?? {};
+		const { page = 0, rowsPerPage = 0, filter, field = "createdAt", order = "desc", type, limit } = config ?? {};
 
 		const query: Record<string, unknown> = {
 			teamId: new mongoose.Types.ObjectId(teamId),
@@ -296,41 +298,6 @@ class MongoMonitorsRepository implements IMonitorsRepository {
 		await MonitorModel.updateMany({ notifications: notificationId }, { $pull: { notifications: notificationId } });
 	};
 
-	updateNotifications = async (
-		teamId: string,
-		monitorIds: string[],
-		notificationIds: string[],
-		action: "add" | "remove" | "set"
-	): Promise<number> => {
-		let objectIds;
-		let notificationObjectIds;
-		try {
-			objectIds = monitorIds.map((id) => new mongoose.Types.ObjectId(id));
-			notificationObjectIds = notificationIds.map((id) => new mongoose.Types.ObjectId(id));
-		} catch {
-			throw new AppError({ message: "One or more monitor or notification IDs are invalid", status: 400 });
-		}
-		const filter = { _id: { $in: objectIds }, teamId: new mongoose.Types.ObjectId(teamId) };
-
-		let update;
-		switch (action) {
-			case "add":
-				update = { $addToSet: { notifications: { $each: notificationObjectIds } } };
-				break;
-			case "remove":
-				update = { $pull: { notifications: { $in: notificationObjectIds } } };
-				break;
-			case "set":
-				update = { $set: { notifications: notificationObjectIds } };
-				break;
-			default:
-				throw new AppError({ message: `Invalid action: ${action}`, status: 400 });
-		}
-
-		const result = await MonitorModel.updateMany(filter, update);
-		return result.modifiedCount;
-	};
-
 	private mapDocuments = (documents: MonitorDocument[]): Monitor[] => {
 		if (!documents?.length) {
 			return [];
@@ -387,7 +354,7 @@ class MongoMonitorsRepository implements IMonitorsRepository {
 			gameId: doc.gameId ?? undefined,
 			grpcServiceName: doc.grpcServiceName ?? undefined,
 			group: doc.group ?? null,
-			recentChecks: (doc.recentChecks ?? []).map((check: CheckSnapshotDocument) => this.toCheckSnapshot(check)),
+			recentChecks: (doc.recentChecks ?? []).map((check: any) => this.toCheckSnapshot(check)),
 			geoCheckEnabled: doc.geoCheckEnabled ?? false,
 			geoCheckLocations: doc.geoCheckLocations ?? [],
 			geoCheckInterval: doc.geoCheckInterval ?? 300000,
@@ -396,7 +363,7 @@ class MongoMonitorsRepository implements IMonitorsRepository {
 		};
 	};
 
-	private toEntityWithChecks = (doc: MonitorDocument): Monitor => {
+	private toEntityWithChecks = (doc: any): Monitor => {
 		const toStringId = (value: unknown): string => {
 			if (value instanceof mongoose.Types.ObjectId) {
 				return value.toString();
@@ -446,7 +413,7 @@ class MongoMonitorsRepository implements IMonitorsRepository {
 			gameId: doc.gameId ?? undefined,
 			grpcServiceName: doc.grpcServiceName ?? undefined,
 			group: doc.group ?? null,
-			recentChecks: (doc.recentChecks ?? []).map((check: CheckSnapshotDocument) => this.toCheckSnapshot(check)),
+			recentChecks: (doc.recentChecks ?? []).map((check: any) => this.toCheckSnapshot(check)),
 			geoCheckEnabled: doc.geoCheckEnabled ?? false,
 			geoCheckLocations: doc.geoCheckLocations ?? [],
 			geoCheckInterval: doc.geoCheckInterval ?? 300000,

server/src/repositories/settings/ISettingsRepository.ts

@@ -1,11 +1,11 @@
-import type { Settings, SettingsUpdate } from "@/types/index.js";
+import type { Settings } from "@/types/index.js";
 export interface ISettingsRepository {
 	// create
 	create(settings: Partial<Settings>): Promise<Settings>;
 	// fetch
 	findSingleton(): Promise<Settings | null>;
 	// update
-	update(settings: SettingsUpdate): Promise<Settings>;
+	update(settings: Partial<Settings>): Promise<Settings>;
 	// delete
 	deleteLegacy: () => Promise<boolean>;
 }

server/src/repositories/settings/MongoSettingsRepository.ts

@@ -1,6 +1,6 @@
-import mongoose, { type UpdateQuery } from "mongoose";
+import mongoose from "mongoose";
 import { ISettingsRepository } from "@/repositories/settings/ISettingsRepository.js";
-import type { Settings, SettingsUpdate } from "@/types/index.js";
+import type { Settings } from "@/types/index.js";
 import { AppSettingsModel, type AppSettingsDocument } from "@/db/models/index.js";
 
 class MongoSettingsRepository implements ISettingsRepository {
@@ -59,23 +59,27 @@ class MongoSettingsRepository implements ISettingsRepository {
 		return this.toEntity(settings);
 	};
 
-	update = async (settings: SettingsUpdate) => {
+	update = async (settings: Partial<Settings>) => {
-		const $set: Record<string, unknown> = {};
+		const update: Record<string, any> = { $set: {}, $unset: {} };
-		const $unset: Record<string, string> = {};
 
 		// Iterate through settings and separate into $set and $unset
 		Object.entries(settings).forEach(([key, value]) => {
-			if (value === undefined || value === null) {
+			if (value === undefined || value === "") {
-				$unset[key] = "";
+				// Unset undefined or empty string values
+				update.$unset[key] = "";
 			} else {
-				$set[key] = value;
+				// Set defined values
+				update.$set[key] = value;
 			}
 		});
 
-		const update: UpdateQuery<AppSettingsDocument> = {
+		// Clean up empty operators
-			...(Object.keys($set).length > 0 && { $set }),
+		if (Object.keys(update.$set).length === 0) {
-			...(Object.keys($unset).length > 0 && { $unset }),
+			delete update.$set;
-		};
+		}
+		if (Object.keys(update.$unset).length === 0) {
+			delete update.$unset;
+		}
 
 		await AppSettingsModel.findOneAndUpdate({}, update, {
 			upsert: true,

server/src/repositories/status-pages/MongoStatusPagesRepository.ts

@@ -57,7 +57,6 @@ class MongoStatusPagesRepository implements IStatusPagesRepository {
 			showCharts: doc.showCharts,
 			showUptimePercentage: doc.showUptimePercentage,
 			showAdminLoginLink: doc.showAdminLoginLink,
-			showInfrastructure: doc.showInfrastructure,
 			customCSS: doc.customCSS,
 			createdAt: this.toDateString(doc.createdAt),
 			updatedAt: this.toDateString(doc.updatedAt),
@@ -72,8 +71,7 @@ class MongoStatusPagesRepository implements IStatusPagesRepository {
 	};
 
 	create = async (userId: string, teamId: string, image: Express.Multer.File | undefined, data: Partial<StatusPage>): Promise<StatusPage> => {
-		const { logo, ...restData } = data;
+		const { logo: _logo, ...restData } = data;
-		void logo;
 		const statusPage = new StatusPageModel({
 			...restData,
 			userId,
@@ -111,8 +109,7 @@ class MongoStatusPagesRepository implements IStatusPagesRepository {
 		image: Express.Multer.File | undefined,
 		patch: Partial<StatusPage> & { removeLogo?: string }
 	): Promise<StatusPage> => {
-		const { logo, removeLogo, ...restPatch } = patch;
+		const { logo: _logo, removeLogo, ...restPatch } = patch;
-		void logo;
 		const updateData: StatusPageUpdateData = { ...restPatch };
 		if (image) {
 			updateData.logo = {

server/src/repositories/users/MongoUsersRepository.ts

@@ -117,7 +117,7 @@ class MongoUsersRepository implements IUsersRepository {
 
 		delete candidateUser.deleteProfileImage;
 
-		const updateQuery: Record<string, unknown> = { $set: candidateUser };
+		const updateQuery: Record<string, any> = { $set: candidateUser };
 		if (unsetFields) {
 			updateQuery.$unset = unsetFields;
 		}

server/src/routes/authRoute.ts

@@ -1,15 +1,14 @@
 import { Router, RequestHandler } from "express";
 import { isAllowed } from "../middleware/isAllowed.js";
 import multer from "multer";
-import { IAuthController } from "@/controllers/authController.js";
 
 const upload = multer();
 
 class AuthRoutes {
 	private router: Router;
-	private authController: IAuthController;
+	private authController: any;
 
-	constructor(authController: IAuthController, verifyJWT: RequestHandler) {
+	constructor(authController: any, verifyJWT: RequestHandler) {
 		this.router = Router();
 		this.authController = authController;
 		this.initRoutes(verifyJWT);

server/src/routes/checkRoute.ts

@@ -1,13 +1,12 @@
 import { Router } from "express";
 
 import { isAllowed } from "../middleware/isAllowed.js";
-import { ICheckController } from "@/controllers/checkController.js";
 
 class CheckRoutes {
 	private router: Router;
-	private checkController: ICheckController;
+	private checkController: any;
 
-	constructor(checkController: ICheckController) {
+	constructor(checkController: any) {
 		this.router = Router();
 		this.checkController = checkController;
 		this.initRoutes();
@@ -16,6 +15,7 @@ class CheckRoutes {
 	initRoutes() {
 		this.router.get("/team/summary", this.checkController.getChecksSummaryByTeamId);
 		this.router.get("/team", this.checkController.getChecksByTeam);
+		this.router.put("/team/ttl", isAllowed(["admin", "superadmin"]), this.checkController.updateChecksTTL);
 		this.router.delete("/team", isAllowed(["admin", "superadmin"]), this.checkController.deleteChecksByTeamId);
 		this.router.get("/:monitorId", this.checkController.getChecksByMonitor);
 		this.router.delete("/:monitorId", this.checkController.deleteChecks);

server/src/routes/diagnosticRoute.ts

@@ -1,12 +1,11 @@
 import { RequestHandler, Router } from "express";
 import { isAllowed } from "../middleware/isAllowed.js";
-import { IDiagnosticController } from "@/controllers/diagnosticController.js";
 
 class DiagnosticRoutes {
 	private router: Router;
-	private diagnosticController: IDiagnosticController;
+	private diagnosticController: any;
 
-	constructor(diagnosticController: IDiagnosticController, verifyJWT: RequestHandler) {
+	constructor(diagnosticController: any, verifyJWT: RequestHandler) {
 		this.router = Router();
 		this.diagnosticController = diagnosticController;
 		this.initRoutes(verifyJWT);

server/src/routes/geoCheckRoutes.ts

@@ -1,11 +1,10 @@
-import { IGeoCheckController } from "@/controllers/geoCheckController.js";
 import { Router } from "express";
 
 class GeoCheckRoutes {
 	private router: Router;
-	private geoCheckController: IGeoCheckController;
+	private geoCheckController: any;
 
-	constructor(geoCheckController: IGeoCheckController) {
+	constructor(geoCheckController: any) {
 		this.router = Router();
 		this.geoCheckController = geoCheckController;
 		this.initRoutes();

server/src/routes/incidentRoute.ts

@@ -1,12 +1,11 @@
 import { Router } from "express";
 import { isAllowed } from "../middleware/isAllowed.js";
-import { IIncidentController } from "@/controllers/incidentController.js";
 
 class IncidentRoutes {
 	private router: Router;
-	private incidentController: IIncidentController;
+	private incidentController: any;
 
-	constructor(incidentController: IIncidentController) {
+	constructor(incidentController: any) {
 		this.router = Router();
 		this.incidentController = incidentController;
 		this.initRoutes();

server/src/routes/inviteRoute.ts

@@ -1,12 +1,11 @@
 import { RequestHandler, Router } from "express";
 import { isAllowed } from "../middleware/isAllowed.js";
-import { IInviteController } from "@/controllers/inviteController.js";
 
 class InviteRoutes {
 	private router: Router;
-	private inviteController: IInviteController;
+	private inviteController: any;
 
-	constructor(inviteController: IInviteController, verifyJWT: RequestHandler) {
+	constructor(inviteController: any, verifyJWT: RequestHandler) {
 		this.router = Router();
 		this.inviteController = inviteController;
 		this.initRoutes(verifyJWT);

server/src/routes/logRoutes.ts

@@ -1,11 +1,10 @@
 import { Router } from "express";
-import { isAllowed } from "@/middleware/isAllowed.js";
+import { isAllowed } from "../middleware/isAllowed.js";
-import { ILogController } from "@/controllers/logController.js";
 class LogRoutes {
 	private router: Router;
-	private logController: ILogController;
+	private logController: any;
 
-	constructor(logController: ILogController) {
+	constructor(logController: any) {
 		this.router = Router();
 		this.logController = logController;
 		this.initRoutes();

server/src/routes/maintenanceWindowRoute.ts

@@ -1,11 +1,10 @@
-import { IMaintenanceWindowController } from "@/controllers/maintenanceWindowController.js";
 import { Router } from "express";
 
 class MaintenanceWindowRoutes {
 	private router: Router;
-	private mwController: IMaintenanceWindowController;
+	private mwController: any;
 
-	constructor(maintenanceWindowController: IMaintenanceWindowController) {
+	constructor(maintenanceWindowController: any) {
 		this.router = Router();
 		this.mwController = maintenanceWindowController;
 		this.initRoutes();

server/src/routes/monitorRoute.ts

@@ -1,11 +1,15 @@
 import { Router } from "express";
 import { isAllowed } from "@/middleware/isAllowed.js";
-import { IMonitorController } from "@/controllers/monitorController.js";
+import multer from "multer";
+import { fetchMonitorCertificate } from "@/controllers/controllerUtils.js";
+const upload = multer({
+	storage: multer.memoryStorage(), // Store file in memory as Buffer
+});
 
 class MonitorRoutes {
 	private router: Router;
-	private monitorController: IMonitorController;
+	private monitorController: any;
-	constructor(monitorController: IMonitorController) {
+	constructor(monitorController: any) {
 		this.router = Router();
 		this.monitorController = monitorController;
 		this.initRoutes();
@@ -34,11 +38,10 @@ class MonitorRoutes {
 
 		// Util routes
 		this.router.get("/certificate/:monitorId", (req, res, next) => {
-			this.monitorController.getMonitorCertificate(req, res, next);
+			this.monitorController.getMonitorCertificate(req, res, next, fetchMonitorCertificate);
 		});
 
 		// General monitor CRUD routes
-		this.router.patch("/notifications", isAllowed(["admin", "superadmin"]), this.monitorController.updateNotifications);
 		this.router.post("/", isAllowed(["admin", "superadmin"]), this.monitorController.createMonitor);
 		this.router.delete("/", isAllowed(["superadmin"]), this.monitorController.deleteAllMonitors);
 
@@ -47,6 +50,7 @@ class MonitorRoutes {
 		this.router.get("/export/json", isAllowed(["admin", "superadmin"]), this.monitorController.exportMonitorsToJSON);
 		this.router.post("/import/json", isAllowed(["admin", "superadmin"]), this.monitorController.importMonitorsFromJSON);
 
+		this.router.post("/test-email", isAllowed(["admin", "superadmin"]), this.monitorController.sendTestEmail);
 		this.router.get("/games", this.monitorController.getAllGames);
 
 		// Individual monitor CRUD routes

server/src/routes/notificationRoute.ts

@@ -1,10 +1,9 @@
-import { INotificationController } from "@/controllers/notificationController.js";
 import { Router } from "express";
 class NotificationRoutes {
 	private router: Router;
-	private notificationController: INotificationController;
+	private notificationController: any;
 
-	constructor(notificationController: INotificationController) {
+	constructor(notificationController: any) {
 		this.router = Router();
 		this.notificationController = notificationController;
 		this.initializeRoutes();

server/src/routes/queueRoute.ts

@@ -1,19 +1,20 @@
 import { Router } from "express";
-import { isAllowed } from "@/middleware/isAllowed.js";
+import { isAllowed } from "../middleware/isAllowed.js";
-import { IJobQueueController } from "@/controllers/queueController.js";
 class QueueRoutes {
 	private router: Router;
-	private queueController: IJobQueueController;
+	private queueController: any;
 
-	constructor(queueController: IJobQueueController) {
+	constructor(queueController: any) {
 		this.router = Router();
 		this.queueController = queueController;
 		this.initRoutes();
 	}
 	initRoutes() {
 		this.router.get("/jobs", isAllowed(["admin", "superadmin"]), this.queueController.getJobs);
+		this.router.post("/jobs", isAllowed(["admin", "superadmin"]), this.queueController.addJob);
 
 		this.router.get("/metrics", isAllowed(["admin", "superadmin"]), this.queueController.getMetrics);
+		this.router.get("/health", isAllowed(["admin", "superadmin"]), this.queueController.checkQueueHealth);
 		this.router.get("/all-metrics", isAllowed(["admin", "superadmin"]), this.queueController.getAllMetrics);
 		this.router.post("/flush", isAllowed(["admin", "superadmin"]), this.queueController.flushQueue);
 	}

server/src/routes/settingsRoute.ts

@@ -1,12 +1,11 @@
 import { Router } from "express";
 import { isAllowed } from "../middleware/isAllowed.js";
-import { ISettingsController } from "@/controllers/settingsController.js";
 
 class SettingsRoutes {
 	private router: Router;
-	private settingsController: ISettingsController;
+	private settingsController: any;
 
-	constructor(settingsController: ISettingsController) {
+	constructor(settingsController: any) {
 		this.router = Router();
 		this.settingsController = settingsController;
 		this.initRoutes();

server/src/routes/statusPageRoute.ts

@@ -1,13 +1,12 @@
-import { IStatusPageController } from "@/controllers/statusPageController.js";
 import { RequestHandler, Router } from "express";
 import multer from "multer";
 const upload = multer();
 
 class StatusPageRoutes {
 	private router: Router;
-	private statusPageController: IStatusPageController;
+	private statusPageController: any;
 
-	constructor(statusPageController: IStatusPageController, verifyJWT: RequestHandler, verifyStatusPageAccess: RequestHandler) {
+	constructor(statusPageController: any, verifyJWT: RequestHandler, verifyStatusPageAccess: RequestHandler) {
 		this.router = Router();
 		this.statusPageController = statusPageController;
 		this.initRoutes(verifyJWT, verifyStatusPageAccess);

server/src/service/business/checkService.ts

@@ -1,45 +1,22 @@
 import { Types } from "mongoose";
 import { IChecksRepository, IMonitorsRepository } from "@/repositories/index.js";
-import type {
+import type { MonitorStatusResponse, CheckErrorInfo, Check, ILighthouseAudit, ChecksQueryResult, ChecksSummary } from "@/types/index.js";
-	MonitorStatusResponse,
-	CheckErrorInfo,
-	Check,
-	ILighthouseAudit,
-	ChecksQueryResult,
-	ChecksSummary,
-	MonitorPayloadMap,
-} from "@/types/index.js";
 import type { HardwareStatusPayload, PageSpeedStatusPayload } from "@/types/network.js";
 import { AppError } from "@/utils/AppError.js";
+import { ParseBoolean } from "@/utils/utils.js";
 import { ILogger } from "@/utils/logger.js";
 
 const SERVICE_NAME = "checkService";
 
 export interface ICheckService {
 	createChecks(checks: Check[]): Promise<Check[]>;
-	buildCheck(statusResponse: MonitorStatusResponse<MonitorPayloadMap[keyof MonitorPayloadMap]>): Check | undefined;
+	buildCheck(statusResponse: MonitorStatusResponse<PageSpeedStatusPayload | HardwareStatusPayload | undefined>): Partial<Check> | undefined;
-	getChecksByMonitor(params: {
+	getChecksByMonitor(params: { monitorId: string; query: Record<string, string>; teamId: string }): Promise<ChecksQueryResult>;
-		monitorId: string;
+	getChecksByTeam(params: { teamId: string; query: Record<string, string> }): Promise<ChecksQueryResult>;
-		teamId: string;
-		sortOrder: string;
-		dateRange: string;
-		page: number;
-		rowsPerPage: number;
-		filter?: string;
-		status?: boolean;
-	}): Promise<ChecksQueryResult>;
-	getChecksByTeam(params: {
-		teamId: string;
-		sortOrder: string;
-		dateRange: string;
-		page: number;
-		rowsPerPage: number;
-		filter?: string;
-	}): Promise<ChecksQueryResult>;
 	getChecksSummaryByTeamId(params: { teamId: string; dateRange: string }): Promise<ChecksSummary>;
 	deleteChecks(params: { monitorId: string; teamId: string }): Promise<number>;
 	deleteChecksByTeamId(params: { teamId: string }): Promise<number>;
-	deleteOlderThan(date: Date): Promise<number>;
+	updateChecksTTL(params: { teamId: string; ttl: string }): Promise<void>;
 }
 
 export class CheckService implements ICheckService {
@@ -62,14 +39,12 @@ export class CheckService implements ICheckService {
 		return this.checksRepository.createChecks(checks);
 	};
 
-	buildCheck = (statusResponse: MonitorStatusResponse<MonitorPayloadMap[keyof MonitorPayloadMap]>): Check | undefined => {
+	buildCheck = (statusResponse: MonitorStatusResponse<PageSpeedStatusPayload | HardwareStatusPayload | undefined>) => {
 		const { monitorId, teamId, type, status, responseTime, code, message, payload, timings } = statusResponse;
 
-		const now = new Date().toISOString();
+		const check: Partial<Check> = {
-		const check: Check = {
 			id: new Types.ObjectId().toString(),
-			createdAt: now,
+			createdAt: new Date().toISOString(),
-			updatedAt: now,
 			metadata: {
 				monitorId,
 				teamId,
@@ -137,25 +112,7 @@ export class CheckService implements ICheckService {
 		return check;
 	};
 
-	getChecksByMonitor = async ({
+	getChecksByMonitor = async ({ monitorId, query, teamId }: { monitorId: string; query: Record<string, string>; teamId: string }) => {
-		monitorId,
-		teamId,
-		sortOrder,
-		dateRange,
-		filter,
-		page,
-		rowsPerPage,
-		status,
-	}: {
-		monitorId: string;
-		teamId: string;
-		sortOrder: string;
-		dateRange: string;
-		page: number;
-		rowsPerPage: number;
-		status?: boolean;
-		filter?: string;
-	}) => {
 		if (!monitorId) {
 			throw new AppError({ message: "No monitor ID in request", service: SERVICE_NAME, method: "getChecksByMonitor", status: 400 });
 		}
@@ -166,54 +123,74 @@ export class CheckService implements ICheckService {
 		// For verification, throws an error if monitor doesn't belong to team
 		await this.monitorsRepository.findById(monitorId, teamId);
 
-		const parsedPage = page ?? 0;
+		const { sortOrder, dateRange, filter, page, rowsPerPage, status } = query;
-		const parsedRowsPerPage = rowsPerPage ?? 5;
+		if (!sortOrder || !dateRange || !page || !rowsPerPage) {
+			throw new AppError({
+				message: `Missing required query parameters sortOrder: ${sortOrder}, dateRange: ${dateRange}, filter: ${filter}, page: ${page}, rowsPerPage: ${rowsPerPage}`,
+				service: SERVICE_NAME,
+				method: "getChecksByMonitor",
+				status: 400,
+			});
+		}
+		const parsedStatus = typeof status === "undefined" ? status : ParseBoolean(status);
+		const parsedPage = page ? parseInt(page) : 0;
+		const parsedRowsPerPage = rowsPerPage ? parseInt(rowsPerPage) : 5;
 
-		const result = await this.checksRepository.findByMonitorId(monitorId, sortOrder, dateRange, filter, parsedPage, parsedRowsPerPage, status);
+		const result = await this.checksRepository.findByMonitorId(monitorId, sortOrder, dateRange, filter, parsedPage, parsedRowsPerPage, parsedStatus);
 
 		return result;
 	};
 
-	getChecksByTeam = async ({
+	getChecksByTeam = async ({ teamId, query }: { teamId: string; query: Record<string, string> }) => {
-		teamId,
+		const { sortOrder, dateRange, filter, page, rowsPerPage } = query;
-		sortOrder,
+		if (!sortOrder || !dateRange || !page || !rowsPerPage) {
-		dateRange,
+			throw new AppError({ message: "Missing required query parameters", service: SERVICE_NAME, method: "getChecksByTeam", status: 400 });
-		filter,
+		}
-		page,
+
-		rowsPerPage,
+		if (!teamId) {
-	}: {
+			throw new AppError({ message: "No team ID in request", service: SERVICE_NAME, method: "getChecksByTeam", status: 400 });
-		teamId: string;
+		}
-		sortOrder: string;
+
-		dateRange: string;
+		const parsedPage = page ? parseInt(page) : 0;
-		page: number;
+		const parsedRowsPerPage = rowsPerPage ? parseInt(rowsPerPage) : 5;
-		rowsPerPage: number;
-		filter?: string;
-	}) => {
-		const parsedPage = page ?? 0;
-		const parsedRowsPerPage = rowsPerPage ?? 5;
 
 		const checkData = await this.checksRepository.findByTeamId(sortOrder, dateRange, filter, parsedPage, parsedRowsPerPage, teamId);
 		return checkData;
 	};
 
 	getChecksSummaryByTeamId = async ({ teamId, dateRange }: { teamId: string; dateRange: string }) => {
+		if (!teamId) {
+			throw new AppError({ message: "No team ID in request", service: SERVICE_NAME, method: "getChecksSummaryByTeamId", status: 400 });
+		}
 		const summary = await this.checksRepository.findSummaryByTeamId(teamId, dateRange);
 		return summary;
 	};
 
 	deleteChecks = async ({ monitorId, teamId }: { monitorId: string; teamId: string }) => {
+		if (!monitorId) {
+			throw new AppError({ message: "No monitor ID in request", service: SERVICE_NAME, method: "deleteChecks", status: 400 });
+		}
+
+		if (!teamId) {
+			throw new AppError({ message: "No team ID in request", service: SERVICE_NAME, method: "deleteChecks", status: 400 });
+		}
+
+		// For verification, throws an error if monitor doesn't belong to team
 		await this.monitorsRepository.findById(monitorId, teamId);
 
 		const deletedCount = await this.checksRepository.deleteByMonitorId(monitorId);
 		return deletedCount;
 	};
 	deleteChecksByTeamId = async ({ teamId }: { teamId: string }) => {
+		if (!teamId) {
+			throw new AppError({ message: "No team ID in request", service: SERVICE_NAME, method: "deleteChecksByTeamId", status: 400 });
+		}
+
 		const deletedCount = await this.checksRepository.deleteByTeamId(teamId);
 		return deletedCount;
 	};
 
-	deleteOlderThan = async (date: Date) => {
+	updateChecksTTL = async ({ teamId, ttl }: { teamId: string; ttl: string }) => {
-		const deletedCount = await this.checksRepository.deleteOlderThan(date);
+		throw new AppError({ message: "Not implemented", service: SERVICE_NAME, method: "updateChecksTTL", status: 500, details: { teamId, ttl } });
-		return deletedCount;
 	};
 }

server/src/service/business/diagnosticService.ts

@@ -24,7 +24,8 @@ export class DiagnosticService implements IDiagnosticService {
 		 * Clears performance marks after each measurement to prevent memory leaks.
 		 */
 		const obs = new PerformanceObserver((items) => {
-			items.getEntries();
+			// Get the first entry but we don't need to store it
+			items.getEntries()[0];
 			performance.clearMarks();
 		});
 		obs.observe({ entryTypes: ["measure"] });

server/src/service/business/geoChecksService.ts

@@ -1,7 +1,7 @@
 import type { Monitor, GeoCheck } from "@/types/index.js";
-import type { GeoCheckResult, GeoContinent } from "@/types/geoCheck.js";
+import type { GeoCheckResult } from "@/types/geoCheck.js";
 import { Types } from "mongoose";
-import type { FlatGeoChecksQueryResult, IGeoChecksRepository } from "@/repositories/index.js";
+import type { IGeoChecksRepository } from "@/repositories/index.js";
 import type { IMonitorsRepository } from "@/repositories/index.js";
 import type { IGlobalPingService } from "@/service/infrastructure/globalPingService.js";
 import type { ILogger } from "@/utils/logger.js";
@@ -13,15 +13,7 @@ export interface IGeoChecksService {
 	readonly serviceName: string;
 	buildGeoCheck(monitor: Monitor): Promise<GeoCheck | null>;
 	createGeoChecks(geoChecks: GeoCheck[]): Promise<GeoCheck[]>;
-	getGeoChecksByMonitor(args: {
+	getGeoChecksByMonitor(args: { monitorId: string; query: any; teamId: string }): Promise<any>;
-		monitorId: string;
-		teamId: string;
-		sortOrder: string;
-		dateRange: string;
-		page?: number;
-		rowsPerPage?: number;
-		continent: GeoContinent | GeoContinent[];
-	}): Promise<FlatGeoChecksQueryResult>;
 }
 
 export class GeoChecksService implements IGeoChecksService {
@@ -147,23 +139,7 @@ export class GeoChecksService implements IGeoChecksService {
 		return this.geoChecksRepository.createGeoChecks(geoChecks);
 	};
 
-	getGeoChecksByMonitor = async ({
+	getGeoChecksByMonitor = async ({ monitorId, query, teamId }: { monitorId: string; query: any; teamId: string }) => {
-		monitorId,
-		teamId,
-		sortOrder,
-		dateRange,
-		page,
-		rowsPerPage,
-		continent,
-	}: {
-		monitorId: string;
-		teamId: string;
-		sortOrder: string;
-		dateRange: string;
-		page?: number;
-		rowsPerPage?: number;
-		continent: GeoContinent | GeoContinent[];
-	}) => {
 		if (!monitorId) {
 			throw new AppError({
 				message: "No monitor ID in request",
@@ -191,9 +167,10 @@ export class GeoChecksService implements IGeoChecksService {
 			});
 		}
 
+		const { sortOrder, dateRange, page, rowsPerPage, continent } = query;
 		const continents = continent ? (Array.isArray(continent) ? continent : [continent]) : undefined;
-		const parsedPage = page || 0;
+		const parsedPage = page ? parseInt(page) : page;
-		const parsedRowsPerPage = rowsPerPage || 5;
+		const parsedRowsPerPage = rowsPerPage ? parseInt(rowsPerPage) : rowsPerPage;
 		const result = await this.geoChecksRepository.findByMonitorId(monitorId, sortOrder, dateRange, parsedPage, parsedRowsPerPage, continents);
 		return result;
 	};

server/src/service/business/incidentService.ts

@@ -2,6 +2,7 @@ const SERVICE_NAME = "incidentService";
 import type { Monitor } from "@/types/monitor.js";
 import type { MonitorStatusResponse } from "@/types/network.js";
 import { AppError } from "@/utils/AppError.js";
+import { ParseBoolean } from "@/utils/utils.js";
 import { getDateForRange } from "@/utils/dataUtils.js";
 import type { IIncidentsRepository, IMonitorsRepository, IUsersRepository } from "@/repositories/index.js";
 import type { Incident, IncidentSummary, User } from "@/types/index.js";
@@ -21,13 +22,13 @@ export interface IIncidentService {
 		teamId: string,
 		sortOrder: string,
 		dateRange: string,
-		page: number,
+		page: string,
-		rowsPerPage: number,
+		rowsPerPage: string,
-		status: boolean | undefined,
+		status: string,
-		monitorId: string | undefined,
+		monitorId: string,
-		resolutionType: string | undefined
+		resolutionType: string
 	): Promise<{ incidents: Incident[]; count: number }>;
-	getIncidentSummary(teamId: string, limit?: number): Promise<IncidentSummary>;
+	getIncidentSummary(teamId: string, limit?: string): Promise<IncidentSummary>;
 	getIncidentById(incidentId: string, teamId: string): Promise<{ incident: Incident; monitor: Monitor; user: User | null }>;
 }
 
@@ -163,13 +164,13 @@ export class IncidentService implements IIncidentService {
 			});
 
 			return resolvedIncident;
-		} catch (error: unknown) {
+		} catch (error: any) {
 			this.logger.error({
 				service: SERVICE_NAME,
 				method: "resolveIncident",
-				message: error instanceof Error ? error.message : "Unknown error",
+				message: error.message,
 				details: { id: incidentId },
-				stack: error instanceof Error ? error.stack : undefined,
+				stack: error.stack,
 			});
 			throw error;
 		}
@@ -179,11 +180,11 @@ export class IncidentService implements IIncidentService {
 		teamId: string,
 		sortOrder: string,
 		dateRange: string,
-		page: number,
+		page: string,
-		rowsPerPage: number,
+		rowsPerPage: string,
-		status: boolean | undefined,
+		status: string,
-		monitorId: string | undefined,
+		monitorId: string,
-		resolutionType: string | undefined
+		resolutionType: string
 	) => {
 		try {
 			if (!teamId) {
@@ -192,8 +193,9 @@ export class IncidentService implements IIncidentService {
 
 			const startDate = getDateForRange(dateRange);
 
-			const parsedPage = page ?? 0;
+			const parsedPage = Number.isFinite(parseInt(page)) ? parseInt(page) : 0;
-			const parsedRowsPerPage = rowsPerPage ?? 20;
+			const parsedRowsPerPage = Number.isFinite(parseInt(rowsPerPage)) ? parseInt(rowsPerPage) : 20;
+			const parsedStatus = typeof status === "undefined" ? undefined : ParseBoolean(status);
 
 			const incidents = await this.incidentsRepository.findByTeamId(
 				teamId,
@@ -201,43 +203,43 @@ export class IncidentService implements IIncidentService {
 				parsedPage,
 				parsedRowsPerPage,
 				sortOrder,
-				status,
+				parsedStatus,
 				monitorId,
 				resolutionType
 			);
 
-			const count = await this.incidentsRepository.countByTeamId(teamId, startDate, status, monitorId, resolutionType);
+			const count = await this.incidentsRepository.countByTeamId(teamId, startDate, parsedStatus, monitorId, resolutionType);
 
 			return { incidents, count };
-		} catch (error: unknown) {
+		} catch (error: any) {
 			this.logger.error({
 				service: SERVICE_NAME,
 				method: "getIncidentsByTeam",
-				message: error instanceof Error ? error.message : "Unknown error",
+				message: error.message,
 				details: { teamId },
-				stack: error instanceof Error ? error.stack : undefined,
+				stack: error.stack,
 			});
 			throw error;
 		}
 	};
 
-	getIncidentSummary = async (teamId: string, limit?: number) => {
+	getIncidentSummary = async (teamId: string, limit?: string) => {
 		try {
 			if (!teamId) {
 				throw new AppError({ message: "No team ID in request", service: SERVICE_NAME, method: "getIncidentSummary", status: 400 });
 			}
 
-			const parsedLimit = limit ?? 10;
+			const parsedLimit = limit && Number.isFinite(parseInt(limit, 10)) ? parseInt(limit, 10) : 10;
 			const summary = await this.incidentsRepository.findSummaryByTeamId(teamId, parsedLimit);
 
 			return summary;
-		} catch (error: unknown) {
+		} catch (error: any) {
 			this.logger.error({
 				service: SERVICE_NAME,
 				method: "getIncidentSummary",
-				message: error instanceof Error ? error.message : "Unknown error",
+				message: error.message,
 				details: { teamId },
-				stack: error instanceof Error ? error.stack : undefined,
+				stack: error.stack,
 			});
 			throw error;
 		}
@@ -252,13 +254,13 @@ export class IncidentService implements IIncidentService {
 				user = await this.usersRepository.findById(incident.resolvedBy);
 			}
 			return { incident, monitor, user };
-		} catch (error: unknown) {
+		} catch (error: any) {
 			this.logger.error({
 				service: SERVICE_NAME,
 				method: "getIncidentById",
-				message: error instanceof Error ? error.message : "Unknown error",
+				message: error.message,
 				details: { incidentId },
-				stack: error instanceof Error ? error.stack : undefined,
+				stack: error.stack,
 			});
 			throw error;
 		}

server/src/service/business/inviteService.ts

@@ -2,8 +2,6 @@ import type { Invite, UserRole } from "@/types/index.js";
 import { canManageRole } from "@/types/user.js";
 import type { IInvitesRepository } from "@/repositories/index.js";
 import { AppError } from "@/utils/AppError.js";
-import { ISettingsService } from "../system/settingsService.js";
-import { IEmailService } from "../infrastructure/emailService.js";
 
 const SERVICE_NAME = "inviteService";
 
@@ -16,8 +14,8 @@ export interface IInviteService {
 export class InviteService implements IInviteService {
 	static SERVICE_NAME = SERVICE_NAME;
 
-	private settingsService: ISettingsService;
+	private settingsService: any;
-	private emailService: IEmailService;
+	private emailService: any;
 	private invitesRepository: IInvitesRepository;
 
 	constructor({
@@ -26,8 +24,8 @@ export class InviteService implements IInviteService {
 		emailService,
 	}: {
 		invitesRepository: IInvitesRepository;
-		settingsService: ISettingsService;
+		settingsService: any;
-		emailService: IEmailService;
+		emailService: any;
 	}) {
 		this.invitesRepository = invitesRepository;
 		this.settingsService = settingsService;
@@ -59,16 +57,8 @@ export class InviteService implements IInviteService {
 		return inviteToken;
 	};
 
-	sendInviteEmail = async ({ invite, firstName, userRoles }: { invite: Partial<Invite>; firstName: string; userRoles: UserRole[] }) => {
+	sendInviteEmail = async ({ invite, firstName, userRoles }: { invite: Partial<Invite>; firstName: any; userRoles: UserRole[] }) => {
 		const inviteRoles = invite.role ?? [];
-		if (!invite.email) {
-			throw new AppError({
-				message: "Invite email is required to send an invite",
-				service: SERVICE_NAME,
-				method: "sendInviteEmail",
-				status: 400,
-			});
-		}
 
 		for (const targetRole of inviteRoles) {
 			const canManage = userRoles.some((actorRole) => canManageRole(actorRole, targetRole));
@@ -76,7 +66,7 @@ export class InviteService implements IInviteService {
 				throw new AppError({
 					message: "You do not have permission to create this invite",
 					service: SERVICE_NAME,
-					method: "sendInviteEmail",
+					method: "getInviteToken",
 					status: 403,
 				});
 			}
@@ -89,16 +79,6 @@ export class InviteService implements IInviteService {
 			name: firstName,
 			link: `${clientHost}/register/${inviteToken.token}`,
 		});
-
-		if (!html) {
-			throw new AppError({
-				message: "Failed to build invite e-mail... Please verify your settings.",
-				service: SERVICE_NAME,
-				method: "sendInviteEmail",
-				status: 500,
-			});
-		}
-
 		const result = await this.emailService.sendEmail(invite.email, "Welcome to Uptime Monitor", html);
 		if (!result) {
 			throw new AppError({

server/src/service/business/maintenanceWindowService.ts

@@ -1,29 +1,16 @@
 import { IMaintenanceWindowsRepository, IMonitorsRepository } from "@/repositories/index.js";
-import type { DurationUnit, MaintenanceWindow } from "@/types/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";
 
 export interface IMaintenanceWindowService {
-	createMaintenanceWindow(params: {
+	createMaintenanceWindow(params: { teamId: string; body: Partial<MaintenanceWindow> & { monitors: string[] } }): Promise<void>;
-		teamId: string;
-		monitorIDs: string[];
-		name: string;
-		active: boolean;
-		duration: number;
-		durationUnit: DurationUnit;
-		repeat: number;
-		start: string;
-		end: string;
-	}): Promise<void>;
 	getMaintenanceWindowById(params: { id: string; teamId: string }): Promise<MaintenanceWindow>;
 	getMaintenanceWindowsByTeamId(params: {
 		teamId: string;
-		active?: boolean;
+		query: Record<string, string>;
-		page?: number;
-		rowsPerPage?: number;
-		field?: string;
-		order?: string;
 	}): Promise<{ maintenanceWindows: MaintenanceWindow[]; maintenanceWindowCount: number }>;
 	getMaintenanceWindowsByMonitorId(params: { monitorId: string; teamId: string }): Promise<MaintenanceWindow[]>;
 	deleteMaintenanceWindow(params: { id: string; teamId: string }): Promise<MaintenanceWindow>;
@@ -50,28 +37,9 @@ export class MaintenanceWindowService implements IMaintenanceWindowService {
 		return MaintenanceWindowService.SERVICE_NAME;
 	}
 
-	createMaintenanceWindow = async ({
+	createMaintenanceWindow = async ({ teamId, body }: { teamId: string; body: any }) => {
-		teamId,
+		const monitorIds = body.monitors;
-		monitorIDs,
+		const monitors = await this.monitorsRepository.findByIds(monitorIds);
-		name,
-		active,
-		duration,
-		durationUnit,
-		repeat,
-		start,
-		end,
-	}: {
-		teamId: string;
-		monitorIDs: string[];
-		name: string;
-		active: boolean;
-		duration: number;
-		durationUnit: DurationUnit;
-		repeat: number;
-		start: string;
-		end: string;
-	}) => {
-		const monitors = await this.monitorsRepository.findByIds(monitorIDs);
 
 		const unauthorizedMonitors = monitors.filter((monitor) => monitor.teamId !== teamId);
 
@@ -84,17 +52,17 @@ export class MaintenanceWindowService implements IMaintenanceWindowService {
 			});
 		}
 
-		const dbTransactions = monitorIDs.map((monitorId: string) => {
+		const dbTransactions = monitorIds.map((monitorId: string) => {
 			return this.maintenanceWindowsRepository.create({
 				teamId,
 				monitorId,
-				name: name,
+				name: body.name,
-				active: active,
+				active: body.active ? body.active : true,
-				duration: duration,
+				duration: body.duration,
-				durationUnit: durationUnit,
+				durationUnit: body.durationUnit,
-				repeat: repeat,
+				repeat: body.repeat,
-				start: start,
+				start: body.start,
-				end: end,
+				end: body.end,
 			});
 		});
 		await Promise.all(dbTransactions);
@@ -104,25 +72,14 @@ export class MaintenanceWindowService implements IMaintenanceWindowService {
 		return await this.maintenanceWindowsRepository.findById(id, teamId);
 	};
 
-	getMaintenanceWindowsByTeamId = async ({
+	getMaintenanceWindowsByTeamId = async ({ teamId, query }: { teamId: string; query: any }) => {
-		teamId,
+		let { active, page, rowsPerPage, field, order } = query || {};
-		active,
-		page,
-		rowsPerPage,
-		field,
-		order,
-	}: {
-		teamId: string;
-		active?: boolean;
-		page?: number;
-		rowsPerPage?: number;
-		field?: string;
-		order?: string;
-	}) => {
-		page = page ?? 0;
-		rowsPerPage = rowsPerPage ?? 10;
 
-		const maintenanceWindows = await this.maintenanceWindowsRepository.findByTeamId(teamId, page, rowsPerPage, field, order, active);
+		active = typeof active === "undefined" ? undefined : ParseBoolean(active);
+		page = parseInt(page) || 0;
+		rowsPerPage = parseInt(rowsPerPage) || 10;
+
+		const maintenanceWindows = await this.maintenanceWindowsRepository.findByTeamId(teamId, active, page, rowsPerPage, field, order);
 		const maintenanceWindowCount = await this.maintenanceWindowsRepository.countByTeamId(teamId, active);
 		return { maintenanceWindows, maintenanceWindowCount };
 	};
@@ -135,7 +92,7 @@ export class MaintenanceWindowService implements IMaintenanceWindowService {
 		return await this.maintenanceWindowsRepository.deleteById(id, teamId);
 	};
 
-	editMaintenanceWindow = async ({ id, teamId, body }: { id: string; teamId: string; body: Partial<MaintenanceWindow> }) => {
+	editMaintenanceWindow = async ({ id, teamId, body }: { id: string; teamId: string; body: any }) => {
 		return await this.maintenanceWindowsRepository.updateById(id, teamId, body);
 	};
 }

server/src/service/business/monitorService.ts

@@ -7,7 +7,6 @@ import type {
 	HardwareDetailsResult,
 	PageSpeedDetailsResult,
 	GamesMap,
-	GroupedGeoCheckResult,
 } from "@/types/monitor.js";
 import { supportsGeoCheck } from "@/types/monitor.js";
 import type { GeoContinent } from "@/types/geoCheck.js";
@@ -19,12 +18,11 @@ import type {
 	IMonitorStatsRepository,
 	IStatusPagesRepository,
 } from "@/repositories/index.js";
-import demoMonitorsData from "@/utils/demoMonitors.json" with { type: "json" };
+import fs from "fs";
+import { fileURLToPath } from "url";
+import path from "path";
 import { AppError } from "@/utils/AppError.js";
-import type { ImportedMonitor } from "@/validation/monitorValidation.js";
 import { ISuperSimpleQueue } from "../infrastructure/SuperSimpleQueue/SuperSimpleQueue.js";
-import { IEmailService } from "../infrastructure/emailService.js";
-import { ILogger } from "@/utils/logger.js";
 
 const SERVICE_NAME = "MonitorService";
 type DateRangeKey = "recent" | "day" | "week" | "month" | "all";
@@ -33,20 +31,15 @@ export interface IMonitorService {
 	readonly serviceName: string;
 
 	// create
-	createMonitor(teamId: string, userId: string, body: Partial<Monitor>): Promise<void>;
+	createMonitor(teamId: string, userId: string, body: Monitor): Promise<void>;
-	createMonitors(monitors: Array<Monitor>): Promise<Monitor[] | null>;
+	createMonitors(monitors: Array<Monitor>, userId: string, teamId: string): Promise<Monitor[] | null>;
 	addDemoMonitors(args: { userId: string; teamId: string }): Promise<Monitor[]>;
 
 	// read
-	getUptimeDetailsById(args: { teamId: string; monitorId: string; dateRange: string }): Promise<UptimeDetailsResult>;
+	getUptimeDetailsById(args: { teamId: string; monitorId: string; dateRange: string; normalize?: boolean }): Promise<UptimeDetailsResult>;
 	getHardwareDetailsById(args: { teamId: string; monitorId: string; dateRange: string }): Promise<HardwareDetailsResult>;
 	getPageSpeedDetailsById(args: { teamId: string; monitorId: string; dateRange: string }): Promise<PageSpeedDetailsResult>;
-	getGeoChecksByMonitorId(args: {
+	getGeoChecksByMonitorId(args: { teamId: string; monitorId: string; dateRange: string; continents?: GeoContinent[] }): Promise<any>;
-		teamId: string;
-		monitorId: string;
-		dateRange: string;
-		continents?: GeoContinent[];
-	}): Promise<GroupedGeoCheckResult>;
 	getMonitorById(args: { teamId: string; monitorId: string }): Promise<Monitor>;
 	getMonitorsByTeamId(args: {
 		teamId: string;
@@ -67,33 +60,32 @@ export interface IMonitorService {
 		filter?: string;
 		field?: string;
 		order?: "asc" | "desc";
+		explain?: boolean;
 	}): Promise<MonitorsWithChecksByTeamIdResult>;
 	getAllGames(): GamesMap;
 	getGroupsByTeamId(args: { teamId: string }): Promise<string[]>;
 
 	// update
-	editMonitor(args: { teamId: string; monitorId: string; body: Partial<Monitor> }): Promise<Monitor>;
+	editMonitor(args: { teamId: string; monitorId: string; body: Monitor }): Promise<Monitor>;
 	pauseMonitor(args: { teamId: string; monitorId: string }): Promise<Monitor>;
 
 	// delete
 	deleteMonitor(args: { teamId: string; monitorId: string }): Promise<Monitor>;
 	deleteAllMonitors(args: { teamId: string }): Promise<number>;
 
-	// notifications
-	updateNotifications(args: { teamId: string; monitorIds: string[]; notificationIds: string[]; action: "add" | "remove" | "set" }): Promise<number>;
-
 	// other
+	sendTestEmail(args: { to: string }): Promise<string>;
 	exportMonitorsToJSON(args: { teamId: string }): Promise<Monitor[]>;
-	importMonitorsFromJSON(args: { teamId: string; userId: string; monitors: ImportedMonitor[] }): Promise<{ imported: number; errors: string[] }>;
+	importMonitorsFromJSON(args: { teamId: string; userId: string; monitors: any[] }): Promise<{ imported: number; errors: string[] }>;
 }
 
 export class MonitorService implements IMonitorService {
 	static SERVICE_NAME = SERVICE_NAME;
 
 	private jobQueue: ISuperSimpleQueue;
-	private emailService: IEmailService;
+	private emailService: any;
-	private logger: ILogger;
+	private logger: any;
-	private games: GamesMap;
+	private games: any;
 	private monitorsRepository: IMonitorsRepository;
 	private checksRepository: IChecksRepository;
 	private geoChecksRepository: IGeoChecksRepository;
@@ -114,9 +106,9 @@ export class MonitorService implements IMonitorService {
 		incidentsRepository,
 	}: {
 		jobQueue: ISuperSimpleQueue;
-		emailService: IEmailService;
+		emailService: any;
-		logger: ILogger;
+		logger: any;
-		games: GamesMap;
+		games: any;
 		monitorsRepository: IMonitorsRepository;
 		checksRepository: IChecksRepository;
 		geoChecksRepository: IGeoChecksRepository;
@@ -174,7 +166,7 @@ export class MonitorService implements IMonitorService {
 		this.jobQueue.addJob(monitor.id, monitor);
 	};
 
-	createMonitors = async (monitors: Array<Monitor>): Promise<Monitor[] | null> => {
+	createMonitors = async (monitors: Array<Monitor>, userId: string, teamId: string): Promise<Monitor[] | null> => {
 		const createdMonitors = await this.monitorsRepository.createMonitors(monitors);
 		if (!monitors || monitors.length === 0) {
 			throw new AppError({ message: "Failed to create monitors", status: 500, service: SERVICE_NAME, method: "createMonitors" });
@@ -184,18 +176,24 @@ export class MonitorService implements IMonitorService {
 		return createdMonitors;
 	};
 
-	addDemoMonitors = async ({ userId, teamId }: { userId: string; teamId: string }): Promise<Monitor[]> => {
+	addDemoMonitors = async ({ userId, teamId }: { userId: string; teamId: string }): Promise<any[]> => {
-		const demoData = demoMonitorsData;
+		const __filename = fileURLToPath(import.meta.url);
-		const monitors = demoData.map((monitor) => ({
+		const __dirname = path.dirname(__filename);
-			userId,
+		const demoMonitorsPath = path.resolve(__dirname, "../../utils/demoMonitors.json");
-			teamId,
+
-			name: monitor.name,
+		const demoData = JSON.parse(fs.readFileSync(demoMonitorsPath, "utf8"));
-			description: monitor.name,
+		const monitors: Monitor[] = demoData.map((monitor: Monitor) => {
-			type: "http" as const,
+			return {
-			url: monitor.url,
+				userId,
-			interval: 60000,
+				teamId,
-		}));
+				name: monitor.name,
-		const demoMonitors = await this.monitorsRepository.createMonitors(monitors as unknown as Monitor[]);
+				description: monitor.name,
+				type: "http",
+				url: monitor.url,
+				interval: 60000,
+			};
+		});
+		const demoMonitors = await this.monitorsRepository.createMonitors(monitors);
 
 		await Promise.all(demoMonitors.map((monitor) => this.jobQueue.addJob(monitor.id, monitor)));
 		return demoMonitors;
@@ -205,10 +203,12 @@ export class MonitorService implements IMonitorService {
 		teamId,
 		monitorId,
 		dateRange,
+		normalize,
 	}: {
 		teamId: string;
 		monitorId: string;
 		dateRange: string;
+		normalize?: boolean;
 	}): Promise<UptimeDetailsResult> => {
 		const monitor = await this.monitorsRepository.findById(monitorId, teamId);
 		if (!monitor) {
@@ -336,7 +336,7 @@ export class MonitorService implements IMonitorService {
 		monitorId: string;
 		dateRange: string;
 		continents?: GeoContinent[];
-	}): Promise<GroupedGeoCheckResult> => {
+	}): Promise<any> => {
 		const monitor = await this.monitorsRepository.findById(monitorId, teamId);
 		if (!monitor) {
 			throw new AppError({ message: `Monitor with ID ${monitorId} not found.`, status: 404 });
@@ -389,6 +389,7 @@ export class MonitorService implements IMonitorService {
 		filter,
 		field,
 		order,
+		explain,
 	}: {
 		teamId: string;
 		limit?: number;
@@ -398,6 +399,7 @@ export class MonitorService implements IMonitorService {
 		filter?: string;
 		field?: string;
 		order?: "asc" | "desc";
+		explain?: boolean;
 	}): Promise<MonitorsWithChecksByTeamIdResult> => {
 		const summary = await this.monitorsRepository.findMonitorsSummaryByTeamId(teamId, { type });
 		const count = await this.monitorsRepository.findMonitorCountByTeamIdAndType(teamId, { type, filter });
@@ -436,81 +438,55 @@ export class MonitorService implements IMonitorService {
 		return groups;
 	};
 
-	editMonitor = async ({ teamId, monitorId, body }: { teamId: string; monitorId: string; body: Partial<Monitor> }) => {
+	editMonitor = async ({ teamId, monitorId, body }: { teamId: string; monitorId: string; body: Monitor }) => {
 		const editedMonitor = await this.monitorsRepository.updateById(monitorId, teamId, body);
 		await this.jobQueue.updateJob(editedMonitor);
 		return editedMonitor;
 	};
 
-	updateNotifications = async ({
-		teamId,
-		monitorIds,
-		notificationIds,
-		action,
-	}: {
-		teamId: string;
-		monitorIds: string[];
-		notificationIds: string[];
-		action: "add" | "remove" | "set";
-	}): Promise<number> => {
-		const modifiedCount = await this.monitorsRepository.updateNotifications(teamId, monitorIds, notificationIds, action);
-
-		// If notifications were updated, we should update the jobs in the queue
-		if (modifiedCount > 0) {
-			const monitors = await this.monitorsRepository.findByIds(monitorIds);
-			await Promise.all(monitors.map((monitor) => this.jobQueue.updateJob(monitor)));
-		}
-
-		return modifiedCount;
-	};
-
 	pauseMonitor = async ({ teamId, monitorId }: { teamId: string; monitorId: string }): Promise<Monitor> => {
 		const monitor = await this.monitorsRepository.togglePauseById(monitorId, teamId);
-		if (monitor.isActive) {
+		monitor.isActive === true ? await this.jobQueue.resumeJob(monitor) : await this.jobQueue.pauseJob(monitor);
-			await this.jobQueue.resumeJob(monitor);
-		} else {
-			await this.jobQueue.pauseJob(monitor);
-		}
 		return monitor;
 	};
 
 	deleteMonitor = async ({ teamId, monitorId }: { teamId: string; monitorId: string }): Promise<Monitor> => {
 		const monitor = await this.monitorsRepository.deleteById(monitorId, teamId);
-		await this.monitorStatsRepository.deleteByMonitorId(monitor.id).catch((err: unknown) => {
+		await this.monitorStatsRepository.deleteByMonitorId(monitor.id).catch((err: any) => {
 			this.logger.warn({
 				message: `Error deleting monitor stats for monitor ${monitor.id} with name ${monitor.name}`,
 				service: SERVICE_NAME,
-				stack: err instanceof Error ? err.stack : undefined,
+				stack: err.stack,
 			});
 		});
-		await this.checksRepository.deleteByMonitorId(monitor.id).catch((err: unknown) => {
+		await this.checksRepository.deleteByMonitorId(monitor.id).catch((err: any) => {
 			this.logger.warn({
 				message: `Error deleting checks for monitor ${monitor.id} with name ${monitor.name}`,
 				service: SERVICE_NAME,
-				stack: err instanceof Error ? err.stack : undefined,
+				stack: err.stack,
 			});
 		});
-		await this.statusPagesRepository.removeMonitorFromStatusPages(monitor.id).catch((err: unknown) => {
+		await this.statusPagesRepository.removeMonitorFromStatusPages(monitor.id).catch((err: any) => {
 			this.logger.warn({
 				message: `Error removing monitor ${monitor.id} with name ${monitor.name} from status pages`,
 				service: SERVICE_NAME,
-				stack: err instanceof Error ? err.stack : undefined,
+				stack: err.stack,
 			});
 		});
 
-		await this.incidentsRepository.deleteByMonitorId(monitor.id, teamId).catch((err: unknown) => {
+		await this.incidentsRepository.deleteByMonitorId(monitor.id, teamId).catch((err: any) => {
 			this.logger.warn({
 				message: `Error deleting incidents for monitor ${monitor.id} with name ${monitor.name}`,
 				service: SERVICE_NAME,
-				stack: err instanceof Error ? err.stack : undefined,
+				stack: err.stack,
 			});
 		});
 
-		await this.geoChecksRepository.deleteByMonitorId(monitor.id).catch((err: unknown) => {
+		await this.geoChecksRepository.deleteByMonitorId(monitor.id).catch((err: any) => {
 			this.logger.warn({
 				message: `Error deleting geo checks for monitor ${monitor.id} with name ${monitor.name}`,
 				service: SERVICE_NAME,
-				stack: err instanceof Error ? err.stack : undefined,
+				stack: err.stack,
 			});
 		});
 
@@ -528,12 +504,12 @@ export class MonitorService implements IMonitorService {
 					await this.geoChecksRepository.deleteByMonitorId(monitor.id);
 					await this.statusPagesRepository.removeMonitorFromStatusPages(monitor.id);
 					await this.monitorStatsRepository.deleteByMonitorId(monitor.id);
-				} catch (error: unknown) {
+				} catch (error: any) {
 					this.logger.warn({
 						message: `Error deleting associated records for monitor ${monitor.id} with name ${monitor.name}`,
 						service: SERVICE_NAME,
 						method: "deleteAllMonitors",
-						stack: error instanceof Error ? error.stack : undefined,
+						stack: error.stack,
 					});
 				}
 			})
@@ -541,7 +517,21 @@ export class MonitorService implements IMonitorService {
 		return deletedCount;
 	};
 
-	exportMonitorsToJSON = async ({ teamId }: { teamId: string }): Promise<Monitor[]> => {
+	sendTestEmail = async ({ to }: { to: string }): Promise<string> => {
+		const subject = "Test email from Checkmate";
+		const context = { testName: "Monitoring System" };
+
+		const html = await this.emailService.buildEmail("testEmailTemplate", context);
+		const messageId = await this.emailService.sendEmail(to, subject, html);
+
+		if (!messageId) {
+			throw new AppError({ message: "Failed to send test email.", service: SERVICE_NAME, method: "sendTestEmail", status: 500 });
+		}
+
+		return messageId;
+	};
+
+	exportMonitorsToJSON = async ({ teamId }: { teamId: string }): Promise<any[]> => {
 		const monitors = await this.monitorsRepository.findByTeamId(teamId, {});
 
 		if (!monitors || monitors.length === 0) {
@@ -558,21 +548,23 @@ export class MonitorService implements IMonitorService {
 	}: {
 		teamId: string;
 		userId: string;
-		monitors: ImportedMonitor[];
+		monitors: any[];
 	}): Promise<{ imported: number; errors: string[] }> => {
 		const errors: string[] = [];
 
-		const cleanedMonitors: Monitor[] = monitors.map((monitor) => ({
+		const cleanedMonitors = monitors.map((monitor) => {
-			...monitor,
+			const cleanData = { ...monitor };
-			id: "",
+			delete cleanData.id;
-			teamId,
+			delete cleanData._id;
-			userId,
+			delete cleanData.createdAt;
-			recentChecks: [],
+			delete cleanData.updatedAt;
-			createdAt: "",
+			delete cleanData.recentChecks;
-			updatedAt: "",
+			// Monitors must belong to current team
-		}));
+			cleanData.teamId = teamId;
+			return cleanData;
+		});
 
-		const createdMonitors = await this.createMonitors(cleanedMonitors);
+		const createdMonitors = await this.createMonitors(cleanedMonitors, userId, teamId);
 
 		if (!createdMonitors || createdMonitors.length === 0) {
 			throw new AppError({

server/src/service/business/userService.ts

@@ -12,31 +12,24 @@ import bcrypt from "bcryptjs";
 import { AppError } from "@/utils/AppError.js";
 import { ISuperSimpleQueue } from "@/service/infrastructure/SuperSimpleQueue/SuperSimpleQueue.js";
 import { IEmailService } from "@/service/infrastructure/emailService.js";
-import { EnvConfig, ISettingsService } from "@/service/system/settingsService.js";
+import { ISettingsService } from "@/service/system/settingsService.js";
 import { ILogger } from "@/utils/logger.js";
 import jwt from "jsonwebtoken";
-import crypto from "crypto";
-type CryptoType = typeof crypto;
 type JwtType = typeof jwt;
 const SERVICE_NAME = "userService";
 
 export interface IUserService {
-	issueToken(payload: Partial<User>, appSettings: EnvConfig): string;
+	issueToken(payload: Partial<User>, appSettings: { jwtTTL?: string; jwtSecret?: string }): string;
-	registerUser(user: Partial<User>, inviteToken: string, file: Express.Multer.File | null): Promise<{ user: User; token: string }>;
+	registerUser(user: Partial<User>, inviteToken: string, file: unknown): Promise<{ user: User; token: string }>;
-	createUser(userData: Partial<User>, teamId: string, actorRoles: UserRole[], file: Express.Multer.File | null): Promise<User>;
+	createUser(userData: Partial<User>, teamId: string, actorRoles: UserRole[], file: unknown): Promise<User>;
 	loginUser(email: string, password: string): Promise<{ user: User; token: string }>;
-	editUser(
+	editUser(updates: Partial<User & { newPassword?: string }>, file: unknown, currentUser: User): Promise<User>;
-		updates: Partial<User & { newPassword?: string }>,
-		file: Express.Multer.File | null,
-		currentUserId: string,
-		currentUserEmail: string
-	): Promise<User>;
 	checkSuperadminExists(): Promise<boolean>;
 	requestRecovery(email: string): Promise<string | false | undefined>;
 	validateRecovery(recoveryToken: string): Promise<void>;
 	resetPassword(password: string, recoveryToken: string): Promise<{ user: User; token: string }>;
-	deleteUser(params: { userId: string; teamId: string; roles: UserRole[] }): Promise<void>;
+	deleteUser(user: User): Promise<void>;
-	deleteUserById(params: { actorId: string; actorTeamId: string; actorRoles: UserRole[]; targetUserId: string }): Promise<void>;
+	deleteUserById(actor: User, targetUserId: string): Promise<void>;
 	getAllUsers(): Promise<User[]>;
 	getUserById(roles: UserRole[], userId: string): Promise<User>;
 	editUserById(userId: string, patch: Partial<User>): Promise<void>;
@@ -56,7 +49,7 @@ export class UserService implements IUserService {
 	private logger: ILogger;
 	private jwt: JwtType;
 	private jobQueue: ISuperSimpleQueue;
-	private crypto: CryptoType;
+	private crypto: any;
 	private monitorsRepository: IMonitorsRepository;
 	private usersRepository: IUsersRepository;
 	private invitesRepository: IInvitesRepository;
@@ -78,7 +71,7 @@ export class UserService implements IUserService {
 		settingsRepository,
 		teamsRepository,
 	}: {
-		crypto: CryptoType;
+		crypto: any;
 		emailService: IEmailService;
 		settingsService: ISettingsService;
 		logger: ILogger;
@@ -109,14 +102,14 @@ export class UserService implements IUserService {
 		return UserService.SERVICE_NAME;
 	}
 
-	issueToken = (payload: Partial<User>, appSettings: EnvConfig) => {
+	issueToken = (payload: any, appSettings: any) => {
 		const tokenTTL = appSettings?.jwtTTL ?? "2h";
 		const tokenSecret = appSettings?.jwtSecret;
 		const payloadData = payload;
 		return this.jwt.sign(payloadData, tokenSecret, { expiresIn: tokenTTL });
 	};
 
-	registerUser = async (user: Partial<User>, inviteToken: string, file: Express.Multer.File | null) => {
+	registerUser = async (user: Partial<User>, inviteToken: string, file: any) => {
 		// Create a new user
 		// If superAdmin exists, a token should be attached to all further register requests
 		const superAdminExists = await this.usersRepository.findSuperAdmin();
@@ -143,7 +136,7 @@ export class UserService implements IUserService {
 			user.password = this.hashPassword(user.password);
 		}
 
-		const newUser = await this.usersRepository.create(user as User, file);
+		const newUser = await this.usersRepository.create(user, file);
 
 		this.logger.debug({
 			message: "New user created",
@@ -186,7 +179,7 @@ export class UserService implements IUserService {
 		return { user: newUser, token };
 	};
 
-	createUser = async (userData: Partial<User>, teamId: string, actorRoles: UserRole[], file: Express.Multer.File | null) => {
+	createUser = async (userData: Partial<User>, teamId: string, actorRoles: UserRole[], file: any) => {
 		// Validate that the creator can assign the requested roles
 		const targetRoles = userData.role ?? [];
 		for (const targetRole of targetRoles) {
@@ -207,7 +200,7 @@ export class UserService implements IUserService {
 			userData.password = this.hashPassword(userData.password);
 		}
 
-		const newUser = await this.usersRepository.create(userData as User, file);
+		const newUser = await this.usersRepository.create(userData, file);
 
 		this.logger.debug({
 			message: "New user created by superadmin",
@@ -246,19 +239,14 @@ export class UserService implements IUserService {
 		return { user: userWithoutPassword, token };
 	};
 
-	editUser = async (
+	editUser = async (updates: Partial<User & { newPassword?: string }>, file: any, currentUser: any) => {
-		updates: Partial<User & { newPassword?: string }>,
-		file: Express.Multer.File | null,
-		currentUserId: string,
-		currentUserEmail: string
-	) => {
 		// Change Password check
 		if (updates?.password && updates?.newPassword) {
 			// Get user's email
 			// Add user email to body for DB operation
-			updates.email = currentUserEmail;
+			updates.email = currentUser.email;
 			// Get user
-			const user = await this.usersRepository.findByEmail(currentUserEmail);
+			const user = await this.usersRepository.findByEmail(currentUser.email);
 			// Compare passwords
 			const match = await bcrypt.compare(updates?.password, user.password);
 			// If not a match, throw a 403
@@ -271,7 +259,7 @@ export class UserService implements IUserService {
 			delete updates.newPassword;
 		}
 
-		return await this.usersRepository.updateById(currentUserId, updates, file);
+		return await this.usersRepository.updateById(currentUser.id, updates, file);
 	};
 
 	checkSuperadminExists = async () => {
@@ -285,8 +273,8 @@ export class UserService implements IUserService {
 		await this.recoveryTokensRepository.deleteManyByEmail(email);
 		const recoveryToken = await this.recoveryTokensRepository.create(email);
 		const name = user.firstName;
-		const settings = this.settingsService.getSettings();
+		const { clientHost } = this.settingsService.getSettings();
-		const url = `${settings.clientHost!}/set-new-password/${recoveryToken.token}`;
+		const url = `${clientHost}/set-new-password/${recoveryToken.token}`;
 
 		const html = await this.emailService.buildEmail("passwordResetTemplate", {
 			name,
@@ -331,7 +319,24 @@ export class UserService implements IUserService {
 		return { user: existingUser, token };
 	};
 
-	deleteUser = async ({ userId, teamId, roles }: { userId: string; teamId: string; roles: UserRole[] }) => {
+	deleteUser = async (user: User) => {
+		const email = user?.email;
+		if (!email) {
+			throw new AppError({ message: "No email in request", service: SERVICE_NAME, method: "deleteUser", status: 400 });
+		}
+
+		const teamId = user?.teamId;
+		const userId = user?.id;
+
+		if (!teamId) {
+			throw new AppError({ message: "No team ID in request", service: SERVICE_NAME, method: "deleteUser", status: 400 });
+		}
+
+		if (!userId) {
+			throw new AppError({ message: "No user ID in request", service: SERVICE_NAME, method: "deleteUser", status: 400 });
+		}
+
+		const roles = user?.role;
 		if (roles.includes("demo")) {
 			throw new AppError({ message: "Demo user cannot be deleted", service: SERVICE_NAME, method: "deleteUser", status: 400 });
 		}
@@ -344,7 +349,7 @@ export class UserService implements IUserService {
 			if (res && res.length > 0) {
 				await Promise.all(
 					res.map(async (monitor) => {
-						await this.jobQueue.deleteJob(monitor);
+						await this.jobQueue.deleteJob(monitor.id);
 					})
 				);
 			}
@@ -353,24 +358,14 @@ export class UserService implements IUserService {
 		await this.usersRepository.deleteById(userId);
 	};
 
-	deleteUserById = async ({
+	deleteUserById = async (actor: User, targetUserId: string) => {
-		actorId,
+		if (actor.id === targetUserId) {
-		actorRoles,
-		actorTeamId,
-		targetUserId,
-	}: {
-		actorId: string;
-		actorTeamId: string;
-		actorRoles: UserRole[];
-		targetUserId: string;
-	}) => {
-		if (actorId === targetUserId) {
 			throw new AppError({ message: "Cannot delete your own account from here", service: SERVICE_NAME, method: "deleteUserById", status: 400 });
 		}
 
 		const targetUser = await this.usersRepository.findById(targetUserId);
 
-		if (targetUser.teamId !== actorTeamId) {
+		if (targetUser.teamId !== actor.teamId) {
 			throw new AppError({ message: "User is not on your team", service: SERVICE_NAME, method: "deleteUserById", status: 403 });
 		}
 
@@ -378,6 +373,7 @@ export class UserService implements IUserService {
 			throw new AppError({ message: "Demo user cannot be deleted", service: SERVICE_NAME, method: "deleteUserById", status: 400 });
 		}
 
+		const actorRoles = actor.role;
 		const targetRoles = targetUser.role;
 
 		// Check actor can manage all of target's roles
@@ -396,7 +392,7 @@ export class UserService implements IUserService {
 		await this.usersRepository.deleteById(targetUserId);
 
 		this.logger.info({
-			message: `User ${targetUserId} deleted by ${actorId}`,
+			message: `User ${targetUserId} deleted by ${actor.id}`,
 			service: SERVICE_NAME,
 			method: "deleteUserById",
 		});
@@ -406,7 +402,7 @@ export class UserService implements IUserService {
 		return await this.usersRepository.findAll();
 	};
 
-	getUserById = async (roles: UserRole[], userId: string) => {
+	getUserById = async (roles: any, userId: any) => {
 		if (!roles.includes("superadmin") && !roles.includes("admin")) {
 			throw new AppError({ message: "Insufficient permissions", service: SERVICE_NAME, status: 403 });
 		}
@@ -415,11 +411,11 @@ export class UserService implements IUserService {
 		return user;
 	};
 
-	editUserById = async (userId: string, patch: Partial<User>) => {
+	editUserById = async (userId: any, patch: Partial<User>) => {
 		await this.usersRepository.updateById(userId, patch, null);
 	};
 
-	setPasswordByUserId = async (userId: string, password: string) => {
+	setPasswordByUserId = async (userId: any, password: string) => {
 		const hashedPassword = this.hashPassword(password);
 		const updatedUser = await this.usersRepository.updateById(userId, { password: hashedPassword }, null);
 		return updatedUser;

server/src/service/index.ts

@@ -27,7 +27,6 @@ export * from "@/service/infrastructure/notificationProviders/INotificationProvi
 export * from "@/service/infrastructure/notificationProviders/matrix.js";
 export * from "@/service/infrastructure/notificationProviders/pagerduty.js";
 export * from "@/service/infrastructure/notificationProviders/slack.js";
-export * from "@/service/infrastructure/notificationProviders/teams.js";
 export * from "@/service/infrastructure/notificationProviders/webhook.js";
 
 // System services

server/src/service/infrastructure/SuperSimpleQueue/SuperSimpleQueue.ts

@@ -2,7 +2,7 @@ import { IMonitorsRepository } from "@/repositories/index.js";
 import { ILogger } from "@/utils/logger.js";
 import Scheduler from "super-simple-scheduler";
 import { ISuperSimpleQueueHelper } from "@/service/infrastructure/SuperSimpleQueue/SuperSimpleQueueHelper.js";
-import { Monitor, MonitorType, supportsGeoCheck } from "@/types/monitor.js";
+import { supportsGeoCheck } from "@/types/monitor.js";
 const SERVICE_NAME = "JobQueue";
 
 type QueueJobFailure = {
@@ -42,11 +42,11 @@ type QueueJobSummary = {
 export interface ISuperSimpleQueue {
 	readonly serviceName: string;
 	init(): Promise<boolean>;
-	addJob(monitorId: string, monitor: Monitor): Promise<void>;
+	addJob(monitorId: string, monitor: any): Promise<void>;
-	deleteJob(monitor: Monitor): Promise<void>;
+	deleteJob(monitor: any): Promise<void>;
-	pauseJob(monitor: Monitor): Promise<void>;
+	pauseJob(monitor: any): Promise<void>;
-	resumeJob(monitor: Monitor): Promise<void>;
+	resumeJob(monitor: any): Promise<void>;
-	updateJob(monitor: Monitor): Promise<void>;
+	updateJob(monitor: any): Promise<void>;
 	shutdown(): Promise<void>;
 	getMetrics(): Promise<QueueMetrics>;
 	getJobs(): Promise<QueueJobSummary[]>;
@@ -89,10 +89,9 @@ export class SuperSimpleQueue implements ISuperSimpleQueue {
 		try {
 			this.scheduler.start();
 
-			this.scheduler.addTemplate("monitor-job", this.helper.getHeartbeatJob());
+			this.scheduler.addTemplate("monitor-job", this.helper.getMonitorJob());
-			this.scheduler.addTemplate("geo-check-job", this.helper.getHeartbeatGeoJob());
+			this.scheduler.addTemplate("geo-check-job", this.helper.getGeoCheckJob());
 			this.scheduler.addTemplate("cleanup-orphaned", this.helper.getCleanupOrphanedJob());
-			this.scheduler.addTemplate("cleanup-retention-job", this.helper.getCleanupRetentionJob());
 			const monitors = await this.monitorsRepository.findAll();
 			if (!monitors) {
 				return true;
@@ -105,20 +104,20 @@ export class SuperSimpleQueue implements ISuperSimpleQueue {
 			}
 
 			this.scheduler.addJob({ id: "cleanup-orphaned", template: "cleanup-orphaned", active: true });
-			this.scheduler.addJob({ id: "cleanup-retention", template: "cleanup-retention-job", active: true, repeat: 24 * 60 * 60 * 1000 });
 
 			return true;
-		} catch (error: unknown) {
+		} catch (error: any) {
 			this.logger.error({
-				message: `Failed to initialize SuperSimpleQueue: ${error instanceof Error ? error.message : String(error)}`,
+				message: "Failed to initialize SuperSimpleQueue",
 				service: SERVICE_NAME,
 				method: "init",
+				details: error,
 			});
 			return false;
 		}
 	};
 
-	addJob = async (monitorId: string, monitor: Monitor) => {
+	addJob = async (monitorId: string, monitor: any) => {
 		this.scheduler.addJob({
 			id: monitorId,
 			template: "monitor-job",
@@ -144,12 +143,12 @@ export class SuperSimpleQueue implements ISuperSimpleQueue {
 		}
 	};
 
-	deleteJob = async (monitor: Monitor) => {
+	deleteJob = async (monitor: any) => {
 		this.scheduler.removeJob(monitor.id);
 		this.scheduler.removeJob(`${monitor.id}-geo`);
 	};
 
-	pauseJob = async (monitor: Monitor) => {
+	pauseJob = async (monitor: any) => {
 		const result = await this.scheduler.pauseJob(monitor.id);
 		if (result === false) {
 			throw new Error("Failed to pause monitor");
@@ -162,7 +161,7 @@ export class SuperSimpleQueue implements ISuperSimpleQueue {
 		});
 	};
 
-	resumeJob = async (monitor: Monitor) => {
+	resumeJob = async (monitor: any) => {
 		const result = await this.scheduler.resumeJob(monitor.id);
 		if (result === false) {
 			throw new Error("Failed to resume monitor");
@@ -177,7 +176,7 @@ export class SuperSimpleQueue implements ISuperSimpleQueue {
 		});
 	};
 
-	updateJob = async (monitor: Monitor) => {
+	updateJob = async (monitor: any) => {
 		this.scheduler.updateJob(monitor.id, { repeat: monitor.interval, data: monitor });
 
 		// Handle geo check job lifecycle
@@ -245,8 +244,8 @@ export class SuperSimpleQueue implements ISuperSimpleQueue {
 				failingJobs: 0,
 				jobsWithFailures: [] as Array<{
 					monitorId: string | number;
-					monitorUrl: string;
+					monitorUrl: any;
-					monitorType: MonitorType;
+					monitorType: any;
 					failedAt: number | null;
 					failCount: number;
 					failReason: string | null;

server/src/service/infrastructure/SuperSimpleQueue/SuperSimpleQueueHelper.ts

@@ -2,16 +2,8 @@ const SERVICE_NAME = "JobQueueHelper";
 import type { Monitor } from "@/types/monitor.js";
 import { supportsGeoCheck } from "@/types/monitor.js";
 import { AppError } from "@/utils/AppError.js";
-import {
+import { INetworkService, INotificationsService, IStatusService, IncidentService, type IGeoChecksService } from "@/service/index.js";
-	ICheckService,
+import type { StatusChangeResult } from "@/types/index.js";
-	INetworkService,
-	INotificationsService,
-	ISettingsService,
-	IStatusService,
-	IncidentService,
-	type IGeoChecksService,
-} from "@/service/index.js";
-import { CHECK_TTL_SENTINEL, type MaintenanceWindow, type StatusChangeResult } from "@/types/index.js";
 import {
 	IMaintenanceWindowsRepository,
 	IMonitorsRepository,
@@ -26,10 +18,9 @@ import { IBufferService } from "@/service/index.js";
 
 export interface ISuperSimpleQueueHelper {
 	readonly serviceName: string;
-	getHeartbeatJob(): (monitor: Monitor) => Promise<void>;
+	getMonitorJob(): (monitor: Monitor) => Promise<void>;
-	getHeartbeatGeoJob(): (monitor: Monitor) => Promise<void>;
 	getCleanupOrphanedJob(): () => Promise<void>;
-	getCleanupRetentionJob(): () => Promise<void>;
+	getGeoCheckJob(): (monitor: Monitor) => Promise<void>;
 	isInMaintenanceWindow(monitorId: string, teamId: string): Promise<boolean>;
 }
 
@@ -50,12 +41,11 @@ export interface MonitorActionDecision {
 export class SuperSimpleQueueHelper implements ISuperSimpleQueueHelper {
 	static SERVICE_NAME = SERVICE_NAME;
 
-	private logger: ILogger;
+	private logger: any;
 	private networkService: INetworkService;
 	private statusService: IStatusService;
 	private notificationsService: INotificationsService;
-	private checkService: ICheckService;
+	private checkService: any;
-	private settingsService: ISettingsService;
 	private buffer: IBufferService;
 	private incidentService: IncidentService;
 	private maintenanceWindowsRepository: IMaintenanceWindowsRepository;
@@ -72,8 +62,7 @@ export class SuperSimpleQueueHelper implements ISuperSimpleQueueHelper {
 		networkService: INetworkService,
 		statusService: IStatusService,
 		notificationsService: INotificationsService,
-		checkService: ICheckService,
+		checkService: any,
-		settingsService: ISettingsService,
 		buffer: IBufferService,
 		incidentService: IncidentService,
 		maintenanceWindowsRepository: IMaintenanceWindowsRepository,
@@ -89,7 +78,6 @@ export class SuperSimpleQueueHelper implements ISuperSimpleQueueHelper {
 		this.networkService = networkService;
 		this.statusService = statusService;
 		this.checkService = checkService;
-		this.settingsService = settingsService;
 		this.buffer = buffer;
 		this.notificationsService = notificationsService;
 		this.incidentService = incidentService;
@@ -107,7 +95,7 @@ export class SuperSimpleQueueHelper implements ISuperSimpleQueueHelper {
 		return SuperSimpleQueueHelper.SERVICE_NAME;
 	}
 
-	getHeartbeatJob = () => {
+	getMonitorJob = () => {
 		return async (monitor: Monitor) => {
 			try {
 				const monitorId = monitor.id;
@@ -138,7 +126,7 @@ export class SuperSimpleQueueHelper implements ISuperSimpleQueueHelper {
 				}
 
 				// Step 3.  Build check
-				const check = this.checkService.buildCheck(status);
+				const check = await this.checkService.buildCheck(status);
 				if (!check) {
 					this.logger.warn({
 						message: `No check could be built for monitor ${monitorId}`,
@@ -158,31 +146,33 @@ export class SuperSimpleQueueHelper implements ISuperSimpleQueueHelper {
 
 				// Step 6. Handle notifications (best effort, continue even in event of failure, don't wait)
 				if (decision.shouldSendNotification) {
-					this.notificationsService.handleNotifications(statusChangeResult.monitor, status, decision).catch((error: unknown) => {
+					this.notificationsService.handleNotifications(statusChangeResult.monitor, status, decision).catch((error: any) => {
 						this.logger.error({
-							message: `Error sending notifications for job ${statusChangeResult.monitor.id}: ${error instanceof Error ? error.message : "Unknown error"}`,
+							message: error.message,
 							service: SERVICE_NAME,
 							method: "getMonitorJob",
-							stack: error instanceof Error ? error.stack : undefined,
+							details: `Error sending notifications for job ${statusChangeResult.monitor.id}: ${error.message}`,
+							stack: error.stack,
 						});
 					});
 				}
 
 				// Step 7. Handle incidents (best effort, don't wait)
-				this.incidentService.handleIncident(statusChangeResult.monitor, statusChangeResult.code, decision, status).catch((error: unknown) => {
+				this.incidentService.handleIncident(statusChangeResult.monitor, statusChangeResult.code, decision, status).catch((error: any) => {
 					this.logger.warn({
-						message: `Error handling incident for job ${monitor.id}: ${error instanceof Error ? error.message : "Unknown error"}`,
+						message: error.message,
 						service: SERVICE_NAME,
 						method: "getMonitorJob",
-						stack: error instanceof Error ? error.stack : undefined,
+						details: `Error handling incident for job ${monitor.id}: ${error.message}`,
+						stack: error.stack,
 					});
 				});
-			} catch (error: unknown) {
+			} catch (error: any) {
 				this.logger.warn({
-					message: error instanceof Error ? error.message : "Unknown error",
+					message: error.message,
-					service: SERVICE_NAME,
+					service: error.service || SERVICE_NAME,
-					method: "getMonitorJob",
+					method: error.method || "getMonitorJob",
-					stack: error instanceof Error ? error.stack : undefined,
+					stack: error.stack,
 				});
 				throw error;
 			}
@@ -268,19 +258,19 @@ export class SuperSimpleQueueHelper implements ISuperSimpleQueueHelper {
 					service: SERVICE_NAME,
 					method: "getCleanupOrphanedJob",
 				});
-			} catch (error: unknown) {
+			} catch (error: any) {
 				this.logger.warn({
-					message: error instanceof Error ? error.message : "Unknown error",
+					message: error.message,
 					service: SERVICE_NAME,
 					method: "getCleanupOrphanedJob",
-					stack: error instanceof Error ? error.stack : undefined,
+					stack: error.stack,
 				});
 				throw error;
 			}
 		};
 	};
 
-	getHeartbeatGeoJob = () => {
+	getGeoCheckJob = () => {
 		return async (monitor: Monitor) => {
 			try {
 				const monitorId = monitor.id;
@@ -288,7 +278,7 @@ export class SuperSimpleQueueHelper implements ISuperSimpleQueueHelper {
 
 				// Step 1: Validate monitor eligibility
 				if (!monitorId) {
-					throw new AppError({ message: "No monitor id", service: SERVICE_NAME, method: "getHeartbeatGeoJob" });
+					throw new AppError({ message: "No monitor id", service: SERVICE_NAME, method: "getGeoCheckJob" });
 				}
 
 				if (!monitor.geoCheckEnabled) {
@@ -298,7 +288,7 @@ export class SuperSimpleQueueHelper implements ISuperSimpleQueueHelper {
 					this.logger.debug({
 						message: `Monitor ${monitorId} type does not support geo checks, skipping`,
 						service: SERVICE_NAME,
-						method: "getHeartbeatGeoJob",
+						method: "getGeoCheckJob",
 					});
 					return;
 				}
@@ -307,7 +297,7 @@ export class SuperSimpleQueueHelper implements ISuperSimpleQueueHelper {
 					this.logger.warn({
 						message: `No geo check locations configured for monitor ${monitorId}`,
 						service: SERVICE_NAME,
-						method: "getHeartbeatGeoJob",
+						method: "getGeoCheckJob",
 					});
 					return;
 				}
@@ -318,7 +308,7 @@ export class SuperSimpleQueueHelper implements ISuperSimpleQueueHelper {
 					this.logger.debug({
 						message: `Monitor ${monitorId} is in maintenance window, skipping geo check`,
 						service: SERVICE_NAME,
-						method: "getHeartbeatGeoJob",
+						method: "getGeoCheckJob",
 					});
 					return;
 				}
@@ -329,7 +319,7 @@ export class SuperSimpleQueueHelper implements ISuperSimpleQueueHelper {
 					this.logger.warn({
 						message: `No geo check could be built for monitor ${monitorId}`,
 						service: SERVICE_NAME,
-						method: "getHeartbeatGeoJob",
+						method: "getGeoCheckJob",
 					});
 					return;
 				}
@@ -340,14 +330,14 @@ export class SuperSimpleQueueHelper implements ISuperSimpleQueueHelper {
 				this.logger.debug({
 					message: `Geo check job executed for monitor ${monitorId}`,
 					service: SERVICE_NAME,
-					method: "getHeartbeatGeoJob",
+					method: "getGeoCheckJob",
 				});
-			} catch (error: unknown) {
+			} catch (error: any) {
 				this.logger.error({
-					message: error instanceof Error ? error.message : "Unknown error",
+					message: error.message,
 					service: SERVICE_NAME,
-					method: "getHeartbeatGeoJob",
+					method: "getGeoCheckJob",
-					stack: error instanceof Error ? error.stack : undefined,
+					stack: error.stack,
 				});
 				// Don't throw - geo check failures shouldn't crash the job scheduler
 			}
@@ -357,7 +347,7 @@ export class SuperSimpleQueueHelper implements ISuperSimpleQueueHelper {
 	async isInMaintenanceWindow(monitorId: string, teamId: string) {
 		const maintenanceWindows = await this.maintenanceWindowsRepository.findByMonitorId(monitorId, teamId);
 		// Check for active maintenance window:
-		const maintenanceWindowIsActive = maintenanceWindows.reduce((acc: boolean, window: MaintenanceWindow) => {
+		const maintenanceWindowIsActive = maintenanceWindows.reduce((acc: any, window: any) => {
 			if (window.active) {
 				const start = new Date(window.start);
 				const end = new Date(window.end);
@@ -384,40 +374,6 @@ export class SuperSimpleQueueHelper implements ISuperSimpleQueueHelper {
 		return maintenanceWindowIsActive;
 	}
 
-	getCleanupRetentionJob = () => {
-		return async () => {
-			try {
-				const settings = await this.settingsService.getDBSettings();
-
-				const checkTTL = settings.checkTTL; // Check TTL is in DAYS, not MS
-
-				if (checkTTL === CHECK_TTL_SENTINEL) {
-					this.logger.info({
-						message: `Check TTL is set to unlimited, skipping cleanup`,
-						service: SERVICE_NAME,
-						method: "getCleanupRetentionJob",
-					});
-					return;
-				}
-				const checkTTLInMs = checkTTL * 24 * 60 * 60 * 1000;
-				const cutoffDate = new Date(Date.now() - checkTTLInMs);
-				const deleteCount = await this.checkService.deleteOlderThan(cutoffDate);
-				this.logger.info({
-					message: `Deleted ${deleteCount} checks older than ${cutoffDate.toISOString()}`,
-					service: SERVICE_NAME,
-					method: "getCleanupRetentionJob",
-				});
-			} catch (error: unknown) {
-				this.logger.error({
-					message: error instanceof Error ? error.message : "Unknown error",
-					service: SERVICE_NAME,
-					method: "getCleanupRetentionJob",
-					stack: error instanceof Error ? error.stack : undefined,
-				});
-			}
-		};
-	};
-
 	private evaluateMonitorAction(statusChangeResult: StatusChangeResult): MonitorActionDecision {
 		const { monitor, statusChanged, prevStatus } = statusChangeResult;
 

server/src/service/infrastructure/network/AdvancedMatcher.ts

@@ -2,11 +2,7 @@ import { Monitor } from "@/types/monitor.js";
 import jmespath from "jmespath";
 type JmesPath = typeof jmespath;
 
-export interface IAdvancedMatcher {
+export class AdvancedMatcher {
-	validate<T>(payload: T, monitor: Monitor): { ok: boolean; message: string; extracted?: T | undefined };
-}
-
-export class AdvancedMatcher implements IAdvancedMatcher {
 	constructor(private jmespath: JmesPath) {}
 
 	private compare(actual: unknown, expected: string, method?: string): boolean {
@@ -16,7 +12,7 @@ export class AdvancedMatcher implements IAdvancedMatcher {
 		return String(actual) === expected; // Default
 	}
 
-	validate<T>(payload: T, monitor: Monitor): { ok: boolean; message: string; extracted?: T | undefined } {
+	validate<T>(payload: T, monitor: Monitor): { ok: boolean; message: string; extracted?: any } {
 		const { useAdvancedMatching, jsonPath, matchMethod, expectedValue } = monitor;
 		if (!useAdvancedMatching) return { ok: true, message: "Success" };
 
@@ -39,10 +35,10 @@ export class AdvancedMatcher implements IAdvancedMatcher {
 			};
 		}
 
-		const isFalsy = dataToValidate === false || dataToValidate === "false" || dataToValidate === undefined || dataToValidate === null;
+		const isFalsey = dataToValidate === false || dataToValidate === "false" || dataToValidate === undefined || dataToValidate === null;
 		return {
-			ok: !isFalsy,
+			ok: !isFalsey,
-			message: !isFalsy ? "Success" : "Extracted value is falsy",
+			message: !isFalsey ? "Success" : "Extracted value is falsey",
 			extracted: dataToValidate,
 		};
 	}

server/src/service/infrastructure/network/HttpProvider.ts

@@ -1,5 +1,5 @@
 import { type Got, HTTPError, RequestError } from "got";
-import { IAdvancedMatcher } from "@/service/infrastructure/network/AdvancedMatcher.js";
+import { AdvancedMatcher } from "@/service/infrastructure/network/AdvancedMatcher.js";
 import { IStatusProvider } from "@/service/infrastructure/network/IStatusProvider.js";
 import { HttpStatusPayload } from "@/types/network.js";
 import { MonitorStatusResponse } from "@/types/network.js";
@@ -13,9 +13,9 @@ export class HttpProvider implements IStatusProvider<HttpStatusPayload> {
 
 	constructor(
 		private got: Got,
-		private advancedMatcher: IAdvancedMatcher
+		private advancedMatcher: AdvancedMatcher
 	) {
-		const cacheable = new CacheableLookup({ maxTtl: 300, errorTtl: 30 });
+		const cacheable = new CacheableLookup();
 		this.got = got.extend({
 			dnsCache: cacheable,
 			timeout: {

server/src/service/infrastructure/networkService.ts

@@ -1,4 +1,4 @@
-import type { Monitor, MonitorStatusResponse, MonitorPayloadMap, MonitorType } from "@/types/index.js";
+import type { Monitor, MonitorStatusResponse } from "@/types/index.js";
 import type { AxiosStatic } from "axios";
 import { AppError } from "@/utils/AppError.js";
 import { NETWORK_ERROR } from "@/service/infrastructure/network/utils.js";
@@ -8,7 +8,7 @@ const SERVICE_NAME = "NetworkService";
 
 export interface INetworkService {
 	readonly serviceName: string;
-	requestStatus<T extends MonitorType>(monitor: Monitor & { type: T }): Promise<MonitorStatusResponse<MonitorPayloadMap[T]>>;
+	requestStatus(monitor: Monitor): Promise<MonitorStatusResponse<unknown>>;
 	requestWebhook(
 		type: string,
 		url: string,
@@ -43,12 +43,12 @@ export class NetworkService implements INetworkService {
 	}
 
 	// Main entry point
-	async requestStatus<T extends MonitorType>(monitor: Monitor & { type: T }): Promise<MonitorStatusResponse<MonitorPayloadMap[T]>> {
+	async requestStatus(monitor: Monitor) {
 		const provider = this.providers.find((p) => p.supports(monitor.type));
 		if (!provider) {
-			return this.handleUnsupportedType(monitor.type) as Promise<MonitorStatusResponse<MonitorPayloadMap[T]>>;
+			return this.handleUnsupportedType(monitor.type);
 		}
-		return provider.handle(monitor) as Promise<MonitorStatusResponse<MonitorPayloadMap[T]>>;
+		return provider.handle(monitor);
 	}
 
 	private async handleUnsupportedType(type: string): Promise<MonitorStatusResponse> {

server/src/service/infrastructure/notificationMessageBuilder.ts

@@ -145,9 +145,9 @@ export class NotificationMessageBuilder implements INotificationMessageBuilder {
 	}
 
 	private buildThresholdBreachContent(monitor: Monitor, monitorStatusResponse: MonitorStatusResponse<HardwareStatusPayload>): NotificationContent {
-		const title = `Threshold Exceeded: ${monitor.name}`;
+		const title = `Threshold Breach: ${monitor.name}`;
-		const summary = `Monitor "${monitor.name}" has exceeded one or more thresholds.`;
+		const summary = `Monitor "${monitor.name}" has breached one or more thresholds.`;
-		const details = [`URL: ${monitor.url}`, `Status: Threshold exceeded`, `Type: ${monitor.type}`];
+		const details = [`URL: ${monitor.url}`, `Status: Breached`, `Type: ${monitor.type}`];
 
 		const thresholds = this.extractThresholdBreaches(monitor, monitorStatusResponse);
 

server/src/service/infrastructure/notificationProviders/INotificationProvider.ts

@@ -3,5 +3,5 @@ import type { NotificationMessage } from "@/types/notificationMessage.js";
 
 export interface INotificationProvider {
 	sendMessage: (notification: Notification, message: NotificationMessage) => Promise<boolean>;
-	sendTestAlert(notification: Partial<Notification>): Promise<boolean>;
+	sendTestAlert(notification: Notification): Promise<boolean>;
 }

server/src/service/infrastructure/notificationProviders/discord.ts

@@ -13,7 +13,7 @@ export class DiscordProvider implements INotificationProvider {
 		this.logger = logger;
 	}
 
-	sendTestAlert = async (notification: Partial<Notification>) => {
+	sendTestAlert = async (notification: Notification) => {
 		if (!notification.address) {
 			return false;
 		}

server/src/service/infrastructure/notificationProviders/email.ts

@@ -14,7 +14,7 @@ export class EmailProvider implements INotificationProvider {
 		this.logger = logger;
 	}
 
-	async sendTestAlert(notification: Partial<Notification>): Promise<boolean> {
+	async sendTestAlert(notification: Notification): Promise<boolean> {
 		const subject = "Test notification";
 		const html = await buildTestEmail(this.emailService);
 
@@ -84,7 +84,7 @@ export class EmailProvider implements INotificationProvider {
 			case "monitor_up":
 				return `Monitor ${message.monitor.name} is back up`;
 			case "threshold_breach":
-				return `Monitor ${message.monitor.name} threshold exceeded`;
+				return `Monitor ${message.monitor.name} threshold breached`;
 			case "threshold_resolved":
 				return `Monitor ${message.monitor.name} thresholds resolved`;
 			default:

server/src/service/infrastructure/notificationProviders/matrix.ts

@@ -13,7 +13,7 @@ export class MatrixProvider implements INotificationProvider {
 		this.logger = logger;
 	}
 
-	sendTestAlert = async (notification: Partial<Notification>) => {
+	sendTestAlert = async (notification: Notification) => {
 		const { homeserverUrl, accessToken, roomId } = notification;
 		if (!homeserverUrl || !accessToken || !roomId) {
 			return false;

server/src/service/infrastructure/notificationProviders/pagerduty.ts

@@ -14,7 +14,7 @@ export class PagerDutyProvider implements INotificationProvider {
 		this.logger = logger;
 	}
 
-	async sendTestAlert(notification: Partial<Notification>): Promise<boolean> {
+	async sendTestAlert(notification: Notification): Promise<boolean> {
 		try {
 			await got.post("https://events.pagerduty.com/v2/enqueue", {
 				json: {