CSPACE-2135,CSPACE-1220: Updated Intake schema at the services layer to the Limited...

diff --git a/services/common/src/main/config/services/tenant-bindings.xml b/services/common/src/main/config/services/tenant-bindings.xml
index af3aa1febfbcb11c58d5ccdb1ac63b5081ebba67..08708861383241ba729bd9b8344d20c72a2e1541 100644 (file)
--- a/services/common/src/main/config/services/tenant-bindings.xml
+++ b/services/common/src/main/config/services/tenant-bindings.xml
@@ -126,9 +126,8 @@
                     <service:properties>
                         <types:item><types:key>authRef</types:key><types:value>currentOwner</types:value></types:item>
                         <types:item><types:key>authRef</types:key><types:value>depositor</types:value></types:item>
-                        <types:item><types:key>authRef</types:key><types:value>conditionCheckAssesor</types:value></types:item>
+                        <types:item><types:key>authRef</types:key><types:value>conditionCheckerAssessor</types:value></types:item>
                         <types:item><types:key>authRef</types:key><types:value>insurer</types:value></types:item>
-                        <types:item><types:key>authRef</types:key><types:value>fieldCollector</types:value></types:item>
                         <types:item><types:key>authRef</types:key><types:value>valuer</types:value></types:item>
                     </service:properties>
                     <service:content contentType="application/xml">
@@ -1173,9 +1172,8 @@
                     <service:properties>
                         <types:item><types:key>authRef</types:key><types:value>currentOwner</types:value></types:item>
                         <types:item><types:key>authRef</types:key><types:value>depositor</types:value></types:item>
-                        <types:item><types:key>authRef</types:key><types:value>conditionCheckAssesor</types:value></types:item>
+                        <types:item><types:key>authRef</types:key><types:value>conditionCheckerAssessor</types:value></types:item>
                         <types:item><types:key>authRef</types:key><types:value>insurer</types:value></types:item>
-                        <types:item><types:key>authRef</types:key><types:value>fieldCollector</types:value></types:item>
                         <types:item><types:key>authRef</types:key><types:value>valuer</types:value></types:item>
                     </service:properties>
                     <service:content contentType="application/xml">

diff --git a/services/intake/3rdparty/nuxeo-platform-cs-intake/src/main/resources/schemas/intakes_common.xsd b/services/intake/3rdparty/nuxeo-platform-cs-intake/src/main/resources/schemas/intakes_common.xsd
index d27a2f40896ab6d60d4533fd7db42dbb51f12005..d424b59100e3860a9f9036fb42a2c7b723fbb62b 100644 (file)
--- a/services/intake/3rdparty/nuxeo-platform-cs-intake/src/main/resources/schemas/intakes_common.xsd
+++ b/services/intake/3rdparty/nuxeo-platform-cs-intake/src/main/resources/schemas/intakes_common.xsd
@@ -2,7 +2,7 @@
 \r
 <!--\r
     Intake schema (XSD)\r
-    \r
+\r
     Entity  : Intake\r
     Part    : Common\r
     Used for: Nuxeo EP core document type\r
@@ -20,7 +20,7 @@
     \r
     <!-- See http://wiki.collectionspace.org/display/collectionspace/Intake+Schema -->\r
 \r
-<!--  Object Entry Information Group -->\r
+    <!--  Object Entry Information Group -->\r
     <xs:element name="currentOwner" type="xs:string"/>\r
     <xs:element name="depositor" type="xs:string"/>\r
     <xs:element name="depositorsRequirements" type="xs:string"/>\r
@@ -32,22 +32,8 @@
     <xs:element name="packingNote" type="xs:string"/>\r
     <xs:element name="returnDate" type="xs:string"/>\r
     \r
-<!--  Date Information Group -->\r
-    <xs:element name="associationDate" type="xs:string"/>\r
-    <xs:element name="earliestDate" type="xs:string"/>\r
-    <xs:element name="earliestDateCertainty" type="xs:string"/>\r
-    <xs:element name="earliestDateQualifier" type="xs:string"/>\r
-    <xs:element name="latestDate" type="xs:string"/>\r
-    <xs:element name="latestDateCertainty" type="xs:string"/>\r
-    <xs:element name="latestDateQualifier" type="xs:string"/>\r
-    <xs:element name="datePeriod" type="xs:string"/>\r
-    <xs:element name="dateText" type="xs:string"/>\r
-    \r
     <!--  Object Collection Information Group -->\r
-    <xs:element name="fieldCollectionDate" type="xs:string"/>\r
     <xs:element name="fieldCollectionEventName" type="xs:string"/>\r
-    <xs:element name="fieldCollectionNumber" type="xs:string"/>\r
-    <xs:element name="fieldCollector" type="xs:string"/>\r
 \r
     <!-- Valuation Information Group -->\r
     <xs:element name="valuationReferenceNumber" type="xs:string"/>\r
@@ -60,19 +46,31 @@
     <xs:element name="insuranceRenewalDate" type="xs:string"/>\r
     <xs:element name="insurer" type="xs:string"/>\r
     \r
-<!-- Object Location Information Group -->\r
+    <!-- Object Location Information Group -->\r
     <xs:element name="currentLocation" type="xs:string"/>\r
     <xs:element name="currentLocationFitness" type="xs:string"/>\r
     <xs:element name="currentLocationNote" type="xs:string"/>\r
     <xs:element name="locationDate" type="xs:string"/>\r
     <xs:element name="normalLocation" type="xs:string"/>\r
     \r
-<!-- Condition Check/Technical Assessment Information Group -->\r
+    <!-- Condition Check/Technical Assessment Information Group -->\r
     <xs:element name="conditionCheckDate" type="xs:string"/>\r
     <xs:element name="conditionCheckMethod" type="xs:string"/>\r
     <xs:element name="conditionCheckNote" type="xs:string"/>\r
     <xs:element name="conditionCheckReason" type="xs:string"/>\r
     <xs:element name="conditionCheckReferenceNumber" type="xs:string"/>\r
-    <xs:element name="conditionCheckAssesor" type="xs:string"/>\r
+    <xs:element name="conditionCheckerAssessor" type="xs:string"/>\r
+\r
+    <!--  Date Information Group -->\r
+    <!-- This appears to be a placeholder structured date -->\r
+    <xs:element name="dateAssociation" type="xs:string"/>\r
+    <xs:element name="earliestDate" type="xs:string"/>\r
+    <xs:element name="earliestDateCertainty" type="xs:string"/>\r
+    <xs:element name="earliestDateQualifier" type="xs:string"/>\r
+    <xs:element name="latestDate" type="xs:string"/>\r
+    <xs:element name="latestDateCertainty" type="xs:string"/>\r
+    <xs:element name="latestDateQualifier" type="xs:string"/>\r
+    <xs:element name="datePeriod" type="xs:string"/>\r
+    <xs:element name="dateText" type="xs:string"/>\r
     \r
 </xs:schema>\r

diff --git a/services/intake/client/src/test/java/org/collectionspace/services/client/test/IntakeAuthRefsTest.java b/services/intake/client/src/test/java/org/collectionspace/services/client/test/IntakeAuthRefsTest.java
index e0c0cd917de0091e089a839cf3262b4626870fe1..d3e7c09d42f532dc0926e20590ea7381699fc0ea 100644 (file)
--- a/services/intake/client/src/test/java/org/collectionspace/services/client/test/IntakeAuthRefsTest.java
+++ b/services/intake/client/src/test/java/org/collectionspace/services/client/test/IntakeAuthRefsTest.java
@@ -72,11 +72,10 @@ public class IntakeAuthRefsTest extends BaseServiceTest {
     private String personAuthCSID = null; 
     private String currentOwnerRefName = null;
     private String depositorRefName = null;
-    private String conditionCheckAssesorRefName = null;
+    private String conditionCheckerAssessorRefName = null;
     private String insurerRefName = null;
-    private String fieldCollectorRefName = null;
     private String valuerRefName = null;
-    private final int NUM_AUTH_REFS_EXPECTED = 6;
+    private final int NUM_AUTH_REFS_EXPECTED = 5;
 
     /* (non-Javadoc)
      * @see org.collectionspace.services.client.test.BaseServiceTest#getClientInstance()
@@ -120,9 +119,8 @@ public class IntakeAuthRefsTest extends BaseServiceTest {
                 "entryDate-" + identifier,
                 currentOwnerRefName,
                 depositorRefName,
-                conditionCheckAssesorRefName,
+                conditionCheckerAssessorRefName,
                 insurerRefName,
-                fieldCollectorRefName,
                 valuerRefName );
         ClientResponse<Response> res = intakeClient.create(multipart);
 
@@ -177,18 +175,14 @@ public class IntakeAuthRefsTest extends BaseServiceTest {
                                                                        authRefName, "Debbie Depositor", true);
         personIdsCreated.add(createPerson("Debbie", "Depositor", depositorRefName));
         
-        conditionCheckAssesorRefName = PersonAuthorityClientUtils.createPersonRefName(
-                                                                       authRefName, "Andrew Assessor", true);
-        personIdsCreated.add(createPerson("Andrew", "Assessor", conditionCheckAssesorRefName));
+        conditionCheckerAssessorRefName = PersonAuthorityClientUtils.createPersonRefName(
+                                                                       authRefName, "Andrew Checker-Assessor", true);
+        personIdsCreated.add(createPerson("Andrew", "Checker-Assessor", conditionCheckerAssessorRefName));
         
         insurerRefName = PersonAuthorityClientUtils.createPersonRefName(
                                                                        authRefName, "Ingrid Insurer", true);
         personIdsCreated.add(createPerson("Ingrid", "Insurer", insurerRefName));
         
-        fieldCollectorRefName = PersonAuthorityClientUtils.createPersonRefName(
-                                                                       authRefName, "Connie Collector", true);
-        personIdsCreated.add(createPerson("Connie", "Collector", fieldCollectorRefName));
-        
         valuerRefName = PersonAuthorityClientUtils.createPersonRefName(
                                                                        authRefName, "Vince Valuer", true);
         personIdsCreated.add(createPerson("Vince", "Valuer", valuerRefName));
@@ -333,21 +327,20 @@ public class IntakeAuthRefsTest extends BaseServiceTest {
     }
 
    private MultipartOutput createIntakeInstance(String entryNumber,
-               String entryDate,
-                               String currentOwner,
-                               String depositor,
-                               String conditionCheckAssesor,
-                               String insurer,
-                               String fieldCollector,
-                               String Valuer ) {
+        String entryDate,
+        String currentOwner,
+        String depositor,
+        String conditionCheckerAssessor,
+        String insurer,
+        String Valuer ) {
+
         IntakesCommon intake = new IntakesCommon();
         intake.setEntryNumber(entryNumber);
         intake.setEntryDate(entryDate);
         intake.setCurrentOwner(currentOwner);
         intake.setDepositor(depositor);
-        intake.setConditionCheckAssesor(conditionCheckAssesor);
+        intake.setConditionCheckerAssessor(conditionCheckerAssessor);
         intake.setInsurer(insurer);
-        intake.setFieldCollector(fieldCollector);
         intake.setValuer(Valuer);
         MultipartOutput multipart = new MultipartOutput();
         OutputPart commonPart =

diff --git a/services/intake/client/src/test/java/org/collectionspace/services/client/test/OrganizationAuthRefDocsTest.java b/services/intake/client/src/test/java/org/collectionspace/services/client/test/OrganizationAuthRefDocsTest.java
index 7a4ecf7bb49156e180f09f349c4fa8b99b828054..1be1479c5e79ddee6d15c57c89fe60aa40b51b30 100644 (file)
--- a/services/intake/client/src/test/java/org/collectionspace/services/client/test/OrganizationAuthRefDocsTest.java
+++ b/services/intake/client/src/test/java/org/collectionspace/services/client/test/OrganizationAuthRefDocsTest.java
@@ -74,9 +74,8 @@ public class OrganizationAuthRefDocsTest extends BaseServiceTest {
     private String currentOwnerOrgCSID = null; \r
     private String currentOwnerRefName = null;\r
     private String depositorRefName = null;\r
-    private String conditionCheckAssesorRefName = null;\r
+    private String conditionCheckerAssessorRefName = null;\r
     private String insurerRefName = null;\r
-    private String fieldCollectorRefName = null;\r
     private String valuerRefName = null;\r
     private final int NUM_AUTH_REF_DOCS_EXPECTED = 1;\r
 \r
@@ -121,9 +120,8 @@ public class OrganizationAuthRefDocsTest extends BaseServiceTest {
                 "entryDate-" + identifier,\r
                                                                currentOwnerRefName,\r
                                                                depositorRefName,\r
-                                                               conditionCheckAssesorRefName,\r
+                                                               conditionCheckerAssessorRefName,\r
                                                                insurerRefName,\r
-                                                               fieldCollectorRefName,\r
                                                                valuerRefName );\r
 \r
         ClientResponse<Response> res = intakeClient.create(multipart);\r
@@ -186,18 +184,14 @@ public class OrganizationAuthRefDocsTest extends BaseServiceTest {
                                                                        authRefName, "Debbie Depositor", true);\r
         orgIdsCreated.add(createOrganization("Debbie", "Depositor", depositorRefName));\r
         \r
-        conditionCheckAssesorRefName = OrgAuthorityClientUtils.createOrganizationRefName(\r
-                                                                       authRefName, "Andrew Assessor", true);\r
-        orgIdsCreated.add(createOrganization("Andrew", "Assessor", conditionCheckAssesorRefName));\r
+        conditionCheckerAssessorRefName = OrgAuthorityClientUtils.createOrganizationRefName(\r
+                                                                       authRefName, "Andrew Checker-Assessor", true);\r
+        orgIdsCreated.add(createOrganization("Andrew", "Checker-Assessor", conditionCheckerAssessorRefName));\r
         \r
         insurerRefName = OrgAuthorityClientUtils.createOrganizationRefName(\r
                                                                        authRefName, "Ingrid Insurer", true);\r
         orgIdsCreated.add(createOrganization("Ingrid", "Insurer", insurerRefName));\r
         \r
-        fieldCollectorRefName = OrgAuthorityClientUtils.createOrganizationRefName(\r
-                                                                       authRefName, "Connie Collector", true);\r
-        orgIdsCreated.add(createOrganization("Connie", "Collector", fieldCollectorRefName));\r
-        \r
         valuerRefName = OrgAuthorityClientUtils.createOrganizationRefName(\r
                                                                        authRefName, "Vince Valuer", true);\r
         orgIdsCreated.add(createOrganization("Vince", "Valuer", valuerRefName));\r
@@ -326,18 +320,16 @@ public class OrganizationAuthRefDocsTest extends BaseServiceTest {
                String entryDate,\r
                                String currentOwner,\r
                                String depositor,\r
-                               String conditionCheckAssesor,\r
+                               String conditionCheckerAssessor,\r
                                String insurer,\r
-                               String fieldCollector,\r
                                String Valuer ) {\r
         IntakesCommon intake = new IntakesCommon();\r
         intake.setEntryNumber(entryNumber);\r
         intake.setEntryDate(entryDate);\r
         intake.setCurrentOwner(currentOwner);\r
         intake.setDepositor(depositor);\r
-        intake.setConditionCheckAssesor(conditionCheckAssesor);\r
+        intake.setConditionCheckerAssessor(conditionCheckerAssessor);\r
         intake.setInsurer(insurer);\r
-        intake.setFieldCollector(fieldCollector);\r
         intake.setValuer(Valuer);\r
         MultipartOutput multipart = new MultipartOutput();\r
         OutputPart commonPart =\r

diff --git a/services/intake/client/src/test/java/org/collectionspace/services/client/test/PersonAuthRefDocsTest.java b/services/intake/client/src/test/java/org/collectionspace/services/client/test/PersonAuthRefDocsTest.java
index ae955825ec26c5a92a96f9564608937ce36908c2..b600372d15f36fd6b80b6fdc079832f851d3234e 100644 (file)
--- a/services/intake/client/src/test/java/org/collectionspace/services/client/test/PersonAuthRefDocsTest.java
+++ b/services/intake/client/src/test/java/org/collectionspace/services/client/test/PersonAuthRefDocsTest.java
@@ -74,9 +74,8 @@ public class PersonAuthRefDocsTest extends BaseServiceTest {
     private String currentOwnerPersonCSID = null; 
     private String currentOwnerRefName = null;
     private String depositorRefName = null;
-    private String conditionCheckAssesorRefName = null;
+    private String conditionCheckerAssessorRefName = null;
     private String insurerRefName = null;
-    private String fieldCollectorRefName = null;
     private String valuerRefName = null;
     private final int NUM_AUTH_REF_DOCS_EXPECTED = 1;
 
@@ -119,12 +118,11 @@ public class PersonAuthRefDocsTest extends BaseServiceTest {
         MultipartOutput multipart = createIntakeInstance(
                 "entryNumber-" + identifier,
                 "entryDate-" + identifier,
-                                                               currentOwnerRefName,
-                                                               depositorRefName,
-                                                               conditionCheckAssesorRefName,
-                                                               insurerRefName,
-                                                               fieldCollectorRefName,
-                                                               valuerRefName );
+               currentOwnerRefName,
+               depositorRefName,
+               conditionCheckerAssessorRefName,
+               insurerRefName,
+               valuerRefName );
 
         ClientResponse<Response> res = intakeClient.create(multipart);
         try {
@@ -186,18 +184,14 @@ public class PersonAuthRefDocsTest extends BaseServiceTest {
                                                                        authRefName, "Debbie Depositor", true);
         personIdsCreated.add(createPerson("Debbie", "Depositor", depositorRefName));
         
-        conditionCheckAssesorRefName = PersonAuthorityClientUtils.createPersonRefName(
-                                                                       authRefName, "Andrew Assessor", true);
-        personIdsCreated.add(createPerson("Andrew", "Assessor", conditionCheckAssesorRefName));
+        conditionCheckerAssessorRefName = PersonAuthorityClientUtils.createPersonRefName(
+                                                                       authRefName, "Andrew Checker-Assessor", true);
+        personIdsCreated.add(createPerson("Andrew", "Checker-Assessor", conditionCheckerAssessorRefName));
         
         insurerRefName = PersonAuthorityClientUtils.createPersonRefName(
                                                                        authRefName, "Ingrid Insurer", true);
         personIdsCreated.add(createPerson("Ingrid", "Insurer", insurerRefName));
         
-        fieldCollectorRefName = PersonAuthorityClientUtils.createPersonRefName(
-                                                                       authRefName, "Connie Collector", true);
-        personIdsCreated.add(createPerson("Connie", "Collector", fieldCollectorRefName));
-        
         valuerRefName = PersonAuthorityClientUtils.createPersonRefName(
                                                                        authRefName, "Vince Valuer", true);
         personIdsCreated.add(createPerson("Vince", "Valuer", valuerRefName));
@@ -326,18 +320,16 @@ public class PersonAuthRefDocsTest extends BaseServiceTest {
                String entryDate,
                                String currentOwner,
                                String depositor,
-                               String conditionCheckAssesor,
+                               String conditionCheckerAssessor,
                                String insurer,
-                               String fieldCollector,
                                String Valuer ) {
         IntakesCommon intake = new IntakesCommon();
         intake.setEntryNumber(entryNumber);
         intake.setEntryDate(entryDate);
         intake.setCurrentOwner(currentOwner);
         intake.setDepositor(depositor);
-        intake.setConditionCheckAssesor(conditionCheckAssesor);
+        intake.setConditionCheckerAssessor(conditionCheckerAssessor);
         intake.setInsurer(insurer);
-        intake.setFieldCollector(fieldCollector);
         intake.setValuer(Valuer);
         MultipartOutput multipart = new MultipartOutput();
         OutputPart commonPart =

diff --git a/services/intake/jaxb/src/main/resources/intakes-common.xsd b/services/intake/jaxb/src/main/resources/intakes-common.xsd
index 862d1c8d452bd159fcd36a429481df85c72a0453..febe2e23db62a16c118cc963f823ac3d8cb89185 100644 (file)
--- a/services/intake/jaxb/src/main/resources/intakes-common.xsd
+++ b/services/intake/jaxb/src/main/resources/intakes-common.xsd
@@ -44,49 +44,48 @@
                 <xs:element name="entryReason" type="xs:string"/>
                 <xs:element name="packingNote" type="xs:string"/>
                 <xs:element name="returnDate" type="xs:string"/>
-                
-                <!--  Date Information Group -->
-                <xs:element name="associationDate" type="xs:string"/>
-                <xs:element name="earliestDate" type="xs:string"/>
-                <xs:element name="earliestDateCertainty" type="xs:string"/>
-                <xs:element name="earliestDateQualifier" type="xs:string"/>
-                <xs:element name="latestDate" type="xs:string"/>
-                <xs:element name="latestDateCertainty" type="xs:string"/>
-                <xs:element name="latestDateQualifier" type="xs:string"/>
-                <xs:element name="datePeriod" type="xs:string"/>
-                <xs:element name="dateText" type="xs:string"/>
-                
+
                 <!--  Object Collection Information Group -->
-                <xs:element name="fieldCollectionDate" type="xs:string"/>
                 <xs:element name="fieldCollectionEventName" type="xs:string"/>
-                <xs:element name="fieldCollectionNumber" type="xs:string"/>
-                <xs:element name="fieldCollector" type="xs:string"/>
-                
+
                 <!-- Valuation Information Group -->
                 <xs:element name="valuationReferenceNumber" type="xs:string"/>
                 <xs:element name="valuer" type="xs:string"/>
-                
+
                 <!-- Insurance Information Group -->
                 <xs:element name="insuranceNote" type="xs:string"/>
                 <xs:element name="insurancePolicyNumber" type="xs:string"/>
                 <xs:element name="insuranceReferenceNumber" type="xs:string"/>
                 <xs:element name="insuranceRenewalDate" type="xs:string"/>
                 <xs:element name="insurer" type="xs:string"/>
-                
+
                 <!-- Object Location Information Group -->
                 <xs:element name="currentLocation" type="xs:string"/>
                 <xs:element name="currentLocationFitness" type="xs:string"/>
                 <xs:element name="currentLocationNote" type="xs:string"/>
                 <xs:element name="locationDate" type="xs:string"/>
                 <xs:element name="normalLocation" type="xs:string"/>
-                
+
                 <!-- Condition Check/Technical Assessment Information Group -->
                 <xs:element name="conditionCheckDate" type="xs:string"/>
                 <xs:element name="conditionCheckMethod" type="xs:string"/>
                 <xs:element name="conditionCheckNote" type="xs:string"/>
                 <xs:element name="conditionCheckReason" type="xs:string"/>
                 <xs:element name="conditionCheckReferenceNumber" type="xs:string"/>
-                <xs:element name="conditionCheckAssesor" type="xs:string"/>
+                <xs:element name="conditionCheckerAssessor" type="xs:string"/>
+
+                <!--  Date Information Group -->
+                <!-- This appears to be a placeholder structured date -->
+                <xs:element name="dateAssociation" type="xs:string"/>
+                <xs:element name="earliestDate" type="xs:string"/>
+                <xs:element name="earliestDateCertainty" type="xs:string"/>
+                <xs:element name="earliestDateQualifier" type="xs:string"/>
+                <xs:element name="latestDate" type="xs:string"/>
+                <xs:element name="latestDateCertainty" type="xs:string"/>
+                <xs:element name="latestDateQualifier" type="xs:string"/>
+                <xs:element name="datePeriod" type="xs:string"/>
+                <xs:element name="dateText" type="xs:string"/>
+
             </xs:sequence>
         </xs:complexType>
     </xs:element>