diff --git a/server/src/interfaces/timeslot.ts b/server/src/interfaces/timeslot.ts index 7326bd5..d8a8e6e 100644 --- a/server/src/interfaces/timeslot.ts +++ b/server/src/interfaces/timeslot.ts @@ -1,5 +1,3 @@ -import Trainer from "./trainer" - export interface Timeslot { startTime: Date endTime: Date @@ -13,6 +11,6 @@ export interface WeeklyTimeslot { export interface ReservedTimeslots { id: number - startTime: string | Date - endTime: string | Date + start_time: string | Date + end_time: string | Date } \ No newline at end of file diff --git a/server/src/routes/timeslot.ts b/server/src/routes/timeslot.ts index a9df470..501028c 100644 --- a/server/src/routes/timeslot.ts +++ b/server/src/routes/timeslot.ts @@ -155,8 +155,8 @@ router.get("/timeslot", async (req: Request, res: Response) => { .minute(parseInt(timeslot.end_time.split(":")[1])) .second(parseInt(timeslot.end_time.split(":")[2])); for (const reservedTimeslot of reservedTimeslots) { - const reservedTimeStart = dayjs(reservedTimeslot.startTime); - const reservedTimeEnd = dayjs(reservedTimeslot.endTime); + const reservedTimeStart = dayjs(reservedTimeslot.start_time); + const reservedTimeEnd = dayjs(reservedTimeslot.end_time); if ((!reservedTimeStart.isBefore(startTime) && !reservedTimeStart.isAfter(endTime)) || (!reservedTimeEnd.isBefore(startTime) && !reservedTimeStart.isAfter(endTime))) { continue timeslots;