Merge pull request #997 from rfcx/develop

Make v3.0.54
rfcx · Jun 3, 2022 · f1742db · f1742db
2 parents 9644f42 + 29992dd
commit f1742db
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 3 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,13 +1,19 @@
 # Arbimon Release Notes
 
+## v3.0.54 - May XX, 2022
+
+Resolved issues:
+
+- #991 Fixed an issue with export recordings tags
+
 ## v3.0.53 - May 17, 2022
 
 Resolved issues:
 
 - Delete legacy part of the ingest endpoint which has been syncing GuardianSites
 - Show error and rollback action if user role assignment is failed on Core API side
 - #933 Use moment timezone instead of convert_tz to get local datetime
-- - Fixed the issue with blank ROI images which appearing when the user opened the cluster Grid View
+- Fixed the issue with blank ROI images which appearing when the user opened the cluster Grid View
 
 ## v3.0.52 - May 13, 2022
 

diff --git a/app/model/projects.js b/app/model/projects.js
@@ -803,7 +803,7 @@ var Projects = {
             body: JSON.stringify(body)
         }
         const result = await rp(options)
-        if (result.statusCode !== 201) {
+        if (result.statusCode !== 200) {
             console.error(result.body)
             throw new Error(result.body)
         }

diff --git a/app/model/recordings.js b/app/model/recordings.js
@@ -1742,7 +1742,8 @@ var Recordings = {
                         promises.push(models.tags.getFor({id:projection_parameters.tag}).then(function(tags){
                             tags.forEach(function(tag, idx){
                                 var prtid = "p_RT_" + idx;
-                                summaryBuilders[c].addProjection("(SELECT COUNT(*) FROM recording_tags AS " + prtid + " WHERE r.recording_id = " + prtid + ".recording_id AND " + prtid + ".tag_id = " + dbpool.escape(tag.id)+ "  ) AS " + dbpool.escapeId("tag<" + tag.tag + ">"));
+                                const tagQuery = `(SELECT COUNT(*) FROM recording_tags AS ${prtid} WHERE r.recording_id = ${prtid}.recording_id AND ${prtid}.tag_id = ${tag.tag_id}) AS ${dbpool.escapeId('tag<' + tag.tag + '>')}`
+                                summaryBuilders[c].addProjection(tagQuery);
                             });
                         }));
                     }