diff --git a/descriptors/ModuleDescriptor-template.json b/descriptors/ModuleDescriptor-template.json index 8b2a864649..18287c6ef5 100644 --- a/descriptors/ModuleDescriptor-template.json +++ b/descriptors/ModuleDescriptor-template.json @@ -1279,7 +1279,7 @@ }, { "id": "request-storage", - "version": "6.2" + "version": "6.3" }, { "id": "request-storage-batch", diff --git a/src/main/java/org/folio/circulation/domain/RequestRepresentation.java b/src/main/java/org/folio/circulation/domain/RequestRepresentation.java index 06767191b3..76795d869e 100644 --- a/src/main/java/org/folio/circulation/domain/RequestRepresentation.java +++ b/src/main/java/org/folio/circulation/domain/RequestRepresentation.java @@ -102,6 +102,8 @@ private static void addItemProperties(JsonObject request, Item item) { write(itemSummary, "volume", item.getVolume()); write(itemSummary, "chronology", item.getChronology()); write(itemSummary, "displaySummary", item.getDisplaySummary()); + write(itemSummary, "loanTypeId", item.getLoanTypeId()); + write(itemSummary, "loanTypeName", item.getLoanTypeName()); ItemStatus status = item.getStatus(); if (status != null) { diff --git a/src/main/java/org/folio/circulation/domain/StoredRequestRepresentation.java b/src/main/java/org/folio/circulation/domain/StoredRequestRepresentation.java index f1c788fcce..aaa4bfb37e 100644 --- a/src/main/java/org/folio/circulation/domain/StoredRequestRepresentation.java +++ b/src/main/java/org/folio/circulation/domain/StoredRequestRepresentation.java @@ -56,6 +56,9 @@ private static void addStoredItemProperties(JsonObject request, Item item) { item.getLocation().getPrimaryServicePoint().getName()); } } + write(itemSummary, "loanTypeId", item.getLoanTypeId()); + write(itemSummary, "loanTypeName", item.getLoanTypeName()); + request.put("item", itemSummary); } diff --git a/src/test/java/api/queue/RequestQueueResourceTest.java b/src/test/java/api/queue/RequestQueueResourceTest.java index 8e3848da45..88c90efc05 100644 --- a/src/test/java/api/queue/RequestQueueResourceTest.java +++ b/src/test/java/api/queue/RequestQueueResourceTest.java @@ -43,7 +43,6 @@ import api.support.builders.ReorderQueueBuilder; import api.support.builders.RequestBuilder; import api.support.fakes.FakePubSub; -import api.support.http.CheckOutResource; import api.support.http.IndividualResource; import api.support.http.ItemResource; import io.vertx.core.json.JsonArray; @@ -280,7 +279,7 @@ void shouldGetRequestQueueForItemSuccessfully() { assertThat(request.containsKey("item"), is(true)); JsonObject item = request.getJsonObject("item"); assertThat(item.fieldNames(), contains("barcode", "location", - "enumeration", "volume", "chronology", "status", "callNumber", + "enumeration", "volume", "chronology", "loanTypeId", "loanTypeName", "status", "callNumber", "callNumberComponents", "copyNumber", "itemEffectiveLocationId", "itemEffectiveLocationName", "retrievalServicePointId", "retrievalServicePointName"));