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:
@@ -158,7 +158,7 @@ describe('alert engine', () => {
|
||||
.values({
|
||||
portId: port.id,
|
||||
clientId: client.id,
|
||||
pipelineStage: 'in_communication',
|
||||
pipelineStage: 'qualified',
|
||||
dateLastContact: stale,
|
||||
createdAt: stale,
|
||||
updatedAt: stale,
|
||||
@@ -181,7 +181,7 @@ describe('alert engine', () => {
|
||||
await db.insert(interests).values({
|
||||
portId: port.id,
|
||||
clientId: client.id,
|
||||
pipelineStage: 'in_communication',
|
||||
pipelineStage: 'qualified',
|
||||
leadCategory: 'hot_lead',
|
||||
dateLastContact: stale,
|
||||
updatedAt: stale,
|
||||
|
||||
@@ -7,9 +7,8 @@ import { describe, it, expect } from 'vitest';
|
||||
import { eq, and } from 'drizzle-orm';
|
||||
|
||||
import { db } from '@/lib/db';
|
||||
import { interests } from '@/lib/db/schema/interests';
|
||||
import { interests, interestBerths } from '@/lib/db/schema/interests';
|
||||
import { invoices } from '@/lib/db/schema/financial';
|
||||
import { berthReservations } from '@/lib/db/schema/reservations';
|
||||
import { analyticsSnapshots } from '@/lib/db/schema/insights';
|
||||
import {
|
||||
computePipelineFunnel,
|
||||
@@ -67,26 +66,36 @@ describe('analytics service', () => {
|
||||
});
|
||||
|
||||
describe('computeOccupancyTimeline', () => {
|
||||
it('returns 7 points for 7d range with occupancy percentages', async () => {
|
||||
it('returns 7 points for 7d range with cumulative won-deal occupancy', async () => {
|
||||
// Post 2026-05-14 the timeline derives occupancy from won
|
||||
// interests (cumulative as of each day) rather than active
|
||||
// reservations — see analytics.service.ts comment + PRE-DEPLOY-
|
||||
// PLAN § 1.1.3. Fixture: 3 berths, one of which sold 5 days ago.
|
||||
const port = await makePort();
|
||||
await makeBerth({ portId: port.id });
|
||||
await makeBerth({ portId: port.id });
|
||||
const client = await makeClient({ portId: port.id });
|
||||
const yacht = await makeYacht({
|
||||
await makeYacht({
|
||||
portId: port.id,
|
||||
ownerType: 'client',
|
||||
ownerId: client.id,
|
||||
});
|
||||
const berth = await makeBerth({ portId: port.id });
|
||||
// Active reservation covering today
|
||||
await db.insert(berthReservations).values({
|
||||
portId: port.id,
|
||||
const fiveDaysAgo = new Date(Date.now() - 5 * 86_400_000);
|
||||
const [interest] = await db
|
||||
.insert(interests)
|
||||
.values({
|
||||
portId: port.id,
|
||||
clientId: client.id,
|
||||
pipelineStage: 'contract',
|
||||
outcome: 'won',
|
||||
outcomeAt: fiveDaysAgo,
|
||||
})
|
||||
.returning();
|
||||
await db.insert(interestBerths).values({
|
||||
interestId: interest!.id,
|
||||
berthId: berth.id,
|
||||
clientId: client.id,
|
||||
yachtId: yacht.id,
|
||||
status: 'active',
|
||||
startDate: new Date(Date.now() - 5 * 86_400_000),
|
||||
createdBy: 'seed',
|
||||
isPrimary: true,
|
||||
});
|
||||
|
||||
const result = await computeOccupancyTimeline(port.id, '7d');
|
||||
|
||||
@@ -39,12 +39,13 @@ describe('report templates render', () => {
|
||||
logoBuffer={null}
|
||||
data={{
|
||||
stageRevenue: {
|
||||
open: '12345.67',
|
||||
eoi_sent: '54321.00',
|
||||
contract_signed: '98765.43',
|
||||
completed: '111000.00',
|
||||
enquiry: '12345.67',
|
||||
eoi: '54321.00',
|
||||
contract: '98765.43',
|
||||
},
|
||||
totalCompleted: '111000.00',
|
||||
totalForecast: '87650.00',
|
||||
pipelineWeights: { enquiry: 0.05, eoi: 0.4, contract: 0.95 },
|
||||
generatedAt: new Date().toISOString(),
|
||||
}}
|
||||
currency="USD"
|
||||
|
||||
@@ -80,13 +80,23 @@ describe('buildDocumensoPayload', () => {
|
||||
Length: '45',
|
||||
Width: '14',
|
||||
Draft: '6',
|
||||
// Berth Number carries the formatBerthRange output — single-
|
||||
// berth EOI duplicates the primary mooring; multi-berth shows
|
||||
// the compact range. The separate 'Berth Range' formValue key
|
||||
// was retired 2026-05-14 (the Documenso template never had
|
||||
// that field, so the value was silently dropped).
|
||||
'Berth Number': 'A12',
|
||||
'Berth Range': 'A12',
|
||||
Lease_10: false,
|
||||
Purchase: true,
|
||||
});
|
||||
});
|
||||
|
||||
it('renders Berth Number as the multi-berth range string when bundle has > 1', () => {
|
||||
const ctx = makeContext({ eoiBerthRange: 'A1-A3, B5' });
|
||||
const payload = buildDocumensoPayload(ctx, OPTIONS);
|
||||
expect(payload.formValues['Berth Number']).toBe('A1-A3, B5');
|
||||
});
|
||||
|
||||
it('defaults missing primaryEmail to empty string', () => {
|
||||
const ctx = makeContext({ client: { ...makeContext().client, primaryEmail: null } });
|
||||
const payload = buildDocumensoPayload(ctx, OPTIONS);
|
||||
@@ -106,7 +116,10 @@ describe('buildDocumensoPayload', () => {
|
||||
});
|
||||
|
||||
it('renders empty Section 3 when yacht and berth are not linked', () => {
|
||||
const ctx = makeContext({ yacht: null, berth: null });
|
||||
// Also explicitly clear the berth-range fallback that defaults to
|
||||
// the primary mooring — when there's no berth AND no bundle, the
|
||||
// form field renders as empty.
|
||||
const ctx = makeContext({ yacht: null, berth: null, eoiBerthRange: '' });
|
||||
const payload = buildDocumensoPayload(ctx, OPTIONS);
|
||||
expect(payload.formValues['Yacht Name']).toBe('');
|
||||
expect(payload.formValues.Length).toBe('');
|
||||
|
||||
Reference in New Issue
Block a user