Merge branch 'dev' into fix-issues-540

Author: maxceem

data/demo-data.json

@@ -19,7 +19,7 @@
                 "a2b4bc11-c641-4a19-9eb7-33980378f82e"
             ],
             "status": "in-review",
-            "isApplicationPageActive": false,
+            "isApplicationPageActive": true,
             "minSalary": 100,
             "maxSalary": 200,
             "hoursPerWeek": 20,
@@ -51,7 +51,7 @@
                 "a2b4bc11-c641-4a19-9eb7-33980378f82e"
             ],
             "status": "in-review",
-            "isApplicationPageActive": false,
+            "isApplicationPageActive": true,
             "minSalary": 100,
             "maxSalary": 200,
             "hoursPerWeek": 80,
@@ -83,7 +83,7 @@
                 "a2b4bc11-c641-4a19-9eb7-33980378f82e"
             ],
             "status": "in-review",
-            "isApplicationPageActive": false,
+            "isApplicationPageActive": true,
             "minSalary": 100,
             "maxSalary": 200,
             "hoursPerWeek": 90,
@@ -115,7 +115,7 @@
                 "a2b4bc11-c641-4a19-9eb7-33980378f82e"
             ],
             "status": "in-review",
-            "isApplicationPageActive": false,
+            "isApplicationPageActive": true,
             "minSalary": 100,
             "maxSalary": 200,
             "hoursPerWeek": 20,
@@ -148,7 +148,7 @@
                 "0b104b7c-0792-4118-8bc7-a274e9ee19e3"
             ],
             "status": "closed",
-            "isApplicationPageActive": false,
+            "isApplicationPageActive": true,
             "minSalary": null,
             "maxSalary": null,
             "hoursPerWeek": null,

docs/swagger.yaml

@@ -118,6 +118,12 @@ paths:
           schema:
             type: integer
           description: The project id.
+        - in: query
+          name: isApplicationPageActive 
+          required: false
+          schema:
+            type: boolean 
+          description: Is application page active.
         - in: query
           name: projectIds
           required: false

scripts/demo-email-notifications/index.js

@@ -36,6 +36,8 @@ async function resetNotificationRecords () {
   const duration = 30
   const completedEndTimestamp = moment(completedStartTimestamp).clone().add(30, 'm').toDate()
   await completedInterview.update({ startTimestamp: completedStartTimestamp, duration, endTimeStamp: completedEndTimestamp, status: Interviews.Status.Scheduled, guestNames: ['guest1', 'guest2'], hostName: 'hostName' })
+  const completedInterview2 = await Interview.findById('3144fa65-ea1a-4bec-81b0-7cb1c8845826')
+  await completedInterview2.update({ startTimestamp: completedStartTimestamp, duration, endTimeStamp: completedEndTimestamp, status: Interviews.Status.Scheduled, guestNames: ['guest1', 'guest2'], hostName: 'hostName' })
 
   // reset post interview candidate action reminder records
   localLogger.info('reset post interview candidate action reminder records')

src/services/JobService.js

@@ -453,6 +453,7 @@ async function searchJobs (currentUser, criteria, options = { returnAll: false }
     }
 
     _.each(_.pick(criteria, [
+      'isApplicationPageActive',
       'projectId',
       'externalId',
       'description',
@@ -532,6 +533,7 @@ async function searchJobs (currentUser, criteria, options = { returnAll: false }
   logger.info({ component: 'JobService', context: 'searchJobs', message: 'fallback to DB query' })
   const filter = { [Op.and]: [] }
   _.each(_.pick(criteria, [
+    'isApplicationPageActive',
     'projectId',
     'externalId',
     'startDate',
@@ -595,6 +597,7 @@ searchJobs.schema = Joi.object().keys({
     sortOrder: Joi.string().valid('desc', 'asc'),
     projectId: Joi.number().integer(),
     externalId: Joi.string(),
+    isApplicationPageActive: Joi.boolean(),
     description: Joi.string(),
     title: Joi.title(),
     startDate: Joi.date(),

src/services/NotificationsSchedulerService.js

@@ -324,6 +324,9 @@ async function sendInterviewCompletedNotifications () {
   })
   interviews = _.map(_.values(_.groupBy(interviews, 'jobCandidateId')), (interviews) => _.maxBy(interviews, 'round'))
 
+  const jobCandidates = await JobCandidate.findAll({ where: { id: _.map(interviews, 'jobCandidateId') } })
+  const jcMap = _.keyBy(jobCandidates, 'id')
+
   localLogger.debug(`[sendInterviewCompletedNotifications]: Found ${interviews.length} interviews which must be ended by now.`)
 
   let sentCount = 0
@@ -332,8 +335,12 @@ async function sendInterviewCompletedNotifications () {
       localLogger.error(`Interview id: ${interview.id} host email not present`)
       continue
     }
+    if (!jcMap[interview.jobCandidateId] || jcMap[interview.jobCandidateId].status !== constants.JobCandidateStatus.INTERVIEW) {
+      localLogger.error(`Interview id: ${interview.id} job candidate status is not ${constants.JobCandidateStatus.INTERVIEW}`)
+      continue
+    }
 
-    const data = await getDataForInterview(interview)
+    const data = await getDataForInterview(interview, jcMap[interview.jobCandidateId])
     if (!data) { continue }
 
     sendNotification({}, {