From 8dd435a9501d77e02bbf41ebc1e55f911aae0d73 Mon Sep 17 00:00:00 2001 From: Collin Duncan <3679940+cgduncan7@users.noreply.github.com> Date: Wed, 13 Sep 2023 12:01:06 +0200 Subject: [PATCH] Debugging some issues with schedulable reservations --- src/reservations/controller.ts | 2 +- src/reservations/cron.ts | 3 +-- src/reservations/service.ts | 13 ++++++++++--- 3 files changed, 12 insertions(+), 6 deletions(-) diff --git a/src/reservations/controller.ts b/src/reservations/controller.ts index dbde476..13569d1 100644 --- a/src/reservations/controller.ts +++ b/src/reservations/controller.ts @@ -41,7 +41,7 @@ export class ReservationsController { @Query('schedulable') schedulable?: boolean, ) { if (schedulable) { - return this.reservationsService.getScheduleable() + return this.reservationsService.getSchedulable() } if (date) { return this.reservationsService.getByDate(date) diff --git a/src/reservations/cron.ts b/src/reservations/cron.ts index 1cc1a59..b76ef3a 100644 --- a/src/reservations/cron.ts +++ b/src/reservations/cron.ts @@ -26,8 +26,7 @@ export class ReservationsCronService { }) async handleDailyReservations() { this.loggerService.log('handleDailyReservations beginning') - const reservationsToPerform = - await this.reservationService.getScheduleable() + const reservationsToPerform = await this.reservationService.getSchedulable() this.loggerService.log( `Found ${reservationsToPerform.length} reservations to perform`, ) diff --git a/src/reservations/service.ts b/src/reservations/service.ts index 03d2d4a..809cc13 100644 --- a/src/reservations/service.ts +++ b/src/reservations/service.ts @@ -3,6 +3,7 @@ import { InjectRepository } from '@nestjs/typeorm' import { Repository } from 'typeorm' import dayjs from '../common/dayjs' +import { LoggerService } from '../logger/service.logger' import { BaanReserverenService } from '../runner/baanreserveren/service' import { Reservation } from './entity' @@ -14,6 +15,9 @@ export class ReservationsService { @Inject(BaanReserverenService) private readonly brService: BaanReserverenService, + + @Inject(LoggerService) + private readonly loggerService: LoggerService, ) {} async getAll() { @@ -35,14 +39,17 @@ export class ReservationsService { * Gets all reservations that have not been scheduled that are within the reservation window * @returns Reservations that can be scheduled */ - async getScheduleable() { - return await this.reservationsRepository + async getSchedulable() { + const query = this.reservationsRepository .createQueryBuilder() .where(`DATE(dateRangeStart) <= DATE(:date)`, { date: dayjs().add(7, 'days'), }) .andWhere(`waitListed = false`) - .getMany() + + this.loggerService.debug('Query: ' + query.getSql()) + + return await query.getMany() } async getByDateOnWaitingList(date = dayjs()) {