Address reviews

onaio · Jul 16, 2024 · 6be6b28 · 6be6b28
1 parent c288cc6
commit 6be6b28
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 6 deletions.
diff --git a/...src/main/java/org/smartregister/fhir/gateway/plugins/LocationHierarchyEndpointHelper.java b/...src/main/java/org/smartregister/fhir/gateway/plugins/LocationHierarchyEndpointHelper.java
@@ -194,7 +194,8 @@ public Bundle handleNonIdentifierRequest(
         List<String> selectedSyncLocations = extractSyncLocations(syncLocationsParam);
         String practitionerId = verifiedJwt.getSubject();
         List<String> userRoles = JwtUtils.getUserRolesFromJWT(verifiedJwt);
-        String syncStrategy = getSyncStrategyFromJwtToken(verifiedJwt);
+        String applicationId = JwtUtils.getApplicationIdFromJWT(verifiedJwt);
+        String syncStrategy = getSyncStrategyByAppId(applicationId);
 
         if (Constants.LIST.equals(mode)) {
             if (Constants.SyncStrategy.RELATED_ENTITY_LOCATION.equalsIgnoreCase(syncStrategy)
@@ -241,11 +242,8 @@ public Bundle handleNonIdentifierRequest(
         }
     }
 
-    public String getSyncStrategyFromJwtToken(DecodedJWT verifiedJwt) {
-        String applicationId = JwtUtils.getApplicationIdFromJWT(verifiedJwt);
-
+    public String getSyncStrategyByAppId(String applicationId) {
         String syncStrategy;
-
         if (CacheHelper.INSTANCE.skipCache()) {
             syncStrategy = getSyncStrategy(applicationId);
         } else {

diff --git a/...test/java/org/smartregister/fhir/gateway/plugins/LocationHierarchyEndpointHelperTest.java b/...test/java/org/smartregister/fhir/gateway/plugins/LocationHierarchyEndpointHelperTest.java
@@ -172,7 +172,7 @@ public void testHandleNonIdentifierRequestListModePaginatesLocations() {
                 .getDescendants(Mockito.anyString(), Mockito.any(), Mockito.any());
         Mockito.doReturn(Constants.SyncStrategy.RELATED_ENTITY_LOCATION)
                 .when(mockLocationHierarchyEndpointHelper)
-                .getSyncStrategyFromJwtToken(mockDecodedJWT);
+                .getSyncStrategyByAppId(Mockito.any());
 
         mockJwtUtils
                 .when(() -> JwtUtils.getUserRolesFromJWT(any(DecodedJWT.class)))