Changes for new sendgrid template

Author: urwithat

src/common/helper.js

@@ -1356,16 +1356,16 @@ function extractWorkPeriods (start, end) {
  * @param {String} userHandle user handle
  * @returns {String} email address of the user
  */
-async function getUserEmailByHandle (userHandle) {
+async function getUserByHandle (userHandle) {
   const token = await getM2MToken()
   const url = `${config.TC_API}/members/${userHandle}`
   const res = await request
     .get(url)
     .set('Authorization', `Bearer ${token}`)
     .set('Content-Type', 'application/json')
     .set('Accept', 'application/json')
-  localLogger.debug({ context: 'getUserEmailByHandle', message: `response body: ${JSON.stringify(res.body)}` })
-  return _.get(res, 'body.email')
+  localLogger.debug({ context: 'getUserByHandle', message: `response body: ${JSON.stringify(res.body)}` })
+  return _.get(res, 'body')
 }
 
 module.exports = {
@@ -1417,5 +1417,5 @@ module.exports = {
   updateChallenge,
   createChallengeResource,
   extractWorkPeriods,
-  getUserEmailByHandle
+  getUserByHandle
 }

src/eventHandlers/InterviewEventHandler.js

@@ -20,21 +20,23 @@ async function sendInvitationEmail (payload) {
   // get job candidate user details
   const jobCandidate = await models.JobCandidate.findById(interview.jobCandidateId)
   const jobCandidateUser = await helper.getUserById(jobCandidate.userId)
-  const jobCandidateUserEmail = await helper.getUserEmailByHandle(jobCandidateUser.handle)
+  const jobCandidateUserEmail = await helper.getUserByHandle(jobCandidateUser.handle)
   // get customer details
   const job = await jobCandidate.getJob()
 
   teamService.sendEmail({}, {
     template: 'interview-invitation',
-    cc: [jobCandidateUserEmail, ...interview.attendeesList],
+    cc: [jobCandidateUserEmail.email, ...interview.attendeesList],
     data: {
-      interviewType: interview.xaiTemplate,
-      interviewRound: interview.round,
-      interviewDuration: Interviews.XaiTemplate[interview.xaiTemplate],
-      interviewerList: interview.attendeesList,
-      jobName: job.title,
-      candidateName: `${jobCandidateUser.firstName} ${jobCandidateUser.lastName}`,
-      candidateId: interview.jobCandidateId
+      job_candidate_id: interview.jobCandidateId,
+      interview_round: interview.round,
+      interviewee_name: `${jobCandidateUser.firstName} ${jobCandidateUser.lastName}`,
+      interviewer_name: `${jobCandidateUserEmail.firstName} ${jobCandidateUserEmail.lastName}`,
+      xai_template: interview.xaiTemplate,
+      additional_interviewers: interview.attendeesList,
+      interview_length: Interviews.XaiTemplate[interview.xaiTemplate],
+      job_name: job.title,
+      interviewee_handle: jobCandidateUserEmail.handle
     }
   })
 }

src/services/TeamService.js

@@ -319,24 +319,17 @@ async function sendEmail (currentUser, data) {
   const templateCC = template.cc || []
   const dataRecipients = data.recipients || []
   const templateRecipients = template.recipients || []
-  let emailProps = {
+  let emailData = {
     // override template if coming data already have the 'from' address
     from: data.from || template.from,
     // create a set of uniq. recipients & CCs, from both coming data & template
     recipients: _.uniq([...dataRecipients, ...templateRecipients]),
-    cc: _.uniq([...dataCC, ...templateCC])
-  };
-  let emailStringProps = {
-    from: emailProps.from,
-    recipients: (emailProps.recipients).join(','),
-    cc: (emailProps.cc).join(',')
-  };
-  let emailData = {
-    data: { ...data.data, ...emailStringProps },
+    cc: _.uniq([...dataCC, ...templateCC]),
+    data: data.data,
     sendgrid_template_id: template.sendgridTemplateId,
     version: 'v3'
   }
-  await helper.postEvent(config.EMAIL_TOPIC, { ...emailData, ...emailProps })
+  await helper.postEvent(config.EMAIL_TOPIC, emailData)
 }
 
 sendEmail.schema = Joi.object().keys({