email

server/src/controllers/controllerUtils.ts

@@ -105,6 +105,12 @@ const requireUserId = (userId?: string): string => {
 	}
 	return userId;
 };
+const requireUserEmail = (userEmail?: string): string => {
+	if (!userEmail) {
+		throw new AppError({ message: "User email is required", status: 400 });
+	}
+	return userEmail;
+};
 
 export {
 	fetchMonitorCertificate,
@@ -116,4 +122,5 @@ export {
 	parseSortOrder,
 	requireTeamId,
 	requireUserId,
+	requireUserEmail,
 };

server/src/controllers/incidentController.ts

@@ -1,6 +1,6 @@
 import { AppError } from "@/utils/AppError.js";
 import { Request, Response, NextFunction } from "express";
-import { requireTeamId } from "./controllerUtils.js";
+import { requireTeamId, requireUserId, requireUserEmail } from "./controllerUtils.js";
 
 const SERVICE_NAME = "incidentController";
 
@@ -86,12 +86,15 @@ class IncidentController {
 
 	resolveIncidentManually = async (req: Request, res: Response, next: NextFunction) => {
 		try {
-			const resolvedIncident = await this.incidentService.resolveIncident(
-				req?.params?.incidentId,
-				req?.user?.id,
-				req?.user?.teamId,
-				req?.body?.comment
-			);
+			const teamId = requireTeamId(req.user?.teamId);
+			const userId = requireUserId(req.user?.id);
+			const userEmail = requireUserEmail(req.user?.email);
+			const incidentId = req.params?.incidentId;
+			if (!incidentId) {
+				throw new AppError({ message: "Incident ID is required", service: SERVICE_NAME, status: 400 });
+			}
+
+			const resolvedIncident = await this.incidentService.resolveIncident(incidentId, userId, teamId, req?.body?.comment, userEmail);
 
 			return res.status(200).json({
 				success: true,