* fix(reports): stabilize fetchAllRows paging to stop doubled/dropped balances (#790, #791) PostgREST `.range()` paging is only correct when the underlying query has a stable TOTAL order. Several aggregating report queries (general ledger, trial balance, grundbok, supplier/AR ledgers, etc.) paginated without `.order()`, so on datasets larger than one 1000-row page Postgres could return rows in a different order between requests — silently DUPLICATING or SKIPPING rows on a page boundary and doubling or dropping financial totals. - fetch-all.ts: document the ordering invariant and add an optional `dedupeBy` defense-in-depth that drops cross-page duplicates and warns when it fires (surfaces a missing `.order()` in logs instead of corrupting money). - Add a stable `.order()` (line PK or account_number) to every paginated query in lib/reports/ and the account-balances route; pass `dedupeBy` on the money-aggregating line queries. - Add fetch-all unit tests and update report test fixtures to carry row ids. Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com> * fix(api): declare the real { data, meta } envelope on v1 single/write/204 endpoints (#794) The OpenAPI generator derives each endpoint's documented body purely from its registered `response.success` Zod schema, and that schema is never validated at runtime — so a route could advertise a shape its handler never sends. #802 fixed this for list endpoints; the same drift was latent on single-resource and write endpoints, which declared the bare resource schema instead of the `{ data, meta }` envelope the handlers actually return. - registry.ts: extend `ResponseMetaSchema` with the optional `audit` block and `partial_expansions` list that writes/expansions emit; add the `NoBodyResponse` sentinel so 204 DELETE handlers document a bare 204 instead of a phantom 200. - Wrap every single/write endpoint's `response.success` in `dataEnvelope(...)` (or `NoBodyResponse` for 204s) across the v1 routes. - Add a response-envelope contract test that fails CI if any JSON endpoint forgets to wrap its schema, with binary downloads and 204s as the only exemptions. Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com> * fix(reports): extend paging dedupeBy to rc-basis-gaps and opening-balances Address PR review: these two money-aggregating line queries already had the stable `.order('id')` (so paging was correct) but didn't carry `id` in the select, so they couldn't use the `dedupeBy` defense-in-depth that general-ledger and trial-balance got. Select `id` and pass `dedupeBy: r => r.id` so the whole report layer applies the ordering invariant consistently. Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com> --------- Co-authored-by: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
216 lines
8.4 KiB
TypeScript
216 lines
8.4 KiB
TypeScript
import type { SupabaseClient } from '@supabase/supabase-js'
|
||
import { fetchAllRows } from '@/lib/supabase/fetch-all'
|
||
import { getOpeningBalances } from './opening-balances'
|
||
import type { TrialBalanceRow } from '@/types'
|
||
|
||
/**
|
||
* Generate trial balance (Saldobalans) for a fiscal period or a date range
|
||
* inside one.
|
||
*
|
||
* Computes IB (ingående balans), period movements, and UB (utgående balans)
|
||
* per BFNAR 2013:2 requirements. Uses the opening_balance_entry set by
|
||
* year-end closing when available; falls back to summing prior-period entries.
|
||
*
|
||
* When `fromDate`/`toDate` are passed, they must lie inside the fiscal
|
||
* period. The function rolls the IB forward from `period_start` to
|
||
* `fromDate − 1` (so "opening" reflects the state at `fromDate`) and limits
|
||
* period activity to `[fromDate, toDate]`. Defaults equal `period_start` and
|
||
* `period_end` — identical to the no-options behaviour.
|
||
*
|
||
* Uses joined queries with pagination to handle any number of entries.
|
||
* Avoids the broken .in(entryIds) pattern that silently truncated at 1000 rows.
|
||
*/
|
||
export async function generateTrialBalance(
|
||
supabase: SupabaseClient,
|
||
companyId: string,
|
||
fiscalPeriodId: string,
|
||
options?: {
|
||
excludeYearEndClosing?: boolean
|
||
fromDate?: string
|
||
toDate?: string
|
||
}
|
||
): Promise<{
|
||
rows: TrialBalanceRow[]
|
||
totalDebit: number
|
||
totalCredit: number
|
||
isBalanced: boolean
|
||
}> {
|
||
|
||
// Fetch period for opening balance computation
|
||
const { data: period } = await supabase
|
||
.from('fiscal_periods')
|
||
.select('period_start, period_end, opening_balance_entry_id')
|
||
.eq('id', fiscalPeriodId)
|
||
.eq('company_id', companyId)
|
||
.single()
|
||
|
||
// ── Opening balances (IB) at period_start ──────────────────────
|
||
const { balances: openingBalances, obEntryId } = await getOpeningBalances(
|
||
supabase, companyId, period
|
||
)
|
||
|
||
// ── Roll IB forward from period_start up to fromDate ───────────
|
||
// When the caller requests a sub-range starting after period_start, the
|
||
// "opening" of that window must include all activity since the period
|
||
// started. We additively fold those lines into openingBalances so the
|
||
// downstream IB/period split stays correct without changing call sites.
|
||
if (
|
||
options?.fromDate &&
|
||
period?.period_start &&
|
||
options.fromDate > period.period_start
|
||
) {
|
||
const priorLines = await fetchAllRows<{
|
||
id: string
|
||
account_number: string
|
||
debit_amount: number
|
||
credit_amount: number
|
||
}>(({ from, to }) => {
|
||
let query = supabase
|
||
.from('journal_entry_lines')
|
||
.select('id, account_number, debit_amount, credit_amount, journal_entries!inner(company_id, fiscal_period_id, status, source_type, entry_date)')
|
||
.eq('journal_entries.company_id', companyId)
|
||
.eq('journal_entries.fiscal_period_id', fiscalPeriodId)
|
||
.in('journal_entries.status', ['posted', 'reversed'])
|
||
.gte('journal_entries.entry_date', period.period_start)
|
||
.lt('journal_entries.entry_date', options.fromDate)
|
||
|
||
if (obEntryId) {
|
||
query = query.neq('journal_entry_id', obEntryId)
|
||
}
|
||
|
||
if (options?.excludeYearEndClosing) {
|
||
query = query.neq('journal_entries.source_type', 'year_end')
|
||
}
|
||
|
||
// Stable total order on the line PK for correct paging (see fetch-all.ts).
|
||
return query.order('id', { ascending: true }).range(from, to)
|
||
}, { dedupeBy: (r) => r.id })
|
||
|
||
for (const line of priorLines) {
|
||
const existing = openingBalances.get(line.account_number) || { debit: 0, credit: 0 }
|
||
existing.debit += Number(line.debit_amount) || 0
|
||
existing.credit += Number(line.credit_amount) || 0
|
||
openingBalances.set(line.account_number, existing)
|
||
}
|
||
}
|
||
|
||
// ── Period lines (excluding opening balance entry) ─────────────
|
||
// If year-end closing set an OB entry, exclude it from period lines so
|
||
// its values aren't double-counted (they're already captured as IB).
|
||
// Race condition note: if year-end closing runs concurrently and sets
|
||
// obEntryId between the period query and this query, the OB entry could
|
||
// be missed from both IB and period. The window is sub-second and the
|
||
// consequence is a single stale report — acceptable.
|
||
const lines = await fetchAllRows<{
|
||
id: string
|
||
account_number: string
|
||
debit_amount: number
|
||
credit_amount: number
|
||
}>(({ from, to }) => {
|
||
let query = supabase
|
||
.from('journal_entry_lines')
|
||
.select('id, account_number, debit_amount, credit_amount, journal_entries!inner(company_id, fiscal_period_id, status, source_type, entry_date)')
|
||
.eq('journal_entries.company_id', companyId)
|
||
.eq('journal_entries.fiscal_period_id', fiscalPeriodId)
|
||
.in('journal_entries.status', ['posted', 'reversed'])
|
||
|
||
// Date filters are only applied when the caller explicitly asks. The
|
||
// period itself is already enforced via the fiscal_period_id join, so
|
||
// adding redundant entry_date bounds for the default case would just
|
||
// increase query complexity (and break older mocks that don't stub gte
|
||
// /lte). The fiscal_period_id constraint plus a CHECK on entry_date in
|
||
// the engine keep activity inside the period.
|
||
if (options?.fromDate) {
|
||
query = query.gte('journal_entries.entry_date', options.fromDate)
|
||
}
|
||
if (options?.toDate) {
|
||
query = query.lte('journal_entries.entry_date', options.toDate)
|
||
}
|
||
|
||
if (obEntryId) {
|
||
query = query.neq('journal_entry_id', obEntryId)
|
||
}
|
||
|
||
if (options?.excludeYearEndClosing) {
|
||
query = query.neq('journal_entries.source_type', 'year_end')
|
||
}
|
||
|
||
// Stable total order on the line PK for correct paging (see fetch-all.ts).
|
||
return query.order('id', { ascending: true }).range(from, to)
|
||
}, { dedupeBy: (r) => r.id })
|
||
|
||
if (lines.length === 0 && openingBalances.size === 0) {
|
||
return { rows: [], totalDebit: 0, totalCredit: 0, isBalanced: true }
|
||
}
|
||
|
||
// Get account names
|
||
const accounts = await fetchAllRows<{
|
||
account_number: string
|
||
account_name: string
|
||
account_class: number
|
||
}>(({ from, to }) =>
|
||
supabase
|
||
.from('chart_of_accounts')
|
||
.select('account_number, account_name, account_class')
|
||
.eq('company_id', companyId)
|
||
.order('account_number', { ascending: true })
|
||
.range(from, to)
|
||
)
|
||
|
||
const accountMap = new Map<string, { name: string; class: number }>()
|
||
for (const acc of accounts) {
|
||
accountMap.set(acc.account_number, {
|
||
name: acc.account_name,
|
||
class: acc.account_class,
|
||
})
|
||
}
|
||
|
||
// Aggregate period activity by account
|
||
const periodBalances = new Map<string, { debit: number; credit: number }>()
|
||
|
||
for (const line of lines) {
|
||
const existing = periodBalances.get(line.account_number) || { debit: 0, credit: 0 }
|
||
existing.debit += Number(line.debit_amount) || 0
|
||
existing.credit += Number(line.credit_amount) || 0
|
||
periodBalances.set(line.account_number, existing)
|
||
}
|
||
|
||
// Merge account numbers from both opening and period
|
||
const allAccountNumbers = new Set([...openingBalances.keys(), ...periodBalances.keys()])
|
||
|
||
// Build rows: IB + period = UB
|
||
const rows: TrialBalanceRow[] = []
|
||
for (const accountNumber of allAccountNumbers) {
|
||
const opening = openingBalances.get(accountNumber) || { debit: 0, credit: 0 }
|
||
const periodActivity = periodBalances.get(accountNumber) || { debit: 0, credit: 0 }
|
||
const accountInfo = accountMap.get(accountNumber) || {
|
||
name: `Konto ${accountNumber}`,
|
||
class: parseInt(accountNumber[0]) || 0,
|
||
}
|
||
|
||
rows.push({
|
||
account_number: accountNumber,
|
||
account_name: accountInfo.name,
|
||
account_class: accountInfo.class,
|
||
opening_debit: Math.round(opening.debit * 100) / 100,
|
||
opening_credit: Math.round(opening.credit * 100) / 100,
|
||
period_debit: Math.round(periodActivity.debit * 100) / 100,
|
||
period_credit: Math.round(periodActivity.credit * 100) / 100,
|
||
closing_debit: Math.round((opening.debit + periodActivity.debit) * 100) / 100,
|
||
closing_credit: Math.round((opening.credit + periodActivity.credit) * 100) / 100,
|
||
})
|
||
}
|
||
|
||
rows.sort((a, b) => a.account_number.localeCompare(b.account_number))
|
||
|
||
const totalDebit = Math.round(rows.reduce((sum, r) => sum + r.closing_debit, 0) * 100) / 100
|
||
const totalCredit = Math.round(rows.reduce((sum, r) => sum + r.closing_credit, 0) * 100) / 100
|
||
|
||
return {
|
||
rows,
|
||
totalDebit,
|
||
totalCredit,
|
||
isBalanced: Math.abs(totalDebit - totalCredit) < 0.01,
|
||
}
|
||
}
|