mirror of
https://github.com/mauriceboe/TREK.git
synced 2026-06-19 13:21:46 +00:00
247433fb2a
* fix(journey): authorize reads of the journey share link GET /api/journeys/:id/share-link now requires journey access (canAccessJourney), matching the create/delete share-link routes and the get_journey_share_link MCP tool. Returns no link when the caller lacks access to the journey. * feat(costs): rework Budget into Costs — Splitwise-style, multi-currency, mobile Renames the Budget addon to "Costs" (UI only) and reworks it into a Tricount/ Splitwise-style cost tracker: multiple payers per expense, equal split across chosen members, settle-up with persisted history + undo, 12 fixed categories, per-expense currency with live FX conversion to a user-set display currency (Settings -> Display), and locale-correct money formatting. Adds a desktop and a dedicated mobile layout. A migration backfills existing budget items (single payer, split members, currency). Closes #551 (per-expense currency). Also switches the app font to self-hosted Poppins (Geist for secondary subtext), replacing the Google Fonts CDN dependency. * fix(costs): neutral dashboard dark palette + liquid glass, full page width, entry-count badge - Dark mode used a warm oklch palette that read brownish; switch to the neutral zinc tokens used by the dashboard (#121215 bg, #f4f4f5 ink) and add a subtle backdrop-blur glass on cards. - Costs now uses the full available page width on desktop instead of a 1280px cap. - Render the expense count next to the Expenses title as a badge. - Adapt budget/journey unit tests to the new payer-based settlement model and the Costs rename (category default 'other', Costs tab/CostsPanel). * fix(costs): drop the entry-count badge, always show row edit/delete actions Removes the count badge next to the Expenses title and makes the per-row edit/delete actions permanently visible (no longer hover-only) on desktop too. * feat(costs): currency-native money formatting, custom select/date, rename addon to Costs - Format every amount in its own currency convention (symbol position, grouping and decimal separators) regardless of app language, via a currency->locale map (EUR -> '12,00 €', USD -> '$12.00', JPY -> '¥12', ...). Previously Intl used the app locale, so EUR showed the symbol in front under an English UI. - Use TREK's CustomSelect (searchable, with symbols) and CustomDatePicker in the add/edit expense modal instead of the native <select>/<input type=date>. - Rename the 'Budget Planner' add-on to 'Costs' in the admin list (display only; id/tables/permissions/MCP stay 'budget') via seed + a migration for existing DBs. * feat(auth): configurable session duration via SESSION_DURATION Adds a SESSION_DURATION env var (ms-style strings: 1h, 7d, 30d, ...) controlling how long a session stays valid before re-login. It drives both the trek_session JWT exp claim and the cookie maxAge from one source, so they never drift. Invalid values warn at startup and fall back to the default (24h — unchanged). The MFA challenge token and MCP OAuth tokens keep their own TTL. Implements the request from discussion #946. Documented in the env-var wiki page, .env.example and docker-compose.yml.
253 lines
8.6 KiB
TypeScript
253 lines
8.6 KiB
TypeScript
import {
|
|
Body,
|
|
Controller,
|
|
Delete,
|
|
Get,
|
|
Headers,
|
|
HttpException,
|
|
Param,
|
|
Post,
|
|
Put,
|
|
Query,
|
|
UseGuards,
|
|
} from '@nestjs/common';
|
|
import type { User } from '../../types';
|
|
import { BudgetService } from './budget.service';
|
|
import { JwtAuthGuard } from '../auth/jwt-auth.guard';
|
|
import { CurrentUser } from '../auth/current-user.decorator';
|
|
|
|
/**
|
|
* /api/trips/:tripId/budget — trip-scoped expense planner.
|
|
*
|
|
* Byte-identical to the legacy Express route (server/src/routes/budget.ts):
|
|
* every handler verifies trip access (404); mutations check 'budget_edit' (403);
|
|
* create is 201, the rest 200; bespoke 400/404 bodies reproduced; mutations
|
|
* broadcast over WebSocket with the forwarded X-Socket-Id. Static sub-routes
|
|
* (summary, settlement, reorder/*) are declared before /:id so they win over the
|
|
* param. Updating total_price on a reservation-linked item syncs the price back.
|
|
*/
|
|
@Controller('api/trips/:tripId/budget')
|
|
@UseGuards(JwtAuthGuard)
|
|
export class BudgetController {
|
|
constructor(private readonly budget: BudgetService) {}
|
|
|
|
private requireTrip(tripId: string, user: User) {
|
|
const trip = this.budget.verifyTripAccess(tripId, user.id);
|
|
if (!trip) {
|
|
throw new HttpException({ error: 'Trip not found' }, 404);
|
|
}
|
|
return trip;
|
|
}
|
|
|
|
private requireEdit(trip: ReturnType<BudgetService['verifyTripAccess']>, user: User): void {
|
|
if (!this.budget.canEdit(trip!, user)) {
|
|
throw new HttpException({ error: 'No permission' }, 403);
|
|
}
|
|
}
|
|
|
|
@Get()
|
|
list(@CurrentUser() user: User, @Param('tripId') tripId: string) {
|
|
this.requireTrip(tripId, user);
|
|
return { items: this.budget.list(tripId) };
|
|
}
|
|
|
|
@Get('summary/per-person')
|
|
perPerson(@CurrentUser() user: User, @Param('tripId') tripId: string) {
|
|
this.requireTrip(tripId, user);
|
|
return { summary: this.budget.perPersonSummary(tripId) };
|
|
}
|
|
|
|
@Get('settlement')
|
|
settlement(
|
|
@CurrentUser() user: User,
|
|
@Param('tripId') tripId: string,
|
|
@Query('base') base?: string,
|
|
) {
|
|
const trip = this.requireTrip(tripId, user);
|
|
return this.budget.settlement(tripId, base, (trip as { currency?: string }).currency || 'EUR');
|
|
}
|
|
|
|
@Get('settlements')
|
|
listSettlements(@CurrentUser() user: User, @Param('tripId') tripId: string) {
|
|
this.requireTrip(tripId, user);
|
|
return { settlements: this.budget.listSettlements(tripId) };
|
|
}
|
|
|
|
@Post('settlements')
|
|
createSettlement(
|
|
@CurrentUser() user: User,
|
|
@Param('tripId') tripId: string,
|
|
@Body() body: { from_user_id?: number; to_user_id?: number; amount?: number },
|
|
@Headers('x-socket-id') socketId?: string,
|
|
) {
|
|
const trip = this.requireTrip(tripId, user);
|
|
this.requireEdit(trip, user);
|
|
if (body.from_user_id == null || body.to_user_id == null || body.amount == null) {
|
|
throw new HttpException({ error: 'from_user_id, to_user_id and amount are required' }, 400);
|
|
}
|
|
const settlement = this.budget.createSettlement(
|
|
tripId,
|
|
{ from_user_id: body.from_user_id, to_user_id: body.to_user_id, amount: body.amount },
|
|
user.id,
|
|
);
|
|
this.budget.broadcast(tripId, 'budget:settlement-created', { settlement }, socketId);
|
|
return { settlement };
|
|
}
|
|
|
|
@Delete('settlements/:settlementId')
|
|
deleteSettlement(
|
|
@CurrentUser() user: User,
|
|
@Param('tripId') tripId: string,
|
|
@Param('settlementId') settlementId: string,
|
|
@Headers('x-socket-id') socketId?: string,
|
|
) {
|
|
const trip = this.requireTrip(tripId, user);
|
|
this.requireEdit(trip, user);
|
|
if (!this.budget.deleteSettlement(settlementId, tripId)) {
|
|
throw new HttpException({ error: 'Settlement not found' }, 404);
|
|
}
|
|
this.budget.broadcast(tripId, 'budget:settlement-deleted', { settlementId: Number(settlementId) }, socketId);
|
|
return { success: true };
|
|
}
|
|
|
|
@Post()
|
|
create(
|
|
@CurrentUser() user: User,
|
|
@Param('tripId') tripId: string,
|
|
@Body() body: { name?: string; category?: string; total_price?: number; persons?: number | null; days?: number | null; note?: string | null; expense_date?: string | null },
|
|
@Headers('x-socket-id') socketId?: string,
|
|
) {
|
|
const trip = this.requireTrip(tripId, user);
|
|
this.requireEdit(trip, user);
|
|
if (!body.name) {
|
|
throw new HttpException({ error: 'Name is required' }, 400);
|
|
}
|
|
const item = this.budget.create(tripId, body as { name: string });
|
|
this.budget.broadcast(tripId, 'budget:created', { item }, socketId);
|
|
return { item };
|
|
}
|
|
|
|
@Put('reorder/items')
|
|
reorderItems(
|
|
@CurrentUser() user: User,
|
|
@Param('tripId') tripId: string,
|
|
@Body('orderedIds') orderedIds: number[],
|
|
@Headers('x-socket-id') socketId?: string,
|
|
) {
|
|
const trip = this.requireTrip(tripId, user);
|
|
this.requireEdit(trip, user);
|
|
this.budget.reorderItems(tripId, orderedIds);
|
|
this.budget.broadcast(tripId, 'budget:reordered', { orderedIds }, socketId);
|
|
return { success: true };
|
|
}
|
|
|
|
@Put('reorder/categories')
|
|
reorderCategories(
|
|
@CurrentUser() user: User,
|
|
@Param('tripId') tripId: string,
|
|
@Body('orderedCategories') orderedCategories: string[],
|
|
@Headers('x-socket-id') socketId?: string,
|
|
) {
|
|
const trip = this.requireTrip(tripId, user);
|
|
this.requireEdit(trip, user);
|
|
this.budget.reorderCategories(tripId, orderedCategories);
|
|
this.budget.broadcast(tripId, 'budget:reordered', { orderedCategories }, socketId);
|
|
return { success: true };
|
|
}
|
|
|
|
@Put(':id')
|
|
update(
|
|
@CurrentUser() user: User,
|
|
@Param('tripId') tripId: string,
|
|
@Param('id') id: string,
|
|
@Body() body: Record<string, unknown>,
|
|
@Headers('x-socket-id') socketId?: string,
|
|
) {
|
|
const trip = this.requireTrip(tripId, user);
|
|
this.requireEdit(trip, user);
|
|
const updated = this.budget.update(id, tripId, body);
|
|
if (!updated) {
|
|
throw new HttpException({ error: 'Budget item not found' }, 404);
|
|
}
|
|
if (updated.reservation_id && body.total_price !== undefined) {
|
|
this.budget.syncReservationPrice(tripId, updated.reservation_id, updated.total_price, socketId);
|
|
}
|
|
this.budget.broadcast(tripId, 'budget:updated', { item: updated }, socketId);
|
|
return { item: updated };
|
|
}
|
|
|
|
@Put(':id/members')
|
|
updateMembers(
|
|
@CurrentUser() user: User,
|
|
@Param('tripId') tripId: string,
|
|
@Param('id') id: string,
|
|
@Body('user_ids') userIds: unknown,
|
|
@Headers('x-socket-id') socketId?: string,
|
|
) {
|
|
const trip = this.requireTrip(tripId, user);
|
|
this.requireEdit(trip, user);
|
|
if (!Array.isArray(userIds)) {
|
|
throw new HttpException({ error: 'user_ids must be an array' }, 400);
|
|
}
|
|
const result = this.budget.updateMembers(id, tripId, userIds);
|
|
if (!result) {
|
|
throw new HttpException({ error: 'Budget item not found' }, 404);
|
|
}
|
|
this.budget.broadcast(tripId, 'budget:members-updated', { itemId: Number(id), members: result.members, persons: result.item.persons }, socketId);
|
|
return { members: result.members, item: result.item };
|
|
}
|
|
|
|
@Put(':id/payers')
|
|
setPayers(
|
|
@CurrentUser() user: User,
|
|
@Param('tripId') tripId: string,
|
|
@Param('id') id: string,
|
|
@Body('payers') payers: unknown,
|
|
@Headers('x-socket-id') socketId?: string,
|
|
) {
|
|
const trip = this.requireTrip(tripId, user);
|
|
this.requireEdit(trip, user);
|
|
if (!Array.isArray(payers)) {
|
|
throw new HttpException({ error: 'payers must be an array' }, 400);
|
|
}
|
|
const item = this.budget.setPayers(id, tripId, payers as { user_id: number; amount: number }[]);
|
|
if (!item) {
|
|
throw new HttpException({ error: 'Budget item not found' }, 404);
|
|
}
|
|
this.budget.broadcast(tripId, 'budget:updated', { item }, socketId);
|
|
return { item };
|
|
}
|
|
|
|
@Put(':id/members/:userId/paid')
|
|
toggleMemberPaid(
|
|
@CurrentUser() user: User,
|
|
@Param('tripId') tripId: string,
|
|
@Param('id') id: string,
|
|
@Param('userId') userId: string,
|
|
@Body('paid') paid: boolean,
|
|
@Headers('x-socket-id') socketId?: string,
|
|
) {
|
|
const trip = this.requireTrip(tripId, user);
|
|
this.requireEdit(trip, user);
|
|
const member = this.budget.toggleMemberPaid(id, userId, paid);
|
|
this.budget.broadcast(tripId, 'budget:member-paid-updated', { itemId: Number(id), userId: Number(userId), paid: paid ? 1 : 0 }, socketId);
|
|
return { member };
|
|
}
|
|
|
|
@Delete(':id')
|
|
remove(
|
|
@CurrentUser() user: User,
|
|
@Param('tripId') tripId: string,
|
|
@Param('id') id: string,
|
|
@Headers('x-socket-id') socketId?: string,
|
|
) {
|
|
const trip = this.requireTrip(tripId, user);
|
|
this.requireEdit(trip, user);
|
|
if (!this.budget.remove(id, tripId)) {
|
|
throw new HttpException({ error: 'Budget item not found' }, 404);
|
|
}
|
|
this.budget.broadcast(tripId, 'budget:deleted', { itemId: Number(id) }, socketId);
|
|
return { success: true };
|
|
}
|
|
}
|