CIRC-2050 update allowed service point mapping

folio-org · Apr 1, 2024 · c24f6ae · c24f6ae
1 parent 1832e8e
commit c24f6ae
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 4 deletions.
diff --git a/src/main/java/org/folio/circulation/services/AllowedServicePointsService.java b/src/main/java/org/folio/circulation/services/AllowedServicePointsService.java
@@ -157,7 +157,8 @@ private CompletableFuture<Result<User>> fetchUser(AllowedServicePointsRequest re
 
     if ("true".equals(request.getUseStubItem())) {
       return requestPolicyRepository.lookupRequestPolicy(user)
-        .thenCompose(r -> r.after(policy -> mappingFunction.apply(policy, new HashSet<>(items))));
+        .thenCompose(r -> r.after(policy -> extractAllowedServicePointsIgnoringItemStatus(
+          policy, new HashSet<>())));
     }
 
     return requestPolicyRepository.lookupRequestPolicies(items, user)

diff --git a/src/test/java/api/requests/AllowedServicePointsAPITests.java b/src/test/java/api/requests/AllowedServicePointsAPITests.java
@@ -767,14 +767,17 @@ void shouldUseStubItemParameterInCirculationRuleMatchingWhenPresent() {
       "+ g " + patronGroup, "g " + patronGroup));
 
     var response = getCreateOp(requesterId, instanceId, null, "true", HttpStatus.SC_OK).getJson();
-    assertThat(response, hasNoJsonPath(HOLD.getValue()));
-    assertThat(response, hasNoJsonPath(RECALL.getValue()));
     assertThat(response, hasNoJsonPath(PAGE.getValue()));
 
+    JsonArray allowedPageServicePoints = response.getJsonArray(HOLD.getValue());
+    assertServicePointsMatch(allowedPageServicePoints, List.of(cd1, cd2, cd4, cd5));
+    allowedPageServicePoints = response.getJsonArray(RECALL.getValue());
+    assertServicePointsMatch(allowedPageServicePoints, List.of(cd1, cd2, cd4, cd5));
+
     response = getCreateOp(requesterId, instanceId, null, "false", HttpStatus.SC_OK).getJson();
     assertThat(response, hasNoJsonPath(HOLD.getValue()));
     assertThat(response, hasNoJsonPath(RECALL.getValue()));
-    JsonArray allowedPageServicePoints = response.getJsonArray(PAGE.getValue());
+    allowedPageServicePoints = response.getJsonArray(PAGE.getValue());
     assertServicePointsMatch(allowedPageServicePoints, List.of(cd1, cd2, cd4, cd5));
 
     response = getCreateOp(requesterId, instanceId, null, HttpStatus.SC_OK).getJson();