Merge branch 'develop' into deploy-pm-1612

himaniraghav3 · web-flow · commit 8f091ff8da1c · 2025-08-25T16:39:53.000+05:30
diff --git a/src/constants.js b/src/constants.js
@@ -313,6 +313,9 @@ export const TEMPLATE_IDS = {
   PROJECT_MEMBER_INVITED: 'd-b47a25b103604bc28fc0ce77e77fb681',
   INFORM_PM_COPILOT_APPLICATION_ACCEPTED: 'd-b35d073e302b4279a1bd208fcfe96f58',
   COPILOT_ALREADY_PART_OF_PROJECT: 'd-003d41cdc9de4bbc9e14538e8f2e0585',
+  COPILOT_APPLICATION_ACCEPTED: 'd-eef5e7568c644940b250e76d026ced5b',
+  COPILOT_OPPORTUNITY_COMPLETED: 'd-dc448919d11b4e7d8b4ba351c4b67b8b',
+  COPILOT_OPPORTUNITY_CANCELED: 'd-2a67ba71e82f4d70891fe6989c3522a3'
 }
 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
diff --git a/src/models/copilotRequest.js b/src/models/copilotRequest.js
@@ -2,7 +2,7 @@ import _ from 'lodash';
 import { COPILOT_REQUEST_STATUS } from '../constants';
 
 module.exports = function defineCopilotRequest(sequelize, DataTypes) {
-  const CopliotRequest = sequelize.define('CopilotRequest', {
+  const CopilotRequest = sequelize.define('CopilotRequest', {
     id: { type: DataTypes.BIGINT, primaryKey: true, autoIncrement: true },
     status: {
       type: DataTypes.STRING(16),
@@ -30,9 +30,10 @@ module.exports = function defineCopilotRequest(sequelize, DataTypes) {
     indexes: [],
   });
 
-  CopliotRequest.associate = (models) => {
-    CopliotRequest.hasMany(models.CopilotOpportunity, { as: 'copilotOpportunity', foreignKey: 'copilotRequestId' });
+  CopilotRequest.associate = (models) => {
+    CopilotRequest.hasMany(models.CopilotOpportunity, { as: 'copilotOpportunity', foreignKey: 'copilotRequestId' });
+    CopilotRequest.belongsTo(models.Project, { as: 'project', foreignKey: 'projectId' });
   };
 
-  return CopliotRequest;
+  return CopilotRequest;
 };
diff --git a/src/routes/copilotOpportunity/assign.js b/src/routes/copilotOpportunity/assign.js
@@ -6,10 +6,11 @@ import config from 'config';
 import models from '../../models';
 import util from '../../util';
 import { PERMISSION } from '../../permissions/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 { CONNECT_NOTIFICATION_EVENT, COPILOT_APPLICATION_STATUS, COPILOT_OPPORTUNITY_STATUS, COPILOT_REQUEST_STATUS, EVENT, INVITE_STATUS, PROJECT_MEMBER_ROLE, RESOURCES, TEMPLATE_IDS, USER_ROLE } from '../../constants';
 import { getCopilotTypeLabel } from '../../utils/copilot';
 import { createEvent } from '../../services/busApi';
 import moment from 'moment';
+import { Op } from 'sequelize';
 
 const assignCopilotOpportunityValidations = {
   body: Joi.object().keys({
@@ -31,6 +32,34 @@ module.exports = [
       return next(err);
     }
 
+    const sendEmailToAllApplicants = async (copilotRequest, allApplications) => {
+    
+      const userIds = allApplications.map(item => item.userId);
+    
+      const users = await util.getMemberDetailsByUserIds(userIds, req.log, req.id);
+    
+      users.forEach(async (user) => {
+        req.log.debug(`Sending email notification to copilots who are not accepted`);
+        const emailEventType = CONNECT_NOTIFICATION_EVENT.EXTERNAL_ACTION_EMAIL;
+        const copilotPortalUrl = config.get('copilotPortalUrl');
+        const requestData = copilotRequest.data;
+        createEvent(emailEventType, {
+          data: {
+            opportunity_details_url: copilotPortalUrl,
+            work_manager_url: config.get('workManagerUrl'),
+            opportunity_title: requestData.opportunityTitle,
+            user_name: user ? user.handle : "",
+          },
+          sendgrid_template_id: TEMPLATE_IDS.COPILOT_OPPORTUNITY_COMPLETED,
+          recipients: [user.email],
+          version: 'v3',
+        }, req.log);
+      
+        req.log.debug(`Email sent to copilots who are not accepted`);
+      });
+    
+    };
+
     return models.sequelize.transaction(async (t) => {
       const opportunity = await models.CopilotOpportunity.findOne({
         where: { id: copilotOpportunityId },
@@ -172,51 +201,82 @@ module.exports = [
         return;
       }
 
-      const existingInvite = await models.ProjectMemberInvite.findAll({
-        where: {
-          userId,
-          projectId,
-          role: PROJECT_MEMBER_ROLE.COPILOT,
-          status: INVITE_STATUS.PENDING,
-        },
-        transaction: t,
-      });
-
-      if (existingInvite && existingInvite.length) {
-        const err = new Error(`User already has an pending invite to the project`);
-        err.status = 400;
-        throw err;
-      }
-
-      const invite = await models.ProjectMemberInvite.create({
-        status: INVITE_STATUS.PENDING,
-        role: PROJECT_MEMBER_ROLE.COPILOT,
-        userId,
+      const member = {
         projectId,
-        applicationId: application.id,
+        role: USER_ROLE.TC_COPILOT,
+        userId,
         createdBy: req.authUser.userId,
-        createdAt: new Date(),
         updatedBy: req.authUser.userId,
-        updatedAt: new Date(),
+      };
+      req.context = req.context || {};
+      req.context.currentProjectMembers = activeMembers;
+      await util.addUserToProject(req, member, t)
+
+      await application.update({
+        status: COPILOT_APPLICATION_STATUS.ACCEPTED,
+      }, {
+        transaction: t,
+      });
+
+      await opportunity.update({
+        status: COPILOT_OPPORTUNITY_STATUS.COMPLETED,
       }, {
         transaction: t,
-      })
+      });
 
-      util.sendResourceToKafkaBus(
-        req,
-        EVENT.ROUTING_KEY.PROJECT_MEMBER_INVITE_CREATED,
-        RESOURCES.PROJECT_MEMBER_INVITE,
-        Object.assign({}, invite.toJSON(), {
-          source: 'copilot_portal',
-        }),
-      );
 
-      await application.update({
-        status: COPILOT_APPLICATION_STATUS.INVITED,
+      await copilotRequest.update({
+        status: COPILOT_REQUEST_STATUS.FULFILLED,
       }, {
         transaction: t,
       });
 
+      const sendEmailToCopilot = async () => {
+        const memberDetails = await util.getMemberDetailsByUserIds([application.userId], req.log, req.id);
+        const member = memberDetails[0];
+        req.log.debug(`Sending email notification to accepted copilot`);
+        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}`,
+            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_APPLICATION_ACCEPTED,
+          recipients: [member.email],
+          version: 'v3',
+        }, req.log);
+
+        req.log.debug(`Email sent to copilot`);
+      };
+
+      await sendEmailToCopilot();
+
+      // Cancel other applications
+      const otherApplications = await models.CopilotApplication.findAll({
+        where: {
+          opportunityId: copilotOpportunityId,
+          id: {
+            [Op.notIn]: [applicationId],
+          },
+        },
+        transaction: t,
+      });
+
+      // Send email to all applicants about opportunity completion
+      await sendEmailToAllApplicants(copilotRequest, otherApplications);
+
+      for (const otherApplication of otherApplications) {
+        await otherApplication.update({
+          status: COPILOT_APPLICATION_STATUS.CANCELED,
+        }, {
+          transaction: t,
+        });
+      }
+
       res.status(200).send({ id: applicationId });
     }).catch(err => next(err));
   },
diff --git a/src/routes/copilotOpportunity/delete.js b/src/routes/copilotOpportunity/delete.js
@@ -1,10 +1,14 @@
 import _ from 'lodash';
+import { Op } from 'sequelize';
+import config from 'config';
 
 import models from '../../models';
 import util from '../../util';
-import { COPILOT_APPLICATION_STATUS, COPILOT_OPPORTUNITY_STATUS, COPILOT_REQUEST_STATUS } from '../../constants';
+import { CONNECT_NOTIFICATION_EVENT, COPILOT_APPLICATION_STATUS, COPILOT_OPPORTUNITY_STATUS, COPILOT_REQUEST_STATUS, EVENT, INVITE_STATUS, RESOURCES, TEMPLATE_IDS } from '../../constants';
+import { createEvent } from '../../services/busApi';
 import { PERMISSION } from '../../permissions/constants';
 
+
 module.exports = [
   (req, res, next) => {
     if (!util.hasPermissionByReq(PERMISSION.CANCEL_COPILOT_OPPORTUNITY, req)) {
@@ -18,6 +22,32 @@ module.exports = [
     // default values
     const opportunityId = _.parseInt(req.params.id);
 
+    const sendEmailToAllApplicants = async (copilotRequest, applications) => {
+      const userIds = applications.map(item => item.userId);
+      const users = await util.getMemberDetailsByUserIds(userIds, req.log, req.id);
+    
+      users.forEach(async (user) => {
+        req.log.debug(`Sending email notification to copilots who applied`);
+        const emailEventType = CONNECT_NOTIFICATION_EVENT.EXTERNAL_ACTION_EMAIL;
+        const copilotPortalUrl = config.get('copilotPortalUrl');
+        const requestData = copilotRequest.data;
+        createEvent(emailEventType, {
+          data: {
+            opportunity_details_url: copilotPortalUrl,
+            work_manager_url: config.get('workManagerUrl'),
+            opportunity_title: requestData.opportunityTitle,
+            user_name: user ? user.handle : "",
+          },
+          sendgrid_template_id: TEMPLATE_IDS.COPILOT_OPPORTUNITY_CANCELED,
+          recipients: [user.email],
+          version: 'v3',
+        }, req.log);
+      
+        req.log.debug(`Email sent to copilots who applied`);
+      });
+    
+    };
+
     return models.sequelize.transaction(async (transaction) => {
       req.log.debug('Canceling Copilot opportunity transaction', opportunityId);
       const opportunity = await models.CopilotOpportunity.findOne({
@@ -54,6 +84,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 +106,23 @@ 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());
+      }
+
+      await sendEmailToAllApplicants(copilotRequest, applications)
+
       res.status(200).send({ id: opportunity.id });
     })
         
diff --git a/src/routes/copilotOpportunity/get.js b/src/routes/copilotOpportunity/get.js
@@ -4,7 +4,6 @@ import util from '../../util';
 module.exports = [
   (req, res, next) => {
     const { id } = req.params;
-
     if (!id || isNaN(id)) {
       return util.handleError('Invalid opportunity ID', null, req, next, 400);
     }
diff --git a/src/routes/copilotOpportunity/list.js b/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,10 +53,7 @@ module.exports = [
           attributes: ['name'],
         },
       ],
-      order: [
-        [models.Sequelize.literal(`CASE WHEN "CopilotOpportunity"."status" = 'active' THEN 0 ELSE 1 END`), 'ASC'],
-        [sortParams[0], sortParams[1]]
-      ],
+      order: baseOrder,
       limit,
       offset,
     })
diff --git a/src/routes/copilotRequest/approveRequest.service.js b/src/routes/copilotRequest/approveRequest.service.js
@@ -4,7 +4,7 @@ import moment from 'moment';
 import { Op } from 'sequelize';
 
 import models from '../../models';
-import { CONNECT_NOTIFICATION_EVENT, COPILOT_REQUEST_STATUS, TEMPLATE_IDS, USER_ROLE } from '../../constants';
+import { CONNECT_NOTIFICATION_EVENT, COPILOT_OPPORTUNITY_STATUS, COPILOT_REQUEST_STATUS, TEMPLATE_IDS, USER_ROLE } from '../../constants';
 import util from '../../util';
 import { createEvent } from '../../services/busApi';
 import { getCopilotTypeLabel } from '../../utils/copilot';
@@ -46,13 +46,13 @@ module.exports = (req, data, existingTransaction) => {
                   projectId,
                   type: data.type,
                   status: {
-                    [Op.notIn]: [COPILOT_REQUEST_STATUS.CANCELED],
+                    [Op.in]: [COPILOT_OPPORTUNITY_STATUS.ACTIVE],
                   }
                 },
               })
               .then((existingCopilotOpportunityOfSameType) => {
                 if (existingCopilotOpportunityOfSameType) {
-                  const err = new Error('There\'s an opportunity of same type already!');
+                  const err = new Error('There\'s an active opportunity of same type already!');
                   _.assign(err, {
                     status: 403,
                   });
diff --git a/src/routes/copilotRequest/list.js b/src/routes/copilotRequest/list.js
diff --git a/src/routes/projectMemberInvites/update.js b/src/routes/projectMemberInvites/update.js

Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,6 @@ import util from '../../util';`
`4`	`4`	`module.exports = [`
`5`	`5`	`(req, res, next) => {`
`6`	`6`	`const { id } = req.params;`
`7`		`-`
`8`	`7`	`if (!id \|\| isNaN(id)) {`
`9`	`8`	`return util.handleError('Invalid opportunity ID', null, req, next, 400);`
`10`	`9`	`}`