Bug Fix 240 & 242

Author: urwithat

docs/swagger.yaml

@@ -1047,7 +1047,6 @@ paths:
           required: true
           schema:
             type: string
-            format: uuid
       requestBody:
         content:
           application/json:
@@ -1281,7 +1280,6 @@ paths:
           required: true
           schema:
             type: string
-            format: uuid
         - in: query
           name: fromDb
           description: get data from db or not.
@@ -3586,6 +3584,7 @@ components:
           description: "The x.ai template name"
         templateId:
           type: string
+          format: uuid
           description: "The x.ai template id"
         templateType:
           type: string
@@ -3698,6 +3697,7 @@ components:
           description: "The x.ai template name"
         templateId:
           type: string
+          format: uuid
           description: "The x.ai template id"
         templateType:
           type: string

src/eventHandlers/InterviewEventHandler.js

@@ -15,25 +15,19 @@ const teamService = require('../services/TeamService')
  */
 async function sendInvitationEmail (payload) {
   const interview = payload.value
-  // get job candidate user details
-  const jobCandidate = await models.JobCandidate.findById(interview.jobCandidateId)
-  const jobCandidateUser = await helper.getUserById(jobCandidate.userId)
-  const jobCandidateMember = await helper.getUserByHandle(jobCandidateUser.handle)
   // get customer details
   const job = await jobCandidate.getJob()
-
   teamService.sendEmail({}, {
     template: 'interview-invitation',
-    cc: [interview.hostEmail, jobCandidateMember.email, ...interview.guestEmails],
+    cc: [interview.hostEmail, ...interview.guestEmails],
     data: {
       interview_id: interview.id,
-      interviewee_name: `${jobCandidateMember.firstName} ${jobCandidateMember.lastName}`,
+      interviewee_name: interview.guestNames,
       interviewer_name: interview.hostName,
       xai_template: '/' + interview.templateUrl,
       additional_interviewers: (interview.guestEmails).join(','),
       interview_length: interview.duration,
-      job_name: job.title,
-      interviewee_handle: jobCandidateMember.handle
+      job_name: job.title
     }
   })
 }

src/services/InterviewService.js

@@ -225,17 +225,26 @@ async function requestInterview (currentUser, jobCandidateId, interview) {
     throw new errors.ConflictError(`You've reached the maximum allowed number (${InterviewConstants.MaxAllowedCount}) of interviews for this candidate.`)
   }
 
+  // get job candidate user details
+  const jobCandidate = await models.JobCandidate.findById(jobCandidateId)
+  const jobCandidateUser = await helper.getUserById(jobCandidate.userId)
+  const jobCandidateMember = await helper.getUserByHandle(jobCandidateUser.handle)
   // pre-populate fields
   interview.id = uuid()
   interview.jobCandidateId = jobCandidateId
   interview.round = round + 1
   interview.duration = InterviewConstants.XaiTemplate[interview.templateUrl]
   interview.createdBy = await helper.getUserId(currentUser.userId)
+  interview.guestEmails = [jobCandidateMember.email, ...interview.guestEmails]
   // pre-populate hostName & guestNames
   const hostMembers = await helper.getMemberDetailsByEmails([interview.hostEmail])
   const guestMembers = await helper.getMemberDetailsByEmails(interview.guestEmails)
   interview.hostName = `${hostMembers[0].firstName} ${hostMembers[0].lastName}`
-  interview.guestNames = _.map(guestMembers, (guestMember) => `${guestMember.firstName} ${guestMember.lastName}`)
+  interview.guestNames = _.flatten(_.map(interview.guestEmails, (guestEmail) => {
+    return _.map(guestMembers, (guestMember) => {
+      return (guestEmail == guestMember.email) ? `${guestMember.firstName} ${guestMember.lastName}` : guestEmail.split("@")[0]
+    })
+  }))
 
   try {
     // create the interview