mirror of
https://github.com/mauriceboe/TREK.git
synced 2026-10-18 21:16:47 +00:00
style(server): prettier on the test files this branch touched
This commit is contained in:
@@ -811,17 +811,35 @@ describe('Budget e2e (real auth guard + temp SQLite, real budget SQL)', () => {
|
||||
// to drop them and shrink the total to what the rest had paid.
|
||||
describe('someone who left the trip', () => {
|
||||
it('PUT with the unchanged payers and split keeps them, the total and a balanced ledger; a stranger is still dropped', async () => {
|
||||
await makeUser(orm, { id: 3, username: 'e2e-leaver', email: 'leaver@example.test', role: 'user', password_version: 0 });
|
||||
await makeUser(orm, { id: 4, username: 'e2e-stranger', email: 'stranger@example.test', role: 'user', password_version: 0 });
|
||||
await makeUser(orm, {
|
||||
id: 3,
|
||||
username: 'e2e-leaver',
|
||||
email: 'leaver@example.test',
|
||||
role: 'user',
|
||||
password_version: 0,
|
||||
});
|
||||
await makeUser(orm, {
|
||||
id: 4,
|
||||
username: 'e2e-stranger',
|
||||
email: 'stranger@example.test',
|
||||
role: 'user',
|
||||
password_version: 0,
|
||||
});
|
||||
const leftTripId = (await makeTrip(orm, 1, { title: 'E2E Left Trip', currency: 'EUR' })).id;
|
||||
await addTripMember(orm, leftTripId, 2);
|
||||
await addTripMember(orm, leftTripId, 3);
|
||||
const payload = {
|
||||
name: 'Rental car',
|
||||
payers: [{ user_id: 1, amount: 120 }, { user_id: 3, amount: 60 }],
|
||||
payers: [
|
||||
{ user_id: 1, amount: 120 },
|
||||
{ user_id: 3, amount: 60 },
|
||||
],
|
||||
member_ids: [1, 2, 3],
|
||||
};
|
||||
const created = await request(server).post(`/api/trips/${leftTripId}/budget`).set('Cookie', sessionCookie(1)).send(payload);
|
||||
const created = await request(server)
|
||||
.post(`/api/trips/${leftTripId}/budget`)
|
||||
.set('Cookie', sessionCookie(1))
|
||||
.send(payload);
|
||||
expect(created.status).toBe(201);
|
||||
await deleteRows(orm, TripMembers, { trip: leftTripId, user: 3 });
|
||||
|
||||
@@ -834,11 +852,13 @@ describe('Budget e2e (real auth guard + temp SQLite, real budget SQL)', () => {
|
||||
expect(saved.body.item.payers.map((p: { user_id: number }) => p.user_id).sort()).toEqual([1, 3]);
|
||||
expect(saved.body.item.members.map((m: { user_id: number }) => m.user_id).sort()).toEqual([1, 2, 3]);
|
||||
|
||||
const settlement = await request(server).get(`/api/trips/${leftTripId}/budget/settlement`).set('Cookie', sessionCookie(1));
|
||||
const settlement = await request(server)
|
||||
.get(`/api/trips/${leftTripId}/budget/settlement`)
|
||||
.set('Cookie', sessionCookie(1));
|
||||
expect(settlement.status).toBe(200);
|
||||
const balances = settlement.body.balances as { user_id: number; balance: number }[];
|
||||
expect(Math.round(balances.reduce((a, b) => a + b.balance, 0) * 100)).toBe(0);
|
||||
expect(balances.find(b => b.user_id === 3)?.balance).toBe(0);
|
||||
expect(balances.find((b) => b.user_id === 3)?.balance).toBe(0);
|
||||
});
|
||||
});
|
||||
});
|
||||
|
||||
@@ -413,7 +413,12 @@ export async function createPluginRpcHostParts(
|
||||
// Plan 4 Task 1 constructor-ripple: LlmConfigResolver's addon-row read
|
||||
// moved off DatabaseService onto AddonsRepository.
|
||||
const llmConfig = new LlmConfigResolver(
|
||||
new SettingsService(await createTestUnitOfWork(db), appSettings, await createTestSettingsRepo(db), await createTestTripsRepo(db)),
|
||||
new SettingsService(
|
||||
await createTestUnitOfWork(db),
|
||||
appSettings,
|
||||
await createTestSettingsRepo(db),
|
||||
await createTestTripsRepo(db),
|
||||
),
|
||||
(await sharedTestOrm(db)).repo(Addons),
|
||||
addons,
|
||||
);
|
||||
@@ -507,7 +512,12 @@ export async function createPluginRpcHostParts(
|
||||
generalStorage,
|
||||
await createTestUnitOfWork(db),
|
||||
(await sharedTestOrm(db)).em,
|
||||
new SettingsService(await createTestUnitOfWork(db), appSettings, await createTestSettingsRepo(db), await createTestTripsRepo(db)),
|
||||
new SettingsService(
|
||||
await createTestUnitOfWork(db),
|
||||
appSettings,
|
||||
await createTestSettingsRepo(db),
|
||||
await createTestTripsRepo(db),
|
||||
),
|
||||
);
|
||||
// Plan 4 Task 4: UserCleanupService's UC1 now goes through a directly-injected
|
||||
// EntityManager (MaintenanceRepository.deletePluginUserData), not DatabaseService.
|
||||
|
||||
@@ -10,8 +10,8 @@ import { BudgetItemMembers } from '../../../src/db/entities/BudgetItemMembers.en
|
||||
import { BudgetItems } from '../../../src/db/entities/BudgetItems.entity';
|
||||
import { BudgetSettlements } from '../../../src/db/entities/BudgetSettlements.entity';
|
||||
import { Reservations } from '../../../src/db/entities/Reservations.entity';
|
||||
import { Trips } from '../../../src/db/entities/Trips.entity';
|
||||
import { TripMembers } from '../../../src/db/entities/TripMembers.entity';
|
||||
import { Trips } from '../../../src/db/entities/Trips.entity';
|
||||
import { BudgetService } from '../../../src/nest/budget/budget.service';
|
||||
import { invalidatePermissionsCache } from '../../../src/nest/permissions/permissions-cache';
|
||||
import {
|
||||
|
||||
Reference in New Issue
Block a user