mirror of
https://github.com/mauriceboe/TREK.git
synced 2026-06-20 13:51:45 +00:00
fix(reservations): restore correct day assignment for non-transport bookings
v3.0.0 switched the planner from rendering reservations by
reservation_time to rendering them by day_id (commit 3f61e1c), but
migration 110 only backfilled day_id for transport types. Tours,
restaurants, events and 'other' bookings kept whatever day_id was
stored in the DB — often the trip's first day, from older code paths
that defaulted it there — so after the upgrade those rows all show
up on day 1 regardless of their actual reservation_time.
- Migration 122: for every non-hotel reservation, null out any
day_id / end_day_id that does not match the reservation's time,
then backfill it from reservation_time / reservation_end_time.
Idempotent; leaves already-correct rows alone.
- reservationService.createReservation / updateReservation now
derive day_id / end_day_id from reservation_time /
reservation_end_time when the client didn't send one explicitly,
so the mismatch cannot reappear on new or edited bookings.
Hotels are skipped because they store their date range on the
linked day_accommodation.
This commit is contained in:
@@ -2043,6 +2043,70 @@ function runMigrations(db: Database.Database): void {
|
||||
db.exec('CREATE INDEX IF NOT EXISTS idx_journey_entry_photos_entry ON journey_entry_photos(entry_id)');
|
||||
db.exec('CREATE INDEX IF NOT EXISTS idx_journey_entry_photos_photo ON journey_entry_photos(journey_photo_id)');
|
||||
},
|
||||
// Migration 122: Correct stale day_id / end_day_id on non-transport
|
||||
// reservations. Migration 110 only backfilled transport types; tours,
|
||||
// restaurants, events and "other" bookings kept a stale day_id from
|
||||
// older code paths that often defaulted to the first day of the trip.
|
||||
// Starting with v3.0.0 the planner renders reservations by day_id
|
||||
// instead of reservation_time, so those stale rows show up on the
|
||||
// wrong day. This migration nulls out day_id / end_day_id values that
|
||||
// don't match the reservation's time and then backfills them from
|
||||
// reservation_time / reservation_end_time.
|
||||
() => {
|
||||
db.exec(`
|
||||
UPDATE reservations
|
||||
SET day_id = NULL
|
||||
WHERE reservation_time IS NOT NULL
|
||||
AND day_id IS NOT NULL
|
||||
AND type != 'hotel'
|
||||
AND NOT EXISTS (
|
||||
SELECT 1 FROM days d
|
||||
WHERE d.id = reservations.day_id
|
||||
AND d.date = substr(reservations.reservation_time, 1, 10)
|
||||
)
|
||||
`);
|
||||
|
||||
db.exec(`
|
||||
UPDATE reservations
|
||||
SET end_day_id = NULL
|
||||
WHERE reservation_end_time IS NOT NULL
|
||||
AND end_day_id IS NOT NULL
|
||||
AND type != 'hotel'
|
||||
AND NOT EXISTS (
|
||||
SELECT 1 FROM days d
|
||||
WHERE d.id = reservations.end_day_id
|
||||
AND d.date = substr(reservations.reservation_end_time, 1, 10)
|
||||
)
|
||||
`);
|
||||
|
||||
db.exec(`
|
||||
UPDATE reservations
|
||||
SET day_id = (
|
||||
SELECT d.id FROM days d
|
||||
WHERE d.trip_id = reservations.trip_id
|
||||
AND d.date = substr(reservations.reservation_time, 1, 10)
|
||||
LIMIT 1
|
||||
)
|
||||
WHERE type != 'hotel'
|
||||
AND reservation_time IS NOT NULL
|
||||
AND day_id IS NULL
|
||||
`);
|
||||
|
||||
db.exec(`
|
||||
UPDATE reservations
|
||||
SET end_day_id = (
|
||||
SELECT d.id FROM days d
|
||||
WHERE d.trip_id = reservations.trip_id
|
||||
AND d.date = substr(reservations.reservation_end_time, 1, 10)
|
||||
LIMIT 1
|
||||
)
|
||||
WHERE type != 'hotel'
|
||||
AND reservation_end_time IS NOT NULL
|
||||
AND end_day_id IS NULL
|
||||
AND substr(reservations.reservation_end_time, 1, 10)
|
||||
!= substr(reservations.reservation_time, 1, 10)
|
||||
`);
|
||||
},
|
||||
];
|
||||
|
||||
if (currentVersion < migrations.length) {
|
||||
|
||||
Reference in New Issue
Block a user