diff --git a/.circleci/config.yml b/.circleci/config.yml index d4c591c5..1acd4a4c 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -149,7 +149,7 @@ workflows: context : org-global filters: branches: - only: ['develop', 'migration-setup', 'pm-1173_1'] + only: ['develop', 'migration-setup'] - deployProd: context : org-global filters: diff --git a/src/routes/copilotOpportunityApply/create.js b/src/routes/copilotOpportunityApply/create.js index 829eec36..4bfbea9f 100644 --- a/src/routes/copilotOpportunityApply/create.js +++ b/src/routes/copilotOpportunityApply/create.js @@ -71,10 +71,17 @@ module.exports = [ 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.userId], req.log, req.id); + const creator = await util.getMemberDetailsByUserIds([opportunity.createdBy], req.log, req.id); + const listOfSubjects = subjects; - if (creator) { - const isCreatorPartofSubjects = subjects.find(item => item.email.toLowerCase() === creator[0].email.toLowerCase()); + 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,