From 7c37516e47f32ef9673f2909bfd6b142e0c2549a Mon Sep 17 00:00:00 2001 From: Gabriel Tiveron Date: Fri, 20 Nov 2020 13:20:26 -0300 Subject: [PATCH 1/2] Fix/ Ajuste na rota de listar membro de grupo --- backend/DiarioSaude/controllers/group.controller.js | 8 ++++++++ backend/DiarioSaude/routes/group.route.js | 3 +++ 2 files changed, 11 insertions(+) diff --git a/backend/DiarioSaude/controllers/group.controller.js b/backend/DiarioSaude/controllers/group.controller.js index fb3341c..af0917f 100644 --- a/backend/DiarioSaude/controllers/group.controller.js +++ b/backend/DiarioSaude/controllers/group.controller.js @@ -140,3 +140,11 @@ exports.addMember = (req, res) => { res.json({status: 200, message: "Member added"}) }) } + +exports.listMember = (req, res) => { + Group.findById(req.body.group_id, (err, group) => { + if(err) res.json({status:400, message: err}) + + res.json({status:200, members: group.users}) + }) +} diff --git a/backend/DiarioSaude/routes/group.route.js b/backend/DiarioSaude/routes/group.route.js index 5b28c61..4e41e61 100644 --- a/backend/DiarioSaude/routes/group.route.js +++ b/backend/DiarioSaude/routes/group.route.js @@ -20,4 +20,7 @@ module.exports = (app) => { app.post('/group/member', group.addMember); // Add Form app.post('/group/form', group.addForm); + + // List member + app.get('/members', group.listMember) } From 0a124c8530ef6863468cf7042a13e99aa2379448 Mon Sep 17 00:00:00 2001 From: Gabriel Tiveron Date: Fri, 20 Nov 2020 18:01:24 -0300 Subject: [PATCH 2/2] Fix/ Ajuste no endpoint de listar usuarios --- backend/DiarioSaude/controllers/auth.controller.js | 9 ++++++++- backend/DiarioSaude/routes/auth.route.js | 1 + 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/backend/DiarioSaude/controllers/auth.controller.js b/backend/DiarioSaude/controllers/auth.controller.js index 2308bf9..71a1d4a 100644 --- a/backend/DiarioSaude/controllers/auth.controller.js +++ b/backend/DiarioSaude/controllers/auth.controller.js @@ -140,9 +140,16 @@ exports.signin = (req, res) => { }; exports.getUser = (req, res) => { - console.log(req) Person.getPerson(req.params.cpf, (err, user) => { if(err) res.json({status: 400, message: err}) res.json({status:200, user: {name: user.name, id: user.id, birthDate: user.birthDate, gender: user.gender}}) }) } + +exports.getAll = (req, res) => { + Person.find((err, users) => { + if (err) res.json({status:400, message:err}) + + res.json({status: 200, users: users}) + }) +} diff --git a/backend/DiarioSaude/routes/auth.route.js b/backend/DiarioSaude/routes/auth.route.js index 0cd2d59..fd9cfcc 100644 --- a/backend/DiarioSaude/routes/auth.route.js +++ b/backend/DiarioSaude/routes/auth.route.js @@ -21,5 +21,6 @@ module.exports = function(app) { app.post("/auth/signin", controller.signin); app.get('/user/:cpf', controller.getUser) + app.get('/users', controller.getAll) };