From d7f1dd686cf2b8204b619579c2ebdf4656aac7eb Mon Sep 17 00:00:00 2001 From: lesion Date: Sun, 18 Jun 2023 22:17:11 +0200 Subject: [PATCH] new queryParamToBool helper --- server/api/controller/collection.js | 4 ++-- server/helpers.js | 5 +++-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/server/api/controller/collection.js b/server/api/controller/collection.js index 50030d1a..d04564e2 100644 --- a/server/api/controller/collection.js +++ b/server/api/controller/collection.js @@ -2,13 +2,13 @@ const { Collection, Filter, Event, Tag, Place } = require('../models/models') const log = require('../../log') const { DateTime } = require('luxon') -const { col: Col } = require('../../helpers') +const { col: Col, queryParamToBool } = require('../../helpers') const { Op, Sequelize } = require('sequelize') const collectionController = { async getAll (req, res) { - const withFilters = req.query.withFilters + const withFilters = queryParamToBool(req.query.withFilters) let collections if (withFilters) { collections = await Collection.findAll({ include: [ Filter ] }) diff --git a/server/helpers.js b/server/helpers.js index 7af98bbc..77598eca 100644 --- a/server/helpers.js +++ b/server/helpers.js @@ -295,8 +295,9 @@ module.exports = { } }, - queryParamToBool (value) { - return ((value+'').toLowerCase() === 'true') + queryParamToBool (value, defaultValue) { + if (typeof value === 'undefined') return defaultValue + return (String(value).toLowerCase() === 'true') } }