CIRC-2051 add ecsRequestRouting to allowed-service-points

folio-org · Apr 11, 2024 · 5b4f4bc · 5b4f4bc
1 parent e11290c
commit 5b4f4bc
Show file tree

Hide file tree

Showing 11 changed files with 184 additions and 68 deletions.
diff --git a/descriptors/ModuleDescriptor-template.json b/descriptors/ModuleDescriptor-template.json
@@ -649,7 +649,7 @@
     },
     {
       "id": "allowed-service-points",
-      "version": "1.1",
+      "version": "1.2",
       "handlers": [
         {
           "methods": [

diff --git a/ramls/circulation.raml b/ramls/circulation.raml
@@ -347,6 +347,10 @@ resourceTypes:
               description: "When true, allows to apply circulation rules based on patron group only"
               type: boolean
               required: false
+            ecsRequestRouting:
+              description: "When true, returns only service points with ecsRequestRouting"
+              type: boolean
+              required: false
         responses:
           200:
             description: "List of allowed service points was retrieved successfully"

diff --git a/src/main/java/org/folio/circulation/domain/AllowedServicePointsRequest.java b/src/main/java/org/folio/circulation/domain/AllowedServicePointsRequest.java
@@ -21,6 +21,7 @@ public class AllowedServicePointsRequest {
   private String itemId;
   private String requestId;
   private boolean useStubItem;
+  private boolean ecsRequestRouting;
 
   public boolean isForTitleLevelRequest() {
     return instanceId != null;

diff --git a/src/main/java/org/folio/circulation/infrastructure/storage/ServicePointRepository.java b/src/main/java/org/folio/circulation/infrastructure/storage/ServicePointRepository.java
@@ -206,22 +206,24 @@ public CompletableFuture<Result<Collection<ServicePoint>>> findServicePointsById
       .thenApply(r -> r.map(MultipleRecords::getRecords));
   }
 
-  public CompletableFuture<Result<Collection<ServicePoint>>> fetchPickupLocationServicePoints() {
+  public CompletableFuture<Result<Collection<ServicePoint>>> fetchServicePointsByIndexName(
+    String indexName) {
+
     return createServicePointsFetcher().find(MultipleCqlIndexValuesCriteria.builder()
-        .indexName("pickupLocation")
+        .indexName(indexName)
         .indexOperator(CqlQuery::matchAny)
         .value("true")
         .build())
       .thenApply(r -> r.map(MultipleRecords::getRecords));
   }
 
-  public CompletableFuture<Result<Collection<ServicePoint>>> fetchPickupLocationServicePointsByIds(
-    Set<String> ids) {
+  public CompletableFuture<Result<Collection<ServicePoint>>>
+  fetchPickupLocationServicePointsByIdsAndIndexName(Set<String> ids, String indexName) {
 
-    log.debug("filterIdsByServicePointsAndPickupLocationExistence:: parameters ids: {}",
-      () -> collectionAsString(ids));
+    log.debug("filterIdsByServicePointsAndPickupLocationExistence:: parameters ids: {}, " +
+        "indexName: {}", () -> collectionAsString(ids), () -> indexName);
 
-    Result<CqlQuery> pickupLocationQuery = exactMatch("pickupLocation", "true");
+    Result<CqlQuery> pickupLocationQuery = exactMatch(indexName, "true");
 
     return createServicePointsFetcher().findByIdIndexAndQuery(ids, "id", pickupLocationQuery)
       .thenApply(r -> r.map(MultipleRecords::getRecords));

diff --git a/src/main/java/org/folio/circulation/resources/AllowedServicePointsResource.java b/src/main/java/org/folio/circulation/resources/AllowedServicePointsResource.java
@@ -72,6 +72,7 @@ private static Result<AllowedServicePointsRequest> buildRequest(RoutingContext r
     String itemId = queryParams.get("itemId");
     String requestId = queryParams.get("requestId");
     String useStubItem = queryParams.get("useStubItem");
+    String ecsRequestRouting = queryParams.get("ecsRequestRouting");
 
     List<String> errors = new ArrayList<>();
 
@@ -99,6 +100,13 @@ private static Result<AllowedServicePointsRequest> buildRequest(RoutingContext r
         useStubItem);
       errors.add(String.format("useStubItem is not a valid boolean: %s.", useStubItem));
     }
+    if (ecsRequestRouting != null && !"true".equals(ecsRequestRouting)
+      && !"false".equals(ecsRequestRouting)) {
+
+      log.warn("validateAllowedServicePointsRequest:: ecsRequestRouting is not a valid boolean: {}",
+        ecsRequestRouting);
+      errors.add(String.format("ecsRequestRouting is not a valid boolean: %s.", ecsRequestRouting));
+    }
     // Checking parameter combinations
     boolean allowedCombinationOfParametersDetected = false;
 
@@ -137,7 +145,7 @@ private static Result<AllowedServicePointsRequest> buildRequest(RoutingContext r
     }
 
     return succeeded(new AllowedServicePointsRequest(operation, requesterId, instanceId, itemId,
-      requestId, Boolean.parseBoolean(useStubItem)));
+      requestId, Boolean.parseBoolean(useStubItem), Boolean.parseBoolean(ecsRequestRouting)));
   }
 
   private static JsonObject toJson(Map<RequestType, Set<AllowedServicePoint>> allowedServicePoints) {

diff --git a/src/main/java/org/folio/circulation/services/AllowedServicePointsService.java b/src/main/java/org/folio/circulation/services/AllowedServicePointsService.java
@@ -145,20 +145,25 @@ private CompletableFuture<Result<User>> fetchUser(AllowedServicePointsRequest re
   private CompletableFuture<Result<Map<RequestType, Set<AllowedServicePoint>>>>
   getAllowedServicePoints(AllowedServicePointsRequest request, User user, Collection<Item> items) {
 
+    String indexName = request.isEcsRequestRouting()
+      ? "ecsRequestRouting"
+      : "pickupLocation";
     if (items.isEmpty() && request.isForTitleLevelRequest()) {
       log.info("getAllowedServicePoints:: requested instance has no items");
-      return getAllowedServicePointsForTitleWithNoItems(request);
+      return getAllowedServicePointsForTitleWithNoItems(request, indexName);
     }
 
     BiFunction<RequestPolicy, Set<Item>, CompletableFuture<Result<Map<RequestType,
       Set<AllowedServicePoint>>>>> mappingFunction = request.isImplyingItemStatusIgnore()
-      ? this::extractAllowedServicePointsIgnoringItemStatus
-      : this::extractAllowedServicePointsConsideringItemStatus;
+      ? (requestPolicy, itemsSet) -> extractAllowedServicePointsIgnoringItemStatus(
+        requestPolicy, itemsSet, indexName)
+      : (requestPolicy, itemsSet) -> extractAllowedServicePointsConsideringItemStatus(
+        requestPolicy, itemsSet, indexName);
 
     if (request.isUseStubItem()) {
       return requestPolicyRepository.lookupRequestPolicy(user)
         .thenCompose(r -> r.after(policy -> extractAllowedServicePointsIgnoringItemStatus(
-          policy, new HashSet<>())));
+          policy, new HashSet<>(), indexName)));
     }
 
     return requestPolicyRepository.lookupRequestPolicies(items, user)
@@ -168,20 +173,20 @@ private CompletableFuture<Result<User>> fetchUser(AllowedServicePointsRequest re
   }
 
   private CompletableFuture<Result<Map<RequestType, Set<AllowedServicePoint>>>>
-  getAllowedServicePointsForTitleWithNoItems(AllowedServicePointsRequest request) {
+  getAllowedServicePointsForTitleWithNoItems(AllowedServicePointsRequest request, String indexName) {
 
     if (request.isForTitleLevelRequest() && request.getOperation() == CREATE) {
       log.info("getAllowedServicePointsForTitleWithNoItems:: checking TLR settings");
       return configurationRepository.lookupTlrSettings()
-        .thenCompose(r -> r.after(this::considerTlrSettings));
+        .thenCompose(r -> r.after(tlrSettings -> considerTlrSettings(tlrSettings, indexName)));
     }
 
     log.info("getAllowedServicePointsForTitleWithNoItems:: no need to check TLR-settings");
     return ofAsync(emptyMap());
   }
 
   private CompletableFuture<Result<Map<RequestType, Set<AllowedServicePoint>>>> considerTlrSettings(
-    TlrSettingsConfiguration tlrSettings) {
+    TlrSettingsConfiguration tlrSettings, String indexName) {
 
     if (!tlrSettings.isTitleLevelRequestsFeatureEnabled() ||
       tlrSettings.isTlrHoldShouldFollowCirculationRules()) {
@@ -192,7 +197,7 @@ private CompletableFuture<Result<Map<RequestType, Set<AllowedServicePoint>>>> co
 
     log.info("considerTlrSettings:: allowing all pickup locations for Hold");
 
-    return fetchAllowedServicePoints()
+    return fetchAllowedServicePoints(indexName)
       .thenApply(r -> r.map(sp -> sp.isEmpty() ? emptyMap() : Map.of(HOLD, sp)));
   }
 
@@ -231,20 +236,22 @@ private Result<Item> refuseIfItemIsNotFound(Item item, AllowedServicePointsReque
   }
 
   private CompletableFuture<Result<Map<RequestType, Set<AllowedServicePoint>>>>
-  extractAllowedServicePointsIgnoringItemStatus(RequestPolicy requestPolicy, Set<Item> items) {
+  extractAllowedServicePointsIgnoringItemStatus(RequestPolicy requestPolicy, Set<Item> items,
+    String indexName) {
 
-    return extractAllowedServicePoints(requestPolicy, items, true);
+    return extractAllowedServicePoints(requestPolicy, items, true, indexName);
   }
 
   private CompletableFuture<Result<Map<RequestType, Set<AllowedServicePoint>>>>
-  extractAllowedServicePointsConsideringItemStatus(RequestPolicy requestPolicy, Set<Item> items) {
+  extractAllowedServicePointsConsideringItemStatus(RequestPolicy requestPolicy, Set<Item> items,
+    String indexName) {
 
-    return extractAllowedServicePoints(requestPolicy, items, false);
+    return extractAllowedServicePoints(requestPolicy, items, false, indexName);
   }
 
   private CompletableFuture<Result<Map<RequestType, Set<AllowedServicePoint>>>>
   extractAllowedServicePoints(RequestPolicy requestPolicy, Set<Item> items,
-    boolean ignoreItemStatus) {
+    boolean ignoreItemStatus, String indexName) {
 
     log.debug("extractAllowedServicePoints:: parameters requestPolicy: {}, items: {}, " +
         "ignoreItemStatus: {}", requestPolicy, items, ignoreItemStatus);
@@ -280,22 +287,22 @@ private Result<Item> refuseIfItemIsNotFound(Item item, AllowedServicePointsReque
       .collect(Collectors.toCollection(ArrayList::new)); // collect into a mutable list
 
     // TODO: fetch service points on a later stage, we only need IDs here
-    return fetchServicePoints(requestTypesAllowedByPolicy, servicePointAllowedByPolicy)
+    return fetchServicePoints(requestTypesAllowedByPolicy, servicePointAllowedByPolicy, indexName)
       .thenApply(r -> r.map(servicePoints -> groupAllowedServicePointsByRequestType(
         requestTypesAllowedByPolicyAndStatus, servicePoints, servicePointAllowedByPolicy)));
   }
 
   private CompletableFuture<Result<Set<AllowedServicePoint>>> fetchServicePoints(
     List<RequestType> requestTypesAllowedByPolicy,
-    Map<RequestType, Set<String>> servicePointsAllowedByPolicy) {
+    Map<RequestType, Set<String>> servicePointsAllowedByPolicy, String indexName) {
 
     Set<String> allowedServicePointsIds = servicePointsAllowedByPolicy.values().stream()
       .flatMap(Collection::stream)
       .collect(Collectors.toSet());
 
     return requestTypesAllowedByPolicy.size() == servicePointsAllowedByPolicy.size()
-      ? fetchPickupLocationServicePointsByIds(allowedServicePointsIds)
-      : fetchAllowedServicePoints();
+      ? fetchPickupLocationServicePointsByIds(allowedServicePointsIds, indexName)
+      : fetchAllowedServicePoints(indexName);
   }
 
   private Map<RequestType, Set<AllowedServicePoint>> groupAllowedServicePointsByRequestType(
@@ -359,20 +366,22 @@ private Map<RequestType, Set<AllowedServicePoint>> combineAllowedServicePoints(
       }, () -> new EnumMap<>(RequestType.class)));
   }
 
-  private CompletableFuture<Result<Set<AllowedServicePoint>>> fetchAllowedServicePoints() {
-    return servicePointRepository.fetchPickupLocationServicePoints()
+  private CompletableFuture<Result<Set<AllowedServicePoint>>> fetchAllowedServicePoints(
+    String indexName) {
+
+    return servicePointRepository.fetchServicePointsByIndexName(indexName)
       .thenApply(r -> r.map(servicePoints -> servicePoints.stream()
         .map(AllowedServicePoint::new)
         .collect(Collectors.toSet())));
   }
 
   private CompletableFuture<Result<Set<AllowedServicePoint>>> fetchPickupLocationServicePointsByIds(
-    Set<String> ids) {
+    Set<String> ids, String indexName) {
 
     log.debug("filterIdsByServicePointsAndPickupLocationExistence:: parameters ids: {}",
       () -> collectionAsString(ids));
 
-    return servicePointRepository.fetchPickupLocationServicePointsByIds(ids)
+    return servicePointRepository.fetchPickupLocationServicePointsByIdsAndIndexName(ids, indexName)
       .thenApply(servicePointsResult -> servicePointsResult
         .map(servicePoints -> servicePoints.stream()
           .map(AllowedServicePoint::new)