* fix(bankid): harden login/signup flow — polling, signup rollback, metadata merge, enrichment lookup - middleware: read BankID enrichment from the bankid_enrichment table (the extension_data path has been dead since the multi-tenant refactor), so company-less BankID users land on /select-company instead of the manual wizard - BankIdAuth: hard 6-min poll deadline; every failed poll counts toward the give-up limit; guard overlapping ticks so completion runs exactly once (a double /complete regenerated the magic link and invalidated the first, failing logins intermittently); retry clicks wait out the start cooldown instead of silently no-oping; Swedish messages for 429/unknown start errors - bankid/complete: all-or-nothing signup — delete the created user when the identity insert, app_metadata update, or magic-link generation fails, so a retry starts clean instead of hitting account_exists with an unusable account - bankid/unlink: read-merge-write app_metadata so has_password survives unlink (BankID-only users could otherwise strand themselves with no login method) - login: BankID "create account" CTA now links to /register instead of dismissing the notice; sv.json: fix missing å/ä/ö in settings_bankid strings Co-Authored-By: Claude Fable 5 <noreply@anthropic.com> * docs: move secondary guides into docs/, delete dead root files Move DOCKER.md, SELF-HOSTING.md, WHITELABEL.md and extensions.md (renamed EXTENSIONS.md) into a new docs/ folder and update all path references (README, setup.sh, .dockerignore image rules, docker-publish workflow comment, _example-branding, lib/branding/service.ts). Delete two dead root files: customer.json (stray API-test payload) and findings.md (point-in-time swarm audit export, criticals already filed). Co-Authored-By: Claude Fable 5 <noreply@anthropic.com> Signed-off-by: Emil <emilmattsson14@gmail.com> * fix(api): security & correctness hardening + withRouteContext MFA migration across API routes Audit of ~100 app/api routes. Highlights: Security - agent/conversations: list leaked colleagues' titles + message previews (company-scoped RLS, no user filter) -> user-scoped - calendar/feed PUT: raw body into .update() allowed feed_token fixation on a public unauthenticated URL -> strict schema, content toggles only - bokslutsdispositioner: unbounded schablonintaktRate could inflate the IL 30 kap 25% periodiseringsfond cap base -> bounded - agent profile/composer/onboarding: viewers could rewrite the agent profile while sibling /verify blocked them -> role-gated Correctness - account-totals / listAssets: unbounded queries silently truncated at 1000 rows (under-counted money; skipped assets at year-end depreciation) -> fetchAllRows with stable order (+3 more pagination fixes) - voucher-gaps: swallowed detect_voucher_gaps RPC errors (BFNAR gap view could show "no gaps" when the check never ran) -> surfaced - 5 phantom-success writes (OK on zero matched rows) fixed - assets K3 component-sum validated against stale acquisition_cost -> fixed - invite silent email-send failure -> response carries email_sent; deadlines/calendar cast-then-check JSON crashes -> Zod Convention - ~44 legacy routes converted to withRouteContext (MFA); added Zod validation, corrected status codes, console.* -> lib/logger Response shapes preserved for existing callers. ~110 new tests. Co-Authored-By: Claude Fable 5 <noreply@anthropic.com> * feat(bookkeeping): save a booking as a reusable template from Bokför direkt Add a "Spara som mall" action to the manual booking dialog so users can capture a kontering they just worked out as a booking template — right where they figured out how something should be booked. - derive amount-parameterised template lines from the concrete booking (settlement = the non-VAT leg nearest the total, 26xx = a VAT line with its rate snapped to the nearest standard rate, the rest = business ratios; line labels come from the loaded BAS chart) - extract the shared TemplateForm out of BookingTemplatesPanel so the booking dialog reuses the same editor, live preview and convertibility hints instead of duplicating them - save via the existing POST /api/settings/booking-templates endpoint Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com> * fix(bokslut): render arsredovisning RR/BR at ÅRL post level — no kontonummer Bolagsverket rejected a user's filed årsredovisning with "Balansräkning och resultaträkning ska inte innehålla kontonummer": the PDF built every statement row as per-account "1930 Företagskonto" lines while the iXBRL filing path already aggregated to statutory posts, so the two artifacts diverged. The PDF statements now derive from the same K2 risbs mapping the iXBRL document uses (mapTrialBalancesToK2), via a new statement-rows.ts that emits post-level rows in uppställningsform order for both the K2 and K3 templates. Also fixed along the way: - Jämförelseår column (ÅRL 3:5 §) — previous-year trial balances now load and render; the old PDF had no comparatives at all. - mapping.warnings (unmapped accounts, RR ≠ 2099, obalans, reclass nudges) flow into ArsredovisningData.warnings so the wizard flags a non-fileable document before download. - Flerårsöversikt current/previous year overridden with the mapper's strict-3000–3799 Nettoomsattning, mirroring build-input's duplicate-fact rule, so the FB table ties to the RR. - FB eget kapital-table is post-level and drops obeskattade reserver (never eget kapital); K3 equity-changes statement uses real prior-year opening balances with derived utdelning/nyemission residuals that tie the roll-forward exactly to booked UB. - build-input dedupes warnings now that the PDF path runs the same mapping. Regression test asserts no RR/BR label ever contains a four-digit account number again. Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com> * fix(reports): diagnose untransferred prior-year results behind balance-sheet differens Prod incident (97 kr): a multi-year SIE migration lacked one year's omforing av arets resultat; the residual corrupted every later derived opening balance and Balansrakningen showed a bare "Differens: 97 kr" with no explanation. Continuity checking cannot catch this failure mode (prior-year UB and derived IB match per-account by construction) - the invariant that actually breaks is per-year P&L = 0 for all non-latest years. - lib/reports/imbalance-diagnosis.ts: shared detector (findUntransferredResults + buildImbalanceDiagnosis) - Balansrakning/Balansrapport attach imbalance_diagnosis when unbalanced, naming the exact culprit years; rendered in web views + PDF; MCP gnubok_get_balance_sheet inherits the field via spread - SIE import: parse-time warning when a completed year's vouchers leave a P&L residual, plus a post-import DB walk surfacing culprits as warnings and structured details.untransferredResults; the Arcim migration workspace previously dropped result.warnings entirely and now renders them - opening-balance/correct: pre-flight the company lock date and return 409 OB_COMPANY_LOCK_DATE (retryable: false, lock date interpolated in the client message) instead of the retryable 500 that invited blind retries; catch-path maps a raced trigger rejection to the same code Diagnosis runs only on unbalanced paths (zero cost when healthy) and never fails the report or the import. No migration, nothing persisted. Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com> * fix: production error remediation — FX rates, deadlines, log levels, correction relink Batch of fixes for recurring Vercel runtime errors: - Riksbanken FX rates: persistent read-through cache (exchange_rates table), one retry honoring Retry-After on 429/5xx, bounded ingest concurrency, and an honest fallback — most recent cached observation or null, never a hardcoded rate silently booked into amount_sek. Unrated transactions stay repairable via refresh-exchange-rate. - Tax deadline regeneration inserts replacement rows before deleting the superseded set, so a failed insert no longer wipes a company's deadlines (the 23502 user_id regression did exactly that). Migration makes deadlines.user_id nullable for system-generated rows. - Route wrappers + errorResponse log 4xx outcomes at warn so only genuine 5xx reach Vercel's runtime-error clustering; client-supplied /api/log telemetry demoted to warn as well. - application/json documents (raw PSD2 responses archived per BFL) validate as parseable JSON with object/array root instead of always failing the magic-byte check. - correctEntry surfaces document-relink failures to callers, and the BFL document-immutability trigger now allows relinking underlag from a reversed entry to its correction (migration + pg test). - Middleware clears stale session cookies on /api requests too, using scope 'local' so cleanup doesn't re-trigger the failed token refresh. Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com> * fix(skatteverket): persist token health and stop retrying dead consents Terminal auth errors (SESSION_EXPIRED, REFRESH_EXHAUSTED, MISSING_SCOPE, TOKEN_CORRUPTED) mark the token row needs_reconsent with the error code and timestamp — SKV per-flow refresh tokens live 65 minutes, so once expired nothing recovers without a fresh BankID consent. The AGI kvittens and skattekonto sync crons skip flagged connections instead of failing every night, and the settings panel prompts for re-consent proactively. A successful reconnect resets the row to active. Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com> * fix(banking): allocate distinct BAS ledger slots for PSD2 mirror accounts A bank returning N same-currency accounts used to map them all onto the currency default (1930/1932/1933/1934), tripping the UNIQUE (company_id, ledger_account) constraint per-account — swallowed errors left accounts silently unmirrored. allocatePsd2LedgerAccount now hands out the currency default first, then free 1931–1959 sub-account slots, skipping slots held by any existing row. - Callback persists allocations to accounts_data so the picker pre-fills reality; reconnect reuses previously mirrored ledgers instead of re-deriving (a user remap to 1935 survives). - Selection save resolves effective ledgers up front and rejects duplicates or cross-connection conflicts with a 400 instead of silently skipping the mirror. - Bank error codes + psu_type are forwarded to the settings page for every OAuth error, keying the Handelsbanken corporate fullmakt guidance. Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com> * fix(agent): stage exact journal lines on categorization previews Categorization previews only carried debit/credit accounts, the GROSS amount, and separate VAT rows — read together that looks like an unbalanced 'gross on cost account + VAT debit' entry, and it misled both users and agents into rejecting correct proposals. The MCP preview and the pending-operation PATCH now materialize the exact lines the commit executor will post (net cost line, VAT line, gross bank line, SEK) via buildTransactionEntryLines, and PATCH re-derives them from the new mapping instead of spreading stale staged lines. ApprovalCard and /pending render the verifikat lines, falling back to the legacy summary only for operations staged before this fix. Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com> * feat(bookkeeping): prune unused imported accounts from the chart SIE imports routinely bring in hundreds of accounts that were never used and clutter the kontoplan. New account_usage_counts RPC (one grouped query instead of a count per account) backs GET /api/bookkeeping/accounts/usage, and POST /api/bookkeeping/accounts/prune deletes zero-usage accounts — dry-run first, then an explicit account list capped at 2000. Accounts with journal lines are skipped, never deleted. The chart manager shows a usage column and a prune dialog grouping custom accounts vs unused BAS-seeded ones. Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com> * feat(api): carry dimensions through v1 invoice and supplier-invoice surfaces Credit-note creation now copies default_dimensions and per-line dimensions from the original, so the reversing journal entry nets against the same dimension cells instead of dropping them. List/detail responses expose the dimension fields, and the OpenAPI spec snapshot follows. Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com> * perf: batch serial Supabase round-trips on hot dashboard paths Every dashboard render pays the layout's query chain, so serialized awaits are direct wall-clock: the layout, chat conversation, invoice detail, supplier detail, select-company, and agent-onboarding pages now run their independent lookups in parallel batches, and getCompanyCapabilities folds its disabled-config read into the same round-trip. JournalEntryList hydrates the saved fiscal-year scope optimistically instead of serializing the first entries fetch behind the fiscal-periods request. The supplier detail page filters invoices server-side via a new supplier_id query param instead of fetching the whole company ledger, and the invoice editor (with its framer-motion dependency) lazy-loads so it stops shipping with the invoice list bundle. Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com> * feat(salary): one-click runs, payslip delivery, payments settings, run cockpit Salary P1 batch, driving the 20-click flow toward 3 clicks: - One-click 'Starta lönekörning': POST /api/salary/runs accepts an empty body and resolves defaults server-side — period follows the latest non-corrected run, payment date from the new salary_pay_day setting, series from the per-source-type map. The separate /salary/runs/new page is gone. - Run detail page rebuilt as a step-railed cockpit (progress rail, KPI cards, employee ledger, journal preview) on a deliberately wider canvas; components extracted to components/salary/run/. - Payslip delivery: tokenized public payslip pages (/payslip/[token], backed by salary_payslip_links) plus per-employee email send with PDF — employees need no account, and the middleware exempts the route from auth redirects. - Payments settings: salary pay day, default bank, and pain.001 vs Bankgirot Lön format with per-bank upload instructions and an LB sunset warning (banks retire LB during 2026). - AGI panel: full submission status flows (stale drafts, signing links, kvittens polling, error reports); tax payment panel with skattekonto shortcut and mark-as-paid. - Salary calendar bulk editing, employee benefits/tax-card polish, municipality tax-table lookup improvements. messages/sv+en also carry the strings for the account-prune, skatteverket-reconsent, and banking surfaces committed just before this. Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com> * chore: adopt Next 16 proxy.ts convention + repo housekeeping - Rename middleware.ts to proxy.ts with the proxy() export (Next 16 renamed the middleware convention; behavior unchanged). - Exclude dev_docs/ from tsconfig so stray snippets in planning docs don't break the build type-check. - Ratchet antipatterns-baseline down (raw-route-auth 165 → 119) to lock in the withRouteContext migration from 5cfd2b76. - template-library uses roundOre() instead of inline rounding. - database.md: drop account_balances from the key-tables list. Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com> * fix(bookkeeping): robust service-role detection in correction document relink relink_documents_to_correction() keyed its service-role branch on auth.role(), which reads the singular request.jwt.claim.role GUC that PostgREST v10+ and the pg-real harness no longer populate. Genuine service-role callers (pending-ops executor / MCP approve) landed in the auth gate and could not relink underlag. Read the role from the request.jwt.claims JSON directly, mirroring the canonical link_voucher_rpcs_tenant_guard convention. Validated on staging. Also: harden the salary run page's error paths (res.json().catch) against non-JSON error bodies, and roll back the pg-real service-role case in finally so an aborted transaction cannot poison a pooled connection for the next test. Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com> * fix(documents): restore journal_entry_line_id link durability (BFL 7 kap) Migration 20260704103000 rewrote enforce_document_journal_entry_immutability to guard journal_entry_id but left journal_entry_line_id to the metadata trigger, which exempts draft-linked docs -- and the entry-level trigger only fired on UPDATE OF journal_entry_id, so a line-id-only UPDATE never invoked it at all. That let a set journal_entry_line_id be cleared to NULL, breaking the "link durable from first set" invariant (document-immutability.pg regression). Widen the trigger to fire on journal_entry_line_id too and guard it with the same uuid-durability rule as journal_entry_id (setting NULL -> uuid stays allowed; clearing/re-pointing a set value is blocked, status-independent). The correction-relink GUC path, which legitimately clears line_id when moving underlag to the posted correction, stays exempt. Validated on staging. Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com> --------- Signed-off-by: Emil <emilmattsson14@gmail.com> Co-authored-by: Claude Fable 5 <noreply@anthropic.com>
628 lines
23 KiB
TypeScript
628 lines
23 KiB
TypeScript
import type { SupabaseClient } from '@supabase/supabase-js'
|
||
import { eventBus } from '@/lib/events'
|
||
import type {
|
||
CreateJournalEntryLineInput,
|
||
JournalEntry,
|
||
JournalEntryLine,
|
||
} from '@/types'
|
||
import { validateBalance, getNextVoucherNumber } from '@/lib/bookkeeping/engine'
|
||
import { normalizeLineDimensions } from '@/lib/bookkeeping/dimension-resolver'
|
||
import { backfillStandardBASAccounts } from '@/lib/bookkeeping/account-backfill'
|
||
import { resolvePeriodStatusForDate } from '@/lib/core/bookkeeping/period-service'
|
||
import {
|
||
AccountsNotInChartError,
|
||
BookkeepingDatabaseError,
|
||
CannotCorrectNonPostedError,
|
||
EntryAlreadyReversedError,
|
||
EntryDateOutsideFiscalPeriodError,
|
||
FiscalPeriodNotFoundError,
|
||
JournalEntryNotBalancedError,
|
||
JournalEntryNotFoundError,
|
||
MeaninglessCorrectionError,
|
||
NoOpenPeriodForDateError,
|
||
TargetPeriodClosedError,
|
||
TargetPeriodLockedError,
|
||
} from '@/lib/bookkeeping/errors'
|
||
|
||
/**
|
||
* Round to 2dp using cents-integer math to avoid 0.1+0.2 drift.
|
||
*/
|
||
function round2(n: number): number {
|
||
return Math.round(n * 100) / 100
|
||
}
|
||
|
||
/**
|
||
* True when every account's (debit − credit) sum across the proposed lines is
|
||
* zero. Such a rättelse describes no real affärshändelse and would erase the
|
||
* original posting without representing anything in its place: disallowed by
|
||
* BFL 5 kap. 5 § / BFNAR 2013:2.
|
||
*/
|
||
function netsToZeroPerAccount(lines: CreateJournalEntryLineInput[]): boolean {
|
||
const nets = new Map<string, number>()
|
||
for (const line of lines) {
|
||
const delta = round2(line.debit_amount || 0) - round2(line.credit_amount || 0)
|
||
nets.set(line.account_number, (nets.get(line.account_number) || 0) + delta)
|
||
}
|
||
return Array.from(nets.values()).every((n) => Math.abs(n) < 0.005)
|
||
}
|
||
|
||
/**
|
||
* True when proposed lines are the same multiset as the original lines
|
||
* (account_number + debit + credit). A rättelse must actually change something.
|
||
*/
|
||
function isIdenticalToOriginal(
|
||
proposed: CreateJournalEntryLineInput[],
|
||
original: JournalEntryLine[]
|
||
): boolean {
|
||
if (proposed.length !== original.length) return false
|
||
const key = (acc: string, d: number, c: number) =>
|
||
`${acc}|${round2(d).toFixed(2)}|${round2(c).toFixed(2)}`
|
||
const proposedKeys = proposed
|
||
.map((l) => key(l.account_number, l.debit_amount || 0, l.credit_amount || 0))
|
||
.sort()
|
||
const originalKeys = original
|
||
.map((l) => key(l.account_number, Number(l.debit_amount) || 0, Number(l.credit_amount) || 0))
|
||
.sort()
|
||
return proposedKeys.every((k, i) => k === originalKeys[i])
|
||
}
|
||
|
||
/**
|
||
* Storno Service - 3-step correction flow per Bokföringslagen
|
||
*
|
||
* Swedish bookkeeping law requires that committed entries cannot be modified.
|
||
* To correct an error, you must:
|
||
* 1. Create a storno (reversal) entry that nullifies the original
|
||
* 2. Create a corrected entry with the right data
|
||
* 3. Link all three via reverses_id, reversed_by_id, correction_of_id
|
||
*/
|
||
|
||
/**
|
||
* Cancel a journal entry and delete its lines.
|
||
* Uses status='cancelled' instead of DELETE (DB trigger blocks all DELETEs).
|
||
* Works for both draft→cancelled and posted→cancelled transitions.
|
||
*/
|
||
async function cancelEntry(supabase: SupabaseClient, entryId: string): Promise<void> {
|
||
const { error: statusErr } = await supabase
|
||
.from('journal_entries')
|
||
.update({ status: 'cancelled' })
|
||
.eq('id', entryId)
|
||
if (statusErr) {
|
||
console.error(`[storno] cancelEntry: failed to cancel ${entryId}:`, statusErr.message)
|
||
}
|
||
const { error: linesErr } = await supabase
|
||
.from('journal_entry_lines')
|
||
.delete()
|
||
.eq('journal_entry_id', entryId)
|
||
if (linesErr) {
|
||
console.error(`[storno] cancelEntry: failed to delete lines for ${entryId}:`, linesErr.message)
|
||
}
|
||
}
|
||
|
||
/** Journal entry row fetched together with its lines (the embedded select). */
|
||
type OriginalWithLines = JournalEntry & { lines?: JournalEntryLine[] | null }
|
||
|
||
/**
|
||
* Correct an existing posted journal entry using the storno method.
|
||
*
|
||
* The storno (reversal) is always created in the original entry's period and
|
||
* date, so the original nets to zero where it was booked. The corrected entry
|
||
* defaults to the original's date/period too, but `options.newEntryDate` /
|
||
* `options.newFiscalPeriodId` let a caller re-book it elsewhere: used to move
|
||
* a verifikation booked on the wrong year to its correct period (see
|
||
* recordateEntry). When the date/period is the correction, identical lines are
|
||
* allowed (the move itself is the meaningful change).
|
||
*
|
||
* Returns: { reversal, corrected } - the two new entries created
|
||
*/
|
||
export async function correctEntry(
|
||
supabase: SupabaseClient,
|
||
companyId: string,
|
||
userId: string,
|
||
originalEntryId: string,
|
||
correctedLines: CreateJournalEntryLineInput[],
|
||
options?: {
|
||
newEntryDate?: string
|
||
newFiscalPeriodId?: string
|
||
/**
|
||
* The original entry (with lines) already loaded by the caller. When
|
||
* provided, we skip the redundant re-fetch: recordateEntry reads the
|
||
* original to copy its lines and hands it through here. This also closes
|
||
* the small TOCTOU window a second independent read would open.
|
||
*/
|
||
preloadedOriginal?: OriginalWithLines
|
||
}
|
||
): Promise<{ reversal: JournalEntry; corrected: JournalEntry; documentRelinkError?: string }> {
|
||
// Validate the corrected lines are balanced
|
||
const balance = validateBalance(correctedLines)
|
||
if (!balance.valid) {
|
||
throw new JournalEntryNotBalancedError(balance.totalDebit, balance.totalCredit, 'correction')
|
||
}
|
||
|
||
// Reject a rättelse with no economic effect (e.g. 1930 debit 100 / 1930
|
||
// credit 100). Such an entry would erase the original posting without
|
||
// representing any affärshändelse: disallowed by BFL 5 kap. 5 §.
|
||
if (netsToZeroPerAccount(correctedLines)) {
|
||
throw new MeaninglessCorrectionError('net_zero_per_account')
|
||
}
|
||
|
||
// Fetch original entry with lines: unless the caller already loaded it.
|
||
let original = options?.preloadedOriginal ?? null
|
||
if (!original) {
|
||
const { data, error: fetchError } = await supabase
|
||
.from('journal_entries')
|
||
.select('*, lines:journal_entry_lines(*)')
|
||
.eq('id', originalEntryId)
|
||
.eq('company_id', companyId)
|
||
.single()
|
||
|
||
if (fetchError || !data) {
|
||
throw new JournalEntryNotFoundError()
|
||
}
|
||
original = data as OriginalWithLines
|
||
}
|
||
|
||
if (original.status !== 'posted') {
|
||
throw new CannotCorrectNonPostedError(original.status)
|
||
}
|
||
|
||
const originalLines = (original.lines as JournalEntryLine[]) || []
|
||
|
||
// Resolve where the corrected entry lands. Defaults to the original's own
|
||
// date/period (a plain line-correction). A caller may override either to
|
||
// re-book the entry in another period (recordate / wrong-year fix).
|
||
const correctedDate = options?.newEntryDate ?? original.entry_date
|
||
const correctedPeriodId = options?.newFiscalPeriodId ?? original.fiscal_period_id
|
||
const dateOrPeriodChanged =
|
||
correctedDate !== original.entry_date || correctedPeriodId !== original.fiscal_period_id
|
||
|
||
// Reject when the proposed lines are identical to the original entry: a
|
||
// rättelse must actually change something. Skip this when the date/period is
|
||
// the change (moving a verifikation to the right year keeps the same lines).
|
||
if (!dateOrPeriodChanged && isIdenticalToOriginal(correctedLines, originalLines)) {
|
||
throw new MeaninglessCorrectionError('identical_to_original')
|
||
}
|
||
|
||
// When re-booking elsewhere, validate the corrected date falls within the
|
||
// target period's bounds (mirrors createDraftEntry). recordateEntry resolves
|
||
// the period from the date, so this also guards a mismatched explicit
|
||
// override and fails fast before any storno is written.
|
||
if (dateOrPeriodChanged) {
|
||
const { data: targetPeriod, error: targetErr } = await supabase
|
||
.from('fiscal_periods')
|
||
.select('name, period_start, period_end')
|
||
.eq('id', correctedPeriodId)
|
||
.eq('company_id', companyId)
|
||
.single()
|
||
if (targetErr || !targetPeriod) {
|
||
throw new FiscalPeriodNotFoundError()
|
||
}
|
||
if (correctedDate < targetPeriod.period_start || correctedDate > targetPeriod.period_end) {
|
||
throw new EntryDateOutsideFiscalPeriodError(
|
||
correctedDate,
|
||
targetPeriod.name,
|
||
targetPeriod.period_start,
|
||
targetPeriod.period_end
|
||
)
|
||
}
|
||
}
|
||
|
||
// ===== Step 0: Resolve corrected-line accounts BEFORE any journal write =====
|
||
// The old flow created and posted the storno first and only then discovered
|
||
// that a corrected line referenced an account outside the chart. The storno
|
||
// then had to be cancelled again, which left a voided 0 kr storno in the
|
||
// correction chain and permanently burned voucher numbers (next_voucher_number
|
||
// is a consuming counter → an unexplained BFNAR 2013:2 gap). Validate up
|
||
// front instead: standard BAS accounts missing from the chart are seeded on
|
||
// demand (same as createDraftEntry); unknown numbers or deliberately
|
||
// deactivated accounts fail fast with nothing written.
|
||
const accountNumbers = [...new Set(correctedLines.map((l) => l.account_number))]
|
||
const resolveActiveAccountIds = async (): Promise<Map<string, string>> => {
|
||
const { data: accounts } = await supabase
|
||
.from('chart_of_accounts')
|
||
.select('id, account_number')
|
||
.eq('company_id', companyId)
|
||
.eq('is_active', true)
|
||
.in('account_number', accountNumbers)
|
||
const map = new Map<string, string>()
|
||
for (const account of accounts || []) {
|
||
map.set(account.account_number, account.id)
|
||
}
|
||
return map
|
||
}
|
||
|
||
let accountIdMap = await resolveActiveAccountIds()
|
||
let missingAccounts = accountNumbers.filter((num) => !accountIdMap.has(num))
|
||
if (missingAccounts.length > 0) {
|
||
const seeded = await backfillStandardBASAccounts(supabase, companyId, userId, missingAccounts)
|
||
if (seeded.length > 0) {
|
||
accountIdMap = await resolveActiveAccountIds()
|
||
missingAccounts = accountNumbers.filter((num) => !accountIdMap.has(num))
|
||
}
|
||
if (missingAccounts.length > 0) {
|
||
throw new AccountsNotInChartError(missingAccounts)
|
||
}
|
||
}
|
||
|
||
// ===== Step 1: Create storno (reversal) entry =====
|
||
const reversalVoucherNumber = await getNextVoucherNumber(
|
||
supabase,
|
||
companyId,
|
||
original.fiscal_period_id,
|
||
original.voucher_series || 'A'
|
||
)
|
||
|
||
const { data: reversalEntry, error: reversalError } = await supabase
|
||
.from('journal_entries')
|
||
.insert({
|
||
company_id: companyId,
|
||
user_id: userId,
|
||
fiscal_period_id: original.fiscal_period_id,
|
||
voucher_number: reversalVoucherNumber,
|
||
voucher_series: original.voucher_series || 'A',
|
||
entry_date: original.entry_date,
|
||
description: `Storno: ${original.description}`,
|
||
source_type: 'storno',
|
||
reverses_id: originalEntryId,
|
||
status: 'draft',
|
||
})
|
||
.select()
|
||
.single()
|
||
|
||
if (reversalError || !reversalEntry) {
|
||
throw new BookkeepingDatabaseError('create_reversal_entry', reversalError?.message)
|
||
}
|
||
|
||
// Insert reversed lines (swap debit and credit, preserve dimensions)
|
||
const reversalLineInserts = originalLines.map((line, index) => {
|
||
const dimensions = normalizeLineDimensions(line)
|
||
return {
|
||
journal_entry_id: reversalEntry.id,
|
||
account_number: line.account_number,
|
||
account_id: line.account_id || null,
|
||
debit_amount: Math.round((Number(line.credit_amount) || 0) * 100) / 100,
|
||
credit_amount: Math.round((Number(line.debit_amount) || 0) * 100) / 100,
|
||
currency: line.currency || 'SEK',
|
||
amount_in_currency: line.amount_in_currency ? -Number(line.amount_in_currency) : null,
|
||
exchange_rate: line.exchange_rate || null,
|
||
line_description: `Storno: ${line.line_description || ''}`,
|
||
tax_code: line.tax_code || null,
|
||
dimensions,
|
||
sort_order: index,
|
||
}
|
||
})
|
||
|
||
const { error: reversalLinesError } = await supabase
|
||
.from('journal_entry_lines')
|
||
.insert(reversalLineInserts)
|
||
|
||
if (reversalLinesError) {
|
||
await cancelEntry(supabase, reversalEntry.id)
|
||
throw new BookkeepingDatabaseError('create_reversal_lines', reversalLinesError.message)
|
||
}
|
||
|
||
// Post the reversal entry
|
||
const { error: postReversalError } = await supabase
|
||
.from('journal_entries')
|
||
.update({ status: 'posted' })
|
||
.eq('id', reversalEntry.id)
|
||
|
||
if (postReversalError) {
|
||
await cancelEntry(supabase, reversalEntry.id)
|
||
throw new BookkeepingDatabaseError('post_reversal_entry', postReversalError.message)
|
||
}
|
||
|
||
// NOTE: Original entry is NOT marked as 'reversed' here. We defer that
|
||
// until both the reversal and corrected entries are successfully posted.
|
||
// This avoids the impossible reversed→posted rollback if step 2 fails.
|
||
|
||
// ===== Step 2: Create corrected entry =====
|
||
// If anything in this step fails, cancel the reversal entry.
|
||
// The original entry was never modified, so no rollback needed.
|
||
|
||
let correctedEntry: typeof reversalEntry
|
||
|
||
try {
|
||
const correctedVoucherNumber = await getNextVoucherNumber(
|
||
supabase,
|
||
companyId,
|
||
correctedPeriodId,
|
||
original.voucher_series || 'A'
|
||
)
|
||
|
||
// Account IDs were resolved (and standard BAS accounts seeded) in Step 0,
|
||
// before the storno existed: nothing to clean up if we got this far.
|
||
const { data: newEntry, error: correctedError } = await supabase
|
||
.from('journal_entries')
|
||
.insert({
|
||
company_id: companyId,
|
||
user_id: userId,
|
||
fiscal_period_id: correctedPeriodId,
|
||
voucher_number: correctedVoucherNumber,
|
||
voucher_series: original.voucher_series || 'A',
|
||
entry_date: correctedDate,
|
||
description: `Rättelse: ${original.description}`,
|
||
source_type: 'correction',
|
||
correction_of_id: originalEntryId,
|
||
status: 'draft',
|
||
})
|
||
.select()
|
||
.single()
|
||
|
||
if (correctedError || !newEntry) {
|
||
throw new BookkeepingDatabaseError('create_corrected_entry', correctedError?.message)
|
||
}
|
||
|
||
correctedEntry = newEntry
|
||
|
||
// Insert corrected lines
|
||
const correctedLineInserts = correctedLines.map((line, index) => {
|
||
const dimensions = normalizeLineDimensions(line)
|
||
return {
|
||
journal_entry_id: correctedEntry.id,
|
||
account_number: line.account_number,
|
||
account_id: accountIdMap.get(line.account_number) || null,
|
||
debit_amount: Math.round((line.debit_amount || 0) * 100) / 100,
|
||
credit_amount: Math.round((line.credit_amount || 0) * 100) / 100,
|
||
currency: line.currency || 'SEK',
|
||
amount_in_currency: line.amount_in_currency
|
||
? Math.round(line.amount_in_currency * 100) / 100
|
||
: null,
|
||
exchange_rate: line.exchange_rate || null,
|
||
line_description: line.line_description || null,
|
||
tax_code: line.tax_code || null,
|
||
dimensions,
|
||
sort_order: index,
|
||
}
|
||
})
|
||
|
||
const { error: correctedLinesError } = await supabase
|
||
.from('journal_entry_lines')
|
||
.insert(correctedLineInserts)
|
||
|
||
if (correctedLinesError) {
|
||
await cancelEntry(supabase, correctedEntry.id)
|
||
throw new BookkeepingDatabaseError('create_corrected_lines', correctedLinesError.message)
|
||
}
|
||
|
||
// Post the corrected entry
|
||
const { error: postCorrectedError } = await supabase
|
||
.from('journal_entries')
|
||
.update({ status: 'posted' })
|
||
.eq('id', correctedEntry.id)
|
||
|
||
if (postCorrectedError) {
|
||
await cancelEntry(supabase, correctedEntry.id)
|
||
throw new BookkeepingDatabaseError('post_corrected_entry', postCorrectedError.message)
|
||
}
|
||
} catch (err) {
|
||
// Cancel the reversal entry (posted → cancelled). Original was never
|
||
// modified so no rollback needed: it's still 'posted'.
|
||
await cancelEntry(supabase, reversalEntry.id)
|
||
throw err
|
||
}
|
||
|
||
// ===== Mark original as reversed (CAS guard: only if still 'posted') =====
|
||
const { data: updatedOriginal, error: casError } = await supabase
|
||
.from('journal_entries')
|
||
.update({
|
||
status: 'reversed',
|
||
reversed_by_id: reversalEntry.id,
|
||
})
|
||
.eq('id', originalEntryId)
|
||
.eq('status', 'posted')
|
||
.select('id')
|
||
|
||
if (casError || !updatedOriginal || updatedOriginal.length === 0) {
|
||
// Concurrent reversal beat us: cancel both our entries
|
||
await cancelEntry(supabase, reversalEntry.id)
|
||
await cancelEntry(supabase, correctedEntry!.id)
|
||
throw new EntryAlreadyReversedError()
|
||
}
|
||
|
||
// Re-point bank transactions and underlag from the original to the corrected
|
||
// entry. The original is now status 'reversed'; the corrected entry is the
|
||
// live representation of the affärshändelse, so the transaction row should
|
||
// keep reading as booked against it (and stay correctable/uncategorizable),
|
||
// and the underlag should travel with it. Best-effort: the correction_of_id
|
||
// chain preserves traceability even if either relink fails, but a document
|
||
// relink failure is surfaced on the result so the caller can warn instead
|
||
// of silently stranding underlag on the reversed entry.
|
||
await relinkTransactionsToEntry(supabase, companyId, originalEntryId, correctedEntry!.id)
|
||
const documentRelinkError = await relinkDocumentsToEntry(
|
||
supabase,
|
||
userId,
|
||
originalEntryId,
|
||
correctedEntry!.id
|
||
)
|
||
|
||
// ===== Step 3: Fetch complete entries =====
|
||
const { data: finalReversal } = await supabase
|
||
.from('journal_entries')
|
||
.select('*, lines:journal_entry_lines(*)')
|
||
.eq('id', reversalEntry.id)
|
||
.single()
|
||
|
||
const { data: finalCorrected } = await supabase
|
||
.from('journal_entries')
|
||
.select('*, lines:journal_entry_lines(*)')
|
||
.eq('id', correctedEntry.id)
|
||
.single()
|
||
|
||
const result = {
|
||
reversal: finalReversal as JournalEntry,
|
||
corrected: finalCorrected as JournalEntry,
|
||
...(documentRelinkError ? { documentRelinkError } : {}),
|
||
}
|
||
|
||
await eventBus.emit({
|
||
type: 'journal_entry.corrected',
|
||
payload: {
|
||
original: original as JournalEntry,
|
||
storno: result.reversal,
|
||
corrected: result.corrected,
|
||
companyId,
|
||
userId,
|
||
},
|
||
})
|
||
|
||
return result
|
||
}
|
||
|
||
/**
|
||
* Move a posted verifikation to a different date, and thereby a different
|
||
* fiscal period: without changing its lines. Fixes a booking entered with the
|
||
* wrong date/year (e.g. 2026-07-03 that should have been 2025-07-03).
|
||
*
|
||
* A posted verifikation is immutable (BFL), so this is a storno + re-book under
|
||
* the hood: the original is reversed in its own period (netting it to zero
|
||
* there) and an identical corrected verifikation is posted with `newDate` in
|
||
* the target period. The underlag follows the corrected entry. The full chain
|
||
* original → storno → correction stays linked (BFL 5 kap. 5 §).
|
||
*
|
||
* Fails fast with a typed error if the target date is not bookable: closed year
|
||
* (TargetPeriodClosedError), locked period / company lock date
|
||
* (TargetPeriodLockedError), or no covering period (NoOpenPeriodForDateError).
|
||
*/
|
||
export async function recordateEntry(
|
||
supabase: SupabaseClient,
|
||
companyId: string,
|
||
userId: string,
|
||
originalEntryId: string,
|
||
newDate: string
|
||
): Promise<{ reversal: JournalEntry; corrected: JournalEntry }> {
|
||
// Fetch original with lines
|
||
const { data: original, error: fetchError } = await supabase
|
||
.from('journal_entries')
|
||
.select('*, lines:journal_entry_lines(*)')
|
||
.eq('id', originalEntryId)
|
||
.eq('company_id', companyId)
|
||
.single()
|
||
|
||
if (fetchError || !original) {
|
||
throw new JournalEntryNotFoundError()
|
||
}
|
||
if (original.status !== 'posted') {
|
||
throw new CannotCorrectNonPostedError(original.status)
|
||
}
|
||
if (newDate === original.entry_date) {
|
||
throw new MeaninglessCorrectionError('no_date_change')
|
||
}
|
||
|
||
// Classify the target date using the same two-layer logic the DB triggers
|
||
// enforce (company lock date + period is_closed/locked_at), so we surface a
|
||
// clear Swedish message instead of a raw trigger rejection.
|
||
const target = await resolvePeriodStatusForDate(supabase, companyId, newDate)
|
||
if (target.status === 'closed') {
|
||
throw new TargetPeriodClosedError(newDate)
|
||
}
|
||
if (target.status === 'locked') {
|
||
throw new TargetPeriodLockedError(newDate, target.lock_date)
|
||
}
|
||
if (!target.period_id) {
|
||
// 'open' but no covering period: we do not auto-create periods on a fix.
|
||
throw new NoOpenPeriodForDateError(newDate)
|
||
}
|
||
|
||
// Copy the original lines verbatim: they were correct; only the date was
|
||
// wrong. correctEntry rebuilds the storno from the original anyway.
|
||
const originalLines = (original.lines as JournalEntryLine[]) || []
|
||
const copiedLines: CreateJournalEntryLineInput[] = originalLines
|
||
.slice()
|
||
.sort((a, b) => a.sort_order - b.sort_order)
|
||
.map((line) => ({
|
||
account_number: line.account_number,
|
||
debit_amount: Number(line.debit_amount) || 0,
|
||
credit_amount: Number(line.credit_amount) || 0,
|
||
line_description: line.line_description || undefined,
|
||
currency: line.currency || undefined,
|
||
amount_in_currency:
|
||
line.amount_in_currency != null ? Number(line.amount_in_currency) : undefined,
|
||
exchange_rate: line.exchange_rate != null ? Number(line.exchange_rate) : undefined,
|
||
tax_code: line.tax_code || undefined,
|
||
dimensions: line.dimensions || undefined,
|
||
cost_center: line.cost_center || undefined,
|
||
project: line.project || undefined,
|
||
}))
|
||
|
||
const result = await correctEntry(
|
||
supabase,
|
||
companyId,
|
||
userId,
|
||
originalEntryId,
|
||
copiedLines,
|
||
{
|
||
newEntryDate: newDate,
|
||
newFiscalPeriodId: target.period_id,
|
||
// Hand the entry we already fetched (with lines) to correctEntry so it
|
||
// doesn't re-read the same row.
|
||
preloadedOriginal: original as OriginalWithLines,
|
||
}
|
||
)
|
||
|
||
// Underlag and bank-transaction links follow the corrected entry:
|
||
// correctEntry handles both relinks for every correction flavour.
|
||
return result
|
||
}
|
||
|
||
/**
|
||
* Re-point every bank transaction from one entry to another. Used when a
|
||
* verifikation is corrected so the transaction row keeps reading as booked
|
||
* against the live (corrected) entry instead of the reversed original.
|
||
* Failures are logged, not thrown: the correction chain stays traceable.
|
||
*/
|
||
async function relinkTransactionsToEntry(
|
||
supabase: SupabaseClient,
|
||
companyId: string,
|
||
fromEntryId: string,
|
||
toEntryId: string
|
||
): Promise<void> {
|
||
const { error } = await supabase
|
||
.from('transactions')
|
||
.update({ journal_entry_id: toEntryId })
|
||
.eq('company_id', companyId)
|
||
.eq('journal_entry_id', fromEntryId)
|
||
if (error) {
|
||
console.error(
|
||
`[storno] relinkTransactionsToEntry: failed to move transactions ${fromEntryId} → ${toEntryId}:`,
|
||
error.message
|
||
)
|
||
}
|
||
}
|
||
|
||
/**
|
||
* Re-point every document_attachment from one entry to another so the
|
||
* underlag travels with the live (corrected) entry. Goes through the
|
||
* relink_documents_to_correction RPC: a direct UPDATE on
|
||
* document_attachments.journal_entry_id is categorically blocked by the
|
||
* BFL immutability triggers (migration 20260506130000/150000); the RPC
|
||
* validates the correction chain (source reversed, target posted,
|
||
* target.correction_of_id = source) and performs the move under the narrow
|
||
* gnubok.allow_correction_relink GUC. The line-level link is cleared because
|
||
* the corrected entry has new line ids.
|
||
*
|
||
* Failures are logged, not thrown (the entry-level correction chain is the
|
||
* source of truth for traceability), but the error message is returned so
|
||
* correctEntry can surface a warning instead of pretending the underlag
|
||
* moved.
|
||
*/
|
||
async function relinkDocumentsToEntry(
|
||
supabase: SupabaseClient,
|
||
userId: string,
|
||
fromEntryId: string,
|
||
toEntryId: string
|
||
): Promise<string | undefined> {
|
||
const { error } = await supabase.rpc('relink_documents_to_correction', {
|
||
p_user_id: userId,
|
||
p_from_entry_id: fromEntryId,
|
||
p_to_entry_id: toEntryId,
|
||
})
|
||
if (error) {
|
||
console.error(
|
||
`[storno] relinkDocumentsToEntry: failed to move documents ${fromEntryId} → ${toEntryId}:`,
|
||
error.message
|
||
)
|
||
return error.message
|
||
}
|
||
return undefined
|
||
}
|