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>
207 lines
6.6 KiB
TypeScript
207 lines
6.6 KiB
TypeScript
/**
|
|
* Engine integration test — drives `runAlertEngineForPorts` against
|
|
* seeded conditions and asserts: (1) correct alerts upsert, (2) running
|
|
* twice doesn't duplicate, (3) mutating state auto-resolves stale alerts.
|
|
*
|
|
* Socket emissions are stubbed via vi.mock so the test stays offline.
|
|
*/
|
|
|
|
import { describe, it, expect, vi, beforeEach } from 'vitest';
|
|
import { and, eq, isNull } from 'drizzle-orm';
|
|
|
|
vi.mock('@/lib/socket/server', () => ({
|
|
emitToRoom: vi.fn(),
|
|
}));
|
|
|
|
import { db } from '@/lib/db';
|
|
import { alerts } from '@/lib/db/schema/insights';
|
|
import { interests } from '@/lib/db/schema/interests';
|
|
import { berthReservations } from '@/lib/db/schema/reservations';
|
|
import { documents } from '@/lib/db/schema/documents';
|
|
import { runAlertEngineForPorts } from '@/lib/services/alert-engine';
|
|
import { makePort, makeClient, makeBerth, makeYacht } from '../helpers/factories';
|
|
|
|
async function clearAlerts(portId: string) {
|
|
await db.delete(alerts).where(eq(alerts.portId, portId));
|
|
}
|
|
|
|
async function listOpenAlerts(portId: string, ruleId: string) {
|
|
return db
|
|
.select()
|
|
.from(alerts)
|
|
.where(and(eq(alerts.portId, portId), eq(alerts.ruleId, ruleId), isNull(alerts.resolvedAt)));
|
|
}
|
|
|
|
describe('alert engine', () => {
|
|
beforeEach(() => {
|
|
vi.clearAllMocks();
|
|
});
|
|
|
|
it('reservation.no_agreement fires for active reservation older than 3 days without agreement', async () => {
|
|
const port = await makePort();
|
|
const client = await makeClient({ portId: port.id });
|
|
const berth = await makeBerth({ portId: port.id });
|
|
const yacht = await makeYacht({
|
|
portId: port.id,
|
|
ownerType: 'client',
|
|
ownerId: client.id,
|
|
overrides: { name: 'M/Y Test' },
|
|
});
|
|
const fourDaysAgo = new Date(Date.now() - 4 * 86_400_000);
|
|
const [resv] = await db
|
|
.insert(berthReservations)
|
|
.values({
|
|
portId: port.id,
|
|
berthId: berth.id,
|
|
clientId: client.id,
|
|
yachtId: yacht.id,
|
|
status: 'active',
|
|
startDate: new Date(),
|
|
createdBy: 'seed',
|
|
createdAt: fourDaysAgo,
|
|
})
|
|
.returning();
|
|
expect(resv).toBeDefined();
|
|
|
|
await clearAlerts(port.id);
|
|
await runAlertEngineForPorts([port.id]);
|
|
|
|
const open = await listOpenAlerts(port.id, 'reservation.no_agreement');
|
|
expect(open).toHaveLength(1);
|
|
expect(open[0]!.entityId).toBe(resv!.id);
|
|
expect(open[0]!.severity).toBe('warning');
|
|
});
|
|
|
|
it('does not duplicate on a second sweep', async () => {
|
|
const port = await makePort();
|
|
const client = await makeClient({ portId: port.id });
|
|
const berth = await makeBerth({ portId: port.id });
|
|
const yacht = await makeYacht({
|
|
portId: port.id,
|
|
ownerType: 'client',
|
|
ownerId: client.id,
|
|
});
|
|
const stale = new Date(Date.now() - 10 * 86_400_000);
|
|
await db.insert(berthReservations).values({
|
|
portId: port.id,
|
|
berthId: berth.id,
|
|
clientId: client.id,
|
|
yachtId: yacht.id,
|
|
status: 'active',
|
|
startDate: new Date(),
|
|
createdBy: 'seed',
|
|
createdAt: stale,
|
|
});
|
|
|
|
await clearAlerts(port.id);
|
|
await runAlertEngineForPorts([port.id]);
|
|
await runAlertEngineForPorts([port.id]);
|
|
|
|
const open = await listOpenAlerts(port.id, 'reservation.no_agreement');
|
|
expect(open).toHaveLength(1);
|
|
});
|
|
|
|
it('auto-resolves an open alert when the underlying condition clears', async () => {
|
|
const port = await makePort();
|
|
const client = await makeClient({ portId: port.id });
|
|
const berth = await makeBerth({ portId: port.id });
|
|
const yacht = await makeYacht({
|
|
portId: port.id,
|
|
ownerType: 'client',
|
|
ownerId: client.id,
|
|
});
|
|
const tenDaysAgo = new Date(Date.now() - 10 * 86_400_000);
|
|
const [resv] = await db
|
|
.insert(berthReservations)
|
|
.values({
|
|
portId: port.id,
|
|
berthId: berth.id,
|
|
clientId: client.id,
|
|
yachtId: yacht.id,
|
|
status: 'active',
|
|
startDate: new Date(),
|
|
createdBy: 'seed',
|
|
createdAt: tenDaysAgo,
|
|
})
|
|
.returning();
|
|
|
|
await clearAlerts(port.id);
|
|
await runAlertEngineForPorts([port.id]);
|
|
expect(await listOpenAlerts(port.id, 'reservation.no_agreement')).toHaveLength(1);
|
|
|
|
// Add an agreement document — condition no longer fires.
|
|
await db.insert(documents).values({
|
|
portId: port.id,
|
|
reservationId: resv!.id,
|
|
documentType: 'reservation_agreement',
|
|
title: 'Reservation Agreement',
|
|
status: 'sent',
|
|
createdBy: 'seed',
|
|
});
|
|
await runAlertEngineForPorts([port.id]);
|
|
|
|
expect(await listOpenAlerts(port.id, 'reservation.no_agreement')).toHaveLength(0);
|
|
const allRows = await db
|
|
.select()
|
|
.from(alerts)
|
|
.where(and(eq(alerts.portId, port.id), eq(alerts.ruleId, 'reservation.no_agreement')));
|
|
expect(allRows).toHaveLength(1);
|
|
expect(allRows[0]!.resolvedAt).not.toBeNull();
|
|
});
|
|
|
|
it('interest.stale fires for old leads in mid-funnel stages', async () => {
|
|
const port = await makePort();
|
|
const client = await makeClient({ portId: port.id });
|
|
const stale = new Date(Date.now() - 30 * 86_400_000);
|
|
const [interest] = await db
|
|
.insert(interests)
|
|
.values({
|
|
portId: port.id,
|
|
clientId: client.id,
|
|
pipelineStage: 'qualified',
|
|
dateLastContact: stale,
|
|
createdAt: stale,
|
|
updatedAt: stale,
|
|
})
|
|
.returning();
|
|
|
|
await clearAlerts(port.id);
|
|
await runAlertEngineForPorts([port.id]);
|
|
|
|
const open = await listOpenAlerts(port.id, 'interest.stale');
|
|
expect(open).toHaveLength(1);
|
|
expect(open[0]!.entityId).toBe(interest!.id);
|
|
expect(open[0]!.severity).toBe('info');
|
|
});
|
|
|
|
it('interest.high_value_silent fires for hot leads silent >7d', async () => {
|
|
const port = await makePort();
|
|
const client = await makeClient({ portId: port.id });
|
|
const stale = new Date(Date.now() - 10 * 86_400_000);
|
|
await db.insert(interests).values({
|
|
portId: port.id,
|
|
clientId: client.id,
|
|
pipelineStage: 'qualified',
|
|
leadCategory: 'hot_lead',
|
|
dateLastContact: stale,
|
|
updatedAt: stale,
|
|
});
|
|
|
|
await clearAlerts(port.id);
|
|
await runAlertEngineForPorts([port.id]);
|
|
|
|
const open = await listOpenAlerts(port.id, 'interest.high_value_silent');
|
|
expect(open).toHaveLength(1);
|
|
expect(open[0]!.severity).toBe('critical');
|
|
});
|
|
|
|
it('engine reports rule errors without crashing the sweep', async () => {
|
|
const port = await makePort();
|
|
const summary = await runAlertEngineForPorts([port.id]);
|
|
expect(summary.portsScanned).toBe(1);
|
|
expect(summary.rulesEvaluated).toBeGreaterThan(0);
|
|
// No conditions seeded — no rules should fail.
|
|
expect(summary.errors).toHaveLength(0);
|
|
});
|
|
});
|