|
|
|
@ -155,8 +155,8 @@ router.get("/timeslot", async (req: Request, res: Response) => {
|
|
|
|
.minute(parseInt(timeslot.end_time.split(":")[1]))
|
|
|
|
.minute(parseInt(timeslot.end_time.split(":")[1]))
|
|
|
|
.second(parseInt(timeslot.end_time.split(":")[2]));
|
|
|
|
.second(parseInt(timeslot.end_time.split(":")[2]));
|
|
|
|
for (const reservedTimeslot of reservedTimeslots) {
|
|
|
|
for (const reservedTimeslot of reservedTimeslots) {
|
|
|
|
const reservedTimeStart = dayjs(reservedTimeslot.startTime);
|
|
|
|
const reservedTimeStart = dayjs(reservedTimeslot.start_time);
|
|
|
|
const reservedTimeEnd = dayjs(reservedTimeslot.endTime);
|
|
|
|
const reservedTimeEnd = dayjs(reservedTimeslot.end_time);
|
|
|
|
if ((!reservedTimeStart.isBefore(startTime) && !reservedTimeStart.isAfter(endTime)) ||
|
|
|
|
if ((!reservedTimeStart.isBefore(startTime) && !reservedTimeStart.isAfter(endTime)) ||
|
|
|
|
(!reservedTimeEnd.isBefore(startTime) && !reservedTimeStart.isAfter(endTime))) {
|
|
|
|
(!reservedTimeEnd.isBefore(startTime) && !reservedTimeStart.isAfter(endTime))) {
|
|
|
|
continue timeslots;
|
|
|
|
continue timeslots;
|
|
|
|
|