Merge pull request #838 from topcoder-platform/develop

[PROD] - Copilot Portal fixes and updates

Author: kkartunov

.circleci/config.yml

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

config/custom-environment-variables.json

@@ -53,6 +53,7 @@
   "AUTH0_PROXY_SERVER_URL" : "AUTH0_PROXY_SERVER_URL",
   "connectUrl": "CONNECT_URL",
   "workManagerUrl": "WORK_MANAGER_URL",
+  "copilotsSlackEmail": "COPILOTS_SLACK_EMAIL",
   "accountsAppUrl": "ACCOUNTS_APP_URL",
   "inviteEmailSubject": "INVITE_EMAIL_SUBJECT",
   "inviteEmailSectionTitle": "INVITE_EMAIL_SECTION_TITLE",

config/default.json

@@ -56,6 +56,7 @@
   "workManagerUrl": "https://challenges.topcoder-dev.com",
   "copilotPortalUrl": "https://copilots.topcoder-dev.com",
   "accountsAppUrl": "https://accounts.topcoder-dev.com",
+  "copilotsSlackEmail": "aaaaplg3e4y6ccn3qniivvnxva@topcoder.slack.com",
   "MAX_REVISION_NUMBER": 100,
   "UNIQUE_GMAIL_VALIDATION": false,
   "pageSize": 20,

config/production.json

@@ -4,5 +4,6 @@
   "copilotPortalUrl": "https://copilots.topcoder.com",
   "sfdcBillingAccountNameField": "Billing_Account_name__c",
   "sfdcBillingAccountMarkupField": "Mark_up__c",
-  "sfdcBillingAccountActiveField": "Active__c"
+  "sfdcBillingAccountActiveField": "Active__c",
+  "copilotsSlackEmail": "mem-ops-copilot-aaaadbvbjvvek6ojnwpfdh5qq4@topcoder.slack.com"
 }

src/constants.js

@@ -311,6 +311,8 @@ export const TEMPLATE_IDS = {
   APPLY_COPILOT: 'd-d7c1f48628654798a05c8e09e52db14f',
   CREATE_REQUEST: 'd-3efdc91da580479d810c7acd50a4c17f',
   PROJECT_MEMBER_INVITED: 'd-b47a25b103604bc28fc0ce77e77fb681',
+  INFORM_PM_COPILOT_APPLICATION_ACCEPTED: 'd-b35d073e302b4279a1bd208fcfe96f58',
+  COPILOT_ALREADY_PART_OF_PROJECT: 'd-003d41cdc9de4bbc9e14538e8f2e0585',
 }
 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

src/routes/copilotOpportunity/assign.js

@@ -1,11 +1,15 @@
 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_APPLICATION_STATUS, COPILOT_OPPORTUNITY_STATUS, COPILOT_REQUEST_STATUS, EVENT, INVITE_STATUS, PROJECT_MEMBER_ROLE, RESOURCES } from '../../constants';
+import { CONNECT_NOTIFICATION_EVENT, COPILOT_APPLICATION_STATUS, COPILOT_OPPORTUNITY_STATUS, COPILOT_REQUEST_STATUS, EVENT, INVITE_STATUS, PROJECT_MEMBER_ROLE, RESOURCES, TEMPLATE_IDS } from '../../constants';
+import { getCopilotTypeLabel } from '../../utils/copilot';
+import { createEvent } from '../../services/busApi';
+import moment from 'moment';
 
 const assignCopilotOpportunityValidations = {
   body: Joi.object().keys({
@@ -45,11 +49,17 @@ module.exports = [
         throw err;
       }
 
+      const copilotRequest = await models.CopilotRequest.findOne({
+        where: { id: opportunity.copilotRequestId },
+        transaction: t,
+      });
+
       const application = await models.CopilotApplication.findOne({
         where: { id: applicationId, opportunityId: copilotOpportunityId },
         transaction: t,
       });
 
+
       if (!application) {
         const err = new Error('No such application available');
         err.status = 400;
@@ -65,12 +75,101 @@ module.exports = [
       const projectId = opportunity.projectId;
       const userId = application.userId;
       const activeMembers = await models.ProjectMember.getActiveProjectMembers(projectId, t);
-
-      const existingUser = activeMembers.find(item => item.userId === userId);
-      if (existingUser && existingUser.role === 'copilot') {
-        const err = new Error(`User is already a copilot of this project`);
-        err.status = 400;
-        throw err;
+      const updateCopilotOpportunity = async () => {
+        const transaction = await models.sequelize.transaction();
+        const memberDetails = await util.getMemberDetailsByUserIds([application.userId], req.log, req.id);
+        const member = memberDetails[0];
+        req.log.debug(`Updating opportunity: ${JSON.stringify(opportunity)}`);
+        await opportunity.update({
+          status: COPILOT_OPPORTUNITY_STATUS.COMPLETED,
+        }, {
+          transaction,
+        });
+        req.log.debug(`Updating application: ${JSON.stringify(application)}`);
+        await application.update({
+          status: COPILOT_APPLICATION_STATUS.ACCEPTED,
+        }, {
+          transaction,
+        });
+
+        req.log.debug(`Updating request: ${JSON.stringify(copilotRequest)}`);
+        await copilotRequest.update({
+          status: COPILOT_REQUEST_STATUS.FULFILLED,
+        }, {
+          transaction,
+        });
+
+        req.log.debug(`Updating other applications: ${JSON.stringify(copilotRequest)}`);
+        await models.CopilotApplication.update({
+          status: COPILOT_APPLICATION_STATUS.CANCELED,
+        }, {
+          where: {
+            opportunityId: opportunity.id,
+            id: {
+              $ne: application.id,
+            },
+          }
+        });
+
+        req.log.debug(`All updations done`);
+        transaction.commit();
+
+        req.log.debug(`Sending email notification`);
+        const emailEventType = CONNECT_NOTIFICATION_EVENT.EXTERNAL_ACTION_EMAIL;
+        const copilotPortalUrl = config.get('copilotPortalUrl');
+        const requestData = copilotRequest.data;
+        createEvent(emailEventType, {
+          data: {
+            opportunity_details_url: `${copilotPortalUrl}/opportunity/${opportunity.id}`,
+            work_manager_url: config.get('workManagerUrl'),
+            opportunity_type: getCopilotTypeLabel(requestData.projectType),
+            opportunity_title: requestData.opportunityTitle,
+            start_date: moment.utc(requestData.startDate).format('DD-MM-YYYY'),
+            user_name: member ? member.handle : "",
+          },
+          sendgrid_template_id: TEMPLATE_IDS.COPILOT_ALREADY_PART_OF_PROJECT,
+          recipients: [member.email],
+          version: 'v3',
+        }, req.log);
+
+        req.log.debug(`Email sent`);
+      };
+
+      const existingMember = activeMembers.find(item => item.userId === userId);
+      if (existingMember) {
+        req.log.debug(`User already part of project: ${JSON.stringify(existingMember)}`);
+        if (['copilot', 'manager'].includes(existingMember.role)) {
+          req.log.debug(`User is a copilot or manager`);
+          await updateCopilotOpportunity();
+        } else {
+          req.log.debug(`User has read/write role`);
+          await models.ProjectMember.update({
+            role: 'copilot',
+          }, {
+            where: {
+              id: existingMember.id,
+            },
+          });
+
+          const projectMember = await models.ProjectMember.findOne({
+            where: {
+              id: existingMember.id,
+            },
+          });
+
+          req.log.debug(`Updated project member: ${JSON.stringify(projectMember.get({plain: true}))}`);
+
+          util.sendResourceToKafkaBus(
+            req,
+            EVENT.ROUTING_KEY.PROJECT_MEMBER_UPDATED,
+            RESOURCES.PROJECT_MEMBER,
+            projectMember.get({ plain: true }),
+            existingMember);
+          req.log.debug(`Member updated in kafka`);
+          await updateCopilotOpportunity();
+        }
+        res.status(200).send({ id: applicationId });
+        return;
       }
 
       const existingInvite = await models.ProjectMemberInvite.findAll({

src/routes/copilotOpportunity/delete.js

@@ -1,10 +1,12 @@
 import _ from 'lodash';
+import { Op } from 'sequelize';
 
 import models from '../../models';
 import util from '../../util';
-import { COPILOT_APPLICATION_STATUS, COPILOT_OPPORTUNITY_STATUS, COPILOT_REQUEST_STATUS } from '../../constants';
+import { COPILOT_APPLICATION_STATUS, COPILOT_OPPORTUNITY_STATUS, COPILOT_REQUEST_STATUS, EVENT, INVITE_STATUS, RESOURCES } from '../../constants';
 import { PERMISSION } from '../../permissions/constants';
 
+
 module.exports = [
   (req, res, next) => {
     if (!util.hasPermissionByReq(PERMISSION.CANCEL_COPILOT_OPPORTUNITY, req)) {
@@ -54,6 +56,14 @@ module.exports = [
         }));
       });
 
+      const allInvites = await models.ProjectMemberInvite.findAll({
+        where: {
+          applicationId: {
+            [Op.in]: applications.map(item => item.id),
+          },
+        },
+      });
+
       await Promise.all(promises);
 
       await copilotRequest.update({
@@ -68,6 +78,21 @@ module.exports = [
         transaction,
       });
 
+      // update all the existing invites which are 
+      // associated to the copilot opportunity
+      // with cancel status
+      for (const invite of allInvites) {
+        await invite.update({
+          status: INVITE_STATUS.CANCELED,
+        });
+        await invite.reload();
+        util.sendResourceToKafkaBus(
+          req,
+          EVENT.ROUTING_KEY.PROJECT_MEMBER_INVITE_UPDATED,
+          RESOURCES.PROJECT_MEMBER_INVITE,
+          invite.toJSON());
+      }
+
       res.status(200).send({ id: opportunity.id });
     })
 

src/routes/copilotOpportunity/list.js

@@ -21,6 +21,25 @@ module.exports = [
     const pageSize = parseInt(req.query.pageSize, 10) || DEFAULT_PAGE_SIZE;
     const offset = (page - 1) * pageSize;
     const limit = pageSize;
+    const noGroupingByStatus = req.query.noGrouping === 'true';
+
+    const baseOrder = [];
+
+    // If grouping is enabled (default), add custom ordering based on status
+    if (!noGroupingByStatus) {
+      baseOrder.push([
+        models.Sequelize.literal(`
+          CASE
+            WHEN "CopilotOpportunity"."status" = 'active' THEN 0
+            WHEN "CopilotOpportunity"."status" = 'cancelled' THEN 1
+            WHEN "CopilotOpportunity"."status" = 'completed' THEN 2
+            ELSE 3
+          END
+        `),
+        'ASC',
+      ]);
+    }
+    baseOrder.push([sortParams[0], sortParams[1]]);
 
     return models.CopilotOpportunity.findAll({
       include: [
@@ -34,7 +53,7 @@ module.exports = [
           attributes: ['name'],
         },
       ],
-      order: [[sortParams[0], sortParams[1]]],
+      order: baseOrder,
       limit,
       offset,
     })

src/routes/copilotOpportunityApply/create.js

@@ -8,10 +8,11 @@ import util from '../../util';
 import { PERMISSION } from '../../permissions/constants';
 import { CONNECT_NOTIFICATION_EVENT, COPILOT_OPPORTUNITY_STATUS, TEMPLATE_IDS, USER_ROLE } from '../../constants';
 import { createEvent } from '../../services/busApi';
+import { getCopilotTypeLabel } from '../../utils/copilot';
 
 const applyCopilotRequestValidations = {
   body: Joi.object().keys({
-    notes: Joi.string().optional(),
+    notes: Joi.string().required(),
   }),
 };
 
@@ -41,6 +42,12 @@ module.exports = [
       where: {
         id: copilotOpportunityId,
       },
+      include: [
+        {
+          model: models.CopilotRequest,
+          as: 'copilotRequest',
+        },
+      ],
     }).then(async (opportunity) => {
       if (!opportunity) {
         const err = new Error('No opportunity found');
@@ -92,12 +99,15 @@ module.exports = [
 
           const emailEventType = CONNECT_NOTIFICATION_EVENT.EXTERNAL_ACTION_EMAIL;
           const copilotPortalUrl = config.get('copilotPortalUrl');
+          const requestData = opportunity.copilotRequest.data;
           listOfSubjects.forEach((subject) => {
             createEvent(emailEventType, {
                 data: {
                   user_name: subject.handle,
                   opportunity_details_url: `${copilotPortalUrl}/opportunity/${opportunity.id}#applications`,
                   work_manager_url: config.get('workManagerUrl'),
+                  opportunity_type: getCopilotTypeLabel(requestData.projectType),
+                  opportunity_title: requestData.opportunityTitle,
                 },
                 sendgrid_template_id: TEMPLATE_IDS.APPLY_COPILOT,
                 recipients: [subject.email],

src/routes/copilotOpportunityApply/list.js

@@ -31,19 +31,68 @@ module.exports = [
     canAccessAllApplications ? {} : { createdBy: userId },
     );
 
-    return models.CopilotApplication.findAll({
-      where: whereCondition,
-      include: [
-        {
-          model: models.CopilotOpportunity,
-          as: 'copilotOpportunity',
-        },
-      ],
-      order: [[sortParams[0], sortParams[1]]],
+    return models.CopilotOpportunity.findOne({
+      where: {
+        id: opportunityId,
+      }
+    }).then((opportunity) => {
+      if (!opportunity) {
+        const err = new Error('No opportunity found');
+        err.status = 404;
+        throw err;
+      }
+      return models.CopilotApplication.findAll({
+        where: whereCondition,
+        include: [
+          {
+            model: models.CopilotOpportunity,
+            as: 'copilotOpportunity',
+          },
+        ],
+        order: [[sortParams[0], sortParams[1]]],
+      })
+        .then(copilotApplications => {
+          req.log.debug(`CopilotApplications ${JSON.stringify(copilotApplications)}`);
+          return models.ProjectMember.getActiveProjectMembers(opportunity.projectId).then((members) => {
+            req.log.debug(`Fetched existing active members ${JSON.stringify(members)}`);
+            req.log.debug(`Applications ${JSON.stringify(copilotApplications)}`);
+            const enrichedApplications = copilotApplications.map(application => {
+              const m = members.find(m => m.userId === application.userId);
+
+              // Using spread operator fails in lint check
+              // While Object.assign fails silently during run time
+              // So using this method
+              const enriched = {
+                id: application.id,
+                opportunityId: application.opportunityId,
+                notes: application.notes,
+                status: application.status,
+                userId: application.userId,
+                deletedAt: application.deletedAt,
+                createdAt: application.createdAt,
+                updatedAt: application.updatedAt,
+                deletedBy: application.deletedBy,
+                createdBy: application.createdBy,
+                updatedBy: application.updatedBy,
+                copilotOpportunity: application.copilotOpportunity,
+              };
+
+              if (m) {
+                enriched.existingMembership = m;
+              }
+
+              req.log.debug(`Existing member to application ${JSON.stringify(enriched)}`);
+
+              return enriched;
+            });
+
+            req.log.debug(`Enriched Applications ${JSON.stringify(enrichedApplications)}`);
+            res.status(200).send(enrichedApplications);
+          });
+        })
     })
-      .then(copilotApplications => res.json(copilotApplications))
-      .catch((err) => {
-        util.handleError('Error fetching copilot applications', err, req, next);
-      });
+    .catch((err) => {
+      util.handleError('Error fetching copilot applications', err, req, next);
+    });
   },
 ];