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 810dd278c1563d4d8c4ca5e726f39b7913b68e47..3862e6f0808075d6e7aea17292b65fe7441811ca 100644 (file)
--- 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>();