From 94ddf5563989fae14fb1540ab38538efb8ab26c3 Mon Sep 17 00:00:00 2001 From: Collin Duncan <3679940+cgduncan7@users.noreply.github.com> Date: Tue, 15 Apr 2025 08:54:32 +0200 Subject: [PATCH] Making end date inclusive for schedulable reservations --- src/reservations/service.ts | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/src/reservations/service.ts b/src/reservations/service.ts index e889791..9342e95 100644 --- a/src/reservations/service.ts +++ b/src/reservations/service.ts @@ -48,13 +48,12 @@ export class ReservationsService { async getSchedulable() { const query = this.reservationsRepository .createQueryBuilder() - .where( - `DATE(dateRangeStart) BETWEEN DATE(:startDate) AND DATE(:endDate)`, - { - startDate: dayjs().add(1, 'days').toISOString(), - endDate: dayjs().add(7, 'days').toISOString(), - }, - ) + .where(`DATE(dateRangeStart) >= DATE(:startDate)`, { + startDate: dayjs().add(1, 'days').toISOString(), + }) + .andWhere(`DATE(dateRangeStart) <= DATE(:endDate)`, { + endDate: dayjs().add(7, 'days').toISOString(), + }) .andWhere('status = :status', { statuses: ReservationStatus.Pending, })