Changeset 6c00695 for backend/src

Timestamp:

05/29/26 20:18:54 (4 months ago)

Author:

MBK <marija.karapandzova@…>

Branches:

master

Children:

b63d7b5

Parents:

f18b11b

Message:

Add endpoint for lab technitians to view submitted tests and implement filters

Location:

backend/src/main/java/medora

Files:

• controller/LabController.java (modified) (2 diffs)
• service/LabService.java (modified) (5 diffs)

backend/src/main/java/medora/controller/LabController.java

@@ -92 +92 @@
 
     @GetMapping
-    public ResponseEntity<?> getAllLabTests() {
-        try {
+    public ResponseEntity<?> getAllLabTests(HttpServletRequest httpRequest) {
+        try {
+            String role = securityUtil.getRoleFromRequest(httpRequest);
+            if (role == null) {
+                return ResponseEntity.status(HttpStatus.UNAUTHORIZED)
+                        .body(Map.of("error", "Unauthorized"));
+            }
+
+            // BILLING_ADMIN cannot access lab tests
+            if (role.equals("BILLING_ADMIN")) {
+                return ResponseEntity.status(HttpStatus.FORBIDDEN)
+                        .body(Map.of("error", "You do not have permission to access lab tests"));
+            }
+
             logger.info("Fetching all lab tests");
             List<LabTests> tests = labService.getAllLabTests();
@@ -307 +319 @@
             return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR)
                     .body(Map.of("error", "Failed to fetch pending lab tests: " + e.getMessage()));
+        }
+    }
+
+    @GetMapping("/results")
+    public ResponseEntity<?> getAllSubmittedLabResults(HttpServletRequest httpRequest) {
+        try {
+            String role = securityUtil.getRoleFromRequest(httpRequest);
+            if (role == null) {
+                return ResponseEntity.status(HttpStatus.UNAUTHORIZED)
+                        .body(Map.of("error", "Unauthorized"));
+            }
+
+            if (!role.equals("LAB_TECHNICIAN")) {
+                return ResponseEntity.status(HttpStatus.FORBIDDEN)
+                        .body(Map.of("error", "Only lab technicians can view submitted results"));
+            }
+
+            logger.info("Fetching all submitted lab results");
+            List<MedicalRecordLabResults> results = labService.getAllSubmittedLabResults();
+            List<Map<String, Object>> dtos = results.stream()
+                    .map(recordResult -> {
+                        LabResults labResult = recordResult.getLabResult();
+                        MedicalRecord medicalRecord = recordResult.getMedicalRecord();
+                        String patientName = "N/A";
+                        if (medicalRecord != null && medicalRecord.getPatient() != null) {
+                            Patient patient = medicalRecord.getPatient();
+                            patientName = patient.getFirstName() + " " + patient.getLastName();
+                        }
+                        Map<String, Object> resultMap = new java.util.HashMap<>();
+                        resultMap.put("resultId", labResult.getResultId());
+                        resultMap.put("testId", labResult.getLabTest().getTestId());
+                        resultMap.put("testName", labResult.getLabTest().getTestName());
+                        resultMap.put("patientName", patientName);
+                        resultMap.put("doctorName", "");
+                        resultMap.put("testDate", labResult.getResultDate());
+                        resultMap.put("resultDate", labResult.getResultDate());
+                        resultMap.put("createdDate", labResult.getResultDate());
+                        resultMap.put("results", labResult.getResults());
+                        resultMap.put("description", labResult.getLabTest().getDescription() != null ? labResult.getLabTest().getDescription() : "");
+                        return resultMap;
+                    })
+                    .collect(Collectors.toList());
+            return ResponseEntity.ok(dtos);
+        } catch (RuntimeException e) {
+            logger.error("Error fetching submitted lab results: {}", e.getMessage());
+            return ResponseEntity.badRequest()
+                    .body(Map.of("error", e.getMessage()));
+        } catch (Exception e) {
+            logger.error("Unexpected error fetching submitted lab results: {}", e.getMessage());
+            return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR)
+                    .body(Map.of("error", "Failed to fetch submitted lab results: " + e.getMessage()));
         }
     }

backend/src/main/java/medora/service/LabService.java

@@ -13 +13 @@
 
 /**
- *
+ * LabService handles lab test and lab result operations.
  * UC013 – Record Lab Test Request
  * UC014 – Store Lab Results
@@ -53 +53 @@
     }
 
-
+    // ================= LAB TEST =================
 
     @Transactional
@@ -107 +107 @@
     }
 
-    // UC013
+    // ================= LAB TEST REQUESTS (UC013) =================
 
     @Transactional
@@ -172 +172 @@
     }
 
-    //UC014, UC015
+    // ================= LAB RESULTS (UC014, UC015) =================
 
     @Transactional
@@ -245 +245 @@
                 .toList();
     }
+
+    @Transactional(readOnly = true)
+    public List<MedicalRecordLabResults> getAllSubmittedLabResults() {
+        logger.info("Fetching all submitted lab results");
+        return medicalRecordLabResultRepository.findAll();
+    }
 }