Merge pull request 'fix: doctor toggle logic' (#27) from feat/appointment-date-filter into dev

Reviewed-on: #27

backend/src/controllers/appointment.controller.js

@@ -147,18 +147,51 @@ export const getAppointments = async (req, res) => {
 		const page = parseInt(req.query.page) || 1;
 		const limit = parseInt(req.query.limit) || 10;
 		const skip = (page - 1) * limit;
-		const { date, search } = req.query;
+
+		const { date, startDate, endDate, search } = req.query;
 
 		const where = {};
 
-		if (date) {
+		const hasSingleDate = date && date.trim() !== "";
+
+		const hasRange =
+			(startDate && startDate.trim() !== "") ||
+			(endDate && endDate.trim() !== "");
+
+		if (hasSingleDate) {
 			const start = new Date(date);
+			start.setHours(0, 0, 0, 0);
+
 			const end = new Date(date);
-			end.setDate(end.getDate() + 1);
-			where.date = { gte: start, lt: end };
+			end.setHours(23, 59, 59, 999);
+
+			where.date = {
+				gte: start,
+				lte: end,
+			};
 		}
 
-		if (search) {
+		if (!hasSingleDate && hasRange) {
+			const dateFilter = {};
+
+			if (startDate && startDate.trim() !== "") {
+				const start = new Date(startDate);
+				start.setHours(0, 0, 0, 0);
+
+				dateFilter.gte = start;
+			}
+
+			if (endDate && endDate.trim() !== "") {
+				const end = new Date(endDate);
+				end.setHours(23, 59, 59, 999);
+
+				dateFilter.lte = end;
+			}
+
+			where.date = dateFilter;
+		}
+
+		if (search && search.trim() !== "") {
 			where.OR = [
 				{ name: { contains: search, mode: "insensitive" } },
 				{ mobileNumber: { contains: search } },
@@ -169,24 +202,39 @@ export const getAppointments = async (req, res) => {
 		const [appointments, total] = await Promise.all([
 			prisma.appointment.findMany({
 				where,
-				include: { doctor: true, department: true },
-				orderBy: { createdAt: "desc" },
+				include: {
+					doctor: true,
+					department: true,
+				},
+				orderBy: {
+					createdAt: "desc",
+				},
 				skip,
 				take: limit,
 			}),
-			prisma.appointment.count({ where }),
+
+			prisma.appointment.count({
+				where,
+			}),
 		]);
 
 		res.status(200).json({
 			success: true,
 			data: appointments,
-			pagination: { total, page, limit, totalPages: Math.ceil(total / limit) },
+			pagination: {
+				total,
+				page,
+				limit,
+				totalPages: Math.ceil(total / limit),
+			},
 		});
 	} catch (error) {
 		console.error(error);
-		res
-			.status(500)
-			.json({ success: false, message: "Failed to fetch appointments" });
+
+		res.status(500).json({
+			success: false,
+			message: "Failed to fetch appointments",
+		});
 	}
 };
 

backend/src/controllers/doctor.controller.js

@@ -273,42 +273,47 @@ export const updateDoctor = async (req, res) => {
 			},
 		});
 
-		const oldRelations = await prisma.doctorDepartment.findMany({
-			where: {doctorId: doctor.id},
-		});
+		const hasTimingData = departments?.some(
+			(dep) => dep.timing && Object.keys(dep.timing).length > 0,
+		);
 
-		for (const rel of oldRelations) {
-			await prisma.doctorTiming.deleteMany({
-				where: {doctorDepartmentId: rel.id},
-			});
-		}
-
-		await prisma.doctorDepartment.deleteMany({
-			where: {doctorId: doctor.id},
-		});
-
-		for (const dep of departments) {
-			const targetDept = await prisma.department.findUnique({
-				where: {departmentId: dep.departmentId},
-			});
-			if (!targetDept) continue;
-
-			const newDD = await prisma.doctorDepartment.create({
-				data: {
-					doctorId: doctor.id,
-					departmentId: targetDept.id,
-					sortOrder: dep.sortOrder !== undefined ? Number(dep.sortOrder) : 0,
-				},
+		if (departments && Array.isArray(departments) && hasTimingData) {
+			const oldRelations = await prisma.doctorDepartment.findMany({
+				where: {doctorId: doctor.id},
 			});
 
-			if (dep.timing) {
-				const {id, doctorDepartmentId, createdAt, updatedAt, ...cleanTiming} =
-					dep.timing;
-
-				await prisma.doctorTiming.create({
-					data: {doctorDepartmentId: newDD.id, ...cleanTiming},
+			for (const rel of oldRelations) {
+				await prisma.doctorTiming.deleteMany({
+					where: {doctorDepartmentId: rel.id},
 				});
 			}
+
+			await prisma.doctorDepartment.deleteMany({
+				where: {doctorId: doctor.id},
+			});
+
+			for (const dep of departments) {
+				const targetDept = await prisma.department.findUnique({
+					where: {departmentId: dep.departmentId},
+				});
+				if (!targetDept) continue;
+
+				const newDD = await prisma.doctorDepartment.create({
+					data: {
+						doctorId: doctor.id,
+						departmentId: targetDept.id,
+						sortOrder: dep.sortOrder !== undefined ? Number(dep.sortOrder) : 0,
+					},
+				});
+
+				if (dep.timing) {
+					const {id, doctorDepartmentId, createdAt, updatedAt, ...cleanTiming} =
+						dep.timing;
+					await prisma.doctorTiming.create({
+						data: {doctorDepartmentId: newDD.id, ...cleanTiming},
+					});
+				}
+			}
 		}
 
 		res