Skip to content

Commit de13a6d

Browse files
authored
feat: add school and status to team members list (#685)
* feat: add school and status to team members list * fix test * Update docs
1 parent fd08de9 commit de13a6d

File tree

5 files changed

+84
-65
lines changed

5 files changed

+84
-65
lines changed

controllers/team.controller.js

Lines changed: 1 addition & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -21,23 +21,11 @@ const Constants = {
2121
function showTeam(req, res) {
2222
const teamData = req.body.team.toJSON();
2323

24-
const memberNames = [];
25-
for (const member of req.body.teamMembers) {
26-
const strippedMemberJSON = member.toStrippedJSON();
27-
28-
const memberName = {
29-
firstName: strippedMemberJSON.firstName,
30-
lastName: strippedMemberJSON.lastName
31-
};
32-
33-
memberNames.push(memberName);
34-
}
35-
3624
return res.status(200).json({
3725
message: Constants.Success.TEAM_READ,
3826
data: {
3927
team: teamData,
40-
members: memberNames
28+
members: req.body.teamMembers
4129
}
4230
});
4331
}

middlewares/team.middleware.js

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -419,7 +419,12 @@ async function populateMemberAccountsById(req, res, next) {
419419
let teamMembers = [];
420420

421421
for (const member of team.members) {
422-
teamMembers.push(member.accountId);
422+
teamMembers.push({
423+
school: member.application.general.school,
424+
status: member.status,
425+
firstName: member.accountId.firstName,
426+
lastName: member.accountId.lastName
427+
});
423428
hackerIds.push(member._id);
424429
}
425430
team.members = hackerIds;

package.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,11 @@
33
"version": "3.0.0",
44
"private": true,
55
"scripts": {
6-
"start": "DEBUG=hackboard:* NODE_ENV=development nodemon --ignore gcp_creds.json ./bin/www.js",
6+
"start": "DEBUG=hackboard:* NODE_ENV=test nodemon --ignore gcp_creds.json ./bin/www.js",
77
"deploy": "NODE_ENV=deployment node ./bin/www.js",
8-
"debug": "DEBUG=hackboard:* NODE_ENV=deployment nodemon --ignore gcp_creds.json ./bin/www.js",
8+
"debug": "DEBUG=hackboard:* NODE_ENV=test nodemon --ignore gcp_creds.json ./bin/www.js",
99
"test": "DEBUG=hackboard:* NODE_ENV=test mocha --reporter spec tests/**.js --exit",
10-
"seed": "NODE_ENV=development node ./seed/index.js",
10+
"seed": "NODE_ENV=test node ./seed/index.js",
1111
"docs": "apidoc -i ./routes -o ./docs/api/",
1212
"format": "prettier --write '**/*.js'",
1313
"lint": "eslint --fix '**/*.js'"

routes/api/team.js

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ const Services = {
2121
};
2222

2323
module.exports = {
24-
activate: function(apiRouter) {
24+
activate: function (apiRouter) {
2525
const teamRouter = new express.Router();
2626

2727
/**
@@ -137,7 +137,9 @@ module.exports = {
137137
"members": [
138138
{
139139
"firstName": "John",
140-
"lastName": "Doe"
140+
"lastName": "Doe",
141+
"school": "McGill University",
142+
"status": "Applied"
141143
}
142144
],
143145
}

0 commit comments

Comments
 (0)