mirror of
https://github.com/mauriceboe/TREK.git
synced 2026-10-19 21:46:49 +00:00
jubnl
791 lines
36 KiB
TypeScript
791 lines
36 KiB
TypeScript
/**
|
||
* Reservations integration tests.
|
||
* Covers RESV-001 to RESV-007.
|
||
*/
|
||
import { describe, it, expect, vi, beforeAll, beforeEach, afterAll } from 'vitest';
|
||
import request from 'supertest';
|
||
import type { Application } from 'express';
|
||
import type { INestApplication } from '@nestjs/common';
|
||
|
||
vi.mock('../../src/db/database', async () => {
|
||
const { createSnapshotTestDb, buildDbMock } = await import('../helpers/db-mock');
|
||
return buildDbMock(createSnapshotTestDb());
|
||
});
|
||
vi.mock('../../src/config', () => ({
|
||
JWT_SECRET: 'test-jwt-secret-for-trek-testing-only',
|
||
ENCRYPTION_KEY: 'a1b2c3d4e5f6a7b8c9d0e1f2a3b4c5d6a7b8c9d0e1f2a3b4c5d6a7b8c9d0e1f2',
|
||
updateJwtSecret: () => {},
|
||
SESSION_DURATION: '24h',
|
||
SESSION_DURATION_MS: 86400000,
|
||
SESSION_DURATION_SECONDS: 86400,
|
||
DEFAULT_LANGUAGE: 'en',
|
||
}));
|
||
vi.mock('../../src/websocket', () => ({ broadcast: vi.fn(), broadcastToUser: vi.fn() }));
|
||
|
||
import { db as testDb } from '../../src/db/database';
|
||
import { buildApp } from '../../src/bootstrap';
|
||
import { resetTestDb, resetRateLimits } from '../helpers/test-db';
|
||
import { createUser, createTrip, createDay, createPlace, createReservation, createDayAssignment, addTripMember } from '../helpers/factories';
|
||
import { authCookie } from '../helpers/auth';
|
||
|
||
let nestApp: INestApplication;
|
||
let app: Application;
|
||
|
||
beforeAll(async () => {
|
||
nestApp = await buildApp();
|
||
app = nestApp.getHttpAdapter().getInstance();
|
||
});
|
||
|
||
beforeEach(() => {
|
||
resetTestDb(testDb);
|
||
resetRateLimits(nestApp);
|
||
});
|
||
|
||
afterAll(async () => {
|
||
await nestApp.close();
|
||
testDb.close();
|
||
});
|
||
|
||
// ─────────────────────────────────────────────────────────────────────────────
|
||
// Create reservation
|
||
// ─────────────────────────────────────────────────────────────────────────────
|
||
|
||
describe('Create reservation', () => {
|
||
it('RESV-001 — POST /api/trips/:tripId/reservations creates a reservation', async () => {
|
||
const { user } = createUser(testDb);
|
||
const trip = createTrip(testDb, 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 } = createUser(testDb);
|
||
const trip = createTrip(testDb, 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 } = createUser(testDb);
|
||
const trip = createTrip(testDb, 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 } = createUser(testDb);
|
||
const { user: other } = createUser(testDb);
|
||
const trip = createTrip(testDb, 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 } = createUser(testDb);
|
||
const trip = createTrip(testDb, user.id);
|
||
const day = createDay(testDb, 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 } = createUser(testDb);
|
||
const trip = createTrip(testDb, user.id);
|
||
createReservation(testDb, trip.id, { title: 'Flight Out', type: 'flight' });
|
||
createReservation(testDb, 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 } = createUser(testDb);
|
||
const trip = createTrip(testDb, 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 } = createUser(testDb);
|
||
const { user: other } = createUser(testDb);
|
||
const trip = createTrip(testDb, 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 } = createUser(testDb);
|
||
const trip = createTrip(testDb, user.id);
|
||
const resv = createReservation(testDb, 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 } = createUser(testDb);
|
||
const trip = createTrip(testDb, user.id);
|
||
createDay(testDb, trip.id, { date: '2025-09-01' });
|
||
const day2 = createDay(testDb, trip.id, { date: '2025-09-02' });
|
||
const resv = createReservation(testDb, 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 } = createUser(testDb);
|
||
const trip = createTrip(testDb, user.id);
|
||
const day1 = createDay(testDb, trip.id, { date: '2025-10-01' });
|
||
const day3 = createDay(testDb, 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 } = createUser(testDb);
|
||
const trip = createTrip(testDb, 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 } = createUser(testDb);
|
||
const trip = createTrip(testDb, user.id);
|
||
const day1 = createDay(testDb, trip.id, { date: '2025-08-01' });
|
||
const day2 = createDay(testDb, trip.id, { date: '2025-08-03' });
|
||
const place = createPlace(testDb, 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 = testDb.prepare('SELECT * FROM day_accommodations WHERE trip_id = ?').get(trip.id) as any;
|
||
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 } = createUser(testDb);
|
||
const trip = createTrip(testDb, user.id);
|
||
const day = createDay(testDb, trip.id);
|
||
const place = createPlace(testDb, 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 = createReservation(testDb, 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 = testDb.prepare('SELECT accommodation_id FROM reservations WHERE id = ?').get(resv.id) as { accommodation_id: string | null };
|
||
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 } = createUser(testDb);
|
||
const trip = createTrip(testDb, user.id, { start_date: '2026-12-01', end_date: '2026-12-03' });
|
||
const day1 = testDb.prepare('SELECT id FROM days WHERE trip_id = ? AND date = ?').get(trip.id, '2026-12-01') as { id: number };
|
||
const day2 = testDb.prepare('SELECT id FROM days WHERE trip_id = ? AND date = ?').get(trip.id, '2026-12-02') as { id: number };
|
||
const place = createPlace(testDb, 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 = testDb.prepare('SELECT accommodation_id FROM reservations WHERE id = ?').get(resvId) as { accommodation_id: string };
|
||
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 = testDb.prepare('SELECT day_id, reservation_time FROM reservations WHERE id = ?').get(resvId) as
|
||
{ day_id: number; reservation_time: string | null };
|
||
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 } = createUser(testDb);
|
||
const trip = createTrip(testDb, user.id);
|
||
const day = createDay(testDb, trip.id);
|
||
const place = createPlace(testDb, trip.id);
|
||
const assignment = createDayAssignment(testDb, 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 } = createUser(testDb);
|
||
const trip = createTrip(testDb, user.id);
|
||
const otherTrip = createTrip(testDb, user.id);
|
||
const otherDay = createDay(testDb, otherTrip.id);
|
||
const otherPlace = createPlace(testDb, otherTrip.id);
|
||
const foreignAssignment = createDayAssignment(testDb, 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 } = createUser(testDb);
|
||
const trip = createTrip(testDb, 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 } = createUser(testDb);
|
||
const trip = createTrip(testDb, user.id);
|
||
const resv = createReservation(testDb, 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 } = createUser(testDb);
|
||
const trip = createTrip(testDb, 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 } = createUser(testDb);
|
||
const trip = createTrip(testDb, user.id);
|
||
const resv = createReservation(testDb, 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 = testDb.prepare('SELECT id FROM reservations WHERE id = ?').get(resv.id);
|
||
expect(row).toBeDefined();
|
||
});
|
||
});
|
||
|
||
// ─────────────────────────────────────────────────────────────────────────────
|
||
// Batch update positions
|
||
// ─────────────────────────────────────────────────────────────────────────────
|
||
|
||
describe('Batch update positions', () => {
|
||
it('RESV-006 — PUT /positions updates reservation sort order', async () => {
|
||
const { user } = createUser(testDb);
|
||
const trip = createTrip(testDb, user.id);
|
||
const r1 = createReservation(testDb, trip.id, { title: 'First', type: 'flight' });
|
||
const r2 = createReservation(testDb, 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 } = createUser(testDb);
|
||
const trip = createTrip(testDb, user.id);
|
||
const day = createDay(testDb, trip.id, { date: '2026-01-01' });
|
||
const resv = createReservation(testDb, 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 = testDb.prepare('SELECT * FROM reservation_day_positions WHERE reservation_id = ?').get(resv.id);
|
||
expect(row).toBeUndefined();
|
||
});
|
||
});
|
||
|
||
// ─────────────────────────────────────────────────────────────────────────────
|
||
// 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 } = createUser(testDb);
|
||
const trip = createTrip(testDb, 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 = testDb
|
||
.prepare('SELECT * FROM budget_items WHERE trip_id = ? AND reservation_id = ?')
|
||
.get(trip.id, res.body.reservation.id) as any;
|
||
expect(budgetItem).toBeDefined();
|
||
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 } = createUser(testDb);
|
||
const trip = createTrip(testDb, 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 = testDb
|
||
.prepare('SELECT * FROM budget_items WHERE trip_id = ?')
|
||
.all(trip.id) as any[];
|
||
expect(budgetItems).toHaveLength(0);
|
||
});
|
||
|
||
it('RESV-012 — PUT with create_budget_entry creates a new budget item when none exists', async () => {
|
||
const { user } = createUser(testDb);
|
||
const trip = createTrip(testDb, user.id);
|
||
const resv = createReservation(testDb, 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 = testDb
|
||
.prepare('SELECT * FROM budget_items WHERE trip_id = ? AND reservation_id = ?')
|
||
.get(trip.id, resv.id) as any;
|
||
expect(budgetItem).toBeDefined();
|
||
expect(budgetItem.total_price).toBe(300);
|
||
});
|
||
|
||
it('RESV-013 — PUT with create_budget_entry updates existing linked budget item', async () => {
|
||
const { user } = createUser(testDb);
|
||
const trip = createTrip(testDb, 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 = testDb
|
||
.prepare('SELECT * FROM budget_items WHERE trip_id = ? AND reservation_id = ?')
|
||
.all(trip.id, resvId) as any[];
|
||
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 } = createUser(testDb);
|
||
const trip = createTrip(testDb, 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 = testDb
|
||
.prepare('SELECT id FROM budget_items WHERE trip_id = ? AND reservation_id = ?')
|
||
.get(trip.id, resvId);
|
||
expect(before).toBeDefined();
|
||
|
||
// 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 = testDb
|
||
.prepare('SELECT id FROM budget_items WHERE trip_id = ? AND reservation_id = ?')
|
||
.get(trip.id, resvId);
|
||
expect(after).toBeDefined();
|
||
});
|
||
|
||
it('RESV-014b — PUT with create_budget_entry total_price 0 removes the linked budget item', async () => {
|
||
const { user } = createUser(testDb);
|
||
const trip = createTrip(testDb, 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 = testDb
|
||
.prepare('SELECT id FROM budget_items WHERE trip_id = ? AND reservation_id = ?')
|
||
.get(trip.id, resvId);
|
||
expect(after).toBeUndefined();
|
||
});
|
||
|
||
it('RESV-014c — changing the booking type updates the linked expense category', async () => {
|
||
const { user } = createUser(testDb);
|
||
const trip = createTrip(testDb, 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 = testDb
|
||
.prepare('SELECT category FROM budget_items WHERE trip_id = ? AND reservation_id = ?')
|
||
.get(trip.id, resvId) as { category: string };
|
||
expect(item.category).toBe('accommodation');
|
||
});
|
||
|
||
it('RESV-014d — a manually-picked expense category survives a booking type change', async () => {
|
||
const { user } = createUser(testDb);
|
||
const trip = createTrip(testDb, 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.
|
||
testDb.prepare('UPDATE budget_items SET category = ? WHERE trip_id = ? AND reservation_id = ?').run('fees', trip.id, resvId);
|
||
|
||
await request(app)
|
||
.put(`/api/trips/${trip.id}/reservations/${resvId}`)
|
||
.set('Cookie', authCookie(user.id))
|
||
.send({ title: 'Booking', type: 'hotel' });
|
||
|
||
const item = testDb
|
||
.prepare('SELECT category FROM budget_items WHERE trip_id = ? AND reservation_id = ?')
|
||
.get(trip.id, resvId) as { category: string };
|
||
expect(item.category).toBe('fees');
|
||
});
|
||
});
|
||
|
||
describe('Reservation accommodation delete', () => {
|
||
it('RESV-009 — DELETE reservation linked to accommodation also removes the accommodation', async () => {
|
||
const { user } = createUser(testDb);
|
||
const trip = createTrip(testDb, user.id);
|
||
const day1 = createDay(testDb, trip.id, { date: '2025-07-01' });
|
||
const day2 = createDay(testDb, trip.id, { date: '2025-07-03' });
|
||
const place = createPlace(testDb, 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 = testDb.prepare(
|
||
'SELECT id FROM day_accommodations WHERE trip_id = ?'
|
||
).get(trip.id) as any;
|
||
expect(accom).toBeDefined();
|
||
|
||
// 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 = testDb.prepare(
|
||
'SELECT id FROM day_accommodations WHERE id = ?'
|
||
).get(accom.id);
|
||
expect(accomAfter).toBeUndefined();
|
||
});
|
||
|
||
it('RESV-009b — DELETE reservation linked to accommodation also removes its linked budget item (issue #933)', async () => {
|
||
const { user } = createUser(testDb);
|
||
const trip = createTrip(testDb, user.id);
|
||
const day1 = createDay(testDb, trip.id, { date: '2025-08-01' });
|
||
const day2 = createDay(testDb, trip.id, { date: '2025-08-03' });
|
||
const place = createPlace(testDb, 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 = testDb.prepare(
|
||
'SELECT id FROM budget_items WHERE trip_id = ? AND reservation_id = ?'
|
||
).get(trip.id, reservationId);
|
||
expect(budgetBefore).toBeDefined();
|
||
|
||
// 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 = testDb.prepare(
|
||
'SELECT id FROM budget_items WHERE trip_id = ?'
|
||
).get(trip.id);
|
||
expect(budgetAfter).toBeUndefined();
|
||
});
|
||
});
|