fce6faff2c
* 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>
212 lines
7.3 KiB
TypeScript
212 lines
7.3 KiB
TypeScript
import type { SupabaseClient } from '@supabase/supabase-js'
|
|
import { fetchAllRows } from '@/lib/supabase/fetch-all'
|
|
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
|
|
}
|
|
|
|
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 joined queries with pagination to handle any number of entries.
|
|
* Avoids the broken .in(entryIds) pattern that silently truncated at 1000 rows.
|
|
*
|
|
* 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
|
|
): Promise<GeneralLedgerReport> {
|
|
|
|
// 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>()
|
|
for (const [accNum, { debit, credit }] of openingByAccount) {
|
|
openingBalances.set(accNum, debit - credit)
|
|
}
|
|
|
|
// ── Period lines via joined query (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.
|
|
// Supabase types !inner joins as arrays; for many-to-one (line → entry)
|
|
// it returns a single object at runtime. Cast via `as any` on the query.
|
|
const rawLines = await fetchAllRows<{
|
|
id: string
|
|
account_number: string
|
|
debit_amount: number
|
|
credit_amount: number
|
|
journal_entry_id: string
|
|
journal_entries: {
|
|
entry_date: string
|
|
voucher_number: number
|
|
voucher_series: string
|
|
description: string
|
|
source_type: string
|
|
}
|
|
}>(({ from, to }) => {
|
|
let query = supabase
|
|
.from('journal_entry_lines')
|
|
.select('id, account_number, debit_amount, credit_amount, journal_entry_id, journal_entries!inner(entry_date, voucher_number, voucher_series, description, source_type, company_id, fiscal_period_id, status)')
|
|
.eq('journal_entries.company_id', companyId)
|
|
.eq('journal_entries.fiscal_period_id', periodId)
|
|
.in('journal_entries.status', ['posted', 'reversed'])
|
|
|
|
if (obEntryId) {
|
|
query = query.neq('journal_entry_id', obEntryId)
|
|
}
|
|
|
|
// Stable total order on the line PK — paging is only correct with a
|
|
// deterministic order, else rows duplicate/skip across pages and balances
|
|
// double or accounts vanish (see fetch-all.ts ordering invariant). The
|
|
// report re-sorts lines per account below, so this order is invisible.
|
|
// eslint-disable-next-line @typescript-eslint/no-explicit-any
|
|
return query.order('id', { ascending: true }).range(from, to) as any
|
|
}, { dedupeBy: (r) => r.id })
|
|
|
|
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, [])
|
|
}
|
|
|
|
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
|
|
})
|
|
}
|
|
|
|
// 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 },
|
|
}
|
|
}
|