Replacing subject placeholders

Author: tejad

src/eventHandlers/JobCandidateEventHandler.js

@@ -155,26 +155,28 @@ async function sendJobCandidateSelectedNotification (payload) {
   const project = await helper.getProjectById({ isMachine: true }, job.projectId)
   const jobUrl = `${config.TAAS_APP_URL}/${project.id}/positions/${job.id}`
   const teamUrl = `${config.TAAS_APP_URL}/${project.id}`
+  const data = {
+    subject: template.subject,
+    teamName: project.name,
+    teamUrl,
+    jobTitle: job.title,
+    jobDuration: job.duration,
+    jobStartDate: helper.formatDateEDT(job.startDate),
+    userHandle: user.handle,
+    jobUrl,
+    notificationType: {
+      candidateSelected: true
+    },
+    description: 'Job Candidate Selected'
+  }
+  data.subject = await helper.substituteStringByObject(data.subject, data)
   const emailData = {
     serviceId: 'email',
     type: 'taas.notification.job-candidate-selected',
     details: {
       from: template.from,
       recipients: template.recipients,
-      data: {
-        subject: template.subject,
-        teamName: project.name,
-        teamUrl,
-        jobTitle: job.title,
-        jobDuration: job.duration,
-        jobStartDate: helper.formatDateEDT(job.startDate),
-        userHandle: user.handle,
-        jobUrl,
-        notificationType: {
-          candidateSelected: true
-        },
-        description: 'Job Candidate Selected'
-      },
+      data,
       sendgridTemplateId: template.sendgridTemplateId,
       version: 'v3'
     }

src/eventHandlers/JobEventHandler.js

@@ -84,25 +84,28 @@ async function sendNotifications (payload) {
   }
   const template = helper.getEmailTemplatesForKey('notificationEmailTemplates')['taas.notification.job-created']
   const project = await helper.getProjectById({ isMachine: true }, payload.value.projectId)
+  const data = {
+    subject: template.subject,
+    teamName: project.name,
+    teamURL: `${config.TAAS_APP_URL}/${project.id}`,
+    jobTitle: payload.value.title,
+    jobURL: `${config.TAAS_APP_URL}/${project.id}/positions/${payload.value.id}`,
+    jobDuration: payload.value.duration,
+    jobStartDate: helper.formatDateEDT(payload.value.startDate),
+    notificationType: {
+      newJobCreated: true
+    },
+    description: 'New Job Created'
+  }
+  data.subject = await helper.substituteStringByObject(data.subject, data)
+
   const emailData = {
     serviceId: 'email',
     type: 'taas.notification.job-created',
     details: {
       from: template.from,
       recipients: _.map(project.members, m => _.pick(m, 'email')),
-      data: {
-        subject: template.subject,
-        teamName: project.name,
-        teamURL: `${config.TAAS_APP_URL}/${project.id}`,
-        jobTitle: payload.value.title,
-        jobURL: `${config.TAAS_APP_URL}/${project.id}/positions/${payload.value.id}`,
-        jobDuration: payload.value.duration,
-        jobStartDate: helper.formatDateEDT(payload.value.startDate),
-        notificationType: {
-          newJobCreated: true
-        },
-        description: 'New Job Created'
-      },
+      data,
       sendgridTemplateId: template.sendgridTemplateId,
       version: 'v3'
     }

src/eventHandlers/ResourceBookingEventHandler.js

@@ -89,26 +89,28 @@ async function sendPlacedNotifications (payload) {
   const recipients = _.map(project.members, m => _.pick(m, 'email'))
   const jobUrl = `${config.TAAS_APP_URL}/${project.id}/positions/${job.id}`
   const teamUrl = `${config.TAAS_APP_URL}/${project.id}`
+  const data = {
+    subject: template.subject,
+    teamName: project.name,
+    teamUrl,
+    jobTitle: job.title,
+    jobUrl,
+    userHandle: user.handle,
+    startDate: resourceBooking.startDate,
+    endDate: resourceBooking.endDate,
+    notificationType: {
+      resourceBookingPlaced: true
+    },
+    description: 'Resource Booking is Placed'
+  }
+  data.subject = await helper.substituteStringByObject(data.subject, data)
   const emailData = {
     serviceId: 'email',
     type: 'taas.notification.resource-booking-placed',
     details: {
       from: template.from,
       recipients,
-      data: {
-        subject: template.subject,
-        teamName: project.name,
-        teamUrl,
-        jobTitle: job.title,
-        jobUrl,
-        userHandle: user.handle,
-        startDate: resourceBooking.startDate,
-        endDate: resourceBooking.endDate,
-        notificationType: {
-          resourceBookingPlaced: true
-        },
-        description: 'Resource Booking is Placed'
-      },
+      data,
       sendgridTemplateId: template.sendgridTemplateId,
       version: 'v3'
     }

src/eventHandlers/TeamEventHandler.js

@@ -15,27 +15,30 @@ const helper = require('../common/helper')
  */
 async function sendNotificationEmail (payload) {
   const template = helper.getEmailTemplatesForKey('notificationEmailTemplates')['taas.notification.team-created']
+  const data = {
+    subject: template.subject,
+    teamName: payload.project.name,
+    teamUrl: `${config.TAAS_APP_URL}/${payload.project.id}`,
+    jobList: _.map(payload.jobs, j => ({
+      title: j.title,
+      duration: j.duration,
+      startDate: helper.formatDateEDT(j.startDate),
+      jobUrl: `${config.TAAS_APP_URL}/${payload.project.id}/positions/${j.id}`
+    })),
+    notificationType: {
+      newTeamCreated: true
+    },
+    description: 'New Team Created'
+  }
+  data.subject = await helper.substituteStringByObject(data.subject, data)
+
   const emailData = {
     serviceId: 'email',
     type: 'taas.notification.team-created',
     details: {
       from: template.from,
       recipients: _.map(payload.project.members, m => _.pick(m, 'email')),
-      data: {
-        subject: template.subject,
-        teamName: payload.project.name,
-        teamUrl: `${config.TAAS_APP_URL}/${payload.project.id}`,
-        jobList: _.map(payload.jobs, j => ({
-          title: j.title,
-          duration: j.duration,
-          startDate: helper.formatDateEDT(j.startDate),
-          jobUrl: `${config.TAAS_APP_URL}/${payload.project.id}/positions/${j.id}`
-        })),
-        notificationType: {
-          newTeamCreated: true
-        },
-        description: 'New Team Created'
-      },
+      data,
       sendgridTemplateId: template.sendgridTemplateId,
       version: 'v3'
     }