Merge pull request #77 from onaio/bug_fix_null_admin_levels

Bug Fix
onaio · Aug 6, 2024 · 17c78a2 · 17c78a2
2 parents efab847 + c78b77a
commit 17c78a2
Show file tree

Hide file tree

Showing 5 changed files with 22 additions and 4 deletions.
diff --git a/exec/pom.xml b/exec/pom.xml
@@ -4,7 +4,7 @@
  <parent>
  <groupId>org.smartregister</groupId>
  <artifactId>opensrp-gateway-plugin</artifactId>
- <version>2.0.4</version>
+ <version>2.0.5</version>
  </parent>
 
  <artifactId>exec</artifactId>
@@ -70,7 +70,7 @@
  <dependency>
  <groupId>org.smartregister</groupId>
  <artifactId>plugins</artifactId>
- <version>2.0.4</version>
+ <version>2.0.5</version>
  </dependency>
 
  <dependency>

diff --git a/plugins/pom.xml b/plugins/pom.xml
@@ -4,7 +4,7 @@
  <parent>
  <groupId>org.smartregister</groupId>
  <artifactId>opensrp-gateway-plugin</artifactId>
- <version>2.0.4</version>
+ <version>2.0.5</version>
  </parent>
 
  <artifactId>plugins</artifactId>

diff --git a/...src/main/java/org/smartregister/fhir/gateway/plugins/LocationHierarchyEndpointHelper.java b/...src/main/java/org/smartregister/fhir/gateway/plugins/LocationHierarchyEndpointHelper.java
@@ -411,6 +411,9 @@ public List<String> generateAdminLevels(
 
  public List<Location> filterLocationsByAdminLevels(
  List<Location> locations, List<String> postFetchAdminLevels) {
+ if (postFetchAdminLevels == null) {
+ return locations;
+ }
  List<Location> allLocations = new ArrayList<>();
  for (Location location : locations) {
  for (CodeableConcept codeableConcept : location.getType()) {

diff --git a/...test/java/org/smartregister/fhir/gateway/plugins/LocationHierarchyEndpointHelperTest.java b/...test/java/org/smartregister/fhir/gateway/plugins/LocationHierarchyEndpointHelperTest.java
@@ -299,6 +299,21 @@ public void testFilterLocationsByAdminLevelsBasic() {
  Assert.assertEquals("3", filteredLocations.get(1).getId());
  }
 
+ @Test
+ public void testFilterLocationsByAdminLevelsWithNullAdminLevelsDoesNotFilter() {
+ List<Location> locations = createLocationList(5, true);
+
+ List<Location> filteredLocations =
+ locationHierarchyEndpointHelper.filterLocationsByAdminLevels(locations, null);
+
+ Assert.assertEquals(5, filteredLocations.size());
+ Assert.assertEquals("0", filteredLocations.get(0).getId());
+ Assert.assertEquals("1", filteredLocations.get(1).getId());
+ Assert.assertEquals("2", filteredLocations.get(2).getId());
+ Assert.assertEquals("3", filteredLocations.get(3).getId());
+ Assert.assertEquals("4", filteredLocations.get(4).getId());
+ }
+
  private Bundle getLocationBundle() {
  Bundle bundleLocation = new Bundle();
  bundleLocation.setId("Location/1234");

diff --git a/pom.xml b/pom.xml
@@ -11,7 +11,7 @@
 
  <groupId>org.smartregister</groupId>
  <artifactId>opensrp-gateway-plugin</artifactId>
- <version>2.0.4</version>
+ <version>2.0.5</version>
  <packaging>pom</packaging>
 
  <modules>