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
parent eea410c42b
commit 2303f75a7b
23 changed files with 586 additions and 82 deletions
@@ -868,6 +868,35 @@ describe('CreateSupplierSchema', () => {
      expect(result.data.email).toBeUndefined()
    }
  })
+
+  // #2391: the form asks for XXXXXX-XXXX, the extractor emits bare digits;
+  // storage is the 10-digit key so the matcher's exact key finds the row.
+  it('stores a Swedish org number as its 10-digit key whatever the caller typed', () => {
+    for (const typed of ['556677-8899', '5566778899', '556677 8899', '165566778899']) {
+      const result = CreateSupplierSchema.safeParse(validSupplier({ org_number: typed }))
+      expect(result.success, typed).toBe(true)
+      if (result.success) expect(result.data.org_number).toBe('5566778899')
+    }
+  })
+
+  it('stores a foreign registration number or a VAT number as typed', () => {
+    for (const typed of ['DK12345678', 'BE0123456789', 'SE556677889901', '556677889901']) {
+      const result = CreateSupplierSchema.safeParse(
+        validSupplier({ supplier_type: 'eu_business', country: 'DK', org_number: typed }),
+      )
+      expect(result.success, typed).toBe(true)
+      if (result.success) expect(result.data.org_number).toBe(typed)
+    }
+  })
+
+  it('canonicalises org_number on update too', () => {
+    const result = UpdateSupplierSchema.safeParse({ org_number: '556677-8899' })
+    expect(result.success).toBe(true)
+    if (result.success) expect(result.data.org_number).toBe('5566778899')
+    const untouched = UpdateSupplierSchema.safeParse({ name: 'Renamed AB' })
+    expect(untouched.success).toBe(true)
+    if (untouched.success) expect(untouched.data.org_number).toBeUndefined()
+  })
 })

 // ============================================================
@@ -9,6 +9,7 @@ import {
  fiscalYearSchema,
 } from '@/lib/invariants/zod'
 import { ISO_DATE_RE, ISO_DATE_MESSAGE_SV } from '@/lib/invariants/iso-date'
+import { orgNumberKey } from '@/lib/invariants/org-number'
 import { countCalendarMonths } from '@/lib/bookkeeping/accruals/compute'
 import { DimensionsBagSchema } from '@/lib/bookkeeping/dimension-resolver'
 import { validateEmployeeBankAccount } from '@/lib/salary/payment/bank-account'
@@ -1211,6 +1212,17 @@ function emptyStringAsUndefined<T extends z.ZodTypeAny>(inner: T) {
  )
 }

+/**
+ * suppliers.org_number is stored as the 10-digit key (#2391): the form asks
+ * for XXXXXX-XXXX and the AI extractor emits bare digits, and the matcher
+ * compares through the same key, so storage is canonical whatever the caller
+ * typed. Only Swedish-shaped input (10 or 12 digits once separators are
+ * stripped) is rewritten; a foreign registration number or an unrecognised
+ * value is stored as typed, because eu_business and non_eu_business
+ * suppliers keep their home-registry number in this column.
+ */
+const supplierOrgNumber = z.string().transform((v) => orgNumberKey(v) ?? v.trim())
+
 export const CreateSupplierSchema = z.object({
  name: z.string().min(1, 'Supplier name is required'),
  supplier_type: SupplierTypeSchema,
@@ -1221,7 +1233,7 @@ export const CreateSupplierSchema = z.object({
  postal_code: z.string().optional(),
  city: z.string().optional(),
  country: CountryCodeSchema,
-  org_number: z.string().optional(),
+  org_number: supplierOrgNumber.optional(),
  vat_number: z.string().optional(),
  bankgiro: z.string().optional(),
  plusgiro: z.string().optional(),