Bug/open banking flow (#854)
* fix(enable-banking): pin Mobile BankID (decoupled) auth_method so Handelsbanken corporate connects We never sent auth_method to Enable Banking, so it fell back to the ASPSP's visible default — REDIRECT for Handelsbanken. For Handelsbanken *corporate* PSUs the redirect flow does not support Mobile BankID, so authorization failed right after the user approved in the BankID app. Mobile BankID at Handelsbanken is a DECOUPLED method flagged hidden_method=true, which Enable Banking only uses when requested explicitly. Resolve the bank's preferred auth method before /auth: query the ASPSP's auth_methods and pick the DECOUPLED (Mobile BankID) method when present, otherwise leave auth_method unset so banks that already work are untouched. The method name is read dynamically per psu_type, so it is robust across sandbox/production naming. - api-client: add approach/hidden_method to AuthMethod, fix ASPSP.auth_methods field name (was available_auth_methods, never populated), add getPreferredAuthMethod(), thread optional authMethod through startAuthorization - index: resolve authMethod in /connect and pass it on both fresh + reconnect - tests: cover method selection and request-body shaping Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com> * refactor(invoice-inbox): clean up bulk-selection toolbar UI Redesign the selection toolbar shown when inbox items are checked: one solid primary "Bokför valda" button with outlined secondary actions ("Fråga assistenten", "Ta bort") and a plain selection count. Removes the redundant "Avmarkera" button (users uncheck the still-visible box), fixes label clipping, and gives the toolbar more breathing room. Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com> * chore(entitlements): bypass paywall in local development Add isPaywallBypassed() so all gated capabilities are testable locally without a subscription. Fires only on NODE_ENV=development (npm run dev) or an explicit DISABLE_PAYWALL=true escape hatch — production builds run under NODE_ENV=production and the entitlement suite runs under 'test', so both keep exercising the real gate. Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com> * fix(tic): resolve enskild firma bolagsuppgifter via 12-digit personnummer TIC's Lens search is fuzzy and only resolves an enskild firma from the 12-digit (century-prefixed) personnummer; a 10-digit form fuzzy-matched an unrelated entity. Expand personnummer to 12 digits before querying and reject hits whose registration number is unrelated to the request. Add a "Hämta" action to the settings Bolagsuppgifter panel to (re)fetch on demand. Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com> * feat(transactions): implement categorize core for bank transaction categorization - Added `categorize-core.ts` to handle categorization of bank transactions, supporting single and bulk operations. - Introduced `categorizeMatchedTransaction` and `bulkBookMatchedInboxItems` functions for transaction processing. - Implemented fiscal period validation and duplicate booking detection. - Enhanced logging and error handling for transaction categorization. feat(scripts): add diagnostic script for Handelsbanken ASPSP metadata - Created `check-handelsbanken-aspsp.mjs` to fetch and display available authentication methods for Handelsbanken. - Outputs metadata for business and personal PSU types, including default authentication methods. fix(migrations): increase statement timeout for SIE bulk delete operations - Updated `20260629160000_sie_bulk_delete_statement_timeout.sql` to set a longer statement timeout for bulk delete RPCs to prevent cancellations during large imports. feat(migrations): add bulk book inbox items to pending operations - Expanded `pending_operations` table to include `bulk_book_inbox_items` operation type in `20260630120000_pending_operations_add_bulk_book_inbox_items.sql`. - Supports bulk booking of matched inbox items against bank transactions. test(pg): add tests for replace_period_opening_balance_link RPC - Implemented tests in `replace-period-opening-balance-link.pg.test.ts` to validate the functionality of the opening-balance correction flow. - Ensured immutability of opening balance links and proper handling of posted vs. non-posted entries. * fix(sie-export): update journal entries and lines handling in SIE export tests * fix(migrations): resolve version collision on 20260629160000 The SIE bulk-delete statement_timeout migration shared version 20260629160000 with journal_entries_list_series_filter (merged from main via #798/#823), causing a schema_migrations_pkey duplicate key error on apply. Rename the branch's migration to 20260629160100. Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com> * fix(compliance): resolve compliance-swarm + review findings - opening-balance/correct: compensating rollback for the non-atomic storno+rebook so a mid-sequence failure never leaves two posted OB entries (ASVS V2.3); durable audit event on every failure path (V16); reference the original verifikationsnummer in the corrected entry per BFL 5 kap 5§; document that requireWrite already enforces write-role + membership (V8.2.1 was a false positive) - reports sources routes: validate the cursor date component as ISO (/^\d{4}-\d{2}-\d{2}$/) before use, 400 on malformed (ASVS V1.2), applied to both the VAT-declaration and trial-balance routes - AgentSessionList: await the rename PATCH, revert the optimistic title and toast on failure (ASVS V4.5) - bank booking: exclude same-batch siblings from the booking-time duplicate guard so bulk-booking distinct same-(date,amount) transactions no longer false-positives; pre-existing duplicate detection is preserved - BulkBookInboxDialog: drop the unsafe currency-based reverse_charge default, add an omvänd skattskyldighet advisory, and type VAT options to the backend VatTreatment union - OpeningBalanceRowEditor: hold onChange in a ref (synced in effect, not during render) so an unstable callback can't cause a render loop Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com> --------- Co-authored-by: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
This commit is contained in:
Mattsson
co-authored by
Claude Opus 4.8
Claude Opus 4.8
parent
2da9c71eb3
commit
f63d3e3100
@@ -129,6 +129,30 @@ describe('detectBookedDuplicateTransaction', () => {
|
||||
})
|
||||
expect(result?.transaction_id).toBe('sib-2')
|
||||
})
|
||||
|
||||
// ── Intra-batch exclusion (bulk-book false-positive fix) ────────────────
|
||||
it('excludes a same-batch sibling whose id is in excludeTransactionIds', async () => {
|
||||
const supabase = makeSupabase([sibling({ id: 'sib-batch' })])
|
||||
const result = await detectBookedDuplicateTransaction(
|
||||
supabase,
|
||||
COMPANY,
|
||||
{ id: 'self', date: '2025-12-19', amount: -1616, cash_account_id: null },
|
||||
{ excludeTransactionIds: ['sib-batch'] },
|
||||
)
|
||||
expect(result).toBeNull()
|
||||
})
|
||||
|
||||
it('STILL flags a pre-existing sibling not in excludeTransactionIds (invariant preserved)', async () => {
|
||||
// 'sib-old' existed before the batch; only 'sib-batch' was booked this run.
|
||||
const supabase = makeSupabase([sibling({ id: 'sib-old' })])
|
||||
const result = await detectBookedDuplicateTransaction(
|
||||
supabase,
|
||||
COMPANY,
|
||||
{ id: 'self', date: '2025-12-19', amount: -1616, cash_account_id: null },
|
||||
{ excludeTransactionIds: ['sib-batch'] },
|
||||
)
|
||||
expect(result?.transaction_id).toBe('sib-old')
|
||||
})
|
||||
})
|
||||
|
||||
// ── Ledger-only voucher guard (the orphan with no sibling transaction) ───────
|
||||
@@ -305,6 +329,29 @@ describe('detectLedgerDuplicateVoucher', () => {
|
||||
})
|
||||
expect(result).toBeNull()
|
||||
})
|
||||
|
||||
// ── Intra-batch exclusion (bulk-book false-positive fix) ────────────────
|
||||
it('excludes a same-batch voucher whose journal_entry.id is in excludeJournalEntryIds', async () => {
|
||||
const supabase = makeLedgerSupabase({ lines: [jel()] }) // jel() → journal_entry.id 'je-2'
|
||||
const result = await detectLedgerDuplicateVoucher(
|
||||
supabase,
|
||||
COMPANY,
|
||||
{ id: 'self', date: '2026-03-26', amount: 98565, cash_account_id: null },
|
||||
{ excludeJournalEntryIds: ['je-2'] },
|
||||
)
|
||||
expect(result).toBeNull()
|
||||
})
|
||||
|
||||
it('STILL flags a pre-existing voucher not in excludeJournalEntryIds (invariant preserved)', async () => {
|
||||
const supabase = makeLedgerSupabase({ lines: [jel()] })
|
||||
const result = await detectLedgerDuplicateVoucher(
|
||||
supabase,
|
||||
COMPANY,
|
||||
{ id: 'self', date: '2026-03-26', amount: 98565, cash_account_id: null },
|
||||
{ excludeJournalEntryIds: ['je-booked-this-batch'] },
|
||||
)
|
||||
expect(result?.journal_entry_id).toBe('je-2')
|
||||
})
|
||||
})
|
||||
|
||||
describe('detectBookingDuplicate (orchestrator)', () => {
|
||||
@@ -332,4 +379,20 @@ describe('detectBookingDuplicate (orchestrator)', () => {
|
||||
})
|
||||
expect(result).toBeNull()
|
||||
})
|
||||
|
||||
it('propagates exclusions to BOTH the sibling scan and the ledger scan', async () => {
|
||||
// A matching sibling AND a matching ledger voucher exist, but both belong to
|
||||
// this same batch (excluded) → the orchestrator must report no duplicate.
|
||||
const supabase = makeLedgerSupabase({
|
||||
transactionRows: [sibling({ id: 'sib-batch', amount: 98565, journal_entry_id: 'je-sib' })],
|
||||
lines: [jel()], // journal_entry.id 'je-2'
|
||||
})
|
||||
const result = await detectBookingDuplicate(
|
||||
supabase,
|
||||
COMPANY,
|
||||
{ id: 'self', date: '2026-03-26', amount: 98565, cash_account_id: null },
|
||||
{ excludeTransactionIds: ['sib-batch'], excludeJournalEntryIds: ['je-2'] },
|
||||
)
|
||||
expect(result).toBeNull()
|
||||
})
|
||||
})
|
||||
|
||||
@@ -0,0 +1,332 @@
|
||||
/**
|
||||
* Bulk-book Underlag (Modell B) core logic.
|
||||
*
|
||||
* `bulkBookMatchedInboxItems` is shared by the direct UI route
|
||||
* (POST /items/bulk-book) and the `bulk_book_inbox_items` pending-operation
|
||||
* executor. These tests pin the "Bokför valda hoppar över" contract — items
|
||||
* that aren't matched / already booked / linked to a leverantörsfaktura are
|
||||
* SKIPPED, never errored — and the happy path where a matched item is booked
|
||||
* against its transaction via the shared categorize core.
|
||||
*
|
||||
* The single-item categorize core itself (createJE, duplicate guard, VAT
|
||||
* mapping, underlag propagation) is covered by
|
||||
* lib/pending-operations/__tests__/commit-duplicate-guard.test.ts and the
|
||||
* inbox-link pg tests; here we mock its downstream modules and assert the
|
||||
* loop's classification + collection.
|
||||
*/
|
||||
import { describe, it, expect, vi, beforeEach } from 'vitest'
|
||||
|
||||
const mockCreateJE = vi.fn()
|
||||
const mockDetectDup = vi.fn()
|
||||
const mockMapping = vi.fn()
|
||||
const mockUpsertTemplate = vi.fn()
|
||||
const mockLinkToJE = vi.fn()
|
||||
|
||||
vi.mock('@/lib/bookkeeping/transaction-entries', () => ({
|
||||
createTransactionJournalEntry: (...args: unknown[]) => mockCreateJE(...args),
|
||||
}))
|
||||
vi.mock('@/lib/transactions/booking-duplicate-detection', () => ({
|
||||
detectBookingDuplicate: (...args: unknown[]) => mockDetectDup(...args),
|
||||
}))
|
||||
vi.mock('@/lib/bookkeeping/category-mapping', () => ({
|
||||
buildMappingResultFromCategory: (...args: unknown[]) => mockMapping(...args),
|
||||
}))
|
||||
vi.mock('@/lib/bookkeeping/counterparty-templates', () => ({
|
||||
upsertCounterpartyTemplate: (...args: unknown[]) => mockUpsertTemplate(...args),
|
||||
}))
|
||||
vi.mock('@/lib/core/documents/document-service', () => ({
|
||||
linkToJournalEntry: (...args: unknown[]) => mockLinkToJE(...args),
|
||||
}))
|
||||
|
||||
import { bulkBookMatchedInboxItems } from '../categorize-core'
|
||||
import { BulkBookInboxSchema } from '@/lib/api/schemas'
|
||||
import { eventBus } from '@/lib/events/bus'
|
||||
|
||||
/** Queue-based supabase mock: each `from()` consumes the next queued result. */
|
||||
function queuedSupabase(results: Array<{ data?: unknown; error?: unknown }>) {
|
||||
const queue = [...results]
|
||||
const from = vi.fn(() => {
|
||||
const raw = queue.shift() ?? { data: null, error: null }
|
||||
const result = { data: raw.data ?? null, error: raw.error ?? null }
|
||||
const chain: object = new Proxy(
|
||||
{},
|
||||
{
|
||||
get(_t, prop) {
|
||||
if (prop === 'then') return (resolve: (v: unknown) => void) => resolve(result)
|
||||
return () => chain
|
||||
},
|
||||
},
|
||||
)
|
||||
return chain
|
||||
})
|
||||
return { from } as never
|
||||
}
|
||||
|
||||
beforeEach(() => {
|
||||
vi.clearAllMocks()
|
||||
eventBus.clear()
|
||||
mockDetectDup.mockResolvedValue(null)
|
||||
mockMapping.mockReturnValue({
|
||||
rule: null,
|
||||
debit_account: '5420',
|
||||
credit_account: '1930',
|
||||
risk_level: 'LOW',
|
||||
confidence: 1,
|
||||
requires_review: false,
|
||||
default_private: false,
|
||||
vat_lines: [],
|
||||
description: 'Programvara',
|
||||
})
|
||||
mockCreateJE.mockResolvedValue({ id: 'je-1' })
|
||||
})
|
||||
|
||||
describe('BulkBookInboxSchema', () => {
|
||||
it('accepts a valid payload', () => {
|
||||
const r = BulkBookInboxSchema.safeParse({
|
||||
item_ids: ['11111111-1111-4111-8111-111111111111'],
|
||||
category: 'expense_software',
|
||||
vat_treatment: 'reverse_charge',
|
||||
})
|
||||
expect(r.success).toBe(true)
|
||||
})
|
||||
|
||||
// Regression: the bulk_book_inbox_items pending operation persists absent
|
||||
// optionals as explicit JSON null (stagePendingOperation in server.ts). A bare
|
||||
// `.optional()` rejected those on approval ("expected number, received null").
|
||||
it('accepts persisted params with explicit nulls and normalizes them to undefined', () => {
|
||||
const r = BulkBookInboxSchema.safeParse({
|
||||
item_ids: ['11111111-1111-4111-8111-111111111111'],
|
||||
category: 'expense_software',
|
||||
vat_treatment: null,
|
||||
vat_amount: null,
|
||||
notes: null,
|
||||
allow_duplicate: false,
|
||||
})
|
||||
expect(r.success).toBe(true)
|
||||
if (r.success) {
|
||||
// null must not leak downstream to categorizeMatchedTransaction.
|
||||
expect(r.data.vat_treatment).toBeUndefined()
|
||||
expect(r.data.vat_amount).toBeUndefined()
|
||||
expect(r.data.notes).toBeUndefined()
|
||||
}
|
||||
})
|
||||
|
||||
it('rejects an empty item_ids array', () => {
|
||||
const r = BulkBookInboxSchema.safeParse({ item_ids: [], category: 'expense_software' })
|
||||
expect(r.success).toBe(false)
|
||||
})
|
||||
|
||||
it('rejects a missing category', () => {
|
||||
const r = BulkBookInboxSchema.safeParse({ item_ids: ['11111111-1111-1111-1111-111111111111'] })
|
||||
expect(r.success).toBe(false)
|
||||
})
|
||||
|
||||
it('rejects an invalid category', () => {
|
||||
const r = BulkBookInboxSchema.safeParse({
|
||||
item_ids: ['11111111-1111-1111-1111-111111111111'],
|
||||
category: 'expense_unicorns',
|
||||
})
|
||||
expect(r.success).toBe(false)
|
||||
})
|
||||
|
||||
it('rejects an invalid vat_treatment', () => {
|
||||
const r = BulkBookInboxSchema.safeParse({
|
||||
item_ids: ['11111111-1111-1111-1111-111111111111'],
|
||||
category: 'expense_software',
|
||||
vat_treatment: 'omvänd',
|
||||
})
|
||||
expect(r.success).toBe(false)
|
||||
})
|
||||
|
||||
it('rejects more than 200 items', () => {
|
||||
const ids = Array.from({ length: 201 }, (_, i) => `id-${i}`)
|
||||
const r = BulkBookInboxSchema.safeParse({ item_ids: ids, category: 'expense_software' })
|
||||
expect(r.success).toBe(false)
|
||||
})
|
||||
})
|
||||
|
||||
describe('bulkBookMatchedInboxItems — skip classification (never errors)', () => {
|
||||
const base = { category: 'expense_software' as const }
|
||||
|
||||
it('skips an item that is not found', async () => {
|
||||
const supabase = queuedSupabase([{ data: null }])
|
||||
const { booked, skipped } = await bulkBookMatchedInboxItems(supabase, 'u1', 'c1', {
|
||||
...base,
|
||||
item_ids: ['missing'],
|
||||
})
|
||||
expect(booked).toEqual([])
|
||||
expect(skipped).toEqual([{ item_id: 'missing', reason: 'not_found' }])
|
||||
expect(mockCreateJE).not.toHaveBeenCalled()
|
||||
})
|
||||
|
||||
it('skips an item already booked (created_journal_entry_id)', async () => {
|
||||
const supabase = queuedSupabase([
|
||||
{ data: { id: 'i1', matched_transaction_id: 'tx-1', created_journal_entry_id: 'je-x', created_supplier_invoice_id: null } },
|
||||
])
|
||||
const { booked, skipped } = await bulkBookMatchedInboxItems(supabase, 'u1', 'c1', { ...base, item_ids: ['i1'] })
|
||||
expect(booked).toEqual([])
|
||||
expect(skipped).toEqual([{ item_id: 'i1', reason: 'already_booked' }])
|
||||
expect(mockCreateJE).not.toHaveBeenCalled()
|
||||
})
|
||||
|
||||
it('skips an item linked to a supplier invoice', async () => {
|
||||
const supabase = queuedSupabase([
|
||||
{ data: { id: 'i1', matched_transaction_id: 'tx-1', created_journal_entry_id: null, created_supplier_invoice_id: 'si-x' } },
|
||||
])
|
||||
const { booked, skipped } = await bulkBookMatchedInboxItems(supabase, 'u1', 'c1', { ...base, item_ids: ['i1'] })
|
||||
expect(booked).toEqual([])
|
||||
expect(skipped).toEqual([{ item_id: 'i1', reason: 'is_supplier_invoice' }])
|
||||
expect(mockCreateJE).not.toHaveBeenCalled()
|
||||
})
|
||||
|
||||
it('skips an item without a matched transaction', async () => {
|
||||
const supabase = queuedSupabase([
|
||||
{ data: { id: 'i1', matched_transaction_id: null, created_journal_entry_id: null, created_supplier_invoice_id: null } },
|
||||
])
|
||||
const { booked, skipped } = await bulkBookMatchedInboxItems(supabase, 'u1', 'c1', { ...base, item_ids: ['i1'] })
|
||||
expect(booked).toEqual([])
|
||||
expect(skipped).toEqual([{ item_id: 'i1', reason: 'not_matched' }])
|
||||
expect(mockCreateJE).not.toHaveBeenCalled()
|
||||
})
|
||||
})
|
||||
|
||||
describe('bulkBookMatchedInboxItems — booking', () => {
|
||||
it('books a matched, unbooked item against its transaction', async () => {
|
||||
const supabase = queuedSupabase([
|
||||
// 1. inbox item fetch → bookable
|
||||
{ data: { id: 'i1', matched_transaction_id: 'tx-1', created_journal_entry_id: null, created_supplier_invoice_id: null } },
|
||||
// 2. transactions fetch (categorize core)
|
||||
{ data: { id: 'tx-1', date: '2026-06-01', amount: -700.28, currency: 'SEK', cash_account_id: null, journal_entry_id: null } },
|
||||
// 3. company_settings
|
||||
{ data: { entity_type: 'aktiebolag', fiscal_year_start_month: 1 } },
|
||||
// 4. ensureFiscalPeriod → existing period
|
||||
{ data: [{ id: 'fp-1' }] },
|
||||
// 5. transactions update (mark booked)
|
||||
{ error: null },
|
||||
// 6. propagation select (no matched inbox rows to stamp in this mock)
|
||||
{ data: [] },
|
||||
])
|
||||
|
||||
const { booked, skipped } = await bulkBookMatchedInboxItems(supabase, 'u1', 'c1', {
|
||||
item_ids: ['i1'],
|
||||
category: 'expense_software',
|
||||
vat_treatment: 'reverse_charge',
|
||||
})
|
||||
|
||||
expect(skipped).toEqual([])
|
||||
expect(booked).toEqual([{ item_id: 'i1', transaction_id: 'tx-1', journal_entry_id: 'je-1' }])
|
||||
expect(mockCreateJE).toHaveBeenCalledTimes(1)
|
||||
// The shared core received the chosen category + reverse-charge treatment.
|
||||
expect(mockMapping).toHaveBeenCalledWith(
|
||||
'expense_software',
|
||||
expect.objectContaining({ id: 'tx-1' }),
|
||||
true,
|
||||
'aktiebolag',
|
||||
'reverse_charge',
|
||||
undefined,
|
||||
)
|
||||
})
|
||||
|
||||
it('books the matched item and skips the unmatched one in a mixed batch', async () => {
|
||||
const supabase = queuedSupabase([
|
||||
// item i1 → not matched (1 from())
|
||||
{ data: { id: 'i1', matched_transaction_id: null, created_journal_entry_id: null, created_supplier_invoice_id: null } },
|
||||
// item i2 → bookable, then its categorize chain
|
||||
{ data: { id: 'i2', matched_transaction_id: 'tx-2', created_journal_entry_id: null, created_supplier_invoice_id: null } },
|
||||
{ data: { id: 'tx-2', date: '2026-06-02', amount: -25, currency: 'SEK', cash_account_id: null, journal_entry_id: null } },
|
||||
{ data: { entity_type: 'aktiebolag', fiscal_year_start_month: 1 } },
|
||||
{ data: [{ id: 'fp-1' }] },
|
||||
{ error: null },
|
||||
{ data: [] },
|
||||
])
|
||||
|
||||
const { booked, skipped } = await bulkBookMatchedInboxItems(supabase, 'u1', 'c1', {
|
||||
item_ids: ['i1', 'i2'],
|
||||
category: 'expense_software',
|
||||
})
|
||||
|
||||
expect(skipped).toEqual([{ item_id: 'i1', reason: 'not_matched' }])
|
||||
expect(booked).toEqual([{ item_id: 'i2', transaction_id: 'tx-2', journal_entry_id: 'je-1' }])
|
||||
expect(mockCreateJE).toHaveBeenCalledTimes(1)
|
||||
})
|
||||
})
|
||||
|
||||
describe('bulkBookMatchedInboxItems — intra-batch duplicate handling', () => {
|
||||
/** Six queued from() results for one successfully-booked item. */
|
||||
const bookableItem = (itemId: string, txId: string, amount: number) => [
|
||||
{ data: { id: itemId, matched_transaction_id: txId, created_journal_entry_id: null, created_supplier_invoice_id: null } },
|
||||
{ data: { id: txId, date: '2026-06-01', amount, currency: 'SEK', cash_account_id: null, journal_entry_id: null } },
|
||||
{ data: { entity_type: 'aktiebolag', fiscal_year_start_month: 1 } },
|
||||
{ data: [{ id: 'fp-1' }] },
|
||||
{ error: null },
|
||||
{ data: [] },
|
||||
]
|
||||
|
||||
it('books BOTH distinct transactions that share (date, amount) in one bulk run', async () => {
|
||||
// Model the reviewer-reported bug: the guard WOULD flag the second tx as a
|
||||
// duplicate of the first tx's freshly-created verifikat — but only when the
|
||||
// first tx is NOT excluded as a same-batch sibling. The fix must pass tx-1
|
||||
// in as an exclusion so tx-2 books instead of being skipped 409.
|
||||
mockDetectDup.mockImplementation(
|
||||
(_sb: unknown, _co: unknown, target: { id: string }, exclude?: { excludeTransactionIds?: string[] }) => {
|
||||
if (target.id === 'tx-2' && !(exclude?.excludeTransactionIds ?? []).includes('tx-1')) {
|
||||
return Promise.resolve({
|
||||
transaction_id: 'tx-1', journal_entry_id: 'je-1', voucher_label: 'A1',
|
||||
entry_date: '2026-06-01', description: null, amount: 700.28,
|
||||
})
|
||||
}
|
||||
return Promise.resolve(null)
|
||||
},
|
||||
)
|
||||
|
||||
const supabase = queuedSupabase([
|
||||
...bookableItem('i1', 'tx-1', -700.28),
|
||||
...bookableItem('i2', 'tx-2', -700.28),
|
||||
])
|
||||
|
||||
const { booked, skipped } = await bulkBookMatchedInboxItems(supabase, 'u1', 'c1', {
|
||||
item_ids: ['i1', 'i2'],
|
||||
category: 'expense_software',
|
||||
})
|
||||
|
||||
expect(skipped).toEqual([])
|
||||
expect(booked).toEqual([
|
||||
{ item_id: 'i1', transaction_id: 'tx-1', journal_entry_id: 'je-1' },
|
||||
{ item_id: 'i2', transaction_id: 'tx-2', journal_entry_id: 'je-1' },
|
||||
])
|
||||
expect(mockCreateJE).toHaveBeenCalledTimes(2)
|
||||
|
||||
// The SECOND booking was handed tx-1 (and its verifikat) as an intra-batch
|
||||
// exclusion; the first was handed an empty set.
|
||||
const firstCall = mockDetectDup.mock.calls.find((c) => (c[2] as { id: string }).id === 'tx-1')
|
||||
const secondCall = mockDetectDup.mock.calls.find((c) => (c[2] as { id: string }).id === 'tx-2')
|
||||
expect(firstCall?.[3]).toEqual({ excludeTransactionIds: [], excludeJournalEntryIds: [] })
|
||||
expect(secondCall?.[3]).toEqual({ excludeTransactionIds: ['tx-1'], excludeJournalEntryIds: ['je-1'] })
|
||||
})
|
||||
|
||||
it('STILL skips a pre-existing already-booked duplicate (cross-batch detection preserved)', async () => {
|
||||
// The guard fires on a duplicate that existed BEFORE this batch: its ids are
|
||||
// absent from the (empty) exclusion set, so the booking is refused (409) and
|
||||
// the item is skipped as a possible duplicate rather than double-booked.
|
||||
mockDetectDup.mockResolvedValue({
|
||||
transaction_id: 'tx-preexisting', journal_entry_id: 'je-old', voucher_label: 'A9',
|
||||
entry_date: '2026-06-01', description: null, amount: 700.28,
|
||||
})
|
||||
|
||||
const supabase = queuedSupabase([
|
||||
{ data: { id: 'i1', matched_transaction_id: 'tx-1', created_journal_entry_id: null, created_supplier_invoice_id: null } },
|
||||
{ data: { id: 'tx-1', date: '2026-06-01', amount: -700.28, currency: 'SEK', cash_account_id: null, journal_entry_id: null } },
|
||||
])
|
||||
|
||||
const { booked, skipped } = await bulkBookMatchedInboxItems(supabase, 'u1', 'c1', {
|
||||
item_ids: ['i1'],
|
||||
category: 'expense_software',
|
||||
})
|
||||
|
||||
expect(booked).toEqual([])
|
||||
expect(skipped).toHaveLength(1)
|
||||
expect(skipped[0].item_id).toBe('i1')
|
||||
expect(skipped[0].reason).toBe('already_booked_or_duplicate')
|
||||
expect(mockCreateJE).not.toHaveBeenCalled()
|
||||
})
|
||||
})
|
||||
@@ -56,6 +56,28 @@ export interface BookingTarget {
|
||||
cash_account_id?: string | null
|
||||
}
|
||||
|
||||
/**
|
||||
* Same-batch siblings to exclude from booking-time duplicate detection.
|
||||
*
|
||||
* When a bulk run books several DISTINCT bank movements that happen to share a
|
||||
* (date, amount, cash account) — several identical Swish transfers the user
|
||||
* explicitly selected — the second booking must NOT dedupe against the first
|
||||
* booking's freshly-created verifikat: they are separate affärshändelser. The
|
||||
* bulk driver accumulates the ids it has booked so far in THIS batch and passes
|
||||
* them here so intra-batch siblings never flag one another.
|
||||
*
|
||||
* CRITICAL: only ids created within the current batch belong here. A duplicate
|
||||
* that existed BEFORE the batch has neither its transaction id nor its voucher
|
||||
* id in these lists, so it is STILL detected and skipped. Both fields are
|
||||
* optional; the default (no exclusion) keeps single-booking callers unaffected.
|
||||
*/
|
||||
export interface BookingDuplicateExclusions {
|
||||
/** Sibling transaction ids booked earlier in the same bulk run. */
|
||||
excludeTransactionIds?: string[]
|
||||
/** Journal-entry ids minted earlier in the same bulk run. */
|
||||
excludeJournalEntryIds?: string[]
|
||||
}
|
||||
|
||||
/**
|
||||
* Find an already-booked sibling transaction sharing (date, amount, account).
|
||||
* Returns the single best candidate, or null.
|
||||
@@ -73,9 +95,13 @@ export async function detectBookedDuplicateTransaction(
|
||||
supabase: SupabaseClient,
|
||||
companyId: string,
|
||||
target: BookingTarget,
|
||||
opts?: BookingDuplicateExclusions,
|
||||
): Promise<BookedDuplicateCandidate | null> {
|
||||
const targetOre = toOre(target.amount)
|
||||
if (targetOre === 0 || Number.isNaN(targetOre)) return null
|
||||
// Siblings booked earlier in this same bulk run are distinct events the user
|
||||
// selected, not duplicates — never flag one against another.
|
||||
const excludeTransactionIds = new Set(opts?.excludeTransactionIds ?? [])
|
||||
|
||||
// Same company, same date, already booked, not the target row itself. The
|
||||
// amount and account match is applied in JS so a numeric-string amount from
|
||||
@@ -101,6 +127,7 @@ export async function detectBookedDuplicateTransaction(
|
||||
}
|
||||
const targetAccount = target.cash_account_id ?? null
|
||||
const matches = (data as unknown as Row[]).filter((r) => {
|
||||
if (excludeTransactionIds.has(r.id)) return false
|
||||
if (toOre(r.amount) !== targetOre) return false
|
||||
// Account guard: both-known must match; a null on either side is compatible.
|
||||
if (targetAccount !== null && r.cash_account_id !== null && r.cash_account_id !== targetAccount) {
|
||||
@@ -179,9 +206,13 @@ export async function detectLedgerDuplicateVoucher(
|
||||
supabase: SupabaseClient,
|
||||
companyId: string,
|
||||
target: BookingTarget,
|
||||
opts?: BookingDuplicateExclusions,
|
||||
): Promise<BookedDuplicateCandidate | null> {
|
||||
const targetOre = toOre(target.amount)
|
||||
if (targetOre === 0 || Number.isNaN(targetOre)) return null
|
||||
// Vouchers minted earlier in this same bulk run are this batch's own fresh
|
||||
// bookings — a subsequent sibling must not dedupe against them.
|
||||
const excludeJournalEntryIds = new Set(opts?.excludeJournalEntryIds ?? [])
|
||||
const targetAmount = roundOre(Math.abs(Number(target.amount)))
|
||||
const inbound = targetOre > 0
|
||||
|
||||
@@ -251,6 +282,8 @@ export async function detectLedgerDuplicateVoucher(
|
||||
}
|
||||
}
|
||||
const candidates = (lines as unknown as LineRow[])
|
||||
// Same-batch vouchers are this run's own fresh bookings, never duplicates.
|
||||
.filter((l) => !excludeJournalEntryIds.has(l.journal_entry.id))
|
||||
.filter((l) => {
|
||||
const legAmount = roundOre(Number(inbound ? l.debit_amount : l.credit_amount))
|
||||
return Math.abs(legAmount - targetAmount) < 0.01
|
||||
@@ -309,8 +342,9 @@ export async function detectBookingDuplicate(
|
||||
supabase: SupabaseClient,
|
||||
companyId: string,
|
||||
target: BookingTarget,
|
||||
opts?: BookingDuplicateExclusions,
|
||||
): Promise<BookedDuplicateCandidate | null> {
|
||||
const sibling = await detectBookedDuplicateTransaction(supabase, companyId, target)
|
||||
const sibling = await detectBookedDuplicateTransaction(supabase, companyId, target, opts)
|
||||
if (sibling) return sibling
|
||||
return detectLedgerDuplicateVoucher(supabase, companyId, target)
|
||||
return detectLedgerDuplicateVoucher(supabase, companyId, target, opts)
|
||||
}
|
||||
|
||||
@@ -0,0 +1,465 @@
|
||||
/**
|
||||
* Shared core for booking a bank transaction by category.
|
||||
*
|
||||
* This is the single implementation behind three callers:
|
||||
* 1. The single-transaction approval executor `commitCategorizeTransaction`
|
||||
* (lib/pending-operations/commit.ts) — the agent / web "Kategorisera"
|
||||
* flow.
|
||||
* 2. The bulk-book-inbox executor `commitBulkBookInboxItems`
|
||||
* (lib/pending-operations/commit.ts) — Lena driving the Underlag view.
|
||||
* 3. The direct UI bulk-book route (`POST /items/bulk-book` in the
|
||||
* invoice-inbox extension) — the "Bokför valda" button.
|
||||
*
|
||||
* Extracting it keeps the VAT/mapping logic, the duplicate guard, and the
|
||||
* matched-inbox underlag propagation in ONE place. "Booking an underlag" in the
|
||||
* Dokumentinkorgen is implemented as categorizing the bank transaction it is
|
||||
* matched to: `buildMappingResultFromCategory` produces correct accounts +
|
||||
* reverse-charge VAT, and the propagation step below attaches the underlag to
|
||||
* the new verifikation (BFL 7 kap) and stamps the inbox item resolved.
|
||||
*
|
||||
* Booking is always in SEK off the bank transaction's own amount (BFL 5 kap
|
||||
* 2§), so the foreign-currency underlag never needs an FX step here — the bank
|
||||
* already settled it.
|
||||
*/
|
||||
import type { SupabaseClient } from '@supabase/supabase-js'
|
||||
import { eventBus } from '@/lib/events'
|
||||
import { buildMappingResultFromCategory } from '@/lib/bookkeeping/category-mapping'
|
||||
import { createTransactionJournalEntry } from '@/lib/bookkeeping/transaction-entries'
|
||||
import { upsertCounterpartyTemplate } from '@/lib/bookkeeping/counterparty-templates'
|
||||
import { isBookkeepingError } from '@/lib/bookkeeping/errors'
|
||||
import { linkToJournalEntry } from '@/lib/core/documents/document-service'
|
||||
import { detectBookingDuplicate, type BookingDuplicateExclusions } from '@/lib/transactions/booking-duplicate-detection'
|
||||
import { appendProcessingHistory } from '@/lib/processing-history/append'
|
||||
import { roundOre } from '@/lib/money'
|
||||
import { createLogger } from '@/lib/logger'
|
||||
import type { Transaction, TransactionCategory, EntityType, VatTreatment } from '@/types'
|
||||
|
||||
const log = createLogger('transactions/categorize-core')
|
||||
|
||||
/** Structurally compatible with the commit.ts `ExecutorResult`. */
|
||||
export interface CategorizeCoreResult {
|
||||
data?: Record<string, unknown>
|
||||
error?: string
|
||||
status?: number
|
||||
}
|
||||
|
||||
export interface CategorizeMatchedTransactionOpts {
|
||||
category: TransactionCategory
|
||||
vatTreatment?: VatTreatment
|
||||
/**
|
||||
* The underlag's actual VAT when it differs from rate × belopp (e.g. dricks).
|
||||
* Only valid with a rate-based vat_treatment; see buildMappingResultFromCategory.
|
||||
*/
|
||||
vatAmount?: number
|
||||
/** Audit-trail text appended to the verifikation description. */
|
||||
notes?: string
|
||||
/**
|
||||
* Bypass the booking-time duplicate guard. Default false — the guard fails
|
||||
* closed when another verifikat already books this amount on the bank
|
||||
* account, and the caller surfaces the skip.
|
||||
*/
|
||||
allowDuplicate?: boolean
|
||||
}
|
||||
|
||||
// ── Helper: ensure a fiscal period covers the date ──────────────────
|
||||
//
|
||||
// Moved here from lib/pending-operations/commit.ts so the core is
|
||||
// self-contained; commit.ts now imports it from this module.
|
||||
|
||||
export async function ensureFiscalPeriod(
|
||||
supabase: SupabaseClient,
|
||||
userId: string,
|
||||
companyId: string,
|
||||
date: string,
|
||||
fiscalYearStartMonth: number = 1
|
||||
): Promise<boolean> {
|
||||
const { data: existing } = await supabase
|
||||
.from('fiscal_periods')
|
||||
.select('id')
|
||||
.eq('company_id', companyId)
|
||||
.lte('period_start', date)
|
||||
.gte('period_end', date)
|
||||
.eq('is_closed', false)
|
||||
.limit(1)
|
||||
|
||||
if (existing && existing.length > 0) return true
|
||||
|
||||
const txDate = new Date(date)
|
||||
const txMonth = txDate.getMonth() + 1
|
||||
const txYear = txDate.getFullYear()
|
||||
|
||||
let periodStartYear: number
|
||||
if (fiscalYearStartMonth === 1) {
|
||||
periodStartYear = txYear
|
||||
} else if (txMonth >= fiscalYearStartMonth) {
|
||||
periodStartYear = txYear
|
||||
} else {
|
||||
periodStartYear = txYear - 1
|
||||
}
|
||||
|
||||
const startMonth = String(fiscalYearStartMonth).padStart(2, '0')
|
||||
const periodStart = `${periodStartYear}-${startMonth}-01`
|
||||
|
||||
const endYear = fiscalYearStartMonth === 1 ? periodStartYear : periodStartYear + 1
|
||||
const endMonth = fiscalYearStartMonth === 1 ? 12 : fiscalYearStartMonth - 1
|
||||
const lastDay = new Date(endYear, endMonth, 0).getDate()
|
||||
const periodEnd = `${endYear}-${String(endMonth).padStart(2, '0')}-${String(lastDay).padStart(2, '0')}`
|
||||
|
||||
const periodName = fiscalYearStartMonth === 1
|
||||
? `Räkenskapsår ${periodStartYear}`
|
||||
: `Räkenskapsår ${periodStartYear}/${endYear}`
|
||||
|
||||
const { error } = await supabase
|
||||
.from('fiscal_periods')
|
||||
.upsert({
|
||||
user_id: userId,
|
||||
company_id: companyId,
|
||||
name: periodName,
|
||||
period_start: periodStart,
|
||||
period_end: periodEnd,
|
||||
}, { onConflict: 'user_id,period_start,period_end' })
|
||||
|
||||
if (error) {
|
||||
log.error('Failed to create fiscal period:', error)
|
||||
return false
|
||||
}
|
||||
return true
|
||||
}
|
||||
|
||||
/**
|
||||
* Book a single bank transaction by category. Creates the verifikation, marks
|
||||
* the transaction booked, propagates any matched invoice-inbox underlag onto
|
||||
* the new entry (stamping `created_journal_entry_id` so the inbox row moves to
|
||||
* "Bearbetade"), and records the counterparty template.
|
||||
*
|
||||
* Returns `{ data }` on success or `{ error, status }` on a recoverable
|
||||
* failure (404 missing tx, 409 already booked / possible duplicate, 400 no
|
||||
* mapping, 500 DB). Throws only on AccountsNotInChartError so the caller's
|
||||
* recover-and-retry path stays intact.
|
||||
*/
|
||||
export async function categorizeMatchedTransaction(
|
||||
supabase: SupabaseClient,
|
||||
userId: string,
|
||||
companyId: string,
|
||||
txId: string,
|
||||
opts: CategorizeMatchedTransactionOpts,
|
||||
/**
|
||||
* Same-batch siblings to exclude from the duplicate guard. Only set by the
|
||||
* bulk driver so intra-batch bookings of DISTINCT same-(date,amount) events
|
||||
* never dedupe against one another. Omitted (single-booking callers) = the
|
||||
* full guard runs unchanged.
|
||||
*/
|
||||
exclude?: BookingDuplicateExclusions,
|
||||
): Promise<CategorizeCoreResult> {
|
||||
const { category, vatTreatment, vatAmount, notes, allowDuplicate } = opts
|
||||
|
||||
const { data: transaction, error: fetchError } = await supabase
|
||||
.from('transactions').select('*').eq('id', txId).eq('company_id', companyId).single()
|
||||
|
||||
if (fetchError || !transaction) {
|
||||
return { error: 'Transaction not found — it may have been deleted.', status: 404 }
|
||||
}
|
||||
if (transaction.journal_entry_id) {
|
||||
return { error: 'Transaction already has a journal entry — it was categorized in the meantime.', status: 409 }
|
||||
}
|
||||
|
||||
// Booking-time duplicate guard — parity with the web /categorize route.
|
||||
// Refuse to mint a second verifikat for an affärshändelse already in the
|
||||
// ledger: an already-booked sibling transaction, OR an unlinked voucher that
|
||||
// already books this amount on the bank account (invoice "markera som
|
||||
// betald", the salary run's net-wage payout, a manual verifikat). Fail
|
||||
// closed; the caller re-runs with allowDuplicate=true after the user
|
||||
// confirms the bank line is a genuinely separate event. Fail-open on a
|
||||
// detection error so a transient query failure never blocks a real booking.
|
||||
if (allowDuplicate !== true) {
|
||||
let dup = null
|
||||
try {
|
||||
dup = await detectBookingDuplicate(supabase, companyId, {
|
||||
id: txId,
|
||||
date: transaction.date,
|
||||
amount: transaction.amount,
|
||||
cash_account_id: transaction.cash_account_id ?? null,
|
||||
}, exclude)
|
||||
} catch (err) {
|
||||
log.warn('booking-time duplicate detection failed (continuing)', err)
|
||||
}
|
||||
if (dup) {
|
||||
const amountAbs = roundOre(Math.abs(Number(transaction.amount)))
|
||||
const voucher = dup.voucher_label ? `verifikat ${dup.voucher_label}` : 'en befintlig verifikation'
|
||||
return {
|
||||
error:
|
||||
`Möjlig dubblettbokföring: ${voucher} (${dup.entry_date}) bokför redan ${amountAbs} kr på bankkontot. ` +
|
||||
`Den här affärshändelsen ser redan ut att vara bokförd — länka transaktionen till den befintliga ` +
|
||||
`verifikationen i stället för att bokföra den igen. Om banktransaktionen verkligen är en separat ` +
|
||||
`affärshändelse, kör om med allow_duplicate=true.`,
|
||||
status: 409,
|
||||
}
|
||||
}
|
||||
} else {
|
||||
// allowDuplicate=true bypassed the guard. Booking over a possible
|
||||
// double-booking is a bookkeeping act that must leave a durable
|
||||
// behandlingshistorik record (BFNAR 2013:2 kap 8). Re-detect to capture
|
||||
// the dismissed candidate; best-effort, a logging failure must never block
|
||||
// a legitimate booking.
|
||||
try {
|
||||
const dismissed = await detectBookingDuplicate(supabase, companyId, {
|
||||
id: txId,
|
||||
date: transaction.date,
|
||||
amount: transaction.amount,
|
||||
cash_account_id: transaction.cash_account_id ?? null,
|
||||
}, exclude)
|
||||
if (dismissed) {
|
||||
await appendProcessingHistory({
|
||||
companyId,
|
||||
correlationId: txId,
|
||||
aggregateType: 'BankTransaction',
|
||||
aggregateId: txId,
|
||||
eventType: 'BankTransactionDuplicateDismissed',
|
||||
payload: {
|
||||
transaction_id: txId,
|
||||
dismissed_transaction_id: dismissed.transaction_id,
|
||||
dismissed_journal_entry_id: dismissed.journal_entry_id,
|
||||
amount_ore: Math.round(dismissed.amount * 100),
|
||||
entry_date: dismissed.entry_date,
|
||||
via: 'allow_duplicate',
|
||||
},
|
||||
actor: { type: 'user', id: userId },
|
||||
occurredAt: new Date(),
|
||||
})
|
||||
}
|
||||
} catch (logErr) {
|
||||
log.warn('failed to record duplicate-dismissal behandlingshistorik', logErr)
|
||||
}
|
||||
}
|
||||
|
||||
const isBusiness = category !== 'private'
|
||||
|
||||
const { data: settings } = await supabase
|
||||
.from('company_settings').select('entity_type, fiscal_year_start_month').eq('company_id', companyId).single()
|
||||
|
||||
const entityType: EntityType = (settings?.entity_type as EntityType) || 'enskild_firma'
|
||||
const fiscalYearStartMonth = settings?.fiscal_year_start_month ?? 1
|
||||
|
||||
const mappingResult = buildMappingResultFromCategory(
|
||||
category, transaction as Transaction, isBusiness, entityType, vatTreatment, vatAmount
|
||||
)
|
||||
|
||||
if (!mappingResult.debit_account || !mappingResult.credit_account) {
|
||||
return { error: `No account mapping for category "${category}" with entity type "${entityType}".`, status: 400 }
|
||||
}
|
||||
|
||||
await ensureFiscalPeriod(supabase, userId, companyId, transaction.date, fiscalYearStartMonth)
|
||||
|
||||
let journalEntryId: string | null = null
|
||||
try {
|
||||
const journalEntry = await createTransactionJournalEntry(
|
||||
supabase, companyId, userId, transaction as Transaction, mappingResult, notes,
|
||||
)
|
||||
if (journalEntry) journalEntryId = journalEntry.id
|
||||
} catch (err) {
|
||||
if (isBookkeepingError(err)) throw err
|
||||
log.error('Failed to create journal entry:', err)
|
||||
return { error: err instanceof Error ? err.message : 'Failed to create journal entry', status: 500 }
|
||||
}
|
||||
|
||||
const { error: updateError } = await supabase
|
||||
.from('transactions')
|
||||
.update({ is_business: isBusiness, category, journal_entry_id: journalEntryId })
|
||||
.eq('id', txId)
|
||||
|
||||
if (updateError) {
|
||||
log.error('Failed to update transaction:', updateError)
|
||||
return { error: 'Failed to update transaction', status: 500 }
|
||||
}
|
||||
|
||||
// Propagate the underlag from a matched invoice-inbox item onto the new
|
||||
// verifikation. Without this, BFL 7 kap is violated: a verifikation exists
|
||||
// with no underlag attached even though the user explicitly linked an inbox
|
||||
// item (with a document) to this transaction. We:
|
||||
// 1. find the inbox item(s) where matched_transaction_id = txId
|
||||
// 2. for each item with a document_id, set
|
||||
// document_attachments.journal_entry_id = journalEntryId (idempotent)
|
||||
// 3. stamp invoice_inbox_items.created_journal_entry_id so the inbox row
|
||||
// visibly moves to "Bearbetade" and shows "Öppna verifikation".
|
||||
// Errors are logged but don't fail the commit — the verifikation itself is
|
||||
// already posted, and the link can be repaired by re-running this step.
|
||||
if (journalEntryId) {
|
||||
try {
|
||||
const { data: matchedInboxItems } = await supabase
|
||||
.from('invoice_inbox_items')
|
||||
.select('id, document_id')
|
||||
.eq('company_id', companyId)
|
||||
.eq('matched_transaction_id', txId)
|
||||
.is('created_journal_entry_id', null)
|
||||
for (const inbox of (matchedInboxItems ?? []) as Array<{
|
||||
id: string
|
||||
document_id: string | null
|
||||
}>) {
|
||||
if (inbox.document_id) {
|
||||
try {
|
||||
await linkToJournalEntry(supabase, companyId, inbox.document_id, journalEntryId)
|
||||
} catch (err) {
|
||||
log.error('Failed to link inbox document to journal entry', {
|
||||
inbox_item_id: inbox.id,
|
||||
document_id: inbox.document_id,
|
||||
journal_entry_id: journalEntryId,
|
||||
error: err instanceof Error ? err.message : String(err),
|
||||
})
|
||||
}
|
||||
}
|
||||
const { error: stampError } = await supabase
|
||||
.from('invoice_inbox_items')
|
||||
.update({ created_journal_entry_id: journalEntryId })
|
||||
.eq('id', inbox.id)
|
||||
.eq('company_id', companyId)
|
||||
if (stampError) {
|
||||
log.error('Failed to stamp inbox item created_journal_entry_id', {
|
||||
inbox_item_id: inbox.id,
|
||||
journal_entry_id: journalEntryId,
|
||||
error: stampError.message,
|
||||
})
|
||||
}
|
||||
}
|
||||
} catch (err) {
|
||||
log.error('Failed to propagate underlag from matched inbox items', err)
|
||||
}
|
||||
}
|
||||
|
||||
try {
|
||||
await upsertCounterpartyTemplate(
|
||||
supabase, userId, transaction as Transaction, mappingResult, 'user_approved'
|
||||
)
|
||||
} catch { /* non-critical */ }
|
||||
|
||||
await eventBus.emit({
|
||||
type: 'transaction.categorized',
|
||||
payload: {
|
||||
transaction: transaction as Transaction,
|
||||
account: mappingResult.debit_account,
|
||||
taxCode: mappingResult.vat_lines[0]?.account_number || '',
|
||||
userId,
|
||||
companyId,
|
||||
},
|
||||
})
|
||||
|
||||
return { data: { journal_entry_id: journalEntryId, category } }
|
||||
}
|
||||
|
||||
// ── Bulk: book N selected Underlag against their matched transactions ──────
|
||||
|
||||
export interface BulkBookInboxInput {
|
||||
item_ids: string[]
|
||||
category: TransactionCategory
|
||||
vat_treatment?: VatTreatment
|
||||
vat_amount?: number
|
||||
notes?: string
|
||||
allow_duplicate?: boolean
|
||||
}
|
||||
|
||||
export interface BulkBookInboxResult {
|
||||
booked: Array<{ item_id: string; transaction_id: string; journal_entry_id: string | null }>
|
||||
skipped: Array<{ item_id: string; reason: string; detail?: string }>
|
||||
}
|
||||
|
||||
/**
|
||||
* Book each selected inbox item against its matched bank transaction with one
|
||||
* shared category + VAT treatment. Items without a matched transaction, already
|
||||
* booked, or already linked to a leverantörsfaktura are skipped — never an
|
||||
* error — so one bad underlag never blocks the rest ("Bokför valda hoppar
|
||||
* över"). A per-item throw (period locked, accounts not in chart) is caught and
|
||||
* recorded as a skip with the actionable message.
|
||||
*
|
||||
* Shared by the direct UI route (POST /items/bulk-book) and the
|
||||
* `bulk_book_inbox_items` pending-operation executor (Lena-driven flow).
|
||||
*/
|
||||
export async function bulkBookMatchedInboxItems(
|
||||
supabase: SupabaseClient,
|
||||
userId: string,
|
||||
companyId: string,
|
||||
input: BulkBookInboxInput,
|
||||
): Promise<BulkBookInboxResult> {
|
||||
const { item_ids, category, vat_treatment, vat_amount, notes, allow_duplicate } = input
|
||||
|
||||
const booked: BulkBookInboxResult['booked'] = []
|
||||
const skipped: BulkBookInboxResult['skipped'] = []
|
||||
|
||||
// Ids booked so far in THIS batch. Passed as exclusions to each subsequent
|
||||
// booking so two DISTINCT bank movements the user selected that share a
|
||||
// (date, amount, cash account) don't dedupe against each other's freshly
|
||||
// minted verifikat. Duplicates that existed BEFORE the batch are absent from
|
||||
// these lists, so the guard still catches them (see BookingDuplicateExclusions).
|
||||
const bookedTransactionIds: string[] = []
|
||||
const bookedJournalEntryIds: string[] = []
|
||||
|
||||
for (const itemId of item_ids) {
|
||||
const { data: item, error: itemError } = await supabase
|
||||
.from('invoice_inbox_items')
|
||||
.select('id, matched_transaction_id, created_journal_entry_id, created_supplier_invoice_id')
|
||||
.eq('id', itemId)
|
||||
.eq('company_id', companyId)
|
||||
.maybeSingle()
|
||||
|
||||
if (itemError || !item) {
|
||||
skipped.push({ item_id: itemId, reason: 'not_found' })
|
||||
continue
|
||||
}
|
||||
if (item.created_journal_entry_id) {
|
||||
skipped.push({ item_id: itemId, reason: 'already_booked' })
|
||||
continue
|
||||
}
|
||||
if (item.created_supplier_invoice_id) {
|
||||
skipped.push({ item_id: itemId, reason: 'is_supplier_invoice' })
|
||||
continue
|
||||
}
|
||||
if (!item.matched_transaction_id) {
|
||||
skipped.push({ item_id: itemId, reason: 'not_matched' })
|
||||
continue
|
||||
}
|
||||
|
||||
let result: CategorizeCoreResult
|
||||
try {
|
||||
result = await categorizeMatchedTransaction(
|
||||
supabase,
|
||||
userId,
|
||||
companyId,
|
||||
item.matched_transaction_id as string,
|
||||
{ category, vatTreatment: vat_treatment, vatAmount: vat_amount, notes, allowDuplicate: allow_duplicate },
|
||||
// Snapshot copies so the guard sees only the prior bookings of this batch.
|
||||
{ excludeTransactionIds: [...bookedTransactionIds], excludeJournalEntryIds: [...bookedJournalEntryIds] },
|
||||
)
|
||||
} catch (err) {
|
||||
// Caught per-item (incl. AccountsNotInChartError / period-lock bookkeeping
|
||||
// errors) so the batch keeps going. The message carries the actionable
|
||||
// detail (e.g. which BAS accounts to activate).
|
||||
skipped.push({
|
||||
item_id: itemId,
|
||||
reason: 'error',
|
||||
detail: err instanceof Error ? err.message : String(err),
|
||||
})
|
||||
continue
|
||||
}
|
||||
|
||||
if (result.error) {
|
||||
const reason =
|
||||
result.status === 404 ? 'transaction_not_found'
|
||||
: result.status === 409 ? 'already_booked_or_duplicate'
|
||||
: result.status === 400 ? 'no_account_mapping'
|
||||
: 'error'
|
||||
skipped.push({ item_id: itemId, reason, detail: result.error })
|
||||
continue
|
||||
}
|
||||
|
||||
const bookedTxId = item.matched_transaction_id as string
|
||||
const bookedJeId = (result.data?.journal_entry_id as string | null) ?? null
|
||||
// Record this booking so it is excluded from the NEXT item's duplicate guard.
|
||||
bookedTransactionIds.push(bookedTxId)
|
||||
if (bookedJeId) bookedJournalEntryIds.push(bookedJeId)
|
||||
booked.push({
|
||||
item_id: itemId,
|
||||
transaction_id: bookedTxId,
|
||||
journal_entry_id: bookedJeId,
|
||||
})
|
||||
}
|
||||
|
||||
return { booked, skipped }
|
||||
}
|
||||
Reference in New Issue
Block a user