implemented change password in backend and frontend

backend/src/app/controllers/appointment.controller.ts

@@ -13,6 +13,7 @@ import { PatientModel } from '../models/patient.model'
 import { DoctorModel } from '../models/doctor.model'
 import { type HydratedDocument } from 'mongoose'
 import { type UserDocument, UserModel } from '../models/user.model'
+import { getApprovedDoctorById } from '../services/doctor.service'
 
 export const appointmentsRouter = Router()
 
@@ -34,22 +35,28 @@ appointmentsRouter.get(
     }
 
     const filterAppointments = await getfilteredAppointments(query)
-    res.send(
-      new GetFilteredAppointmentsResponse(
-        filterAppointments.map((appointment) => ({
+    const appointmentResponses = await Promise.all(
+      filterAppointments.map(async (appointment) => {
+        const doctor = await getApprovedDoctorById(
+          appointment.doctorID.toString()
+        )
+
+        return {
           id: appointment.id,
           patientID: appointment.patientID.toString(),
           doctorID: appointment.doctorID.toString(),
+          doctorName: doctor.name,
           date: appointment.date,
           familyID: appointment.familyID || '',
           reservedFor: appointment.reservedFor || 'Me',
           status:
             new Date(appointment.date) > new Date()
               ? AppointmentStatus.Upcoming
               : AppointmentStatus.Completed,
-        }))
-      )
+        }
+      })
     )
+    res.send(new GetFilteredAppointmentsResponse(appointmentResponses))
   })
 )
 

backend/src/app/controllers/healthPackage.controller.ts

@@ -146,22 +146,11 @@ healthPackagesRouter.post(
   '/unsubscribe',
   [allowAuthenticated, asyncWrapper(allowPatients)],
   asyncWrapper(async (req, res) => {
-    const patient = await getPatientByUsername(req.username!)
-    if (!patient) throw new NotFoundError()
-    await unSubscribeToHealthPackage({
-      id: patient.id,
-    })
-    console.log(patient.healthPackageHistory)
-    res.status(200).send()
-  })
-)
+    const { subscriberId, isFamilyMember } = req.body
 
-healthPackagesRouter.post(
-  '/:id/unsubscribe',
-  [allowAuthenticated, asyncWrapper(allowPatients)],
-  asyncWrapper(async (req, res) => {
     await unSubscribeToHealthPackage({
-      id: req.params.id,
+      id: subscriberId,
+      isFamilyMember,
     })
     res.status(200).send()
   })
@@ -257,10 +246,17 @@ healthPackagesRouter.post(
 healthPackagesRouter.post(
   '/patient-cancelled',
   asyncWrapper(async (req, res) => {
-    const patient = await getPatientByUsername(req.username!)
+    const { id, isFamilyMember } = req.body
+    const model = isFamilyMember
+      ? await FamilyMemberModel.findById(id)
+      : await PatientModel.findById(id)
+
+    if (!model) {
+      throw new NotFoundError()
+    }
+
     const cancelled: Types.ObjectId[] = []
-    if (!patient) throw new NotFoundError()
-    patient.healthPackageHistory.forEach((healthPackage) => {
+    model.healthPackageHistory.forEach((healthPackage) => {
       cancelled.push(healthPackage.healthPackage)
     })
     res.send(cancelled)
@@ -270,17 +266,15 @@ healthPackagesRouter.post(
 healthPackagesRouter.post(
   '/cancellation-date/:healthPackageId',
   asyncWrapper(async (req, res) => {
-    if (!req.username) throw new NotFoundError()
-    const patient = await getPatientByUsername(req.username)
-    if (!patient) throw new NotFoundError()
-    console.log('looking for' + req.params.healthPackageId)
-    patient.healthPackageHistory.forEach((healthPackage) => {
-      console.log('history' + healthPackage.healthPackage.toString())
-
+    const { id, isFamilyMember } = req.body
+    const model = isFamilyMember
+      ? await FamilyMemberModel.findById(id)
+      : await PatientModel.findById(id)
+    if (!model) throw new NotFoundError()
+    model.healthPackageHistory.forEach((healthPackage) => {
       if (
         healthPackage.healthPackage.toString() === req.params.healthPackageId
       ) {
-        console.log(healthPackage.date.toDateString())
         res.send(healthPackage.date.toDateString())
       }
     })

backend/src/app/controllers/patient.controller.ts

@@ -35,9 +35,10 @@ import {
   type Relation,
 } from 'clinic-common/types/familyMember.types'
 import {
-  AppointmentResponseBase,
+  AppointmentStatus,
   GetFilteredAppointmentsResponse,
 } from 'clinic-common/types/appointment.types'
+import { getApprovedDoctorById } from '../services/doctor.service'
 import { changePassowrd } from '../services/changePassword'
 import { SUCCESS } from '../utils/httpStatusText'
 import AppError from '../utils/appError'
@@ -298,21 +299,33 @@ patientRouter.get(
 
     const { patient, appointments, prescriptions } = await getPatientByID(id)
 
-    const filteredAppointments = appointments
-      .filter((appointment) => appointment.doctorID.toString() === doctor?.id)
-      .map((appointment) => {
-        return new AppointmentResponseBase(
-          appointment.id,
-          appointment.patientID.toString(),
-          appointment.doctorID.toString(),
-          appointment.date,
-          appointment.familyID,
-          appointment.reservedFor
+    const filteredAppointments = appointments.filter(
+      (appointment) => appointment.doctorID.toString() === doctor?.id
+    )
+    const appointmentResponses = await Promise.all(
+      filteredAppointments.map(async (appointment) => {
+        const doctor = await getApprovedDoctorById(
+          appointment.doctorID.toString()
         )
+
+        return {
+          id: appointment.id,
+          patientID: appointment.patientID.toString(),
+          doctorID: appointment.doctorID.toString(),
+          doctorName: doctor.name,
+          date: appointment.date,
+          familyID: appointment.familyID || '',
+          reservedFor: appointment.reservedFor || 'Me',
+          status:
+            new Date(appointment.date) > new Date()
+              ? AppointmentStatus.Upcoming
+              : AppointmentStatus.Completed,
+        }
       })
+    )
 
     const appointmentsRefactored = new GetFilteredAppointmentsResponse(
-      filteredAppointments
+      appointmentResponses
     )
     res.send(
       new GetAPatientResponse(

backend/src/app/services/patient.service.ts

@@ -201,69 +201,59 @@ export async function subscribeToHealthPackage({
     throw new NotFoundError()
   }
 
+  if (model.healthPackage)
+    await unSubscribeToHealthPackage({ id: patientId, isFamilyMember })
+
   model.healthPackage = healthPackage.id
 
   // Set renewal date to 1 year from now
   const renewalDate = new Date()
   renewalDate.setFullYear(renewalDate.getFullYear() + 1)
   model.healthPackageRenewalDate = renewalDate
+  const historyIndex = model.healthPackageHistory.findIndex(
+    (entry) => entry.healthPackage.toString() === healthPackage.id
+  )
 
-  await model.save() //removed console.log
+  if (historyIndex !== -1) {
+    model.healthPackageHistory.splice(historyIndex, 1)
+  }
+
+  await model.save()
 }
 
 export async function unSubscribeToHealthPackage(params: {
   id: string
+  isFamilyMember: boolean
 }): Promise<void> {
-  const patient = await PatientModel.findById(params.id)
-  const familyMember = await FamilyMemberModel.findById(params.id)
+  const model = params.isFamilyMember
+    ? await FamilyMemberModel.findById(params.id)
+    : await PatientModel.findById(params.id)
 
-  if (!patient && !familyMember) {
+  if (!model) {
     throw new NotFoundError()
   }
 
-  if (patient && patient.healthPackage) {
+  if (model && model.healthPackage) {
     // Check if there is existing history with the same healthPackage
-    const existingItemIndex = patient.healthPackageHistory.findIndex(
-      (item) =>
-        item.healthPackage.toString() === patient.healthPackage?.toString()
-    )
-
-    if (existingItemIndex !== -1) {
-      // Update the date attribute of the existing item
-      patient.healthPackageHistory[existingItemIndex].date = new Date()
-    } else {
-      // If no existing item, push a new item
-      patient.healthPackageHistory.push({
-        healthPackage: patient.healthPackage,
-        date: new Date(),
-      })
-    }
-
-    patient.healthPackage = undefined
-    patient.healthPackageRenewalDate = undefined
-    await patient.save()
-  }
-
-  if (familyMember && familyMember.healthPackage) {
-    const existingItemIndex = familyMember.healthPackageHistory.findIndex(
+    const existingItemIndex = model.healthPackageHistory.findIndex(
       (item) =>
-        item.healthPackage.toString() === familyMember.healthPackage?.toString()
+        item.healthPackage.toString() === model.healthPackage?.toString()
     )
 
     if (existingItemIndex !== -1) {
       // Update the date attribute of the existing item
-      familyMember.healthPackageHistory[existingItemIndex].date = new Date()
+      model.healthPackageHistory[existingItemIndex].date = new Date()
     } else {
       // If no existing item, push a new item
-      familyMember.healthPackageHistory.push({
-        healthPackage: familyMember.healthPackage,
+      model.healthPackageHistory.push({
+        healthPackage: model.healthPackage,
         date: new Date(),
       })
     }
 
-    familyMember.healthPackage = undefined
-    familyMember.healthPackageRenewalDate = undefined
-    await familyMember.save()
+    model.healthPackage = undefined
+    model.healthPackageRenewalDate = undefined
+    await model.save()
   }
 }
 

clinic-common/types/appointment.types.ts

@@ -17,6 +17,7 @@ export class AppointmentResponseBase {
     public id: string,
     public patientID: string,
     public doctorID: string,
+    public doctorName: string,
     public date: string,
     public familyID: string,
     public reservedFor: string

clinic-common/types/healthPackage.types.ts

@@ -61,3 +61,9 @@ export interface SubscribeToHealthPackageRequest {
   isFamilyMember: boolean
   healthPackageId: string
 }
+
+export interface UnsubscribeToHealthPackageRequest {
+  subscriberId: string
+  payerUsername: string
+  isFamilyMember: boolean
+}

frontend/src/api/healthPackages.ts

@@ -6,6 +6,7 @@ import {
   GetHealthPackageForPatientResponse,
   GetHealthPackageResponse,
   SubscribeToHealthPackageRequest,
+  UnsubscribeToHealthPackageRequest,
   UpdateHealthPackageRequest,
   UpdateHealthPackageResponse,
   createHealthPackageRequest,
@@ -68,9 +69,11 @@ export async function subscribeCreditToHealthPackage(
     .then((res) => res.data)
 }
 
-export async function unsubscribeToHealthPackage(): Promise<void> {
+export async function unsubscribeToHealthPackage(
+  params: UnsubscribeToHealthPackageRequest
+): Promise<void> {
   return await api
-    .post<void>(`/health-packages/unsubscribe`)
+    .post<void>(`/health-packages/unsubscribe`, params)
     .then((res) => res.data)
 }
 
@@ -85,18 +88,23 @@ export async function getHealthPackageForPatient(
     .then((res) => res.data)
 }
 
-export async function getCancelledHealthPackagesForPatient(): Promise<
-  string[]
-> {
+export async function getCancelledHealthPackagesForPatient(params: {
+  id: string
+  isFamilyMember: boolean
+}): Promise<string[]> {
   return await api
-    .post<string[]>(`/health-packages/patient-cancelled`)
+    .post<string[]>(`/health-packages/patient-cancelled`, params)
     .then((res) => res.data)
 }
 
 export async function getCanellationDate(
-  healthPackageId: string
+  healthPackageId: string,
+  params: { id: string; isFamilyMember: boolean }
 ): Promise<string> {
   return await api
-    .post<string>(`/health-packages/cancellation-date/${healthPackageId}`)
+    .post<string>(
+      `/health-packages/cancellation-date/${healthPackageId}`,
+      params
+    )
     .then((res) => res.data)
 }

frontend/src/features/patient-dashboard/routes/Appointments.tsx

@@ -110,7 +110,7 @@ export function Appointments() {
                     Doctor Name
                   </Typography>
                   <Typography variant="body1">
-                    {appointment.doctorID}
+                    {appointment.doctorName}
                   </Typography>
                 </Stack>
                 <Stack spacing={-1}>

frontend/src/features/patient-dashboard/routes/FamilyMemberDetails.tsx

@@ -30,7 +30,7 @@ export function FamilyMemberDetails() {
             label: 'Related to',
             value: query.data?.patient.name,
           },
-          {
+          /*{
             label: 'Health Package',
             value:
               query.data?.familyMember.healthPackage.name ||
@@ -49,7 +49,7 @@ export function FamilyMemberDetails() {
                     `${historyEntry.package} was cancelled on (${historyEntry.date})`
                 )
                 .join(', ') || 'No cancelled health packages yet',
-          },
+          },*/
         ]}
       />
     </Grid>