Files
accounted/lib/pending-operations/schemas/create-supplier.ts
T
MattssonandClaude Fable 5.1 2303f75a7b fix(suppliers): one 10-digit org number key for matching and storage (#2405)
* fix(suppliers): one 10-digit org number key for matching and storage

Why the problem occurred: the supplier register was written in three
spellings (the form asks for XXXXXX-XXXX, the v1 API and the MCP tool stored
whatever the caller sent, the AI extractor emits bare digits) while
matchSupplierByIdentity compared raw strings with .eq(). The canonical rule
existed three times (normalizeOrgNumber, the MCP fuzzy pass's orgNumberKey,
the extractor's toOrg10) and nowhere on the path that decides a match, so
every AI-extracted invoice from a hyphen-registered supplier missed the
strongest key and fell to exact-name matching. Prod holds 1738 hyphenated
rows against 493 bare ones.

What was removed or simplified: orgNumberKey (digits only, 10 kept, last 10
of 12, no Luhn) moves into lib/invariants/org-number.ts and replaces the two
other copies. The matcher scans the company's suppliers with an org_number
and compares keys, the same shape as its vat_number branch, so rows written
before the backfill (and self-hosted instances that never run it) match too.
CreateSupplierSchema, UpdateSupplierSchema and the staged create_supplier
schema store the key; the form renders it through formatOrgNumberDisplay.
A backfill migration strips the formatting from existing rows, skipping
migration-reset source companies.

Why this and not the proposed one: the issue's third layer (CHECK plus a
unique index) would fail to create on prod, which holds 94 duplicate
(company_id, key) groups across 18 companies, one of them 124 rows under a
single placeholder-looking number; that needs a merge decision first and is
filed as #2404. Rejecting anything that is not 10 or 12 digits on write was
also dropped: 68 prod rows carry foreign registration numbers (DK, DE, NL,
FI, GB, IE, US, CZ, IT) in org_number, so Swedish-shaped input is
canonicalised and anything else is stored as typed. Luhn stays lenient on
suppliers because two rows with the same mistyped number are one supplier
and parties is Luhn-strict at promotion already.

Fixes #2391

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

* fix(suppliers): key only Swedish-shaped org numbers, search and dedup through the key

Skeptic pass on the previous commit. Three refutations, all confirmed:

1. orgNumberKey took the last 10 of any 12 digits and stripped letters. A
   VAT number typed into the org field (SE556012579001, orgnr + 01) keyed to
   6012579001, another company's identity, on every write path and in the
   backfill; 26 prod rows hold exactly that shape (prefixes 55/52/87). A
   Belgian BE0123456789 lost its country letters the same way. The key now
   strips only hyphens and spaces and unprefixes 12 digits only behind
   16/18/19/20; everything else is null, stored and compared as typed. The
   migration carries the same rule.
2. The supplier list search, the v1 ?search= filter and the list column all
   used the raw stored value, so a user searching 556677-88 after the
   backfill found nothing. Both searches now compare without separators and
   the column renders XXXXXX-XXXX.
3. Storage was not canonical on every path: the CSV import and the provider
   migration orchestrator wrote as typed and keyed their re-sync dedup by
   the raw value, so a Fortnox re-sync sending 556677-8899 would have
   duplicated the now-bare row. Both write and key through orgNumberKey.

Also: the matcher scans live suppliers only, so a register holding an
archived hyphenated row next to its live replacement resolves to the live
one instead of whichever id sorts first.

Refs #2391

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

* fix(suppliers): review pass: foreign numbers survive display and dedup, stub key canonical

CodeRabbit findings on PR #2405, all verified against the code:

- The supplier list rendered through formatOrgNumber, which strips letters
  and would show BE0123456789 as 012345-6789; it now uses
  formatOrgNumberDisplay, which leaves anything not Swedish-shaped alone.
- The CSV import dedup fell back to digits-only, so BE0123456789 and
  FR0123456789 collided; the fallback is now the value as typed, in both
  the parse preview and the execute route.
- The provider migration's supplier-invoice stub map was keyed by the raw
  provider value while the stored row was canonical, so 556677-8899 and
  5566778899 on two invoices produced two stubs; the key goes through
  orgMapKey like the other maps.
- v1 response examples show the stored 10-digit form; the request example
  keeps the hyphenated input.

Refs #2391

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

* docs(api-skill): regenerate suppliers reference for the canonical org_number example

Refs #2391

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

---------

Co-authored-by: Claude Fable 5.1 <noreply@anthropic.com>
2026-09-08 10:59:20 +02:00

175 lines
6.7 KiB
TypeScript

/**
* Authoritative server-side validation for the create_supplier staged
* operation. Used by:
* - The MCP tool execute() before staging (extensions/general/mcp-server/server.ts)
* - commitCreateSupplier() before the suppliers INSERT (lib/pending-operations/commit.ts)
*
* Defense in depth: validating at the commit boundary protects the DB even
* if a caller writes directly to pending_operations.params bypassing the
* MCP tool, satisfying ASVS V4.5 / ISO A.8.28 input-validation guidance.
*
* Financial identifiers (IBAN, BIC, bankgiro, plusgiro, org_number,
* vat_number, default_expense_account) are format-validated so adversarial
* or malformed payment-routing data cannot be persisted. Bankgiro is
* length-checked (7-8 digits, Peppol SE-R-008/009) and additionally passes
* Bankgirot's modulus-10 (Luhn) check digit. VAT numbers are matched against
* the VIES per-country patterns in lib/vat/vies-client.ts; the SE pattern
* (SE + 12 digits) is the same 14-character form Peppol SE-R-001 requires.
*
* These are FORMAT checks only. No field here is legally mandatory for a
* supplier record: ML 17 kap 24 § lists what a seller must put on an invoice
* it issues, not what a buyer's supplier register must hold, so it cannot make
* any register field required. Every field except `name` is therefore optional,
* matching components/suppliers/SupplierForm.tsx and CreateSupplierSchema
* (lib/api/schemas.ts): the staged/agent path accepts exactly what the
* dashboard accepts.
*/
import { z } from 'zod'
import { validateBankgiroNumber } from '@/lib/bankgiro/luhn'
import { orgNumberKey } from '@/lib/invariants/org-number'
import { parseVatNumber } from '@/lib/vat/vies-client'
const IBAN_RE = /^[A-Z]{2}\d{2}[A-Z0-9]{11,30}$/
const BIC_RE = /^[A-Z]{4}[A-Z]{2}[A-Z0-9]{2}([A-Z0-9]{3})?$/
const SE_ORG_NUMBER_RE = /^\d{6}-?\d{4}$|^\d{12}$/
const COUNTRY_RE = /^[A-Z]{2}$/
const PLUSGIRO_RE = /^\d{1,7}-?\d{1}$/
const BAS_EXPENSE_RE = /^[4567]\d{3}$/
const SUPPLIER_TYPES = ['swedish_business', 'eu_business', 'non_eu_business'] as const
/**
* Accept string | null | undefined, trim, and normalise empty to undefined.
* Then run the inner zod string validators on the survivor.
*/
function optString(inner: z.ZodTypeAny) {
return z.preprocess(
(v) => {
if (v == null) return undefined
if (typeof v !== 'string') return v
const t = v.trim()
return t === '' ? undefined : t
},
inner.optional(),
)
}
const emailField = optString(z.string().email('Invalid email format').max(255))
const phoneField = optString(z.string().max(50))
// Stored as the 10-digit key the supplier matcher compares through (#2391):
// the shape check above guarantees the key exists.
const orgNumberField = optString(
z
.string()
.max(20)
.refine(
(v) => SE_ORG_NUMBER_RE.test(v.replace(/\s/g, '')),
'Invalid Swedish org number format (expected XXXXXX-XXXX or 12 digits)',
)
.transform((v) => orgNumberKey(v) ?? v),
)
const vatNumberField = optString(
z
.string()
.max(20)
.refine(
(v) => parseVatNumber(v) !== null,
'Invalid EU VAT number format (must include valid country prefix)',
),
)
const countryField = optString(
z.string().refine((v) => COUNTRY_RE.test(v.toUpperCase()), 'country must be a 2-letter ISO 3166-1 alpha-2 code'),
)
const bankgiroField = optString(
z.string().max(20).refine(
(v) => validateBankgiroNumber(v),
'Invalid Bankgiro (must be 7-8 digits with valid Luhn check digit)',
),
)
const plusgiroField = optString(
z.string().max(20).refine(
(v) => PLUSGIRO_RE.test(v.replace(/\s/g, '')),
'Invalid Plusgiro (expected 2-8 digits)',
),
)
const ibanField = optString(
z.string().max(34).refine(
(v) => IBAN_RE.test(v.replace(/\s/g, '').toUpperCase()),
'Invalid IBAN format',
),
)
const bicField = optString(
z.string().max(11).refine(
(v) => BIC_RE.test(v.replace(/\s/g, '').toUpperCase()),
'Invalid BIC/SWIFT format',
),
)
const expenseAccountField = optString(
z.string().refine(
(v) => BAS_EXPENSE_RE.test(v),
'default_expense_account must be a 4-digit BAS expense account (class 4, 5, 6, or 7)',
),
)
// Accept either a number or a numeric string. Critically, an explicit 0 is
// preserved (some suppliers are due-on-receipt). null/undefined falls through
// to the 30-day default via .default().
const paymentTermsField = z
.preprocess(
(v) => {
if (v == null || v === '') return undefined
if (typeof v === 'number') return v
if (typeof v === 'string') {
const n = Number(v)
return Number.isNaN(n) ? v : n
}
return v
},
z.number().int('default_payment_terms must be an integer').min(0).max(365).optional(),
)
.default(30)
export const CreateSupplierParamsSchema = z
.object({
name: z
.preprocess(
(v) => (typeof v === 'string' ? v.trim() : v),
z.string().min(1, 'Supplier name is required').max(255),
),
supplier_type: z.enum(SUPPLIER_TYPES).default('swedish_business'),
email: emailField,
phone: phoneField,
org_number: orgNumberField,
vat_number: vatNumberField,
address_line1: optString(z.string().max(255)),
address_line2: optString(z.string().max(255)),
postal_code: optString(z.string().max(20)),
city: optString(z.string().max(100)),
country: countryField,
bankgiro: bankgiroField,
plusgiro: plusgiroField,
bank_account: optString(z.string().max(50)),
iban: ibanField,
bic: bicField,
default_expense_account: expenseAccountField,
default_payment_terms: paymentTermsField,
default_currency: optString(z.string().length(3, 'currency must be a 3-letter ISO code')),
notes: optString(z.string().max(2000)),
})
.strict()
// Deliberately NO "eu_business requires vat_number" rule.
//
// Applying omvänd betalningsskyldighet to an EU purchase does not depend on the
// buyer holding the supplier's VAT number. The buyer reports the purchase and
// self-assesses output VAT, then deducts the same amount as input VAT, because
// it is a taxable person established in Sweden (ML 16 kap 6 § + 6 kap 34 §).
// A VIES-validated counterparty VAT number is a condition for zero-rating an
// intra-community SUPPLY, i.e. the SELLER's side, which is why only `customers`
// carries vat_number_validated / vat_number_validated_at and `suppliers` never
// has. Nothing downstream reads supplier.vat_number to decide reverse charge:
// lib/bookkeeping/supplier-invoice-entries.ts and generateReverseChargeBasisLines()
// key off supplier_type + invoice.reverse_charge alone.
//
// An EU supplier below its national registration threshold has no VAT number at
// all, so requiring one refused legitimate suppliers on the staged/agent path
// while the dashboard form created the very same company without complaint.