CSPACE-5128: acquisition AcquisitionDates converted to AcquisitionDateGroupList,...

diff --git a/services/acquisition/3rdparty/nuxeo-platform-cs-acquisition/src/main/resources/schemas/acquisitions_common.xsd b/services/acquisition/3rdparty/nuxeo-platform-cs-acquisition/src/main/resources/schemas/acquisitions_common.xsd
index efa493f54f165d12801927945129dbe2e70f0a51..7e069a9ef630813ee150f17c06b71ed7ffaef2dc 100644 (file)
--- a/services/acquisition/3rdparty/nuxeo-platform-cs-acquisition/src/main/resources/schemas/acquisitions_common.xsd
+++ b/services/acquisition/3rdparty/nuxeo-platform-cs-acquisition/src/main/resources/schemas/acquisitions_common.xsd
@@ -21,13 +21,13 @@
     <!-- See http://wiki.collectionspace.org/display/collectionspace/Acquisition+Schema -->\r
 \r
     <!--  Object Entry Information Group -->\r
-    <xs:element name="accessionDate" type="structuredDateGroup"/>\r
+    <xs:element name="accessionDateGroup" type="structuredDateGroup"/>\r
     <xs:element name="acquisitionAuthorizer" type="xs:string"/>\r
     <xs:element name="acquisitionAuthorizerDate" type="xs:date"/>\r
-    <xs:element name="acquisitionDates">\r
+    <xs:element name="acquisitionDateGroupList">\r
         <xs:complexType>\r
             <xs:sequence>\r
-                <xs:element name="acquisitionDate" type="structuredDateGroup" minOccurs="0" maxOccurs="unbounded"/>\r
+                <xs:element name="acquisitionDateGroup" type="structuredDateGroup" minOccurs="0" maxOccurs="unbounded"/>\r
             </xs:sequence>\r
         </xs:complexType>\r
     </xs:element>\r

diff --git a/services/acquisition/client/src/test/java/org/collectionspace/services/client/test/AcquisitionAuthRefsTest.java b/services/acquisition/client/src/test/java/org/collectionspace/services/client/test/AcquisitionAuthRefsTest.java
index 73a2b0599a47796a61f374eaafb36b487ad3e27a..c082b632e2a63f6ab2e1a2b33071dcf37efd9f3a 100644 (file)
--- a/services/acquisition/client/src/test/java/org/collectionspace/services/client/test/AcquisitionAuthRefsTest.java
+++ b/services/acquisition/client/src/test/java/org/collectionspace/services/client/test/AcquisitionAuthRefsTest.java
@@ -44,6 +44,8 @@ import org.collectionspace.services.acquisition.AcquisitionFunding;
 import org.collectionspace.services.acquisition.AcquisitionFundingList;
 import org.collectionspace.services.acquisition.AcquisitionSourceList;
 import org.collectionspace.services.acquisition.OwnerList;
+import org.collectionspace.services.acquisition.StructuredDateGroup;
+
 
 import org.jboss.resteasy.client.ClientResponse;
 
@@ -112,11 +114,11 @@ public class AcquisitionAuthRefsTest extends BaseServiceTest<AbstractCommonList>
                createPersonRefs();
 
                PoxPayloadOut multipart = createAcquisitionInstance(
+                "April 1, 2010",
                                acquisitionAuthorizerRefName,
                                acquisitionFundingSourcesRefNames,
                                ownersRefNames,
                                acquisitionSourcesRefNames);
-                                // "April 1, 2010",
 
                AcquisitionClient acquisitionClient = new AcquisitionClient();
                ClientResponse<Response> res = acquisitionClient.create(multipart);
@@ -367,12 +369,16 @@ public class AcquisitionAuthRefsTest extends BaseServiceTest<AbstractCommonList>
        }
 
        private PoxPayloadOut createAcquisitionInstance(
+            String accessionDateDisplayDate,
                        String acquisitionAuthorizer,
                        List<String> acquisitionFundingSources,
                        List<String> acqOwners,
                        List<String> acquisitionSources) {
 
                AcquisitionsCommon acquisition = new AcquisitionsCommon();
+               StructuredDateGroup accessionDateGroup = new StructuredDateGroup(); 
+               accessionDateGroup.setDateDisplayDate(accessionDateDisplayDate);
+        acquisition.setAccessionDateGroup(accessionDateGroup);
                acquisition.setAcquisitionAuthorizer(acquisitionAuthorizer);
 
                // AcquisitionFunding-related authrefs fields are *not* currently

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 8a4cd916094e3db40370a50a9519c7e3194b72b3..d00090568bae751881b382e08a9a7efa32b56346 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
@@ -36,10 +36,11 @@ import org.collectionspace.services.common.datetime.GregorianCalendarDateTimeUti
 import org.collectionspace.services.jaxb.AbstractCommonList;
 
 import org.collectionspace.services.acquisition.AcquisitionsCommon;
-import org.collectionspace.services.acquisition.AcquisitionDateList;
+import org.collectionspace.services.acquisition.AcquisitionDateGroupList;
 import org.collectionspace.services.acquisition.AcquisitionSourceList;
 import org.collectionspace.services.acquisition.OwnerList;
 import org.jboss.resteasy.client.ClientResponse;
+import org.collectionspace.services.acquisition.StructuredDateGroup;
 
 import org.testng.Assert;
 import org.testng.annotations.Test;
@@ -311,10 +312,9 @@ public class AcquisitionServiceTest extends AbstractPoxServiceTestImpl<AbstractC
         Assert.assertTrue(acqSources.size() > 0);
         Assert.assertNotNull(acqSources.get(0));
 
-        // List<String> acqDates =
-        //         acquisitionObject.getAcquisitionDates().getAcquisitionDate();
-        // Assert.assertTrue(acqDates.size() > 0);
-        // Assert.assertNotNull(acqDates.get(0));
+        List<StructuredDateGroup> acqDates = acquisitionObject.getAcquisitionDateGroupList().getAcquisitionDateGroup();
+        Assert.assertTrue(acqDates.size() > 0);
+        Assert.assertNotNull(acqDates.get(0));
 
         List<String> owners =
                 acquisitionObject.getOwners().getOwner();
@@ -703,11 +703,15 @@ public class AcquisitionServiceTest extends AbstractPoxServiceTestImpl<AbstractC
         acqSources.add("Museum Acquisition Source-" + identifier);
         acquisition.setAcquisitionSources(acqSourcesList);
 
-        // AcquisitionDateList acqDatesList = new AcquisitionDateList();
-        // List<String> acqDates = acqDatesList.getAcquisitionDate();
-        // acqDates.add(CURRENT_DATE_UTC);
-        // acqDates.add(CURRENT_DATE_UTC);
-        // acquisition.setAcquisitionDates(acqDatesList);
+        AcquisitionDateGroupList acqDatesList = new AcquisitionDateGroupList();
+        List<StructuredDateGroup> acqDates = acqDatesList.getAcquisitionDateGroup();
+        StructuredDateGroup acqDate1 = new StructuredDateGroup();
+        acqDate1.setDateDisplayDate(CURRENT_DATE_UTC);
+        StructuredDateGroup acqDate2 = new StructuredDateGroup();
+        acqDate2.setDateDisplayDate(CURRENT_DATE_UTC);
+        acqDates.add(acqDate1);
+        acqDates.add(acqDate2);
+        acquisition.setAcquisitionDateGroupList(acqDatesList);
 
         OwnerList ownersList = new OwnerList();
         List<String> owners = ownersList.getOwner();

diff --git a/services/acquisition/jaxb/src/main/resources/acquisitions_common.xsd b/services/acquisition/jaxb/src/main/resources/acquisitions_common.xsd
index 1b2a309964a325cb9e3dd64605f2f6d55bfb47ec..76587655f203434614cd13f55a1abd7db6c27aec 100644 (file)
--- a/services/acquisition/jaxb/src/main/resources/acquisitions_common.xsd
+++ b/services/acquisition/jaxb/src/main/resources/acquisitions_common.xsd
@@ -33,10 +33,10 @@
             <xs:sequence>
                 <xs:element name="csid" type="xs:string" />
                 <!--  Object Entry Information Group -->
-                <xs:element name="accessionDate" type="structuredDateGroup"/>
+                <xs:element name="accessionDateGroup" type="structuredDateGroup"/>
                 <xs:element name="acquisitionAuthorizer" type="xs:string"/>
                 <xs:element name="acquisitionAuthorizerDate" type="xs:string"/>
-                <xs:element name="acquisitionDates" type="acquisitionDateList"/>
+                <xs:element name="acquisitionDateGroupList" type="acquisitionDateGroupList"/>
                 <xs:element name="acquisitionFundingList" type="acquisitionFundingList"/>
                 <xs:element name="acquisitionMethod" type="xs:string"/>
                 <xs:element name="acquisitionNote" type="xs:string"/>
@@ -63,9 +63,9 @@
         </xs:complexType>
     </xs:element>
 
-    <xs:complexType name="acquisitionDateList">
+    <xs:complexType name="acquisitionDateGroupList">
         <xs:sequence>
-            <xs:element name="acquisitionDate" type="structuredDateGroup" minOccurs="0" maxOccurs="unbounded"/>
+            <xs:element name="acquisitionDateGroup" type="structuredDateGroup" minOccurs="0" maxOccurs="unbounded"/>
         </xs:sequence>
     </xs:complexType>