Merge branch 'devel' of https://github.com/UnBArqDsw/2020.1_G5_Diario…

…_da_Saude into T08
UnBArqDsw · Nov 20, 2020 · fa4db7c · fa4db7c
2 parents 3c26ead + cbbd576
commit fa4db7c
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 1 deletion.
diff --git 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/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/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)
 };
 
diff --git 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)
 }