Merge pull request #387 from topcoder-platform/feature/new-roles

vikasrohit · web-flow · commit e2ad1f7586f7 · 2019-10-01T11:16:37.000+05:30
New user roles
diff --git a/src/constants.js b/src/constants.js
@@ -27,12 +27,20 @@ export const PROJECT_MEMBER_ROLE = {
   CUSTOMER: 'customer',
   COPILOT: 'copilot',
   ACCOUNT_MANAGER: 'account_manager',
+  PROGRAM_MANAGER: 'program_manager',
+  ACCOUNT_EXECUTIVE: 'account_executive',
+  SOLUTION_ARCHITECT: 'solution_architect',
+  PROJECT_MANAGER: 'project_manager',
 };
 
 export const PROJECT_MEMBER_MANAGER_ROLES = [
   PROJECT_MEMBER_ROLE.MANAGER,
   PROJECT_MEMBER_ROLE.OBSERVER,
   PROJECT_MEMBER_ROLE.ACCOUNT_MANAGER,
+  PROJECT_MEMBER_ROLE.ACCOUNT_EXECUTIVE,
+  PROJECT_MEMBER_ROLE.PROJECT_MANAGER,
+  PROJECT_MEMBER_ROLE.PROGRAM_MANAGER,
+  PROJECT_MEMBER_ROLE.SOLUTION_ARCHITECT,
 ];
 
 export const USER_ROLE = {
@@ -42,6 +50,12 @@ export const USER_ROLE = {
   COPILOT: 'Connect Copilot',
   CONNECT_ADMIN: 'Connect Admin',
   COPILOT_MANAGER: 'Connect Copilot Manager',
+  BUSINESS_DEVELOPMENT_REPRESENTATIVE: 'Business Development Representative',
+  PRESALES: 'Presales',
+  ACCOUNT_EXECUTIVE: 'Account Executive',
+  PROGRAM_MANAGER: 'Program Manager',
+  SOLUTION_ARCHITECT: 'Solution Architect',
+  PROJECT_MANAGER: 'Project Manager',
 };
 
 export const ADMIN_ROLES = [USER_ROLE.CONNECT_ADMIN, USER_ROLE.TOPCODER_ADMIN];
@@ -51,6 +65,13 @@ export const MANAGER_ROLES = [
   USER_ROLE.MANAGER,
   USER_ROLE.TOPCODER_ACCOUNT_MANAGER,
   USER_ROLE.COPILOT_MANAGER,
+  USER_ROLE.BUSINESS_DEVELOPMENT_REPRESENTATIVE,
+  USER_ROLE.PRESALES,
+  USER_ROLE.ACCOUNT_EXECUTIVE,
+
+  USER_ROLE.PROGRAM_MANAGER,
+  USER_ROLE.SOLUTION_ARCHITECT,
+  USER_ROLE.PROJECT_MANAGER,
 ];
 
 export const EVENT = {
diff --git a/src/events/busApi.js b/src/events/busApi.js
@@ -122,16 +122,17 @@ module.exports = (app, logger) => {
     logger.debug('receive PROJECT_MEMBER_ADDED event');
 
     let eventType;
-    switch (member.role) {
-      case PROJECT_MEMBER_ROLE.MANAGER:
-        eventType = BUS_API_EVENT.MEMBER_JOINED_MANAGER;
-        break;
-      case PROJECT_MEMBER_ROLE.COPILOT:
-        eventType = BUS_API_EVENT.MEMBER_JOINED_COPILOT;
-        break;
-      default:
-        eventType = BUS_API_EVENT.MEMBER_JOINED;
-        break;
+    if ([
+      PROJECT_MEMBER_ROLE.MANAGER,
+      PROJECT_MEMBER_ROLE.PROJECT_MANAGER,
+      PROJECT_MEMBER_ROLE.PROGRAM_MANAGER,
+      PROJECT_MEMBER_ROLE.SOLUTION_ARCHITECT,
+    ].includes(member.role)) {
+      eventType = BUS_API_EVENT.MEMBER_JOINED_MANAGER;
+    } else if (member.role === PROJECT_MEMBER_ROLE.COPILOT) {
+      eventType = BUS_API_EVENT.MEMBER_JOINED_COPILOT;
+    } else {
+      eventType = BUS_API_EVENT.MEMBER_JOINED;
     }
     const projectId = _.parseInt(req.params.projectId);
 
diff --git a/src/events/projectMembers/index.js b/src/events/projectMembers/index.js
@@ -44,7 +44,13 @@ const projectMemberAddedHandler = Promise.coroutine(function* a(logger, msg, cha
     const newMember = JSON.parse(msg.content.toString());
     const projectId = newMember.projectId;
     const directUpdatePromise = Promise.coroutine(function* () { // eslint-disable-line func-names
-      if (_.indexOf([PROJECT_MEMBER_ROLE.COPILOT, PROJECT_MEMBER_ROLE.MANAGER], newMember.role) > -1) {
+      if (_.indexOf([
+        PROJECT_MEMBER_ROLE.COPILOT,
+        PROJECT_MEMBER_ROLE.MANAGER,
+        PROJECT_MEMBER_ROLE.PROJECT_MANAGER,
+        PROJECT_MEMBER_ROLE.PROGRAM_MANAGER,
+        PROJECT_MEMBER_ROLE.SOLUTION_ARCHITECT,
+      ], newMember.role) > -1) {
         // add copilot/update manager permissions operation promise
         const directProjectId = yield models.Project.getDirectProjectId(projectId);
         if (directProjectId) {
@@ -116,7 +122,13 @@ const projectMemberRemovedHandler = Promise.coroutine(function* (logger, msg, ch
     const projectId = member.projectId;
     // remove copilot/manager operation promise
     const updateDirectProjectPromise = Promise.coroutine(function* () { // eslint-disable-line func-names
-      if (_.indexOf([PROJECT_MEMBER_ROLE.COPILOT, PROJECT_MEMBER_ROLE.MANAGER], member.role) > -1) {
+      if (_.indexOf([
+        PROJECT_MEMBER_ROLE.COPILOT,
+        PROJECT_MEMBER_ROLE.MANAGER,
+        PROJECT_MEMBER_ROLE.PROJECT_MANAGER,
+        PROJECT_MEMBER_ROLE.PROGRAM_MANAGER,
+        PROJECT_MEMBER_ROLE.SOLUTION_ARCHITECT,
+      ], member.role) > -1) {
         const directProjectId = yield models.Project.getDirectProjectId(projectId);
         if (directProjectId) {
           const token = yield util.getM2MToken();
diff --git a/src/permissions/constants.js b/src/permissions/constants.js
@@ -25,6 +25,9 @@ export const PERMISSION = { // eslint-disable-line import/prefer-default-export
   ROLES_COPILOT_AND_ABOVE: {
     topcoderRoles: ADMIN_ROLES,
     projectRoles: [
+      PROJECT_MEMBER_ROLE.PROGRAM_MANAGER,
+      PROJECT_MEMBER_ROLE.SOLUTION_ARCHITECT,
+      PROJECT_MEMBER_ROLE.PROJECT_MANAGER,
       PROJECT_MEMBER_ROLE.MANAGER,
       PROJECT_MEMBER_ROLE.COPILOT,
     ],
diff --git a/src/permissions/project.delete.js b/src/permissions/project.delete.js
@@ -23,7 +23,13 @@ module.exports = freq => new Promise((resolve, reject) => {
         const hasAccess = util.hasAdminRole(req) ||
           !_.isUndefined(_.find(members, m => m.userId === req.authUser.userId &&
             ((m.role === PROJECT_MEMBER_ROLE.CUSTOMER && m.isPrimary) ||
-              m.role === PROJECT_MEMBER_ROLE.MANAGER)));
+                [
+                  PROJECT_MEMBER_ROLE.MANAGER,
+                  PROJECT_MEMBER_ROLE.PROGRAM_MANAGER,
+                  PROJECT_MEMBER_ROLE.PROJECT_MANAGER,
+                  PROJECT_MEMBER_ROLE.SOLUTION_ARCHITECT,
+                ].includes(m.role)
+            )));
 
         if (!hasAccess) {
           // user is not an admin nor is a registered project member
diff --git a/src/permissions/projectMember.delete.js b/src/permissions/projectMember.delete.js
@@ -25,7 +25,12 @@ module.exports = freq => new Promise((resolve, reject) => {
       const memberToBeRemoved = _.find(members, m => m.id === prjMemberId);
       // check if auth user has acecss to this project
       const hasAccess = util.hasAdminRole(req)
-        || (authMember && memberToBeRemoved && (authMember.role === PROJECT_MEMBER_ROLE.MANAGER ||
+        || (authMember && memberToBeRemoved && ([
+          PROJECT_MEMBER_ROLE.MANAGER,
+          PROJECT_MEMBER_ROLE.PROGRAM_MANAGER,
+          PROJECT_MEMBER_ROLE.PROJECT_MANAGER,
+          PROJECT_MEMBER_ROLE.SOLUTION_ARCHITECT,
+        ].includes(authMember.role) ||
           (authMember.role === PROJECT_MEMBER_ROLE.CUSTOMER && authMember.isPrimary &&
             memberToBeRemoved.role === PROJECT_MEMBER_ROLE.CUSTOMER) ||
           memberToBeRemoved.userId === req.authUser.userId));
diff --git a/src/routes/projectMemberInvites/create.js b/src/routes/projectMemberInvites/create.js
@@ -289,7 +289,7 @@ module.exports = [
     }
     return Promise.all(promises).then((rolesList) => {
       if (!!invite.userIds && _.includes(PROJECT_MEMBER_MANAGER_ROLES, invite.role)) {
-        req.log.debug('Chekcing if userId is allowed as manager');
+        req.log.debug('Checking if userId is allowed as manager');
         const forbidUserList = [];
         _.zip(invite.userIds, rolesList).forEach((data) => {
           const [userId, roles] = data;
diff --git a/src/routes/projectMembers/create.js b/src/routes/projectMembers/create.js
@@ -18,7 +18,15 @@ const createProjectMemberValidations = {
     param: Joi.object()
       .keys({
         role: Joi.any()
-          .valid(PROJECT_MEMBER_ROLE.MANAGER, PROJECT_MEMBER_ROLE.ACCOUNT_MANAGER, PROJECT_MEMBER_ROLE.COPILOT),
+          .valid(
+            PROJECT_MEMBER_ROLE.MANAGER,
+            PROJECT_MEMBER_ROLE.ACCOUNT_MANAGER,
+            PROJECT_MEMBER_ROLE.COPILOT,
+            PROJECT_MEMBER_ROLE.PROJECT_MANAGER,
+            PROJECT_MEMBER_ROLE.PROGRAM_MANAGER,
+            PROJECT_MEMBER_ROLE.SOLUTION_ARCHITECT,
+            PROJECT_MEMBER_ROLE.ACCOUNT_EXECUTIVE,
+        ),
       }),
   },
 };
@@ -39,9 +47,49 @@ module.exports = [
         return next(err);
       }
 
+      if (PROJECT_MEMBER_ROLE.SOLUTION_ARCHITECT === targetRole &&
+          !util.hasRoles(req, [USER_ROLE.SOLUTION_ARCHITECT])) {
+        const err = new Error(`Only solution architect is able to join as ${targetRole}`);
+        err.status = 401;
+        return next(err);
+      }
+
+      if (PROJECT_MEMBER_ROLE.PROJECT_MANAGER === targetRole &&
+          !util.hasRoles(req, [USER_ROLE.PROJECT_MANAGER])) {
+        const err = new Error(`Only project manager is able to join as ${targetRole}`);
+        err.status = 401;
+        return next(err);
+      }
+
+      if (PROJECT_MEMBER_ROLE.PROGRAM_MANAGER === targetRole &&
+          !util.hasRoles(req, [USER_ROLE.PROGRAM_MANAGER])) {
+        const err = new Error(`Only program manager is able to join as ${targetRole}`);
+        err.status = 401;
+        return next(err);
+      }
+
+      if (PROJECT_MEMBER_ROLE.ACCOUNT_EXECUTIVE === targetRole &&
+          !util.hasRoles(req, [USER_ROLE.ACCOUNT_EXECUTIVE])) {
+        const err = new Error(`Only account executive is able to join as ${targetRole}`);
+        err.status = 401;
+        return next(err);
+      }
+
       if (PROJECT_MEMBER_ROLE.ACCOUNT_MANAGER === targetRole &&
-        !util.hasRoles(req, [USER_ROLE.MANAGER, USER_ROLE.TOPCODER_ACCOUNT_MANAGER])) {
-        const err = new Error(`Only manager  or account manager is able to join as ${targetRole}`);
+        !util.hasRoles(req, [
+          USER_ROLE.MANAGER,
+          USER_ROLE.TOPCODER_ACCOUNT_MANAGER,
+          USER_ROLE.BUSINESS_DEVELOPMENT_REPRESENTATIVE,
+          USER_ROLE.PRESALES,
+          USER_ROLE.ACCOUNT_EXECUTIVE,
+          USER_ROLE.PROGRAM_MANAGER,
+          USER_ROLE.SOLUTION_ARCHITECT,
+          USER_ROLE.PROJECT_MANAGER,
+        ])) {
+        const err = new Error(
+            // eslint-disable-next-line max-len
+            `Only manager, account manager, business development representative, account executive, program manager, project manager, solution architect, or presales are able to join as ${targetRole}`,
+        );
         err.status = 401;
         return next(err);
       }
@@ -53,10 +101,22 @@ module.exports = [
       }
     } else if (util.hasRoles(req, [USER_ROLE.MANAGER, USER_ROLE.CONNECT_ADMIN])) {
       targetRole = PROJECT_MEMBER_ROLE.MANAGER;
-    } else if (util.hasRoles(req, [USER_ROLE.TOPCODER_ACCOUNT_MANAGER])) {
+    } else if (util.hasRoles(req, [
+      USER_ROLE.TOPCODER_ACCOUNT_MANAGER,
+      USER_ROLE.BUSINESS_DEVELOPMENT_REPRESENTATIVE,
+      USER_ROLE.PRESALES,
+    ])) {
       targetRole = PROJECT_MEMBER_ROLE.ACCOUNT_MANAGER;
     } else if (util.hasRoles(req, [USER_ROLE.COPILOT, USER_ROLE.CONNECT_ADMIN])) {
       targetRole = PROJECT_MEMBER_ROLE.COPILOT;
+    } else if (util.hasRoles(req, [USER_ROLE.ACCOUNT_EXECUTIVE])) {
+      targetRole = PROJECT_MEMBER_ROLE.ACCOUNT_EXECUTIVE;
+    } else if (util.hasRoles(req, [USER_ROLE.PROGRAM_MANAGER])) {
+      targetRole = PROJECT_MEMBER_ROLE.PROGRAM_MANAGER;
+    } else if (util.hasRoles(req, [USER_ROLE.SOLUTION_ARCHITECT])) {
+      targetRole = PROJECT_MEMBER_ROLE.SOLUTION_ARCHITECT;
+    } else if (util.hasRoles(req, [USER_ROLE.PROJECT_MANAGER])) {
+      targetRole = PROJECT_MEMBER_ROLE.PROJECT_MANAGER;
     } else {
       const err = new Error('Only copilot or manager is able to call this endpoint');
       err.status = 401;
diff --git a/src/routes/projectMembers/update.js b/src/routes/projectMembers/update.js
@@ -16,8 +16,17 @@ const updateProjectMemberValdiations = {
   body: {
     param: Joi.object().keys({
       isPrimary: Joi.boolean(),
-      role: Joi.any().valid(PROJECT_MEMBER_ROLE.CUSTOMER, PROJECT_MEMBER_ROLE.MANAGER,
-        PROJECT_MEMBER_ROLE.ACCOUNT_MANAGER, PROJECT_MEMBER_ROLE.COPILOT, PROJECT_MEMBER_ROLE.OBSERVER).required(),
+      role: Joi.any().valid(
+        PROJECT_MEMBER_ROLE.CUSTOMER,
+        PROJECT_MEMBER_ROLE.MANAGER,
+        PROJECT_MEMBER_ROLE.ACCOUNT_MANAGER,
+        PROJECT_MEMBER_ROLE.COPILOT,
+        PROJECT_MEMBER_ROLE.OBSERVER,
+        PROJECT_MEMBER_ROLE.PROGRAM_MANAGER,
+        PROJECT_MEMBER_ROLE.ACCOUNT_EXECUTIVE,
+        PROJECT_MEMBER_ROLE.SOLUTION_ARCHITECT,
+        PROJECT_MEMBER_ROLE.PROJECT_MANAGER,
+      ).required(),
     }),
   },
 };
diff --git a/src/routes/projects/update.js b/src/routes/projects/update.js
@@ -225,7 +225,9 @@ module.exports = [
         const members = req.context.currentProjectMembers;
         const validRoles = [
           PROJECT_MEMBER_ROLE.MANAGER,
-          PROJECT_MEMBER_ROLE.MANAGER,
+          PROJECT_MEMBER_ROLE.PROGRAM_MANAGER,
+          PROJECT_MEMBER_ROLE.PROJECT_MANAGER,
+          PROJECT_MEMBER_ROLE.SOLUTION_ARCHITECT,
         ].map(x => x.toLowerCase());
         const matchRole = role => _.indexOf(validRoles, role.toLowerCase()) >= 0;
         if (updatedProps.status === PROJECT_STATUS.ACTIVE &&
diff --git a/src/util.js b/src/util.js
@@ -16,12 +16,12 @@ import config from 'config';
 import urlencode from 'urlencode';
 import elasticsearch from 'elasticsearch';
 import Promise from 'bluebird';
+import models from './models';
 // import AWS from 'aws-sdk';
 
 import { ADMIN_ROLES, TOKEN_SCOPES, EVENT, PROJECT_MEMBER_ROLE, VALUE_TYPE, ESTIMATION_TYPE } from './constants';
 
 const exec = require('child_process').exec;
-const models = require('./models').default;
 const tcCoreLibAuth = require('tc-core-library-js').auth;
 
 const m2m = tcCoreLibAuth.m2m(config);
@@ -474,7 +474,6 @@ _.assignIn(util, {
     req.log.debug('creating member', member);
     let newMember = null;
     // register member
-
     return models.ProjectMember.create(member)
     .then((_newMember) => {
       newMember = _newMember.get({ plain: true });

Original file line number	Diff line number	Diff line change
`@@ -289,7 +289,7 @@ module.exports = [`
`289`	`289`	`}`
`290`	`290`	`return Promise.all(promises).then((rolesList) => {`
`291`	`291`	`if (!!invite.userIds && _.includes(PROJECT_MEMBER_MANAGER_ROLES, invite.role)) {`
`292`		`- req.log.debug('Chekcing if userId is allowed as manager');`
	`292`	`+ req.log.debug('Checking if userId is allowed as manager');`
`293`	`293`	`const forbidUserList = [];`
`294`	`294`	`_.zip(invite.userIds, rolesList).forEach((data) => {`
`295`	`295`	`const [userId, roles] = data;`