diff --git a/services/domain/Big.Application/ExpireRegistrationWorker.cs b/services/domain/Big.Application/ExpireRegistrationWorker.cs index 05f8b94..a1acc28 100644 --- a/services/domain/Big.Application/ExpireRegistrationWorker.cs +++ b/services/domain/Big.Application/ExpireRegistrationWorker.cs @@ -9,7 +9,7 @@ namespace Big.Application; /// nothing of Flowable. The polling loop that feeds it jobs lives in Infrastructure. Mirrors /// . /// -public sealed class ExpireRegistrationWorker(IRegistrationStore store) +public sealed class ExpireRegistrationWorker(IRegistrationStore store, IAclClient acl) { /// /// Process the job. Idempotent and tolerant of races (§8.6, at-least-once delivery): a job whose diff --git a/services/domain/Big.Application/Ports.cs b/services/domain/Big.Application/Ports.cs index 9d2c5e7..1a88018 100644 --- a/services/domain/Big.Application/Ports.cs +++ b/services/domain/Big.Application/Ports.cs @@ -59,6 +59,12 @@ public interface IAclClient /// zaak (§8.1). Returns the stored document's URL. /// Task StoreDiplomaAsync(Uri zaakUrl, byte[] content, string fileName, string contentType, CancellationToken ct = default); + + /// + /// Cancel the zaak on document-timeout expiry (S-10c): the 30-day document term lapsed, so the ACL + /// translates this to the ZGW cancellation status/resultaat. The domain never names statustypen. + /// + Task CancelZaakAsync(Uri zaakUrl, CancellationToken ct = default); } /// diff --git a/services/domain/Big.Infrastructure/AclHttpClient.cs b/services/domain/Big.Infrastructure/AclHttpClient.cs index 22c235c..0d387ef 100644 --- a/services/domain/Big.Infrastructure/AclHttpClient.cs +++ b/services/domain/Big.Infrastructure/AclHttpClient.cs @@ -31,6 +31,15 @@ public sealed class AclHttpClient(HttpClient http, AclOptions options) : IAclCli response.EnsureSuccessStatusCode(); } + public async Task CancelZaakAsync(Uri zaakUrl, CancellationToken ct = default) + { + ArgumentNullException.ThrowIfNull(zaakUrl); + + using var response = await http.PostAsJsonAsync( + new Uri(options.BaseUrl, "annuleringen"), new CancelZaakRequest(zaakUrl.ToString()), ct); + response.EnsureSuccessStatusCode(); + } + public async Task StoreDiplomaAsync(Uri zaakUrl, byte[] content, string fileName, string contentType, CancellationToken ct = default) { ArgumentNullException.ThrowIfNull(zaakUrl); @@ -56,6 +65,8 @@ public sealed class AclHttpClient(HttpClient http, AclOptions options) : IAclCli private sealed record SetStatusRequest([property: JsonPropertyName("zaakUrl")] string ZaakUrl); + private sealed record CancelZaakRequest([property: JsonPropertyName("zaakUrl")] string ZaakUrl); + private sealed record StoreDocumentRequest( [property: JsonPropertyName("zaakUrl")] string ZaakUrl, [property: JsonPropertyName("contentBase64")] string ContentBase64, diff --git a/services/domain/Big.Tests/ExpireRegistrationWorkerTests.cs b/services/domain/Big.Tests/ExpireRegistrationWorkerTests.cs index dafc963..e9b4379 100644 --- a/services/domain/Big.Tests/ExpireRegistrationWorkerTests.cs +++ b/services/domain/Big.Tests/ExpireRegistrationWorkerTests.cs @@ -10,10 +10,13 @@ public class ExpireRegistrationWorkerTests { private const string Bsn = "123456782"; - private static Registration Submitted(string processInstanceId = "proc-1") + // By the time the 30-day document timer fires, the zaak was opened long ago (OpenZaakAanmaken runs + // early in the flow), so a timed-out registration carries a zaak the worker can cancel. + private static Registration Submitted(string processInstanceId = "proc-1", Uri? zaakUrl = null) { var registration = Registration.Submit(Bsn); registration.RecordProcessStarted(processInstanceId); + registration.AttachZaak(zaakUrl ?? FakeAclClient.DefaultZaakUrl); return registration; } @@ -24,7 +27,7 @@ public class ExpireRegistrationWorkerTests var registration = Submitted(); store.Seed(registration); - await new ExpireRegistrationWorker(store).HandleAsync( + await new ExpireRegistrationWorker(store, new FakeAclClient()).HandleAsync( new RegistratieVerlopenJob("job-7", registration.Id)); var saved = await store.GetAsync(registration.Id); @@ -33,37 +36,60 @@ public class ExpireRegistrationWorkerTests } [Fact] - public async Task An_already_verlopen_registration_is_not_persisted_again() + public async Task Cancels_the_zaak_via_the_acl_when_expiring_a_still_open_registration() { - // A redelivered job (§8.6) finds the aggregate already VERLOPEN: a no-op, not saved again. + // S-10c: expiring the aggregate is not enough — the ZGW zaak must also be set to its + // cancellation status, which the ACL owns (§8.1). The worker hands the ACL the zaak URL. + var store = new FakeRegistrationStore(); + var zaak = new Uri("http://openzaak/zaken/api/v1/zaken/timed-out"); + var registration = Submitted(zaakUrl: zaak); + store.Seed(registration); + var acl = new FakeAclClient(); + + await new ExpireRegistrationWorker(store, acl).HandleAsync( + new RegistratieVerlopenJob("job-7", registration.Id)); + + Assert.Equal(1, acl.CancelCallCount); + Assert.Equal(zaak, acl.CancelledZaakUrl); + } + + [Fact] + public async Task An_already_verlopen_registration_is_not_persisted_again_and_the_zaak_is_not_recancelled() + { + // A redelivered job (§8.6) finds the aggregate already VERLOPEN: a no-op, not saved again — and + // the ACL is not asked to cancel the zaak a second time (posting a second resultaat would 400). var store = new FakeRegistrationStore(); var registration = Submitted(); registration.Expire(); store.Seed(registration); + var acl = new FakeAclClient(); - await new ExpireRegistrationWorker(store).HandleAsync( + await new ExpireRegistrationWorker(store, acl).HandleAsync( new RegistratieVerlopenJob("job-7", registration.Id)); Assert.Equal(0, store.SaveCount); + Assert.Equal(0, acl.CancelCallCount); Assert.Equal(RegistrationStatus.Verlopen, (await store.GetAsync(registration.Id))!.Status); } [Fact] - public async Task An_already_resolved_registration_is_left_alone_and_the_job_completes() + public async Task An_already_resolved_registration_is_left_alone_and_the_zaak_is_not_cancelled() { // Race with S-11: the citizen withdrew while parked at WachtOpDocumenten, so the aggregate is // already terminal (INGETROKKEN) when the timer's job arrives. Expiring it would violate the // aggregate's invariant; the worker must instead no-op (and let the job complete), not throw - // into a redelivery loop. + // into a redelivery loop — and it must not cancel the zaak of a registration it didn't expire. var store = new FakeRegistrationStore(); var registration = Submitted(); registration.Withdraw(); store.Seed(registration); + var acl = new FakeAclClient(); - await new ExpireRegistrationWorker(store).HandleAsync( + await new ExpireRegistrationWorker(store, acl).HandleAsync( new RegistratieVerlopenJob("job-7", registration.Id)); Assert.Equal(0, store.SaveCount); + Assert.Equal(0, acl.CancelCallCount); Assert.Equal(RegistrationStatus.Ingetrokken, (await store.GetAsync(registration.Id))!.Status); } @@ -73,12 +99,12 @@ public class ExpireRegistrationWorkerTests var store = new FakeRegistrationStore(); await Assert.ThrowsAsync(() => - new ExpireRegistrationWorker(store).HandleAsync( + new ExpireRegistrationWorker(store, new FakeAclClient()).HandleAsync( new RegistratieVerlopenJob("job-7", RegistrationId.New()))); } [Fact] public async Task Rejects_a_null_job() => await Assert.ThrowsAsync(() => - new ExpireRegistrationWorker(new FakeRegistrationStore()).HandleAsync(null!)); + new ExpireRegistrationWorker(new FakeRegistrationStore(), new FakeAclClient()).HandleAsync(null!)); } diff --git a/services/domain/Big.Tests/Fakes.cs b/services/domain/Big.Tests/Fakes.cs index ef539ef..de2a029 100644 --- a/services/domain/Big.Tests/Fakes.cs +++ b/services/domain/Big.Tests/Fakes.cs @@ -119,4 +119,14 @@ internal sealed class FakeAclClient(Uri? zaakUrl = null) : IAclClient StoredDiploma = (zaakUrl, content, fileName, contentType); return Task.FromResult(DefaultDocumentUrl); } + + public Uri? CancelledZaakUrl { get; private set; } + public int CancelCallCount { get; private set; } + + public Task CancelZaakAsync(Uri zaakUrl, CancellationToken ct = default) + { + CancelCallCount++; + CancelledZaakUrl = zaakUrl; + return Task.CompletedTask; + } } diff --git a/services/domain/Big.Tests/RegistratieVerlopenProcessorTests.cs b/services/domain/Big.Tests/RegistratieVerlopenProcessorTests.cs index e13c950..5efcd57 100644 --- a/services/domain/Big.Tests/RegistratieVerlopenProcessorTests.cs +++ b/services/domain/Big.Tests/RegistratieVerlopenProcessorTests.cs @@ -30,7 +30,7 @@ public class RegistratieVerlopenProcessorTests } } - private static ExpireRegistrationWorker Worker(FakeRegistrationStore store) => new(store); + private static ExpireRegistrationWorker Worker(FakeRegistrationStore store) => new(store, new FakeAclClient()); [Fact] public async Task Acquires_a_job_expires_the_registration_and_completes_the_job() diff --git a/tests/acceptance/Support/InMemoryDomainPorts.cs b/tests/acceptance/Support/InMemoryDomainPorts.cs index c63b05e..0400d19 100644 --- a/tests/acceptance/Support/InMemoryDomainPorts.cs +++ b/tests/acceptance/Support/InMemoryDomainPorts.cs @@ -60,6 +60,14 @@ public sealed class InMemoryAclClient : IAclClient return Task.CompletedTask; } + public Uri? CancelledZaakUrl { get; private set; } + + public Task CancelZaakAsync(Uri zaakUrl, CancellationToken ct = default) + { + CancelledZaakUrl = zaakUrl; + return Task.CompletedTask; + } + public (Uri ZaakUrl, string FileName)? StoredDiploma { get; private set; } public Task StoreDiplomaAsync(Uri zaakUrl, byte[] content, string fileName, string contentType, CancellationToken ct = default)