From e82968d66c78176fb3923c40e3eeaa3eb1659e2b Mon Sep 17 00:00:00 2001 From: Isaias Tavares Date: Thu, 5 Nov 2026 01:15:00 -0300 Subject: [PATCH] refactor(db): name the reservation-to-stay join condition once The TEXT-against-INTEGER join between reservations.accommodation_id and day_accommodations.id was spelled out eight times across Reservations and DayAccommodations, each with its own cast and comment. accommodationIdMatches in _shared/ is the one place that spells it, and it documents why the cast is there: SQLite coerces the bare comparison and Postgres refuses it. The call sites now read as what they test. The SQL is unchanged. The size baseline is lowered to the new line counts. --- server/scripts/size-baseline.json | 4 ++-- .../DayAccommodations.repository.ts | 8 +++---- .../repositories/Reservations.repository.ts | 19 +++++++--------- .../_shared/reservation-accommodation.ts | 22 +++++++++++++++++++ 4 files changed, 35 insertions(+), 18 deletions(-) create mode 100644 server/src/db/repositories/_shared/reservation-accommodation.ts diff --git a/server/scripts/size-baseline.json b/server/scripts/size-baseline.json index a21195eb3..e9aaef343 100644 --- a/server/scripts/size-baseline.json +++ b/server/scripts/size-baseline.json @@ -2,7 +2,7 @@ "scripts/db-call-graph.mjs": 1036, "scripts/generate-entities.ts": 2259, "src/db/repositories/Places.repository.ts": 1435, - "src/db/repositories/Reservations.repository.ts": 1554, + "src/db/repositories/Reservations.repository.ts": 1551, "src/db/repositories/Trips.repository.ts": 1121, "src/db/repositories/Users.repository.ts": 1445, "src/nest/atlas/atlas.service.ts": 1177, @@ -12,7 +12,7 @@ "src/nest/doc-sync/doc-sync.service.ts": 1060, "src/nest/doc-sync/providers/synology-drive.client.ts": 1160, "src/nest/journey/journey-domain.service.ts": 1659, - "src/nest/places/places.service.ts": 1548, + "src/nest/places/places.service.ts": 1546, "src/nest/plugins/plugin-runtime.service.ts": 1460, "src/nest/plugins/runtime/plugin-sdk.ts": 1093, "src/nest/reservations/reservations.service.ts": 1237, diff --git a/server/src/db/repositories/DayAccommodations.repository.ts b/server/src/db/repositories/DayAccommodations.repository.ts index ba843c1f5..e6d45e4ae 100644 --- a/server/src/db/repositories/DayAccommodations.repository.ts +++ b/server/src/db/repositories/DayAccommodations.repository.ts @@ -1,7 +1,7 @@ -import { castIntegerKysely } from '../dialect/kysely-functions'; import { coalesceOverride, columnRef } from '../dialect/sql-functions'; import type { DayAccommodations } from '../entities/DayAccommodations.entity'; import type { DB } from '../kysely/db'; +import { accommodationIdMatches } from './_shared/reservation-accommodation'; import { type AssertRowKeys } from './_shared/rows'; import { TrekRepository } from './_shared/trek-repository'; @@ -254,10 +254,8 @@ export class DayAccommodationsRepository extends TrekRepository() .selectFrom('day_accommodations as a') .leftJoin('places as p', 'p.id', 'a.place_id') - // TEXT `accommodation_id` against INTEGER `a.id`: cast, as Postgres refuses - // to compare the two (42883) where SQLite coerces. .leftJoin('reservations as r', (join) => - join.on((eb) => eb(castIntegerKysely(platform, eb, 'r.accommodation_id'), '=', eb.ref('a.id'))), + join.on((eb) => accommodationIdMatches(platform, eb, 'r.accommodation_id', 'a.id')), ) .selectAll('a') .select([ @@ -492,7 +490,7 @@ export class DayAccommodationsRepository extends TrekRepository eb2.fn.min('r.id').as('m')) - .where((eb2) => eb2(castIntegerKysely(platform, eb2, 'r.accommodation_id'), '=', eb2.ref('a.id'))) + .where((eb2) => accommodationIdMatches(platform, eb2, 'r.accommodation_id', 'a.id')) .as('reservation_id'), ]) .where('a.trip_id', '=', trip_id) diff --git a/server/src/db/repositories/Reservations.repository.ts b/server/src/db/repositories/Reservations.repository.ts index 54dffbd09..511174515 100644 --- a/server/src/db/repositories/Reservations.repository.ts +++ b/server/src/db/repositories/Reservations.repository.ts @@ -2,7 +2,8 @@ import type { Reservations } from '../entities/Reservations.entity'; import { DayAssignments } from '../entities/DayAssignments.entity'; import { Days } from '../entities/Days.entity'; import { coalesceOverride, columnRef, dayDistance } from '../dialect/sql-functions'; -import { castIntegerKysely, concatKysely, startsWithIsoDateKysely, substringKysely } from '../dialect/kysely-functions'; +import { concatKysely, startsWithIsoDateKysely, substringKysely } from '../dialect/kysely-functions'; +import { accommodationIdMatches } from './_shared/reservation-accommodation'; import { publicReservationExpr, publicStayExists, type ReservationVisibilityKyselyDB } from './_shared/reservation-visibility'; import type { DayAssignmentRow } from './day-assignment-rows'; import type { ReservationAllColumnsRow, ReservationJoinKyselyDB, ReservationJoinRow } from './reservation-rows'; @@ -349,10 +350,6 @@ type SharePublicAccommodationKyselyDB = ReservationVisibilityKyselyDB & Pick; export class ReservationsRepository extends TrekRepository { - /** - * `accommodation_id` is TEXT and `ap.id` INTEGER, so the text side is cast - * for the join: SQLite coerces the bare comparison, Postgres refuses it. - */ private joinedQuery() { const platform = this.getEntityManager().getPlatform(); return this.kysely() @@ -360,7 +357,7 @@ export class ReservationsRepository extends TrekRepository { .leftJoin('days as d', 'd.id', 'r.day_id') .leftJoin('places as p', 'p.id', 'r.place_id') .leftJoin('day_accommodations as ap', (join) => - join.on((eb) => eb(castIntegerKysely(platform, eb, 'r.accommodation_id'), '=', eb.ref('ap.id'))), + join.on((eb) => accommodationIdMatches(platform, eb, 'r.accommodation_id', 'ap.id')), ) .leftJoin('places as acc_p', 'acc_p.id', 'ap.place_id') .selectAll('r') @@ -872,7 +869,7 @@ export class ReservationsRepository extends TrekRepository { .selectFrom('reservations as r') .leftJoin('places as pl', 'pl.id', 'r.place_id') .leftJoin('day_accommodations as a', (join) => - join.on((eb) => eb(castIntegerKysely(platform, eb, 'r.accommodation_id'), '=', eb.ref('a.id'))), + join.on((eb) => accommodationIdMatches(platform, eb, 'r.accommodation_id', 'a.id')), ) .leftJoin('days as sd', 'sd.id', 'a.start_day_id') .leftJoin('days as ed', 'ed.id', 'a.end_day_id') @@ -889,7 +886,7 @@ export class ReservationsRepository extends TrekRepository { eb .selectFrom('reservations as r2') .select((eb2) => eb2.fn.min('r2.id').as('c')) - .where((eb2) => eb2(castIntegerKysely(platform, eb2, 'r2.accommodation_id'), '=', eb2.ref('a.id'))) + .where((eb2) => accommodationIdMatches(platform, eb2, 'r2.accommodation_id', 'a.id')) .as('stay_first_reservation_id'), 'rd.date as day_date', 'red.date as end_day_date', @@ -949,7 +946,7 @@ export class ReservationsRepository extends TrekRepository { eb .selectFrom('reservations as r') .select('r.title') - .where((eb2) => eb2(castIntegerKysely(platform, eb2, 'r.accommodation_id'), '=', eb2.ref('a.id'))) + .where((eb2) => accommodationIdMatches(platform, eb2, 'r.accommodation_id', 'a.id')) .where((eb2) => publicReservationExpr(eb2, 'r.ingest_state')) .orderBy('r.id', 'asc') .limit(1) @@ -1035,7 +1032,7 @@ export class ReservationsRepository extends TrekRepository { eb .selectFrom('reservations as res') .select('res.title') - .where((eb2) => eb2(castIntegerKysely(platform, eb2, 'res.accommodation_id'), '=', eb2.ref('a.id'))) + .where((eb2) => accommodationIdMatches(platform, eb2, 'res.accommodation_id', 'a.id')) .where('res.status', '!=', 'cancelled') .orderBy('res.id', 'asc') .limit(1), @@ -1076,7 +1073,7 @@ export class ReservationsRepository extends TrekRepository { eb .selectFrom('reservations as res') .select('res.title') - .where((eb2) => eb2(castIntegerKysely(platform, eb2, 'res.accommodation_id'), '=', eb2.ref('a.id'))) + .where((eb2) => accommodationIdMatches(platform, eb2, 'res.accommodation_id', 'a.id')) .where('res.status', '!=', 'cancelled') .orderBy('res.id', 'asc') .limit(1), diff --git a/server/src/db/repositories/_shared/reservation-accommodation.ts b/server/src/db/repositories/_shared/reservation-accommodation.ts new file mode 100644 index 000000000..d6d5aee45 --- /dev/null +++ b/server/src/db/repositories/_shared/reservation-accommodation.ts @@ -0,0 +1,22 @@ +import { castIntegerKysely } from '../../dialect/kysely-functions'; +import type { Platform } from '@mikro-orm/core'; + +import type { ExpressionBuilder, ExpressionWrapper, SqlBool, StringReference } from 'kysely'; + +/** + * The join condition between a reservation and the stay it is booked against. + * + * `reservations.accommodation_id` is TEXT with no foreign key, while + * `day_accommodations.id` is INTEGER, so the comparison is written as + * `CAST( AS INTEGER) = `. SQLite coerces a bare + * text-to-integer comparison and Postgres refuses it (42883), so the cast is + * needed on both engines. A stored `'14.0'` casts to 14 on both. + */ +export function accommodationIdMatches( + platform: Platform, + eb: ExpressionBuilder, + reservationAccommodationId: StringReference, + stayId: StringReference, +): ExpressionWrapper { + return eb(castIntegerKysely(platform, eb, reservationAccommodationId), '=', eb.ref(stayId).$castTo()); +}