CSPACE-5128: object exit exitDate converted to exitDateGroup

diff --git a/services/objectexit/3rdparty/nuxeo-platform-cs-objectexit/src/main/resources/schemas/objectexit_common.xsd b/services/objectexit/3rdparty/nuxeo-platform-cs-objectexit/src/main/resources/schemas/objectexit_common.xsd
index df058134bc42d455f258fb5ea067b3557119a4e2..ba6c9fb9c6a7d9f175fde10e8bab860610e08cec 100644 (file)
--- a/services/objectexit/3rdparty/nuxeo-platform-cs-objectexit/src/main/resources/schemas/objectexit_common.xsd
+++ b/services/objectexit/3rdparty/nuxeo-platform-cs-objectexit/src/main/resources/schemas/objectexit_common.xsd
@@ -23,7 +23,7 @@
     <!--  ObjectExit Information Group -->\r
     <xs:element name="currentOwner" type="xs:string"/>\r
     <xs:element name="depositor" type="xs:string"/>\r
-    <xs:element name="exitDate" type="structuredDateGroup"/>\r
+    <xs:element name="exitDateGroup" type="structuredDateGroup"/>\r
     <xs:element name="exitMethods">\r
         <xs:complexType>\r
             <xs:sequence>\r

diff --git a/services/objectexit/client/src/test/java/org/collectionspace/services/client/test/ObjectExitAuthRefsTest.java b/services/objectexit/client/src/test/java/org/collectionspace/services/client/test/ObjectExitAuthRefsTest.java
index 25fafddb89a6a9c490cf83715964900dc842ebb4..c9ca1f772a17d4616a45072a281dad819ff8ad93 100644 (file)
--- a/services/objectexit/client/src/test/java/org/collectionspace/services/client/test/ObjectExitAuthRefsTest.java
+++ b/services/objectexit/client/src/test/java/org/collectionspace/services/client/test/ObjectExitAuthRefsTest.java
@@ -66,6 +66,7 @@ public class ObjectExitAuthRefsTest extends BaseServiceTest<AbstractCommonList>
     private List<String> personIdsCreated = new ArrayList<String>();
     private String personAuthCSID = null;
     private String depositorRefName = null;
+    private String exitDate = null;
     private String exitNumber = null;
     private final static String CURRENT_DATE_UTC =
             GregorianCalendarDateTimeUtils.currentDateUTC();
@@ -90,12 +91,21 @@ public class ObjectExitAuthRefsTest extends BaseServiceTest<AbstractCommonList>
         throw new UnsupportedOperationException(); //method not supported (or needed) in this test class
     }
 
-    private PoxPayloadOut createObjectExitInstance(String depositorRefName, String exitNumber) {
+    private PoxPayloadOut createObjectExitInstance(String depositorRefName, String exitNumber, String exitDateDisplayDate) {        
+        ExitDateGroup exitDateGroup = this.getExitDateGroup();
+        exitDateGroup.setDateDisplayDate(exitDateDisplayDate);
+
         this.exitNumber = exitNumber;
         this.depositorRefName = depositorRefName;
+        this.setExitDateGroup(exitDateGroup);
+        
         ObjectexitCommon objectexit = new ObjectexitCommon();
+        oeExitDateGroup = objectexit.getExitDateGroup();
+        oeExitDateGroup.setDisplayDate(exitDateDisplayDate);
+
         objectexit.setDepositor(depositorRefName);
         objectexit.setExitNumber(exitNumber);
+        objectexit.setExitDateGroup(oeExitDateGroup);
 
         PoxPayloadOut multipart = new PoxPayloadOut(ObjectExitClient.SERVICE_PAYLOAD_NAME);
         PayloadOutputPart commonPart = multipart.addPart(new ObjectExitClient().getCommonPartName(),
@@ -113,8 +123,7 @@ public class ObjectExitAuthRefsTest extends BaseServiceTest<AbstractCommonList>
         //    references, and will refer to Person resources by their refNames.
         ObjectExitClient objectexitClient = new ObjectExitClient();
         PoxPayloadOut multipart = createObjectExitInstance(depositorRefName,
-                "exitNumber-" + identifier);
-                // , CURRENT_DATE_UTC
+                "exitNumber-" + identifier, CURRENT_DATE_UTC);
         ClientResponse<Response> res = objectexitClient.create(multipart);
         try {
                assertStatusCode(res, testName);

diff --git a/services/objectexit/jaxb/src/main/resources/objectexit_common.xsd b/services/objectexit/jaxb/src/main/resources/objectexit_common.xsd
index 183d2ca3144a0bb43b8cef4c2a9e75cd62716cb4..f6aad8a48c1fa34c541a88ef18166b3c4de93d4c 100644 (file)
--- a/services/objectexit/jaxb/src/main/resources/objectexit_common.xsd
+++ b/services/objectexit/jaxb/src/main/resources/objectexit_common.xsd
@@ -34,7 +34,7 @@
                 <!--  ObjectExit Information Group -->
                 <xs:element name="currentOwner" type="xs:string"/>
                 <xs:element name="depositor" type="xs:string"/>
-                <xs:element name="exitDate" type="structuredDateGroup"/>
+                <xs:element name="exitDateGroup" type="structuredDateGroup"/>
                 <xs:element name="exitMethods" type="exitMethods"/>
                 <xs:element name="exitNote" type="xs:string"/>
                 <xs:element name="exitNumber" type="xs:string"/>