* 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>
146 lines
5.1 KiB
TypeScript
146 lines
5.1 KiB
TypeScript
import type { SupabaseClient } from '@supabase/supabase-js'
|
|
import { fetchEntryLines, type EntryLinesQuery } from '@/lib/bookkeeping/entry-lines'
|
|
|
|
export interface MonthlyBreakdownMonth {
|
|
label: string
|
|
income: number
|
|
expenses: number
|
|
net: number
|
|
}
|
|
|
|
export interface MonthlyBreakdown {
|
|
months: MonthlyBreakdownMonth[]
|
|
}
|
|
|
|
const MONTH_LABELS = [
|
|
'Jan', 'Feb', 'Mar', 'Apr', 'Maj', 'Jun',
|
|
'Jul', 'Aug', 'Sep', 'Okt', 'Nov', 'Dec',
|
|
]
|
|
|
|
/**
|
|
* Generate monthly income vs expenses breakdown for a fiscal period.
|
|
*
|
|
* Groups posted journal entry lines by month and account class:
|
|
* - Class 3 (30xx) = revenue (credit side)
|
|
* - Class 4-7 (40xx-79xx) = expenses (debit side)
|
|
*/
|
|
export async function generateMonthlyBreakdown(
|
|
supabase: SupabaseClient,
|
|
companyId: string,
|
|
fiscalPeriodId: string,
|
|
options?: {
|
|
/** SIE dim → code filter ({"6":"P001"}). Without it a dimension-scoped
|
|
* KPI view would silently chart company-wide months. */
|
|
dimensions?: Record<string, string>
|
|
}
|
|
): Promise<MonthlyBreakdown> {
|
|
|
|
// Get the fiscal period date range
|
|
const { data: period, error: periodError } = await supabase
|
|
.from('fiscal_periods')
|
|
.select('period_start, period_end')
|
|
.eq('id', fiscalPeriodId)
|
|
.eq('company_id', companyId)
|
|
.single()
|
|
|
|
if (periodError || !period) {
|
|
return { months: [] }
|
|
}
|
|
|
|
// Get all posted journal entry lines for this period with their entry dates,
|
|
// via the two-step entry-lines fetch (see lib/bookkeeping/entry-lines.ts).
|
|
// eslint-disable-next-line @typescript-eslint/no-explicit-any
|
|
let lines: any[]
|
|
try {
|
|
lines = await fetchEntryLines({
|
|
supabase,
|
|
entryColumns: 'entry_date, status, company_id, fiscal_period_id',
|
|
lineColumns: 'account_number, debit_amount, credit_amount',
|
|
filterEntries: (q: EntryLinesQuery) =>
|
|
q
|
|
.eq('fiscal_period_id', fiscalPeriodId)
|
|
.eq('company_id', companyId)
|
|
.eq('status', 'posted'),
|
|
filterLines:
|
|
options?.dimensions && Object.keys(options.dimensions).length > 0
|
|
? // jsonb containment (@>): served by idx_jel_dimensions_gin.
|
|
(q: EntryLinesQuery) => q.contains('dimensions', options.dimensions)
|
|
: undefined,
|
|
// The old embed was aliased: journal_entry:journal_entries!inner(...).
|
|
attachEntriesAs: 'journal_entry',
|
|
})
|
|
} catch {
|
|
return { months: [] }
|
|
}
|
|
|
|
// Build monthly aggregates using year-aware keys ("2024-03", "2024-04", etc.)
|
|
// to avoid data corruption for non-calendar fiscal years (e.g., Apr-Mar)
|
|
const monthMap = new Map<string, { year: number; month: number; income: number; expenses: number }>()
|
|
|
|
// Initialize all months in the period range
|
|
const startDate = new Date(period.period_start)
|
|
const endDate = new Date(period.period_end)
|
|
|
|
for (
|
|
let y = startDate.getFullYear(), m = startDate.getMonth();
|
|
y < endDate.getFullYear() || (y === endDate.getFullYear() && m <= endDate.getMonth());
|
|
m === 11 ? (y++, m = 0) : m++
|
|
) {
|
|
const key = `${y}-${String(m).padStart(2, '0')}`
|
|
monthMap.set(key, { year: y, month: m, income: 0, expenses: 0 })
|
|
}
|
|
|
|
for (const line of lines) {
|
|
const entry = line.journal_entry as {
|
|
entry_date: string
|
|
status: string
|
|
company_id: string
|
|
fiscal_period_id: string
|
|
}
|
|
const accountClass = parseInt(line.account_number.charAt(0))
|
|
const entryDate = new Date(entry.entry_date)
|
|
const key = `${entryDate.getFullYear()}-${String(entryDate.getMonth()).padStart(2, '0')}`
|
|
|
|
if (!monthMap.has(key)) {
|
|
monthMap.set(key, { year: entryDate.getFullYear(), month: entryDate.getMonth(), income: 0, expenses: 0 })
|
|
}
|
|
|
|
const bucket = monthMap.get(key)!
|
|
|
|
if (accountClass === 3) {
|
|
// Revenue accounts: credit side represents revenue
|
|
bucket.income = Math.round((bucket.income + line.credit_amount - line.debit_amount) * 100) / 100
|
|
} else if (accountClass >= 4 && accountClass <= 7) {
|
|
// Expense accounts: debit side represents expenses
|
|
bucket.expenses = Math.round((bucket.expenses + line.debit_amount - line.credit_amount) * 100) / 100
|
|
} else if (accountClass === 8 && line.account_number !== '8999') {
|
|
// Financial items (class 8): interest, exchange gains/losses, etc.
|
|
// 8999 "Årets resultat" is a year-end closing account: its debit/credit
|
|
// mirrors the computed profit, so including it here would cancel the
|
|
// period's income-vs-expense signal on the month of closing.
|
|
const amount = line.credit_amount - line.debit_amount
|
|
if (amount >= 0) {
|
|
bucket.income = Math.round((bucket.income + amount) * 100) / 100
|
|
} else {
|
|
bucket.expenses = Math.round((bucket.expenses + Math.abs(amount)) * 100) / 100
|
|
}
|
|
}
|
|
}
|
|
|
|
// Convert to sorted array (keys sort naturally as "YYYY-MM")
|
|
const months: MonthlyBreakdownMonth[] = []
|
|
const sortedKeys = Array.from(monthMap.keys()).sort()
|
|
|
|
for (const key of sortedKeys) {
|
|
const data = monthMap.get(key)!
|
|
months.push({
|
|
label: MONTH_LABELS[data.month],
|
|
income: data.income,
|
|
expenses: data.expenses,
|
|
net: Math.round((data.income - data.expenses) * 100) / 100,
|
|
})
|
|
}
|
|
|
|
return { months }
|
|
}
|