Merge pull request #500 from collectionspace/develop

Merge Release 8.3.0-RC.1

Author: mikejritter

3rdparty/nuxeo/nuxeo-platform-elasticsearch/src/main/java/org/collectionspace/services/nuxeo/elasticsearch/DefaultESDocumentWriter.java

@@ -78,6 +78,13 @@ public ObjectNode getDenormValues(DocumentModel doc) {
 			List<Map<String, Object>> prodDateGroupList = (List<Map<String, Object>>) doc.getProperty("collectionobjects_common", "objectProductionDateGroupList");
 
 			denormValues.putArray("prodYears").addAll(structDatesToYearNodes(prodDateGroupList));
+		} else if ("Media".equals(docType) && isMediaPublished(doc)) {
+			CoreSession session = doc.getCoreSession();
+			String csid = doc.getName();
+			String tenantId = (String) doc.getProperty("collectionspace_core", "tenantId");
+
+			// Add media-specific denormalized fields
+			denormRelatedObjects(session, csid, tenantId, denormValues);
 		}
 
 		return denormValues;
@@ -135,6 +142,31 @@ private void denormMediaRecords(CoreSession session, String csid, String tenantI
 		denormValues.put("hasMedia", mediaCsids.size() > 0);
 	}
 
+	private void denormRelatedObjects(CoreSession session, String csid, String tenantId, ObjectNode denormValues) {
+		// Store the objectCsid of objects that are related to this media.
+
+		String relatedRecordQuery = String.format(
+				"SELECT * FROM Relation WHERE relations_common:objectCsid = '%s' AND relations_common:subjectDocumentType = 'CollectionObject' AND ecm:currentLifeCycleState = 'project' AND collectionspace_core:tenantId = '%s'",
+				csid, tenantId);
+		DocumentModelList relationDocs = session.query(relatedRecordQuery);
+		List<JsonNode> objectCsids = new ArrayList<JsonNode>();
+
+		if (relationDocs.size() > 0) {
+			Iterator<DocumentModel> iterator = relationDocs.iterator();
+
+			while (iterator.hasNext()) {
+				DocumentModel relationDoc = iterator.next();
+				String objectCsid = (String) relationDoc.getProperty("relations_common", "subjectCsid");
+
+				if (objectCsid != null) {
+					objectCsids.add(new TextNode(objectCsid));
+				}
+			}
+		}
+
+		denormValues.putArray("objectCsid").addAll(objectCsids);
+	}
+
 	private void denormAcquisitionRecords(CoreSession session, String csid, String tenantId, ObjectNode denormValues) {
 		// Store the credit lines of acquisition records that are related to this object.
 
@@ -266,6 +298,7 @@ private void denormConceptFields(final DocumentModel doc, final ObjectNode denor
 		final List<String> fields = Arrays.asList("contentConcepts",
 			"contentEvents",
 			"contentPersons",
+			"contentPlaces",
 			"contentOrganizations");
 
 		for (String field : fields) {
@@ -274,7 +307,18 @@ private void denormConceptFields(final DocumentModel doc, final ObjectNode denor
 			for (String content  : contentList) {
 				if (content != null) {
 					final ObjectNode node = objectMapper.createObjectNode();
-					node.put("subject", RefNameUtils.getDisplayName(content));
+					String subjectValue;
+
+					if (RefNameUtils.isTermRefname(content)) {
+						try {
+							subjectValue = RefNameUtils.getDisplayName(content);
+						} catch (Exception e) {
+							subjectValue = content;
+						}
+					} else {
+						subjectValue = content;
+					}
+					node.put("subject", subjectValue);
 					denormContentSubject.add(node);
 				}
 			}

CHANGELOG.md

@@ -0,0 +1,18 @@
+# CollectionSpace Services Changelog
+
+## 8.3.0
+
+* Add new endpoint for returning search results
+* Add JDBC_URL_OPTS build parameter
+* Add mapping for ElasticSearch imagine ordering
+* Add CSV Authority export parameter
+* Update notice of inventory completion report
+* Update notice of intent to repatriate report
+* Update full object with place details report
+* Add contentPlaces to ES mapping
+* Add blob alt text to media responses
+* Remove cspace_english namespace search
+
+### Bug Fixes
+
+* Remove flickr urls from tests

build.properties

@@ -9,7 +9,7 @@ host=127.0.0.1
 #
 # Release version info
 #
-release.version=8.2.0
+release.version=8.3.0-RC.1
 cspace.release=${release.version}
 cspace.instance.id=${env.CSPACE_INSTANCE_ID}
 
@@ -27,15 +27,15 @@ cspace.im.root=
 # UI settings
 cspace.ui.package.name=cspace-ui
 cspace.ui.library.name=cspaceUI
-cspace.ui.version=10.1.0
-cspace.ui.build.branch=main
+cspace.ui.version=10.2.0-rc1.0
+cspace.ui.build.branch=develop
 cspace.ui.build.node.ver=20
 service.ui.library.name=${cspace.ui.library.name}-service
 
 # Public browser settings
 cspace.public.browser.package.name=@collectionspace/cspace-public-browser
 cspace.public.browser.library.name=cspacePublicBrowser
-cspace.public.browser.version=3.4.0
+cspace.public.browser.version=3.5.0-rc1.0
 cspace.public.browser.build.branch=main
 cspace.public.browser.build.node.ver=20
 
@@ -198,10 +198,11 @@ db.jdbc.default.datasource=jdbc/default
 #db.jdbc.urloptions.encoded=ssl=true&sslfactory=org.postgresql.ssl.NonValidatingFactory&foo=true
 
 #
-# By default, as placeholders, we'll supply meaningless JDBC options -both encoded and non-encode forms.
+# Use the JDBC_URL_PARAMS env var to set the urloptions for the jdbc connection string
+# The db.jdbc.urloptions.encoded needs to be created in each ant target which uses it by calling the
+# urlencode scriptdef. We can still reference it below as it will be added at runtime.
 #
-db.jdbc.urloptions=foo=true&bar=false
-db.jdbc.urloptions.encoded=foo=true&bar=false
+db.jdbc.urloptions=${env.JDBC_URL_PARAMS}
 
 #
 # JDBC urls that CollectionSpace needs to talk to the "admin" database, Nuxeo databases, and the "cspace" database (i.e., the AuthN/AuthZ database)

build.xml

@@ -14,6 +14,15 @@
 		<os family="windows" />
 	</condition>
 
+  <scriptdef name="urlencode" language="javascript">
+    <attribute name="property"/>
+    <![CDATA[
+      var value = self.project.getProperty(attributes.get("property"));
+      var encoded = encodeURIComponent(value);
+      self.project.setProperty(attributes.get("property") + ".encoded", encoded)
+    ]]>
+  </scriptdef>
+
 	<target name="init">
 		<!-- Create the time stamp -->
 		<tstamp />
@@ -215,10 +224,10 @@
 	</target>
 
 	<!--
-		This target sends the 'create_nuxeo_db' and 'create_nuxeo_db' targets to all the Ant sub-modules/directories
-		and creates some database utility functions
+		This target calls the 'create_nuxeo_db' and 'create_cspace_db' targets and creates some database utility functions
 	-->
 	<target name="-create_db" depends="-validate_create_db_unix, -validate_create_db_windows">
+		<urlencode property="db.jdbc.urloptions" />
 		<antcall target="create_nuxeo_db" />
 		<antcall target="create_cspace_db" />
 		<antcall target="create_update_userid_db_function" />
@@ -303,6 +312,7 @@
 	</target>
 
 	<target name="import" description="import default configuration">
+		<urlencode property="db.jdbc.urloptions" />
 		<ant antfile="services/build.xml" target="import" inheritAll="false" />
 	</target>
 

cspace-ui/anthro/build.properties

@@ -3,7 +3,7 @@ tenant.ui.basename=/cspace/${tenant.shortname}
 
 tenant.ui.profile.plugin.package.name=cspace-ui-plugin-profile-anthro
 tenant.ui.profile.plugin.library.name=cspaceUIPluginProfileAnthro
-tenant.ui.profile.plugin.version=9.1.0
+tenant.ui.profile.plugin.version=9.2.0-rc1.0
 tenant.ui.profile.plugin.build.branch=main
 
 # If not set, defaults to /gateway/${tenant.shortname} on the current host.

pom.xml

@@ -10,7 +10,7 @@
 	<name>services</name>
 
 	<properties>
-		<revision>8.2.0</revision>
+		<revision>8.3.0-RC.1</revision>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 		<cspace.services.version>${revision}</cspace.services.version>
 		<cspace.services.client.version>${revision}</cspace.services.client.version>
@@ -318,6 +318,63 @@
 						</execution>
 					</executions>
 				</plugin>
+
+				<!-- Integration Test plugins: jetty, failsafe, and remote-resources -->
+				<plugin>
+					<groupId>org.eclipse.jetty</groupId>
+					<artifactId>jetty-maven-plugin</artifactId>
+					<version>9.4.57.v20241219</version>
+					<executions>
+						<execution>
+							<id>start-jetty</id>
+							<phase>pre-integration-test</phase>
+							<goals>
+								<goal>start</goal>
+							</goals>
+							<configuration>
+								<skip>${skipTests}</skip>
+							</configuration>
+						</execution>
+						<execution>
+							<id>stop-jetty</id>
+							<phase>post-integration-test</phase>
+							<goals>
+								<goal>stop</goal>
+							</goals>
+						</execution>
+					</executions>
+				</plugin>
+
+				<plugin>
+					<groupId>org.apache.maven.plugins</groupId>
+					<artifactId>maven-failsafe-plugin</artifactId>
+					<version>3.5.3</version>
+					<executions>
+						<execution>
+							<id>integration-test</id>
+							<goals>
+								<goal>integration-test</goal>
+							</goals>
+						</execution>
+						<execution>
+							<id>verify</id>
+							<goals>
+								<goal>verify</goal>
+							</goals>
+						</execution>
+					</executions>
+					<configuration>
+						<includes>
+							<include>**/*IT.class</include>
+						</includes>
+					</configuration>
+				</plugin>
+
+				<plugin>
+					<groupId>org.apache.maven.plugins</groupId>
+					<artifactId>maven-remote-resources-plugin</artifactId>
+					<version>3.3.0</version>
+				</plugin>
 			</plugins>
 		</pluginManagement>
 

services/IntegrationTests/src/test/resources/test-data/xmlreplay/collectionobject/related/responses/sortRelated.res.xml

@@ -3,7 +3,7 @@
     <itemsInPage>3</itemsInPage>
     <totalItems>3</totalItems>
     <fieldsReturned>
-        csid|uri|refName|updatedAt|workflowState|identificationNumber|blobCsid|title
+        csid|uri|refName|updatedAt|workflowState|altText|identificationNumber|blobCsid|title
     </fieldsReturned>
     <list-item>
         <csid>${first}</csid>
@@ -32,4 +32,4 @@
         <workflowState>project</workflowState>
         <identificationNumber>${identificationNumberLast}</identificationNumber>
     </list-item>
-</ns2:abstract-common-list>
+</ns2:abstract-common-list>

services/JaxRsServiceProvider/build.xml

@@ -5,11 +5,12 @@
     </description>
 	<!-- set global properties for this build -->
     <property name="services.trunk" value="../.."/>
+    <import file="${services.trunk}/build.xml" />
     <!-- enviornment should be declared before reading build.properties -->
     <property environment="env" />
     <property file="${services.trunk}/build.properties" />
-	<property name="application.trunk" location="${services.trunk}/../application" />
-	<property name="cspace.tool.csmake" value="csmake" />
+    <property name="application.trunk" location="${services.trunk}/../application" />
+    <property name="cspace.tool.csmake" value="csmake" />
     <property name="mvn.opts" value="-V" />
     <property name="src" location="src"/>
 
@@ -52,10 +53,12 @@
 
     <target name="package" depends="package-unix,package-windows"
   description="Package CollectionSpace Services" />
+    <urlencode property="db.jdbc.urloptions" />
     <target name="package-unix" if="osfamily-unix">
         <exec executable="mvn" failonerror="true">
             <arg value="package" />
             <arg value="-Dmaven.test.skip=true" />
+            <arg value="-Ddb.jdbc.urloptions.encoded=${db.jdbc.urloptions.encoded}" />
             <arg value="-f" />
             <arg value="${basedir}/pom.xml" />
             <arg value="-N" />
@@ -150,15 +153,15 @@
 		<delete dir="${jee.deploy.cspace}/${cspace.services.context}"/>
         <copy file="${basedir}/target/${cspace.services.war}" todir="${jee.deploy.cspace}"/>
     </target>
-	
+
 	<!--
 		This target attempts to generate a set of Service artifacts (Nuxeo bundles and tenant bindings) by using the
 		Application layer's configuration files.
-		
+
 		This target has a dependency on the Application layer's source tree.  It assumes the Application layer's src tree root
 		is a directory sibling of the Source layer's source tree root.  Also, it assumes the "csmake.jar" exists in the target
 		directory of the Application layer's "tomcat-main" module.
-		
+
 		This target also assumes that the system environment variable 'CSPACE_JEESERVER_HOME' is set and pointing to the root
 		JEE server (usually Apache Tomcat) where CollectionSpace is installed.  All generated Service artifacts wi
 	-->

services/JaxRsServiceProvider/pom.xml

@@ -466,6 +466,11 @@
             <artifactId>org.collectionspace.services.restrictedmedia.service</artifactId>
             <version>${project.version}</version>
         </dependency>
+        <dependency>
+            <groupId>org.collectionspace.services</groupId>
+            <artifactId>org.collectionspace.services.advancedsearch.service</artifactId>
+            <version>${project.version}</version>
+        </dependency>
 
       <!--dependency>
           <groupId>org.collectionspace.services</groupId>

services/JaxRsServiceProvider/src/main/java/org/collectionspace/services/jaxrs/CollectionSpaceJaxRsApplication.java

@@ -63,6 +63,7 @@
 import org.collectionspace.services.pottag.PottagResource;
 import org.collectionspace.services.report.ReportResource;
 import org.collectionspace.services.acquisition.AcquisitionResource;
+import org.collectionspace.services.advancedsearch.AdvancedSearch;
 import org.collectionspace.services.dimension.DimensionResource;
 import org.collectionspace.services.servicegroup.ServiceGroupResource;
 import org.collectionspace.services.structureddate.StructuredDateResource;
@@ -131,6 +132,7 @@ public CollectionSpaceJaxRsApplication() {
         singletons.add(new IndexResource());
         singletons.add(new LoginResource());
         singletons.add(new LogoutResource());
+        singletons.add(new AdvancedSearch());
 
         addResourceToMapAndSingletons(new VocabularyResource());
         addResourceToMapAndSingletons(new PersonAuthorityResource());