From 49c470ab477a9ca32f784469c4b3c3f341da64c2 Mon Sep 17 00:00:00 2001 From: Arjun Patel Date: Fri, 1 Feb 2019 12:17:43 -0800 Subject: [PATCH] fixing grant deletion --- app/controllers/donor/grant.controller.js | 6 ++++-- app/routes/donor.route.js | 6 +----- 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/app/controllers/donor/grant.controller.js b/app/controllers/donor/grant.controller.js index 726e320..426f5be 100644 --- a/app/controllers/donor/grant.controller.js +++ b/app/controllers/donor/grant.controller.js @@ -61,14 +61,16 @@ exports.findByDonorId = (req, res, next) => { }; exports.delete = (req, res, next) => { - const grant_id = req.params.grant_id; + const { grant_id } = req.body; + const user = req.user; - Grant.destroy({ where: { id: grant_id } }) + Grant.destroy({ where: { id: grant_id, donor_id: user.id } }) .then(result => { var message = 'Already Deleted'; if (result) { message = 'Grant Deleted'; } + res.status(201).json({ result, message diff --git a/app/routes/donor.route.js b/app/routes/donor.route.js index ba518bf..aa9efa1 100644 --- a/app/routes/donor.route.js +++ b/app/routes/donor.route.js @@ -23,11 +23,7 @@ router.get('/grants/', checkAuth(roles.DONOR), controllers.grant.findByDonorId); router.post('/grants/', checkAuth(roles.DONOR), controllers.grant.create); // DELECT a grant of a donor -router.delete( - '/grants/:grant_id', - checkAuth(roles.DONOR), - controllers.grant.delete -); +router.delete('/grants/', checkAuth(roles.DONOR), controllers.grant.delete); // POST to get suggested organizations to distribute to // running "the algorithm"