Skip to content

CIRC-2644: Fix matching ECS TLR request to item being checked out in non data tenant #1686

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
mukhiddin-yusuf wants to merge 3 commits into
base: master
Choose a base branch
from
+51 −11
Open

CIRC-2644: Fix matching ECS TLR request to item being checked out in non data tenant #1686

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
6628783
CIRC-2644: fix matching ECS Page TLR request to item being checked ou…
mukhiddin-yusuf Jul 27, 2026
50d9d48
CIRC-2644: refactor test
mukhiddin-yusuf Jul 28, 2026
63c16ae
CIRC-2644: refactor test
mukhiddin-yusuf Jul 28, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions NEWS.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
* Refactor item location handling to use locationRepository directly for effective location retrieval ([CIRC-2538](https://folio-org.atlassian.net/browse/CIRC-2538))
* Fail on startup if Kafka config is invalid ([CIRC-2003](https://folio-org.atlassian.net/browse/CIRC-2003))
* Fix loan status in `AnonymizeLoansTests` fixture for closed loans with open fees ([CIRC-2641](https://folio-org.atlassian.net/browse/CIRC-2641))
* Fix Item check-out for related ECS TLR Page request when ILR exist for different requester ([CIRC-2644](https://folio-org.atlassian.net/browse/CIRC-2644))

## 24.5.0 2026-04-14
* Allow HTTP Connection Pool to be Configurable ([CIRC-2279](https://folio-org.atlassian.net/browse/CIRC-2279))
Expand Down
6 changes: 3 additions & 3 deletions src/main/java/org/folio/circulation/services/CheckOutRequestQueueService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
import java.lang.invoke.MethodHandles;
import java.util.concurrent.CompletableFuture;

import org.apache.commons.lang3.StringUtils;
import org.apache.commons.lang3.Strings;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import org.folio.circulation.domain.Item;
Expand Down Expand Up @@ -38,14 +38,14 @@ protected CompletableFuture<Result<Boolean>> isTitleLevelRequestFulfillableByIte
log.info("isTitleLevelRequestFulfillableByItem:: parameters itemId: {}, requestId: {}",
item::getItemId, request::getId);

if (!StringUtils.equals(request.getInstanceId(), item.getInstanceId())) {
if (!Strings.CS.equals(request.getInstanceId(), item.getInstanceId()) && !item.isDcbItem()) {
log.info("isTitleLevelRequestFulfillableByItem:: instanceId mismatch, not fulfillable");
return ofAsync(false);
}

if (request.isRecall()) {
log.info("isTitleLevelRequestFulfillableByItem:: recall request, checking itemId match");
return ofAsync(StringUtils.equals(request.getItemId(), item.getItemId()));
return ofAsync(Strings.CS.equals(request.getItemId(), item.getItemId()));
}

return canRequestBeFulfilledByItem(item, request);
Expand Down
45 changes: 45 additions & 0 deletions src/test/java/api/loans/CheckOutByBarcodeTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2815,6 +2815,51 @@ void circulationItemCheckOutUpdatesPrimaryEcsRequestStatus() {
assertThat(requestsFixture.getById(requestId).getJson(), isClosedFilled());
}

@Test
void shouldCheckoutItemToRequesterOneWithTitleLevelPageAndDcbItemWhenItemLevelHoldExistForRequesterTwo() {
Comment thread
mukhiddin-yusuf marked this conversation as resolved.
Outdated
circulationSettingsFixture.enableTlrFeature();

IndividualResource realInstance = instancesFixture.basedUponDunkirk();
Comment thread
mukhiddin-yusuf marked this conversation as resolved.

UUID dcbInstanceId = UUID.randomUUID();
IndividualResource dcbHoldings = holdingsFixture.defaultWithHoldings(dcbInstanceId);
String barcode = "00001";
IndividualResource dcbItem = circulationItemsFixture.createCirculationItem(
UUID.randomUUID(), barcode, dcbHoldings.getId(),
locationsFixture.mainFloor().getId(), "DCB instance");

IndividualResource firstRequest = requestsFixture.placeTitleLevelHoldShelfRequest(
realInstance.getId(), usersFixture.steve(), ZonedDateTime.now());
UUID requestId = firstRequest.getId();

requestsStorageClient.replace(requestId,
requestsStorageClient.get(requestId).getJson()
.put("itemId", dcbItem.getId().toString())
.put("holdingsRecordId", dcbHoldings.getId().toString())
.put("item", new JsonObject().put("barcode", barcode)));

UUID randomServicePointId = servicePointsFixture.cd2().getId();
checkInFixture.checkInByBarcode(dcbItem, randomServicePointId);
assertThat(requestsFixture.getById(requestId).getJson(), isOpenInTransit());

checkInFixture.checkInByBarcode(dcbItem, servicePointsFixture.cd1().getId());
assertThat(requestsFixture.getById(requestId).getJson(), isOpenAwaitingPickup());

requestsFixture.place(new RequestBuilder()
.hold()
.fulfillToHoldShelf()
.withItemId(dcbItem.getId())
.withInstanceId(realInstance.getId())
.withRequestDate(ZonedDateTime.now())
.withRequesterId(usersFixture.jessica().getId())
.withPickupServicePointId(servicePointsFixture.cd1().getId()));

UserResource borrower = usersFixture.steve();
checkOutFixture.checkOutByBarcode(dcbItem, borrower);

assertThat(requestsFixture.getById(requestId).getJson(), isClosedFilled());
Comment thread
mukhiddin-yusuf marked this conversation as resolved.
Outdated
}

private IndividualResource placeRequest(String requestLevel, ItemResource item,
IndividualResource requester) {

Expand Down
Loading