feat(transactions): show all library templates in picker; fix PSD2 seed-row collision (#596)

* feat(transactions): show all library templates in picker; fix PSD2 seed-row collision - Booking template picker: surface every active library template, not only the convertible 2-account shapes. Multi-leg/complex templates route to the manual journal editor pre-filled via applyTemplate instead of being hidden. Drop direction filtering for user templates (inferred direction is unreliable); the curated static catalog still respects it. Add an "Aktivera och bokfor" recovery toast for TX_CATEGORIZE_INVALID_ACCOUNT mirroring the existing ACCOUNTS_NOT_IN_CHART flow. CreateTemplateForm reflows to one card per line so trash buttons stop colliding on narrow screens. - cash_accounts.upsertFromPsd2: the seed_default_cash_account migration plants a manual (bank_connection_id IS NULL) row on the same ledger_account, so the first PSD2 sync's upsert on (company_id, bank_connection_id, external_uid) cannot match it (NULL != NULL) and falls through to INSERT, tripping the (company_id, ledger_account) UNIQUE constraint. Look up and promote the seed row in place first. - Tests: pin the TX_CATEGORIZE_INVALID_ACCOUNT error shape the recovery toast parses; cover applyTemplate on shapes the converter rejects (split-expense and all-'business'-typed). Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com> * fix(transactions): PR review — currency metadata, MRU ordering, observable promote, BAS validation - TransactionBookingDialog.buildInitialLinesFromTemplate: attach buildCurrencyMetadata to settlement lines for foreign-currency transactions so the journal entry retains the original currency, amount, and exchange_rate. Without this, non-SEK transactions routed through a non-convertible template were recorded in SEK only with no foreign-currency annotation. (Greptile #2) - TemplatePicker.handleSelectLibraryRaw: only bump the MRU after confirming the click will actually do something (i.e. converted OR a callback is wired). Future consumers that omit onPickLibraryTemplate would otherwise corrupt MRU ordering for templates the user never successfully applied. (Greptile #1) - cash_accounts.upsertFromPsd2 promote-seed: add .select('id') so a zero-row UPDATE is observable. If the seed row vanishes between the SELECT and UPDATE (concurrent ops), fall through to the normal upsert instead of silently returning success without persisting anything. (Greptile #3, compliance A.8.9) - transactions/page.tsx TX_CATEGORIZE_INVALID_ACCOUNT toast: validate accountNumber against /^\d{4}$/ before embedding in any fetch URL/body. Defense-in-depth against a malformed server error envelope. (compliance V8.2.1) - categorize route test: switch the not-in-chart fixture from '4535' (Inköp av varor från annat EU-land — reverse-charge) to '5420' (Programvaror) so the example doesn't imply a domestic override against an EU-reverse-charge account would be valid without its paired moms legs. (Swedish compliance review #3) Other review items deliberately not addressed in this PR: - Validate-on-save that every VAT-rated template has a 'vat' line — overrides existing CreateTemplateForm UX, separate PR. - vat_rate enum guard in applyTemplate — defensive; the editor dropdown only surfaces legal rates and is the only write path in production today. - Imbalance UI warning — already handled: JournalEntryForm computes isBalanced and gates submission; DB trigger check_journal_entry_balance enforces BFL 5 kap server-side. Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com> --------- Co-authored-by: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
2026-05-28 22:57:59 +02:00
parent ccdfed5fea
commit a586cc8a58
9 changed files with 503 additions and 107 deletions
@@ -200,4 +200,48 @@ describe('convertLibraryToBookingTemplate', () => {
    const tpl = makeLibraryTemplate([], { lines: null as unknown as BookingTemplateLibraryLine[] })
    expect(convertLibraryToBookingTemplate(tpl)).toBeNull()
  })
+
+  // Real-world shape from before the editor defaulted new lines to 'vat': users
+  // would tap "add line" twice and end up with three lines all typed 'business'
+  // (the dropdown default at the time). The converter rightly rejects this;
+  // the transaction picker now still surfaces these templates and routes the
+  // click to the manual booking editor instead of hiding them.
+  it('returns null when every line is typed "business" (pre-#589 default)', () => {
+    const tpl = makeLibraryTemplate([
+      { account: '5420', label: 'Programvara', side: 'debit', type: 'business', ratio: 1 },
+      { account: '2640', label: 'Ingående moms', side: 'debit', type: 'business', ratio: 0.25 },
+      { account: '1930', label: 'Företagskonto', side: 'credit', type: 'business', ratio: 1 },
+    ])
+    expect(convertLibraryToBookingTemplate(tpl)).toBeNull()
+  })
+})
+
+describe('applyTemplate on shapes the converter rejects', () => {
+  // The transaction picker's fallback for unconvertible templates is to open
+  // the manual booking dialog with initialLines = applyTemplate(raw.lines, |amount|).
+  // These tests pin that path: even when the shape is too rich for the simple
+  // debit/credit summary, applyTemplate still produces a usable FormLine[].
+  it('still produces lines for a split-expense template (two business legs)', () => {
+    const lines: BookingTemplateLibraryLine[] = [
+      { account: '5420', label: 'Programvara', side: 'debit', type: 'business', ratio: 0.7 },
+      { account: '6991', label: 'Övrigt', side: 'debit', type: 'business', ratio: 0.3 },
+      { account: '1930', label: 'Företagskonto', side: 'credit', type: 'settlement', ratio: 1 },
+    ]
+    const result = applyTemplate(lines, 1000)
+    expect(result).toHaveLength(3)
+    expect(result[0].debit_amount).toBe('700.00')
+    expect(result[1].debit_amount).toBe('300.00')
+    expect(result[2].credit_amount).toBe('1000.00')
+  })
+
+  it('still produces lines when every leg is typed "business"', () => {
+    const lines: BookingTemplateLibraryLine[] = [
+      { account: '5420', label: 'Programvara', side: 'debit', type: 'business', ratio: 1 },
+      { account: '1930', label: 'Företagskonto', side: 'credit', type: 'business', ratio: 1 },
+    ]
+    const result = applyTemplate(lines, 250)
+    expect(result).toHaveLength(2)
+    expect(result[0].debit_amount).toBe('250.00')
+    expect(result[1].credit_amount).toBe('250.00')
+  })
 })
@@ -142,6 +142,57 @@ export async function upsertFromPsd2(
    source: 'enable_banking' as CashAccountSource,
  }

+  // create_company_with_owner and the seed_default_cash_account migration plant
+  // a manual (bank_connection_id IS NULL) row on the same ledger_account so
+  // reconciliation routes work before any PSD2 connection exists. The first
+  // PSD2 sync for that BAS slot has to promote that row in place — a plain
+  // upsert on (company_id, bank_connection_id, external_uid) wouldn't match it
+  // (NULL ≠ NULL) and the INSERT path then trips the (company_id,
+  // ledger_account) UNIQUE constraint.
+  const { data: seedRow, error: seedLookupError } = await supabase
+    .from('cash_accounts')
+    .select('id')
+    .eq('company_id', companyId)
+    .eq('ledger_account', input.ledger_account)
+    .is('bank_connection_id', null)
+    .maybeSingle()
+
+  if (seedLookupError) {
+    log.error('upsertFromPsd2 seed lookup failed', {
+      companyId,
+      bankConnectionId: input.bank_connection_id,
+      externalUid: input.external_uid,
+      error: seedLookupError.message,
+    })
+    throw new Error(`cash_accounts upsert failed: ${seedLookupError.message}`)
+  }
+
+  if (seedRow) {
+    // .select() so we can detect a 0-row UPDATE — Supabase's update().eq() returns
+    // { error: null, data: [] } if the row was deleted between the SELECT above
+    // and this UPDATE (rare but theoretically possible under concurrent ops).
+    // If that happens, fall through to the normal upsert path instead of
+    // silently returning success without persisting anything.
+    const { data: promoted, error: promoteError } = await supabase
+      .from('cash_accounts')
+      .update(payload)
+      .eq('id', seedRow.id)
+      .select('id')
+    if (promoteError) {
+      log.error('upsertFromPsd2 promote-seed failed', {
+        companyId,
+        bankConnectionId: input.bank_connection_id,
+        externalUid: input.external_uid,
+        error: promoteError.message,
+      })
+      throw new Error(`cash_accounts upsert failed: ${promoteError.message}`)
+    }
+    if (promoted && promoted.length > 0) {
+      return
+    }
+    // Seed row vanished between SELECT and UPDATE — fall through to upsert.
+  }
+
  const { error } = await supabase
    .from('cash_accounts')
    .upsert(payload, { onConflict: 'company_id,bank_connection_id,external_uid' })