* feat(dimensions): PR4 reports — dimension-filtered P&L everywhere + Resultat per projekt/kostnadsställe The Project P&L milestone of the dimensions plan (dev_docs §7 PR4). One choke point lights up everything: generateTrialBalance gains options.dimensions (SIE dim → code map) pushed down as jsonb containment (dimensions @>, served by idx_jel_dimensions_gin) on both line queries, with company-wide opening balances dropped when filtered (they cannot be dimension-scoped; P&L-safe by whitelist). Resultatrapport, resultaträkning, huvudbok, monthly-breakdown and the TB drill-down inherit the filter; the KPI route filters only its P&L-side inputs (income statement, months, expense composition) — never cash/VAT. New report lib/reports/dimension-pnl.ts — "Resultat per projekt/ kostnadsställe" (Fortnox Resultatrapport projekt): value-as-column matrix over one dimension with an explicit "(Utan dimension)" bucket computed as the residual against the same trial-balance pass resultatrapport uses, so every row and the Totalt column reconcile with the unfiltered resultatrapport by construction. Registered in REPORT_CATALOG (visible only when dimensions_enabled), slug-routed view + xlsx export. UI: DimensionFilter (dimension + value picker, persistent "Filtrerad — ej fullständig rapport" chip) mounts in FocusedReport for catalog entries flagged dimensions: true; huvudbok rows show line dim codes. Statutory exclusion pinned by TEST, not convention: lib/reports/__tests__/dimension-statutory-guard.test.ts fails if the filter parser leaks into balance sheet, balansrapport, kassaflöde, VAT, SIE or full-archive routes/generators, or if the catalog whitelist widens. MCP: new gnubok_get_dimension_pnl (reports:read); dimensions filter arg on get_trial_balance/get_income_statement/get_general_ledger with resolve-don't-select (names → registry codes, resolution echoes); query_journal totals fixed to aggregate the FULL match set (was silently slice-scoped while claiming otherwise) with an honest totals_scope field, plus group_by / group_by_dimension aggregation. Also: voucher-detail dim-6 badge now uses the registry name instead of the non-standard "PR" abbreviation (#859 review follow-up). Co-Authored-By: Claude Fable 5 <noreply@anthropic.com> * fix(dimensions): address #862 review — export disclosure, prior-column suppression, period-label honesty, route hardening - Filtered XLSX/PDF exports now carry the partial-view disclosure past the file boundary (BFNAR 2013:2): filename suffix (-dim6-p001), a "Filtrerad … — ej fullständig rapport" row on every sheet, and a header note/title line in the PDFs. - Resultatrapport drops the prior-year column when a dimension filter is active — project codes are time-limited under K2/K3, so "this code last year" may be a different project (same rule as narrowed date ranges). - dimension-pnl no longer accepts fromDate: the matrix is cumulative from period_start by design (closing-balance semantics), and the period label now states exactly that instead of echoing a lower bound that was never applied. Routes/MCP tool updated to toDate-only. - dimension-pnl routes 404 on an unknown/foreign period id and cap dim_no to 4 digits (matching the MCP tool's PostgREST-path guard, which the generator now also enforces itself). - Statutory-guard test's generateTrialBalance call-site scan is paren-aware instead of a 300-char window; added fully-untagged and injection-guard test cases. Co-Authored-By: Claude Fable 5 <noreply@anthropic.com> --------- Co-authored-by: Claude Fable 5 <noreply@anthropic.com>
189 lines
5.4 KiB
TypeScript
189 lines
5.4 KiB
TypeScript
import { createClient } from '@/lib/supabase/server'
|
|
import { NextResponse } from 'next/server'
|
|
import { generateIncomeStatement } from '@/lib/reports/income-statement'
|
|
import { requireCompanyId } from '@/lib/company/context'
|
|
import { parseReportDateRange } from '@/lib/reports/date-range'
|
|
import {
|
|
reportToWorkbook,
|
|
textColumn,
|
|
currencyColumn,
|
|
xlsxFilename,
|
|
} from '@/lib/reports/xlsx-export'
|
|
import type { IncomeStatementSection } from '@/types'
|
|
import { parseDimensionFilterParams, dimensionFilterDisclosure, dimensionFilterFileSuffix } from '@/lib/reports/dimension-filter'
|
|
|
|
interface FlatRow {
|
|
section: string
|
|
account_number: string
|
|
account_name: string
|
|
amount: number
|
|
}
|
|
|
|
function flatten(
|
|
sections: IncomeStatementSection[],
|
|
groupLabel: string,
|
|
groupTotalLabel: string,
|
|
groupTotal: number,
|
|
): FlatRow[] {
|
|
const rows: FlatRow[] = []
|
|
for (const s of sections) {
|
|
for (const r of s.rows) {
|
|
rows.push({
|
|
section: s.title,
|
|
account_number: r.account_number,
|
|
account_name: r.account_name,
|
|
amount: r.amount,
|
|
})
|
|
}
|
|
rows.push({
|
|
section: s.title,
|
|
account_number: '',
|
|
account_name: `Summa ${s.title}`,
|
|
amount: s.subtotal,
|
|
})
|
|
}
|
|
rows.push({
|
|
section: groupLabel,
|
|
account_number: '',
|
|
account_name: groupTotalLabel,
|
|
amount: groupTotal,
|
|
})
|
|
return rows
|
|
}
|
|
|
|
export async function GET(request: Request) {
|
|
const supabase = await createClient()
|
|
const { data: { user } } = await supabase.auth.getUser()
|
|
|
|
if (!user) {
|
|
return NextResponse.json({ error: 'Unauthorized' }, { status: 401 })
|
|
}
|
|
|
|
const companyId = await requireCompanyId(supabase, user.id)
|
|
|
|
const { searchParams } = new URL(request.url)
|
|
const periodId = searchParams.get('period_id')
|
|
|
|
if (!periodId) {
|
|
return NextResponse.json({ error: 'period_id is required' }, { status: 400 })
|
|
}
|
|
|
|
const [{ data: period }, { data: companyRow }] = await Promise.all([
|
|
supabase
|
|
.from('fiscal_periods')
|
|
.select('period_start, period_end')
|
|
.eq('id', periodId)
|
|
.eq('company_id', companyId)
|
|
.single(),
|
|
supabase
|
|
.from('company_settings')
|
|
.select('company_name')
|
|
.eq('company_id', companyId)
|
|
.single(),
|
|
])
|
|
|
|
if (!period) {
|
|
return NextResponse.json({ error: 'Räkenskapsperioden kunde inte läsas.' }, { status: 400 })
|
|
}
|
|
|
|
const parsedRange = parseReportDateRange(searchParams, period)
|
|
if (!parsedRange.ok) {
|
|
return NextResponse.json({ error: parsedRange.error }, { status: 400 })
|
|
}
|
|
const range = parsedRange.range
|
|
const effectiveEnd = range.toDate ?? period.period_end
|
|
|
|
const dimFilter = parseDimensionFilterParams(searchParams)
|
|
if (!dimFilter.ok) {
|
|
return NextResponse.json({ error: dimFilter.error }, { status: 400 })
|
|
}
|
|
|
|
try {
|
|
const report = await generateIncomeStatement(supabase, companyId, periodId, {
|
|
...range,
|
|
dimensions: dimFilter.dimensions,
|
|
})
|
|
|
|
const revenueRows = flatten(
|
|
report.revenue_sections,
|
|
'Rörelseintäkter',
|
|
'Summa rörelseintäkter',
|
|
report.total_revenue,
|
|
)
|
|
const expenseRows = flatten(
|
|
report.expense_sections,
|
|
'Rörelsekostnader',
|
|
'Summa rörelsekostnader',
|
|
report.total_expenses,
|
|
)
|
|
const financialRows = flatten(
|
|
report.financial_sections,
|
|
'Finansiella poster',
|
|
'Summa finansiella poster',
|
|
report.total_financial,
|
|
)
|
|
|
|
const summaryRows: FlatRow[] = [
|
|
{
|
|
section: 'Sammanfattning',
|
|
account_number: '',
|
|
account_name: 'Rörelseresultat',
|
|
amount: Math.round((report.total_revenue - report.total_expenses) * 100) / 100,
|
|
},
|
|
{
|
|
section: 'Sammanfattning',
|
|
account_number: '',
|
|
account_name: 'Årets resultat',
|
|
amount: report.net_result,
|
|
},
|
|
]
|
|
|
|
const columns = [
|
|
textColumn('Sektion'),
|
|
textColumn('Konto'),
|
|
textColumn('Kontonamn'),
|
|
currencyColumn('Belopp'),
|
|
]
|
|
const mapRow = (r: FlatRow) => [r.section, r.account_number, r.account_name, r.amount]
|
|
|
|
// Partial-view disclosure on every sheet — any tab opened alone must
|
|
// still identify the export as filtered (BFNAR 2013:2).
|
|
const disclosure = dimensionFilterDisclosure(dimFilter.dimensions)
|
|
if (disclosure) {
|
|
const note: FlatRow = {
|
|
section: disclosure,
|
|
account_number: '',
|
|
account_name: '',
|
|
amount: null as unknown as number,
|
|
}
|
|
for (const sheetRows of [revenueRows, expenseRows, financialRows, summaryRows]) {
|
|
sheetRows.unshift(note)
|
|
}
|
|
}
|
|
|
|
const buffer = reportToWorkbook<FlatRow>([
|
|
{ name: 'Intäkter', columns, rows: revenueRows, mapRow },
|
|
{ name: 'Kostnader', columns, rows: expenseRows, mapRow },
|
|
{ name: 'Finansiella poster', columns, rows: financialRows, mapRow },
|
|
{ name: 'Sammanfattning', columns, rows: summaryRows, mapRow },
|
|
])
|
|
|
|
const filename = xlsxFilename(
|
|
`resultatrakning${dimensionFilterFileSuffix(dimFilter.dimensions)}`,
|
|
companyRow?.company_name ?? '',
|
|
effectiveEnd,
|
|
)
|
|
return new NextResponse(new Uint8Array(buffer), {
|
|
headers: {
|
|
'Content-Type': 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet',
|
|
'Content-Disposition': `attachment; filename="${filename}"`,
|
|
},
|
|
})
|
|
} catch (err) {
|
|
return NextResponse.json(
|
|
{ error: err instanceof Error ? err.message : 'Kunde inte generera resultaträkning' },
|
|
{ status: 500 }
|
|
)
|
|
}
|
|
}
|