From d5f5a670fcf6258d0facf9a2fd3aabd550fbc78f Mon Sep 17 00:00:00 2001 From: Green-Star Date: Wed, 2 Aug 2017 21:50:42 +0200 Subject: Remove one pod (#76) * Client: Fix typo * Client: Add removeFriend feature * Server: Add removeFriend feature * Server: Update method name * Fix rebase onto develop issues * Server: Fix error message * Server: Remove useless methods in removeFriend method * Server: Finish remove on pod feature after rebase * Server: Type pod parameter * Fix Travis build * Add friend-basic test for the remove one pod feature * Add check-params tests for the remove one pod feature * Fix typos * Add friend-advanced test for the remove one pod feature * Client: Trailing new line * Move to promises * Add undefined id test * Use find method instead of a for loop to find the friend to remove * Remove setTimeout method * Server: Remove requestScheduler operations * Server: Fix logging messages * Server: Remove sign request parameter --- server/middlewares/validators/pods.ts | 26 +++++++++++++++++++++++++- 1 file changed, 25 insertions(+), 1 deletion(-) (limited to 'server/middlewares/validators') diff --git a/server/middlewares/validators/pods.ts b/server/middlewares/validators/pods.ts index 481a66957..d0981cd57 100644 --- a/server/middlewares/validators/pods.ts +++ b/server/middlewares/validators/pods.ts @@ -58,9 +58,33 @@ function podsAddValidator (req: express.Request, res: express.Response, next: ex }) } +function podRemoveValidator (req: express.Request, res: express.Response, next: express.NextFunction) { + req.checkParams('id', 'Should have a valid id').notEmpty().isNumeric() + + logger.debug('Checking podRemoveValidator parameters', { parameters: req.params }) + + checkErrors(req, res, function () { + db.Pod.load(req.params.id) + .then(pod => { + if (!pod) { + logger.error('Cannot find pod %d.', req.params.id) + return res.sendStatus(404) + } + + res.locals.pod = pod + return next() + }) + .catch(err => { + logger.error('Cannot load pod %d.', req.params.id, err) + res.sendStatus(500) + }) + }) +} + // --------------------------------------------------------------------------- export { makeFriendsValidator, - podsAddValidator + podsAddValidator, + podRemoveValidator } -- cgit v1.2.3