Files
accounted/lib/salary/jamkning-rules.ts
T
MattssonandClaude Fable 5.1 b07efcafd4 fix(payroll): require jamkning valid_to on every write path (#2058) (#2240)
* fix(payroll): require jamkning valid_to on every write path (#2058)

A jamkningsbeslut saved through the v1 API or MCP with a percentage and a
start date but no end date was stored and returned 200, yet the engine
(isJamkningValid) never applies a beslut without both dates: the payslip
and the AGI carried the table tax while the caller believed the beslut
was live.

One shared validator (lib/salary/jamkning-rules.ts) now requires both
dates whenever a percentage is set and checks their ordering. Every write
path runs it: CreateEmployeeSchema and UpdateEmployeeSchema, the web POST
and PATCH routes, the v1 PATCH route (its private copy is deleted), the
MCP create and update executors in employee-commands, and the MCP update
tool preflights the merged row at staging time so the agent sees the
error before approval. The update paths keep the existing touched gate, so
legacy rows stored without valid_to stay editable in unrelated ways.

The MCP tool descriptions state that both dates are required for the
beslut to apply. scripts/list-incomplete-jamkning.ts lists the existing
rows (percentage set, valid_to null) per company, read-only; setting an
end date or clearing the beslut is decided per company since either
changes the next payslip.

Declined: defaulting valid_to to 31 December of the from-year. It matches
most beslut but silently changes withholding on rows that today do
nothing.

Closes #2058

Co-Authored-By: Claude Fable 5.1 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_0161fHpCX3rnWtidwwdGfCdB

* fix(payroll): keep the jamkning PR inside the type and tools/list budgets

CI on the first push failed on two ratchets this PR itself tripped:

- Typecheck ratchet: the three staging tests added here reused the
  untyped 'agent_chat' actor literal the file already carried, which
  raised that file's error count above its baseline. They now pass
  { type: 'user' }.
- tools/list payload budget: the first jamkning field descriptions on
  gnubok_create_employee and gnubok_update_employee pushed the projected
  catalog to 60 113 tokens against the 60 000 ceiling. The percentage
  fields keep a one-line "needs both dates or never applied" note; the
  date fields drop theirs.

Also acts on the compliance swarm's GDPR Art.32 note: the read-only
lister no longer selects employee names at all (the employee id is what
the per-company decision needs), so the script touches no PII.

Co-Authored-By: Claude Fable 5.1 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_0161fHpCX3rnWtidwwdGfCdB

* docs(mcp): say the jamkning percentage is rejected without both dates

CodeRabbit on #2240: "never applied" described the pre-fix engine
behaviour; the contract now is that a create or update with a percentage
and a missing date is rejected before staging. Same length, so the
tools/list payload budget is unchanged. The concurrency finding is
tracked in #2256 instead of this PR.

Co-Authored-By: Claude Fable 5.1 <noreply@anthropic.com>

* fix(mcp): keep tools/list under budget after proforma landed on main

After merging main (#2254 proforma fields) the projected tools/list
measured 60 010 tokens against the 60 000 ceiling with this PR's two
jamkning field notes. Per the budget test's own rule, demote a read tool
instead of bumping the ceiling: gnubok_list_arsredovisning_versions goes
search-only. Versions exist only once a report is rendered for signing
or filing, which is the same switched-off iXBRL path as its sibling
gnubok_get_arsredovisning_filing_status, already search-only since
2026-09-02. Still reachable via gnubok_call_tool.

Co-Authored-By: Claude Fable 5.1 <noreply@anthropic.com>

---------

Co-authored-by: Claude Fable 5.1 <noreply@anthropic.com>
2026-09-03 20:22:41 +02:00

68 lines
2.7 KiB
TypeScript

/**
* The one validator for a jämkningsbeslut (Skatteverket beslut om ändrad
* beräkning av skatteavdrag) on an employee row.
*
* The calculation engine (isJamkningValid in calculation-engine.ts) applies
* the beslut only when BOTH dates are set and the payment date falls inside
* them. A percentage stored with a missing date is therefore inert: the
* payslip and the AGI carry the table tax while the caller was told 200.
* Every write path (web routes, v1 REST, MCP staging and executors, the Zod
* schemas) runs the merged row through this function so that shape can no
* longer be stored. #2058
*
* Setting the percentage to null clears the beslut; the dates are then free.
*/
export const JAMKNING_FIELDS = ['jamkning_percentage', 'jamkning_valid_from', 'jamkning_valid_to'] as const
export type JamkningField = (typeof JAMKNING_FIELDS)[number]
export interface JamkningFields {
jamkning_percentage?: number | null
jamkning_valid_from?: string | null
jamkning_valid_to?: string | null
}
export interface JamkningIssue {
field: 'jamkning_valid_from' | 'jamkning_valid_to'
message: string
}
export const JAMKNING_START_REQUIRED = 'Jämkningens startdatum måste anges när jämkningsprocent sätts'
export const JAMKNING_END_REQUIRED = 'Jämkningens slutdatum måste anges när jämkningsprocent sätts'
export const JAMKNING_ORDER = 'Jämkningens slutdatum måste vara efter startdatumet'
/**
* Validates the MERGED jämkning state of a row (existing row + patch for an
* update, the full body for a create). Returns every issue found, in field
* order, so callers can either join the messages or surface the first one.
*/
export function validateJamkning(fields: JamkningFields): JamkningIssue[] {
const issues: JamkningIssue[] = []
const percentage = fields.jamkning_percentage
const from = fields.jamkning_valid_from
const to = fields.jamkning_valid_to
const hasBeslut = percentage !== null && percentage !== undefined
if (hasBeslut && !from) {
issues.push({ field: 'jamkning_valid_from', message: JAMKNING_START_REQUIRED })
}
if (hasBeslut && !to) {
issues.push({ field: 'jamkning_valid_to', message: JAMKNING_END_REQUIRED })
}
if (from && to && to < from) {
issues.push({ field: 'jamkning_valid_to', message: JAMKNING_ORDER })
}
return issues
}
/**
* True when a sparse patch names any jämkning key (an explicit null counts).
* Update paths only validate when this holds: a legacy row stored with an
* incomplete beslut must stay editable in unrelated ways, since fixing it
* requires touching these very fields.
*/
export function touchesJamkning(patch: Record<string, unknown>): boolean {
return JAMKNING_FIELDS.some((key) => key in patch)
}