Copilot workflow changes

src/constants.js

@@ -27,6 +27,7 @@ export const USER_ROLE = {
   MANAGER: 'Connect Manager',
   COPILOT: 'Connect Copilot',
   CONNECT_ADMIN: 'Connect Admin',
+  COPILOT_MANAGER: 'Connect Copilot Manager',
 };
 
 export const ADMIN_ROLES = [USER_ROLE.CONNECT_ADMIN, USER_ROLE.TOPCODER_ADMIN];
@@ -130,7 +131,10 @@ export const BUS_API_EVENT = {
 
   // Project Member Invites
   PROJECT_MEMBER_INVITE_CREATED: 'notifications.connect.project.member.invite.created',
+  PROJECT_MEMBER_INVITE_REQUESTED: 'notifications.connect.project.member.invite.requested',
   PROJECT_MEMBER_INVITE_UPDATED: 'notifications.connect.project.member.invite.updated',
+  PROJECT_MEMBER_INVITE_APPROVED: 'notifications.connect.project.member.invite.approved',
+  PROJECT_MEMBER_INVITE_REJECTED: 'notifications.connect.project.member.invite.rejected',
   PROJECT_MEMBER_EMAIL_INVITE_CREATED: 'connect.action.email.project.member.invite.created',
 };
 

src/events/busApi.js

@@ -1,6 +1,7 @@
 import _ from 'lodash';
 import config from 'config';
-import { EVENT, BUS_API_EVENT, PROJECT_STATUS, PROJECT_PHASE_STATUS, PROJECT_MEMBER_ROLE, MILESTONE_STATUS }
+import { EVENT, BUS_API_EVENT, PROJECT_STATUS, PROJECT_PHASE_STATUS, PROJECT_MEMBER_ROLE, MILESTONE_STATUS,
+  INVITE_STATUS }
   from '../constants';
 import { createEvent } from '../services/busApi';
 import models from '../models';
@@ -696,30 +697,61 @@ module.exports = (app, logger) => {
     }
   });
 
-  app.on(EVENT.ROUTING_KEY.PROJECT_MEMBER_INVITE_CREATED, ({ req, userId, email }) => {
+  app.on(EVENT.ROUTING_KEY.PROJECT_MEMBER_INVITE_CREATED, ({ req, userId, email, role }) => {
     logger.debug('receive PROJECT_MEMBER_INVITE_CREATED event');
     const projectId = _.parseInt(req.params.projectId);
 
-    // send event to bus api
-    createEvent(BUS_API_EVENT.PROJECT_MEMBER_INVITE_CREATED, {
-      projectId,
-      userId,
-      email,
-      initiatorUserId: req.authUser.userId,
-    }, logger);
+    if (role === PROJECT_MEMBER_ROLE.COPILOT) {
+      createEvent(BUS_API_EVENT.PROJECT_MEMBER_INVITE_REQUESTED, {
+        projectId,
+        userId,
+        email,
+        initiatorUserId: req.authUser.userId,
+      }, logger);
+    } else {
+      // send event to bus api
+      createEvent(BUS_API_EVENT.PROJECT_MEMBER_INVITE_CREATED, {
+        projectId,
+        userId,
+        email,
+        initiatorUserId: req.authUser.userId,
+      }, logger);
+    }
   });
 
-  app.on(EVENT.ROUTING_KEY.PROJECT_MEMBER_INVITE_UPDATED, ({ req, userId, email, status }) => {
+  app.on(EVENT.ROUTING_KEY.PROJECT_MEMBER_INVITE_UPDATED, ({ req, userId, email, status, role, createdBy }) => {
     logger.debug('receive PROJECT_MEMBER_INVITE_UPDATED event');
     const projectId = _.parseInt(req.params.projectId);
 
-    // send event to bus api
-    createEvent(BUS_API_EVENT.PROJECT_MEMBER_INVITE_UPDATED, {
-      projectId,
-      userId,
-      email,
-      status,
-      initiatorUserId: req.authUser.userId,
-    }, logger);
+    if (role === PROJECT_MEMBER_ROLE.COPILOT && status === INVITE_STATUS.ACCEPTED) {
+      // send event to bus api
+      createEvent(BUS_API_EVENT.PROJECT_MEMBER_INVITE_APPROVED, {
+        projectId,
+        userId,
+        originator: createdBy,
+        email,
+        status,
+        initiatorUserId: req.authUser.userId,
+      }, logger);
+    } else if (role === PROJECT_MEMBER_ROLE.COPILOT && status === INVITE_STATUS.REFUSED) {
+      // send event to bus api
+      createEvent(BUS_API_EVENT.PROJECT_MEMBER_INVITE_REJECTED, {
+        projectId,
+        userId,
+        originator: createdBy,
+        email,
+        status,
+        initiatorUserId: req.authUser.userId,
+      }, logger);
+    } else {
+      // send event to bus api
+      createEvent(BUS_API_EVENT.PROJECT_MEMBER_INVITE_UPDATED, {
+        projectId,
+        userId,
+        email,
+        status,
+        initiatorUserId: req.authUser.userId,
+      }, logger);
+    }
   });
 };

src/routes/projectMemberInvites/create.js

@@ -250,7 +250,7 @@ module.exports = [
                             { correlationId: req.id },
                         );
                     // send email invite (async)
-                    if (v.email && !v.userId) {
+                    if (v.email && !v.userId && v.role !== PROJECT_MEMBER_ROLE.COPILOT) {
                       sendInviteEmail(req, projectId, v);
                     }
                   });

src/routes/projectMemberInvites/update.js

@@ -4,7 +4,7 @@ import Joi from 'joi';
 import { middleware as tcMiddleware } from 'tc-core-library-js';
 import models from '../../models';
 import util from '../../util';
-import { PROJECT_MEMBER_ROLE, MANAGER_ROLES, INVITE_STATUS, EVENT } from '../../constants';
+import { PROJECT_MEMBER_ROLE, MANAGER_ROLES, INVITE_STATUS, EVENT, USER_ROLE } from '../../constants';
 
 /**
  * API to update invite member to project.
@@ -66,8 +66,12 @@ module.exports = [
         if (!util.hasRoles(req, MANAGER_ROLES) && invite.role !== PROJECT_MEMBER_ROLE.CUSTOMER) {
           error = `Project members can cancel invites only for ${PROJECT_MEMBER_ROLE.CUSTOMER}`;
         }
-      } else if ((!!putInvite.userId && putInvite.userId !== req.authUser.userId) ||
-                 (!!putInvite.email && putInvite.email !== req.authUser.email)) {
+      } else if ((!!invite.role && invite.role === PROJECT_MEMBER_ROLE.COPILOT) &&
+                !req.authUser.roles.includes(USER_ROLE.COPILOT_MANAGER)) {
+        error = 'Only Connect copilot manager can add copilots';
+      } else if (((!!putInvite.userId && putInvite.userId !== req.authUser.userId) ||
+                 (!!putInvite.email && putInvite.email !== req.authUser.email)) &&
+                 (!!invite.role && invite.role !== PROJECT_MEMBER_ROLE.COPILOT)) {
         error = 'Project members can only update invites for themselves';
       }
 
@@ -88,6 +92,8 @@ module.exports = [
             userId: updatedInvite.userId,
             email: updatedInvite.email,
             status: updatedInvite.status,
+            role: updatedInvite.role,
+            createdBy: updatedInvite.createdBy,
           });
           req.app.services.pubsub.publish(EVENT.ROUTING_KEY.PROJECT_MEMBER_INVITE_UPDATED, updatedInvite, {
             correlationId: req.id,
@@ -103,7 +109,7 @@ module.exports = [
                 const member = {
                   projectId,
                   role: updatedInvite.role,
-                  userId: req.authUser.userId,
+                  userId: updatedInvite.userId,
                   createdBy: req.authUser.userId,
                   updatedBy: req.authUser.userId,
                 };

src/routes/projectMemberInvites/update.spec.js

@@ -16,6 +16,7 @@ describe('Project member invite update', () => {
   let project1;
   let invite1;
   let invite2;
+  let invite3;
 
   beforeEach((done) => {
     testUtil.clearDb()
@@ -73,7 +74,22 @@ describe('Project member invite update', () => {
                 invite2 = in2.get({
                   plain: true,
                 });
-                done();
+                models.ProjectMemberInvite.create({
+                  projectId: project1.id,
+                  userId: 40051332,
+                  email: null,
+                  role: PROJECT_MEMBER_ROLE.COPILOT,
+                  status: INVITE_STATUS.PENDING,
+                  createdBy: 1,
+                  updatedBy: 1,
+                  createdAt: '2016-06-30 00:33:07+00',
+                  updatedAt: '2016-06-30 00:33:07+00',
+                }).then((in3) => {
+                  invite3 = in3.get({
+                    plain: true,
+                  });
+                  done();
+                });
               });
             });
           });
@@ -243,6 +259,52 @@ describe('Project member invite update', () => {
         });
     });
 
+    it('should return 403 if try to update COPILOT role invite with copilot', (done) => {
+      const mockHttpClient = _.merge(testUtil.mockHttpClient, {
+        get: () => Promise.resolve({
+          status: 200,
+          data: {
+            id: 'requesterId',
+            version: 'v3',
+            result: {
+              success: true,
+              status: 200,
+              content: [{
+                roleName: USER_ROLE.COPILOT,
+              }],
+            },
+          },
+        }),
+      });
+      sandbox.stub(util, 'getHttpClient', () => mockHttpClient);
+      request(server)
+        .put(`/v4/projects/${project1.id}/members/invite`)
+        .set({
+          Authorization: `Bearer ${testUtil.jwts.copilot}`,
+        })
+        .send({
+          param: {
+            userId: invite3.userId,
+            status: INVITE_STATUS.ACCEPTED,
+          },
+        })
+        .expect('Content-Type', /json/)
+        .expect(403)
+        .end((err, res) => {
+          if (err) {
+            done(err);
+          } else {
+            const resJson = res.body.result.content;
+            should.exist(resJson);
+            res.body.result.status.should.equal(403);
+            const errorMessage = _.get(resJson, 'message', '');
+            sinon.assert.match(errorMessage, 'Only Connect copilot manager can add copilots');
+            done();
+          }
+        });
+    });
+
+
     describe('Bus api', () => {
       let createEventSpy;