Merge pull request #34 from advanced-computer-lab-2023/health_records

not showing any medical record that is file uploaded in health records
advanced-computer-lab-2023 · Nov 14, 2023 · c29aff0 · c29aff0
2 parents f3c3bc2 + 0c25239
commit c29aff0
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 1 deletion.
diff --git a/client/src/layouts/dashboard/config-navigation.jsx b/client/src/layouts/dashboard/config-navigation.jsx
@@ -70,6 +70,11 @@ const navConfig = [
     path: '/medical-history',
     icon: icon('ic_disabled')
   },
+  {
+    title: 'My Health Records',
+    path: '/health-record',
+    icon: icon('ic_analytics'),
+  },
   {
     title: 'Not found',
     path: '/404',

diff --git a/server/src/services/patient.service.ts b/server/src/services/patient.service.ts
@@ -231,14 +231,23 @@ const getHealthRecords = async (patientID: String) => {
 
   const healthRecords = user.medicalHistory;
   if (!healthRecords) throw new HttpError(StatusCodes.NOT_FOUND, 'health records not found');
+  //create a new array of objects where the medicalRecord is not a URL
+  let filteredRecords = healthRecords.filter((record: any) => isNotURL(record.medicalRecord));
+  if (!filteredRecords) throw new HttpError(StatusCodes.NOT_FOUND, 'health records not found');
+  // console.log(healthRecords);
+  // console.log(filteredRecords);
 
   return {
-    result: healthRecords,
+    result: filteredRecords,
     status: StatusCodes.OK,
     message: 'Health records retrieved successfully'
   };
 };
 
+const isNotURL = (str: String) => {
+  return !str.endsWith('.pdf') && !str.endsWith('.jpeg') && !str.endsWith('.jpg') && !str.endsWith('.png');
+};
+
 const getHealthPackage = async (userID: string) => {
   const user = await Patient.findOne({ _id: userID });