Adding support for generic duration format

Author: tejad

config/default.js

@@ -244,10 +244,6 @@ module.exports = {
   NOTIFICATION_SENDER_EMAIL: process.env.NOTIFICATION_SENDER_EMAIL,
   // the email notification sendgrid template id
   NOTIFICATION_SENDGRID_TEMPLATE_ID: process.env.NOTIFICATION_SENDGRID_TEMPLATE_ID,
-  // hours after interview completed when we should post the notification
-  INTERVIEW_COMPLETED_NOTIFICATION_HOURS: process.env.INTERVIEW_COMPLETED_NOTIFICATION_HOURS || 4,
-  // no of weeks before expiry when we should post the notification
-  RESOURCE_BOOKING_EXPIRY_NOTIFICATION_WEEKS: process.env.RESOURCE_BOOKING_EXPIRY_NOTIFICATION_WEEKS || 3,
   // frequency of cron checking for available candidates for review
   CRON_CANDIDATE_REVIEW: process.env.CRON_CANDIDATE_REVIEW || '00 00 13 * * 0-6',
   // frequency of cron checking for coming up interviews
@@ -259,5 +255,15 @@ module.exports = {
   // frequency of cron checking for post interview actions
   CRON_POST_INTERVIEW: process.env.CRON_POST_INTERVIEW || '00 00 13 * * 0-6',
   // frequency of cron checking for upcoming resource bookings
-  CRON_UPCOMING_RESOURCE_BOOKING: process.env.CRON_UPCOMING_RESOURCE_BOOKING || '00 00 13 * * 1'
+  CRON_UPCOMING_RESOURCE_BOOKING: process.env.CRON_UPCOMING_RESOURCE_BOOKING || '00 00 13 * * 1',
+  // The match window for fetching interviews which are coming up
+  INTERVIEW_COMING_UP_MATCH_WINDOW: process.env.INTERVIEW_COMING_UP_MATCH_WINDOW || 'PT5M',
+  // The remind time for fetching interviews which are coming up
+  INTERVIEW_COMING_UP_REMIND_TIME: (process.env.INTERVIEW_COMING_UP_REMIND_TIME || 'PT1H,PT24H').split(','),
+  // The match window for fetching completed interviews
+  INTERVIEW_COMPLETED_MATCH_WINDOW: process.env.INTERVIEW_COMPLETED_MATCH_WINDOW || 'PT5M',
+  // The interview completed past time for fetching interviews
+  INTERVIEW_COMPLETED_PAST_TIME: process.env.INTERVIEW_COMPLETED_PAST_TIME || 'PT4H',
+  // The time before resource booking expiry when we should start sending notifications
+  RESOURCE_BOOKING_EXPIRY_TIME: process.env.RESOURCE_BOOKING_EXPIRY_TIME || 'P21D'
 }

src/services/EmailNotificationService.js

@@ -88,7 +88,7 @@ async function getDataForInterview (interview, jobCandidate, job) {
 
   const interviewLink = `${config.TAAS_APP_URL}/${job.projectId}/positions/${job.id}/candidates/interviews`
   const guestName = _.isEmpty(interview.guestNames) ? '' : interview.guestNames[0]
-  const startTime = _.isEmpty(interview.startTimestamp) ? '' : interview.startTimestamp.toUTCString()
+  const startTime = interview.startTimestamp ? interview.startTimestamp.toUTCString() : ''
 
   return {
     jobTitle: job.title,
@@ -182,43 +182,33 @@ async function sendCandidatesAvailableEmails () {
  */
 async function sendInterviewComingUpEmails () {
   const currentTime = moment.utc()
-  const minutesRange = 5
-
-  const oneDayFromNow = currentTime.clone().add(24, 'hours')
-  const dayEndTime = oneDayFromNow.clone().add(minutesRange, 'minutes')
+  const timestampFilter = {
+    [Op.or]: []
+  }
+  const window = moment.duration(config.INTERVIEW_COMING_UP_MATCH_WINDOW)
+  for (const remindTime of config.INTERVIEW_COMING_UP_REMIND_TIME) {
+    const rangeStart = currentTime.clone().add(moment.duration(remindTime))
+    const rangeEnd = rangeStart.clone().add(window)
+
+    timestampFilter[Op.or].push({
+      [Op.and]: [
+        {
+          [Op.gt]: rangeStart
+        },
+        {
+          [Op.lte]: rangeEnd
+        }
+      ]
+    })
+  }
 
-  const oneHourFromNow = currentTime.clone().add(1, 'hour')
-  const hourEndTime = oneHourFromNow.clone().add(minutesRange, 'minutes')
   const filter = {
     [Op.and]: [
       {
         status: { [Op.eq]: constants.Interviews.Status.Scheduled }
       },
       {
-        startTimestamp: {
-          [Op.or]: [
-            {
-              [Op.and]: [
-                {
-                  [Op.gt]: oneDayFromNow
-                },
-                {
-                  [Op.lte]: dayEndTime
-                }
-              ]
-            },
-            {
-              [Op.and]: [
-                {
-                  [Op.gt]: oneHourFromNow
-                },
-                {
-                  [Op.lte]: hourEndTime
-                }
-              ]
-            }
-          ]
-        }
+        startTimestamp: timestampFilter
       }
     ]
   }
@@ -272,9 +262,9 @@ async function sendInterviewComingUpEmails () {
  * Sends email reminder to the interview host after it ends to change the interview status
  */
 async function sendInterviewCompletedEmails () {
-  const minutesRange = 5
-  const hoursBeforeNow = moment.utc().subtract(config.INTERVIEW_COMPLETED_NOTIFICATION_HOURS, 'hours')
-  const endTime = hoursBeforeNow.clone().add(minutesRange, 'minutes')
+  const window = moment.duration(config.INTERVIEW_COMPLETED_MATCH_WINDOW)
+  const rangeStart = moment.utc().subtract(moment.duration(config.INTERVIEW_COMPLETED_PAST_TIME))
+  const rangeEnd = rangeStart.clone().add(window)
   const filter = {
     [Op.and]: [
       {
@@ -284,10 +274,10 @@ async function sendInterviewCompletedEmails () {
         endTimestamp: {
           [Op.and]: [
             {
-              [Op.gte]: hoursBeforeNow
+              [Op.gte]: rangeStart
             },
             {
-              [Op.lt]: endTime
+              [Op.lt]: rangeEnd
             }
           ]
         }
@@ -396,7 +386,8 @@ async function sendPostInterviewActionEmails () {
  */
 async function sendResourceBookingExpirationEmails () {
   const currentTime = moment.utc()
-  const maxEndDate = currentTime.clone().add(config.RESOURCE_BOOKING_EXPIRY_NOTIFICATION_WEEKS, 'weeks')
+  const maxEndDate = currentTime.clone().add(moment.duration(config.RESOURCE_BOOKING_EXPIRY_TIME))
+
   const expiringResourceBookings = await ResourceBooking.findAll({
     where: {
       endDate: {