fix: resolve merge conflicts, migrate validation to zod

This commit is contained in:
ashu130698 committed 2026-03-05 23:40:49 +05:30
commit 4d7de2d3a1
127 files changed
+5494 -1846

No files matched your search

@@ -1,7 +1,7 @@
import { Request, Response, NextFunction } from "express";
import { Notification } from "@/types/index.js";
import { createNotificationBodyValidation, bulkEditNotificationBodyValidation } from "@/validation/joi.js";
import { createNotificationBodyValidation, bulkEditNotificationBodyValidation } from "@/validation/notificationValidation.js";
import { AppError } from "@/utils/AppError.js";
import { IMonitorsRepository } from "@/repositories/index.js";
import { INotificationsService } from "@/service/index.js";
@@ -42,9 +42,7 @@ class NotificationController {
createNotification = async (req: Request, res: Response, next: NextFunction) => {
try {
await createNotificationBodyValidation.validateAsync(req.body, {
abortEarly: false,
});
createNotificationBodyValidation.parse(req.body);
const body = req.body;
@@ -134,9 +132,7 @@ class NotificationController {
editNotification = async (req: Request, res: Response, next: NextFunction) => {
try {
await createNotificationBodyValidation.validateAsync(req.body, {
abortEarly: false,
});
createNotificationBodyValidation.parse(req.body);
const teamId = requireTeamId(req.user?.teamId);
const notificationId = req.params.id as string;
@@ -157,10 +153,7 @@ class NotificationController {
// Handler for bulk editing monitor notification associations
bulkEditMonitorNotifications = async (req: Request, res: Response, next: NextFunction) => {
try {
// Joi validates monitorIds, notificationIds, and action automatically
await bulkEditNotificationBodyValidation.validateAsync(req.body, {
abortEarly: false,
});
bulkEditNotificationBodyValidation.parse(req.body);
const teamId = requireTeamId(req.user?.teamId);
const { monitorIds, notificationIds, action } = req.body;