Merge pull request #809 from topcoder-platform/pm-1168_1

hentrymartin · web-flow · commit 6224d47902e1 · 2025-05-22T21:26:13.000+02:00
fix(PM-1168): invite user when assigning as copilot
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -149,7 +149,7 @@ workflows:
           context : org-global
           filters:
             branches:
-              only: ['develop', 'migration-setup', 'pm-1168']
+              only: ['develop', 'migration-setup']
       - deployProd:
           context : org-global
           filters:
diff --git a/migrations/umzug/migrations/20250521211708-copilot_invite_from_application.js b/migrations/umzug/migrations/20250521211708-copilot_invite_from_application.js
@@ -0,0 +1,18 @@
+module.exports = {
+  up: async (queryInterface, Sequelize) => {
+    await queryInterface.addColumn('project_member_invites', 'applicationId', {
+      type: Sequelize.BIGINT,
+      allowNull: true,
+      references: {
+        model: 'copilot_applications',
+        key: 'id',
+      },
+      onUpdate: 'CASCADE',
+      onDelete: 'SET NULL',
+    });
+  },
+
+  down: async (queryInterface) => {
+    await queryInterface.removeColumn('project_member_invites', 'applicationId');
+  },
+};
diff --git a/src/constants.js b/src/constants.js
@@ -20,6 +20,7 @@ export const COPILOT_REQUEST_STATUS = {
 
 export const COPILOT_APPLICATION_STATUS = {
   PENDING: 'pending',
+  INVITED: 'invited',
   ACCEPTED: 'accepted',
 };
 
diff --git a/src/models/projectMember.js b/src/models/projectMember.js
@@ -44,11 +44,12 @@ module.exports = function defineProjectMember(sequelize, DataTypes) {
   })
     .then(res => _.without(_.map(res, 'projectId'), null));
 
-  ProjectMember.getActiveProjectMembers = projectId => ProjectMember.findAll({
+  ProjectMember.getActiveProjectMembers = (projectId, t) => ProjectMember.findAll({
     where: {
       deletedAt: { $eq: null },
       projectId,
     },
+    transaction: t,
     raw: true,
   });
 
diff --git a/src/models/projectMemberInvite.js b/src/models/projectMemberInvite.js
@@ -13,6 +13,16 @@ module.exports = function defineProjectMemberInvite(sequelize, DataTypes) {
         isEmail: true,
       },
     },
+    applicationId: {
+      type: DataTypes.BIGINT,
+      allowNull: true,
+      references: {
+        model: 'copilot_applications',
+        key: 'id',
+      },
+      onUpdate: 'CASCADE',
+      onDelete: 'CASCADE',
+    },
     role: {
       type: DataTypes.STRING,
       allowNull: false,
diff --git a/src/routes/copilotOpportunity/assign.js b/src/routes/copilotOpportunity/assign.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_APPLICATION_STATUS, COPILOT_OPPORTUNITY_STATUS, COPILOT_REQUEST_STATUS } from '../../constants';
+import { createEvent } from '../../services/busApi';
+import { CONNECT_NOTIFICATION_EVENT, COPILOT_APPLICATION_STATUS, COPILOT_OPPORTUNITY_STATUS, COPILOT_REQUEST_STATUS, EVENT, INVITE_STATUS, PROJECT_MEMBER_ROLE, RESOURCES } from '../../constants';
 
 const assignCopilotOpportunityValidations = {
   body: Joi.object().keys({
@@ -64,7 +66,7 @@ module.exports = [
 
       const projectId = opportunity.projectId;
       const userId = application.userId;
-      const activeMembers = await models.ProjectMember.getActiveProjectMembers(projectId);
+      const activeMembers = await models.ProjectMember.getActiveProjectMembers(projectId, t);
 
       const existingUser = activeMembers.find(item => item.userId === userId);
       if (existingUser && existingUser.role === 'copilot') {
@@ -73,20 +75,89 @@ module.exports = [
         throw err;
       }
 
-      await models.CopilotRequest.update(
-        { status: COPILOT_REQUEST_STATUS.FULFILLED },
-        { where: { id: opportunity.copilotRequestId }, transaction: t },
-      );
+      const project = await models.Project.findOne({
+        where: {
+          id: projectId,
+        },
+        transaction: t,
+      });
+
+      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 applicationUser = await util.getMemberDetailsByUserIds([userId], req.log, req.id);
+
+      const invite = await models.ProjectMemberInvite.create({
+        status: INVITE_STATUS.PENDING,
+        role: PROJECT_MEMBER_ROLE.COPILOT,
+        userId,
+        projectId,
+        applicationId: application.id,
+        email: applicationUser[0].email,
+        createdBy: req.authUser.userId,
+        createdAt: new Date(),
+        updatedBy: req.authUser.userId,
+        updatedAt: new Date(),
+      }, {
+        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,
+        invite.toJSON());
 
-      await models.CopilotApplication.update(
-        { status: COPILOT_APPLICATION_STATUS.ACCEPTED },
-        { where: { id: applicationId }, transaction: t },
-      );
+      const authUserDetails = await util.getMemberDetailsByUserIds([req.authUser.userId], req.log, req.id);
+
+      const emailEventType = CONNECT_NOTIFICATION_EVENT.PROJECT_MEMBER_EMAIL_INVITE_CREATED;
+      await createEvent(emailEventType, {
+        data: {
+          workManagerUrl: config.get('workManagerUrl'),
+          accountsAppURL: config.get('accountsAppUrl'),
+          subject: config.get('inviteEmailSubject'),
+          projects: [{
+            name: project.name,
+            projectId,
+            sections: [
+              {
+                EMAIL_INVITES: true,
+                title: config.get('inviteEmailSectionTitle'),
+                projectName: project.name,
+                projectId,
+                initiator: authUserDetails[0],
+                isSSO: util.isSSO(project),
+              },
+            ],
+          }],
+        },
+        recipients: [applicationUser[0].email],
+        version: 'v3',
+        from: {
+          name: config.get('EMAIL_INVITE_FROM_NAME'),
+          email: config.get('EMAIL_INVITE_FROM_EMAIL'),
+        },
+        categories: [`${process.env.NODE_ENV}:${emailEventType}`.toLowerCase()],
+      }, req.log);
+
+      await application.update({
+        status: COPILOT_APPLICATION_STATUS.INVITED,
+      }, {
+        transaction: t,
+      });
 
       res.status(200).send({ id: applicationId });
     }).catch(err => next(err));
diff --git a/src/routes/projectMemberInvites/update.js b/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 } from '../../constants';
+import { INVITE_STATUS, EVENT, RESOURCES, COPILOT_APPLICATION_STATUS, COPILOT_OPPORTUNITY_STATUS, COPILOT_REQUEST_STATUS } from '../../constants';
 import { PERMISSION } from '../../permissions/constants';
 
 /**
@@ -94,7 +94,7 @@ module.exports = [
             if (updatedInvite.status === INVITE_STATUS.ACCEPTED ||
               updatedInvite.status === INVITE_STATUS.REQUEST_APPROVED) {
               return models.ProjectMember.getActiveProjectMembers(projectId)
-                .then((members) => {
+                .then(async (members) => {
                   req.context = req.context || {};
                   req.context.currentProjectMembers = members;
                   let userId = updatedInvite.userId;
@@ -117,10 +117,54 @@ module.exports = [
                     createdBy: req.authUser.userId,
                     updatedBy: req.authUser.userId,
                   };
-                  return util
-                    .addUserToProject(req, member)
-                    .then(() => res.json(util.postProcessInvites('$.email', updatedInvite, req)))
-                    .catch(err => next(err));
+                  const t = await models.sequelize.transaction();
+                  try {
+                    await util.addUserToProject(req, member, t);
+                    if (invite.applicationId) {
+                      const application = await models.CopilotApplication.findOne({
+                        where: {
+                          id: invite.applicationId,
+                        },
+                        transaction: t,
+                      });
+
+                      await application.update({ status: COPILOT_APPLICATION_STATUS.ACCEPTED }, {
+                        transaction: t
+                      });
+
+                      const opportunity = await models.CopilotOpportunity.findOne({
+                        where: {
+                          id: application.opportunityId,
+                        },
+                        transaction: t,
+                      });
+
+                      await opportunity.update({
+                        status: COPILOT_OPPORTUNITY_STATUS.COMPLETED
+                      }, {
+                        transaction: t,
+                      });
+
+                      const request = await models.CopilotRequest.findOne({
+                        where: {
+                          id: opportunity.copilotRequestId,
+                        },
+                        transaction: t,
+                      });
+
+                      await request.update({
+                        status: COPILOT_REQUEST_STATUS.FULFILLED
+                      }, {
+                        transaction: t,
+                      });
+                    }
+
+                    await t.commit();
+                    return res.json(util.postProcessInvites('$.email', updatedInvite, req));
+                  } catch (e) {
+                    await t.rollback();
+                    return next(e);
+                  }
                 });
             }
             return res.json(util.postProcessInvites('$.email', updatedInvite, req));
