* fix(booking-templates): scope template list to the active company GET /api/settings/booking-templates relied solely on the btl_select RLS policy, which is membership-wide (user_company_ids) and returns templates from every company the user belongs to. A user who owns multiple companies saw all their templates merged regardless of which company was active. Narrow the list in the API layer (mirroring counterparty-templates) to system + the active company + the active company's team. RLS stays the security backstop; this fixes the cross-company merge within a single user's own view (it was never a cross-tenant data leak). Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com> * fix(import): show proper message for duplicate bank file upload The bank file import page mis-parsed the structured error envelope ({ error: { code, message, details } }), so a BANK_FILE_DUPLICATE (409) fell through to the generic "Kunde inte läsa filen" fallback. The upload step also hardcoded that same string as the error heading, so duplicates were doubly misreported as parse failures. - Parse the structured envelope by error.code; surface error.message for all codes instead of rendering the error object. - Add a dedicated BANK_FILE_DUPLICATE message using the importedAt / importedCount details the route already returns. - Add an optional errorTitle prop to BankFileUploadStep (defaults to the previous text) and pass "Filen är redan importerad" for dupes. Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com> * feat(tests): add comprehensive tests for recordateEntry, inbox-linking, and external-id handling - Implemented unit tests for recordateEntry in the bookkeeping module to validate various scenarios including date changes, non-posted entries, and fiscal period restrictions. - Created tests for inbox-linking status in pending operations to ensure correct handling of invoice inbox items and supplier invoices, addressing historical bugs related to status updates. - Added tests for external-id utilities to ensure consistent handling of monetary amounts and deduplication keys across different transaction sources. - Introduced new functions in external-id.ts for stable external ID generation and normalization of imported descriptions, enhancing transaction deduplication reliability. feat(migrations): add new database migrations for transaction handling - Created migration to exclude storno and correction vouchers from unmatched GL lines, ensuring accurate reconciliation. - Added a migration to preserve original bank transaction descriptions in a new immutable column, allowing for user edits while maintaining audit trails and deduplication integrity. * feat(migrations): add function to exclude storno/correction vouchers from unmatched GL lines * feat(transactions): enhance transaction handling with improved description normalization and preloaded original entries --------- Co-authored-by: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
193 lines
7.8 KiB
TypeScript
193 lines
7.8 KiB
TypeScript
import type { SupabaseClient } from '@supabase/supabase-js'
|
|
import { getAllTransactionsWithRaw, convertTransaction, getAccountBalance } from './api-client'
|
|
import { uploadDocument } from '@/lib/core/documents/document-service'
|
|
import { ingestTransactions as defaultIngest } from '@/lib/transactions/ingest'
|
|
import { buildStableExternalIds, FALLBACK_DESCRIPTION } from '@/lib/transactions/external-id'
|
|
import type { RawTransaction, IngestResult, IngestOptions } from '@/types'
|
|
import type { StoredAccount, TransactionsFetchStrategy } from '../types'
|
|
|
|
/** Ingest function signature — matches lib/transactions/ingest */
|
|
export type IngestFn = (
|
|
supabase: SupabaseClient,
|
|
companyId: string,
|
|
userId: string,
|
|
raw: RawTransaction[],
|
|
options?: IngestOptions
|
|
) => Promise<IngestResult>
|
|
|
|
export interface SyncOptions {
|
|
/** Skip auto-categorization during ingestion (e.g. SIE overlap) */
|
|
skipAutoCategorization?: boolean
|
|
/** Only INSERT + dedup, no matching/categorization (viewer imports) */
|
|
rawInsertOnly?: boolean
|
|
/**
|
|
* Fetch strategy passed to Enable Banking. 'longest' instructs the upstream
|
|
* to fetch the deepest available history (slower); omit for incremental syncs.
|
|
*/
|
|
strategy?: TransactionsFetchStrategy
|
|
}
|
|
|
|
export interface SyncResult {
|
|
imported: number
|
|
duplicates: number
|
|
errors: number
|
|
/** Earliest booking date the ASPSP returned. Undefined when no transactions came back. */
|
|
returnedMinBookingDate?: string
|
|
/** Latest booking date the ASPSP returned. Undefined when no transactions came back. */
|
|
returnedMaxBookingDate?: string
|
|
}
|
|
|
|
/**
|
|
* Sync transactions for a single bank account via Enable Banking PSD2.
|
|
*
|
|
* Fetches transactions from the Enable Banking API, converts to RawTransaction
|
|
* format, and delegates to the shared ingestion pipeline. Raw API responses
|
|
* are archived as räkenskapsinformation per BFL 7 kap.
|
|
*
|
|
* @param ingest - Optional ingest function override (defaults to core ingestTransactions).
|
|
* When called from an extension handler with ctx.services.ingestTransactions,
|
|
* pass that function to avoid direct @/lib imports.
|
|
*/
|
|
export async function syncAccountTransactions(
|
|
supabase: SupabaseClient,
|
|
companyId: string,
|
|
userId: string,
|
|
connectionId: string,
|
|
account: StoredAccount,
|
|
fromDate: string,
|
|
toDate: string,
|
|
ingest: IngestFn = defaultIngest,
|
|
syncOptions?: SyncOptions
|
|
): Promise<SyncResult> {
|
|
console.log('[enable-banking] syncAccountTransactions starting', {
|
|
connectionId,
|
|
accountUid: account.uid,
|
|
accountIban: account.iban,
|
|
fromDate,
|
|
toDate,
|
|
strategy: syncOptions?.strategy,
|
|
})
|
|
|
|
const { transactions, rawPages } = await getAllTransactionsWithRaw(
|
|
account.uid,
|
|
fromDate,
|
|
toDate,
|
|
syncOptions?.strategy,
|
|
)
|
|
|
|
// Log the actual date range returned so we can compare against the requested
|
|
// window. Helps diagnose when an ASPSP truncates history below what we asked for.
|
|
let minBookingDate: string | undefined
|
|
let maxBookingDate: string | undefined
|
|
for (const tx of transactions) {
|
|
const d = tx.booking_date || tx.value_date
|
|
if (!d) continue
|
|
if (!minBookingDate || d < minBookingDate) minBookingDate = d
|
|
if (!maxBookingDate || d > maxBookingDate) maxBookingDate = d
|
|
}
|
|
|
|
console.log('[enable-banking] Fetched transactions from API', {
|
|
connectionId,
|
|
accountUid: account.uid,
|
|
transactionCount: transactions.length,
|
|
rawPageCount: rawPages.length,
|
|
requestedFromDate: fromDate,
|
|
requestedToDate: toDate,
|
|
returnedMinBookingDate: minBookingDate,
|
|
returnedMaxBookingDate: maxBookingDate,
|
|
strategy: syncOptions?.strategy,
|
|
})
|
|
|
|
const bankTransactions = transactions.map(tx => convertTransaction(tx, account.currency))
|
|
|
|
// Derive a stable, content-based external_id per transaction. We deliberately
|
|
// do NOT key off the bank's transaction id (entry_reference/transaction_id):
|
|
// many Swedish ASPSPs regenerate those across requests, so a repeat "synka nu"
|
|
// produced a fresh id and re-imported transactions the user had already
|
|
// booked. buildStableExternalIds derives the id from (account, date, amount)
|
|
// plus an occurrence index, so re-syncs collide on (company_id, external_id)
|
|
// and dedupe while genuinely identical transactions are still kept apart.
|
|
// Normalize the IBAN (strip whitespace, uppercase) so formatting variants
|
|
// from the ASPSP ("SE45 5000 …" vs "SE455000…") don't change the scope and
|
|
// orphan every prior external_id. Falls back to the provider account uid.
|
|
const accountScope = account.iban?.replace(/\s+/g, '').toUpperCase() || account.uid
|
|
const externalIds = buildStableExternalIds(
|
|
'eb',
|
|
accountScope,
|
|
bankTransactions.map((tx) => ({ date: tx.booking_date || tx.date, amount: tx.amount }))
|
|
)
|
|
|
|
// Convert Enable Banking format to generic RawTransaction. counterparty
|
|
// identification: prefer IBAN (international, normalized) over BBAN/BG
|
|
// numbers — the own-account detector matches on IBAN first, falling back
|
|
// to counterparty_account for Swedish domestic transfers.
|
|
const rawTransactions: RawTransaction[] = bankTransactions.map((tx, i) => {
|
|
const cpAccount = tx.counterparty_account ?? null
|
|
const looksLikeIban = cpAccount && /^[A-Z]{2}\d/.test(cpAccount.replace(/\s+/g, ''))
|
|
return {
|
|
date: tx.booking_date || tx.date,
|
|
// tx.description is already non-empty (convertTransaction guarantees a
|
|
// label); the trailing fallbacks are defensive. Ingest re-normalizes.
|
|
description: tx.description || tx.counterparty_name || FALLBACK_DESCRIPTION,
|
|
amount: tx.amount,
|
|
currency: tx.currency || account.currency,
|
|
external_id: externalIds[i],
|
|
mcc_code: tx.merchant_category_code ? parseInt(tx.merchant_category_code, 10) : null,
|
|
merchant_name: tx.counterparty_name || null,
|
|
reference: tx.reference || null,
|
|
bank_connection_id: connectionId,
|
|
import_source: 'enable_banking',
|
|
counterparty_iban: looksLikeIban ? cpAccount!.replace(/\s+/g, '') : null,
|
|
counterparty_account: !looksLikeIban ? cpAccount : null,
|
|
}
|
|
})
|
|
|
|
const ingestOptions: IngestOptions = {}
|
|
if (syncOptions?.skipAutoCategorization) ingestOptions.skipAutoCategorization = true
|
|
if (syncOptions?.rawInsertOnly) ingestOptions.rawInsertOnly = true
|
|
// Per-account ledger routing — the mapping engine consumes settlementAccount
|
|
// for the bank-side leg, falling back to '1930' when unset.
|
|
if (account.ledger_account) ingestOptions.settlementAccount = account.ledger_account
|
|
const ingestResult = await ingest(supabase, companyId, userId, rawTransactions, ingestOptions)
|
|
|
|
console.log('[enable-banking] Ingest result', {
|
|
connectionId,
|
|
accountUid: account.uid,
|
|
imported: ingestResult.imported,
|
|
duplicates: ingestResult.duplicates,
|
|
errors: ingestResult.errors,
|
|
})
|
|
|
|
// Archive raw PSD2 API responses as räkenskapsinformation (BFL 7 kap)
|
|
for (let i = 0; i < rawPages.length; i++) {
|
|
try {
|
|
const fileName = `psd2-response_${connectionId}_${account.uid}_${new Date().toISOString().replace(/[:.]/g, '-')}_p${i + 1}.json`
|
|
const buffer = new TextEncoder().encode(rawPages[i]).buffer as ArrayBuffer
|
|
await uploadDocument(supabase, userId, companyId,
|
|
{ name: fileName, buffer, type: 'application/json' },
|
|
{ upload_source: 'api' }
|
|
)
|
|
} catch (archiveError) {
|
|
console.error(`[enable-banking] Failed to archive raw response page ${i + 1}:`, archiveError)
|
|
// Archival failure must not fail the sync
|
|
}
|
|
}
|
|
|
|
// Update account balance
|
|
try {
|
|
const balance = await getAccountBalance(account.uid)
|
|
account.balance = balance.amount
|
|
account.balance_updated_at = new Date().toISOString()
|
|
} catch {
|
|
// Keep previous balance, don't update timestamp
|
|
}
|
|
|
|
return {
|
|
imported: ingestResult.imported,
|
|
duplicates: ingestResult.duplicates,
|
|
errors: ingestResult.errors,
|
|
returnedMinBookingDate: minBookingDate,
|
|
returnedMaxBookingDate: maxBookingDate,
|
|
}
|
|
}
|