* fix(reports): drive report line queries from journal_entries, not the unfiltered lines side
Every report generator fetched journal_entry_lines with a
journal_entries!inner(...) embed and put the tenant filter on the
embedded side (.eq('journal_entries.company_id', ...)). PostgREST
compiles that to a correlated INNER JOIN LATERAL with a parameterized
LIMIT inside, which blocks join reordering: Postgres walked the ENTIRE
journal_entry_lines table (603k rows, all tenants) per report query.
Measured in production: 13.6 s vs 2.7 ms for the equivalent plain join,
against Supabase's 8 s statement_timeout; nightly cloud backups failed
for 5 of 11 companies on 2026-07-09 and a GL report 500'd.
Introduce lib/bookkeeping/entry-lines.ts with a shared two-step fetch:
1. fetch matching journal_entries (id + caller-selected columns)
filtered by company_id / fiscal_period_id / status / entry_date /
source_type, paginated via fetchAllRows;
2. fetch journal_entry_lines with .in('journal_entry_id', chunk) in
chunks of 100 ids (URL-length safety), paginated per chunk;
3. reattach the parent entry to each line under the embed's key shape
(line.journal_entries = {...}, aliasable) and sort lines by id
ascending to preserve the old .order('id') semantics.
Converted call sites (selected columns and filters preserved):
trial-balance (x2), general-ledger, journal-register, sie-export
(reuses its existing entry list via fetchLinesByEntryIds),
vat-declaration, dimension-pnl, opening-balances, monthly-breakdown,
periodisk-sammanstallning, rc-basis-gaps (sibling-line fetch now also
chunked), ar-reconciliation, supplier-reconciliation,
bank-reconciliation, asset-service (x2), bolagsskatt-calculator,
sarskild-loneskatt-calculator.
Tests: unit tests for the helper (chunk size, reattachment shape,
forced id/journal_entry_id columns, empty result, cross-chunk sort,
error propagation); existing report/reconciliation/bokslut test mocks
updated to the two-step query shape, preserving every assertion about
report output.
From the 2026-07-09 production log triage.
Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>
* fix(reports): stop echoing raw error messages from the general-ledger route
The catch handler returned err.message to the client in
details.reason; internal error strings (SQL fragments, table names,
timeout messages) must not reach the browser. The error is already
logged server-side with the request id, so the client envelope keeps
only the REPORT_GENERATION_FAILED code.
From the 2026-07-09 production log triage.
Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>
---------
Co-authored-by: Claude Fable 5 <noreply@anthropic.com>
234 lines
7.8 KiB
TypeScript
234 lines
7.8 KiB
TypeScript
import type { SupabaseClient } from '@supabase/supabase-js'
|
|
import { fetchAllRows } from '@/lib/supabase/fetch-all'
|
|
import { fetchEntryLines, type EntryLinesQuery } from '@/lib/bookkeeping/entry-lines'
|
|
import { getOpeningBalances } from './opening-balances'
|
|
|
|
export interface GeneralLedgerLine {
|
|
date: string
|
|
voucher_series: string
|
|
voucher_number: number
|
|
journal_entry_id: string
|
|
description: string
|
|
source_type: string
|
|
debit: number
|
|
credit: number
|
|
balance: number
|
|
/** SIE dim → code tags on the line; omitted when untagged. */
|
|
dimensions?: Record<string, string>
|
|
}
|
|
|
|
export interface GeneralLedgerAccount {
|
|
account_number: string
|
|
account_name: string
|
|
opening_balance: number
|
|
lines: GeneralLedgerLine[]
|
|
closing_balance: number
|
|
total_debit: number
|
|
total_credit: number
|
|
}
|
|
|
|
export interface GeneralLedgerReport {
|
|
accounts: GeneralLedgerAccount[]
|
|
period: { start: string; end: string }
|
|
}
|
|
|
|
/**
|
|
* Generate general ledger (huvudbok) for a fiscal period.
|
|
* BFL 5 kap. 1 §: systematisk ordning: all transactions grouped by account.
|
|
*
|
|
* Uses the shared two-step entry-lines fetch (lib/bookkeeping/entry-lines.ts):
|
|
* entries first, then lines chunked by entry id, both paginated, so any
|
|
* number of entries is handled without the pathological journal_entries!inner
|
|
* embed plan.
|
|
*
|
|
* Opening balances use the opening_balance_entry set by year-end closing
|
|
* when available; falls back to summing prior-period entries.
|
|
*
|
|
* The account range filter (accountFrom/accountTo) is applied post-hoc
|
|
* during result building, not in the queries. Opening balances are computed
|
|
* for all accounts: the wasted Map entries for filtered-out accounts are
|
|
* trivially cheap compared to the cost of the queries themselves.
|
|
*/
|
|
export async function generateGeneralLedger(
|
|
supabase: SupabaseClient,
|
|
companyId: string,
|
|
periodId: string,
|
|
accountFrom?: string,
|
|
accountTo?: string,
|
|
options?: {
|
|
/** SIE dim → code filter ({"6":"P001"}). Opening balances are dropped
|
|
* when set: they are company-wide and cannot be dimension-scoped. */
|
|
dimensions?: Record<string, string>
|
|
}
|
|
): Promise<GeneralLedgerReport> {
|
|
const dimensionFilter =
|
|
options?.dimensions && Object.keys(options.dimensions).length > 0
|
|
? options.dimensions
|
|
: undefined
|
|
|
|
// Get fiscal period dates and opening_balance_entry_id
|
|
const { data: period } = await supabase
|
|
.from('fiscal_periods')
|
|
.select('period_start, period_end, opening_balance_entry_id')
|
|
.eq('id', periodId)
|
|
.eq('company_id', companyId)
|
|
.single()
|
|
|
|
if (!period) {
|
|
return { accounts: [], period: { start: '', end: '' } }
|
|
}
|
|
|
|
// ── Opening balances (IB) ──────────────────────────────────────
|
|
const { balances: openingByAccount, obEntryId } = await getOpeningBalances(
|
|
supabase, companyId, period
|
|
)
|
|
|
|
// Convert to net balance (debit - credit) for GL running balance
|
|
const openingBalances = new Map<string, number>()
|
|
if (!dimensionFilter) {
|
|
for (const [accNum, { debit, credit }] of openingByAccount) {
|
|
openingBalances.set(accNum, debit - credit)
|
|
}
|
|
}
|
|
|
|
// ── Period lines via the two-step entry-lines fetch (excluding OB entry) ──
|
|
// Race condition note: if year-end closing runs concurrently and creates
|
|
// the OB entry between the period query and this query, the entry could
|
|
// be missed. The window is sub-second and the consequence is a single
|
|
// stale report: acceptable.
|
|
const rawLines = await fetchEntryLines<{
|
|
id: string
|
|
account_number: string
|
|
debit_amount: number
|
|
credit_amount: number
|
|
journal_entry_id: string
|
|
dimensions: Record<string, string> | null
|
|
journal_entries: {
|
|
entry_date: string
|
|
voucher_number: number
|
|
voucher_series: string
|
|
description: string
|
|
source_type: string
|
|
}
|
|
}>({
|
|
supabase,
|
|
entryColumns:
|
|
'entry_date, voucher_number, voucher_series, description, source_type, company_id, fiscal_period_id, status',
|
|
lineColumns:
|
|
'id, account_number, debit_amount, credit_amount, journal_entry_id, dimensions',
|
|
filterEntries: (q: EntryLinesQuery) => {
|
|
let query = q
|
|
.eq('company_id', companyId)
|
|
.eq('fiscal_period_id', periodId)
|
|
.in('status', ['posted', 'reversed'])
|
|
|
|
if (obEntryId) {
|
|
query = query.neq('id', obEntryId)
|
|
}
|
|
|
|
return query
|
|
},
|
|
filterLines: dimensionFilter
|
|
? // jsonb containment (@>): served by idx_jel_dimensions_gin.
|
|
(q: EntryLinesQuery) => q.contains('dimensions', dimensionFilter)
|
|
: undefined,
|
|
})
|
|
|
|
if (rawLines.length === 0 && openingBalances.size === 0) {
|
|
return { accounts: [], period: { start: period.period_start, end: period.period_end } }
|
|
}
|
|
|
|
// Fetch account names
|
|
const accounts = await fetchAllRows<{ account_number: string; account_name: string }>(({ from, to }) =>
|
|
supabase
|
|
.from('chart_of_accounts')
|
|
.select('account_number, account_name')
|
|
.eq('company_id', companyId)
|
|
.order('account_number', { ascending: true })
|
|
.range(from, to)
|
|
)
|
|
|
|
const accountNameMap = new Map<string, string>()
|
|
for (const acc of accounts) {
|
|
accountNameMap.set(acc.account_number, acc.account_name)
|
|
}
|
|
|
|
// Group lines by account
|
|
const accountLines = new Map<string, GeneralLedgerLine[]>()
|
|
|
|
for (const line of rawLines) {
|
|
const entry = line.journal_entries
|
|
const accNum = line.account_number
|
|
if (!accountLines.has(accNum)) {
|
|
accountLines.set(accNum, [])
|
|
}
|
|
|
|
const hasDims = line.dimensions && Object.keys(line.dimensions).length > 0
|
|
|
|
accountLines.get(accNum)!.push({
|
|
date: entry.entry_date,
|
|
voucher_series: entry.voucher_series || 'A',
|
|
voucher_number: entry.voucher_number,
|
|
journal_entry_id: line.journal_entry_id,
|
|
description: entry.description || '',
|
|
source_type: entry.source_type || '',
|
|
debit: Math.round((Number(line.debit_amount) || 0) * 100) / 100,
|
|
credit: Math.round((Number(line.credit_amount) || 0) * 100) / 100,
|
|
balance: 0, // computed below
|
|
...(hasDims ? { dimensions: line.dimensions as Record<string, string> } : {}),
|
|
})
|
|
}
|
|
|
|
// Include accounts that have opening balance but no period lines
|
|
for (const [accNum, balance] of openingBalances) {
|
|
if (!accountLines.has(accNum) && Math.abs(balance) > 0.005) {
|
|
accountLines.set(accNum, [])
|
|
}
|
|
}
|
|
|
|
// Build account summaries
|
|
const result: GeneralLedgerAccount[] = []
|
|
|
|
for (const [accNum, accLines] of accountLines) {
|
|
// Apply optional account range filter
|
|
if (accountFrom && accNum < accountFrom) continue
|
|
if (accountTo && accNum > accountTo) continue
|
|
|
|
// Sort by date, then voucher number
|
|
accLines.sort((a, b) => {
|
|
const dateCompare = a.date.localeCompare(b.date)
|
|
if (dateCompare !== 0) return dateCompare
|
|
return a.voucher_number - b.voucher_number
|
|
})
|
|
|
|
const opening = Math.round((openingBalances.get(accNum) || 0) * 100) / 100
|
|
let runningBalance = opening
|
|
|
|
for (const line of accLines) {
|
|
runningBalance += line.debit - line.credit
|
|
line.balance = Math.round(runningBalance * 100) / 100
|
|
}
|
|
|
|
const totalDebit = accLines.reduce((sum, l) => sum + l.debit, 0)
|
|
const totalCredit = accLines.reduce((sum, l) => sum + l.credit, 0)
|
|
|
|
result.push({
|
|
account_number: accNum,
|
|
account_name: accountNameMap.get(accNum) || `Konto ${accNum}`,
|
|
opening_balance: opening,
|
|
lines: accLines,
|
|
closing_balance: Math.round((opening + totalDebit - totalCredit) * 100) / 100,
|
|
total_debit: Math.round(totalDebit * 100) / 100,
|
|
total_credit: Math.round(totalCredit * 100) / 100,
|
|
})
|
|
}
|
|
|
|
// Sort by account number
|
|
result.sort((a, b) => a.account_number.localeCompare(b.account_number))
|
|
|
|
return {
|
|
accounts: result,
|
|
period: { start: period.period_start, end: period.period_end },
|
|
}
|
|
}
|