feat(expenses+interests): trip/event grouping (lightweight)
Per the trips/events design discussion: instead of building a full
events domain (table + CRUD UI + calendar) for the 6–12 yacht shows
a year, ship the cheap version that covers the actual asks.
Expenses — `tripLabel` free-text:
- New `expenses.trip_label` text column (migration 0039) + index for
filter / autocomplete lookup.
- Validator: createExpenseShape + listExpensesSchema +
exportExpensePdfSchema.filter all accept tripLabel.
- Service: createExpense + updateExpense persist; listExpenses filters;
new `listTripLabels(portId, search?)` returns distinct values
ordered by most-recent expenseDate so the autocomplete surfaces
recently-used labels first.
- New `GET /api/v1/expenses/trip-labels` endpoint (gated by
expenses.view) backs the autocomplete.
- Form dialog: native `<datalist>` powered by the autocomplete query
so reps don't end up with "Palm Beach 2026" / "palm-beach 2026"
fragmented across two PDF sections.
- Expense list: new "Trip" column (badge) + free-text filter.
- Detail page: trip label rendered alongside Category / Payer.
- PDF export: GroupBy gains 'trip'; filter.tripLabel narrows the
export. Untagged rows fall under "(no trip)".
- Trim/normalize on write so " Palm Beach 2026 " === "Palm Beach 2026".
Interests — event tagging via existing tag system:
- Reps can tag interests with an event tag (e.g. "Palm Beach 2026")
via the existing InlineTagEditor on the detail page; tags are
port-scoped and reusable.
- Interest list now has a TagPicker filter rendered next to the
FilterBar so reps can sort prospects by event attended ("show me
every lead from Palm Beach"). Hidden 'relation'-typed
FilterDefinition for tagIds wires URL round-trip + saved-views
capture without rendering inside the FilterBar.
- FilterBar deserializer now handles `relation` types as comma-joined
arrays on URL load.
Why a free-text trip label and not a trips table:
- 6–12 events/year doesn't justify a domain. The CRUD UI cost would
be most of the engineering, and reps already have the events on
their personal calendars.
- If usage proves demand for per-event ROI dashboards or richer
attribution, promote to a real `trips` table later. Migration
path: trip_label → tripId is a backfill+swap.
Test status: 1168/1168 vitest. tsc clean. Migration 0039 applied
in dev (also caught + fixed an unrelated audit-v3 follow-up: 0037
had `idx_br_interest` colliding with the existing
`berth_recommendations.idx_br_interest`; renamed to
`idx_brr_interest` / `idx_brr_contract_file`).
Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
This commit is contained in:
@@ -3,10 +3,10 @@
|
||||
-- the child table fully. CREATE INDEX IF NOT EXISTS keeps the migration safe
|
||||
-- to re-run.
|
||||
|
||||
-- berth_reservations
|
||||
CREATE INDEX IF NOT EXISTS idx_br_interest
|
||||
-- berth_reservations (idx_br_interest is taken by berth_recommendations)
|
||||
CREATE INDEX IF NOT EXISTS idx_brr_interest
|
||||
ON berth_reservations(interest_id);
|
||||
CREATE INDEX IF NOT EXISTS idx_br_contract_file
|
||||
CREATE INDEX IF NOT EXISTS idx_brr_contract_file
|
||||
ON berth_reservations(contract_file_id);
|
||||
|
||||
-- documents (file FKs)
|
||||
|
||||
12
src/lib/db/migrations/0039_expense_trip_label.sql
Normal file
12
src/lib/db/migrations/0039_expense_trip_label.sql
Normal file
@@ -0,0 +1,12 @@
|
||||
-- Free-text trip / event label so reps can group expenses by yacht show
|
||||
-- or business trip (e.g. "Palm Beach 2026"). Un-normalized on purpose —
|
||||
-- 6–12 events/year doesn't justify a `trips` table + CRUD UI. The
|
||||
-- autocomplete on the expense form keeps spellings consistent so the
|
||||
-- group-by works.
|
||||
|
||||
ALTER TABLE expenses
|
||||
ADD COLUMN IF NOT EXISTS trip_label text;
|
||||
|
||||
-- Powers the trip filter on the list endpoint + the autocomplete query.
|
||||
CREATE INDEX IF NOT EXISTS idx_expenses_trip_label
|
||||
ON expenses(port_id, trip_label);
|
||||
@@ -274,6 +274,13 @@
|
||||
"when": 1778200000000,
|
||||
"tag": "0038_document_sends_sent_by_user_fk",
|
||||
"breakpoints": true
|
||||
},
|
||||
{
|
||||
"idx": 39,
|
||||
"version": "7",
|
||||
"when": 1778250000000,
|
||||
"tag": "0039_expense_trip_label",
|
||||
"breakpoints": true
|
||||
}
|
||||
]
|
||||
}
|
||||
|
||||
@@ -49,6 +49,14 @@ export const expenses = pgTable(
|
||||
paymentDate: date('payment_date'),
|
||||
paymentReference: text('payment_reference'),
|
||||
paymentNotes: text('payment_notes'),
|
||||
/**
|
||||
* Free-text trip / event label so reps can group expenses for one
|
||||
* yacht show or business trip (e.g. "Palm Beach 2026"). Deliberately
|
||||
* un-normalized — events are 6–12/year and full event-management
|
||||
* functionality lives outside this CRM. The autocomplete on the
|
||||
* expense form keeps spellings consistent so group-by works.
|
||||
*/
|
||||
tripLabel: text('trip_label'),
|
||||
/** When set, this expense is flagged as a duplicate of another in the
|
||||
* same port. Self-referencing FK; the dedup service writes this. */
|
||||
duplicateOf: text('duplicate_of').references((): AnyPgColumn => expenses.id, {
|
||||
@@ -75,6 +83,8 @@ export const expenses = pgTable(
|
||||
index('idx_expenses_dedup')
|
||||
.on(table.portId, table.establishmentName, table.amount, table.expenseDate)
|
||||
.where(sql`duplicate_of IS NULL`),
|
||||
// Powers the autocomplete + group-by-trip filter / PDF section.
|
||||
index('idx_expenses_trip_label').on(table.portId, table.tripLabel),
|
||||
],
|
||||
);
|
||||
|
||||
|
||||
@@ -43,9 +43,10 @@ export const berthReservations = pgTable(
|
||||
index('idx_br_port').on(table.portId),
|
||||
// Cover the FKs Postgres doesn't auto-index. Without these, deleting
|
||||
// (or restrict-checking) the parent interest / contract file row
|
||||
// requires a full scan of berth_reservations.
|
||||
index('idx_br_interest').on(table.interestId),
|
||||
index('idx_br_contract_file').on(table.contractFileId),
|
||||
// requires a full scan of berth_reservations. (idx_br_interest is
|
||||
// already used by berth_recommendations — namespace this one.)
|
||||
index('idx_brr_interest').on(table.interestId),
|
||||
index('idx_brr_contract_file').on(table.contractFileId),
|
||||
uniqueIndex('idx_br_active')
|
||||
.on(table.berthId)
|
||||
.where(sql`${table.status} = 'active'`),
|
||||
|
||||
Reference in New Issue
Block a user