diff --git a/plugins/src/main/java/org/smartregister/fhir/gateway/plugins/Constants.java b/plugins/src/main/java/org/smartregister/fhir/gateway/plugins/Constants.java index 8e03060..8b7030a 100644 --- a/plugins/src/main/java/org/smartregister/fhir/gateway/plugins/Constants.java +++ b/plugins/src/main/java/org/smartregister/fhir/gateway/plugins/Constants.java @@ -17,7 +17,7 @@ public class Constants { public static final String TAG_SEARCH_PARAM = "_tag"; public static final String TYPE_SEARCH_PARAM = "type"; public static final String DEFAULT_ADMIN_LEVEL_TYPE_URL = - "https://smartregister.org/codes/administrative-level"; + "https://smartregister.org/CodeSystem/administrative-level"; public static final String AUTHORIZATION = "Authorization"; public static final String KEYCLOAK_UUID = "keycloak-uuid"; public static final String IDENTIFIER = "_id"; diff --git a/plugins/src/test/java/org/smartregister/fhir/gateway/plugins/LocationHierarchyEndpointHelperTest.java b/plugins/src/test/java/org/smartregister/fhir/gateway/plugins/LocationHierarchyEndpointHelperTest.java index 7297fb4..ff348d5 100644 --- a/plugins/src/test/java/org/smartregister/fhir/gateway/plugins/LocationHierarchyEndpointHelperTest.java +++ b/plugins/src/test/java/org/smartregister/fhir/gateway/plugins/LocationHierarchyEndpointHelperTest.java @@ -14,7 +14,11 @@ import javax.servlet.http.HttpServletRequest; import org.hl7.fhir.instance.model.api.IBaseBundle; -import org.hl7.fhir.r4.model.*; +import org.hl7.fhir.r4.model.Bundle; +import org.hl7.fhir.r4.model.CodeableConcept; +import org.hl7.fhir.r4.model.Coding; +import org.hl7.fhir.r4.model.Identifier; +import org.hl7.fhir.r4.model.Location; import org.junit.Assert; import org.junit.Before; import org.junit.Test; @@ -23,7 +27,9 @@ import org.smartregister.model.location.LocationHierarchy; import ca.uhn.fhir.rest.client.api.IGenericClient; -import ca.uhn.fhir.rest.gclient.*; +import ca.uhn.fhir.rest.gclient.ICriterion; +import ca.uhn.fhir.rest.gclient.IQuery; +import ca.uhn.fhir.rest.gclient.IUntypedQuery; import ca.uhn.fhir.rest.server.exceptions.ResourceNotFoundException; public class LocationHierarchyEndpointHelperTest { @@ -153,7 +159,7 @@ public void testGenerateAdminLevelsWithInvalidRange() { } @Test - public void testGetPaginatedLocationsPaginatesLocationsNa() { + public void testGetDecendantsWithAdminLevelFiltersReturnsLocationsWithinAdminLevel() { String locationId = "12345"; Location parentLocation = new Location(); parentLocation.setId(locationId);