mirror of
https://github.com/mauriceboe/TREK.git
synced 2026-11-20 11:06:06 +00:00
c51f4f78bb
They reset through resetDatabase and seed through the ORM factories instead of the SQLite snapshot mock, so they run in the Postgres lane as well.
775 lines
35 KiB
TypeScript
775 lines
35 KiB
TypeScript
/**
|
||
* Reservations integration tests.
|
||
* Covers RESV-001 to RESV-007.
|
||
*/
|
||
import { buildApp } from '../../src/bootstrap';
|
||
import { BudgetItems } from '../../src/db/entities/BudgetItems.entity';
|
||
import { DayAccommodations } from '../../src/db/entities/DayAccommodations.entity';
|
||
import { Days } from '../../src/db/entities/Days.entity';
|
||
import { ReservationDayPositions } from '../../src/db/entities/ReservationDayPositions.entity';
|
||
import { Reservations } from '../../src/db/entities/Reservations.entity';
|
||
import { authCookie } from '../helpers/auth';
|
||
import { makeDayAssignment } from '../helpers/factories/itinerary';
|
||
import { makePlace } from '../helpers/factories/places';
|
||
import { makeReservation } from '../helpers/factories/reservations';
|
||
import { findRow, findRows, updateRows } from '../helpers/factories/rows';
|
||
import { makeDay, makeTrip } from '../helpers/factories/trips';
|
||
import { makeUser } from '../helpers/factories/users';
|
||
import { resetDatabase } from '../helpers/reset-database';
|
||
import { resetRateLimits } from '../helpers/test-db';
|
||
import { MikroORM } from '@mikro-orm/core';
|
||
import type { INestApplication } from '@nestjs/common';
|
||
|
||
import type { Application } from 'express';
|
||
import request from 'supertest';
|
||
import { describe, it, expect, beforeAll, beforeEach, afterAll } from 'vitest';
|
||
|
||
let orm: MikroORM;
|
||
|
||
/** The expense linked to the booking on the trip, or null. */
|
||
function linkedExpense(tripId: number, reservationId: number) {
|
||
return findRow(orm, BudgetItems, { trip: tripId, reservation: reservationId });
|
||
}
|
||
|
||
let nestApp: INestApplication;
|
||
let app: Application;
|
||
|
||
beforeAll(async () => {
|
||
nestApp = await buildApp();
|
||
app = nestApp.getHttpAdapter().getInstance();
|
||
orm = nestApp.get(MikroORM);
|
||
});
|
||
|
||
beforeEach(async () => {
|
||
await resetDatabase(orm);
|
||
await resetRateLimits(nestApp);
|
||
});
|
||
|
||
afterAll(async () => {
|
||
await nestApp.close();
|
||
});
|
||
|
||
// ─────────────────────────────────────────────────────────────────────────────
|
||
// Create reservation
|
||
// ─────────────────────────────────────────────────────────────────────────────
|
||
|
||
describe('Create reservation', () => {
|
||
it('RESV-001 — POST /api/trips/:tripId/reservations creates a reservation', async () => {
|
||
const { user } = await makeUser(orm);
|
||
const trip = await makeTrip(orm, user.id);
|
||
|
||
const res = await request(app)
|
||
.post(`/api/trips/${trip.id}/reservations`)
|
||
.set('Cookie', authCookie(user.id))
|
||
.send({ title: 'Hotel Check-in', type: 'hotel' });
|
||
expect(res.status).toBe(201);
|
||
expect(res.body.reservation.title).toBe('Hotel Check-in');
|
||
expect(res.body.reservation.type).toBe('hotel');
|
||
});
|
||
|
||
it('RESV-001b — persists and updates the dedicated url field (#935)', async () => {
|
||
const { user } = await makeUser(orm);
|
||
const trip = await makeTrip(orm, user.id);
|
||
|
||
const created = await request(app)
|
||
.post(`/api/trips/${trip.id}/reservations`)
|
||
.set('Cookie', authCookie(user.id))
|
||
.send({ title: 'Hotel', type: 'hotel', url: 'https://hotel.example/booking' });
|
||
expect(created.status).toBe(201);
|
||
expect(created.body.reservation.url).toBe('https://hotel.example/booking');
|
||
|
||
const updated = await request(app)
|
||
.put(`/api/trips/${trip.id}/reservations/${created.body.reservation.id}`)
|
||
.set('Cookie', authCookie(user.id))
|
||
.send({ url: 'https://hotel.example/changed' });
|
||
expect(updated.status).toBe(200);
|
||
expect(updated.body.reservation.url).toBe('https://hotel.example/changed');
|
||
});
|
||
|
||
it('RESV-001 — POST without title returns 400', async () => {
|
||
const { user } = await makeUser(orm);
|
||
const trip = await makeTrip(orm, user.id);
|
||
|
||
const res = await request(app)
|
||
.post(`/api/trips/${trip.id}/reservations`)
|
||
.set('Cookie', authCookie(user.id))
|
||
.send({ type: 'hotel' });
|
||
expect(res.status).toBe(400);
|
||
});
|
||
|
||
it('RESV-001 — non-member cannot create reservation', async () => {
|
||
const { user: owner } = await makeUser(orm);
|
||
const { user: other } = await makeUser(orm);
|
||
const trip = await makeTrip(orm, owner.id);
|
||
|
||
const res = await request(app)
|
||
.post(`/api/trips/${trip.id}/reservations`)
|
||
.set('Cookie', authCookie(other.id))
|
||
.send({ title: 'Hotel', type: 'hotel' });
|
||
expect(res.status).toBe(404);
|
||
});
|
||
|
||
it('RESV-002 — POST with create_accommodation creates an accommodation record', async () => {
|
||
const { user } = await makeUser(orm);
|
||
const trip = await makeTrip(orm, user.id);
|
||
const day = await makeDay(orm, trip.id, { date: '2025-06-01' });
|
||
|
||
const res = await request(app)
|
||
.post(`/api/trips/${trip.id}/reservations`)
|
||
.set('Cookie', authCookie(user.id))
|
||
.send({ title: 'Grand Hotel', type: 'hotel', day_id: day.id, create_accommodation: true });
|
||
expect(res.status).toBe(201);
|
||
expect(res.body.reservation).toBeDefined();
|
||
});
|
||
});
|
||
|
||
// ─────────────────────────────────────────────────────────────────────────────
|
||
// List reservations
|
||
// ─────────────────────────────────────────────────────────────────────────────
|
||
|
||
describe('List reservations', () => {
|
||
it('RESV-003 — GET /api/trips/:tripId/reservations returns all reservations', async () => {
|
||
const { user } = await makeUser(orm);
|
||
const trip = await makeTrip(orm, user.id);
|
||
await makeReservation(orm, trip.id, { title: 'Flight Out', type: 'flight' });
|
||
await makeReservation(orm, trip.id, { title: 'Hotel Stay', type: 'hotel' });
|
||
|
||
const res = await request(app).get(`/api/trips/${trip.id}/reservations`).set('Cookie', authCookie(user.id));
|
||
expect(res.status).toBe(200);
|
||
expect(res.body.reservations).toHaveLength(2);
|
||
});
|
||
|
||
it('RESV-003 — returns empty array when no reservations exist', async () => {
|
||
const { user } = await makeUser(orm);
|
||
const trip = await makeTrip(orm, user.id);
|
||
|
||
const res = await request(app).get(`/api/trips/${trip.id}/reservations`).set('Cookie', authCookie(user.id));
|
||
expect(res.status).toBe(200);
|
||
expect(res.body.reservations).toHaveLength(0);
|
||
});
|
||
|
||
it('RESV-007 — non-member cannot list reservations', async () => {
|
||
const { user: owner } = await makeUser(orm);
|
||
const { user: other } = await makeUser(orm);
|
||
const trip = await makeTrip(orm, owner.id);
|
||
|
||
const res = await request(app).get(`/api/trips/${trip.id}/reservations`).set('Cookie', authCookie(other.id));
|
||
expect(res.status).toBe(404);
|
||
});
|
||
});
|
||
|
||
// ─────────────────────────────────────────────────────────────────────────────
|
||
// Update reservation
|
||
// ─────────────────────────────────────────────────────────────────────────────
|
||
|
||
describe('Update reservation', () => {
|
||
it('RESV-004 — PUT updates reservation fields', async () => {
|
||
const { user } = await makeUser(orm);
|
||
const trip = await makeTrip(orm, user.id);
|
||
const resv = await makeReservation(orm, trip.id, { title: 'Old Flight', type: 'flight' });
|
||
|
||
const res = await request(app)
|
||
.put(`/api/trips/${trip.id}/reservations/${resv.id}`)
|
||
.set('Cookie', authCookie(user.id))
|
||
.send({ title: 'New Flight', confirmation_number: 'ABC123' });
|
||
expect(res.status).toBe(200);
|
||
expect(res.body.reservation.title).toBe('New Flight');
|
||
expect(res.body.reservation.confirmation_number).toBe('ABC123');
|
||
});
|
||
|
||
it('RESV-004b — PUT with day_id null derives day_id from reservation_time so it stays in the Plan (#1237)', async () => {
|
||
const { user } = await makeUser(orm);
|
||
const trip = await makeTrip(orm, user.id);
|
||
await makeDay(orm, trip.id, { date: '2025-09-01' });
|
||
const day2 = await makeDay(orm, trip.id, { date: '2025-09-02' });
|
||
const resv = await makeReservation(orm, trip.id, { title: 'Event', type: 'event' });
|
||
|
||
const res = await request(app)
|
||
.put(`/api/trips/${trip.id}/reservations/${resv.id}`)
|
||
.set('Cookie', authCookie(user.id))
|
||
.send({ title: 'Event', type: 'event', day_id: null, reservation_time: '2025-09-02' });
|
||
expect(res.status).toBe(200);
|
||
expect(res.body.reservation.day_id).toBe(day2.id);
|
||
});
|
||
|
||
it('RESV-004c — re-dating a booking moves it to the matching day (start + end) (#1237)', async () => {
|
||
const { user } = await makeUser(orm);
|
||
const trip = await makeTrip(orm, user.id);
|
||
const day1 = await makeDay(orm, trip.id, { date: '2025-10-01' });
|
||
const day3 = await makeDay(orm, trip.id, { date: '2025-10-03' });
|
||
|
||
// Booking sits on day 1 (start + end).
|
||
const created = await request(app)
|
||
.post(`/api/trips/${trip.id}/reservations`)
|
||
.set('Cookie', authCookie(user.id))
|
||
.send({
|
||
title: 'Event',
|
||
type: 'event',
|
||
day_id: day1.id,
|
||
reservation_time: '2025-10-01T09:00',
|
||
reservation_end_time: '2025-10-01T10:00',
|
||
});
|
||
const rid = created.body.reservation.id;
|
||
|
||
// Re-date to day 3 WITHOUT sending day_id (the modal omits it) — both ends follow.
|
||
const res = await request(app)
|
||
.put(`/api/trips/${trip.id}/reservations/${rid}`)
|
||
.set('Cookie', authCookie(user.id))
|
||
.send({
|
||
title: 'Event',
|
||
type: 'event',
|
||
reservation_time: '2025-10-03T00:00',
|
||
reservation_end_time: '2025-10-03T14:00',
|
||
});
|
||
expect(res.status).toBe(200);
|
||
expect(res.body.reservation.day_id).toBe(day3.id);
|
||
expect(res.body.reservation.end_day_id).toBe(day3.id);
|
||
});
|
||
|
||
it('RESV-004 — PUT on non-existent reservation returns 404', async () => {
|
||
const { user } = await makeUser(orm);
|
||
const trip = await makeTrip(orm, user.id);
|
||
|
||
const res = await request(app)
|
||
.put(`/api/trips/${trip.id}/reservations/99999`)
|
||
.set('Cookie', authCookie(user.id))
|
||
.send({ title: 'Updated' });
|
||
expect(res.status).toBe(404);
|
||
});
|
||
|
||
it('RESV-010 — PUT syncs check-in/out times to linked accommodation', async () => {
|
||
const { user } = await makeUser(orm);
|
||
const trip = await makeTrip(orm, user.id);
|
||
const day1 = await makeDay(orm, trip.id, { date: '2025-08-01' });
|
||
const day2 = await makeDay(orm, trip.id, { date: '2025-08-03' });
|
||
const place = await makePlace(orm, trip.id, { name: 'Sync Hotel' });
|
||
|
||
// Create reservation with linked accommodation
|
||
const createRes = await request(app)
|
||
.post(`/api/trips/${trip.id}/reservations`)
|
||
.set('Cookie', authCookie(user.id))
|
||
.send({
|
||
title: 'Hotel Booking',
|
||
type: 'hotel',
|
||
day_id: day1.id,
|
||
create_accommodation: { place_id: place.id, start_day_id: day1.id, end_day_id: day2.id },
|
||
});
|
||
expect(createRes.status).toBe(201);
|
||
const resvId = createRes.body.reservation.id;
|
||
|
||
// Update with metadata containing check-in/out times and confirmation_number
|
||
const updateRes = await request(app)
|
||
.put(`/api/trips/${trip.id}/reservations/${resvId}`)
|
||
.set('Cookie', authCookie(user.id))
|
||
.send({
|
||
metadata: { check_in_time: '15:00', check_out_time: '11:00' },
|
||
confirmation_number: 'HTL-XYZ-999',
|
||
});
|
||
expect(updateRes.status).toBe(200);
|
||
|
||
// Verify accommodation was updated with check-in/out
|
||
const accom = (await findRow(orm, DayAccommodations, { trip: trip.id }))!;
|
||
expect(accom.check_in).toBe('15:00');
|
||
expect(accom.check_out).toBe('11:00');
|
||
expect(accom.confirmation).toBe('HTL-XYZ-999');
|
||
});
|
||
|
||
// L2 (Plan 3d Task 7 whole-plan review): a hex-spelled `accommodation_id`
|
||
// in the PUT body used to coerce via `Number('0x1')` and pass the
|
||
// existence check, storing the raw hex string as the link — where the
|
||
// legacy raw-bind existence check's own affinity never converts a hex
|
||
// string, so it always stored NULL instead.
|
||
it('L2 — PUT with a hex-spelled accommodation_id stores NULL, matching the legacy affinity miss', async () => {
|
||
const { user } = await makeUser(orm);
|
||
const trip = await makeTrip(orm, user.id);
|
||
const day = await makeDay(orm, trip.id);
|
||
const place = await makePlace(orm, trip.id, { name: 'Hotel' });
|
||
const { accommodation: accom } = (
|
||
await request(app)
|
||
.post(`/api/trips/${trip.id}/accommodations`)
|
||
.set('Cookie', authCookie(user.id))
|
||
.send({ place_id: place.id, start_day_id: day.id, end_day_id: day.id })
|
||
).body as { accommodation: { id: number } };
|
||
const resv = await makeReservation(orm, trip.id, { title: 'Flight', type: 'flight' });
|
||
|
||
const hexAccId = '0x' + accom.id.toString(16);
|
||
const res = await request(app)
|
||
.put(`/api/trips/${trip.id}/reservations/${resv.id}`)
|
||
.set('Cookie', authCookie(user.id))
|
||
.send({ accommodation_id: hexAccId });
|
||
expect(res.status).toBe(200);
|
||
|
||
const row = (await findRow(orm, Reservations, { id: resv.id }))!;
|
||
expect(row.accommodation_id).toBeNull();
|
||
});
|
||
});
|
||
|
||
// ─────────────────────────────────────────────────────────────────────────────
|
||
// H1 (Plan 3d Task 7 whole-plan review, live regression) — RS28's
|
||
// `accommodation_id` write must store the same TEXT shape the legacy
|
||
// raw-bind statement did (`'<id>.0'`, a REAL-bound number, never `'<id>'`),
|
||
// because `DaysService.resyncAccommodationDays`'s DY23 restamp
|
||
// (`ReservationsRepository.restampLinkedReservation`) still compares
|
||
// against that REAL-bound shape (parity, not a fix — see its own
|
||
// docstring). A `String(n)` write silently orphans the linked reservation:
|
||
// the trip's dates change, the day plan moves, and the booking is left
|
||
// behind with no error anywhere.
|
||
// ─────────────────────────────────────────────────────────────────────────────
|
||
|
||
describe("H1 — a booking on a stay is restamped when the trip's dates change (DY23)", () => {
|
||
it('the accommodation_id RS28 stores is the legacy REAL-bound TEXT shape, and a later date change restamps the linked booking', async () => {
|
||
const { user } = await makeUser(orm);
|
||
const trip = await makeTrip(orm, user.id, { start_date: '2026-12-01', end_date: '2026-12-03' });
|
||
const day1 = (await findRow(orm, Days, { trip: trip.id, date: '2026-12-01' }))!;
|
||
const day2 = (await findRow(orm, Days, { trip: trip.id, date: '2026-12-02' }))!;
|
||
const place = await makePlace(orm, trip.id, { name: 'Lighthouse Inn' });
|
||
|
||
const createRes = await request(app)
|
||
.post(`/api/trips/${trip.id}/reservations`)
|
||
.set('Cookie', authCookie(user.id))
|
||
.send({
|
||
title: 'Lighthouse Inn Stay',
|
||
type: 'hotel',
|
||
day_id: day1.id,
|
||
reservation_time: '2026-12-01T10:00',
|
||
create_accommodation: { place_id: place.id, start_day_id: day1.id, end_day_id: day2.id },
|
||
});
|
||
expect(createRes.status).toBe(201);
|
||
const resvId = createRes.body.reservation.id;
|
||
|
||
// Stored-shape assert: the legacy REAL-bound TEXT shape (`'<id>.0'`), not
|
||
// the SQL-literal-inlined shape (`'<id>'`) `String(n)` used to store.
|
||
const stored = (await findRow(orm, Reservations, { id: resvId }))!;
|
||
expect(stored.accommodation_id).toMatch(/^\d+\.0$/);
|
||
|
||
// Move the whole trip a day later (default date_shift_mode, i.e. NOT
|
||
// 'shift_all'): days re-date positionally in place, the accommodation
|
||
// stays glued to its (now re-dated) day rows (#1288), and its linked
|
||
// reservation must follow — DY23's restamp.
|
||
const updateRes = await request(app)
|
||
.put(`/api/trips/${trip.id}`)
|
||
.set('Cookie', authCookie(user.id))
|
||
.send({ start_date: '2026-12-02', end_date: '2026-12-04' });
|
||
expect(updateRes.status).toBe(200);
|
||
|
||
const resvAfter = (await findRow(orm, Reservations, { id: resvId }))!;
|
||
expect(resvAfter.day_id).toBe(day1.id);
|
||
// Restamped onto day1's NEW date — red without the fix, where DY23's
|
||
// REAL-bound compare misses a `String(n)`-shaped accommodation_id and
|
||
// this stays '2026-12-01T10:00'.
|
||
expect(resvAfter.reservation_time).toBe('2026-12-02T10:00');
|
||
});
|
||
});
|
||
|
||
// ─────────────────────────────────────────────────────────────────────────────
|
||
// L3 (Plan 3d Task 7 whole-plan review): RS22 (`referencesOutsideTrip`'s
|
||
// `assignment_id` cross-trip check, `reservations.service.ts:540-541` +
|
||
// `Reservations.repository.ts::getAssignmentTripId`) had zero hits in the
|
||
// whole suite (lcov × diff). Pinned here through the real REST route.
|
||
// ─────────────────────────────────────────────────────────────────────────────
|
||
|
||
describe('RS22 — assignment_id foreign-reference check on POST /reservations', () => {
|
||
it('RS22-own: an assignment_id belonging to the SAME trip is accepted (201)', async () => {
|
||
const { user } = await makeUser(orm);
|
||
const trip = await makeTrip(orm, user.id);
|
||
const day = await makeDay(orm, trip.id);
|
||
const place = await makePlace(orm, trip.id);
|
||
const assignment = await makeDayAssignment(orm, day.id, place.id);
|
||
|
||
const res = await request(app)
|
||
.post(`/api/trips/${trip.id}/reservations`)
|
||
.set('Cookie', authCookie(user.id))
|
||
.send({ title: 'Dinner', type: 'restaurant', assignment_id: assignment.id });
|
||
expect(res.status).toBe(201);
|
||
expect(res.body.reservation.assignment_id).toBe(assignment.id);
|
||
});
|
||
|
||
it('RS22-foreign: an assignment_id belonging to a DIFFERENT trip is refused (400 "Not part of this trip: assignment_id")', async () => {
|
||
const { user } = await makeUser(orm);
|
||
const trip = await makeTrip(orm, user.id);
|
||
const otherTrip = await makeTrip(orm, user.id);
|
||
const otherDay = await makeDay(orm, otherTrip.id);
|
||
const otherPlace = await makePlace(orm, otherTrip.id);
|
||
const foreignAssignment = await makeDayAssignment(orm, otherDay.id, otherPlace.id);
|
||
|
||
const res = await request(app)
|
||
.post(`/api/trips/${trip.id}/reservations`)
|
||
.set('Cookie', authCookie(user.id))
|
||
.send({ title: 'Dinner', type: 'restaurant', assignment_id: foreignAssignment.id });
|
||
expect(res.status).toBe(400);
|
||
expect(res.body).toEqual({ error: 'Not part of this trip: assignment_id' });
|
||
});
|
||
|
||
it('RS22-missing: an assignment_id that resolves to nothing is refused (400 "Unknown reference: assignment_id")', async () => {
|
||
const { user } = await makeUser(orm);
|
||
const trip = await makeTrip(orm, user.id);
|
||
|
||
const res = await request(app)
|
||
.post(`/api/trips/${trip.id}/reservations`)
|
||
.set('Cookie', authCookie(user.id))
|
||
.send({ title: 'Dinner', type: 'restaurant', assignment_id: 999999 });
|
||
expect(res.status).toBe(400);
|
||
expect(res.body).toEqual({ error: 'Unknown reference: assignment_id' });
|
||
});
|
||
});
|
||
|
||
// ─────────────────────────────────────────────────────────────────────────────
|
||
// Delete reservation
|
||
// ─────────────────────────────────────────────────────────────────────────────
|
||
|
||
describe('Delete reservation', () => {
|
||
it('RESV-005 — DELETE removes reservation', async () => {
|
||
const { user } = await makeUser(orm);
|
||
const trip = await makeTrip(orm, user.id);
|
||
const resv = await makeReservation(orm, trip.id, { title: 'Flight', type: 'flight' });
|
||
|
||
const del = await request(app)
|
||
.delete(`/api/trips/${trip.id}/reservations/${resv.id}`)
|
||
.set('Cookie', authCookie(user.id));
|
||
expect(del.status).toBe(200);
|
||
expect(del.body.success).toBe(true);
|
||
|
||
const list = await request(app).get(`/api/trips/${trip.id}/reservations`).set('Cookie', authCookie(user.id));
|
||
expect(list.body.reservations).toHaveLength(0);
|
||
});
|
||
|
||
it('RESV-005 — DELETE non-existent reservation returns 404', async () => {
|
||
const { user } = await makeUser(orm);
|
||
const trip = await makeTrip(orm, user.id);
|
||
|
||
const res = await request(app)
|
||
.delete(`/api/trips/${trip.id}/reservations/99999`)
|
||
.set('Cookie', authCookie(user.id));
|
||
expect(res.status).toBe(404);
|
||
});
|
||
|
||
// M4 (Plan 3d Task 7 review): `remove`'s id parsed with `toRowId`, not the
|
||
// `Number()`-fallback `rowIdNum` — a hex-spelled id used to coerce to a
|
||
// real row and delete it, where the legacy raw-bind statement's affinity
|
||
// never converts a hex string and so 404'd. Rule 21.
|
||
it('M4 — DELETE …/reservations/0x<id> answers the legacy 404 and deletes nothing', async () => {
|
||
const { user } = await makeUser(orm);
|
||
const trip = await makeTrip(orm, user.id);
|
||
const resv = await makeReservation(orm, trip.id, { title: 'Flight', type: 'flight' });
|
||
const hexId = '0x' + resv.id.toString(16);
|
||
|
||
const res = await request(app)
|
||
.delete(`/api/trips/${trip.id}/reservations/${hexId}`)
|
||
.set('Cookie', authCookie(user.id));
|
||
expect(res.status).toBe(404);
|
||
|
||
const row = await findRow(orm, Reservations, { id: resv.id });
|
||
expect(row).not.toBeNull();
|
||
});
|
||
});
|
||
|
||
// ─────────────────────────────────────────────────────────────────────────────
|
||
// Batch update positions
|
||
// ─────────────────────────────────────────────────────────────────────────────
|
||
|
||
describe('Batch update positions', () => {
|
||
it('RESV-006 — PUT /positions updates reservation sort order', async () => {
|
||
const { user } = await makeUser(orm);
|
||
const trip = await makeTrip(orm, user.id);
|
||
const r1 = await makeReservation(orm, trip.id, { title: 'First', type: 'flight' });
|
||
const r2 = await makeReservation(orm, trip.id, { title: 'Second', type: 'hotel' });
|
||
|
||
const res = await request(app)
|
||
.put(`/api/trips/${trip.id}/reservations/positions`)
|
||
.set('Cookie', authCookie(user.id))
|
||
.send({
|
||
positions: [
|
||
{ id: r2.id, position: 0 },
|
||
{ id: r1.id, position: 1 },
|
||
],
|
||
});
|
||
expect(res.status).toBe(200);
|
||
expect(res.body.success).toBe(true);
|
||
});
|
||
|
||
// M4 (Plan 3d Task 7 review): `updatePositions`' `dayId` parsed with
|
||
// `toRowId`, not the `Number()`-fallback `rowIdNum` — a hex-spelled
|
||
// `day_id` used to coerce to a real day and reach the per-day upsert,
|
||
// where the legacy raw-bind statement's affinity never converts a hex
|
||
// string, so the join matched no row (a quiet no-op, not a write). Rule 21.
|
||
it('M4 — PUT /positions with a hex-spelled day_id is the legacy quiet no-op (no day-scoped row written)', async () => {
|
||
const { user } = await makeUser(orm);
|
||
const trip = await makeTrip(orm, user.id);
|
||
const day = await makeDay(orm, trip.id, { date: '2026-01-01' });
|
||
const resv = await makeReservation(orm, trip.id, { title: 'First', type: 'flight' });
|
||
const hexDayId = '0x' + day.id.toString(16);
|
||
|
||
const res = await request(app)
|
||
.put(`/api/trips/${trip.id}/reservations/positions`)
|
||
.set('Cookie', authCookie(user.id))
|
||
.send({ positions: [{ id: resv.id, day_plan_position: 0 }], day_id: hexDayId });
|
||
// Same success shape the legacy statement's own no-op miss returns —
|
||
// this is not a validation error, it silently writes nothing.
|
||
expect(res.status).toBe(200);
|
||
expect(res.body.success).toBe(true);
|
||
|
||
const row = await findRow(orm, ReservationDayPositions, { reservation: resv.id });
|
||
expect(row).toBeNull();
|
||
});
|
||
});
|
||
|
||
// ─────────────────────────────────────────────────────────────────────────────
|
||
// Budget entry auto-create / auto-update
|
||
// ─────────────────────────────────────────────────────────────────────────────
|
||
|
||
describe('Reservation budget entry integration', () => {
|
||
it('RESV-011 — POST with create_budget_entry auto-creates a linked budget item', async () => {
|
||
const { user } = await makeUser(orm);
|
||
const trip = await makeTrip(orm, user.id);
|
||
|
||
const res = await request(app)
|
||
.post(`/api/trips/${trip.id}/reservations`)
|
||
.set('Cookie', authCookie(user.id))
|
||
.send({
|
||
title: 'Flight to Paris',
|
||
type: 'flight',
|
||
create_budget_entry: { total_price: 250, category: 'Transport' },
|
||
});
|
||
expect(res.status).toBe(201);
|
||
|
||
const budgetItem = await linkedExpense(trip.id, res.body.reservation.id);
|
||
expect(budgetItem).not.toBeNull();
|
||
expect(budgetItem!.total_price).toBe(250);
|
||
expect(budgetItem.name).toBe('Flight to Paris');
|
||
});
|
||
|
||
it('RESV-011b — POST with create_budget_entry.total_price = 0 skips budget creation', async () => {
|
||
const { user } = await makeUser(orm);
|
||
const trip = await makeTrip(orm, user.id);
|
||
|
||
const res = await request(app)
|
||
.post(`/api/trips/${trip.id}/reservations`)
|
||
.set('Cookie', authCookie(user.id))
|
||
.send({
|
||
title: 'Free Entry',
|
||
type: 'activity',
|
||
create_budget_entry: { total_price: 0 },
|
||
});
|
||
expect(res.status).toBe(201);
|
||
|
||
const budgetItems = await findRows(orm, BudgetItems, { trip: trip.id });
|
||
expect(budgetItems).toHaveLength(0);
|
||
});
|
||
|
||
it('RESV-012 — PUT with create_budget_entry creates a new budget item when none exists', async () => {
|
||
const { user } = await makeUser(orm);
|
||
const trip = await makeTrip(orm, user.id);
|
||
const resv = await makeReservation(orm, trip.id, { title: 'Hotel Stay', type: 'hotel' });
|
||
|
||
const res = await request(app)
|
||
.put(`/api/trips/${trip.id}/reservations/${resv.id}`)
|
||
.set('Cookie', authCookie(user.id))
|
||
.send({ create_budget_entry: { total_price: 300, category: 'Accommodation' } });
|
||
expect(res.status).toBe(200);
|
||
|
||
const budgetItem = await linkedExpense(trip.id, resv.id);
|
||
expect(budgetItem).not.toBeNull();
|
||
expect(budgetItem!.total_price).toBe(300);
|
||
});
|
||
|
||
it('RESV-013 — PUT with create_budget_entry updates existing linked budget item', async () => {
|
||
const { user } = await makeUser(orm);
|
||
const trip = await makeTrip(orm, user.id);
|
||
|
||
// Create reservation with budget entry via POST
|
||
const createRes = await request(app)
|
||
.post(`/api/trips/${trip.id}/reservations`)
|
||
.set('Cookie', authCookie(user.id))
|
||
.send({
|
||
title: 'Car Rental',
|
||
type: 'transport',
|
||
create_budget_entry: { total_price: 100, category: 'Transport' },
|
||
});
|
||
expect(createRes.status).toBe(201);
|
||
const resvId = createRes.body.reservation.id;
|
||
|
||
// Update with a new price — should update the existing budget item
|
||
const updateRes = await request(app)
|
||
.put(`/api/trips/${trip.id}/reservations/${resvId}`)
|
||
.set('Cookie', authCookie(user.id))
|
||
.send({ create_budget_entry: { total_price: 150, category: 'Transport' } });
|
||
expect(updateRes.status).toBe(200);
|
||
|
||
const items = await findRows(orm, BudgetItems, { trip: trip.id, reservation: resvId });
|
||
expect(items).toHaveLength(1);
|
||
expect(items[0].total_price).toBe(150);
|
||
});
|
||
|
||
it('RESV-014 — PUT without create_budget_entry keeps the existing linked budget item', async () => {
|
||
const { user } = await makeUser(orm);
|
||
const trip = await makeTrip(orm, user.id);
|
||
|
||
// Create with budget entry
|
||
const createRes = await request(app)
|
||
.post(`/api/trips/${trip.id}/reservations`)
|
||
.set('Cookie', authCookie(user.id))
|
||
.send({
|
||
title: 'Taxi',
|
||
type: 'transport',
|
||
create_budget_entry: { total_price: 50, category: 'Transport' },
|
||
});
|
||
expect(createRes.status).toBe(201);
|
||
const resvId = createRes.body.reservation.id;
|
||
|
||
const before = await linkedExpense(trip.id, resvId);
|
||
expect(before).not.toBeNull();
|
||
|
||
// Update WITHOUT create_budget_entry — the booking edit must NOT touch its
|
||
// linked expense (expenses are managed from the Costs section now).
|
||
const updateRes = await request(app)
|
||
.put(`/api/trips/${trip.id}/reservations/${resvId}`)
|
||
.set('Cookie', authCookie(user.id))
|
||
.send({ title: 'Taxi Updated' });
|
||
expect(updateRes.status).toBe(200);
|
||
|
||
const after = await linkedExpense(trip.id, resvId);
|
||
expect(after).not.toBeNull();
|
||
});
|
||
|
||
it('RESV-014b — PUT with create_budget_entry total_price 0 removes the linked budget item', async () => {
|
||
const { user } = await makeUser(orm);
|
||
const trip = await makeTrip(orm, user.id);
|
||
|
||
const createRes = await request(app)
|
||
.post(`/api/trips/${trip.id}/reservations`)
|
||
.set('Cookie', authCookie(user.id))
|
||
.send({
|
||
title: 'Taxi',
|
||
type: 'transport',
|
||
create_budget_entry: { total_price: 50, category: 'Transport' },
|
||
});
|
||
expect(createRes.status).toBe(201);
|
||
const resvId = createRes.body.reservation.id;
|
||
|
||
// Explicit clear (total_price 0) still removes the linked item.
|
||
const updateRes = await request(app)
|
||
.put(`/api/trips/${trip.id}/reservations/${resvId}`)
|
||
.set('Cookie', authCookie(user.id))
|
||
.send({ title: 'Taxi', create_budget_entry: { total_price: 0 } });
|
||
expect(updateRes.status).toBe(200);
|
||
|
||
const after = await linkedExpense(trip.id, resvId);
|
||
expect(after).toBeNull();
|
||
});
|
||
|
||
it('RESV-014c — changing the booking type updates the linked expense category', async () => {
|
||
const { user } = await makeUser(orm);
|
||
const trip = await makeTrip(orm, user.id);
|
||
|
||
const createRes = await request(app)
|
||
.post(`/api/trips/${trip.id}/reservations`)
|
||
.set('Cookie', authCookie(user.id))
|
||
.send({ title: 'Booking', type: 'other', create_budget_entry: { total_price: 50, category: 'other' } });
|
||
const resvId = createRes.body.reservation.id;
|
||
|
||
// Change the type other -> hotel (no create_budget_entry).
|
||
await request(app)
|
||
.put(`/api/trips/${trip.id}/reservations/${resvId}`)
|
||
.set('Cookie', authCookie(user.id))
|
||
.send({ title: 'Booking', type: 'hotel' });
|
||
|
||
const item = (await linkedExpense(trip.id, resvId))!;
|
||
expect(item.category).toBe('accommodation');
|
||
});
|
||
|
||
it('RESV-014d — a manually-picked expense category survives a booking type change', async () => {
|
||
const { user } = await makeUser(orm);
|
||
const trip = await makeTrip(orm, user.id);
|
||
|
||
const createRes = await request(app)
|
||
.post(`/api/trips/${trip.id}/reservations`)
|
||
.set('Cookie', authCookie(user.id))
|
||
.send({ title: 'Booking', type: 'other', create_budget_entry: { total_price: 50, category: 'other' } });
|
||
const resvId = createRes.body.reservation.id;
|
||
|
||
// Simulate a manual category pick in the Costs editor.
|
||
await updateRows(orm, BudgetItems, { trip: trip.id, reservation: resvId }, { category: 'fees' });
|
||
|
||
await request(app)
|
||
.put(`/api/trips/${trip.id}/reservations/${resvId}`)
|
||
.set('Cookie', authCookie(user.id))
|
||
.send({ title: 'Booking', type: 'hotel' });
|
||
|
||
const item = (await linkedExpense(trip.id, resvId))!;
|
||
expect(item.category).toBe('fees');
|
||
});
|
||
});
|
||
|
||
describe('Reservation accommodation delete', () => {
|
||
it('RESV-009 — DELETE reservation linked to accommodation also removes the accommodation', async () => {
|
||
const { user } = await makeUser(orm);
|
||
const trip = await makeTrip(orm, user.id);
|
||
const day1 = await makeDay(orm, trip.id, { date: '2025-07-01' });
|
||
const day2 = await makeDay(orm, trip.id, { date: '2025-07-03' });
|
||
const place = await makePlace(orm, trip.id, { name: 'Hotel Belle' });
|
||
|
||
// Create a reservation via API with create_accommodation as an object
|
||
const createRes = await request(app)
|
||
.post(`/api/trips/${trip.id}/reservations`)
|
||
.set('Cookie', authCookie(user.id))
|
||
.send({
|
||
title: 'Hotel Belle Stay',
|
||
type: 'hotel',
|
||
day_id: day1.id,
|
||
create_accommodation: {
|
||
place_id: place.id,
|
||
start_day_id: day1.id,
|
||
end_day_id: day2.id,
|
||
},
|
||
});
|
||
expect(createRes.status).toBe(201);
|
||
const reservationId = createRes.body.reservation.id;
|
||
|
||
// Verify accommodation was created
|
||
const accom = (await findRow(orm, DayAccommodations, { trip: trip.id }))!;
|
||
expect(accom).not.toBeNull();
|
||
|
||
// Delete reservation — should also remove the accommodation
|
||
const delRes = await request(app)
|
||
.delete(`/api/trips/${trip.id}/reservations/${reservationId}`)
|
||
.set('Cookie', authCookie(user.id));
|
||
expect(delRes.status).toBe(200);
|
||
|
||
const accomAfter = await findRow(orm, DayAccommodations, { id: accom.id });
|
||
expect(accomAfter).toBeNull();
|
||
});
|
||
|
||
it('RESV-009b — DELETE reservation linked to accommodation also removes its linked budget item (issue #933)', async () => {
|
||
const { user } = await makeUser(orm);
|
||
const trip = await makeTrip(orm, user.id);
|
||
const day1 = await makeDay(orm, trip.id, { date: '2025-08-01' });
|
||
const day2 = await makeDay(orm, trip.id, { date: '2025-08-03' });
|
||
const place = await makePlace(orm, trip.id, { name: 'Seaside Resort' });
|
||
|
||
const createRes = await request(app)
|
||
.post(`/api/trips/${trip.id}/reservations`)
|
||
.set('Cookie', authCookie(user.id))
|
||
.send({
|
||
title: 'Seaside Resort Stay',
|
||
type: 'hotel',
|
||
day_id: day1.id,
|
||
create_accommodation: { place_id: place.id, start_day_id: day1.id, end_day_id: day2.id },
|
||
create_budget_entry: { total_price: 320, category: 'Accommodation' },
|
||
});
|
||
expect(createRes.status).toBe(201);
|
||
const reservationId = createRes.body.reservation.id;
|
||
|
||
const budgetBefore = await linkedExpense(trip.id, reservationId);
|
||
expect(budgetBefore).not.toBeNull();
|
||
|
||
// Delete via the reservation endpoint
|
||
const delRes = await request(app)
|
||
.delete(`/api/trips/${trip.id}/reservations/${reservationId}`)
|
||
.set('Cookie', authCookie(user.id));
|
||
expect(delRes.status).toBe(200);
|
||
|
||
const budgetAfter = await findRow(orm, BudgetItems, { trip: trip.id });
|
||
expect(budgetAfter).toBeNull();
|
||
});
|
||
});
|