## 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
80 lines
3.4 KiB
C#
80 lines
3.4 KiB
C#
using Big.Application;
|
|
using Big.Infrastructure;
|
|
using Microsoft.Extensions.Logging;
|
|
using Microsoft.Extensions.Logging.Abstractions;
|
|
|
|
namespace Big.Tests;
|
|
|
|
// S-10a (#102): the document-timeout drain loop. Mirrors BeoordelingEscalatieProcessor — acquire the
|
|
// parked RegistratieVerlopen jobs (the tokens the 30-day boundary timer on WachtOpDocumenten spawns),
|
|
// expire each correlated registration via the ExpireRegistrationWorker, then complete the job. A job
|
|
// whose expiry fails is logged and left un-completed for Flowable to redeliver (§8.6).
|
|
public class RegistratieVerlopenProcessorTests
|
|
{
|
|
/// <summary>A fake client scripting the jobs to acquire and recording completions.</summary>
|
|
private sealed class FakeVerlopenClient(params RegistratieVerlopenJob[] jobs) : IRegistratieVerlopenClient
|
|
{
|
|
public int AcquireCount { get; private set; }
|
|
public List<string> Completed { get; } = [];
|
|
|
|
public Task<IReadOnlyList<RegistratieVerlopenJob>> AcquireRegistratieVerlopenJobsAsync(int maxJobs, CancellationToken ct = default)
|
|
{
|
|
AcquireCount++;
|
|
return Task.FromResult<IReadOnlyList<RegistratieVerlopenJob>>(jobs.Take(maxJobs).ToList());
|
|
}
|
|
|
|
public Task CompleteRegistratieVerlopenJobAsync(string jobId, CancellationToken ct = default)
|
|
{
|
|
Completed.Add(jobId);
|
|
return Task.CompletedTask;
|
|
}
|
|
}
|
|
|
|
private static ExpireRegistrationWorker Worker(FakeRegistrationStore store) => new(store, new FakeAclClient());
|
|
|
|
[Fact]
|
|
public async Task Acquires_a_job_expires_the_registration_and_completes_the_job()
|
|
{
|
|
var store = new FakeRegistrationStore();
|
|
var registration = Domain.Registration.Submit("123456782");
|
|
store.Seed(registration);
|
|
var client = new FakeVerlopenClient(new RegistratieVerlopenJob("job-9", registration.Id));
|
|
|
|
var acquired = await new RegistratieVerlopenProcessor(
|
|
client, Worker(store), NullLogger<RegistratieVerlopenProcessor>.Instance).PumpOnceAsync(5);
|
|
|
|
Assert.Equal(1, acquired);
|
|
Assert.Equal(Domain.RegistrationStatus.Verlopen, (await store.GetAsync(registration.Id))!.Status);
|
|
Assert.Equal("job-9", Assert.Single(client.Completed));
|
|
}
|
|
|
|
[Fact]
|
|
public async Task A_failing_expiry_is_left_uncompleted_for_flowable_to_redeliver()
|
|
{
|
|
// Unknown registration → the worker throws → the job is left for redelivery, error logged.
|
|
var store = new FakeRegistrationStore();
|
|
var client = new FakeVerlopenClient(new RegistratieVerlopenJob("job-9", Domain.RegistrationId.New()));
|
|
var logger = new CapturingLogger<RegistratieVerlopenProcessor>();
|
|
|
|
var acquired = await new RegistratieVerlopenProcessor(client, Worker(store), logger).PumpOnceAsync(5);
|
|
|
|
Assert.Equal(1, acquired);
|
|
Assert.Empty(client.Completed);
|
|
var error = Assert.Single(logger.Entries, e => e.Level == LogLevel.Error);
|
|
Assert.Contains("job-9", error.Message);
|
|
}
|
|
|
|
[Fact]
|
|
public async Task Does_nothing_but_poll_when_there_are_no_jobs()
|
|
{
|
|
var client = new FakeVerlopenClient();
|
|
|
|
var acquired = await new RegistratieVerlopenProcessor(
|
|
client, Worker(new FakeRegistrationStore()), NullLogger<RegistratieVerlopenProcessor>.Instance).PumpOnceAsync(5);
|
|
|
|
Assert.Equal(0, acquired);
|
|
Assert.Equal(1, client.AcquireCount);
|
|
Assert.Empty(client.Completed);
|
|
}
|
|
}
|