DNM | EUSM Release Branch

exec/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.smartregister</groupId>
     <artifactId>opensrp-gateway-plugin</artifactId>
-    <version>2.2.1</version>
+    <version>2.2.2.3</version>
   </parent>
 
   <artifactId>exec</artifactId>
@@ -70,7 +70,7 @@
     <dependency>
       <groupId>org.smartregister</groupId>
       <artifactId>plugins</artifactId>
-      <version>2.2.1</version>
+      <version>2.2.2.3</version>
     </dependency>
 
     <dependency>

plugins/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.smartregister</groupId>
     <artifactId>opensrp-gateway-plugin</artifactId>
-    <version>2.2.1</version>
+    <version>2.2.2.3</version>
   </parent>
 
   <artifactId>plugins</artifactId>

plugins/src/main/java/org/smartregister/fhir/gateway/plugins/CacheHelper.java

@@ -5,6 +5,7 @@
 import java.util.concurrent.TimeUnit;
 
 import org.apache.commons.lang3.StringUtils;
+import org.hl7.fhir.r4.model.Bundle;
 import org.hl7.fhir.r4.model.DomainResource;
 import org.hl7.fhir.r4.model.Location;
 
@@ -23,6 +24,8 @@ public enum CacheHelper {
 
     Cache<String, List<String>> listStringCache;
 
+    Cache<String, List<Bundle.BundleEntryComponent>> resourceListCache;
+
     CacheHelper() {
         cache =
                 Caffeine.newBuilder()
@@ -49,6 +52,11 @@ public enum CacheHelper {
                         .expireAfterWrite(getCacheExpiryDurationInSeconds(), TimeUnit.SECONDS)
                         .maximumSize(DEFAULT_CACHE_SIZE)
                         .build();
+        resourceListCache =
+                Caffeine.newBuilder()
+                        .expireAfterWrite(getCacheExpiryDurationInSeconds(), TimeUnit.SECONDS)
+                        .maximumSize(DEFAULT_CACHE_SIZE)
+                        .build();
     }
 
     private int getCacheExpiryDurationInSeconds() {

plugins/src/main/java/org/smartregister/fhir/gateway/plugins/Constants.java

@@ -35,6 +35,8 @@ public class Constants {
     public static final int PAGINATION_DEFAULT_PAGE_SIZE = 20;
     public static final int PAGINATION_DEFAULT_PAGE_NUMBER = 1;
     public static final String SYNC_LOCATIONS_SEARCH_PARAM = "_syncLocations";
+    public static final String SYNC_LOCATIONS_HASH_PARAM = "_sLHash";
+    public static final String SYNC_LOCATIONS_PAGE_PARAM = "_sLPage";
     public static final String RELATED_ENTITY_TAG_URL_ENV = "RELATED_ENTITY_TAG_URL";
     public static final String DEFAULT_RELATED_ENTITY_TAG_URL =
             "https://smartregister.org/related-entity-location-tag-id";

plugins/src/main/java/org/smartregister/fhir/gateway/plugins/LocationHierarchyEndpointHelper.java

@@ -77,6 +77,8 @@ public List<LocationHierarchy> getLocationHierarchies(
             Boolean filterInventory,
             String lastUpdated) {
 
+        locationIds = locationIds != null ? locationIds : Collections.emptyList();
+
         return locationIds.parallelStream()
                 .map(
                         locationId ->
@@ -114,6 +116,8 @@ public LocationHierarchy getLocationHierarchyCore(
             locationHierarchy.setId(LOCATION_RESOURCE + locationId);
 
             locationHierarchy.setLocationHierarchyTree(locationHierarchyTree);
+
+            logger.info("Finished building Location Hierarchy of Location Id : {}", locationId);
         } else {
             logger.error("LocationHierarchy with identifier: {} not found", locationId);
             locationHierarchy.setId(LOCATION_RESOURCE_NOT_FOUND);
@@ -179,6 +183,9 @@ public List<Location> getDescendants(
             allLocations.add(parentLocation);
         }
         if (childLocationBundle != null) {
+
+            Utils.fetchAllBundlePagesAndInject(r4FHIRClient, childLocationBundle);
+
             childLocationBundle.getEntry().parallelStream()
                     .forEach(
                             childLocation -> {
@@ -191,24 +198,6 @@ public List<Location> getDescendants(
                                                 null,
                                                 adminLevels));
                             });
-
-            while (childLocationBundle.getLink(Bundle.LINK_NEXT) != null) {
-                childLocationBundle =
-                        getFhirClientForR4().loadPage().next(childLocationBundle).execute();
-
-                childLocationBundle.getEntry().parallelStream()
-                        .forEach(
-                                childLocation -> {
-                                    Location childLocationEntity =
-                                            (Location) childLocation.getResource();
-                                    allLocations.add(childLocationEntity);
-                                    allLocations.addAll(
-                                            getDescendants(
-                                                    childLocationEntity.getIdElement().getIdPart(),
-                                                    null,
-                                                    adminLevels));
-                                });
-            }
         }
 
         return allLocations;
@@ -298,9 +287,11 @@ public Bundle handleNonIdentifierRequest(
                                 filterInventory,
                                 lastUpdated);
                 List<Resource> resourceList =
-                        locationHierarchies.stream()
-                                .map(locationHierarchy -> (Resource) locationHierarchy)
-                                .collect(Collectors.toList());
+                        locationHierarchies != null
+                                ? locationHierarchies.stream()
+                                        .map(locationHierarchy -> (Resource) locationHierarchy)
+                                        .collect(Collectors.toList())
+                                : Collections.emptyList();
                 return Utils.createBundle(resourceList);
             } else {
                 List<String> locationIds =
@@ -314,9 +305,11 @@ public Bundle handleNonIdentifierRequest(
                                 filterInventory,
                                 lastUpdated);
                 List<Resource> resourceList =
-                        locationHierarchies.stream()
-                                .map(locationHierarchy -> (Resource) locationHierarchy)
-                                .collect(Collectors.toList());
+                        locationHierarchies != null
+                                ? locationHierarchies.stream()
+                                        .map(locationHierarchy -> (Resource) locationHierarchy)
+                                        .collect(Collectors.toList())
+                                : Collections.emptyList();
                 return Utils.createBundle(resourceList);
             }
         }

plugins/src/main/java/org/smartregister/fhir/gateway/plugins/PermissionAccessChecker.java

@@ -1,5 +1,6 @@
 package org.smartregister.fhir.gateway.plugins;
 
+import java.security.NoSuchAlgorithmException;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.HashSet;
@@ -11,7 +12,6 @@
 import javax.inject.Named;
 
 import org.apache.commons.lang3.StringUtils;
-import org.apache.commons.lang3.tuple.Pair;
 import org.hl7.fhir.r4.model.Binary;
 import org.hl7.fhir.r4.model.Bundle;
 import org.hl7.fhir.r4.model.CareTeam;
@@ -103,20 +103,22 @@ public AccessDecision checkAccess(RequestDetailsReader requestDetails) {
     private void initSyncAccessDecision(RequestDetailsReader requestDetailsReader) {
         Map<String, List<String>> syncStrategyIds;
 
+        Composition composition = fetchComposition();
+        String syncStrategy = readSyncStrategyFromComposition(composition);
+
         if (CacheHelper.INSTANCE.skipCache()) {
             syncStrategyIds =
-                    getSyncStrategyIds(
-                            jwt.getSubject(), applicationId, fhirContext, requestDetailsReader);
+                    getSyncStrategyIds(jwt.getSubject(), syncStrategy, requestDetailsReader);
         } else {
             syncStrategyIds =
                     CacheHelper.INSTANCE.cache.get(
-                            jwt.getSubject(),
-                            userId ->
+                            generateSyncStrategyIdsCacheKey(
+                                    jwt.getSubject(),
+                                    syncStrategy,
+                                    requestDetailsReader.getParameters()),
+                            key ->
                                     getSyncStrategyIds(
-                                            userId,
-                                            applicationId,
-                                            fhirContext,
-                                            requestDetailsReader));
+                                            jwt.getSubject(), syncStrategy, requestDetailsReader));
         }
 
         this.syncAccessDecision =
@@ -129,6 +131,38 @@ private void initSyncAccessDecision(RequestDetailsReader requestDetailsReader) {
                         userRoles);
     }
 
+    @VisibleForTesting
+    protected static String generateSyncStrategyIdsCacheKey(
+            String userId, String syncStrategy, Map<String, String[]> parameters) {
+
+        String key = null;
+        switch (syncStrategy) {
+            case Constants.SyncStrategy.RELATED_ENTITY_LOCATION:
+                try {
+
+                    String[] syncLocations =
+                            parameters.getOrDefault(
+                                    Constants.SYNC_LOCATIONS_SEARCH_PARAM, new String[] {});
+
+                    if (syncLocations.length == 0) {
+                        key = userId;
+                    } else {
+                        key = Utils.generateHash(Utils.getSortedInput(syncLocations[0], ","));
+                    }
+
+                } catch (NoSuchAlgorithmException exception) {
+                    logger.error(exception.getMessage());
+                }
+
+                break;
+
+            default:
+                key = userId;
+        }
+
+        return key;
+    }
+
     private boolean checkUserHasRole(String resourceName, String requestType) {
         return StringUtils.isNotBlank(resourceName)
                 && (checkIfRoleExists(getAdminRoleName(resourceName), this.userRoles)
@@ -216,8 +250,7 @@ private Composition readCompositionResource(String applicationId, FhirContext fh
         return compositionEntry != null ? (Composition) compositionEntry.getResource() : null;
     }
 
-    Pair<Composition, PractitionerDetails> fetchCompositionAndPractitionerDetails(
-            String subject, String applicationId, FhirContext fhirContext) {
+    PractitionerDetails fetchPractitionerDetails(String subject) {
         fhirContext.registerCustomType(PractitionerDetails.class);
 
         IGenericClient client = Utils.createFhirClientForR4(fhirContext);
@@ -227,53 +260,43 @@ Pair<Composition, PractitionerDetails> fetchCompositionAndPractitionerDetails(
         PractitionerDetails practitionerDetails =
                 practitionerDetailsEndpointHelper.getPractitionerDetailsByKeycloakId(subject);
 
-        Composition composition = readCompositionResource(applicationId, fhirContext);
-
-        if (composition == null)
-            throw new IllegalStateException(
-                    "No Composition resource found for application id '" + applicationId + "'");
-
         if (practitionerDetails == null)
             throw new IllegalStateException(
                     "No PractitionerDetail resource found for user with id '" + subject + "'");
 
-        return Pair.of(composition, practitionerDetails);
+        return practitionerDetails;
     }
 
-    Pair<String, PractitionerDetails> fetchSyncStrategyDetails(
-            String subject, String applicationId, FhirContext fhirContext) {
+    private Composition fetchComposition() {
+        Composition composition = readCompositionResource(applicationId, fhirContext);
+        if (composition == null)
+            throw new IllegalStateException(
+                    "No Composition resource found for application id '" + applicationId + "'");
 
-        Pair<Composition, PractitionerDetails> compositionPractitionerDetailsPair =
-                fetchCompositionAndPractitionerDetails(subject, applicationId, fhirContext);
-        Composition composition = compositionPractitionerDetailsPair.getLeft();
-        PractitionerDetails practitionerDetails = compositionPractitionerDetailsPair.getRight();
+        return composition;
+    }
 
+    private String readSyncStrategyFromComposition(Composition composition) {
         String binaryResourceReference = Utils.getBinaryResourceReference(composition);
         Binary binary =
                 Utils.readApplicationConfigBinaryResource(binaryResourceReference, fhirContext);
-
-        return Pair.of(Utils.findSyncStrategy(binary), practitionerDetails);
+        return Utils.findSyncStrategy(binary);
     }
 
     private Map<String, List<String>> getSyncStrategyIds(
-            String subjectId,
-            String applicationId,
-            FhirContext fhirContext,
-            RequestDetailsReader requestDetailsReader) {
-        Pair<String, PractitionerDetails> syncStrategyDetails =
-                fetchSyncStrategyDetails(subjectId, applicationId, fhirContext);
+            String subjectId, String syncStrategy, RequestDetailsReader requestDetailsReader) {
 
-        String syncStrategy = syncStrategyDetails.getLeft();
-        PractitionerDetails practitionerDetails = syncStrategyDetails.getRight();
+        PractitionerDetails practitionerDetails = fetchPractitionerDetails(subjectId);
 
         return collateSyncStrategyIds(syncStrategy, practitionerDetails, requestDetailsReader);
     }
 
     private List<String> getLocationUuids(String[] syncLocations) {
         List<String> locationUuids = new ArrayList<>();
         String syncLocationParam;
-        for (int i = 0; i < syncLocations.length; i++) {
-            syncLocationParam = syncLocations[i];
+
+        for (String syncLocation : syncLocations) {
+            syncLocationParam = syncLocation;
             if (!syncLocationParam.isEmpty())
                 locationUuids.addAll(
                         Set.of(syncLocationParam.split(Constants.PARAM_VALUES_SEPARATOR)));

plugins/src/main/java/org/smartregister/fhir/gateway/plugins/PractitionerDetailsEndpointHelper.java

@@ -162,6 +162,8 @@ protected Bundle getAttributedPractitionerDetailsByPractitioner(Practitioner pra
 
     @Nonnull
     public static Set<String> getAttributedLocations(List<LocationHierarchy> locationHierarchies) {
+        locationHierarchies =
+                locationHierarchies != null ? locationHierarchies : Collections.emptyList();
         List<ParentChildrenMap> parentChildrenList =
                 locationHierarchies.stream()
                         .flatMap(