* 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>
169 lines
5.8 KiB
TypeScript
169 lines
5.8 KiB
TypeScript
import { describe, it, expect, vi, beforeEach } from 'vitest'
|
|
|
|
// ============================================================
|
|
// Dimension-filtered trial balance (dimensions PR4).
|
|
//
|
|
// Table-keyed FIFO mock like trial-balance.test.ts, extended with
|
|
// `contains`/`not` and per-table call capture so the jsonb containment
|
|
// pushdown is assertable.
|
|
// ============================================================
|
|
|
|
type MockResult = { data?: unknown; error?: unknown }
|
|
let mockResults: Record<string, MockResult[]>
|
|
let containsCalls: { table: string; column: string; value: unknown }[]
|
|
|
|
function makeBuilder(tableName: string) {
|
|
const b: Record<string, unknown> = {}
|
|
for (const m of ['select', 'eq', 'in', 'lt', 'lte', 'gte', 'neq', 'not', 'order', 'range']) {
|
|
b[m] = vi.fn().mockReturnValue(b)
|
|
}
|
|
b.contains = vi.fn().mockImplementation((column: string, value: unknown) => {
|
|
containsCalls.push({ table: tableName, column, value })
|
|
return b
|
|
})
|
|
const consume = (): MockResult => {
|
|
const queue = mockResults[tableName]
|
|
if (!queue || queue.length === 0) {
|
|
// The two-step entry-lines fetch (lib/bookkeeping/entry-lines.ts) reads
|
|
// journal_entries before journal_entry_lines. Tests queue line rows
|
|
// directly, so default the entries step to one generic entry.
|
|
if (tableName === 'journal_entries') {
|
|
return { data: [{ id: 'entry-1' }], error: null }
|
|
}
|
|
return { data: null, error: null }
|
|
}
|
|
return queue.shift()!
|
|
}
|
|
b.single = vi.fn().mockImplementation(async () => consume())
|
|
b.maybeSingle = vi.fn().mockImplementation(async () => consume())
|
|
b.then = (resolve: (v: unknown) => void) => resolve(consume())
|
|
return b
|
|
}
|
|
|
|
function makeClient() {
|
|
return {
|
|
from: vi.fn().mockImplementation((table: string) => makeBuilder(table)),
|
|
rpc: vi.fn().mockResolvedValue({ data: [], error: null }),
|
|
// eslint-disable-next-line @typescript-eslint/no-explicit-any
|
|
} as any
|
|
}
|
|
|
|
vi.mock('../opening-balances', () => ({
|
|
getOpeningBalances: vi.fn(),
|
|
}))
|
|
|
|
import { generateTrialBalance } from '../trial-balance'
|
|
import { getOpeningBalances } from '../opening-balances'
|
|
|
|
const mockOpeningBalances = vi.mocked(getOpeningBalances)
|
|
|
|
let supabase: ReturnType<typeof makeClient>
|
|
|
|
beforeEach(() => {
|
|
vi.clearAllMocks()
|
|
mockResults = {}
|
|
containsCalls = []
|
|
supabase = makeClient()
|
|
})
|
|
|
|
const PERIOD = { period_start: '2026-01-01', period_end: '2026-12-31', opening_balance_entry_id: null }
|
|
|
|
function seedCommon() {
|
|
mockResults = {
|
|
fiscal_periods: [{ data: PERIOD, error: null }],
|
|
journal_entry_lines: [
|
|
{
|
|
data: [
|
|
{ id: 'l1', account_number: '3001', debit_amount: 0, credit_amount: 500 },
|
|
{ id: 'l2', account_number: '1930', debit_amount: 500, credit_amount: 0 },
|
|
],
|
|
error: null,
|
|
},
|
|
],
|
|
chart_of_accounts: [
|
|
{
|
|
data: [
|
|
{ account_number: '1930', account_name: 'Företagskonto', account_class: 1 },
|
|
{ account_number: '3001', account_name: 'Försäljning', account_class: 3 },
|
|
],
|
|
error: null,
|
|
},
|
|
],
|
|
}
|
|
}
|
|
|
|
describe('generateTrialBalance: dimensions option', () => {
|
|
it('pushes the filter down as jsonb containment on the line query', async () => {
|
|
seedCommon()
|
|
mockOpeningBalances.mockResolvedValue({ balances: new Map(), obEntryId: null })
|
|
|
|
await generateTrialBalance(supabase, 'company-1', 'period-1', {
|
|
dimensions: { '6': 'P001' },
|
|
})
|
|
|
|
expect(containsCalls).toEqual([
|
|
{ table: 'journal_entry_lines', column: 'dimensions', value: { '6': 'P001' } },
|
|
])
|
|
})
|
|
|
|
it('does not touch the query when no filter is passed (back-compat)', async () => {
|
|
seedCommon()
|
|
mockOpeningBalances.mockResolvedValue({ balances: new Map(), obEntryId: null })
|
|
|
|
await generateTrialBalance(supabase, 'company-1', 'period-1')
|
|
|
|
expect(containsCalls).toEqual([])
|
|
})
|
|
|
|
it('treats an empty filter object as no filter', async () => {
|
|
seedCommon()
|
|
mockOpeningBalances.mockResolvedValue({ balances: new Map(), obEntryId: null })
|
|
|
|
await generateTrialBalance(supabase, 'company-1', 'period-1', { dimensions: {} })
|
|
|
|
expect(containsCalls).toEqual([])
|
|
})
|
|
|
|
it('drops company-wide opening balances when filtered: amounts are dimension-scoped activity only', async () => {
|
|
seedCommon()
|
|
// Company-wide IB on 1930 that CANNOT be dimension-scoped.
|
|
mockOpeningBalances.mockResolvedValue({
|
|
balances: new Map([['1930', { debit: 9000, credit: 0 }]]),
|
|
obEntryId: null,
|
|
})
|
|
|
|
const filtered = await generateTrialBalance(supabase, 'company-1', 'period-1', {
|
|
dimensions: { '6': 'P001' },
|
|
})
|
|
|
|
const bank = filtered.rows.find((r) => r.account_number === '1930')
|
|
expect(bank?.opening_debit).toBe(0)
|
|
expect(bank?.closing_debit).toBe(500) // period activity only
|
|
|
|
// Unfiltered keeps the IB (control).
|
|
seedCommon()
|
|
const unfiltered = await generateTrialBalance(supabase, 'company-1', 'period-1')
|
|
const bank2 = unfiltered.rows.find((r) => r.account_number === '1930')
|
|
expect(bank2?.opening_debit).toBe(9000)
|
|
expect(bank2?.closing_debit).toBe(9500)
|
|
})
|
|
|
|
it('applies the filter to the IB roll-forward query too (fromDate sub-range)', async () => {
|
|
seedCommon()
|
|
// Roll-forward query consumes the first journal_entry_lines result; add a
|
|
// second for the period query.
|
|
mockResults.journal_entry_lines.push({ data: [], error: null })
|
|
mockOpeningBalances.mockResolvedValue({ balances: new Map(), obEntryId: null })
|
|
|
|
await generateTrialBalance(supabase, 'company-1', 'period-1', {
|
|
fromDate: '2026-06-01',
|
|
dimensions: { '1': 'KS01' },
|
|
})
|
|
|
|
// Both line queries (roll-forward + period) carry the containment filter.
|
|
expect(containsCalls).toHaveLength(2)
|
|
expect(containsCalls.every((c) => c.column === 'dimensions')).toBe(true)
|
|
expect(containsCalls.every((c) => JSON.stringify(c.value) === '{"1":"KS01"}')).toBe(true)
|
|
})
|
|
})
|