feat: Rename 'notes' to 'additional_notes' in appointments and update related service logic

Author: Dave-code-creater

src/config/schema.sql

@@ -115,7 +115,7 @@ CREATE TABLE IF NOT EXISTS appointments (
     appointment_time TIME NOT NULL,
     duration_minutes INTEGER DEFAULT 60,
     status VARCHAR(20) DEFAULT 'scheduled' CHECK (status IN ('scheduled', 'completed', 'cancelled', 'no_show')),
-    notes TEXT,
+    additional_notes TEXT,
 
     created_at TIMESTAMP WITH TIME ZONE DEFAULT NOW(),
     updated_at TIMESTAMP WITH TIME ZONE DEFAULT NOW(),
@@ -251,4 +251,4 @@ VALUES (
     'Chiropractic adjustment and physical therapy',
     'Reduce pain to level 2-3, restore full mobility, return to normal activities'
 );
-*/
+*/

src/controllers/chat.controller.js

@@ -201,7 +201,7 @@ class ChatController {
           throw new ErrorResponse('Invalid role parameter. Must be one of: doctor, staff, admin', 400, '4001');
         }
 
-        const users = await ChatService.getUsersByRole(role, req.query);
+        const users = await ChatService.getUsersByRole(role, req.query, req.user);
 
         const meta = {
           roles: [role],

src/repositories/doctor.repository.js

@@ -486,7 +486,7 @@ class DoctorRepository extends BaseRepository {
             'end_time', a.end_time,
             'status', a.status,
             'appointment_type', a.appointment_type,
-            'notes', a.notes,
+            'notes', a.additional_notes,
             'created_at', a.created_at
           )
         ) FILTER (WHERE a.id IS NOT NULL) as appointments

src/services/appointment.service.js

@@ -16,6 +16,12 @@ class AppointmentService {
    * @returns {Object} Created appointment
    */
   static async createAppointment(appointmentData, req) {
+    // Normalize note field from clients that send `notes`
+    if (appointmentData && appointmentData.notes && !appointmentData.additional_notes) {
+      appointmentData.additional_notes = appointmentData.notes;
+      delete appointmentData.notes;
+    }
+
     const {
       doctor_id, patient_id, appointment_date, appointment_time,
       location, reason_for_visit, additional_notes, status
@@ -134,16 +140,18 @@ class AppointmentService {
       if (user) {
         if (user.role === 'doctor') {
           // Doctors can only see appointments assigned to them
+          // Support both cases:
+          // 1) Appointments linked to doctor table id
+          // 2) Appointments linked to the doctor's user_id (fallback used during creation)
           const doctorRepo = getDoctorRepository();
           const doctor = await doctorRepo.findByUserId(user.id);
+
+          // Always include the user's id as a fallback to catch records created
+          // when no doctor profile existed yet
           if (doctor) {
-            conditions.doctor_id = doctor.id;
+            conditions.doctor_id = [doctor.id, user.id];
           } else {
-            // If user is doctor but no doctor record found, return empty
-            return {
-              appointments: [],
-              pagination: { page, limit, total: 0, pages: 0 }
-            };
+            conditions.doctor_id = [user.id];
           }
         } else if (user.role === 'patient') {
           // Patients can only see their own appointments
@@ -339,6 +347,12 @@ class AppointmentService {
    */
   static async updateAppointment(appointmentId, updateData) {
     try {
+      // Normalize note field: accept `notes` from clients, map to `additional_notes`
+      if (updateData && updateData.notes && !updateData.additional_notes) {
+        updateData.additional_notes = updateData.notes;
+        delete updateData.notes;
+      }
+
       const existingAppointment = await AppointmentService.findAppointmentById(appointmentId);
       if (!existingAppointment) {
         throw new NotFoundError('Appointment not found', '4048');

src/services/chat.service.js

@@ -881,7 +881,7 @@ class ChatService {
    * @param {Object} query - Query parameters
    * @returns {Array} Users with the specified role
    */
-  static async getUsersByRole(role, query = {}) {
+  static async getUsersByRole(role, query = {}, currentUser) {
     try {
       const chatRepo = getChatRepository();
       const { per_page = 100, search_term = '' } = query;
@@ -893,9 +893,12 @@ class ChatService {
       });
 
       // Get users by role from repository
+      // Note: We must pass the currentUser so role-specific filtering (e.g.,
+      // doctor seeing their patients) can be applied correctly.
       const users = await chatRepo.getUsersByRole(role, {
         limit: parseInt(per_page),
-        search: search_term.trim()
+        search: search_term.trim(),
+        currentUser,
       });
 
       // Format users consistently