## S-10c · Close the ZGW zaak on document-timeout expiry (closes #106) Completes the S-10a/S-10b boundary flagged in ADR-0017: when a registration's 30-day document term lapses, the domain now cancels the **ZGW zaak** as well as marking the aggregate `Verlopen`, so OpenZaak and the register no longer diverge. ### What it does On expiry the `ExpireRegistrationWorker` calls the ACL to set the zaak to a distinct, non-terminal **`Geannuleerd`** status with a **`Vervallen`** resultaat (vs the approval `Afgehandeld` + `Geregistreerd`), resolved **by omschrijving** in the ACL — the ACL-first ordering mirrors approval so a failed ZGW call leaves the job for redelivery rather than diverging the two. **Path:** Flowable P30D timer → `RegistratieVerlopen` job → domain `ExpireRegistrationWorker` → ACL `POST /annuleringen` → ZGW `resultaten` + `statussen` (Geannuleerd) → aggregate `Verlopen`. ### Layers touched (each red→green) - **ACL gateway** — `SetZaakToCancellationStatusAsync` (Geannuleerd + Vervallen by name); approval now resolves its `Geregistreerd` resultaat by name too (a second resultaattype now exists). - **ACL service/API** — `AclService.CancelZaakAsync` + `POST /annuleringen`. - **Domain** — `IAclClient.CancelZaakAsync` + client; expiry worker cancels the zaak before advancing to `Verlopen`, guarded against redelivery double-cancel. - **Seed** — non-terminal `Geannuleerd` statustype (volgnummer 2; `Afgehandeld` → 3) + `Vervallen` resultaattype, both idempotent by omschrijving and sharing the zaaktype's procestype. - **Verify/integration** — ACL↔OpenZaak integration test (live `Geannuleerd` + resultaat); `run-domain-check.sh` fires the real P30D timer and asserts the zaak reaches `Geannuleerd` end-to-end; BDD scenario asserts cancel-on-timeout vs untouched-when-in-time. - **Docs** — ADR-0019 (cancellation modelling decision), demo-script, BACKLOG. ### Design note (ADR-0019) ZGW allows only one eindstatus per zaaktype, so `Geannuleerd` is modelled as a **non-terminal** status (it records a cancellation status + resultaat but does not set `einddatum`). This follows the issue's explicit "distinct statustype + resultaat" outcome; the shared-eindstatus alternative is recorded in the ADR. ### Tests Unit + acceptance all green locally (Acl 38, Big 134, Acceptance 17, Bff 33, EventSubscriber 19). Integration + verify-stack run in CI (need live OpenZaak + selectielijst egress). 🤖 Generated with [Claude Code](https://claude.com/claude-code) Reviewed-on: #109
223 lines
9.0 KiB
C#
223 lines
9.0 KiB
C#
using Acl.Application;
|
|
|
|
namespace Acl.Tests;
|
|
|
|
public class AclServiceTests
|
|
{
|
|
private sealed class FakeGateway : IZaakGateway
|
|
{
|
|
public ZaakRequest? Captured;
|
|
public Uri Result { get; } = new("http://openzaak/zaken/api/v1/zaken/abc");
|
|
|
|
public (Uri Zaak, Uri Zaaktype, DateOnly Datum)? Approved;
|
|
|
|
public Task<Uri> OpenZaakAsync(ZaakRequest request, CancellationToken ct = default)
|
|
{
|
|
Captured = request;
|
|
return Task.FromResult(Result);
|
|
}
|
|
|
|
public Task SetZaakToEindstatusAsync(Uri zaakUrl, Uri zaaktypeUrl, DateOnly datumStatusGezet, CancellationToken ct = default)
|
|
{
|
|
Approved = (zaakUrl, zaaktypeUrl, datumStatusGezet);
|
|
return Task.CompletedTask;
|
|
}
|
|
|
|
public (Uri Zaak, Uri Zaaktype, DateOnly Datum)? Cancelled;
|
|
|
|
public Task SetZaakToCancellationStatusAsync(Uri zaakUrl, Uri zaaktypeUrl, DateOnly datumStatusGezet, CancellationToken ct = default)
|
|
{
|
|
Cancelled = (zaakUrl, zaaktypeUrl, datumStatusGezet);
|
|
return Task.CompletedTask;
|
|
}
|
|
|
|
public Uri? ReadReferenceFor;
|
|
|
|
public Task<string> GetZaakIdentificatieAsync(Uri zaakUrl, CancellationToken ct = default)
|
|
{
|
|
ReadReferenceFor = zaakUrl;
|
|
return Task.FromResult("REG-FROM-ZAAK");
|
|
}
|
|
|
|
public DocumentRequest? StoredDocument;
|
|
public Uri DocumentResult { get; } = new("http://openzaak/documenten/api/v1/enkelvoudiginformatieobjecten/doc-1");
|
|
|
|
public Task<Uri> StoreDocumentAsync(DocumentRequest request, CancellationToken ct = default)
|
|
{
|
|
StoredDocument = request;
|
|
return Task.FromResult(DocumentResult);
|
|
}
|
|
}
|
|
|
|
private static AclDefaults Defaults() => new()
|
|
{
|
|
Bronorganisatie = "517439943",
|
|
VerantwoordelijkeOrganisatie = "517439943",
|
|
Vertrouwelijkheidaanduiding = "openbaar",
|
|
ZaaktypeUrl = new("http://openzaak/catalogi/api/v1/zaaktypen/big"),
|
|
InformatieobjecttypeUrl = new("http://openzaak/catalogi/api/v1/informatieobjecttypen/dip"),
|
|
};
|
|
|
|
private sealed class FixedClock(DateOnly today) : IClock
|
|
{
|
|
public DateOnly Today { get; } = today;
|
|
}
|
|
|
|
[Fact]
|
|
public async Task Opening_a_zaak_default_fills_zgw_fields_and_returns_the_zaak_url()
|
|
{
|
|
var gateway = new FakeGateway();
|
|
var defaults = new AclDefaults
|
|
{
|
|
Bronorganisatie = "517439943",
|
|
VerantwoordelijkeOrganisatie = "517439943",
|
|
Vertrouwelijkheidaanduiding = "openbaar",
|
|
ZaaktypeUrl = new("http://openzaak/catalogi/api/v1/zaaktypen/big"),
|
|
InformatieobjecttypeUrl = new("http://openzaak/catalogi/api/v1/informatieobjecttypen/dip"),
|
|
};
|
|
var service = new AclService(gateway, defaults, new FixedClock(new DateOnly(2026, 6, 4)));
|
|
|
|
var url = await service.OpenZaakAsync(new DomainRegistration("123456782", "reg-77"));
|
|
|
|
Assert.Equal(gateway.Result, url);
|
|
var req = Assert.IsType<ZaakRequest>(gateway.Captured);
|
|
Assert.Equal("517439943", req.Bronorganisatie);
|
|
Assert.Equal("517439943", req.VerantwoordelijkeOrganisatie);
|
|
Assert.Equal("openbaar", req.Vertrouwelijkheidaanduiding);
|
|
Assert.Equal(defaults.ZaaktypeUrl, req.Zaaktype);
|
|
Assert.Equal(new DateOnly(2026, 6, 4), req.Startdatum);
|
|
// The registration reference becomes the zaak identificatie (#78).
|
|
Assert.Equal("reg-77", req.Identificatie);
|
|
}
|
|
|
|
[Fact]
|
|
public async Task Rejects_a_null_registration_without_calling_the_gateway()
|
|
{
|
|
var gateway = new FakeGateway();
|
|
var defaults = new AclDefaults
|
|
{
|
|
Bronorganisatie = "517439943",
|
|
VerantwoordelijkeOrganisatie = "517439943",
|
|
Vertrouwelijkheidaanduiding = "openbaar",
|
|
ZaaktypeUrl = new("http://openzaak/catalogi/api/v1/zaaktypen/big"),
|
|
InformatieobjecttypeUrl = new("http://openzaak/catalogi/api/v1/informatieobjecttypen/dip"),
|
|
};
|
|
var service = new AclService(gateway, defaults, new FixedClock(new DateOnly(2026, 6, 4)));
|
|
|
|
await Assert.ThrowsAsync<ArgumentNullException>(() => service.OpenZaakAsync(null!));
|
|
Assert.Null(gateway.Captured);
|
|
}
|
|
|
|
[Fact]
|
|
public async Task Approving_a_zaak_sets_it_to_its_zaaktypes_eindstatus_dated_today()
|
|
{
|
|
var gateway = new FakeGateway();
|
|
var defaults = Defaults();
|
|
var service = new AclService(gateway, defaults, new FixedClock(new DateOnly(2026, 6, 4)));
|
|
var zaak = new Uri("http://openzaak/zaken/api/v1/zaken/abc");
|
|
|
|
await service.ApproveZaakAsync(zaak);
|
|
|
|
Assert.NotNull(gateway.Approved);
|
|
Assert.Equal(zaak, gateway.Approved!.Value.Zaak);
|
|
Assert.Equal(defaults.ZaaktypeUrl, gateway.Approved.Value.Zaaktype);
|
|
Assert.Equal(new DateOnly(2026, 6, 4), gateway.Approved.Value.Datum);
|
|
}
|
|
|
|
[Fact]
|
|
public async Task Approving_a_null_zaak_is_rejected_without_touching_the_gateway()
|
|
{
|
|
var gateway = new FakeGateway();
|
|
var service = new AclService(gateway, Defaults(), new FixedClock(new DateOnly(2026, 6, 4)));
|
|
|
|
await Assert.ThrowsAsync<ArgumentNullException>(() => service.ApproveZaakAsync(null!));
|
|
Assert.Null(gateway.Approved);
|
|
}
|
|
|
|
[Fact]
|
|
public async Task Cancelling_a_zaak_sets_it_to_the_cancellation_status_dated_today()
|
|
{
|
|
var gateway = new FakeGateway();
|
|
var defaults = Defaults();
|
|
var service = new AclService(gateway, defaults, new FixedClock(new DateOnly(2026, 6, 4)));
|
|
var zaak = new Uri("http://openzaak/zaken/api/v1/zaken/abc");
|
|
|
|
await service.CancelZaakAsync(zaak);
|
|
|
|
Assert.NotNull(gateway.Cancelled);
|
|
Assert.Equal(zaak, gateway.Cancelled!.Value.Zaak);
|
|
Assert.Equal(defaults.ZaaktypeUrl, gateway.Cancelled.Value.Zaaktype);
|
|
Assert.Equal(new DateOnly(2026, 6, 4), gateway.Cancelled.Value.Datum);
|
|
// Cancellation must not touch the approval path.
|
|
Assert.Null(gateway.Approved);
|
|
}
|
|
|
|
[Fact]
|
|
public async Task Cancelling_a_null_zaak_is_rejected_without_touching_the_gateway()
|
|
{
|
|
var gateway = new FakeGateway();
|
|
var service = new AclService(gateway, Defaults(), new FixedClock(new DateOnly(2026, 6, 4)));
|
|
|
|
await Assert.ThrowsAsync<ArgumentNullException>(() => service.CancelZaakAsync(null!));
|
|
Assert.Null(gateway.Cancelled);
|
|
}
|
|
|
|
[Fact]
|
|
public async Task Storing_a_diploma_default_fills_the_document_fields_and_returns_its_url()
|
|
{
|
|
var gateway = new FakeGateway();
|
|
var defaults = Defaults();
|
|
var service = new AclService(gateway, defaults, new FixedClock(new DateOnly(2026, 6, 4)));
|
|
var zaak = new Uri("http://openzaak/zaken/api/v1/zaken/abc");
|
|
|
|
var url = await service.StoreDiplomaAsync(zaak, [1, 2, 3], "diploma.pdf", "application/pdf");
|
|
|
|
Assert.Equal(gateway.DocumentResult, url);
|
|
var req = gateway.StoredDocument!;
|
|
Assert.Equal(zaak, req.Zaak);
|
|
Assert.Equal(defaults.InformatieobjecttypeUrl, req.Informatieobjecttype);
|
|
Assert.Equal("517439943", req.Bronorganisatie);
|
|
Assert.Equal("openbaar", req.Vertrouwelijkheidaanduiding);
|
|
Assert.Equal(new DateOnly(2026, 6, 4), req.Creatiedatum);
|
|
Assert.Equal("nld", req.Taal);
|
|
Assert.Equal("diploma.pdf", req.Bestandsnaam);
|
|
Assert.Equal("application/pdf", req.Formaat);
|
|
Assert.Equal(new byte[] { 1, 2, 3 }, req.Inhoud);
|
|
}
|
|
|
|
[Fact]
|
|
public async Task Storing_a_diploma_rejects_null_or_blank_arguments()
|
|
{
|
|
var service = new AclService(new FakeGateway(), Defaults(), new FixedClock(new DateOnly(2026, 6, 4)));
|
|
var zaak = new Uri("http://openzaak/zaken/api/v1/zaken/abc");
|
|
|
|
await Assert.ThrowsAsync<ArgumentNullException>(() => service.StoreDiplomaAsync(null!, [1], "d.pdf", "application/pdf"));
|
|
await Assert.ThrowsAsync<ArgumentNullException>(() => service.StoreDiplomaAsync(zaak, null!, "d.pdf", "application/pdf"));
|
|
await Assert.ThrowsAnyAsync<ArgumentException>(() => service.StoreDiplomaAsync(zaak, [1], " ", "application/pdf"));
|
|
await Assert.ThrowsAnyAsync<ArgumentException>(() => service.StoreDiplomaAsync(zaak, [1], "d.pdf", " "));
|
|
}
|
|
|
|
[Fact]
|
|
public async Task Reading_a_zaak_reference_returns_the_zaaks_identificatie()
|
|
{
|
|
var gateway = new FakeGateway();
|
|
var service = new AclService(gateway, Defaults(), new FixedClock(new DateOnly(2026, 6, 4)));
|
|
var zaak = new Uri("http://openzaak/zaken/api/v1/zaken/abc");
|
|
|
|
var reference = await service.GetZaakReferenceAsync(zaak);
|
|
|
|
Assert.Equal("REG-FROM-ZAAK", reference);
|
|
Assert.Equal(zaak, gateway.ReadReferenceFor);
|
|
}
|
|
|
|
[Fact]
|
|
public async Task Reading_a_null_zaak_reference_is_rejected()
|
|
{
|
|
var gateway = new FakeGateway();
|
|
var service = new AclService(gateway, Defaults(), new FixedClock(new DateOnly(2026, 6, 4)));
|
|
|
|
await Assert.ThrowsAsync<ArgumentNullException>(() => service.GetZaakReferenceAsync(null!));
|
|
Assert.Null(gateway.ReadReferenceFor);
|
|
}
|
|
}
|