From 938cc2f1b27b356b581d6189a62390796cb0b7cb Mon Sep 17 00:00:00 2001
From: Michael Ritter <mikejritter@users.noreply.github.com>
Date: Thu, 1 Feb 2024 18:02:28 -0700
Subject: [PATCH] DRYD-1378: Updates for objectCountGroup (#389)

---
 .../collectionobject/repfield_whitesp1.xml      |  1 +
 .../collectionobject/repfield_whitesp2.xml      |  5 +++++
 .../collectionobject/repfield_whitesp3.xml      |  7 +++++++
 .../collectionobject/repfield_whitesp4.xml      |  5 +++++
 .../collectionobject/testCambridge.xml          |  5 +++++
 .../test/CollectionObjectServiceTest.java       | 15 ---------------
 .../resources/test-data/repfield_whitesp1.xml   |  1 +
 .../resources/test-data/repfield_whitesp2.xml   |  5 +++++
 .../resources/test-data/repfield_whitesp3.xml   |  7 +++++++
 .../resources/test-data/repfield_whitesp4.xml   |  5 +++++
 .../test/resources/test-data/testCambridge.xml  |  7 ++++++-
 .../main/resources/collectionobjects_common.xsd | 17 +++++++++++++++++
 .../anthro/anthro-tenant-bindings.delta.xml     |  1 +
 .../bonsai/bonsai-tenant-bindings.delta.xml     |  1 +
 .../fcart/fcart-tenant-bindings.delta.xml       |  1 +
 .../materials-tenant-bindings.delta.xml         |  1 +
 .../tenants/tenant-bindings-proto-unified.xml   |  1 +
 .../requests/collectionobject-request.xml       |  5 +++++
 18 files changed, 74 insertions(+), 16 deletions(-)

diff --git a/services/IntegrationTests/src/test/resources/test-data/xmlreplay/collectionobject/repfield_whitesp1.xml b/services/IntegrationTests/src/test/resources/test-data/xmlreplay/collectionobject/repfield_whitesp1.xml
index 5d46bb54f..338484b29 100644
--- a/services/IntegrationTests/src/test/resources/test-data/xmlreplay/collectionobject/repfield_whitesp1.xml
+++ b/services/IntegrationTests/src/test/resources/test-data/xmlreplay/collectionobject/repfield_whitesp1.xml
@@ -4,6 +4,7 @@
 <briefDescriptions> <briefDescription> briefDescription</briefDescription></briefDescriptions>
 <distinguishingFeatures>distFeatures</distinguishingFeatures>
 <numberOfObjects>1</numberOfObjects>
+<objectCountGroupList> <objectCountGroup><objectCount>1</objectCount></objectCountGroup></objectCountGroupList>
 <!-- test whitespace as first child node -->
 <responsibleDepartments> <responsibleDepartment> responsibleDept1</responsibleDepartment><responsibleDepartment>responsibleDept2</responsibleDepartment></responsibleDepartments>
 <titleGroupList><titleGroup><title>title</title></titleGroup></titleGroupList>
diff --git a/services/IntegrationTests/src/test/resources/test-data/xmlreplay/collectionobject/repfield_whitesp2.xml b/services/IntegrationTests/src/test/resources/test-data/xmlreplay/collectionobject/repfield_whitesp2.xml
index 8a24b2e07..998f92413 100644
--- a/services/IntegrationTests/src/test/resources/test-data/xmlreplay/collectionobject/repfield_whitesp2.xml
+++ b/services/IntegrationTests/src/test/resources/test-data/xmlreplay/collectionobject/repfield_whitesp2.xml
@@ -8,6 +8,11 @@
 </briefDescriptions>
 <distinguishingFeatures>distFeatures</distinguishingFeatures>
 <numberOfObjects>1</numberOfObjects>
+<objectCountGroupList>
+<objectCountGroup>
+<objectCount>1</objectCount>
+</objectCountGroup>
+</objectCountGroupList>
 <!-- test newline whitespace -->
 <responsibleDepartments>
 <responsibleDepartment>responsibleDept1</responsibleDepartment>
diff --git a/services/IntegrationTests/src/test/resources/test-data/xmlreplay/collectionobject/repfield_whitesp3.xml b/services/IntegrationTests/src/test/resources/test-data/xmlreplay/collectionobject/repfield_whitesp3.xml
index 1d6d30e5d..2ca0df5eb 100644
--- a/services/IntegrationTests/src/test/resources/test-data/xmlreplay/collectionobject/repfield_whitesp3.xml
+++ b/services/IntegrationTests/src/test/resources/test-data/xmlreplay/collectionobject/repfield_whitesp3.xml
@@ -10,6 +10,13 @@
 
 <distinguishingFeatures>distFeatures</distinguishingFeatures>
 <numberOfObjects>1</numberOfObjects>
+
+<objectCountGroupList>
+<objectCountGroup>
+<objectCount>1</objectCount>
+</objectCountGroup>
+</objectCountGroupList>
+
 <!-- test newline whitespace -->
 <responsibleDepartments>
 <!-- test childnode as whitespace -->
diff --git a/services/IntegrationTests/src/test/resources/test-data/xmlreplay/collectionobject/repfield_whitesp4.xml b/services/IntegrationTests/src/test/resources/test-data/xmlreplay/collectionobject/repfield_whitesp4.xml
index b692b2ca5..762de1650 100644
--- a/services/IntegrationTests/src/test/resources/test-data/xmlreplay/collectionobject/repfield_whitesp4.xml
+++ b/services/IntegrationTests/src/test/resources/test-data/xmlreplay/collectionobject/repfield_whitesp4.xml
@@ -8,6 +8,11 @@
 </briefDescriptions>
 <distinguishingFeatures>distFeatures</distinguishingFeatures>
 <numberOfObjects>1</numberOfObjects>
+<objectCountGroupList>
+    <objectCountGroup>
+        <objectCount>1</objectCount>
+    </objectCountGroup>
+</objectCountGroupList>
 <!-- test newline and tab whitespace -->
 <responsibleDepartments>
     <responsibleDepartment>responsibleDept1</responsibleDepartment>
diff --git a/services/IntegrationTests/src/test/resources/test-data/xmlreplay/collectionobject/testCambridge.xml b/services/IntegrationTests/src/test/resources/test-data/xmlreplay/collectionobject/testCambridge.xml
index 6eea3b41c..ca314afc4 100644
--- a/services/IntegrationTests/src/test/resources/test-data/xmlreplay/collectionobject/testCambridge.xml
+++ b/services/IntegrationTests/src/test/resources/test-data/xmlreplay/collectionobject/testCambridge.xml
@@ -5,6 +5,11 @@
   <comments>comments</comments>
   <distinguishingFeatures>distFeatures</distinguishingFeatures>
   <numberOfObjects>1</numberOfObjects>
+  <objectCountGroupList>
+    <objectCountGroup>
+      <objectCount>1</objectCount>
+    </objectCountGroup>
+  </objectCountGroupList>
   <responsibleDepartments>
   </responsibleDepartments>
   <titleGroupList>
diff --git a/services/collectionobject/client/src/test/java/org/collectionspace/services/client/test/CollectionObjectServiceTest.java b/services/collectionobject/client/src/test/java/org/collectionspace/services/client/test/CollectionObjectServiceTest.java
index 18022aecf..41c6b4c0d 100644
--- a/services/collectionobject/client/src/test/java/org/collectionspace/services/client/test/CollectionObjectServiceTest.java
+++ b/services/collectionobject/client/src/test/java/org/collectionspace/services/client/test/CollectionObjectServiceTest.java
@@ -28,21 +28,6 @@ import java.util.List;
 
 import javax.ws.rs.core.MediaType;
 import javax.ws.rs.core.Response;
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-//import org.collectionspace.services.client.AbstractServiceClientImpl;
 import org.collectionspace.services.client.CollectionObjectClient;
 import org.collectionspace.services.client.CollectionObjectFactory;
 import org.collectionspace.services.client.CollectionSpaceClient;
diff --git a/services/collectionobject/client/src/test/resources/test-data/repfield_whitesp1.xml b/services/collectionobject/client/src/test/resources/test-data/repfield_whitesp1.xml
index 5e0e0eda1..c88e26a2c 100644
--- a/services/collectionobject/client/src/test/resources/test-data/repfield_whitesp1.xml
+++ b/services/collectionobject/client/src/test/resources/test-data/repfield_whitesp1.xml
@@ -5,6 +5,7 @@
 <briefDescriptions> <briefDescription> briefDescription</briefDescription></briefDescriptions>
 <distinguishingFeatures>distFeatures</distinguishingFeatures>
 <numberOfObjects>numberOfObjects</numberOfObjects>
+<objectCountGroupList> <objectCountGroup><objectCount>1</objectCount></objectCountGroup></objectCountGroupList>
 <!-- test whitespace as first child node -->
 <responsibleDepartments> <responsibleDepartment> responsibleDept1</responsibleDepartment><responsibleDepartment>responsibleDept2</responsibleDepartment></responsibleDepartments>
 </ns2:collectionobjects_common> 
diff --git a/services/collectionobject/client/src/test/resources/test-data/repfield_whitesp2.xml b/services/collectionobject/client/src/test/resources/test-data/repfield_whitesp2.xml
index 3dc3a28dd..0e838d6bb 100644
--- a/services/collectionobject/client/src/test/resources/test-data/repfield_whitesp2.xml
+++ b/services/collectionobject/client/src/test/resources/test-data/repfield_whitesp2.xml
@@ -8,6 +8,11 @@
 </briefDescriptions>
 <distinguishingFeatures>distFeatures</distinguishingFeatures>
 <numberOfObjects>numberOfObjects</numberOfObjects>
+<objectCountGroupList>
+<objectCountGroup>
+<objectCount>1</objectCount>
+</objectCountGroup>
+</objectCountGroupList>
 <!-- test newline whitespace -->
 <responsibleDepartments>
 <responsibleDepartment>responsibleDept1</responsibleDepartment>
diff --git a/services/collectionobject/client/src/test/resources/test-data/repfield_whitesp3.xml b/services/collectionobject/client/src/test/resources/test-data/repfield_whitesp3.xml
index 8529c5897..5dbc260a4 100644
--- a/services/collectionobject/client/src/test/resources/test-data/repfield_whitesp3.xml
+++ b/services/collectionobject/client/src/test/resources/test-data/repfield_whitesp3.xml
@@ -10,6 +10,13 @@
 
 <distinguishingFeatures>distFeatures</distinguishingFeatures>
 <numberOfObjects>numberOfObjects</numberOfObjects>
+
+<objectCountGroupList>
+<objectCountGroup>
+<objectCount>1</objectCount>
+</objectCountGroup>
+</objectCountGroupList>
+
 <!-- test newline whitespace -->
 <responsibleDepartments>
 <!-- test childnode as whitespace -->
diff --git a/services/collectionobject/client/src/test/resources/test-data/repfield_whitesp4.xml b/services/collectionobject/client/src/test/resources/test-data/repfield_whitesp4.xml
index 58b5b169b..e30484b33 100644
--- a/services/collectionobject/client/src/test/resources/test-data/repfield_whitesp4.xml
+++ b/services/collectionobject/client/src/test/resources/test-data/repfield_whitesp4.xml
@@ -8,6 +8,11 @@
 </briefDescriptions>
 <distinguishingFeatures>distFeatures</distinguishingFeatures>
 <numberOfObjects>numberOfObjects</numberOfObjects>
+<objectCountGroupList>
+    <objectCountGroup>
+        <objectCount>1</objectCount>
+    </objectCountGroup>
+</objectCountGroupList>
 <!-- test newline and tab whitespace -->
 <responsibleDepartments>
     <responsibleDepartment>responsibleDept1</responsibleDepartment>
diff --git a/services/collectionobject/client/src/test/resources/test-data/testCambridge.xml b/services/collectionobject/client/src/test/resources/test-data/testCambridge.xml
index 30dd4ef19..6757f9a9a 100644
--- a/services/collectionobject/client/src/test/resources/test-data/testCambridge.xml
+++ b/services/collectionobject/client/src/test/resources/test-data/testCambridge.xml
@@ -11,4 +11,9 @@
   <objectNumber>objectNumber</objectNumber>
   <distinguishingFeatures>distFeatures</distinguishingFeatures>
   <numberOfObjects>numberOfObjects</numberOfObjects>
-</ns2:collectionobjects_common> 
+  <objectCountGroupList>
+    <objectCountGroup>
+      <objectCount>1</objectCount>
+    </objectCountGroup>
+  </objectCountGroupList>
+</ns2:collectionobjects_common>
diff --git a/services/collectionobject/jaxb/src/main/resources/collectionobjects_common.xsd b/services/collectionobject/jaxb/src/main/resources/collectionobjects_common.xsd
index ee8cc3033..89d0a3d6e 100644
--- a/services/collectionobject/jaxb/src/main/resources/collectionobjects_common.xsd
+++ b/services/collectionobject/jaxb/src/main/resources/collectionobjects_common.xsd
@@ -42,6 +42,7 @@
                 <xs:element name="comments" type="commentList"/>
                 <xs:element name="distinguishingFeatures" type="xs:string"/>
                 <xs:element name="numberOfObjects" type="xs:integer"/>
+                <xs:element name="objectCountGroupList" type="objectCountGroupList" />
                 <xs:element name="objectNameList" type="ns:objectNameList"/>
                 <xs:element name="responsibleDepartments" type="responsibleDepartmentList"/>
                 <xs:element name="collection" type="xs:string"/>
@@ -173,6 +174,22 @@
         </xs:complexType>
     </xs:element>
 
+    <xs:complexType name="objectCountGroupList">
+        <xs:sequence>
+            <xs:element name="objectCountGroup" type="objectCountGroup" minOccurs="0"
+                        maxOccurs="unbounded"/>
+        </xs:sequence>
+    </xs:complexType>
+    <xs:complexType name="objectCountGroup">
+        <xs:sequence>
+            <xs:element name="objectCount" type="xs:integer" />
+            <xs:element name="objectCountType" type="xs:string" />
+            <xs:element name="objectCountCountedBy" type="xs:string" />
+            <xs:element name="objectCountDate" type="xs:date" />
+            <xs:element name="objectCountNote" type="xs:string" />
+        </xs:sequence>
+    </xs:complexType>
+
     <xs:complexType name="otherNumberList">
         <xs:sequence>
             <xs:element name="otherNumber" type="otherNumber" minOccurs="0" maxOccurs="unbounded"/>
diff --git a/services/common/src/main/cspace/config/services/tenants/anthro/anthro-tenant-bindings.delta.xml b/services/common/src/main/cspace/config/services/tenants/anthro/anthro-tenant-bindings.delta.xml
index 0ea5aa8ab..667459fa8 100644
--- a/services/common/src/main/cspace/config/services/tenants/anthro/anthro-tenant-bindings.delta.xml
+++ b/services/common/src/main/cspace/config/services/tenants/anthro/anthro-tenant-bindings.delta.xml
@@ -34,6 +34,7 @@
 							"collectionobjects_common:materialGroupList",
 							"collectionobjects_common:measuredPartGroupList",
 							"collectionobjects_common:numberOfObjects",
+							"collectionobjects_common:objectCountGroupList",
 							"collectionobjects_common:objectHistoryNote",
 							"collectionobjects_common:objectNameList",
 							"collectionobjects_common:objectNumber",
diff --git a/services/common/src/main/cspace/config/services/tenants/bonsai/bonsai-tenant-bindings.delta.xml b/services/common/src/main/cspace/config/services/tenants/bonsai/bonsai-tenant-bindings.delta.xml
index be470110e..266f381c8 100644
--- a/services/common/src/main/cspace/config/services/tenants/bonsai/bonsai-tenant-bindings.delta.xml
+++ b/services/common/src/main/cspace/config/services/tenants/bonsai/bonsai-tenant-bindings.delta.xml
@@ -28,6 +28,7 @@
 							"collectionobjects_common:materialGroupList",
 							"collectionobjects_common:measuredPartGroupList",
 							"collectionobjects_common:numberOfObjects",
+							"collectionobjects_common:objectCountGroupList",
 							"collectionobjects_common:objectHistoryNote",
 							"collectionobjects_common:objectNameList",
 							"collectionobjects_common:objectNumber",
diff --git a/services/common/src/main/cspace/config/services/tenants/fcart/fcart-tenant-bindings.delta.xml b/services/common/src/main/cspace/config/services/tenants/fcart/fcart-tenant-bindings.delta.xml
index 33e44639b..635c908ec 100644
--- a/services/common/src/main/cspace/config/services/tenants/fcart/fcart-tenant-bindings.delta.xml
+++ b/services/common/src/main/cspace/config/services/tenants/fcart/fcart-tenant-bindings.delta.xml
@@ -28,6 +28,7 @@
 							"collectionobjects_common:materialGroupList",
 							"collectionobjects_common:measuredPartGroupList",
 							"collectionobjects_common:numberOfObjects",
+							"collectionobjects_common:objectCountGroupList",
 							"collectionobjects_common:objectHistoryNote",
 							"collectionobjects_common:objectNameList",
 							"collectionobjects_common:objectNumber",
diff --git a/services/common/src/main/cspace/config/services/tenants/materials/materials-tenant-bindings.delta.xml b/services/common/src/main/cspace/config/services/tenants/materials/materials-tenant-bindings.delta.xml
index 624494ad5..96830c7d2 100644
--- a/services/common/src/main/cspace/config/services/tenants/materials/materials-tenant-bindings.delta.xml
+++ b/services/common/src/main/cspace/config/services/tenants/materials/materials-tenant-bindings.delta.xml
@@ -89,6 +89,7 @@
                     "collectionobjects_materials:materialGenericColors",
                     "collectionobjects_materials:materialFinishGroupList",
                     "collectionobjects_common:numberOfObjects",
+                    "collectionobjects_common:objectCountGroupList",
                     "collectionobjects_common:briefDescriptions",
                     "collectionobjects_common:measuredPartGroupList",
                     "collectionobjects_common:viewersContributionNote",
diff --git a/services/common/src/main/cspace/config/services/tenants/tenant-bindings-proto-unified.xml b/services/common/src/main/cspace/config/services/tenants/tenant-bindings-proto-unified.xml
index 3a6c4c961..85eb75226 100644
--- a/services/common/src/main/cspace/config/services/tenants/tenant-bindings-proto-unified.xml
+++ b/services/common/src/main/cspace/config/services/tenants/tenant-bindings-proto-unified.xml
@@ -1159,6 +1159,7 @@
 							"collectionobjects_common:materialGroupList",
 							"collectionobjects_common:measuredPartGroupList",
 							"collectionobjects_common:numberOfObjects",
+							"collectionobjects_common:objectCountGroupList",
 							"collectionobjects_common:objectHistoryNote",
 							"collectionobjects_common:objectNameList",
 							"collectionobjects_common:objectNumber",
diff --git a/services/imports/service/src/test/resources/requests/collectionobject-request.xml b/services/imports/service/src/test/resources/requests/collectionobject-request.xml
index 1d229a32d..c9340dfa4 100644
--- a/services/imports/service/src/test/resources/requests/collectionobject-request.xml
+++ b/services/imports/service/src/test/resources/requests/collectionobject-request.xml
@@ -81,6 +81,11 @@
               <contentConcept></contentConcept>
             </collectionobjects_common:contentConcepts>
             <collectionobjects_common:numberOfObjects>1</collectionobjects_common:numberOfObjects>
+            <collectionobjects_common:objectCountGroupList>
+              <collectionobjects_common:objectCountGroup>
+                <collectionobjects_common:objectCount>1</collectionobjects_common:objectCount>
+              </collectionobjects_common:objectCountGroup>
+            </collectionobjects_common:objectCountGroupList>
             <collectionobjects_common:ownershipExchangePriceCurrency>poundsterling</collectionobjects_common:ownershipExchangePriceCurrency>
             <collectionobjects_common:contentOtherGroupList>
               <contentOtherGroup>
-- 
2.47.3