Add toggle types

server/private/lib/alerts/events/healthCheckEvents.ts

@@ -55,7 +55,7 @@ export async function fireHealthCheckHealthyAlert(
 }
 
 /**
- * Fire a `health_check_not_healthy` alert for the given health check.
+ * Fire a `health_check_unhealthy` alert for the given health check.
  *
  * Call this after a health check has been detected as failing so that any
  * matching `alertRules` can dispatch their email and webhook actions.
@@ -73,7 +73,7 @@ export async function fireHealthCheckNotHealthyAlert(
 ): Promise<void> {
     try {
         await processAlerts({
-            eventType: "health_check_not_healthy",
+            eventType: "health_check_unhealthy",
             orgId,
             healthCheckId,
             data: {

server/private/lib/alerts/events/resourceEvents.ts

@@ -55,7 +55,7 @@ export async function fireHealthCheckHealthyAlert(
 }
 
 /**
- * Fire a `health_check_not_healthy` alert for the given health check.
+ * Fire a `health_check_unhealthy` alert for the given health check.
  *
  * Call this after a health check has been detected as failing so that any
  * matching `alertRules` can dispatch their email and webhook actions.
@@ -73,7 +73,7 @@ export async function fireHealthCheckNotHealthyAlert(
 ): Promise<void> {
     try {
         await processAlerts({
-            eventType: "health_check_not_healthy",
+            eventType: "health_check_unhealthy",
             orgId,
             healthCheckId,
             data: {

server/private/lib/alerts/sendAlertEmail.ts

@@ -72,10 +72,14 @@ function buildSubject(context: AlertContext): string {
             return "[Alert] Site Back Online";
         case "site_offline":
             return "[Alert] Site Offline";
+        case "site_toggle":
+            return "[Alert] Site Toggled";
         case "health_check_healthy":
             return "[Alert] Health Check Recovered";
-        case "health_check_not_healthy":
+        case "health_check_unhealthy":
             return "[Alert] Health Check Failing";
+        case "health_check_toggle":
+            return "[Alert] Health Check Toggled";
         default: {
             // Exhaustiveness fallback – should never be reached with a
             // well-typed caller, but keeps runtime behaviour predictable.
@@ -84,4 +88,4 @@ function buildSubject(context: AlertContext): string {
             return "[Alert] Event Notification";
         }
     }
-}
+}

server/private/lib/alerts/types.ts

@@ -18,8 +18,10 @@
 export type AlertEventType =
     | "site_online"
     | "site_offline"
+    | "site_toggle"
     | "health_check_healthy"
-    | "health_check_not_healthy";
+    | "health_check_unhealthy"
+    | "health_check_toggle";
 
 // ---------------------------------------------------------------------------
 // Webhook authentication config (stored as encrypted JSON in the DB)
@@ -60,4 +62,4 @@ export interface AlertContext {
     healthCheckId?: number;
     /** Human-readable context data included in emails and webhook payloads */
     data: Record<string, unknown>;
-}
+}

server/private/routers/alertRule/createAlertRule.ts

@@ -30,12 +30,12 @@ import { fromError } from "zod-validation-error";
 import { OpenAPITags, registry } from "@server/openApi";
 import { encrypt } from "@server/lib/crypto";
 import config from "@server/lib/config";
-import { and, eq } from "drizzle-orm";
 
-const SITE_EVENT_TYPES = ["site_online", "site_offline"] as const;
-const HC_EVENT_TYPES = [
+export const SITE_EVENT_TYPES = ["site_online", "site_offline", "site_toggle"] as const;
+export const HC_EVENT_TYPES = [
     "health_check_healthy",
-    "health_check_not_healthy"
+    "health_check_unhealthy",
+    "health_check_toggle"
 ] as const;
 
 const paramsSchema = z.strictObject({
@@ -52,10 +52,8 @@ const bodySchema = z
     .strictObject({
         name: z.string().nonempty(),
         eventType: z.enum([
-            "site_online",
-            "site_offline",
-            "health_check_healthy",
-            "health_check_not_healthy"
+            ...HC_EVENT_TYPES,
+            ...SITE_EVENT_TYPES
         ]),
         enabled: z.boolean().optional().default(true),
         cooldownSeconds: z.number().int().nonnegative().optional().default(300),

server/private/routers/alertRule/getAlertRule.ts

@@ -47,8 +47,10 @@ export type GetAlertRuleResponse = {
     eventType:
         | "site_online"
         | "site_offline"
+        | "site_toggle"
         | "health_check_healthy"
-        | "health_check_not_healthy";
+        | "health_check_unhealthy"
+        | "health_check_toggle";
     enabled: boolean;
     cooldownSeconds: number;
     lastTriggeredAt: number | null;
@@ -59,7 +61,7 @@ export type GetAlertRuleResponse = {
     recipients: {
         recipientId: number;
         userId: string | null;
-        roleId: string | null;
+        roleId: number | null;
         email: string | null;
     }[];
     webhookActions: {
@@ -177,24 +179,27 @@ export async function getAlertRule(
                 healthCheckIds: healthCheckRows.map((r) => r.healthCheckId),
                 recipients,
                 webhookActions: webhooks.map((w) => {
-                            let parsedConfig: WebhookAlertConfig | null = null;
-                            if (w.config) {
-                                try {
-                                    const serverSecret = config.getRawConfig().server.secret!;
-                                    const decrypted = decrypt(w.config, serverSecret);
-                                    parsedConfig = JSON.parse(decrypted) as WebhookAlertConfig;
-                                } catch {
-                                    // best-effort – return null if decryption fails
-                                }
-                            }
-                            return {
-                                webhookActionId: w.webhookActionId,
-                                webhookUrl: w.webhookUrl,
-                                enabled: w.enabled,
-                                lastSentAt: w.lastSentAt ?? null,
-                                config: parsedConfig
-                            };
-                        })
+                    let parsedConfig: WebhookAlertConfig | null = null;
+                    if (w.config) {
+                        try {
+                            const serverSecret =
+                                config.getRawConfig().server.secret!;
+                            const decrypted = decrypt(w.config, serverSecret);
+                            parsedConfig = JSON.parse(
+                                decrypted
+                            ) as WebhookAlertConfig;
+                        } catch {
+                            // best-effort – return null if decryption fails
+                        }
+                    }
+                    return {
+                        webhookActionId: w.webhookActionId,
+                        webhookUrl: w.webhookUrl,
+                        enabled: w.enabled,
+                        lastSentAt: w.lastSentAt ?? null,
+                        config: parsedConfig
+                    };
+                })
             },
             success: true,
             error: false,
@@ -207,4 +212,4 @@ export async function getAlertRule(
             createHttpError(HttpCode.INTERNAL_SERVER_ERROR, "An error occurred")
         );
     }
-}
+}

server/private/routers/alertRule/updateAlertRule.ts

@@ -31,12 +31,7 @@ import { OpenAPITags, registry } from "@server/openApi";
 import { and, eq } from "drizzle-orm";
 import { encrypt } from "@server/lib/crypto";
 import config from "@server/lib/config";
-
-const SITE_EVENT_TYPES = ["site_online", "site_offline"] as const;
-const HC_EVENT_TYPES = [
-    "health_check_healthy",
-    "health_check_not_healthy"
-] as const;
+import { HC_EVENT_TYPES, SITE_EVENT_TYPES } from "./createAlertRule";
 
 const paramsSchema = z
     .object({
@@ -57,10 +52,8 @@ const bodySchema = z
         name: z.string().nonempty().optional(),
         eventType: z
             .enum([
-                "site_online",
-                "site_offline",
-                "health_check_healthy",
-                "health_check_not_healthy"
+                ...HC_EVENT_TYPES,
+                ...SITE_EVENT_TYPES
             ])
             .optional(),
         enabled: z.boolean().optional(),