fix: doctor api response; validation logic mix in mongoose and express

Author: rohitbytecode

src/controllers/doctor.controller.js

@@ -1,11 +1,11 @@
 import doctorService from '../services/doctor.service.js';
 
-const createDoctor = async (req, res) => {
+const createDoctor = async (req, res, next) => {
   try {
     const doctor = await doctorService.createDoctor(req.body);
     res.status(201).json(doctor);
   } catch (err) {
-    res.status(400).json({ message: err.message });
+    next(err)
   }
 };
 

src/models/User.js

@@ -31,10 +31,10 @@ const workingDaySchema = new mongoose.Schema({
   }
 }, { _id: false });
 
-workingDaySchema.pre('validate', function(next) {
+workingDaySchema.pre('validate', function() {
 
   if (!this.isAvailable && this.slots.length > 0) {
-    return next(new Error("Slots cannot exist when doctor is unavailable"));
+    return new Error("Slots cannot exist when doctor is unavailable");
   }
 
   const sorted = [...this.slots].sort((a, b) =>
@@ -44,15 +44,13 @@ workingDaySchema.pre('validate', function(next) {
   for (let i = 0; i < sorted.length; i++) {
 
     if (sorted[i].startTime >= sorted[i].endTime) {
-      return next(new Error("Start time must be before end time"));
+      return new Error("Start time must be before end time");
     }
 
     if (i > 0 && sorted[i - 1].endTime > sorted[i].startTime) {
-      return next(new Error("Overlapping time slots detected"));
+      return new Error("Overlapping time slots detected");
     }
   }
-
-  next();
 });
 
 const DEFAULT_WORKING_HOURS = [
@@ -115,29 +113,24 @@ const userSchema = new mongoose.Schema({
 }, { timestamps: true });
 
 
-userSchema.pre('validate', function(next) {
+userSchema.pre('validate', function() {
 
   if (this.role === 'doctor' && this.workingHours) {
     const days = this.workingHours.map(d => d.day);
     const uniqueDays = new Set(days);
 
     if (days.length !== uniqueDays.size) {
-      return next(new Error("Duplicate days are not allowed"));
+      return new Error("Duplicate days are not allowed");
     }
   }
-
-  next();
 });
 
-userSchema.pre('save', function(next) {
+userSchema.pre('save', function() {
 
   if (this.role === 'doctor' && (!this.workingHours || this.workingHours.length === 0)) {
     this.workingHours = DEFAULT_WORKING_HOURS;
   }
-
-  next();
 });
 
-
 const User = mongoose.models.User || mongoose.model('User', userSchema);
 export default User;

src/models/patient.js

@@ -9,10 +9,19 @@ email:{
     },
 phno:{ 
     type: String, 
-    required:true,
+    required: true,
     match:/^[0-9]{10}$/
     },
-age:{type:Number, required:true},
+age:{
+    type:Number, 
+    required: true,
+    min: [0, "Age cannot be negative"],
+    max: [150, "Age cannot exceed 150"],
+    validate: {
+        validator: Number.isInteger,
+        message: "Age must be a whole number"
+    }
+},
 gender: {
     type:String, 
     enum:['male','female','other'],

src/routes/adminroutes.js

@@ -1,6 +1,6 @@
 import express from 'express';
 import * as adminController from '../controllers/admincontroller.js';
-import { protect, authorize } from '../middleware/authmiddleware.js';
+import { protect, authorize } from '../middleware/authMiddleware.js';
 const router = express.Router();
 
 router.post('/login', adminController.login);

src/routes/appointment.js

@@ -1,5 +1,5 @@
 import express from 'express';
-import { protect, authorize } from '../middleware/authmiddleware.js';
+import { protect, authorize } from '../middleware/authMiddleware.js';
 import * as appointmentController from '../controllers/aptcontrol.js';
 
 const router = express.Router();

src/routes/billing.routes.js

@@ -1,5 +1,5 @@
 import express from 'express';
-import { protect, authorize } from '../middleware/authmiddleware.js';
+import { protect, authorize } from '../middleware/authMiddleware.js';
 import * as billingController from '../controllers/billing.controller.js';
 
 const router = express.Router();

src/routes/dashboard.routes.js

@@ -1,5 +1,5 @@
 import express from "express";
-import { protect, authorize } from "../middleware/authmiddleware.js";
+import { protect, authorize } from "../middleware/authMiddleware.js";
 import { getAdminDashboardSummary } from '../controllers/dashboard.controller.js';
 
 const router = express.Router();

src/routes/dept.js

@@ -1,5 +1,5 @@
 import express from 'express';
-import { protect, authorize } from '../middleware/authmiddleware.js';
+import { protect, authorize } from '../middleware/authMiddleware.js';
 import * as departmentController from '../controllers/department.js';
 
 const router = express.Router();

src/routes/doctor.routes.js

@@ -1,10 +1,10 @@
 import express from 'express';
-import { protect, authorize } from '../middleware/authmiddleware.js';
+import { protect, authorize } from '../middleware/authMiddleware.js';
 import * as doctorController from '../controllers/doctor.controller.js';
 
 const router = express.Router();
 
-router.post('/', protect, authorize('admin'), doctorController.createDoctor);
+router.post('/', protect, authorize(['admin']), doctorController.createDoctor);
 
 router.get('/', protect, authorize('admin', 'doctor'), doctorController.getDoctors);
 

src/routes/patient.js

@@ -1,13 +1,13 @@
 import express from 'express';
-import { protect, authorize } from '../middleware/authmiddleware.js';
+import { protect, authorize } from '../middleware/authMiddleware.js';
 import * as patientController from '../controllers/patient.js';
 
 const router = express.Router();
 
 
 router.get('/', protect, authorize('admin', 'doctor'), patientController.getPatients);
 
-router.post('/patient', protect, authorize('admin', 'doctor'), patientController.createPatient);
+router.post('/', protect, authorize('admin', 'doctor'), patientController.createPatient);
 
 router.put('/:id', protect, authorize('admin', 'doctor'), patientController.updatePatient);