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.
-3. Open an issue if you believe you've encountered a bug.
-4. Check for good-first-issue's if you are a newcomer.
-5. Make a pull request to add new features/make quality-of-life improvements/fix bugs.
-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).
+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. Read a detailed structure of [Checkmate](https://deepwiki.com/bluewave-labs/Checkmate) if you would like to deep dive into the architecture.
+4. Open an issue if you believe you've encountered a bug.
+5. Check for good-first-issue's if you are a newcomer.
+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/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,
-			formatDisplayValue,
-			value,
-			sliderMaxWidth = "100%",
-			...props
-		},
+		{ fieldLabel, required, showValue = true, 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/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

@@ -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;
@@ -463,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,14 +21,14 @@ 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 timezones from "@/Utils/timezones.json";
 import { useNavigate, useParams } from "react-router-dom";
 import axios from "axios";
@@ -39,22 +39,6 @@ interface TimezoneOption {
 	name: string;
 }
 
-const MONITOR_TYPE_KEYS: Record<string, 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",
-};
-
-const getMonitorTypeLabel = (type: string, t: (key: string) => string): string => {
-	const i18nMonitorKey = MONITOR_TYPE_KEYS[type];
-	return i18nMonitorKey ? t(i18nMonitorKey) : type;
-};
-
 const CreateStatusPage = () => {
 	const theme = useTheme();
 	const { t } = useTranslation();
@@ -65,12 +49,10 @@ const CreateStatusPage = () => {
 
 	// Fetch existing status page data when configuring
 	const { data: statusPageData, isLoading: isLoadingStatusPage } =
-		useGet<StatusPageResponse>(
-			isCreate ? null : `/status-page/${url}?type=uptime&type=infrastructure`
-		);
+		useGet<StatusPageResponse>(isCreate ? null : `/status-page/${url}?type=uptime`);
 
 	const { data: monitorsResponse } = useGet<Monitor[]>(
-		"/monitors/team?type=http&type=ping&type=port&type=docker&type=hardware"
+		"/monitors/team?type=http&type=ping&type=port&type=docker"
 	);
 	const monitors = monitorsResponse ?? [];
 
@@ -99,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"];
-	}, [JSON.stringify(watchedMonitorIds), monitors]);
-
-	useEffect(() => {
-		form.setValue("type", computedTypes);
-	}, [computedTypes]);
-
 	const onError = (errors: any) => {
 		logger.debug("Status page validation errors", errors);
 	};
@@ -139,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);
@@ -147,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
@@ -343,9 +303,7 @@ const CreateStatusPage = () => {
 																		}}
 																	>
 																		<GripVertical size={20} />
-																		<Typography
-																			flexGrow={1}
-																		>{`${monitor.name} (${getMonitorTypeLabel(monitor.type, t)})`}</Typography>
+																		<Typography flexGrow={1}>{monitor.name}</Typography>
 																		<IconButton
 																			size="small"
 																			onClick={() => {
@@ -467,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,15 +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 type { RootState } from "@/Types/state";
-import { LAYOUT, SPACING } from "@/Utils/Theme/constants";
 
 interface StatusPageMonitor extends Monitor {
 	checks?: Monitor["recentChecks"];
@@ -24,87 +22,6 @@ interface MonitorsListProps {
 	monitors: StatusPageMonitor[];
 }
 
-const getMonitorBadgeStyles = (monitorType: string, theme: Theme) => {
-	// for future: specific badge styles can be defined here based on monitor type
-	const badgeConfig: Record<string, { color: string; bg: string }> = {
-		hardware: {
-			color: theme.palette.background.paper,
-			bg: theme.palette.info.light,
-		},
-		http: {
-			color: theme.palette.background.paper,
-			bg: theme.palette.success.light,
-		},
-		ping: {
-			color: theme.palette.background.paper,
-			bg: theme.palette.success.light,
-		},
-		port: {
-			color: theme.palette.background.paper,
-			bg: theme.palette.success.light,
-		},
-		docker: {
-			color: theme.palette.background.paper,
-			bg: theme.palette.success.light,
-		},
-		pagespeed: {
-			color: theme.palette.background.paper,
-			bg: theme.palette.success.light,
-		},
-		game: {
-			color: theme.palette.background.paper,
-			bg: theme.palette.success.light,
-		},
-	};
-
-	const config = badgeConfig[monitorType] ?? badgeConfig.http;
-	return {
-		backgroundColor: config.bg,
-		color: config.color,
-		padding: `${theme.spacing(SPACING.SM)} ${theme.spacing(SPACING.LG)}`,
-		borderRadius: theme.shape.borderRadius,
-	};
-};
-
-// Extracted component for monitor content below the header row
-const MonitorContent = ({
-	monitor,
-	statusPage,
-	chartType,
-}: {
-	monitor: Monitor & { checks?: Monitor["recentChecks"] };
-	statusPage: StatusPage;
-	chartType: string;
-}) => {
-	const theme = useTheme();
-	const isInfrastructureMonitor = monitor?.type === "hardware";
-
-	if (isInfrastructureMonitor) {
-		if (statusPage.showInfrastructure === false) {
-			return null;
-		}
-		return <InfrastructureMetrics monitor={monitor} />;
-	}
-
-	if (statusPage.showCharts === false) {
-		return null;
-	}
-
-	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={monitor?.checks?.slice().reverse() ?? []}
-				/>
-			) : (
-				<HeatmapResponseTime checks={monitor?.checks?.slice().reverse() ?? []} />
-			)}
-		</Box>
-	);
-};
-
 export const MonitorsList = ({ statusPage, monitors }: MonitorsListProps) => {
 	const theme = useTheme();
 	const { t } = useTranslation();
@@ -114,12 +31,11 @@ export const MonitorsList = ({ statusPage, monitors }: MonitorsListProps) => {
 	const [chartType, setChartType] = useState<"histogram" | "heatmap">("histogram");
 
 	return (
-		<Stack gap={theme.spacing(LAYOUT.MD)}>
-			{statusPage.showCharts && (
+		<Stack gap={theme.spacing(8)}>
+			{statusPage.showCharts !== false && (
 				<Stack
 					direction={"row"}
 					alignItems={"center"}
-					gap={theme.spacing(LAYOUT.SM)}
 				>
 					<Typography>{t("pages.statusPages.monitorsList.chartTypeHeatmap")}</Typography>
 					<SwitchComponent
@@ -140,62 +56,52 @@ export const MonitorsList = ({ statusPage, monitors }: MonitorsListProps) => {
 				return (
 					<BaseBox
 						key={monitor.id}
-						padding={theme.spacing(LAYOUT.MD)}
+						padding={theme.spacing(4)}
 					>
 						<Stack
 							direction="row"
 							alignItems="center"
 							justifyContent="space-between"
-							gap={theme.spacing(LAYOUT.XS)}
-							mb={theme.spacing(LAYOUT.XS)}
+							gap={theme.spacing(4)}
+							mb={statusPage.showCharts !== false ? theme.spacing(4) : 0}
 						>
 							<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",
+									}}
 								>
-									<Typography
-										variant="h6"
-										sx={{
-											overflow: "hidden",
-											textOverflow: "ellipsis",
-											whiteSpace: "nowrap",
-										}}
-									>
-										{monitor.name}
-									</Typography>
-									<Typography
-										variant="caption"
-										sx={getMonitorBadgeStyles(monitor?.type ?? "", theme)}
-									>
-										{t(
-											`pages.common.monitors.monitorTypes.option${monitor?.type.charAt(0).toUpperCase() + monitor?.type.slice(1)}`
-										)}
-									</Typography>
-								</Stack>
-								{showURL && monitor?.url && (
+									{monitor.name}
+								</Typography>
+								{showURL && (
 									<Typography
 										variant="body2"
-										color={theme.palette.text.secondary}
-										sx={{
-											overflow: "hidden",
-											textOverflow: "ellipsis",
-											whiteSpace: "nowrap",
-										}}
+										color="text.secondary"
 									>
 										{monitor.url}
 									</Typography>
 								)}
 							</Box>
-							<StatusLabel status={monitor?.status} />
+							<StatusLabel status={monitor.status} />
 						</Stack>
-						<MonitorContent
-							monitor={monitor}
-							statusPage={statusPage}
-							chartType={chartType}
-						/>
+						{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>
 				);
 			})}

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

@@ -23,17 +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>(apiUrl);
 
 	const statusPage = data?.statusPage;
 	const monitors = data?.monitors ?? [];
-	const infrastructureMonitors = data?.infrastructureMonitors ?? [];
 
 	if (!statusPage) return null;
 
-	if (monitors?.length === 0 && infrastructureMonitors?.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,11 +1,10 @@
 import type { Monitor } from "@/Types/Monitor";
-export type MonitorDisplayType = "uptime" | "infrastructure";
 
 export interface StatusPage {
 	id: string;
 	userId: string;
 	teamId: string;
-	type: MonitorDisplayType[];
+	type: string;
 	companyName: string;
 	url: string;
 	timezone?: string;
@@ -21,7 +20,6 @@ export interface StatusPage {
 	showCharts: boolean;
 	showUptimePercentage: boolean;
 	showAdminLoginLink: boolean;
-	showInfrastructure: boolean;
 	customCSS: string;
 	createdAt: string;
 	updatedAt: string;
@@ -30,5 +28,4 @@ export interface StatusPage {
 export interface StatusPageResponse {
 	statusPage: StatusPage;
 	monitors: Monitor[];
-	infrastructureMonitors?: Monitor[];
 }

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({
@@ -12,11 +11,7 @@ export const settingsSchema = z.object({
 	systemEmailSecure: z.boolean().optional(),
 	systemEmailPool: z.boolean().optional(),
 	showURL: z.boolean().optional(),
-	checkTTL: z
-		.number()
-		.int()
-		.min(1, "Please enter a value")
-		.max(CHECK_TTL_SENTINEL, `Maximum ${CHECK_TTL_SENTINEL}`),
+	checkTTL: z.number().int().min(1, "Please enter a value").max(365, "Maximum 365 days"),
 	pagespeedApiKey: z
 		.string()
 		.transform((val) => (val.trim() === "" ? undefined : val.trim()))

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
-		.alternatives()
-		.try(
-			joi.string().valid("uptime", "infrastructure"),
-			joi.array().items(joi.string().valid("uptime", "infrastructure"))
-		)
-		.required(),
+	type: joi.string().valid("uptime").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

@@ -407,17 +407,6 @@
 					"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",
-				"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"
-				}
+				"chartTypeHistogram": "Histogram"
 			},
 			"statusBar": {
 				"allDown": "All systems are down",
@@ -1289,9 +1260,6 @@
 						},
 						"showAdminLoginLink": {
 							"label": "Show admin login link"
-						},
-						"showInfrastructure": {
-							"label": "Show infrastructure metrics"
 						}
 					}
 				}

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,16 +20,15 @@ import {
 	editSuperadminUserByIdBodyValidation,
 	editUserPasswordByIdBodyValidation,
 } from "@/validation/userValidation.js";
-import { IUserService } from "@/service/index.js";
 
 const SERVICE_NAME = "authController";
 
 class AuthController {
 	static SERVICE_NAME = SERVICE_NAME;
 
-	private userService: IUserService;
+	private userService: any;
 
-	constructor(userService: IUserService) {
+	constructor(userService: any) {
 		this.userService = userService;
 	}
 
@@ -41,12 +41,11 @@ class AuthController {
 			const newUser = req.body.user;
 			const newUserToken = req.body.token;
 			if (newUser?.email) {
-				const newUserEmail = requireUserEmail(newUser.email);
-				newUser.email = newUserEmail.toLowerCase();
+				newUser.email = newUser.email.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",
@@ -63,11 +62,11 @@ class AuthController {
 			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 newUser = await this.userService.createUser(validatedBody, teamId, actorRoles, req?.file ?? null);
+			const actorRoles = requireUserRoles(req.user?.role) as UserRole[];
+			const newUser = await this.userService.createUser(userData, teamId, actorRoles, req.file);
 			res.status(201).json({
 				success: true,
 				msg: "User created successfully",
@@ -101,10 +100,8 @@ class AuthController {
 
 	editUser = async (req: Request, res: Response, next: NextFunction) => {
 		try {
-			const validatedBody = editUserBodyValidation.parse(req.body);
-			const userId = requireUserId(req.user?.id);
-			const userEmail = requireUserEmail(req.user?.email);
-			const updatedUser = await this.userService.editUser(validatedBody, req?.file ?? null, userId, userEmail);
+			editUserBodyValidation.parse(req.body);
+			const updatedUser = await this.userService.editUser(req.body, req.file, req.user);
 
 			res.status(200).json({
 				success: true,
@@ -173,15 +170,7 @@ class AuthController {
 
 	deleteUser = async (req: Request, res: Response, next: NextFunction) => {
 		try {
-			const userId = requireUserId(req.user?.id);
-			const teamId = requireTeamId(req.user?.teamId);
-			const roles = requireUserRoles(req.user?.role);
-
-			await this.userService.deleteUser({
-				userId,
-				teamId,
-				roles,
-			});
+			await this.userService.deleteUser(req.user);
 			return res.status(200).json({
 				success: true,
 				msg: "User deleted successfully",
@@ -193,12 +182,9 @@ class AuthController {
 
 	deleteUserById = async (req: Request, res: Response, next: NextFunction) => {
 		try {
-			const validatedParams = getUserByIdParamValidation.parse(req.params);
-			const targetUserId = validatedParams.userId;
-			const actorId = requireUserId(req.user?.id);
-			const actorTeamId = requireTeamId(req.user?.teamId);
-			const actorRoles = requireUserRoles(req.user?.role);
-			await this.userService.deleteUserById({ actorId, actorTeamId, actorRoles, targetUserId });
+			getUserByIdParamValidation.parse(req.params);
+			const targetUserId = req.params.userId;
+			await this.userService.deleteUserById(req.user, targetUserId);
 			return res.status(200).json({
 				success: true,
 				msg: "User removed successfully",
@@ -223,9 +209,19 @@ class AuthController {
 
 	getUserById = async (req: Request, res: Response, next: NextFunction) => {
 		try {
-			const validatedParams = getUserByIdParamValidation.parse(req.params);
-			const actorRoles = requireUserRoles(req.user?.role);
-			const user = await this.userService.getUserById(actorRoles, validatedParams.userId);
+			getUserByIdParamValidation.parse(req.params);
+			const userId = req?.params?.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) {
@@ -235,19 +231,24 @@ class AuthController {
 
 	editUserById = async (req: Request, res: Response, next: NextFunction) => {
 		try {
-			const actorRoles = requireUserRoles(req.user?.role);
-			const actorId = requireUserId(req.user?.id);
+			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);
-			// If this is superadmin self edit, allow "superadmin" role
-			const validatedBody =
-				validatedParams.userId === actorId ? editSuperadminUserByIdBodyValidation.parse(req.body) : editUserByIdBodyValidation.parse(req.body);
+			const userId = req.params.userId as string;
+			const user = { ...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);
@@ -256,14 +257,16 @@ class AuthController {
 
 	editUserPasswordById = async (req: Request, res: Response, next: NextFunction) => {
 		try {
-			const actorRoles = requireUserRoles(req.user?.role);
-			if (!actorRoles.includes("superadmin")) {
+			const roles = req?.user?.role;
+			if (!roles || !roles.includes("superadmin")) {
 				throw new AppError({ message: "Unauthorized", status: 403 });
 			}
 
-			const validatedParams = editUserByIdParamValidation.parse(req.params);
-			const validatedBody = editUserPasswordByIdBodyValidation.parse(req.body);
-			await this.userService.setPasswordByUserId(validatedParams.userId, validatedBody.password);
+			const userId = req.params.userId as string;
+			editUserByIdParamValidation.parse(req.params);
+			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,19 +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";
 
 class CheckController {
 	static SERVICE_NAME = SERVICE_NAME;
 
-	private checkService: ICheckService;
-	constructor(checkService: ICheckService) {
+	private checkService: any;
+	constructor(checkService: any) {
 		this.checkService = checkService;
 	}
 
@@ -26,20 +25,13 @@ class CheckController {
 
 	getChecksByMonitor = async (req: Request, res: Response, next: NextFunction) => {
 		try {
-			const validatedParams = getChecksParamValidation.parse(req.params);
-			const validatedQuery = getChecksQueryValidation.parse(req.query);
-
-			const teamId = requireTeamId(req.user?.teamId);
+			getChecksParamValidation.parse(req.params);
+			getChecksQueryValidation.parse(req.query);
 
 			const result = await this.checkService.getChecksByMonitor({
-				monitorId: validatedParams.monitorId,
-				teamId,
-				sortOrder: validatedQuery.sortOrder,
-				dateRange: validatedQuery.dateRange,
-				filter: validatedQuery.filter,
-				page: validatedQuery.page,
-				rowsPerPage: validatedQuery.rowsPerPage,
-				status: validatedQuery.status,
+				monitorId: req?.params?.monitorId,
+				query: req?.query,
+				teamId: req?.user?.teamId,
 			});
 
 			return res.status(200).json({
@@ -54,16 +46,10 @@ class CheckController {
 
 	getChecksByTeam = async (req: Request, res: Response, next: NextFunction) => {
 		try {
-			const validatedQuery = getTeamChecksQueryValidation.parse(req.query);
-			const teamId = requireTeamId(req.user?.teamId);
-
+			getTeamChecksQueryValidation.parse(req.query);
 			const checkData = await this.checkService.getChecksByTeam({
-				teamId,
-				sortOrder: validatedQuery.sortOrder,
-				dateRange: validatedQuery.dateRange,
-				page: validatedQuery.page,
-				rowsPerPage: validatedQuery.rowsPerPage,
-				filter: validatedQuery.filter,
+				teamId: req?.user?.teamId,
+				query: req?.query,
 			});
 			return res.status(200).json({
 				success: true,
@@ -77,11 +63,8 @@ class CheckController {
 
 	getChecksSummaryByTeamId = async (req: Request, res: Response, next: NextFunction) => {
 		try {
-			const validatedQuery = getChecksSummaryByTeamIdQueryValidation.parse(req.query);
-			const teamId = requireTeamId(req.user?.teamId);
-			const dateRange = validatedQuery.dateRange ?? "hour";
-
-			const summary = await this.checkService.getChecksSummaryByTeamId({ teamId, dateRange });
+			const dateRange = req.query?.dateRange || "hour";
+			const summary = await this.checkService.getChecksSummaryByTeamId({ teamId: req?.user?.teamId, dateRange });
 			return res.status(200).json({
 				success: true,
 				msg: "Checks summary retrieved successfully",
@@ -94,12 +77,11 @@ class CheckController {
 
 	deleteChecks = async (req: Request, res: Response, next: NextFunction) => {
 		try {
-			const validatedParams = deleteChecksParamValidation.parse(req.params);
-			const teamId = requireTeamId(req.user?.teamId);
+			deleteChecksParamValidation.parse(req.params);
 
 			const deletedCount = await this.checkService.deleteChecks({
-				monitorId: validatedParams.monitorId,
-				teamId,
+				monitorId: req.params.monitorId as string,
+				teamId: req?.user?.teamId,
 			});
 
 			return res.status(200).json({
@@ -114,9 +96,9 @@ class CheckController {
 
 	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,
@@ -127,6 +109,24 @@ class CheckController {
 			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,12 +1,11 @@
 import { AppError } from "@/utils/AppError.js";
-import { Monitor, type MonitorType, MonitorTypes, UserRole } from "@/types/index.js";
-import sslChecker, { SSLDetails } from "ssl-checker";
-type SSLCheckerType = typeof sslChecker;
+import { type MonitorType, MonitorTypes } from "@/types/index.js";
 
-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");
 	}
@@ -113,7 +112,7 @@ const requireUserEmail = (userEmail?: string): string => {
 	return userEmail;
 };
 
-export const requireUserRoles = (userRoles?: UserRole[]): UserRole[] => {
+export const requireUserRoles = (userRoles?: string[]): string[] => {
 	if (!userRoles || userRoles.length === 0) {
 		throw new AppError({ message: "User roles are required", status: 400 });
 	}

server/src/controllers/diagnosticController.ts

@@ -1,13 +1,12 @@
-import { IDiagnosticService } from "@/service/index.js";
 import { Request, Response, NextFunction } from "express";
 
 const SERVICE_NAME = "diagnosticController";
 class DiagnosticController {
 	static SERVICE_NAME = SERVICE_NAME;
 
-	private diagnosticService: IDiagnosticService;
+	private diagnosticService: any;
 
-	constructor(diagnosticService: IDiagnosticService) {
+	constructor(diagnosticService: any) {
 		this.diagnosticService = diagnosticService;
 	}
 

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

@@ -1,52 +0,0 @@
-import mongoose from "mongoose";
-import { logger } from "@/utils/logger.js";
-import StatusPageModel from "../models/StatusPage.js";
-
-/**
- * Migration: Convert StatusPage `type` field from string to array of strings
- *
- * Old format: { type: "uptime" }
- * New format: { type: ["uptime"] }
- */
-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");
-		}
-
-		// Find all status pages where `type` is a string (not yet migrated)
-		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,7 +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";
 
 type MigrationEntry = {
 	name: string;
@@ -15,7 +14,6 @@ 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?: { info: Function; error: Function }) => {

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/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: [],
+			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/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;
-	constructor(logger: ILogger) {
+	private logger: any;
+	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/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),

server/src/routes/checkRoute.ts

@@ -15,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/service/business/checkService.ts

@@ -1,45 +1,22 @@
 import { Types } from "mongoose";
 import { IChecksRepository, IMonitorsRepository } from "@/repositories/index.js";
-import type {
-	MonitorStatusResponse,
-	CheckErrorInfo,
-	Check,
-	ILighthouseAudit,
-	ChecksQueryResult,
-	ChecksSummary,
-	MonitorPayloadMap,
-} from "@/types/index.js";
+import type { MonitorStatusResponse, CheckErrorInfo, Check, ILighthouseAudit, ChecksQueryResult, ChecksSummary } 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;
-	getChecksByMonitor(params: {
-		monitorId: string;
-		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>;
+	buildCheck(statusResponse: MonitorStatusResponse<PageSpeedStatusPayload | HardwareStatusPayload | undefined>): Partial<Check> | undefined;
+	getChecksByMonitor(params: { monitorId: string; query: Record<string, string>; teamId: string }): Promise<ChecksQueryResult>;
+	getChecksByTeam(params: { teamId: string; query: Record<string, 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: Check = {
+		const check: Partial<Check> = {
 			id: new Types.ObjectId().toString(),
-			createdAt: now,
-			updatedAt: now,
+			createdAt: new Date().toISOString(),
 			metadata: {
 				monitorId,
 				teamId,
@@ -137,25 +112,7 @@ export class CheckService implements ICheckService {
 		return check;
 	};
 
-	getChecksByMonitor = async ({
-		monitorId,
-		teamId,
-		sortOrder,
-		dateRange,
-		filter,
-		page,
-		rowsPerPage,
-		status,
-	}: {
-		monitorId: string;
-		teamId: string;
-		sortOrder: string;
-		dateRange: string;
-		page: number;
-		rowsPerPage: number;
-		status?: boolean;
-		filter?: string;
-	}) => {
+	getChecksByMonitor = async ({ monitorId, query, teamId }: { monitorId: string; query: Record<string, string>; teamId: 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 parsedRowsPerPage = rowsPerPage ?? 5;
+		const { sortOrder, dateRange, filter, page, rowsPerPage, status } = query;
+		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 ({
-		teamId,
-		sortOrder,
-		dateRange,
-		filter,
-		page,
-		rowsPerPage,
-	}: {
-		teamId: string;
-		sortOrder: string;
-		dateRange: string;
-		page: number;
-		rowsPerPage: number;
-		filter?: string;
-	}) => {
-		const parsedPage = page ?? 0;
-		const parsedRowsPerPage = rowsPerPage ?? 5;
+	getChecksByTeam = async ({ teamId, query }: { teamId: string; query: Record<string, string> }) => {
+		const { sortOrder, dateRange, filter, page, rowsPerPage } = query;
+		if (!sortOrder || !dateRange || !page || !rowsPerPage) {
+			throw new AppError({ message: "Missing required query parameters", service: SERVICE_NAME, method: "getChecksByTeam", status: 400 });
+		}
+
+		if (!teamId) {
+			throw new AppError({ message: "No team ID in request", service: SERVICE_NAME, method: "getChecksByTeam", status: 400 });
+		}
+
+		const parsedPage = page ? parseInt(page) : 0;
+		const parsedRowsPerPage = rowsPerPage ? parseInt(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) => {
-		const deletedCount = await this.checksRepository.deleteOlderThan(date);
-		return deletedCount;
+	updateChecksTTL = async ({ teamId, ttl }: { teamId: string; ttl: string }) => {
+		throw new AppError({ message: "Not implemented", service: SERVICE_NAME, method: "updateChecksTTL", status: 500, details: { teamId, ttl } });
 	};
 }

server/src/service/business/monitorService.ts

@@ -18,7 +18,9 @@ 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 { ISuperSimpleQueue } from "../infrastructure/SuperSimpleQueue/SuperSimpleQueue.js";
 
@@ -175,17 +177,23 @@ export class MonitorService implements IMonitorService {
 	};
 
 	addDemoMonitors = async ({ userId, teamId }: { userId: string; teamId: string }): Promise<any[]> => {
-		const demoData = demoMonitorsData;
-		const monitors = demoData.map((monitor) => ({
-			userId,
-			teamId,
-			name: monitor.name,
-			description: monitor.name,
-			type: "http" as const,
-			url: monitor.url,
-			interval: 60000,
-		}));
-		const demoMonitors = await this.monitorsRepository.createMonitors(monitors as unknown as Monitor[]);
+		const __filename = fileURLToPath(import.meta.url);
+		const __dirname = path.dirname(__filename);
+		const demoMonitorsPath = path.resolve(__dirname, "../../utils/demoMonitors.json");
+
+		const demoData = JSON.parse(fs.readFileSync(demoMonitorsPath, "utf8"));
+		const monitors: Monitor[] = demoData.map((monitor: Monitor) => {
+			return {
+				userId,
+				teamId,
+				name: monitor.name,
+				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;

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;
-	registerUser(user: Partial<User>, inviteToken: string, file: Express.Multer.File | null): Promise<{ user: User; token: string }>;
-	createUser(userData: Partial<User>, teamId: string, actorRoles: UserRole[], file: Express.Multer.File | null): Promise<User>;
+	issueToken(payload: Partial<User>, appSettings: { jwtTTL?: string; jwtSecret?: string }): string;
+	registerUser(user: Partial<User>, inviteToken: string, file: unknown): Promise<{ user: User; token: string }>;
+	createUser(userData: Partial<User>, teamId: string, actorRoles: UserRole[], file: unknown): Promise<User>;
 	loginUser(email: string, password: string): Promise<{ user: User; token: string }>;
-	editUser(
-		updates: Partial<User & { newPassword?: string }>,
-		file: Express.Multer.File | null,
-		currentUserId: string,
-		currentUserEmail: string
-	): Promise<User>;
+	editUser(updates: Partial<User & { newPassword?: string }>, file: unknown, currentUser: User): 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>;
-	deleteUserById(params: { actorId: string; actorTeamId: string; actorRoles: UserRole[]; targetUserId: string }): Promise<void>;
+	deleteUser(user: User): 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();
@@ -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) {
@@ -246,19 +239,14 @@ export class UserService implements IUserService {
 		return { user: userWithoutPassword, token };
 	};
 
-	editUser = async (
-		updates: Partial<User & { newPassword?: string }>,
-		file: Express.Multer.File | null,
-		currentUserId: string,
-		currentUserEmail: string
-	) => {
+	editUser = async (updates: Partial<User & { newPassword?: string }>, file: any, currentUser: any) => {
 		// 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 url = `${settings.clientHost!}/set-new-password/${recoveryToken.token}`;
+		const { clientHost } = this.settingsService.getSettings();
+		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 ({
-		actorId,
-		actorRoles,
-		actorTeamId,
-		targetUserId,
-	}: {
-		actorId: string;
-		actorTeamId: string;
-		actorRoles: UserRole[];
-		targetUserId: string;
-	}) => {
-		if (actorId === targetUserId) {
+	deleteUserById = async (actor: User, targetUserId: string) => {
+		if (actor.id === 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>;
-	deleteJob(monitor: Monitor): Promise<void>;
-	pauseJob(monitor: Monitor): Promise<void>;
-	resumeJob(monitor: Monitor): Promise<void>;
-	updateJob(monitor: Monitor): Promise<void>;
+	addJob(monitorId: string, monitor: any): Promise<void>;
+	deleteJob(monitor: any): Promise<void>;
+	pauseJob(monitor: any): Promise<void>;
+	resumeJob(monitor: any): 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("geo-check-job", this.helper.getHeartbeatGeoJob());
+			this.scheduler.addTemplate("monitor-job", this.helper.getMonitorJob());
+			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;
-					monitorType: MonitorType;
+					monitorUrl: any;
+					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 {
-	ICheckService,
-	INetworkService,
-	INotificationsService,
-	ISettingsService,
-	IStatusService,
-	IncidentService,
-	type IGeoChecksService,
-} from "@/service/index.js";
-import { CHECK_TTL_SENTINEL, type MaintenanceWindow, type StatusChangeResult } from "@/types/index.js";
+import { INetworkService, INotificationsService, IStatusService, IncidentService, type IGeoChecksService } from "@/service/index.js";
+import 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>;
-	getHeartbeatGeoJob(): (monitor: Monitor) => Promise<void>;
+	getMonitorJob(): (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 settingsService: ISettingsService;
+	private checkService: any;
 	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,
-		settingsService: ISettingsService,
+		checkService: any,
 		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",
-					service: SERVICE_NAME,
-					method: "getMonitorJob",
-					stack: error instanceof Error ? error.stack : undefined,
+					message: error.message,
+					service: error.service || SERVICE_NAME,
+					method: error.method || "getMonitorJob",
+					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",
-					stack: error instanceof Error ? error.stack : undefined,
+					method: "getGeoCheckJob",
+					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/HttpProvider.ts

@@ -15,7 +15,7 @@ export class HttpProvider implements IStatusProvider<HttpStatusPayload> {
 		private got: Got,
 		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/notificationProviders/teams.ts

@@ -1,274 +0,0 @@
-const SERVICE_NAME = "TeamsProvider";
-import type { Notification } from "@/types/index.js";
-import { INotificationProvider } from "@/service/index.js";
-import type { NotificationMessage } from "@/types/notificationMessage.js";
-import { getTestMessage } from "@/service/infrastructure/notificationProviders/utils.js";
-import type { ILogger } from "@/utils/logger.js";
-import got, { HTTPError } from "got";
-
-// Types for Adaptive Card elements
-type TextBlock = {
-	type: "TextBlock";
-	text: string;
-	weight?: "Bolder" | "Normal" | "Lighter";
-	size?: "Small" | "Medium" | "Large" | "ExtraLarge";
-	color?: "Default" | "Dark" | "Light" | "Accent" | "Good" | "Warning" | "Attention";
-	wrap?: boolean;
-	spacing?: "None" | "Small" | "Medium" | "Large" | "ExtraLarge" | "Auto";
-	isSubtle?: boolean;
-};
-
-type ColumnSet = {
-	type: "ColumnSet";
-	separator?: boolean;
-	spacing?: "None" | "Small" | "Medium" | "Large" | "ExtraLarge" | "Auto";
-	columns: unknown[];
-};
-
-type Fact = {
-	title: string;
-	value: string;
-};
-
-type FactSet = {
-	type: "FactSet";
-	facts: Fact[];
-};
-
-type Action = {
-	type: string;
-	title: string;
-	url?: string;
-};
-
-type AdaptiveCard = {
-	type: "AdaptiveCard";
-	$schema: "http://adaptivecards.io/schemas/adaptive-card.json";
-	version: "1.4";
-	body: (TextBlock | ColumnSet | FactSet)[];
-	actions?: Action[];
-};
-
-type TeamsMessage = {
-	type: "message";
-	attachments: Array<{
-		contentType: "application/vnd.microsoft.card.adaptive";
-		contentUrl: null;
-		content: AdaptiveCard;
-	}>;
-};
-
-export class TeamsProvider implements INotificationProvider {
-	private logger: ILogger;
-
-	constructor(logger: ILogger) {
-		this.logger = logger;
-	}
-
-	async sendTestAlert(notification: Notification): Promise<boolean> {
-		if (!notification.address) {
-			return false;
-		}
-
-		try {
-			const payload = this.wrapAdaptiveCard({
-				type: "AdaptiveCard",
-				$schema: "http://adaptivecards.io/schemas/adaptive-card.json",
-				version: "1.4",
-				body: [
-					{
-						type: "TextBlock",
-						text: getTestMessage(),
-						weight: "Bolder",
-						size: "Medium",
-					},
-				],
-			});
-
-			await got.post(notification.address, {
-				json: payload,
-				headers: {
-					"Content-Type": "application/json",
-				},
-			});
-			return true;
-		} catch (error) {
-			const err = error as HTTPError;
-			this.logger.warn({
-				message: "Teams test alert failed",
-				service: SERVICE_NAME,
-				method: "sendTestAlert",
-				stack: err?.stack,
-			});
-			return false;
-		}
-	}
-
-	async sendMessage(notification: Notification, message: NotificationMessage): Promise<boolean> {
-		if (!notification.address) {
-			return false;
-		}
-
-		const payload = this.wrapAdaptiveCard(this.buildAdaptiveCard(message));
-
-		try {
-			await got.post(notification.address, {
-				json: payload,
-				headers: {
-					"Content-Type": "application/json",
-				},
-			});
-			this.logger.info({
-				message: "Teams notification sent via sendMessage",
-				service: SERVICE_NAME,
-				method: "sendMessage",
-			});
-			return true;
-		} catch (error) {
-			const err = error as HTTPError;
-			this.logger.warn({
-				message: "Teams alert failed via sendMessage",
-				service: SERVICE_NAME,
-				method: "sendMessage",
-				stack: err?.stack,
-			});
-			return false;
-		}
-	}
-
-	/**
-	 * Wrap an Adaptive Card in the Teams webhook envelope format
-	 */
-	private wrapAdaptiveCard(card: AdaptiveCard): TeamsMessage {
-		return {
-			type: "message",
-			attachments: [
-				{
-					contentType: "application/vnd.microsoft.card.adaptive",
-					contentUrl: null,
-					content: card,
-				},
-			],
-		};
-	}
-
-	/**
-	 * Build an Adaptive Card from NotificationMessage
-	 */
-	private buildAdaptiveCard(message: NotificationMessage): AdaptiveCard {
-		const colorMap: Record<string, string> = {
-			critical: "attention",
-			warning: "warning",
-			success: "good",
-			info: "accent",
-		};
-		const color = (colorMap[message.severity] || "default") as "Default" | "Dark" | "Light" | "Accent" | "Good" | "Warning" | "Attention" | undefined;
-
-		const body: (TextBlock | ColumnSet | FactSet)[] = [];
-
-		// Header with colored status indicator
-		body.push({
-			type: "TextBlock",
-			text: message.content.title,
-			weight: "Bolder",
-			size: "Large",
-			color,
-			wrap: true,
-		});
-
-		// Summary
-		body.push({
-			type: "TextBlock",
-			text: message.content.summary,
-			wrap: true,
-			spacing: "Small",
-		});
-
-		// Separator
-		body.push({
-			type: "ColumnSet",
-			separator: true,
-			spacing: "Medium",
-			columns: [],
-		});
-
-		// Monitor details as a FactSet
-		body.push({
-			type: "FactSet",
-			facts: [
-				{ title: "Name", value: message.monitor.name },
-				{ title: "Type", value: message.monitor.type },
-				{ title: "Status", value: message.monitor.status },
-				{ title: "URL", value: message.monitor.url },
-			],
-		});
-
-		// Threshold breaches
-		if (message.content.thresholds && message.content.thresholds.length > 0) {
-			body.push({
-				type: "TextBlock",
-				text: "**Threshold Breaches**",
-				weight: "Bolder",
-				spacing: "Medium",
-				wrap: true,
-			});
-
-			for (const breach of message.content.thresholds) {
-				body.push({
-					type: "TextBlock",
-					text: `• **${breach.metric.toUpperCase()}**: ${breach.formattedValue} (threshold: ${breach.threshold}${breach.unit})`,
-					wrap: true,
-					spacing: "Small",
-				});
-			}
-		}
-
-		// Additional details
-		if (message.content.details && message.content.details.length > 0) {
-			body.push({
-				type: "TextBlock",
-				text: "**Additional Information**",
-				weight: "Bolder",
-				spacing: "Medium",
-				wrap: true,
-			});
-
-			for (const detail of message.content.details) {
-				body.push({
-					type: "TextBlock",
-					text: `• ${detail}`,
-					wrap: true,
-					spacing: "Small",
-				});
-			}
-		}
-
-		// Timestamp footer
-		body.push({
-			type: "TextBlock",
-			text: `Checkmate | ${new Date(message.content.timestamp).toUTCString()}`,
-			size: "Small",
-			isSubtle: true,
-			spacing: "Medium",
-			wrap: true,
-		});
-
-		// Actions (incident link)
-		const actions: Action[] = [];
-		if (message.content.incident) {
-			actions.push({
-				type: "Action.OpenUrl",
-				title: "View Incident",
-				url: `${message.clientHost}/incidents/${message.content.incident.id}`,
-			});
-		}
-
-		return {
-			type: "AdaptiveCard",
-			$schema: "http://adaptivecards.io/schemas/adaptive-card.json",
-			version: "1.4",
-			body,
-			...(actions.length > 0 ? { actions } : {}),
-		};
-	}
-}

server/src/service/infrastructure/notificationsService.ts

@@ -32,7 +32,6 @@ export class NotificationsService implements INotificationsService {
 	private discordProvider: INotificationProvider;
 	private pagerDutyProvider: INotificationProvider;
 	private matrixProvider: INotificationProvider;
-	private teamsProvider: INotificationProvider;
 	private logger: ILogger;
 	private settingsService: ISettingsService;
 	private notificationMessageBuilder: INotificationMessageBuilder;
@@ -46,7 +45,6 @@ export class NotificationsService implements INotificationsService {
 		discordProvider: INotificationProvider,
 		pagerDutyProvider: INotificationProvider,
 		matrixProvider: INotificationProvider,
-		teamsProvider: INotificationProvider,
 		settingsService: ISettingsService,
 		logger: ILogger,
 		notificationMessageBuilder: INotificationMessageBuilder
@@ -59,7 +57,6 @@ export class NotificationsService implements INotificationsService {
 		this.discordProvider = discordProvider;
 		this.pagerDutyProvider = pagerDutyProvider;
 		this.matrixProvider = matrixProvider;
-		this.teamsProvider = teamsProvider;
 		this.settingsService = settingsService;
 		this.logger = logger;
 		this.notificationMessageBuilder = notificationMessageBuilder;
@@ -95,8 +92,6 @@ export class NotificationsService implements INotificationsService {
 				return await this.discordProvider.sendMessage!(notification, notificationMessage);
 			case "email":
 				return await this.emailProvider.sendMessage!(notification, notificationMessage);
-			case "teams":
-				return await this.teamsProvider.sendMessage!(notification, notificationMessage);
 			default:
 				this.logger.warn({
 					message: `Unknown notification type: ${notification.type}`,
@@ -155,8 +150,6 @@ export class NotificationsService implements INotificationsService {
 				return await this.matrixProvider.sendTestAlert(notification);
 			case "webhook":
 				return await this.webhookProvider.sendTestAlert(notification);
-			case "teams":
-				return await this.teamsProvider.sendTestAlert(notification);
 			default:
 				return false;
 		}

server/src/service/system/settingsService.ts

@@ -2,12 +2,12 @@ import { ISettingsRepository } from "@/repositories/index.js";
 import { Settings } from "@/types/index.js";
 import { AppError } from "@/utils/AppError.js";
 import { ValidatedEnv } from "@/validation/envValidation.js";
-import type { StringValue } from "ms";
+
 const SERVICE_NAME = "SettingsService";
 
 export type EnvConfig = {
 	jwtSecret: string;
-	jwtTTL: StringValue;
+	jwtTTL: string;
 	nodeEnv: string;
 	logLevel: string;
 	clientHost: string;
@@ -30,7 +30,7 @@ export class SettingsService implements ISettingsService {
 		this.settingsRepository = settingsRepository;
 		this.settings = {
 			jwtSecret: env.JWT_SECRET,
-			jwtTTL: env.TOKEN_TTL as StringValue,
+			jwtTTL: env.TOKEN_TTL,
 			nodeEnv: env.NODE_ENV,
 			logLevel: env.LOG_LEVEL,
 			clientHost: env.CLIENT_HOST,

server/src/types/check.ts

@@ -1,8 +1,5 @@
 import type { MonitorType } from "@/types/index.js";
 import type { Response } from "got";
-
-export const CHECK_TTL_SENTINEL = 366;
-
 export type GotTimings = Response["timings"];
 
 export interface CheckMetadata {
@@ -101,6 +98,9 @@ export interface Check {
 	timings?: GotTimings;
 	statusCode: number;
 	message: string;
+	ack: boolean;
+	ackAt?: string | null;
+	expiry: string;
 	cpu?: CheckCpuInfo;
 	memory?: CheckMemoryInfo;
 	disk?: CheckDiskInfo[];
@@ -113,6 +113,7 @@ export interface Check {
 	seo?: number;
 	performance?: number;
 	audits?: CheckAudits;
+	__v: number;
 	createdAt: string;
 	updatedAt: string;
 }
@@ -204,4 +205,4 @@ export type NormalizedUptimeCheck<T extends GroupedCheck = GroupedCheck> = T & {
 	originalAvgResponseTime: number;
 };
 
-export type CheckSnapshot = Omit<Check, "metadata" | "updatedAt">;
+export type CheckSnapshot = Omit<Check, "metadata" | "ack" | "ackAt" | "expiry" | "__v" | "updatedAt">;

server/src/types/network.ts

@@ -126,7 +126,7 @@ export interface MonitorPayloadMap {
 	game: GameStatusPayload;
 	grpc: GrpcStatusPayload;
 	websocket: WebSocketStatusPayload;
-	unknown: unknown;
+	default: unknown;
 }
 
 export type StatusChangeResult = {

server/src/types/notification.ts

@@ -1,4 +1,4 @@
-export const NotificationChannels = ["email", "slack", "discord", "webhook", "pager_duty", "matrix", "teams"] as const;
+export const NotificationChannels = ["email", "slack", "discord", "webhook", "pager_duty", "matrix"] as const;
 export type NotificationChannel = (typeof NotificationChannels)[number];
 
 export interface Notification {

server/src/types/ssl-checker.d.ts

@@ -1,24 +0,0 @@
-declare module "ssl-checker" {
-	import { Agent } from "https";
-
-	export interface SSLDetails {
-		daysRemaining: number;
-		valid: boolean;
-		validFrom: string;
-		validTo: string;
-		validFor: string[];
-	}
-
-	export interface SSLOptions {
-		method?: "GET" | "HEAD";
-		port?: number;
-		agent?: Agent;
-		rejectUnauthorized?: boolean;
-		validateSubjectAltName?: boolean;
-	}
-
-	function sslChecker(hostname: string, options?: SSLOptions): Promise<SSLDetails>;
-
-	// Change 'export default' to 'export =' to allow it to be callable
-	export = sslChecker;
-}

server/src/types/statusPage.ts

@@ -1,4 +1,4 @@
-export const StatusPageTypes = ["uptime", "infrastructure"] as const;
+export const StatusPageTypes = ["uptime"] as const;
 export type StatusPageType = (typeof StatusPageTypes)[number];
 
 export interface StatusPageLogo {
@@ -15,7 +15,7 @@ export interface StatusPage {
 	id: string;
 	userId: string;
 	teamId: string;
-	type: StatusPageType[];
+	type: StatusPageType;
 	companyName: string;
 	url: string;
 	timezone?: string;
@@ -28,7 +28,6 @@ export interface StatusPage {
 	showCharts: boolean;
 	showUptimePercentage: boolean;
 	showAdminLoginLink: boolean;
-	showInfrastructure: boolean;
 	customCSS: string;
 	createdAt: string;
 	updatedAt: string;

server/src/validation/checkValidation.ts

@@ -12,31 +12,33 @@ export const getChecksParamValidation = z.object({
 
 export const getChecksQueryValidation = z.object({
 	type: z.enum(["http", "ping", "pagespeed", "hardware", "docker", "port", "game", "grpc", "websocket"]).optional(),
-	sortOrder: z.enum(["asc", "desc"]),
+	sortOrder: z.enum(["asc", "desc"]).optional(),
 	limit: z.coerce.number().optional(),
-	dateRange: z.enum(["recent", "hour", "day", "week", "month", "all"]),
+	dateRange: z.enum(["recent", "hour", "day", "week", "month", "all"]).optional(),
 	filter: z.enum(["all", "up", "down", "resolve"]).optional(),
 	ack: booleanCoercion.optional(),
-	page: z.coerce.number(),
-	rowsPerPage: z.coerce.number(),
+	page: z.coerce.number().optional(),
+	rowsPerPage: z.coerce.number().optional(),
 	status: booleanCoercion.optional(),
 	continent: z.union([z.enum(GeoContinents), z.array(z.enum(GeoContinents))]).optional(),
 });
 
 export const getTeamChecksQueryValidation = z.object({
-	sortOrder: z.enum(["asc", "desc"]),
+	sortOrder: z.enum(["asc", "desc"]).optional(),
 	limit: z.coerce.number().optional(),
-	dateRange: z.enum(["recent", "hour", "day", "week", "month", "all"]),
+	dateRange: z.enum(["recent", "hour", "day", "week", "month", "all"]).optional(),
 	filter: z.enum(["all", "up", "down", "resolve"]).optional(),
 	ack: booleanCoercion.optional(),
-	page: z.coerce.number(),
-	rowsPerPage: z.coerce.number(),
+	page: z.coerce.number().optional(),
+	rowsPerPage: z.coerce.number().optional(),
 });
 
 export const deleteChecksParamValidation = z.object({
 	monitorId: z.string().min(1, "Monitor ID is required"),
 });
 
-export const getChecksSummaryByTeamIdQueryValidation = z.object({
-	dateRange: z.enum(["recent", "hour", "day", "week", "month", "all"]).optional(),
+export const deleteChecksByTeamIdParamValidation = z.object({});
+
+export const updateChecksTTLBodyValidation = z.object({
+	ttl: z.number().min(1, "TTL is required"),
 });

server/src/validation/notificationValidation.ts

@@ -18,7 +18,7 @@ export const createNotificationBodyValidation = z.discriminatedUnion("type", [
 	z.object({
 		notificationName: z.string().min(1, "Notification name is required"),
 		type: z.literal("webhook"),
-		address: z.url({ message: "Please enter a valid Webhook URL" }),
+		address: z.string().url("Please enter a valid Webhook URL"),
 		homeserverUrl: z.union([z.string(), z.literal("")]).optional(),
 		roomId: z.union([z.string(), z.literal("")]).optional(),
 		accessToken: z.union([z.string(), z.literal("")]).optional(),
@@ -27,7 +27,7 @@ export const createNotificationBodyValidation = z.discriminatedUnion("type", [
 	z.object({
 		notificationName: z.string().min(1, "Notification name is required"),
 		type: z.literal("slack"),
-		address: z.url({ message: "Please enter a valid Webhook URL" }),
+		address: z.string().url("Please enter a valid Webhook URL"),
 		homeserverUrl: z.union([z.string(), z.literal("")]).optional(),
 		roomId: z.union([z.string(), z.literal("")]).optional(),
 		accessToken: z.union([z.string(), z.literal("")]).optional(),
@@ -36,7 +36,7 @@ export const createNotificationBodyValidation = z.discriminatedUnion("type", [
 	z.object({
 		notificationName: z.string().min(1, "Notification name is required"),
 		type: z.literal("discord"),
-		address: z.url({ message: "Please enter a valid Webhook URL" }),
+		address: z.string().url("Please enter a valid Webhook URL"),
 		homeserverUrl: z.union([z.string(), z.literal("")]).optional(),
 		roomId: z.union([z.string(), z.literal("")]).optional(),
 		accessToken: z.union([z.string(), z.literal("")]).optional(),
@@ -55,16 +55,10 @@ export const createNotificationBodyValidation = z.discriminatedUnion("type", [
 		notificationName: z.string().min(1, "Notification name is required"),
 		type: z.literal("matrix"),
 		address: z.union([z.string(), z.literal("")]).optional(),
-		homeserverUrl: z.url({ message: "Please enter a valid Homeserver URL" }),
+		homeserverUrl: z.string().url("Please enter a valid Homeserver URL"),
 		roomId: z.string().min(1, "Room ID is required"),
 		accessToken: z.string().min(1, "Access Token is required"),
 	}),
-	// Teams notification
-	z.object({
-		notificationName: z.string().min(1, "Notification name is required"),
-		type: z.literal("teams"),
-		address: z.url({ message: "Please enter a valid Webhook URL" }),
-	}),
 ]);
 
 export const sendTestEmailBodyValidation = z.object({

server/src/validation/settingsValidation.ts

@@ -1,4 +1,3 @@
-import { CHECK_TTL_SENTINEL } from "@/types/check.js";
 import { z } from "zod";
 
 //****************************************
@@ -7,8 +6,9 @@ import { z } from "zod";
 
 export const updateAppSettingsBodyValidation = z
 	.object({
-		checkTTL: z.union([z.number().int().min(1).max(CHECK_TTL_SENTINEL), z.literal("")]).optional(),
+		checkTTL: z.union([z.number(), z.literal("")]).optional(),
 		systemEmailPort: z.union([z.number(), z.literal("")]).optional(),
+
 		pagespeedApiKey: z.union([z.string(), z.literal("")]).optional(),
 		language: z.union([z.string(), z.literal("")]).optional(),
 		timezone: z.union([z.string(), z.literal("")]).optional(),

server/src/validation/statusPageValidation.ts

@@ -10,13 +10,13 @@ export const getStatusPageParamValidation = z.object({
 });
 
 export const getStatusPageQueryValidation = z.object({
-	type: z.array(z.enum(["uptime", "infrastructure"])),
+	type: z.literal("uptime"),
 	timeFrame: z.coerce.number().optional(),
 });
 
 export const createStatusPageBodyValidation = z
 	.object({
-		type: z.array(z.enum(["uptime", "infrastructure"])),
+		type: z.literal("uptime"),
 		companyName: z.string().min(1, "Company name is required"),
 		url: z.string().regex(/^[a-zA-Z0-9_-]+$/, {
 			message: "URL can only contain letters, numbers, underscores, and hyphens",

server/test/teamsProvider.test.ts

@@ -1,267 +0,0 @@
-import { describe, expect, it, jest, beforeEach } from "@jest/globals";
-import { TeamsProvider } from "../src/service/infrastructure/notificationProviders/teams.ts";
-import type { Notification } from "../src/types/notification.ts";
-import type { NotificationMessage } from "../src/types/notificationMessage.ts";
-
-// Mock got
-jest.unstable_mockModule("got", () => ({
-	default: { post: jest.fn() },
-}));
-
-const createLogger = () => ({
-	info: jest.fn(),
-	warn: jest.fn(),
-	error: jest.fn(),
-	debug: jest.fn(),
-});
-
-const createNotification = (overrides?: Partial<Notification>): Notification => ({
-	id: "notif-1",
-	userId: "user-1",
-	teamId: "team-1",
-	type: "teams",
-	notificationName: "Teams Alert",
-	address: "https://xxxxx.webhook.office.com/webhookb2/test",
-	createdAt: new Date().toISOString(),
-	updatedAt: new Date().toISOString(),
-	...overrides,
-});
-
-const createMessage = (overrides?: Partial<NotificationMessage>): NotificationMessage => ({
-	type: "monitor_down",
-	severity: "critical",
-	monitor: {
-		id: "mon-1",
-		name: "API Server",
-		url: "https://api.example.com",
-		type: "http",
-		status: "down",
-	},
-	content: {
-		title: "🔴 Monitor Down",
-		summary: "API Server is not responding",
-		details: ["Response timeout after 30s"],
-		thresholds: [],
-		incident: {
-			id: "inc-1",
-			url: "https://app.example.com/incidents/inc-1",
-			createdAt: new Date(),
-		},
-		timestamp: new Date("2026-01-15T12:00:00Z"),
-	},
-	clientHost: "https://app.example.com",
-	metadata: {
-		teamId: "team-1",
-		notificationReason: "monitor_down",
-	},
-	...overrides,
-});
-
-describe("TeamsProvider", () => {
-	let provider: TeamsProvider;
-	let logger: ReturnType<typeof createLogger>;
-	let gotPost: jest.Mock;
-
-	beforeEach(async () => {
-		logger = createLogger();
-		provider = new TeamsProvider(logger);
-		const got = await import("got");
-		gotPost = got.default.post as jest.Mock;
-		gotPost.mockReset();
-		gotPost.mockResolvedValue({});
-	});
-
-	describe("sendTestAlert", () => {
-		it("returns false when address is missing", async () => {
-			const notification = createNotification({ address: undefined });
-			const result = await provider.sendTestAlert(notification);
-			expect(result).toBe(false);
-			expect(gotPost).not.toHaveBeenCalled();
-		});
-
-		it("sends an Adaptive Card test message and returns true on success", async () => {
-			const notification = createNotification();
-			const result = await provider.sendTestAlert(notification);
-			expect(result).toBe(true);
-			expect(gotPost).toHaveBeenCalledTimes(1);
-
-			const [url, options] = gotPost.mock.calls[0] as [string, { json: any; headers: any }];
-			expect(url).toBe(notification.address);
-			expect(options.headers["Content-Type"]).toBe("application/json");
-
-			// Verify Teams webhook envelope
-			const payload = options.json;
-			expect(payload.type).toBe("message");
-			expect(payload.attachments).toHaveLength(1);
-			expect(payload.attachments[0].contentType).toBe("application/vnd.microsoft.card.adaptive");
-
-			// Verify Adaptive Card structure
-			const card = payload.attachments[0].content;
-			expect(card.type).toBe("AdaptiveCard");
-			expect(card.version).toBe("1.4");
-			expect(card.body[0].type).toBe("TextBlock");
-			expect(card.body[0].text).toContain("test notification");
-		});
-
-		it("returns false and logs warning on HTTP error", async () => {
-			gotPost.mockRejectedValue(new Error("Network error"));
-			const notification = createNotification();
-			const result = await provider.sendTestAlert(notification);
-			expect(result).toBe(false);
-			expect(logger.warn).toHaveBeenCalledWith(
-				expect.objectContaining({
-					message: "Teams test alert failed",
-					service: "TeamsProvider",
-				})
-			);
-		});
-	});
-
-	describe("sendMessage", () => {
-		it("returns false when address is missing", async () => {
-			const notification = createNotification({ address: undefined });
-			const result = await provider.sendMessage(notification, createMessage());
-			expect(result).toBe(false);
-			expect(gotPost).not.toHaveBeenCalled();
-		});
-
-		it("sends a well-formed Adaptive Card and returns true", async () => {
-			const notification = createNotification();
-			const message = createMessage();
-			const result = await provider.sendMessage(notification, message);
-
-			expect(result).toBe(true);
-			expect(gotPost).toHaveBeenCalledTimes(1);
-
-			const [url, options] = gotPost.mock.calls[0] as [string, { json: any }];
-			expect(url).toBe(notification.address);
-
-			const payload = options.json;
-			expect(payload.type).toBe("message");
-
-			const card = payload.attachments[0].content;
-			expect(card.type).toBe("AdaptiveCard");
-			expect(card.version).toBe("1.4");
-
-			// Verify body contains expected elements
-			const textBlocks = card.body.filter((b: any) => b.type === "TextBlock");
-			const factSets = card.body.filter((b: any) => b.type === "FactSet");
-
-			// Title block
-			expect(textBlocks[0].text).toBe(message.content.title);
-			expect(textBlocks[0].color).toBe("attention"); // critical -> attention
-
-			// Summary block
-			expect(textBlocks[1].text).toBe(message.content.summary);
-
-			// FactSet with monitor details
-			expect(factSets).toHaveLength(1);
-			const facts = factSets[0].facts;
-			expect(facts).toEqual(
-				expect.arrayContaining([
-					expect.objectContaining({ title: "Name", value: "API Server" }),
-					expect.objectContaining({ title: "URL", value: "https://api.example.com" }),
-					expect.objectContaining({ title: "Status", value: "down" }),
-				])
-			);
-
-			// Incident action button
-			expect(card.actions).toHaveLength(1);
-			expect(card.actions[0].type).toBe("Action.OpenUrl");
-			expect(card.actions[0].title).toBe("View Incident");
-			expect(card.actions[0].url).toContain("/infrastructure/mon-1");
-		});
-
-		it("omits actions when no incident is present", async () => {
-			const notification = createNotification();
-			const message = createMessage({
-				content: {
-					title: "Test",
-					summary: "Summary",
-					timestamp: new Date(),
-				},
-			});
-			const result = await provider.sendMessage(notification, message);
-			expect(result).toBe(true);
-
-			const [, options] = gotPost.mock.calls[0] as [string, { json: any }];
-			const card = options.json.attachments[0].content;
-			expect(card.actions).toBeUndefined();
-		});
-
-		it("includes threshold breaches when present", async () => {
-			const notification = createNotification();
-			const message = createMessage({
-				type: "threshold_breach",
-				severity: "warning",
-				content: {
-					title: "Threshold Breach",
-					summary: "CPU usage exceeded",
-					thresholds: [
-						{
-							metric: "cpu",
-							currentValue: 95,
-							threshold: 80,
-							unit: "%",
-							formattedValue: "95%",
-						},
-					],
-					timestamp: new Date(),
-				},
-			});
-
-			await provider.sendMessage(notification, message);
-
-			const [, options] = gotPost.mock.calls[0] as [string, { json: any }];
-			const card = options.json.attachments[0].content;
-
-			// Title should use "warning" color
-			expect(card.body[0].color).toBe("warning");
-
-			// Find threshold text blocks
-			const thresholdHeader = card.body.find((b: any) => b.type === "TextBlock" && b.text === "**Threshold Breaches**");
-			expect(thresholdHeader).toBeDefined();
-
-			const cpuBlock = card.body.find((b: any) => b.type === "TextBlock" && b.text?.includes("CPU"));
-			expect(cpuBlock).toBeDefined();
-			expect(cpuBlock.text).toContain("95%");
-			expect(cpuBlock.text).toContain("threshold: 80%");
-		});
-
-		it("maps severity to correct Adaptive Card colors", async () => {
-			const notification = createNotification();
-
-			const severityMap = [
-				{ severity: "critical", expected: "attention" },
-				{ severity: "warning", expected: "warning" },
-				{ severity: "success", expected: "good" },
-				{ severity: "info", expected: "accent" },
-			] as const;
-
-			for (const { severity, expected } of severityMap) {
-				gotPost.mockReset();
-				gotPost.mockResolvedValue({});
-
-				const message = createMessage({ severity });
-				await provider.sendMessage(notification, message);
-
-				const [, options] = gotPost.mock.calls[0] as [string, { json: any }];
-				const card = options.json.attachments[0].content;
-				expect(card.body[0].color).toBe(expected);
-			}
-		});
-
-		it("returns false and logs warning on HTTP error", async () => {
-			gotPost.mockRejectedValue(new Error("502 Bad Gateway"));
-			const notification = createNotification();
-			const result = await provider.sendMessage(notification, createMessage());
-			expect(result).toBe(false);
-			expect(logger.warn).toHaveBeenCalledWith(
-				expect.objectContaining({
-					message: "Teams alert failed via sendMessage",
-					service: "TeamsProvider",
-				})
-			);
-		});
-	});
-});

server/tsconfig.json

@@ -14,8 +14,7 @@
 		"moduleResolution": "nodenext",
 		"skipLibCheck": true,
 		"noUncheckedIndexedAccess": true,
-		"isolatedModules": true,
-		"resolveJsonModule": true
+		"isolatedModules": true
 	},
 	"include": ["src"],
 	"exclude": ["tests", "dist", "node_modules"]