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
@@ -50,7 +50,7 @@ import { findBankSkvCounterparts } from '@/lib/skatteverket/bank-counterpart'
 import { useCompany } from '@/contexts/CompanyContext'
 import { getErrorMessage } from '@/lib/errors/get-error-message'
 import { formatCurrency, formatDate } from '@/lib/utils'
-import type { TransactionCategory, CreateTransactionInput, Invoice, Customer, SupplierInvoice, Supplier, VatTreatment, EntityType, LinePatternEntry } from '@/types'
+import type { TransactionCategory, CreateTransactionInput, Invoice, Customer, SupplierInvoice, Supplier, VatTreatment, EntityType, LinePatternEntry, BookingTemplateLibrary } from '@/types'
 import type { SuggestedTemplate } from '@/lib/transactions/category-suggestions'

 type InvoiceWithCustomer = Invoice & { customer?: Customer }
@@ -109,6 +109,7 @@ export default function TransactionsPage() {
  // Booking dialog (journal entry form)
  const [bookingDialogOpen, setBookingDialogOpen] = useState(false)
  const [bookingDialogTransaction, setBookingDialogTransaction] = useState<TransactionWithInvoice | null>(null)
+  const [bookingDialogTemplate, setBookingDialogTemplate] = useState<BookingTemplateLibrary | null>(null)

  // Template picker dialog
  const [templatePickerOpen, setTemplatePickerOpen] = useState(false)
@@ -541,6 +542,78 @@ export default function TransactionsPage() {
          setProcessingId(null)
          return null
        }
+        if (result?.error?.code === 'TX_CATEGORIZE_INVALID_ACCOUNT') {
+          // The user picked a library template (or typed an account
+          // override) whose account isn't in this company's kontoplan.
+          // Mirror the ACCOUNTS_NOT_IN_CHART flow with a one-click
+          // "Aktivera och bokför" — pull the BAS name if known so the
+          // toast carries real context.
+          // Validate the BAS account number is a plain 4-digit string before
+          // embedding it in any fetch URL/body — the value comes from the
+          // server error envelope but defense-in-depth.
+          const rawAccountNumber: unknown = result.error.details?.accountNumber
+          const accountNumber: string | undefined =
+            typeof rawAccountNumber === 'string' && /^\d{4}$/.test(rawAccountNumber)
+              ? rawAccountNumber
+              : undefined
+          let displayName = accountNumber ?? ''
+          if (accountNumber) {
+            try {
+              const lookupRes = await fetch(`/api/bookkeeping/accounts/bas-lookup?numbers=${encodeURIComponent(accountNumber)}`)
+              if (lookupRes.ok) {
+                const lookup = await lookupRes.json() as { data?: Array<{ account_number: string; account_name: string | null; known?: boolean }> }
+                const hit = lookup.data?.find((r) => r.account_number === accountNumber)
+                if (hit?.account_name) displayName = `${accountNumber} — ${hit.account_name}`
+              }
+            } catch { /* fall through to the plain number */ }
+          }
+          let invalidAccountActivateInFlight = false
+          toast({
+            title: 'Kontot finns inte i din kontoplan',
+            description: accountNumber
+              ? `Kontot ${displayName} är inte aktiverat.`
+              : 'Kontot är inte aktiverat.',
+            variant: 'destructive',
+            action: accountNumber ? (
+              <ToastAction altText="Aktivera och bokför" onClick={async () => {
+                if (invalidAccountActivateInFlight) return
+                invalidAccountActivateInFlight = true
+                try {
+                  const activateRes = await fetch('/api/bookkeeping/accounts/activate', {
+                    method: 'POST',
+                    headers: { 'Content-Type': 'application/json' },
+                    body: JSON.stringify({ account_numbers: [accountNumber] }),
+                  })
+                  if (!activateRes.ok) {
+                    const errBody = await activateRes.json().catch(() => null)
+                    toast({
+                      title: 'Kunde inte aktivera kontot',
+                      description: getErrorMessage(errBody, { statusCode: activateRes.status }),
+                      variant: 'destructive',
+                    })
+                    return
+                  }
+                  const activateBody = await activateRes.json()
+                  if (Array.isArray(activateBody.unknown) && activateBody.unknown.length > 0) {
+                    toast({
+                      title: 'Kontot finns inte i BAS-planen',
+                      description: `Lägg till ${accountNumber} manuellt under Inställningar → Kontoplan.`,
+                      variant: 'destructive',
+                    })
+                    return
+                  }
+                  await runCategorize(args)
+                } finally {
+                  invalidAccountActivateInFlight = false
+                }
+              }}>
+                Aktivera och bokför
+              </ToastAction>
+            ) : undefined,
+          })
+          setProcessingId(null)
+          return null
+        }
        if (result?.error?.code === 'ACCOUNTS_NOT_IN_CHART') {
          // The mapped template/category references one or more accounts
          // that aren't active in this company's kontoplan. Without an
@@ -1240,6 +1313,7 @@ export default function TransactionsPage() {
    }, 350)
    setBookingDialogOpen(false)
    setBookingDialogTransaction(null)
+    setBookingDialogTemplate(null)
    toast({ title: 'Bokförd' })
  }

@@ -1392,10 +1466,22 @@ export default function TransactionsPage() {
    setTemplatePickerOpen(false)
    if (templatePickerTransaction) {
      setBookingDialogTransaction(templatePickerTransaction)
+      setBookingDialogTemplate(null)
      setBookingDialogOpen(true)
    }
  }

+  // Complex (multi-leg or otherwise non-convertible) library template picked
+  // from the transaction modal — route into the manual booking dialog with
+  // the template pre-applied against the transaction's amount.
+  function handlePickLibraryTemplate(raw: BookingTemplateLibrary) {
+    if (!templatePickerTransaction) return
+    setBookingDialogTransaction(templatePickerTransaction)
+    setBookingDialogTemplate(raw)
+    setTemplatePickerOpen(false)
+    setBookingDialogOpen(true)
+  }
+
  async function handleQuickReviewConfirm(
    id: string,
    category: TransactionCategory,
@@ -1714,8 +1800,12 @@ export default function TransactionsPage() {

      <TransactionBookingDialog
        open={bookingDialogOpen}
-        onOpenChange={setBookingDialogOpen}
+        onOpenChange={(o) => {
+          setBookingDialogOpen(o)
+          if (!o) setBookingDialogTemplate(null)
+        }}
        transaction={bookingDialogTransaction}
+        preselectedTemplate={bookingDialogTemplate}
        onBooked={handleTransactionBooked}
      />

@@ -1767,6 +1857,7 @@ export default function TransactionsPage() {
              setTemplatePickerOpen(false)
              handleOpenTemplateReview(templatePickerTransaction, templateId)
            }}
+            onPickLibraryTemplate={handlePickLibraryTemplate}
          />
        </DialogContent>
      </Dialog>
@@ -714,4 +714,40 @@ describe('POST /api/transactions/[id]/categorize', () => {
    // had to enqueue a response for it. The absence of an enqueue here plus
    // the 400 status is the assertion that the route did not fall through.
  })
+
+  // The transactions page surfaces TX_CATEGORIZE_INVALID_ACCOUNT with an
+  // inline "Aktivera och bokför" toast and reads details.accountNumber to
+  // call POST /accounts/activate. This test pins the error shape that flow
+  // depends on — if the field name changes the recovery UI silently breaks.
+  it('returns 400 TX_CATEGORIZE_INVALID_ACCOUNT with details.accountNumber when account_override is not in the chart', async () => {
+    const tx = makeTransaction({
+      id: 'tx-1',
+      amount: -869.25,
+      merchant_name: 'Paddle',
+      journal_entry_id: null,
+    })
+
+    enqueue({ data: tx, error: null })
+    enqueue({ data: { entity_type: 'enskild_firma', fiscal_year_start_month: 1 }, error: null })
+    // chart_of_accounts lookup for '5420' — not in the company's chart.
+    // Using a plain expense account (Programvaror) avoids the implication
+    // that 4535 (Inköp av varor från annat EU-land, reverse-charge) would
+    // be a valid override on a domestic transaction without its paired
+    // moms legs (2614/2645) — see the Swedish compliance review note.
+    enqueue({ data: null, error: null })
+
+    const request = createMockRequest('/api/transactions/tx-1/categorize', {
+      method: 'POST',
+      body: { is_business: true, category: 'expense_software', account_override: '5420' },
+    })
+    const response = await POST(request, createMockRouteParams({ id: 'tx-1' }))
+    const { status, body } = await parseJsonResponse<{
+      error: { code: string; details: { accountNumber?: string } }
+    }>(response)
+
+    expect(status).toBe(400)
+    expect(body.error.code).toBe('TX_CATEGORIZE_INVALID_ACCOUNT')
+    expect(body.error.details.accountNumber).toBe('5420')
+    expect(mockCreateTransactionJournalEntry).not.toHaveBeenCalled()
+  })
 })