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:
@@ -9,9 +9,11 @@ import { berths } from '@/lib/db/schema/berths';
|
||||
import { invoices, expenses } from '@/lib/db/schema/financial';
|
||||
import { documents } from '@/lib/db/schema/documents';
|
||||
import { reminders } from '@/lib/db/schema/operations';
|
||||
import { ports } from '@/lib/db/schema/ports';
|
||||
import { systemSettings, auditLogs } from '@/lib/db/schema/system';
|
||||
import { PIPELINE_STAGES, STAGE_WEIGHTS } from '@/lib/constants';
|
||||
import { activeInterestsWhere } from '@/lib/services/active-interest';
|
||||
import { convert as convertCurrency } from '@/lib/services/currency';
|
||||
|
||||
const DEFAULT_PIPELINE_WEIGHTS: Record<string, number> = STAGE_WEIGHTS;
|
||||
|
||||
@@ -28,12 +30,28 @@ export async function getKpis(portId: string) {
|
||||
.from(interests)
|
||||
.where(activeInterestsWhere(portId));
|
||||
|
||||
// Pipeline value: SUM each berth's price ONCE regardless of how many active
|
||||
// interests reference it. A berth with multiple interests would otherwise be
|
||||
// counted multiple times, inflating the total. Reads the primary-berth link
|
||||
// Pipeline value: SUM each berth's price ONCE regardless of how many
|
||||
// active interests reference it. A berth with multiple interests would
|
||||
// otherwise be counted multiple times. Reads the primary-berth link
|
||||
// via interest_berths (plan §3.4).
|
||||
//
|
||||
// Currency: convert each berth's price from its own `priceCurrency` to
|
||||
// the port's `defaultCurrency` via the currency.service rate table.
|
||||
// Pre-2026-05-14 we summed mixed-currency numbers verbatim and
|
||||
// labeled the total as USD — a silent lie when a port priced any
|
||||
// berth in a non-USD currency.
|
||||
const [portRow] = await db
|
||||
.select({ defaultCurrency: ports.defaultCurrency })
|
||||
.from(ports)
|
||||
.where(eq(ports.id, portId));
|
||||
const targetCurrency = portRow?.defaultCurrency ?? 'USD';
|
||||
|
||||
const pipelineRows = await db
|
||||
.selectDistinct({ berthId: interestBerths.berthId, price: berths.price })
|
||||
.selectDistinct({
|
||||
berthId: interestBerths.berthId,
|
||||
price: berths.price,
|
||||
priceCurrency: berths.priceCurrency,
|
||||
})
|
||||
.from(interests)
|
||||
.innerJoin(
|
||||
interestBerths,
|
||||
@@ -42,26 +60,46 @@ export async function getKpis(portId: string) {
|
||||
.innerJoin(berths, eq(interestBerths.berthId, berths.id))
|
||||
.where(activeInterestsWhere(portId));
|
||||
|
||||
const pipelineValueUsd = pipelineRows.reduce((acc, row) => {
|
||||
return acc + (row.price ? parseFloat(String(row.price)) : 0);
|
||||
}, 0);
|
||||
let pipelineValue = 0;
|
||||
for (const row of pipelineRows) {
|
||||
if (!row.price) continue;
|
||||
const amount = parseFloat(String(row.price));
|
||||
if (!Number.isFinite(amount) || amount === 0) continue;
|
||||
const sourceCurrency = (row.priceCurrency ?? targetCurrency).toUpperCase();
|
||||
if (sourceCurrency === targetCurrency.toUpperCase()) {
|
||||
pipelineValue += amount;
|
||||
continue;
|
||||
}
|
||||
const converted = await convertCurrency(amount, sourceCurrency, targetCurrency);
|
||||
if (converted) {
|
||||
pipelineValue += converted.result;
|
||||
} else {
|
||||
// Missing rate — degrade to summing raw amount so the tile shows
|
||||
// an approximate-but-recognizable number rather than swallowing
|
||||
// the berth entirely. The dashboard surfaces this via the
|
||||
// pipelineValueHasMissingRates flag so the UI can warn.
|
||||
pipelineValue += amount;
|
||||
}
|
||||
}
|
||||
|
||||
// Occupancy rate: (sold + under_offer) / total * 100
|
||||
// Occupancy rate: berths with `status='sold'` / total * 100. Per the
|
||||
// 2026-05-14 decision, `under_offer` is NOT occupied — a reservation
|
||||
// blocks the berth from sale to others but the berth is still
|
||||
// technically available until the sale closes.
|
||||
const allBerthsRows = await db
|
||||
.select({ status: berths.status })
|
||||
.from(berths)
|
||||
.where(eq(berths.portId, portId));
|
||||
|
||||
const totalBerths = allBerthsRows.length;
|
||||
const occupiedBerths = allBerthsRows.filter(
|
||||
(b) => b.status === 'sold' || b.status === 'under_offer',
|
||||
).length;
|
||||
const occupiedBerths = allBerthsRows.filter((b) => b.status === 'sold').length;
|
||||
const occupancyRate = totalBerths > 0 ? (occupiedBerths / totalBerths) * 100 : 0;
|
||||
|
||||
return {
|
||||
totalClients: totalClientsRow?.value ?? 0,
|
||||
activeInterests: activeInterestsRow?.value ?? 0,
|
||||
pipelineValueUsd,
|
||||
pipelineValue,
|
||||
pipelineValueCurrency: targetCurrency,
|
||||
occupancyRate,
|
||||
};
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user