From 9e1f93d43e0516581d5e067881476e6659240196 Mon Sep 17 00:00:00 2001
From: "D. Berge" <dberge@aaltronav.eu>
Date: Sat, 22 Aug 2020 20:22:47 +0200
Subject: [PATCH] Adapt db.events.list to latest schema

---
 lib/www/server/lib/db/event/list.js | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/lib/www/server/lib/db/event/list.js b/lib/www/server/lib/db/event/list.js
index fcea396..e257f37 100644
--- a/lib/www/server/lib/db/event/list.js
+++ b/lib/www/server/lib/db/event/list.js
@@ -3,8 +3,8 @@ const { setSurvey } = require('../connection');
 async function list (projectId, opts = {}) {
 	const client = await setSurvey(projectId);
 
-	const sortFields = [ "sequence", "shot_number", "ts0", "ts1", "label", "remarks" ];
-	const sortKey = opts.sortBy && sortFields.includes(opts.sortBy) && opts.sortBy || "ts0";
+	const sortFields = [ "sequence", "point", "tstamp", "remarks" ];
+	const sortKey = opts.sortBy && sortFields.includes(opts.sortBy) && opts.sortBy || "tstamp";
 	const sortDir = (opts.sortDesc == "true" || !opts.sortDesc) ? "DESC" : "ASC";
 	const offset = Math.abs((opts.page-1)*opts.itemsPerPage) || 0;
 	const limit = Math.abs(Number(opts.itemsPerPage)) || null;
@@ -15,13 +15,14 @@ async function list (projectId, opts = {}) {
 			: [ "sequence = $1", [ opts.sequence ] ]
 		: opts.date0
 			? opts.date1
-				? [ "date(ts0) BETWEEN SYMMETRIC $1 AND $2", [ opts.date0, opts.date1 ] ]
-				: [ "date(ts0) = $1", [ opts.date0 ] ]
+				? [ "date(tstamp) BETWEEN SYMMETRIC $1 AND $2", [ opts.date0, opts.date1 ] ]
+				: [ "date(tstamp) = $1", [ opts.date0 ] ]
 			: [ "true = true", [] ];
 
 	const text = `
-		SELECT *
-		FROM events
+		SELECT *,
+			array(SELECT label FROM events_labels l WHERE l.type = e.type AND l.id = e.id) labels
+		FROM events e
 		WHERE
 			${filter[0]}
 		ORDER BY ${sortKey} ${sortDir};