feat(reporting): money-math sweep — Step 1 PRE-DEPLOY-PLAN
Single coherent commit completing § 1.1 (hot-path correctness) plus
§ 1.1.4.5 (multi-berth EOI mooring fix). Numbers users see are now
self-consistent across dashboard / kanban / hot deals / PDF reports.
## Active-interest sweep (canonical predicate everywhere)
Routed every "active interest" filter through `activeInterestsWhere`
(commit b966d81 helper). The helper enforces port-scoping + archivedAt
IS NULL + outcome IS NULL — strict definition, won is closed.
Touched sites:
- src/lib/services/reminders.service.ts:digestPort — no longer fires
reminders for won/lost/cancelled deals
- src/lib/services/berths.service.ts:getLatestInterestStageByBerth
- src/lib/services/client-archive-dossier.service.ts (next-in-line
others lookup)
- src/lib/services/client-archive.service.ts (remaining-under-offer
recount before flipping berth back to available)
- src/lib/services/client-restore.service.ts (yacht-usage check)
- src/lib/services/interests.service.ts:listInterestsForBoard +
getInterestStageCounts + the "others on same berth" lookup —
kanban / board now exclude terminal deals
- src/lib/services/report-generators.ts: fetchPipelineData,
fetchRevenueData stage breakdowns, top-N interests
## Pipeline-value currency conversion
`getKpis()` now fetches the port's defaultCurrency from `ports` and
converts each berth's `priceCurrency`→port-default via
`currency.service`. Returns `pipelineValue` + `pipelineValueCurrency`
instead of the lying `pipelineValueUsd`. Missing rates fall through to
raw amount summing (so the tile still shows an approximate number) —
behind a follow-up to surface a "rates incomplete" indicator.
3 consumers updated: KpiCards, PipelineValueTile, ActiveDealsTile.
## Occupancy = sold only
Both the dashboard KPI tile and the revenue-report PDF occupancy data
now count only `berth.status='sold'`. `under_offer` is a hold, not
occupation. The analytics timeline switches from
`berth_reservations`-derived to a cumulative-won-deals derivation via
`interests.outcome='won' AND outcome_at::date <= day` — same source of
truth, historical shape preserved.
## Revenue PDF two-card layout
Added `totalForecast` + `pipelineWeights` to `RevenueData`. Summary
section now renders both:
- "Completed revenue (won)" — money in the bank
- "Forecast revenue (pipeline-weighted)" — expected pipeline value
Pipeline weights resolve from `system_settings.pipeline_weights`
(per-port admin override) and fall back to STAGE_WEIGHTS defaults. PDF
and dashboard forecast tiles reconcile.
## Multi-berth EOI mooring (4.5)
Documenso `Berth Number` form field now carries the formatBerthRange
output for BOTH single- and multi-berth EOIs. Single-berth output is
byte-identical to the legacy primary-only path
(`formatBerthRange(['A1']) === 'A1'`). Multi-berth EOIs now render
the full range ("A1-A3, B5") in the existing field instead of being
silently dropped against a nonexistent `Berth Range` field.
Dropped:
- `'Berth Range'` from the Documenso formValues payload + TS type
- `setBerthRange()` helper from fill-eoi-form.ts (now redundant)
- The "missing Berth Range AcroForm field" warning log
Updated CLAUDE.md to reflect — no Documenso admin template change
needed.
## Tests
- Updated `documenso-payload.test.ts` — new fixture asserts
formatBerthRange output flows into Berth Number; multi-berth case
added.
- Updated `analytics-service.test.ts:computeOccupancyTimeline` —
fixture creates a won interest instead of a reservation.
- Updated `alerts-engine.test.ts:interest.stale` — fixture stage
switched from dead `'in_communication'` to canonical `'qualified'`.
- Updated `report-templates.test.tsx:revenue` — fixture carries
`totalForecast` + `pipelineWeights` to match new RevenueData.
1373/1373 vitest pass. tsc + eslint clean.
Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
This commit is contained in:
@@ -178,11 +178,14 @@ export async function computeOccupancyTimeline(
|
||||
);
|
||||
const total = totalRow[0]?.total ?? 0;
|
||||
|
||||
// Single-query implementation: generate_series for the date range and
|
||||
// LEFT JOIN active reservations whose [start_date, end_date] window
|
||||
// covers each day. Returns every day's occupancy count in one round
|
||||
// trip; replaces the prior per-day loop that fired N queries (30 for
|
||||
// .30d, 90 for .90d) and saturated the postgres pool.
|
||||
// Occupancy = cumulative count of berths sold (i.e. won deals) on or
|
||||
// before each day. Per 2026-05-14 decision, the canonical occupancy
|
||||
// signal is "the deal closed and money changed hands" — reservations
|
||||
// are merely holds and don't count as occupied. Sources from
|
||||
// `interests.outcome='won'` + `outcome_at::date`; primary-berth link
|
||||
// via `interest_berths` so multi-berth deals contribute every linked
|
||||
// berth once. Single round-trip via generate_series cross-join with a
|
||||
// sold_berths CTE.
|
||||
const fromStr = from.toISOString().slice(0, 10);
|
||||
const toStr = new Date(to.getTime() - 86_400_000).toISOString().slice(0, 10);
|
||||
const rows = await db.execute<{ day: string; occupied: number }>(
|
||||
@@ -190,18 +193,20 @@ export async function computeOccupancyTimeline(
|
||||
WITH days AS (
|
||||
SELECT generate_series(${fromStr}::date, ${toStr}::date, '1 day'::interval)::date AS day
|
||||
),
|
||||
active_reservations AS (
|
||||
SELECT berth_id, start_date, end_date
|
||||
FROM berth_reservations
|
||||
WHERE port_id = ${portId} AND status = 'active'
|
||||
sold_berths AS (
|
||||
SELECT DISTINCT ib.berth_id, (i.outcome_at AT TIME ZONE 'UTC')::date AS sold_on
|
||||
FROM interests i
|
||||
INNER JOIN interest_berths ib ON ib.interest_id = i.id
|
||||
WHERE i.port_id = ${portId}
|
||||
AND i.outcome = 'won'
|
||||
AND i.outcome_at IS NOT NULL
|
||||
AND i.archived_at IS NULL
|
||||
)
|
||||
SELECT
|
||||
to_char(days.day, 'YYYY-MM-DD') AS day,
|
||||
COUNT(DISTINCT ar.berth_id)::int AS occupied
|
||||
COUNT(DISTINCT sb.berth_id)::int AS occupied
|
||||
FROM days
|
||||
LEFT JOIN active_reservations ar
|
||||
ON ar.start_date <= days.day
|
||||
AND (ar.end_date IS NULL OR ar.end_date >= days.day)
|
||||
LEFT JOIN sold_berths sb ON sb.sold_on <= days.day
|
||||
GROUP BY days.day
|
||||
ORDER BY days.day
|
||||
`,
|
||||
|
||||
Reference in New Issue
Block a user