feat(invoices): named payee accounts and per-invoice choice of bank account (#2233)
* fix(enable-banking): read BBAN from AccountIdentification.other and store it on the account Enable Banking has no top-level `bban` key on AccountIdentification: a Swedish BBAN (clearing + account number) arrives as `other.identification` with `other.scheme_name = 'BBAN'`, or in `all_account_ids`. The client typed `bban?: string` and read `.bban`, so the value was always undefined: no connected account ever carried its clearing + account number, and domestic counterparty accounts on transactions were dropped. Type the identifiers per the OpenAPI spec, add extractBban() and pickAccountIdentifier(), read counterparty identifiers through the scheme list (IBAN, then BBAN/BGNR/PGNR, then anything), and store `bban` on StoredAccount from the OAuth callback. The external_id dedup scope stays IBAN-then-uid and is untouched. Co-Authored-By: Claude Fable 5.1 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_01UaZTY21HVN57hJoPXKSLjV * feat(invoices): named payee accounts on cash_accounts with a default per currency A company had exactly one set of payment instructions per invoice currency (company_settings.invoice_payment_accounts), picked by currency alone. A second SEK bank account, or a second bankgiro number, had nowhere to live. cash_accounts is already the per-company bank-account entity. Migration 20260903150000 adds the payee fields (bankgiro, plusgiro, clearing + account number, BBAN, BIC, Swish, foreign routing) plus invoice_payee, a small invoice_payee_defaults table (one default account per currency; one account may be the default for several currencies, a SEK account with an IBAN is the usual EUR payee), and a SECURITY DEFINER mirror that rewrites the legacy map and the SEK bank columns from the default accounts. Every existing reader (PDF, email, reminders, v1, MCP) keeps working; the three writers that only touched legacy columns (PUT /api/settings, v1 settings, MCP update_company_settings) now write through to the default account, so what an agent sets is what the PDF prints. Peppol PaymentMeans is built from the resolver instead of the raw legacy column. bg_pg is dropped (never read or written; NULL on every prod and staging row). Backfill lands only on existing cash accounts (primary, IBAN match, or the only enabled account in the currency). Entries with no target stay in the map as the resolver fallback and get an attach action in settings. New: POST /api/cash-accounts (manual bank account on the next free 19xx), PATCH /api/cash-accounts/[id] payee fields (owner/admin), GET/PUT /api/cash-accounts/payee-defaults. Settings page rewritten as an account list with per-currency defaults. Behandlingshistorik and the full archive cover the new table and columns. Verified on staging: migration applied (11 defaults landed), mirror trigger observed rewriting company_settings from a payee edit. Co-Authored-By: Claude Fable 5.1 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_01UaZTY21HVN57hJoPXKSLjV * feat(invoices): choose which bank account an invoice is paid to, frozen at issue Migration 20260903160000 adds invoices.payment_cash_account_id (FK to cash_accounts, SET NULL) and invoices.payment_details, the payee fields frozen when the account is chosen and refreshed at issue. Resolver: resolveInvoicePaymentAccount / companyWithInvoicePaymentAccount / assertInvoicePaymentAccountForRender take an optional override, and hasRequiredInvoicePaymentAccount reads it from the invoice row, so every surface (PDF, Swish QR, email, reminders, payment confirmation, Peppol, recurring, staged MCP send) prints the frozen payee when one exists and the company default per currency otherwise. Invoices that never chose an account behave exactly as before. Issue paths (mark-sent, send, v1 send, v1 mark-sent, Peppol send, recurring, MCP send and mark-sent) refresh the snapshot from the account as it is at issue; a chosen account that is disabled, un-flagged or unusable for the currency blocks with INVOICE_SEND_PAYMENT_ACCOUNT_INVALID. Writers: dashboard POST/PATCH, v1 create/update and MCP create_invoice accept payment_cash_account_id and validate it against the company's payee accounts (INVOICE_PAYEE_ACCOUNT_INVALID). Credit notes inherit the original's payee; copies carry the choice; preview-pdf renders the chosen account. The editor shows "Betalas till" under the currency when the company has two or more usable payee accounts for that currency. Co-Authored-By: Claude Fable 5.1 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_01UaZTY21HVN57hJoPXKSLjV * feat(invoices): book manual payments on the invoice's chosen bank account Manual mark-paid (dashboard, v1, MCP gnubok_mark_invoice_as_paid) and the booking dialog's proposed lines debited 1930 regardless of which bank account the invoice asked to be paid to. They now resolve the chosen payee account's ledger account (resolveInvoiceSettlementAccount) and fall back to 1930 only when no account was chosen or the row is gone. Bank-transaction matching keeps debiting the account the money landed on and does not filter by the chosen account; between equal-confidence candidates it prefers the invoice that asked to be paid to the landing account. Scores are untouched, so nothing new auto-matches. Co-Authored-By: Claude Fable 5.1 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_01UaZTY21HVN57hJoPXKSLjV * chore(invoices): keep the payload-size and phantom-column ceilings after the payee work Shorten the new gnubok_create_invoice argument description (tools/list payload was 29 bytes over the 60 kB budget), inline the cash-account payee UPDATE/INSERT payloads and the settings select strings as literals so the phantom-column scanner can read their columns, and reuse ACCOUNT_NUMBER_RE instead of a hand-rolled copy. Co-Authored-By: Claude Fable 5.1 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_01UaZTY21HVN57hJoPXKSLjV * fix(invoices): harden the payee model after review (admin-only payee columns, separate payee IBAN, company-scoped FK) Review findings from CodeRabbit, Superagent, the Swedish accounting review and three skeptic passes, resolved in one batch: Schema (both migrations are unshipped and edited in place): - cash_accounts.payee_iban: the printed IBAN is its own column. iban stays the bank identity written by every sync and used to re-pair on reconnect, so a sync can no longer rewrite an invoice instruction or resurrect a cleared IBAN. The backfill copies each currency entry verbatim onto the target account (IBAN match first, then primary), so every invoice keeps printing exactly what it printed before; the bank IBAN is never pushed onto invoices that did not carry one. - Payee columns are owner/admin-only at the database (BEFORE trigger, service role exempt): cash_accounts is member-writable for bank sync, and the SECURITY DEFINER mirror would otherwise have let a member rewrite where customers pay. - Revoking an account as payee or disabling it drops its defaults; deleting a default drops that currency from the map and clears the legacy SEK columns (an admin saying "nothing to print" must not keep printing a closed account). The mirror leaves the legacy SEK columns alone when the map has no SEK entry, so legacy-only companies are never wiped by a mirror run for another currency. - Audit and mirror triggers fire on the same column set; anon and authenticated can no longer execute the trigger-only definer functions. - invoices.payment_cash_account_id is a composite same-company FK with SET NULL scoped to the account column. Code: - Only 19xx bank accounts can be payee: PATCH, the defaults PUT (which now also requires enabled, payee-flagged and usable for the currency), resolveInvoicePayeeChoice, and the mark-paid settlement resolver (which also refuses disabled rows and logs every fallback to 1930). - createManualBankAccount excludes every ledger slot any row already holds (findFreeLedgerAccount treats a manual holder as free; this path inserts). - The legacy settings writers (PUT /api/settings, v1, MCP) write through to the account BEFORE updating company_settings and fail the request on error; the account is written before it is adopted as default so the mirror never sees an empty payee. - snapshotInvoicePayee: dry runs no longer persist; a failed snapshot write blocks issue (INVOICE_PAYEE_SNAPSHOT_FAILED). v1 mark-sent/mark-paid projections carry the payee columns; v1 create validates the payee before the dry-run return and echoes it in the preview. - pickAccountIdentifier: supplementary IBAN wins over a primary BBAN, and non-account schemes (card PANs) are never persisted. - Editor shows the payee select for a single usable account with no default; the booking dialog waits for cash accounts before proposing lines; a failed default write no longer hides a created account. - Behandlingshistorik names the account on created/deleted defaults. - Regenerated skills/accounted-api; MCP argument description trimmed under the tools/list payload ceiling. Declined: clearing legacy columns via a forward migration (the mirror now does it on delete); Swedish review's "show the debit account in the mark-paid UI" (the booking dialog already proposes and lets the user edit the debit line); manual ledger collision (UNIQUE exists, and the create path now rejects it with a clear error); Peppol aligning to the PDF value for companies whose legacy column had drifted from the map (the PDF is the customer-facing document; both now agree). Co-Authored-By: Claude Fable 5.1 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_01UaZTY21HVN57hJoPXKSLjV * fix(invoices): read NEW.invoice_payee only on the cash_accounts branch of the mirror trigger trg_mirror_invoice_payee_defaults fires for both tables; plpgsql resolves record fields per expression, so the combined condition failed with "record new has no field invoice_payee" whenever a default row changed, which took down every pg-real case on the payee tables. The revoke/disable check now sits inside its own TG_TABLE_NAME branch. The MCP settings executor test mocks the payee write-through like the settings route test already does. Co-Authored-By: Claude Fable 5.1 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_01UaZTY21HVN57hJoPXKSLjV * fix(invoices): keep member disables from revoking payee defaults, gate payee on 1920-1999, fit the MCP payload Cycle 3 of /resolve-pr on #2233. Superagent P1: the SECURITY DEFINER mirror trigger deleted an admin's invoice_payee_defaults rows whenever cash_accounts.enabled flipped to false, and enabled is member-writable (the bank picker's "Synkas ej"), so a member could undo an admin's payee decision. The trigger now drops defaults only on the admin-only invoice_payee true -> false revoke; the mirror trigger's WHEN no longer lists enabled. Disabled accounts stay out of the pick lists and the send gate already refuses an invoice that chose one. Applied to staging as the same function + trigger definition and probed inside a rolled-back block: disable keeps the default and the mirrored bankgiro, revoke clears both. pg-real: the admin-guard test ran three expectations inside one withUserContext transaction; the first raise aborted it and the next statement failed with "current transaction is aborted". One transaction per expectation now, and the member case also flips enabled to prove the column stays member-level. Swedish review: payee eligibility was /^19\d\d$/, which admits 1910 Kassa and the 1911-1919 tills. A customer pays to a giro or bank account, so isBankCashAccount, CreateCashAccountSchema.ledger_account and the PATCH route now require BAS 1920-1999; tests cover 1910 and 1919. Unit tests (3/4): the tools/list payload guard read 60 025, then 60 014 tokens after main merged #2166 and #2163 alongside this branch. The ceiling is not bumped and no read on this surface is a demotion candidate, so gnubok_create_invoice drops payment_cash_account_id; agent-created invoices print the per-currency default and v1 REST plus the editor keep the field. Recorded in DECISIONS.md. Co-Authored-By: Claude Fable 5.1 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_01UaZTY21HVN57hJoPXKSLjV * chore(migrations): move invoices_payment_cash_account to 20260903183000 after colliding with main's KPI migration origin/main merged 20260903160000_kpi_monthly_include_reversed_originals while this branch held the same version; identical versions abort the Supabase apply. Staging's schema_migrations row was moved to the new version with the file. Co-Authored-By: Claude Fable 5.1 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_01UaZTY21HVN57hJoPXKSLjV * fix(invoices): gate invoice_payee on BAS 1920-1999 at the database, and unblock the typecheck ratchet Cycle 4 of /resolve-pr on #2233, on Emil's go. Swedish review: the 1920-1999 payee rule lived only in the routes. The cash_accounts_payee_admin_only trigger now also refuses invoice_payee on any other ledger (INVOICE_PAYEE_ACCOUNT_INVALID, 23514), whoever writes it, and the backfill only targets giro/bank rows, so a company whose single enabled cash_accounts row is a Stripe clearing account keeps its legacy bankgiro in company_settings instead of landing it on 1686. pg test covers insert and update on 1686 and 1910; the function was applied to staging and probed. Typecheck ratchet: main is red from two merges that landed with failing Checks, and every branch that syncs it inherits the errors. - #2242 added POST(req) calls to the fiscal-periods route test without the route params argument withRouteContext handlers take (25 errors in the file, baseline 23). All 25 calls now pass createMockRouteParams({}). - #2247 made SyncResult.requestedFromDate and historyNarrowed required; the 13 mockedSync results in the enable-banking accounts-route test lacked them. They now carry a fixed date and historyNarrowed: false. Both files' tests pass unchanged in behaviour. Co-Authored-By: Claude Fable 5.1 <noreply@anthropic.com> * chore(migrations): move invoices_payment_cash_account to 20260903193000 after colliding with main's party_promotion origin/main merged 20260903183000_party_promotion while this branch held the same version. Staging's schema_migrations row must follow (pending: the Supabase MCP was disconnected at the time of this commit). Co-Authored-By: Claude Fable 5.1 <noreply@anthropic.com> --------- Co-authored-by: Claude Fable 5.1 <noreply@anthropic.com>
This commit is contained in:
Mattsson
co-authored by
Claude Fable 5.1
Claude Fable 5.1
parent
88a5d78594
commit
d670fe6663
@@ -0,0 +1,307 @@
|
||||
import { randomUUID } from 'node:crypto'
|
||||
import { describe, expect, it } from 'vitest'
|
||||
import { insertAuthUser, insertCashAccount, insertCompany, insertCompanyMember } from './fixtures'
|
||||
import { getPool, withUserContext } from './setup'
|
||||
|
||||
/**
|
||||
* Migration 20260903150000: payee fields on cash_accounts, invoice_payee_defaults,
|
||||
* and the mirror that keeps company_settings.invoice_payment_accounts plus the
|
||||
* legacy SEK columns equal to the default account per currency.
|
||||
*/
|
||||
|
||||
async function setActiveCompany(userId: string, companyId: string): Promise<void> {
|
||||
await getPool().query(
|
||||
`INSERT INTO public.user_preferences (user_id, active_company_id)
|
||||
VALUES ($1, $2)
|
||||
ON CONFLICT (user_id) DO UPDATE SET active_company_id = EXCLUDED.active_company_id`,
|
||||
[userId, companyId],
|
||||
)
|
||||
}
|
||||
|
||||
async function insertSettings(userId: string, companyId: string): Promise<void> {
|
||||
await getPool().query(
|
||||
`INSERT INTO public.company_settings (user_id, company_id) VALUES ($1, $2)`,
|
||||
[userId, companyId],
|
||||
)
|
||||
}
|
||||
|
||||
async function settingsRow(companyId: string) {
|
||||
const res = await getPool().query<{
|
||||
invoice_payment_accounts: Record<string, Record<string, string>>
|
||||
bankgiro: string | null
|
||||
iban: string | null
|
||||
plusgiro: string | null
|
||||
bank_name: string | null
|
||||
}>(
|
||||
`SELECT invoice_payment_accounts, bankgiro, iban, plusgiro, bank_name
|
||||
FROM public.company_settings WHERE company_id = $1`,
|
||||
[companyId],
|
||||
)
|
||||
return res.rows[0]
|
||||
}
|
||||
|
||||
async function setDefault(companyId: string, currency: string, cashAccountId: string): Promise<void> {
|
||||
await getPool().query(
|
||||
`INSERT INTO public.invoice_payee_defaults (company_id, currency, cash_account_id)
|
||||
VALUES ($1, $2, $3)
|
||||
ON CONFLICT (company_id, currency) DO UPDATE SET cash_account_id = EXCLUDED.cash_account_id`,
|
||||
[companyId, currency, cashAccountId],
|
||||
)
|
||||
}
|
||||
|
||||
describe('invoice payee accounts (20260903150000)', () => {
|
||||
it('mirrors the default SEK account into the map and the legacy columns, and drops both when the default goes', async () => {
|
||||
const userId = await insertAuthUser()
|
||||
const companyId = await insertCompany({ createdBy: userId })
|
||||
await insertSettings(userId, companyId)
|
||||
const main = await insertCashAccount({ companyId, ledgerAccount: '1930', isPrimary: true })
|
||||
await getPool().query(
|
||||
`UPDATE public.cash_accounts
|
||||
SET bankgiro = '5050-1234', bank_name = 'Testbanken', payee_iban = 'SE45 5000 0000 0583 9825 7466', invoice_payee = true
|
||||
WHERE id = $1`,
|
||||
[main],
|
||||
)
|
||||
// No default yet: the settings row is untouched.
|
||||
expect((await settingsRow(companyId)).bankgiro).toBeNull()
|
||||
|
||||
await setDefault(companyId, 'SEK', main)
|
||||
let row = await settingsRow(companyId)
|
||||
expect(row.bankgiro).toBe('5050-1234')
|
||||
expect(row.bank_name).toBe('Testbanken')
|
||||
expect(row.iban).toBe('SE4550000000058398257466')
|
||||
expect(row.invoice_payment_accounts.SEK).toEqual({
|
||||
bankgiro: '5050-1234',
|
||||
bank_name: 'Testbanken',
|
||||
iban: 'SE4550000000058398257466',
|
||||
})
|
||||
|
||||
// Editing the account's payee fields re-mirrors.
|
||||
await getPool().query(`UPDATE public.cash_accounts SET plusgiro = '123456-7' WHERE id = $1`, [main])
|
||||
row = await settingsRow(companyId)
|
||||
expect(row.plusgiro).toBe('123456-7')
|
||||
expect(row.invoice_payment_accounts.SEK.plusgiro).toBe('123456-7')
|
||||
|
||||
// Bank-sync churn on the same row does not touch the settings row.
|
||||
const before = await getPool().query(`SELECT updated_at FROM public.company_settings WHERE company_id = $1`, [companyId])
|
||||
await getPool().query(`UPDATE public.cash_accounts SET balance = 1000, name = 'Nytt namn' WHERE id = $1`, [main])
|
||||
const after = await getPool().query(`SELECT updated_at FROM public.company_settings WHERE company_id = $1`, [companyId])
|
||||
expect(after.rows[0].updated_at).toEqual(before.rows[0].updated_at)
|
||||
|
||||
// A bank-sync write of the bank-identity iban is not a payee change.
|
||||
await getPool().query(`UPDATE public.cash_accounts SET iban = 'SE9999999999999999999999' WHERE id = $1`, [main])
|
||||
row = await settingsRow(companyId)
|
||||
expect(row.iban).toBe('SE4550000000058398257466')
|
||||
|
||||
// Removing the default drops the SEK key and clears the legacy columns:
|
||||
// the admin said "nothing to print", so the send gate asks for an
|
||||
// account instead of printing a possibly closed one.
|
||||
await getPool().query(`DELETE FROM public.invoice_payee_defaults WHERE company_id = $1`, [companyId])
|
||||
row = await settingsRow(companyId)
|
||||
expect(row.invoice_payment_accounts.SEK).toBeUndefined()
|
||||
expect(row.bankgiro).toBeNull()
|
||||
expect(row.plusgiro).toBeNull()
|
||||
})
|
||||
|
||||
it('lets one account be the default for several currencies and leaves other currencies alone', async () => {
|
||||
const userId = await insertAuthUser()
|
||||
const companyId = await insertCompany({ createdBy: userId })
|
||||
await insertSettings(userId, companyId)
|
||||
await getPool().query(
|
||||
`UPDATE public.company_settings
|
||||
SET invoice_payment_accounts = '{"USD": {"iban": "GB33BUKB20201555555555"}}'::jsonb
|
||||
WHERE company_id = $1`,
|
||||
[companyId],
|
||||
)
|
||||
const sek = await insertCashAccount({ companyId, ledgerAccount: '1930', isPrimary: true, iban: 'SE4550000000058398257466' })
|
||||
await getPool().query(`UPDATE public.cash_accounts SET payee_iban = 'SE4550000000058398257466', bic = 'ESSESESS', invoice_payee = true WHERE id = $1`, [sek])
|
||||
await setDefault(companyId, 'SEK', sek)
|
||||
await setDefault(companyId, 'EUR', sek)
|
||||
|
||||
const row = await settingsRow(companyId)
|
||||
expect(row.invoice_payment_accounts.SEK).toEqual({ iban: 'SE4550000000058398257466', bic: 'ESSESESS' })
|
||||
expect(row.invoice_payment_accounts.EUR).toEqual({ iban: 'SE4550000000058398257466', bic: 'ESSESESS' })
|
||||
// USD had no default: the legacy entry survives as fallback.
|
||||
expect(row.invoice_payment_accounts.USD).toEqual({ iban: 'GB33BUKB20201555555555' })
|
||||
})
|
||||
|
||||
it('rejects a second default for the same currency and an account from another company', async () => {
|
||||
const userId = await insertAuthUser()
|
||||
const companyId = await insertCompany({ createdBy: userId })
|
||||
await insertSettings(userId, companyId)
|
||||
const otherCompanyId = await insertCompany({ createdBy: userId, name: 'Annat AB' })
|
||||
await insertSettings(userId, otherCompanyId)
|
||||
const own = await insertCashAccount({ companyId, ledgerAccount: '1930', isPrimary: true })
|
||||
const foreign = await insertCashAccount({ companyId: otherCompanyId, ledgerAccount: '1930', isPrimary: true })
|
||||
|
||||
await setDefault(companyId, 'SEK', own)
|
||||
await expect(
|
||||
getPool().query(
|
||||
`INSERT INTO public.invoice_payee_defaults (company_id, currency, cash_account_id) VALUES ($1, 'SEK', $2)`,
|
||||
[companyId, own],
|
||||
),
|
||||
).rejects.toThrow(/duplicate key/)
|
||||
await expect(
|
||||
getPool().query(
|
||||
`INSERT INTO public.invoice_payee_defaults (company_id, currency, cash_account_id) VALUES ($1, 'EUR', $2)`,
|
||||
[companyId, foreign],
|
||||
),
|
||||
).rejects.toThrow(/invoice_payee_defaults_same_company/)
|
||||
})
|
||||
|
||||
it('RLS: members read the defaults, only owner/admin write them', async () => {
|
||||
const ownerId = await insertAuthUser()
|
||||
const memberId = await insertAuthUser()
|
||||
const companyId = await insertCompany({ createdBy: ownerId })
|
||||
await insertSettings(ownerId, companyId)
|
||||
await insertCompanyMember({ companyId, userId: ownerId, role: 'owner' })
|
||||
await insertCompanyMember({ companyId, userId: memberId, role: 'member' })
|
||||
await setActiveCompany(ownerId, companyId)
|
||||
await setActiveCompany(memberId, companyId)
|
||||
const account = await insertCashAccount({ companyId, ledgerAccount: '1930', isPrimary: true })
|
||||
|
||||
await withUserContext(ownerId, async (client) => {
|
||||
await client.query(
|
||||
`INSERT INTO public.invoice_payee_defaults (company_id, currency, cash_account_id) VALUES ($1, 'SEK', $2)`,
|
||||
[companyId, account],
|
||||
)
|
||||
const seen = await client.query(`SELECT count(*)::int AS n FROM public.invoice_payee_defaults WHERE company_id = $1`, [companyId])
|
||||
expect(seen.rows[0].n).toBe(1)
|
||||
})
|
||||
|
||||
await withUserContext(memberId, async (client) => {
|
||||
const res = await client.query(
|
||||
`INSERT INTO public.invoice_payee_defaults (company_id, currency, cash_account_id) VALUES ($1, 'EUR', $2)
|
||||
ON CONFLICT DO NOTHING RETURNING id`,
|
||||
[companyId, account],
|
||||
).catch((err: Error) => err)
|
||||
expect(res).toBeInstanceOf(Error)
|
||||
expect((res as Error).message).toMatch(/row-level security/)
|
||||
})
|
||||
})
|
||||
|
||||
it('audits payee edits on cash_accounts and default changes', async () => {
|
||||
const userId = await insertAuthUser()
|
||||
const companyId = await insertCompany({ createdBy: userId })
|
||||
await insertSettings(userId, companyId)
|
||||
const account = await insertCashAccount({ companyId, ledgerAccount: '1930', isPrimary: true })
|
||||
await getPool().query(`UPDATE public.cash_accounts SET bankgiro = '5050-1234' WHERE id = $1`, [account])
|
||||
await getPool().query(`UPDATE public.cash_accounts SET balance = 5 WHERE id = $1`, [account])
|
||||
const cashAudit = await getPool().query<{ action: string; new_bg: string | null }>(
|
||||
`SELECT action, new_state->>'bankgiro' AS new_bg FROM public.audit_log
|
||||
WHERE table_name = 'cash_accounts' AND record_id = $1 ORDER BY created_at, id`,
|
||||
[account],
|
||||
)
|
||||
expect(cashAudit.rows).toEqual([{ action: 'UPDATE', new_bg: '5050-1234' }])
|
||||
|
||||
await setDefault(companyId, 'SEK', account)
|
||||
const id = randomUUID()
|
||||
await getPool().query(
|
||||
`INSERT INTO public.invoice_payee_defaults (id, company_id, currency, cash_account_id) VALUES ($1, $2, 'EUR', $3)`,
|
||||
[id, companyId, account],
|
||||
)
|
||||
const defAudit = await getPool().query<{ action: string; company_id: string }>(
|
||||
`SELECT action, company_id FROM public.audit_log WHERE table_name = 'invoice_payee_defaults' AND record_id = $1`,
|
||||
[id],
|
||||
)
|
||||
expect(defAudit.rows).toEqual([{ action: 'INSERT', company_id: companyId }])
|
||||
})
|
||||
it('leaves the legacy SEK columns alone when the map has no SEK entry (legacy-only companies)', async () => {
|
||||
const userId = await insertAuthUser()
|
||||
const companyId = await insertCompany({ createdBy: userId })
|
||||
await insertSettings(userId, companyId)
|
||||
await getPool().query(
|
||||
`UPDATE public.company_settings SET bankgiro = '991-2346', invoice_payment_accounts = '{}'::jsonb WHERE company_id = $1`,
|
||||
[companyId],
|
||||
)
|
||||
const eur = await insertCashAccount({ companyId, ledgerAccount: '1932', currency: 'EUR' })
|
||||
await getPool().query(`UPDATE public.cash_accounts SET payee_iban = 'DE89370400440532013000', invoice_payee = true WHERE id = $1`, [eur])
|
||||
await setDefault(companyId, 'EUR', eur)
|
||||
const row = await settingsRow(companyId)
|
||||
expect(row.invoice_payment_accounts.EUR).toEqual({ iban: 'DE89370400440532013000' })
|
||||
expect(row.bankgiro).toBe('991-2346')
|
||||
})
|
||||
|
||||
it('refuses invoice_payee on anything but a giro/bank ledger (BAS 1920-1999), whoever writes it', async () => {
|
||||
const userId = await insertAuthUser()
|
||||
const companyId = await insertCompany({ createdBy: userId })
|
||||
await insertSettings(userId, companyId)
|
||||
for (const ledger of ['1686', '1910']) {
|
||||
const res = await getPool()
|
||||
.query(`INSERT INTO public.cash_accounts (company_id, ledger_account, currency, bankgiro, invoice_payee) VALUES ($1, $2, 'SEK', '5050-1234', true)`, [companyId, ledger])
|
||||
.catch((err: Error) => err)
|
||||
expect(res).toBeInstanceOf(Error)
|
||||
expect((res as Error).message).toMatch(/INVOICE_PAYEE_ACCOUNT_INVALID/)
|
||||
}
|
||||
const till = await insertCashAccount({ companyId, ledgerAccount: '1910' })
|
||||
const flip = await getPool()
|
||||
.query(`UPDATE public.cash_accounts SET invoice_payee = true WHERE id = $1`, [till])
|
||||
.catch((err: Error) => err)
|
||||
expect(flip).toBeInstanceOf(Error)
|
||||
const bank = await insertCashAccount({ companyId, ledgerAccount: '1920' })
|
||||
await getPool().query(`UPDATE public.cash_accounts SET bankgiro = '5050-1234', invoice_payee = true WHERE id = $1`, [bank])
|
||||
})
|
||||
|
||||
it('revoking an account as payee drops its defaults; disabling it (member-level) does not', async () => {
|
||||
const userId = await insertAuthUser()
|
||||
const companyId = await insertCompany({ createdBy: userId })
|
||||
await insertSettings(userId, companyId)
|
||||
const main = await insertCashAccount({ companyId, ledgerAccount: '1930', isPrimary: true })
|
||||
await getPool().query(`UPDATE public.cash_accounts SET bankgiro = '5050-1234', invoice_payee = true WHERE id = $1`, [main])
|
||||
await setDefault(companyId, 'SEK', main)
|
||||
await setDefault(companyId, 'EUR', main)
|
||||
|
||||
// "Synkas ej" in the bank picker is a member action and must not undo an
|
||||
// admin's payee choice: the defaults and the mirrored columns stay.
|
||||
await getPool().query(`UPDATE public.cash_accounts SET enabled = false WHERE id = $1`, [main])
|
||||
let left = await getPool().query(`SELECT count(*)::int AS n FROM public.invoice_payee_defaults WHERE company_id = $1`, [companyId])
|
||||
expect(left.rows[0].n).toBe(2)
|
||||
expect((await settingsRow(companyId)).bankgiro).toBe('5050-1234')
|
||||
|
||||
await getPool().query(`UPDATE public.cash_accounts SET invoice_payee = false WHERE id = $1`, [main])
|
||||
left = await getPool().query(`SELECT count(*)::int AS n FROM public.invoice_payee_defaults WHERE company_id = $1`, [companyId])
|
||||
expect(left.rows[0].n).toBe(0)
|
||||
expect((await settingsRow(companyId)).bankgiro).toBeNull()
|
||||
})
|
||||
|
||||
it('payee columns are owner/admin-only at the database; sync-style member writes to other columns still pass', async () => {
|
||||
const ownerId = await insertAuthUser()
|
||||
const memberId = await insertAuthUser()
|
||||
const companyId = await insertCompany({ createdBy: ownerId })
|
||||
await insertSettings(ownerId, companyId)
|
||||
await insertCompanyMember({ companyId, userId: ownerId, role: 'owner' })
|
||||
await insertCompanyMember({ companyId, userId: memberId, role: 'member' })
|
||||
await setActiveCompany(ownerId, companyId)
|
||||
await setActiveCompany(memberId, companyId)
|
||||
const main = await insertCashAccount({ companyId, ledgerAccount: '1930', isPrimary: true })
|
||||
|
||||
// One transaction per expectation: a raised error aborts the transaction
|
||||
// withUserContext runs in, so the next statement would fail for the
|
||||
// wrong reason.
|
||||
await withUserContext(memberId, async (client) => {
|
||||
const res = await client
|
||||
.query(`UPDATE public.cash_accounts SET bankgiro = '999-9999' WHERE id = $1`, [main])
|
||||
.catch((err: Error) => err)
|
||||
expect(res).toBeInstanceOf(Error)
|
||||
expect((res as Error).message).toMatch(/INVOICE_PAYEE_ADMIN_ONLY/)
|
||||
})
|
||||
await withUserContext(memberId, async (client) => {
|
||||
// Balance, the enabled flag and the bank-identity iban are what sync
|
||||
// and the bank picker write: allowed for a member.
|
||||
await client.query(`UPDATE public.cash_accounts SET balance = 10, enabled = false, iban = 'SE4550000000058398257466' WHERE id = $1`, [main])
|
||||
const seen = await client.query(`SELECT balance::int AS balance, enabled FROM public.cash_accounts WHERE id = $1`, [main])
|
||||
expect(seen.rows[0]).toEqual({ balance: 10, enabled: false })
|
||||
})
|
||||
await withUserContext(memberId, async (client) => {
|
||||
const insert = await client
|
||||
.query(`INSERT INTO public.cash_accounts (company_id, ledger_account, currency, bankgiro, invoice_payee) VALUES ($1, '1931', 'SEK', '999-9999', true)`, [companyId])
|
||||
.catch((err: Error) => err)
|
||||
expect(insert).toBeInstanceOf(Error)
|
||||
expect((insert as Error).message).toMatch(/INVOICE_PAYEE_ADMIN_ONLY/)
|
||||
})
|
||||
await withUserContext(ownerId, async (client) => {
|
||||
await client.query(`UPDATE public.cash_accounts SET bankgiro = '5050-1234', invoice_payee = true WHERE id = $1`, [main])
|
||||
const seen = await client.query(`SELECT bankgiro FROM public.cash_accounts WHERE id = $1`, [main])
|
||||
expect(seen.rows[0].bankgiro).toBe('5050-1234')
|
||||
})
|
||||
})
|
||||
})
|
||||
@@ -0,0 +1,73 @@
|
||||
import { randomUUID } from 'node:crypto'
|
||||
import { describe, expect, it } from 'vitest'
|
||||
import { insertAuthUser, insertCashAccount, insertCompany } from './fixtures'
|
||||
import { getPool } from './setup'
|
||||
|
||||
/**
|
||||
* Migration 20260903193000: invoices.payment_cash_account_id (FK, SET NULL)
|
||||
* and invoices.payment_details (object snapshot).
|
||||
*/
|
||||
|
||||
async function insertCustomer(companyId: string, userId: string): Promise<string> {
|
||||
const id = randomUUID()
|
||||
await getPool().query(
|
||||
`INSERT INTO public.customers (id, company_id, user_id, name, customer_type) VALUES ($1, $2, $3, 'Kund AB', 'swedish_business')`,
|
||||
[id, companyId, userId],
|
||||
)
|
||||
return id
|
||||
}
|
||||
|
||||
async function insertInvoice(companyId: string, userId: string, customerId: string, extra: Record<string, unknown> = {}): Promise<string> {
|
||||
const id = randomUUID()
|
||||
const cols = ['id', 'company_id', 'user_id', 'customer_id', 'invoice_date', 'due_date', 'status', 'currency', 'subtotal', 'vat_amount', 'total', 'vat_treatment', 'vat_rate', 'paid_amount', 'remaining_amount', ...Object.keys(extra)]
|
||||
const vals = [id, companyId, userId, customerId, '2026-09-01', '2026-10-01', 'draft', 'SEK', 100, 25, 125, 'standard_25', 25, 0, 125, ...Object.values(extra)]
|
||||
await getPool().query(
|
||||
`INSERT INTO public.invoices (${cols.join(', ')}) VALUES (${cols.map((_, i) => `$${i + 1}`).join(', ')})`,
|
||||
vals,
|
||||
)
|
||||
return id
|
||||
}
|
||||
|
||||
describe('invoice payee columns (20260903193000)', () => {
|
||||
it('stores the choice and the snapshot; deleting the account nulls the reference but keeps the snapshot', async () => {
|
||||
const userId = await insertAuthUser()
|
||||
const companyId = await insertCompany({ createdBy: userId })
|
||||
const customerId = await insertCustomer(companyId, userId)
|
||||
const account = await insertCashAccount({ companyId, ledgerAccount: '1931' })
|
||||
const invoiceId = await insertInvoice(companyId, userId, customerId, {
|
||||
payment_cash_account_id: account,
|
||||
payment_details: JSON.stringify({ bankgiro: '5050-1055' }),
|
||||
})
|
||||
|
||||
await getPool().query(`DELETE FROM public.cash_accounts WHERE id = $1`, [account])
|
||||
const row = await getPool().query<{ payment_cash_account_id: string | null; payment_details: { bankgiro: string } }>(
|
||||
`SELECT payment_cash_account_id, payment_details FROM public.invoices WHERE id = $1`,
|
||||
[invoiceId],
|
||||
)
|
||||
expect(row.rows[0].payment_cash_account_id).toBeNull()
|
||||
expect(row.rows[0].payment_details).toEqual({ bankgiro: '5050-1055' })
|
||||
})
|
||||
|
||||
it('rejects a non-object snapshot and an account id that does not exist', async () => {
|
||||
const userId = await insertAuthUser()
|
||||
const companyId = await insertCompany({ createdBy: userId })
|
||||
const customerId = await insertCustomer(companyId, userId)
|
||||
await expect(
|
||||
insertInvoice(companyId, userId, customerId, { payment_details: JSON.stringify(['not', 'an', 'object']) }),
|
||||
).rejects.toThrow(/payment_details/)
|
||||
await expect(
|
||||
insertInvoice(companyId, userId, customerId, { payment_cash_account_id: randomUUID() }),
|
||||
).rejects.toThrow(/foreign key/)
|
||||
})
|
||||
|
||||
it('rejects another company\'s cash account (composite same-company FK)', async () => {
|
||||
const userId = await insertAuthUser()
|
||||
const companyId = await insertCompany({ createdBy: userId })
|
||||
const otherCompanyId = await insertCompany({ createdBy: userId, name: 'Annat AB' })
|
||||
const customerId = await insertCustomer(companyId, userId)
|
||||
const foreign = await insertCashAccount({ companyId: otherCompanyId, ledgerAccount: '1930' })
|
||||
await expect(
|
||||
insertInvoice(companyId, userId, customerId, { payment_cash_account_id: foreign }),
|
||||
).rejects.toThrow(/invoices_payment_cash_account_same_company/)
|
||||
})
|
||||
})
|
||||
Reference in New Issue
Block a user