From 6033b45ed3ebb1d42809fdeab5eed4956fcc2900 Mon Sep 17 00:00:00 2001
From: "D. Berge" <dberge@aaltronav.eu>
Date: Wed, 23 Aug 2023 19:17:20 +0200
Subject: [PATCH] Refactor API middleware.

The middleware naming is kept consistent with the HTTP verb that
they handle.
---
 lib/www/server/api/index.js                        |  6 +++---
 lib/www/server/api/middleware/project/get.js       |  3 ++-
 lib/www/server/api/middleware/project/index.js     |  4 ++--
 lib/www/server/api/middleware/project/list.js      | 14 --------------
 .../server/api/middleware/project/summary/get.js   | 13 +++++++++++++
 .../server/api/middleware/project/summary/index.js |  3 +++
 6 files changed, 23 insertions(+), 20 deletions(-)
 delete mode 100644 lib/www/server/api/middleware/project/list.js
 create mode 100644 lib/www/server/api/middleware/project/summary/get.js
 create mode 100644 lib/www/server/api/middleware/project/summary/index.js

diff --git a/lib/www/server/api/index.js b/lib/www/server/api/index.js
index a883cf1..b2ee175 100644
--- a/lib/www/server/api/index.js
+++ b/lib/www/server/api/index.js
@@ -86,13 +86,13 @@ app.use(mw.auth.authentify);
 // We must be authenticated before we can access these
 app.map({
 	'/project': {
-		get: [ mw.project.list ],  // Get list of projects
+		get: [ mw.project.get ],  // Get list of projects
 	},
 	'/project/:project': {
-		get: [ mw.project.get ],      // Get project data
+		get: [ mw.project.summary.get ],      // Get project data
 	},
 	'/project/:project/summary': {
-		get: [ mw.project.get ],
+		get: [ mw.project.summary.get ],
 	},
 
 	/*
diff --git a/lib/www/server/api/middleware/project/get.js b/lib/www/server/api/middleware/project/get.js
index 77aad70..cc3480f 100644
--- a/lib/www/server/api/middleware/project/get.js
+++ b/lib/www/server/api/middleware/project/get.js
@@ -4,10 +4,11 @@ const { project} = require('../../../lib/db');
 module.exports = async function (req, res, next) {
 
 	try {
-		res.status(200).send(await project.get(req.params.project));
+		res.status(200).send(await project.get());
 		next();
 	} catch (err) {
 		next(err);
 	}
 
+
 };
diff --git a/lib/www/server/api/middleware/project/index.js b/lib/www/server/api/middleware/project/index.js
index 26b9699..e974836 100644
--- a/lib/www/server/api/middleware/project/index.js
+++ b/lib/www/server/api/middleware/project/index.js
@@ -1,4 +1,4 @@
 module.exports = {
-	list: require('./list'),
-	get: require('./get')
+	get: require('./get'),
+	summary: require('./summary'),
 };
diff --git a/lib/www/server/api/middleware/project/list.js b/lib/www/server/api/middleware/project/list.js
deleted file mode 100644
index ee197a7..0000000
--- a/lib/www/server/api/middleware/project/list.js
+++ /dev/null
@@ -1,14 +0,0 @@
-
-const { project} = require('../../../lib/db');
-
-module.exports = async function (req, res, next) {
-
-	try {
-		res.status(200).send(await project.list());
-		next();
-	} catch (err) {
-		next(err);
-	}
-
-
-};
diff --git a/lib/www/server/api/middleware/project/summary/get.js b/lib/www/server/api/middleware/project/summary/get.js
new file mode 100644
index 0000000..96231ad
--- /dev/null
+++ b/lib/www/server/api/middleware/project/summary/get.js
@@ -0,0 +1,13 @@
+
+const { project } = require('../../../../lib/db');
+
+module.exports = async function (req, res, next) {
+
+	try {
+		res.status(200).send(await project.summary.get(req.params.project));
+		next();
+	} catch (err) {
+		next(err);
+	}
+
+};
diff --git a/lib/www/server/api/middleware/project/summary/index.js b/lib/www/server/api/middleware/project/summary/index.js
new file mode 100644
index 0000000..14c855b
--- /dev/null
+++ b/lib/www/server/api/middleware/project/summary/index.js
@@ -0,0 +1,3 @@
+module.exports = {
+	get: require('./get'),
+};