Skip to content

Commit 5071cb8

Browse files
committed
fix: build
1 parent 83c6db9 commit 5071cb8

File tree

2 files changed

+62
-62
lines changed

2 files changed

+62
-62
lines changed

src/routes/copilotOpportunity/assign.js

Lines changed: 36 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -18,41 +18,6 @@ const assignCopilotOpportunityValidations = {
1818
}),
1919
};
2020

21-
const sendEmailToAllApplicants = async (req, opportunity, copilotRequest, applicationId) => {
22-
const allApplications = await models.Sequelize.CopilotApplication.findAll({
23-
where: {
24-
opportunityId: opportunity.id,
25-
id: {
26-
[Op.notIn]: [applicationId],
27-
}
28-
}
29-
});
30-
31-
const userIds = allApplications.map(item => item.userId);
32-
33-
const users = await util.getMemberDetailsByUserIds(userIds, req.log, req.id);
34-
35-
users.forEach(async (user) => {
36-
req.log.debug(`Sending email notification to copilots who are not accepted`);
37-
const emailEventType = CONNECT_NOTIFICATION_EVENT.EXTERNAL_ACTION_EMAIL;
38-
const copilotPortalUrl = config.get('copilotPortalUrl');
39-
const requestData = copilotRequest.data;
40-
createEvent(emailEventType, {
41-
data: {
42-
opportunity_details_url: `${copilotPortalUrl}/opportunity`,
43-
opportunity_title: requestData.opportunityTitle,
44-
user_name: user ? user.handle : "",
45-
},
46-
sendgrid_template_id: TEMPLATE_IDS.COPILOT_OPPORTUNITY_COMPLETED,
47-
recipients: [user.email],
48-
version: 'v3',
49-
}, req.log);
50-
51-
req.log.debug(`Email sent to copilots who are not accepted`);
52-
});
53-
54-
};
55-
5621
module.exports = [
5722
validate(assignCopilotOpportunityValidations),
5823
async (req, res, next) => {
@@ -67,6 +32,41 @@ module.exports = [
6732
return next(err);
6833
}
6934

35+
const sendEmailToAllApplicants = async (opportunity, copilotRequest, applicationId) => {
36+
const allApplications = await models.Sequelize.CopilotApplication.findAll({
37+
where: {
38+
opportunityId: opportunity.id,
39+
id: {
40+
[Op.notIn]: [applicationId],
41+
}
42+
}
43+
});
44+
45+
const userIds = allApplications.map(item => item.userId);
46+
47+
const users = await util.getMemberDetailsByUserIds(userIds, req.log, req.id);
48+
49+
users.forEach(async (user) => {
50+
req.log.debug(`Sending email notification to copilots who are not accepted`);
51+
const emailEventType = CONNECT_NOTIFICATION_EVENT.EXTERNAL_ACTION_EMAIL;
52+
const copilotPortalUrl = config.get('copilotPortalUrl');
53+
const requestData = copilotRequest.data;
54+
createEvent(emailEventType, {
55+
data: {
56+
opportunity_details_url: `${copilotPortalUrl}/opportunity`,
57+
opportunity_title: requestData.opportunityTitle,
58+
user_name: user ? user.handle : "",
59+
},
60+
sendgrid_template_id: TEMPLATE_IDS.COPILOT_OPPORTUNITY_COMPLETED,
61+
recipients: [user.email],
62+
version: 'v3',
63+
}, req.log);
64+
65+
req.log.debug(`Email sent to copilots who are not accepted`);
66+
});
67+
68+
};
69+
7070
return models.sequelize.transaction(async (t) => {
7171
const opportunity = await models.CopilotOpportunity.findOne({
7272
where: { id: copilotOpportunityId },
@@ -171,7 +171,7 @@ module.exports = [
171171
req.log.debug(`Email sent`);
172172

173173
// Send email to all applicants about opportunity completion
174-
await sendEmailToAllApplicants(req, opportunity, copilotRequest, application.id);
174+
await sendEmailToAllApplicants(opportunity, copilotRequest, application.id);
175175
};
176176

177177
const existingMember = activeMembers.find(item => item.userId === userId);

src/routes/copilotOpportunity/delete.js

Lines changed: 26 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -9,31 +9,6 @@ import { createEvent } from '../../services/busApi';
99
import { PERMISSION } from '../../permissions/constants';
1010

1111

12-
const sendEmailToAllApplicants = async (req, copilotRequest, applications) => {
13-
const userIds = applications.map(item => item.userId);
14-
const users = await util.getMemberDetailsByUserIds(userIds, req.log, req.id);
15-
16-
users.forEach(async (user) => {
17-
req.log.debug(`Sending email notification to copilots who applied`);
18-
const emailEventType = CONNECT_NOTIFICATION_EVENT.EXTERNAL_ACTION_EMAIL;
19-
const copilotPortalUrl = config.get('copilotPortalUrl');
20-
const requestData = copilotRequest.data;
21-
createEvent(emailEventType, {
22-
data: {
23-
opportunity_details_url: `${copilotPortalUrl}/opportunity`,
24-
opportunity_title: requestData.opportunityTitle,
25-
user_name: user ? user.handle : "",
26-
},
27-
sendgrid_template_id: TEMPLATE_IDS.COPILOT_OPPORTUNITY_CANCELED,
28-
recipients: [user.email],
29-
version: 'v3',
30-
}, req.log);
31-
32-
req.log.debug(`Email sent to copilots who applied`);
33-
});
34-
35-
};
36-
3712
module.exports = [
3813
(req, res, next) => {
3914
if (!util.hasPermissionByReq(PERMISSION.CANCEL_COPILOT_OPPORTUNITY, req)) {
@@ -47,6 +22,31 @@ module.exports = [
4722
// default values
4823
const opportunityId = _.parseInt(req.params.id);
4924

25+
const sendEmailToAllApplicants = async (copilotRequest, applications) => {
26+
const userIds = applications.map(item => item.userId);
27+
const users = await util.getMemberDetailsByUserIds(userIds, req.log, req.id);
28+
29+
users.forEach(async (user) => {
30+
req.log.debug(`Sending email notification to copilots who applied`);
31+
const emailEventType = CONNECT_NOTIFICATION_EVENT.EXTERNAL_ACTION_EMAIL;
32+
const copilotPortalUrl = config.get('copilotPortalUrl');
33+
const requestData = copilotRequest.data;
34+
createEvent(emailEventType, {
35+
data: {
36+
opportunity_details_url: `${copilotPortalUrl}/opportunity`,
37+
opportunity_title: requestData.opportunityTitle,
38+
user_name: user ? user.handle : "",
39+
},
40+
sendgrid_template_id: TEMPLATE_IDS.COPILOT_OPPORTUNITY_CANCELED,
41+
recipients: [user.email],
42+
version: 'v3',
43+
}, req.log);
44+
45+
req.log.debug(`Email sent to copilots who applied`);
46+
});
47+
48+
};
49+
5050
return models.sequelize.transaction(async (transaction) => {
5151
req.log.debug('Canceling Copilot opportunity transaction', opportunityId);
5252
const opportunity = await models.CopilotOpportunity.findOne({
@@ -120,7 +120,7 @@ module.exports = [
120120
invite.toJSON());
121121
}
122122

123-
await sendEmailToAllApplicants(req, copilotRequest, applications)
123+
await sendEmailToAllApplicants(copilotRequest, applications)
124124

125125
res.status(200).send({ id: opportunity.id });
126126
})

0 commit comments

Comments
 (0)