From 86383d4f5108eef9ef42730150c19311e1637950 Mon Sep 17 00:00:00 2001 From: Udo Walter Date: Sun, 31 Mar 2019 17:26:26 +0000 Subject: [server/httpresponse] small rework --- server/api/groups.js | 38 +++++++++++++++++++------------------- 1 file changed, 19 insertions(+), 19 deletions(-) (limited to 'server/api/groups.js') diff --git a/server/api/groups.js b/server/api/groups.js index 99260ea..e3683bf 100644 --- a/server/api/groups.js +++ b/server/api/groups.js @@ -6,7 +6,7 @@ const ipHelper = require(path.join(__appdir, 'lib', 'iphelper')) const express = require('express') const { decorateApp } = require('@awaitjs/express') const router = decorateApp(express.Router()) -const httpResponse = require(path.join(__appdir, 'lib', 'httpresponse')) +const HttpResponse = require(path.join(__appdir, 'lib', 'httpresponse')) // ############################################################################ // ########################### GET requests ################################# @@ -29,7 +29,7 @@ router.getAsync('/:id', async (req, res) => { if (all) res.status(200).send({ ...group.get({ plain: true }), ...await groupUtil.getAllChildren([group]) }) else res.status(200).send(group) } else { - return httpResponse.notFound(res, req.params.id) + return HttpResponse.notFound(req.params.id).send(res) } } else if (req.params.id === '0') { const [subgroups, clients] = await Promise.all([ @@ -38,7 +38,7 @@ router.getAsync('/:id', async (req, res) => { ]) res.send({ id: 0, subgroups, clients }) } else { - httpResponse.invalidId(res, true) + HttpResponse.invalidId(true).send(res) } }) @@ -47,9 +47,9 @@ router.getAsync('/:id', async (req, res) => { router.postAsync(['', '/:id'], async (req, res) => { if (req.query.delete !== undefined && req.query.delete !== 'false') { - if (!Array.isArray(req.body.ids)) return httpResponse.invalidBodyValue(res, 'ids', 'an array') + if (!Array.isArray(req.body.ids)) return HttpResponse.invalidBodyValue('ids', 'an array').send(res) const count = await db.group.destroy({ where: { id: req.body.ids } }) - httpResponse.successBatch(res, 'deleted', 'group', count) + HttpResponse.successBatch('deleted', 'group', count).send(res) } else { let group let action = 'updated' @@ -58,10 +58,10 @@ router.postAsync(['', '/:id'], async (req, res) => { action = 'created' } else if (req.params.id > 0) { group = await db.group.findOne({ where: { id: req.params.id }, include: ['ipranges'] }) - if (!group) return httpResponse.notFound(res, req.params.id) + if (!group) return HttpResponse.notFound(req.params.id).send(res) else await group.update(req.body.data) } else { - return httpResponse.invalidId(res) + return HttpResponse.invalidId().send(res) } const promises = [] // Set group parents @@ -96,39 +96,39 @@ router.postAsync(['', '/:id'], async (req, res) => { } } await Promise.all(promises) - httpResponse.success(res, action, 'group', group.id) + HttpResponse.success(action, 'group', group.id).send(res) } }) router.postAsync('/:id/subgroups', async (req, res) => { - if (!(req.params.id > 0)) return httpResponse.invalidId(res) + if (!(req.params.id > 0)) return HttpResponse.invalidId().send(res) const group = await db.group.findOne({ where: { id: req.params.id } }) if (group) { if (req.query.delete !== undefined && req.query.delete !== 'false') { const count = await group.removeSubgroups(req.body.ids) - httpResponse.successBatch(res, 'removed', 'subgroup', count) + HttpResponse.successBatch('removed', 'subgroup', count).send(res) } else { const count = await group.addSubgroups(req.body.ids) - httpResponse.successBatch(res, 'added', 'subgroup', count) + HttpResponse.successBatch('added', 'subgroup', count).send(res) } } else { - httpResponse.notFound(res, req.params.id) + HttpResponse.notFound(req.params.id).send(res) } }) router.postAsync('/:id/clients', async (req, res) => { - if (!(req.params.id > 0)) return httpResponse.invalidId(res) + if (!(req.params.id > 0)) return HttpResponse.invalidId().send(res) const group = await db.group.findOne({ where: { id: req.params.id } }) if (group) { if (req.query.delete !== undefined && req.query.delete !== 'false') { const count = await group.removeClients(req.body.ids) - httpResponse.successBatch(res, 'removed', 'client', count) + HttpResponse.successBatch('removed', 'client', count).send(res) } else { const count = await group.addClients(req.body.ids) - httpResponse.successBatch(res, 'added', 'client', count) + HttpResponse.successBatch('added', 'client', count).send(res) } } else { - httpResponse.notFound(res, req.params.id) + HttpResponse.notFound(req.params.id).send(res) } }) @@ -136,10 +136,10 @@ router.postAsync('/:id/clients', async (req, res) => { // ########################## DELETE requests ############################### router.delete('/:id', async (req, res) => { - if (!(req.params.id > 0)) return httpResponse.invalidId(res) + if (!(req.params.id > 0)) return HttpResponse.invalidId().send(res) const count = await db.group.destroy({ where: { id: req.params.id } }) - if (count) httpResponse.success(res, 'deleted', 'group', req.params.id) - else httpResponse.notFound(res, req.params.id) + if (count) HttpResponse.success('deleted', 'group', req.params.id).send(res) + else HttpResponse.notFound(req.params.id).send(res) }) // ############################################################################ -- cgit v1.2.3-55-g7522