feat: Nurse APIs; fix app.js/server.js conflict, routing priorities

Author: rohitbytecode

server.js

@@ -1,28 +1,11 @@
 import 'dotenv/config';
 import app from './src/app.js';
-//import bodyParser from 'body-parser';
 import connectDB from './src/config/db.js';
 
 connectDB();
 
-// app.use(cors());
-// app.use(bodyParser.json());
-
-import patientRoutes from './src/routes/patient.js';
-import deptRoutes from './src/routes/dept.js';
-import doctorRoutes from './src/routes/doctor.routes.js';
-import appointmentRoutes from './src/routes/appointment.js';
-import authRoutes from './src/routes/auth.routes.js';
-import signupRoutes from './src/routes/signup.js';
-import adminRoutes from './src/routes/adminroutes.js';
-
-app.use('/api/patients', patientRoutes);
-app.use('/api/departments', deptRoutes);
-app.use('/api/users/doctors', doctorRoutes);
-app.use('/api/appointments', appointmentRoutes);
-app.use('/api/signup', signupRoutes);
-app.use('/api/auth', authRoutes);
-app.use('/api/admin', adminRoutes);
-
 const PORT = process.env.PORT || 5000;
-app.listen(PORT, () => console.log(`Server running on port ${PORT}`));
+
+app.listen(PORT, () => {
+  console.log(`Server running on port ${PORT}`);
+});

src/app.js

@@ -3,23 +3,43 @@ import cors from 'cors';
 import morgan from 'morgan';
 
 import authRoutes from './routes/auth.routes.js';
+import signupRoutes from './routes/signup.js';
+import adminRoutes from './routes/adminroutes.js';
+
 import doctorRoutes from './routes/doctor.routes.js';
- 
+import nurseRoutes from './routes/nurse.routes.js';
+
+import patientRoutes from './routes/patient.js';
+import deptRoutes from './routes/dept.js';
+import appointmentRoutes from './routes/appointment.js';
 
 const app = express();
 
+// Global middleware
 app.use(cors());
 app.use(express.json());
 app.use(morgan('dev'));
 
-app.get('/', (req, res) => res.json({ ok: true }));
+app.get('/', (req, res) => {
+  res.json({ ok: true });
+});
 
 app.use('/api/auth', authRoutes);
-app.use('/api', doctorRoutes); 
+app.use('/api/signup', signupRoutes);
+app.use('/api/admin', adminRoutes);
+
+app.use('/api/users/doctors', doctorRoutes);
+app.use('/api/users/nurses', nurseRoutes);
+
+app.use('/api/patients', patientRoutes);
+app.use('/api/departments', deptRoutes);
+app.use('/api/appointments', appointmentRoutes);
 
 app.use((err, req, res, next) => {
   console.error(err);
-  res.status(err.status || 500).json({ error: err.message || 'Server error' });
+  res.status(err.status || 500).json({
+    error: err.message || 'Server error'
+  });
 });
 
-export default app;
+export default app;

src/controllers/doctor.controller.js

@@ -70,7 +70,7 @@ const updateDoctor = async (req, res) => {
   }
 };
 
-/*const deleteDoctor = async (req, res) => {
+const deleteDoctor = async (req, res) => {
   try {
     const { id } = req.params;
 
@@ -84,11 +84,12 @@ const updateDoctor = async (req, res) => {
   } catch (err) {
     res.status(500).json({ message: err.message });
   }
-};*/
+};
 
 export {
   createDoctor,
+  changePassword,
   getDoctors,
   updateDoctor,
-  //deleteDoctor
+  deleteDoctor
 };

src/controllers/nurse.controller.js

@@ -1,4 +1,4 @@
-import User from "../models/User";
+import User from "../models/User.js";
 import bcrypt from "bcrypt";
 
 const createNurse= async (req, res) => {
@@ -35,6 +35,11 @@ const changePassword = async (req, res) => {
 const getNurses = async (req, res) => {
     try {
         const nurses=await User.find({ role: 'nurse' });
+
+        if(!nurses){
+            res.status(404).json({ message: 'Nurse not found' });
+        }
+
         res.json(nurses);
     } catch (err) {
         res.status(500).json({ message: err.message });
@@ -63,11 +68,28 @@ const updateNurse = async (req,res) =>{
     } catch(error) {
         res.status(400).json({ message: err.message });
     }
-};   
+};
+
+const deleteNurse =  async (req,res)=> {
+    try{
+      const { id }= req.params;
+
+      const nurse= await User.findOneAndDelete({ _id: id, role: 'nurse' });
+
+      if(!nurse){
+        return res.status(404).json({ message: 'Nurse not found'});
+      }
+
+      res.json({ message: 'Nurse deleted successfully'});
+    } catch(error){
+        res.status(500).json({ message: err.message});
+    }
+};
 
 export { 
     createNurse,
     changePassword,
     getNurses,
-    updateNurse
+    updateNurse,
+    deleteNurse
 };

src/routes/doctor.routes.js

@@ -8,10 +8,10 @@ router.post('/', protect, authorize('admin'), doctorController.createDoctor);
 
 router.get('/', protect, authorize('admin', 'doctor'), doctorController.getDoctors);
 
-router.put('/:id', protect, authorize('admin'), doctorController.updateDoctor);
-
 router.put('/change-password', protect, authorize('doctor'), doctorController.changePassword);
 
+router.put('/:id', protect, authorize('admin'), doctorController.updateDoctor);
+
 router.delete('/:id', protect, authorize('admin'), doctorController.deleteDoctor);
 
 export default router;

src/routes/nurse.routes.js

@@ -4,12 +4,14 @@ import * as nurseController from '../controllers/nurse.controller.js';
 
 const router = express.Router();
 
-router.get('/', protect, authorize('admin'), nurseController.createNurse);
+router.post('/', protect, authorize('admin'), nurseController.createNurse);
 
 router.get('/', protect, authorize('admin', 'nurse'), nurseController.getNurses);
 
+router.put('/change-password', protect, authorize('nurse'), nurseController.changePassword);
+
 router.put('/:id', protect, authorize('admin'), nurseController.updateNurse);
 
-router.put('/change-password', protect, authorize('nurse'), nurseController.changePassword);
+router.delete('/:id', protect, authorize('admin'), nurseController.deleteNurse);
 
-router.delete('/:id', protect, authorize('nurse'), nurseController.delete)
+export default router;