Make item request non-null CIRC-1416

folio-org · Jul 28, 2022 · 579bef4 · 579bef4
1 parent ec7a307
commit 579bef4
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 5 deletions.
diff --git a/src/main/java/org/folio/circulation/domain/Request.java b/src/main/java/org/folio/circulation/domain/Request.java
@@ -67,6 +67,7 @@ public class Request implements ItemRelatedRecord, UserRelatedRecord {
   @With
   private final Collection<Item> instanceItems;
 
+  @NonNull
   private final Item item;
 
   @With
@@ -92,15 +93,15 @@ public class Request implements ItemRelatedRecord, UserRelatedRecord {
   public static Request from(JsonObject representation) {
     // TODO: make sure that operation and TLR settings don't matter for all processes calling
     //  this constructor
-    return new Request(null, null, representation, null, null, new ArrayList<>(), null, null, null,
+    return new Request(null, null, representation, null, null, new ArrayList<>(), Item.unknown(), null, null,
       null, null, null, false, null, false);
   }
 
   public static Request from(TlrSettingsConfiguration tlrSettingsConfiguration, Operation operation,
     JsonObject representation) {
 
     return new Request(tlrSettingsConfiguration, operation, representation, null, null,
-      new ArrayList<>(), null, null, null, null, null, null, false, null, false);
+      new ArrayList<>(), Item.unknown(), null, null, null, null, null, false, null, false);
   }
 
   public JsonObject asJson() {

diff --git a/src/main/java/org/folio/circulation/domain/RequestAndRelatedRecords.java b/src/main/java/org/folio/circulation/domain/RequestAndRelatedRecords.java
@@ -44,9 +44,8 @@ public boolean isTlrFeatureEnabled() {
   }
 
   public RequestAndRelatedRecords withRequest(Request newRequest) {
-    Item item = this.request.getItem();
     return new RequestAndRelatedRecords(
-      newRequest.withItem(item == null ? newRequest.getItem() : item),
+      newRequest,
       this.requestQueue,
       null,
       this.moveRequestRecord,

diff --git a/src/test/java/org/folio/circulation/domain/RequestQueueTests.java b/src/test/java/org/folio/circulation/domain/RequestQueueTests.java
@@ -83,7 +83,8 @@ private static Request buildRequest(int position, RequestStatus status, String r
       .put("status", status.getValue())
       .put("position", position);
 
-    return new Request(null, null, json, null, null, null, null, null, null, null, null, null, false, null, false);
+    return new Request(null, null, json, null, null, null, Item.unknown(),
+      null, null, null, null, null, false, null, false);
   }
 
   private static String randomId() {