fix: SIE import voucher range bugs + remove describe transaction (#161)
* fix: fix SIE import voucher range bugs from multi-tenant migration and remove describe transaction feature - Fix reserve_voucher_range RPC parameter mismatch (p_user_id → p_company_id) causing duplicate voucher errors - Fix create-accounts onConflict from user_id to company_id - Add reserve-then-adjust pattern: pre-reserve voucher range before batch insert, release unused range on partial failure - Add release_voucher_range DB function for safe rollback - Remove DescribeTransactionDialog, describe/batch-describe API routes, and related schemas (feature superseded) Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com> * fix: address Greptile review — voucher range race condition and orphaned entries - Add p_reserved_highest upper-bound guard to release_voucher_range to prevent rolling back past numbers claimed by concurrent operations - Move highestInsertedVoucher tracking to after both headers AND lines succeed, preventing orphaned journal entries with no lines from being counted as "used" Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com> --------- Co-authored-by: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
This commit is contained in:
Jakob Wennberg
@@ -20,7 +20,7 @@ import InboxZeroState from '@/components/transactions/InboxZeroState'
|
||||
import InvoiceMatchDialog from '@/components/transactions/InvoiceMatchDialog'
|
||||
import TransactionBookingDialog from '@/components/transactions/TransactionBookingDialog'
|
||||
import QuickReviewDialog from '@/components/transactions/QuickReviewDialog'
|
||||
import DescribeTransactionDialog from '@/components/transactions/DescribeTransactionDialog'
|
||||
|
||||
import TemplatePicker from '@/components/transactions/TemplatePicker'
|
||||
import { EXPENSE_CATEGORIES, INCOME_CATEGORIES } from '@/components/transactions/transaction-types'
|
||||
import { getDefaultAccountForCategory, getDefaultVatTreatmentForCategory } from '@/lib/bookkeeping/category-mapping'
|
||||
@@ -77,10 +77,6 @@ export default function TransactionsPage() {
|
||||
const [quickReviewOpen, setQuickReviewOpen] = useState(false)
|
||||
const [quickReview, setQuickReview] = useState<QuickReviewState | null>(null)
|
||||
|
||||
// Describe dialog
|
||||
const [describeDialogOpen, setDescribeDialogOpen] = useState(false)
|
||||
const [describeDialogTransaction, setDescribeDialogTransaction] = useState<TransactionWithInvoice | null>(null)
|
||||
|
||||
// Entity type for tooltip context
|
||||
const [entityType, setEntityType] = useState<string>('enskild_firma')
|
||||
|
||||
@@ -716,33 +712,6 @@ export default function TransactionsPage() {
|
||||
return journalEntryId
|
||||
}
|
||||
|
||||
function openDescribeDialog(transaction: TransactionWithInvoice) {
|
||||
setDescribeDialogTransaction(transaction)
|
||||
setDescribeDialogOpen(true)
|
||||
}
|
||||
|
||||
function handleDescribeCategorized(transactionId: string, journalEntryId: string | null) {
|
||||
setExitingIds((prev) => new Set(prev).add(transactionId))
|
||||
setTimeout(() => {
|
||||
setTransactions((prev) =>
|
||||
prev.map((t) =>
|
||||
t.id === transactionId
|
||||
? { ...t, is_business: true, journal_entry_id: journalEntryId }
|
||||
: t
|
||||
)
|
||||
)
|
||||
setExitingIds((prev) => {
|
||||
const next = new Set(prev)
|
||||
next.delete(transactionId)
|
||||
return next
|
||||
})
|
||||
}, 350)
|
||||
}
|
||||
|
||||
function handleBatchApplied() {
|
||||
fetchTransactions()
|
||||
}
|
||||
|
||||
// Swipe view
|
||||
if (showSwipeView && uncategorizedTransactions.length > 0) {
|
||||
return (
|
||||
@@ -813,7 +782,7 @@ export default function TransactionsPage() {
|
||||
onMarkPrivate={handleMarkPrivate}
|
||||
onOpenMatchDialog={openMatchDialog}
|
||||
onOpenCategoryDialog={openCategoryDialog}
|
||||
onOpenDescribe={openDescribeDialog}
|
||||
|
||||
onOpenQuickReview={handleOpenQuickReview}
|
||||
onOpenTemplateReview={handleOpenTemplateReview}
|
||||
onToggleSelect={toggleBatchSelect}
|
||||
@@ -936,14 +905,6 @@ export default function TransactionsPage() {
|
||||
onChangeTemplate={handleChangeTemplate}
|
||||
/>
|
||||
|
||||
<DescribeTransactionDialog
|
||||
open={describeDialogOpen}
|
||||
onOpenChange={setDescribeDialogOpen}
|
||||
transaction={describeDialogTransaction}
|
||||
onCategorized={handleDescribeCategorized}
|
||||
onBatchApplied={handleBatchApplied}
|
||||
/>
|
||||
|
||||
<Dialog open={isDialogOpen} onOpenChange={setIsDialogOpen}>
|
||||
<DialogContent>
|
||||
<DialogHeader>
|
||||
|
||||
@@ -108,7 +108,7 @@ export async function POST(request: Request) {
|
||||
const { data: upserted, error } = await supabase
|
||||
.from('chart_of_accounts')
|
||||
.upsert(batch, {
|
||||
onConflict: 'user_id,account_number',
|
||||
onConflict: 'company_id,account_number',
|
||||
ignoreDuplicates: true,
|
||||
count: 'exact',
|
||||
})
|
||||
|
||||
@@ -1,217 +0,0 @@
|
||||
import { describe, it, expect, vi, beforeEach } from 'vitest'
|
||||
import {
|
||||
createMockRequest,
|
||||
createMockRouteParams,
|
||||
createQueuedMockSupabase,
|
||||
makeTransaction,
|
||||
parseJsonResponse,
|
||||
} from '@/tests/helpers'
|
||||
|
||||
// Mock init
|
||||
vi.mock('@/lib/init', () => ({ ensureInitialized: vi.fn() }))
|
||||
|
||||
// Mock counterparty template lookup
|
||||
vi.mock('@/lib/bookkeeping/counterparty-templates', () => ({
|
||||
findCounterpartyTemplate: vi.fn().mockResolvedValue(null),
|
||||
buildMappingResultFromCounterpartyTemplate: vi.fn(),
|
||||
formatCounterpartyName: vi.fn((name: string) => name),
|
||||
}))
|
||||
|
||||
// Mock booking templates
|
||||
const mockFindMatchingTemplates = vi.fn().mockReturnValue([])
|
||||
vi.mock('@/lib/bookkeeping/booking-templates', () => ({
|
||||
findMatchingTemplates: (...args: unknown[]) => mockFindMatchingTemplates(...args),
|
||||
}))
|
||||
|
||||
// Mock Supabase
|
||||
const mockCreateClient = vi.fn()
|
||||
vi.mock('@/lib/supabase/server', () => ({
|
||||
createClient: (...args: unknown[]) => mockCreateClient(...args),
|
||||
}))
|
||||
|
||||
vi.mock('@/lib/company/context', () => ({
|
||||
requireCompanyId: vi.fn().mockResolvedValue('company-1'),
|
||||
getActiveCompanyId: vi.fn().mockResolvedValue('company-1'),
|
||||
}))
|
||||
|
||||
describe('POST /api/transactions/[id]/describe', () => {
|
||||
let POST: typeof import('../route').POST
|
||||
|
||||
beforeEach(async () => {
|
||||
vi.clearAllMocks()
|
||||
const mod = await import('../route')
|
||||
POST = mod.POST
|
||||
})
|
||||
|
||||
it('returns 401 when not authenticated', async () => {
|
||||
const { supabase } = createQueuedMockSupabase()
|
||||
supabase.auth.getUser.mockResolvedValue({
|
||||
data: { user: null },
|
||||
error: { message: 'Not authenticated' },
|
||||
})
|
||||
mockCreateClient.mockResolvedValue(supabase)
|
||||
|
||||
const req = createMockRequest('/api/transactions/test-id/describe', {
|
||||
method: 'POST',
|
||||
body: { description: 'business lunch' },
|
||||
})
|
||||
|
||||
const res = await POST(req, createMockRouteParams({ id: 'test-id' }))
|
||||
const { status, body } = await parseJsonResponse(res)
|
||||
|
||||
expect(status).toBe(401)
|
||||
expect(body).toHaveProperty('error', 'Unauthorized')
|
||||
})
|
||||
|
||||
it('returns 400 for invalid body (description too short)', async () => {
|
||||
const { supabase } = createQueuedMockSupabase()
|
||||
supabase.auth.getUser.mockResolvedValue({
|
||||
data: { user: { id: 'user-1' } },
|
||||
error: null,
|
||||
})
|
||||
mockCreateClient.mockResolvedValue(supabase)
|
||||
|
||||
const req = createMockRequest('/api/transactions/test-id/describe', {
|
||||
method: 'POST',
|
||||
body: { description: 'ab' },
|
||||
})
|
||||
|
||||
const res = await POST(req, createMockRouteParams({ id: 'test-id' }))
|
||||
const { status } = await parseJsonResponse(res)
|
||||
|
||||
expect(status).toBe(400)
|
||||
})
|
||||
|
||||
it('returns 404 when transaction not found', async () => {
|
||||
const { supabase, enqueueMany } = createQueuedMockSupabase()
|
||||
supabase.auth.getUser.mockResolvedValue({
|
||||
data: { user: { id: 'user-1' } },
|
||||
error: null,
|
||||
})
|
||||
enqueueMany([
|
||||
// transaction fetch
|
||||
{ data: null, error: { message: 'Not found' } },
|
||||
])
|
||||
mockCreateClient.mockResolvedValue(supabase)
|
||||
|
||||
const req = createMockRequest('/api/transactions/nonexistent/describe', {
|
||||
method: 'POST',
|
||||
body: { description: 'business lunch' },
|
||||
})
|
||||
|
||||
const res = await POST(req, createMockRouteParams({ id: 'nonexistent' }))
|
||||
const { status, body } = await parseJsonResponse(res)
|
||||
|
||||
expect(status).toBe(404)
|
||||
expect(body).toHaveProperty('error', 'Transaction not found')
|
||||
})
|
||||
|
||||
it('returns template candidates on happy path', async () => {
|
||||
const tx = makeTransaction({
|
||||
id: 'tx-1',
|
||||
merchant_name: 'Restaurant XYZ',
|
||||
amount: -450,
|
||||
})
|
||||
|
||||
mockFindMatchingTemplates.mockReturnValueOnce([
|
||||
{
|
||||
template: {
|
||||
id: 'restaurant_dining',
|
||||
name_sv: 'Restaurangbesök',
|
||||
name_en: 'Restaurant dining',
|
||||
group: 'representation',
|
||||
debit_account: '6071',
|
||||
credit_account: '1930',
|
||||
description_sv: 'Representation - restaurang',
|
||||
vat_rate: 0.12,
|
||||
vat_treatment: 'reduced_12',
|
||||
deductibility: 'conditional',
|
||||
deductibility_note_sv: null,
|
||||
special_rules_sv: null,
|
||||
risk_level: 'MEDIUM',
|
||||
},
|
||||
confidence: 0.82,
|
||||
},
|
||||
])
|
||||
|
||||
const { supabase, enqueueMany } = createQueuedMockSupabase()
|
||||
supabase.auth.getUser.mockResolvedValue({
|
||||
data: { user: { id: 'user-1' } },
|
||||
error: null,
|
||||
})
|
||||
enqueueMany([
|
||||
// transaction fetch
|
||||
{ data: tx, error: null },
|
||||
// company_settings
|
||||
{ data: { entity_type: 'enskild_firma' }, error: null },
|
||||
// batch candidate count
|
||||
{ data: null, error: null, count: 3 },
|
||||
])
|
||||
mockCreateClient.mockResolvedValue(supabase)
|
||||
|
||||
const req = createMockRequest('/api/transactions/tx-1/describe', {
|
||||
method: 'POST',
|
||||
body: { description: 'business lunch with client' },
|
||||
})
|
||||
|
||||
const res = await POST(req, createMockRouteParams({ id: 'tx-1' }))
|
||||
const { status, body } = await parseJsonResponse<{ data: Record<string, unknown> }>(res)
|
||||
|
||||
expect(status).toBe(200)
|
||||
expect(body.data.templates).toHaveLength(1)
|
||||
expect(body.data.needs_more_detail).toBe(false)
|
||||
expect(body.data.ai_suggestion).toBeNull()
|
||||
expect(body.data.user_description).toBe('business lunch with client')
|
||||
expect(body.data.batch_candidate_count).toBe(3)
|
||||
expect(body.data.merchant_name).toBe('Restaurant XYZ')
|
||||
})
|
||||
|
||||
it('sets needs_more_detail when confidence is low', async () => {
|
||||
const tx = makeTransaction({ id: 'tx-2', merchant_name: null })
|
||||
|
||||
mockFindMatchingTemplates.mockReturnValueOnce([
|
||||
{
|
||||
template: {
|
||||
id: 'misc',
|
||||
name_sv: 'Diverse',
|
||||
name_en: 'Miscellaneous',
|
||||
group: 'other',
|
||||
debit_account: '6991',
|
||||
credit_account: '1930',
|
||||
description_sv: 'Okategoriserad utgift',
|
||||
vat_rate: 0,
|
||||
vat_treatment: null,
|
||||
deductibility: 'full',
|
||||
deductibility_note_sv: null,
|
||||
special_rules_sv: null,
|
||||
risk_level: 'LOW',
|
||||
},
|
||||
confidence: 0.4,
|
||||
},
|
||||
])
|
||||
|
||||
const { supabase, enqueueMany } = createQueuedMockSupabase()
|
||||
supabase.auth.getUser.mockResolvedValue({
|
||||
data: { user: { id: 'user-1' } },
|
||||
error: null,
|
||||
})
|
||||
enqueueMany([
|
||||
// transaction fetch
|
||||
{ data: tx, error: null },
|
||||
// company_settings
|
||||
{ data: { entity_type: 'enskild_firma' }, error: null },
|
||||
])
|
||||
mockCreateClient.mockResolvedValue(supabase)
|
||||
|
||||
const req = createMockRequest('/api/transactions/tx-2/describe', {
|
||||
method: 'POST',
|
||||
body: { description: 'some kind of payment' },
|
||||
})
|
||||
|
||||
const res = await POST(req, createMockRouteParams({ id: 'tx-2' }))
|
||||
const { status, body } = await parseJsonResponse<{ data: Record<string, unknown> }>(res)
|
||||
|
||||
expect(status).toBe(200)
|
||||
expect(body.data.needs_more_detail).toBe(true)
|
||||
})
|
||||
})
|
||||
@@ -1,131 +0,0 @@
|
||||
import { createClient } from '@/lib/supabase/server'
|
||||
import { NextResponse } from 'next/server'
|
||||
import { ensureInitialized } from '@/lib/init'
|
||||
import { validateBody } from '@/lib/api/validate'
|
||||
import { DescribeTransactionSchema } from '@/lib/api/schemas'
|
||||
import { findMatchingTemplates } from '@/lib/bookkeeping/booking-templates'
|
||||
import { findCounterpartyTemplate, buildMappingResultFromCounterpartyTemplate, formatCounterpartyName } from '@/lib/bookkeeping/counterparty-templates'
|
||||
import { requireCompanyId } from '@/lib/company/context'
|
||||
import type { Transaction, EntityType } from '@/types'
|
||||
|
||||
ensureInitialized()
|
||||
|
||||
export async function POST(
|
||||
request: Request,
|
||||
{ params }: { params: Promise<{ id: string }> }
|
||||
) {
|
||||
const supabase = await createClient()
|
||||
const { id } = await params
|
||||
|
||||
const { data: { user } } = await supabase.auth.getUser()
|
||||
|
||||
if (!user) {
|
||||
return NextResponse.json({ error: 'Unauthorized' }, { status: 401 })
|
||||
}
|
||||
|
||||
const companyId = await requireCompanyId(supabase, user.id)
|
||||
|
||||
const validation = await validateBody(request, DescribeTransactionSchema)
|
||||
if (!validation.success) return validation.response
|
||||
const { description } = validation.data
|
||||
|
||||
// Fetch the transaction (validates ownership)
|
||||
const { data: transaction, error: fetchError } = await supabase
|
||||
.from('transactions')
|
||||
.select('*')
|
||||
.eq('id', id)
|
||||
.eq('company_id', companyId)
|
||||
.single()
|
||||
|
||||
if (fetchError || !transaction) {
|
||||
return NextResponse.json({ error: 'Transaction not found' }, { status: 404 })
|
||||
}
|
||||
|
||||
// Fetch entity type
|
||||
const { data: settings } = await supabase
|
||||
.from('company_settings')
|
||||
.select('entity_type')
|
||||
.eq('company_id', companyId)
|
||||
.single()
|
||||
|
||||
const entityType: EntityType = (settings?.entity_type as EntityType) || 'enskild_firma'
|
||||
|
||||
// Run template matching and counterparty lookup in parallel
|
||||
const [templates, counterpartyMatch] = await Promise.all([
|
||||
findMatchingTemplates(transaction as Transaction, entityType),
|
||||
findCounterpartyTemplate(supabase, user.id, transaction as Transaction),
|
||||
])
|
||||
|
||||
// Build counterparty suggestion if matched
|
||||
let counterpartySuggestion: {
|
||||
id: string
|
||||
counterparty_name: string
|
||||
debit_account: string
|
||||
credit_account: string
|
||||
vat_treatment: string | null
|
||||
confidence: number
|
||||
occurrence_count: number
|
||||
source: string
|
||||
line_pattern: unknown[] | null
|
||||
} | null = null
|
||||
|
||||
if (counterpartyMatch) {
|
||||
const tmpl = counterpartyMatch.template
|
||||
counterpartySuggestion = {
|
||||
id: tmpl.id,
|
||||
counterparty_name: formatCounterpartyName(tmpl.counterparty_name),
|
||||
debit_account: tmpl.debit_account,
|
||||
credit_account: tmpl.credit_account,
|
||||
vat_treatment: tmpl.vat_treatment,
|
||||
line_pattern: tmpl.line_pattern ?? null,
|
||||
confidence: counterpartyMatch.confidence,
|
||||
occurrence_count: tmpl.occurrence_count,
|
||||
source: tmpl.source,
|
||||
}
|
||||
}
|
||||
|
||||
const needsMoreDetail = counterpartySuggestion
|
||||
? false
|
||||
: templates.length === 0 || templates[0].confidence < 0.55
|
||||
|
||||
// Count uncategorized sibling transactions from same merchant
|
||||
let batchCandidateCount = 0
|
||||
if (transaction.merchant_name) {
|
||||
const { count } = await supabase
|
||||
.from('transactions')
|
||||
.select('id', { count: 'exact', head: true })
|
||||
.eq('company_id', companyId)
|
||||
.eq('merchant_name', transaction.merchant_name)
|
||||
.is('journal_entry_id', null)
|
||||
.neq('id', id)
|
||||
|
||||
batchCandidateCount = count || 0
|
||||
}
|
||||
|
||||
return NextResponse.json({
|
||||
data: {
|
||||
templates: templates.map((m) => ({
|
||||
template_id: m.template.id,
|
||||
name_sv: m.template.name_sv,
|
||||
name_en: m.template.name_en,
|
||||
group: m.template.group,
|
||||
debit_account: m.template.debit_account,
|
||||
credit_account: m.template.credit_account,
|
||||
confidence: m.confidence,
|
||||
description_sv: m.template.description_sv,
|
||||
vat_rate: m.template.vat_rate,
|
||||
vat_treatment: m.template.vat_treatment,
|
||||
deductibility: m.template.deductibility,
|
||||
deductibility_note_sv: m.template.deductibility_note_sv || null,
|
||||
special_rules_sv: m.template.special_rules_sv || null,
|
||||
risk_level: m.template.risk_level,
|
||||
})),
|
||||
counterparty_match: counterpartySuggestion,
|
||||
ai_suggestion: null,
|
||||
needs_more_detail: needsMoreDetail,
|
||||
user_description: description,
|
||||
batch_candidate_count: batchCandidateCount,
|
||||
merchant_name: transaction.merchant_name,
|
||||
},
|
||||
})
|
||||
}
|
||||
@@ -1,218 +0,0 @@
|
||||
import { describe, it, expect, vi, beforeEach } from 'vitest'
|
||||
import {
|
||||
createMockRequest,
|
||||
createQueuedMockSupabase,
|
||||
makeTransaction,
|
||||
parseJsonResponse,
|
||||
} from '@/tests/helpers'
|
||||
import { eventBus } from '@/lib/events'
|
||||
|
||||
// Mock init
|
||||
vi.mock('@/lib/init', () => ({ ensureInitialized: vi.fn() }))
|
||||
|
||||
// Mock booking templates
|
||||
vi.mock('@/lib/bookkeeping/booking-templates', () => ({
|
||||
getTemplateById: vi.fn((id: string) => {
|
||||
if (id === 'office_supplies') {
|
||||
return {
|
||||
id: 'office_supplies',
|
||||
name_sv: 'Kontorsmaterial',
|
||||
name_en: 'Office supplies',
|
||||
group: 'office',
|
||||
debit_account: '6110',
|
||||
credit_account: '1930',
|
||||
fallback_category: 'expense_office',
|
||||
default_private: false,
|
||||
vat_treatment: 'standard_25',
|
||||
vat_rate: 0.25,
|
||||
deductibility: 'full',
|
||||
risk_level: 'LOW',
|
||||
requires_review: false,
|
||||
entity_applicability: 'all',
|
||||
direction: 'expense',
|
||||
}
|
||||
}
|
||||
return null
|
||||
}),
|
||||
buildMappingResultFromTemplate: vi.fn(() => ({
|
||||
rule: null,
|
||||
debit_account: '6110',
|
||||
credit_account: '1930',
|
||||
risk_level: 'LOW',
|
||||
confidence: 1.0,
|
||||
requires_review: false,
|
||||
default_private: false,
|
||||
vat_lines: [],
|
||||
description: 'Kontorsmaterial',
|
||||
})),
|
||||
}))
|
||||
|
||||
// Mock transaction entries
|
||||
const mockCreateTransactionJournalEntry = vi.fn().mockResolvedValue({ id: 'je-1' })
|
||||
vi.mock('@/lib/bookkeeping/transaction-entries', () => ({
|
||||
createTransactionJournalEntry: (...args: unknown[]) => mockCreateTransactionJournalEntry(...args),
|
||||
}))
|
||||
|
||||
// Mock mapping engine
|
||||
const mockSaveUserMappingRule = vi.fn().mockResolvedValue(undefined)
|
||||
vi.mock('@/lib/bookkeeping/mapping-engine', () => ({
|
||||
saveUserMappingRule: (...args: unknown[]) => mockSaveUserMappingRule(...args),
|
||||
}))
|
||||
|
||||
// Mock Supabase — set up once, re-configure per test via auth mock + queue
|
||||
const mockCreateClient = vi.fn()
|
||||
vi.mock('@/lib/supabase/server', () => ({
|
||||
createClient: (...args: unknown[]) => mockCreateClient(...args),
|
||||
}))
|
||||
|
||||
vi.mock('@/lib/company/context', () => ({
|
||||
requireCompanyId: vi.fn().mockResolvedValue('company-1'),
|
||||
getActiveCompanyId: vi.fn().mockResolvedValue('company-1'),
|
||||
}))
|
||||
|
||||
describe('POST /api/transactions/batch-describe', () => {
|
||||
let POST: typeof import('../route').POST
|
||||
|
||||
beforeEach(async () => {
|
||||
vi.clearAllMocks()
|
||||
eventBus.clear()
|
||||
const mod = await import('../route')
|
||||
POST = mod.POST
|
||||
})
|
||||
|
||||
it('returns 401 when not authenticated', async () => {
|
||||
const { supabase } = createQueuedMockSupabase()
|
||||
supabase.auth.getUser.mockResolvedValue({
|
||||
data: { user: null },
|
||||
error: { message: 'Not authenticated' },
|
||||
})
|
||||
mockCreateClient.mockResolvedValue(supabase)
|
||||
|
||||
const req = createMockRequest('/api/transactions/batch-describe', {
|
||||
method: 'POST',
|
||||
body: {
|
||||
merchant_name: 'Staples',
|
||||
template_id: 'office_supplies',
|
||||
is_business: true,
|
||||
},
|
||||
})
|
||||
|
||||
const res = await POST(req)
|
||||
const { status, body } = await parseJsonResponse(res)
|
||||
|
||||
expect(status).toBe(401)
|
||||
expect(body).toHaveProperty('error', 'Unauthorized')
|
||||
})
|
||||
|
||||
it('returns 400 for invalid template_id', async () => {
|
||||
const { supabase } = createQueuedMockSupabase()
|
||||
supabase.auth.getUser.mockResolvedValue({
|
||||
data: { user: { id: 'user-1' } },
|
||||
error: null,
|
||||
})
|
||||
mockCreateClient.mockResolvedValue(supabase)
|
||||
|
||||
const req = createMockRequest('/api/transactions/batch-describe', {
|
||||
method: 'POST',
|
||||
body: {
|
||||
merchant_name: 'Staples',
|
||||
template_id: 'nonexistent_template',
|
||||
is_business: true,
|
||||
},
|
||||
})
|
||||
|
||||
const res = await POST(req)
|
||||
const { status, body } = await parseJsonResponse(res)
|
||||
|
||||
expect(status).toBe(400)
|
||||
expect(body).toHaveProperty('error', 'Invalid template_id')
|
||||
})
|
||||
|
||||
it('applies template to uncategorized merchant transactions', async () => {
|
||||
const tx1 = makeTransaction({ id: 'tx-1', merchant_name: 'Staples', amount: -299 })
|
||||
const tx2 = makeTransaction({ id: 'tx-2', merchant_name: 'Staples', amount: -150 })
|
||||
|
||||
const { supabase, enqueueMany } = createQueuedMockSupabase()
|
||||
supabase.auth.getUser.mockResolvedValue({
|
||||
data: { user: { id: 'user-1' } },
|
||||
error: null,
|
||||
})
|
||||
enqueueMany([
|
||||
// company_settings
|
||||
{ data: { entity_type: 'enskild_firma', fiscal_year_start_month: 1 }, error: null },
|
||||
// fetch uncategorized transactions
|
||||
{ data: [tx1, tx2], error: null },
|
||||
// fiscal period upsert for tx1
|
||||
{ data: null, error: null },
|
||||
// transaction update for tx1
|
||||
{ data: null, error: null },
|
||||
// fiscal period upsert for tx2
|
||||
{ data: null, error: null },
|
||||
// transaction update for tx2
|
||||
{ data: null, error: null },
|
||||
])
|
||||
mockCreateClient.mockResolvedValue(supabase)
|
||||
|
||||
const req = createMockRequest('/api/transactions/batch-describe', {
|
||||
method: 'POST',
|
||||
body: {
|
||||
merchant_name: 'Staples',
|
||||
template_id: 'office_supplies',
|
||||
is_business: true,
|
||||
user_description: 'office supplies purchase',
|
||||
},
|
||||
})
|
||||
|
||||
const res = await POST(req)
|
||||
const { status, body } = await parseJsonResponse<{ data: { applied: number; errors: string[] } }>(res)
|
||||
|
||||
expect(status).toBe(200)
|
||||
expect(body.data.applied).toBe(2)
|
||||
expect(body.data.errors).toHaveLength(0)
|
||||
|
||||
// Verify journal entries were created
|
||||
expect(mockCreateTransactionJournalEntry).toHaveBeenCalledTimes(2)
|
||||
|
||||
// Verify mapping rule was saved with user description
|
||||
expect(mockSaveUserMappingRule).toHaveBeenCalledWith(
|
||||
expect.anything(),
|
||||
'company-1',
|
||||
'Staples',
|
||||
'6110',
|
||||
'1930',
|
||||
false,
|
||||
'office supplies purchase',
|
||||
'office_supplies'
|
||||
)
|
||||
})
|
||||
|
||||
it('returns 0 applied when no uncategorized transactions exist', async () => {
|
||||
const { supabase, enqueueMany } = createQueuedMockSupabase()
|
||||
supabase.auth.getUser.mockResolvedValue({
|
||||
data: { user: { id: 'user-1' } },
|
||||
error: null,
|
||||
})
|
||||
enqueueMany([
|
||||
// company_settings
|
||||
{ data: { entity_type: 'enskild_firma', fiscal_year_start_month: 1 }, error: null },
|
||||
// fetch uncategorized transactions — empty
|
||||
{ data: [], error: null },
|
||||
])
|
||||
mockCreateClient.mockResolvedValue(supabase)
|
||||
|
||||
const req = createMockRequest('/api/transactions/batch-describe', {
|
||||
method: 'POST',
|
||||
body: {
|
||||
merchant_name: 'Unknown Merchant',
|
||||
template_id: 'office_supplies',
|
||||
is_business: true,
|
||||
},
|
||||
})
|
||||
|
||||
const res = await POST(req)
|
||||
const { status, body } = await parseJsonResponse<{ data: { applied: number } }>(res)
|
||||
|
||||
expect(status).toBe(200)
|
||||
expect(body.data.applied).toBe(0)
|
||||
})
|
||||
})
|
||||
@@ -1,179 +0,0 @@
|
||||
import { createClient } from '@/lib/supabase/server'
|
||||
import { NextResponse } from 'next/server'
|
||||
import { eventBus } from '@/lib/events'
|
||||
import { ensureInitialized } from '@/lib/init'
|
||||
import { validateBody } from '@/lib/api/validate'
|
||||
import { BatchDescribeSchema } from '@/lib/api/schemas'
|
||||
import { getTemplateById, buildMappingResultFromTemplate } from '@/lib/bookkeeping/booking-templates'
|
||||
import { createTransactionJournalEntry } from '@/lib/bookkeeping/transaction-entries'
|
||||
import { saveUserMappingRule } from '@/lib/bookkeeping/mapping-engine'
|
||||
import { requireCompanyId } from '@/lib/company/context'
|
||||
import type { Transaction, EntityType, TransactionCategory } from '@/types'
|
||||
|
||||
ensureInitialized()
|
||||
|
||||
export async function POST(request: Request) {
|
||||
const supabase = await createClient()
|
||||
|
||||
const { data: { user } } = await supabase.auth.getUser()
|
||||
|
||||
if (!user) {
|
||||
return NextResponse.json({ error: 'Unauthorized' }, { status: 401 })
|
||||
}
|
||||
|
||||
const companyId = await requireCompanyId(supabase, user.id)
|
||||
|
||||
const validation = await validateBody(request, BatchDescribeSchema)
|
||||
if (!validation.success) return validation.response
|
||||
const { merchant_name, template_id, is_business, user_description } = validation.data
|
||||
|
||||
// Look up the template
|
||||
const template = getTemplateById(template_id)
|
||||
if (!template) {
|
||||
return NextResponse.json({ error: 'Invalid template_id' }, { status: 400 })
|
||||
}
|
||||
|
||||
// Fetch entity type and fiscal year start
|
||||
const { data: settings } = await supabase
|
||||
.from('company_settings')
|
||||
.select('entity_type, fiscal_year_start_month')
|
||||
.eq('company_id', companyId)
|
||||
.single()
|
||||
|
||||
const entityType: EntityType = (settings?.entity_type as EntityType) || 'enskild_firma'
|
||||
const fiscalYearStartMonth: number = settings?.fiscal_year_start_month ?? 1
|
||||
|
||||
// Fetch all uncategorized transactions from the specified merchant (limit 50)
|
||||
const { data: transactions, error: fetchError } = await supabase
|
||||
.from('transactions')
|
||||
.select('*')
|
||||
.eq('company_id', companyId)
|
||||
.eq('merchant_name', merchant_name)
|
||||
.is('journal_entry_id', null)
|
||||
.order('date', { ascending: true })
|
||||
.limit(50)
|
||||
|
||||
if (fetchError || !transactions || transactions.length === 0) {
|
||||
return NextResponse.json({
|
||||
data: { applied: 0, errors: [] },
|
||||
})
|
||||
}
|
||||
|
||||
const finalCategory: TransactionCategory = is_business
|
||||
? template.fallback_category
|
||||
: 'private'
|
||||
|
||||
let applied = 0
|
||||
const errors: string[] = []
|
||||
|
||||
for (const tx of transactions) {
|
||||
try {
|
||||
const mappingResult = buildMappingResultFromTemplate(
|
||||
template,
|
||||
tx as Transaction,
|
||||
entityType
|
||||
)
|
||||
|
||||
// Ensure fiscal period exists
|
||||
const txDate = new Date(tx.date)
|
||||
const txMonth = txDate.getMonth() + 1
|
||||
const txYear = txDate.getFullYear()
|
||||
|
||||
let periodStartYear: number
|
||||
if (fiscalYearStartMonth === 1) {
|
||||
periodStartYear = txYear
|
||||
} else if (txMonth >= fiscalYearStartMonth) {
|
||||
periodStartYear = txYear
|
||||
} else {
|
||||
periodStartYear = txYear - 1
|
||||
}
|
||||
|
||||
const startMonth = String(fiscalYearStartMonth).padStart(2, '0')
|
||||
const periodStart = `${periodStartYear}-${startMonth}-01`
|
||||
const endYear = fiscalYearStartMonth === 1 ? periodStartYear : periodStartYear + 1
|
||||
const endMonth = fiscalYearStartMonth === 1 ? 12 : fiscalYearStartMonth - 1
|
||||
const lastDay = new Date(endYear, endMonth, 0).getDate()
|
||||
const periodEnd = `${endYear}-${String(endMonth).padStart(2, '0')}-${String(lastDay).padStart(2, '0')}`
|
||||
const periodName = fiscalYearStartMonth === 1
|
||||
? `Räkenskapsår ${periodStartYear}`
|
||||
: `Räkenskapsår ${periodStartYear}/${endYear}`
|
||||
|
||||
await supabase
|
||||
.from('fiscal_periods')
|
||||
.upsert({
|
||||
user_id: user.id,
|
||||
company_id: companyId,
|
||||
name: periodName,
|
||||
period_start: periodStart,
|
||||
period_end: periodEnd,
|
||||
}, { onConflict: 'company_id,period_start,period_end' })
|
||||
|
||||
// Create journal entry
|
||||
let journalEntryId: string | null = null
|
||||
try {
|
||||
const journalEntry = await createTransactionJournalEntry(
|
||||
supabase,
|
||||
companyId,
|
||||
user.id,
|
||||
tx as Transaction,
|
||||
mappingResult
|
||||
)
|
||||
if (journalEntry) {
|
||||
journalEntryId = journalEntry.id
|
||||
}
|
||||
} catch (err) {
|
||||
console.error(`[batch-describe] Journal entry failed for ${tx.id}:`, err)
|
||||
}
|
||||
|
||||
// Update the transaction
|
||||
await supabase
|
||||
.from('transactions')
|
||||
.update({
|
||||
is_business,
|
||||
category: finalCategory,
|
||||
journal_entry_id: journalEntryId,
|
||||
})
|
||||
.eq('id', tx.id)
|
||||
|
||||
await eventBus.emit({
|
||||
type: 'transaction.categorized',
|
||||
payload: {
|
||||
transaction: tx as Transaction,
|
||||
account: mappingResult.debit_account,
|
||||
taxCode: mappingResult.vat_lines[0]?.account_number || '',
|
||||
userId: user.id,
|
||||
companyId,
|
||||
},
|
||||
})
|
||||
|
||||
applied++
|
||||
} catch (err) {
|
||||
const msg = err instanceof Error ? err.message : 'Unknown error'
|
||||
errors.push(`${tx.id}: ${msg}`)
|
||||
}
|
||||
}
|
||||
|
||||
// Save a mapping rule for future auto-categorization
|
||||
if (applied > 0) {
|
||||
try {
|
||||
const sampleTx = transactions[0] as Transaction
|
||||
const sampleResult = buildMappingResultFromTemplate(template, sampleTx, entityType)
|
||||
await saveUserMappingRule(
|
||||
supabase,
|
||||
companyId,
|
||||
merchant_name,
|
||||
sampleResult.debit_account,
|
||||
sampleResult.credit_account,
|
||||
!is_business,
|
||||
user_description,
|
||||
template_id
|
||||
)
|
||||
} catch {
|
||||
// Non-critical
|
||||
}
|
||||
}
|
||||
|
||||
return NextResponse.json({
|
||||
data: { applied, errors },
|
||||
})
|
||||
}
|
||||
@@ -1,787 +0,0 @@
|
||||
'use client'
|
||||
|
||||
import { useState } from 'react'
|
||||
import { Button } from '@/components/ui/button'
|
||||
import { Badge } from '@/components/ui/badge'
|
||||
import { Card, CardContent } from '@/components/ui/card'
|
||||
import { Textarea } from '@/components/ui/textarea'
|
||||
import {
|
||||
Dialog,
|
||||
DialogContent,
|
||||
DialogHeader,
|
||||
DialogTitle,
|
||||
DialogDescription,
|
||||
} from '@/components/ui/dialog'
|
||||
import { useToast } from '@/components/ui/use-toast'
|
||||
import { formatCurrency, formatDate } from '@/lib/utils'
|
||||
import {
|
||||
ArrowUpRight,
|
||||
ArrowDownRight,
|
||||
Loader2,
|
||||
Search,
|
||||
ArrowLeft,
|
||||
Check,
|
||||
CheckCircle2,
|
||||
AlertTriangle,
|
||||
Wand,
|
||||
} from 'lucide-react'
|
||||
import JournalEntryPreview from './JournalEntryPreview'
|
||||
import { formatAccountWithName } from '@/lib/bookkeeping/client-account-names'
|
||||
import type { TransactionWithInvoice } from './transaction-types'
|
||||
import type { LinePatternEntry } from '@/types'
|
||||
|
||||
interface TemplateMatch {
|
||||
template_id: string
|
||||
name_sv: string
|
||||
name_en: string
|
||||
group: string
|
||||
debit_account: string
|
||||
credit_account: string
|
||||
confidence: number
|
||||
description_sv: string
|
||||
vat_rate: number
|
||||
vat_treatment: string | null
|
||||
deductibility: 'full' | 'non_deductible' | 'conditional'
|
||||
deductibility_note_sv: string | null
|
||||
special_rules_sv: string | null
|
||||
risk_level: string
|
||||
}
|
||||
|
||||
interface CounterpartyMatch {
|
||||
id: string
|
||||
counterparty_name: string
|
||||
debit_account: string
|
||||
credit_account: string
|
||||
vat_treatment: string | null
|
||||
confidence: number
|
||||
occurrence_count: number
|
||||
source: string
|
||||
line_pattern: LinePatternEntry[] | null
|
||||
}
|
||||
|
||||
interface AiSuggestion {
|
||||
debit_account: string
|
||||
credit_account: string
|
||||
vat_treatment: string | null
|
||||
category: string
|
||||
confidence: number
|
||||
reasoning: string
|
||||
warnings: string[]
|
||||
template_id: string | null
|
||||
}
|
||||
|
||||
interface DescribeResult {
|
||||
templates: TemplateMatch[]
|
||||
counterparty_match: CounterpartyMatch | null
|
||||
ai_suggestion: AiSuggestion | null
|
||||
needs_more_detail: boolean
|
||||
user_description: string
|
||||
batch_candidate_count: number
|
||||
merchant_name: string | null
|
||||
}
|
||||
|
||||
interface DescribeTransactionDialogProps {
|
||||
open: boolean
|
||||
onOpenChange: (open: boolean) => void
|
||||
transaction: TransactionWithInvoice | null
|
||||
onCategorized: (transactionId: string, journalEntryId: string | null) => void
|
||||
onBatchApplied?: (count: number) => void
|
||||
}
|
||||
|
||||
type Step = 'describe' | 'pick' | 'batch'
|
||||
type Selection = { type: 'template'; templateId: string } | { type: 'ai' } | { type: 'counterparty' }
|
||||
|
||||
function getExamplePrompts(transaction: TransactionWithInvoice): string[] {
|
||||
const desc = (transaction.description || '').toLowerCase()
|
||||
const isExpense = transaction.amount < 0
|
||||
|
||||
if (!isExpense) {
|
||||
return ['Konsultarvode', 'Försäljning av varor', 'Återbetalning']
|
||||
}
|
||||
|
||||
if (desc.includes('restaurang') || desc.includes('lunch') || desc.includes('middag') || desc.includes('mat')) {
|
||||
return ['Lunch med kund', 'Personalmiddag', 'Fika till kontoret']
|
||||
}
|
||||
if (desc.includes('hotel') || desc.includes('hotell') || desc.includes('boende') || desc.includes('resa')) {
|
||||
return ['Tjänsteresa', 'Hotell konferens', 'Flygbiljett']
|
||||
}
|
||||
if (desc.includes('uber') || desc.includes('taxi') || desc.includes('bolt') || desc.includes('sj ')) {
|
||||
return ['Taxi till kund', 'Tjänsteresa', 'Pendling']
|
||||
}
|
||||
if (desc.includes('google') || desc.includes('meta') || desc.includes('facebook') || desc.includes('linkedin')) {
|
||||
return ['Online-annonsering', 'SaaS-prenumeration', 'Marknadsföringskampanj']
|
||||
}
|
||||
if (desc.includes('amazon') || desc.includes('aws') || desc.includes('azure') || desc.includes('cloud')) {
|
||||
return ['Serverhosting', 'SaaS-prenumeration', 'Kontorsmaterial']
|
||||
}
|
||||
|
||||
return ['Kontorsmaterial', 'SaaS-prenumeration', 'Konsulttjänst', 'Reklam']
|
||||
}
|
||||
|
||||
function getVatRateFromTreatment(treatment: string | null): number {
|
||||
switch (treatment) {
|
||||
case 'standard_25': return 0.25
|
||||
case 'reduced_12': return 0.12
|
||||
case 'reduced_6': return 0.06
|
||||
default: return 0
|
||||
}
|
||||
}
|
||||
|
||||
export default function DescribeTransactionDialog({
|
||||
open,
|
||||
onOpenChange,
|
||||
transaction,
|
||||
onCategorized,
|
||||
onBatchApplied,
|
||||
}: DescribeTransactionDialogProps) {
|
||||
const { toast } = useToast()
|
||||
const [step, setStep] = useState<Step>('describe')
|
||||
const [description, setDescription] = useState('')
|
||||
const [isSearching, setIsSearching] = useState(false)
|
||||
const [isBooking, setIsBooking] = useState(false)
|
||||
const [isBatchApplying, setIsBatchApplying] = useState(false)
|
||||
const [describeResult, setDescribeResult] = useState<DescribeResult | null>(null)
|
||||
const [selection, setSelection] = useState<Selection | null>(null)
|
||||
|
||||
const selectedTemplateId = selection?.type === 'template' ? selection.templateId : null
|
||||
const isAiSelected = selection?.type === 'ai'
|
||||
|
||||
function resetState() {
|
||||
setStep('describe')
|
||||
setDescription('')
|
||||
setIsSearching(false)
|
||||
setIsBooking(false)
|
||||
setIsBatchApplying(false)
|
||||
setDescribeResult(null)
|
||||
setSelection(null)
|
||||
}
|
||||
|
||||
function handleOpenChange(isOpen: boolean) {
|
||||
if (!isOpen) {
|
||||
resetState()
|
||||
}
|
||||
onOpenChange(isOpen)
|
||||
}
|
||||
|
||||
async function handleSearch() {
|
||||
if (!transaction || description.trim().length < 3) return
|
||||
|
||||
setIsSearching(true)
|
||||
try {
|
||||
const response = await fetch(`/api/transactions/${transaction.id}/describe`, {
|
||||
method: 'POST',
|
||||
headers: { 'Content-Type': 'application/json' },
|
||||
body: JSON.stringify({ description: description.trim() }),
|
||||
})
|
||||
const result = await response.json()
|
||||
if (!response.ok) {
|
||||
toast({
|
||||
title: 'Fel',
|
||||
description: result.error || 'Kunde inte söka mallar',
|
||||
variant: 'destructive',
|
||||
})
|
||||
setIsSearching(false)
|
||||
return
|
||||
}
|
||||
|
||||
setDescribeResult(result.data)
|
||||
setSelection(null)
|
||||
setStep('pick')
|
||||
} catch {
|
||||
toast({
|
||||
title: 'Fel',
|
||||
description: 'Något gick fel vid sökning',
|
||||
variant: 'destructive',
|
||||
})
|
||||
}
|
||||
setIsSearching(false)
|
||||
}
|
||||
|
||||
async function handleBook() {
|
||||
if (!transaction || !describeResult || !selection) return
|
||||
|
||||
setIsBooking(true)
|
||||
try {
|
||||
// Build categorize request based on selection type
|
||||
let body: Record<string, unknown>
|
||||
|
||||
if (selection.type === 'counterparty') {
|
||||
const cp = describeResult.counterparty_match!
|
||||
body = {
|
||||
is_business: true,
|
||||
counterparty_template_id: cp.id,
|
||||
user_description: describeResult.user_description,
|
||||
}
|
||||
} else if (selection.type === 'template') {
|
||||
body = {
|
||||
is_business: true,
|
||||
template_id: selection.templateId,
|
||||
user_description: describeResult.user_description,
|
||||
}
|
||||
} else {
|
||||
// AI suggestion selected
|
||||
const ai = describeResult.ai_suggestion!
|
||||
if (ai.template_id) {
|
||||
// AI matched a template — use template-based booking
|
||||
body = {
|
||||
is_business: true,
|
||||
template_id: ai.template_id,
|
||||
user_description: describeResult.user_description,
|
||||
}
|
||||
} else {
|
||||
// AI category-based booking — category maps to the correct account
|
||||
body = {
|
||||
is_business: true,
|
||||
category: ai.category,
|
||||
vat_treatment: ai.vat_treatment || undefined,
|
||||
user_description: describeResult.user_description,
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
const response = await fetch(`/api/transactions/${transaction.id}/categorize`, {
|
||||
method: 'POST',
|
||||
headers: { 'Content-Type': 'application/json' },
|
||||
body: JSON.stringify(body),
|
||||
})
|
||||
const result = await response.json()
|
||||
if (!response.ok) {
|
||||
toast({
|
||||
title: 'Fel',
|
||||
description: result.error || 'Kunde inte bokföra transaktion',
|
||||
variant: 'destructive',
|
||||
})
|
||||
setIsBooking(false)
|
||||
return
|
||||
}
|
||||
|
||||
if (describeResult.batch_candidate_count > 0) {
|
||||
setStep('batch')
|
||||
setIsBooking(false)
|
||||
onCategorized(transaction.id, result.journal_entry_id || null)
|
||||
} else {
|
||||
toast({ title: 'Bokförd', description: 'Transaktion bokförd och verifikation skapad' })
|
||||
onCategorized(transaction.id, result.journal_entry_id || null)
|
||||
handleOpenChange(false)
|
||||
}
|
||||
} catch {
|
||||
toast({
|
||||
title: 'Fel',
|
||||
description: 'Något gick fel vid bokföring',
|
||||
variant: 'destructive',
|
||||
})
|
||||
setIsBooking(false)
|
||||
}
|
||||
}
|
||||
|
||||
async function handleBatchApply() {
|
||||
if (!describeResult) return
|
||||
|
||||
// For batch apply, we need a template_id
|
||||
let templateId: string | null = null
|
||||
if (selection?.type === 'template') {
|
||||
templateId = selection.templateId
|
||||
} else if (selection?.type === 'ai' && describeResult.ai_suggestion?.template_id) {
|
||||
templateId = describeResult.ai_suggestion.template_id
|
||||
}
|
||||
|
||||
if (!templateId) return
|
||||
|
||||
setIsBatchApplying(true)
|
||||
try {
|
||||
const response = await fetch('/api/transactions/batch-describe', {
|
||||
method: 'POST',
|
||||
headers: { 'Content-Type': 'application/json' },
|
||||
body: JSON.stringify({
|
||||
merchant_name: describeResult.merchant_name,
|
||||
template_id: templateId,
|
||||
is_business: true,
|
||||
user_description: describeResult.user_description,
|
||||
}),
|
||||
})
|
||||
const result = await response.json()
|
||||
if (!response.ok) {
|
||||
toast({
|
||||
title: 'Fel',
|
||||
description: result.error || 'Kunde inte bokföra batch',
|
||||
variant: 'destructive',
|
||||
})
|
||||
setIsBatchApplying(false)
|
||||
return
|
||||
}
|
||||
|
||||
const applied = result.data?.applied || 0
|
||||
const errors = result.data?.errors || []
|
||||
if (errors.length > 0) {
|
||||
toast({
|
||||
title: 'Delvis klart',
|
||||
description: `${applied} lyckades, ${errors.length} misslyckades`,
|
||||
variant: 'destructive',
|
||||
})
|
||||
} else {
|
||||
toast({
|
||||
title: 'Klart',
|
||||
description: `${applied} transaktioner bokförda`,
|
||||
})
|
||||
}
|
||||
onBatchApplied?.(applied)
|
||||
handleOpenChange(false)
|
||||
} catch {
|
||||
toast({
|
||||
title: 'Fel',
|
||||
description: 'Något gick fel vid batchbokföring',
|
||||
variant: 'destructive',
|
||||
})
|
||||
setIsBatchApplying(false)
|
||||
}
|
||||
}
|
||||
|
||||
function handleSkipBatch() {
|
||||
toast({ title: 'Bokförd', description: 'Transaktion bokförd och verifikation skapad' })
|
||||
handleOpenChange(false)
|
||||
}
|
||||
|
||||
if (!transaction) return null
|
||||
|
||||
const isIncome = transaction.amount > 0
|
||||
const counterpartyMatch = describeResult?.counterparty_match
|
||||
const isCounterpartySelected = selection?.type === 'counterparty'
|
||||
const aiSuggestion = describeResult?.ai_suggestion
|
||||
// Check if AI agrees with top template
|
||||
const topTemplate = describeResult?.templates[0]
|
||||
const aiAgreesWithTop = aiSuggestion && topTemplate && aiSuggestion.debit_account === topTemplate.debit_account
|
||||
|
||||
// Determine if batch apply is available (requires a template_id)
|
||||
const canBatchApply = selection?.type === 'template' || (selection?.type === 'ai' && !!describeResult?.ai_suggestion?.template_id)
|
||||
|
||||
return (
|
||||
<Dialog open={open} onOpenChange={(isBooking || isBatchApplying) ? undefined : handleOpenChange}>
|
||||
<DialogContent className="max-w-md max-h-[90vh] flex flex-col">
|
||||
<DialogHeader>
|
||||
<DialogTitle>
|
||||
{step === 'describe' && 'Beskriv transaktion'}
|
||||
{step === 'pick' && 'Välj mall'}
|
||||
{step === 'batch' && 'Bokför liknande'}
|
||||
</DialogTitle>
|
||||
<DialogDescription>
|
||||
{step === 'describe' && 'Beskriv vad transaktionen gäller så hittar vi rätt bokföringsmall'}
|
||||
{step === 'pick' && 'Välj den mall som stämmer bäst'}
|
||||
{step === 'batch' && 'Transaktion bokförd!'}
|
||||
</DialogDescription>
|
||||
</DialogHeader>
|
||||
|
||||
{/* Transaction summary - shown in describe and pick steps */}
|
||||
{(step === 'describe' || step === 'pick') && (
|
||||
<div className="flex items-center gap-3 rounded-lg border p-3">
|
||||
<div
|
||||
className="h-9 w-9 rounded-full flex items-center justify-center flex-shrink-0 bg-muted text-muted-foreground"
|
||||
>
|
||||
{isIncome ? (
|
||||
<ArrowUpRight className="h-4 w-4" />
|
||||
) : (
|
||||
<ArrowDownRight className="h-4 w-4" />
|
||||
)}
|
||||
</div>
|
||||
<div className="flex-1 min-w-0">
|
||||
<p className="font-medium text-sm truncate">{transaction.description}</p>
|
||||
<p className="text-xs text-muted-foreground">{formatDate(transaction.date)}</p>
|
||||
</div>
|
||||
<p className="font-medium text-sm flex-shrink-0">
|
||||
{isIncome ? '+' : ''}
|
||||
{formatCurrency(transaction.amount, transaction.currency)}
|
||||
</p>
|
||||
</div>
|
||||
)}
|
||||
|
||||
{/* Step 1: Describe */}
|
||||
{step === 'describe' && (
|
||||
<div className="space-y-4">
|
||||
<Textarea
|
||||
placeholder="Beskriv vad transaktionen gäller, t.ex. 'lunch med kund' eller 'kontorsmaterial'"
|
||||
value={description}
|
||||
onChange={(e) => setDescription(e.target.value)}
|
||||
rows={3}
|
||||
autoFocus
|
||||
onKeyDown={(e) => {
|
||||
if (e.key === 'Enter' && !e.shiftKey && description.trim().length >= 3) {
|
||||
e.preventDefault()
|
||||
handleSearch()
|
||||
}
|
||||
}}
|
||||
/>
|
||||
<div className="flex flex-wrap gap-1.5">
|
||||
{getExamplePrompts(transaction).map((prompt) => (
|
||||
<button
|
||||
key={prompt}
|
||||
type="button"
|
||||
className="text-xs px-2.5 py-1 rounded-full border bg-muted/50 hover:bg-muted text-muted-foreground hover:text-foreground transition-colors"
|
||||
onClick={() => setDescription(prompt)}
|
||||
>
|
||||
{prompt}
|
||||
</button>
|
||||
))}
|
||||
</div>
|
||||
<Button
|
||||
className="w-full"
|
||||
disabled={description.trim().length < 3 || isSearching}
|
||||
onClick={handleSearch}
|
||||
>
|
||||
{isSearching ? (
|
||||
<Loader2 className="mr-2 h-4 w-4 animate-spin" />
|
||||
) : (
|
||||
<Search className="mr-2 h-4 w-4" />
|
||||
)}
|
||||
{isSearching ? 'Söker...' : 'Sök'}
|
||||
</Button>
|
||||
</div>
|
||||
)}
|
||||
|
||||
{/* Step 2: Pick template */}
|
||||
{step === 'pick' && describeResult && (
|
||||
<div className="space-y-4 min-h-0 flex flex-col">
|
||||
{describeResult.needs_more_detail && (
|
||||
<div className="flex items-start gap-2 p-3 rounded-lg bg-warning/10 text-warning-foreground text-sm">
|
||||
<AlertTriangle className="h-4 w-4 flex-shrink-0 mt-0.5" />
|
||||
<p>Resultaten är osäkra. Försök beskriv mer detaljerat för bättre träffar.</p>
|
||||
</div>
|
||||
)}
|
||||
|
||||
<div className="overflow-y-auto max-h-[40vh] space-y-2 pr-1">
|
||||
{/* Counterparty Match Card */}
|
||||
{counterpartyMatch && (
|
||||
<Card
|
||||
className={`cursor-pointer transition-colors hover:border-primary/50 ${
|
||||
isCounterpartySelected ? 'border-primary bg-primary/5' : ''
|
||||
}`}
|
||||
onClick={() => setSelection({ type: 'counterparty' })}
|
||||
>
|
||||
<CardContent className="py-3 px-4">
|
||||
<div className="flex items-start justify-between gap-2">
|
||||
<div className="min-w-0 flex-1">
|
||||
<div className="flex items-center gap-1.5 mb-1">
|
||||
<Badge variant="secondary" className="text-[10px] px-1.5 py-0 bg-emerald-100 text-emerald-700 dark:bg-emerald-900/30 dark:text-emerald-300">
|
||||
Tidigare bokföring
|
||||
</Badge>
|
||||
</div>
|
||||
<p className="text-sm font-medium">{counterpartyMatch.counterparty_name}</p>
|
||||
<div className="flex flex-wrap items-center gap-1.5 mt-1.5">
|
||||
{counterpartyMatch.line_pattern && counterpartyMatch.line_pattern.length > 0 ? (
|
||||
counterpartyMatch.line_pattern.map((lp, i) => (
|
||||
<Badge key={i} variant="secondary" className="text-[10px] px-1.5 py-0">
|
||||
{formatAccountWithName(lp.account)}
|
||||
</Badge>
|
||||
))
|
||||
) : (
|
||||
<>
|
||||
<Badge variant="secondary" className="text-[10px] px-1.5 py-0">
|
||||
D: {formatAccountWithName(counterpartyMatch.debit_account)}
|
||||
</Badge>
|
||||
<Badge variant="secondary" className="text-[10px] px-1.5 py-0">
|
||||
K: {formatAccountWithName(counterpartyMatch.credit_account)}
|
||||
</Badge>
|
||||
{counterpartyMatch.vat_treatment && counterpartyMatch.vat_treatment !== 'exempt' && (
|
||||
<Badge variant="outline" className="text-[10px] px-1.5 py-0">
|
||||
Moms {Math.round(getVatRateFromTreatment(counterpartyMatch.vat_treatment) * 100)}%
|
||||
</Badge>
|
||||
)}
|
||||
</>
|
||||
)}
|
||||
</div>
|
||||
<p className="text-xs text-muted-foreground mt-1">
|
||||
{counterpartyMatch.occurrence_count} tidigare bokföringar
|
||||
</p>
|
||||
</div>
|
||||
<div className="flex items-center gap-2 flex-shrink-0">
|
||||
<Badge
|
||||
variant={counterpartyMatch.confidence >= 0.7 ? 'default' : 'outline'}
|
||||
className="text-[10px] px-1.5 py-0"
|
||||
>
|
||||
{Math.round(counterpartyMatch.confidence * 100)}%
|
||||
</Badge>
|
||||
{isCounterpartySelected && (
|
||||
<Check className="h-4 w-4 text-primary" />
|
||||
)}
|
||||
</div>
|
||||
</div>
|
||||
</CardContent>
|
||||
</Card>
|
||||
)}
|
||||
|
||||
{/* AI Suggestion Card */}
|
||||
{aiSuggestion && (
|
||||
<Card
|
||||
className={`cursor-pointer transition-colors hover:border-primary/50 ${
|
||||
isAiSelected ? 'border-primary bg-primary/5' : ''
|
||||
}`}
|
||||
onClick={() => setSelection({ type: 'ai' })}
|
||||
>
|
||||
<CardContent className="py-3 px-4">
|
||||
<div className="flex items-start justify-between gap-2">
|
||||
<div className="min-w-0 flex-1">
|
||||
<div className="flex items-center gap-1.5 mb-1">
|
||||
<Wand className="h-3.5 w-3.5 text-violet-500" />
|
||||
<Badge variant="secondary" className="text-[10px] px-1.5 py-0 bg-violet-100 text-violet-700 dark:bg-violet-900/30 dark:text-violet-300">
|
||||
AI-förslag
|
||||
</Badge>
|
||||
</div>
|
||||
<p className="text-sm text-muted-foreground mt-1">
|
||||
{aiSuggestion.reasoning}
|
||||
</p>
|
||||
<div className="flex flex-wrap items-center gap-1.5 mt-1.5">
|
||||
<Badge variant="secondary" className="text-[10px] px-1.5 py-0">
|
||||
D: {formatAccountWithName(aiSuggestion.debit_account)}
|
||||
</Badge>
|
||||
<Badge variant="secondary" className="text-[10px] px-1.5 py-0">
|
||||
K: {formatAccountWithName(aiSuggestion.credit_account)}
|
||||
</Badge>
|
||||
{aiSuggestion.vat_treatment && aiSuggestion.vat_treatment !== 'exempt' && (
|
||||
<Badge variant="outline" className="text-[10px] px-1.5 py-0">
|
||||
Moms {Math.round(getVatRateFromTreatment(aiSuggestion.vat_treatment) * 100)}%
|
||||
</Badge>
|
||||
)}
|
||||
{aiSuggestion.vat_treatment === 'exempt' && (
|
||||
<Badge variant="outline" className="text-[10px] px-1.5 py-0">
|
||||
Momsfritt
|
||||
</Badge>
|
||||
)}
|
||||
</div>
|
||||
{aiSuggestion.warnings.length > 0 && (
|
||||
<div className="flex flex-wrap gap-1 mt-1.5">
|
||||
{aiSuggestion.warnings.map((warning, i) => (
|
||||
<Badge key={i} variant="outline" className="text-[10px] px-1.5 py-0 text-warning-foreground border-warning/30">
|
||||
{warning}
|
||||
</Badge>
|
||||
))}
|
||||
</div>
|
||||
)}
|
||||
</div>
|
||||
<div className="flex items-center gap-2 flex-shrink-0">
|
||||
<Badge
|
||||
variant={aiSuggestion.confidence >= 0.7 ? 'default' : 'outline'}
|
||||
className="text-[10px] px-1.5 py-0"
|
||||
>
|
||||
{Math.round(aiSuggestion.confidence * 100)}%
|
||||
</Badge>
|
||||
{isAiSelected && (
|
||||
<Check className="h-4 w-4 text-primary" />
|
||||
)}
|
||||
</div>
|
||||
</div>
|
||||
</CardContent>
|
||||
</Card>
|
||||
)}
|
||||
|
||||
{/* Template cards */}
|
||||
{describeResult.templates.length === 0 && !aiSuggestion ? (
|
||||
<p className="text-sm text-muted-foreground text-center py-4">
|
||||
Inga matchande mallar hittades. Försök med en annan beskrivning.
|
||||
</p>
|
||||
) : (
|
||||
describeResult.templates.map((template) => (
|
||||
<Card
|
||||
key={template.template_id}
|
||||
className={`cursor-pointer transition-colors hover:border-primary/50 ${
|
||||
selectedTemplateId === template.template_id
|
||||
? 'border-primary bg-primary/5'
|
||||
: ''
|
||||
}`}
|
||||
onClick={() => setSelection({ type: 'template', templateId: template.template_id })}
|
||||
>
|
||||
<CardContent className="py-3 px-4">
|
||||
<div className="flex items-start justify-between gap-2">
|
||||
<div className="min-w-0 flex-1">
|
||||
<div className="flex items-center gap-1.5">
|
||||
<p className="font-medium text-sm">{template.name_sv}</p>
|
||||
{aiAgreesWithTop && template.template_id === topTemplate.template_id && (
|
||||
<Badge variant="secondary" className="text-[10px] px-1.5 py-0 bg-success/10 text-success">
|
||||
AI bekräftar
|
||||
</Badge>
|
||||
)}
|
||||
</div>
|
||||
{template.description_sv && (
|
||||
<p className="text-xs text-muted-foreground mt-0.5 line-clamp-2">
|
||||
{template.description_sv}
|
||||
</p>
|
||||
)}
|
||||
<div className="flex flex-wrap items-center gap-1.5 mt-1.5">
|
||||
<Badge variant="secondary" className="text-[10px] px-1.5 py-0">
|
||||
D: {formatAccountWithName(template.debit_account)}
|
||||
</Badge>
|
||||
<Badge variant="secondary" className="text-[10px] px-1.5 py-0">
|
||||
K: {formatAccountWithName(template.credit_account)}
|
||||
</Badge>
|
||||
{template.vat_treatment && template.vat_treatment !== 'exempt' && (
|
||||
<Badge variant="outline" className="text-[10px] px-1.5 py-0">
|
||||
Moms {Math.round(template.vat_rate * 100)}%
|
||||
</Badge>
|
||||
)}
|
||||
{template.vat_treatment === 'exempt' && (
|
||||
<Badge variant="outline" className="text-[10px] px-1.5 py-0">
|
||||
Momsfritt
|
||||
</Badge>
|
||||
)}
|
||||
{template.deductibility === 'non_deductible' && (
|
||||
<Badge variant="outline" className="text-[10px] px-1.5 py-0 text-warning-foreground border-warning/30">
|
||||
Ej avdragsgill
|
||||
</Badge>
|
||||
)}
|
||||
{template.deductibility === 'conditional' && (
|
||||
<Badge variant="outline" className="text-[10px] px-1.5 py-0 text-warning-foreground border-warning/30">
|
||||
Villkorligt avdrag
|
||||
</Badge>
|
||||
)}
|
||||
</div>
|
||||
{(template.deductibility_note_sv || template.special_rules_sv) && selectedTemplateId === template.template_id && (
|
||||
<div className="mt-2 space-y-1">
|
||||
{template.deductibility_note_sv && (
|
||||
<p className="text-[11px] text-warning-foreground">
|
||||
{template.deductibility_note_sv}
|
||||
</p>
|
||||
)}
|
||||
{template.special_rules_sv && (
|
||||
<p className="text-[11px] text-muted-foreground italic">
|
||||
{template.special_rules_sv}
|
||||
</p>
|
||||
)}
|
||||
</div>
|
||||
)}
|
||||
</div>
|
||||
<div className="flex items-center gap-2 flex-shrink-0">
|
||||
<Badge
|
||||
variant={template.confidence >= 0.7 ? 'default' : 'outline'}
|
||||
className="text-[10px] px-1.5 py-0"
|
||||
>
|
||||
{Math.round(template.confidence * 100)}%
|
||||
</Badge>
|
||||
{selectedTemplateId === template.template_id && (
|
||||
<Check className="h-4 w-4 text-primary" />
|
||||
)}
|
||||
</div>
|
||||
</div>
|
||||
</CardContent>
|
||||
</Card>
|
||||
))
|
||||
)}
|
||||
</div>
|
||||
|
||||
{/* Journal entry preview for selected template, AI suggestion, or counterparty match */}
|
||||
{selection && (() => {
|
||||
if (selection.type === 'counterparty' && counterpartyMatch) {
|
||||
return (
|
||||
<JournalEntryPreview
|
||||
amount={transaction.amount}
|
||||
currency={transaction.currency}
|
||||
templateDebitAccount={counterpartyMatch.line_pattern ? undefined : counterpartyMatch.debit_account}
|
||||
templateCreditAccount={counterpartyMatch.line_pattern ? undefined : counterpartyMatch.credit_account}
|
||||
templateVatRate={counterpartyMatch.line_pattern ? undefined : getVatRateFromTreatment(counterpartyMatch.vat_treatment)}
|
||||
linePattern={counterpartyMatch.line_pattern ?? undefined}
|
||||
/>
|
||||
)
|
||||
}
|
||||
if (selection.type === 'ai' && aiSuggestion) {
|
||||
return (
|
||||
<JournalEntryPreview
|
||||
amount={transaction.amount}
|
||||
currency={transaction.currency}
|
||||
templateDebitAccount={aiSuggestion.debit_account}
|
||||
templateCreditAccount={aiSuggestion.credit_account}
|
||||
templateVatRate={getVatRateFromTreatment(aiSuggestion.vat_treatment)}
|
||||
/>
|
||||
)
|
||||
}
|
||||
if (selection.type === 'template') {
|
||||
const tmpl = describeResult.templates.find(t => t.template_id === selection.templateId)
|
||||
if (!tmpl) return null
|
||||
return (
|
||||
<JournalEntryPreview
|
||||
amount={transaction.amount}
|
||||
currency={transaction.currency}
|
||||
templateDebitAccount={tmpl.debit_account}
|
||||
templateCreditAccount={tmpl.credit_account}
|
||||
templateVatRate={tmpl.vat_rate}
|
||||
/>
|
||||
)
|
||||
}
|
||||
return null
|
||||
})()}
|
||||
|
||||
<div className="flex gap-2 pt-2">
|
||||
<Button
|
||||
variant="ghost"
|
||||
className="flex-shrink-0"
|
||||
onClick={() => {
|
||||
setStep('describe')
|
||||
setSelection(null)
|
||||
}}
|
||||
>
|
||||
<ArrowLeft className="mr-2 h-4 w-4" />
|
||||
Beskriv igen
|
||||
</Button>
|
||||
<Button
|
||||
className="flex-1"
|
||||
disabled={!selection || isBooking}
|
||||
onClick={handleBook}
|
||||
>
|
||||
{isBooking ? (
|
||||
<Loader2 className="mr-2 h-4 w-4 animate-spin" />
|
||||
) : (
|
||||
<Check className="mr-2 h-4 w-4" />
|
||||
)}
|
||||
{isBooking ? 'Bokför...' : 'Bokför'}
|
||||
</Button>
|
||||
</div>
|
||||
</div>
|
||||
)}
|
||||
|
||||
{/* Step 3: Batch offer */}
|
||||
{step === 'batch' && describeResult && (
|
||||
<div className="space-y-4">
|
||||
<div className="flex items-center gap-3 p-4 rounded-lg bg-success/10">
|
||||
<CheckCircle2 className="h-6 w-6 text-success flex-shrink-0" />
|
||||
<p className="text-sm font-medium">Transaktionen är bokförd!</p>
|
||||
</div>
|
||||
|
||||
{canBatchApply && (
|
||||
<p className="text-sm text-muted-foreground">
|
||||
Det finns ytterligare{' '}
|
||||
<span className="font-medium text-foreground">
|
||||
{describeResult.batch_candidate_count}
|
||||
</span>{' '}
|
||||
obokförda transaktioner från{' '}
|
||||
<span className="font-medium text-foreground">
|
||||
{describeResult.merchant_name}
|
||||
</span>
|
||||
. Använd samma mall?
|
||||
</p>
|
||||
)}
|
||||
|
||||
<div className="flex gap-2">
|
||||
<Button
|
||||
variant="outline"
|
||||
className="flex-1"
|
||||
onClick={handleSkipBatch}
|
||||
disabled={isBatchApplying}
|
||||
>
|
||||
{canBatchApply ? 'Nej, bara den här' : 'Stäng'}
|
||||
</Button>
|
||||
{canBatchApply && (
|
||||
<Button
|
||||
className="flex-1"
|
||||
onClick={handleBatchApply}
|
||||
disabled={isBatchApplying}
|
||||
>
|
||||
{isBatchApplying ? (
|
||||
<Loader2 className="mr-2 h-4 w-4 animate-spin" />
|
||||
) : null}
|
||||
{isBatchApplying
|
||||
? 'Bokför...'
|
||||
: `Ja, bokför alla ${describeResult.batch_candidate_count} st`}
|
||||
</Button>
|
||||
)}
|
||||
</div>
|
||||
</div>
|
||||
)}
|
||||
</DialogContent>
|
||||
</Dialog>
|
||||
)
|
||||
}
|
||||
@@ -16,8 +16,7 @@ import JournalEntryPreview from './JournalEntryPreview'
|
||||
import AccountCombobox from '@/components/bookkeeping/AccountCombobox'
|
||||
import DocumentUploadZone from '@/components/bookkeeping/DocumentUploadZone'
|
||||
import type { UploadedFile } from '@/components/bookkeeping/DocumentUploadZone'
|
||||
import { X, ArrowLeft, ArrowRight, Building, AlertTriangle, Check, FileText, Link2, Receipt as ReceiptIcon, SkipForward, Paperclip, ChevronDown, ChevronUp, MessageSquareText } from 'lucide-react'
|
||||
import DescribeTransactionDialog from './DescribeTransactionDialog'
|
||||
import { X, ArrowLeft, ArrowRight, Building, AlertTriangle, Check, FileText, Link2, Receipt as ReceiptIcon, SkipForward, Paperclip, ChevronDown, ChevronUp } from 'lucide-react'
|
||||
import { formatAccountWithName } from '@/lib/bookkeeping/client-account-names'
|
||||
import type { TransactionCategory, VatTreatment, BASAccount, EntityType } from '@/types'
|
||||
import type { SuggestedCategory, SuggestedTemplate } from '@/lib/transactions/category-suggestions'
|
||||
@@ -60,7 +59,7 @@ export default function SwipeCategorizationView({
|
||||
const [accounts, setAccounts] = useState<BASAccount[]>([])
|
||||
const [uploadedFiles, setUploadedFiles] = useState<UploadedFile[]>([])
|
||||
const [showUploadZone, setShowUploadZone] = useState(false)
|
||||
const [showDescribeDialog, setShowDescribeDialog] = useState(false)
|
||||
|
||||
const [showVatDropdown, setShowVatDropdown] = useState(false)
|
||||
const [pendingTemplateId, setPendingTemplateId] = useState<string | null>(null)
|
||||
const [pendingInboxItemId, setPendingInboxItemId] = useState<string | null>(null)
|
||||
@@ -847,17 +846,6 @@ export default function SwipeCategorizationView({
|
||||
</div>
|
||||
)}
|
||||
|
||||
{/* Describe transaction button */}
|
||||
<Button
|
||||
variant="outline"
|
||||
className="w-full"
|
||||
onClick={() => setShowDescribeDialog(true)}
|
||||
disabled={isProcessing}
|
||||
>
|
||||
<MessageSquareText className="mr-2 h-4 w-4" />
|
||||
Beskriv transaktion...
|
||||
</Button>
|
||||
|
||||
{/* Categorization button */}
|
||||
<Button
|
||||
className="w-full"
|
||||
@@ -887,19 +875,6 @@ export default function SwipeCategorizationView({
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<DescribeTransactionDialog
|
||||
open={showDescribeDialog}
|
||||
onOpenChange={setShowDescribeDialog}
|
||||
transaction={currentTransaction}
|
||||
onCategorized={() => {
|
||||
setShowDescribeDialog(false)
|
||||
moveToNext()
|
||||
}}
|
||||
onBatchApplied={() => {
|
||||
setShowDescribeDialog(false)
|
||||
moveToNext()
|
||||
}}
|
||||
/>
|
||||
</div>
|
||||
)
|
||||
}
|
||||
|
||||
@@ -6,7 +6,7 @@ import { Button } from '@/components/ui/button'
|
||||
import { Badge } from '@/components/ui/badge'
|
||||
import { Checkbox } from '@/components/ui/checkbox'
|
||||
import { cn, formatCurrency, formatDate } from '@/lib/utils'
|
||||
import { ArrowUpRight, ArrowDownRight, FileText, Loader2, MessageSquareText, Paperclip } from 'lucide-react'
|
||||
import { ArrowUpRight, ArrowDownRight, FileText, Loader2, Paperclip } from 'lucide-react'
|
||||
import { Tooltip, TooltipTrigger, TooltipContent, TooltipProvider } from '@/components/ui/info-tooltip'
|
||||
import { getAccountName, formatAccountWithName } from '@/lib/bookkeeping/client-account-names'
|
||||
import { getTemplateById } from '@/lib/bookkeeping/booking-templates'
|
||||
@@ -26,7 +26,7 @@ interface TransactionInboxCardProps {
|
||||
onMarkPrivate: (id: string) => void
|
||||
onOpenMatchDialog: (transaction: TransactionWithInvoice) => void
|
||||
onOpenCategoryDialog: (transaction: TransactionWithInvoice) => void
|
||||
onOpenDescribe?: (transaction: TransactionWithInvoice) => void
|
||||
|
||||
onOpenQuickReview?: (transaction: TransactionWithInvoice, suggestion: SuggestedCategory) => void
|
||||
onOpenTemplateReview?: (transaction: TransactionWithInvoice, templateId: string) => void
|
||||
onToggleSelect: (id: string) => void
|
||||
@@ -45,7 +45,7 @@ export default function TransactionInboxCard({
|
||||
onMarkPrivate,
|
||||
onOpenMatchDialog,
|
||||
onOpenCategoryDialog,
|
||||
onOpenDescribe,
|
||||
|
||||
onOpenQuickReview,
|
||||
onOpenTemplateReview,
|
||||
onToggleSelect,
|
||||
@@ -239,20 +239,6 @@ export default function TransactionInboxCard({
|
||||
</Button>
|
||||
) : null}
|
||||
|
||||
{/* Describe transaction */}
|
||||
{onOpenDescribe && (
|
||||
<Button
|
||||
size="sm"
|
||||
variant="outline"
|
||||
className="h-9 text-xs"
|
||||
onClick={() => onOpenDescribe(transaction)}
|
||||
disabled={isProcessing || isDisabled}
|
||||
>
|
||||
<MessageSquareText className="mr-1.5 h-3 w-3" />
|
||||
Beskriv...
|
||||
</Button>
|
||||
)}
|
||||
|
||||
{/* Open category dialog / template picker */}
|
||||
<Button
|
||||
size="sm"
|
||||
|
||||
@@ -340,16 +340,6 @@ export const MatchSupplierInvoiceSchema = z.object({
|
||||
supplier_invoice_id: uuid,
|
||||
})
|
||||
|
||||
export const DescribeTransactionSchema = z.object({
|
||||
description: z.string().min(3).max(500),
|
||||
})
|
||||
|
||||
export const BatchDescribeSchema = z.object({
|
||||
merchant_name: z.string().min(1),
|
||||
template_id: z.string().min(1),
|
||||
is_business: z.boolean(),
|
||||
user_description: z.string().max(500).optional(),
|
||||
})
|
||||
|
||||
// ============================================================
|
||||
// Settings schemas
|
||||
|
||||
@@ -596,6 +596,16 @@ async function importVouchers(
|
||||
|
||||
const currentVoucherNumber = (startNumber as number) || 1
|
||||
|
||||
// Reserve the full voucher number range upfront to prevent concurrent
|
||||
// operations from claiming numbers in our range during batch insertion.
|
||||
const reservedHighest = currentVoucherNumber + preparedVouchers.length - 1
|
||||
await supabase.rpc('reserve_voucher_range', {
|
||||
p_company_id: companyId,
|
||||
p_fiscal_period_id: fiscalPeriodId,
|
||||
p_series: voucherSeries,
|
||||
p_highest_used: reservedHighest,
|
||||
})
|
||||
|
||||
// Batch insert journal entries (in chunks of 100) with retry logic.
|
||||
// Retries handle transient errors (Supabase rate limits, Cloudflare 500s).
|
||||
const BATCH_SIZE = 100
|
||||
@@ -603,6 +613,7 @@ async function importVouchers(
|
||||
const INTER_BATCH_DELAY_MS = 50 // Prevent rate limiting under sustained load
|
||||
let retriedBatches = 0
|
||||
let failedBatches = 0
|
||||
let highestInsertedVoucher = currentVoucherNumber - 1 // nothing inserted yet
|
||||
|
||||
for (let batchStart = 0; batchStart < preparedVouchers.length; batchStart += BATCH_SIZE) {
|
||||
const batch = preparedVouchers.slice(batchStart, batchStart + BATCH_SIZE)
|
||||
@@ -723,6 +734,11 @@ async function importVouchers(
|
||||
}
|
||||
|
||||
if (linesInserted) {
|
||||
// Track highest voucher number only after both headers AND lines succeed,
|
||||
// to avoid counting orphaned entries with no lines as "used".
|
||||
const batchHighest = currentVoucherNumber + batchStart + batch.length - 1
|
||||
highestInsertedVoucher = Math.max(highestInsertedVoucher, batchHighest)
|
||||
|
||||
// Track movements ONLY for successfully inserted vouchers.
|
||||
// This ensures the migration adjustment correctly compensates for
|
||||
// any batches that failed completely.
|
||||
@@ -767,16 +783,19 @@ async function importVouchers(
|
||||
}
|
||||
}
|
||||
|
||||
// Update voucher sequence to reflect all assigned numbers.
|
||||
// next_voucher_number() was called once but we assigned N numbers manually,
|
||||
// so the sequence only got incremented by 1. Fix with GREATEST to avoid races.
|
||||
if (results.created > 0) {
|
||||
const highestUsed = currentVoucherNumber + preparedVouchers.length - 1
|
||||
await supabase.rpc('reserve_voucher_range', {
|
||||
// Adjust voucher sequence after insertion.
|
||||
// Range was pre-reserved to `reservedHighest`. If some batches failed,
|
||||
// release the unused portion to avoid burned numbers and gap-explanation friction.
|
||||
if (highestInsertedVoucher < reservedHighest) {
|
||||
const releaseTarget = highestInsertedVoucher >= currentVoucherNumber
|
||||
? highestInsertedVoucher // partial success: set to actual highest
|
||||
: currentVoucherNumber - 1 // total failure: roll back fully
|
||||
await supabase.rpc('release_voucher_range', {
|
||||
p_company_id: companyId,
|
||||
p_fiscal_period_id: fiscalPeriodId,
|
||||
p_series: voucherSeries,
|
||||
p_highest_used: highestUsed,
|
||||
p_actual_last: releaseTarget,
|
||||
p_reserved_highest: reservedHighest,
|
||||
})
|
||||
}
|
||||
|
||||
|
||||
@@ -0,0 +1,69 @@
|
||||
-- Fix reserve_voucher_range: p_user_id was not updated to p_company_id
|
||||
-- during the multi-tenant migration (20260330130000). The parameter mismatch
|
||||
-- caused SIE imports to silently fail to update the voucher sequence,
|
||||
-- leading to duplicate voucher number errors on subsequent operations.
|
||||
--
|
||||
-- Also adds release_voucher_range for rolling back burned numbers on partial
|
||||
-- import failure (reserve-then-adjust pattern).
|
||||
|
||||
-- =============================================================================
|
||||
-- 1. Fix reserve_voucher_range: p_user_id -> p_company_id
|
||||
-- =============================================================================
|
||||
DROP FUNCTION IF EXISTS public.reserve_voucher_range(uuid, uuid, text, integer);
|
||||
|
||||
CREATE OR REPLACE FUNCTION public.reserve_voucher_range(
|
||||
p_company_id uuid,
|
||||
p_fiscal_period_id uuid,
|
||||
p_series text,
|
||||
p_highest_used integer
|
||||
)
|
||||
RETURNS void
|
||||
LANGUAGE plpgsql
|
||||
SECURITY DEFINER
|
||||
SET search_path = public
|
||||
AS $$
|
||||
BEGIN
|
||||
INSERT INTO public.voucher_sequences (company_id, user_id, fiscal_period_id, voucher_series, last_number)
|
||||
VALUES (p_company_id, auth.uid(), p_fiscal_period_id, p_series, p_highest_used)
|
||||
ON CONFLICT (company_id, fiscal_period_id, voucher_series)
|
||||
DO UPDATE SET
|
||||
last_number = GREATEST(public.voucher_sequences.last_number, EXCLUDED.last_number),
|
||||
updated_at = now();
|
||||
END;
|
||||
$$;
|
||||
|
||||
GRANT EXECUTE ON FUNCTION public.reserve_voucher_range(uuid, uuid, text, integer) TO authenticated;
|
||||
|
||||
-- =============================================================================
|
||||
-- 2. release_voucher_range: roll back sequence on partial import failure
|
||||
-- Only decreases last_number (never increases), preventing race conditions
|
||||
-- with concurrent operations that may have legitimately advanced the sequence.
|
||||
-- =============================================================================
|
||||
CREATE OR REPLACE FUNCTION public.release_voucher_range(
|
||||
p_company_id uuid,
|
||||
p_fiscal_period_id uuid,
|
||||
p_series text,
|
||||
p_actual_last integer,
|
||||
p_reserved_highest integer -- the ceiling this import originally reserved
|
||||
)
|
||||
RETURNS void
|
||||
LANGUAGE plpgsql
|
||||
SECURITY DEFINER
|
||||
SET search_path = public
|
||||
AS $$
|
||||
BEGIN
|
||||
-- Only release within the range this import originally reserved.
|
||||
-- The upper-bound guard (last_number <= p_reserved_highest) prevents rolling
|
||||
-- back past numbers that a concurrent operation has legitimately claimed.
|
||||
UPDATE public.voucher_sequences
|
||||
SET last_number = p_actual_last,
|
||||
updated_at = now()
|
||||
WHERE company_id = p_company_id
|
||||
AND fiscal_period_id = p_fiscal_period_id
|
||||
AND voucher_series = p_series
|
||||
AND last_number > p_actual_last
|
||||
AND last_number <= p_reserved_highest;
|
||||
END;
|
||||
$$;
|
||||
|
||||
GRANT EXECUTE ON FUNCTION public.release_voucher_range(uuid, uuid, text, integer, integer) TO authenticated;
|
||||
Reference in New Issue
Block a user