hackmcgill
diff --git a/‎.dockerignore‎
Lines changed: 1 addition & 2 deletions b/‎.dockerignore‎
Lines changed: 1 addition & 2 deletions
diff --git a/‎.vscode/launch.json‎
Lines changed: 16 additions & 0 deletions b/‎.vscode/launch.json‎
Lines changed: 16 additions & 0 deletions
diff --git a/‎VERSION‎
Lines changed: 1 addition & 1 deletion b/‎VERSION‎
Lines changed: 1 addition & 1 deletion
diff --git a/‎app.js‎
Lines changed: 3 additions & 0 deletions b/‎app.js‎
Lines changed: 3 additions & 0 deletions
diff --git a/‎constants/error.constant.js‎
Lines changed: 14 additions & 0 deletions b/‎constants/error.constant.js‎
Lines changed: 14 additions & 0 deletions
diff --git a/‎constants/general.constant.js‎
Lines changed: 8 additions & 2 deletions b/‎constants/general.constant.js‎
Lines changed: 8 additions & 2 deletions
diff --git a/‎constants/role.constant.js‎
Lines changed: 8 additions & 0 deletions b/‎constants/role.constant.js‎
Lines changed: 8 additions & 0 deletions
diff --git a/‎constants/routes.constant.js‎
Lines changed: 37 additions & 11 deletions b/‎constants/routes.constant.js‎
Lines changed: 37 additions & 11 deletions
diff --git a/‎constants/success.constant.js‎
Lines changed: 18 additions & 2 deletions b/‎constants/success.constant.js‎
Lines changed: 18 additions & 2 deletions
diff --git a/‎constants/testMongoId.constant.js‎
Lines changed: 29 additions & 0 deletions b/‎constants/testMongoId.constant.js‎
Lines changed: 29 additions & 0 deletions
@@ -1,3 +1,2 @@
 node_modules
-npm-debug.log
-certbot
+npm-debug.log
@@ -179,6 +179,22 @@
                 "${workspaceFolder}/tests/auth.test.js"
             ],
             "internalConsoleOptions": "openOnSessionStart"
+        },
+        {
+            "type": "node",
+            "request": "launch",
+            "name": "Mocha Tests - Role",
+            "program": "${workspaceFolder}/node_modules/mocha/bin/_mocha",
+            "args": [
+                "-u",
+                "tdd",
+                "--timeout",
+                "999999",
+                "--colors",
+                "${workspaceFolder}/tests/setup.spec.js",
+                "${workspaceFolder}/tests/role.test.js"
+            ],
+            "internalConsoleOptions": "openOnSessionStart"
         }
     ]
 }
@@ -1 +1 @@
-1.1.2
+1.1.1
@@ -28,6 +28,7 @@ const teamRouter = require("./routes/api/team");
 const sponsorRouter = require("./routes/api/sponsor");
 const searchRouter = require("./routes/api/search");
 const volunteerRouter = require("./routes/api/volunteer");
+const roleRouter = require("./routes/api/role");
 
 const app = express();
 Services.db.connect(app);
@@ -83,6 +84,8 @@ volunteerRouter.activate(apiRouter);
 Services.log.info("Volunteer router activated");
 searchRouter.activate(apiRouter);
 Services.log.info("Search router activated");
+roleRouter.activate(apiRouter);
+Services.log.info("Role router activated");
 
 apiRouter.use("/", indexRouter);
 app.use("/", indexRouter);
 
@@ -11,18 +11,24 @@ 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 TEAM_NAME_409_MESSAGE = "Conflict with team name already in use";
 const HACKER_STATUS_409_MESSAGE = "Conflict with hacker status";
+const TEAM_SIZE_409_MESSAGE = "Team full";
+const TEAM_JOIN_SAME_409_MESSAGE = "Hacker is already on receiving team";
 
 const TEAM_MEMBER_422_MESSAGE = "Duplicate team member in input";
 const VALIDATION_422_MESSAGE = "Validation failed";
 const ACCOUNT_DUPLICATE_422_MESSAGE = "Account already exists";
+const ROLE_DUPLICATE_422_MESSAGE = "Role already exists";
 
 const ACCOUNT_TOKEN_401_MESSAGE = "Invalid token for account";
 const AUTH_401_MESSAGE = "Invalid Authentication";
 
 const AUTH_403_MESSAGE = "Invalid Authorization";
 const ACCOUNT_403_MESSAGE = "Account not verified";
 
+const TEAM_READ_500_MESSAGE = "Error while retrieving team";
+const TEAM_UPDATE_500_MESSAGE = "Error while updating team";
 const HACKER_UPDATE_500_MESSAGE = "Error while updating hacker";
 const ACCOUNT_UPDATE_500_MESSAGE = "Error while updating account";
 const HACKER_CREATE_500_MESSAGE = "Error while creating hacker";
@@ -32,6 +38,7 @@ const VOLUNTEER_CREATE_500_MESSAGE = "Error while creating volunteer";
 const EMAIL_500_MESSAGE = "Error while generating email";
 const GENERIC_500_MESSAGE = "Internal error";
 const LOGIN_500_MESSAGE = "Error while logging in";
+const ROLE_CREATE_500_MESSAGE = "Error while creating role";
 
 module.exports = {
     ACCOUNT_404_MESSAGE: ACCOUNT_404_MESSAGE,
@@ -48,6 +55,7 @@ module.exports = {
     AUTH_401_MESSAGE: AUTH_401_MESSAGE,
     AUTH_403_MESSAGE: AUTH_403_MESSAGE,
     ACCOUNT_403_MESSAGE: ACCOUNT_403_MESSAGE,
+    TEAM_UPDATE_500_MESSAGE: TEAM_UPDATE_500_MESSAGE,
     HACKER_UPDATE_500_MESSAGE: HACKER_UPDATE_500_MESSAGE,
     HACKER_ID_409_MESSAGE: HACKER_ID_409_MESSAGE,
     ACCOUNT_UPDATE_500_MESSAGE: ACCOUNT_UPDATE_500_MESSAGE,
@@ -61,4 +69,10 @@ module.exports = {
     ACCOUNT_DUPLICATE_422_MESSAGE: ACCOUNT_DUPLICATE_422_MESSAGE,
     LOGIN_500_MESSAGE: LOGIN_500_MESSAGE,
     HACKER_STATUS_409_MESSAGE: HACKER_STATUS_409_MESSAGE,
+    TEAM_SIZE_409_MESSAGE: TEAM_SIZE_409_MESSAGE,
+    ROLE_DUPLICATE_422_MESSAGE: ROLE_DUPLICATE_422_MESSAGE,
+    ROLE_CREATE_500_MESSAGE: ROLE_CREATE_500_MESSAGE,
+    TEAM_NAME_409_MESSAGE: TEAM_NAME_409_MESSAGE,
+    TEAM_JOIN_SAME_409_MESSAGE: TEAM_JOIN_SAME_409_MESSAGE,
+    TEAM_READ_500_MESSAGE: TEAM_READ_500_MESSAGE,
 };
@@ -5,7 +5,8 @@ const HACKATHON_NAME = "McHacks";
 // constants kept in alphabetical order
 // matches optional http://, https://, http:, https:, and optional www., and then matches for devpost.com and further parameters
 const DEVPOST_REGEX = /^(http(s)?:(\/\/)?)?(www\.)?(([-a-zA-Z0-9@:%._\+~#=]{2,256}\.)?devpost\.com)\b([-a-zA-Z0-9@:%_\+.~#?&//=]*)$/;
-const EMAIL_REGEX = /^\w+([\.-]?\w+)*@\w+([\.-]?\w+)*(\.\w{2,3})+$/;
+// from https://emailregex.com
+const EMAIL_REGEX = /^(([^<>()\[\]\\.,;:\s@"]+(\.[^<>()\[\]\\.,;:\s@"]+)*)|(".+"))@((\[[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}])|(([a-zA-Z\-0-9]+\.)+[a-zA-Z]{2,}))$/;
 const HACKER_STATUS_NONE = "None";
 const HACKER_STATUS_APPLIED = "Applied";
 const HACKER_STATUS_ACCEPTED = "Accepted";
@@ -63,6 +64,9 @@ const EXTENDED_USER_TYPES = [HACKER, VOLUNTEER, STAFF, SPONSOR_T1, SPONSOR_T2, S
 // matches optional http://, https://, http:, https:, and optional www.
 // matches the domain, and then optional route, path, query parameters
 const URL_REGEX = /^(http(s)?:(\/\/)?)?(www\.)?([-a-zA-Z0-9@:%._\+~#=]{2,256}\.[a-z]{2,6})\b([-a-zA-Z0-9@:%_\+.~#?&//=]*)$/;
+const ANY_REGEX = /^.+$/;
+
+const MAX_TEAM_SIZE = 4;
 
 const EMAIL_SUBJECTS = {};
 EMAIL_SUBJECTS[HACKER_STATUS_NONE] = `Application for ${HACKATHON_NAME} incomplete`;
@@ -87,6 +91,7 @@ module.exports = {
     HACKATHON_NAME: HACKATHON_NAME,
     DEVPOST_REGEX: DEVPOST_REGEX,
     EMAIL_REGEX: EMAIL_REGEX,
+    ANY_REGEX: ANY_REGEX,
     HACKER_STATUS_NONE: HACKER_STATUS_NONE,
     HACKER_STATUS_APPLIED: HACKER_STATUS_APPLIED,
     HACKER_STATUS_ACCEPTED: HACKER_STATUS_ACCEPTED,
@@ -117,5 +122,6 @@ module.exports = {
     ROLE_CATEGORIES: ROLE_CATEGORIES,
     POST_ROLES: POST_ROLES,
     CACHE_TIMEOUT_STATS: CACHE_TIMEOUT_STATS,
-    CACHE_KEY_STATS: CACHE_KEY_STATS
+    CACHE_KEY_STATS: CACHE_KEY_STATS,
+    MAX_TEAM_SIZE: MAX_TEAM_SIZE
 };
@@ -39,6 +39,12 @@ const hackerRole = {
         Constants.Routes.hackerRoutes.patchSelfById,
         Constants.Routes.hackerRoutes.patchSelfConfirmationById,
         Constants.Routes.hackerRoutes.getSelf,
+
+        Constants.Routes.teamRoutes.join,
+        Constants.Routes.teamRoutes.patchSelfById,
+        Constants.Routes.teamRoutes.post,
+        Constants.Routes.teamRoutes.get,
+        Constants.Routes.teamRoutes.leave
     ]
 };
 
@@ -50,6 +56,8 @@ const volunteerRole = {
 
         Constants.Routes.hackerRoutes.patchAnyCheckInById,
         Constants.Routes.hackerRoutes.patchSelfCheckInById,
+
+        Constants.Routes.teamRoutes.get
     ]
 };
 
 
@@ -10,10 +10,6 @@ const authRoutes = {
         requestType: Constants.REQUEST_TYPES.POST,
         uri: "/api/auth/logout"
     },
-    "invite": {
-        requestType: Constants.REQUEST_TYPES.POST,
-        uri: "/api/auth/invite"
-    },
     "getSelfRoleBindindings": {
         requestType: Constants.REQUEST_TYPES.GET,
         uri: "/api/auth/rolebindings/" + Constants.ROLE_CATEGORIES.SELF
@@ -62,7 +58,7 @@ const accountRoutes = {
 const hackerRoutes = {
     "getSelf": {
         requestType: Constants.REQUEST_TYPES.GET,
-        uri: "/api/hacker/self/"
+        uri: "/api/hacker/self/",
     },
     "getSelfById": {
         requestType: Constants.REQUEST_TYPES.GET,
@@ -138,18 +134,30 @@ const sponsorRoutes = {
 };
 
 const teamRoutes = {
-    "getSelfById": {
-        requestType: Constants.REQUEST_TYPES.GET,
-        uri: "/api/team/" + Constants.ROLE_CATEGORIES.SELF,
-    },
-    "getAnyById": {
+    "get": {
         requestType: Constants.REQUEST_TYPES.GET,
         uri: "/api/team/" + Constants.ROLE_CATEGORIES.ALL,
     },
     "post": {
         requestType: Constants.REQUEST_TYPES.POST,
         uri: "/api/team/",
     },
+    "join": {
+        requestType: Constants.REQUEST_TYPES.PATCH,
+        uri: "/api/team/join/",
+    },
+    "patchSelfById": {
+        requestType: Constants.REQUEST_TYPES.PATCH,
+        uri: "/api/team/" + Constants.ROLE_CATEGORIES.SELF
+    },
+    "patchAnyById": {
+        requestType: Constants.REQUEST_TYPES.PATCH,
+        uri: "/api/team/" + Constants.ROLE_CATEGORIES.ALL
+    },
+    "leave": {
+        requestType: Constants.REQUEST_TYPES.PATCH,
+        uri: "/api/team/leave/",
+    },
 };
 
 const volunteerRoutes = {
@@ -159,6 +167,13 @@ const volunteerRoutes = {
     },
 };
 
+const roleRoutes = {
+    "post": {
+        requestType: Constants.REQUEST_TYPES.POST,
+        uri: "/api/role/",
+    }
+};
+
 const searchRoutes = {
     "get": {
         requestType: Constants.REQUEST_TYPES.GET,
@@ -170,7 +185,16 @@ const staffRoutes = {
     "hackerStats": {
         requestType: Constants.REQUEST_TYPES.GET,
         uri: "/api/hacker/stats",
-    }
+    },
+    "postInvite": {
+        requestType: Constants.REQUEST_TYPES.POST,
+        uri: "/api/account/invite"
+    },
+    "getInvite": {
+        requestType: Constants.REQUEST_TYPES.GET,
+        uri: "/api/account/invite"
+    },
+
 }
 
 const allRoutes = {
@@ -180,6 +204,7 @@ const allRoutes = {
     "Sponsor": sponsorRoutes,
     "Team": teamRoutes,
     "Volunteer": volunteerRoutes,
+    "Role": roleRoutes,
     "Search": searchRoutes,
     "Staff": staffRoutes,
 };
@@ -217,6 +242,7 @@ module.exports = {
     sponsorRoutes: sponsorRoutes,
     teamRoutes: teamRoutes,
     volunteerRoutes: volunteerRoutes,
+    roleRoutes: roleRoutes,
     searchRoutes: searchRoutes,
     staffRoutes: staffRoutes,
     allRoutes: allRoutes,
 
@@ -2,9 +2,11 @@
 
 const ACCOUNT_GET_BY_EMAIL = "Account found by user email.";
 const ACCOUNT_GET_BY_ID = "Account found by user id.";
+const ACCOUNT_READ = "Account retrieval successful.";
 const ACCOUNT_CREATE = "Account creation successful.";
 const ACCOUNT_UPDATE = "Account update successful.";
 const ACCOUNT_INVITE = "Account invitation successful.";
+const ACCOUNT_GET_INVITES = "Invite retrieval successful.";
 
 const AUTH_LOGIN = "Login successful.";
 const AUTH_LOGOUT = "Logout successful.";
@@ -23,15 +25,21 @@ const HACKER_UPDATE = "Hacker update successful.";
 const RESUME_UPLOAD = "Resume upload successful.";
 const RESUME_DOWNLOAD = "Resume download successful.";
 
+const ROLE_CREATE = "Role creation successful.";
+
 const SEARCH_QUERY = "Query search successful. Returning results.";
 const SEARCH_NO_RESULTS = "Query search successful. No results found.";
 
-
 const SPONSOR_GET_BY_ID = "Sponsor found by id.";
+const SPONSOR_READ = "Sponsor retrieval successful.";
 const SPONSOR_CREATE = "Sponsor creation successful.";
 
 const TEAM_GET_BY_ID = "Team found by id.";
 const TEAM_CREATE = "Team creation successful.";
+const TEAM_JOIN = "Team join successful.";
+const TEAM_UPDATE = "Team update successful.";
+const TEAM_READ = "Team retrieval successful.";
+const TEAM_HACKER_LEAVE = "Removal from team successful.";
 
 const VOLUNTEER_CREATE = "Volunteer creation successful.";
 
@@ -41,7 +49,8 @@ module.exports = {
     ACCOUNT_CREATE: ACCOUNT_CREATE,
     ACCOUNT_UPDATE: ACCOUNT_UPDATE,
     ACCOUNT_INVITE: ACCOUNT_INVITE,
-
+    ACCOUNT_GET_INVITES: ACCOUNT_GET_INVITES,
+    ACCOUNT_READ: ACCOUNT_READ,
     AUTH_LOGIN: AUTH_LOGIN,
     AUTH_LOGOUT: AUTH_LOGOUT,
     AUTH_SEND_RESET_EMAIL: AUTH_SEND_RESET_EMAIL,
@@ -59,14 +68,21 @@ module.exports = {
     RESUME_UPLOAD: RESUME_UPLOAD,
     RESUME_DOWNLOAD: RESUME_DOWNLOAD,
 
+    ROLE_CREATE: ROLE_CREATE,
+
     SEARCH_QUERY: SEARCH_QUERY,
     SEARCH_NO_RESULTS: SEARCH_NO_RESULTS,
 
     SPONSOR_GET_BY_ID: SPONSOR_GET_BY_ID,
     SPONSOR_CREATE: SPONSOR_CREATE,
+    SPONSOR_READ: SPONSOR_READ,
 
     TEAM_GET_BY_ID: TEAM_GET_BY_ID,
     TEAM_CREATE: TEAM_CREATE,
+    TEAM_JOIN: TEAM_JOIN,
+    TEAM_UPDATE: TEAM_UPDATE,
+    TEAM_READ: TEAM_READ,
+    TEAM_HACKER_LEAVE: TEAM_HACKER_LEAVE,
 
     VOLUNTEER_CREATE: VOLUNTEER_CREATE,
 };
@@ -0,0 +1,29 @@
+"use strict";
+
+const mongoose = require("mongoose");
+
+const team1Id = mongoose.Types.ObjectId();
+const team2Id = mongoose.Types.ObjectId();
+const team3Id = mongoose.Types.ObjectId();
+
+const hackerAId = mongoose.Types.ObjectId();
+const hackerBId = mongoose.Types.ObjectId();
+const hackerCId = mongoose.Types.ObjectId();
+const hackerDId = mongoose.Types.ObjectId();
+const hackerEId = mongoose.Types.ObjectId();
+const hackerFId = mongoose.Types.ObjectId();
+const hackerGId = mongoose.Types.ObjectId();
+
+
+module.exports = {
+    team1Id: team1Id,
+    team2Id: team2Id,
+    team3Id: team3Id,
+    hackerAId: hackerAId,
+    hackerBId: hackerBId,
+    hackerCId: hackerCId,
+    hackerDId: hackerDId,
+    hackerEId: hackerEId,
+    hackerFId: hackerFId,
+    hackerGId: hackerGId,
+};