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:
@@ -3,7 +3,9 @@ import { and, count, eq, gte, isNull, lte, sql, sum } from 'drizzle-orm';
|
||||
import { db } from '@/lib/db';
|
||||
import { interests, interestBerths } from '@/lib/db/schema/interests';
|
||||
import { berths } from '@/lib/db/schema/berths';
|
||||
import { auditLogs } from '@/lib/db/schema/system';
|
||||
import { auditLogs, systemSettings } from '@/lib/db/schema/system';
|
||||
import { STAGE_WEIGHTS } from '@/lib/constants';
|
||||
import { activeInterestsWhere } from '@/lib/services/active-interest';
|
||||
|
||||
// ─── Types ────────────────────────────────────────────────────────────────────
|
||||
|
||||
@@ -19,8 +21,18 @@ export interface PipelineData {
|
||||
}
|
||||
|
||||
export interface RevenueData {
|
||||
/** Gross berth prices per pipeline stage (unweighted). */
|
||||
stageRevenue: Record<string, string>;
|
||||
/** Money-changed-hands total: sum of berth prices for won deals. */
|
||||
totalCompleted: string;
|
||||
/** Pipeline-weighted forecast: sum of (berth price × stage weight)
|
||||
* for every active interest. Aligns with the dashboard forecast tile
|
||||
* so the PDF and dashboard reconcile. */
|
||||
totalForecast: string;
|
||||
/** Pipeline weights actually applied (port-customizable). Echoes
|
||||
* `system_settings.pipeline_weights` when set, otherwise the
|
||||
* STAGE_WEIGHTS defaults. */
|
||||
pipelineWeights: Record<string, number>;
|
||||
generatedAt: string;
|
||||
}
|
||||
|
||||
@@ -60,7 +72,7 @@ export async function fetchPipelineData(
|
||||
count: count(),
|
||||
})
|
||||
.from(interests)
|
||||
.where(and(eq(interests.portId, portId), isNull(interests.archivedAt)))
|
||||
.where(activeInterestsWhere(portId))
|
||||
.groupBy(interests.pipelineStage);
|
||||
|
||||
const stageCountMap: Record<string, number> = {};
|
||||
@@ -82,7 +94,7 @@ export async function fetchPipelineData(
|
||||
and(eq(interestBerths.interestId, interests.id), eq(interestBerths.isPrimary, true)),
|
||||
)
|
||||
.leftJoin(berths, eq(interestBerths.berthId, berths.id))
|
||||
.where(and(eq(interests.portId, portId), isNull(interests.archivedAt)))
|
||||
.where(activeInterestsWhere(portId))
|
||||
.orderBy(sql`${berths.price} DESC NULLS LAST`)
|
||||
.limit(10);
|
||||
|
||||
@@ -118,7 +130,7 @@ export async function fetchRevenueData(
|
||||
and(eq(interestBerths.interestId, interests.id), eq(interestBerths.isPrimary, true)),
|
||||
)
|
||||
.leftJoin(berths, eq(interestBerths.berthId, berths.id))
|
||||
.where(and(eq(interests.portId, portId), isNull(interests.archivedAt)))
|
||||
.where(activeInterestsWhere(portId))
|
||||
.groupBy(interests.pipelineStage);
|
||||
|
||||
const stageRevenueMap: Record<string, string> = {};
|
||||
@@ -145,9 +157,46 @@ export async function fetchRevenueData(
|
||||
and(eq(interests.portId, portId), eq(interests.outcome, 'won'), isNull(interests.archivedAt)),
|
||||
);
|
||||
|
||||
// Pipeline-weighted forecast — sums (berth price × stage weight) for
|
||||
// every active interest. Stage weights resolve from
|
||||
// `system_settings.pipeline_weights` (per-port admin override) and
|
||||
// fall back to STAGE_WEIGHTS defaults. The PDF surfaces this number
|
||||
// alongside totalCompleted so investors / leadership see both
|
||||
// "money in the bank" and "expected from pipeline" on the same page.
|
||||
let pipelineWeights: Record<string, number> = STAGE_WEIGHTS;
|
||||
const weightsSetting = await db.query.systemSettings.findFirst({
|
||||
where: and(eq(systemSettings.key, 'pipeline_weights'), eq(systemSettings.portId, portId)),
|
||||
});
|
||||
if (weightsSetting?.value && typeof weightsSetting.value === 'object') {
|
||||
pipelineWeights = weightsSetting.value as Record<string, number>;
|
||||
}
|
||||
|
||||
const forecastRows = await db
|
||||
.select({
|
||||
stage: interests.pipelineStage,
|
||||
revenue: sum(berths.price),
|
||||
})
|
||||
.from(interests)
|
||||
.leftJoin(
|
||||
interestBerths,
|
||||
and(eq(interestBerths.interestId, interests.id), eq(interestBerths.isPrimary, true)),
|
||||
)
|
||||
.leftJoin(berths, eq(interestBerths.berthId, berths.id))
|
||||
.where(activeInterestsWhere(portId))
|
||||
.groupBy(interests.pipelineStage);
|
||||
|
||||
let totalForecast = 0;
|
||||
for (const row of forecastRows) {
|
||||
if (!row.revenue) continue;
|
||||
const weight = pipelineWeights[row.stage] ?? 0;
|
||||
totalForecast += parseFloat(String(row.revenue)) * weight;
|
||||
}
|
||||
|
||||
return {
|
||||
stageRevenue: stageRevenueMap,
|
||||
totalCompleted: completedRevenue[0]?.total ? String(completedRevenue[0].total) : '0',
|
||||
totalForecast: totalForecast.toFixed(2),
|
||||
pipelineWeights,
|
||||
generatedAt: new Date().toISOString(),
|
||||
};
|
||||
}
|
||||
@@ -222,7 +271,11 @@ export async function fetchOccupancyData(
|
||||
totalBerths += row.count;
|
||||
}
|
||||
|
||||
const occupiedCount = (statusCountMap['under_offer'] ?? 0) + (statusCountMap['sold'] ?? 0);
|
||||
// Occupied = sold only. Per 2026-05-14 decision, `under_offer` is a
|
||||
// hold (blocks the berth from sale to other clients) but the berth is
|
||||
// still technically available until the deal closes. Aligned with the
|
||||
// KPI tile + analytics timeline so the same dashboard shows one number.
|
||||
const occupiedCount = statusCountMap['sold'] ?? 0;
|
||||
const occupancyRate = totalBerths > 0 ? (occupiedCount / totalBerths) * 100 : 0;
|
||||
|
||||
return {
|
||||
|
||||
Reference in New Issue
Block a user