Merge pull request #814 from topcoder-platform/pm-1169

fix(PM-1169): Send source as part of email resource

Author: kkartunov

.circleci/config.yml

@@ -149,7 +149,7 @@ workflows:
           context : org-global
           filters:
             branches:
-              only: ['develop', 'migration-setup']
+              only: ['develop', 'migration-setup', 'pm-1169']
       - deployProd:
           context : org-global
           filters:

src/constants.js

@@ -22,6 +22,7 @@ export const COPILOT_APPLICATION_STATUS = {
   PENDING: 'pending',
   INVITED: 'invited',
   ACCEPTED: 'accepted',
+  CANCELED: 'canceled',
 };
 
 export const COPILOT_OPPORTUNITY_STATUS = {
@@ -360,6 +361,11 @@ export const INVITE_STATUS = {
   CANCELED: 'canceled',
 };
 
+export const INVITE_SOURCE = {
+  WORK_MANAGER: "work_manager",
+  COPILOT_PORTAL: "copilot_portal",
+};
+
 export const SCOPE_CHANGE_REQ_STATUS = {
   PENDING: 'pending',
   APPROVED: 'approved',

src/events/busApi.js

@@ -997,6 +997,7 @@ module.exports = (app, logger) => {
     const email = resource.email;
     const status = resource.status;
     const role = resource.role;
+    const source = resource.source;
 
     models.Project.findOne({
       where: { id: projectId },
@@ -1011,6 +1012,7 @@ module.exports = (app, logger) => {
             role,
             initiatorUserId: req.authUser.userId,
             isSSO: util.isSSO(project),
+            source,
           }, logger);
         } else {
         // send event to bus api
@@ -1021,6 +1023,7 @@ module.exports = (app, logger) => {
             role,
             initiatorUserId: req.authUser.userId,
             isSSO: util.isSSO(project),
+            source,
           });
           createEvent(CONNECT_NOTIFICATION_EVENT.PROJECT_MEMBER_INVITE_CREATED, {
             projectId,
@@ -1029,6 +1032,7 @@ module.exports = (app, logger) => {
             role,
             initiatorUserId: req.authUser.userId,
             isSSO: util.isSSO(project),
+            source,
           }, logger);
         }
       }).catch(err => logger.error(err)); // eslint-disable-line no-unused-vars

src/routes/copilotOpportunity/assign.js

@@ -107,7 +107,10 @@ module.exports = [
         req,
         EVENT.ROUTING_KEY.PROJECT_MEMBER_INVITE_CREATED,
         RESOURCES.PROJECT_MEMBER_INVITE,
-        invite.toJSON());
+        Object.assign({}, invite.toJSON(), {
+          source: 'copilot_portal',
+        }),
+      );
 
       await application.update({
         status: COPILOT_APPLICATION_STATUS.INVITED,

src/routes/projectMemberInvites/create.js

@@ -411,7 +411,10 @@ module.exports = [
                       req,
                       EVENT.ROUTING_KEY.PROJECT_MEMBER_INVITE_CREATED,
                       RESOURCES.PROJECT_MEMBER_INVITE,
-                      v.toJSON());
+                      Object.assign({}, v.toJSON(), {
+                        source: 'work_manager',
+                      }),
+                     );
 
                     req.log.debug(`V: ${JSON.stringify(v)}`);
                     // send email invite (async)

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 { INVITE_STATUS, EVENT, RESOURCES, COPILOT_APPLICATION_STATUS, COPILOT_OPPORTUNITY_STATUS, COPILOT_REQUEST_STATUS } from '../../constants';
+import { INVITE_STATUS, EVENT, RESOURCES, COPILOT_APPLICATION_STATUS, COPILOT_OPPORTUNITY_STATUS, COPILOT_REQUEST_STATUS, INVITE_SOURCE } from '../../constants';
 import { PERMISSION } from '../../permissions/constants';
 
 /**
@@ -19,6 +19,9 @@ const updateMemberValidations = {
       status: Joi.any()
         .valid(_.values(INVITE_STATUS))
         .required(),
+      source: Joi.string()
+        .valid(_.values(INVITE_SOURCE))
+        .default(INVITE_SOURCE.WORK_MANAGER),
     })
     .required(),
 };
@@ -29,6 +32,7 @@ module.exports = [
   permissions('projectMemberInvite.edit'),
   (req, res, next) => {
     const newStatus = req.body.status;
+    const source = req.body.source;
     if (newStatus === INVITE_STATUS.CANCELED) {
       const err = new Error('Cannot change invite status to “canceled”. Please, delete the invite instead.');
       err.status = 400;
@@ -121,14 +125,23 @@ module.exports = [
                   try {
                     await util.addUserToProject(req, member, t);
                     if (invite.applicationId) {
+                      let nextApplicationStatus = COPILOT_APPLICATION_STATUS.CANCELED;
+                      let nextOpportunityStatus = COPILOT_OPPORTUNITY_STATUS.CANCELED;
+                      let nextOpportunityRequestStatus = COPILOT_REQUEST_STATUS.CANCELED;
+                      if (source === 'copilot_portal') {
+                        nextApplicationStatus = COPILOT_APPLICATION_STATUS.ACCEPTED;
+                        nextOpportunityStatus = COPILOT_OPPORTUNITY_STATUS.COMPLETED;
+                        nextOpportunityRequestStatus = COPILOT_REQUEST_STATUS.FULFILLED;
+                      }
+
                       const application = await models.CopilotApplication.findOne({
                         where: {
                           id: invite.applicationId,
                         },
                         transaction: t,
                       });
 
-                      await application.update({ status: COPILOT_APPLICATION_STATUS.ACCEPTED }, {
+                      await application.update({ status: nextApplicationStatus }, {
                         transaction: t
                       });
 
@@ -140,7 +153,7 @@ module.exports = [
                       });
 
                       await opportunity.update({
-                        status: COPILOT_OPPORTUNITY_STATUS.COMPLETED
+                        status: nextOpportunityStatus,
                       }, {
                         transaction: t,
                       });
@@ -153,7 +166,7 @@ module.exports = [
                       });
 
                       await request.update({
-                        status: COPILOT_REQUEST_STATUS.FULFILLED
+                        status: nextOpportunityRequestStatus,
                       }, {
                         transaction: t,
                       });