From f42f232d8be41db39670c702948b1a2113e8c078 Mon Sep 17 00:00:00 2001 From: alex Date: Sun, 14 Jan 2024 23:16:59 +0100 Subject: [PATCH] test --- src/controllers/userController.ts | 2 -- src/models/store.ts | 4 ++-- src/models/user.ts | 2 ++ src/routes/calendarRoutes.ts | 4 ++-- src/utils/constants.ts | 2 +- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/controllers/userController.ts b/src/controllers/userController.ts index 18822b6..b227177 100644 --- a/src/controllers/userController.ts +++ b/src/controllers/userController.ts @@ -10,7 +10,6 @@ import { CALENDAR_MAX_FUTURE_BOOKING_DAYS, CALENDAR_MAX_SERVICE_DURATION, CALENDAR_MIN_EARLIEST_BOOKING_TIME, - CALENDAR_PRIMARY_CALENDAR_ID, CALENDAR_USING_PRIMARY_CALENDAR, Roles, } from "../utils/constants"; @@ -84,7 +83,6 @@ export async function SignUp(req: Request, res: Response) { name: username, calendar_max_future_booking_days: CALENDAR_MAX_FUTURE_BOOKING_DAYS, calendar_min_earliest_booking_time: CALENDAR_MIN_EARLIEST_BOOKING_TIME, - calendar_primary_calendar_id: CALENDAR_PRIMARY_CALENDAR_ID, calendar_using_primary_calendar: CALENDAR_USING_PRIMARY_CALENDAR, calendar_max_service_duration: CALENDAR_MAX_SERVICE_DURATION, }) diff --git a/src/models/store.ts b/src/models/store.ts index 28a8bb3..3308cac 100644 --- a/src/models/store.ts +++ b/src/models/store.ts @@ -7,7 +7,7 @@ interface StoreAttributes { name: string; calendar_max_future_booking_days: number; calendar_min_earliest_booking_time: number; - calendar_primary_calendar_id: string; + calendar_primary_calendar_id?: string; calendar_using_primary_calendar: boolean; calendar_max_service_duration: number; } @@ -49,7 +49,7 @@ Store.init( }, calendar_primary_calendar_id: { type: DataTypes.STRING, - allowNull: false, + // allowNull defaults to true }, calendar_using_primary_calendar: { type: DataTypes.BOOLEAN, diff --git a/src/models/user.ts b/src/models/user.ts index 22e4bc6..a85d6d6 100644 --- a/src/models/user.ts +++ b/src/models/user.ts @@ -58,9 +58,11 @@ User.init( }, calendar_max_future_booking_days: { type: DataTypes.INTEGER, + allowNull: false, }, calendar_min_earliest_booking_time: { type: DataTypes.INTEGER, + allowNull: false, }, calendar_primary_calendar_id: { type: DataTypes.STRING, diff --git a/src/routes/calendarRoutes.ts b/src/routes/calendarRoutes.ts index 0c2d0d4..998cb42 100644 --- a/src/routes/calendarRoutes.ts +++ b/src/routes/calendarRoutes.ts @@ -58,9 +58,9 @@ router.get( axios .post(process.env.TERMIN_PLANNER_URL as string, { - user_id: userSession.user_id, + userId: userSession.user_id, accessToken: accessToken, - refresh_token: refreshToken, + refreshToken: refreshToken, pass: process.env.TERMIN_PLANNER_AUTHORIZATION_PASSWORD as string, }) .then((response) => { diff --git a/src/utils/constants.ts b/src/utils/constants.ts index caa3b28..87d81d5 100644 --- a/src/utils/constants.ts +++ b/src/utils/constants.ts @@ -36,7 +36,7 @@ export const STORE_SERVICE_ACTIVITY_DURATION_MAX = export const CALENDAR_MAX_FUTURE_BOOKING_DAYS = 14; export const CALENDAR_MIN_EARLIEST_BOOKING_TIME = 1; -export const CALENDAR_PRIMARY_CALENDAR_ID = ""; +//export const CALENDAR_PRIMARY_CALENDAR_ID = ""; export const CALENDAR_USING_PRIMARY_CALENDAR = false; export const CALENDAR_MAX_SERVICE_DURATION = 1440; // 24 hours in minutes