fix(underlag): a verifikat a customer invoice points at is backed by it; PS follows the invoice link (#2298) (#2347)
* fix(underlag): a verifikat a customer invoice points at is backed by it; PS follows the invoice link (#2298) The invoice-to-verifikat link is written on the invoice side only (invoices.journal_entry_id, invoice_payments.journal_entry_id), while the missing-underlag predicate and the periodisk sammanstallning resolved the invoice from the entry's own source columns. A SIE-imported sale matched to its invoice afterwards therefore kept warning "Underlag saknas" and was left out of the EU sales list, although the account-based momsdeklaration showed it and the verifikat page already listed the invoice as its underlag. - verifikat_without_documents / transactions_without_documents: customer- invoice hanvisning arm (BFL 5 kap 7 §), tenant-scoped on the link row; new migration 20260906135702, pinned by a pg-real test. - getInvoiceReferencesForJournalEntries(): one TS mirror of that arm, used by the journal-list filter and bulk exempt, /api/documents/counts (new invoice_references map) and the transactions list; the push cron mirrors it with its global reads. - Journal list: no "Underlag saknas" chip for a covered entry, matching the engine's own invoice rows and the verifikat detail page. - Periodisk sammanstallning: entries fetched by their EU-revenue lines and attributed through every link (engine source_id, invoices.journal_entry_id, invoice_payments.journal_entry_id); kontantmetod invoice_cash_payment entries are filed too, which the old source_type filter dropped. Co-Authored-By: Claude Fable 5.1 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_019SaJfqNi4VmsG8FMKq99G6 * fix(underlag): issued invoices only, blocking mixed-customer settlements in PS, chunk-level degrade (#2298 review) - The customer-invoice hanvisning arms (RPCs, both TS resolvers, push cron) now require an ISSUED invoice: status not in ('draft', 'cancelled'), the schema's own definition (migration 20260427150000). NON_ISSUED_INVOICE_ STATUSES in lib/invoices/matchable-statuses.ts is the shared constant; the pg test pins a draft-linked and a cancelled-payment entry as still missing. - Periodisk sammanstallning: one verifikat linked to invoices of different customers is no longer attributed to the first invoice; it is left out of the accumulators and reported once as a blocking MIXED_CUSTOMER_SETTLEMENT naming the voucher, the customer count and the amount. Same-customer settlements are filed in full. - Transactions list: a failed invoice-reference lookup leaves that chunk's verdict unknown (no badges) and continues with the remaining chunks instead of abandoning them. Co-Authored-By: Claude Fable 5.1 <noreply@anthropic.com> --------- Co-authored-by: Jakob Wennberg <311770904+jakobwennberg-oss@users.noreply.github.com> Co-authored-by: Claude Fable 5.1 <noreply@anthropic.com>
This commit is contained in:
Jakob Wennberg
co-authored by
Claude Fable 5.1
Jakob Wennberg
Claude Fable 5.1
Jakob Wennberg
parent
cce0de5704
commit
7448490fb7
@@ -377,6 +377,8 @@ describe('GET /api/bookkeeping/journal-entries', () => {
|
||||
enqueue({ data: [], error: null }) // no SI references
|
||||
enqueue({ data: [], error: null }) // no SI payment-row references
|
||||
enqueue({ data: [{ journal_entry_id: E3 }], error: null }) // E3 exempt
|
||||
enqueue({ data: [], error: null }) // no invoices pointing at the entries
|
||||
enqueue({ data: [], error: null }) // no invoice payment rows
|
||||
const fullRow = makeJournalEntry({ id: E2 })
|
||||
enqueue({ data: [fullRow], error: null }) // page rows
|
||||
|
||||
@@ -415,6 +417,8 @@ describe('GET /api/bookkeeping/journal-entries', () => {
|
||||
enqueue({ data: [], error: null }) // no SI references
|
||||
enqueue({ data: [], error: null }) // no SI payment-row references
|
||||
enqueue({ data: [], error: null }) // no exemptions
|
||||
enqueue({ data: [], error: null }) // no invoices pointing at the entries
|
||||
enqueue({ data: [], error: null }) // no invoice payment rows
|
||||
enqueue({ data: [makeJournalEntry({ id: E2 })], error: null }) // page rows
|
||||
|
||||
const request = createMockRequest('/api/bookkeeping/journal-entries', {
|
||||
@@ -450,6 +454,8 @@ describe('GET /api/bookkeeping/journal-entries', () => {
|
||||
})
|
||||
enqueue({ data: [], error: null }) // no SI payment-row references
|
||||
enqueue({ data: [], error: null }) // no exemptions
|
||||
enqueue({ data: [], error: null }) // no invoices pointing at the entries
|
||||
enqueue({ data: [], error: null }) // no invoice payment rows
|
||||
enqueue({ data: [makeJournalEntry({ id: E2 })], error: null }) // page rows
|
||||
|
||||
const request = createMockRequest('/api/bookkeeping/journal-entries', {
|
||||
@@ -464,6 +470,30 @@ describe('GET /api/bookkeeping/journal-entries', () => {
|
||||
expect(body.count).toBe(1)
|
||||
})
|
||||
|
||||
it('treats a customer invoice pointing at the entry as underlag (#2298)', async () => {
|
||||
// E1: a SIE-imported voucher the user matched to an invoice created in
|
||||
// Accounted (invoice_payments row). E2: nothing points at it.
|
||||
enqueue({ data: [candidate(E1, 1), candidate(E2, 2)], error: null })
|
||||
enqueue({ data: [], error: null }) // no direct documents
|
||||
enqueue({ data: [], error: null }) // no SI references
|
||||
enqueue({ data: [], error: null }) // no SI payment-row references
|
||||
enqueue({ data: [], error: null }) // no exemptions
|
||||
enqueue({ data: [], error: null }) // no direct invoice links
|
||||
enqueue({ data: [{ id: 'pay-1', invoice_id: 'inv-1', journal_entry_id: E1 }], error: null })
|
||||
enqueue({ data: [makeJournalEntry({ id: E2 })], error: null }) // page rows
|
||||
|
||||
const request = createMockRequest('/api/bookkeeping/journal-entries', {
|
||||
searchParams: { missing_underlag: 'true', exclude_draft: 'true' },
|
||||
})
|
||||
const { status, body } = await parseJsonResponse<{ data: { id: string }[]; count: number }>(
|
||||
await GET(request, { params: Promise.resolve({}) })
|
||||
)
|
||||
|
||||
expect(status).toBe(200)
|
||||
expect(body.data.map((e) => e.id)).toEqual([E2])
|
||||
expect(body.count).toBe(1)
|
||||
})
|
||||
|
||||
it('matches a voucher-label search against series+number, like the direct path', async () => {
|
||||
// A voucher-shaped needle fans out to TWO candidate queries (description
|
||||
// ilike, then series+number), unioned by id: a runtime-built .or()
|
||||
@@ -474,6 +504,8 @@ describe('GET /api/bookkeeping/journal-entries', () => {
|
||||
enqueue({ data: [], error: null }) // no SI references
|
||||
enqueue({ data: [], error: null }) // no SI payment-row references
|
||||
enqueue({ data: [], error: null }) // no exemptions
|
||||
enqueue({ data: [], error: null }) // no invoices pointing at the entries
|
||||
enqueue({ data: [], error: null }) // no invoice payment rows
|
||||
enqueue({ data: [makeJournalEntry({ id: E1 })], error: null }) // page rows
|
||||
|
||||
const request = createMockRequest('/api/bookkeeping/journal-entries', {
|
||||
|
||||
@@ -64,12 +64,17 @@ describe('POST /api/bookkeeping/no-doc-required/bulk-missing', () => {
|
||||
expect((await parseJsonResponse(res)).status).toBe(400)
|
||||
})
|
||||
|
||||
// Queue order per candidate chunk mirrors resolveMissingUnderlagEntries:
|
||||
// documents, SI references, SI payment-row references, exemptions, then the
|
||||
// customer-invoice resolver (invoices by journal_entry_id, invoice_payments).
|
||||
it('dry_run counts only entries that are missing AND not exempt', async () => {
|
||||
enqueue({ data: [{ id: 'a' }, { id: 'b' }, { id: 'c' }], error: null }) // candidates
|
||||
enqueue({ data: [{ journal_entry_id: 'a' }], error: null }) // a has a document
|
||||
enqueue({ data: [], error: null }) // no SI references with docs
|
||||
enqueue({ data: [], error: null }) // no SI payment-row references
|
||||
enqueue({ data: [{ journal_entry_id: 'b' }], error: null }) // b already exempt
|
||||
enqueue({ data: [], error: null }) // no invoices pointing at the entries
|
||||
enqueue({ data: [], error: null }) // no invoice payment rows
|
||||
const res = await POST(makeReq({ dry_run: true }))
|
||||
const { status, body } = await parseJsonResponse<{ data: { count: number } }>(res)
|
||||
expect(status).toBe(200)
|
||||
@@ -108,18 +113,39 @@ describe('POST /api/bookkeeping/no-doc-required/bulk-missing', () => {
|
||||
error: null,
|
||||
})
|
||||
enqueue({ data: [], error: null }) // no exemptions
|
||||
enqueue({ data: [], error: null }) // no invoices pointing at the entries
|
||||
enqueue({ data: [], error: null }) // no invoice payment rows
|
||||
const res = await POST(makeReq({ dry_run: true }))
|
||||
const { status, body } = await parseJsonResponse<{ data: { count: number } }>(res)
|
||||
expect(status).toBe(200)
|
||||
expect(body.data.count).toBe(2) // c and d
|
||||
})
|
||||
|
||||
it('dry_run excludes entries a customer invoice points at (#2298)', async () => {
|
||||
// a: the invoice register links it directly (invoices.journal_entry_id)
|
||||
// b: a SIE-imported voucher matched to an invoice (invoice_payments row)
|
||||
// c: genuinely missing
|
||||
enqueue({ data: [{ id: 'a' }, { id: 'b' }, { id: 'c' }], error: null }) // candidates
|
||||
enqueue({ data: [], error: null }) // no direct documents
|
||||
enqueue({ data: [], error: null }) // no SI references
|
||||
enqueue({ data: [], error: null }) // no SI payment-row references
|
||||
enqueue({ data: [], error: null }) // no exemptions
|
||||
enqueue({ data: [{ id: 'inv-1', journal_entry_id: 'a' }], error: null })
|
||||
enqueue({ data: [{ id: 'pay-1', invoice_id: 'inv-2', journal_entry_id: 'b' }], error: null })
|
||||
const res = await POST(makeReq({ dry_run: true }), { params: Promise.resolve({}) })
|
||||
const { status, body } = await parseJsonResponse<{ data: { count: number } }>(res)
|
||||
expect(status).toBe(200)
|
||||
expect(body.data.count).toBe(1) // only c
|
||||
})
|
||||
|
||||
it('marks the missing entries and returns the count', async () => {
|
||||
enqueue({ data: [{ id: 'a' }, { id: 'b' }, { id: 'c' }], error: null }) // candidates
|
||||
enqueue({ data: [], error: null }) // no documents
|
||||
enqueue({ data: [], error: null }) // no SI references with docs
|
||||
enqueue({ data: [], error: null }) // no SI payment-row references
|
||||
enqueue({ data: [{ journal_entry_id: 'a' }], error: null }) // a already exempt
|
||||
enqueue({ data: [], error: null }) // no invoices pointing at the entries
|
||||
enqueue({ data: [], error: null }) // no invoice payment rows
|
||||
enqueue({ error: null }) // helper upsert
|
||||
const res = await POST(makeReq({ period_id: null, reason: 'Importerad' }))
|
||||
const { status, body } = await parseJsonResponse<{ data: { exempted: number } }>(res)
|
||||
|
||||
@@ -33,9 +33,11 @@ beforeEach(() => {
|
||||
;(getActiveCompanyId as ReturnType<typeof vi.fn>).mockResolvedValue('company-1')
|
||||
})
|
||||
|
||||
// Queue order mirrors the route's Promise.all: direct docs, supplier_invoices
|
||||
// references, supplier_invoice_payments references. The `document` embed
|
||||
// carries the anchor state (journal_entry_id) of the SI's retained doc.
|
||||
// Queue order mirrors the route: the Promise.all (direct docs, supplier_invoices
|
||||
// references, supplier_invoice_payments references), then the customer-invoice
|
||||
// resolver (invoices by journal_entry_id, invoice_payments by journal_entry_id).
|
||||
// The `document` embed carries the anchor state (journal_entry_id) of the SI's
|
||||
// retained doc.
|
||||
function enqueueAll(opts: {
|
||||
direct?: Array<{ id: string; journal_entry_id: string }>
|
||||
si?: Array<{
|
||||
@@ -51,10 +53,14 @@ function enqueueAll(opts: {
|
||||
document: { journal_entry_id: string | null } | null
|
||||
} | null
|
||||
}>
|
||||
invoices?: Array<{ id: string; journal_entry_id: string | null }>
|
||||
payments?: Array<{ id: string; invoice_id: string | null; journal_entry_id: string | null }>
|
||||
}) {
|
||||
enqueue({ data: opts.direct ?? [], error: null })
|
||||
enqueue({ data: opts.si ?? [], error: null })
|
||||
enqueue({ data: opts.sip ?? [], error: null })
|
||||
enqueue({ data: opts.invoices ?? [], error: null })
|
||||
enqueue({ data: opts.payments ?? [], error: null })
|
||||
}
|
||||
|
||||
describe('GET /api/documents/counts', () => {
|
||||
@@ -190,4 +196,45 @@ describe('GET /api/documents/counts', () => {
|
||||
const res = await GET(makeReq([JE_A]))
|
||||
expect((await parseJsonResponse(res)).status).toBe(500)
|
||||
})
|
||||
|
||||
it('reports customer invoices pointing at an entry apart from document counts (#2298)', async () => {
|
||||
// JE_A: the invoice register links it directly AND a payment row points
|
||||
// at it (one invoice counted once, plus a second invoice via payment).
|
||||
// JE_B: only a payment row (a SIE-imported voucher matched to an invoice).
|
||||
// JE_C: nothing. No document anywhere: `data` stays empty.
|
||||
enqueueAll({
|
||||
invoices: [{ id: 'inv-1', journal_entry_id: JE_A }],
|
||||
payments: [
|
||||
{ id: 'pay-1', invoice_id: 'inv-1', journal_entry_id: JE_A },
|
||||
{ id: 'pay-2', invoice_id: 'inv-2', journal_entry_id: JE_A },
|
||||
{ id: 'pay-3', invoice_id: 'inv-3', journal_entry_id: JE_B },
|
||||
],
|
||||
})
|
||||
const res = await GET(makeReq([JE_A, JE_B, JE_C]), { params: Promise.resolve({}) })
|
||||
const { status, body } = await parseJsonResponse<{
|
||||
data: Record<string, number>
|
||||
invoice_references: Record<string, number>
|
||||
}>(res)
|
||||
expect(status).toBe(200)
|
||||
expect(body.data).toEqual({})
|
||||
expect(body.invoice_references).toEqual({ [JE_A]: 2, [JE_B]: 1 })
|
||||
})
|
||||
|
||||
it('never returns invoice references for entries the caller did not ask about', async () => {
|
||||
enqueueAll({
|
||||
payments: [{ id: 'pay-1', invoice_id: 'inv-1', journal_entry_id: JE_C }],
|
||||
})
|
||||
const res = await GET(makeReq([JE_A]), { params: Promise.resolve({}) })
|
||||
const { body } = await parseJsonResponse<{ invoice_references: Record<string, number> }>(res)
|
||||
expect(body.invoice_references).toEqual({})
|
||||
})
|
||||
|
||||
it('returns 500 when the invoice-reference lookup fails', async () => {
|
||||
enqueue({ data: [], error: null })
|
||||
enqueue({ data: [], error: null })
|
||||
enqueue({ data: [], error: null })
|
||||
enqueue({ data: null, error: { message: 'boom' } }) // invoices by journal_entry_id
|
||||
const res = await GET(makeReq([JE_A]), { params: Promise.resolve({}) })
|
||||
expect((await parseJsonResponse(res)).status).toBe(500)
|
||||
})
|
||||
})
|
||||
|
||||
@@ -2,6 +2,7 @@ import { NextResponse } from 'next/server'
|
||||
import { z } from 'zod'
|
||||
import { withRouteContext } from '@/lib/api/with-route-context'
|
||||
import { getErrorMessage as getUserErrorMessage } from '@/lib/errors/get-error-message'
|
||||
import { getInvoiceReferencesForJournalEntries } from '@/lib/core/bookkeeping/journal-entry-references'
|
||||
|
||||
const uuidSchema = z.string().uuid()
|
||||
|
||||
@@ -12,8 +13,8 @@ const uuidSchema = z.string().uuid()
|
||||
* into a PostgREST .or() filter string, so validation doubles as injection
|
||||
* protection).
|
||||
*
|
||||
* Counts BOTH direct attachments (document_attachments.journal_entry_id) and
|
||||
* documents retained on a supplier invoice that references the entry
|
||||
* `data` counts BOTH direct attachments (document_attachments.journal_entry_id)
|
||||
* and documents retained on a supplier invoice that references the entry
|
||||
* (registration/payment FK or a supplier_invoice_payments row). BFL 5 kap 7 §
|
||||
* accepts underlag via hänvisning, and the expanded-row view
|
||||
* (JournalEntryAttachments) already lists referenced docs: counting only
|
||||
@@ -23,6 +24,14 @@ const uuidSchema = z.string().uuid()
|
||||
* guards, so they must not silence the missing-underlag warning (mirrors the
|
||||
* verifikat_without_documents RPC). Documents are deduplicated per entry so a
|
||||
* doc that is both directly linked and referenced counts once.
|
||||
*
|
||||
* `invoice_references` counts, per requested entry, the customer invoices
|
||||
* that point at it (invoices.journal_entry_id or an invoice_payments row):
|
||||
* the customer-side hänvisning (#2298). Kept apart from `data` because a
|
||||
* register invoice is not a document row: the list must not offer a
|
||||
* paperclip with nothing behind it, but it must stop warning "Underlag
|
||||
* saknas" for an entry the verifikat page already lists an invoice on.
|
||||
* Same verdict as the RPC's customer arm and the verifikat detail page.
|
||||
*/
|
||||
export const GET = withRouteContext('document.counts', async (request, ctx) => {
|
||||
const { supabase, companyId } = ctx
|
||||
@@ -125,6 +134,13 @@ export const GET = withRouteContext('document.counts', async (request, ctx) => {
|
||||
add(row.journal_entry_id, row.supplier_invoice.document_id)
|
||||
}
|
||||
|
||||
let invoiceRefs: Map<string, string[]>
|
||||
try {
|
||||
invoiceRefs = await getInvoiceReferencesForJournalEntries(supabase, companyId, ids)
|
||||
} catch (err) {
|
||||
return NextResponse.json({ error: getUserErrorMessage(err) }, { status: 500 })
|
||||
}
|
||||
|
||||
// Referenced entries outside the requested set (an SI FK can point at an
|
||||
// entry the caller didn't ask about) must not leak into the response.
|
||||
const requested = new Set(ids)
|
||||
@@ -132,6 +148,10 @@ export const GET = withRouteContext('document.counts', async (request, ctx) => {
|
||||
for (const [journalEntryId, docIds] of docsByEntry) {
|
||||
if (requested.has(journalEntryId)) counts[journalEntryId] = docIds.size
|
||||
}
|
||||
const invoiceReferences: Record<string, number> = {}
|
||||
for (const [journalEntryId, invoiceIds] of invoiceRefs) {
|
||||
if (requested.has(journalEntryId)) invoiceReferences[journalEntryId] = invoiceIds.length
|
||||
}
|
||||
|
||||
return NextResponse.json({ data: counts })
|
||||
return NextResponse.json({ data: counts, invoice_references: invoiceReferences })
|
||||
})
|
||||
|
||||
Reference in New Issue
Block a user