From f4d07280789667577cb0d6109eb627aa5757ac03 Mon Sep 17 00:00:00 2001 From: Ray Lee Date: Sat, 5 Jan 2019 16:46:18 -0800 Subject: [PATCH] DRYD-559: Read tenantId from current document instead of hardcoding. --- .../services/nuxeo/elasticsearch/CSJsonESDocumentWriter.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/3rdparty/nuxeo/nuxeo-platform-elasticsearch/src/main/java/org/collectionspace/services/nuxeo/elasticsearch/CSJsonESDocumentWriter.java b/3rdparty/nuxeo/nuxeo-platform-elasticsearch/src/main/java/org/collectionspace/services/nuxeo/elasticsearch/CSJsonESDocumentWriter.java index 810dd278c..3862e6f08 100644 --- a/3rdparty/nuxeo/nuxeo-platform-elasticsearch/src/main/java/org/collectionspace/services/nuxeo/elasticsearch/CSJsonESDocumentWriter.java +++ b/3rdparty/nuxeo/nuxeo-platform-elasticsearch/src/main/java/org/collectionspace/services/nuxeo/elasticsearch/CSJsonESDocumentWriter.java @@ -48,7 +48,8 @@ public class CSJsonESDocumentWriter extends JsonESDocumentWriter { if (StringUtils.isNotEmpty(refName)) { String escapedRefName = refName.replace("'", "\\'"); - String mediaQuery = String.format("SELECT * FROM Media WHERE media_common:coverage = '%s' AND ecm:currentLifeCycleState = 'project' AND collectionspace_core:tenantId = '2000' ORDER BY media_common:identificationNumber", escapedRefName); + String tenantId = (String) doc.getProperty("collectionspace_core", "tenantId"); + String mediaQuery = String.format("SELECT * FROM Media WHERE media_common:coverage = '%s' AND ecm:currentLifeCycleState = 'project' AND collectionspace_core:tenantId = '%s' ORDER BY media_common:identificationNumber", escapedRefName, tenantId); DocumentModelList mediaDocs = session.query(mediaQuery); List mediaCsids = new ArrayList(); -- 2.47.3