diff --git a/.circleci/config.yml b/.circleci/config.yml index 83db4e29..1c2bc8c2 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -149,7 +149,7 @@ workflows: context : org-global filters: branches: - only: ['develop', 'migration-setup', 'pm-1368'] + only: ['develop', 'migration-setup', 'pm-1494'] - deployProd: context : org-global filters: diff --git a/src/routes/copilotRequest/approveRequest.service.js b/src/routes/copilotRequest/approveRequest.service.js index a5c3b854..37f7d25c 100644 --- a/src/routes/copilotRequest/approveRequest.service.js +++ b/src/routes/copilotRequest/approveRequest.service.js @@ -1,11 +1,13 @@ import _ from 'lodash'; import config from 'config'; +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 util from '../../util'; import { createEvent } from '../../services/busApi'; -import { Op } from 'sequelize'; +import { getCopilotTypeLabel } from '../../utils/copilot'; const resolveTransaction = (transaction, callback) => { if (transaction) { @@ -16,7 +18,7 @@ const resolveTransaction = (transaction, callback) => { }; module.exports = (req, data, existingTransaction) => { - const { projectId, copilotRequestId } = data; + const { projectId, copilotRequestId, opportunityTitle, type, startDate } = data; return resolveTransaction(existingTransaction, transaction => models.Project.findOne({ @@ -71,6 +73,9 @@ module.exports = (req, data, existingTransaction) => { user_name: subject.handle, opportunity_details_url: `${copilotPortalUrl}/opportunity/${opportunity.id}`, work_manager_url: config.get('workManagerUrl'), + opportunity_type: getCopilotTypeLabel(type), + opportunity_title: opportunityTitle, + start_date: moment.utc(startDate).format("YYYY-MM-DD HH:mm:ss [UTC]"), }, sendgrid_template_id: TEMPLATE_IDS.CREATE_REQUEST, recipients: [subject.email], diff --git a/src/routes/copilotRequest/create.js b/src/routes/copilotRequest/create.js index 1522fac6..52b640ea 100644 --- a/src/routes/copilotRequest/create.js +++ b/src/routes/copilotRequest/create.js @@ -98,6 +98,8 @@ module.exports = [ createdBy: req.authUser.userId, updatedBy: req.authUser.userId, type: copilotRequest.data.projectType, + opportunityTitle: copilotRequest.data.opportunityTitle, + startDate: copilotRequest.data.startDate, }); return approveRequest(req, approveData, transaction).then(() => copilotRequest); }).then(copilotRequest => res.status(201).json(copilotRequest)) diff --git a/src/utils/copilot.js b/src/utils/copilot.js new file mode 100644 index 00000000..b7a722b7 --- /dev/null +++ b/src/utils/copilot.js @@ -0,0 +1,16 @@ +import { COPILOT_OPPORTUNITY_TYPE } from "../constants"; + +export const getCopilotTypeLabel = (type) => { + switch (type) { + case COPILOT_OPPORTUNITY_TYPE.AI: + return 'AI'; + case COPILOT_OPPORTUNITY_TYPE.DATA_SCIENCE: + return "Data Science"; + case COPILOT_OPPORTUNITY_TYPE.DESIGN: + return "Design"; + case COPILOT_OPPORTUNITY_TYPE.DEV: + return "Development"; + default: + return "Quality Assurance"; + } +};