* 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>
144 lines
4.7 KiB
TypeScript
144 lines
4.7 KiB
TypeScript
import type { SupabaseClient } from '@supabase/supabase-js'
|
|
import { fetchAllRows } from '@/lib/supabase/fetch-all'
|
|
|
|
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
|
|
): 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
|
|
// eslint-disable-next-line @typescript-eslint/no-explicit-any
|
|
let lines: any[]
|
|
try {
|
|
lines = await fetchAllRows(({ from, to }) =>
|
|
supabase
|
|
.from('journal_entry_lines')
|
|
.select(`
|
|
account_number,
|
|
debit_amount,
|
|
credit_amount,
|
|
journal_entry:journal_entries!inner(
|
|
entry_date,
|
|
status,
|
|
company_id,
|
|
fiscal_period_id
|
|
)
|
|
`)
|
|
.eq('journal_entries.fiscal_period_id', fiscalPeriodId)
|
|
.eq('journal_entries.company_id', companyId)
|
|
.eq('journal_entries.status', 'posted')
|
|
// Stable total order for correct paging (see fetch-all.ts).
|
|
.order('id', { ascending: true })
|
|
.range(from, to)
|
|
)
|
|
} 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 }
|
|
}
|