CSPACE-2663, CSPACE-2664. Added new fields to the summary list payloads for Loansin...

diff --git a/services/loanin/jaxb/src/main/java/org/collectionspace/services/LoaninListItemJAXBSchema.java b/services/loanin/jaxb/src/main/java/org/collectionspace/services/LoaninListItemJAXBSchema.java
index 34285605c2141e1f46fc90634430cfd0d3bd7668..7fa960175e0244f27e24356d3aca2821d003ccc9 100644 (file)
--- a/services/loanin/jaxb/src/main/java/org/collectionspace/services/LoaninListItemJAXBSchema.java
+++ b/services/loanin/jaxb/src/main/java/org/collectionspace/services/LoaninListItemJAXBSchema.java
@@ -2,7 +2,8 @@ package org.collectionspace.services;
 
 public interface LoaninListItemJAXBSchema {
        final static String LOAN_IN_NUMBER = "loaninNumber";
-        final static String LOAN_RETURN_DATE = "loanReturnDate";
+       final static String LENDER = "lender";
+       final static String LOAN_RETURN_DATE = "loanReturnDate";
        final static String CSID = "csid";
        final static String URI = "url";
 }

diff --git a/services/loanin/jaxb/src/main/resources/loansin-common.xsd b/services/loanin/jaxb/src/main/resources/loansin-common.xsd
index b03aac010772635f0bfdac90bf1c378c9258d850..26e3095c637cd86b438698f74977a77f2a0d67e7 100644 (file)
--- a/services/loanin/jaxb/src/main/resources/loansin-common.xsd
+++ b/services/loanin/jaxb/src/main/resources/loansin-common.xsd
@@ -69,6 +69,8 @@
                                 <xs:sequence>
                                     <xs:element name="loanInNumber" type="xs:string"
                                         minOccurs="1" />
+                                    <xs:element name="lender" type="xs:string"
+                                        minOccurs="1" />
                                     <xs:element name="loanReturnDate" type="xs:string"
                                         minOccurs="1" />
                                     <!-- uri to retrive details -->

diff --git a/services/loanin/service/src/main/java/org/collectionspace/services/loanin/nuxeo/LoaninDocumentModelHandler.java b/services/loanin/service/src/main/java/org/collectionspace/services/loanin/nuxeo/LoaninDocumentModelHandler.java
index 0b51c77fcec820e87b8686b400a2cf283630848e..bee2c58f77ba4711a2ec6f6f96fb19dad4115f03 100644 (file)
--- a/services/loanin/service/src/main/java/org/collectionspace/services/loanin/nuxeo/LoaninDocumentModelHandler.java
+++ b/services/loanin/service/src/main/java/org/collectionspace/services/loanin/nuxeo/LoaninDocumentModelHandler.java
@@ -27,6 +27,7 @@ import java.util.Iterator;
 import java.util.List;
 
 import org.collectionspace.services.LoaninJAXBSchema;
+import org.collectionspace.services.LoaninListItemJAXBSchema;
 import org.collectionspace.services.common.document.DocumentWrapper;
 import org.collectionspace.services.loanin.LoansinCommon;
 import org.collectionspace.services.loanin.LoansinCommonList;
@@ -120,12 +121,15 @@ public class LoaninDocumentModelHandler
         LoansinCommonList coList = extractPagingInfo(new LoansinCommonList(), wrapDoc);
         List<LoansinCommonList.LoaninListItem> list = coList.getLoaninListItem();
         Iterator<DocumentModel> iter = wrapDoc.getWrappedObject().iterator();
+        String label = getServiceContext().getCommonPartLabel();
         while(iter.hasNext()){
             DocumentModel docModel = iter.next();
             LoaninListItem ilistItem = new LoaninListItem();
-            ilistItem.setLoanInNumber((String) docModel.getProperty(getServiceContext().getCommonPartLabel(),
+            ilistItem.setLoanInNumber((String) docModel.getProperty(label,
                     LoaninJAXBSchema.LOAN_IN_NUMBER));
-            ilistItem.setLoanReturnDate((String) docModel.getProperty(getServiceContext().getCommonPartLabel(),
+            ilistItem.setLender((String) docModel.getProperty(label,
+                    LoaninListItemJAXBSchema.LENDER));
+            ilistItem.setLoanReturnDate((String) docModel.getProperty(label,
                     LoaninJAXBSchema.LOAN_RETURN_DATE));
             String id = NuxeoUtils.extractId(docModel.getPathAsString());
             ilistItem.setUri(getServiceContextPath() + id);

diff --git a/services/loanout/jaxb/src/main/java/org/collectionspace/services/LoanoutListItemJAXBSchema.java b/services/loanout/jaxb/src/main/java/org/collectionspace/services/LoanoutListItemJAXBSchema.java
index c49599415c816530176b1469eeb4c33556cb5637..5c3b95c116bbbf6d372eb4ffd05d9a3d43bd6057 100644 (file)
--- a/services/loanout/jaxb/src/main/java/org/collectionspace/services/LoanoutListItemJAXBSchema.java
+++ b/services/loanout/jaxb/src/main/java/org/collectionspace/services/LoanoutListItemJAXBSchema.java
@@ -2,6 +2,7 @@ package org.collectionspace.services;
 
 public interface LoanoutListItemJAXBSchema {
        final static String LOAN_OUT_NUMBER = "loanoutNumber";
+    final static String BORROWER = "borrower";
     final static String LOAN_RETURN_DATE = "loanReturnDate";
        final static String CSID = "csid";
        final static String URI = "url";

diff --git a/services/loanout/jaxb/src/main/resources/loansout-common.xsd b/services/loanout/jaxb/src/main/resources/loansout-common.xsd
index 3a5f5f139d01a4beb193069492b1b8adcb61bcb6..df1b4a6549e7310a41fe1e8aeaaa46e7219facc3 100644 (file)
--- a/services/loanout/jaxb/src/main/resources/loansout-common.xsd
+++ b/services/loanout/jaxb/src/main/resources/loansout-common.xsd
@@ -75,6 +75,8 @@
                                 <xs:sequence>
                                     <xs:element name="loanOutNumber" type="xs:string"
                                         minOccurs="1" />
+                                    <xs:element name="borrower" type="xs:string"
+                                        minOccurs="1" />
                                     <xs:element name="loanReturnDate" type="xs:string"
                                         minOccurs="1" />
                                     <!-- uri to retrive details -->

diff --git a/services/loanout/service/src/main/java/org/collectionspace/services/loanout/nuxeo/LoanoutDocumentModelHandler.java b/services/loanout/service/src/main/java/org/collectionspace/services/loanout/nuxeo/LoanoutDocumentModelHandler.java
index bbf1deb94f07ce02187a3e3adaa8747667df46b1..1007ef1177b469f6894b6ace9767b555ea1bfcdd 100644 (file)
--- a/services/loanout/service/src/main/java/org/collectionspace/services/loanout/nuxeo/LoanoutDocumentModelHandler.java
+++ b/services/loanout/service/src/main/java/org/collectionspace/services/loanout/nuxeo/LoanoutDocumentModelHandler.java
@@ -131,12 +131,15 @@ public class LoanoutDocumentModelHandler
         LoansoutCommonList coList = extractPagingInfo(new LoansoutCommonList(), wrapDoc);
         List<LoansoutCommonList.LoanoutListItem> list = coList.getLoanoutListItem();
         Iterator<DocumentModel> iter = wrapDoc.getWrappedObject().iterator();
+        String label = getServiceContext().getCommonPartLabel();
         while(iter.hasNext()){
             DocumentModel docModel = iter.next();
             LoanoutListItem ilistItem = new LoanoutListItem();
-            ilistItem.setLoanOutNumber((String) docModel.getProperty(getServiceContext().getCommonPartLabel(),
+            ilistItem.setLoanOutNumber((String) docModel.getProperty(label,
                     LoanoutJAXBSchema.LOAN_OUT_NUMBER));
-            ilistItem.setLoanReturnDate((String) docModel.getProperty(getServiceContext().getCommonPartLabel(),
+            ilistItem.setBorrower((String) docModel.getProperty(label,
+                    LoanoutJAXBSchema.BORROWER));
+            ilistItem.setLoanReturnDate((String) docModel.getProperty(label,
                     LoanoutJAXBSchema.LOAN_RETURN_DATE));
             String id = NuxeoUtils.extractId(docModel.getPathAsString());
             ilistItem.setUri(getServiceContextPath() + id);