From 315733eec0b42504603f9b6bcc817d92d66c4f9b Mon Sep 17 00:00:00 2001
From: "D. Berge" <dberge@aaltronav.eu>
Date: Thu, 20 May 2021 18:25:12 +0200
Subject: [PATCH] Refactor events export middleware.

Uses the `prepare` method for better reusability.
---
 lib/www/server/api/middleware/event/get/html.js | 7 +++----
 lib/www/server/api/middleware/event/get/pdf.js  | 7 +++----
 lib/www/server/api/middleware/event/get/seis.js | 6 ++----
 3 files changed, 8 insertions(+), 12 deletions(-)

diff --git a/lib/www/server/api/middleware/event/get/html.js b/lib/www/server/api/middleware/event/get/html.js
index a398ca7..8e466af 100644
--- a/lib/www/server/api/middleware/event/get/html.js
+++ b/lib/www/server/api/middleware/event/get/html.js
@@ -1,13 +1,12 @@
-const { event, sequence, configuration } = require('../../../../lib/db');
-const { transform } = require('../../../../lib/sse');
+const { configuration } = require('../../../../lib/db');
+const { transform, prepare } = require('../../../../lib/sse');
 const render = require('../../../../lib/render');
 
 const html = async function (req, res, next) {
 	try {
 		const query = req.query;
 		query.sequence = req.params.sequence;
-		const events = await event.list(req.params.project, query);
-		const sequences = await sequence.list(req.params.project, query);
+		const {events, sequences} = await prepare(req.params.project, query);
 		const seis = transform(events, sequences, {projectId: req.params.project});
 		const templates = await configuration.get(req.params.project, "sse/templates");
 		const template = templates[0].template;
diff --git a/lib/www/server/api/middleware/event/get/pdf.js b/lib/www/server/api/middleware/event/get/pdf.js
index 59a495c..a1f9e88 100644
--- a/lib/www/server/api/middleware/event/get/pdf.js
+++ b/lib/www/server/api/middleware/event/get/pdf.js
@@ -1,8 +1,8 @@
 const fs = require('fs/promises');
 const Path = require('path');
 const crypto = require('crypto');
-const { event, sequence, configuration } = require('../../../../lib/db');
-const { transform } = require('../../../../lib/sse');
+const { configuration } = require('../../../../lib/db');
+const { transform, prepare } = require('../../../../lib/sse');
 const render = require('../../../../lib/render');
 const { url2pdf } = require('../../../../lib/selenium');
 
@@ -15,8 +15,7 @@ const pdf = async function (req, res, next) {
 	try {
 		const query = req.query;
 		query.sequence = req.params.sequence;
-		const events = await event.list(req.params.project, query);
-		const sequences = await sequence.list(req.params.project, query);
+		const {events, sequences} = await prepare(req.params.project, query);
 		const seis = transform(events, sequences, {projectId: req.params.project});
 		const templates = await configuration.get(req.params.project, "sse/templates");
 		const template = templates[0].template;
diff --git a/lib/www/server/api/middleware/event/get/seis.js b/lib/www/server/api/middleware/event/get/seis.js
index 655c81b..a76e0a8 100644
--- a/lib/www/server/api/middleware/event/get/seis.js
+++ b/lib/www/server/api/middleware/event/get/seis.js
@@ -1,12 +1,10 @@
-const { event, sequence } = require('../../../../lib/db');
-const { transform } = require('../../../../lib/sse');
+const { transform, prepare } = require('../../../../lib/sse');
 
 const seis = async function (req, res, next) {
 	try {
 		const query = req.query;
 		query.sequence = req.params.sequence;
-		const events = await event.list(req.params.project, query);
-		const sequences = await sequence.list(req.params.project, query);
+		const {events, sequences} = await prepare(req.params.project, query);
 		const response = transform(events, sequences, {projectId: req.params.project});
 		if ("download" in query || "d" in query) {
 			const filename = `${req.params.project}-seq${query.sequence.padStart(3, "0")}.json`;