WIP commit for handling risky reservations

src/ntfy/client.ts

@@ -41,7 +41,7 @@ export class NtfyClient {
 				throw new Error(`${response.status} - ${response.statusText}`)
 			}
 		} catch (error: unknown) {
-			this.loggerService.error('ntfy client failed', { error: error instanceof Error ? error.message : JSON.stringify(error) })
+			this.loggerService.error('ntfy client failed', { error })
 		}
 	}
 }

src/ntfy/provider.ts

@@ -62,9 +62,9 @@ export class NtfyProvider implements OnApplicationBootstrap {
 	async sendBootstrappedNotification() {
 		const version =
 			this.configService.get<string>('GIT_COMMIT') ??
-			(this.configService.get('LOCAL') === 'true'
+			this.configService.get('LOCAL') === 'true'
 				? 'LOCAL'
-				: 'unknown')
+				: 'unknown'
 		await this.publishQueue.add(
 			...NtfyProvider.defaultJob({
 				title: 'Autobaan up and running',
@@ -107,6 +107,39 @@ export class NtfyProvider implements OnApplicationBootstrap {
 		)
 	}
 
+	async sendPerformingRiskyReservationNotification(
+		reservationId: string,
+		startTime: Dayjs,
+		endTime: Dayjs,
+	) {
+		const url = `${this.configService.get(
+			'BASE_URL',
+		)}/reservations/${reservationId}`
+		await this.publishQueue.add(
+			...NtfyProvider.defaultJob({
+				title: 'Handling risky reservation. Waiting for confirmation',
+				message: `Waiting for ${reservationId} - ${startTime.format()} to ${endTime.format()}`,
+				actions: [
+					{
+						action: 'http',
+						label: 'Accept',
+						url: `${url}/resume`,
+						method: 'POST',
+						clear: true,
+					},
+					{
+						action: 'http',
+						label: 'Reject',
+						url,
+						method: 'DELETE',
+						clear: true,
+					},
+				],
+				tags: [MessageTags.warning, MessageTags.passport_control],
+			}),
+		)
+	}
+
 	async sendErrorPerformingReservationNotification(
 		reservationId: string,
 		startTime: Dayjs,

src/ntfy/types.ts

@@ -49,6 +49,7 @@ export enum MessageTags {
 	clock11 = 'clock11',
 	clock1130 = 'clock1130',
 	badminton = 'badminton',
+	passport_control = 'passport_control',
 }
 
 export enum MessagePriority {
@@ -59,13 +60,60 @@ export enum MessagePriority {
 	max = 5,
 }
 
+type MessageActionType = 'broadcast' | 'copy' | 'http' | 'view'
+
+export interface MessageActionConfig {
+	action: MessageActionType
+	/**
+	 * Label displayed on the action button
+	 */
+	label: string
+	/**
+	 * Clear notification after action button is tapped
+	 */
+	clear?: boolean
+}
+
+export interface BroadcastActionConfig extends MessageActionConfig {
+	action: 'broadcast'
+	intent?: string
+	extras?: Record<string, string>
+}
+
+export interface CopyActionConfig extends MessageActionConfig {
+	action: 'copy'
+	value: string
+}
+
+export interface HttpActionConfig extends MessageActionConfig {
+	action: 'http'
+	url: string
+	/**
+	 * @default 'POST'
+	 */
+	method?: 'GET' | 'POST' | 'PUT' | 'DELETE' | 'PATCH' // there are more but if I use them I'll have gone insane
+	headers?: Record<string, string>
+	body?: string
+}
+export interface ViewActionConfig extends MessageActionConfig {
+	action: 'view'
+	url: string
+	clear?: boolean
+}
+
+export type MessageAction =
+	| BroadcastActionConfig
+	| CopyActionConfig
+	| HttpActionConfig
+	| ViewActionConfig
+
 export interface MessageConfig {
 	topic: string
 	message?: string
 	title?: string
 	tags?: MessageTags[]
 	priority?: MessagePriority
-	actions?: object[]
+	actions?: MessageAction[]
 	markdown?: boolean
 	icon?: string
 }

src/reservations/controller.ts

@@ -16,7 +16,6 @@ import { Transform } from 'class-transformer'
 import {
 	IsArray,
 	IsBoolean,
-	IsDateString,
 	IsEnum,
 	IsOptional,
 	IsString,
@@ -58,12 +57,10 @@ export class CreateReservationRequest {
 	readonly ownerId: string
 
 	@Transform(DayjsTransformer)
-	@IsDateString()
 	readonly dateRangeStart: Dayjs
 
 	@IsOptional()
 	@Transform(DayjsTransformer)
-	@IsDateString()
 	readonly dateRangeEnd?: Dayjs
 
 	@IsOptional()

src/reservations/cron.ts

@@ -97,9 +97,7 @@ export class ReservationsCronService {
 		await this.ntfyProvider.sendCronStartNotification(
 			'cleanUpExpiredReservations',
 		)
-		const reservations = await this.reservationService.getOlderThanDate(
+		const reservations = await this.reservationService.getByDate()
-			dayjs().subtract(7, 'day'),
-		)
 		this.loggerService.debug(
 			`Found ${reservations.length} reservations to delete`,
 		)

src/reservations/service.ts

@@ -8,6 +8,12 @@ import { LoggerService } from '../logger/service.logger'
 import { BaanReserverenService } from '../runner/baanreserveren/service'
 import { Reservation, ReservationStatus } from './entity'
 
+export enum ReservationDangerLevel {
+	Safe = 'safe',
+	Risky = 'risky',
+	Lethal = 'lethal',
+}
+
 @Injectable()
 export class ReservationsService {
 	constructor(
@@ -41,17 +47,6 @@ export class ReservationsService {
 		return await qb.orderBy('dateRangeStart', 'ASC').getMany()
 	}
 
-	async getOlderThanDate(date = dayjs()) {
-		const query = this.reservationsRepository
-			.createQueryBuilder()
-			.where(`(DATE(dateRangeStart) < DATE(:startDate)`, {
-				startDate: date.toISOString(),
-			})
-			.orderBy('dateRangeStart', 'ASC')
-
-		return await query.getMany()
-	}
-
 	/**
 	 * Gets all reservations that have not been scheduled that are within the reservation window
 	 * @returns Reservations that can be scheduled
@@ -104,6 +99,19 @@ export class ReservationsService {
 		return await this.reservationsRepository.save(res)
 	}
 
+	getDangerLevel(reservation: Reservation) {
+		// don't book something within the ~~danger zone~~
+		const now = dayjs()
+		const hourDiff = now.diff(reservation.dateRangeStart, 'hours')
+		if (hourDiff > 8) {
+			return ReservationDangerLevel.Safe
+		} else if (hourDiff >= 5) {
+			return ReservationDangerLevel.Risky
+		} else {
+			return ReservationDangerLevel.Lethal
+		}
+	}
+
 	async update(reservationId: string, update: Partial<Reservation>) {
 		return await this.reservationsRepository.update(reservationId, update)
 	}

src/runner/baanreserveren/service.ts

@@ -912,12 +912,8 @@ export class BaanReserverenService {
 			try {
 				currentAttempt++
 				await this.init()
-				break
 			} catch (err: unknown) {
 				if (err instanceof RunningReservationsNavigationError) {
-					this.loggerService.warn('Hit expected warmup error, retrying', {
-						currentAttempt,
-					})
 					await new Promise((res) => setTimeout(res, delay))
 				} else {
 					throw err

src/waitingList/service.ts

@@ -12,7 +12,11 @@ import {
 	RESERVATIONS_QUEUE_NAME,
 	ReservationsQueue,
 } from '../reservations/config'
-import { ReservationsService } from '../reservations/service'
+import { Reservation } from '../reservations/entity'
+import {
+	ReservationDangerLevel,
+	ReservationsService,
+} from '../reservations/service'
 import { WaitingListDetails } from './types'
 
 const EMAIL_SUBJECT_REGEX = new RegExp(
@@ -90,12 +94,45 @@ export class WaitingListService {
 			return
 		}
 
+		// don't book something within the ~~danger zone~~
+		const partitioned = reservations.reduce<{
+			safe: Reservation[]
+			risky: Reservation[]
+			lethal: Reservation[]
+		}>(
+			(acc, res) => {
+				switch (this.reservationsService.getDangerLevel(res)) {
+					case ReservationDangerLevel.Safe:
+						return {
+							safe: [...acc.safe, res],
+							risky: acc.risky,
+							lethal: acc.lethal,
+						}
+					case ReservationDangerLevel.Risky:
+						return {
+							safe: acc.safe,
+							risky: [...acc.risky, res],
+							lethal: acc.lethal,
+						}
+					case ReservationDangerLevel.Lethal:
+						return {
+							safe: acc.safe,
+							risky: acc.risky,
+							lethal: [...acc.lethal, res],
+						}
+				}
+			},
+			{ safe: [], risky: [], lethal: [] },
+		)
+
 		this.loggerService.debug(
-			`Found ${reservations.length} reservations on waiting list`,
+			`Found the reservations in given categories: ${JSON.stringify(
+				partitioned,
+			)}`,
 		)
 
 		await this.reservationsQueue.addBulk(
-			reservations.map((r) => ({
+			partitioned.safe.map((r) => ({
 				data: { reservation: r, speedyMode: false },
 				opts: { attempts: 1 },
 			})),