* feat(dimensions): PR10 advanced — custom dimensions, hierarchy, account rules, commit enforcement The final rung of the dimensions ladder (dev_docs/dimensions_implementation_plan.md §7 row 10): - custom dimensions: POST /api/dimensions creates registry dims (next free SIE number >= 20 when omitted; explicit numbers allowed — SIE import already mints reserved ones); register gets a 'Ny dimension' dialog with a quiet Avancerat disclosure for the #UNDERDIM parent; GET now carries parent_sie_dim_no (the column + SIE round-trip existed since PR1/PR5 — this exposes it) - account_dimension_rules (migration 20260703120000): one rule per (account, dimension) — required / default / fixed, per-rule is_active, company-scoped RLS, composite FK to the registry, value-presence CHECK - enforcement, opt-in BY CONSTRUCTION (zero rules = engine byte-identical; deliberately NO settings toggle — a rule that exists but is ignored is worse than either extreme): default/fixed apply onto line bags at draft creation (fixed overwrites, default fills); required asserts at commitEntry with a Swedish MANDATORY_DIMENSION_MISSING naming every account + dimension; the bulk-book route runs the same policy before its RPC; storno/correction paths never pass through commitEntry so history always reverses regardless of policy; rule fetches fail open incl. thrown exceptions - chart of accounts: per-account Dimensionsregler section in EditAccountDialog (Krävs/Förval/Låst, value picker, pause switch), gated on the existing dimensions toggle, quiet when empty - pickers: LineDimensionFields is registry-driven (one combobox per active dimension, cached fetch, hardcoded 1/6 fallback) — every existing mount lights up custom dims with zero changes - agent briefing: per-dimension required_on_accounts/default_on_accounts so agents self-correct instead of bouncing off the policy error - rules CRUD API with existence/active/company validation and qualified DTO ids; firm_id FK deferred until the firms table lands (per plan) 39 new tests (pure-fn rules, engine enforcement, both new API surfaces, pg-real RLS/CHECK/cascade suite); full suite 6,791 green; migration replayed on a fresh container. Co-Authored-By: Claude Fable 5 <noreply@anthropic.com> * fix: renumber migration to 20260703200000 — version collision with prod The concurrent session shipped pending_operations_add_link_document_to_voucher as 20260703120000 today; the Supabase preview branch (cloned from prod) rejected the duplicate version key. Co-Authored-By: Claude Fable 5 <noreply@anthropic.com> * fix: review round — auto-pick retry on collision, fail-open warnings, query schema - POST /api/dimensions retries once past a concurrent number claim when the number was auto-picked (explicit choices still 409) - every fail-open skip of the dimension-rules policy now logs a structured warning (engine draft/commit paths + bulk-book) — deliberate fail-open, but observable - GET /api/dimensions/rules validates its query through ListDimensionRulesQuerySchema instead of an inline regex Co-Authored-By: Claude Fable 5 <noreply@anthropic.com> --------- Co-authored-by: Claude Fable 5 <noreply@anthropic.com>
394 lines
14 KiB
TypeScript
394 lines
14 KiB
TypeScript
/**
|
|
* Engine wiring of validateEntryDimensions (dimensions plan PR3) and of the
|
|
* account dimension rules (dimensions PR10).
|
|
*
|
|
* createDraftEntry and updateDraftEntry must run the soft dimension
|
|
* validation AFTER balance validation and BEFORE any insert/update, so a
|
|
* rejection leaves no orphan rows. Untagged entries must not even fetch
|
|
* company_settings; companies without the toggle keep free-text passthrough.
|
|
*
|
|
* PR10: createDraftEntry applies default/fixed rules onto the line bags
|
|
* before validation + insert; commitEntry asserts 'required' rules against
|
|
* the entry's stored lines BEFORE the commit_journal_entry RPC, and skips
|
|
* the line fetch entirely when no required rule exists.
|
|
*/
|
|
import { describe, it, expect, vi, beforeEach } from 'vitest'
|
|
import { commitEntry, createDraftEntry, updateDraftEntry } from '../engine'
|
|
import { DimensionValidationError, MandatoryDimensionMissingError } from '../errors'
|
|
import type { CreateJournalEntryInput } from '@/types'
|
|
|
|
vi.mock('@/lib/events', () => ({
|
|
eventBus: { emit: vi.fn().mockResolvedValue([]) },
|
|
}))
|
|
|
|
vi.mock('@/lib/bookkeeping/account-backfill', () => ({
|
|
backfillStandardBASAccounts: vi.fn().mockResolvedValue([]),
|
|
}))
|
|
|
|
interface TableResult {
|
|
data?: unknown
|
|
error?: unknown
|
|
}
|
|
|
|
/**
|
|
* Table-keyed Supabase mock: every from(table) call returns a chain resolving
|
|
* to the configured result for that table. insert payloads are captured per
|
|
* table so tests can assert what would have been written.
|
|
*/
|
|
function buildSupabase(tables: Record<string, TableResult>) {
|
|
const inserts: Record<string, unknown[]> = {}
|
|
const updates: Record<string, unknown[]> = {}
|
|
|
|
const from = vi.fn().mockImplementation((table: string) => {
|
|
const result = tables[table] ?? {}
|
|
const resolved = { data: result.data ?? null, error: result.error ?? null }
|
|
const chain: Record<string, unknown> = {}
|
|
for (const m of ['select', 'eq', 'in', 'delete', 'order', 'limit', 'lte', 'gte']) {
|
|
chain[m] = vi.fn().mockReturnValue(chain)
|
|
}
|
|
chain.insert = vi.fn().mockImplementation((payload: unknown) => {
|
|
;(inserts[table] ??= []).push(payload)
|
|
return chain
|
|
})
|
|
chain.update = vi.fn().mockImplementation((payload: unknown) => {
|
|
;(updates[table] ??= []).push(payload)
|
|
return chain
|
|
})
|
|
chain.single = vi.fn().mockResolvedValue(resolved)
|
|
chain.maybeSingle = vi.fn().mockResolvedValue(resolved)
|
|
chain.then = (resolve: (v: unknown) => void) => resolve(resolved)
|
|
return chain
|
|
})
|
|
|
|
const supabase = {
|
|
from,
|
|
rpc: vi.fn().mockResolvedValue({ data: null, error: null }),
|
|
}
|
|
|
|
const queriedTables = () => from.mock.calls.map((call) => call[0] as string)
|
|
|
|
return { supabase, inserts, updates, queriedTables }
|
|
}
|
|
|
|
const BASE_TABLES: Record<string, TableResult> = {
|
|
fiscal_periods: {
|
|
data: { name: 'FY 2026', period_start: '2026-01-01', period_end: '2026-12-31' },
|
|
},
|
|
chart_of_accounts: {
|
|
data: [
|
|
{ account_number: '1930', id: 'acc-1930' },
|
|
{ account_number: '4010', id: 'acc-4010' },
|
|
],
|
|
},
|
|
journal_entries: {
|
|
data: { id: 'entry-1', status: 'draft', voucher_series: 'A', lines: [] },
|
|
},
|
|
journal_entry_lines: { data: null },
|
|
}
|
|
|
|
const DIMENSION_TABLES: Record<string, TableResult> = {
|
|
company_settings: { data: { dimensions_enabled: true } },
|
|
dimensions: {
|
|
data: [
|
|
{ id: 'dim-ks', sie_dim_no: 1 },
|
|
{ id: 'dim-proj', sie_dim_no: 6 },
|
|
],
|
|
},
|
|
dimension_values: {
|
|
data: [
|
|
{ dimension_id: 'dim-ks', code: 'KS01', is_active: true },
|
|
{ dimension_id: 'dim-proj', code: 'P001', is_active: true },
|
|
],
|
|
},
|
|
}
|
|
|
|
function makeInput(dimensions?: Record<string, string>): CreateJournalEntryInput {
|
|
return {
|
|
fiscal_period_id: 'period-1',
|
|
entry_date: '2026-06-15',
|
|
description: 'Materialinköp',
|
|
source_type: 'manual',
|
|
// Explicit series keeps resolveSeriesFromSettings from also querying
|
|
// company_settings, so the assertions below isolate the validation fetch.
|
|
voucher_series: 'A',
|
|
lines: [
|
|
{ account_number: '4010', debit_amount: 100, credit_amount: 0, dimensions },
|
|
{ account_number: '1930', debit_amount: 0, credit_amount: 100, dimensions },
|
|
],
|
|
}
|
|
}
|
|
|
|
beforeEach(() => {
|
|
vi.clearAllMocks()
|
|
})
|
|
|
|
describe('createDraftEntry — dimension validation wiring', () => {
|
|
it('never fetches company_settings for an untagged entry', async () => {
|
|
const { supabase, queriedTables } = buildSupabase(BASE_TABLES)
|
|
|
|
const entry = await createDraftEntry(supabase as never, 'company-1', 'user-1', makeInput())
|
|
|
|
expect(entry.id).toBe('entry-1')
|
|
expect(queriedTables()).not.toContain('company_settings')
|
|
expect(queriedTables()).not.toContain('dimensions')
|
|
expect(queriedTables()).not.toContain('dimension_values')
|
|
})
|
|
|
|
it('passes tagged lines through untouched when dimensions_enabled is false', async () => {
|
|
const { supabase, inserts, queriedTables } = buildSupabase({
|
|
...BASE_TABLES,
|
|
company_settings: { data: { dimensions_enabled: false } },
|
|
})
|
|
|
|
const entry = await createDraftEntry(
|
|
supabase as never,
|
|
'company-1',
|
|
'user-1',
|
|
makeInput({ '6': 'FRITEXT-PROJEKT' })
|
|
)
|
|
|
|
expect(entry.id).toBe('entry-1')
|
|
// Toggle checked once, registry never consulted (free-text passthrough).
|
|
expect(queriedTables().filter((t) => t === 'company_settings')).toHaveLength(1)
|
|
expect(queriedTables()).not.toContain('dimensions')
|
|
// The free-text tag still lands on the inserted lines (bag only — the
|
|
// project mirror is GENERATED at the database since the PR9 cutover).
|
|
const lineRows = inserts.journal_entry_lines[0] as Array<Record<string, unknown>>
|
|
expect(lineRows[0].dimensions).toEqual({ '6': 'FRITEXT-PROJEKT' })
|
|
expect('project' in lineRows[0]).toBe(false)
|
|
})
|
|
|
|
it('rejects an unknown code before ANY row is inserted (toggle on)', async () => {
|
|
const { supabase, inserts, queriedTables } = buildSupabase({
|
|
...BASE_TABLES,
|
|
...DIMENSION_TABLES,
|
|
dimension_values: { data: [] },
|
|
})
|
|
|
|
await expect(
|
|
createDraftEntry(supabase as never, 'company-1', 'user-1', makeInput({ '6': 'P999' }))
|
|
).rejects.toBeInstanceOf(DimensionValidationError)
|
|
|
|
expect(queriedTables()).not.toContain('journal_entries')
|
|
expect(inserts.journal_entries).toBeUndefined()
|
|
expect(inserts.journal_entry_lines).toBeUndefined()
|
|
})
|
|
|
|
it('rejects an archived value with the Swedish reactivation message', async () => {
|
|
const { supabase } = buildSupabase({
|
|
...BASE_TABLES,
|
|
...DIMENSION_TABLES,
|
|
dimension_values: {
|
|
data: [{ dimension_id: 'dim-proj', code: 'P001', is_active: false }],
|
|
},
|
|
})
|
|
|
|
await expect(
|
|
createDraftEntry(supabase as never, 'company-1', 'user-1', makeInput({ '6': 'P001' }))
|
|
).rejects.toThrow('"P001" är arkiverat — återaktivera värdet för att använda det.')
|
|
})
|
|
|
|
it('creates the draft when every tagged code is registered and active', async () => {
|
|
const { supabase, inserts } = buildSupabase({ ...BASE_TABLES, ...DIMENSION_TABLES })
|
|
|
|
const entry = await createDraftEntry(
|
|
supabase as never,
|
|
'company-1',
|
|
'user-1',
|
|
makeInput({ '1': 'KS01', '6': 'P001' })
|
|
)
|
|
|
|
expect(entry.id).toBe('entry-1')
|
|
const lineRows = inserts.journal_entry_lines[0] as Array<Record<string, unknown>>
|
|
expect(lineRows[0].dimensions).toEqual({ '1': 'KS01', '6': 'P001' })
|
|
// PR9 cutover: the payload must NOT name the generated mirror columns —
|
|
// an explicit value would make Postgres reject the insert.
|
|
expect('cost_center' in lineRows[0]).toBe(false)
|
|
expect('project' in lineRows[0]).toBe(false)
|
|
})
|
|
})
|
|
|
|
describe('updateDraftEntry — dimension validation wiring', () => {
|
|
it('rejects an unknown code before the header or lines are touched', async () => {
|
|
const { supabase, updates, queriedTables } = buildSupabase({
|
|
...BASE_TABLES,
|
|
...DIMENSION_TABLES,
|
|
dimension_values: { data: [] },
|
|
})
|
|
|
|
await expect(
|
|
updateDraftEntry(supabase as never, 'company-1', 'user-1', 'entry-1', makeInput({ '6': 'P999' }))
|
|
).rejects.toBeInstanceOf(DimensionValidationError)
|
|
|
|
// journal_entries is hit exactly once: the draft-status load. The header
|
|
// update and the delete/insert of lines must never run.
|
|
expect(queriedTables().filter((t) => t === 'journal_entries')).toHaveLength(1)
|
|
expect(updates.journal_entries).toBeUndefined()
|
|
expect(queriedTables()).not.toContain('journal_entry_lines')
|
|
})
|
|
|
|
it('updates an untagged draft without ever fetching company_settings', async () => {
|
|
const { supabase, queriedTables } = buildSupabase(BASE_TABLES)
|
|
|
|
const entry = await updateDraftEntry(
|
|
supabase as never,
|
|
'company-1',
|
|
'user-1',
|
|
'entry-1',
|
|
makeInput()
|
|
)
|
|
|
|
expect(entry.id).toBe('entry-1')
|
|
expect(queriedTables()).not.toContain('company_settings')
|
|
})
|
|
|
|
it('updates a draft with valid registered codes', async () => {
|
|
const { supabase, inserts } = buildSupabase({ ...BASE_TABLES, ...DIMENSION_TABLES })
|
|
|
|
const entry = await updateDraftEntry(
|
|
supabase as never,
|
|
'company-1',
|
|
'user-1',
|
|
'entry-1',
|
|
makeInput({ '6': 'P001' })
|
|
)
|
|
|
|
expect(entry.id).toBe('entry-1')
|
|
const lineRows = inserts.journal_entry_lines[0] as Array<Record<string, unknown>>
|
|
expect(lineRows[0].dimensions).toEqual({ '6': 'P001' })
|
|
})
|
|
})
|
|
|
|
/**
|
|
* Raw account_dimension_rules row exactly as fetchActiveDimensionRules
|
|
* selects it: joined registry rows ride along nested (dimensions,
|
|
* dimension_values).
|
|
*/
|
|
function makeRuleRow(overrides: Record<string, unknown> = {}) {
|
|
return {
|
|
account_number: '4010',
|
|
rule_type: 'default',
|
|
dimensions: { sie_dim_no: 6, name: 'Projekt' },
|
|
dimension_values: { code: 'P001' },
|
|
...overrides,
|
|
}
|
|
}
|
|
|
|
describe('createDraftEntry — account dimension rules (PR10)', () => {
|
|
it('applies a default rule onto the inserted line bag when the key is absent', async () => {
|
|
const { supabase, inserts } = buildSupabase({
|
|
...BASE_TABLES,
|
|
account_dimension_rules: { data: [makeRuleRow()] },
|
|
})
|
|
|
|
const entry = await createDraftEntry(supabase as never, 'company-1', 'user-1', makeInput())
|
|
|
|
expect(entry.id).toBe('entry-1')
|
|
const lineRows = inserts.journal_entry_lines[0] as Array<Record<string, unknown>>
|
|
// The 4010 line got the default; the 1930 line has no rule and stays bare.
|
|
expect(lineRows[0].dimensions).toEqual({ '6': 'P001' })
|
|
expect(lineRows[1].dimensions).toEqual({})
|
|
// PR9 cutover: generated mirror columns must never appear in the payload.
|
|
expect('cost_center' in lineRows[0]).toBe(false)
|
|
expect('project' in lineRows[0]).toBe(false)
|
|
})
|
|
|
|
it('fixed rule overwrites the caller-supplied bag value', async () => {
|
|
const { supabase, inserts } = buildSupabase({
|
|
...BASE_TABLES,
|
|
account_dimension_rules: {
|
|
data: [makeRuleRow({ rule_type: 'fixed', dimension_values: { code: 'PLOCK' } })],
|
|
},
|
|
})
|
|
|
|
const entry = await createDraftEntry(
|
|
supabase as never,
|
|
'company-1',
|
|
'user-1',
|
|
makeInput({ '6': 'CALLER' })
|
|
)
|
|
|
|
expect(entry.id).toBe('entry-1')
|
|
const lineRows = inserts.journal_entry_lines[0] as Array<Record<string, unknown>>
|
|
// Rule pinned the 4010 line; the rule-less 1930 line keeps the caller tag.
|
|
expect(lineRows[0].dimensions).toEqual({ '6': 'PLOCK' })
|
|
expect(lineRows[1].dimensions).toEqual({ '6': 'CALLER' })
|
|
})
|
|
})
|
|
|
|
describe('commitEntry — mandatory dimension enforcement (PR10)', () => {
|
|
const requiredRule = makeRuleRow({ rule_type: 'required', dimension_values: null })
|
|
|
|
it('rejects an untagged line BEFORE the commit_journal_entry RPC fires', async () => {
|
|
const { supabase } = buildSupabase({
|
|
...BASE_TABLES,
|
|
account_dimension_rules: { data: [requiredRule] },
|
|
journal_entry_lines: {
|
|
data: [
|
|
{ account_number: '4010', dimensions: {} },
|
|
{ account_number: '1930', dimensions: {} },
|
|
],
|
|
},
|
|
})
|
|
|
|
await expect(
|
|
commitEntry(supabase as never, 'company-1', 'user-1', 'entry-1')
|
|
).rejects.toBeInstanceOf(MandatoryDimensionMissingError)
|
|
await expect(
|
|
commitEntry(supabase as never, 'company-1', 'user-1', 'entry-1')
|
|
).rejects.toThrow('Konto 4010 kräver Projekt — välj ett värde innan bokföring.')
|
|
|
|
// The verifikat must never have been posted.
|
|
expect(supabase.rpc).not.toHaveBeenCalled()
|
|
})
|
|
|
|
it('commits when every required dimension is satisfied on the stored lines', async () => {
|
|
const { supabase } = buildSupabase({
|
|
...BASE_TABLES,
|
|
account_dimension_rules: { data: [requiredRule] },
|
|
journal_entry_lines: {
|
|
data: [
|
|
{ account_number: '4010', dimensions: { '6': 'P001' } },
|
|
{ account_number: '1930', dimensions: {} },
|
|
],
|
|
},
|
|
})
|
|
|
|
const entry = await commitEntry(supabase as never, 'company-1', 'user-1', 'entry-1')
|
|
|
|
expect(entry.id).toBe('entry-1')
|
|
expect(supabase.rpc).toHaveBeenCalledWith(
|
|
'commit_journal_entry',
|
|
expect.objectContaining({ p_company_id: 'company-1', p_entry_id: 'entry-1' })
|
|
)
|
|
})
|
|
|
|
it('skips the line fetch entirely when the company has zero rules', async () => {
|
|
const { supabase, queriedTables } = buildSupabase(BASE_TABLES)
|
|
|
|
const entry = await commitEntry(supabase as never, 'company-1', 'user-1', 'entry-1')
|
|
|
|
expect(entry.id).toBe('entry-1')
|
|
// Rules were checked, but no required rule exists → no line fetch.
|
|
expect(queriedTables()).toContain('account_dimension_rules')
|
|
expect(queriedTables()).not.toContain('journal_entry_lines')
|
|
expect(supabase.rpc).toHaveBeenCalledWith(
|
|
'commit_journal_entry',
|
|
expect.objectContaining({ p_entry_id: 'entry-1' })
|
|
)
|
|
})
|
|
|
|
it('skips the line fetch when the only rules are default/fixed', async () => {
|
|
const { supabase, queriedTables } = buildSupabase({
|
|
...BASE_TABLES,
|
|
account_dimension_rules: {
|
|
data: [makeRuleRow(), makeRuleRow({ rule_type: 'fixed', account_number: '5010' })],
|
|
},
|
|
})
|
|
|
|
await commitEntry(supabase as never, 'company-1', 'user-1', 'entry-1')
|
|
|
|
expect(queriedTables()).not.toContain('journal_entry_lines')
|
|
})
|
|
})
|