mirror of
https://github.com/mauriceboe/TREK.git
synced 2026-10-18 21:16:47 +00:00
06bee95ae3
A euro trip read in dollars books a bill entered in dollars at the rate of the day, from the euro's quote: 12,345.67 USD at 1.1398 is 10,831.44 EUR. The Costs screen and the settlement then turned those euros back into dollars with the dollar's own quote, 1 / 0.87732. Frankfurter rounds the two quotes separately, so they are not exact inverses, and the bill read $12,346.05 the moment it was saved, a $250.00 one $250.01. The error grows with the amount, which is why the large rows showed it first. Paying back what settle-up offered for such a bill left the trip open with the debt flipped the other way. Both sides now convert trip money to the display currency with the trip currency's own quote, the one every entry rate is frozen from. On the server, settlement() fetches that quote for the REST route and for the MCP get_settlement_summary tool, which now makes the same call, and a legacy transfer without a currency reads back through the same factor. On the client, useExchangeRates takes the trip currency as an anchor and converts through its cached quote, falling back to the display currency's while it is missing, so it works offline from cache and needs no change to the settlement response. The final budget builds each row from the unrounded trip amount, because a euro cent is worth more than a dollar cent and 10,831.44 EUR came back as 12,345.68; the balances and settle-up still net whole trip cents. A same-day bill in the display currency now reads exactly as typed on the row, the payer chip, the day header, the totals, Outstanding and the final budget, on both shells and on the shared trip page, and paying the amount settle-up offers leaves both balances at zero. When the rate really moved, the row keeps the value the totals count, with what was entered and the euros it was booked at underneath, "$801.76 -> 685,26 EUR". One helper builds that line for the desktop list, the phone list, payments, the final budget breakdown and the shared page; it prints nothing for an amount of 0 or a bill that reads as typed. The expense editors share one module for their preview. The split summary puts the share the row lends or borrows next to the entered one, "$400.88 -> $390.53 each", and an expense saved without a currency still opens in the trip currency. Both CSV exports add the amount in the trip currency when it differs from the display currency. Kept from before: the desktop totals recompute when rates arrive, a booking's linked cost is labelled in the trip currency, a legacy transfer is read in the display currency, the shared page reads the frozen rate in whole cents, a booking import keeps the currency it was quoted in at a rate frozen before the write (REST and plugin RPC), and the MCP trip summary, the budget-overview prompt and the per-person summary add every row up in trip cents at its frozen rate. The packing-list prompt reads the trip title directly instead of building the whole summary, which could wait on a rates fetch.
248 lines
13 KiB
TypeScript
248 lines
13 KiB
TypeScript
import { describe, it, expect, vi } from 'vitest';
|
|
import { HttpException } from '@nestjs/common';
|
|
import { BudgetController } from '../../../src/nest/budget/budget.controller';
|
|
import type { BudgetService } from '../../../src/nest/budget/budget.service';
|
|
import type { User } from '../../../src/types';
|
|
|
|
const user = { id: 1, role: 'user', email: 'u@example.test' } as User;
|
|
const trip = { id: 5, user_id: 1 };
|
|
|
|
function makeService(overrides: Partial<BudgetService> = {}): BudgetService {
|
|
return {
|
|
verifyTripAccess: vi.fn().mockReturnValue(trip),
|
|
canEdit: vi.fn().mockReturnValue(true),
|
|
broadcast: vi.fn(),
|
|
syncReservationPrice: vi.fn(),
|
|
...overrides,
|
|
} as unknown as BudgetService;
|
|
}
|
|
|
|
function thrown(fn: () => unknown): { status: number; body: unknown } {
|
|
try {
|
|
fn();
|
|
} catch (err) {
|
|
expect(err).toBeInstanceOf(HttpException);
|
|
const e = err as HttpException;
|
|
return { status: e.getStatus(), body: e.getResponse() };
|
|
}
|
|
throw new Error('expected the handler to throw');
|
|
}
|
|
|
|
async function thrownAsync(fn: () => Promise<unknown>): Promise<{ status: number; body: unknown }> {
|
|
try {
|
|
await fn();
|
|
} catch (err) {
|
|
expect(err).toBeInstanceOf(HttpException);
|
|
const e = err as HttpException;
|
|
return { status: e.getStatus(), body: e.getResponse() };
|
|
}
|
|
throw new Error('expected the handler to throw');
|
|
}
|
|
|
|
/** The trip row TripAccessGuard resolves and @Trip() hands to the settlement route. */
|
|
const tripRow = { id: 5, user_id: 42, currency: 'USD' } as never;
|
|
|
|
describe('BudgetController (parity with the legacy /api/trips/:tripId/budget route)', () => {
|
|
|
|
it('GET / returns items', () => {
|
|
const svc = makeService({ list: vi.fn().mockReturnValue([{ id: 1 }]) } as Partial<BudgetService>);
|
|
expect(new BudgetController(svc).list(user, '5')).toEqual({ items: [{ id: 1 }] });
|
|
});
|
|
|
|
it('GET /summary/per-person + /settlement delegate', async () => {
|
|
const settlement = vi.fn().mockReturnValue({ transfers: [] });
|
|
const svc = makeService({
|
|
perPersonSummary: vi.fn().mockReturnValue([{ userId: 1, owes: 10 }]),
|
|
settlement,
|
|
} as Partial<BudgetService>);
|
|
expect(await new BudgetController(svc).perPerson(user, '5')).toEqual({ summary: [{ userId: 1, owes: 10 }] });
|
|
// A trip with no currency set falls back to EUR rather than passing undefined on.
|
|
expect(new BudgetController(svc).settlement(user, { id: 5, user_id: 42 } as never, '5')).toEqual({ transfers: [] });
|
|
expect(settlement).toHaveBeenLastCalledWith('5', undefined, 'EUR');
|
|
});
|
|
|
|
it('GET /settlement forwards the base query and the trip currency', () => {
|
|
const settlement = vi.fn().mockReturnValue({ transfers: [] });
|
|
const svc = makeService({
|
|
verifyTripAccess: vi.fn().mockReturnValue({ id: 5, user_id: 1, currency: 'USD' }),
|
|
settlement,
|
|
} as Partial<BudgetService>);
|
|
new BudgetController(svc).settlement(user, tripRow, '5', 'GBP');
|
|
expect(settlement).toHaveBeenCalledWith('5', 'GBP', 'USD');
|
|
});
|
|
|
|
describe('settlements ledger', () => {
|
|
it('GET /settlements lists', () => {
|
|
const svc = makeService({ listSettlements: vi.fn().mockReturnValue([{ id: 1 }]) } as Partial<BudgetService>);
|
|
expect(new BudgetController(svc).listSettlements(user, '5')).toEqual({ settlements: [{ id: 1 }] });
|
|
});
|
|
|
|
|
|
// The legacy 'from_user_id, to_user_id and amount are required' 400s are now
|
|
// produced by the global ZodValidationPipe (budget.dto.ts) before the handler
|
|
// runs — covered by the integration suite, not constructible here.
|
|
|
|
it('POST /settlements creates and broadcasts (amount 0 is allowed), forwarding the display currency and the settled day', async () => {
|
|
const createSettlement = vi.fn().mockResolvedValue({ id: 3, amount: 0 });
|
|
const broadcast = vi.fn();
|
|
const svc = makeService({ createSettlement, broadcast } as Partial<BudgetService>);
|
|
const res = await new BudgetController(svc).createSettlement(user, '5', { from_user_id: 1, to_user_id: 2, amount: 0, currency: 'USD', settled_at: '2026-01-05' }, 'sock');
|
|
expect(res).toEqual({ settlement: { id: 3, amount: 0 } });
|
|
expect(createSettlement).toHaveBeenCalledWith('5', { from_user_id: 1, to_user_id: 2, amount: 0, currency: 'USD', settled_at: '2026-01-05' }, user.id);
|
|
expect(broadcast).toHaveBeenCalledWith('5', 'budget:settlement-created', { settlement: { id: 3, amount: 0 } }, 'sock');
|
|
});
|
|
|
|
it('DELETE /settlements/:id 404 when missing', () => {
|
|
const svc = makeService({ deleteSettlement: vi.fn().mockReturnValue(false) } as Partial<BudgetService>);
|
|
expect(thrown(() => new BudgetController(svc).deleteSettlement(user, '5', '7'))).toEqual({
|
|
status: 404, body: { error: 'Settlement not found' },
|
|
});
|
|
});
|
|
|
|
it('DELETE /settlements/:id success broadcasts the numeric id', () => {
|
|
const broadcast = vi.fn();
|
|
const svc = makeService({ deleteSettlement: vi.fn().mockReturnValue(true), broadcast } as Partial<BudgetService>);
|
|
expect(new BudgetController(svc).deleteSettlement(user, '5', '7', 'sock')).toEqual({ success: true });
|
|
expect(broadcast).toHaveBeenCalledWith('5', 'budget:settlement-deleted', { settlementId: 7 }, 'sock');
|
|
});
|
|
|
|
|
|
it('PUT /settlements/:id 404 when missing', async () => {
|
|
const svc = makeService({ updateSettlement: vi.fn().mockResolvedValue(null) } as Partial<BudgetService>);
|
|
expect(await thrownAsync(() => new BudgetController(svc).updateSettlement(user, '5', '7', { from_user_id: 1, to_user_id: 2, amount: 10 }))).toEqual({
|
|
status: 404, body: { error: 'Settlement not found' },
|
|
});
|
|
});
|
|
|
|
it('PUT /settlements/:id updates and broadcasts, forwarding the display currency and the settled day', async () => {
|
|
const updateSettlement = vi.fn().mockResolvedValue({ id: 7, from_user_id: 2, to_user_id: 1, amount: 15 });
|
|
const broadcast = vi.fn();
|
|
const svc = makeService({ updateSettlement, broadcast } as Partial<BudgetService>);
|
|
const res = await new BudgetController(svc).updateSettlement(user, '5', '7', { from_user_id: 2, to_user_id: 1, amount: 15, currency: 'USD', settled_at: '2026-01-06' }, 'sock');
|
|
expect(res).toEqual({ settlement: { id: 7, from_user_id: 2, to_user_id: 1, amount: 15 } });
|
|
expect(updateSettlement).toHaveBeenCalledWith('7', '5', { from_user_id: 2, to_user_id: 1, amount: 15, currency: 'USD', settled_at: '2026-01-06' });
|
|
expect(broadcast).toHaveBeenCalledWith('5', 'budget:settlement-updated', { settlement: { id: 7, from_user_id: 2, to_user_id: 1, amount: 15 } }, 'sock');
|
|
});
|
|
});
|
|
|
|
describe('POST /', () => {
|
|
|
|
// The legacy 'Name is required' 400 is now produced by the global
|
|
// ZodValidationPipe (budgetCreateItemRequestSchema requires name) before
|
|
// the handler runs — covered by the integration suite.
|
|
|
|
it('creates and broadcasts', async () => {
|
|
const create = vi.fn().mockReturnValue({ id: 9, name: 'Hotel' });
|
|
const broadcast = vi.fn();
|
|
const svc = makeService({ create, broadcast } as Partial<BudgetService>);
|
|
expect(await new BudgetController(svc).create(user, '5', { name: 'Hotel', total_price: 200 }, 'sock')).toEqual({ item: { id: 9, name: 'Hotel' } });
|
|
expect(broadcast).toHaveBeenCalledWith('5', 'budget:created', { item: { id: 9, name: 'Hotel' } }, 'sock');
|
|
});
|
|
});
|
|
|
|
describe('PUT /:id', () => {
|
|
it('404 when item missing', async () => {
|
|
const svc = makeService({ update: vi.fn().mockReturnValue(null) } as Partial<BudgetService>);
|
|
expect(await thrownAsync(() => new BudgetController(svc).update(user, '5', '9', { name: 'X' }))).toEqual({
|
|
status: 404, body: { error: 'Budget item not found' },
|
|
});
|
|
});
|
|
|
|
it('syncs the reservation price when a linked item changes total_price', async () => {
|
|
const update = vi.fn().mockReturnValue({ id: 9, reservation_id: 42, total_price: 250 });
|
|
const syncReservationPrice = vi.fn();
|
|
const broadcast = vi.fn();
|
|
const svc = makeService({ update, syncReservationPrice, broadcast } as Partial<BudgetService>);
|
|
await new BudgetController(svc).update(user, '5', '9', { total_price: 250 }, 'sock');
|
|
expect(syncReservationPrice).toHaveBeenCalledWith('5', 42, 250, 'sock');
|
|
expect(broadcast).toHaveBeenCalledWith('5', 'budget:updated', { item: { id: 9, reservation_id: 42, total_price: 250 } }, 'sock');
|
|
});
|
|
|
|
it('does not sync when the item has no linked reservation', async () => {
|
|
const update = vi.fn().mockReturnValue({ id: 9, reservation_id: null, total_price: 250 });
|
|
const syncReservationPrice = vi.fn();
|
|
const svc = makeService({ update, syncReservationPrice } as Partial<BudgetService>);
|
|
await new BudgetController(svc).update(user, '5', '9', { total_price: 250 });
|
|
expect(syncReservationPrice).not.toHaveBeenCalled();
|
|
});
|
|
});
|
|
|
|
describe('PUT /:id/members', () => {
|
|
// The legacy 'user_ids must be an array' 400 is now produced by the global
|
|
// ZodValidationPipe (budgetUpdateMembersRequestSchema) before the handler runs.
|
|
|
|
it('404 when the item is missing', () => {
|
|
const svc = makeService({ updateMembers: vi.fn().mockReturnValue(null) } as Partial<BudgetService>);
|
|
expect(thrown(() => new BudgetController(svc).updateMembers(user, '5', '9', { user_ids: [2, 3] }))).toEqual({
|
|
status: 404, body: { error: 'Budget item not found' },
|
|
});
|
|
});
|
|
|
|
it('updates members and broadcasts persons count', () => {
|
|
const updateMembers = vi.fn().mockReturnValue({ members: [{ user_id: 2 }], item: { persons: 1 } });
|
|
const broadcast = vi.fn();
|
|
const svc = makeService({ updateMembers, broadcast } as Partial<BudgetService>);
|
|
const res = new BudgetController(svc).updateMembers(user, '5', '9', { user_ids: [2] }, 'sock');
|
|
expect(res).toEqual({ members: [{ user_id: 2 }], item: { persons: 1 } });
|
|
expect(updateMembers).toHaveBeenCalledWith('9', '5', [2]);
|
|
expect(broadcast).toHaveBeenCalledWith('5', 'budget:members-updated', { itemId: 9, members: [{ user_id: 2 }], persons: 1 }, 'sock');
|
|
});
|
|
});
|
|
|
|
describe('PUT /:id/payers', () => {
|
|
// The legacy 'payers must be an array' 400 is now produced by the global
|
|
// ZodValidationPipe (budgetUpdatePayersRequestSchema) before the handler runs.
|
|
|
|
it('404 when the item is missing', () => {
|
|
const svc = makeService({ setPayers: vi.fn().mockReturnValue(null) } as Partial<BudgetService>);
|
|
expect(thrown(() => new BudgetController(svc).setPayers(user, '5', '9', { payers: [{ user_id: 2, amount: 10 }] }))).toEqual({
|
|
status: 404, body: { error: 'Budget item not found' },
|
|
});
|
|
});
|
|
|
|
it('sets payers and broadcasts budget:updated', () => {
|
|
const setPayers = vi.fn().mockReturnValue({ id: 9, payers: [{ user_id: 2, amount: 10 }] });
|
|
const broadcast = vi.fn();
|
|
const svc = makeService({ setPayers, broadcast } as Partial<BudgetService>);
|
|
const res = new BudgetController(svc).setPayers(user, '5', '9', { payers: [{ user_id: 2, amount: 10 }] }, 'sock');
|
|
expect(res).toEqual({ item: { id: 9, payers: [{ user_id: 2, amount: 10 }] } });
|
|
expect(setPayers).toHaveBeenCalledWith('9', '5', [{ user_id: 2, amount: 10 }]);
|
|
expect(broadcast).toHaveBeenCalledWith('5', 'budget:updated', { item: { id: 9, payers: [{ user_id: 2, amount: 10 }] } }, 'sock');
|
|
});
|
|
});
|
|
|
|
it('PUT /:id/members/:userId/paid toggles + broadcasts normalised paid flag', () => {
|
|
const toggleMemberPaid = vi.fn().mockReturnValue({ user_id: 2, paid: 1 });
|
|
const broadcast = vi.fn();
|
|
const svc = makeService({ toggleMemberPaid, broadcast } as Partial<BudgetService>);
|
|
expect(new BudgetController(svc).toggleMemberPaid(user, '5', '9', '2', { paid: true }, 'sock')).toEqual({ member: { user_id: 2, paid: 1 } });
|
|
expect(broadcast).toHaveBeenCalledWith('5', 'budget:member-paid-updated', { itemId: 9, userId: 2, paid: 1 }, 'sock');
|
|
});
|
|
|
|
it('PUT /:id/members/:userId/paid broadcasts paid: 0 when toggled off', () => {
|
|
const toggleMemberPaid = vi.fn().mockReturnValue({ user_id: 2, paid: 0 });
|
|
const broadcast = vi.fn();
|
|
const svc = makeService({ toggleMemberPaid, broadcast } as Partial<BudgetService>);
|
|
new BudgetController(svc).toggleMemberPaid(user, '5', '9', '2', { paid: false }, 'sock');
|
|
expect(broadcast).toHaveBeenCalledWith('5', 'budget:member-paid-updated', { itemId: 9, userId: 2, paid: 0 }, 'sock');
|
|
});
|
|
|
|
it('DELETE /:id 404 when missing, success otherwise', () => {
|
|
const missing = makeService({ remove: vi.fn().mockReturnValue(false) } as Partial<BudgetService>);
|
|
expect(thrown(() => new BudgetController(missing).remove(user, '5', '9'))).toEqual({
|
|
status: 404, body: { error: 'Budget item not found' },
|
|
});
|
|
const ok = makeService({ remove: vi.fn().mockReturnValue(true), broadcast: vi.fn() } as Partial<BudgetService>);
|
|
expect(new BudgetController(ok).remove(user, '5', '9')).toEqual({ success: true });
|
|
});
|
|
|
|
it('PUT /reorder/items + /reorder/categories broadcast budget:reordered', () => {
|
|
const reorderItems = vi.fn(); const reorderCategories = vi.fn(); const broadcast = vi.fn();
|
|
const svc = makeService({ reorderItems, reorderCategories, broadcast } as Partial<BudgetService>);
|
|
expect(new BudgetController(svc).reorderItems(user, '5', { orderedIds: [3, 1] }, 'sock')).toEqual({ success: true });
|
|
expect(reorderItems).toHaveBeenCalledWith('5', [3, 1]);
|
|
expect(new BudgetController(svc).reorderCategories(user, '5', { orderedCategories: ['food', 'fun'] }, 'sock')).toEqual({ success: true });
|
|
expect(reorderCategories).toHaveBeenCalledWith('5', ['food', 'fun']);
|
|
});
|
|
});
|