From d9c594e7948f3a57d4ad207a8479f2969a9b10df Mon Sep 17 00:00:00 2001 From: Michael Taylor Date: Tue, 12 Sep 2023 14:18:09 -0400 Subject: [PATCH] feat: default to pagination when non specified --- package.json | 2 +- src/controllers/project.controller.js | 16 ++++++++++++++++ src/controllers/units.controller.js | 16 ++++++++++++++++ 3 files changed, 33 insertions(+), 1 deletion(-) diff --git a/package.json b/package.json index fb8ca462..50b4aaf4 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "cadt", - "version": "1.6.8", + "version": "1.6.9", "_comment": "DONT CHANGE MAJOR UNLESS DATAMODEL CHANGES: The major version corresponds to the datamodel version your using, so 2.0.0 means it'll use datamodel v2", "private": true, "bin": "build/server.js", diff --git a/src/controllers/project.controller.js b/src/controllers/project.controller.js index 28f577b2..3db3872a 100644 --- a/src/controllers/project.controller.js +++ b/src/controllers/project.controller.js @@ -127,6 +127,22 @@ export const findAll = async (req, res) => { order, } = req.query; + if (!page) { + let redirectUrl = `${req.baseUrl}?page=1&limit=10`; + + if (Object.keys(req.query).length > 0) { + redirectUrl = redirectUrl.concat( + '&', + Object.keys(req.query) + .map((key) => `${key}=${req.query[key]}`) + .join('&'), + ); + } + + // Redirect to the modified URL + return res.redirect(301, redirectUrl); + } + let where = orgUid != null && orgUid !== 'all' ? { orgUid } : undefined; if (filter) { diff --git a/src/controllers/units.controller.js b/src/controllers/units.controller.js index 3d103ba0..133dda0c 100644 --- a/src/controllers/units.controller.js +++ b/src/controllers/units.controller.js @@ -133,6 +133,22 @@ export const findAll = async (req, res) => { filter, } = req.query; + if (!page) { + let redirectUrl = `${req.baseUrl}?page=1&limit=10`; + + if (Object.keys(req.query).length > 0) { + redirectUrl = redirectUrl.concat( + '&', + Object.keys(req.query) + .map((key) => `${key}=${req.query[key]}`) + .join('&'), + ); + } + + // Redirect to the modified URL + return res.redirect(301, redirectUrl); + } + let where = orgUid != null && orgUid !== 'all' ? { orgUid } : undefined; if (filter) {