Merge pull request #63 from folio-org/EDGRTAC-81

Add holdingsCopyNumber and ItemsCopyNumber to rtac response
folio-org · Mar 6, 2024 · bfba49e · bfba49e
2 parents 4fa1459 + 8b4e207
commit bfba49e
Show file tree

Hide file tree

Showing 6 changed files with 31 additions and 2 deletions.
diff --git a/ramls/batch-holdings.xsd b/ramls/batch-holdings.xsd
@@ -30,7 +30,8 @@
         <xs:element name="tempLocation" type="xs:string" minOccurs="0"/>
         <xs:element name="volume" type="xs:string" minOccurs="0"/>
         <xs:element name="temporaryLoanType" type="xs:string" minOccurs="0"/>
-        <xs:element name="permanentLoanType" type="xs:string" minOccurs="0"/>
+        <xs:element name="holdingsCopyNumber" type="xs:string" minOccurs="0"/>
+        <xs:element name="itemCopyNumber" type="xs:string" minOccurs="0"/>
       </xs:sequence>
     </xs:complexType>
   </xs:element>

diff --git a/ramls/holdings.xsd b/ramls/holdings.xsd
@@ -20,6 +20,8 @@
       <xs:element name="dueDate" type="xs:string"/>
       <xs:element name="tempLocation" type="xs:string" minOccurs="0"/>
       <xs:element name="volume" type="xs:string" minOccurs="0"/>
+      <xs:element name="holdingsCopyNumber" type="xs:string" minOccurs="0"/>
+      <xs:element name="itemCopyNumber" type="xs:string" minOccurs="0"/>
     </xs:sequence>
   </xs:complexType>
 </xs:element>

diff --git a/src/main/java/org/folio/edge/rtac/model/Holding.java b/src/main/java/org/folio/edge/rtac/model/Holding.java
@@ -34,6 +34,10 @@ public final class Holding {
   private final String temporaryLoanType;
   @JsonProperty("permanentLoanType")
   private final String permanentLoanType;
+  @JsonProperty("holdingsCopyNumber")
+  public final String holdingsCopyNumber;
+  @JsonProperty("itemCopyNumber")
+  public final String itemCopyNumber;
 
   @Override
   public boolean equals(Object o) {

diff --git a/src/test/java/org/folio/edge/rtac/MainVerticleTest.java b/src/test/java/org/folio/edge/rtac/MainVerticleTest.java
@@ -201,6 +201,8 @@ public void testRtacTitleFound(TestContext context) throws Exception {
     assertEquals("PS3552.E796 D44x 1975", holdingRecord.getString("callNumber"));
     assertEquals("Item in place", holdingRecord.getString("status"));
     assertEquals("v.5:no.2-6", holdingRecord.getString("volume"));
+    assertEquals("101", holdingRecord.getString("holdingsCopyNumber"));
+    assertEquals("201", holdingRecord.getString("itemCopyNumber"));
   }
 
   // Unsuccessful searches result in a 200 OK status with an empty element in the
@@ -262,6 +264,10 @@ public void testRtacBatching(TestContext context) throws Exception {
     assertEquals("Item in place", secondHoldings.getString("status"));
     assertEquals("v.5:no.2-6", firstHoldings.getString("volume"));
     assertEquals("v.5:no.2-6", secondHoldings.getString("volume"));
+    assertEquals("101", firstHoldings.getString("holdingsCopyNumber"));
+    assertEquals("101", secondHoldings.getString("holdingsCopyNumber"));
+    assertEquals("201", firstHoldings.getString("itemCopyNumber"));
+    assertEquals("201", secondHoldings.getString("itemCopyNumber"));
   }
 
   @Test
@@ -463,6 +469,8 @@ public void shouldRespondWithXMLWhenClientDoesNotStateAPreference() throws IOExc
     assertEquals("PS3552.E796 D44x 1975", holding.callNumber);
     assertEquals("Item in place", holding.status);
     assertEquals("v.5:no.2-6", holding.volume);
+    assertEquals("101", holding.holdingsCopyNumber);
+    assertEquals("201", holding.itemCopyNumber);
   }
 
   @Test

diff --git a/src/test/java/org/folio/edge/rtac/model/InstancesTest.java b/src/test/java/org/folio/edge/rtac/model/InstancesTest.java
@@ -41,21 +41,33 @@ public void setUp() throws Exception {
       .status("Item in place")
       .dueDate("")
       .volume("v.10:no.2")
+      .itemCopyNumber("101")
       .build();
 
     Holding h2 = Holding.builder()
       .id("99712686103569")
       .callNumber("PS3552.E796 D44x 1975")
       .location("LC General Collection Millersville University Library")
       .status("Item in place")
+      .holdingsCopyNumber("201")
       .dueDate("2018-04-23 12:00:00")
       .build();
 
+    Holding h3 = Holding.builder()
+        .id("99712686103569")
+        .callNumber("PS3552.E796 D44x 1975")
+        .location("LC General Collection Millersville University Library")
+        .status("Item in place")
+        .itemCopyNumber("102")
+        .holdingsCopyNumber("202")
+        .dueDate("2018-04-23 12:00:00")
+        .build();
+
     instances = new Instances();
 
     final var holdings = new Holdings();
     holdings.setInstanceId(INSTANCE_ID);
-    holdings.setHoldings(List.of(h1, h2));
+    holdings.setHoldings(List.of(h1, h2, h3));
     instances.setHoldings(List.of(holdings));
 
     SchemaFactory schemaFactory = SchemaFactory

diff --git a/src/test/java/org/folio/edge/rtac/utils/RtacMockOkapi.java b/src/test/java/org/folio/edge/rtac/utils/RtacMockOkapi.java
@@ -103,6 +103,8 @@ public static Holdings getHoldings(String titleId) {
       .tempLocation("")
       .dueDate("")
       .volume("v.5:no.2-6")
+      .holdingsCopyNumber("101")
+      .itemCopyNumber("201")
       .build();
 
     final var holdings = new Holdings();