From: Ray Lee <rhlee@berkeley.edu>
Date: Sun, 6 Jan 2019 00:46:18 +0000 (-0800)
Subject: DRYD-559: Read tenantId from current document instead of hardcoding.
X-Git-Url: https://git.aero2k.de/?a=commitdiff_plain;h=f4d07280789667577cb0d6109eb627aa5757ac03;p=tmp%2Fjakarta-migration.git

DRYD-559: Read tenantId from current document instead of hardcoding.
---

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<JsonNode> mediaCsids = new ArrayList<JsonNode>();