Changeset ccb5a6b

Timestamp:

05/23/26 20:35:57 (4 months ago)

Author:

MBK <marija.karapandzova@…>

Branches:

master

Children:

ed083e6

Parents:

946877f

Message:

Assign role permissions for lab technitians

Location:

backend/src/main/java/medora

Files:

• controller/LabController.java (modified) (2 diffs)
• dto/LabTestRequestDTO.java (modified) (2 diffs)
• models/domain/PerformedLabTests.java (modified) (3 diffs)
• repository/PerformedLabTestRepository.java (modified) (1 diff)
• service/LabService.java (modified) (5 diffs)

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

@@ -278 +278 @@
     }
 
+    @GetMapping("/requests/pending")
+    public ResponseEntity<?> getPendingLabTests(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 pending tests"));
+            }
+
+            logger.info("Fetching pending lab tests");
+            List<PerformedLabTests> pendingTests = labService.getPendingLabTests();
+            List<LabTestRequestDTO> dtos = pendingTests.stream()
+                    .map(this::convertPerformedTestToDTO)
+                    .collect(Collectors.toList());
+            return ResponseEntity.ok(dtos);
+        } catch (RuntimeException e) {
+            logger.error("Error fetching pending lab tests: {}", e.getMessage());
+            return ResponseEntity.badRequest()
+                    .body(Map.of("error", e.getMessage()));
+        } catch (Exception e) {
+            logger.error("Unexpected error fetching pending lab tests: {}", e.getMessage());
+            return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR)
+                    .body(Map.of("error", "Failed to fetch pending lab tests: " + e.getMessage()));
+        }
+    }
+
     private LabTestDTO convertToDTO(LabTests labTest) {
         return new LabTestDTO(
@@ -295 +327 @@
                 performedTest.getDoctor().getDoctorId(),
                 performedTest.getDoctor().getFirstName() + " " + performedTest.getDoctor().getLastName(),
+                performedTest.getCreatedAt() != null ? performedTest.getCreatedAt().toLocalDate() : performedTest.getTestDate(),
                 performedTest.getTestDate(),
                 performedTest.getNotes()

backend/src/main/java/medora/dto/LabTestRequestDTO.java

@@ -5 +5 @@
 import lombok.NoArgsConstructor;
 import lombok.Setter;
-
 import java.time.LocalDate;
 
@@ -20 +19 @@
     private String doctorName;
     private LocalDate requestDate;
+    private LocalDate testDate;
     private String notes;
 }

backend/src/main/java/medora/models/domain/PerformedLabTests.java

@@ -6 +6 @@
 
 import java.time.LocalDate;
+import java.time.LocalDateTime;
 
 @Getter
@@ -38 +39 @@
     private LocalDate testDate;
 
+    @Column(name = "created_at")
+    private LocalDateTime createdAt;
+
     private String notes;
 
@@ -44 +48 @@
 
     public PerformedLabTests(Long performedTestId,
-                            LabTests labTest,
-                            Patient patient,
-                            Doctors doctor,
-                            LabTechnician technician,
-                            LocalDate testDate,
-                            String notes) {
+                             LabTests labTest,
+                             Patient patient,
+                             Doctors doctor,
+                             LabTechnician technician,
+                             LocalDate testDate,
+                             String notes) {
         this.performedTestId = performedTestId;
         this.labTest = labTest;

backend/src/main/java/medora/repository/PerformedLabTestRepository.java

@@ -22 +22 @@
     """)
     List<PerformedLabTests> findByPatientAndDate(@Param("patientId") Long patientId, @Param("testDate") java.time.LocalDate testDate);
+
 }

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 @@
     }
 
-    // ================= LAB TEST REQUESTS (UC013) =================
+    // UC013
 
     @Transactional
@@ -172 +172 @@
     }
 
-    // ================= LAB RESULTS (UC014, UC015) =================
+    //UC014, UC015
 
     @Transactional
@@ -220 +220 @@
         return medicalRecordLabResultRepository.findByMedicalRecordRecordId(medicalRecordId);
     }
+
+    @Transactional(readOnly = true)
+    public List<PerformedLabTests> getPendingLabTests() {
+        // Get all performed tests and filter to only those without results
+        List<PerformedLabTests> allTests = performedLabTestRepository.findAll();
+
+        return allTests.stream()
+                .filter(test -> {
+                    // Get the patient's medical record
+                    Optional<MedicalRecord> recordOpt = medicalRecordRepository.findByPatientPatientId(test.getPatient().getPatientId());
+                    if (recordOpt.isEmpty()) {
+                        return true; // No medical record, so no results possible
+                    }
+
+                    MedicalRecord record = recordOpt.get();
+                    // Check if this test has results in this medical record
+                    List<MedicalRecordLabResults> results = medicalRecordLabResultRepository
+                            .findByMedicalRecordRecordId(record.getRecordId());
+
+                    // Filter to only results for this specific test
+                    return results.stream()
+                            .noneMatch(r -> r.getLabResult().getLabTest().getTestId().equals(test.getLabTest().getTestId()));
+                })
+                .toList();
+    }
 }