mirror of
https://github.com/mauriceboe/TREK.git
synced 2026-11-20 19:16:08 +00:00
feat(costs): let a trip keep its costs as totals only (#1714)
Travellers who track what a trip costs but never split it saw an Unfinished warning on every expense and a settle-up they had no use for. A trip now has a costs mode (appended migration, trips.costs_mode, split by default); totals leaves payers, shares and settling up out of Costs on desktop and phone through the same gate as a trip of one, and saves new expenses without a payer. PUT /api/trips/:id and update_trip take it on budget_edit. The split chips move into their own component.
This commit is contained in:
@@ -58,6 +58,7 @@ export class Trips {
|
||||
created_at?: string | null;
|
||||
updated_at?: string | null;
|
||||
reminder_sent_for?: string | null;
|
||||
costs_mode: string & Opt = 'split';
|
||||
assistant_attachments_collection = new Collection<AssistantAttachments>(this);
|
||||
assistant_threads_collection = new Collection<AssistantThreads>(this);
|
||||
budget_category_order_collection = new Collection<BudgetCategoryOrder>(this);
|
||||
@@ -124,6 +125,7 @@ export const TripsSchema = defineEntity({
|
||||
created_at: p.type(DbTimestampType).nullable().defaultRaw(`CURRENT_TIMESTAMP`).index('idx_trips_created_at'),
|
||||
updated_at: p.type(DbTimestampType).nullable().defaultRaw(`CURRENT_TIMESTAMP`),
|
||||
reminder_sent_for: p.text().nullable(),
|
||||
costs_mode: p.text().default('split'),
|
||||
assistant_attachments_collection: () => p.oneToMany(AssistantAttachments).mappedBy('trip').hidden(),
|
||||
assistant_threads_collection: () => p.oneToMany(AssistantThreads).mappedBy('trip').hidden(),
|
||||
budget_category_order_collection: () => p.oneToMany(BudgetCategoryOrder).mappedBy('trip').hidden(),
|
||||
|
||||
@@ -17,4 +17,5 @@ export interface TripsTable {
|
||||
created_at: InsertOptional<string | null>;
|
||||
updated_at: InsertOptional<string | null>;
|
||||
reminder_sent_for: InsertOptional<string | null>;
|
||||
costs_mode: InsertOptional<string>;
|
||||
}
|
||||
|
||||
+24
@@ -0,0 +1,24 @@
|
||||
import { addColumnIfMissing } from '../migration-utils';
|
||||
import { Migration } from '@mikro-orm/migrations';
|
||||
|
||||
/**
|
||||
* A trip can keep its costs as totals only (#1714): who paid, the shares and
|
||||
* settling up are left out of Costs, for travellers who track what a trip costs
|
||||
* but never split it.
|
||||
*
|
||||
* `costs_mode` is 'split' (what every trip did so far) or 'totals'. 'split' as
|
||||
* the default keeps this from being a breaking change: SQLite fills every
|
||||
* existing row with it on the ALTER, so every trip looks as it did before.
|
||||
*/
|
||||
export class Migration20200101046390_a_trip_can_keep_its_costs_as_totals_only extends Migration {
|
||||
override name = 'Migration20200101046390_a_trip_can_keep_its_costs_as_totals_only';
|
||||
|
||||
override async up(): Promise<void> {
|
||||
await addColumnIfMissing(
|
||||
this,
|
||||
'trips',
|
||||
'costs_mode',
|
||||
`costs_mode TEXT NOT NULL DEFAULT 'split' CHECK (costs_mode IN ('split', 'totals'))`,
|
||||
);
|
||||
}
|
||||
}
|
||||
@@ -36,6 +36,7 @@ export interface TripRawRow {
|
||||
created_at: string | null;
|
||||
updated_at: string | null;
|
||||
reminder_sent_for: string | null;
|
||||
costs_mode: string;
|
||||
}
|
||||
|
||||
const _tripRawRowKeys: AssertRowKeys<TripRawRow, Trips> = true;
|
||||
@@ -544,7 +545,7 @@ export class TripsRepository extends TrekRepository<Trips> {
|
||||
/**
|
||||
* TP37 (`trips.service.ts::copy`'s INSERT) — `INSERT INTO trips (user_id,
|
||||
* title, description, start_date, end_date, currency, cover_image,
|
||||
* is_archived, reminder_days) VALUES (?, ?, ?, ?, ?, ?, ?, 0, ?)`. A
|
||||
* is_archived, reminder_days, costs_mode) VALUES (?, ?, ?, ?, ?, ?, ?, 0, ?, ?)`. A
|
||||
* DIFFERENT column set from `insertTrip` (TP18, `create`'s own INSERT):
|
||||
* this one also writes `cover_image` (verbatim from the source row) and
|
||||
* `is_archived` as a hard-coded literal `0` — a copy is never archived,
|
||||
@@ -563,6 +564,7 @@ export class TripsRepository extends TrekRepository<Trips> {
|
||||
currency: string | null;
|
||||
cover_image: string | null;
|
||||
reminder_days: number;
|
||||
costs_mode: string;
|
||||
}): Promise<number> {
|
||||
return await this.insert({
|
||||
user: input.user_id,
|
||||
@@ -574,13 +576,14 @@ export class TripsRepository extends TrekRepository<Trips> {
|
||||
cover_image: input.cover_image,
|
||||
is_archived: 0,
|
||||
reminder_days: input.reminder_days,
|
||||
costs_mode: input.costs_mode,
|
||||
});
|
||||
}
|
||||
|
||||
/**
|
||||
* TP25 (`trips.service.ts::updateTrip`) — `UPDATE trips SET title=?,
|
||||
* description=?, start_date=?, end_date=?, currency=?, is_archived=?,
|
||||
* cover_image=?, reminder_days=?, updated_at=CURRENT_TIMESTAMP WHERE
|
||||
* cover_image=?, reminder_days=?, costs_mode=?, updated_at=CURRENT_TIMESTAMP WHERE
|
||||
* id=?`. The `||`/`!== undefined` pre-image fallbacks are the SERVICE's
|
||||
* own (R5/§18.6 — this write stays OUTSIDE the days-regeneration
|
||||
* transaction, unchanged); this takes the final, already-decided values
|
||||
@@ -597,16 +600,11 @@ export class TripsRepository extends TrekRepository<Trips> {
|
||||
* here would tempt a caller to paper over that with its own `?? 0`, the
|
||||
* exact regression the review found.
|
||||
*/
|
||||
async updateTripRow(id: number, data: {
|
||||
title: string;
|
||||
description: string | null;
|
||||
start_date: string | null;
|
||||
end_date: string | null;
|
||||
currency: string;
|
||||
is_archived: number | null;
|
||||
cover_image: string | null;
|
||||
reminder_days: number;
|
||||
}): Promise<void> {
|
||||
async updateTripRow(
|
||||
id: number,
|
||||
data: Pick<TripRawRow, 'title' | 'description' | 'start_date' | 'end_date' | 'is_archived' | 'cover_image' | 'costs_mode'>
|
||||
& { currency: string; reminder_days: number },
|
||||
): Promise<void> {
|
||||
const platform = this.getEntityManager().getPlatform();
|
||||
await this.nativeUpdate({ id }, { ...data, updated_at: currentTimestamp(platform) });
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user