BAH-2711 | Refactor. To read login locationUuid from cookie

Author: SanoferSameera

.github/workflows/build_and_upload.yml

@@ -7,6 +7,7 @@ on:
  push:
     branches:
      - master
+     - BAH-2711
  workflow_dispatch:
 env:
   ORG_NAME: BahmniIndiaDistro

omod/src/main/java/org/bahmni/module/hip/web/controller/PatientController.java

@@ -5,8 +5,10 @@
 import org.bahmni.module.hip.web.client.model.ErrorCode;
 import org.bahmni.module.hip.web.client.model.ErrorRepresentation;
 import org.bahmni.module.hip.web.model.ExistingPatient;
+import org.bahmni.module.hip.web.model.Location;
 import org.bahmni.module.hip.web.service.ExistingPatientService;
 import org.bahmni.module.hip.web.service.ValidationService;
+import org.codehaus.jackson.map.ObjectMapper;
 import org.openmrs.Patient;
 import org.openmrs.module.webservices.rest.web.RestConstants;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -19,6 +21,9 @@
 import org.springframework.web.bind.annotation.RestController;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.CookieValue;
+
+import java.io.IOException;
 import java.util.List;
 import java.util.Set;
 
@@ -39,8 +44,10 @@ public PatientController(ExistingPatientService existingPatientService, Validati
     ResponseEntity<?> getExistingPatients(@RequestParam(required = false) String patientName,
                                           @RequestParam String patientYearOfBirth,
                                           @RequestParam String patientGender,
-                                          @RequestParam String phoneNumber) {
-        Set<Patient> matchingPatients = existingPatientService.getMatchingPatients(phoneNumber,patientName,
+                                          @RequestParam String phoneNumber,
+                                          @CookieValue(name = "bahmni.user.location") String location) throws IOException {
+        String locationUuid = new ObjectMapper().readValue(location,Location.class).getUuid();
+        Set<Patient> matchingPatients = existingPatientService.getMatchingPatients(locationUuid,phoneNumber,patientName,
                 Integer.parseInt(patientYearOfBirth), patientGender);
         if (matchingPatients.size() == 0) {
             return ResponseEntity.ok().body(new ErrorRepresentation(new Error(

omod/src/main/java/org/bahmni/module/hip/web/model/Location.java

@@ -0,0 +1,11 @@
+package org.bahmni.module.hip.web.model;
+
+import lombok.Getter;
+import lombok.Setter;
+
+@Getter
+@Setter
+public class Location {
+    String name;
+    String uuid;
+}

omod/src/main/java/org/bahmni/module/hip/web/service/ExistingPatientService.java

@@ -44,10 +44,10 @@ public ExistingPatientService(PatientDao patientDao, PatientService patientServi
         this.locationService = locationService;
     }
 
-    public Set<Patient> getMatchingPatients(String phoneNumber, String patientName, int patientYearOfBirth, String patientGender) {
+    public Set<Patient> getMatchingPatients(String locationUuid,String phoneNumber, String patientName, int patientYearOfBirth, String patientGender) {
         Set<Patient> matchingPatients = new HashSet<>();
         matchingPatients.addAll(getMatchingPatients(phoneNumber));
-        matchingPatients.addAll(getMatchingPatients(patientName, patientYearOfBirth, patientGender));
+        matchingPatients.addAll(getMatchingPatients(locationUuid,patientName, patientYearOfBirth, patientGender));
         matchingPatients.removeIf(patient -> !getHealthId(patient).equals(""));
         return matchingPatients;
     }
@@ -115,17 +115,17 @@ public List<Patient> getMatchingPatients(String phoneNumber) {
         return new ArrayList<>();
     }
 
-    public List<Patient> getMatchingPatients(String patientName, int patientYearOfBirth, String patientGender) {
-        List<PatientResponse> patients = getPatients(patientName, patientYearOfBirth, patientGender);
+    public List<Patient> getMatchingPatients(String locationUuid, String patientName, int patientYearOfBirth, String patientGender) {
+        List<PatientResponse> patients = getPatients(locationUuid,patientName, patientYearOfBirth, patientGender);
         List<Patient> existingPatients = new ArrayList<>();
         for (PatientResponse patient : patients) {
             existingPatients.add(patientService.getPatientByUuid(patient.getUuid()));
         }
         return existingPatients;
     }
 
-    private List<PatientResponse> getPatients(String patientName, int patientYearOfBirth, String patientGender) {
-        List<PatientResponse> patientsMatchedWithName = filterPatientsByName(patientName);
+    private List<PatientResponse> getPatients(String locationUuid, String patientName, int patientYearOfBirth, String patientGender) {
+        List<PatientResponse> patientsMatchedWithName = filterPatientsByName(locationUuid,patientName);
         if (patientsMatchedWithName.size() != 1) {
             List<PatientResponse> patientsMatchedWithNameAndAge = filterPatientsByAge(patientYearOfBirth, patientsMatchedWithName);
             if (patientsMatchedWithNameAndAge.size() != 1)
@@ -135,9 +135,9 @@ private List<PatientResponse> getPatients(String patientName, int patientYearOfB
         return patientsMatchedWithName;
     }
 
-    private List<PatientResponse> filterPatientsByName(String patientName) {
-        PatientSearchParameters searchParameters = getPatientSearchParameters(patientName);
-        Supplier<Location> visitLocation = () -> getVisitLocation(searchParameters.getLoginLocationUuid());
+    private List<PatientResponse> filterPatientsByName(String locationUuid,String patientName) {
+        PatientSearchParameters searchParameters = getPatientSearchParameters(locationUuid,patientName);
+        Supplier<Location> visitLocation = () -> getVisitLocation(locationUuid);
         Supplier<List<String>> configuredAddressFields = () -> patientDao.getConfiguredPatientAddressFields();
 
         return patientDao.getPatients(searchParameters, visitLocation, configuredAddressFields);
@@ -228,7 +228,7 @@ public boolean isHealthIdVoided(String uuid){
         return false;
     }
 
-    private PatientSearchParameters getPatientSearchParameters(String patientName) {
+    private PatientSearchParameters getPatientSearchParameters(String locationUuid,String patientName) {
         PatientSearchParameters searchParameters = new PatientSearchParameters();
         searchParameters.setIdentifier("");
         searchParameters.setName(patientName);
@@ -245,7 +245,7 @@ private PatientSearchParameters getPatientSearchParameters(String patientName) {
         searchParameters.setAddressSearchResultFields(null);
         searchParameters.setPatientSearchResultFields(null);
 
-        searchParameters.setLoginLocationUuid(locationService.getLocation(Config.LOCATION.getValue()).getUuid());
+        searchParameters.setLoginLocationUuid(locationUuid);
         searchParameters.setFilterPatientsByLocation(false);
         searchParameters.setFilterOnAllIdentifiers(false);
         return searchParameters;