{label}
-{value}
- {sub &&{sub}
} +{note}
{formatCategory(payload[0].payload.category)}
-${Number(payload[0].value).toFixed(2)}
-What the trip cost
+ {/* Sans, not the display face, and proportional figures — a serif or + tabular-nums hero reads as decoration at this size. */} +{fmt(Number(total_spend))}
++ all payers, net of refunds · {transaction_count} charges over {num_days} days +
+On the ground
++ {fmt(onGroundDaily)} / day +
+ {dayRateRank &&{dayRateRank}
} ++ + {fmt(committed)} + committed{t.start_date ? ` before ${fmtDate(t.start_date)}` : ""} +
++ {phases.committed_count} bookings · {committedPct.toFixed(0)}% of the trip +
++ + {fmt(onGround)} + spent on the ground +
++ {phases.on_ground_count} charges · {(100 - committedPct).toFixed(0)}% of the trip +
++ Almost nothing was booked before this trip started — its flights and + stays are likely filed against another trip. +
+ )} +No transactions assigned to this trip yet.
diff --git a/src/lib/queries.ts b/src/lib/queries.ts index 972467a..d137b76 100644 --- a/src/lib/queries.ts +++ b/src/lib/queries.ts @@ -927,6 +927,33 @@ export interface TripAnalytics { category_breakdown: { category: string; amount: number; count: number }[]; daily_spend: { date: string; amount: number }[]; top_merchants: { merchant: string; amount: number; count: number }[]; + /** + * A trip has two economies, and mixing them is what made `travel` look like an + * uninformative 60% slab: it is the ONLY category that spans both. Measured on + * Europe 2026, every other category is 100% on-the-ground — dining, transport, + * entertainment, groceries and shopping are all exactly $0.00 before departure. + * + * So the fix is not a finer travel taxonomy (which would need a hand-maintained + * merchant list, the trap ticket #19 already describes). It is to split by phase + * and use the axis that carries information in each: merchant before departure, + * where everything is a flight or a booking, and category after it, where travel + * drops to a normal-sized slice among peers. + * + * `committed` is dated before `start_date`; everything else is `on_ground`. A trip + * with no start_date has no knowable split, so it all reads as on-ground. + */ + phases: { + committed: number; + committed_count: number; + on_ground: number; + on_ground_count: number; + }; + /** Pre-departure spend by merchant — the bookings that make up the commitment. */ + committed_merchants: { merchant: string; amount: number; count: number }[]; + /** On-the-ground spend by category, where category is finally worth charting. */ + on_ground_categories: { category: string; amount: number; count: number }[]; + /** On-ground spend per day of the trip window. The comparable rate between trips. */ + on_ground_daily: number; tag_breakdown: { tag_id: number; name: string; color: string; amount: number; count: number }[]; participant_splits: { participant_id: number; @@ -1064,7 +1091,10 @@ export async function getTripAnalytics(tripId: number, viewerId: number): Promis // // COUNT(*) deliberately still counts refund rows: a refund is a transaction // that occurred on the trip, even though it subtracts from the total. - const [categoryRows, dailyRows, merchantRows, tagRows, splitRows] = await Promise.all([ + const [ + categoryRows, dailyRows, merchantRows, tagRows, splitRows, + phaseRows, committedMerchantRows, onGroundCategoryRows, + ] = await Promise.all([ queryRaw<{ category: string; amount: number; count: number }>(` SELECT COALESCE(o.category_override, t.category, 'other') AS category, @@ -1242,6 +1272,58 @@ export async function getTripAnalytics(tripId: number, viewerId: number): Promis OR paid_to_me.pid IS NOT NULL OR paid_by_me.pid IS NOT NULL ORDER BY 3 DESC `, [tripId, viewerId]), + + // ── The phase split, and the right axis on each side of it ── + // + // $3 is the trip's start_date. NULL makes every comparison NULL, so a trip with + // no dates collapses to all-on-ground rather than erroring or silently + // reporting everything as committed. + queryRaw<{ committed: number; committed_count: number; on_ground: number; on_ground_count: number }>(` + SELECT + COALESCE(SUM(CASE WHEN t.transaction_date < $2::date THEN ${SPEND_SIGNED} END), 0)::float AS committed, + COUNT(*) FILTER (WHERE t.transaction_date < $2::date)::int AS committed_count, + COALESCE(SUM(CASE WHEN t.transaction_date >= $2::date OR $2 IS NULL THEN ${SPEND_SIGNED} END), 0)::float AS on_ground, + COUNT(*) FILTER (WHERE t.transaction_date >= $2::date OR $2 IS NULL)::int AS on_ground_count + FROM transaction_overrides o + JOIN transactions t ON t.id = o.transaction_id + WHERE o.trip_id = $1 + AND ${NET_SPEND_ROWS} + AND ${EXCLUDE_RECONCILED_SOURCE} + AND COALESCE(o.category_override, t.category, 'other') NOT IN ('transfers', 'investment') + `, [tripId, trip.start_date]), + + queryRaw<{ merchant: string; amount: number; count: number }>(` + SELECT + COALESCE(o.merchant_normalized, t.merchant_normalized, t.merchant_name, t.description) AS merchant, + SUM(${SPEND_SIGNED})::float AS amount, + COUNT(*)::int AS count + FROM transaction_overrides o + JOIN transactions t ON t.id = o.transaction_id + WHERE o.trip_id = $1 + AND t.transaction_date < $2::date + AND ${NET_SPEND_ROWS} + AND ${EXCLUDE_RECONCILED_SOURCE} + AND COALESCE(o.category_override, t.category, 'other') NOT IN ('transfers', 'investment') + GROUP BY 1 + ORDER BY 2 DESC + LIMIT 12 + `, [tripId, trip.start_date]), + + queryRaw<{ category: string; amount: number; count: number }>(` + SELECT + COALESCE(o.category_override, t.category, 'other') AS category, + SUM(${SPEND_SIGNED})::float AS amount, + COUNT(*)::int AS count + FROM transaction_overrides o + JOIN transactions t ON t.id = o.transaction_id + WHERE o.trip_id = $1 + AND (t.transaction_date >= $2::date OR $2 IS NULL) + AND ${NET_SPEND_ROWS} + AND ${EXCLUDE_RECONCILED_SOURCE} + AND COALESCE(o.category_override, t.category, 'other') NOT IN ('transfers', 'investment') + GROUP BY 1 + ORDER BY 2 DESC + `, [tripId, trip.start_date]), ]); const num_days = (trip.start_date && trip.end_date) @@ -1260,6 +1342,12 @@ export async function getTripAnalytics(tripId: number, viewerId: number): Promis tag_breakdown: tagRows, participant_splits: splitRows, viewer_is_owner: trip.owner_id === viewerId, + phases: phaseRows[0] ?? { committed: 0, committed_count: 0, on_ground: 0, on_ground_count: 0 }, + committed_merchants: committedMerchantRows, + on_ground_categories: onGroundCategoryRows, + // Per day of the trip window, not per day of the whole span — the commitment + // was made over months and dividing it by trip length would be meaningless. + on_ground_daily: (phaseRows[0]?.on_ground ?? 0) / num_days, }; }