From e03f634aff18984260aaab1d16208209be875a7f Mon Sep 17 00:00:00 2001 From: Bilal Catic Date: Mon, 24 Jun 2019 22:33:10 +0200 Subject: [PATCH] fix timezone conversion when fetching booking reservations --- services/officeRnD/bookings.js | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/services/officeRnD/bookings.js b/services/officeRnD/bookings.js index c727b49..db98a88 100644 --- a/services/officeRnD/bookings.js +++ b/services/officeRnD/bookings.js @@ -41,7 +41,7 @@ const getAllFinishedBookings = () => { const filters = { canceled: false, end: { - [Op.lt]: moment.tz('UTC') + [Op.lt]: moment.utc().toISOString() } }; @@ -56,8 +56,8 @@ const getAllFinishedBookings = () => { const getFirstNextBooking = (reservation) => { return new Promise ((resolve, reject) => { - const {resourceId, start, timezone} = reservation; - const endOfTheDay = moment.tz(start, timezone).endOf('Day').toISOString(); + const { resourceId, start } = reservation; + const endOfTheDay = moment.utc(start).endOf('Day').toISOString(); const attributes = ['reservationId', 'memberId', 'resourceId', 'start', 'end', 'timezone']; const filters = { @@ -90,8 +90,8 @@ const getFirstNextBooking = (reservation) => { const getFirstPreviousBooking = (reservation) => { return new Promise ((resolve, reject) => { - const {resourceId, start, timezone} = reservation; - const startOfTheDay = moment.tz(start, timezone).startOf('Day').toISOString(); + const { resourceId, start } = reservation; + const startOfTheDay = moment.utc(start).startOf('Day').toISOString(); const attributes = ['reservationId', 'memberId', 'resourceId', 'start', 'end', 'timezone']; const filters = {