DRYD-1328: Use distinct in order to get media for all rows (#378)

diff --git a/services/report/3rdparty/jasper-cs-report/src/main/resources/tombstone_with_budget.jrxml b/services/report/3rdparty/jasper-cs-report/src/main/resources/tombstone_with_budget.jrxml
index 405eb4b95e3c593529ecf61bef30675a9b8d2ea1..dffa3580794b3ad97b9626d0c842827a578d76fc 100644 (file)
--- a/services/report/3rdparty/jasper-cs-report/src/main/resources/tombstone_with_budget.jrxml
+++ b/services/report/3rdparty/jasper-cs-report/src/main/resources/tombstone_with_budget.jrxml
@@ -151,14 +151,13 @@ LEFT JOIN materials material on material.objcsid = obj.objcsid
 LEFT JOIN dimensions dimension on dimension.objcsid = obj.objcsid
 LEFT JOIN dates date on date.objcsid = obj.objcsid
 LEFT JOIN (
-  SELECT relation.subjectcsid, relation.objectcsid
+  SELECT DISTINCT ON (relation.subjectcsid) relation.subjectcsid, relation.objectcsid
   FROM relations_common relation
   INNER JOIN misc ON misc.id = relation.id AND misc.lifecyclestate != 'deleted'
   INNER JOIN hierarchy hier ON hier.name = relation.objectcsid
   INNER JOIN collectionspace_core core ON core.id = hier.id
   WHERE relation.objectdocumenttype = 'Media' AND relation.subjectdocumenttype = 'CollectionObject'
-  ORDER BY core.updatedat DESC
-  LIMIT 1
+  ORDER BY relation.subjectcsid, core.updatedat DESC
 ) media ON media.subjectcsid = obj.objcsid
 LEFT JOIN (
   SELECT

diff --git a/services/report/3rdparty/jasper-cs-report/src/main/resources/tombstone_with_creator.jrxml b/services/report/3rdparty/jasper-cs-report/src/main/resources/tombstone_with_creator.jrxml
index 909c8f9cd0b811bd472427e5ee11865425a6348a..0d478f605e78c9a45324379fefd1d1a6e2daf680 100644 (file)
--- a/services/report/3rdparty/jasper-cs-report/src/main/resources/tombstone_with_creator.jrxml
+++ b/services/report/3rdparty/jasper-cs-report/src/main/resources/tombstone_with_creator.jrxml
@@ -101,14 +101,13 @@ LEFT JOIN (
   GROUP BY material_hier.parentid
 ) material ON material.parentid = obj.id
 LEFT JOIN (
-  SELECT relation.subjectcsid, relation.objectcsid
+  SELECT DISTINCT ON (relation.subjectcsid) relation.subjectcsid, relation.objectcsid
   FROM relations_common relation
   INNER JOIN misc ON misc.id = relation.id AND misc.lifecyclestate != 'deleted'
   INNER JOIN hierarchy hier ON hier.name = relation.objectcsid
   INNER JOIN collectionspace_core core ON core.id = hier.id
   WHERE relation.objectdocumenttype = 'Media' AND relation.subjectdocumenttype = 'CollectionObject'
-  ORDER BY core.updatedat DESC
-  LIMIT 1
+  ORDER BY relation.subjectcsid, core.updatedat DESC
 ) media ON media.subjectcsid = hier.name
 $P!{whereclause}]]>
   </queryString>