Bundles the prior session's 50-task fix sweep (Documenso v2 + EOI/signing-
progress redesign + env-to-admin migration + dev-mode banner) with the
2026-05-18 audit fix wave (3 CRITICAL, 14 HIGH, 28 MEDIUM, 6 LOW).
CRITICAL (3):
- C-01 interest-berths INNER JOIN -> LEFT JOIN so hard-deleted berths
no longer silently drop interest links
- C-02 /setup added to PUBLIC_PATHS; fresh-deploy bootstrap loop fixed
- C-03 generic PATCH /interests/[id] no longer accepts pipelineStage —
callers must go through /stage with the override-guard chain
HIGH (14/15):
- H-01 explicit ON DELETE on previously-implicit NO ACTION FKs across
interests/documents/reservations/reminders/invoices (migration 0070)
- H-02 login page reads ?redirect= param with same-origin guard
- H-03 CRM invite token moves to URL fragment so it never lands in
nginx access logs / Referer headers
- H-04 Retry-After header on sign-in-by-identifier 429 (RFC 6585 §4)
- H-05 toggleAccount writes an audit row
- H-06 upsertSetting masks any value whose key ends with _encrypted
- H-07 archiveClient cascade fires per-interest audit rows
- H-08 createSalesTransporter applies SMTP_TIMEOUTS
- H-09 AppShell stable children — viewport flip across breakpoint no
longer destroys in-progress form drafts
- H-10 portal documents page swaps Unicode glyph status icons for
Lucide CheckCircle2/XCircle/Circle + aria-labels
- H-12 list components swap alert(...) for toast.warning(...)
- H-13 5 icon-only buttons gain aria-label
- H-14 parseBody treats empty bodies as {}
- H-15 admin layout renders a 403 panel instead of silent bounce
- H-11 not applicable — mobile-search-overlay IS a mobile bottom-sheet
MEDIUM (28+):
- M-MT01-05 defense-in-depth port_id/parent-id filters on UPDATE/DELETE
WHEREs across custom-fields, notes (all 6 entity types x update +
delete), client-contacts, yacht ownerClient lookup, webhook reads
- M-D01 documents-hub realtime event-name typo (file:created -> uploaded)
- M-EM01 portal-auth emails thread through portId
- M-EM02 sendEmail accepts cc/bcc params
- M-EM04 notification_digest catalog key
- M-IN01 portal presigned download URLs use 4h TTL
- M-IN02 OpenAI client lazy-instantiated
- M-IN04 stale pdfme refs updated to pdf-lib AcroForm
- M-IN05 umami.testConnection returns tagged union
- M-L01 reservations tenure_type unified with berths
- M-L02 report-generators canonicalize stage values
- M-AU01 audit log placeholder copy fixed
- M-AU04 outcome_set / outcome_cleared distinct audit verbs
- M-NEW-2 activity feed entity name+type separator
- M-R01 portal allowlist narrowed + portal_session backstop in proxy
- M-SC02 companies archived partial index
- M-SC04 audit_logs.searchText documented as DB-managed
- M-S01 storage_s3_access_key_encrypted admin field
- M-U01 audit log empty state uses <EmptyState>
- M-U09 invoice delete dialog -> <AlertDialog>
- M-U10 toast.success on ClientForm + InterestForm create/edit
- M-U11 settings-form-card logo preview alt text
- M-U14 mobile topbar title on clients/yachts/interests/berths
- M-U15 Invoices in mobile More-sheet
LOW (6/8):
- L-AU01 severity defaults for security-relevant verbs
- L-AU02 +13 missing actions in admin audit filter
- L-AU03 +7 missing entity types in admin audit filter
- L-AU04 dead listAuditLogs stubbed
- L-D02 CLAUDE.md Owner-wins chain tightened
Bonus — Document detail polish (#67 partial, 3/6 deliverables):
- state-aware action button per signer
- watcher Add UI with display-name resolution
- cleanSignerName cleanup
Prior session work bundled in:
- Documenso v2 webhook + envelope-ID normalization + sequential signing
- SigningProgress UI redesign (avatars, per-signer state, timestamps)
- env->admin settings registry + RegistryDrivenForm + encrypted creds
- Embedded-signing card + Test connection + setup help
- Dev-mode EMAIL_REDIRECT_TO banner
- Pipeline rules admin page
- Sales email config card
- Audit log details Sheet
- EOI tab: Finalising badge, absolute timestamps, sequential indicator
- Notes pipeline_stage_at_creation (migration 0069)
- Documenso numeric ID dual-key webhook (migration 0068)
- Dimensions criterion copy (migration 0067)
Tests: 1374/1374 vitest pass. tsc clean. lint clean.
See docs/AUDIT-FIX-WAVE-2026-05-18.md for the full progress report and
the user-input items still pending.
Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
228 lines
7.9 KiB
TypeScript
228 lines
7.9 KiB
TypeScript
/**
|
|
* Payment-records service. The CRM does NOT generate invoices — banks invoice
|
|
* clients directly. We record that money was received (or refunded) with an
|
|
* optional uploaded receipt for audit purposes.
|
|
*
|
|
* Auto-advance: when the running deposit total (SUM where payment_type='deposit'
|
|
* minus SUM of refunds) reaches `interests.depositExpectedAmount`, the pipeline
|
|
* stage moves to 'deposit_paid' (no-op if already past).
|
|
*/
|
|
|
|
import { and, asc, desc, eq, sql } from 'drizzle-orm';
|
|
|
|
import { db } from '@/lib/db';
|
|
import { interests, payments } from '@/lib/db/schema';
|
|
import { createAuditLog, type AuditMeta } from '@/lib/audit';
|
|
import { NotFoundError, ValidationError } from '@/lib/errors';
|
|
import { emitToRoom } from '@/lib/socket/server';
|
|
import type { CreatePaymentInput, UpdatePaymentInput } from '@/lib/validators/payments';
|
|
|
|
// ─── Reads ──────────────────────────────────────────────────────────────────
|
|
|
|
/** All payments for a single interest, newest received first. */
|
|
export async function listPaymentsForInterest(interestId: string, portId: string) {
|
|
const interest = await db.query.interests.findFirst({
|
|
where: and(eq(interests.id, interestId), eq(interests.portId, portId)),
|
|
columns: { id: true },
|
|
});
|
|
if (!interest) throw new NotFoundError('Interest');
|
|
|
|
return db
|
|
.select()
|
|
.from(payments)
|
|
.where(and(eq(payments.interestId, interestId), eq(payments.portId, portId)))
|
|
.orderBy(desc(payments.receivedAt), asc(payments.id));
|
|
}
|
|
|
|
/** Net deposit total for an interest. `deposit` rows add; `refund` rows
|
|
* subtract (their `amount` may be either positive or already negative — we
|
|
* always treat refunds as deductions to match the UI convention). */
|
|
export async function getDepositTotalForInterest(
|
|
interestId: string,
|
|
portId: string,
|
|
): Promise<{ total: string; currency: string }> {
|
|
const rows = await db
|
|
.select({
|
|
paymentType: payments.paymentType,
|
|
amount: payments.amount,
|
|
currency: payments.currency,
|
|
})
|
|
.from(payments)
|
|
.where(
|
|
and(
|
|
eq(payments.interestId, interestId),
|
|
eq(payments.portId, portId),
|
|
sql`${payments.paymentType} IN ('deposit', 'refund')`,
|
|
),
|
|
);
|
|
|
|
// Use BigInt-ish accumulator via Number — amounts are EUR scale; we don't
|
|
// need cent-precise math for the auto-advance gate, but we DO normalize the
|
|
// sign of refunds so a refund stored as "+200" still subtracts.
|
|
let net = 0;
|
|
let currency = 'EUR';
|
|
for (const row of rows) {
|
|
const n = Number(row.amount);
|
|
if (!Number.isFinite(n)) continue;
|
|
currency = row.currency;
|
|
net += row.paymentType === 'refund' ? -Math.abs(n) : n;
|
|
}
|
|
return { total: net.toFixed(2), currency };
|
|
}
|
|
|
|
// ─── Writes ─────────────────────────────────────────────────────────────────
|
|
|
|
export async function createPayment(portId: string, data: CreatePaymentInput, meta: AuditMeta) {
|
|
// Resolve interest + sanity-check it belongs to this port.
|
|
const interest = await db.query.interests.findFirst({
|
|
where: and(eq(interests.id, data.interestId), eq(interests.portId, portId)),
|
|
columns: { id: true, clientId: true, depositExpectedAmount: true, pipelineStage: true },
|
|
});
|
|
if (!interest) throw new NotFoundError('Interest');
|
|
|
|
const amountNum = Number(data.amount);
|
|
if (!Number.isFinite(amountNum) || amountNum === 0) {
|
|
throw new ValidationError('amount must be a non-zero numeric value');
|
|
}
|
|
|
|
const [row] = await db
|
|
.insert(payments)
|
|
.values({
|
|
portId,
|
|
interestId: data.interestId,
|
|
clientId: interest.clientId,
|
|
paymentType: data.paymentType,
|
|
amount: data.amount,
|
|
currency: data.currency,
|
|
receivedAt: new Date(data.receivedAt),
|
|
receiptFileId: data.receiptFileId ?? null,
|
|
notes: data.notes ?? null,
|
|
recordedBy: meta.userId,
|
|
})
|
|
.returning();
|
|
|
|
void createAuditLog({
|
|
userId: meta.userId,
|
|
portId,
|
|
action: 'create',
|
|
entityType: 'payment',
|
|
entityId: row!.id,
|
|
newValue: {
|
|
interestId: data.interestId,
|
|
paymentType: data.paymentType,
|
|
amount: data.amount,
|
|
currency: data.currency,
|
|
},
|
|
ipAddress: meta.ipAddress,
|
|
userAgent: meta.userAgent,
|
|
});
|
|
|
|
emitToRoom(`port:${portId}`, 'payment:created', {
|
|
paymentId: row!.id,
|
|
interestId: data.interestId,
|
|
paymentType: data.paymentType,
|
|
});
|
|
|
|
// Auto-advance: when the running deposit total reaches the expected amount,
|
|
// promote the stage to 'deposit_paid'. Dynamic import keeps the
|
|
// payments ↔ interests cycle one-way at module-load time.
|
|
if (data.paymentType === 'deposit' || data.paymentType === 'refund') {
|
|
const { total } = await getDepositTotalForInterest(data.interestId, portId);
|
|
const expected = interest.depositExpectedAmount ? Number(interest.depositExpectedAmount) : null;
|
|
if (expected !== null && Number.isFinite(expected) && Number(total) >= expected) {
|
|
const { advanceStageIfBehindGated } = await import('@/lib/services/interests.service');
|
|
void advanceStageIfBehindGated(
|
|
data.interestId,
|
|
portId,
|
|
'deposit_paid',
|
|
meta,
|
|
`Deposit total (${total} ${data.currency}) reached expected amount`,
|
|
'deposit_received',
|
|
);
|
|
|
|
// Stamp dateDepositReceived if not already set so the timeline shows
|
|
// when the threshold was met (not the date of the first payment row).
|
|
await db
|
|
.update(interests)
|
|
.set({ dateDepositReceived: new Date(), updatedAt: new Date() })
|
|
.where(eq(interests.id, data.interestId));
|
|
|
|
// Berth rule fires via the same hook the legacy invoices.ts path uses.
|
|
const { evaluateRule } = await import('@/lib/services/berth-rules-engine');
|
|
void evaluateRule('deposit_received', data.interestId, portId, meta);
|
|
}
|
|
}
|
|
|
|
return row!;
|
|
}
|
|
|
|
export async function updatePayment(
|
|
id: string,
|
|
portId: string,
|
|
data: UpdatePaymentInput,
|
|
meta: AuditMeta,
|
|
) {
|
|
const existing = await db.query.payments.findFirst({
|
|
where: and(eq(payments.id, id), eq(payments.portId, portId)),
|
|
});
|
|
if (!existing) throw new NotFoundError('Payment');
|
|
|
|
const next: Record<string, unknown> = {};
|
|
if (data.paymentType !== undefined) next.paymentType = data.paymentType;
|
|
if (data.amount !== undefined) next.amount = data.amount;
|
|
if (data.currency !== undefined) next.currency = data.currency;
|
|
if (data.receivedAt !== undefined) next.receivedAt = new Date(data.receivedAt);
|
|
if (data.receiptFileId !== undefined) next.receiptFileId = data.receiptFileId;
|
|
if (data.notes !== undefined) next.notes = data.notes;
|
|
|
|
const [updated] = await db
|
|
.update(payments)
|
|
.set(next)
|
|
.where(and(eq(payments.id, id), eq(payments.portId, portId)))
|
|
.returning();
|
|
|
|
void createAuditLog({
|
|
userId: meta.userId,
|
|
portId,
|
|
action: 'update',
|
|
entityType: 'payment',
|
|
entityId: id,
|
|
oldValue: {
|
|
paymentType: existing.paymentType,
|
|
amount: existing.amount,
|
|
currency: existing.currency,
|
|
},
|
|
newValue: next,
|
|
ipAddress: meta.ipAddress,
|
|
userAgent: meta.userAgent,
|
|
});
|
|
|
|
return updated!;
|
|
}
|
|
|
|
export async function deletePayment(id: string, portId: string, meta: AuditMeta) {
|
|
const existing = await db.query.payments.findFirst({
|
|
where: and(eq(payments.id, id), eq(payments.portId, portId)),
|
|
});
|
|
if (!existing) throw new NotFoundError('Payment');
|
|
|
|
await db.delete(payments).where(and(eq(payments.id, id), eq(payments.portId, portId)));
|
|
|
|
void createAuditLog({
|
|
userId: meta.userId,
|
|
portId,
|
|
action: 'delete',
|
|
entityType: 'payment',
|
|
entityId: id,
|
|
oldValue: {
|
|
paymentType: existing.paymentType,
|
|
amount: existing.amount,
|
|
currency: existing.currency,
|
|
},
|
|
ipAddress: meta.ipAddress,
|
|
userAgent: meta.userAgent,
|
|
});
|
|
|
|
return { ok: true };
|
|
}
|