diff --git a/server/src/db/repositories/Trips.repository.ts b/server/src/db/repositories/Trips.repository.ts index dc5544f84..978d30f27 100644 --- a/server/src/db/repositories/Trips.repository.ts +++ b/server/src/db/repositories/Trips.repository.ts @@ -800,12 +800,12 @@ export class TripsRepository extends TrekRepository { const owner = this.kysely() .selectFrom('trips as t') .innerJoin('users as u', 'u.id', 't.user_id') - .select((eb) => ['u.username as username', eb.lit(1).as('is_owner')]) + .select((eb) => ['u.username as username', eb.lit(1).$castTo().as('is_owner')]) .where('t.id', '=', trip_id); const member = this.kysely() .selectFrom('trip_members as m') .innerJoin('users as u', 'u.id', 'm.user_id') - .select((eb) => ['u.username as username', eb.lit(0).as('is_owner')]) + .select((eb) => ['u.username as username', eb.lit(0).$castTo().as('is_owner')]) .where('m.trip_id', '=', trip_id); const rows = await owner.unionAll(member).orderBy('is_owner', 'desc').execute(); return rows as TravellerUsernameRow[]; diff --git a/server/src/db/types/integer-flag.type.ts b/server/src/db/types/integer-flag.type.ts index 05e7a8ee4..055257ae5 100644 --- a/server/src/db/types/integer-flag.type.ts +++ b/server/src/db/types/integer-flag.type.ts @@ -18,13 +18,17 @@ type FlagColumn = number | null | undefined; */ export class IntegerFlagType extends Type { override convertToDatabaseValue(value: FlagValue): FlagColumn { - if (value === null || value === undefined) return value; + // Spelled out: the server compiles without strictNullChecks, where returning the narrowed `value` keeps its full type. + if (value === null) return null; + if (value === undefined) return undefined; return value ? 1 : 0; } /** 0/1 from either driver (Postgres's `bigint` reads as a number); a boolean from a value set in JS passes through. */ override convertToJSValue(value: FlagColumn | boolean): FlagValue { - if (value === null || value === undefined) return value; + // Spelled out: the server compiles without strictNullChecks, where returning the narrowed `value` keeps its full type. + if (value === null) return null; + if (value === undefined) return undefined; return Boolean(Number(value)); }