Fixing luxor update errors

Vincit · Jun 17, 2024 · d46f49d · d46f49d
1 parent d746d0f
commit d46f49d
Show file tree

Hide file tree

Showing 7 changed files with 43 additions and 14 deletions.
diff --git a/backend/src/authMiddleware.ts b/backend/src/authMiddleware.ts
@@ -1,5 +1,5 @@
 import express from 'express';
-import unless from 'express-unless';
+import unless, { Params } from 'express-unless';
 import { getOAuthClient } from './utils/oAuthClient';
 import * as responses from './utils/responses';
 import { readToken, updateToken } from './controllers/auth/token';
@@ -60,7 +60,7 @@ export const parseToken = () => {
         }
     };
 
-    middleware.unless = unless;
+    middleware.unless = unless.unless;
 
     return middleware;
 };
@@ -114,7 +114,7 @@ export const validateAccessToken = () => {
         }
     };
 
-    middleware.unless = unless;
+    middleware.unless = unless.unless;
 
     return middleware;
 };
diff --git a/backend/src/controllers/booking/currentBookingsController.ts b/backend/src/controllers/booking/currentBookingsController.ts
@@ -103,7 +103,11 @@ export const addNextCalendarEventMiddleware = () => {
                     const endDt = DateTime.fromISO(
                         req.query.until as string
                     ).toUTC();
-                    end = endDt.toISO();
+                    end = endDt.toISO() || '';
+
+                    if (end === '') {
+                        throw new Error('End date not found');
+                    }
 
                     if (endDt <= startDt) {
                         return responses.badRequest(req, res);

diff --git a/backend/src/controllers/booking/makeBookingController.ts b/backend/src/controllers/booking/makeBookingController.ts
@@ -4,6 +4,7 @@ import * as calendar from '../googleAPI/calendarAPI';
 import * as responses from '../../utils/responses';
 import { OAuth2Client } from 'google-auth-library';
 import _ from 'lodash';
+import { getISOTime } from '../../utils/timeUtils';
 
 /**
  * Add res.locals.roomAccepted boolean that tells if the room has accepted the event
@@ -85,8 +86,8 @@ export const checkRoomIsFree = () => {
                 await calendar.freeBusyQuery(
                     client,
                     [{ id: roomId }],
-                    startTime.toISO(),
-                    endTime.toISO()
+                    getISOTime(startTime),
+                    getISOTime(endTime)
                 )
             )[roomId];
 
@@ -128,13 +129,14 @@ export const makeBooking = () => {
                 .plus({ minutes: res.locals.duration })
                 .toUTC();
             const client: OAuth2Client = res.locals.oAuthClient;
+
             const response = await calendar.createEvent(
                 client,
                 res.locals.roomId,
                 res.locals.email,
                 res.locals.title,
-                startTime.toISO(),
-                endTime.toISO()
+                getISOTime(startTime),
+                getISOTime(endTime)
             );
 
             if (!response.id) {

diff --git a/backend/src/controllers/booking/notifyBookingController.ts b/backend/src/controllers/booking/notifyBookingController.ts
@@ -14,6 +14,7 @@ import {
     removeScheduleDataArray
 } from '../userController';
 import { DateTime } from 'luxon';
+import { getISOTime } from '../../utils/timeUtils';
 
 const notificationOptions = {
     vapidDetails: {
@@ -124,7 +125,7 @@ export const scheduleNotification = () => {
             const endTime = DateTime.fromISO(
                 eventData.end?.dateTime as string
             ).toUTC();
-            const endTimeISO = endTime.toISO();
+            const endTimeISO = getISOTime(endTime);
             const scheduleData: ScheduleData = {
                 endTime: endTimeISO,
                 roomId: roomId

diff --git a/backend/src/controllers/booking/updateBookingController.ts b/backend/src/controllers/booking/updateBookingController.ts
@@ -4,6 +4,7 @@ import { OAuth2Client } from 'google-auth-library';
 import * as calendar from '../googleAPI/calendarAPI';
 import * as responses from '../../utils/responses';
 import * as schema from '../../utils/googleSchema';
+import { getISOTime } from '../../utils/timeUtils';
 
 /**
  * Add time to current booking
@@ -26,10 +27,11 @@ export const addTimeToBooking = () => {
             }
 
             // New end time
-            const endTime = DateTime.fromISO(eventData.end?.dateTime as string)
-                .plus({ minutes: timeToAdd })
-                .toUTC()
-                .toISO();
+            const endTime = getISOTime(
+                DateTime.fromISO(eventData.end?.dateTime as string)
+                    .plus({ minutes: timeToAdd })
+                    .toUTC()
+            );
 
             // Keep responseStatus as accepted, because in case of
             // conflicts in Google calendar, adding time to the existing
@@ -198,6 +200,10 @@ export const rollBackDeclinedUpdate = () => {
                 },
                 { email: res.locals.email, responseStatus: 'accepted' }
             ];
+            if (!endTime) {
+                console.error('Time parse error', endTime);
+                throw new Error('Time parse error');
+            }
 
             await calendar.updateEndTime(
                 client,

diff --git a/backend/src/controllers/roomController.ts b/backend/src/controllers/roomController.ts
@@ -76,7 +76,12 @@ export const fetchAvailability = () => {
                     req.query.until as string
                 ).toUTC();
                 start = startDt.toISO();
-                end = endDt.toISO();
+
+                end = endDt.toISO() || '';
+
+                if (end === '') {
+                    throw new Error('End date not found');
+                }
 
                 if (endDt <= startDt) {
                     return responses.badRequest(req, res);

diff --git a/backend/src/utils/timeUtils.ts b/backend/src/utils/timeUtils.ts
@@ -0,0 +1,11 @@
+import { DateTime } from 'luxon';
+
+export const getISOTime = (time: DateTime): string => {
+    const timeISO: string = time.toISO() || '';
+
+    if (timeISO === '') {
+        console.error(time);
+        throw new Error('Time parse error');
+    }
+    return timeISO;
+};