From 01a601309308213b9a11ff1e1726abd8aa0da1fc Mon Sep 17 00:00:00 2001 From: Collin Duncan <3679940+cgduncan7@users.noreply.github.com> Date: Tue, 22 Apr 2025 09:23:27 +0200 Subject: [PATCH] Fixing incorrect inequality when fetching schedulable reservations --- src/reservations/service.ts | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/src/reservations/service.ts b/src/reservations/service.ts index 9342e95..ad5dc64 100644 --- a/src/reservations/service.ts +++ b/src/reservations/service.ts @@ -48,12 +48,13 @@ export class ReservationsService { async getSchedulable() { const query = this.reservationsRepository .createQueryBuilder() - .where(`DATE(dateRangeStart) >= DATE(:startDate)`, { - startDate: dayjs().add(1, 'days').toISOString(), - }) - .andWhere(`DATE(dateRangeStart) <= DATE(:endDate)`, { - endDate: dayjs().add(7, 'days').toISOString(), - }) + .where( + `(DATE(dateRangeStart) >= DATE(:startDate) OR DATE(dateRangeStart) <= DATE(:endDate))`, + { + startDate: dayjs().add(1, 'days').toISOString(), + endDate: dayjs().add(7, 'days').toISOString(), + }, + ) .andWhere('status = :status', { statuses: ReservationStatus.Pending, })