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'`),
|
||||
|
||||
@@ -47,7 +47,7 @@ import { logger } from '@/lib/logger';
|
||||
|
||||
// ─── Public options + result types ──────────────────────────────────────────
|
||||
|
||||
export type GroupBy = 'none' | 'payer' | 'category' | 'date';
|
||||
export type GroupBy = 'none' | 'payer' | 'category' | 'date' | 'trip';
|
||||
export type PageFormat = 'A4' | 'Letter' | 'Legal';
|
||||
export type TargetCurrency = 'USD' | 'EUR';
|
||||
|
||||
@@ -84,6 +84,7 @@ export interface ExpensePdfArgs {
|
||||
category?: string | null;
|
||||
paymentStatus?: string | null;
|
||||
payer?: string | null;
|
||||
tripLabel?: string | null;
|
||||
includeArchived?: boolean;
|
||||
};
|
||||
options: ExpensePdfOptions;
|
||||
@@ -171,6 +172,8 @@ interface ExpenseRow {
|
||||
* the table + a footnote at the bottom of the summary box. */
|
||||
noReceiptAcknowledged: boolean;
|
||||
paymentStatus: string | null;
|
||||
/** Free-text trip / event label — drives `groupBy=trip` sectioning. */
|
||||
tripLabel: string | null;
|
||||
}
|
||||
|
||||
interface ProcessedExpense extends ExpenseRow {
|
||||
@@ -328,6 +331,10 @@ function groupKey(row: ProcessedExpense, by: GroupBy): string {
|
||||
return row.payer ?? 'Unknown payer';
|
||||
case 'category':
|
||||
return row.category ?? 'Uncategorized';
|
||||
case 'trip':
|
||||
// Untagged rows go under "(no trip)" so they're still in the
|
||||
// export, just collected at the bottom.
|
||||
return row.tripLabel ?? '(no trip)';
|
||||
case 'date':
|
||||
return row.expenseDate.toISOString().slice(0, 10);
|
||||
default:
|
||||
@@ -388,6 +395,7 @@ async function fetchExpenseRows(args: ExpensePdfArgs): Promise<ExpenseRow[]> {
|
||||
if (args.filter?.payer) conditions.push(eq(expenses.payer, args.filter.payer));
|
||||
if (args.filter?.paymentStatus)
|
||||
conditions.push(eq(expenses.paymentStatus, args.filter.paymentStatus));
|
||||
if (args.filter?.tripLabel) conditions.push(eq(expenses.tripLabel, args.filter.tripLabel));
|
||||
}
|
||||
|
||||
const rows = await db
|
||||
@@ -404,6 +412,7 @@ async function fetchExpenseRows(args: ExpensePdfArgs): Promise<ExpenseRow[]> {
|
||||
description: expenses.description,
|
||||
receiptFileIds: expenses.receiptFileIds,
|
||||
noReceiptAcknowledged: expenses.noReceiptAcknowledged,
|
||||
tripLabel: expenses.tripLabel,
|
||||
paymentStatus: expenses.paymentStatus,
|
||||
})
|
||||
.from(expenses)
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
import { eq, and, gte, lte, sql } from 'drizzle-orm';
|
||||
import { eq, and, gte, lte, sql, isNull, ilike, isNotNull, desc, ne } from 'drizzle-orm';
|
||||
import type { PgColumn } from 'drizzle-orm/pg-core';
|
||||
|
||||
import { db } from '@/lib/db';
|
||||
@@ -19,6 +19,46 @@ import type {
|
||||
|
||||
export type { ListExpensesInput };
|
||||
|
||||
/**
|
||||
* Trim + collapse whitespace on free-text trip labels so "Palm Beach 2026"
|
||||
* and " Palm Beach 2026 " end up identical for the group-by + filter.
|
||||
* Empty / whitespace-only collapses to null.
|
||||
*/
|
||||
function normalizeTripLabel(input: string | null | undefined): string | null {
|
||||
if (input == null) return null;
|
||||
const trimmed = input.replace(/\s+/g, ' ').trim();
|
||||
return trimmed.length > 0 ? trimmed : null;
|
||||
}
|
||||
|
||||
/**
|
||||
* Distinct trip labels used in this port, ordered by most-recent first
|
||||
* so the autocomplete surfaces "what reps actually used lately" rather
|
||||
* than alphabetically. Powers the `tripLabel` <Combobox> on the expense
|
||||
* form. Read-only — no mutation hooks.
|
||||
*/
|
||||
export async function listTripLabels(portId: string, search?: string): Promise<string[]> {
|
||||
const conditions = [
|
||||
eq(expenses.portId, portId),
|
||||
isNotNull(expenses.tripLabel),
|
||||
ne(expenses.tripLabel, ''),
|
||||
isNull(expenses.archivedAt),
|
||||
];
|
||||
if (search && search.trim().length > 0) {
|
||||
conditions.push(ilike(expenses.tripLabel, `%${search.trim()}%`));
|
||||
}
|
||||
const rows = await db
|
||||
.selectDistinct({
|
||||
tripLabel: expenses.tripLabel,
|
||||
latest: sql<Date>`MAX(${expenses.expenseDate})`.as('latest'),
|
||||
})
|
||||
.from(expenses)
|
||||
.where(and(...conditions))
|
||||
.groupBy(expenses.tripLabel)
|
||||
.orderBy(desc(sql`MAX(${expenses.expenseDate})`))
|
||||
.limit(50);
|
||||
return rows.map((r) => r.tripLabel as string).filter((s): s is string => Boolean(s));
|
||||
}
|
||||
|
||||
export async function listExpenses(portId: string, query: ListExpensesInput) {
|
||||
const filters = [];
|
||||
|
||||
@@ -34,6 +74,9 @@ export async function listExpenses(portId: string, query: ListExpensesInput) {
|
||||
if (query.payer) {
|
||||
filters.push(eq(expenses.payer, query.payer));
|
||||
}
|
||||
if (query.tripLabel) {
|
||||
filters.push(eq(expenses.tripLabel, query.tripLabel));
|
||||
}
|
||||
if (query.dateFrom) {
|
||||
filters.push(gte(expenses.expenseDate, new Date(query.dateFrom)));
|
||||
}
|
||||
@@ -106,6 +149,7 @@ export async function createExpense(portId: string, data: CreateExpenseInput, me
|
||||
payer: data.payer,
|
||||
expenseDate: data.expenseDate,
|
||||
description: data.description,
|
||||
tripLabel: normalizeTripLabel(data.tripLabel),
|
||||
receiptFileIds: data.receiptFileIds ?? [],
|
||||
noReceiptAcknowledged: data.noReceiptAcknowledged ?? false,
|
||||
paymentStatus: data.paymentStatus,
|
||||
@@ -175,6 +219,9 @@ export async function updateExpense(
|
||||
}
|
||||
|
||||
const updateData: Record<string, unknown> = { ...data, updatedAt: new Date() };
|
||||
if (data.tripLabel !== undefined) {
|
||||
updateData.tripLabel = normalizeTripLabel(data.tripLabel);
|
||||
}
|
||||
|
||||
// Re-convert to USD if amount or currency changed
|
||||
const newAmount = data.amount ?? Number(existing.amount);
|
||||
|
||||
@@ -29,6 +29,12 @@ export const createExpenseShape = z.object({
|
||||
paymentDate: z.string().optional(),
|
||||
paymentReference: z.string().optional(),
|
||||
paymentNotes: z.string().optional(),
|
||||
/**
|
||||
* Free-text trip / event label (e.g. "Palm Beach 2026"). Empty / null
|
||||
* means "no trip". The form's autocomplete suggests prior values per
|
||||
* port to keep spellings consistent so group-by works downstream.
|
||||
*/
|
||||
tripLabel: z.string().max(120).optional(),
|
||||
});
|
||||
|
||||
export const createExpenseSchema = createExpenseShape.refine(
|
||||
@@ -52,6 +58,7 @@ export const listExpensesSchema = baseListQuerySchema.extend({
|
||||
dateTo: z.string().optional(),
|
||||
currency: z.string().optional(),
|
||||
payer: z.string().optional(),
|
||||
tripLabel: z.string().optional(),
|
||||
});
|
||||
|
||||
/**
|
||||
@@ -75,13 +82,14 @@ export const exportExpensePdfSchema = z.object({
|
||||
category: z.string().optional().nullable(),
|
||||
paymentStatus: z.string().optional().nullable(),
|
||||
payer: z.string().optional().nullable(),
|
||||
tripLabel: z.string().optional().nullable(),
|
||||
includeArchived: z.boolean().optional(),
|
||||
})
|
||||
.optional(),
|
||||
options: z.object({
|
||||
documentName: z.string().min(1).max(200),
|
||||
subheader: z.string().max(300).optional(),
|
||||
groupBy: z.enum(['none', 'payer', 'category', 'date']).default('none'),
|
||||
groupBy: z.enum(['none', 'payer', 'category', 'date', 'trip']).default('none'),
|
||||
includeReceipts: z.boolean().default(false),
|
||||
includeReceiptContents: z.boolean().default(false),
|
||||
includeSummary: z.boolean().default(true),
|
||||
|
||||
Reference in New Issue
Block a user