Merge branch 'develop' into feat/status-page-custom-domain

Resolve conflicts from server reorganization while preserving custom
domain support for published status pages.

CLAUDE.md

@@ -68,19 +68,23 @@ VITE_APP_LOG_LEVEL="debug"
 ### Backend Layers
 ```
 server/src/
-├── controllers/     # Route handlers (authController, monitorController, etc.)
-├── service/         # Business logic
-│   ├── business/    # Core monitoring logic
-│   ├── infrastructure/  # Server/system utilities
-│   └── system/      # App-level settings
+├── api/             # HTTP layer
+│   ├── controllers/   # Route handlers (authController, monitorController, etc.)
+│   ├── middleware/    # verifyJWT, rateLimiter, sanitization, responseHandler
+│   ├── routes/        # API route definitions
+│   └── validation/    # Zod request-payload schemas
+├── domain/          # Business logic + data access, one folder per entity
+│   ├── monitors/      # e.g. monitor.service.ts, monitor.repository.ts, monitor.type.ts
+│   ├── checks/
+│   ├── incidents/
+│   └── …              # users, teams, status-pages, notifications, etc.
+├── service/         # Cross-cutting services (e.g. infrastructure/)
+├── config/          # App config wiring (controllers, routes, services, envValidation)
 ├── db/
-│   ├── models/      # Mongoose schemas (Monitor, Check, Incident, User, etc.)
-│   ├── migration/   # Database migrations (run on startup)
-│   └── modules/     # Database-specific modules
-├── middleware/v1/   # verifyJWT, rateLimiter, sanitization, responseHandler
-├── routes/v1/       # API route definitions
-├── validation/      # Joi input validation schemas
-└── repositories/    # Data access layer
+│   └── migration/   # Database migrations (run on startup)
+├── templates/       # Email/notification templates
+├── types/           # Shared const tuples + derived types
+└── utils/           # Shared utilities
 ```
 
 ### Frontend Structure

client/package.json

@@ -14,7 +14,7 @@
 		"format-check": "prettier --check ."
 	},
 	"lint-staged": {
-		"**/*": "prettier --write"
+		"**/*": "prettier --write --ignore-unknown"
 	},
 	"dependencies": {
 		"@emotion/react": "^11.13.3",

server/eslint.config.js

@@ -39,7 +39,7 @@ export default [
 			},
 		},
 		rules: {
-			"@typescript-eslint/no-unused-vars": ["error", { argsIgnorePattern: "^_" }], // Ignore unused variables that start with '_'
+			"@typescript-eslint/no-unused-vars": ["error", { argsIgnorePattern: "^_", varsIgnorePattern: "^_" }], // Ignore unused variables that start with '_'
 			"@typescript-eslint/no-explicit-any": "warn", // Warn on 'any' types
 			"mocha/max-top-level-suites": "warn", // Warn if there are too many top-level suites instead of failing
 		},

server/jest.config.ts

@@ -8,7 +8,6 @@ const config: Config = {
 		"^.+\\.(t|j)sx?$": ["ts-jest", { useESM: true, tsconfig: "./tsconfig.jest.json" }],
 	},
 	moduleNameMapper: {
-		"^@/validation/(.*)\\.js$": "<rootDir>/src/validation/$1.js",
 		"^@/utils/(.*)\\.js$": "<rootDir>/src/utils/$1.ts",
 		"^@/(.*)\\.ts$": "<rootDir>/src/$1.ts",
 		"^@/(.*)\\.js$": "<rootDir>/src/$1.ts",

server/openapi/index.ts

@@ -28,7 +28,7 @@ export function getOpenApiSpec(): JsonObject {
 		info: {
 			title: "Checkmate API",
 			version: "1.0.0",
-			description: "Generated from Zod validation schemas. Source of truth: server/src/validation/*.ts",
+			description: "Generated from Zod validation schemas. Source of truth: server/src/api/validation/*.ts",
 		},
 		servers: [{ url: "/api/v1", description: "Current server" }],
 		tags: [

server/openapi/routes/auth.ts

@@ -7,7 +7,7 @@ import {
 	recoveryValidation,
 	recoveryTokenBodyValidation,
 	newPasswordValidation,
-} from "@/validation/authValidation.js";
+} from "@/api/validation/authValidation.js";
 import {
 	getUserByIdParamValidation,
 	editUserByIdParamValidation,
@@ -16,7 +16,7 @@ import {
 	createUserBodyValidation,
 	editUserBodyValidation,
 	userResponseSchema,
-} from "@/validation/userValidation.js";
+} from "@/api/validation/userValidation.js";
 
 const tags = ["auth"];
 

server/openapi/routes/check.ts

@@ -7,7 +7,7 @@ import {
 	getTeamChecksQueryValidation,
 	deleteChecksParamValidation,
 	getChecksSummaryByTeamIdQueryValidation,
-} from "@/validation/checkValidation.js";
+} from "@/api/validation/checkValidation.js";
 
 const tags = ["checks"];
 

server/openapi/routes/geoCheck.ts

@@ -1,6 +1,6 @@
 import { registry } from "../registry.js";
 import { bearer, okUnknown, standardErrors } from "../helpers.js";
-import { getChecksParamValidation, getChecksQueryValidation } from "@/validation/checkValidation.js";
+import { getChecksParamValidation, getChecksQueryValidation } from "@/api/validation/checkValidation.js";
 
 registry.registerPath({
 	method: "get",

server/openapi/routes/incident.ts

@@ -1,7 +1,7 @@
 import { z } from "zod";
 import { registry } from "../registry.js";
 import { bearer, okJson, okJsonNoData, standardErrors } from "../helpers.js";
-import { getIncidentsByTeamQueryValidation, getIncidentSummaryQueryValidation } from "@/validation/incidentValidation.js";
+import { getIncidentsByTeamQueryValidation, getIncidentSummaryQueryValidation } from "@/api/validation/incidentValidation.js";
 
 const tags = ["incidents"];
 

server/openapi/routes/invite.ts

@@ -1,7 +1,7 @@
 import { registry } from "../registry.js";
 import { bearer, json, okJson, okJsonNoData, standardErrors } from "../helpers.js";
 import { z } from "zod";
-import { inviteBodyValidation, inviteVerificationBodyValidation } from "@/validation/authValidation.js";
+import { inviteBodyValidation, inviteVerificationBodyValidation } from "@/api/validation/authValidation.js";
 
 const tags = ["invite"];
 

server/openapi/routes/maintenanceWindow.ts

@@ -8,7 +8,7 @@ import {
 	deleteMaintenanceWindowByIdParamValidation,
 	editMaintenanceWindowByIdParamValidation,
 	editMaintenanceByIdWindowBodyValidation,
-} from "@/validation/maintenanceWindowValidation.js";
+} from "@/api/validation/maintenanceWindowValidation.js";
 
 const tags = ["maintenance-window"];
 

server/openapi/routes/monitor.ts

@@ -16,8 +16,8 @@ import {
 	getHardwareDetailsByIdParamValidation,
 	getHardwareDetailsByIdQueryValidation,
 	monitorResponseSchema,
-} from "@/validation/monitorValidation.js";
-import { updateNotificationsValidation } from "@/validation/notificationValidation.js";
+} from "@/api/validation/monitorValidation.js";
+import { updateNotificationsValidation } from "@/api/validation/notificationValidation.js";
 
 const tags = ["monitors"];
 

server/openapi/routes/notification.ts

@@ -7,7 +7,7 @@ import {
 	getNotificationByIdParamValidation,
 	editNotificationParamValidation,
 	testAllNotificationsBodyValidation,
-} from "@/validation/notificationValidation.js";
+} from "@/api/validation/notificationValidation.js";
 
 const tags = ["notifications"];
 

server/openapi/routes/settings.ts

@@ -1,7 +1,7 @@
 import { registry } from "../registry.js";
 import { bearer, json, okJsonNoData, okUnknown, standardErrors } from "../helpers.js";
-import { updateAppSettingsBodyValidation } from "@/validation/settingsValidation.js";
-import { sendTestEmailBodyValidation } from "@/validation/notificationValidation.js";
+import { updateAppSettingsBodyValidation } from "@/api/validation/settingsValidation.js";
+import { sendTestEmailBodyValidation } from "@/api/validation/notificationValidation.js";
 
 const tags = ["settings"];
 

server/openapi/routes/statusPage.ts

@@ -5,7 +5,7 @@ import {
 	getStatusPageParamValidation,
 	getStatusPageQueryValidation,
 	resolveStatusPageQueryValidation,
-} from "@/validation/statusPageValidation.js";
+} from "@/api/validation/statusPageValidation.js";
 
 const tags = ["status-page"];
 

server/package.json

@@ -22,7 +22,7 @@
 		"format-check": "prettier --check ."
 	},
 	"lint-staged": {
-		"**/*": "prettier --write"
+		"**/*": "prettier --write --ignore-unknown"
 	},
 	"keywords": [],
 	"author": "",

server/src/api/controllers/authController.ts

@@ -1,6 +1,6 @@
 import { Request, Response, NextFunction } from "express";
 import { AppError } from "@/utils/AppError.js";
-import { requireTeamId, requireUserEmail, requireUserId, requireUserRoles } from "@/controllers/controllerUtils.js";
+import { requireTeamId, requireUserEmail, requireUserId, requireUserRoles } from "@/api/controllers/controllerUtils.js";
 
 import {
 	registrationBodyValidation,
@@ -8,7 +8,7 @@ import {
 	recoveryValidation,
 	recoveryTokenBodyValidation,
 	newPasswordValidation,
-} from "@/validation/authValidation.js";
+} from "@/api/validation/authValidation.js";
 
 import {
 	editUserBodyValidation,
@@ -18,8 +18,8 @@ import {
 	editUserByIdBodyValidation,
 	editSuperadminUserByIdBodyValidation,
 	editUserPasswordByIdBodyValidation,
-} from "@/validation/userValidation.js";
-import { IUserService } from "@/service/index.js";
+} from "@/api/validation/userValidation.js";
+import { IUserService } from "@/domain/users/user.service.js";
 
 const SERVICE_NAME = "authController";
 

server/src/api/controllers/checkController.ts

@@ -6,9 +6,9 @@ import {
 	getTeamChecksQueryValidation,
 	getChecksSummaryByTeamIdQueryValidation,
 	deleteChecksParamValidation,
-} from "@/validation/checkValidation.js";
-import { ICheckService } from "@/service/index.js";
-import { requireTeamId } from "@/controllers/controllerUtils.js";
+} from "@/api/validation/checkValidation.js";
+import { ICheckService } from "@/domain/checks/check.service.js";
+import { requireTeamId } from "@/api/controllers/controllerUtils.js";
 
 const SERVICE_NAME = "checkController";
 

server/src/api/controllers/controllerUtils.ts

@@ -1,5 +1,6 @@
 import { AppError } from "@/utils/AppError.js";
-import { Monitor, type MonitorType, MonitorTypes, UserRole } from "@/types/index.js";
+import { Monitor, MonitorTypes, type MonitorType } from "@/domain/monitors/monitor.types.js";
+import { UserRole } from "@/domain/users/user.type.js";
 import sslChecker, { SSLDetails } from "ssl-checker";
 type SSLCheckerType = typeof sslChecker;
 

server/src/api/controllers/diagnosticController.ts

@@ -1,4 +1,4 @@
-import { IDiagnosticService } from "@/service/index.js";
+import { IDiagnosticService } from "@/domain/diagnostics/diagnostic.service.js";
 import { Request, Response, NextFunction } from "express";
 
 const SERVICE_NAME = "diagnosticController";

server/src/api/controllers/geoCheckController.ts

@@ -1,8 +1,7 @@
 import { Request, Response, NextFunction } from "express";
-import { getChecksParamValidation, getChecksQueryValidation } from "@/validation/checkValidation.js";
-import type { IGeoChecksService } from "@/service/business/geoChecksService.js";
+import { getChecksParamValidation, getChecksQueryValidation } from "@/api/validation/checkValidation.js";
+import type { IGeoChecksService } from "@/domain/geo-checks/geo-check.service.js";
 import { requireTeamId } from "./controllerUtils.js";
-import { AppError } from "@/utils/AppError.js";
 
 const SERVICE_NAME = "geoCheckController";
 

server/src/api/controllers/incidentController.ts

@@ -1,8 +1,8 @@
 import { AppError } from "@/utils/AppError.js";
 import { Request, Response, NextFunction } from "express";
 import { requireTeamId, requireUserId, requireUserEmail, extractString } from "./controllerUtils.js";
-import { IIncidentService } from "@/service/index.js";
-import { getIncidentsByTeamQueryValidation, getIncidentSummaryQueryValidation } from "@/validation/incidentValidation.js";
+import { IIncidentService } from "@/domain/incidents/incident.service.js";
+import { getIncidentsByTeamQueryValidation, getIncidentSummaryQueryValidation } from "@/api/validation/incidentValidation.js";
 
 const SERVICE_NAME = "IncidentController";
 

server/src/api/controllers/inviteController.ts

@@ -1,7 +1,7 @@
 import { Request, Response, NextFunction } from "express";
-import { inviteBodyValidation, inviteVerificationBodyValidation } from "@/validation/authValidation.js";
-import { requireFirstName, requireTeamId, requireUserRoles } from "@/controllers/controllerUtils.js";
-import { IInviteService } from "@/service/index.js";
+import { inviteBodyValidation, inviteVerificationBodyValidation } from "@/api/validation/authValidation.js";
+import { requireFirstName, requireTeamId, requireUserRoles } from "@/api/controllers/controllerUtils.js";
+import { IInviteService } from "@/domain/invites/invite.service.js";
 const SERVICE_NAME = "inviteController";
 
 export interface IInviteController {

server/src/api/controllers/maintenanceWindowController.ts

@@ -7,9 +7,9 @@ import {
 	getMaintenanceWindowsByMonitorIdParamValidation,
 	getMaintenanceWindowsByTeamIdQueryValidation,
 	deleteMaintenanceWindowByIdParamValidation,
-} from "@/validation/maintenanceWindowValidation.js";
-import { requireTeamId } from "@/controllers/controllerUtils.js";
-import { IMaintenanceWindowService } from "@/service/index.js";
+} from "@/api/validation/maintenanceWindowValidation.js";
+import { requireTeamId } from "@/api/controllers/controllerUtils.js";
+import { IMaintenanceWindowService } from "@/domain/maintenance-windows/maintenance-window.service.js";
 
 export interface IMaintenanceWindowController {
 	createMaintenanceWindows: (req: Request, res: Response, next: NextFunction) => Promise<Response | void>;

server/src/api/controllers/monitorController.ts

@@ -1,5 +1,5 @@
 import { Request, Response, NextFunction } from "express";
-import { updateNotificationsValidation } from "@/validation/notificationValidation.js";
+import { updateNotificationsValidation } from "@/api/validation/notificationValidation.js";
 import {
 	getMonitorByIdParamValidation,
 	getMonitorByIdQueryValidation,
@@ -15,11 +15,12 @@ import {
 	getUptimeDetailsByIdQueryValidation,
 	importMonitorsBodyValidation,
 	bulkPauseMonitorBodyValidation,
-} from "@/validation/monitorValidation.js";
+} from "@/api/validation/monitorValidation.js";
 import sslChecker from "ssl-checker";
-import { fetchMonitorCertificate, requireTeamId, requireUserId } from "@/controllers/controllerUtils.js";
+import { fetchMonitorCertificate, requireTeamId, requireUserId } from "@/api/controllers/controllerUtils.js";
 import { AppError } from "@/utils/AppError.js";
-import { IMonitorService, INotificationsService } from "@/service/index.js";
+import { IMonitorService } from "@/domain/monitors/monitor.service.js";
+import { INotificationsService } from "@/domain/notifications/notification.service.js";
 
 const SERVICE_NAME = "monitorController";
 

server/src/api/controllers/notificationController.ts

@@ -7,11 +7,11 @@ import {
 	testNotificationBodyValidation,
 	editNotificationParamValidation,
 	testAllNotificationsBodyValidation,
-} from "@/validation/notificationValidation.js";
+} from "@/api/validation/notificationValidation.js";
 import { AppError } from "@/utils/AppError.js";
-import { INotificationsService } from "@/service/index.js";
+import { INotificationsService } from "@/domain/notifications/notification.service.js";
 import { requireTeamId, requireUserId } from "./controllerUtils.js";
-import { IMonitorsRepository } from "@/repositories/index.js";
+import { IMonitorsRepository } from "@/domain/monitors/monitor.repository.interface.js";
 
 const SERVICE_NAME = "NotificationController";
 

server/src/api/controllers/queueController.ts

@@ -1,5 +1,5 @@
-import { IJobQueue } from "@/service/index.js";
-import { getQueueJobsQueryValidation } from "@/validation/queueValidation.js";
+import { IJobQueue } from "@/service/job-queues/job-queue.interface.js";
+import { getQueueJobsQueryValidation } from "@/api/validation/queueValidation.js";
 import { Request, Response, NextFunction } from "express";
 
 const SERVICE_NAME = "JobQueueController";

server/src/api/controllers/settingsController.ts

@@ -1,9 +1,10 @@
 import { Request, Response, NextFunction } from "express";
-import { updateAppSettingsBodyValidation } from "@/validation/settingsValidation.js";
-import { sendTestEmailBodyValidation } from "@/validation/notificationValidation.js";
+import { updateAppSettingsBodyValidation } from "@/api/validation/settingsValidation.js";
+import { sendTestEmailBodyValidation } from "@/api/validation/notificationValidation.js";
 import { AppError } from "@/utils/AppError.js";
-import { IEmailService, ISettingsService } from "@/service/index.js";
-import { Settings } from "@/types/settings.js";
+import { ISettingsService } from "@/domain/app-settings/app-settings.service.js";
+import { IEmailService } from "@/service/emailService.js";
+import { Settings } from "@/domain/app-settings/app-settings.type.js";
 
 const SERVICE_NAME = "SettingsController";
 

server/src/api/controllers/statusPageController.ts

@@ -6,15 +6,15 @@ import {
 	getStatusPageQueryValidation,
 	imageValidation,
 	resolveStatusPageQueryValidation,
-} from "@/validation/statusPageValidation.js";
+} from "@/api/validation/statusPageValidation.js";
 import { AppError } from "@/utils/AppError.js";
-import { requireTeamId, requireUserId } from "@/controllers/controllerUtils.js";
-import { IStatusPageService } from "@/service/business/statusPageService.js";
-import { IMonitorsRepository } from "@/repositories/index.js";
-import { ISettingsService } from "@/service/system/settingsService.js";
+import { requireTeamId, requireUserId } from "@/api/controllers/controllerUtils.js";
+import { IStatusPageService } from "@/domain/status-pages/status-page.service.js";
+import { IMonitorsRepository } from "@/domain/monitors/monitor.repository.interface.js";
+import { ISettingsService } from "@/domain/app-settings/app-settings.service.js";
 import { NormalizeData } from "@/utils/dataUtils.js";
 import { resolveStatusPageDomainFromRequest } from "@/utils/statusPageDomain.js";
-import type { StatusPage } from "@/types/statusPage.js";
+import type { StatusPage } from "@/domain/status-pages/status-page.type.js";
 
 const SERVICE_NAME = "statusPageController";
 

server/src/api/controllers/statusPageThemeFlag.ts

@@ -1,4 +1,4 @@
-import { DEFAULT_STATUS_PAGE_THEME, DEFAULT_STATUS_PAGE_THEME_MODE, type StatusPage } from "@/types/statusPage.js";
+import { DEFAULT_STATUS_PAGE_THEME, DEFAULT_STATUS_PAGE_THEME_MODE, type StatusPage } from "@/domain/status-pages/status-page.type.js";
 
 /**
  * When STATUS_PAGE_THEMES_ENABLED is false, the controller drops incoming

server/src/api/controllers/tagController.ts

@@ -1,5 +1,5 @@
 import { Request, Response, NextFunction } from "express";
-import { ITagsService } from "@/service/index.js";
+import { ITagsService } from "@/domain/tags/tag.service.js";
 import { requireTeamId } from "./controllerUtils.js";
 import {
 	createTagBodyValidation,
@@ -7,7 +7,7 @@ import {
 	getTagByIdParamValidation,
 	editTagParamValidation,
 	deleteTagParamValidation,
-} from "@/validation/index.js";
+} from "@/api/validation/index.js";
 
 export interface ITagsController {
 	createTag: (req: Request, res: Response, next: NextFunction) => Promise<Response | void>;

server/src/api/middleware/isAllowed.ts

@@ -1,7 +1,7 @@
 import type { Request, Response, NextFunction } from "express";
 const SERVICE_NAME = "allowedRoles";
 import { AppError } from "@/utils/AppError.js";
-import type { UserRole } from "@/types/index.js";
+import type { UserRole } from "@/domain/users/user.type.js";
 
 const isAllowed = (allowedRoles: UserRole[]) => {
 	return (req: Request, res: Response, next: NextFunction) => {

server/src/api/middleware/statusPageCorsOrigin.ts

@@ -1,5 +1,5 @@
 import type { CorsOptions } from "cors";
-import type { IStatusPagesRepository } from "@/repositories/index.js";
+import type { IStatusPagesRepository } from "@/domain/status-pages/status-page-repository.interface.js";
 import { normalizeStatusPageDomain } from "@/utils/statusPageDomain.js";
 
 export const createStatusPageCorsOrigin = (clientHost: string, statusPagesRepository: IStatusPagesRepository): CorsOptions["origin"] => {

server/src/api/middleware/verifyJWT.ts

@@ -2,8 +2,8 @@ import { NextFunction, Request, Response } from "express";
 
 import jwt from "jsonwebtoken";
 import { AppError } from "@/utils/AppError.js";
-import type { ISettingsService } from "@/service/system/settingsService.js";
-import type { User } from "@/types/user.js";
+import type { ISettingsService } from "@/domain/app-settings/app-settings.service.js";
+import type { User } from "@/domain/users/user.type.js";
 
 const SERVICE_NAME = "verifyJWT";
 const TOKEN_PREFIX = "Bearer ";

server/src/api/middleware/verifyStatusPageAccess.ts

@@ -1,5 +1,5 @@
 import { NextFunction, Request, RequestHandler, Response } from "express";
-import { IStatusPagesRepository } from "@/repositories/index.js";
+import { IStatusPagesRepository } from "@/domain/status-pages/status-page-repository.interface.js";
 import { AppError } from "@/utils/AppError.js";
 
 export const createVerifyStatusPageAccess = (statusPagesRepository: IStatusPagesRepository, verifyJWT: RequestHandler) => {

server/src/api/routes/authRoute.ts

@@ -1,7 +1,7 @@
 import { Router, RequestHandler } from "express";
 import { isAllowed } from "../middleware/isAllowed.js";
 import multer from "multer";
-import { IAuthController } from "@/controllers/authController.js";
+import { IAuthController } from "@/api/controllers/authController.js";
 
 const upload = multer();
 

server/src/api/routes/checkRoute.ts

@@ -1,7 +1,7 @@
 import { Router } from "express";
 
 import { isAllowed } from "../middleware/isAllowed.js";
-import { ICheckController } from "@/controllers/checkController.js";
+import { ICheckController } from "@/api/controllers/checkController.js";
 
 class CheckRoutes {
 	private router: Router;

server/src/api/routes/diagnosticRoute.ts

@@ -1,6 +1,6 @@
 import { RequestHandler, Router } from "express";
 import { isAllowed } from "../middleware/isAllowed.js";
-import { IDiagnosticController } from "@/controllers/diagnosticController.js";
+import { IDiagnosticController } from "@/api/controllers/diagnosticController.js";
 
 class DiagnosticRoutes {
 	private router: Router;

server/src/api/routes/geoCheckRoutes.ts

@@ -1,4 +1,4 @@
-import { IGeoCheckController } from "@/controllers/geoCheckController.js";
+import { IGeoCheckController } from "@/api/controllers/geoCheckController.js";
 import { Router } from "express";
 
 class GeoCheckRoutes {

server/src/api/routes/incidentRoute.ts

@@ -1,6 +1,6 @@
 import { Router } from "express";
 import { isAllowed } from "../middleware/isAllowed.js";
-import { IIncidentController } from "@/controllers/incidentController.js";
+import { IIncidentController } from "@/api/controllers/incidentController.js";
 
 class IncidentRoutes {
 	private router: Router;

server/src/api/routes/inviteRoute.ts

@@ -1,6 +1,6 @@
 import { RequestHandler, Router } from "express";
 import { isAllowed } from "../middleware/isAllowed.js";
-import { IInviteController } from "@/controllers/inviteController.js";
+import { IInviteController } from "@/api/controllers/inviteController.js";
 
 class InviteRoutes {
 	private router: Router;

server/src/api/routes/logRoutes.ts

@@ -1,6 +1,6 @@
 import { Router } from "express";
-import { isAllowed } from "@/middleware/isAllowed.js";
-import { ILogController } from "@/controllers/logController.js";
+import { isAllowed } from "@/api/middleware/isAllowed.js";
+import { ILogController } from "@/api/controllers/logController.js";
 class LogRoutes {
 	private router: Router;
 	private logController: ILogController;

server/src/api/routes/maintenanceWindowRoute.ts

@@ -1,4 +1,4 @@
-import { IMaintenanceWindowController } from "@/controllers/maintenanceWindowController.js";
+import { IMaintenanceWindowController } from "@/api/controllers/maintenanceWindowController.js";
 import { Router } from "express";
 
 class MaintenanceWindowRoutes {

server/src/api/routes/monitorRoute.ts

@@ -1,6 +1,6 @@
 import { Router } from "express";
-import { isAllowed } from "@/middleware/isAllowed.js";
-import { IMonitorController } from "@/controllers/monitorController.js";
+import { isAllowed } from "@/api/middleware/isAllowed.js";
+import { IMonitorController } from "@/api/controllers/monitorController.js";
 
 class MonitorRoutes {
 	private router: Router;

server/src/api/routes/notificationRoute.ts

@@ -1,4 +1,4 @@
-import { INotificationController } from "@/controllers/notificationController.js";
+import { INotificationController } from "@/api/controllers/notificationController.js";
 import { Router } from "express";
 class NotificationRoutes {
 	private router: Router;

server/src/api/routes/queueRoute.ts

@@ -1,6 +1,6 @@
 import { Router } from "express";
-import { isAllowed } from "@/middleware/isAllowed.js";
-import { IJobQueueController } from "@/controllers/queueController.js";
+import { isAllowed } from "@/api/middleware/isAllowed.js";
+import { IJobQueueController } from "@/api/controllers/queueController.js";
 class QueueRoutes {
 	private router: Router;
 	private queueController: IJobQueueController;

server/src/api/routes/settingsRoute.ts

@@ -1,6 +1,6 @@
 import { Router } from "express";
 import { isAllowed } from "../middleware/isAllowed.js";
-import { ISettingsController } from "@/controllers/settingsController.js";
+import { ISettingsController } from "@/api/controllers/settingsController.js";
 
 class SettingsRoutes {
 	private router: Router;

server/src/api/routes/statusPageRoute.ts

@@ -1,4 +1,4 @@
-import { IStatusPageController } from "@/controllers/statusPageController.js";
+import { IStatusPageController } from "@/api/controllers/statusPageController.js";
 import { RequestHandler, Router } from "express";
 import multer from "multer";
 const upload = multer();

server/src/api/routes/tagRoutes.ts

@@ -1,4 +1,4 @@
-import { ITagsController } from "@/controllers/tagController.js";
+import { ITagsController } from "@/api/controllers/tagController.js";
 import { Router } from "express";
 class TagRoutes {
 	private router: Router;

server/src/api/validation/authValidation.ts

@@ -1,6 +1,6 @@
 import { z } from "zod";
 import { passwordPattern, nameValidation, lowercaseEmailValidation } from "./shared.js";
-import { UserRoles } from "@/types/user.js";
+import { UserRoles } from "@/domain/users/user.type.js";
 
 //****************************************
 // Auth Validations

server/src/api/validation/checkValidation.ts

@@ -1,7 +1,7 @@
 import { z } from "zod";
 import { booleanCoercion } from "./shared.js";
-import { GeoContinents } from "@/types/geoCheck.js";
-import { MonitorTypes } from "@/types/monitor.js";
+import { GeoContinents } from "@/domain/geo-checks/geo-check.type.js";
+import { MonitorTypes } from "@/domain/monitors/monitor.types.js";
 
 //****************************************
 // Check Validations

server/src/api/validation/index.ts

@@ -9,7 +9,7 @@
 export * from "./shared.js";
 
 // Environment validation
-export * from "./envValidation.js";
+export * from "@/config/envValidation.js";
 
 // Domain-specific validations
 export * from "./authValidation.js";

server/src/api/validation/maintenanceWindowValidation.ts

@@ -1,6 +1,6 @@
 import { z } from "zod";
 import { booleanCoercion } from "./shared.js";
-import { DurationUnits } from "@/types/maintenanceWindow.js";
+import { DurationUnits } from "@/domain/maintenance-windows/maintenance-window.type.js";
 
 const dateToString = z.coerce.date().transform((d) => d.toISOString());
 

server/src/api/validation/monitorValidation.ts

@@ -1,7 +1,16 @@
 import { z } from "zod";
 import { booleanCoercion, dnsHostnameRegex, dnsServerValidation } from "./shared.js";
-import { GeoContinents } from "@/types/geoCheck.js";
-import { DnsRecordTypes, MonitorMatchMethods, MonitorStatuses, MonitorTypes, PageSpeedStrategies } from "@/types/monitor.js";
+import { GeoContinents } from "@/domain/geo-checks/geo-check.type.js";
+import {
+	DnsRecordTypes,
+	HttpStatusCodeSet,
+	MonitorMatchMethods,
+	MonitorStatuses,
+	MonitorTypes,
+	PageSpeedStrategies,
+} from "@/domain/monitors/monitor.types.js";
+
+const httpStatusCode = z.number().refine((code) => HttpStatusCodeSet.has(code), { message: "Must be a valid HTTP status code" });
 
 export const getMonitorByIdParamValidation = z.object({
 	monitorId: z.string().min(1, "Monitor ID is required"),
@@ -81,6 +90,7 @@ export const createMonitorBodyValidation = z
 		tempAlertThreshold: z.number().optional(),
 		notifications: z.array(z.string()).optional(),
 		tags: z.array(z.string()).optional(),
+		customUpCodes: z.array(httpStatusCode).default([]),
 		secret: z.string().optional(),
 		jsonPath: z.union([z.string(), z.literal("")]).optional(),
 		expectedValue: z.union([z.string(), z.literal("")]).optional(),
@@ -110,6 +120,7 @@ export const editMonitorBodyValidation = z
 		interval: z.number().optional(),
 		notifications: z.array(z.string()).optional(),
 		tags: z.array(z.string()).optional(),
+		customUpCodes: z.array(httpStatusCode).optional(),
 		secret: z.string().optional(),
 		ignoreTlsErrors: z.boolean().optional(),
 		useAdvancedMatching: z.boolean().optional(),
@@ -180,6 +191,7 @@ const importedMonitorSchema = z
 		uptimePercentage: z.number().optional(),
 		notifications: z.array(z.string()).default([]),
 		tags: z.array(z.string()).default([]),
+		customUpCodes: z.array(httpStatusCode).default([]),
 		secret: z.string().optional(),
 		cpuAlertThreshold: z.number().default(100),
 		cpuAlertCounter: z.number().default(5),
@@ -241,6 +253,7 @@ export const monitorResponseSchema = z
 		matchMethod: z.enum(MonitorMatchMethods).optional(),
 		notifications: z.array(z.string()),
 		tags: z.array(z.string()),
+		customUpCodes: z.array(httpStatusCode).optional(),
 		secret: z.string().optional(),
 		cpuAlertThreshold: z.number(),
 		memoryAlertThreshold: z.number(),

server/src/api/validation/settingsValidation.ts

@@ -1,4 +1,4 @@
-import { CHECK_TTL_SENTINEL } from "@/types/check.js";
+import { CHECK_TTL_SENTINEL } from "@/domain/checks/check.type.js";
 import { z } from "zod";
 
 //****************************************

server/src/api/validation/shared.ts

@@ -1,5 +1,5 @@
 import { z } from "zod";
-import { type UserRole } from "@/types/user.js";
+import { type UserRole } from "@/domain/users/user.type.js";
 
 export const passwordPattern =
 	/^(?=.*[a-z])(?=.*[A-Z])(?=.*[0-9])(?=.*[!?@#$%^&*()\-_=+[\]{};:'",.~`|\\/])[A-Za-z0-9!?@#$%^&*()\-_=+[\]{};:'",.~`|\\/]+$/;

server/src/api/validation/statusPageValidation.ts

@@ -1,6 +1,6 @@
 import { z } from "zod";
 import { booleanCoercion, dnsHostnameRegex } from "./shared.js";
-import { StatusPageTypes, StatusPageThemes, StatusPageThemeModes } from "@/types/statusPage.js";
+import { StatusPageTypes, StatusPageThemes, StatusPageThemeModes } from "@/domain/status-pages/status-page.type.js";
 import { normalizeStatusPageDomain } from "@/utils/statusPageDomain.js";
 
 //****************************************

server/src/api/validation/userValidation.ts

@@ -1,5 +1,5 @@
 import { z } from "zod";
-import { UserRoles } from "@/types/user.js";
+import { UserRoles } from "@/domain/users/user.type.js";
 import { nameValidation, lowercaseEmailValidation, passwordValidation } from "./shared.js";
 
 //****************************************

server/src/app.ts

@@ -5,14 +5,14 @@ import helmet from "helmet";
 import compression from "compression";
 import cookieParser from "cookie-parser";
 import swaggerUi, { type JsonObject } from "swagger-ui-express";
-import { handleErrors } from "@/middleware/handleErrors.js";
-import { generalApiLimiter } from "@/middleware/rateLimiter.js";
-import { sanitizeBody, sanitizeQuery } from "@/middleware/sanitization.js";
+import { handleErrors } from "@/api/middleware/handleErrors.js";
+import { generalApiLimiter } from "@/api/middleware/rateLimiter.js";
+import { sanitizeBody, sanitizeQuery } from "@/api/middleware/sanitization.js";
 import { setupRoutes } from "@/config/routes.js";
 import { InitializedServices } from "@/config/services.js";
 import { InitializedControllers } from "@/config/controllers.js";
-import { EnvConfig } from "@/service/system/settingsService.js";
-import { createStatusPageCorsOrigin } from "@/middleware/statusPageCorsOrigin.js";
+import { EnvConfig } from "@/domain/app-settings/app-settings.service.js";
+import { createStatusPageCorsOrigin } from "@/api/middleware/statusPageCorsOrigin.js";
 
 export const createApp = ({
 	services,

server/src/config/controllers.ts

@@ -1,17 +1,17 @@
-import MonitorController from "../controllers/monitorController.js";
-import AuthController from "../controllers/authController.js";
-import SettingsController from "../controllers/settingsController.js";
-import CheckController from "../controllers/checkController.js";
-import GeoCheckController from "../controllers/geoCheckController.js";
-import InviteController from "../controllers/inviteController.js";
-import MaintenanceWindowController from "../controllers/maintenanceWindowController.js";
-import QueueController from "../controllers/queueController.js";
-import LogController from "../controllers/logController.js";
-import StatusPageController from "../controllers/statusPageController.js";
-import NotificationController from "../controllers/notificationController.js";
-import TagsController from "../controllers/tagController.js";
-import DiagnosticController from "../controllers/diagnosticController.js";
-import IncidentController from "../controllers/incidentController.js";
+import MonitorController from "../api/controllers/monitorController.js";
+import AuthController from "../api/controllers/authController.js";
+import SettingsController from "../api/controllers/settingsController.js";
+import CheckController from "../api/controllers/checkController.js";
+import GeoCheckController from "../api/controllers/geoCheckController.js";
+import InviteController from "../api/controllers/inviteController.js";
+import MaintenanceWindowController from "../api/controllers/maintenanceWindowController.js";
+import QueueController from "../api/controllers/queueController.js";
+import LogController from "../api/controllers/logController.js";
+import StatusPageController from "../api/controllers/statusPageController.js";
+import NotificationController from "../api/controllers/notificationController.js";
+import TagsController from "../api/controllers/tagController.js";
+import DiagnosticController from "../api/controllers/diagnosticController.js";
+import IncidentController from "../api/controllers/incidentController.js";
 import type { InitializedServices } from "@/config/services.js";
 
 export interface InitializedControllers {

server/src/config/envValidation.ts

@@ -1,6 +1,6 @@
 import { z } from "zod";
-import { DbTypes, QueueTypes, QueueModes } from "@/types/settings.js";
-import { booleanCoercion } from "./shared.js";
+import { DbTypes, QueueTypes, QueueModes } from "@/domain/app-settings/app-settings.type.js";
+import { booleanCoercion } from "@/api/validation/shared.js";
 
 const envSchema = z.object({
 	// Server Configuration

server/src/config/routes.ts

@@ -1,25 +1,25 @@
 import type { Application } from "express";
-import { createVerifyJWT } from "../middleware/verifyJWT.js";
-import { createVerifyStatusPageAccess } from "../middleware/verifyStatusPageAccess.js";
-import { authApiLimiter } from "../middleware/rateLimiter.js";
+import { createVerifyJWT } from "../api/middleware/verifyJWT.js";
+import { createVerifyStatusPageAccess } from "../api/middleware/verifyStatusPageAccess.js";
+import { authApiLimiter } from "../api/middleware/rateLimiter.js";
 import type { InitializedControllers } from "./controllers.js";
 import type { InitializedServices } from "./services.js";
 
-import AuthRoutes from "../routes/authRoute.js";
-import InviteRoutes from "../routes/inviteRoute.js";
-import MonitorRoutes from "../routes/monitorRoute.js";
-import CheckRoutes from "../routes/checkRoute.js";
-import GeoCheckRoutes from "../routes/geoCheckRoutes.js";
-import SettingsRoutes from "../routes/settingsRoute.js";
-import MaintenanceWindowRoutes from "../routes/maintenanceWindowRoute.js";
-import StatusPageRoutes from "../routes/statusPageRoute.js";
-import QueueRoutes from "../routes/queueRoute.js";
-import LogRoutes from "../routes/logRoutes.js";
-import DiagnosticRoutes from "../routes/diagnosticRoute.js";
-import NotificationRoutes from "../routes/notificationRoute.js";
-import TagRoutes from "../routes/tagRoutes.js";
+import AuthRoutes from "../api/routes/authRoute.js";
+import InviteRoutes from "../api/routes/inviteRoute.js";
+import MonitorRoutes from "../api/routes/monitorRoute.js";
+import CheckRoutes from "../api/routes/checkRoute.js";
+import GeoCheckRoutes from "../api/routes/geoCheckRoutes.js";
+import SettingsRoutes from "../api/routes/settingsRoute.js";
+import MaintenanceWindowRoutes from "../api/routes/maintenanceWindowRoute.js";
+import StatusPageRoutes from "../api/routes/statusPageRoute.js";
+import QueueRoutes from "../api/routes/queueRoute.js";
+import LogRoutes from "../api/routes/logRoutes.js";
+import DiagnosticRoutes from "../api/routes/diagnosticRoute.js";
+import NotificationRoutes from "../api/routes/notificationRoute.js";
+import TagRoutes from "../api/routes/tagRoutes.js";
 
-import IncidentRoutes from "../routes/incidentRoute.js";
+import IncidentRoutes from "../api/routes/incidentRoute.js";
 
 export const setupRoutes = (app: Application, controllers: InitializedControllers, services: InitializedServices) => {
 	const verifyJWT = createVerifyJWT(services.settingsService);

server/src/config/services.ts

@@ -1,75 +1,52 @@
 import { Mongoose } from "mongoose";
-import MongoDB from "../db/MongoDB.js";
-import { IDb } from "@/db/IDb.js";
-import {
-	// Service classes
-	NetworkService,
-	EmailService,
-	BufferService,
-	GlobalPingService,
-	LessSimpleQueue,
-	SuperSimpleQueue,
-	QueueHelper,
-	NotificationsService,
-	TagsService,
-	StatusService,
-	NotificationMessageBuilder,
-	MonitorService,
-	StatusPageService,
-	UserService,
-	CheckService,
-	GeoChecksService,
-	DiagnosticService,
-	InviteService,
-	MaintenanceWindowService,
-	IncidentService,
-	// Notification providers
-	WebhookProvider,
-	SlackProvider,
-	EmailProvider,
-	DiscordProvider,
-	PagerDutyProvider,
-	MatrixProvider,
-	TeamsProvider,
-	TelegramProvider,
-	PushoverProvider,
-	TwilioProvider,
-	NtfyProvider,
-	// Interfaces
-	INetworkService,
-	IEmailService,
-	IBufferService,
-	IJobQueue,
-	INotificationsService,
-	ITagsService,
-	IStatusService,
-	IMonitorService,
-	IUserService,
-	ICheckService,
-	IGeoChecksService,
-	IDiagnosticService,
-	IInviteService,
-	IMaintenanceWindowService,
-	IStatusPageService,
-	IIncidentService,
-	INotificationMessageBuilder,
-	ISettingsService,
-	SettingsService,
-	EnvConfig,
-} from "@/service/index.js";
+import MongoDB from "../db/db.mongo.js";
+import { IDb } from "@/db/db.interface.js";
+import { EnvConfig, ISettingsService, SettingsService } from "@/domain/app-settings/app-settings.service.js";
+import { CheckService, ICheckService } from "@/domain/checks/check.service.js";
+import { DiagnosticService, IDiagnosticService } from "@/domain/diagnostics/diagnostic.service.js";
+import { GeoChecksService, IGeoChecksService } from "@/domain/geo-checks/geo-check.service.js";
+import { IIncidentService, IncidentService } from "@/domain/incidents/incident.service.js";
+import { IInviteService, InviteService } from "@/domain/invites/invite.service.js";
+import { IMaintenanceWindowService, MaintenanceWindowService } from "@/domain/maintenance-windows/maintenance-window.service.js";
+import { IMonitorService, MonitorService } from "@/domain/monitors/monitor.service.js";
+import { INotificationMessageBuilder, NotificationMessageBuilder } from "@/domain/notifications/notification.message-builder.js";
+import { INotificationsService, NotificationsService } from "@/domain/notifications/notification.service.js";
+import { DiscordProvider } from "@/domain/notifications/providers/discord.js";
+import { EmailProvider } from "@/domain/notifications/providers/email.js";
+import { MatrixProvider } from "@/domain/notifications/providers/matrix.js";
+import { NtfyProvider } from "@/domain/notifications/providers/ntfy.js";
+import { PagerDutyProvider } from "@/domain/notifications/providers/pagerduty.js";
+import { PushoverProvider } from "@/domain/notifications/providers/pushover.js";
+import { SlackProvider } from "@/domain/notifications/providers/slack.js";
+import { TeamsProvider } from "@/domain/notifications/providers/teams.js";
+import { TelegramProvider } from "@/domain/notifications/providers/telegram.js";
+import { TwilioProvider } from "@/domain/notifications/providers/twilio.js";
+import { WebhookProvider } from "@/domain/notifications/providers/webhook.js";
+import { IStatusPageService, StatusPageService } from "@/domain/status-pages/status-page.service.js";
+import { ITagsService, TagsService } from "@/domain/tags/tag.service.js";
+import { IUserService, UserService } from "@/domain/users/user.service.js";
+import { BufferService, IBufferService } from "@/service/bufferService.js";
+import { EmailService, IEmailService } from "@/service/emailService.js";
+import { GlobalPingService } from "@/service/globalPingService.js";
+import { QueueHelper } from "@/service/job-queues/job-queue.helper.js";
+import { IJobQueue } from "@/service/job-queues/job-queue.interface.js";
+import { LessSimpleQueue } from "@/service/job-queues/job-queue.less-simple.js";
+import { SuperSimpleQueue } from "@/service/job-queues/job-queue.sumper-simple.js";
+import { INetworkService, NetworkService } from "@/service/networkService.js";
+import { IStatusService, StatusService } from "@/service/statusService.js";
 
 // Network providers
-import { PingProvider } from "@/service/infrastructure/network/PingProvider.js";
-import { HttpProvider } from "@/service/infrastructure/network/HttpProvider.js";
-import { AdvancedMatcher } from "@/service/infrastructure/network/AdvancedMatcher.js";
-import { PageSpeedProvider } from "@/service/infrastructure/network/PageSpeedProvider.js";
-import { HardwareProvider } from "@/service/infrastructure/network/HardwareProvider.js";
-import { DockerProvider } from "@/service/infrastructure/network/DockerProvider.js";
-import { PortProvider } from "@/service/infrastructure/network/PortProvider.js";
-import { GameProvider } from "@/service/infrastructure/network/GameProvider.js";
-import { GrpcProvider } from "@/service/infrastructure/network/GrpcProvider.js";
-import { WebSocketProvider } from "@/service/infrastructure/network/WebSocketProvider.js";
-import { DNSProvider } from "@/service/infrastructure/network/DNSProvider.js";
+import { PingProvider } from "@/service/network/PingProvider.js";
+import { HttpProvider } from "@/service/network/HttpProvider.js";
+import { AdvancedMatcher } from "@/service/network/AdvancedMatcher.js";
+import { PageSpeedProvider } from "@/service/network/PageSpeedProvider.js";
+import { HardwareProvider } from "@/service/network/HardwareProvider.js";
+import { DockerProvider } from "@/service/network/DockerProvider.js";
+import { PortProvider } from "@/service/network/PortProvider.js";
+import { GameProvider } from "@/service/network/GameProvider.js";
+import { GrpcProvider } from "@/service/network/GrpcProvider.js";
+import { WebSocketProvider } from "@/service/network/WebSocketProvider.js";
+import { DNSProvider } from "@/service/network/DNSProvider.js";
 
 // Third-party
 import { Resolver } from "dns/promises";
@@ -93,40 +70,38 @@ import * as protoLoader from "@grpc/proto-loader";
 import WebSocket from "ws";
 
 // Repositories
-import {
-	MongoMonitorsRepository,
-	MongoChecksRepository,
-	MongoGeoChecksRepository,
-	MongoMonitorStatsRepository,
-	MongoStatusPagesRepository,
-	MongoUsersRepository,
-	MongoInvitesRepository,
-	MongoRecoveryTokensRepository,
-	MongoNotificationsRepository,
-	MongoTagsRepository,
-	MongoIncidentsRepository,
-	MongoTeamsRepository,
-	MongoMaintenanceWindowsRepository,
-	MongoSettingsRepository,
-	MongoQueueWorkersRepository,
-	IMonitorsRepository,
-	IChecksRepository,
-	IGeoChecksRepository,
-	IMonitorStatsRepository,
-	IStatusPagesRepository,
-	IUsersRepository,
-	IInvitesRepository,
-	IRecoveryTokensRepository,
-	ISettingsRepository,
-	INotificationsRepository,
-	ITagsRepository,
-	IIncidentsRepository,
-	ITeamsRepository,
-	IMaintenanceWindowsRepository,
-} from "@/repositories/index.js";
+import { ISettingsRepository } from "@/domain/app-settings/app-settings-repository.interface.js";
+import MongoSettingsRepository from "@/domain/app-settings/app-settings.repository.mongo.js";
+import { IChecksRepository } from "@/domain/checks/check.repository.interface.js";
+import MongoChecksRepository from "@/domain/checks/check.repository.mongo.js";
+import { IGeoChecksRepository } from "@/domain/geo-checks/geo-check.repository.interface.js";
+import MongoGeoChecksRepository from "@/domain/geo-checks/geo-check.repository.mongo.js";
+import { IIncidentsRepository } from "@/domain/incidents/incident.repository.interface.js";
+import MongoIncidentsRepository from "@/domain/incidents/incident.repository.mongo.js";
+import { IInvitesRepository } from "@/domain/invites/invite.repository.interface.js";
+import MongoInvitesRepository from "@/domain/invites/invite.repository.mongo.js";
+import { IMaintenanceWindowsRepository } from "@/domain/maintenance-windows/maintenance-window.repository.interface.js";
+import MongoMaintenanceWindowsRepository from "@/domain/maintenance-windows/maintenance-window.repository.mongo.js";
+import { IMonitorStatsRepository } from "@/domain/monitor-stats/monitor-stats.repository.interface.js";
+import MongoMonitorStatsRepository from "@/domain/monitor-stats/monitor-stats.repository.mongo.js";
+import { IMonitorsRepository } from "@/domain/monitors/monitor.repository.interface.js";
+import MongoMonitorsRepository from "@/domain/monitors/monitor.repository.mongo.js";
+import { INotificationsRepository } from "@/domain/notifications/notification.repository.interface.js";
+import MongoNotificationsRepository from "@/domain/notifications/notification.repository.mongo.js";
+import MongoQueueWorkersRepository from "@/domain/queue-workers/queue-worker.repository.mongo.js";
+import { IRecoveryTokensRepository } from "@/domain/recovery-tokens/recovery-token.repository.interface.js";
+import MongoRecoveryTokensRepository from "@/domain/recovery-tokens/recovery-token.repository.mongo.js";
+import { IStatusPagesRepository } from "@/domain/status-pages/status-page-repository.interface.js";
+import MongoStatusPagesRepository from "@/domain/status-pages/status-page-repository.mongo.js";
+import { ITagsRepository } from "@/domain/tags/tag.repository.interface.js";
+import MongoTagsRepository from "@/domain/tags/tag.repository.mongo.js";
+import { ITeamsRepository } from "@/domain/teams/team.repository.interface.js";
+import MongoTeamsRepository from "@/domain/teams/team.repository.model.js";
+import { IUsersRepository } from "@/domain/users/user.repository.interface.js";
+import MongoUsersRepository from "@/domain/users/user.repository.mongo.js";
 import { ILogger } from "@/utils/logger.js";
 import { AppError } from "@/utils/AppError.js";
-import { type QueueMode } from "@/types/settings.js";
+import { type QueueMode } from "@/domain/app-settings/app-settings.type.js";
 
 export type InitializedServices = {
 	settingsService: ISettingsService;

server/src/db/db.mongo.ts

@@ -1,11 +1,11 @@
 import { Mongoose } from "mongoose";
 import mongoose from "mongoose";
-import AppSettings from "@/db/models/AppSettings.js";
+import AppSettings from "@/domain/app-settings/app-settings.model.js";
 import { runMigrations } from "@/db/migration/index.js";
 import { ILogger } from "@/utils/logger.js";
-import { EnvConfig } from "@/service/system/settingsService.js";
+import { EnvConfig } from "@/domain/app-settings/app-settings.service.js";
 const SERVICE_NAME = "MongoDB";
-import { IDb } from "@/db/IDb.js";
+import { IDb } from "@/db/db.interface.js";
 import { AppError } from "@/utils/AppError.js";
 
 class MongoDB implements IDb<Mongoose> {

server/src/db/migration/0001_migrateStatusWindowThreshold.ts

@@ -1,4 +1,4 @@
-import Monitor from "@/db/models/Monitor.js";
+import Monitor from "@/domain/monitors/monitor.model.js";
 async function migrateStatusWindowThreshold() {
 	const monitors = await Monitor.find({ statusWindowThreshold: { $lt: 1 } });
 	for (const monitor of monitors) {

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

@@ -1,4 +1,4 @@
-import { MonitorStatsModel } from "../models/MonitorStats.js";
+import { MonitorStatsModel } from "../../domain/monitor-stats/monitor-stats.model.js";
 import { logger } from "@/utils/logger.js";
 
 /**

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

@@ -1,4 +1,4 @@
-import { MonitorModel } from "../models/Monitor.js";
+import { MonitorModel } from "../../domain/monitors/monitor.model.js";
 import { logger } from "@/utils/logger.js";
 
 /**

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

@@ -1,6 +1,6 @@
 import mongoose from "mongoose";
 import { logger } from "@/utils/logger.js";
-import StatusPageModel from "../models/StatusPage.js";
+import StatusPageModel from "../../domain/status-pages/status-page.model.js";
 
 export async function migrateStatusPageTypeToArray(): Promise<void> {
 	const SERVICE_NAME = "Migration:MigrateStatusPageTypeToArray";

server/src/db/migration/0006_cleanupDuplicateMonitorStatsForUniqueIndex.ts

@@ -1,4 +1,4 @@
-import { MonitorStatsModel } from "../models/MonitorStats.js";
+import { MonitorStatsModel } from "../../domain/monitor-stats/monitor-stats.model.js";
 import { logger } from "@/utils/logger.js";
 
 /**

server/src/db/migration/0007_migrateMaintenanceWindowMonitorIdToArray.ts

@@ -1,7 +1,7 @@
 import mongoose from "mongoose";
 import type { AnyBulkWriteOperation, Document } from "mongodb";
 import { logger } from "@/utils/logger.js";
-import MaintenanceWindowModel from "../models/MaintenanceWindow.js";
+import MaintenanceWindowModel from "../../domain/maintenance-windows/maintenance-window.model.js";
 
 type GroupResult = {
 	_id: {

server/src/db/migration/index.ts

@@ -2,7 +2,7 @@ import { migrateStatusWindowThreshold } from "./0001_migrateStatusWindowThreshol
 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 MigrationModel from "../../domain/migrations/migration.model.js";
 import { migrateStatusPageTypeToArray } from "./0005_migrateStatusPageTypeToArray.js";
 import { cleanupDuplicateMonitorStatsForUniqueIndex } from "./0006_cleanupDuplicateMonitorStatsForUniqueIndex.js";
 import { migrateMaintenanceWindowMonitorIdToArray } from "./0007_migrateMaintenanceWindowMonitorIdToArray.js";

server/src/db/models/index.ts

@@ -1,46 +0,0 @@
-export * from "@/db/models/Monitor.js";
-export { default as MonitorModel } from "@/db/models/Monitor.js";
-
-export * from "@/db/models/Check.js";
-export { default as CheckModel } from "@/db/models/Check.js";
-
-export * from "@/db/models/MonitorStats.js";
-export { default as MonitorStatsModel } from "@/db/models/MonitorStats.js";
-
-export * from "@/db/models/StatusPage.js";
-export { default as StatusPageModel } from "@/db/models/StatusPage.js";
-
-export * from "@/db/models/User.js";
-export { default as UserModel } from "@/db/models/User.js";
-
-export * from "@/db/models/Invite.js";
-export { default as InviteModel } from "@/db/models/Invite.js";
-
-export * from "@/db/models/AppSettings.js";
-export { default as AppSettingsModel } from "@/db/models/AppSettings.js";
-
-export * from "@/db/models/RecoveryToken.js";
-export { default as RecoveryTokenModel } from "@/db/models/RecoveryToken.js";
-
-export * from "@/db/models/Notification.js";
-export { default as NotificationModel } from "@/db/models/Notification.js";
-
-export * from "@/db/models/Incident.js";
-export { default as IncidentModel } from "@/db/models/Incident.js";
-
-export * from "@/db/models/Team.js";
-export { default as TeamModel } from "@/db/models/Team.js";
-
-export * from "@/db/models/MaintenanceWindow.js";
-export { default as MaintenanceWindowModel } from "@/db/models/MaintenanceWindow.js";
-
-export * from "@/db/models/GeoCheck.js";
-export { default as GeoCheckModel } from "@/db/models/GeoCheck.js";
-
-export * from "@/db/models/DLQItem.js";
-export { default as DLQItemModel } from "@/db/models/DLQItem.js";
-export * from "@/db/models/Tag.js";
-export { default as TagModel } from "@/db/models/Tag.js";
-
-export * from "@/db/models/QueueWorker.js";
-export { default as QueueWorkerModel } from "@/db/models/QueueWorker.js";

server/src/domain/app-settings/app-settings-repository.interface.ts

@@ -1,4 +1,4 @@
-import type { Settings, SettingsUpdate } from "@/types/index.js";
+import type { Settings, SettingsUpdate } from "@/domain/app-settings/app-settings.type.js";
 export interface ISettingsRepository {
 	// create
 	create(settings: Partial<Settings>): Promise<Settings>;

server/src/domain/app-settings/app-settings.model.ts

@@ -1,5 +1,5 @@
 import { Schema, model, type Types } from "mongoose";
-import type { Settings, SettingsThresholds } from "@/types/settings.js";
+import type { Settings, SettingsThresholds } from "@/domain/app-settings/app-settings.type.js";
 
 interface AppSettingsDocument extends Omit<Settings, "id" | "createdAt" | "updatedAt"> {
 	_id: Types.ObjectId;

server/src/domain/app-settings/app-settings.repository.mongo.ts

@@ -1,7 +1,7 @@
 import mongoose, { type UpdateQuery } from "mongoose";
-import { ISettingsRepository } from "@/repositories/settings/ISettingsRepository.js";
-import type { Settings, SettingsUpdate } from "@/types/index.js";
-import { AppSettingsModel, type AppSettingsDocument } from "@/db/models/index.js";
+import { ISettingsRepository } from "@/domain/app-settings/app-settings-repository.interface.js";
+import type { Settings, SettingsUpdate } from "@/domain/app-settings/app-settings.type.js";
+import { AppSettingsModel, type AppSettingsDocument } from "@/domain/app-settings/app-settings.model.js";
 
 class MongoSettingsRepository implements ISettingsRepository {
 	private toStringId = (value?: mongoose.Types.ObjectId | string | null): string => {

server/src/domain/app-settings/app-settings.service.ts

@@ -1,7 +1,7 @@
-import { ISettingsRepository } from "@/repositories/index.js";
-import { type DbType, type QueueType, type QueueMode, Settings, SettingsUpdate } from "@/types/index.js";
+import { ISettingsRepository } from "@/domain/app-settings/app-settings-repository.interface.js";
+import { Settings, SettingsUpdate, type DbType, type QueueMode, type QueueType } from "@/domain/app-settings/app-settings.type.js";
 import { AppError } from "@/utils/AppError.js";
-import { ValidatedEnv } from "@/validation/envValidation.js";
+import { ValidatedEnv } from "@/config/envValidation.js";
 import type { StringValue } from "ms";
 const SERVICE_NAME = "SettingsService";
 

server/src/domain/app-settings/app-settings.type.ts

@@ -7,12 +7,6 @@ export type QueueType = (typeof QueueTypes)[number];
 export const QueueModes = ["primary", "worker"] as const;
 export type QueueMode = (typeof QueueModes)[number];
 
-export type QueueWorker = {
-	workerId: string; // hostname:pid:uuid
-	mode: QueueMode;
-	lastSeenAt: number; // epoch ms of the last heartbeat
-};
-
 export interface SettingsThresholds {
 	cpu?: number;
 	memory?: number;
@@ -50,3 +44,20 @@ export interface Settings {
 	createdAt: string;
 	updatedAt: string;
 }
+
+export type EmailTransportConfig = Pick<
+	Settings,
+	| "systemEmailHost"
+	| "systemEmailPort"
+	| "systemEmailAddress"
+	| "systemEmailDisplayName"
+	| "systemEmailPassword"
+	| "systemEmailUser"
+	| "systemEmailConnectionHost"
+	| "systemEmailTLSServername"
+	| "systemEmailSecure"
+	| "systemEmailPool"
+	| "systemEmailIgnoreTLS"
+	| "systemEmailRequireTLS"
+	| "systemEmailRejectUnauthorized"
+>;

server/src/domain/checks/check.model.ts

@@ -1,5 +1,5 @@
 import { Schema, model, Types } from "mongoose";
-import { MonitorTypes, type MonitorType } from "@/types/monitor.js";
+import { MonitorTypes, type MonitorType } from "@/domain/monitors/monitor.types.js";
 import type {
 	Check,
 	CheckAudits,
@@ -13,7 +13,7 @@ import type {
 	CheckNetworkInterfaceInfo,
 	GotTimings,
 	ILighthouseAudit,
-} from "@/types/check.js";
+} from "@/domain/checks/check.type.js";
 
 type CheckMetadataDocument = Omit<CheckMetadata, "monitorId" | "teamId"> & {
 	monitorId: Types.ObjectId;

server/src/domain/checks/check.repository.interface.ts

@@ -2,12 +2,12 @@ import type {
 	Check,
 	ChecksQueryResult,
 	ChecksSummary,
-	MonitorType,
-	PageSpeedChecksResult,
 	HardwareChecksResult,
+	PageSpeedChecksResult,
 	UptimeChecksResult,
-} from "@/types/index.js";
-import type { LatestChecksMap } from "@/repositories/checks/MongoChecksRepistory.js";
+} from "@/domain/checks/check.type.js";
+import type { MonitorType } from "@/domain/monitors/monitor.types.js";
+import type { LatestChecksMap } from "@/domain/checks/check.repository.mongo.js";
 
 export interface IChecksRepository {
 	// create

server/src/domain/checks/check.repository.mongo.ts

@@ -1,4 +1,4 @@
-import { IChecksRepository } from "@/repositories/index.js";
+import { IChecksRepository } from "@/domain/checks/check.repository.interface.js";
 import type {
 	Check,
 	CheckAudits,
@@ -11,9 +11,9 @@ import type {
 	CheckMetadata,
 	CheckNetworkInterfaceInfo,
 	GotTimings,
-	MonitorType,
-} from "@/types/index.js";
-import { CheckModel, type CheckDocument } from "@/db/models/index.js";
+} from "@/domain/checks/check.type.js";
+import type { MonitorType } from "@/domain/monitors/monitor.types.js";
+import { CheckModel, type CheckDocument } from "@/domain/checks/check.model.js";
 import mongoose from "mongoose";
 import { getDateForRange } from "@/utils/dataUtils.js";
 import { ILogger } from "@/utils/logger.js";

server/src/domain/checks/check.service.ts

@@ -1,14 +1,8 @@
 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 { IChecksRepository } from "@/domain/checks/check.repository.interface.js";
+import { IMonitorsRepository } from "@/domain/monitors/monitor.repository.interface.js";
+import type { Check, CheckErrorInfo, ChecksQueryResult, ChecksSummary, ILighthouseAudit } from "@/domain/checks/check.type.js";
+import type { MonitorPayloadMap, MonitorStatusResponse } from "@/types/network.js";
 import type { HardwareStatusPayload, PageSpeedStatusPayload } from "@/types/network.js";
 import { AppError } from "@/utils/AppError.js";
 import { ILogger } from "@/utils/logger.js";

server/src/domain/checks/check.type.ts

@@ -1,4 +1,4 @@
-import type { MonitorType } from "@/types/index.js";
+import type { MonitorType } from "@/domain/monitors/monitor.types.js";
 import type { Response } from "got";
 
 export const CHECK_TTL_SENTINEL = 366;

server/src/domain/diagnostics/diagnostic.service.ts

@@ -1,6 +1,6 @@
 import v8 from "v8";
 import os from "os";
-import { IDb } from "@/db/IDb.js";
+import { IDb } from "@/db/db.interface.js";
 import { Mongoose } from "mongoose";
 import { AppError } from "@/utils/AppError.js";
 
@@ -87,9 +87,9 @@ export class DiagnosticService implements IDiagnosticService {
 					const entry: CollectionDiagnostics = {
 						name: collection.collectionName,
 						documentCount,
-						storageSize: stats.storageSize,
-						totalIndexSize: stats.totalIndexSize,
-						totalSize: stats.totalSize,
+						storageSize: stats.storageSize ?? 0,
+						totalIndexSize: stats.totalIndexSize ?? 0,
+						totalSize: stats.totalSize ?? (stats.storageSize ?? 0) + (stats.totalIndexSize ?? 0),
 					};
 					if (stats.timeseries?.bucketCount !== undefined) {
 						entry.bucketCount = stats.timeseries.bucketCount;
@@ -103,7 +103,7 @@ export class DiagnosticService implements IDiagnosticService {
 			host: mongo.connection.host,
 			port: mongo.connection.port,
 			dbName: mongo.connection.name,
-			totalSize: dbStats.totalSize,
+			totalSize: dbStats.totalSize ?? (dbStats.storageSize ?? 0) + (dbStats.indexSize ?? 0),
 			collections,
 		};
 	};

server/src/domain/dlq/dlq.model.ts

@@ -1,5 +1,5 @@
 import { Schema, model, type Types } from "mongoose";
-import { DLQItemTypes, DLQItemStatuses, type DLQItem } from "@/types/dlqItem.js";
+import { DLQItemTypes, DLQItemStatuses, type DLQItem } from "@/domain/dlq/dlq.type.js";
 
 export interface DLQItemDocument extends Omit<DLQItem, "id" | "monitorId" | "teamId" | "nextRetryAt" | "createdAt" | "updatedAt"> {
 	_id: Types.ObjectId;

server/src/domain/dlq/dlq.repository.interface.ts

@@ -1,4 +1,4 @@
-import type { DLQItem, DLQItemType, DLQItemStatus } from "@/types/index.js";
+import type { DLQItem, DLQItemStatus, DLQItemType } from "@/domain/dlq/dlq.type.js";
 
 export interface DLQQueryFilters {
 	type?: DLQItemType;

server/src/domain/dlq/dlq.repository.mongo.ts

@@ -1,7 +1,7 @@
-import { DLQItemModel } from "@/db/models/index.js";
-import type { DLQItemDocument } from "@/db/models/DLQItem.js";
-import type { DLQItem } from "@/types/index.js";
-import type { IDLQRepository, DLQQueryFilters, DLQStatusCount } from "@/repositories/dlq/IDLQRepository.js";
+import { DLQItemModel } from "@/domain/dlq/dlq.model.js";
+import type { DLQItemDocument } from "@/domain/dlq/dlq.model.js";
+import type { DLQItem } from "@/domain/dlq/dlq.type.js";
+import type { IDLQRepository, DLQQueryFilters, DLQStatusCount } from "@/domain/dlq/dlq.repository.interface.js";
 import mongoose from "mongoose";
 import { AppError } from "@/utils/AppError.js";
 

server/src/domain/geo-checks/geo-check.model.ts

@@ -1,6 +1,6 @@
 import { Schema, model, Types } from "mongoose";
-import { MonitorTypes, type MonitorType } from "@/types/monitor.js";
-import type { GeoCheck, GeoCheckLocation, GeoCheckMetadata, GeoCheckResult, GeoCheckTimings } from "@/types/geoCheck.js";
+import { MonitorTypes, type MonitorType } from "@/domain/monitors/monitor.types.js";
+import type { GeoCheck, GeoCheckLocation, GeoCheckMetadata, GeoCheckResult, GeoCheckTimings } from "@/domain/geo-checks/geo-check.type.js";
 
 type GeoCheckMetadataDocument = Omit<GeoCheckMetadata, "monitorId" | "teamId"> & {
 	monitorId: Types.ObjectId;

server/src/domain/geo-checks/geo-check.repository.interface.ts

@@ -1,5 +1,5 @@
-import type { GeoCheck, GroupedGeoCheck } from "@/types/geoCheck.js";
-import type { GeoContinent, FlatGeoCheck } from "@/types/geoCheck.js";
+import type { GeoCheck, GroupedGeoCheck } from "@/domain/geo-checks/geo-check.type.js";
+import type { GeoContinent, FlatGeoCheck } from "@/domain/geo-checks/geo-check.type.js";
 
 export interface GeoChecksQueryResult {
 	geoChecksCount: number;

server/src/domain/geo-checks/geo-check.repository.mongo.ts

@@ -1,7 +1,7 @@
-import { IGeoChecksRepository } from "./IGeoChecksRepository.js";
-import type { GeoCheck, GeoCheckMetadata, GeoCheckResult, GroupedGeoCheck, GeoContinent, FlatGeoCheck } from "@/types/geoCheck.js";
-import type { FlatGeoChecksQueryResult } from "./IGeoChecksRepository.js";
-import { GeoCheckMetadataDocument, GeoCheckModel, type GeoCheckDocument } from "@/db/models/index.js";
+import { IGeoChecksRepository } from "./geo-check.repository.interface.js";
+import type { GeoCheck, GeoCheckMetadata, GeoCheckResult, GroupedGeoCheck, GeoContinent, FlatGeoCheck } from "@/domain/geo-checks/geo-check.type.js";
+import type { FlatGeoChecksQueryResult } from "./geo-check.repository.interface.js";
+import { GeoCheckMetadataDocument, GeoCheckModel, type GeoCheckDocument } from "@/domain/geo-checks/geo-check.model.js";
 import mongoose, { PipelineStage } from "mongoose";
 import { getDateForRange } from "@/utils/dataUtils.js";
 import { ILogger } from "@/utils/logger.js";