Merge

jmgasper · jmgasper · commit 0994e2d819c2 · 2025-06-23T08:14:02.000+10:00
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -149,7 +149,7 @@ workflows:
           context : org-global
           filters:
             branches:
-              only: ['develop', 'migration-setup']
+              only: ['develop', 'migration-setup', 'pm-1378']
       - deployProd:
           context : org-global
           filters:
diff --git a/config/custom-environment-variables.json b/config/custom-environment-variables.json
@@ -30,7 +30,8 @@
   "dbConfig": {
     "masterUrl": "DB_MASTER_URL",
     "maxPoolSize": "DB_MAX_POOL_SIZE",
-    "minPoolSize": "DB_MIN_POOL_SIZE"
+    "minPoolSize": "DB_MIN_POOL_SIZE",
+    "schema": "DB_SCHEMA_NAME"
   },
   "kafkaConfig": {
     "groupId": "KAFKA_GROUP_ID",
diff --git a/config/default.json b/config/default.json
@@ -54,6 +54,7 @@
   "inviteEmailSubject": "You are invited to Topcoder",
   "inviteEmailSectionTitle": "Project Invitation",
   "workManagerUrl": "https://challenges.topcoder-dev.com",
+  "copilotPortalUrl": "https://copilots.topcoder-dev.com",
   "accountsAppUrl": "https://accounts.topcoder-dev.com",
   "MAX_REVISION_NUMBER": 100,
   "UNIQUE_GMAIL_VALIDATION": false,
diff --git a/config/development.json b/config/development.json
@@ -3,6 +3,7 @@
   "pubsubExchangeName": "dev.projects",
   "attachmentsS3Bucket": "topcoder-dev-media",
   "workManagerUrl": "https://challenges.topcoder-dev.com",
+  "copilotPortalUrl": "https://copilots.topcoder-dev.com",
   "fileServiceEndpoint": "https://api.topcoder-dev.com/v5/files",
   "memberServiceEndpoint": "https://api.topcoder-dev.com/v5/members",
   "identityServiceEndpoint": "https://api.topcoder-dev.com/v3/",
diff --git a/config/production.json b/config/production.json
@@ -1,6 +1,7 @@
 {
   "authDomain": "topcoder.com",
   "workManagerUrl": "https://challenges.topcoder.com",
+  "copilotPortalUrl": "https://copilots.topcoder.com",
   "sfdcBillingAccountNameField": "Billing_Account_name__c",
   "sfdcBillingAccountMarkupField": "Mark_up__c",
   "sfdcBillingAccountActiveField": "Active__c"
diff --git a/src/constants.js b/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 = {
@@ -301,8 +302,16 @@ export const CONNECT_NOTIFICATION_EVENT = {
   TOPIC_UPDATED: 'connect.notification.project.topic.updated',
   POST_CREATED: 'connect.notification.project.post.created',
   POST_UPDATED: 'connect.notification.project.post.edited',
+
+  // External action email
+  EXTERNAL_ACTION_EMAIL: 'external.action.email',
 };
 
+export const TEMPLATE_IDS = {
+  APPLY_COPILOT: 'd-d7c1f48628654798a05c8e09e52db14f',
+  CREATE_REQUEST: 'd-3efdc91da580479d810c7acd50a4c17f',
+  PROJECT_MEMBER_INVITED: 'd-b47a25b103604bc28fc0ce77e77fb681',
+}
 export const REGEX = {
   URL: /^(http(s?):\/\/)?(www\.)?[a-zA-Z0-9\.\-\_]+(\.[a-zA-Z]{2,15})+(\:[0-9]{2,5})?(\/[a-zA-Z0-9\_\-\s\.\/\?\%\#\&\=;]*)?$/, // eslint-disable-line
 };
@@ -360,6 +369,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',
diff --git a/src/events/busApi.js b/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
diff --git a/src/models/index.js b/src/models/index.js
@@ -29,6 +29,7 @@ const operatorsAliases = {
 
 const sequelize = new Sequelize(config.get('dbConfig.masterUrl'), {
   operatorsAliases,
+  schema: config.get('dbConfig.schema'),
   logging: false,
   dialectOptions: {
     ssl: false,
diff --git a/src/models/projectMember.js b/src/models/projectMember.js
@@ -34,6 +34,10 @@ module.exports = function defineProjectMember(sequelize, DataTypes) {
     ],
   });
 
+  ProjectMember.associate = (models) => {
+    ProjectMember.belongsTo(models.Project, { foreignKey: 'projectId' });
+  };
+
   ProjectMember.getProjectIdsForUser = userId => ProjectMember.findAll({
     where: {
       deletedAt: { $eq: null },
diff --git a/src/permissions/constants.js b/src/permissions/constants.js
@@ -288,6 +288,19 @@ export const PERMISSION = { // eslint-disable-line import/prefer-default-export
     ],
     scopes: SCOPES_PROJECTS_WRITE,
   },
+  
+  CANCEL_COPILOT_OPPORTUNITY: {
+    meta: {
+      title: 'Cancel copilot opportunity',
+      group: 'Cancel copilot opportunity',
+      description: 'Who can cancel copilot opportunity.',
+    },
+    topcoderRoles: [
+      USER_ROLE.PROJECT_MANAGER,
+      USER_ROLE.TOPCODER_ADMIN,
+    ],
+    scopes: SCOPES_PROJECTS_WRITE,
+  },
 
   LIST_COPILOT_OPPORTUNITY: {
     meta: {
diff --git a/src/routes/copilotOpportunity/assign.js b/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,
diff --git a/src/routes/copilotOpportunity/delete.js b/src/routes/copilotOpportunity/delete.js
@@ -0,0 +1,81 @@
+import _ from 'lodash';
+
+import models from '../../models';
+import util from '../../util';
+import { COPILOT_APPLICATION_STATUS, COPILOT_OPPORTUNITY_STATUS, COPILOT_REQUEST_STATUS } from '../../constants';
+import { PERMISSION } from '../../permissions/constants';
+
+module.exports = [
+  (req, res, next) => {
+    if (!util.hasPermissionByReq(PERMISSION.CANCEL_COPILOT_OPPORTUNITY, req)) {
+      const err = new Error('Unable to cancel copilot opportunity');
+      _.assign(err, {
+        details: JSON.stringify({ message: 'You do not have permission to cancel copilot opportunity' }),
+        status: 403,
+      });
+      return Promise.reject(err);
+    }
+    // default values
+    const opportunityId = _.parseInt(req.params.id);
+
+    return models.sequelize.transaction(async (transaction) => {
+      req.log.debug('Canceling Copilot opportunity transaction', opportunityId);
+      const opportunity = await models.CopilotOpportunity.findOne({
+        where: { id: opportunityId },
+        transaction,
+      });
+
+      if (!opportunity) {
+        const err = new Error(`No opportunity available for id ${opportunityId}`);
+        err.status = 404;
+        throw err;
+      }
+
+      const copilotRequest = await models.CopilotRequest.findOne({
+        where: {
+          id: opportunity.copilotRequestId,
+        },
+        transaction,
+      });
+
+      const applications = await models.CopilotApplication.findAll({
+        where: {
+          opportunityId: opportunity.id,
+        },
+        transaction,
+      });
+
+      const promises = [];
+      applications.forEach((application) => {
+        promises.push(application.update({
+          status: COPILOT_APPLICATION_STATUS.CANCELED,
+        }, {
+          transaction,
+        }));
+      });
+
+      await Promise.all(promises);
+
+      await copilotRequest.update({
+        status: COPILOT_REQUEST_STATUS.CANCELED,
+      }, {
+        transaction,
+      });
+
+      await opportunity.update({
+        status: COPILOT_OPPORTUNITY_STATUS.CANCELED,
+      }, {
+        transaction,
+      });
+
+      res.status(200).send({ id: opportunity.id });
+    })
+        
+      .catch((err) => {
+        if (err.message) {
+          _.assign(err, { details: err.message });
+        }
+        util.handleError('Error canceling copilot opportunity', err, req, next);
+      });
+  },
+];
diff --git a/src/routes/copilotOpportunity/get.js b/src/routes/copilotOpportunity/get.js
@@ -20,12 +20,29 @@ module.exports = [
           model: models.Project,
           as: 'project',
           attributes: ['name'],
+          include: [
+            {
+              model: models.ProjectMember,
+              as: 'members',
+              attributes: ['id', 'userId', 'role'],
+            },
+          ]
         },
       ],
     })
       .then((copilotOpportunity) => {
         const plainOpportunity = copilotOpportunity.get({ plain: true });
-        const formattedOpportunity = Object.assign({}, plainOpportunity,
+        const memberIds = plainOpportunity.project.members && plainOpportunity.project.members.map((member) => member.userId);
+        let canApplyAsCopilot = false;
+        if (req.authUser) {
+          canApplyAsCopilot = !memberIds.includes(req.authUser.userId)
+        }
+        // This shouldn't be exposed to the clientside
+        delete plainOpportunity.project.members;
+        const formattedOpportunity = Object.assign({
+          members: memberIds,
+          canApplyAsCopilot,
+        }, plainOpportunity,
           plainOpportunity.copilotRequest ? plainOpportunity.copilotRequest.data : {},
           { copilotRequest: undefined },
         );
diff --git a/src/routes/copilotOpportunityApply/create.js b/src/routes/copilotOpportunityApply/create.js
@@ -1,11 +1,13 @@
 import _ from 'lodash';
 import validate from 'express-validation';
 import Joi from 'joi';
+import config from 'config';
 
 import models from '../../models';
 import util from '../../util';
 import { PERMISSION } from '../../permissions/constants';
-import { COPILOT_OPPORTUNITY_STATUS } from '../../constants';
+import { CONNECT_NOTIFICATION_EVENT, COPILOT_OPPORTUNITY_STATUS, TEMPLATE_IDS, USER_ROLE } from '../../constants';
+import { createEvent } from '../../services/busApi';
 
 const applyCopilotRequestValidations = {
   body: Joi.object().keys({
@@ -65,7 +67,44 @@ module.exports = [
       }
 
       return models.CopilotApplication.create(data)
-        .then((result) => {
+        .then(async (result) => {
+          const pmRole = await util.getRolesByRoleName(USER_ROLE.PROJECT_MANAGER, req.log, req.id);
+          const { subjects = [] } = await util.getRoleInfo(pmRole[0], req.log, req.id);
+
+          const creator = await util.getMemberDetailsByUserIds([opportunity.createdBy], req.log, req.id);
+
+          const listOfSubjects = subjects;
+          if (creator && creator[0] && creator[0].email) {
+            const isCreatorPartofSubjects = subjects.find(item => {
+              if (!item.email) {
+                return false;
+              }
+
+              return item.email.toLowerCase() === creator[0].email.toLowerCase();
+            });
+            if (!isCreatorPartofSubjects) {
+              listOfSubjects.push({
+                email: creator[0].email,
+                handle: creator[0].handle,
+              });
+            }
+          }
+          
+          const emailEventType = CONNECT_NOTIFICATION_EVENT.EXTERNAL_ACTION_EMAIL;
+          const copilotPortalUrl = config.get('copilotPortalUrl');
+          listOfSubjects.forEach((subject) => {
+            createEvent(emailEventType, {
+                data: {
+                  user_name: subject.handle,
+                  opportunity_details_url: `${copilotPortalUrl}/opportunity/${opportunity.id}#applications`,
+                  work_manager_url: config.get('workManagerUrl'),
+                },
+                sendgrid_template_id: TEMPLATE_IDS.APPLY_COPILOT,
+                recipients: [subject.email],
+                version: 'v3',
+              }, req.log);
+          });
+
           res.status(201).json(result);
           return Promise.resolve();
         })
diff --git a/src/routes/copilotRequest/approveRequest.js b/src/routes/copilotRequest/approveRequest.js
@@ -35,7 +35,7 @@ module.exports = [
       updatedBy: req.authUser.userId,
     });
 
-    return approveRequest(data)
+    return approveRequest(req, data)
       .then(_newCopilotOpportunity => res.status(201).json(_newCopilotOpportunity))
       .catch((err) => {
         if (err.message) {
diff --git a/src/routes/copilotRequest/approveRequest.service.js b/src/routes/copilotRequest/approveRequest.service.js
@@ -1,7 +1,10 @@
 import _ from 'lodash';
+import config from 'config';
 
 import models from '../../models';
-import { COPILOT_REQUEST_STATUS } from '../../constants';
+import { CONNECT_NOTIFICATION_EVENT, COPILOT_REQUEST_STATUS, TEMPLATE_IDS, USER_ROLE } from '../../constants';
+import util from '../../util';
+import { createEvent } from '../../services/busApi';
 
 const resolveTransaction = (transaction, callback) => {
   if (transaction) {
@@ -11,7 +14,7 @@ const resolveTransaction = (transaction, callback) => {
   return models.sequelize.transaction(callback);
 };
 
-module.exports = (data, existingTransaction) => {
+module.exports = (req, data, existingTransaction) => {
   const { projectId, copilotRequestId } = data;
 
   return resolveTransaction(existingTransaction, transaction =>
@@ -52,6 +55,29 @@ module.exports = (data, existingTransaction) => {
                 return models.CopilotOpportunity
                   .create(data, { transaction });
               }))
+              .then(async (opportunity) => {
+                const roles = await util.getRolesByRoleName(USER_ROLE.TC_COPILOT, req.log, req.id);
+                const { subjects = [] } = await util.getRoleInfo(roles[0], req.log, req.id);
+                const emailEventType = CONNECT_NOTIFICATION_EVENT.EXTERNAL_ACTION_EMAIL;
+                const copilotPortalUrl = config.get('copilotPortalUrl');
+                req.log.info("Sending emails to all copilots about new opportunity");
+                subjects.forEach(subject => {
+                  createEvent(emailEventType, {
+                    data: {
+                      user_name: subject.handle,
+                      opportunity_details_url: `${copilotPortalUrl}/opportunity/${opportunity.id}`,
+                      work_manager_url: config.get('workManagerUrl'),
+                    },
+                    sendgrid_template_id: TEMPLATE_IDS.CREATE_REQUEST,
+                    recipients: [subject.email],
+                    version: 'v3',
+                  }, req.log);
+                });
+
+                req.log.info("Finished sending emails to copilots");
+                
+                return opportunity;
+              })
               .catch((err) => {
                 transaction.rollback();
                 return Promise.reject(err);
diff --git a/src/routes/copilotRequest/create.js b/src/routes/copilotRequest/create.js
diff --git a/src/routes/index.js b/src/routes/index.js
diff --git a/src/routes/projectMemberInvites/create.js b/src/routes/projectMemberInvites/create.js
diff --git a/src/routes/projectMemberInvites/update.js b/src/routes/projectMemberInvites/update.js
diff --git a/src/util.js b/src/util.js

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,7 @@`
`1`	`1`	`{`
`2`	`2`	`"authDomain": "topcoder.com",`
`3`	`3`	`"workManagerUrl": "https://challenges.topcoder.com",`
	`4`	`+ "copilotPortalUrl": "https://copilots.topcoder.com",`
`4`	`5`	`"sfdcBillingAccountNameField": "Billing_Account_name__c",`
`5`	`6`	`"sfdcBillingAccountMarkupField": "Mark_up__c",`
`6`	`7`	`"sfdcBillingAccountActiveField": "Active__c"`