* feat(deadlines): gate F-skatt reminders on debited preliminary tax, add durable dismissal The f_skatt deadline was gated on the F-skatt approval flag (DB default true), giving nearly every company 12 monthly payment reminders for a tax Skatteverket may not have debited at all (64% of all system deadline rows, one lifetime completion). Approval carries no recurring obligation; the monthly duty is payment of debiterad preliminarskatt and exists only while the debited amount is > 0 (SFL 62 kap. 4-5 par., 55 kap. 2 par.). - Gate the f_skatt deadline on preliminary_tax_monthly > 0 (field already collected at onboarding, previously unread) and retitle it as a payment. - Storforetag keep the 12th in August (January-only 17th, 62 kap. 3 par.). - Declare the prod-only preliminary_tax_monthly column in a migration so installs built purely from migrations stop failing tax-settings saves. - Add deadlines.dismissed_at: DELETE on a system deadline now soft-dismisses it durably (hard deletes were resurrected by the nightly backfill within 24h); generator, backfill, and every read surface respect it. - Prune upcoming f_skatt rows for companies with no debited amount. Closes part of #1028. Co-Authored-By: Claude Fable 5 <noreply@anthropic.com> * fix(deadlines): include dismissed_at in DeadlineForm payload The Deadline type gained the required dismissed_at field; the form's submit payload literal must carry it for the Omit<Deadline, ...> shape. Co-Authored-By: Claude Fable 5 <noreply@anthropic.com> * fix(deadlines): make system-deadline dismissal atomic Constrain the dismiss update to source='system' and verify a row was actually updated: a concurrent regeneration can delete the row between lookup and update, and the route must not report a phantom success. Co-Authored-By: Claude Fable 5 <noreply@anthropic.com> --------- Co-authored-by: Claude Fable 5 <noreply@anthropic.com>
160 lines
5.4 KiB
TypeScript
160 lines
5.4 KiB
TypeScript
import { NextResponse } from 'next/server'
|
|
import { withRouteContext } from '@/lib/api/with-route-context'
|
|
import { validateBody } from '@/lib/api/validate'
|
|
import { CreateDeadlineSchema } from '@/lib/api/schemas'
|
|
|
|
// Sparse update: every Create field, optional. Validated — the previous
|
|
// implementation type-asserted the raw JSON, so malformed values reached
|
|
// Postgres and malformed JSON crashed the handler.
|
|
const UpdateDeadlineSchema = CreateDeadlineSchema.partial()
|
|
|
|
/**
|
|
* GET /api/deadlines/[id]
|
|
* Get a single deadline by ID
|
|
*/
|
|
export const GET = withRouteContext<{ params: Promise<{ id: string }> }>(
|
|
'deadline.get',
|
|
async (_request, ctx, { params }) => {
|
|
const { id } = await params
|
|
const { supabase, companyId } = ctx
|
|
|
|
const { data, error } = await supabase
|
|
.from('deadlines')
|
|
.select('*, customer:customers(id, name)')
|
|
.eq('id', id)
|
|
.eq('company_id', companyId)
|
|
.single()
|
|
|
|
if (error) {
|
|
if (error.code === 'PGRST116') {
|
|
return NextResponse.json({ error: 'Deadline not found' }, { status: 404 })
|
|
}
|
|
return NextResponse.json({ error: error.message }, { status: 500 })
|
|
}
|
|
|
|
return NextResponse.json({ data })
|
|
},
|
|
)
|
|
|
|
/**
|
|
* PUT /api/deadlines/[id]
|
|
* Update a deadline
|
|
*/
|
|
export const PUT = withRouteContext<{ params: Promise<{ id: string }> }>(
|
|
'deadline.update',
|
|
async (request, ctx, { params }) => {
|
|
const { id } = await params
|
|
const { supabase, companyId, log } = ctx
|
|
|
|
const validation = await validateBody(request, UpdateDeadlineSchema, {
|
|
log,
|
|
operation: 'deadline.update',
|
|
})
|
|
if (!validation.success) return validation.response
|
|
const body = validation.data
|
|
|
|
// Build update object
|
|
const updateData: Record<string, unknown> = {}
|
|
if (body.title !== undefined) updateData.title = body.title
|
|
if (body.due_date !== undefined) updateData.due_date = body.due_date
|
|
if (body.due_time !== undefined) updateData.due_time = body.due_time
|
|
if (body.deadline_type !== undefined) updateData.deadline_type = body.deadline_type
|
|
if (body.priority !== undefined) updateData.priority = body.priority
|
|
if (body.customer_id !== undefined) updateData.customer_id = body.customer_id || null
|
|
if (body.notes !== undefined) updateData.notes = body.notes
|
|
|
|
if (Object.keys(updateData).length === 0) {
|
|
return NextResponse.json({ error: 'Nothing to update' }, { status: 400 })
|
|
}
|
|
|
|
const { data, error } = await supabase
|
|
.from('deadlines')
|
|
.update(updateData)
|
|
.eq('id', id)
|
|
.eq('company_id', companyId)
|
|
.select('*, customer:customers(id, name)')
|
|
.single()
|
|
|
|
if (error) {
|
|
// PGRST116 = zero rows — the deadline doesn't exist in this company.
|
|
if (error.code === 'PGRST116') {
|
|
return NextResponse.json({ error: 'Deadline not found' }, { status: 404 })
|
|
}
|
|
return NextResponse.json({ error: error.message }, { status: 500 })
|
|
}
|
|
|
|
return NextResponse.json({ data })
|
|
},
|
|
{ requireWrite: true },
|
|
)
|
|
|
|
/**
|
|
* DELETE /api/deadlines/[id]
|
|
* Delete a user deadline, or durably dismiss a system-generated one.
|
|
*
|
|
* System rows are soft-dismissed instead of hard-deleted: the nightly
|
|
* backfill cron treats a missing upcoming system row as a repair case and
|
|
* recreates it within 24 hours, so a hard delete silently undoes itself.
|
|
* A dismissed row stays in the table (hidden from every surface) and
|
|
* satisfies the generator and backfill the same way a completed row does.
|
|
*/
|
|
export const DELETE = withRouteContext<{ params: Promise<{ id: string }> }>(
|
|
'deadline.delete',
|
|
async (_request, ctx, { params }) => {
|
|
const { id } = await params
|
|
const { supabase, companyId } = ctx
|
|
|
|
const { data: existing, error: fetchError } = await supabase
|
|
.from('deadlines')
|
|
.select('id, source')
|
|
.eq('id', id)
|
|
.eq('company_id', companyId)
|
|
.maybeSingle()
|
|
|
|
if (fetchError) {
|
|
return NextResponse.json({ error: fetchError.message }, { status: 500 })
|
|
}
|
|
if (!existing) {
|
|
return NextResponse.json({ error: 'Deadline not found' }, { status: 404 })
|
|
}
|
|
|
|
if (existing.source === 'system') {
|
|
const { data: dismissedRows, error: dismissError } = await supabase
|
|
.from('deadlines')
|
|
.update({ dismissed_at: new Date().toISOString() })
|
|
.eq('id', id)
|
|
.eq('company_id', companyId)
|
|
.eq('source', 'system')
|
|
.select('id')
|
|
|
|
if (dismissError) {
|
|
return NextResponse.json({ error: dismissError.message }, { status: 500 })
|
|
}
|
|
// The row can vanish between lookup and update (generator cleanup
|
|
// during a concurrent regeneration); report 404 rather than a
|
|
// phantom success that persisted nothing.
|
|
if (!dismissedRows || dismissedRows.length === 0) {
|
|
return NextResponse.json({ error: 'Deadline not found' }, { status: 404 })
|
|
}
|
|
return NextResponse.json({ success: true, dismissed: true })
|
|
}
|
|
|
|
const { error, count } = await supabase
|
|
.from('deadlines')
|
|
.delete({ count: 'exact' })
|
|
.eq('id', id)
|
|
.eq('company_id', companyId)
|
|
|
|
if (error) {
|
|
return NextResponse.json({ error: error.message }, { status: 500 })
|
|
}
|
|
// Zero rows = wrong id / another company's deadline — not a success.
|
|
if (count === 0) {
|
|
return NextResponse.json({ error: 'Deadline not found' }, { status: 404 })
|
|
}
|
|
|
|
return NextResponse.json({ success: true })
|
|
},
|
|
{ requireWrite: true },
|
|
)
|