Expanding the reservations job payload to dictate if it should run in speedy mode or not as waiting lists are actually hindered by speedy mode

src/reservations/config.ts

@@ -1,7 +1,13 @@
-import type { Queue } from 'bull'
+import type { Job, Queue } from 'bull'
 
 import type { Reservation } from './entity'
 
 export const RESERVATIONS_QUEUE_NAME = 'reservations'
 
-export type ReservationsQueue = Queue<Reservation>
+interface ReservationsQueueJobPayload {
+	reservation: Reservation
+	speedyMode: boolean
+}
+
+export type ReservationsQueue = Queue<ReservationsQueueJobPayload>
+export type ReservationsJob = Job<ReservationsQueueJobPayload>

src/reservations/controller.ts

@@ -120,7 +120,7 @@ export class ReservationsController {
 			return 'Reservation saved'
 		}
 		this.loggerService.debug('Reservation is available for reservation')
-		await this.reservationsQueue.add(reservation)
+		await this.reservationsQueue.add({ reservation, speedyMode: true })
 		return 'Reservation queued'
 	}
 
@@ -132,7 +132,7 @@ export class ReservationsController {
 		if (!reservation.isAvailableForReservation())
 			throw new HttpException('Not available', 400)
 
-		await this.reservationsQueue.add(reservation)
+		await this.reservationsQueue.add({ reservation, speedyMode: true })
 		return 'Reservation queued'
 	}
 

src/reservations/cron.ts

@@ -73,7 +73,7 @@ export class ReservationsCronService {
 			this.loggerService.debug(`It's go-time`)
 			await this.reservationsQueue.addBulk(
 				reservationsToPerform.map((res) => ({
-					data: res,
+					data: { reservation: res, speedyMode: true },
 					opts: { attempts: DAILY_RESERVATIONS_ATTEMPTS },
 				})),
 			)

src/reservations/worker.ts

@@ -9,7 +9,7 @@ import {
 	BaanReserverenService,
 	NoCourtAvailableError,
 } from '../runner/baanreserveren/service'
-import { RESERVATIONS_QUEUE_NAME } from './config'
+import { RESERVATIONS_QUEUE_NAME, ReservationsJob } from './config'
 import { DAILY_RESERVATIONS_ATTEMPTS } from './cron'
 import { Reservation } from './entity'
 import { ReservationsService } from './service'
@@ -31,8 +31,8 @@ export class ReservationsWorker {
 	) {}
 
 	@Process()
-	async handleReservationJob(job: Job<Reservation>) {
+	async handleReservationJob(job: ReservationsJob) {
-		const reservation = plainToInstance(Reservation, job.data, {
+		const reservation = plainToInstance(Reservation, job.data.reservation, {
 			groups: ['password'],
 		})
 		this.loggerService.log('Handling reservation', {
@@ -43,7 +43,12 @@ export class ReservationsWorker {
 			reservation.dateRangeStart,
 			reservation.dateRangeEnd,
 		)
-		await this.performReservation(reservation, job.attemptsMade, true, true)
+		await this.performReservation(
+			reservation,
+			job.attemptsMade,
+			true,
+			job.data.speedyMode,
+		)
 	}
 
 	private async handleReservationErrors(

src/waitingList/service.ts

@@ -95,7 +95,10 @@ export class WaitingListService {
 		)
 
 		await this.reservationsQueue.addBulk(
-			reservations.map((r) => ({ data: r, opts: { attempts: 1 } })),
+			reservations.map((r) => ({
+				data: { reservation: r, speedyMode: false },
+				opts: { attempts: 1 },
+			})),
 		)
 	}
 

test/unit/reservations/cron.spec.ts

@@ -119,7 +119,7 @@ describe('reservations.cron', () => {
 			it('should perform reservations', () => {
 				expect(reservationsQueueSpy).toHaveBeenCalledWith([
 					{
-						data: stubbedReservation,
+						data: { reservation: stubbedReservation, speedyMode: true },
 						opts: { attempts: DAILY_RESERVATIONS_ATTEMPTS },
 					},
 				])