CSPACE-2300: Added borrowersAuthorizer field to LoansIn (aka LoansIn) records, in...

diff --git a/services/common/src/main/config/services/tenant-bindings.xml b/services/common/src/main/config/services/tenant-bindings.xml
index e11388c0120c2bbcdf0d4eb8f2346f5b805ddba5..0caf1ff9ffd87659c54e9b940ab421854f6316d8 100644 (file)
--- a/services/common/src/main/config/services/tenant-bindings.xml
+++ b/services/common/src/main/config/services/tenant-bindings.xml
@@ -206,6 +206,7 @@
                         <types:item><types:key>authRef</types:key><types:value>lendersAuthorizer</types:value></types:item>
                         <types:item><types:key>authRef</types:key><types:value>lendersContact</types:value></types:item>
                         <types:item><types:key>authRef</types:key><types:value>loanInContact</types:value></types:item>
+                        <types:item><types:key>authRef</types:key><types:value>borrowersAuthorizer</types:value></types:item>
                     </service:properties>
                     <service:content contentType="application/xml">
                         <service:xmlContent
@@ -1312,6 +1313,7 @@
                         <types:item><types:key>authRef</types:key><types:value>lendersAuthorizer</types:value></types:item>
                         <types:item><types:key>authRef</types:key><types:value>lendersContact</types:value></types:item>
                         <types:item><types:key>authRef</types:key><types:value>loanInContact</types:value></types:item>
+                        <types:item><types:key>authRef</types:key><types:value>borrowersAuthorizer</types:value></types:item>
                     </service:properties>
                     <service:content contentType="application/xml">
                         <service:xmlContent

diff --git a/services/loanin/3rdparty/nuxeo-platform-cs-loanin/src/main/resources/schemas/loansin_common.xsd b/services/loanin/3rdparty/nuxeo-platform-cs-loanin/src/main/resources/schemas/loansin_common.xsd
index c3bfb213ece766ad7b4aab4ce4b5bc9a63bd1ec3..da97dd42bf9a087de0d916ba08bfd963c292bfb5 100644 (file)
--- a/services/loanin/3rdparty/nuxeo-platform-cs-loanin/src/main/resources/schemas/loansin_common.xsd
+++ b/services/loanin/3rdparty/nuxeo-platform-cs-loanin/src/main/resources/schemas/loansin_common.xsd
@@ -27,6 +27,7 @@
     <xs:element name="lendersAuthorizationDate" type="xs:string"/>\r
     <xs:element name="lendersContact" type="xs:string"/>\r
     <xs:element name="loanInContact" type="xs:string"/>\r
+    <xs:element name="borrowersAuthorizer" type="xs:string"/>\r
     <xs:element name="loanInConditions" type="xs:string"/>\r
     <xs:element name="loanInDate" type="xs:string"/>\r
     <xs:element name="loanReturnDate" type="xs:string"/>\r

diff --git a/services/loanin/client/src/test/java/org/collectionspace/services/client/test/LoaninAuthRefsTest.java b/services/loanin/client/src/test/java/org/collectionspace/services/client/test/LoaninAuthRefsTest.java
index 122b15c1838f1ab81640d3dc41549497359d31a8..365e7c22d8064df02e47c507f8905cdbdfd630f0 100644 (file)
--- a/services/loanin/client/src/test/java/org/collectionspace/services/client/test/LoaninAuthRefsTest.java
+++ b/services/loanin/client/src/test/java/org/collectionspace/services/client/test/LoaninAuthRefsTest.java
@@ -76,9 +76,10 @@ public class LoaninAuthRefsTest extends BaseServiceTest {
     private String lendersAuthorizerRefName = null;
     private String lendersContactRefName = null;
     private String loanInContactRefName = null;
+    private String borrowersAuthorizerRefName = null;
     // FIXME: May change when repeatable / multivalue 'lenders' field is added
     // to tenant-bindings.xml
-    private final int NUM_AUTH_REFS_EXPECTED = 4;
+    private final int NUM_AUTH_REFS_EXPECTED = 5;
 
     /* (non-Javadoc)
      * @see org.collectionspace.services.client.test.BaseServiceTest#getClientInstance()
@@ -123,10 +124,11 @@ public class LoaninAuthRefsTest extends BaseServiceTest {
         MultipartOutput multipart = createLoaninInstance(
                 "loanInNumber-" + identifier,
                 "returnDate-" + identifier,
-                                                               lenderRefName,
+               lenderRefName,
                 lendersAuthorizerRefName,
                 lendersContactRefName,
-                loanInContactRefName);
+                loanInContactRefName,
+                borrowersAuthorizerRefName);
         ClientResponse<Response> response = loaninClient.create(multipart);
         int statusCode = response.getStatus();
         try {
@@ -195,6 +197,10 @@ public class LoaninAuthRefsTest extends BaseServiceTest {
         personIdsCreated.add(csid);
         loanInContactRefName = PersonAuthorityClientUtils.getPersonRefName(personAuthCSID, csid, null);
 
+        csid = createPerson("Bonnie", "Borrowersauthorizer", "bonnieBorrowersauthorizer", authRefName);
+        personIdsCreated.add(csid);
+        borrowersAuthorizerRefName = PersonAuthorityClientUtils.getPersonRefName(personAuthCSID, csid, null);
+
         // FIXME: Add instance(s) of 'lenders' field when we can work with
         // repeatable / multivalued authority reference fields.  Be sure to
         // change the NUM_AUTH_REFS_EXPECTED constant accordingly, or otherwise
@@ -256,6 +262,7 @@ public class LoaninAuthRefsTest extends BaseServiceTest {
         Assert.assertEquals(loanin.getLendersAuthorizer(), lendersAuthorizerRefName);
         Assert.assertEquals(loanin.getLendersContact(), lendersContactRefName);
         Assert.assertEquals(loanin.getLoanInContact(), loanInContactRefName);
+        Assert.assertEquals(loanin.getBorrowersAuthorizer(), borrowersAuthorizerRefName);
         
         // Get the auth refs and check them
         ClientResponse<AuthorityRefList> res2 =
@@ -363,7 +370,8 @@ public class LoaninAuthRefsTest extends BaseServiceTest {
                 String lender,
                 String lendersAuthorizer,
                 String lendersContact,
-                String loaninContact) {
+                String loaninContact,
+                String borrowersAuthorizer) {
         LoansinCommon loanin = new LoansinCommon();
         loanin.setLoanInNumber(loaninNumber);
         loanin.setLoanInNumber(returnDate);
@@ -371,6 +379,7 @@ public class LoaninAuthRefsTest extends BaseServiceTest {
         loanin.setLendersAuthorizer(lendersAuthorizer);
         loanin.setLendersContact(lendersContact);
         loanin.setLoanInContact(loaninContact);
+        loanin.setBorrowersAuthorizer(borrowersAuthorizer);
         MultipartOutput multipart = new MultipartOutput();
         OutputPart commonPart =
             multipart.addPart(loanin, MediaType.APPLICATION_XML_TYPE);

diff --git a/services/loanin/jaxb/src/main/resources/loansin-common.xsd b/services/loanin/jaxb/src/main/resources/loansin-common.xsd
index ae65cf10c99c372f34c14dab71efe5273b1e89b2..b03aac010772635f0bfdac90bf1c378c9258d850 100644 (file)
--- a/services/loanin/jaxb/src/main/resources/loansin-common.xsd
+++ b/services/loanin/jaxb/src/main/resources/loansin-common.xsd
@@ -38,6 +38,7 @@
                 <xs:element name="lendersAuthorizationDate" type="xs:string"/>
                 <xs:element name="lendersContact" type="xs:string"/>
                 <xs:element name="loanInContact" type="xs:string"/>
+                <xs:element name="borrowersAuthorizer" type="xs:string"/>
                 <xs:element name="loanInConditions" type="xs:string"/>
                 <xs:element name="loanInDate" type="xs:string"/>
                 <xs:element name="loanReturnDate" type="xs:string"/>