[1.0.0] #19

Merged
ashir merged 80 commits from dev into main 2026-04-30 18:37:18 +00:00
Showing only changes of commit 9c44c66b22 - Show all commits
+77 -65
View File
@@ -16,8 +16,7 @@ export const getAllDoctors = async (req, res) => {
orderBy: {name: "asc"}, orderBy: {name: "asc"},
}); });
const formatted = doctors.map((doc, index) => { const formatted = doctors.map((doc, index) => ({
return {
SL_NO: String(index + 1), SL_NO: String(index + 1),
doctorId: doc.doctorId, doctorId: doc.doctorId,
name: doc.name, name: doc.name,
@@ -42,12 +41,10 @@ export const getAllDoctors = async (req, res) => {
return { return {
departmentId: d.department.departmentId, departmentId: d.department.departmentId,
departmentName: d.department.name, departmentName: d.department.name,
timing: timingArray.join(" & "), timing: timingArray.join(" & "),
}; };
}), }),
}; }));
});
res.status(200).json({ res.status(200).json({
success: true, success: true,
@@ -113,6 +110,54 @@ export const getDoctorByDoctorId = async (req, res) => {
} }
}; };
// get doctors by department
export const getDoctorsByDepartmentId = async (req, res) => {
try {
const {Department_ID} = req.query;
if (!Department_ID) {
return res.status(400).json({
success: false,
message: "Department_ID is required",
});
}
const department = await prisma.department.findUnique({
where: {departmentId: Department_ID},
});
if (!department) {
return res.status(404).json({
success: false,
message: "Department not found",
});
}
const doctors = await prisma.doctorDepartment.findMany({
where: {departmentId: department.id},
include: {
doctor: true,
},
});
const result = doctors.map((d) => ({
GG_ID: d.doctor.doctorId,
Name: d.doctor.name,
}));
res.status(200).json({
success: true,
data: result,
});
} catch (error) {
console.error(error);
res.status(500).json({
success: false,
message: "Failed to fetch doctors",
});
}
};
// add doctors // add doctors
export const createDoctor = async (req, res) => { export const createDoctor = async (req, res) => {
try { try {
@@ -184,20 +229,14 @@ export const updateDoctor = async (req, res) => {
}); });
if (!doctor) { if (!doctor) {
return res.status(404).json({ return res
success: false, .status(404)
message: "Doctor not found", .json({success: false, message: "Doctor not found"});
});
} }
await prisma.doctor.update({ await prisma.doctor.update({
where: {id: doctor.id}, where: {id: doctor.id},
data: { data: {name, designation, workingStatus, qualification},
name,
designation,
workingStatus,
qualification,
},
}); });
const oldRelations = await prisma.doctorDepartment.findMany({ const oldRelations = await prisma.doctorDepartment.findMany({
@@ -229,25 +268,24 @@ export const updateDoctor = async (req, res) => {
}); });
if (dep.timing) { if (dep.timing) {
const {id, doctorDepartmentId, createdAt, updatedAt, ...cleanTiming} =
dep.timing;
await prisma.doctorTiming.create({ await prisma.doctorTiming.create({
data: { data: {
doctorDepartmentId: doctorDepartment.id, doctorDepartmentId: doctorDepartment.id,
...dep.timing, ...cleanTiming,
}, },
}); });
} }
} }
res.status(200).json({ res
success: true, .status(200)
message: "Doctor updated successfully", .json({success: true, message: "Doctor updated successfully"});
});
} catch (error) { } catch (error) {
console.error(error); console.error("Update Error:", error);
res.status(500).json({ res.status(500).json({success: false, message: "Failed to update doctor"});
success: false,
message: "Failed to update doctor",
});
} }
}; };
//delete doctor //delete doctor
@@ -256,13 +294,6 @@ export const deleteDoctor = async (req, res) => {
try { try {
const {doctorId} = req.params; const {doctorId} = req.params;
if (!doctorId) {
return res.status(400).json({
success: false,
message: "Doctor ID is required",
});
}
const doctor = await prisma.doctor.findUnique({ const doctor = await prisma.doctor.findUnique({
where: {doctorId}, where: {doctorId},
}); });
@@ -270,7 +301,7 @@ export const deleteDoctor = async (req, res) => {
if (!doctor) { if (!doctor) {
return res.status(404).json({ return res.status(404).json({
success: false, success: false,
message: `Doctor with ID ${doctorId} not found`, message: "Doctor not found",
}); });
} }
@@ -294,7 +325,7 @@ export const deleteDoctor = async (req, res) => {
res.status(200).json({ res.status(200).json({
success: true, success: true,
message: `Doctor ${doctorId} deleted successfully`, message: "Doctor deleted successfully",
}); });
} catch (error) { } catch (error) {
console.error(error); console.error(error);
@@ -320,23 +351,19 @@ export const getDoctorTimings = async (req, res) => {
}); });
const result = doctors.map((doc) => { const result = doctors.map((doc) => {
let timing = {}; const timing = doc.departments[0]?.timing || {};
if (doc.departments.length > 0) {
timing = doc.departments[0].timing ?? {};
}
return { return {
Doctor_ID: doc.doctorId, Doctor_ID: doc.doctorId,
Doctor: doc.name, Doctor: doc.name,
Monday: timing?.monday ?? "", Monday: timing.monday || "",
Tuesday: timing?.tuesday ?? "", Tuesday: timing.tuesday || "",
Wednesday: timing?.wednesday ?? "", Wednesday: timing.wednesday || "",
Thursday: timing?.thursday ?? "", Thursday: timing.thursday || "",
Friday: timing?.friday ?? "", Friday: timing.friday || "",
Saturday: timing?.saturday ?? "", Saturday: timing.saturday || "",
Sunday: timing?.sunday ?? "", Sunday: timing.sunday || "",
Additional: timing?.additional ?? "", Additional: timing.additional || "",
}; };
}); });
@@ -380,26 +407,11 @@ export const getDoctorTimingById = async (req, res) => {
const result = { const result = {
doctorId: doctor.doctorId, doctorId: doctor.doctorId,
doctorName: doctor.name, doctorName: doctor.name,
departments: doctor.departments.map((d) => ({
departments: doctor.departments.map((d) => {
const t = d.timing || {};
return {
departmentId: d.department.departmentId, departmentId: d.department.departmentId,
departmentName: d.department.name, departmentName: d.department.name,
timing: d.timing || {},
timing: { })),
monday: t.monday || "",
tuesday: t.tuesday || "",
wednesday: t.wednesday || "",
thursday: t.thursday || "",
friday: t.friday || "",
saturday: t.saturday || "",
sunday: t.sunday || "",
additional: t.additional || "",
},
};
}),
}; };
res.status(200).json({ res.status(200).json({