CSPACE-2661, CSPACE 2662. Added new fields to the summary list payloads for Intake...

diff --git a/services/acquisition/client/src/test/java/org/collectionspace/services/client/test/AcquisitionServiceTest.java b/services/acquisition/client/src/test/java/org/collectionspace/services/client/test/AcquisitionServiceTest.java
index f66b21c418492e37c382e6985393d5f9cd3f4901..6e42681c409c94aaff10bd744fc020abd5e4d5bb 100644 (file)
--- a/services/acquisition/client/src/test/java/org/collectionspace/services/client/test/AcquisitionServiceTest.java
+++ b/services/acquisition/client/src/test/java/org/collectionspace/services/client/test/AcquisitionServiceTest.java
@@ -815,6 +815,7 @@ public class AcquisitionServiceTest extends AbstractServiceTestImpl {
         acqDates.add("First Acquisition Date -" + identifier);
         acqDates.add("Second Acquisition Date-" + identifier);
         acquisition.setAcquisitionDates(acqDatesList);
+        acquisition.setOwner("DummyOwner");
         MultipartOutput multipart = new MultipartOutput();
         OutputPart commonPart = multipart.addPart(acquisition,
             MediaType.APPLICATION_XML_TYPE);

diff --git a/services/acquisition/jaxb/src/main/java/org/collectionspace/services/AcquisitionListItemJAXBSchema.java b/services/acquisition/jaxb/src/main/java/org/collectionspace/services/AcquisitionListItemJAXBSchema.java
index 0f816b07c1c76d9115aeafcb3d29ab3742fdc7ad..d4a50d826fcfc30f223584897be3f17b96fa9970 100644 (file)
--- a/services/acquisition/jaxb/src/main/java/org/collectionspace/services/AcquisitionListItemJAXBSchema.java
+++ b/services/acquisition/jaxb/src/main/java/org/collectionspace/services/AcquisitionListItemJAXBSchema.java
@@ -3,6 +3,7 @@ package org.collectionspace.services;
 public interface AcquisitionListItemJAXBSchema {\r
        final static String ACQUISITION_REFERENCE_NUMBER = "acquisitionReferenceNumber";\r
        final static String ACQUISITION_SOURCES = "acquisitionSources";\r
+       final static String OWNER = "owner";\r
        final static String CSID = "csid";\r
        final static String URI = "url";\r
 }\r

diff --git a/services/acquisition/jaxb/src/main/resources/acquisitions_common.xsd b/services/acquisition/jaxb/src/main/resources/acquisitions_common.xsd
index 56939220e0ae1378709974a31ac7931956c9421c..9e01344d6b2956421a315d618007c6a23b6f9dcd 100644 (file)
--- a/services/acquisition/jaxb/src/main/resources/acquisitions_common.xsd
+++ b/services/acquisition/jaxb/src/main/resources/acquisitions_common.xsd
@@ -112,6 +112,8 @@
                                         minOccurs="1" />
                                     <xs:element name="acquisitionSources" type="acquisitionSourceList"
                                         minOccurs="1" />
+                                    <xs:element name="owner" type="xs:string"
+                                        minOccurs="1" />
                                     <!-- uri to retrive acquisition details -->
                                     <xs:element name="uri" type="xs:anyURI"
                                         minOccurs="1" />

diff --git a/services/acquisition/service/src/main/java/org/collectionspace/services/acquisition/nuxeo/AcquisitionDocumentModelHandler.java b/services/acquisition/service/src/main/java/org/collectionspace/services/acquisition/nuxeo/AcquisitionDocumentModelHandler.java
index 453570c6f66354958785d8838dbd37d33ecd4beb..c4afe62a558d158c7044432ee244d8857b44fc22 100644 (file)
--- a/services/acquisition/service/src/main/java/org/collectionspace/services/acquisition/nuxeo/AcquisitionDocumentModelHandler.java
+++ b/services/acquisition/service/src/main/java/org/collectionspace/services/acquisition/nuxeo/AcquisitionDocumentModelHandler.java
@@ -111,20 +111,23 @@ public class AcquisitionDocumentModelHandler
         AcquisitionsCommonList coList = this.extractPagingInfo(new AcquisitionsCommonList(), wrapDoc);
         List<AcquisitionsCommonList.AcquisitionListItem> list = coList.getAcquisitionListItem();
         Iterator<DocumentModel> iter = wrapDoc.getWrappedObject().iterator();
+        String label = getServiceContext().getCommonPartLabel();
         while (iter.hasNext()) {
             DocumentModel docModel = iter.next();
             AcquisitionListItem listItem = new AcquisitionListItem();
-            listItem.setAcquisitionReferenceNumber((String) docModel.getProperty(getServiceContext().getCommonPartLabel(),
+            listItem.setAcquisitionReferenceNumber((String) docModel.getProperty(label,
                     AcquisitionListItemJAXBSchema.ACQUISITION_REFERENCE_NUMBER));
             // docModel.getProperty returns an ArrayList here.
             List<String> acquisitionSources =
-                 (List<String>) docModel.getProperty(getServiceContext().getCommonPartLabel(),
+                 (List<String>) docModel.getProperty(label,
                      AcquisitionListItemJAXBSchema.ACQUISITION_SOURCES);
             AcquisitionSourceList acquisitionSourceList = new AcquisitionSourceList();
             for (String acquisitionSource : acquisitionSources) {
                   acquisitionSourceList.getAcquisitionSource().add(acquisitionSource);
             }
             listItem.setAcquisitionSources(acquisitionSourceList);
+            listItem.setOwner((String) docModel.getProperty(label,
+                       AcquisitionListItemJAXBSchema.OWNER));
             //need fully qualified context for URI
             String id = NuxeoUtils.extractId(docModel.getPathAsString());
             listItem.setUri(getServiceContextPath() + id);

diff --git a/services/intake/jaxb/src/main/resources/intakes-common.xsd b/services/intake/jaxb/src/main/resources/intakes-common.xsd
index 19d4dcdf56b8e643a25b331656ef622b9218c089..665e269e985f3a168344bd195431116944e04a69 100644 (file)
--- a/services/intake/jaxb/src/main/resources/intakes-common.xsd
+++ b/services/intake/jaxb/src/main/resources/intakes-common.xsd
@@ -155,6 +155,8 @@
                                         minOccurs="1" />
                                     <xs:element name="depositor" type="xs:string"
                                         minOccurs="1" />
+                                    <xs:element name="currentOwner" type="xs:string"
+                                        minOccurs="1" />
                                     <!-- uri to retrive intake details -->
                                     <xs:element name="uri" type="xs:anyURI"
                                         minOccurs="1" />

diff --git a/services/intake/service/src/main/java/org/collectionspace/services/intake/nuxeo/IntakeDocumentModelHandler.java b/services/intake/service/src/main/java/org/collectionspace/services/intake/nuxeo/IntakeDocumentModelHandler.java
index 39e77383be2489d7abe62ad03c258623c4775580..21bf178adf4191c0fbb64445788211b7977ac5ec 100644 (file)
--- a/services/intake/service/src/main/java/org/collectionspace/services/intake/nuxeo/IntakeDocumentModelHandler.java
+++ b/services/intake/service/src/main/java/org/collectionspace/services/intake/nuxeo/IntakeDocumentModelHandler.java
@@ -121,13 +121,16 @@ public class IntakeDocumentModelHandler
         IntakesCommonList coList = this.extractPagingInfo(new IntakesCommonList(), wrapDoc);
         List<IntakesCommonList.IntakeListItem> list = coList.getIntakeListItem();
         Iterator<DocumentModel> iter = wrapDoc.getWrappedObject().iterator();
+        String label = getServiceContext().getCommonPartLabel();
         while(iter.hasNext()){
             DocumentModel docModel = iter.next();
             IntakeListItem ilistItem = new IntakeListItem();
-            ilistItem.setEntryNumber((String) docModel.getProperty(getServiceContext().getCommonPartLabel(),
+            ilistItem.setEntryNumber((String) docModel.getProperty(label,
                     IntakeJAXBSchema.ENTRY_NUMBER));
-            ilistItem.setDepositor((String) docModel.getProperty(getServiceContext().getCommonPartLabel(),
+            ilistItem.setDepositor((String) docModel.getProperty(label,
                     IntakeJAXBSchema.DEPOSITOR));
+            ilistItem.setCurrentOwner((String) docModel.getProperty(label,
+                    IntakeJAXBSchema.CURRENT_OWNER));
             String id = NuxeoUtils.extractId(docModel.getPathAsString());
             ilistItem.setUri(getServiceContextPath() + id);
             ilistItem.setCsid(id);