After a migration the chart carries hundreds of accounts nobody ever posted to, and a short kontoplan is what keeps manual bookings off the wrong account. Inactivating them one switch at a time was the only way. - The "Verifikat" column header on Mina konton is now a filter (all / without vouchers / with vouchers), the way the verifikat list filters from its headers. "Without vouchers" means absent from get_account_usage_counts, i.e. never posted to. - Rows get a selection checkbox (rest-muted, solid on hover/checked, same class as the other list pages) with select-all in the header and a bulk bar carrying the count, Inaktivera, select-all-listed and clear. - New POST /api/bookkeeping/accounts/deactivate mirrors /activate: only never-used, non-system, active accounts flip; used accounts are skipped unless include_used is set, system accounts always, and the response says what was skipped. The client partitions the selection first so the confirm states exactly what will happen before anything posts. Closes #2186 Claude-Session: https://claude.ai/code/session_01QPQLwHNEiQfiCNLSMzXMiQ 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:
co-authored by
Jakob Wennberg
Claude Fable 5.1
parent
1e91c126ff
commit
601e521584
@@ -1,6 +1,6 @@
|
||||
/**
|
||||
* Tests for /api/bookkeeping/accounts (list/create), /[number] (update/delete)
|
||||
* and /activate.
|
||||
* /activate and /deactivate.
|
||||
*
|
||||
* The DELETE usage check is asserted with a call-capturing mock: the count
|
||||
* query must be scoped to the caller's company via the journal_entries join —
|
||||
@@ -29,6 +29,7 @@ vi.mock('@/lib/auth/require-write', () => ({
|
||||
import { GET as listGET, POST as createPOST } from '../route'
|
||||
import { DELETE, PUT } from '../[number]/route'
|
||||
import { POST as activatePOST } from '../activate/route'
|
||||
import { POST as deactivatePOST } from '../deactivate/route'
|
||||
|
||||
interface CapturedCall {
|
||||
method: string
|
||||
@@ -624,3 +625,134 @@ describe('POST /api/bookkeeping/accounts/activate', () => {
|
||||
expect(calls.some((c) => c.method === 'insert')).toBe(false)
|
||||
})
|
||||
})
|
||||
|
||||
describe('POST /api/bookkeeping/accounts/deactivate', () => {
|
||||
it('returns 401 when not authenticated', async () => {
|
||||
requireAuthMock.mockResolvedValue({
|
||||
user: null,
|
||||
supabase: {},
|
||||
error: NextResponse.json({ error: 'Unauthorized' }, { status: 401 }),
|
||||
})
|
||||
const req = createMockRequest('/api/bookkeeping/accounts/deactivate', {
|
||||
method: 'POST',
|
||||
body: { account_numbers: ['4010'] },
|
||||
})
|
||||
const res = await deactivatePOST(req, routeParams)
|
||||
expect(res.status).toBe(401)
|
||||
})
|
||||
|
||||
it('returns 400 when account_numbers is missing or empty', async () => {
|
||||
const { supabase } = createCapturingSupabase([])
|
||||
auth(supabase)
|
||||
const req = createMockRequest('/api/bookkeeping/accounts/deactivate', {
|
||||
method: 'POST',
|
||||
body: { account_numbers: [] },
|
||||
})
|
||||
const { status, body } = await parseJsonResponse<{ error: string }>(
|
||||
await deactivatePOST(req, routeParams)
|
||||
)
|
||||
expect(status).toBe(400)
|
||||
expect(body.error).toBe('account_numbers array required')
|
||||
})
|
||||
|
||||
it('returns 403 for a viewer', async () => {
|
||||
const { supabase } = createCapturingSupabase([])
|
||||
auth(supabase)
|
||||
requireWriteMock.mockResolvedValue({
|
||||
ok: false,
|
||||
response: NextResponse.json({ error: 'Forbidden' }, { status: 403 }),
|
||||
})
|
||||
const req = createMockRequest('/api/bookkeeping/accounts/deactivate', {
|
||||
method: 'POST',
|
||||
body: { account_numbers: ['4010'] },
|
||||
})
|
||||
const res = await deactivatePOST(req, routeParams)
|
||||
expect(res.status).toBe(403)
|
||||
})
|
||||
|
||||
// The post-migration sweep: only never-used, non-system, active accounts
|
||||
// flip; everything else is reported back so the UI can say what it skipped.
|
||||
it('deactivates the never-used accounts and reports what it skipped', async () => {
|
||||
const { supabase, calls } = createCapturingSupabase([
|
||||
{
|
||||
data: [
|
||||
{ account_number: '4010', is_active: true, is_system_account: false }, // unused
|
||||
{ account_number: '4020', is_active: true, is_system_account: false }, // unused
|
||||
{ account_number: '5010', is_active: true, is_system_account: false }, // used
|
||||
{ account_number: '1930', is_active: true, is_system_account: true }, // system
|
||||
{ account_number: '6110', is_active: false, is_system_account: false }, // already off
|
||||
],
|
||||
},
|
||||
{ data: [{ account_number: '5010', usage_count: 12 }] }, // get_account_usage_counts
|
||||
{ data: [{ account_number: '4010' }, { account_number: '4020' }] }, // update result
|
||||
])
|
||||
auth(supabase)
|
||||
const req = createMockRequest('/api/bookkeeping/accounts/deactivate', {
|
||||
method: 'POST',
|
||||
body: { account_numbers: ['4010', '4020', '5010', '1930', '6110', '9999'] },
|
||||
})
|
||||
const { status, body } = await parseJsonResponse<{
|
||||
deactivated: number
|
||||
skipped_system: string[]
|
||||
skipped_used: string[]
|
||||
skipped_inactive: number
|
||||
unknown: string[]
|
||||
}>(await deactivatePOST(req, routeParams))
|
||||
|
||||
expect(status).toBe(200)
|
||||
expect(body.deactivated).toBe(2)
|
||||
expect(body.skipped_used).toEqual(['5010'])
|
||||
expect(body.skipped_system).toEqual(['1930'])
|
||||
expect(body.skipped_inactive).toBe(1)
|
||||
expect(body.unknown).toEqual(['9999'])
|
||||
|
||||
// Usage is read through the company-scoped RPC, never an embed.
|
||||
expect(calls.find((c) => c.method === 'rpc')?.args).toEqual([
|
||||
'get_account_usage_counts',
|
||||
{ p_company_id: 'company-1' },
|
||||
])
|
||||
// The update is scoped to the company and to exactly the unused set.
|
||||
const updateCall = calls.find((c) => c.method === 'update')
|
||||
expect(updateCall?.args).toEqual([{ is_active: false }])
|
||||
const inAfterUpdate = calls.slice(calls.indexOf(updateCall!)).find((c) => c.method === 'in')
|
||||
expect(inAfterUpdate?.args).toEqual(['account_number', ['4010', '4020']])
|
||||
})
|
||||
|
||||
it('includes used accounts only when include_used is set', async () => {
|
||||
const { supabase } = createCapturingSupabase([
|
||||
{ data: [{ account_number: '5010', is_active: true, is_system_account: false }] },
|
||||
{ data: [{ account_number: '5010', usage_count: 3 }] },
|
||||
{ data: [{ account_number: '5010' }] },
|
||||
])
|
||||
auth(supabase)
|
||||
const req = createMockRequest('/api/bookkeeping/accounts/deactivate', {
|
||||
method: 'POST',
|
||||
body: { account_numbers: ['5010'], include_used: true },
|
||||
})
|
||||
const { status, body } = await parseJsonResponse<{ deactivated: number; skipped_used: string[] }>(
|
||||
await deactivatePOST(req, routeParams)
|
||||
)
|
||||
expect(status).toBe(200)
|
||||
expect(body.deactivated).toBe(1)
|
||||
expect(body.skipped_used).toEqual([])
|
||||
})
|
||||
|
||||
it('skips the update entirely when nothing qualifies', async () => {
|
||||
const { supabase, calls } = createCapturingSupabase([
|
||||
{ data: [{ account_number: '5010', is_active: true, is_system_account: false }] },
|
||||
{ data: [{ account_number: '5010', usage_count: 3 }] },
|
||||
])
|
||||
auth(supabase)
|
||||
const req = createMockRequest('/api/bookkeeping/accounts/deactivate', {
|
||||
method: 'POST',
|
||||
body: { account_numbers: ['5010'] },
|
||||
})
|
||||
const { status, body } = await parseJsonResponse<{ deactivated: number; skipped_used: string[] }>(
|
||||
await deactivatePOST(req, routeParams)
|
||||
)
|
||||
expect(status).toBe(200)
|
||||
expect(body.deactivated).toBe(0)
|
||||
expect(body.skipped_used).toEqual(['5010'])
|
||||
expect(calls.find((c) => c.method === 'update')).toBeUndefined()
|
||||
})
|
||||
})
|
||||
|
||||
@@ -0,0 +1,127 @@
|
||||
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'
|
||||
|
||||
/**
|
||||
* POST /api/bookkeeping/accounts/deactivate
|
||||
*
|
||||
* Batch-deactivate accounts in the company's chart. Accepts
|
||||
* { account_numbers: string[], include_used?: boolean }. The mirror of
|
||||
* /activate, built for the post-migration sweep (#2186): a chart imported from
|
||||
* a previous system carries hundreds of accounts that were never posted to,
|
||||
* and a short chart is what keeps manual bookings from landing on the wrong
|
||||
* one.
|
||||
*
|
||||
* - System accounts are never deactivated here (skipped_system).
|
||||
* - Accounts with postings are skipped unless include_used is true
|
||||
* (skipped_used): deactivating a used account is legal and reversible, but
|
||||
* it hides balances from the kontoplan, so the bulk path defaults to the
|
||||
* never-used set and leaves used accounts to the per-row toggle with its
|
||||
* confirm. Usage comes from get_account_usage_counts, the same company-
|
||||
* scoped RPC the DELETE guard and the prune dialog read.
|
||||
* - Already-inactive numbers are counted in skipped_inactive; numbers not in
|
||||
* the chart at all are reported in `unknown` rather than rejected.
|
||||
*/
|
||||
const DeactivateSchema = z.object({
|
||||
account_numbers: z.array(z.string().min(1).max(10)).min(1).max(2000),
|
||||
include_used: z.boolean().optional().default(false),
|
||||
})
|
||||
|
||||
interface ChartRow {
|
||||
account_number: string
|
||||
is_active: boolean
|
||||
is_system_account: boolean
|
||||
}
|
||||
|
||||
export const POST = withRouteContext(
|
||||
'bookkeeping.accounts.deactivate',
|
||||
async (request, ctx) => {
|
||||
const { supabase, companyId } = ctx
|
||||
|
||||
const raw = await request.json().catch(() => null)
|
||||
const parsed = DeactivateSchema.safeParse(raw)
|
||||
if (!parsed.success) {
|
||||
return NextResponse.json({ error: 'account_numbers array required' }, { status: 400 })
|
||||
}
|
||||
|
||||
const uniqueNumbers = [...new Set(parsed.data.account_numbers)]
|
||||
const includeUsed = parsed.data.include_used
|
||||
|
||||
const { data: existing, error: fetchError } = await supabase
|
||||
.from('chart_of_accounts')
|
||||
.select('account_number, is_active, is_system_account')
|
||||
.eq('company_id', companyId)
|
||||
.in('account_number', uniqueNumbers)
|
||||
|
||||
if (fetchError) {
|
||||
return NextResponse.json({ error: getUserErrorMessage(fetchError) }, { status: 500 })
|
||||
}
|
||||
|
||||
const { data: usage, error: usageError } = await supabase.rpc('get_account_usage_counts', {
|
||||
p_company_id: companyId,
|
||||
})
|
||||
if (usageError) {
|
||||
return NextResponse.json({ error: getUserErrorMessage(usageError) }, { status: 500 })
|
||||
}
|
||||
// Accounts never posted to are simply absent from the RPC result.
|
||||
const usedNumbers = new Set<string>(
|
||||
((usage ?? []) as { account_number: string }[]).map((u) => u.account_number),
|
||||
)
|
||||
|
||||
const byNumber = new Map<string, ChartRow>(
|
||||
((existing || []) as ChartRow[]).map((a) => [a.account_number, a]),
|
||||
)
|
||||
|
||||
const toDeactivate: string[] = []
|
||||
const skippedSystem: string[] = []
|
||||
const skippedUsed: string[] = []
|
||||
const unknown: string[] = []
|
||||
let skippedInactive = 0
|
||||
|
||||
for (const num of uniqueNumbers) {
|
||||
const row = byNumber.get(num)
|
||||
if (!row) {
|
||||
unknown.push(num)
|
||||
continue
|
||||
}
|
||||
if (!row.is_active) {
|
||||
skippedInactive += 1
|
||||
continue
|
||||
}
|
||||
if (row.is_system_account) {
|
||||
skippedSystem.push(num)
|
||||
continue
|
||||
}
|
||||
if (usedNumbers.has(num) && !includeUsed) {
|
||||
skippedUsed.push(num)
|
||||
continue
|
||||
}
|
||||
toDeactivate.push(num)
|
||||
}
|
||||
|
||||
let deactivatedRows: { account_number: string }[] = []
|
||||
if (toDeactivate.length > 0) {
|
||||
const { data, error } = await supabase
|
||||
.from('chart_of_accounts')
|
||||
.update({ is_active: false })
|
||||
.eq('company_id', companyId)
|
||||
.in('account_number', toDeactivate)
|
||||
.select('account_number')
|
||||
if (error) {
|
||||
return NextResponse.json({ error: getUserErrorMessage(error) }, { status: 500 })
|
||||
}
|
||||
deactivatedRows = data || []
|
||||
}
|
||||
|
||||
return NextResponse.json({
|
||||
data: deactivatedRows,
|
||||
deactivated: deactivatedRows.length,
|
||||
skipped_system: skippedSystem,
|
||||
skipped_used: skippedUsed,
|
||||
skipped_inactive: skippedInactive,
|
||||
unknown,
|
||||
})
|
||||
},
|
||||
{ requireWrite: true },
|
||||
)
|
||||
Reference in New Issue
Block a user