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>
116 lines
3.6 KiB
TypeScript
116 lines
3.6 KiB
TypeScript
import { describe, expect, it } from 'vitest';
|
|
|
|
import { renderPdf } from '@/lib/pdf/render';
|
|
import { ActivityReportPdf } from '@/lib/pdf/templates/reports/activity-report';
|
|
import { OccupancyReportPdf } from '@/lib/pdf/templates/reports/occupancy-report';
|
|
import { PipelineReportPdf } from '@/lib/pdf/templates/reports/pipeline-report';
|
|
import { RevenueReportPdf } from '@/lib/pdf/templates/reports/revenue-report';
|
|
|
|
const PORT_NAME = 'Port Test';
|
|
|
|
describe('report templates render', () => {
|
|
it('activity report renders with logs + summary', async () => {
|
|
const bytes = await renderPdf(
|
|
<ActivityReportPdf
|
|
portName={PORT_NAME}
|
|
logoBuffer={null}
|
|
data={{
|
|
logs: Array.from({ length: 30 }, (_, i) => ({
|
|
id: `id-${i}`,
|
|
action: i % 3 === 0 ? 'create' : i % 3 === 1 ? 'update' : 'delete',
|
|
entityType: i % 2 === 0 ? 'client' : 'berth',
|
|
entityId: `e-${i}`,
|
|
userId: `user-${i % 3}`,
|
|
createdAt: new Date(2026, 4, (i % 28) + 1),
|
|
})),
|
|
summary: { create: 10, update: 10, delete: 10 },
|
|
generatedAt: new Date().toISOString(),
|
|
}}
|
|
/>,
|
|
);
|
|
expect(bytes.subarray(0, 5).toString('utf8')).toBe('%PDF-');
|
|
expect(bytes.length).toBeGreaterThan(2000);
|
|
}, 30_000);
|
|
|
|
it('revenue report renders with multi-stage breakdown', async () => {
|
|
const bytes = await renderPdf(
|
|
<RevenueReportPdf
|
|
portName={PORT_NAME}
|
|
logoBuffer={null}
|
|
data={{
|
|
stageRevenue: {
|
|
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"
|
|
/>,
|
|
);
|
|
expect(bytes.subarray(0, 5).toString('utf8')).toBe('%PDF-');
|
|
}, 30_000);
|
|
|
|
it('pipeline report renders funnel + top interests', async () => {
|
|
const bytes = await renderPdf(
|
|
<PipelineReportPdf
|
|
portName={PORT_NAME}
|
|
logoBuffer={null}
|
|
data={{
|
|
stageCounts: {
|
|
open: 50,
|
|
details_sent: 30,
|
|
eoi_sent: 20,
|
|
eoi_signed: 10,
|
|
completed: 5,
|
|
},
|
|
topInterests: Array.from({ length: 8 }, (_, i) => ({
|
|
id: `i-${i}`,
|
|
clientId: `client-${i.toString().padStart(8, '0')}`,
|
|
pipelineStage: 'eoi_sent',
|
|
berthPrice: String(50000 + i * 5000),
|
|
})),
|
|
generatedAt: new Date().toISOString(),
|
|
}}
|
|
/>,
|
|
);
|
|
expect(bytes.subarray(0, 5).toString('utf8')).toBe('%PDF-');
|
|
}, 30_000);
|
|
|
|
it('occupancy report renders pie + status table', async () => {
|
|
const bytes = await renderPdf(
|
|
<OccupancyReportPdf
|
|
portName={PORT_NAME}
|
|
logoBuffer={null}
|
|
data={{
|
|
statusCounts: {
|
|
available: 42,
|
|
under_offer: 12,
|
|
sold: 38,
|
|
reserved: 3,
|
|
maintenance: 2,
|
|
},
|
|
occupancyRate: 0.42,
|
|
totalBerths: 97,
|
|
generatedAt: new Date().toISOString(),
|
|
}}
|
|
/>,
|
|
);
|
|
expect(bytes.subarray(0, 5).toString('utf8')).toBe('%PDF-');
|
|
}, 30_000);
|
|
|
|
it('all reports gracefully handle empty data', async () => {
|
|
const empty = await renderPdf(
|
|
<ActivityReportPdf
|
|
portName={PORT_NAME}
|
|
logoBuffer={null}
|
|
data={{ logs: [], summary: {}, generatedAt: new Date().toISOString() }}
|
|
/>,
|
|
);
|
|
expect(empty.length).toBeGreaterThan(500);
|
|
}, 30_000);
|
|
});
|