diff --git a/client/src/routes/MainRoutes.js b/client/src/routes/MainRoutes.js index 55ba01d2..eb960688 100644 --- a/client/src/routes/MainRoutes.js +++ b/client/src/routes/MainRoutes.js @@ -63,6 +63,7 @@ const MainRoutes = { element: , }, { + path: 'admins', element: , }, @@ -103,8 +104,9 @@ const MainRoutes = { }, ], }, + { - path: 'listOfPatients', + path: 'My Patients', element: , }, ], diff --git a/clinic/src/database/repository/appointment-repository.js b/clinic/src/database/repository/appointment-repository.js index 4dbb5839..5f8c755f 100644 --- 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;