k1nq/TREK
1
0
Fork 0
mirror of https://github.com/mauriceboe/TREK.git synced 2026-07-09 15:05:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(extract): don't let the day-clamp fallback break reservation resync (#1288)

Browse Source 
This branch added a clamp-to-nearest-day fallback to resolveDayIdFromTime so an
imported booking whose exact date has no day row still lands on a day. After
rebasing onto dev, that collided with #1288's resyncReservationDays, which
relies on the original "null when no exact day" semantics to leave a booking
whose date now falls outside the range untouched — instead it snapped to an edge
day (TRIP-SVC-019 failed: expected day_id kept, got the clamped one).

Make clampToNearest an opt-in parameter (default true, preserving the import
behaviour for create/update) and have resyncReservationDays pass false, so
out-of-range bookings keep their day_id. Full server suite green (4082).
This commit is contained in:
Maurice
2026-06-28 11:36:26 +02:00
parent 0d104d8a09
commit 5983bead7c
1 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
server/src/services/reservationService.ts
+8 -4
View File
@@ -49,6 +49,7 @@ function loadEndpoints(reservationId: number): ReservationEndpoint[] {
function resolveDayIdFromTime( function resolveDayIdFromTime(
tripId: string | number, tripId: string | number,
time: string | null | undefined, time: string | null | undefined,
clampToNearest = true,
): number | null { ): number | null {
if (!time) return null; if (!time) return null;
const datePart = time.slice(0, 10); const datePart = time.slice(0, 10);
@@ -57,8 +58,11 @@ function resolveDayIdFromTime(
.prepare('SELECT id FROM days WHERE trip_id = ? AND date = ? LIMIT 1') .prepare('SELECT id FROM days WHERE trip_id = ? AND date = ? LIMIT 1')
.get(tripId, datePart) as { id: number } | undefined; .get(tripId, datePart) as { id: number } | undefined;
if (exact) return exact.id; if (exact) return exact.id;
// Fallback: clamp to the nearest day in the trip so a booking whose exact date // Fallback: clamp to the nearest day in the trip so an imported booking whose
// has no day row (or sits just outside the span) still lands on a day. // exact date has no day row (or sits just outside the span) still lands on a day.
// Skipped by callers (e.g. resyncReservationDays) that must leave a booking whose
// date now falls outside the range untouched instead of snapping it to an edge day.
if (!clampToNearest) return null;
const nearest = db const nearest = db
.prepare('SELECT id FROM days WHERE trip_id = ? ORDER BY ABS(JULIANDAY(date) - JULIANDAY(?)) ASC, date ASC LIMIT 1') .prepare('SELECT id FROM days WHERE trip_id = ? ORDER BY ABS(JULIANDAY(date) - JULIANDAY(?)) ASC, date ASC LIMIT 1')
.get(tripId, datePart) as { id: number } | undefined; .get(tripId, datePart) as { id: number } | undefined;
@@ -82,10 +86,10 @@ export function resyncReservationDays(tripId: string | number): void {
}[]; }[];
const update = db.prepare('UPDATE reservations SET day_id = ?, end_day_id = ? WHERE id = ?'); const update = db.prepare('UPDATE reservations SET day_id = ?, end_day_id = ? WHERE id = ?');
for (const r of rows) { for (const r of rows) {
const newDayId = resolveDayIdFromTime(tripId, r.reservation_time); const newDayId = resolveDayIdFromTime(tripId, r.reservation_time, false);
if (newDayId == null) continue; if (newDayId == null) continue;
const newEndDayId = r.reservation_end_time const newEndDayId = r.reservation_end_time
? (resolveDayIdFromTime(tripId, r.reservation_end_time) ?? r.end_day_id) ? (resolveDayIdFromTime(tripId, r.reservation_end_time, false) ?? r.end_day_id)
: r.end_day_id; : r.end_day_id;
if (newDayId !== r.day_id || newEndDayId !== r.end_day_id) { if (newDayId !== r.day_id || newEndDayId !== r.end_day_id) {
update.run(newDayId, newEndDayId, r.id); update.run(newDayId, newEndDayId, r.id);