Add teamId to expansion of query result, and keep team member ids in …

controllers/team.controller.js

@@ -20,7 +20,6 @@ const Constants = {
  */
 function showTeam(req, res) {
     const teamData = req.body.team.toJSON();
-    delete teamData.members;
 
     const memberNames = [];
     for (const member of req.body.teamMembers) {

docs/api/api_data.js

@@ -1257,7 +1257,7 @@ define({
     },
     {
       "type": "get",
-      "url": "/hacker/email/:email",
+      "url": "/hacker/:id",
       "title": "get a hacker's information",
       "name": "getHacker",
       "group": "Hacker",
@@ -1268,8 +1268,8 @@ define({
             "group": "param",
             "type": "String",
             "optional": false,
-            "field": "email",
-            "description": "<p>a hacker's unique email</p>"
+            "field": "id",
+            "description": "<p>a hacker's unique mongoID</p>"
           }]
         }
       },
@@ -1324,12 +1324,12 @@ define({
       "filename": "routes/api/hacker.js",
       "groupTitle": "Hacker",
       "sampleRequest": [{
-        "url": "https://api.mchacks.ca/api/hacker/email/:email"
+        "url": "https://api.mchacks.ca/api/hacker/:id"
       }]
     },
     {
       "type": "get",
-      "url": "/hacker/:id",
+      "url": "/hacker/email/:email",
       "title": "get a hacker's information",
       "name": "getHacker",
       "group": "Hacker",
@@ -1340,8 +1340,8 @@ define({
             "group": "param",
             "type": "String",
             "optional": false,
-            "field": "id",
-            "description": "<p>a hacker's unique mongoID</p>"
+            "field": "email",
+            "description": "<p>a hacker's unique email</p>"
           }]
         }
       },
@@ -1396,7 +1396,7 @@ define({
       "filename": "routes/api/hacker.js",
       "groupTitle": "Hacker",
       "sampleRequest": [{
-        "url": "https://api.mchacks.ca/api/hacker/:id"
+        "url": "https://api.mchacks.ca/api/hacker/email/:email"
       }]
     },
     {
@@ -2573,7 +2573,7 @@ define({
         },
         "examples": [{
           "title": "Success-Response: ",
-          "content": "{\n               \"message\": \"Successfully retrieved team information\", \n               \"data\": {...}\n           }",
+          "content": "{\n               \"message\": \"Team retrieval successful\", \n               \"data\": {        \n                   \"team\": {\n                       \"name\":\"foo\",\n                       \"members\": [\n                           ObjectId('...')\n                       ],\n                       \"devpostURL\": \"www.devpost.com/foo\",\n                       \"projectName\": \"fooey\"\n                   },\n                   \"members\": [\n                       {\n                           \"firstName\": \"John\",\n                           \"lastName\": \"Doe\"\n                       }\n                   ],\n               }\n           }",
           "type": "object"
         }]
       },

docs/api/api_data.json

@@ -1256,7 +1256,7 @@
   },
   {
     "type": "get",
-    "url": "/hacker/email/:email",
+    "url": "/hacker/:id",
     "title": "get a hacker's information",
     "name": "getHacker",
     "group": "Hacker",
@@ -1267,8 +1267,8 @@
           "group": "param",
           "type": "String",
           "optional": false,
-          "field": "email",
-          "description": "<p>a hacker's unique email</p>"
+          "field": "id",
+          "description": "<p>a hacker's unique mongoID</p>"
         }]
       }
     },
@@ -1323,12 +1323,12 @@
     "filename": "routes/api/hacker.js",
     "groupTitle": "Hacker",
     "sampleRequest": [{
-      "url": "https://api.mchacks.ca/api/hacker/email/:email"
+      "url": "https://api.mchacks.ca/api/hacker/:id"
     }]
   },
   {
     "type": "get",
-    "url": "/hacker/:id",
+    "url": "/hacker/email/:email",
     "title": "get a hacker's information",
     "name": "getHacker",
     "group": "Hacker",
@@ -1339,8 +1339,8 @@
           "group": "param",
           "type": "String",
           "optional": false,
-          "field": "id",
-          "description": "<p>a hacker's unique mongoID</p>"
+          "field": "email",
+          "description": "<p>a hacker's unique email</p>"
         }]
       }
     },
@@ -1395,7 +1395,7 @@
     "filename": "routes/api/hacker.js",
     "groupTitle": "Hacker",
     "sampleRequest": [{
-      "url": "https://api.mchacks.ca/api/hacker/:id"
+      "url": "https://api.mchacks.ca/api/hacker/email/:email"
     }]
   },
   {
@@ -2571,7 +2571,7 @@
       },
       "examples": [{
         "title": "Success-Response: ",
-        "content": "{\n               \"message\": \"Successfully retrieved team information\", \n               \"data\": {...}\n           }",
+        "content": "{\n               \"message\": \"Team retrieval successful\", \n               \"data\": {        \n                   \"team\": {\n                       \"name\":\"foo\",\n                       \"members\": [\n                           ObjectId('...')\n                       ],\n                       \"devpostURL\": \"www.devpost.com/foo\",\n                       \"projectName\": \"fooey\"\n                   },\n                   \"members\": [\n                       {\n                           \"firstName\": \"John\",\n                           \"lastName\": \"Doe\"\n                       }\n                   ],\n               }\n           }",
         "type": "object"
       }]
     },

docs/api/api_project.js

@@ -1,16 +1,16 @@
-define({
-    "name": "hackerAPI",
-    "version": "0.0.8",
-    "description": "Documentation for the API used for mchacks",
-    "defaultVersion": "0.0.8",
-    "title": "hackerAPI documentation",
-    "url": "https://api.mchacks.ca/api",
-    "sampleUrl": "https://api.mchacks.ca/api",
-    "apidoc": "0.3.0",
-    "generator": {
-        "name": "apidoc",
-        "time": "2019-01-21T04:13:36.482Z",
-        "url": "http://apidocjs.com",
-        "version": "0.17.7"
-    }
+define({
+  "name": "hackerAPI",
+  "version": "0.0.8",
+  "description": "Documentation for the API used for mchacks",
+  "defaultVersion": "0.0.8",
+  "title": "hackerAPI documentation",
+  "url": "https://api.mchacks.ca/api",
+  "sampleUrl": "https://api.mchacks.ca/api",
+  "apidoc": "0.3.0",
+  "generator": {
+    "name": "apidoc",
+    "time": "2019-01-19T01:48:55.120Z",
+    "url": "http://apidocjs.com",
+    "version": "0.17.7"
+  }
 });

docs/api/api_project.json

@@ -1,16 +1,16 @@
-{
-    "name": "hackerAPI",
-    "version": "0.0.8",
-    "description": "Documentation for the API used for mchacks",
-    "defaultVersion": "0.0.8",
-    "title": "hackerAPI documentation",
-    "url": "https://api.mchacks.ca/api",
-    "sampleUrl": "https://api.mchacks.ca/api",
-    "apidoc": "0.3.0",
-    "generator": {
-        "name": "apidoc",
-        "time": "2019-01-21T04:13:36.482Z",
-        "url": "http://apidocjs.com",
-        "version": "0.17.7"
-    }
+{
+  "name": "hackerAPI",
+  "version": "0.0.8",
+  "description": "Documentation for the API used for mchacks",
+  "defaultVersion": "0.0.8",
+  "title": "hackerAPI documentation",
+  "url": "https://api.mchacks.ca/api",
+  "sampleUrl": "https://api.mchacks.ca/api",
+  "apidoc": "0.3.0",
+  "generator": {
+    "name": "apidoc",
+    "time": "2019-01-19T01:48:55.120Z",
+    "url": "http://apidocjs.com",
+    "version": "0.17.7"
+  }
 }

middlewares/team.middleware.js

@@ -407,13 +407,14 @@ async function populateMemberAccountsById(req, res, next) {
             data: {}
         });
     }
-
+    let hackerIds = [];
     let teamMembers = [];
 
     for (const member of team.members) {
         teamMembers.push(member.accountId);
+        hackerIds.push(member._id);
     }
-
+    team.members = hackerIds;
     req.body.team = team;
     req.body.teamMembers = teamMembers;
     return next();

routes/api/team.js

@@ -122,8 +122,23 @@ module.exports = {
          * @apiSuccess {Object} data Team object
          * @apiSuccessExample {object} Success-Response: 
          *      {
-                    "message": "Successfully retrieved team information", 
-                    "data": {...}
+                    "message": "Team retrieval successful", 
+                    "data": {        
+                        "team": {
+                            "name":"foo",
+                            "members": [
+                                ObjectId('...')
+                            ],
+                            "devpostURL": "www.devpost.com/foo",
+                            "projectName": "fooey"
+                        },
+                        "members": [
+                            {
+                                "firstName": "John",
+                                "lastName": "Doe"
+                            }
+                        ],
+                    }
                 }
 
          * @apiError {String} message Error message

services/search.service.js

@@ -17,10 +17,12 @@ function executeQuery(model, queryArray, page, limit, sort, sort_by, shouldExpan
     var query;
     switch (model.toLowerCase()) {
         case "hacker":
-            query = (shouldExpand) ? Hacker.find().populate({
+            query = (shouldExpand) ? Hacker.find().populate([{
                 path: "accountId",
                 select: " -password"
-            }) : Hacker.find();
+            }, {
+                path: "teamId"
+            }]) : Hacker.find();
             break;
         default:
             return [];

tests/team.test.js

@@ -76,6 +76,12 @@ describe("GET team", function () {
                     res.body.should.have.property("data");
                     res.body.data.should.have.property("team");
                     res.body.data.team.name.should.equal("FullTeam");
+                    res.body.data.team.should.have.property("members");
+                    res.body.data.team.members[0].should.equal(util.hacker.TeamHacker1._id.toString());
+                    res.body.data.team.members[1].should.equal(util.hacker.TeamHacker2._id.toString());
+                    res.body.data.team.members[2].should.equal(util.hacker.TeamHacker3._id.toString());
+                    res.body.data.team.members[3].should.equal(util.hacker.TeamHacker4._id.toString());
+
                     res.body.data.should.have.property("members");
                     res.body.data.members[0].firstName.should.equal(util.account.hackerAccounts.stored.team[1].firstName);
                     res.body.data.members[0].lastName.should.equal(util.account.hackerAccounts.stored.team[1].lastName);