Skip to content

Commit efe574e

Browse files
maxceemmaxceem
authored
Merge pull request #532 from topcoder-platform/feature/revert-splitting-email-templates
Revert splitting email templates
2 parents 8858bd2 + d0905bb commit efe574e

24 files changed

+584
-3258
lines changed

‎config/default.js

Lines changed: 2 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -179,8 +179,6 @@ module.exports = {
179179
INTERVIEW_INVITATION_SENDER_EMAIL: process.env.INTERVIEW_INVITATION_SENDER_EMAIL || '[email protected]',
180180
// the URL where TaaS App is hosted
181181
TAAS_APP_URL: process.env.TAAS_APP_URL || 'https://platform.topcoder-dev.com/taas/myteams',
182-
// the URL where TaaS App Earn is hosted
183-
TAAS_APP_EARN_URL: process.env.TAAS_APP_EARN_URL || 'https://platform.topcoder-dev.com/earn/my-gigs',
184182
// environment variables for Payment Service
185183
ROLE_ID_SUBMITTER: process.env.ROLE_ID_SUBMITTER || '732339e7-8e30-49d7-9198-cccf9451e221',
186184
TYPE_ID_TASK: process.env.TYPE_ID_TASK || 'ecd58c69-238f-43a4-a4bb-d172719b9f31',
@@ -253,30 +251,8 @@ module.exports = {
253251
},
254252
// the sender email
255253
NOTIFICATION_SENDER_EMAIL: process.env.NOTIFICATION_SENDER_EMAIL || '[email protected]',
256-
// the email notification sendgrid template id of candidate was viewed by client
257-
NOTIFICATION_CLIENT_VIEWED_PROFILE_SENDGRID_TEMPLATE_ID: process.env.NOTIFICATION_CLIENT_VIEWED_PROFILE_SENDGRID_TEMPLATE_ID,
258-
// the email notification sendgrid template id of candidates are available for review
259-
NOTIFICATION_REVIEW_CANDIDATES_SENDGRID_TEMPLATE_ID: process.env.NOTIFICATION_REVIEW_CANDIDATES_SENDGRID_TEMPLATE_ID,
260-
// the email notification sendgrid template id of interview coming up for customer
261-
NOTIFICATION_CUSTOMER_INTERVIEW_COMING_UP_SENDGRID_TEMPLATE_ID: process.env.NOTIFICATION_CUSTOMER_INTERVIEW_COMING_UP_SENDGRID_TEMPLATE_ID,
262-
// the email notification sendgrid template id of interview coming up for member
263-
NOTIFICATION_MEMBER_INTERVIEW_COMING_UP_SENDGRID_TEMPLATE_ID: process.env.NOTIFICATION_MEMBER_INTERVIEW_COMING_UP_SENDGRID_TEMPLATE_ID,
264-
// the email notification sendgrid template id of interview completed
265-
NOTIFICATION_INTERVIEW_COMPLETE_SENDGRID_TEMPLATE_ID: process.env.NOTIFICATION_INTERVIEW_COMPLETE_SENDGRID_TEMPLATE_ID,
266-
// the email notification sendgrid template id of post interview action reminder
267-
NOTIFICATION_POST_INTERVIEW_ACTION_SENDGRID_TEMPLATE_ID: process.env.NOTIFICATION_POST_INTERVIEW_ACTION_SENDGRID_TEMPLATE_ID,
268-
// the email notification sendgrid template id of upcoming resource booking expiration
269-
NOTIFICATION_UPCOMING_RESOURCE_BOOKING_EXPIRATION_SENDGRID_TEMPLATE_ID: process.env.NOTIFICATION_UPCOMING_RESOURCE_BOOKING_EXPIRATION_SENDGRID_TEMPLATE_ID,
270-
// the email notification sendgrid template id of new team created
271-
NOTIFICATION_NEW_TEAM_CREATED_SENDGRID_TEMPLATE_ID: process.env.NOTIFICATION_NEW_TEAM_CREATED_SENDGRID_TEMPLATE_ID,
272-
// the email notification sendgrid template id of new job added to existing project
273-
NOTIFICATION_NEW_JOB_ADDED_SENDGRID_TEMPLATE_ID: process.env.NOTIFICATION_NEW_JOB_ADDED_SENDGRID_TEMPLATE_ID,
274-
// the email notification sendgrid template id of resource placed
275-
NOTIFICATION_RESOURCE_BOOKING_PLACED_SENDGRID_TEMPLATE_ID: process.env.NOTIFICATION_RESOURCE_BOOKING_PLACED_SENDGRID_TEMPLATE_ID,
276-
// the email notification sendgrid template id of interviews overlapping
277-
NOTIFICATION_INTERVIEWS_OVERLAPPING_SENDGRID_TEMPLATE_ID: process.env.NOTIFICATION_INTERVIEWS_OVERLAPPING_SENDGRID_TEMPLATE_ID,
278-
// the email notification sendgrid template id of job candidate selected
279-
NOTIFICATION_JOB_CANDIDATE_SELECTED_SENDGRID_TEMPLATE_ID: process.env.NOTIFICATION_JOB_CANDIDATE_SELECTED_SENDGRID_TEMPLATE_ID,
254+
// the email notification sendgrid template id
255+
NOTIFICATION_SENDGRID_TEMPLATE_ID: process.env.NOTIFICATION_SENDGRID_TEMPLATE_ID,
280256
// frequency of cron checking for available candidates for review
281257
CRON_CANDIDATE_REVIEW: process.env.CRON_CANDIDATE_REVIEW || '00 00 13 * * 0-6',
282258
// frequency of cron checking for coming up interviews

‎config/email_template.config.js

Lines changed: 22 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -112,88 +112,88 @@ module.exports = {
112112
*/
113113
notificationEmailTemplates: {
114114
'taas.notification.job-candidate-resume-viewed': {
115-
subject: 'Client has viewed your Topcoder profile',
115+
subject: 'Topcoder - Client View Resume for Job {{jobName}}',
116116
body: '',
117117
recipients: [],
118118
from: config.NOTIFICATION_SENDER_EMAIL,
119-
sendgridTemplateId: config.NOTIFICATION_CLIENT_VIEWED_PROFILE_SENDGRID_TEMPLATE_ID
119+
sendgridTemplateId: config.NOTIFICATION_SENDGRID_TEMPLATE_ID
120120
},
121121
'taas.notification.candidates-available-for-review': {
122-
subject: 'You have candidates to review',
122+
subject: 'Topcoder - {{teamName}} has job candidates available for review',
123123
body: '',
124124
recipients: [],
125125
from: config.NOTIFICATION_SENDER_EMAIL,
126-
sendgridTemplateId: config.NOTIFICATION_REVIEW_CANDIDATES_SENDGRID_TEMPLATE_ID
126+
sendgridTemplateId: config.NOTIFICATION_SENDGRID_TEMPLATE_ID
127127
},
128128
'taas.notification.interview-coming-up-host': {
129-
subject: 'Interview reminder: Your Topcoder interview is coming up',
129+
subject: 'Topcoder - Interview Coming Up: {{jobTitle}} with {{guestFullName}}',
130130
body: '',
131131
recipients: [],
132132
from: config.NOTIFICATION_SENDER_EMAIL,
133-
sendgridTemplateId: config.NOTIFICATION_CUSTOMER_INTERVIEW_COMING_UP_SENDGRID_TEMPLATE_ID
133+
sendgridTemplateId: config.NOTIFICATION_SENDGRID_TEMPLATE_ID
134134
},
135135
'taas.notification.interview-coming-up-guest': {
136-
subject: 'Reminder: Interview coming up',
136+
subject: 'Topcoder - Interview Coming Up: {{jobTitle}} with {{hostFullName}}',
137137
body: '',
138138
recipients: [],
139139
from: config.NOTIFICATION_SENDER_EMAIL,
140-
sendgridTemplateId: config.NOTIFICATION_MEMBER_INTERVIEW_COMING_UP_SENDGRID_TEMPLATE_ID
140+
sendgridTemplateId: config.NOTIFICATION_SENDGRID_TEMPLATE_ID
141141
},
142142
'taas.notification.interview-awaits-resolution': {
143-
subject: 'Interview complete - here’s what to do next',
143+
subject: 'Topcoder - Interview Awaits Resolution: {{jobTitle}} for {{guestFullName}}',
144144
body: '',
145145
recipients: [],
146146
from: config.NOTIFICATION_SENDER_EMAIL,
147-
sendgridTemplateId: config.NOTIFICATION_INTERVIEW_COMPLETE_SENDGRID_TEMPLATE_ID
147+
sendgridTemplateId: config.NOTIFICATION_SENDGRID_TEMPLATE_ID
148148
},
149149
'taas.notification.post-interview-action-required': {
150-
subject: 'Reminder: Take action to reserve your talent',
150+
subject: 'Topcoder - Candidate Action Required in {{teamName}} for {{numCandidates}} candidates',
151151
body: '',
152152
recipients: [],
153153
from: config.NOTIFICATION_SENDER_EMAIL,
154-
sendgridTemplateId: config.NOTIFICATION_POST_INTERVIEW_ACTION_SENDGRID_TEMPLATE_ID
154+
sendgridTemplateId: config.NOTIFICATION_SENDGRID_TEMPLATE_ID
155155
},
156156
'taas.notification.resource-booking-expiration': {
157-
subject: 'Reminder: 3 weeks left in your Angular Developer’s gig',
157+
subject: 'Topcoder - Resource Booking Expiring in {{teamName}} for {{numResourceBookings}} resource bookings',
158158
body: '',
159159
recipients: [],
160160
from: config.NOTIFICATION_SENDER_EMAIL,
161-
sendgridTemplateId: config.NOTIFICATION_UPCOMING_RESOURCE_BOOKING_EXPIRATION_SENDGRID_TEMPLATE_ID
161+
sendgridTemplateId: config.NOTIFICATION_SENDGRID_TEMPLATE_ID
162162
},
163163
'taas.notification.team-created': {
164-
subject: 'Your Topcoder talent request confirmation',
164+
subject: 'Topcoder - New Team {{teamName}} Created',
165165
body: '',
166166
recipients: [],
167167
from: config.NOTIFICATION_SENDER_EMAIL,
168-
sendgridTemplateId: config.NOTIFICATION_NEW_TEAM_CREATED_SENDGRID_TEMPLATE_ID
168+
sendgridTemplateId: config.NOTIFICATION_SENDGRID_TEMPLATE_ID
169169
},
170170
'taas.notification.job-created': {
171-
subject: 'New job added to your Topcoder team',
171+
subject: 'Topcoder - New Job {{jobTitle}} Created in Team {{teamName}}',
172172
body: '',
173173
recipients: [],
174174
from: config.NOTIFICATION_SENDER_EMAIL,
175-
sendgridTemplateId: config.NOTIFICATION_NEW_JOB_ADDED_SENDGRID_TEMPLATE_ID
175+
sendgridTemplateId: config.NOTIFICATION_SENDGRID_TEMPLATE_ID
176176
},
177177
'taas.notification.interviews-overlapping': {
178178
subject: 'Topcoder - Interviews overlapping',
179179
body: '',
180180
recipients: config.NOTIFICATION_OPS_EMAILS,
181181
from: config.NOTIFICATION_SENDER_EMAIL,
182-
sendgridTemplateId: config.NOTIFICATION_INTERVIEWS_OVERLAPPING_SENDGRID_TEMPLATE_ID
182+
sendgridTemplateId: config.NOTIFICATION_SENDGRID_TEMPLATE_ID
183183
},
184184
'taas.notification.job-candidate-selected': {
185185
subject: 'Topcoder - Job Candidate {{userHandle}} Selected for {{jobTitle}} in Team {{teamName}}',
186186
body: '',
187187
recipients: config.NOTIFICATION_OPS_EMAILS,
188188
from: config.NOTIFICATION_SENDER_EMAIL,
189-
sendgridTemplateId: config.NOTIFICATION_JOB_CANDIDATE_SELECTED_SENDGRID_TEMPLATE_ID
189+
sendgridTemplateId: config.NOTIFICATION_SENDGRID_TEMPLATE_ID
190190
},
191191
'taas.notification.resource-booking-placed': {
192-
subject: 'Your Topcoder talent is confirmed! How to start working with them.',
192+
subject: 'Topcoder - Resource Booking {{userHandle}} Placed for Job {{jobTitle}} in Team {{teamName}}',
193193
body: '',
194194
recipients: [],
195195
from: config.NOTIFICATION_SENDER_EMAIL,
196-
sendgridTemplateId: config.NOTIFICATION_RESOURCE_BOOKING_PLACED_SENDGRID_TEMPLATE_ID
196+
sendgridTemplateId: config.NOTIFICATION_SENDGRID_TEMPLATE_ID
197197
}
198198
}
199199
}

0 commit comments

Comments
 (0)