Merge pull request #39 from advanced-computer-lab-2023/VCP-10

fixing the problem with user id
advanced-computer-lab-2023 · Oct 14, 2023 · ed489fa · ed489fa
2 parents 5340ce3 + 29de931
commit ed489fa
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 8 deletions.
diff --git a/client/src/routes/MainRoutes.js b/client/src/routes/MainRoutes.js
@@ -63,6 +63,7 @@ const MainRoutes = {
                     element: <Account />,
                 },
                 {
+
                     path: 'admins',
                     element: <LazyAdmins />,
                 },
@@ -103,8 +104,9 @@ const MainRoutes = {
                         },
                     ],
                 },
+
                 {
-                    path: 'listOfPatients',
+                    path: 'My Patients',
                     element: <LazyDoctorListofPatients />,
                 },
             ],

diff --git a/clinic/src/database/repository/appointment-repository.js b/clinic/src/database/repository/appointment-repository.js
@@ -1,13 +1,14 @@
 import AppointmentModel from '../models/Appointment.js';
+import mongoose from 'mongoose';
 
 class AppointmentRepository {
-	async findAppointmentsByUserId(id) {
-		// const objectId = mongoose.Types.ObjectId(id)
-		// console.log(objectId);
-		const appointments = await AppointmentModel.find({});
-		return appointments.filter((appointment) => appointment.patientId.toString() === id.toString()
-		);
-	}
+    async findAppointmentsByUserId(id) {
+        const userID = new mongoose.Types.ObjectId(id);
+        const appointments = await AppointmentModel.find({
+            $or: [{ patientId: userID }, { doctorId: userID }],
+        });
+        return appointments;
+    }
 }
 
 export default AppointmentRepository;