Refactor Location Hierarchy List fetch

opensrp · Aug 30, 2023 · f8fa292 · f8fa292
1 parent 8d8dc6d
commit f8fa292
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 16 deletions.
diff --git a/exec/pom.xml b/exec/pom.xml
@@ -21,7 +21,7 @@
   <parent>
     <groupId>com.google.fhir.gateway</groupId>
     <artifactId>fhir-gateway</artifactId>
-    <version>0.1.34</version>
+    <version>0.1.35</version>
   </parent>
 
   <artifactId>exec</artifactId>

diff --git a/plugins/pom.xml b/plugins/pom.xml
@@ -23,7 +23,7 @@
     implementations do not have to do this; they can redeclare those deps. -->
     <groupId>com.google.fhir.gateway</groupId>
     <artifactId>fhir-gateway</artifactId>
-    <version>0.1.34</version>
+    <version>0.1.35</version>
   </parent>
 
   <artifactId>plugins</artifactId>

diff --git a/plugins/src/main/java/com/google/fhir/gateway/plugin/OpenSRPHelper.java b/plugins/src/main/java/com/google/fhir/gateway/plugin/OpenSRPHelper.java
@@ -98,7 +98,7 @@ private Bundle getAttributedPractitionerDetailsByPractitioner(Practitioner pract
     List<String> officialLocationIds =
         getOfficialLocationIdentifiersByLocationIds(supervisorCareTeamOrganizationLocationIds);
     List<LocationHierarchy> locationHierarchies =
-        getLocationsHierarchyByOfficialLocationIdentifiers(officialLocationIds);
+        getLocationsHierarchyByLocationIds(officialLocationIds);
     List<String> attributedLocationsList = getAttributedLocations(locationHierarchies);
     List<String> attributedOrganizationIds =
         getOrganizationIdsByLocationIds(attributedLocationsList);
@@ -261,14 +261,8 @@ private PractitionerDetails getPractitionerDetailsByPractitioner(Practitioner pr
     List<String> locationIds =
         getLocationIdentifiersByOrganizationAffiliations(organizationAffiliations);
 
-    List<String> locationsIdentifiers =
-        getOfficialLocationIdentifiersByLocationIds(
-            locationIds); // TODO Investigate why the Location ID and official identifiers are
-    // different
-
     logger.info("Searching for location hierarchy list by locations identifiers");
-    List<LocationHierarchy> locationHierarchyList =
-        getLocationsHierarchyByOfficialLocationIdentifiers(locationsIdentifiers);
+    List<LocationHierarchy> locationHierarchyList = getLocationsHierarchyByLocationIds(locationIds);
     fhirPractitionerDetails.setLocationHierarchyList(locationHierarchyList);
 
     logger.info("Searching for locations by ids");
@@ -503,15 +497,14 @@ private List<OrganizationAffiliation> mapBundleToOrganizationAffiliation(
         .collect(Collectors.toList());
   }
 
-  private List<LocationHierarchy> getLocationsHierarchyByOfficialLocationIdentifiers(
-      List<String> officialLocationIdentifiers) {
-    if (officialLocationIdentifiers.isEmpty()) return new ArrayList<>();
+  private List<LocationHierarchy> getLocationsHierarchyByLocationIds(List<String> locationIds) {
+    if (locationIds.isEmpty()) return new ArrayList<>();
 
     Bundle bundle =
         getFhirClientForR4()
             .search()
             .forResource(LocationHierarchy.class)
-            .where(LocationHierarchy.IDENTIFIER.exactly().codes(officialLocationIdentifiers))
+            .where(LocationHierarchy.RES_ID.exactly().codes(locationIds))
             .returnBundle(Bundle.class)
             .execute();
 

diff --git a/pom.xml b/pom.xml
@@ -27,7 +27,7 @@
 
   <groupId>com.google.fhir.gateway</groupId>
   <artifactId>fhir-gateway</artifactId>
-  <version>0.1.34</version>
+  <version>0.1.35</version>
   <packaging>pom</packaging>
 
   <name>FHIR Information Gateway</name>

diff --git a/server/pom.xml b/server/pom.xml
@@ -21,7 +21,7 @@
   <parent>
     <groupId>com.google.fhir.gateway</groupId>
     <artifactId>fhir-gateway</artifactId>
-    <version>0.1.34</version>
+    <version>0.1.35</version>
   </parent>
 
   <artifactId>server</artifactId>