Merge pull request #87 from BahmniIndiaDistro/BAH-2536

BAH-2536 | Patient Dao changes from Bahmni Commons

Author: binduak

omod/pom.xml

@@ -84,6 +84,11 @@
             </exclusions>
         </dependency>
 
+        <dependency>
+            <groupId>org.bahmni.module</groupId>
+            <artifactId>bahmni-commons-api</artifactId>
+        </dependency>
+
         <dependency>
             <groupId>org.projectlombok</groupId>
             <artifactId>lombok</artifactId>

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

@@ -1,15 +1,20 @@
 package org.bahmni.module.hip.web.service;
 
-import org.bahmni.module.bahmnicore.contract.patient.response.PatientResponse;
-import org.bahmni.module.bahmnicore.dao.PatientDao;
+import org.apache.commons.lang3.StringUtils;
+import org.bahmni.module.bahmnicommons.api.contract.patient.PatientSearchParameters;
+import org.bahmni.module.bahmnicommons.api.contract.patient.response.PatientResponse;
+import org.bahmni.module.bahmnicommons.api.dao.PatientDao;
+import org.bahmni.module.bahmnicommons.api.visitlocation.BahmniVisitLocationServiceImpl;
 import org.bahmni.module.hip.Config;
 import org.bahmni.module.hip.api.dao.ExistingPatientDao;
 import org.bahmni.module.hip.web.client.model.Status;
 import org.bahmni.module.hip.web.model.ExistingPatient;
+import org.openmrs.Location;
 import org.openmrs.Patient;
 import org.openmrs.PatientIdentifier;
 import org.openmrs.api.LocationService;
 import org.openmrs.api.PatientService;
+import org.openmrs.api.context.Context;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -19,6 +24,7 @@
 import java.util.HashSet;
 import java.util.List;
 import java.util.Set;
+import java.util.function.Supplier;
 
 
 @Service
@@ -130,9 +136,11 @@ private List<PatientResponse> getPatients(String patientName, int patientYearOfB
     }
 
     private List<PatientResponse> filterPatientsByName(String patientName) {
-        return patientDao.getPatients("", patientName, null, null, "", 100, 0,
-                null, "", null, null, null,
-                locationService.getLocation(Config.LOCATION.getValue()).getUuid(), false, false);
+        PatientSearchParameters searchParameters = getPatientSearchParameters(patientName);
+        Supplier<Location> visitLocation = () -> getVisitLocation(searchParameters.getLoginLocationUuid());
+        Supplier<List<String>> configuredAddressFields = () -> patientDao.getConfiguredPatientAddressFields();
+
+        return patientDao.getPatients(searchParameters, visitLocation, configuredAddressFields);
     }
 
 
@@ -219,4 +227,34 @@ public boolean isHealthIdVoided(String uuid){
         }
         return false;
     }
+
+    private PatientSearchParameters getPatientSearchParameters(String patientName) {
+        PatientSearchParameters searchParameters = new PatientSearchParameters();
+        searchParameters.setIdentifier("");
+        searchParameters.setName(patientName);
+        searchParameters.setCustomAttribute(null);
+
+        searchParameters.setAddressFieldName(null);
+        searchParameters.setAddressFieldValue("");
+        searchParameters.setLength(100);
+        searchParameters.setStart(0);
+
+        searchParameters.setPatientAttributes(null);
+        searchParameters.setProgramAttributeFieldName("");
+        searchParameters.setProgramAttributeFieldValue(null);
+        searchParameters.setAddressSearchResultFields(null);
+        searchParameters.setPatientSearchResultFields(null);
+
+        searchParameters.setLoginLocationUuid(locationService.getLocation(Config.LOCATION.getValue()).getUuid());
+        searchParameters.setFilterPatientsByLocation(false);
+        searchParameters.setFilterOnAllIdentifiers(false);
+        return searchParameters;
+    }
+    private Location getVisitLocation(String loginLocationUuid) {
+        if (StringUtils.isBlank(loginLocationUuid)) {
+            return null;
+        }
+        BahmniVisitLocationServiceImpl bahmniVisitLocationService = new BahmniVisitLocationServiceImpl(Context.getLocationService());
+        return bahmniVisitLocationService.getVisitLocation(loginLocationUuid);
+    }
 }

omod/src/main/resources/config.xml

@@ -25,6 +25,7 @@
 		<require_module version="1.5.0">org.openmrs.module.fhir2</require_module>
 		<require_module>org.openmrs.module.emrapi</require_module>
 		<require_module>org.bahmni.module.bahmnicore</require_module>
+		<require_module>org.bahmni.module.bahmnicommons</require_module>
 	</require_modules>
 
 	<!-- AOP

pom.xml

@@ -23,6 +23,7 @@
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 		<openmrs.platform.version>2.4.2</openmrs.platform.version>
 		<hapifhirVersion>5.0.0</hapifhirVersion>
+		<bahmniCommons.version>1.0.0-SNAPSHOT</bahmniCommons.version>
 	</properties>
 
 
@@ -124,6 +125,14 @@
 				<version>2.29.0</version>
 				<scope>provided</scope>
 			</dependency>
+
+			<dependency>
+				<groupId>org.bahmni.module</groupId>
+				<artifactId>bahmni-commons-api</artifactId>
+				<type>jar</type>
+				<version>${bahmniCommons.version}</version>
+				<scope>provided</scope>
+			</dependency>
 		</dependencies>
 
 	</dependencyManagement>