Kundengrenze: auch closed → suspended prüfen, Zustand unter Sperre lesen (#116)
Codex-Repro: bei voller Grenze ließ PATCH {status: suspended} einen
beendeten Kunden wieder zählen (200 statt 403), weil nur closed → active
geprüft wurde und der Ausgangszustand vor der Transaktion gelesen wurde.
Jetzt: jeder Wechsel aus closed in einen zählenden Zustand prüft die
Grenze unter der Kapazitätssperre; der aktuelle Zustand wird FOR UPDATE
gelesen. Test: beide Wechsel 403, active↔suspended erlaubt, zwei parallele
Reaktivierungen bei einem freien Platz → genau eine. Ohne Fix rot.
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
This commit is contained in:
parent
61e8555199
commit
7b6a56bb9f
2 changed files with 34 additions and 2 deletions
|
|
@ -165,9 +165,13 @@ export const customersModule: KcModule = {
|
|||
if (type === 'private' && (after.company || after.vatId)) throw badRequest('Privatkunden haben keine Firma und keine USt-IdNr. Bitte beides entfernen.', 'PRIVATE_NO_COMPANY');
|
||||
if (type === 'business') { if (!(after.company || name)) throw badRequest('Geschäftskunden benötigen einen Firmennamen', 'BUSINESS_NEEDS_COMPANY'); applyTypeRules('business', name, { vatId: after.vatId ?? undefined }); }
|
||||
await tx(async (c) => {
|
||||
if (b.status === 'active' && before.status === 'closed') {
|
||||
// Jeder Wechsel von "closed" in einen zählenden Zustand (active ODER suspended) belegt wieder einen Platz der
|
||||
// Kundengrenze. Erst die Kapazitätssperre, dann den aktuellen Zustand unter Zeilensperre lesen – nicht den vor der
|
||||
// Transaktion gelesenen (ein paralleler Aufruf könnte ihn inzwischen geändert haben).
|
||||
if (b.status && b.status !== 'closed') {
|
||||
const cap = await assertCustomerCapacity(c);
|
||||
if (!cap.allowed) throw forbidden(cap.reason!, 'CUSTOMER_LIMIT_REACHED');
|
||||
const cur = await one('SELECT status FROM organizations WHERE id = ? FOR UPDATE', [id], c);
|
||||
if (cur?.status === 'closed' && !cap.allowed) throw forbidden(cap.reason!, 'CUSTOMER_LIMIT_REACHED');
|
||||
}
|
||||
if (b.name || b.status || b.customerType) await run('UPDATE organizations SET name = COALESCE(?, name), status = COALESCE(?, status), customer_type = COALESCE(?, customer_type) WHERE id = ?', [b.name ?? null, b.status ?? null, b.customerType ?? null, id], c);
|
||||
const keys = Object.keys(patch);
|
||||
|
|
|
|||
|
|
@ -95,3 +95,31 @@ describe('Lizenzantwort: Signatur ist Pflicht, Werte nur aus dem signierten Payl
|
|||
await expect(checkLicenseNow()).rejects.toThrow(/Serverzeit/);
|
||||
});
|
||||
});
|
||||
|
||||
describe('Kundengrenze bei Statuswechseln (#116, Codex-Repro)', () => {
|
||||
it('closed → active und closed → suspended prüfen die Grenze; zählende Wechsel untereinander nicht', async () => {
|
||||
const admin = await staff('capstat-admin@example.com', 'superadmin');
|
||||
const mk = async (n: string) => (await call(app, admin, 'POST', '/admin/customers', { type: 'business', name: n, owner: { email: `${n.replace(/\s/g, '').toLowerCase()}@example.com`, name: n } })).json().id as string;
|
||||
const x = await mk('Stat X'); const y = await mk('Stat Y');
|
||||
await call(app, admin, 'PATCH', `/admin/customers/${x}`, { status: 'closed' });
|
||||
const n = Number((await one("SELECT COUNT(*) AS n FROM organizations WHERE status IN ('active','suspended')"))!.n);
|
||||
setTestEdition({ mode: 'licensed', features: [], customerLimit: n, staffLimit: null, reason: 'test' }); // voll belegt
|
||||
try {
|
||||
for (const to of ['suspended', 'active'] as const) {
|
||||
const r = await call(app, admin, 'PATCH', `/admin/customers/${x}`, { status: to });
|
||||
expect(r.statusCode).toBe(403); expect(r.json().error.code).toBe('CUSTOMER_LIMIT_REACHED');
|
||||
}
|
||||
expect((await one('SELECT status FROM organizations WHERE id = ?', [x]))!.status).toBe('closed');
|
||||
expect(Number((await one("SELECT COUNT(*) AS n FROM organizations WHERE status IN ('active','suspended')"))!.n)).toBe(n);
|
||||
// active ↔ suspended belegt keinen neuen Platz und bleibt erlaubt
|
||||
expect((await call(app, admin, 'PATCH', `/admin/customers/${y}`, { status: 'suspended' })).statusCode).toBe(200);
|
||||
expect((await call(app, admin, 'PATCH', `/admin/customers/${y}`, { status: 'active' })).statusCode).toBe(200);
|
||||
// parallel: zwei closed-Kunden, ein freier Platz → genau einer wird reaktiviert
|
||||
await call(app, admin, 'PATCH', `/admin/customers/${y}`, { status: 'closed' });
|
||||
setTestEdition({ mode: 'licensed', features: [], customerLimit: n, staffLimit: null, reason: 'test' });
|
||||
const res = await Promise.all([call(app, admin, 'PATCH', `/admin/customers/${x}`, { status: 'suspended' }), call(app, admin, 'PATCH', `/admin/customers/${y}`, { status: 'active' })]);
|
||||
expect(res.map((r) => r.statusCode).sort()).toEqual([200, 403]);
|
||||
expect(Number((await one("SELECT COUNT(*) AS n FROM organizations WHERE status IN ('active','suspended')"))!.n)).toBe(n);
|
||||
} finally { setTestEdition(null); }
|
||||
});
|
||||
});
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue