Phase 2 abgeschlossen: nachträgliche Änderungen, Grabstein, Richtlinie
Der Kern von harter Regel 2. Jede Änderung an einem Verlaufseintrag schreibt den vorherigen Stand nach CaseEntryVersion und erhöht die Versionsnummer. Autor und Entstehungszeit bleiben unangetastet, geprüft gegen die Datenbank. Die Karenzzeit wird serverseitig aus AppSetting gelesen, nie aus dem Request. Eine Änderung darin wird versioniert und protokolliert, aber nicht sichtbar markiert — ein Tippfehler, zwei Minuten später korrigiert, soll die Akte nicht mit "bearbeitet"-Marken zupflastern. Alles danach ist markiert und verlangt eine Begründung, ebenso jede Änderung an einem fremden Eintrag. Die Stelle, an der eine naive Umsetzung leckt, hat einen eigenen Test: wird minClearance eines Eintrags angehoben, erben alle bestehenden Versionen den neuen Wert. Sonst liest jemand mit niedrigerer Stufe den ursprünglichen Text einfach in der Historie. Zurückziehen setzt einen Grabstein mit Pflichtbegründung, der Text bleibt in der Datenbank. Rückgängig machen geht und wird wiederum protokolliert. Systemeinträge sind von jeder Änderung ausgenommen. Dazu die Änderungsübersicht als Reiter an der Akte — sichtbar für alle, die die Akte lesen dürfen, nicht nur für die Leitung — und die Adminseite für die Änderungsrichtlinie. Zwei Testprobleme dabei behoben: AppSetting ist eine einzige Zeile für die ganze Anwendung, deshalb laufen die Web-Tests jetzt nacheinander, und die Testdatenbank startet bei jedem Lauf im Auslieferungszustand. Vorher hing das Ergebnis davon ab, was der vorige Lauf hinterlassen hatte. 63 Tests, zweimal hintereinander grün. Bündel bei 110,5 kB von 120.
This commit is contained in:
Harlekin
@@ -0,0 +1,108 @@
|
||||
'use client'
|
||||
|
||||
import { useState, useTransition } from 'react'
|
||||
import { de } from '@/lib/i18n/de'
|
||||
import { savePolicy } from './actions'
|
||||
|
||||
const POLICIES = ['APPEND_ONLY', 'GRACE_WINDOW', 'OPEN'] as const
|
||||
|
||||
/**
|
||||
* Nicht optimistisch: die Richtlinie wirkt sofort für alle Akten.
|
||||
* Bestätigungsdialog, Wartezustand am Knopf, klare Rückmeldung.
|
||||
* Siehe docs/09-performance-und-ux.md.
|
||||
*/
|
||||
export function PolicyForm({
|
||||
initial,
|
||||
}: {
|
||||
initial: { entryEditPolicy: string; entryEditGraceMinutes: number; entryEditMarkGrace: boolean }
|
||||
}) {
|
||||
const [policy, setPolicy] = useState(initial.entryEditPolicy)
|
||||
const [grace, setGrace] = useState(initial.entryEditGraceMinutes)
|
||||
const [mark, setMark] = useState(initial.entryEditMarkGrace)
|
||||
const [saved, setSaved] = useState(false)
|
||||
const [error, setError] = useState<string | null>(null)
|
||||
const [pending, startTransition] = useTransition()
|
||||
|
||||
function submit() {
|
||||
if (!confirm(de.settings.confirm)) return
|
||||
setError(null)
|
||||
startTransition(async () => {
|
||||
const result = await savePolicy({
|
||||
entryEditPolicy: policy,
|
||||
entryEditGraceMinutes: grace,
|
||||
entryEditMarkGrace: mark,
|
||||
})
|
||||
if (result.ok) setSaved(true)
|
||||
else setError(result.error)
|
||||
})
|
||||
}
|
||||
|
||||
return (
|
||||
<div className="mt-6 space-y-6">
|
||||
<fieldset>
|
||||
<legend className="font-condensed text-xs text-text-dim">{de.settings.policy}</legend>
|
||||
<div className="mt-2 space-y-2">
|
||||
{POLICIES.map((value) => (
|
||||
<label key={value} className="flex items-start gap-2 text-sm">
|
||||
<input
|
||||
type="radio"
|
||||
name="policy"
|
||||
value={value}
|
||||
checked={policy === value}
|
||||
onChange={() => {
|
||||
setPolicy(value)
|
||||
setSaved(false)
|
||||
}}
|
||||
className="mt-1"
|
||||
/>
|
||||
<span>{de.settings.policies[value]}</span>
|
||||
</label>
|
||||
))}
|
||||
</div>
|
||||
</fieldset>
|
||||
|
||||
<label className="block">
|
||||
<span className="font-condensed text-xs text-text-dim">{de.settings.graceMinutes}</span>
|
||||
<input
|
||||
type="number"
|
||||
min={0}
|
||||
max={1440}
|
||||
value={grace}
|
||||
disabled={policy !== 'GRACE_WINDOW'}
|
||||
onChange={(event) => {
|
||||
setGrace(Number(event.target.value))
|
||||
setSaved(false)
|
||||
}}
|
||||
className="mt-1.5 block w-24 border border-line bg-raised px-3 py-2 font-mono text-sm disabled:text-text-dim"
|
||||
/>
|
||||
</label>
|
||||
|
||||
<label className="flex items-center gap-2 text-sm">
|
||||
<input
|
||||
type="checkbox"
|
||||
checked={mark}
|
||||
onChange={(event) => {
|
||||
setMark(event.target.checked)
|
||||
setSaved(false)
|
||||
}}
|
||||
/>
|
||||
<span>{de.settings.markGrace}</span>
|
||||
</label>
|
||||
|
||||
<div className="flex items-center gap-3">
|
||||
<button
|
||||
type="button"
|
||||
onClick={submit}
|
||||
disabled={pending}
|
||||
className="border border-line bg-raised px-4 py-2 font-condensed text-xs text-accent disabled:text-text-dim"
|
||||
>
|
||||
{pending ? de.case.saving : de.settings.save}
|
||||
</button>
|
||||
{saved ? (
|
||||
<span className="font-condensed text-2xs text-text-dim">{de.settings.saved}</span>
|
||||
) : null}
|
||||
{error ? <span className="font-condensed text-2xs text-stamp-4">{error}</span> : null}
|
||||
</div>
|
||||
</div>
|
||||
)
|
||||
}
|
||||
@@ -0,0 +1,57 @@
|
||||
'use server'
|
||||
|
||||
import { revalidatePath } from 'next/cache'
|
||||
import { z } from 'zod'
|
||||
import { db } from '@/lib/db'
|
||||
import { requirePermissionForAction } from '@/lib/auth/current'
|
||||
import { writeAudit } from '@/lib/audit'
|
||||
import { de } from '@/lib/i18n/de'
|
||||
|
||||
const schema = z.object({
|
||||
entryEditPolicy: z.enum(['APPEND_ONLY', 'GRACE_WINDOW', 'OPEN']),
|
||||
entryEditGraceMinutes: z.coerce.number().int().min(0).max(1440),
|
||||
entryEditMarkGrace: z.boolean(),
|
||||
})
|
||||
|
||||
export type PolicyResult = { ok: true } | { ok: false; error: string }
|
||||
|
||||
/**
|
||||
* Die Änderungsrichtlinie gilt für die ganze Abteilung und wird serverseitig
|
||||
* gelesen, nie aus dem Request. Deshalb ist das hier die einzige Stelle, an
|
||||
* der sie sich ändern lässt — mit Recht `admin` und mit Protokolleintrag.
|
||||
*/
|
||||
export async function savePolicy(input: unknown): Promise<PolicyResult> {
|
||||
const user = await requirePermissionForAction('admin')
|
||||
|
||||
const parsed = schema.safeParse(input)
|
||||
if (!parsed.success) return { ok: false, error: de.case.errors.default! }
|
||||
|
||||
const before = await db.appSetting.findUnique({ where: { id: 1 } })
|
||||
|
||||
await db.$transaction(async (tx) => {
|
||||
await tx.appSetting.upsert({
|
||||
where: { id: 1 },
|
||||
create: { id: 1, ...parsed.data, updatedById: user.id },
|
||||
update: { ...parsed.data, updatedById: user.id },
|
||||
})
|
||||
|
||||
await writeAudit(tx, {
|
||||
actorId: user.id,
|
||||
action: 'roles.update',
|
||||
targetType: 'AppSetting',
|
||||
targetId: '1',
|
||||
clearanceAtTime: user.permissions.clearanceLevel,
|
||||
meta: {
|
||||
from: {
|
||||
policy: before?.entryEditPolicy,
|
||||
grace: before?.entryEditGraceMinutes,
|
||||
mark: before?.entryEditMarkGrace,
|
||||
},
|
||||
to: parsed.data,
|
||||
},
|
||||
})
|
||||
})
|
||||
|
||||
revalidatePath('/admin/richtlinie')
|
||||
return { ok: true }
|
||||
}
|
||||
@@ -0,0 +1,28 @@
|
||||
import type { Metadata } from 'next'
|
||||
import { db } from '@/lib/db'
|
||||
import { requirePermission } from '@/lib/auth/current'
|
||||
import { de } from '@/lib/i18n/de'
|
||||
import { PolicyForm } from './PolicyForm'
|
||||
|
||||
export const metadata: Metadata = { title: de.settings.heading }
|
||||
export const dynamic = 'force-dynamic'
|
||||
|
||||
export default async function PolicyPage() {
|
||||
await requirePermission('admin')
|
||||
|
||||
const setting = await db.appSetting.findUnique({ where: { id: 1 } })
|
||||
|
||||
return (
|
||||
<main className="mx-auto max-w-(--container-measure) px-6 py-10">
|
||||
<h1 className="font-condensed">{de.settings.heading}</h1>
|
||||
<p className="mt-2 text-text-dim">{de.settings.intro}</p>
|
||||
<PolicyForm
|
||||
initial={{
|
||||
entryEditPolicy: setting?.entryEditPolicy ?? 'GRACE_WINDOW',
|
||||
entryEditGraceMinutes: setting?.entryEditGraceMinutes ?? 15,
|
||||
entryEditMarkGrace: setting?.entryEditMarkGrace ?? false,
|
||||
}}
|
||||
/>
|
||||
</main>
|
||||
)
|
||||
}
|
||||
@@ -0,0 +1,140 @@
|
||||
'use client'
|
||||
|
||||
import { useState, useTransition } from 'react'
|
||||
import { de } from '@/lib/i18n/de'
|
||||
import { changeStatusAction, reclassifyAction } from '../actions'
|
||||
|
||||
/**
|
||||
* Statuswechsel und Umklassifizierung.
|
||||
*
|
||||
* Bewusst **nicht** optimistisch: beides ist folgenreich und teils nicht
|
||||
* umkehrbar. Stattdessen ein sofortiger Wartezustand am Knopf und eine klare
|
||||
* Rückmeldung. Siehe docs/09-performance-und-ux.md.
|
||||
*/
|
||||
export function CaseActions({
|
||||
caseNumber,
|
||||
classification,
|
||||
statusTargets,
|
||||
levels,
|
||||
maxLevel,
|
||||
}: {
|
||||
caseNumber: string
|
||||
classification: number
|
||||
statusTargets: string[]
|
||||
levels: { level: number; name: string }[]
|
||||
maxLevel: number
|
||||
}) {
|
||||
const [nextStatus, setNextStatus] = useState(statusTargets[0] ?? '')
|
||||
const [statusReason, setStatusReason] = useState('')
|
||||
const [nextLevel, setNextLevel] = useState(classification)
|
||||
const [levelReason, setLevelReason] = useState('')
|
||||
const [error, setError] = useState<string | null>(null)
|
||||
const [pending, startTransition] = useTransition()
|
||||
|
||||
const lowering = nextLevel < classification
|
||||
|
||||
function run(action: () => Promise<{ ok: boolean; error?: string }>, confirmText: string) {
|
||||
if (!confirm(confirmText)) return
|
||||
setError(null)
|
||||
startTransition(async () => {
|
||||
const result = await action()
|
||||
if (!result.ok) setError(result.error ?? de.case.errors.default!)
|
||||
})
|
||||
}
|
||||
|
||||
return (
|
||||
<div className="mt-6 flex flex-wrap gap-x-10 gap-y-5 border-t border-line pt-5 text-xs">
|
||||
{statusTargets.length > 0 ? (
|
||||
<div>
|
||||
<p className="font-condensed text-text-dim">{de.case.statusChange}</p>
|
||||
<div className="mt-1.5 flex flex-wrap items-center gap-2">
|
||||
<select
|
||||
value={nextStatus}
|
||||
onChange={(event) => setNextStatus(event.target.value)}
|
||||
className="border border-line bg-raised px-2 py-1"
|
||||
>
|
||||
{statusTargets.map((target) => (
|
||||
<option key={target} value={target}>
|
||||
{de.case.statusNames[target] ?? target}
|
||||
</option>
|
||||
))}
|
||||
</select>
|
||||
<input
|
||||
value={statusReason}
|
||||
onChange={(event) => setStatusReason(event.target.value)}
|
||||
placeholder={de.entry.changeReason}
|
||||
className="w-56 border border-line bg-raised px-2 py-1"
|
||||
/>
|
||||
<button
|
||||
type="button"
|
||||
disabled={pending || !nextStatus}
|
||||
onClick={() =>
|
||||
run(
|
||||
() =>
|
||||
changeStatusAction({
|
||||
caseNumber,
|
||||
to: nextStatus,
|
||||
reason: statusReason || undefined,
|
||||
}),
|
||||
`${de.case.statusChange}: ${de.case.statusNames[nextStatus] ?? nextStatus}?`,
|
||||
)
|
||||
}
|
||||
className="border border-line bg-raised px-3 py-1 font-condensed text-accent disabled:text-text-dim"
|
||||
>
|
||||
{pending ? de.case.saving : de.common.save}
|
||||
</button>
|
||||
</div>
|
||||
</div>
|
||||
) : null}
|
||||
|
||||
<div>
|
||||
<p className="font-condensed text-text-dim">{de.case.reclassify}</p>
|
||||
<div className="mt-1.5 flex flex-wrap items-center gap-2">
|
||||
<select
|
||||
value={nextLevel}
|
||||
onChange={(event) => setNextLevel(Number(event.target.value))}
|
||||
className="border border-line bg-raised px-2 py-1"
|
||||
>
|
||||
{levels
|
||||
.filter((level) => level.level <= maxLevel)
|
||||
.map((level) => (
|
||||
<option key={level.level} value={level.level}>
|
||||
{level.level} · {level.name}
|
||||
</option>
|
||||
))}
|
||||
</select>
|
||||
{/* Eine Herabstufung macht Inhalte für Leute sichtbar, die sie vorher
|
||||
nicht sehen durften. Deshalb ist die Begründung Pflicht. */}
|
||||
{lowering ? (
|
||||
<input
|
||||
value={levelReason}
|
||||
onChange={(event) => setLevelReason(event.target.value)}
|
||||
placeholder={de.case.reclassifyReason}
|
||||
className="w-64 border border-line bg-raised px-2 py-1"
|
||||
/>
|
||||
) : null}
|
||||
<button
|
||||
type="button"
|
||||
disabled={pending || nextLevel === classification}
|
||||
onClick={() =>
|
||||
run(
|
||||
() =>
|
||||
reclassifyAction({
|
||||
caseNumber,
|
||||
to: nextLevel,
|
||||
reason: levelReason || undefined,
|
||||
}),
|
||||
`${de.case.reclassify}: ${nextLevel}?`,
|
||||
)
|
||||
}
|
||||
className="border border-line bg-raised px-3 py-1 font-condensed text-accent disabled:text-text-dim"
|
||||
>
|
||||
{pending ? de.case.saving : de.common.save}
|
||||
</button>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
{error ? <p className="w-full font-condensed text-2xs text-stamp-4">{error}</p> : null}
|
||||
</div>
|
||||
)
|
||||
}
|
||||
@@ -0,0 +1,141 @@
|
||||
'use client'
|
||||
|
||||
import { useState, useTransition } from 'react'
|
||||
import { de } from '@/lib/i18n/de'
|
||||
import { editEntryAction, restoreEntryAction, retractEntryAction } from '../actions'
|
||||
|
||||
/**
|
||||
* Ändern und Zurückziehen eines Verlaufseintrags.
|
||||
*
|
||||
* Nicht optimistisch: die Begründung gehört erst abgeschickt und bestätigt,
|
||||
* bevor der neue Text steht. Siehe docs/09-performance-und-ux.md.
|
||||
*/
|
||||
export function EntryActions({
|
||||
entryId,
|
||||
caseNumber,
|
||||
body,
|
||||
retracted,
|
||||
canEdit,
|
||||
canRetract,
|
||||
}: {
|
||||
entryId: string
|
||||
caseNumber: string
|
||||
body: string
|
||||
retracted: boolean
|
||||
canEdit: boolean
|
||||
canRetract: boolean
|
||||
}) {
|
||||
const [mode, setMode] = useState<'idle' | 'edit' | 'retract'>('idle')
|
||||
const [draft, setDraft] = useState(body)
|
||||
const [reason, setReason] = useState('')
|
||||
const [error, setError] = useState<string | null>(null)
|
||||
const [pending, startTransition] = useTransition()
|
||||
|
||||
function run(action: () => Promise<{ ok: boolean; error?: string }>) {
|
||||
setError(null)
|
||||
startTransition(async () => {
|
||||
const result = await action()
|
||||
if (result.ok) {
|
||||
setMode('idle')
|
||||
setReason('')
|
||||
} else {
|
||||
setError(result.error ?? de.case.errors.default!)
|
||||
}
|
||||
})
|
||||
}
|
||||
|
||||
if (retracted) {
|
||||
if (!canRetract) return null
|
||||
return (
|
||||
<div className="mt-2 flex flex-wrap items-center gap-2 text-2xs">
|
||||
<input
|
||||
value={reason}
|
||||
onChange={(event) => setReason(event.target.value)}
|
||||
placeholder={de.entry.retractReason}
|
||||
className="w-64 border border-line bg-raised px-2 py-1"
|
||||
/>
|
||||
<button
|
||||
type="button"
|
||||
disabled={pending}
|
||||
onClick={() => run(() => restoreEntryAction({ entryId, caseNumber, reason }))}
|
||||
className="font-condensed text-accent disabled:text-text-dim"
|
||||
>
|
||||
{de.entry.restore}
|
||||
</button>
|
||||
{error ? <span className="text-stamp-4">{error}</span> : null}
|
||||
</div>
|
||||
)
|
||||
}
|
||||
|
||||
if (mode === 'idle') {
|
||||
if (!canEdit && !canRetract) return null
|
||||
return (
|
||||
<div className="mt-1.5 flex gap-3 text-2xs">
|
||||
{canEdit ? (
|
||||
<button type="button" onClick={() => setMode('edit')} className="font-condensed text-accent">
|
||||
{de.entry.edit}
|
||||
</button>
|
||||
) : null}
|
||||
{canRetract ? (
|
||||
<button
|
||||
type="button"
|
||||
onClick={() => setMode('retract')}
|
||||
className="font-condensed text-accent"
|
||||
>
|
||||
{de.entry.retract}
|
||||
</button>
|
||||
) : null}
|
||||
</div>
|
||||
)
|
||||
}
|
||||
|
||||
return (
|
||||
<div className="mt-2 max-w-(--container-measure) text-2xs">
|
||||
{mode === 'edit' ? (
|
||||
<textarea
|
||||
value={draft}
|
||||
onChange={(event) => setDraft(event.target.value)}
|
||||
rows={4}
|
||||
className="block w-full border border-line bg-raised px-3 py-2 text-sm"
|
||||
/>
|
||||
) : null}
|
||||
|
||||
<input
|
||||
value={reason}
|
||||
onChange={(event) => setReason(event.target.value)}
|
||||
placeholder={mode === 'edit' ? de.entry.changeReason : de.entry.retractReason}
|
||||
className="mt-2 block w-full border border-line bg-raised px-2 py-1"
|
||||
/>
|
||||
|
||||
<div className="mt-2 flex items-center gap-3">
|
||||
<button
|
||||
type="button"
|
||||
disabled={pending}
|
||||
onClick={() =>
|
||||
run(() =>
|
||||
mode === 'edit'
|
||||
? editEntryAction({ entryId, caseNumber, body: draft, changeReason: reason })
|
||||
: retractEntryAction({ entryId, caseNumber, reason }),
|
||||
)
|
||||
}
|
||||
className="border border-line bg-raised px-3 py-1 font-condensed text-accent disabled:text-text-dim"
|
||||
>
|
||||
{pending ? de.case.saving : mode === 'edit' ? de.entry.editSave : de.entry.retract}
|
||||
</button>
|
||||
<button
|
||||
type="button"
|
||||
onClick={() => {
|
||||
setMode('idle')
|
||||
setDraft(body)
|
||||
setReason('')
|
||||
setError(null)
|
||||
}}
|
||||
className="font-condensed text-text-dim"
|
||||
>
|
||||
{de.entry.cancel}
|
||||
</button>
|
||||
{error ? <span className="text-stamp-4">{error}</span> : null}
|
||||
</div>
|
||||
</div>
|
||||
)
|
||||
}
|
||||
@@ -0,0 +1,95 @@
|
||||
import type { Metadata } from 'next'
|
||||
import Link from 'next/link'
|
||||
import { notFound } from 'next/navigation'
|
||||
import { db } from '@/lib/db'
|
||||
import { requireUser } from '@/lib/auth/current'
|
||||
import { loadVisibleCase } from '@/lib/cases/service'
|
||||
import { loadChangeHistory } from '@/lib/cases/entryService'
|
||||
import { de } from '@/lib/i18n/de'
|
||||
|
||||
export const metadata: Metadata = { title: de.entry.changesHeading }
|
||||
export const dynamic = 'force-dynamic'
|
||||
|
||||
/**
|
||||
* Änderungsübersicht als eigener Reiter an der Akte.
|
||||
*
|
||||
* Für die Abteilungsleitung ist das die Ansicht, mit der sie im Zweifel prüft,
|
||||
* ob an einer Akte nachträglich gedreht wurde. Sichtbar für alle, die die Akte
|
||||
* lesen dürfen — nicht nur für die Leitung. Das ist der ganze Sinn der Sache.
|
||||
*/
|
||||
export default async function ChangesPage({
|
||||
params,
|
||||
}: {
|
||||
params: Promise<{ caseNumber: string }>
|
||||
}) {
|
||||
const user = await requireUser()
|
||||
const { caseNumber } = await params
|
||||
|
||||
const akte = await loadVisibleCase(user.permissions, caseNumber)
|
||||
if (!akte) notFound()
|
||||
|
||||
const versionen = await loadChangeHistory(user.permissions, akte.id)
|
||||
|
||||
const namen = new Map(
|
||||
(
|
||||
await db.user.findMany({
|
||||
where: { id: { in: [...new Set(versionen.map((v) => v.editedById))] } },
|
||||
select: { id: true, displayName: true },
|
||||
})
|
||||
).map((u) => [u.id, u.displayName]),
|
||||
)
|
||||
|
||||
return (
|
||||
<main className="mx-auto max-w-5xl px-6 py-10">
|
||||
<p className="font-mono text-xs text-text-dim">
|
||||
<Link href={`/faelle/${akte.caseNumber}`}>{akte.caseNumber}</Link>
|
||||
</p>
|
||||
<h1 className="mt-2 font-condensed">{de.entry.changesHeading}</h1>
|
||||
<p className="mt-2 max-w-(--container-measure) text-text-dim">{de.entry.changesIntro}</p>
|
||||
|
||||
{versionen.length === 0 ? (
|
||||
<p className="mt-8 text-text-dim">{de.entry.changesEmpty}</p>
|
||||
) : (
|
||||
<ol className="mt-8 border-t border-line">
|
||||
{versionen.map((version) => (
|
||||
<li key={version.id} className="border-b border-line py-5">
|
||||
<div className="flex flex-wrap items-baseline gap-x-3 gap-y-1 text-2xs text-text-dim">
|
||||
<span className="font-condensed">
|
||||
{de.entry.versionLabel(version.version)} → {version.version + 1}
|
||||
</span>
|
||||
<span className="font-mono">
|
||||
{namen.get(version.editedById) ?? version.editedById}
|
||||
</span>
|
||||
<time dateTime={version.editedAt.toISOString()}>
|
||||
{version.editedAt.toLocaleString('de-DE')}
|
||||
</time>
|
||||
</div>
|
||||
|
||||
{version.changeReason ? (
|
||||
<p className="mt-1.5 text-sm">
|
||||
<span className="font-condensed text-text-dim">{de.entry.changeReason}: </span>
|
||||
{version.changeReason}
|
||||
</p>
|
||||
) : null}
|
||||
|
||||
<div className="mt-3 grid gap-4 md:grid-cols-2">
|
||||
<div>
|
||||
<p className="font-condensed text-2xs text-text-dim">{de.entry.before}</p>
|
||||
<p className="mt-1 border-l-(length:--spacing-edge) border-line pl-3 text-sm whitespace-pre-wrap">
|
||||
{version.body}
|
||||
</p>
|
||||
</div>
|
||||
<div>
|
||||
<p className="font-condensed text-2xs text-text-dim">{de.entry.after}</p>
|
||||
<p className="mt-1 border-l-(length:--spacing-edge) border-steel pl-3 text-sm whitespace-pre-wrap">
|
||||
{version.entry.body}
|
||||
</p>
|
||||
</div>
|
||||
</div>
|
||||
</li>
|
||||
))}
|
||||
</ol>
|
||||
)}
|
||||
</main>
|
||||
)
|
||||
}
|
||||
@@ -10,6 +10,12 @@ import { de } from '@/lib/i18n/de'
|
||||
import { StampMark, classificationEdgeStyle } from '@/components/StampMark'
|
||||
import { SkeletonLine } from '@/components/Skeleton'
|
||||
import { EntryComposer } from './EntryComposer'
|
||||
import { CaseActions } from './CaseActions'
|
||||
import { EntryActions } from './EntryActions'
|
||||
import { allowedTargets, type CaseStatusName } from '@/lib/cases/lifecycle'
|
||||
import { evaluateEntryEdit, canRetract } from '@/lib/cases/entryPolicy'
|
||||
import Link from 'next/link'
|
||||
import type { EffectivePermissions } from '@/lib/auth/permissions'
|
||||
|
||||
export const dynamic = 'force-dynamic'
|
||||
|
||||
@@ -27,25 +33,27 @@ export async function generateMetadata({
|
||||
* Kopfdaten stehen sofort, der Nutzer liest schon, während der Rest lädt.
|
||||
* Siehe docs/09-performance-und-ux.md.
|
||||
*/
|
||||
async function Timeline({ caseId, userId, clearanceLevel, isAdmin }: {
|
||||
async function Timeline({
|
||||
caseId,
|
||||
caseNumber,
|
||||
permissions,
|
||||
}: {
|
||||
caseId: string
|
||||
userId: string
|
||||
clearanceLevel: number
|
||||
isAdmin: boolean
|
||||
caseNumber: string
|
||||
permissions: EffectivePermissions
|
||||
}) {
|
||||
const settings = await db.appSetting.findUnique({ where: { id: 1 } })
|
||||
const policy = {
|
||||
entryEditPolicy: (settings?.entryEditPolicy ?? 'GRACE_WINDOW') as
|
||||
| 'APPEND_ONLY'
|
||||
| 'GRACE_WINDOW'
|
||||
| 'OPEN',
|
||||
entryEditGraceMinutes: settings?.entryEditGraceMinutes ?? 15,
|
||||
entryEditMarkGrace: settings?.entryEditMarkGrace ?? false,
|
||||
}
|
||||
|
||||
const entries = await db.caseEntry.findMany({
|
||||
where: {
|
||||
AND: [
|
||||
visibleEntryWhere({
|
||||
userId,
|
||||
clearanceLevel,
|
||||
isAdmin,
|
||||
permissions: new Set(),
|
||||
hasMembership: true,
|
||||
}),
|
||||
{ caseId },
|
||||
],
|
||||
},
|
||||
where: { AND: [visibleEntryWhere(permissions), { caseId }] },
|
||||
orderBy: [{ createdAt: 'desc' }, { id: 'desc' }],
|
||||
take: 100,
|
||||
select: {
|
||||
@@ -84,7 +92,12 @@ async function Timeline({ caseId, userId, clearanceLevel, isAdmin }: {
|
||||
{entry.createdAt.toLocaleString('de-DE')}
|
||||
</time>
|
||||
{entry.editVisible && entry.editedAt ? (
|
||||
<span className="font-condensed">{de.entry.edited(entry.version)}</span>
|
||||
<Link
|
||||
href={`/faelle/${caseNumber}/aenderungen`}
|
||||
className="font-condensed"
|
||||
>
|
||||
{de.entry.edited(entry.version)}
|
||||
</Link>
|
||||
) : null}
|
||||
</div>
|
||||
|
||||
@@ -101,6 +114,15 @@ async function Timeline({ caseId, userId, clearanceLevel, isAdmin }: {
|
||||
{entry.body}
|
||||
</p>
|
||||
)}
|
||||
|
||||
<EntryActions
|
||||
entryId={entry.id}
|
||||
caseNumber={caseNumber}
|
||||
body={entry.body}
|
||||
retracted={entry.retractedAt !== null}
|
||||
canEdit={evaluateEntryEdit(permissions, entry, policy).ok}
|
||||
canRetract={canRetract(permissions, entry)}
|
||||
/>
|
||||
</li>
|
||||
))}
|
||||
</ol>
|
||||
@@ -131,9 +153,8 @@ export default async function CasePage({
|
||||
})
|
||||
}
|
||||
|
||||
const level = await db.clearanceLevelConfig.findUnique({
|
||||
where: { level: akte.classification },
|
||||
})
|
||||
const levels = await db.clearanceLevelConfig.findMany({ orderBy: { level: 'asc' } })
|
||||
const level = levels.find((l) => l.level === akte.classification)
|
||||
|
||||
return (
|
||||
<main className="mx-auto max-w-5xl px-6 py-10">
|
||||
@@ -162,11 +183,21 @@ export default async function CasePage({
|
||||
</div>
|
||||
) : null}
|
||||
</dl>
|
||||
<CaseActions
|
||||
caseNumber={akte.caseNumber}
|
||||
classification={akte.classification}
|
||||
statusTargets={allowedTargets(akte.status as CaseStatusName)}
|
||||
levels={levels.map((l) => ({ level: l.level, name: l.name }))}
|
||||
maxLevel={user.permissions.clearanceLevel}
|
||||
/>
|
||||
</header>
|
||||
|
||||
<section className="mt-10">
|
||||
<h2 className="font-condensed">{de.case.timeline}</h2>
|
||||
<nav className="mt-8 flex gap-4 border-b border-line pb-2 font-condensed text-xs">
|
||||
<span className="text-text-dim">{de.case.timeline}</span>
|
||||
<Link href={`/faelle/${akte.caseNumber}/aenderungen`}>{de.case.changes}</Link>
|
||||
</nav>
|
||||
|
||||
<section className="mt-6">
|
||||
<div className="mt-4">
|
||||
<EntryComposer caseNumber={akte.caseNumber} />
|
||||
</div>
|
||||
@@ -186,9 +217,8 @@ export default async function CasePage({
|
||||
>
|
||||
<Timeline
|
||||
caseId={akte.id}
|
||||
userId={user.id}
|
||||
clearanceLevel={user.permissions.clearanceLevel}
|
||||
isAdmin={user.permissions.isAdmin}
|
||||
caseNumber={akte.caseNumber}
|
||||
permissions={user.permissions}
|
||||
/>
|
||||
</Suspense>
|
||||
</div>
|
||||
|
||||
@@ -5,6 +5,7 @@ import { redirect } from 'next/navigation'
|
||||
import { z } from 'zod'
|
||||
import { requireUser } from '@/lib/auth/current'
|
||||
import { AccessError, addEntry, changeStatus, createCase, reclassify } from '@/lib/cases/service'
|
||||
import { editEntry, restoreEntry, retractEntry } from '@/lib/cases/entryService'
|
||||
import { de } from '@/lib/i18n/de'
|
||||
|
||||
export type ActionResult = { ok: true } | { ok: false; error: string }
|
||||
@@ -121,3 +122,62 @@ export async function reclassifyAction(input: unknown): Promise<ActionResult> {
|
||||
revalidatePath('/faelle')
|
||||
return { ok: true }
|
||||
}
|
||||
|
||||
const editSchema = z.object({
|
||||
entryId: z.string().min(1),
|
||||
caseNumber: z.string().min(1),
|
||||
body: z.string().trim().min(1).max(20_000),
|
||||
minClearance: z.coerce.number().int().min(0).max(5).optional(),
|
||||
changeReason: z.string().trim().optional(),
|
||||
})
|
||||
|
||||
export async function editEntryAction(input: unknown): Promise<ActionResult> {
|
||||
const user = await requireUser()
|
||||
const parsed = editSchema.safeParse(input)
|
||||
if (!parsed.success) return { ok: false, error: de.case.errors.default! }
|
||||
|
||||
try {
|
||||
await editEntry(user.permissions, parsed.data)
|
||||
} catch (error) {
|
||||
return { ok: false, error: toMessage(error) }
|
||||
}
|
||||
|
||||
revalidatePath(`/faelle/${parsed.data.caseNumber}`)
|
||||
return { ok: true }
|
||||
}
|
||||
|
||||
const retractSchema = z.object({
|
||||
entryId: z.string().min(1),
|
||||
caseNumber: z.string().min(1),
|
||||
reason: z.string().trim().min(10),
|
||||
})
|
||||
|
||||
export async function retractEntryAction(input: unknown): Promise<ActionResult> {
|
||||
const user = await requireUser()
|
||||
const parsed = retractSchema.safeParse(input)
|
||||
if (!parsed.success) return { ok: false, error: de.entry.reasonTooShort }
|
||||
|
||||
try {
|
||||
await retractEntry(user.permissions, parsed.data)
|
||||
} catch (error) {
|
||||
return { ok: false, error: toMessage(error) }
|
||||
}
|
||||
|
||||
revalidatePath(`/faelle/${parsed.data.caseNumber}`)
|
||||
return { ok: true }
|
||||
}
|
||||
|
||||
export async function restoreEntryAction(input: unknown): Promise<ActionResult> {
|
||||
const user = await requireUser()
|
||||
const parsed = retractSchema.safeParse(input)
|
||||
if (!parsed.success) return { ok: false, error: de.entry.reasonTooShort }
|
||||
|
||||
try {
|
||||
await restoreEntry(user.permissions, parsed.data)
|
||||
} catch (error) {
|
||||
return { ok: false, error: toMessage(error) }
|
||||
}
|
||||
|
||||
revalidatePath(`/faelle/${parsed.data.caseNumber}`)
|
||||
return { ok: true }
|
||||
}
|
||||
|
||||
@@ -23,7 +23,12 @@ export default async function AppLayout({ children }: { children: React.ReactNod
|
||||
<Link href="/uebersicht">{de.nav.dashboard}</Link>
|
||||
<Link href="/faelle">{de.nav.cases}</Link>
|
||||
{user.permissions.isAdmin || user.permissions.permissions.has('roles.manage') ? (
|
||||
<Link href="/admin/rollen">{de.nav.admin}</Link>
|
||||
<>
|
||||
<Link href="/admin/rollen">{de.nav.admin}</Link>
|
||||
{user.permissions.isAdmin ? (
|
||||
<Link href="/admin/richtlinie">{de.settings.heading}</Link>
|
||||
) : null}
|
||||
</>
|
||||
) : null}
|
||||
</nav>
|
||||
|
||||
|
||||
@@ -0,0 +1,91 @@
|
||||
import type { EffectivePermissions } from '@/lib/auth/permissions'
|
||||
|
||||
/**
|
||||
* Wer darf einen Verlaufseintrag nachträglich ändern, und ist die Änderung
|
||||
* sichtbar zu markieren? Siehe docs/05-akten-und-vorlagen.md.
|
||||
*
|
||||
* Bewusst eine reine Funktion ohne Datenbank: das ist die Regel, an der die
|
||||
* Nachvollziehbarkeit der ganzen Akte hängt, und sie gehört einzeln prüfbar.
|
||||
* Die Karenzzeit wird **serverseitig** aus `AppSetting` gelesen, nie aus dem
|
||||
* Request.
|
||||
*/
|
||||
export type EditPolicyName = 'APPEND_ONLY' | 'GRACE_WINDOW' | 'OPEN'
|
||||
|
||||
export type EntrySnapshot = {
|
||||
authorId: string
|
||||
type: string
|
||||
version: number
|
||||
createdAt: Date
|
||||
retractedAt: Date | null
|
||||
minClearance: number
|
||||
}
|
||||
|
||||
export type EditSettings = {
|
||||
entryEditPolicy: EditPolicyName
|
||||
entryEditGraceMinutes: number
|
||||
entryEditMarkGrace: boolean
|
||||
}
|
||||
|
||||
export type EditDecision =
|
||||
| {
|
||||
ok: true
|
||||
/** Begründung Pflicht (mindestens 10 Zeichen)? */
|
||||
reasonRequired: boolean
|
||||
/** Bekommt der Eintrag ein sichtbares „bearbeitet · vN"? */
|
||||
markVisible: boolean
|
||||
withinGrace: boolean
|
||||
}
|
||||
| { ok: false; reason: EditDenial }
|
||||
|
||||
export type EditDenial =
|
||||
| 'system-entry'
|
||||
| 'retracted'
|
||||
| 'append-only'
|
||||
| 'grace-expired'
|
||||
| 'not-author'
|
||||
|
||||
/** Systemeinträge sind von jeder Änderung ausgenommen. */
|
||||
const IMMUTABLE_TYPES = new Set(['SYSTEM', 'STATUS_CHANGE'])
|
||||
|
||||
export function evaluateEntryEdit(
|
||||
p: EffectivePermissions,
|
||||
entry: EntrySnapshot,
|
||||
settings: EditSettings,
|
||||
now: Date = new Date(),
|
||||
): EditDecision {
|
||||
if (IMMUTABLE_TYPES.has(entry.type)) return { ok: false, reason: 'system-entry' }
|
||||
if (entry.retractedAt) return { ok: false, reason: 'retracted' }
|
||||
if (settings.entryEditPolicy === 'APPEND_ONLY') return { ok: false, reason: 'append-only' }
|
||||
|
||||
const isOwn = entry.authorId === p.userId
|
||||
const ageMs = now.getTime() - entry.createdAt.getTime()
|
||||
const withinGrace =
|
||||
settings.entryEditPolicy === 'GRACE_WINDOW' &&
|
||||
isOwn &&
|
||||
ageMs <= settings.entryEditGraceMinutes * 60_000
|
||||
|
||||
// Ab der zweiten Änderung oder bei einem fremden Eintrag ist die Begründung
|
||||
// Pflicht. Sie steht danach in der Historie, die jeder sieht, der den
|
||||
// Eintrag sehen darf.
|
||||
const reasonRequired = entry.version >= 2 || !isOwn
|
||||
|
||||
if (withinGrace) {
|
||||
// Ein Tippfehler, der zwei Minuten nach dem Absenden korrigiert wird, soll
|
||||
// die Akte nicht mit „bearbeitet"-Marken zupflastern. Versioniert und
|
||||
// protokolliert wird trotzdem.
|
||||
return { ok: true, reasonRequired, markVisible: settings.entryEditMarkGrace, withinGrace }
|
||||
}
|
||||
|
||||
const needed = isOwn ? 'entry.edit_own' : 'entry.edit_any'
|
||||
if (!p.isAdmin && !p.permissions.has(needed)) {
|
||||
return { ok: false, reason: isOwn ? 'grace-expired' : 'not-author' }
|
||||
}
|
||||
|
||||
return { ok: true, reasonRequired, markVisible: true, withinGrace: false }
|
||||
}
|
||||
|
||||
/** Zurückziehen und Wiederherstellen hängen beide am Recht `entry.retract`. */
|
||||
export function canRetract(p: EffectivePermissions, entry: EntrySnapshot): boolean {
|
||||
if (IMMUTABLE_TYPES.has(entry.type)) return false
|
||||
return p.isAdmin || p.permissions.has('entry.retract')
|
||||
}
|
||||
@@ -0,0 +1,254 @@
|
||||
import { db } from '@/lib/db'
|
||||
import { writeAudit } from '@/lib/audit'
|
||||
import { visibleEntryWhere } from '@/lib/access/caseFilter'
|
||||
import { canEditCase } from '@/lib/access/caseWrite'
|
||||
import { AccessError } from '@/lib/cases/service'
|
||||
import { canRetract, evaluateEntryEdit, type EditSettings } from '@/lib/cases/entryPolicy'
|
||||
import type { EffectivePermissions } from '@/lib/auth/permissions'
|
||||
|
||||
/**
|
||||
* Nachträgliche Änderungen an Verlaufseinträgen.
|
||||
*
|
||||
* Der Kern von harter Regel 2: geändert werden darf, unsichtbar werden nie.
|
||||
* Jede Änderung schreibt den **vorherigen** Stand nach `CaseEntryVersion` und
|
||||
* erhöht die Versionsnummer. Es gibt kein Löschen, nur Zurückziehen mit
|
||||
* Grabstein. Siehe docs/05-akten-und-vorlagen.md.
|
||||
*/
|
||||
|
||||
const MIN_REASON_LENGTH = 10
|
||||
|
||||
async function loadSettings(): Promise<EditSettings> {
|
||||
const setting = await db.appSetting.findUnique({ where: { id: 1 } })
|
||||
return {
|
||||
entryEditPolicy: (setting?.entryEditPolicy ?? 'GRACE_WINDOW') as EditSettings['entryEditPolicy'],
|
||||
entryEditGraceMinutes: setting?.entryEditGraceMinutes ?? 15,
|
||||
entryEditMarkGrace: setting?.entryEditMarkGrace ?? false,
|
||||
}
|
||||
}
|
||||
|
||||
/** Lädt einen Eintrag, sofern der Nutzer ihn und seine Akte sehen darf. */
|
||||
async function loadVisibleEntry(p: EffectivePermissions, entryId: string) {
|
||||
return db.caseEntry.findFirst({
|
||||
where: { AND: [visibleEntryWhere(p), { id: entryId }] },
|
||||
select: {
|
||||
id: true,
|
||||
caseId: true,
|
||||
type: true,
|
||||
body: true,
|
||||
minClearance: true,
|
||||
authorId: true,
|
||||
createdAt: true,
|
||||
version: true,
|
||||
retractedAt: true,
|
||||
case: { select: { caseNumber: true, status: true, classification: true } },
|
||||
},
|
||||
})
|
||||
}
|
||||
|
||||
/** Ein knapper Diff für das Protokoll, ohne den ganzen Text zu doppeln. */
|
||||
function compactDiff(before: string, after: string) {
|
||||
return {
|
||||
lengthBefore: before.length,
|
||||
lengthAfter: after.length,
|
||||
firstDivergenceAt: (() => {
|
||||
const max = Math.min(before.length, after.length)
|
||||
for (let i = 0; i < max; i++) if (before[i] !== after[i]) return i
|
||||
return before.length === after.length ? -1 : max
|
||||
})(),
|
||||
}
|
||||
}
|
||||
|
||||
export async function editEntry(
|
||||
p: EffectivePermissions,
|
||||
input: { entryId: string; body: string; minClearance?: number; changeReason?: string },
|
||||
): Promise<{ version: number; markVisible: boolean }> {
|
||||
const entry = await loadVisibleEntry(p, input.entryId)
|
||||
if (!entry) throw new AccessError('not-found')
|
||||
|
||||
// Archiviert und versiegelt sind dicht, abgeschlossen braucht ein eigenes Recht.
|
||||
const caseCheck = canEditCase(p, entry.case, 'entry.create')
|
||||
if (!caseCheck.ok) throw new AccessError(caseCheck.reason)
|
||||
|
||||
const settings = await loadSettings()
|
||||
const decision = evaluateEntryEdit(p, entry, settings)
|
||||
if (!decision.ok) throw new AccessError(decision.reason)
|
||||
|
||||
const reason = input.changeReason?.trim() ?? ''
|
||||
if (decision.reasonRequired && reason.length < MIN_REASON_LENGTH) {
|
||||
throw new AccessError('reason-required')
|
||||
}
|
||||
|
||||
const nextClearance = input.minClearance ?? entry.minClearance
|
||||
if (nextClearance !== entry.minClearance) {
|
||||
if (!p.isAdmin && !p.permissions.has('case.edit')) throw new AccessError('no-permission')
|
||||
if (nextClearance > p.clearanceLevel) throw new AccessError('clearance-too-low')
|
||||
}
|
||||
|
||||
const nextVersion = entry.version + 1
|
||||
const closedNote = entry.case.status === 'CLOSED'
|
||||
|
||||
await db.$transaction(async (tx) => {
|
||||
// Der vorherige Stand wandert in die Versionstabelle, bevor der Eintrag
|
||||
// überschrieben wird.
|
||||
await tx.caseEntryVersion.create({
|
||||
data: {
|
||||
entryId: entry.id,
|
||||
version: entry.version,
|
||||
body: entry.body,
|
||||
minClearance: entry.minClearance,
|
||||
changeReason: reason || null,
|
||||
editedById: p.userId,
|
||||
},
|
||||
})
|
||||
|
||||
await tx.caseEntry.update({
|
||||
where: { id: entry.id },
|
||||
data: {
|
||||
body: input.body,
|
||||
minClearance: nextClearance,
|
||||
version: nextVersion,
|
||||
editedAt: new Date(),
|
||||
editedById: p.userId,
|
||||
editVisible: decision.markVisible,
|
||||
},
|
||||
})
|
||||
|
||||
// Umklassifizierung wirkt rückwirkend: sonst liest jemand mit niedrigerer
|
||||
// Stufe den ursprünglichen Text einfach in der Historie. Das ist die
|
||||
// Stelle, an der eine naive Umsetzung leckt.
|
||||
if (nextClearance > entry.minClearance) {
|
||||
await tx.caseEntryVersion.updateMany({
|
||||
where: { entryId: entry.id, minClearance: { lt: nextClearance } },
|
||||
data: { minClearance: nextClearance },
|
||||
})
|
||||
}
|
||||
|
||||
if (closedNote) {
|
||||
await tx.caseEntry.create({
|
||||
data: {
|
||||
id: crypto.randomUUID(),
|
||||
caseId: entry.caseId,
|
||||
type: 'SYSTEM',
|
||||
body: 'Nachträgliche Änderung nach Abschluss',
|
||||
authorId: p.userId,
|
||||
minClearance: 0,
|
||||
},
|
||||
})
|
||||
}
|
||||
|
||||
await writeAudit(tx, {
|
||||
actorId: p.userId,
|
||||
action: 'entry.edit',
|
||||
targetType: 'CaseEntry',
|
||||
targetId: entry.id,
|
||||
clearanceAtTime: p.clearanceLevel,
|
||||
meta: {
|
||||
caseNumber: entry.case.caseNumber,
|
||||
version: nextVersion,
|
||||
reason: reason || undefined,
|
||||
withinGrace: decision.withinGrace,
|
||||
markVisible: decision.markVisible,
|
||||
minClearanceFrom: entry.minClearance,
|
||||
minClearanceTo: nextClearance,
|
||||
diff: compactDiff(entry.body, input.body),
|
||||
},
|
||||
})
|
||||
})
|
||||
|
||||
return { version: nextVersion, markVisible: decision.markVisible }
|
||||
}
|
||||
|
||||
/**
|
||||
* Zurückziehen statt Löschen. Der Eintrag bleibt an seiner Stelle im Verlauf
|
||||
* stehen und zeigt einen Grabstein. Der ursprüngliche Text bleibt in der
|
||||
* Datenbank und ist für Nutzer mit `audit.read` weiterhin lesbar.
|
||||
*/
|
||||
export async function retractEntry(
|
||||
p: EffectivePermissions,
|
||||
input: { entryId: string; reason: string },
|
||||
): Promise<void> {
|
||||
const entry = await loadVisibleEntry(p, input.entryId)
|
||||
if (!entry) throw new AccessError('not-found')
|
||||
|
||||
const caseCheck = canEditCase(p, entry.case, 'entry.create')
|
||||
if (!caseCheck.ok) throw new AccessError(caseCheck.reason)
|
||||
|
||||
if (!canRetract(p, entry)) throw new AccessError('no-permission')
|
||||
if (entry.retractedAt) throw new AccessError('retracted')
|
||||
|
||||
const reason = input.reason.trim()
|
||||
if (reason.length < MIN_REASON_LENGTH) throw new AccessError('reason-required')
|
||||
|
||||
await db.$transaction(async (tx) => {
|
||||
await tx.caseEntry.update({
|
||||
where: { id: entry.id },
|
||||
data: { retractedAt: new Date(), retractedById: p.userId, retractionReason: reason },
|
||||
})
|
||||
|
||||
await writeAudit(tx, {
|
||||
actorId: p.userId,
|
||||
action: 'entry.retract',
|
||||
targetType: 'CaseEntry',
|
||||
targetId: entry.id,
|
||||
clearanceAtTime: p.clearanceLevel,
|
||||
meta: { caseNumber: entry.case.caseNumber, reason },
|
||||
})
|
||||
})
|
||||
}
|
||||
|
||||
/** Zurückziehen lässt sich rückgängig machen, was wiederum protokolliert wird. */
|
||||
export async function restoreEntry(
|
||||
p: EffectivePermissions,
|
||||
input: { entryId: string; reason: string },
|
||||
): Promise<void> {
|
||||
const entry = await loadVisibleEntry(p, input.entryId)
|
||||
if (!entry) throw new AccessError('not-found')
|
||||
|
||||
const caseCheck = canEditCase(p, entry.case, 'entry.create')
|
||||
if (!caseCheck.ok) throw new AccessError(caseCheck.reason)
|
||||
|
||||
if (!canRetract(p, entry)) throw new AccessError('no-permission')
|
||||
if (!entry.retractedAt) throw new AccessError('not-retracted')
|
||||
|
||||
const reason = input.reason.trim()
|
||||
if (reason.length < MIN_REASON_LENGTH) throw new AccessError('reason-required')
|
||||
|
||||
await db.$transaction(async (tx) => {
|
||||
await tx.caseEntry.update({
|
||||
where: { id: entry.id },
|
||||
data: { retractedAt: null, retractedById: null, retractionReason: null },
|
||||
})
|
||||
|
||||
await writeAudit(tx, {
|
||||
actorId: p.userId,
|
||||
action: 'entry.restore',
|
||||
targetType: 'CaseEntry',
|
||||
targetId: entry.id,
|
||||
clearanceAtTime: p.clearanceLevel,
|
||||
meta: { caseNumber: entry.case.caseNumber, reason },
|
||||
})
|
||||
})
|
||||
}
|
||||
|
||||
/**
|
||||
* Änderungsübersicht einer Akte: alle nachträglichen Änderungen am Verlauf,
|
||||
* chronologisch. Sichtbar für alle, die die Akte lesen dürfen — das ist der
|
||||
* ganze Sinn der Sache.
|
||||
*/
|
||||
export async function loadChangeHistory(p: EffectivePermissions, caseId: string) {
|
||||
return db.caseEntryVersion.findMany({
|
||||
where: { entry: { AND: [visibleEntryWhere(p), { caseId }] } },
|
||||
orderBy: [{ editedAt: 'desc' }],
|
||||
take: 200,
|
||||
select: {
|
||||
id: true,
|
||||
entryId: true,
|
||||
version: true,
|
||||
body: true,
|
||||
changeReason: true,
|
||||
editedById: true,
|
||||
editedAt: true,
|
||||
entry: { select: { body: true, version: true, type: true, createdAt: true } },
|
||||
},
|
||||
})
|
||||
}
|
||||
@@ -185,6 +185,20 @@ export const de = {
|
||||
empty: 'Noch kein Vermerk. Ersten Vermerk anlegen.',
|
||||
edited: (v: number) => `bearbeitet · v${v}`,
|
||||
history: 'Änderungsverlauf',
|
||||
edit: 'Bearbeiten',
|
||||
editSave: 'Änderung speichern',
|
||||
retract: 'Zurückziehen',
|
||||
restore: 'Wiederherstellen',
|
||||
retractReason: 'Begründung der Zurücknahme',
|
||||
reasonTooShort: 'Begründung nötig, mindestens 10 Zeichen.',
|
||||
cancel: 'Abbrechen',
|
||||
changesHeading: 'Änderungen an dieser Akte',
|
||||
changesIntro:
|
||||
'Jede nachträgliche Änderung am Verlauf, chronologisch. Sichtbar für alle, die die Akte lesen dürfen.',
|
||||
changesEmpty: 'Bisher wurde nichts nachträglich geändert.',
|
||||
versionLabel: (v: number) => `Fassung ${v}`,
|
||||
before: 'Vorher',
|
||||
after: 'Jetzt',
|
||||
changeReason: 'Begründung',
|
||||
retracted: (date: string, person: string, reason: string) =>
|
||||
`Eintrag zurückgezogen am ${date} durch ${person} · Begründung: ${reason}`,
|
||||
@@ -229,6 +243,23 @@ export const de = {
|
||||
conflict: 'Nicht gespeichert, die Akte wurde zwischenzeitlich geändert. Fassungen vergleichen.',
|
||||
},
|
||||
|
||||
settings: {
|
||||
heading: 'Änderungsrichtlinie',
|
||||
intro:
|
||||
'Regelt, ob und wie lange Verlaufseinträge nachträglich geändert werden dürfen. Gilt für die ganze Abteilung.',
|
||||
policy: 'Richtlinie',
|
||||
graceMinutes: 'Karenzzeit in Minuten',
|
||||
markGrace: 'Auch Änderungen in der Karenzzeit sichtbar markieren',
|
||||
save: 'Richtlinie speichern',
|
||||
saved: 'Richtlinie gespeichert',
|
||||
confirm: 'Änderungsrichtlinie ändern? Das gilt sofort für alle Akten.',
|
||||
policies: {
|
||||
APPEND_ONLY: 'Keine Änderung möglich, nur Korrektureinträge',
|
||||
GRACE_WINDOW: 'Eigene Einträge in der Karenzzeit frei änderbar, danach nur mit Recht',
|
||||
OPEN: 'Jederzeit änderbar, sofern das Recht vorliegt',
|
||||
} as Record<string, string>,
|
||||
},
|
||||
|
||||
health: {
|
||||
heading: 'Systemzustand',
|
||||
service: 'Dienst',
|
||||
|
||||
@@ -0,0 +1,273 @@
|
||||
// @vitest-environment node
|
||||
import { afterAll, beforeAll, beforeEach, describe, expect, it } from 'vitest'
|
||||
import { createPrismaClient, type PrismaClient } from '@afis/db'
|
||||
import type { EffectivePermissions, Permission } from '@/lib/auth/permissions'
|
||||
|
||||
/**
|
||||
* Nachträgliche Änderungen an Verlaufseinträgen, harte Regel 2.
|
||||
* Grundlage: docs/05-akten-und-vorlagen.md.
|
||||
*/
|
||||
const url = process.env.DIRECT_DATABASE_URL ?? process.env.DATABASE_URL
|
||||
const suite = url ? describe : describe.skip
|
||||
|
||||
let db: PrismaClient
|
||||
const marke = `edit-${Date.now()}`
|
||||
const AUTOR = `${marke}-autor`
|
||||
const FREMD = `${marke}-fremd`
|
||||
|
||||
function perms(userId: string, level: number, permissions: Permission[]): EffectivePermissions {
|
||||
return {
|
||||
userId,
|
||||
clearanceLevel: level,
|
||||
permissions: new Set(permissions),
|
||||
isAdmin: false,
|
||||
hasMembership: true,
|
||||
}
|
||||
}
|
||||
|
||||
const BASIS: Permission[] = ['case.create', 'case.edit', 'entry.create']
|
||||
|
||||
let caseId = ''
|
||||
let caseNumber = ''
|
||||
|
||||
suite('Nachträgliche Änderungen am Verlauf', () => {
|
||||
beforeAll(async () => {
|
||||
db = createPrismaClient(url)
|
||||
await db.caseTemplate.create({
|
||||
data: { key: `${marke}-vorlage`, version: 1, name: 'Prüfvorlage', fields: [] },
|
||||
})
|
||||
for (const id of [AUTOR, FREMD]) {
|
||||
await db.user.create({ data: { id, username: id, displayName: id } })
|
||||
}
|
||||
const { createCase } = await import('@/lib/cases/service')
|
||||
const akte = await createCase(perms(AUTOR, 5, BASIS), {
|
||||
title: 'Änderungsprüfung',
|
||||
classification: 1,
|
||||
templateKey: `${marke}-vorlage`,
|
||||
})
|
||||
caseId = akte.id
|
||||
caseNumber = akte.caseNumber
|
||||
})
|
||||
|
||||
afterAll(async () => {
|
||||
// Die Änderungsrichtlinie ist eine einzige Zeile für die ganze Anwendung.
|
||||
// Wer sie im Test umstellt, stellt sie zurück, sonst kippt sie anderen
|
||||
// Testdateien den Auslieferungszustand um.
|
||||
await db.appSetting.update({
|
||||
where: { id: 1 },
|
||||
data: { entryEditPolicy: 'GRACE_WINDOW', entryEditGraceMinutes: 15, entryEditMarkGrace: false },
|
||||
})
|
||||
await db.$disconnect()
|
||||
})
|
||||
|
||||
beforeEach(async () => {
|
||||
await db.appSetting.update({
|
||||
where: { id: 1 },
|
||||
data: { entryEditPolicy: 'GRACE_WINDOW', entryEditGraceMinutes: 15, entryEditMarkGrace: false },
|
||||
})
|
||||
})
|
||||
|
||||
async function neuerEintrag(body: string, minClearance = 0): Promise<string> {
|
||||
const { addEntry } = await import('@/lib/cases/service')
|
||||
const id = crypto.randomUUID()
|
||||
await addEntry(perms(AUTOR, 5, BASIS), { id, caseNumber, body, minClearance })
|
||||
return id
|
||||
}
|
||||
|
||||
it('versioniert eine Änderung und lässt Autor und Entstehungszeit unangetastet', async () => {
|
||||
const { editEntry } = await import('@/lib/cases/entryService')
|
||||
const id = await neuerEintrag('Ursprünglicher Wortlaut')
|
||||
const vorher = await db.caseEntry.findUniqueOrThrow({ where: { id } })
|
||||
|
||||
await editEntry(perms(AUTOR, 5, BASIS), { entryId: id, body: 'Korrigierter Wortlaut' })
|
||||
|
||||
const nachher = await db.caseEntry.findUniqueOrThrow({ where: { id } })
|
||||
expect(nachher.body).toBe('Korrigierter Wortlaut')
|
||||
expect(nachher.version).toBe(2)
|
||||
expect(nachher.authorId).toBe(vorher.authorId)
|
||||
expect(nachher.createdAt.getTime()).toBe(vorher.createdAt.getTime())
|
||||
|
||||
// Der vorherige Stand steht in der Versionstabelle.
|
||||
const versionen = await db.caseEntryVersion.findMany({ where: { entryId: id } })
|
||||
expect(versionen).toHaveLength(1)
|
||||
expect(versionen[0]?.body).toBe('Ursprünglicher Wortlaut')
|
||||
})
|
||||
|
||||
it('markiert eine Änderung in der Karenzzeit nicht sichtbar, protokolliert sie aber', async () => {
|
||||
const { editEntry } = await import('@/lib/cases/entryService')
|
||||
const id = await neuerEintrag('Tipfehler')
|
||||
|
||||
await editEntry(perms(AUTOR, 5, BASIS), { entryId: id, body: 'Tippfehler' })
|
||||
|
||||
const eintrag = await db.caseEntry.findUniqueOrThrow({ where: { id } })
|
||||
expect(eintrag.editVisible).toBe(false)
|
||||
expect(eintrag.editedAt).not.toBeNull()
|
||||
|
||||
const protokoll = await db.auditLog.findFirst({
|
||||
where: { targetId: id, action: 'entry.edit' },
|
||||
orderBy: { at: 'desc' },
|
||||
})
|
||||
expect(protokoll).not.toBeNull()
|
||||
expect(protokoll?.meta).toMatchObject({ withinGrace: true, markVisible: false })
|
||||
})
|
||||
|
||||
it('verlangt nach Ablauf der Karenzzeit das Recht entry.edit_own', async () => {
|
||||
const { editEntry } = await import('@/lib/cases/entryService')
|
||||
const { AccessError } = await import('@/lib/cases/service')
|
||||
const id = await neuerEintrag('Alter Eintrag')
|
||||
|
||||
// Karenzzeit serverseitig auf null setzen — nicht über den Request.
|
||||
await db.appSetting.update({ where: { id: 1 }, data: { entryEditGraceMinutes: 0 } })
|
||||
|
||||
await expect(
|
||||
editEntry(perms(AUTOR, 5, BASIS), {
|
||||
entryId: id,
|
||||
body: 'Zu spät',
|
||||
changeReason: 'Nachträgliche Korrektur des Sachverhalts',
|
||||
}),
|
||||
).rejects.toBeInstanceOf(AccessError)
|
||||
|
||||
// Mit dem Recht geht es, und die Änderung ist sichtbar markiert.
|
||||
await editEntry(perms(AUTOR, 5, [...BASIS, 'entry.edit_own']), {
|
||||
entryId: id,
|
||||
body: 'Zu spät, aber erlaubt',
|
||||
changeReason: 'Nachträgliche Korrektur des Sachverhalts',
|
||||
})
|
||||
const eintrag = await db.caseEntry.findUniqueOrThrow({ where: { id } })
|
||||
expect(eintrag.editVisible).toBe(true)
|
||||
})
|
||||
|
||||
it('lässt einen fremden Eintrag ohne entry.edit_any nicht ändern', async () => {
|
||||
const { editEntry } = await import('@/lib/cases/entryService')
|
||||
const { AccessError } = await import('@/lib/cases/service')
|
||||
const id = await neuerEintrag('Vom Autor geschrieben')
|
||||
|
||||
await expect(
|
||||
editEntry(perms(FREMD, 5, [...BASIS, 'entry.edit_own']), {
|
||||
entryId: id,
|
||||
body: 'Fremdzugriff',
|
||||
changeReason: 'Ich finde das besser so formuliert',
|
||||
}),
|
||||
).rejects.toBeInstanceOf(AccessError)
|
||||
})
|
||||
|
||||
it('verlangt bei einem fremden Eintrag eine Begründung', async () => {
|
||||
const { editEntry } = await import('@/lib/cases/entryService')
|
||||
const { AccessError } = await import('@/lib/cases/service')
|
||||
const id = await neuerEintrag('Vom Autor geschrieben')
|
||||
|
||||
await expect(
|
||||
editEntry(perms(FREMD, 5, [...BASIS, 'entry.edit_any']), { entryId: id, body: 'Ohne Grund' }),
|
||||
).rejects.toBeInstanceOf(AccessError)
|
||||
|
||||
await editEntry(perms(FREMD, 5, [...BASIS, 'entry.edit_any']), {
|
||||
entryId: id,
|
||||
body: 'Mit Grund',
|
||||
changeReason: 'Sachverhalt war falsch wiedergegeben',
|
||||
})
|
||||
const version = await db.caseEntryVersion.findFirstOrThrow({
|
||||
where: { entryId: id },
|
||||
orderBy: { version: 'desc' },
|
||||
})
|
||||
expect(version.changeReason).toBe('Sachverhalt war falsch wiedergegeben')
|
||||
})
|
||||
|
||||
it('lässt einen Systemeintrag nicht ändern', async () => {
|
||||
const { editEntry } = await import('@/lib/cases/entryService')
|
||||
const { AccessError } = await import('@/lib/cases/service')
|
||||
const system = await db.caseEntry.findFirstOrThrow({
|
||||
where: { caseId, type: 'SYSTEM' },
|
||||
})
|
||||
await expect(
|
||||
editEntry(perms(AUTOR, 5, [...BASIS, 'entry.edit_any']), {
|
||||
entryId: system.id,
|
||||
body: 'Umgeschrieben',
|
||||
changeReason: 'Ich will die Historie schönen',
|
||||
}),
|
||||
).rejects.toBeInstanceOf(AccessError)
|
||||
})
|
||||
|
||||
it('zieht die Höherstufung auf alle bestehenden Versionen nach', async () => {
|
||||
// Das ist die Stelle, an der eine naive Umsetzung leckt: sonst liest
|
||||
// jemand mit niedrigerer Stufe den ursprünglichen Text in der Historie.
|
||||
const { editEntry } = await import('@/lib/cases/entryService')
|
||||
const id = await neuerEintrag('Zunächst harmlos', 0)
|
||||
|
||||
await editEntry(perms(AUTOR, 5, [...BASIS, 'entry.edit_own']), {
|
||||
entryId: id,
|
||||
body: 'Immer noch harmlos',
|
||||
changeReason: 'Formulierung geglättet',
|
||||
})
|
||||
|
||||
await editEntry(perms(AUTOR, 5, [...BASIS, 'entry.edit_own']), {
|
||||
entryId: id,
|
||||
body: 'Jetzt vertraulich',
|
||||
minClearance: 4,
|
||||
changeReason: 'Enthält den Namen eines Zeugen',
|
||||
})
|
||||
|
||||
const versionen = await db.caseEntryVersion.findMany({ where: { entryId: id } })
|
||||
expect(versionen.length).toBeGreaterThanOrEqual(2)
|
||||
for (const version of versionen) {
|
||||
expect(version.minClearance).toBe(4)
|
||||
}
|
||||
|
||||
// Gegenprobe über die Sichtbarkeitsabfrage: Stufe 1 findet nichts davon.
|
||||
const { visibleEntryWhere } = await import('@/lib/access/caseFilter')
|
||||
const sichtbar = await db.caseEntry.findMany({
|
||||
where: { AND: [visibleEntryWhere(perms('wer-auch-immer', 1, [])), { id }] },
|
||||
})
|
||||
expect(sichtbar).toHaveLength(0)
|
||||
})
|
||||
|
||||
it('zieht einen Eintrag mit Grabstein zurück und stellt ihn wieder her', async () => {
|
||||
const { retractEntry, restoreEntry } = await import('@/lib/cases/entryService')
|
||||
const { AccessError } = await import('@/lib/cases/service')
|
||||
const id = await neuerEintrag('Gehört in einen anderen Fall')
|
||||
|
||||
await expect(
|
||||
retractEntry(perms(AUTOR, 5, BASIS), { entryId: id, reason: 'Falscher Fall' }),
|
||||
).rejects.toBeInstanceOf(AccessError)
|
||||
|
||||
await retractEntry(perms(AUTOR, 5, [...BASIS, 'entry.retract']), {
|
||||
entryId: id,
|
||||
reason: 'Gehört in den Fall AfiS-2026-0002',
|
||||
})
|
||||
|
||||
const zurueckgezogen = await db.caseEntry.findUniqueOrThrow({ where: { id } })
|
||||
expect(zurueckgezogen.retractedAt).not.toBeNull()
|
||||
expect(zurueckgezogen.retractionReason).toContain('AfiS-2026-0002')
|
||||
// Der ursprüngliche Text bleibt in der Datenbank stehen.
|
||||
expect(zurueckgezogen.body).toBe('Gehört in einen anderen Fall')
|
||||
|
||||
await restoreEntry(perms(AUTOR, 5, [...BASIS, 'entry.retract']), {
|
||||
entryId: id,
|
||||
reason: 'Zurückziehen war ein Versehen',
|
||||
})
|
||||
const wiederhergestellt = await db.caseEntry.findUniqueOrThrow({ where: { id } })
|
||||
expect(wiederhergestellt.retractedAt).toBeNull()
|
||||
|
||||
const aktionen = await db.auditLog.findMany({
|
||||
where: { targetId: id },
|
||||
orderBy: { at: 'asc' },
|
||||
select: { action: true },
|
||||
})
|
||||
expect(aktionen.map((a) => a.action)).toContain('entry.retract')
|
||||
expect(aktionen.map((a) => a.action)).toContain('entry.restore')
|
||||
})
|
||||
|
||||
it('lässt bei APPEND_ONLY gar keine Änderung zu', async () => {
|
||||
const { editEntry } = await import('@/lib/cases/entryService')
|
||||
const { AccessError } = await import('@/lib/cases/service')
|
||||
const id = await neuerEintrag('Unveränderlich')
|
||||
await db.appSetting.update({ where: { id: 1 }, data: { entryEditPolicy: 'APPEND_ONLY' } })
|
||||
|
||||
await expect(
|
||||
editEntry(perms(AUTOR, 5, [...BASIS, 'entry.edit_own', 'entry.edit_any']), {
|
||||
entryId: id,
|
||||
body: 'Doch geändert',
|
||||
changeReason: 'Sollte nicht durchgehen',
|
||||
}),
|
||||
).rejects.toBeInstanceOf(AccessError)
|
||||
})
|
||||
})
|
||||
@@ -9,5 +9,9 @@ export default defineConfig({
|
||||
globals: true,
|
||||
include: ['tests/**/*.test.{ts,tsx}'],
|
||||
setupFiles: ['./tests/setup.ts'],
|
||||
// Mehrere Testdateien arbeiten gegen dieselbe Datenbank, und AppSetting ist
|
||||
// eine einzige Zeile für die ganze Anwendung. Parallel laufende Dateien
|
||||
// würden sich gegenseitig die Änderungsrichtlinie umstellen.
|
||||
fileParallelism: false,
|
||||
},
|
||||
})
|
||||
|
||||
Reference in New Issue
Block a user