* fix(security): gate replace_sie_import behind owner/admin membership The RPC was SECURITY DEFINER with EXECUTE granted to PUBLIC and anon, no company_members lookup, no auth.uid() reference and no unauthorized raise, while setting gnubok.allow_delete to disarm the BFL immutability and retention triggers. Any caller holding a company_id and an import id could hard delete another tenant's verifikationer. Confirmed live in production. Applies the same fail closed owner/admin guard that undo_sie_import already carries (migration 20260624120000), resolving the actor from COALESCE(p_user_id, auth.uid()) so it denies when the role is NULL, then revokes EXECUTE from PUBLIC and anon. search_path and the raised statement_timeout are restated, since CREATE OR REPLACE drops settings that are not repeated. userId is a required parameter on replaceSIEImport: the service client has a NULL auth.uid(), so a caller without an explicit actor now fails to compile rather than hitting the closed gate at runtime. Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com> * fix(security): validate arcim OAuth callback state server side The callback route is skipAuth and decoded the state parameter as plain base64url JSON, trusting consentId and provider from it. A one time code was minted at flow start and never read. An unauthenticated attacker who learned a consent id could run an OAuth flow on their own provider account and post the callback with a forged state, landing their tokens on another tenant's consent, so the victim's next migration imported the attacker's ledger. State is now an opaque randomBytes(32) pointer to a provider_otc row, consumed by a single atomic UPDATE guarded on used_at IS NULL and expires_at, so a replay loses the row lock race and updates nothing. provider is read from provider_consents rather than trusted from the client. provider_otc already existed for exactly this purpose and was never wired up. Also scopes getConsent to an owning company, closing a cross tenant status oracle where the preview and migrate paths echoed a consent's status before the scoped check ran. Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com> * fix(security): scope documents storage to company_id (phase A) The documents bucket policies matched on auth.uid(), and upload keys were documents/{userId}/..., so company membership was never consulted. Removing a member revoked nothing: their session still authenticated and they kept direct Storage read access to every receipt, supplier invoice and bank statement they had uploaded. The same bug was fixed for sie-files in 20260416120000; this bucket was left behind. Phase A is additive. Company scoped policies are added alongside the uploader scoped ones, uploads move to documents/{companyId}/{userId}/..., and reads accept either layout so nothing breaks mid migration. Phase C, which drops the old policies, is gated on the backfill reporting zero remaining legacy prefix objects. The policy compares the company segment as text rather than casting to uuid the way sie-files does: this bucket holds keys whose second segment is not a uuid (MCP audit packages), and Postgres does not guarantee the bucket prefix qual runs before the cast, so a planner reordering would raise 22P02 and fail the whole query instead of filtering the row out. deleteDocument now removes both candidate keys. Removing only the stored pointer would leave a readable orphan copy of a document the user asked to erase. The backfill script is included but has never been run. It defaults to dry run, refuses .env.local by name, and verifies each copy is readable and SHA-256 identical before repointing the row. Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com> * fix(security): enforce events:read scope and membership on /api/events This was the only one of the three validateApiKey call sites with no downstream guard: v1 and the MCP server both check scope and re-verify company membership, this route did neither. An events:read scope existed and was documented as gating the endpoint but was never called, so a legacy key falling back to DEFAULT_SCOPES read the full log. The bound company id went straight from the api_keys row into a service role query, so a key whose user had been removed from the company kept reading. Adds the scope check before any database access, re-verifies company_members with archived_at IS NULL, honours test mode by stamping X-Gnubok-Mode instead of ignoring it, applies minimisePayload so the pull surface can never return a wider payload than the push surface, and replaces the three flat error strings with the canonical envelope. Test key reads are served rather than blocked: TEST_KEY_WRITE_BLOCKED is gated on mutations in with-api-v1, so a read gets the same treatment as every other v1 read endpoint. Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com> * perf(bookkeeping): sweep remaining journal_entries!inner embeds A previous refactor removed this pattern from lib/reports and introduced fetchEntryLines, but the class was never swept. Seventeen sites remained and had become the top application consumer of production database time: measured across the resulting query shapes, 32,694 calls and 25,848 seconds of execution, mean 790ms, with shapes averaging 2.6s and 3.0s and maxing at 7,962ms against the 8s statement_timeout, which surfaced to users as 500s on the booking path. PostgREST compiles an embed with filters on the embedded side into a correlated INNER JOIN LATERAL with a parameterized LIMIT, which stops Postgres reordering the join, so each query walked the whole journal_entry_lines table across all tenants. Driving from the entries side instead turns that into two indexed round trips. Converted sites keep their existing shape: the helper reattaches the parent entry under the same key the embed produced. Several conversions also remove a latent silent truncation where an unpaginated query was capped at PostgREST's 1000 row ceiling. Two deliberate exceptions. The free text ilike legs of the MCP display query stay on the embed, because each is capped at legLimit and that cap drives the truncation contract the tool reports, while the helper is unbounded. The accounts route moves to the existing get_account_usage_counts RPC instead, since its embed was a head count and the helper returns rows. commitEntry's write path is untouched: the change there is confined to the read query of the pre-commit dimension rule check. Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com> * fix(api): anchor v1 list cursors on created_at Page two returned page one, forever, while still advertising a fresh next_cursor. The three routes sorted by and encoded a Postgres date column, which serializes as YYYY-MM-DD, but decodeDefaultCursor validates the cursor timestamp as full ISO-8601 and returned null, so the keyset filter was never applied and has_more never went false. An integrator syncing verifikat looped on the newest rows indefinitely. The transactions route already solved this and its comment names the trap; the fix was never ported. All three now order and encode on created_at with an id tie break, matching the transactions keyset predicate exactly. ISO_TIMESTAMP is deliberately left alone: relaxing it would silently change sort semantics on the route that currently works. Default ordering therefore moves from business date to insert order. Every business date is still on the row, and the invoices list gains date_from and date_to filters so a date range is still reachable; the other two already had them. The tests use an in-memory PostgREST that actually evaluates the filters, because the repo's pass-through mock cannot catch this class of bug: the bug is that the filter is never sent. They walk to exhaustion with a hard iteration cap, so an unterminated walk fails instead of hanging. Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com> * fix(api): separate dry run from commit in the idempotency hash The request hash was built from url.pathname, which excludes the query string, so a dry run and its commit hashed identically. Following the flow documented in dry-run.ts, re-issuing the request with the same Idempotency-Key returned the cached preview with Idempotent-Replayed set and wrote nothing, while reporting 200. An agent or integrator saw success for a write that never happened. dry_run is folded into the hash only when true, not as an unconditional boolean. Including it as false would change the hash of every ordinary write, and with a 24h idempotency TTL any key in flight across the deploy would fail the request_hash comparison and 409 on a legitimate retry. Both hash call sites now go through one shared helper so they cannot drift into a permanent cache miss, and dry run responses are no longer stored at all. Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com> * ci: install the Bedrock SDK out of tree in the compliance review The Swedish accounting compliance gate had failed ten consecutive runs and so was posting nothing. With --no-package-lock npm discarded the lockfile and re-resolved the whole tree from package.json, floating @hookform/resolvers to 5.4.3, whose valibot ^1 peer conflicts with the pinned valibot 0.39.0. Installing into the parent of the checkout resolves only that one package, so an unrelated peer conflict can never take the gate down again. Node still finds it because ESM bare specifiers walk up parent node_modules; NODE_PATH would not have worked, as it is CommonJS only. --legacy-peer-deps was rejected because it masks future genuine peer conflicts and still reifies the full tree. The same step's SDK version is aligned from 0.31.0 back to the 0.29.1 that package.json and check:guards enforce after the streaming outage. That drift went unnoticed because the pin guard only inspects package.json and the lockfile, never workflow files. Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com> * build(docker): generate crontabs from vercel.json vercel.json defines 16 cron jobs; both Docker crontabs carried 9, and were byte identical to each other. Self hosted deployments therefore never sent recurring invoices, never dispatched webhooks and never cleaned up idempotency keys. tax-deadlines also ran once a year on 2 January instead of daily, and documents/verify weekly instead of daily. Extension crons are included rather than excluded. The Dockerfile copies the whole tree before building, so every extension cron route is compiled into the image regardless of the enabled preset, and each returns 200 when its extension is unconfigured, so curl -sf logs no failure. Two such entries were already present in the crontab for extensions absent from the preset, which settles the intent. documents/verify is treated as drift rather than a self hosted concession: the weekly cadence was present in the hosted crontab too, and the run is capped at 200 documents walking a nulls-first queue, so weekly drains the integrity queue seven times slower on a check that exists for BFL retention. webhooks/dispatch keeps its per minute cadence, adding 1,440 requests a day on self hosted. A gentler tick would silently stretch the first retry, since the retry ladder opens at 60 seconds. SCHEDULE_OVERRIDES is the one line place to change that. A parity test asserts the path sets match minus a documented exclusion list, and ratchets three cron routes that are currently scheduled nowhere so they are named rather than silently rotting. Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com> * chore(observability): add a provider agnostic error sink There is no error tracking in this codebase: logs go to console and Vercel retention and nowhere else, nothing alerts on the 16 cron jobs, and seven code comments across lib, app, components and extensions asserted that Sentry captures errors when Sentry is not a dependency. The two most recent bug fixes on this repo were both discovered by customer email. This adds the sink, not a vendor. No dependency is taken: the interface has a no-op default and a registration point, so behaviour is unchanged until an adapter is registered. Releases are tagged from the build id already inlined by next.config.ts. Redaction moved out of lib/logger.ts into a leaf module that both the logger and the sink import, so there is one denylist and no path from application data to a third party can skip the personnummer regex, including direct sink calls that bypass the logger. That matters here because these logs carry personnummer and financial data. verifyCronSecret now reports its own 401s, which covers all 16 jobs without touching a route file and catches the case where CRON_SECRET is rotated without updating the scheduler and every job silently 401s forever. The threshold is one failure rather than the backup alert's three: suppressing the first occurrence is precisely how an outage stays invisible. The seven misleading comments are corrected to describe what the code actually does, including the two cases that still are not covered: the client side one, since the sink is server side, and a warn level call that is not forwarded. Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com> * fix: remediate the 2026-07-26 similar-sweep findings across all surfaces Resolves the ~150-finding sweep (dev_docs/similar-sweep-2026-07-26.md) with one agent per finding; every behavioural fix carries a regression test proven to fail at HEAD. Full status, corrections to the sweep, refusals and open decisions in dev_docs/similar-sweep-2026-07-26-remediation-status.md. Structural roots closed: - resolveSekAmountOrNull(): honest SEK resolution refuses instead of booking 1:1; four duplicated toSek closures now refuse via INVOICE_FX_RATE_MISSING - ledger-line-amount.ts: journal_entry_lines.currency labels the document, not the amount; SQL pre-filter decoy proven and fixed - sparse-patch.ts: .partial() does not strip .default() in Zod 4.4.3; the exploitable salary payslip-line PATCH and KPI preferences sinks fixed - tests/schema: migration-replay phantom-column guard (13k+ refs, closed CHECK sets, onConflict targets); found 28 real defects, all fixed, all four baselines now empty - three new ratchet guards: sek-labelled-amount, cross-extension-import, ungated-extension-route Highlights: lawful VAT-rate set on all seven invoice surfaces (ML 6 kap), RC input VAT mismatch wired on web + both MCP callers, missing-underlag resource delegates to the shared RPC predicate, push-notifications consent polarity fail-closed, deadlines undo honours requested state, silent-failure and read-side-fabrication classes fixed across settings/KPI/inbox/Stripe/ Arcim/kassaflodesanalys, error-envelope stringification fixed at 10+ sites with isSwedishUserMessage extended. Also includes the parallel session's MCP invoice tools (update_invoice, recurring schedules, invoice deliveries) which share files with the sweep work and are verified green together. 13 new migrations are NOT applied anywhere; they apply via branch merge. 20260726120000 backfills 1247 supplier-invoice rows. pg tests for new DDL are written but unrun (no local Postgres). Verified: 11088 tests / 881 files green, tsc 0 non-test errors, lint 0 errors, check:guards passing, MCP payload 57475/57500. Co-Authored-By: Claude Fable 5 <noreply@anthropic.com> * fix(migrations): rename replace_sie_import migration off main's 20260726090000 version origin/main shipped 20260726090000_agent_quota_rpc_caller_guard.sql; keeping our replace_sie_import migration on the same version would abort the Supabase apply with a schema_migrations_pkey duplicate at merge time. Co-Authored-By: Claude Fable 5 <noreply@anthropic.com> * fix(review): remediate pre-publish deep-review findings across all slices A 13-agent review of the full branch diff surfaced 1 critical, 5 high and ~45 further findings; this commit resolves them in one pass: - replace_sie_import / undo_sie_import: p_user_id honored only for service_role callers; any other caller is pinned to auth.uid() (impersonation gate bypass), authz raise errcode 42501 mapped to a Swedish 403 in the route, new caller-guard migration for undo - bulk_book_transactions refuses homogeneous non-SEK batches instead of writing foreign magnitudes into SEK ledger columns - credit-note cap trigger: company-match on credited_invoice_id, no cross-tenant figures in exception text - link_voucher RPCs resolve NULL invoice currency as SEK end to end - personal-number ciphertext CHECK split into NOT VALID + VALIDATE - same-currency foreign settlements clear 1510 at booking rate and book realized diff to 3960/7960; rate-less foreign write paths refuse - receivables revaluation covers partially_paid and outstanding amounts - period lock guard paginates candidates past the PostgREST 1000 cap - documents: service-client storage removals after authz, dual-layout reads in integrity cron and archive export, backfill delete-source sweep actually deletes with hash verification and shared-key grouping - invoice matching normalizes NULL/lowercase currencies (regression), duplicate candidates stop claiming amount matches they never ran - match-invoice aborts on any booking failure (no paid-without-verifikat) - refresh-exchange-rate reverts on concurrent booking (TOCTOU window) - KPI preferences upsert arbiter aligned to the company-scoped constraint - personnummer_last4 stripped from all salary responses incl. MCP tools - worked-hours batch restores destroyed rows on conflict and error paths - MCP: shared duplicate-claim builder (no more 'null kr'), short-circuit on tag_journal_lines overflow, auto_send schedules stage as high risk - observability sink redacts emails/IBANs/API keys and keeps redacted stacks in prod; assorted small guards (safe-return-to /@, dry_run=True, cursor helper off-by-one, OAuth state TTL 10 min, arcim saveMappings call removed) Full dispositions, deferred items and hand-verified accounting numbers are documented in the PR body and DECISIONS.md. Co-Authored-By: Claude Fable 5 <noreply@anthropic.com> * feat(personnummer): implement masking and encryption for personal numbers with tests * fix(review): address CI and compliance-bot findings for PR #1215 pg-real: the CI image's auth shim reads the legacy request.jwt.claim.role GUC, so both service-role simulations (runAsServiceRole and the invoice-delivery test's local helper) never satisfied auth.role() = 'service_role' and every legitimate p_user_id path failed closed; the shared helper now sets both GUC shapes plus SET LOCAL ROLE with a fail-loud sanity check, and the delivery test reuses it. The link-voucher migration had recreated both RPCs from pre-rewrite file text, reintroducing the NULL-unsafe membership pattern the null-safe-tenant-guards ratchet bans; both guards now use public.caller_is_company_member() with all currency changes preserved. Compliance bots: the customers export now emits the standard masked form instead of raw AES-256-GCM ciphertext in the Org-/personnummer column, and maskCustomerRow returns a non-round-trippable placeholder on decrypt failure instead of 500ing the list. MCP parity: gnubok_lock_period's staging pre-check now runs the exact countUnbookedInPeriod the commit path enforces (exported from period-service; local mirror deleted), and gnubok_agi_status resolves AGI state run-scoped so a correction run no longer renders as already filed. Declined with evidence: PR-Agent's opening-balances null-zeroing concern (all mergeable columns are NOT NULL with defaults per 20260713101000). Co-Authored-By: Claude Fable 5 <noreply@anthropic.com> * fix(review): address codex review findings on PR #1215 - restore 20260726140000 to its preview-recorded content and restate the NULL-safe tenant guard under 20260727130000: a recorded migration version never re-runs, so the in-place edit could not reach the preview branch - replace toFixed() with sv-SE two-decimal formatting in the ROT/RUT cap warning texts and update the pinned test expectations - drop the em dash in the fiscal-periods route comment - strip trailing whitespace in import-existing.test.ts Co-Authored-By: Claude Fable 5 <noreply@anthropic.com> * test(reports): raise timeout on real PDF render tests renderToBuffer does real @react-pdf layout work and exceeds the 5s default when the full suite saturates the CPU; tests pass in isolation. Co-Authored-By: Claude Fable 5 <noreply@anthropic.com> --------- Co-authored-by: Claude Opus 5 (1M context) <noreply@anthropic.com>
855 lines
32 KiB
TypeScript
855 lines
32 KiB
TypeScript
/**
|
|
* Link an existing posted verifikat to a customer invoice as its payment row.
|
|
*
|
|
* The matching is accounting-method aware (company_settings.accounting_method):
|
|
* • Faktureringsmetoden (accrual): match verifikat that CREDIT an AR account
|
|
* (default 1510, covers 151x): e.g. a SIE-imported payment voucher or a
|
|
* manually-entered receipt that clears the receivable.
|
|
* • Kontantmetoden (cash): no 1510 is ever booked (revenue is recognised at
|
|
* payment: debit 19xx / credit 30xx+26xx), so instead match verifikat that
|
|
* DEBIT a liquid-funds account (BAS class 19: kassa/bank, covers
|
|
* 1910/1920/1930/1940…). That voucher IS the payment the user already
|
|
* booked; linking just marks the invoice paid without a duplicate entry.
|
|
*
|
|
* No new journal entry is created in either case. Only an invoice_payments row
|
|
* is inserted pointing at the existing journal_entry_id, plus the invoice's
|
|
* paid_amount/remaining_amount/status are advanced.
|
|
*
|
|
* Both the web API route and the MCP commit handler call into the same
|
|
* `linkInvoiceToVoucher()` function (→ link_invoice_to_voucher RPC) so
|
|
* behaviour stays in lockstep.
|
|
*/
|
|
import type { SupabaseClient } from '@supabase/supabase-js'
|
|
import { eventBus } from '@/lib/events/bus'
|
|
import { createLogger } from '@/lib/logger'
|
|
import {
|
|
CONFIDENCE,
|
|
amountsMatchExact,
|
|
amountsMatchFuzzy,
|
|
customerNameMatches,
|
|
} from './invoice-matching'
|
|
import { autoReconcileTransactionForLinkedVoucher } from '@/lib/reconciliation/bank-reconciliation'
|
|
import { documentCurrency, ledgerLineSideAmountIn } from '@/lib/bookkeeping/ledger-line-amount'
|
|
import type { Invoice, Customer } from '@/types'
|
|
|
|
const log = createLogger('voucher-matching')
|
|
|
|
/** AR account range. Default 1510 (Kundfordringar): covers all 151x. Used on
|
|
* faktureringsmetoden, where the issuance verifikat books the receivable. */
|
|
const AR_ACCOUNT_PREFIX = '151'
|
|
|
|
/** Liquid-funds range (Kassa och bank, BAS class 19: 1910/1920/1930/1940…).
|
|
* Used on kontantmetoden, where the payment verifikat debits a bank/cash
|
|
* account instead of crediting 1510. */
|
|
const CASH_ACCOUNT_PREFIX = '19'
|
|
|
|
/**
|
|
* Read the company's accounting method. Defaults to 'accrual' when the settings
|
|
* row or column is absent: mirrors mark-paid / propose-payment-lines.
|
|
*/
|
|
async function resolveAccountingMethod(
|
|
supabase: SupabaseClient,
|
|
companyId: string
|
|
): Promise<'accrual' | 'cash'> {
|
|
const { data, error } = await supabase
|
|
.from('company_settings')
|
|
.select('accounting_method')
|
|
.eq('company_id', companyId)
|
|
.maybeSingle()
|
|
if (error) {
|
|
// A transient failure here would silently flip a cash company to the
|
|
// accrual (151x) search and render an empty candidate list: make the
|
|
// fallback visible so an intermittent empty state is diagnosable.
|
|
log.warn('accounting_method lookup failed; falling back to accrual', {
|
|
companyId,
|
|
message: error.message,
|
|
})
|
|
}
|
|
return (data as { accounting_method?: string } | null)?.accounting_method === 'cash'
|
|
? 'cash'
|
|
: 'accrual'
|
|
}
|
|
|
|
/** ±90 days from the invoice's due_date as the default search window. */
|
|
const DEFAULT_DATE_WINDOW_DAYS = 90
|
|
|
|
/** Tolerance for floating-point comparisons on monetary amounts (0.5 öre). */
|
|
const AMOUNT_TOLERANCE = 0.005
|
|
|
|
/** Date-proximity bump applied when entry_date is within ±7 days of due_date. */
|
|
const DATE_PROXIMITY_BUMP = 0.05
|
|
|
|
export interface VoucherCandidate {
|
|
journal_entry_id: string
|
|
voucher_series: string | null
|
|
voucher_number: number | null
|
|
entry_date: string
|
|
description: string
|
|
/** Matched amount on this voucher, always positive: the AR credit (151x) on
|
|
* faktureringsmetoden, or the liquid-funds debit (19xx) on kontantmetoden.
|
|
* Expressed in `currency` below (the INVOICE's currency), never in the raw
|
|
* SEK ledger column: see ledgerLineSideAmountIn.
|
|
* Kept under this name for API/UI back-compat across both methods. */
|
|
ar_credit_amount: number
|
|
/** The unit `ar_credit_amount` is quoted in: always the invoice's currency. */
|
|
currency: string
|
|
/** Currency of the matched line; nullable when the line stores SEK only. */
|
|
ar_line_currency: string | null
|
|
/** True when the voucher's fiscal period is closed or locked. */
|
|
period_locked: boolean
|
|
/** Confidence score 0..1 (or 0.99 for OCR match). */
|
|
confidence: number
|
|
/** Localized reason in Swedish (mirrors invoice-matching.ts conventions). */
|
|
match_reason: string
|
|
}
|
|
|
|
interface JournalEntryLine {
|
|
id: string
|
|
journal_entry_id: string
|
|
account_number: string
|
|
debit_amount: number | null
|
|
credit_amount: number | null
|
|
/** Labels the DOCUMENT, NOT the unit of debit_amount/credit_amount. */
|
|
currency: string | null
|
|
/** The line's amount in `currency`: the only non-SEK figure on the row. */
|
|
amount_in_currency: number | string | null
|
|
}
|
|
|
|
interface VoucherRow {
|
|
id: string
|
|
voucher_series: string | null
|
|
voucher_number: number | null
|
|
entry_date: string
|
|
description: string
|
|
status: string
|
|
source_type: string | null
|
|
fiscal_period_id: string
|
|
}
|
|
|
|
/** `fiscal_periods` has no `status` column: open/locked/closed is derived from
|
|
* `is_closed` + `locked_at`, exactly as the `enforce_period_lock` trigger
|
|
* (migration 017) and `resolvePeriodStatusForDate()` do it. */
|
|
interface FiscalPeriodRow {
|
|
id: string
|
|
is_closed: boolean | null
|
|
locked_at: string | null
|
|
}
|
|
|
|
interface CandidateContext {
|
|
invoice: Invoice & { customer?: Customer }
|
|
remainingAmount: number
|
|
}
|
|
|
|
/** Internal: SQL-side filter for posted, non-storno, non-opening entries. */
|
|
const EXCLUDED_SOURCE_TYPES = ['opening_balance', 'storno']
|
|
|
|
/**
|
|
* Find posted journal entries that could plausibly be the payment for this
|
|
* invoice and return up to `limit` ranked candidates. On faktureringsmetoden
|
|
* those are vouchers crediting an AR account (151x); on kontantmetoden they are
|
|
* vouchers debiting a liquid-funds account (19xx): see the module header.
|
|
*
|
|
* The query is intentionally generous on filtering: we let the validator
|
|
* make the final call at commit time. Ranking mirrors
|
|
* `findMatchingInvoices()`: exact amount + customer match wins, then exact,
|
|
* then fuzzy (±1% capped at 500 SEK), with a small bump for date proximity
|
|
* to the invoice's due_date.
|
|
*/
|
|
export async function findMatchingVouchersForInvoice(
|
|
supabase: SupabaseClient,
|
|
companyId: string,
|
|
invoice: Invoice & { customer?: Customer },
|
|
options: { limit?: number; dateWindowDays?: number } = {}
|
|
): Promise<VoucherCandidate[]> {
|
|
const limit = options.limit ?? 10
|
|
const windowDays = options.dateWindowDays ?? DEFAULT_DATE_WINDOW_DAYS
|
|
|
|
const remainingAmount = computeRemaining(invoice)
|
|
if (remainingAmount <= AMOUNT_TOLERANCE) return []
|
|
|
|
// Cash method: match the bank/cash DEBIT (19xx). Accrual: match the AR
|
|
// CREDIT (151x). The account prefix + side both switch on the method.
|
|
const isCash = (await resolveAccountingMethod(supabase, companyId)) === 'cash'
|
|
const accountPrefix = isCash ? CASH_ACCOUNT_PREFIX : AR_ACCOUNT_PREFIX
|
|
const amountColumn = isCash ? 'debit_amount' : 'credit_amount'
|
|
|
|
const dueDate = new Date(invoice.due_date)
|
|
const dateFrom = new Date(dueDate)
|
|
dateFrom.setDate(dateFrom.getDate() - windowDays)
|
|
const dateTo = new Date(dueDate)
|
|
dateTo.setDate(dateTo.getDate() + windowDays)
|
|
|
|
// Pre-filter the matched side to a band around the invoice amount before the
|
|
// row cap applies. Without this, a cash company with many 19xx-debit lines
|
|
// (every bank receipt) overflows the cap and the relevant voucher can be
|
|
// dropped before it is ever scored. The band is a superset of every case
|
|
// scoreCandidate accepts (exact remaining/total + fuzzy ±1% capped 500 SEK),
|
|
// so it never hides a single-line match.
|
|
//
|
|
// CRITICAL: `remainingAmount` and `invoice.total` are in the INVOICE's
|
|
// currency, while debit_amount/credit_amount are ALWAYS SEK. Bounding the SEK
|
|
// column by a foreign band excluded the one correct voucher server-side,
|
|
// before scoring ever ran, and left only same-magnitude SEK coincidences
|
|
// behind. On a foreign invoice the band therefore has to move onto
|
|
// `amount_in_currency` (the only column quoted in the invoice's currency,
|
|
// see ledgerLineSideAmountIn) together with the matching currency label.
|
|
//
|
|
// `documentCurrency()` and not `invoice.currency` directly: the column is
|
|
// nullable, and a NULL would test `!== 'SEK'` and send a plain domestic
|
|
// invoice down the FX path where nothing is convertible. The label guard in
|
|
// scoreCandidate still compares the RAW `invoice.currency`, so a NULL row
|
|
// behaves exactly as it did before this change.
|
|
const invoiceCurrency = documentCurrency(invoice.currency)
|
|
const isForeignInvoice = invoiceCurrency !== 'SEK'
|
|
const hiAmount = Math.max(remainingAmount, invoice.total)
|
|
const loAmount = Math.min(remainingAmount, invoice.total)
|
|
const amountPad = Math.min(hiAmount * 0.01, 500) + 0.02
|
|
const amountFloor = Math.max(0, loAmount - amountPad)
|
|
const amountCeil = hiAmount + amountPad
|
|
|
|
// Drive the query from journal_entries, embedding the matched lines, NOT
|
|
// from journal_entry_lines joined up to the entry. PostgREST executes the
|
|
// FROM table first: driving from lines means scanning `account LIKE '19%'`
|
|
// across ALL tenants and running the lines RLS policy (a per-row EXISTS via
|
|
// current_active_company_id()) thousands of times: on a cash company every
|
|
// bank receipt is a 19xx debit, and the query blows the authenticated
|
|
// statement_timeout (8s). Driving from entries hits company+date+status
|
|
// indexes first (a handful of rows), so the per-line RLS check only runs for
|
|
// those entries' lines. Same result set, milliseconds instead of seconds.
|
|
let query = supabase
|
|
.from('journal_entries')
|
|
.select(
|
|
`
|
|
id,
|
|
voucher_series,
|
|
voucher_number,
|
|
entry_date,
|
|
description,
|
|
status,
|
|
source_type,
|
|
fiscal_period_id,
|
|
company_id,
|
|
journal_entry_lines!inner (
|
|
id,
|
|
account_number,
|
|
debit_amount,
|
|
credit_amount,
|
|
currency,
|
|
amount_in_currency
|
|
)
|
|
`
|
|
)
|
|
.eq('company_id', companyId)
|
|
.eq('status', 'posted')
|
|
.gte('entry_date', dateFrom.toISOString().slice(0, 10))
|
|
.lte('entry_date', dateTo.toISOString().slice(0, 10))
|
|
.like('journal_entry_lines.account_number', `${accountPrefix}%`)
|
|
query = isCash
|
|
? query.gt('journal_entry_lines.debit_amount', 0)
|
|
: query.gt('journal_entry_lines.credit_amount', 0)
|
|
if (isForeignInvoice) {
|
|
// Only lines actually labelled with the invoice's currency AND carrying a
|
|
// rate can be compared to it at all; everything else is unscoreable, so
|
|
// narrowing to them here is a strict superset of what survives scoring.
|
|
// The band is floor <= |amount_in_currency| <= ceil, mirroring the SEK
|
|
// band below: without the floor, every small same-currency line passed
|
|
// the prefilter and could crowd the exact-amount voucher out of the
|
|
// .limit(limit * 10) cap before scoring ever ran. Both signs are kept
|
|
// (the .or below) because a few production rows store the foreign figure
|
|
// negatively, and the direction is taken from the debit/credit side
|
|
// anyway. NULL amount_in_currency drops out of every comparison, which
|
|
// is correct.
|
|
query = query
|
|
.eq('journal_entry_lines.currency', invoiceCurrency)
|
|
.gte('journal_entry_lines.amount_in_currency', -amountCeil)
|
|
.lte('journal_entry_lines.amount_in_currency', amountCeil)
|
|
if (amountFloor > 0) {
|
|
query = query.or(
|
|
`amount_in_currency.gte.${amountFloor},amount_in_currency.lte.${-amountFloor}`,
|
|
{ referencedTable: 'journal_entry_lines' },
|
|
)
|
|
}
|
|
} else {
|
|
query = query
|
|
.gte(`journal_entry_lines.${amountColumn}`, amountFloor)
|
|
.lte(`journal_entry_lines.${amountColumn}`, amountCeil)
|
|
}
|
|
const { data: entryRows, error } = await query.limit(limit * 10)
|
|
if (error) {
|
|
// Surface transient failures instead of silently rendering "no candidates":
|
|
// a swallowed error looks like a match that intermittently vanishes.
|
|
log.warn('voucher candidate query failed', {
|
|
companyId,
|
|
invoiceId: invoice.id,
|
|
message: error.message,
|
|
})
|
|
}
|
|
if (error || !entryRows) return []
|
|
|
|
// Sum the matched side per voucher (the embed already contains only the
|
|
// lines that passed the account/side/amount filters).
|
|
const byEntry = new Map<
|
|
string,
|
|
{ entry: VoucherRow; arCreditTotal: number; lineCurrency: string | null }
|
|
>()
|
|
|
|
const matchedSide: 'debit' | 'credit' = isCash ? 'debit' : 'credit'
|
|
|
|
for (const raw of entryRows) {
|
|
const entry = raw as unknown as VoucherRow & {
|
|
journal_entry_lines: Pick<
|
|
JournalEntryLine,
|
|
| 'id'
|
|
| 'account_number'
|
|
| 'debit_amount'
|
|
| 'credit_amount'
|
|
| 'currency'
|
|
| 'amount_in_currency'
|
|
>[]
|
|
}
|
|
if (EXCLUDED_SOURCE_TYPES.includes(entry.source_type ?? '')) continue
|
|
|
|
let matchedTotal = 0
|
|
let lineCurrency: string | null = null
|
|
for (const line of entry.journal_entry_lines ?? []) {
|
|
// Matched amount = the bank/cash debit (cash) or AR credit (accrual),
|
|
// quoted in the INVOICE's currency. On SEK this reads the raw column
|
|
// exactly as before; on a foreign invoice it reads amount_in_currency and
|
|
// returns null for any line that carries no figure in that currency.
|
|
const matched = ledgerLineSideAmountIn(line, invoiceCurrency, matchedSide)
|
|
if (matched === null || matched <= 0) continue
|
|
matchedTotal += matched
|
|
if (!lineCurrency) lineCurrency = line.currency
|
|
}
|
|
if (matchedTotal <= 0) continue
|
|
|
|
byEntry.set(entry.id, { entry, arCreditTotal: matchedTotal, lineCurrency })
|
|
}
|
|
|
|
if (byEntry.size === 0) return []
|
|
|
|
// Fetch the already-linked payments (for dedup) and the fiscal-period locks
|
|
// (informational "låst period" badge) concurrently: both depend only on the
|
|
// grouped entries, so there is no reason to pay two sequential round-trips.
|
|
// Computing locks for entries that dedup later drops is harmless.
|
|
const candidateEntryIds = Array.from(byEntry.keys())
|
|
const periodIds = Array.from(
|
|
new Set(Array.from(byEntry.values()).map((v) => v.entry.fiscal_period_id))
|
|
)
|
|
const [{ data: existingLinks }, { data: periods, error: periodsError }] = await Promise.all([
|
|
supabase
|
|
.from('invoice_payments')
|
|
.select('journal_entry_id')
|
|
.eq('company_id', companyId)
|
|
.eq('invoice_id', invoice.id)
|
|
.in('journal_entry_id', candidateEntryIds),
|
|
supabase
|
|
.from('fiscal_periods')
|
|
.select('id, is_closed, locked_at')
|
|
.in('id', periodIds),
|
|
])
|
|
|
|
// Drop entries already fully linked to *this* invoice.
|
|
const alreadyLinked = new Set(
|
|
(existingLinks ?? [])
|
|
.map((row) => (row as { journal_entry_id: string | null }).journal_entry_id)
|
|
.filter((id): id is string => !!id)
|
|
)
|
|
for (const id of alreadyLinked) byEntry.delete(id)
|
|
if (byEntry.size === 0) return []
|
|
|
|
// Linking is allowed in locked periods (no JE mutation): this flag is just
|
|
// informational for the candidate preview. On a lookup failure fail CLOSED
|
|
// (flag every candidate as locked) rather than silently claiming "open": the
|
|
// badge blocks nothing, so an over-cautious badge is harmless while a
|
|
// wrongly-absent one is the exact mis-advice this guard exists to prevent.
|
|
if (periodsError) {
|
|
log.warn('fiscal period lock lookup failed; flagging candidates as locked', {
|
|
companyId,
|
|
invoiceId: invoice.id,
|
|
message: periodsError.message,
|
|
})
|
|
}
|
|
const lockedPeriods = new Set<string>(
|
|
periodsError
|
|
? periodIds
|
|
: (periods ?? [])
|
|
.filter((p) => {
|
|
const period = p as FiscalPeriodRow
|
|
return period.is_closed === true || period.locked_at != null
|
|
})
|
|
.map((p) => (p as FiscalPeriodRow).id)
|
|
)
|
|
|
|
// Score and rank.
|
|
const ctx: CandidateContext = { invoice, remainingAmount }
|
|
const candidates: VoucherCandidate[] = []
|
|
for (const { entry, arCreditTotal, lineCurrency } of byEntry.values()) {
|
|
const scored = scoreCandidate(entry, arCreditTotal, lineCurrency, ctx)
|
|
if (!scored) continue
|
|
candidates.push({
|
|
journal_entry_id: entry.id,
|
|
voucher_series: entry.voucher_series,
|
|
voucher_number: entry.voucher_number,
|
|
entry_date: entry.entry_date,
|
|
description: entry.description,
|
|
ar_credit_amount: round2(arCreditTotal),
|
|
currency: invoice.currency,
|
|
ar_line_currency: lineCurrency,
|
|
period_locked: lockedPeriods.has(entry.fiscal_period_id),
|
|
confidence: scored.confidence,
|
|
match_reason: scored.match_reason,
|
|
})
|
|
}
|
|
|
|
candidates.sort((a, b) => b.confidence - a.confidence || a.entry_date.localeCompare(b.entry_date))
|
|
return candidates.slice(0, limit)
|
|
}
|
|
|
|
function scoreCandidate(
|
|
entry: VoucherRow,
|
|
arCreditTotal: number,
|
|
lineCurrency: string | null,
|
|
ctx: CandidateContext
|
|
): { confidence: number; match_reason: string } | null {
|
|
// OCR-style: invoice number appears in entry description.
|
|
if (
|
|
ctx.invoice.invoice_number &&
|
|
descriptionMentionsInvoice(entry.description, ctx.invoice.invoice_number)
|
|
) {
|
|
return {
|
|
confidence: CONFIDENCE.OCR_REFERENCE_MATCH,
|
|
match_reason: `Fakturanummer ${ctx.invoice.invoice_number} omnämnt i verifikatets beskrivning`,
|
|
}
|
|
}
|
|
|
|
// Label guard, unchanged in shape. It is no longer what makes the amounts
|
|
// comparable (that used to be the bug: it passed on exactly the FX rows it
|
|
// existed to catch, then compared a SEK ledger amount to a foreign
|
|
// remainder). `arCreditTotal` already arrives expressed in
|
|
// ctx.invoice.currency and any line that could not be expressed there was
|
|
// dropped before summing. What survives here is the counterparty
|
|
// discriminator: a matched line stamped with another document's currency.
|
|
const lineCurrencyEffective = lineCurrency ?? ctx.invoice.currency
|
|
if (lineCurrencyEffective !== ctx.invoice.currency) {
|
|
return null
|
|
}
|
|
|
|
const exactRemaining = amountsMatchExact(arCreditTotal, ctx.remainingAmount)
|
|
const exactTotal =
|
|
!exactRemaining && amountsMatchExact(arCreditTotal, ctx.invoice.total)
|
|
const fuzzyRemaining =
|
|
!exactRemaining && !exactTotal && amountsMatchFuzzy(arCreditTotal, ctx.remainingAmount)
|
|
|
|
const customerMatch = customerNameMatches(
|
|
ctx.invoice.customer?.name,
|
|
entry.description,
|
|
null
|
|
)
|
|
|
|
let confidence = 0
|
|
let reason = ''
|
|
if (exactRemaining && customerMatch) {
|
|
confidence = CONFIDENCE.EXACT_AMOUNT_CUSTOMER
|
|
reason = `Exakt belopp (${formatNumber(arCreditTotal)} ${ctx.invoice.currency}) och kundnamn matchar`
|
|
} else if (exactRemaining) {
|
|
confidence = CONFIDENCE.EXACT_AMOUNT_ONLY
|
|
reason = `Exakt belopp (${formatNumber(arCreditTotal)} ${ctx.invoice.currency})`
|
|
} else if (exactTotal && customerMatch) {
|
|
confidence = CONFIDENCE.FUZZY_AMOUNT_CUSTOMER
|
|
reason = `Fakturans totalbelopp och kundnamn matchar`
|
|
} else if (exactTotal) {
|
|
confidence = CONFIDENCE.FUZZY_AMOUNT_ONLY + 0.05
|
|
reason = `Fakturans totalbelopp matchar`
|
|
} else if (fuzzyRemaining && customerMatch) {
|
|
confidence = CONFIDENCE.FUZZY_AMOUNT_CUSTOMER
|
|
reason = `Belopp nära (±1%) och kundnamn matchar`
|
|
} else if (fuzzyRemaining) {
|
|
confidence = CONFIDENCE.FUZZY_AMOUNT_ONLY
|
|
reason = `Belopp nära (±1%)`
|
|
} else {
|
|
return null
|
|
}
|
|
|
|
// Bump for date proximity to due_date.
|
|
if (isDateWithinDays(entry.entry_date, ctx.invoice.due_date, 7)) {
|
|
confidence = Math.min(CONFIDENCE.OCR_REFERENCE_MATCH - 0.001, confidence + DATE_PROXIMITY_BUMP)
|
|
}
|
|
|
|
return { confidence, match_reason: reason }
|
|
}
|
|
|
|
export type ValidateResult =
|
|
| {
|
|
ok: true
|
|
arCreditAmount: number
|
|
arLineCurrency: string | null
|
|
voucher: VoucherRow
|
|
remainingAfter: number
|
|
isFullyPaid: boolean
|
|
paymentAmount: number
|
|
}
|
|
| {
|
|
ok: false
|
|
code: VoucherLinkErrorCode
|
|
details?: Record<string, unknown>
|
|
}
|
|
|
|
export type VoucherLinkErrorCode =
|
|
| 'LINK_VOUCHER_INVOICE_NOT_FOUND'
|
|
| 'LINK_VOUCHER_VOUCHER_NOT_FOUND'
|
|
| 'LINK_VOUCHER_NOT_POSTED'
|
|
| 'LINK_VOUCHER_NO_AR_CREDIT'
|
|
| 'LINK_VOUCHER_ALREADY_LINKED'
|
|
| 'LINK_VOUCHER_AMOUNT_EXCEEDS_REMAINING'
|
|
| 'LINK_VOUCHER_CURRENCY_MISMATCH'
|
|
| 'LINK_VOUCHER_INVOICE_FULLY_PAID'
|
|
| 'LINK_VOUCHER_DB_ERROR'
|
|
|
|
/**
|
|
* Validate that a journal entry can be linked as payment for an invoice.
|
|
* Used by both the staging path (MCP tool) and the commit path (web route +
|
|
* MCP commit handler) so the guards stay identical.
|
|
*/
|
|
export async function validateVoucherForInvoiceLink(
|
|
supabase: SupabaseClient,
|
|
companyId: string,
|
|
invoice: Invoice & { customer?: Customer },
|
|
journalEntryId: string
|
|
): Promise<ValidateResult> {
|
|
const remainingAmount = computeRemaining(invoice)
|
|
if (remainingAmount <= AMOUNT_TOLERANCE) {
|
|
return { ok: false, code: 'LINK_VOUCHER_INVOICE_FULLY_PAID' }
|
|
}
|
|
|
|
// Match the bank/cash debit (cash) or the AR credit (accrual): see header.
|
|
const isCash = (await resolveAccountingMethod(supabase, companyId)) === 'cash'
|
|
const accountPrefix = isCash ? CASH_ACCOUNT_PREFIX : AR_ACCOUNT_PREFIX
|
|
|
|
const { data: voucher, error: voucherError } = await supabase
|
|
.from('journal_entries')
|
|
.select('id, voucher_series, voucher_number, entry_date, description, status, source_type, fiscal_period_id, company_id')
|
|
.eq('id', journalEntryId)
|
|
.eq('company_id', companyId)
|
|
.maybeSingle()
|
|
|
|
if (voucherError || !voucher) {
|
|
return { ok: false, code: 'LINK_VOUCHER_VOUCHER_NOT_FOUND' }
|
|
}
|
|
|
|
const v = voucher as VoucherRow & { company_id: string }
|
|
if (v.status !== 'posted') {
|
|
return { ok: false, code: 'LINK_VOUCHER_NOT_POSTED', details: { status: v.status } }
|
|
}
|
|
if (EXCLUDED_SOURCE_TYPES.includes(v.source_type ?? '')) {
|
|
return { ok: false, code: 'LINK_VOUCHER_NO_AR_CREDIT', details: { source_type: v.source_type } }
|
|
}
|
|
|
|
// `amount_in_currency` is not optional here: on a foreign invoice it is the
|
|
// ONLY column quoted in the invoice's currency. Omitting it from the column
|
|
// list would leave every FX line unconvertible and this guard would reject
|
|
// vouchers it should accept.
|
|
const { data: lines, error: linesError } = await supabase
|
|
.from('journal_entry_lines')
|
|
.select('account_number, debit_amount, credit_amount, currency, amount_in_currency')
|
|
.eq('journal_entry_id', journalEntryId)
|
|
if (linesError || !lines || lines.length === 0) {
|
|
return { ok: false, code: 'LINK_VOUCHER_NO_AR_CREDIT' }
|
|
}
|
|
|
|
// Nullable column, non-null type: see documentCurrency(). The label guard
|
|
// below still compares the RAW invoice.currency, so a NULL row is rejected
|
|
// exactly as it was before, rather than newly failing as "unconvertible".
|
|
const invoiceCurrency = documentCurrency(invoice.currency)
|
|
const matchedSide: 'debit' | 'credit' = isCash ? 'debit' : 'credit'
|
|
let arCreditTotal = 0
|
|
let lineCurrency: string | null = null
|
|
// A matched-side line on the right account that carries no amount in the
|
|
// invoice's currency. Fail CLOSED on it: summing only the convertible lines
|
|
// would silently understate a voucher that settles more than we can see.
|
|
let unconvertibleLineCurrency: string | null | undefined
|
|
for (const raw of lines) {
|
|
const line = raw as {
|
|
account_number: string
|
|
debit_amount: number | null
|
|
credit_amount: number | null
|
|
currency: string | null
|
|
amount_in_currency: number | string | null
|
|
}
|
|
if (!line.account_number?.startsWith(accountPrefix)) continue
|
|
const matched = ledgerLineSideAmountIn(line, invoiceCurrency, matchedSide)
|
|
if (matched === null) {
|
|
// Only a line that actually moves on the matched side counts as evidence
|
|
// of a settlement we cannot read; the opposite leg is irrelevant.
|
|
const rawSide = Number(isCash ? line.debit_amount : line.credit_amount) || 0
|
|
if (rawSide > 0 && unconvertibleLineCurrency === undefined) {
|
|
unconvertibleLineCurrency = line.currency
|
|
}
|
|
continue
|
|
}
|
|
if (matched <= 0) continue
|
|
arCreditTotal += matched
|
|
if (!lineCurrency) lineCurrency = line.currency
|
|
}
|
|
arCreditTotal = round2(arCreditTotal)
|
|
|
|
if (unconvertibleLineCurrency !== undefined) {
|
|
return {
|
|
ok: false,
|
|
code: 'LINK_VOUCHER_CURRENCY_MISMATCH',
|
|
details: {
|
|
invoice_currency: invoice.currency,
|
|
line_currency: unconvertibleLineCurrency,
|
|
},
|
|
}
|
|
}
|
|
|
|
if (arCreditTotal <= 0) {
|
|
return { ok: false, code: 'LINK_VOUCHER_NO_AR_CREDIT' }
|
|
}
|
|
|
|
// Label guard, unchanged. This is NOT a unit check any more (the amount above
|
|
// is already in the invoice's currency); it is a counterparty discriminator:
|
|
// a matched line stamped with a different document currency belongs to some
|
|
// other invoice. On a foreign invoice it always passes, because only
|
|
// same-labelled lines could be converted at all.
|
|
const lineCurrencyEffective = lineCurrency ?? invoice.currency
|
|
if (lineCurrencyEffective !== invoice.currency) {
|
|
return {
|
|
ok: false,
|
|
code: 'LINK_VOUCHER_CURRENCY_MISMATCH',
|
|
details: { invoice_currency: invoice.currency, line_currency: lineCurrencyEffective },
|
|
}
|
|
}
|
|
|
|
if (arCreditTotal > remainingAmount + AMOUNT_TOLERANCE) {
|
|
return {
|
|
ok: false,
|
|
code: 'LINK_VOUCHER_AMOUNT_EXCEEDS_REMAINING',
|
|
details: { ar_credit: arCreditTotal, remaining: round2(remainingAmount) },
|
|
}
|
|
}
|
|
|
|
// Already linked to this invoice? (Final, authoritative check: the DB
|
|
// partial unique index is the last line of defence at insert time.)
|
|
const { data: existingLinks } = await supabase
|
|
.from('invoice_payments')
|
|
.select('id')
|
|
.eq('company_id', companyId)
|
|
.eq('invoice_id', invoice.id)
|
|
.eq('journal_entry_id', journalEntryId)
|
|
.limit(1)
|
|
if (existingLinks && existingLinks.length > 0) {
|
|
return { ok: false, code: 'LINK_VOUCHER_ALREADY_LINKED' }
|
|
}
|
|
|
|
const paymentAmount = Math.min(arCreditTotal, round2(remainingAmount))
|
|
const remainingAfter = Math.max(0, round2(remainingAmount - paymentAmount))
|
|
const isFullyPaid = remainingAfter <= AMOUNT_TOLERANCE
|
|
|
|
return {
|
|
ok: true,
|
|
arCreditAmount: arCreditTotal,
|
|
arLineCurrency: lineCurrency,
|
|
voucher: v,
|
|
remainingAfter,
|
|
isFullyPaid,
|
|
paymentAmount,
|
|
}
|
|
}
|
|
|
|
export interface LinkInvoiceToVoucherParams {
|
|
invoiceId: string
|
|
journalEntryId: string
|
|
notes?: string
|
|
}
|
|
|
|
export interface LinkInvoiceToVoucherResult {
|
|
paymentId: string
|
|
invoiceStatus: 'paid' | 'partially_paid'
|
|
paidAmount: number
|
|
remainingAmount: number
|
|
paymentAmount: number
|
|
journalEntryId: string
|
|
/** Bank transaction auto-reconciled to the linked voucher, if exactly one
|
|
* unbooked line matched it; null when nothing was safely linkable. Lets the
|
|
* inbox row leave the Transactions list: the gap this whole flow fixes. */
|
|
reconciledTransactionId: string | null
|
|
}
|
|
|
|
/** jsonb payload returned by the link_invoice_to_voucher RPC on success. */
|
|
interface RpcLinkInvoiceOk {
|
|
ok: true
|
|
payment_id: string
|
|
invoice_status: 'paid' | 'partially_paid'
|
|
paid_amount: number
|
|
remaining_amount: number
|
|
payment_amount: number
|
|
journal_entry_id: string
|
|
currency: string
|
|
payment_date: string
|
|
}
|
|
|
|
/** jsonb payload returned by the link_invoice_to_voucher RPC on guard failure. */
|
|
interface RpcLinkInvoiceErr {
|
|
ok: false
|
|
code: VoucherLinkErrorCode
|
|
details?: Record<string, unknown>
|
|
}
|
|
|
|
/**
|
|
* Atomically link an existing posted verifikat to an invoice. Inserts an
|
|
* invoice_payments row, advances the invoice's paid_amount/remaining_amount,
|
|
* and emits invoice.match_confirmed (reusing the existing event so reminder
|
|
* cancellation + automations fire without a new event channel).
|
|
*
|
|
* Re-validates inside the same call to defend against stage→commit drift:
|
|
* voucher reversed, invoice paid by another flow, etc. Any structured
|
|
* rejection is returned as { ok: false, code } so callers can map it to a
|
|
* stable HTTP status + auto-reject the pending op.
|
|
*/
|
|
export async function linkInvoiceToVoucher(
|
|
supabase: SupabaseClient,
|
|
userId: string,
|
|
companyId: string,
|
|
params: LinkInvoiceToVoucherParams
|
|
): Promise<
|
|
| { ok: true; result: LinkInvoiceToVoucherResult }
|
|
| { ok: false; code: VoucherLinkErrorCode; details?: Record<string, unknown> }
|
|
> {
|
|
// All validation + writes happen inside link_invoice_to_voucher (PL/pgSQL).
|
|
// The function locks the invoice row FOR UPDATE, re-validates the voucher,
|
|
// and applies the invoices UPDATE + invoice_payments INSERT in a single PG
|
|
// transaction, so concurrent linkers serialize and a failure on either write
|
|
// rolls back automatically. The previous TS implementation did
|
|
// UPDATE-then-INSERT with a manual rollback that restored from a STALE
|
|
// pre-link snapshot: under concurrent linking it could clobber a sibling's
|
|
// successful write while leaving its payment row in place (audit C2; mirrors
|
|
// the supplier-side link_supplier_invoice_to_voucher fix from PR #602).
|
|
const { data: rpcData, error: rpcError } = await supabase.rpc('link_invoice_to_voucher', {
|
|
p_invoice_id: params.invoiceId,
|
|
p_journal_entry_id: params.journalEntryId,
|
|
p_user_id: userId,
|
|
p_company_id: companyId,
|
|
p_notes: params.notes ?? null,
|
|
})
|
|
|
|
if (rpcError) {
|
|
log.error('link_invoice_to_voucher RPC error', {
|
|
companyId,
|
|
userId,
|
|
invoiceId: params.invoiceId,
|
|
journalEntryId: params.journalEntryId,
|
|
message: rpcError.message,
|
|
})
|
|
return { ok: false, code: 'LINK_VOUCHER_DB_ERROR', details: { reason: rpcError.message } }
|
|
}
|
|
|
|
const rpc = rpcData as RpcLinkInvoiceOk | RpcLinkInvoiceErr | null
|
|
if (!rpc) {
|
|
return { ok: false, code: 'LINK_VOUCHER_DB_ERROR', details: { reason: 'empty RPC response' } }
|
|
}
|
|
if (!rpc.ok) {
|
|
return { ok: false, code: rpc.code, details: rpc.details }
|
|
}
|
|
|
|
// Fetch the now-updated invoice (with customer) for event emission: the RPC
|
|
// committed before this read, so the row reflects post-link state. Mirrors
|
|
// the supplier-side wrapper.
|
|
const { data: invoice } = await supabase
|
|
.from('invoices')
|
|
.select('*, customer:customers(*)')
|
|
.eq('id', params.invoiceId)
|
|
.eq('company_id', companyId)
|
|
.maybeSingle()
|
|
|
|
if (invoice) {
|
|
try {
|
|
await eventBus.emit({
|
|
type: 'invoice.paid',
|
|
payload: {
|
|
invoice: invoice as Invoice,
|
|
paymentAmount: rpc.payment_amount,
|
|
paymentDate: rpc.payment_date,
|
|
userId,
|
|
companyId,
|
|
},
|
|
})
|
|
} catch {
|
|
/* non-critical */
|
|
}
|
|
}
|
|
|
|
// Close the loop on the bank feed: the invoice→voucher link above only
|
|
// advanced the invoice, so the bank transaction that paid it kept sitting in
|
|
// the Transactions inbox (journal_entry_id still null). Reconcile it to the
|
|
// same verifikat when it can be done unambiguously. Best-effort: the invoice
|
|
// link has already committed, so a failure here must not fail the whole call.
|
|
let reconciledTransactionId: string | null = null
|
|
try {
|
|
const recon = await autoReconcileTransactionForLinkedVoucher(
|
|
supabase,
|
|
companyId,
|
|
userId,
|
|
params.journalEntryId,
|
|
{ invoiceId: params.invoiceId },
|
|
)
|
|
reconciledTransactionId = recon?.linkedTransactionId ?? null
|
|
} catch (err) {
|
|
log.warn('auto-reconcile of bank transaction after voucher link failed (non-blocking)', {
|
|
companyId,
|
|
invoiceId: params.invoiceId,
|
|
journalEntryId: params.journalEntryId,
|
|
reason: err instanceof Error ? err.message : String(err),
|
|
})
|
|
}
|
|
|
|
return {
|
|
ok: true,
|
|
result: {
|
|
paymentId: rpc.payment_id,
|
|
invoiceStatus: rpc.invoice_status,
|
|
paidAmount: rpc.paid_amount,
|
|
remainingAmount: rpc.remaining_amount,
|
|
paymentAmount: rpc.payment_amount,
|
|
journalEntryId: params.journalEntryId,
|
|
reconciledTransactionId,
|
|
},
|
|
}
|
|
}
|
|
|
|
// ── Helpers ─────────────────────────────────────────────────
|
|
|
|
function computeRemaining(invoice: Invoice): number {
|
|
if (typeof invoice.remaining_amount === 'number' && invoice.remaining_amount > 0) {
|
|
return invoice.remaining_amount
|
|
}
|
|
const paid = invoice.paid_amount ?? 0
|
|
return Math.max(0, round2(invoice.total - paid))
|
|
}
|
|
|
|
function round2(n: number): number {
|
|
return Math.round(n * 100) / 100
|
|
}
|
|
|
|
function isDateWithinDays(a: string, b: string, days: number): boolean {
|
|
const ad = new Date(a).getTime()
|
|
const bd = new Date(b).getTime()
|
|
if (Number.isNaN(ad) || Number.isNaN(bd)) return false
|
|
return Math.abs(ad - bd) <= days * 24 * 3600 * 1000
|
|
}
|
|
|
|
function descriptionMentionsInvoice(description: string | null, invoiceNumber: string): boolean {
|
|
if (!description || !invoiceNumber) return false
|
|
const normalizedDesc = description.replace(/\s+/g, '').toLowerCase()
|
|
const normalizedNum = invoiceNumber.replace(/\s+/g, '').toLowerCase()
|
|
return normalizedDesc.includes(normalizedNum)
|
|
}
|
|
|
|
function formatNumber(n: number): string {
|
|
return new Intl.NumberFormat('sv-SE', {
|
|
minimumFractionDigits: 2,
|
|
maximumFractionDigits: 2,
|
|
}).format(n)
|
|
}
|