Compare commits

..

3 commits

Author SHA1 Message Date
fc5f8b2f11 Removing github workflow
All checks were successful
ci/woodpecker/push/test Pipeline was successful
2025-02-02 14:02:59 +01:00
d5ccc4e570 Updating image of woodpecker test to node/hydrogen
Some checks failed
ci/woodpecker/push/test Pipeline was successful
Push to main / test (push) Has been cancelled
Push to main / build-image (push) Has been cancelled
2025-02-02 12:18:16 +01:00
3e0ba829d3
Adding woodpecker-cicd workflow file
Some checks failed
Push to main / test (push) Waiting to run
Push to main / build-image (push) Blocked by required conditions
ci/woodpecker/push/test Pipeline failed
Signed-off-by: Collin Duncan <github@collinduncan.com>
2025-02-02 11:25:02 +01:00
13 changed files with 114 additions and 230 deletions

View file

@ -1,43 +0,0 @@
name: Push to main
on:
push:
branches:
- main
jobs:
test:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
- uses: actions/setup-node@v4
with:
node-version: lts/hydrogen
- run: npm ci
- run: npm run test:unit
build-image:
needs:
- test
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
- name: Set up Docker Buildx
uses: docker/setup-buildx-action@v3
- name: Login to Docker Hub
uses: docker/login-action@v3
with:
registry: ghcr.io
username: ${{ secrets.GHCR_USERNAME }}
password: ${{ secrets.GHCR_PASSWORD }}
- name: Declare GIT_COMMIT
shell: bash
run: |
echo "GIT_COMMIT=$(git rev-parse --short "$GITHUB_SHA")" >> "$GITHUB_ENV"
- name: Build docker image
uses: docker/build-push-action@v5
with:
context: .
file: ./docker/server/Dockerfile
push: true
tags: ghcr.io/cgduncan7/autobaan:latest
cache-from: type=gha
cache-to: type=gha,mode=max
build-args: GIT_COMMIT=${{ env.GIT_COMMIT }}

10
.woodpecker/test.yaml Normal file
View file

@ -0,0 +1,10 @@
when:
- branch: main
event: push
steps:
- name: test
image: docker.io/node:hydrogen-slim
commands:
- npm ci
- npm run test:unit

View file

@ -1,31 +0,0 @@
import { MigrationInterface, QueryRunner } from 'typeorm'
export class ReservationStatuses1739366336570 implements MigrationInterface {
name = 'ReservationStatuses1739366336570'
public async up(queryRunner: QueryRunner): Promise<void> {
await queryRunner.query(
`CREATE TABLE "temporary_reservations" ("id" varchar PRIMARY KEY NOT NULL, "dateRangeStart" datetime NOT NULL, "dateRangeEnd" datetime NOT NULL, "status" varchar(32) NOT NULL DEFAULT ('pending'), "waitingListId" integer, "ownerId" varchar(32) NOT NULL, "opponents" json NOT NULL)`,
)
await queryRunner.query(
`INSERT INTO "temporary_reservations"("id", "dateRangeStart", "dateRangeEnd", "status", "waitingListId", "ownerId", "opponents") SELECT "id", "dateRangeStart", "dateRangeEnd", CASE "waitListed" WHEN true THEN "on_waiting_list" ELSE "pending" END, "waitingListId", "ownerId", "opponents" FROM "reservations"`,
)
await queryRunner.query(`DROP TABLE "reservations"`)
await queryRunner.query(
`ALTER TABLE "temporary_reservations" RENAME TO "reservations"`,
)
}
public async down(queryRunner: QueryRunner): Promise<void> {
await queryRunner.query(
`ALTER TABLE "reservations" RENAME TO "temporary_reservations"`,
)
await queryRunner.query(
`CREATE TABLE "reservations" ("id" varchar PRIMARY KEY NOT NULL, "dateRangeStart" datetime NOT NULL, "dateRangeEnd" datetime NOT NULL, "waitListed" boolean NOT NULL DEFAULT (0), "waitingListId" integer, "ownerId" varchar(32) NOT NULL, "opponents" json NOT NULL)`,
)
await queryRunner.query(
`INSERT INTO "reservations"("id", "dateRangeStart", "dateRangeEnd", "waitListed", "waitingListId", "ownerId", "opponents") SELECT "id", "dateRangeStart", "dateRangeEnd", CASE "status" WHEN "on_waiting_list" THEN true ELSE false, "waitingListId", "ownerId", "opponents" FROM "temporary_reservations"`,
)
await queryRunner.query(`DROP TABLE "temporary_reservations"`)
}
}

View file

@ -1,6 +1,5 @@
import 'dayjs/locale/nl'
import { TransformationType, TransformFnParams } from 'class-transformer'
import * as dayjs from 'dayjs'
import * as customParseFormat from 'dayjs/plugin/customParseFormat'
import * as isSameOrBefore from 'dayjs/plugin/isSameOrBefore'
@ -42,20 +41,4 @@ const dayjsTz = (
return dayjs(date, format).tz('Europe/Amsterdam')
}
export const DayjsTransformer = ({ value, type }: TransformFnParams) => {
switch (type) {
case TransformationType.PLAIN_TO_CLASS:
return dayjsTz(value)
case TransformationType.CLASS_TO_PLAIN:
return value.format()
default:
return value
}
}
export const DayjsColumnTransformer = {
to: (value: dayjs.Dayjs) => value.format(),
from: (value: Date) => dayjsTz(value),
}
export default dayjsTz

View file

@ -19,6 +19,7 @@ export class Monitor {
@Column('datetime', {
nullable: false,
default: dayjs(),
transformer: {
to: (value?: Dayjs) => (value ?? dayjs()).format(),
from: (value: Date) => dayjs(value),

View file

@ -2,7 +2,6 @@ import { Injectable } from '@nestjs/common'
import { InjectRepository } from '@nestjs/typeorm'
import { Repository } from 'typeorm'
import dayjsTz from '../common/dayjs'
import { Monitor, MonitorType } from './entity'
@Injectable()
@ -14,7 +13,7 @@ export class MonitorsService {
async performMonitor(type: MonitorType, data: string) {
await this.monitorsRepository.save(
this.monitorsRepository.create({ type, data, createdAt: dayjsTz() }),
this.monitorsRepository.create({ type, data }),
)
}
}

View file

@ -121,14 +121,14 @@ export class NtfyProvider implements OnApplicationBootstrap {
)
}
async sendReservationOnWaitingListNotification(
async sendReservationWaitlistedNotification(
reservationId: string,
startTime: Dayjs,
endTime: Dayjs,
) {
await this.publishQueue.add(
...NtfyProvider.defaultJob({
title: 'Reservation added to waiting list',
title: 'Reservation waitlisted',
message: `${reservationId} - ${startTime.format()} to ${endTime.format()}`,
tags: [MessageTags.badminton, MessageTags.hourglass],
}),
@ -138,7 +138,7 @@ export class NtfyProvider implements OnApplicationBootstrap {
async sendWaitListEmailReceivedNotification(subject: string) {
await this.publishQueue.add(
...NtfyProvider.defaultJob({
title: 'Reservation on waiting list has become available',
title: 'Wait listed reservation available',
message: `${subject}`,
tags: [MessageTags.badminton, MessageTags.hourglass],
}),

View file

@ -12,61 +12,73 @@ import {
Query,
UseInterceptors,
} from '@nestjs/common'
import { Transform } from 'class-transformer'
import { Transform, TransformationType } from 'class-transformer'
import {
IsArray,
IsBoolean,
IsEnum,
IsOptional,
IsString,
ValidateNested,
} from 'class-validator'
import { Dayjs } from 'dayjs'
import { DayjsTransformer } from '../common/dayjs'
import dayjs from '../common/dayjs'
import { LoggerService } from '../logger/service.logger'
import { RESERVATIONS_QUEUE_NAME, ReservationsQueue } from './config'
import { ReservationStatus } from './entity'
import { ReservationsService } from './service'
export class GetReservationsQueryParams {
@IsOptional()
@Transform(() => Dayjs)
readonly date?: Dayjs
date?: Dayjs
@IsOptional()
@IsBoolean()
@Transform(({ value }) => value === 'true')
readonly schedulable?: boolean
@IsOptional()
@IsEnum(ReservationStatus)
readonly status?: ReservationStatus
}
export class CreateReservationOpponent {
@IsString()
readonly id: string
id: string
@IsString()
readonly name: string
name: string
}
export class CreateReservationRequest {
@IsString()
readonly ownerId: string
ownerId: string
@Transform(DayjsTransformer)
readonly dateRangeStart: Dayjs
@Transform(({ value, type }) => {
switch (type) {
case TransformationType.PLAIN_TO_CLASS:
return dayjs(value)
case TransformationType.CLASS_TO_PLAIN:
return value.format()
default:
return value
}
})
dateRangeStart: Dayjs
@IsOptional()
@Transform(DayjsTransformer)
readonly dateRangeEnd?: Dayjs
@Transform(({ value, type }) => {
switch (type) {
case TransformationType.PLAIN_TO_CLASS:
return dayjs(value)
case TransformationType.CLASS_TO_PLAIN:
return value.format()
default:
return value
}
})
dateRangeEnd?: Dayjs
@IsOptional()
@IsArray()
@ValidateNested()
readonly opponents?: CreateReservationOpponent[]
opponents?: CreateReservationOpponent[]
}
@Controller('reservations')
@ -85,14 +97,14 @@ export class ReservationsController {
@Get()
getReservations(@Query() params: GetReservationsQueryParams) {
const { schedulable, date, status } = params
const { schedulable, date } = params
if (schedulable) {
return this.reservationsService.getSchedulable()
}
if (date) {
return this.reservationsService.getByDate(date, status)
return this.reservationsService.getByDate(date)
}
return this.reservationsService.getAll(status)
return this.reservationsService.getAll()
}
@Get(':id')

View file

@ -1,24 +1,15 @@
import { Exclude, Transform, Type } from 'class-transformer'
import { IsEnum } from 'class-validator'
import { TransformationType } from 'class-transformer'
import { Dayjs } from 'dayjs'
import { Column, Entity, PrimaryGeneratedColumn } from 'typeorm'
import dayjs, {
DayjsColumnTransformer,
DayjsTransformer,
} from '../common/dayjs'
import dayjs from '../common/dayjs'
export interface Opponent {
id: string
name: string
}
export enum ReservationStatus {
Pending = 'pending',
OnWaitingList = 'on_waiting_list',
Booked = 'booked',
}
@Entity({ name: 'reservations' })
export class Reservation {
@PrimaryGeneratedColumn('uuid')
@ -29,30 +20,49 @@ export class Reservation {
@Column('datetime', {
nullable: false,
transformer: DayjsColumnTransformer,
transformer: {
to: (value: Dayjs) => value.format(),
from: (value: Date) => dayjs(value),
},
})
@Type(() => Dayjs)
@Transform(DayjsTransformer)
@Transform(({ value, type }) => {
switch (type) {
case TransformationType.PLAIN_TO_CLASS:
return dayjs(value)
case TransformationType.CLASS_TO_PLAIN:
return value.format()
default:
return value
}
})
dateRangeStart: Dayjs
@Column('datetime', {
nullable: false,
transformer: DayjsColumnTransformer,
transformer: {
to: (value: Dayjs) => value.format(),
from: (value: Date) => dayjs(value),
},
})
@Type(() => Dayjs)
@Transform(DayjsTransformer)
@Transform(({ value, type }) => {
switch (type) {
case TransformationType.PLAIN_TO_CLASS:
return dayjs(value)
case TransformationType.CLASS_TO_PLAIN:
return value.format()
default:
return value
}
})
dateRangeEnd: Dayjs
@Column('json', { nullable: false })
opponents: Opponent[]
@Column('varchar', {
length: 32,
nullable: false,
default: ReservationStatus.Pending,
})
@IsEnum(ReservationStatus)
status: ReservationStatus
@Column('boolean', { default: false })
waitListed: boolean
@Column('int', { nullable: true })
waitingListId: number

View file

@ -6,7 +6,7 @@ import { Repository } from 'typeorm'
import dayjs from '../common/dayjs'
import { LoggerService } from '../logger/service.logger'
import { BaanReserverenService } from '../runner/baanreserveren/service'
import { Reservation, ReservationStatus } from './entity'
import { Reservation } from './entity'
@Injectable()
export class ReservationsService {
@ -21,24 +21,19 @@ export class ReservationsService {
private readonly loggerService: LoggerService,
) {}
async getAll(status?: ReservationStatus) {
return await this.reservationsRepository.find({ where: { status } })
async getAll() {
return await this.reservationsRepository.find()
}
async getById(id: string) {
return await this.reservationsRepository.findOneBy({ id })
}
async getByDate(date = dayjs(), status?: ReservationStatus) {
let qb = this.reservationsRepository
async getByDate(date = dayjs()) {
return await this.reservationsRepository
.createQueryBuilder()
.where(`DATE(dateRangeStart) = DATE(:date)`, { date: date.toISOString() })
if (status != null) {
qb = qb.andWhere(`status = :status`, { status })
}
return await qb.orderBy('dateRangeStart', 'ASC').getMany()
.getMany()
}
/**
@ -49,15 +44,13 @@ export class ReservationsService {
const query = this.reservationsRepository
.createQueryBuilder()
.where(
`(DATE(dateRangeStart) >= DATE(:startDate) OR DATE(dateRangeStart) <= DATE(:endDate))`,
`DATE(dateRangeStart) BETWEEN DATE(:startDate) AND DATE(:endDate)`,
{
startDate: dayjs().add(1, 'days').toISOString(),
endDate: dayjs().add(7, 'days').toISOString(),
},
)
.andWhere('status = :status', {
statuses: ReservationStatus.Pending,
})
.andWhere(`waitListed = false`)
.orderBy('dateRangeStart', 'ASC')
return await query.getMany()
@ -66,10 +59,13 @@ export class ReservationsService {
async getByDateOnWaitingList(date = dayjs()) {
return await this.reservationsRepository
.createQueryBuilder()
.where(`DATE(dateRangeStart) = DATE(:date)`, {
.where(`DATE(dateRangeStart) <= DATE(:date)`, {
date: date.toISOString(),
})
.andWhere('status = :status', { status: ReservationStatus.OnWaitingList })
.andWhere(`DATE(dateRangeEnd) >= DATE(:date)`, {
date: date.toISOString(),
})
.andWhere('waitListed = true')
.getMany()
}

View file

@ -1,5 +1,6 @@
import { Process, Processor } from '@nestjs/bull'
import { Inject } from '@nestjs/common'
import { Job } from 'bull'
import { instanceToPlain, plainToInstance } from 'class-transformer'
import { LoggerService } from '../logger/service.logger'
@ -10,7 +11,7 @@ import {
} from '../runner/baanreserveren/service'
import { RESERVATIONS_QUEUE_NAME, ReservationsJob } from './config'
import { DAILY_RESERVATIONS_ATTEMPTS } from './cron'
import { Reservation, ReservationStatus } from './entity'
import { Reservation } from './entity'
import { ReservationsService } from './service'
@Processor(RESERVATIONS_QUEUE_NAME)
@ -62,10 +63,10 @@ export class ReservationsWorker {
}
if (
(shouldWaitlist || attemptsMade === DAILY_RESERVATIONS_ATTEMPTS) &&
reservation.status !== ReservationStatus.OnWaitingList
!reservation.waitListed
) {
this.loggerService.log('Adding reservation to waiting list')
await this.ntfyProvider.sendReservationOnWaitingListNotification(
await this.ntfyProvider.sendReservationWaitlistedNotification(
reservation.id,
reservation.dateRangeStart,
reservation.dateRangeEnd,
@ -88,9 +89,7 @@ export class ReservationsWorker {
} else {
await this.brService.performReservation(reservation, timeSensitive)
}
await this.reservationsService.update(reservation.id, {
status: ReservationStatus.Booked,
})
await this.reservationsService.deleteById(reservation.id)
} catch (error: unknown) {
await this.handleReservationErrors(
error as Error,
@ -106,12 +105,12 @@ export class ReservationsWorker {
timeSensitive = true,
) {
try {
const waitingListId = await this.brService.addReservationToWaitingList(
const waitingListId = await this.brService.addReservationToWaitList(
reservation,
timeSensitive,
)
await this.reservationsService.update(reservation.id, {
status: ReservationStatus.OnWaitingList,
waitListed: true,
waitingListId,
})
} catch (error: unknown) {

View file

@ -9,11 +9,7 @@ import dayjs from '../../common/dayjs'
import { LoggerService } from '../../logger/service.logger'
import { MONITORING_QUEUE_NAME, MonitoringQueue } from '../../monitoring/config'
import { MonitorType } from '../../monitoring/entity'
import {
Opponent,
Reservation,
ReservationStatus,
} from '../../reservations/entity'
import { Opponent, Reservation } from '../../reservations/entity'
import { EmptyPage } from '../pages/empty'
export const BAAN_RESERVEREN_ROOT_URL = 'https://squashcity.baanreserveren.nl'
@ -71,12 +67,12 @@ const CourtSlotToNumber: Record<CourtSlot, number> = {
// Lower is better
const CourtRank: Record<CourtSlot, number> = {
[CourtSlot.One]: 0,
[CourtSlot.Two]: 2, // team at squash city has this pre-booked at 19.15 on Tuesday :sad:
[CourtSlot.Three]: 2, // team at squash city has this pre-booked at 19.15 on Tuesday :sad:
[CourtSlot.One]: 2,
[CourtSlot.Two]: 1, // team at squash city has this pre-booked at 19.15 on Tuesday :sad:
[CourtSlot.Three]: 1, // team at squash city has this pre-booked at 19.15 on Tuesday :sad:
[CourtSlot.Four]: 0,
[CourtSlot.Five]: 0,
[CourtSlot.Six]: 0,
[CourtSlot.Five]: 99, // shitty
[CourtSlot.Six]: 99, // shitty
[CourtSlot.Seven]: 0,
[CourtSlot.Eight]: 0,
[CourtSlot.Nine]: 0,
@ -86,16 +82,13 @@ const CourtRank: Record<CourtSlot, number> = {
[CourtSlot.Thirteen]: 9, // no one likes upstairs
} as const
export enum StartTimeClass {
enum StartTimeClass {
First = 'first',
Second = 'second',
Third = 'third',
}
export const StartTimeClassCourtSlots: Record<
StartTimeClass,
readonly CourtSlot[]
> = {
const StartTimeClassCourtSlots: Record<StartTimeClass, readonly CourtSlot[]> = {
[StartTimeClass.First]: [
CourtSlot.One,
CourtSlot.Two,
@ -683,7 +676,7 @@ export class BaanReserverenService {
return courtStatuses
}
public getCourtSlotsForDate(date: Dayjs) {
private getCourtSlotsForDate(date: Dayjs) {
const time = date.format('HH:mm')
for (const [timeClass, times] of Object.entries(StartTimeClassStartTimes)) {
if (times.includes(time)) {
@ -748,7 +741,7 @@ export class BaanReserverenService {
throw new NoCourtAvailableError('Could not reserve court')
}
public async addReservationToWaitingList(
public async addReservationToWaitList(
reservation: Reservation,
timeSensitive = true,
) {
@ -781,11 +774,7 @@ export class BaanReserverenService {
public async removeReservationFromWaitList(reservation: Reservation) {
try {
if (
reservation.status !== ReservationStatus.OnWaitingList ||
!reservation.waitingListId
)
return
if (!reservation.waitListed || !reservation.waitingListId) return
await this.init()
await this.navigateToWaitingList()
await this.deleteWaitingListEntryRowById(reservation.waitingListId)

View file

@ -10,8 +10,6 @@ import {
BAAN_RESERVEREN_ROOT_URL,
BaanReserverenService,
CourtSlot,
StartTimeClass,
StartTimeClassCourtSlots,
} from '../../../src/runner/baanreserveren/service'
import { EmptyPage } from '../../../src/runner/pages/empty'
@ -23,7 +21,6 @@ describe('baanreserveren.service', () => {
beforeAll(async () => {
pageGotoSpy = jest
.fn()
.mockClear()
.mockImplementation(() => Promise.resolve({ status: () => 200 }))
module = await Test.createTestingModule({
providers: [
@ -57,12 +54,10 @@ describe('baanreserveren.service', () => {
brService = module.get<BaanReserverenService>(BaanReserverenService)
})
beforeEach(() => pageGotoSpy.mockClear())
describe('performSpeedyReservation', () => {
it.each([
[18, 15, CourtSlot.Six, CourtSlot.Seven],
[18, 30, CourtSlot.One, CourtSlot.Four],
[18, 15, CourtSlot.Seven, CourtSlot.Six],
[18, 30, CourtSlot.Four, CourtSlot.Two],
[18, 45, CourtSlot.Twelve, CourtSlot.Thirteen],
])(
'should try highest ranked court first',
@ -94,8 +89,8 @@ describe('baanreserveren.service', () => {
)
it.each([
[18, 15, CourtSlot.Six, CourtSlot.Seven],
[18, 30, CourtSlot.One, CourtSlot.Four],
[18, 15, CourtSlot.Seven, CourtSlot.Eight],
[18, 30, CourtSlot.Four, CourtSlot.Two],
[18, 45, CourtSlot.Twelve, CourtSlot.Thirteen],
])(
'should try backup if first rank is taken',
@ -137,40 +132,4 @@ describe('baanreserveren.service', () => {
},
)
})
describe.only('getCourtSlotsForDate', () => {
it.each([
{
date: '2025-04-10T16:30:00.000Z',
expectedCourtSlots: StartTimeClassCourtSlots[StartTimeClass.First],
},
{
date: '2025-04-10T16:45:00.000Z',
expectedCourtSlots: StartTimeClassCourtSlots[StartTimeClass.Third],
},
{
date: '2025-04-10T17:00:00.000Z',
expectedCourtSlots: StartTimeClassCourtSlots[StartTimeClass.Second],
},
{
date: '2025-01-10T17:30:00.000Z',
expectedCourtSlots: StartTimeClassCourtSlots[StartTimeClass.First],
},
{
date: '2025-01-10T17:45:00.000Z',
expectedCourtSlots: StartTimeClassCourtSlots[StartTimeClass.Third],
},
{
date: '2025-01-10T18:00:00.000Z',
expectedCourtSlots: StartTimeClassCourtSlots[StartTimeClass.Second],
},
])(
'should get correct court slots for $date',
({ date, expectedCourtSlots }) => {
expect(brService.getCourtSlotsForDate(dayjs(date))).toEqual(
expect.arrayContaining(expectedCourtSlots as CourtSlot[]),
)
},
)
})
})