mirror of
https://github.com/mauriceboe/TREK.git
synced 2026-06-21 06:11:45 +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.
109 lines
4.0 KiB
TypeScript
109 lines
4.0 KiB
TypeScript
import { Injectable } from '@nestjs/common';
|
|
import { db } from '../../db/database';
|
|
import { broadcast } from '../../websocket';
|
|
import { checkPermission } from '../../services/permissions';
|
|
import type { User } from '../../types';
|
|
import * as svc from '../../services/budgetService';
|
|
import { getRates } from '../../services/exchangeRateService';
|
|
|
|
type Trip = NonNullable<ReturnType<typeof svc.verifyTripAccess>>;
|
|
|
|
/**
|
|
* Thin Nest wrapper around the existing budget service. Trip-access, the
|
|
* 'budget_edit' permission, the SQL, settlement maths and the WebSocket
|
|
* broadcasts all reuse the legacy code unchanged.
|
|
*/
|
|
@Injectable()
|
|
export class BudgetService {
|
|
verifyTripAccess(tripId: string, userId: number) {
|
|
return svc.verifyTripAccess(tripId, userId);
|
|
}
|
|
|
|
canEdit(trip: Trip, user: User): boolean {
|
|
return checkPermission('budget_edit', user.role, trip.user_id, user.id, trip.user_id !== user.id);
|
|
}
|
|
|
|
broadcast(tripId: string, event: string, payload: Record<string, unknown>, socketId: string | undefined): void {
|
|
broadcast(tripId, event, payload, socketId);
|
|
}
|
|
|
|
list(tripId: string) {
|
|
return svc.listBudgetItems(tripId);
|
|
}
|
|
|
|
perPersonSummary(tripId: string) {
|
|
return svc.getPerPersonSummary(tripId);
|
|
}
|
|
|
|
async settlement(tripId: string, base: string | undefined, tripCurrency: string) {
|
|
const effectiveBase = (base || tripCurrency || 'EUR').toUpperCase();
|
|
const rates = await getRates(effectiveBase);
|
|
return svc.calculateSettlement(tripId, { base: effectiveBase, rates, tripCurrency });
|
|
}
|
|
|
|
create(tripId: string, data: Parameters<typeof svc.createBudgetItem>[1]) {
|
|
return svc.createBudgetItem(tripId, data);
|
|
}
|
|
|
|
update(id: string, tripId: string, data: Parameters<typeof svc.updateBudgetItem>[2]) {
|
|
return svc.updateBudgetItem(id, tripId, data);
|
|
}
|
|
|
|
remove(id: string, tripId: string): boolean {
|
|
return svc.deleteBudgetItem(id, tripId);
|
|
}
|
|
|
|
updateMembers(id: string, tripId: string, userIds: number[]) {
|
|
return svc.updateMembers(id, tripId, userIds);
|
|
}
|
|
|
|
toggleMemberPaid(id: string, userId: string, paid: boolean) {
|
|
return svc.toggleMemberPaid(id, userId, paid);
|
|
}
|
|
|
|
setPayers(id: string, tripId: string, payers: { user_id: number; amount: number }[]) {
|
|
return svc.setItemPayers(id, tripId, payers);
|
|
}
|
|
|
|
listSettlements(tripId: string) {
|
|
return svc.listSettlements(tripId);
|
|
}
|
|
|
|
createSettlement(tripId: string, data: { from_user_id: number; to_user_id: number; amount: number }, userId: number) {
|
|
return svc.createSettlement(tripId, data, userId);
|
|
}
|
|
|
|
deleteSettlement(id: string, tripId: string): boolean {
|
|
return svc.deleteSettlement(id, tripId);
|
|
}
|
|
|
|
reorderItems(tripId: string, orderedIds: number[]): void {
|
|
svc.reorderBudgetItems(tripId, orderedIds);
|
|
}
|
|
|
|
reorderCategories(tripId: string, orderedCategories: string[]): void {
|
|
svc.reorderBudgetCategories(tripId, orderedCategories);
|
|
}
|
|
|
|
/**
|
|
* Mirrors the legacy PUT /:id side effect: when a price-linked budget item's
|
|
* total_price changes, write it into the reservation's metadata and broadcast
|
|
* reservation:updated. Non-fatal — a failure here never breaks the budget update.
|
|
*/
|
|
syncReservationPrice(tripId: string, reservationId: number, totalPrice: number, socketId: string | undefined): void {
|
|
try {
|
|
const reservation = db.prepare(
|
|
'SELECT id, metadata FROM reservations WHERE id = ? AND trip_id = ?',
|
|
).get(reservationId, tripId) as { id: number; metadata: string | null } | undefined;
|
|
if (!reservation) return;
|
|
const meta = reservation.metadata ? JSON.parse(reservation.metadata) : {};
|
|
meta.price = String(totalPrice);
|
|
db.prepare('UPDATE reservations SET metadata = ? WHERE id = ?').run(JSON.stringify(meta), reservation.id);
|
|
const updatedRes = db.prepare('SELECT * FROM reservations WHERE id = ?').get(reservation.id);
|
|
broadcast(tripId, 'reservation:updated', { reservation: updatedRes }, socketId);
|
|
} catch (err) {
|
|
console.error('[budget] Failed to sync price to reservation:', err);
|
|
}
|
|
}
|
|
}
|