@defra/flood-webchat 0.0.1-beta.3 → 0.0.1-beta.5

package/src/server/lib/utils.js

@@ -1,12 +1,19 @@
-const isWithinHours = days => {
-  const now = new Date()
-  const name = now.toLocaleDateString('en-GB', { weekday: 'long' })
-  const day = days.find(d => d.day.toLowerCase() === name.toLowerCase())
-  const date = now.toLocaleDateString('en-GB').split('/')
-  const open = `${date[2]}-${date[1]}-${date[0]}T${day.openTime}.000Z`
-  const close = `${date[2]}-${date[1]}-${date[0]}T${day.closeTime}.000Z`
-
-  return now.getTime() >= Date.parse(open) && now.getTime() <= Date.parse(close)
+const { DateTime } = require('luxon')
+
+const getHour = (time) => Number(time.split(':')[0])
+
+const isWithinHours = (days, date) => {
+  const now = date ? DateTime.fromISO(date) : DateTime.local()
+  now.setZone('Europe/London')
+
+  const today = new Date(date || undefined).toLocaleDateString('en-GB', { weekday: 'long' })
+  const dateParts = new Date(date || undefined).toLocaleDateString('en-GB').split('/')
+
+  const todaysAvailability = days.find(item => item.day === today)
+  const todaysDateTimeOpen = DateTime.local(Number(dateParts[2]), Number(dateParts[1]), Number(dateParts[0]), getHour(todaysAvailability.openTime))
+  const todaysDateTimeClose = DateTime.local(Number(dateParts[2]), Number(dateParts[1]), Number(dateParts[0]), getHour(todaysAvailability.closeTime))
+
+  return now.diff(todaysDateTimeOpen).milliseconds >= 0 && now.diff(todaysDateTimeClose).milliseconds <= 0
 }
 
 module.exports = {