mirror of
https://github.com/mauriceboe/TREK.git
synced 2026-06-19 21:31: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.
330 lines
12 KiB
TypeScript
330 lines
12 KiB
TypeScript
/**
|
|
* Todo integration tests — TODO-001 through TODO-012.
|
|
* Covers all endpoints at /api/trips/:tripId/todo.
|
|
*/
|
|
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';
|
|
|
|
const { testDb, dbMock } = vi.hoisted(() => {
|
|
const Database = require('better-sqlite3');
|
|
const db = new Database(':memory:');
|
|
db.exec('PRAGMA journal_mode = WAL');
|
|
db.exec('PRAGMA foreign_keys = ON');
|
|
db.exec('PRAGMA busy_timeout = 5000');
|
|
const mock = {
|
|
db,
|
|
closeDb: () => {},
|
|
reinitialize: () => {},
|
|
getPlaceWithTags: () => null,
|
|
canAccessTrip: (tripId: any, userId: number) =>
|
|
db.prepare(`SELECT t.id, t.user_id FROM trips t LEFT JOIN trip_members m ON m.trip_id = t.id AND m.user_id = ? WHERE t.id = ? AND (t.user_id = ? OR m.user_id IS NOT NULL)`).get(userId, tripId, userId),
|
|
isOwner: (tripId: any, userId: number) =>
|
|
!!db.prepare('SELECT id FROM trips WHERE id = ? AND user_id = ?').get(tripId, userId),
|
|
};
|
|
return { testDb: db, dbMock: mock };
|
|
});
|
|
|
|
vi.mock('../../src/db/database', () => dbMock);
|
|
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 { buildApp } from '../../src/bootstrap';
|
|
import { createTables } from '../../src/db/schema';
|
|
import { runMigrations } from '../../src/db/migrations';
|
|
import { resetTestDb, resetRateLimits } from '../helpers/test-db';
|
|
import { createUser, createTrip, addTripMember } from '../helpers/factories';
|
|
import { authCookie } from '../helpers/auth';
|
|
import { invalidatePermissionsCache } from '../../src/services/permissions';
|
|
|
|
let nestApp: INestApplication;
|
|
let app: Application;
|
|
|
|
beforeAll(async () => {
|
|
createTables(testDb);
|
|
runMigrations(testDb);
|
|
nestApp = await buildApp();
|
|
app = nestApp.getHttpAdapter().getInstance();
|
|
});
|
|
|
|
beforeEach(() => {
|
|
resetTestDb(testDb);
|
|
resetRateLimits(nestApp);
|
|
invalidatePermissionsCache();
|
|
});
|
|
|
|
afterAll(async () => {
|
|
await nestApp.close();
|
|
testDb.close();
|
|
});
|
|
|
|
describe('Todo items', () => {
|
|
it('TODO-001: GET /api/trips/:id/todo returns empty items for a new trip', async () => {
|
|
const { user } = createUser(testDb);
|
|
const trip = createTrip(testDb, user.id);
|
|
const res = await request(app)
|
|
.get(`/api/trips/${trip.id}/todo`)
|
|
.set('Cookie', authCookie(user.id));
|
|
expect(res.status).toBe(200);
|
|
expect(res.body.items).toEqual([]);
|
|
});
|
|
|
|
it('TODO-002: POST /api/trips/:id/todo creates a todo with title only', async () => {
|
|
const { user } = createUser(testDb);
|
|
const trip = createTrip(testDb, user.id);
|
|
const res = await request(app)
|
|
.post(`/api/trips/${trip.id}/todo`)
|
|
.set('Cookie', authCookie(user.id))
|
|
.send({ name: 'Book hotel' });
|
|
expect(res.status).toBe(201);
|
|
expect(res.body.item).toMatchObject({ name: 'Book hotel', checked: 0, trip_id: trip.id });
|
|
expect(res.body.item.id).toBeDefined();
|
|
});
|
|
|
|
it('TODO-003: POST /api/trips/:id/todo creates a todo with all optional fields', async () => {
|
|
const { user } = createUser(testDb);
|
|
const trip = createTrip(testDb, user.id);
|
|
const res = await request(app)
|
|
.post(`/api/trips/${trip.id}/todo`)
|
|
.set('Cookie', authCookie(user.id))
|
|
.send({
|
|
name: 'Pack suitcase',
|
|
category: 'Preparation',
|
|
description: 'Pack everything for the trip',
|
|
priority: 2,
|
|
});
|
|
expect(res.status).toBe(201);
|
|
expect(res.body.item).toMatchObject({
|
|
name: 'Pack suitcase',
|
|
category: 'Preparation',
|
|
description: 'Pack everything for the trip',
|
|
priority: 2,
|
|
});
|
|
});
|
|
|
|
it('TODO-004: POST /api/trips/:id/todo - missing name returns 400', async () => {
|
|
const { user } = createUser(testDb);
|
|
const trip = createTrip(testDb, user.id);
|
|
const res = await request(app)
|
|
.post(`/api/trips/${trip.id}/todo`)
|
|
.set('Cookie', authCookie(user.id))
|
|
.send({ category: 'Test' });
|
|
expect(res.status).toBe(400);
|
|
expect(res.body.error).toBeDefined();
|
|
});
|
|
|
|
it('TODO-005: PUT /api/trips/:id/todo/:todoId toggles checked status', async () => {
|
|
const { user } = createUser(testDb);
|
|
const trip = createTrip(testDb, user.id);
|
|
const createRes = await request(app)
|
|
.post(`/api/trips/${trip.id}/todo`)
|
|
.set('Cookie', authCookie(user.id))
|
|
.send({ name: 'Visit museum' });
|
|
const itemId = createRes.body.item.id;
|
|
|
|
// Toggle to checked
|
|
const res = await request(app)
|
|
.put(`/api/trips/${trip.id}/todo/${itemId}`)
|
|
.set('Cookie', authCookie(user.id))
|
|
.send({ checked: 1 });
|
|
expect(res.status).toBe(200);
|
|
expect(res.body.item.checked).toBe(1);
|
|
|
|
// Toggle back to unchecked
|
|
const res2 = await request(app)
|
|
.put(`/api/trips/${trip.id}/todo/${itemId}`)
|
|
.set('Cookie', authCookie(user.id))
|
|
.send({ checked: 0 });
|
|
expect(res2.status).toBe(200);
|
|
expect(res2.body.item.checked).toBe(0);
|
|
});
|
|
|
|
it('TODO-006: PUT /api/trips/:id/todo/:todoId updates category', async () => {
|
|
const { user } = createUser(testDb);
|
|
const trip = createTrip(testDb, user.id);
|
|
const createRes = await request(app)
|
|
.post(`/api/trips/${trip.id}/todo`)
|
|
.set('Cookie', authCookie(user.id))
|
|
.send({ name: 'Buy souvenirs' });
|
|
const itemId = createRes.body.item.id;
|
|
|
|
const res = await request(app)
|
|
.put(`/api/trips/${trip.id}/todo/${itemId}`)
|
|
.set('Cookie', authCookie(user.id))
|
|
.send({ category: 'Shopping' });
|
|
expect(res.status).toBe(200);
|
|
expect(res.body.item.category).toBe('Shopping');
|
|
});
|
|
|
|
it('TODO-007: DELETE /api/trips/:id/todo/:todoId deletes a todo', async () => {
|
|
const { user } = createUser(testDb);
|
|
const trip = createTrip(testDb, user.id);
|
|
const createRes = await request(app)
|
|
.post(`/api/trips/${trip.id}/todo`)
|
|
.set('Cookie', authCookie(user.id))
|
|
.send({ name: 'To Delete' });
|
|
const itemId = createRes.body.item.id;
|
|
|
|
const res = await request(app)
|
|
.delete(`/api/trips/${trip.id}/todo/${itemId}`)
|
|
.set('Cookie', authCookie(user.id));
|
|
expect(res.status).toBe(200);
|
|
expect(res.body.success).toBe(true);
|
|
|
|
// Verify gone from list
|
|
const listRes = await request(app)
|
|
.get(`/api/trips/${trip.id}/todo`)
|
|
.set('Cookie', authCookie(user.id));
|
|
expect(listRes.body.items).toHaveLength(0);
|
|
});
|
|
|
|
it('TODO-008: PUT /api/trips/:id/todo/reorder reorders items', async () => {
|
|
const { user } = createUser(testDb);
|
|
const trip = createTrip(testDb, user.id);
|
|
|
|
// Create 3 items
|
|
const r1 = await request(app)
|
|
.post(`/api/trips/${trip.id}/todo`)
|
|
.set('Cookie', authCookie(user.id))
|
|
.send({ name: 'First' });
|
|
const r2 = await request(app)
|
|
.post(`/api/trips/${trip.id}/todo`)
|
|
.set('Cookie', authCookie(user.id))
|
|
.send({ name: 'Second' });
|
|
const r3 = await request(app)
|
|
.post(`/api/trips/${trip.id}/todo`)
|
|
.set('Cookie', authCookie(user.id))
|
|
.send({ name: 'Third' });
|
|
|
|
const id1 = r1.body.item.id;
|
|
const id2 = r2.body.item.id;
|
|
const id3 = r3.body.item.id;
|
|
|
|
// Reverse the order
|
|
const res = await request(app)
|
|
.put(`/api/trips/${trip.id}/todo/reorder`)
|
|
.set('Cookie', authCookie(user.id))
|
|
.send({ orderedIds: [id3, id2, id1] });
|
|
expect(res.status).toBe(200);
|
|
expect(res.body.success).toBe(true);
|
|
|
|
// Verify the new order in the DB
|
|
const items = testDb.prepare('SELECT id, sort_order FROM todo_items WHERE trip_id = ? ORDER BY sort_order').all(trip.id) as any[];
|
|
expect(items[0].id).toBe(id3);
|
|
expect(items[1].id).toBe(id2);
|
|
expect(items[2].id).toBe(id1);
|
|
});
|
|
|
|
it('TODO-009: Non-member accessing trip returns 404', async () => {
|
|
const { user: owner } = createUser(testDb);
|
|
const { user: stranger } = createUser(testDb);
|
|
const trip = createTrip(testDb, owner.id);
|
|
|
|
const res = await request(app)
|
|
.get(`/api/trips/${trip.id}/todo`)
|
|
.set('Cookie', authCookie(stranger.id));
|
|
expect(res.status).toBe(404);
|
|
});
|
|
|
|
it('TODO-010: Trip member can read and create todos', async () => {
|
|
const { user: owner } = createUser(testDb);
|
|
const { user: member } = createUser(testDb);
|
|
const trip = createTrip(testDb, owner.id);
|
|
addTripMember(testDb, trip.id, member.id);
|
|
|
|
// Member can read
|
|
const getRes = await request(app)
|
|
.get(`/api/trips/${trip.id}/todo`)
|
|
.set('Cookie', authCookie(member.id));
|
|
expect(getRes.status).toBe(200);
|
|
|
|
// Member can create
|
|
const postRes = await request(app)
|
|
.post(`/api/trips/${trip.id}/todo`)
|
|
.set('Cookie', authCookie(member.id))
|
|
.send({ name: 'Member task' });
|
|
expect(postRes.status).toBe(201);
|
|
});
|
|
|
|
it('TODO-011: PUT /api/trips/:id/todo/:todoId - non-existent item returns 404', async () => {
|
|
const { user } = createUser(testDb);
|
|
const trip = createTrip(testDb, user.id);
|
|
const res = await request(app)
|
|
.put(`/api/trips/${trip.id}/todo/99999`)
|
|
.set('Cookie', authCookie(user.id))
|
|
.send({ name: 'Ghost' });
|
|
expect(res.status).toBe(404);
|
|
});
|
|
|
|
it('TODO-012: GET /api/trips/:id/todo - unauthenticated returns 401', async () => {
|
|
const { user } = createUser(testDb);
|
|
const trip = createTrip(testDb, user.id);
|
|
const res = await request(app).get(`/api/trips/${trip.id}/todo`);
|
|
expect(res.status).toBe(401);
|
|
});
|
|
});
|
|
|
|
describe('Todo category assignees', () => {
|
|
it('TODO-013: GET /api/trips/:id/todo/category-assignees returns empty object for new trip', async () => {
|
|
const { user } = createUser(testDb);
|
|
const trip = createTrip(testDb, user.id);
|
|
const res = await request(app)
|
|
.get(`/api/trips/${trip.id}/todo/category-assignees`)
|
|
.set('Cookie', authCookie(user.id));
|
|
expect(res.status).toBe(200);
|
|
expect(res.body.assignees).toEqual({});
|
|
});
|
|
|
|
it('TODO-014: PUT /api/trips/:id/todo/category-assignees/:name sets assignees', async () => {
|
|
const { user: owner } = createUser(testDb);
|
|
const { user: member } = createUser(testDb);
|
|
const trip = createTrip(testDb, owner.id);
|
|
addTripMember(testDb, trip.id, member.id);
|
|
|
|
const res = await request(app)
|
|
.put(`/api/trips/${trip.id}/todo/category-assignees/Shopping`)
|
|
.set('Cookie', authCookie(owner.id))
|
|
.send({ user_ids: [owner.id, member.id] });
|
|
expect(res.status).toBe(200);
|
|
expect(Array.isArray(res.body.assignees)).toBe(true);
|
|
expect(res.body.assignees).toHaveLength(2);
|
|
|
|
// Verify via GET
|
|
const getRes = await request(app)
|
|
.get(`/api/trips/${trip.id}/todo/category-assignees`)
|
|
.set('Cookie', authCookie(owner.id));
|
|
expect(getRes.body.assignees.Shopping).toBeDefined();
|
|
expect(getRes.body.assignees.Shopping).toHaveLength(2);
|
|
});
|
|
|
|
it('TODO-015: PUT category-assignees with empty array clears assignees', async () => {
|
|
const { user: owner } = createUser(testDb);
|
|
const { user: member } = createUser(testDb);
|
|
const trip = createTrip(testDb, owner.id);
|
|
addTripMember(testDb, trip.id, member.id);
|
|
|
|
// Set assignees
|
|
await request(app)
|
|
.put(`/api/trips/${trip.id}/todo/category-assignees/Shopping`)
|
|
.set('Cookie', authCookie(owner.id))
|
|
.send({ user_ids: [owner.id] });
|
|
|
|
// Clear them
|
|
const res = await request(app)
|
|
.put(`/api/trips/${trip.id}/todo/category-assignees/Shopping`)
|
|
.set('Cookie', authCookie(owner.id))
|
|
.send({ user_ids: [] });
|
|
expect(res.status).toBe(200);
|
|
expect(res.body.assignees).toHaveLength(0);
|
|
});
|
|
});
|