CSPACE-4395 authority item list results now return termStatus. Also fixed some tests...

diff --git a/services/IntegrationTests/src/test/java/org/collectionspace/services/IntegrationTests/test/CollectionSpaceIntegrationTest.java b/services/IntegrationTests/src/test/java/org/collectionspace/services/IntegrationTests/test/CollectionSpaceIntegrationTest.java
index 7b3cf371560b075d08a9ac52d07b7d42cb3ec70e..b3fc2ca00b2de5e4792b80bd15609779f61d067d 100755 (executable)
--- a/services/IntegrationTests/src/test/java/org/collectionspace/services/IntegrationTests/test/CollectionSpaceIntegrationTest.java
+++ b/services/IntegrationTests/src/test/java/org/collectionspace/services/IntegrationTests/test/CollectionSpaceIntegrationTest.java
@@ -39,6 +39,7 @@ import org.collectionspace.services.client.PoxPayloadIn;
 import org.collectionspace.services.collectionobject.CollectionobjectsCommon;\r
 import org.collectionspace.services.collectionobject.TitleGroup;\r
 import org.collectionspace.services.collectionobject.TitleGroupList;\r
+import org.collectionspace.services.common.datetime.GregorianCalendarDateTimeUtils;\r
 import org.collectionspace.services.intake.IntakesCommon;\r
 import org.collectionspace.services.relation.RelationsCommon;\r
 import org.collectionspace.services.relation.RelationshipType;\r
@@ -91,8 +92,8 @@ public abstract class CollectionSpaceIntegrationTest {
         * @param identifier the identifier\r
         */\r
        void fillIntake(IntakesCommon theIntake, String identifier) {\r
-               fillIntake(theIntake, "entryNumber-" + identifier, "entryDate-"\r
-                               + identifier);\r
+               String CURRENT_DATE_UTC = GregorianCalendarDateTimeUtils.currentDateUTC();\r
+               fillIntake(theIntake, "entryNumber-" + identifier, CURRENT_DATE_UTC);\r
        }\r
 \r
        /**\r

diff --git a/services/IntegrationTests/src/test/resources/test-data/xmlreplay/acquisitions/ac1.xml b/services/IntegrationTests/src/test/resources/test-data/xmlreplay/acquisitions/ac1.xml
index 31de83477df4649ca22b4288b1b54619a7cb9645..ae8665103b89354e4ef90d1d459daa93101f6acd 100755 (executable)
--- a/services/IntegrationTests/src/test/resources/test-data/xmlreplay/acquisitions/ac1.xml
+++ b/services/IntegrationTests/src/test/resources/test-data/xmlreplay/acquisitions/ac1.xml
@@ -4,8 +4,8 @@
   xmlns:ns2="http://collectionspace.org/services/jaxb"\r
   xmlns:ns3="http://collectionspace.org/services/acquisition">\r
   <acquisitionDates>\r
-    <acquisitionDate>NEW First Acquisition Date-334</acquisitionDate>\r
-    <acquisitionDate>Second Acquisition Date-1292275630222</acquisitionDate>\r
+    <acquisitionDate>2010-11-15T07:30:24Z</acquisitionDate>\r
+    <acquisitionDate>2009-10-15T07:30:24Z</acquisitionDate>\r
   </acquisitionDates>\r
   <acquisitionReferenceNumber>acquisitionReferenceNumber-1</acquisitionReferenceNumber>\r
   <owners>\r

diff --git a/services/IntegrationTests/src/test/resources/test-data/xmlreplay/acquisitions/ac2.xml b/services/IntegrationTests/src/test/resources/test-data/xmlreplay/acquisitions/ac2.xml
index 81287aba8d83f4a766d8c9655ae49719df568548..dfa99178c19ae44925c01651a4b863439869611d 100755 (executable)
--- a/services/IntegrationTests/src/test/resources/test-data/xmlreplay/acquisitions/ac2.xml
+++ b/services/IntegrationTests/src/test/resources/test-data/xmlreplay/acquisitions/ac2.xml
@@ -4,8 +4,8 @@
 xmlns:ns2="http://collectionspace.org/services/jaxb"\r
 xmlns:ns3="http://collectionspace.org/services/acquisition">\r
   <acquisitionDates>\r
-    <acquisitionDate>Second Acquisition Date-1292275631503</acquisitionDate>\r
-    <acquisitionDate>First Acquisition Date -1292275631503</acquisitionDate>\r
+    <acquisitionDate>2010-11-15T07:30:24Z</acquisitionDate>\r
+    <acquisitionDate>2009-10-15T07:30:24Z</acquisitionDate>\r
   </acquisitionDates>\r
   <acquisitionReferenceNumber>acquisitionReferenceNumber-1292275631503</acquisitionReferenceNumber>\r
   <owners>\r

diff --git a/services/IntegrationTests/src/test/resources/test-data/xmlreplay/acquisitions/res/ac1.res.xml b/services/IntegrationTests/src/test/resources/test-data/xmlreplay/acquisitions/res/ac1.res.xml
index 7187217b2024b3c23cef6a5a6d4ba2f046491fc1..da16a0e1457949ebe432c998a168a26d9fa9f5f2 100755 (executable)
--- a/services/IntegrationTests/src/test/resources/test-data/xmlreplay/acquisitions/res/ac1.res.xml
+++ b/services/IntegrationTests/src/test/resources/test-data/xmlreplay/acquisitions/res/ac1.res.xml
@@ -4,8 +4,8 @@
 <acquisitionReferenceNumber>acquisitionReferenceNumber-1</acquisitionReferenceNumber>\r
 <acquisitionFundingList/>\r
 <acquisitionDates>\r
-<acquisitionDate>NEW First Acquisition Date-334</acquisitionDate>\r
-<acquisitionDate>Second Acquisition Date-1292275630222</acquisitionDate>\r
+<acquisitionDate>2010-11-15T07:30:24Z</acquisitionDate>\r
+<acquisitionDate>2009-10-15T07:30:24Z</acquisitionDate>\r
 </acquisitionDates>\r
 <acquisitionSources>\r
 <acquisitionSource>Donor Acquisition Source-1292275630222</acquisitionSource>\r

diff --git a/services/IntegrationTests/src/test/resources/test-data/xmlreplay/acquisitions/res/ac2.res.xml b/services/IntegrationTests/src/test/resources/test-data/xmlreplay/acquisitions/res/ac2.res.xml
index 21d1a9364842d0338cb6d5599ecba5cd69fb31f9..9fa704a36f620064e59750f608f37cc91c6e298e 100755 (executable)
--- a/services/IntegrationTests/src/test/resources/test-data/xmlreplay/acquisitions/res/ac2.res.xml
+++ b/services/IntegrationTests/src/test/resources/test-data/xmlreplay/acquisitions/res/ac2.res.xml
@@ -4,8 +4,8 @@
 <acquisitionReferenceNumber>acquisitionReferenceNumber-1292275631503</acquisitionReferenceNumber>\r
 <acquisitionFundingList/>\r
 <acquisitionDates>\r
-<acquisitionDate>Second Acquisition Date-1292275631503</acquisitionDate>\r
-<acquisitionDate>First Acquisition Date -1292275631503</acquisitionDate>\r
+<acquisitionDate>2010-11-15T07:30:24Z</acquisitionDate>\r
+<acquisitionDate>2009-10-15T07:30:24Z</acquisitionDate>\r
 </acquisitionDates>\r
 <acquisitionSources>\r
 <acquisitionSource>Museum Acquisition Source-1292275631503</acquisitionSource>\r

diff --git a/services/IntegrationTests/src/test/resources/test-data/xmlreplay/acquisitions/res/ac3.res.xml b/services/IntegrationTests/src/test/resources/test-data/xmlreplay/acquisitions/res/ac3.res.xml
index dd7b7a580ee6c8daca7cb60b36cb9b2238a596ca..ebe0bbfe88d06a46916deeb8609c37a52d2fd9b7 100755 (executable)
--- a/services/IntegrationTests/src/test/resources/test-data/xmlreplay/acquisitions/res/ac3.res.xml
+++ b/services/IntegrationTests/src/test/resources/test-data/xmlreplay/acquisitions/res/ac3.res.xml
@@ -4,8 +4,8 @@
 <acquisitionReferenceNumber>acquisitionReferenceNumber-1292275630222</acquisitionReferenceNumber>\r
 <acquisitionFundingList/>\r
 <acquisitionDates>\r
-<acquisitionDate>First Acquisition Date -1292275630222</acquisitionDate>\r
-<acquisitionDate>Second Acquisition Date-1292275630222</acquisitionDate>\r
+<acquisitionDate>2010-11-15T07:30:24Z</acquisitionDate>\r
+<acquisitionDate>2009-10-15T07:30:24Z</acquisitionDate>\r
 </acquisitionDates>\r
 <acquisitionSources>\r
 <acquisitionSource>Donor Acquisition Source-1292275630222</acquisitionSource>\r

diff --git a/services/IntegrationTests/src/test/resources/test-data/xmlreplay/vocabulary/res/GetVocabularyItems.res.xml b/services/IntegrationTests/src/test/resources/test-data/xmlreplay/vocabulary/res/GetVocabularyItems.res.xml
index fe7ab95e3546040bfea8694f393ea904963fbaae..4a130df47fb3d69bd1556baee4a3cd54647bfb12 100644 (file)
--- a/services/IntegrationTests/src/test/resources/test-data/xmlreplay/vocabulary/res/GetVocabularyItems.res.xml
+++ b/services/IntegrationTests/src/test/resources/test-data/xmlreplay/vocabulary/res/GetVocabularyItems.res.xml
@@ -6,26 +6,29 @@
        <pageNum>0</pageNum>
     <itemsInPage>3</itemsInPage>
     <totalItems>3</totalItems>
-    <fieldsReturned>csid|uri|updatedAt|displayName|shortIdentifier|refName|order</fieldsReturned>
+    <fieldsReturned>csid|uri|updatedAt|order|displayName|shortIdentifier|refName|termStatus</fieldsReturned>
     <list-item>
         <displayName>${Item3DupeOrder.displayName}</displayName>
         <shortIdentifier>${Item3DupeOrder.itemID}</shortIdentifier>
         <order>${Item3DupeOrder.order}</order>
         <uri>/vocabularies/${Vocabulary1.CSID}/items/${Item3DupeOrder.CSID}</uri>
-        <csid>${Item3DupeOrder.CSID}</csid>
+                               <csid>${Item3DupeOrder.CSID}</csid>
+                               <termStatus/>
     </list-item>
     <list-item>
         <displayName>${Item2.displayName}</displayName>
         <shortIdentifier>${Item2.itemID}</shortIdentifier>
         <order>${Item2.order}</order>
         <uri>/vocabularies/${Vocabulary1.CSID}/items/${Item2.CSID}</uri>
-        <csid>${Item2.CSID}</csid>
+                               <csid>${Item2.CSID}</csid>
+                               <termStatus/>
     </list-item>
     <list-item>
         <displayName>${Item1.displayName}</displayName>
         <shortIdentifier>${Item1.itemID}</shortIdentifier>
         <order>${Item1.order}</order>
         <uri>/vocabularies/${Vocabulary1.CSID}/items/${Item1.CSID}</uri>
-        <csid>${Item1.CSID}</csid>
+                               <csid>${Item1.CSID}</csid>
+                               <termStatus/>
     </list-item>
 </ns3:abstract-common-list>

diff --git a/services/authority/service/src/main/java/org/collectionspace/services/common/vocabulary/nuxeo/AuthorityItemDocumentModelHandler.java b/services/authority/service/src/main/java/org/collectionspace/services/common/vocabulary/nuxeo/AuthorityItemDocumentModelHandler.java
index 090e77aa4cb522a6553f79ca3ade80ca456d3c0f..799a9e4941816e19fde25819ff5db9f356e92e28 100644 (file)
--- a/services/authority/service/src/main/java/org/collectionspace/services/common/vocabulary/nuxeo/AuthorityItemDocumentModelHandler.java
+++ b/services/authority/service/src/main/java/org/collectionspace/services/common/vocabulary/nuxeo/AuthorityItemDocumentModelHandler.java
@@ -35,6 +35,7 @@ import org.collectionspace.services.common.api.Tools;
 import org.collectionspace.services.common.context.MultipartServiceContext;
 import org.collectionspace.services.common.context.ServiceBindingUtils;
 import org.collectionspace.services.common.context.ServiceContext;
+import org.collectionspace.services.common.document.DocumentException;
 import org.collectionspace.services.common.document.DocumentWrapper;
 import org.collectionspace.services.common.document.DocumentWrapperImpl;
 import org.collectionspace.services.common.relation.IRelationsManager;
@@ -45,6 +46,7 @@ import org.collectionspace.services.common.vocabulary.AuthorityJAXBSchema;
 import org.collectionspace.services.common.vocabulary.AuthorityItemJAXBSchema;
 import org.collectionspace.services.common.vocabulary.RefNameServiceUtils;
 import org.collectionspace.services.nuxeo.client.java.DocHandlerBase;
+import org.collectionspace.services.common.service.ListResultField;
 import org.collectionspace.services.nuxeo.util.NuxeoUtils;
 import org.collectionspace.services.relation.RelationResource;
 import org.collectionspace.services.relation.RelationsCommon;
@@ -119,6 +121,57 @@ public abstract class AuthorityItemDocumentModelHandler<AICommon>
         this.authorityRefNameBase = value;
     }
 
+    @Override
+    public List<ListResultField> getListItemsArray() throws DocumentException {
+       List<ListResultField> list = super.getListItemsArray();
+       int nFields = list.size();
+       // Ensure some common fields so do not depend upon config for general logic
+       boolean hasDisplayName = false;
+       boolean hasShortId = false;
+       boolean hasRefName = false;
+       boolean hasTermStatus = false;
+        for(int i=0;i<nFields;i++) {
+               ListResultField field = list.get(i); 
+               String elName = field.getElement();
+               if(AuthorityItemJAXBSchema.DISPLAY_NAME.equals(elName))
+                       hasDisplayName = true;
+               else if(AuthorityItemJAXBSchema.SHORT_IDENTIFIER.equals(elName))
+                       hasShortId = true;
+               else if(AuthorityItemJAXBSchema.REF_NAME.equals(elName))
+                       hasRefName = true;
+               else if(AuthorityItemJAXBSchema.TERM_STATUS.equals(elName))
+                       hasTermStatus = true;
+        }
+        ListResultField field;
+        if(!hasDisplayName) {
+               field = new ListResultField();
+               field.setElement(AuthorityItemJAXBSchema.DISPLAY_NAME);
+               field.setXpath(AuthorityItemJAXBSchema.DISPLAY_NAME);
+               list.add(field);
+        }
+        if(!hasShortId) {
+               field = new ListResultField();
+               field.setElement(AuthorityItemJAXBSchema.SHORT_IDENTIFIER);
+               field.setXpath(AuthorityItemJAXBSchema.SHORT_IDENTIFIER);
+               list.add(field);
+        }
+        if(!hasRefName) {
+               field = new ListResultField();
+               field.setElement(AuthorityItemJAXBSchema.REF_NAME);
+               field.setXpath(AuthorityItemJAXBSchema.REF_NAME);
+               list.add(field);
+        }
+        if(!hasTermStatus) {
+               field = new ListResultField();
+               field.setElement(AuthorityItemJAXBSchema.TERM_STATUS);
+               field.setXpath(AuthorityItemJAXBSchema.TERM_STATUS);
+               list.add(field);
+        }
+        return list;
+
+    }
+
+
     /* (non-Javadoc)
      * @see org.collectionspace.services.nuxeo.client.java.DocumentModelHandler#handleCreate(org.collectionspace.services.common.document.DocumentWrapper)
      */

diff --git a/services/common/src/main/cspace/config/services/tenants/tenant-bindings-proto.xml b/services/common/src/main/cspace/config/services/tenants/tenant-bindings-proto.xml
index 70f6bd4f37969853c740323b38c4487cd45525cd..4bdeb869c102ff395c0021017b69d38b96985164 100644 (file)
--- a/services/common/src/main/cspace/config/services/tenants/tenant-bindings-proto.xml
+++ b/services/common/src/main/cspace/config/services/tenants/tenant-bindings-proto.xml
@@ -1512,18 +1512,7 @@
       <service:DocHandlerParams xmlns:service="http://collectionspace.org/services/common/service">
         <service:params>
           <service:ListResultsFields>
-            <service:ListResultField>
-              <service:element>displayName</service:element>
-              <service:xpath>displayName</service:xpath>
-            </service:ListResultField>
-            <service:ListResultField>
-              <service:element>shortIdentifier</service:element>
-              <service:xpath>shortIdentifier</service:xpath>
-            </service:ListResultField>
-            <service:ListResultField>
-              <service:element>refName</service:element>
-              <service:xpath>refName</service:xpath>
-            </service:ListResultField>
+                                               <!-- Omit the standard AuthorityItem items (they are handled by the code) -->
             <service:ListResultField>
               <service:element>order</service:element>
               <service:xpath>order</service:xpath>
@@ -1650,18 +1639,7 @@
       <service:DocHandlerParams xmlns:service="http://collectionspace.org/services/common/service">
         <service:params>
           <service:ListResultsFields>
-            <service:ListResultField>
-              <service:element>displayName</service:element>
-              <service:xpath>displayName</service:xpath>
-            </service:ListResultField>
-            <service:ListResultField>
-              <service:element>shortIdentifier</service:element>
-              <service:xpath>shortIdentifier</service:xpath>
-            </service:ListResultField>
-            <service:ListResultField>
-              <service:element>refName</service:element>
-              <service:xpath>refName</service:xpath>
-            </service:ListResultField>
+                                       <!-- Omit the standard AuthorityItem items (they are handled by the code) -->
           </service:ListResultsFields>
         </service:params>
       </service:DocHandlerParams>
@@ -1833,18 +1811,7 @@
       <service:DocHandlerParams xmlns:service="http://collectionspace.org/services/common/service">
         <service:params>
           <service:ListResultsFields>
-            <service:ListResultField>
-              <service:element>displayName</service:element>
-              <service:xpath>displayName</service:xpath>
-            </service:ListResultField>
-            <service:ListResultField>
-              <service:element>shortIdentifier</service:element>
-              <service:xpath>shortIdentifier</service:xpath>
-            </service:ListResultField>
-            <service:ListResultField>
-              <service:element>refName</service:element>
-              <service:xpath>refName</service:xpath>
-            </service:ListResultField>
+                                       <!-- Omit the standard AuthorityItem items (they are handled by the code) -->
           </service:ListResultsFields>
         </service:params>
       </service:DocHandlerParams>
@@ -2044,18 +2011,7 @@
       <service:DocHandlerParams xmlns:service="http://collectionspace.org/services/common/service">
         <service:params>
           <service:ListResultsFields>
-            <service:ListResultField>
-              <service:element>displayName</service:element>
-              <service:xpath>displayName</service:xpath>
-            </service:ListResultField>
-            <service:ListResultField>
-              <service:element>shortIdentifier</service:element>
-              <service:xpath>shortIdentifier</service:xpath>
-            </service:ListResultField>
-            <service:ListResultField>
-              <service:element>refName</service:element>
-              <service:xpath>refName</service:xpath>
-            </service:ListResultField>
+                                       <!-- Omit the standard AuthorityItem items (they are handled by the code) -->
           </service:ListResultsFields>
         </service:params>
       </service:DocHandlerParams>
@@ -2192,18 +2148,7 @@
       <service:DocHandlerParams xmlns:service="http://collectionspace.org/services/common/service">
         <service:params>
           <service:ListResultsFields>
-            <service:ListResultField>
-              <service:element>displayName</service:element>
-              <service:xpath>displayName</service:xpath>
-            </service:ListResultField>
-            <service:ListResultField>
-              <service:element>shortIdentifier</service:element>
-              <service:xpath>shortIdentifier</service:xpath>
-            </service:ListResultField>
-            <service:ListResultField>
-              <service:element>refName</service:element>
-              <service:xpath>refName</service:xpath>
-            </service:ListResultField>
+                                       <!-- Omit the standard AuthorityItem items (they are handled by the code) -->
           </service:ListResultsFields>
         </service:params>
       </service:DocHandlerParams>