Feature/124 update application page

controllers/account.controller.js

@@ -25,7 +25,7 @@ function showAccount(req, res) {
 
 /**
  * @function addUser
- * @param {{body: {accountDetails: {_id: ObjectId, firstName: string, lastName: string, email: string, password: string, dietaryRestrictions: string, shirtSize: string}}}} req
+ * @param {{body: {accountDetails: {_id: ObjectId, firstName: string, lastName: string, email: string, password: string}}}} req
  * @param {*} res
  * @return {JSON} Success or error status
  * @description Adds a user from information in req.body.accountDetails

controllers/hacker.controller.js

@@ -20,7 +20,7 @@ function showHacker(req, res) {
 
 /**
  * @function createdHacker
- * @param {{body: {hacker: {_id: ObjectId, accountId: ObjectId, school: string, gender: string, needsBus: boolean, application: {Object}}}}} req
+ * @param {{body: {hacker: {_id: ObjectId, accountId: ObjectId, status: string, application: {Object}}}}} req
  * @param {*} res
  * @return {JSON} Success status
  * @description returns success message

docs/api/vendor/jquery.min.js

@@ -1448,12 +1448,9 @@
                             i > 1 && sa(m),
                             i > 1 &&
                                 qa(
-                                    a
-                                        .slice(0, i - 1)
-                                        .concat({
-                                            value:
-                                                " " === a[i - 2].type ? "*" : ""
-                                        })
+                                    a.slice(0, i - 1).concat({
+                                        value: " " === a[i - 2].type ? "*" : ""
+                                    })
                                 ).replace(Q, "$1"),
                             c,
                             e > i && wa(a.slice(i, e)),

middlewares/account.middleware.js

@@ -34,12 +34,12 @@ function parsePatch(req, res, next) {
 
 /**
  * @function parseAccount
- * @param {{body: {firstName: string, lastName: string, email: string, password: string, dietaryRestrictions: string, shirtSize: string}}} req
+ * @param {{body: {firstName: string, lastName: string, email: string, password: string}}} req
  * @param {*} res
  * @param {(err?)=>void} next
  * @return {void}
  * @description
- * Moves firstName, lastName, email, password, dietaryRestrictions, shirtSize from req.body to req.body.accountDetails.
+ * Moves firstName, lastName, email, password from req.body to req.body.accountDetails.
  * Hashes the password.
  * Adds _id to accountDetails.
  */
@@ -49,6 +49,7 @@ function parseAccount(req, res, next) {
         firstName: req.body.firstName,
         lastName: req.body.lastName,
         pronoun: req.body.pronoun,
+        gender: req.body.gender,
         email: req.body.email,
         password: Services.Account.hashPassword(req.body.password),
         dietaryRestrictions: req.body.dietaryRestrictions,
@@ -60,6 +61,7 @@ function parseAccount(req, res, next) {
     delete req.body.firstName;
     delete req.body.lastName;
     delete req.body.pronoun;
+    delete req.body.gender;
     delete req.body.email;
     delete req.body.password;
     delete req.body.dietaryRestrictions;

middlewares/auth.middleware.js

@@ -140,7 +140,7 @@ async function changePassword(req, res, next) {
         req.body.oldPassword
     );
     // user's old password is correct
-    if (acc) {
+    if (!!acc) {
         req.body.account = await Services.Account.updatePassword(
             req.user.id,
             req.body.newPassword
@@ -332,7 +332,7 @@ function parseResetToken(req, res, next) {
  * @param {(err?)=>void} next
  */
 function parseAccountConfirmationToken(req, res, next) {
-    if (req.body.token) {
+    if (!!req.body.token) {
         jwt.verify(req.body.token, process.env.JWT_CONFIRM_ACC_SECRET, function(
             err,
             decoded
@@ -432,7 +432,7 @@ async function validateConfirmationToken(req, res, next) {
  * @param {*} next
  */
 async function validateConfirmationTokenWithoutAccount(req, res, next) {
-    if (req.body.decodedToken) {
+    if (!!req.body.decodedToken) {
         const confirmationObj = await Services.AccountConfirmation.findById(
             req.body.decodedToken.accountConfirmationId
         );

middlewares/hacker.middleware.js

@@ -32,44 +32,25 @@ function parsePatch(req, res, next) {
 
 /**
  * @function parseHacker
- * @param {{body: {accountId: ObjectId, school: string, degree: string, gender: string, needsBus: string, application: Object, authorization: string}}} req
+ * @param {{body: {accountId: ObjectId, application: Object, authorization: string}}} req
  * @param {*} res
  * @param {(err?)=>void} next
  * @return {void}
  * @description
- * Moves accountId, school, degree, gender, needsBus, application from req.body to req.body.hackerDetails.
+ * Moves accountId, application from req.body to req.body.hackerDetails.
  * Adds _id to hackerDetails.
  */
 function parseHacker(req, res, next) {
     const hackerDetails = {
         _id: mongoose.Types.ObjectId(),
         accountId: req.body.accountId,
-        school: req.body.school,
-        degree: req.body.degree,
-        gender: req.body.gender,
-        needsBus: req.body.needsBus,
         application: req.body.application,
-
-        ethnicity: req.body.ethnicity,
-        major: req.body.major,
-        graduationYear: req.body.graduationYear,
-        codeOfConduct: req.body.codeOfConduct,
-
         teamId: req.body.teamId
     };
     req.body.token = req.body.authorization;
 
     delete req.body.accountId;
-    delete req.body.school;
-    delete req.body.degree;
-    delete req.body.gender;
-    delete req.body.needsBus;
     delete req.body.application;
-    delete req.body.authorization;
-    delete req.body.ethnicity;
-    delete req.body.major;
-    delete req.body.graduationYear;
-    delete req.body.codeOfConduct;
     delete req.body.teamId;
 
     req.body.hackerDetails = hackerDetails;
@@ -280,7 +261,7 @@ async function uploadResume(req, res, next) {
     req.body.gcfilename = gcfilename;
     await Services.Hacker.updateOne(req.hacker.id, {
         $set: {
-            "application.portfolioURL.resume": gcfilename
+            "application.general.URL.resume": gcfilename
         }
     });
     return next();
@@ -297,11 +278,12 @@ async function downloadResume(req, res, next) {
     if (
         hacker &&
         hacker.application &&
-        hacker.application.portfolioURL &&
-        hacker.application.portfolioURL.resume
+        hacker.application.general &&
+        hacker.application.general.URL &&
+        hacker.application.general.URL.resume
     ) {
         req.body.resume = await Services.Storage.download(
-            hacker.application.portfolioURL.resume
+            hacker.application.general.URL.resume
         );
     } else {
         return next({
@@ -480,7 +462,7 @@ function checkStatus(statuses) {
     return Middleware.Util.asyncMiddleware(async (req, res, next) => {
         let hacker = await Services.Hacker.findById(req.params.id);
 
-        if (hacker) {
+        if (!!hacker) {
             const status = hacker.status;
             // makes sure the hacker's status is in the accepted statuses list
             if (statuses.indexOf(status) === -1) {
@@ -578,10 +560,8 @@ async function createHacker(req, res, next) {
             }
         });
     }
-
     const hacker = await Services.Hacker.createHacker(hackerDetails);
-
-    if (hacker) {
+    if (!!hacker) {
         req.body.hacker = hacker;
         return next();
     } else {
@@ -636,7 +616,7 @@ async function findSelf(req, res, next) {
 
     const hacker = await Services.Hacker.findByAccountId(req.user.id);
 
-    if (hacker) {
+    if (!!hacker) {
         req.body.hacker = hacker;
         return next();
     } else {

middlewares/validators/account.validator.js

@@ -7,6 +7,7 @@ module.exports = {
         VALIDATOR.stringValidator("body", "firstName", false),
         VALIDATOR.stringValidator("body", "lastName", false),
         VALIDATOR.stringValidator("body", "pronoun", false),
+        VALIDATOR.stringValidator("body", "gender", false),
         VALIDATOR.regexValidator("body", "email", false, Constants.EMAIL_REGEX),
         VALIDATOR.alphaArrayValidator("body", "dietaryRestrictions", false),
         VALIDATOR.stringValidator("body", "gender", false),
@@ -24,6 +25,7 @@ module.exports = {
         VALIDATOR.stringValidator("body", "firstName", true),
         VALIDATOR.stringValidator("body", "lastName", true),
         VALIDATOR.stringValidator("body", "pronoun", true),
+        VALIDATOR.stringValidator("body", "gender", true),
         VALIDATOR.regexValidator("body", "email", true, Constants.EMAIL_REGEX),
         VALIDATOR.alphaArrayValidator("body", "dietaryRestrictions", true),
         VALIDATOR.stringValidator("body", "gender", true),