Merge pull request #160 from hackmcgill/feature/105

Feature/105

Author: YiFeiZhang2

constants/error.constant.js

@@ -11,6 +11,7 @@ const SPONSOR_ID_409_MESSAGE = "Conflict with sponsor accountId link";
 const VOLUNTEER_ID_409_MESSAGE = "Conflict with volunteer accountId link";
 const HACKER_ID_409_MESSAGE = "Conflict with hacker accountId link";
 const TEAM_MEMBER_409_MESSAGE = "Conflict with team member being in another team";
+const HACKER_STATUS_409_MESSAGE = "Conflict with hacker status";
 
 const TEAM_MEMBER_422_MESSAGE = "Duplicate team member in input";
 const VALIDATION_422_MESSAGE = "Validation failed";
@@ -59,4 +60,5 @@ module.exports = {
     GENERIC_500_MESSAGE: GENERIC_500_MESSAGE,
     ACCOUNT_DUPLICATE_422_MESSAGE: ACCOUNT_DUPLICATE_422_MESSAGE,
     LOGIN_500_MESSAGE: LOGIN_500_MESSAGE,
+    HACKER_STATUS_409_MESSAGE: HACKER_STATUS_409_MESSAGE,
 };

constants/role.constant.js

@@ -36,6 +36,7 @@ const hackerRole = {
         Constants.Routes.hackerRoutes.getSelfById,
         Constants.Routes.hackerRoutes.getSelfResumeById,
         Constants.Routes.hackerRoutes.patchSelfById,
+        Constants.Routes.hackerRoutes.patchSelfConfirmationById
     ]
 };
 
@@ -44,6 +45,9 @@ const volunteerRole = {
     "name": Constants.General.VOLUNTEER,
     "routes": [
         Constants.Routes.volunteerRoutes.post,
+
+        Constants.Routes.hackerRoutes.patchAnyCheckInById,
+        Constants.Routes.hackerRoutes.patchSelfCheckInById,
     ]
 };
 

constants/routes.constant.js

@@ -99,7 +99,19 @@ const hackerRoutes = {
     "patchSelfStatusById": {
         requestType: Constants.REQUEST_TYPES.PATCH,
         uri: "/api/hacker/status/" + Constants.ROLE_CATEGORIES.SELF,
-    }
+    },
+    "patchSelfCheckInById": {
+        requestType: Constants.REQUEST_TYPES.PATCH,
+        uri: "/api/hacker/checkin/" + Constants.ROLE_CATEGORIES.SELF,
+    },
+    "patchAnyCheckInById": {
+        requestType: Constants.REQUEST_TYPES.PATCH,
+        uri: "/api/hacker/checkin/" + Constants.ROLE_CATEGORIES.ALL,
+    },
+    "patchSelfConfirmationById": {
+        requestType: Constants.REQUEST_TYPES.PATCH,
+        uri: "/api/hacker/confirmation/" + Constants.ROLE_CATEGORIES.SELF,
+    },
 };
 
 const sponsorRoutes = {

controllers/account.controller.js

@@ -67,49 +67,36 @@ async function getUserById(req, res) {
  * @description Adds a user from information in req.body.accountDetails
  */
 async function addUser(req, res) {
-    const accountDetails = req.body.accountDetails;
-    delete accountDetails.password;
+    const acc = req.body.account;
     return res.status(200).json({
         message: "Account creation successful",
-        data: accountDetails
+        data: acc.toStrippedJSON()
     });
 }
 
 
 /**
- * @async
- * @function updateAccount
- * @param {{params: {id: string}, body: {Object}}} req
+ * @function updatedAccount
+ * @param {{body: {Object}}} req
  * @param {*} res
  * @return {JSON} Success or error status
  * @description 
- *      Change a user's account information based on the account's mongoID. 
+ *      Returns a 200 status for an updated account.
  *      The new account information is located in req.body.
  *      The id is moved to req.body.id from req.params.id by validation.
  */
-async function updateAccount(req, res) {
-    const id = req.params.id;
-
-    const success = await Services.Account.changeOneAccount(id, req.body);
-
-    if (success) {
-        return res.status(200).json({
-            message: "Changed account information",
-            data: req.body
-        });
-    } else {
-        return res.status(500).json({
-            message: Constants.Error.ACCOUNT_UPDATE_500_MESSAGE,
-            data: {}
-        });
-    }
+function updatedAccount(req, res) {
+    return res.status(200).json({
+        message: "Changed account information",
+        data: req.body
+    });
 }
 
-function invitedAccount(req, res){
+function invitedAccount(req, res) {
     return res.status(200).json({
         message: "Successfully invited user",
         data: {}
-    })
+    });
 }
 
 
@@ -119,7 +106,6 @@ module.exports = {
 
     // assumes all information in req.body
     addUser: Util.asyncMiddleware(addUser),
-
-    updateAccount: Util.asyncMiddleware(updateAccount),
+    updatedAccount: updatedAccount,
     invitedAccount: invitedAccount
 };

controllers/auth.controller.js

@@ -14,40 +14,40 @@ module.exports = {
             data: {}
         });
     },
-    sentResetEmail: function(req, res) {
+    sentResetEmail: function (req, res) {
         return res.status(200).json({
             message: "Sent reset email",
             data: {}
         });
     },
-    resetPassword: function(req, res) {
+    resetPassword: function (req, res) {
         return res.status(200).json({
             message: "Successfully reset password",
             data: {}
         });
     },
-    confirmAccount: function(req, res) {
+    confirmAccount: function (req, res) {
         return res.status(200).json({
             message: "Successfully confirmed account",
             data: {}
-        })
+        });
     },
-    retrieveRoleBindings: function(req, res) {
+    retrieveRoleBindings: function (req, res) {
         return res.status(200).json({
             message: "Successfully retrieved role bindings",
             data: req.roleBindings.toJSON()
-        })
+        });
     },
-    sentConfirmationEmail: function(req, res){
+    sentConfirmationEmail: function (req, res) {
         return res.status(200).json({
             message: "Successfully resent account email",
             data: {}
         })
     },
-    retrievedRoles: function(req, res) {
+    retrievedRoles: function (req, res) {
         return res.status(200).json({
             message: "Successfully retrieved all roles",
             data: req.roles
         })
     }
-};
+};

controllers/hacker.controller.js

@@ -33,33 +33,20 @@ async function findById(req, res) {
 }
 
 /**
- * @async
- * @function createHacker
- * @param {{body: {hackerDetails: {_id: ObjectId, accountId: ObjectId, school: string, gender: string, needsBus: boolean, application: {Object}}}}} req
+ * @function createdHacker
+ * @param {{body: {hacker: {_id: ObjectId, accountId: ObjectId, school: string, gender: string, needsBus: boolean, application: {Object}}}}} req
  * @param {*} res
- * @return {JSON} Success or error status
- * @description create a hacker from information in req.body.hackerDetails
+ * @return {JSON} Success status
+ * @description returns success message
  */
-async function createHacker(req, res) {
-    const hackerDetails = req.body.hackerDetails;
-    const success = await Services.Hacker.createHacker(hackerDetails);
-    hackerDetails.id = hackerDetails._id;
-    delete hackerDetails._id;
-    if (success) {
-        return res.status(200).json({
-            message: "Hacker creation successful",
-            data: hackerDetails
-        });
-    } else {
-        return res.status(500).json({
-            message: Constants.Error.HACKER_CREATE_500_MESSAGE,
-            data: {}
-        });
-    }
+async function createdHacker(req, res) {
+    return res.status(200).json({
+        message: "Hacker creation successful",
+        data: req.body.hacker.toJSON()
+    });
 }
 
 /**
- * @async
  * @function updateHacker
  * @param {{params: {id: ObjectId}, body: {Object}}} req
  * @param {*} res
@@ -70,7 +57,7 @@ async function createHacker(req, res) {
  *      Returns a 200 status for an updated hacker.
  *      The new information is located in req.body.
  */
-async function updatedHacker(req, res) {
+function updatedHacker(req, res) {
     return res.status(200).json({
         message: "Changed hacker information",
         data: req.body
@@ -99,7 +86,7 @@ function downloadedResume(req, res) {
 module.exports = {
     updatedHacker: updatedHacker,
     findById: Util.asyncMiddleware(findById),
-    createHacker: Util.asyncMiddleware(createHacker),
+    createdHacker: createdHacker,
     uploadedResume: uploadedResume,
     downloadedResume: downloadedResume
 };