CSPACE-2893: In the Acquisition service, enabled the retrieval of terms used (authori...

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 618fa18db479f9fcdc0a3f3fc11d747c3802ae41..f5b72ef5afedaea297da3d317edf1f07e5013d11 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
@@ -41,6 +41,7 @@ import org.collectionspace.services.acquisition.AcquisitionsCommon;
 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.jboss.resteasy.client.ClientResponse;
 
@@ -75,8 +76,9 @@ public class AcquisitionAuthRefsTest extends BaseServiceTest {
     private String personAuthCSID = null; 
     private String acquisitionAuthorizerRefName = null;
     private List<String> acquisitionFundingSourcesRefNames = new ArrayList<String>();
+    private List<String> ownersRefNames = new ArrayList<String>();
     private List<String> acquisitionSourcesRefNames = new ArrayList<String>();
-    private final int NUM_AUTH_REFS_EXPECTED = 3;
+    private final int NUM_AUTH_REFS_EXPECTED = 5;
 
     /* (non-Javadoc)
      * @see org.collectionspace.services.client.test.BaseServiceTest#getClientInstance()
@@ -119,6 +121,7 @@ public class AcquisitionAuthRefsTest extends BaseServiceTest {
             "April 1, 2010",
            acquisitionAuthorizerRefName,
             acquisitionFundingSourcesRefNames,
+            ownersRefNames,
             acquisitionSourcesRefNames);
 
         AcquisitionClient acquisitionClient = new AcquisitionClient();
@@ -180,6 +183,14 @@ public class AcquisitionAuthRefsTest extends BaseServiceTest {
         acquisitionFundingSourcesRefNames.add(PersonAuthorityClientUtils.getPersonRefName(personAuthCSID, csid, null));
         personIdsCreated.add(csid);
          */
+        
+        csid = createPerson("Owen", "OwnerOne", "owenOwnerOne", authRefName);
+        ownersRefNames.add(PersonAuthorityClientUtils.getPersonRefName(personAuthCSID, csid, null));
+        personIdsCreated.add(csid);
+
+        csid = createPerson("Orelia", "OwnerTwo", "oreliaOwnerTwo", authRefName);
+        ownersRefNames.add(PersonAuthorityClientUtils.getPersonRefName(personAuthCSID, csid, null));
+        personIdsCreated.add(csid);
 
         csid = createPerson("Sammy", "SourceOne", "sammySourceOne", authRefName);
         acquisitionSourcesRefNames.add(PersonAuthorityClientUtils.getPersonRefName(personAuthCSID, csid, null));
@@ -256,6 +267,12 @@ public class AcquisitionAuthRefsTest extends BaseServiceTest {
         */
 
         // In scalar repeatable fields
+        OwnerList ownersList = acquisition.getOwners();
+        List<String> owners = ownersList.getOwner();
+        for (String refName : owners) {
+          Assert.assertTrue(ownersRefNames.contains(refName));
+        }
+
         AcquisitionSourceList acquisitionSources = acquisition.getAcquisitionSources();
         List<String> sources = acquisitionSources.getAcquisitionSource();
         for (String refName : sources) {
@@ -358,12 +375,16 @@ public class AcquisitionAuthRefsTest extends BaseServiceTest {
        String accessionDate,
        String acquisitionAuthorizer,
        List<String> acquisitionFundingSources,
+        List<String> acqOwners,
         List<String> acquisitionSources) {
        
         AcquisitionsCommon acquisition = new AcquisitionsCommon();
         acquisition.setAccessionDate(accessionDate);
         acquisition.setAcquisitionAuthorizer(acquisitionAuthorizer);
 
+        // AcquisitionFunding-related authrefs fields are *not* currently
+        // enabled, as described in issue CSPACE-2818
+
         /*
         AcquisitionFundingList acqFundingsList = new AcquisitionFundingList();
         List<AcquisitionFunding> acqFundings = acqFundingsList.getAcquisitionFunding();
@@ -381,6 +402,13 @@ public class AcquisitionAuthRefsTest extends BaseServiceTest {
         acquisition.setAcquisitionFundingList(acqFundingsList);
         */
 
+        OwnerList ownersList = new OwnerList();
+        List<String> owners = ownersList.getOwner();
+        for (String owner: acqOwners) {
+          owners.add(owner);
+        }
+        acquisition.setOwners(ownersList);
+
         AcquisitionSourceList acqSourcesList = new AcquisitionSourceList();
         List<String> acqSources = acqSourcesList.getAcquisitionSource();
         for (String acqSource: acquisitionSources) {

diff --git a/services/common/src/main/config/services/tenant-bindings.xml b/services/common/src/main/config/services/tenant-bindings.xml
index 184665b56da37d8dd4f6e6550808f3a2a93bfe02..fdce5391aaf38677b7dbdb816c6316479478daef 100644 (file)
--- a/services/common/src/main/config/services/tenant-bindings.xml
+++ b/services/common/src/main/config/services/tenant-bindings.xml
@@ -767,6 +767,7 @@
                               label="acquisitions_common" updated="" order="1">
                     <service:properties>
                         <types:item><types:key>authRef</types:key><types:value>acquisitionAuthorizer</types:value></types:item>
+                        <types:item><types:key>authRef</types:key><types:value>owners|owner</types:value></types:item>
                         <types:item><types:key>authRef</types:key><types:value>acquisitionSources|acquisitionSource</types:value></types:item>
                         <!-- Commented out for now, as searching within a field in a complexType breaks searches for referenced objects -->
                         <!-- <types:item><types:key>authRef</types:key><types:value>acquisitionFundingList|acquisitionFundingSource</types:value></types:item> -->
@@ -1910,6 +1911,7 @@
                               label="acquisitions_common" updated="" order="1">
                     <service:properties>
                         <types:item><types:key>authRef</types:key><types:value>acquisitionAuthorizer</types:value></types:item>
+                        <types:item><types:key>authRef</types:key><types:value>owners|owner</types:value></types:item>
                         <types:item><types:key>authRef</types:key><types:value>acquisitionSources|acquisitionSource</types:value></types:item>
                         <!-- Commented out for now, as searching within a field in a complexType breaks searches for referenced objects -->
                         <!-- <types:item><types:key>authRef</types:key><types:value>acquisitionFundingList|acquisitionFundingSource</types:value></types:item> -->