## What & why The ACL was handed a **pinned zaaktype URL** (`Acl__Defaults__ZaaktypeUrl`) + informatieobjecttype URL. OpenZaak assigns those UUIDs at creation, so every stack had to seed the catalogus and then capture + inject the resulting URLs out of band (CI's `run-domain-check.sh`; the local `local-seed`→`acl.env` bootstrap from ADR-0020). Brittle, and a stale/placeholder URL failed opaquely (OpenZaak 400). Now **the ACL resolves them itself** from OpenZaak's Catalogi API by stable business key: - config `ZaaktypeIdentificatie` (`BIG-REGISTRATIE`) / `InformatieobjecttypeOmschrijving` (`Diploma`); - a `CachedZaaktypeCatalog` resolves **lazily on first use** and caches (success only, so a pre-publish miss is retried — no startup ordering coupling); - a clear "No published … found" error replaces the opaque placeholder 400. Design in **ADR-0021** (proposed in #117). Closes #113 Closes #117 ## Consequences (the payoff) No stack captures/injects a server-assigned URL any more — `docker-compose.yml`/`.local.yml`, `run-domain-check.sh` and `local-seed` all drop it; the local `acl.env` shrinks to a single line. **One thing S-27 can't remove** (confirmed empirically during this work): OpenZaak validates the `zaaktype` field on zaak-create with Django's URLValidator and **rejects a single-label host** (`http://openzaak:8000/…` → `zaaktype: bad-url`). So the ACL's **base URL** must still point at a URL-valid host (a container IP); that base-URL injection from ADR-0020 stays (local `acl.env` now carries only it; CI keeps `ACL_OPENZAAK_BASEURL`). ADR-0021 records this. ## Definition of Done - [x] Linked issues (#113 slice, #117 adr-proposal). - [x] TDD — resolver + gateway-lookup unit tests, updated `AclService` tests (50 unit tests green). - [x] Implementation makes them pass; refactor of both compose stacks + verify scripts follows. - [x] Conventional Commits referencing #113. - [ ] CI green — see below. - [x] `docker compose up` reaches green health — verified: fresh `make local` + `make verify-local` green with **no zaaktype-URL injection**; `acl.env` is base-URL-only. - [x] Docs — ADR-0021 + demo-script S-27 note. - [x] ADR added (ADR-0021). - [x] Demo note appended. ## Verification done locally - **50 unit tests** pass (resolver resolve/cache/retry-on-failure; gateway match/miss/blank-key; all `AclService` paths). - **6 ACL integration tests** pass against a live seeded OpenZaak — incl. resolving the zaaktype + Diploma iot by business key, and a clear error for an unknown identificatie. - **Fresh `make local` + `make verify-local`**: full flow (submit → werkbak → openbaar) green; `acl.env` = `Acl__OpenZaak__BaseUrl` only. - `make lint` clean; ACL mutation ratchet run locally (see checks). ## Notes for reviewers - `IZaakGateway` gains two resolve methods; `AclService` depends on the new `IZaaktypeCatalog` (singleton, so the cache persists). - Supersedes the pinned-URL mechanism; ADR-0021 documents that ADR-0020's `seed-env`/entrypoint shim are **simplified** (base-URL only), not deleted, because of the URLValidator constraint above. Reviewed-on: #118
193 lines
9.8 KiB
C#
193 lines
9.8 KiB
C#
using Acl.Application;
|
|
using Acl.Infrastructure;
|
|
|
|
namespace Acl.IntegrationTests;
|
|
|
|
/// <summary>
|
|
/// S-04a (#46): the deferred S-04 acceptance criterion — the ACL's OpenZaakGateway
|
|
/// opening a zaak against a *real* OpenZaak, exercising real ZGW JWT auth and the
|
|
/// real POST /zaken/api/v1/zaken contract (CRS headers, default-fill, the created
|
|
/// zaak URL) that the stubbed-HttpMessageHandler unit tests cannot. See ADR-0006.
|
|
/// </summary>
|
|
[Trait("Category", "Integration")]
|
|
[Collection(OpenZaakCollection.Name)]
|
|
public sealed class OpenZaakGatewayIntegrationTests(OpenZaakFixture stack)
|
|
{
|
|
[Fact]
|
|
public async Task Opens_a_real_zaak_against_the_published_big_zaaktype_and_returns_its_url()
|
|
{
|
|
var zaaktype = await stack.FindPublishedBigZaaktypeAsync();
|
|
Assert.True(zaaktype is not null,
|
|
"No published BIG-REGISTRATIE zaaktype found in OpenZaak — bring the stack up and " +
|
|
"seed it with OZ_PUBLISH=1 (`make integration` does this).");
|
|
|
|
var gateway = new OpenZaakGateway(stack.Http, stack.Options);
|
|
var reference = Guid.NewGuid().ToString(); // zaak identificatie must be unique per bronorganisatie
|
|
var request = new ZaakRequest(
|
|
Bronorganisatie: "517439943",
|
|
VerantwoordelijkeOrganisatie: "517439943",
|
|
Vertrouwelijkheidaanduiding: "openbaar",
|
|
Zaaktype: zaaktype!,
|
|
Startdatum: DateOnly.FromDateTime(DateTime.UtcNow),
|
|
Identificatie: reference);
|
|
|
|
var zaakUrl = await gateway.OpenZaakAsync(request);
|
|
|
|
// The gateway returns the canonical zaak URL on OpenZaak's Zaken API...
|
|
Assert.StartsWith(
|
|
new Uri(stack.BaseUrl, "/zaken/api/v1/zaken/").ToString(),
|
|
zaakUrl.ToString());
|
|
|
|
// ...and that zaak is really persisted with the default-filled fields + the reference identificatie.
|
|
var zaak = await stack.GetZaakAsync(zaakUrl);
|
|
Assert.Equal(zaaktype.ToString(), zaak.GetProperty("zaaktype").GetString());
|
|
Assert.Equal("517439943", zaak.GetProperty("bronorganisatie").GetString());
|
|
Assert.Equal("openbaar", zaak.GetProperty("vertrouwelijkheidaanduiding").GetString());
|
|
Assert.Equal(reference, zaak.GetProperty("identificatie").GetString());
|
|
}
|
|
|
|
[Fact]
|
|
public async Task Setting_a_zaak_to_its_eindstatus_records_the_terminal_statustype()
|
|
{
|
|
var zaaktype = await stack.FindPublishedBigZaaktypeAsync();
|
|
Assert.True(zaaktype is not null,
|
|
"No published BIG-REGISTRATIE zaaktype found in OpenZaak — bring the stack up and " +
|
|
"seed it with OZ_PUBLISH=1 (`make integration` does this).");
|
|
|
|
var gateway = new OpenZaakGateway(stack.Http, stack.Options);
|
|
var zaakUrl = await gateway.OpenZaakAsync(new ZaakRequest(
|
|
Bronorganisatie: "517439943",
|
|
VerantwoordelijkeOrganisatie: "517439943",
|
|
Vertrouwelijkheidaanduiding: "openbaar",
|
|
Zaaktype: zaaktype!,
|
|
Startdatum: DateOnly.FromDateTime(DateTime.UtcNow),
|
|
Identificatie: Guid.NewGuid().ToString()));
|
|
|
|
await gateway.SetZaakToEindstatusAsync(zaakUrl, zaaktype!, DateOnly.FromDateTime(DateTime.UtcNow));
|
|
|
|
// The zaak now carries a current status, and it is the zaaktype's eindstatus.
|
|
var zaak = await stack.GetZaakAsync(zaakUrl);
|
|
var statusUrl = zaak.GetProperty("status").GetString();
|
|
Assert.False(string.IsNullOrEmpty(statusUrl), "the approved zaak has no current status");
|
|
|
|
var status = await stack.GetJsonAsync(new Uri(statusUrl!));
|
|
var eindstatustype = await stack.FindEindstatustypeAsync(zaaktype!);
|
|
Assert.Equal(eindstatustype.ToString(), status.GetProperty("statustype").GetString());
|
|
}
|
|
|
|
[Fact]
|
|
public async Task Cancelling_a_zaak_records_the_geannuleerd_status_and_a_resultaat()
|
|
{
|
|
var zaaktype = await stack.FindPublishedBigZaaktypeAsync();
|
|
Assert.True(zaaktype is not null,
|
|
"No published BIG-REGISTRATIE zaaktype found in OpenZaak — bring the stack up and " +
|
|
"seed it with OZ_PUBLISH=1 (`make integration` does this).");
|
|
|
|
var gateway = new OpenZaakGateway(stack.Http, stack.Options);
|
|
var zaakUrl = await gateway.OpenZaakAsync(new ZaakRequest(
|
|
Bronorganisatie: "517439943",
|
|
VerantwoordelijkeOrganisatie: "517439943",
|
|
Vertrouwelijkheidaanduiding: "openbaar",
|
|
Zaaktype: zaaktype!,
|
|
Startdatum: DateOnly.FromDateTime(DateTime.UtcNow),
|
|
Identificatie: Guid.NewGuid().ToString()));
|
|
|
|
await gateway.SetZaakToCancellationStatusAsync(zaakUrl, zaaktype!, DateOnly.FromDateTime(DateTime.UtcNow));
|
|
|
|
// The zaak's current status is the Geannuleerd statustype — distinct from the approval eindstatus.
|
|
var zaak = await stack.GetZaakAsync(zaakUrl);
|
|
var statusUrl = zaak.GetProperty("status").GetString();
|
|
Assert.False(string.IsNullOrEmpty(statusUrl), "the cancelled zaak has no current status");
|
|
|
|
var status = await stack.GetJsonAsync(new Uri(statusUrl!));
|
|
var geannuleerd = await stack.FindStatustypeByOmschrijvingAsync(zaaktype!, "Geannuleerd");
|
|
Assert.Equal(geannuleerd.ToString(), status.GetProperty("statustype").GetString());
|
|
|
|
// ...and a resultaat is recorded (OpenZaak requires it before a closing/terminal status).
|
|
Assert.False(string.IsNullOrEmpty(zaak.GetProperty("resultaat").GetString()),
|
|
"the cancelled zaak has no resultaat");
|
|
}
|
|
|
|
[Fact]
|
|
public async Task Storing_a_diploma_creates_a_real_informatieobject_related_to_the_zaak()
|
|
{
|
|
var zaaktype = await stack.FindPublishedBigZaaktypeAsync();
|
|
Assert.True(zaaktype is not null,
|
|
"No published BIG-REGISTRATIE zaaktype found — seed the stack with OZ_PUBLISH=1.");
|
|
var informatieobjecttype = await stack.FindPublishedDiplomaInformatieobjecttypeAsync();
|
|
Assert.True(informatieobjecttype is not null,
|
|
"No published Diploma informatieobjecttype found — seed the stack with OZ_PUBLISH=1.");
|
|
|
|
var gateway = new OpenZaakGateway(stack.Http, stack.Options);
|
|
var zaakUrl = await gateway.OpenZaakAsync(new ZaakRequest(
|
|
Bronorganisatie: "517439943",
|
|
VerantwoordelijkeOrganisatie: "517439943",
|
|
Vertrouwelijkheidaanduiding: "openbaar",
|
|
Zaaktype: zaaktype!,
|
|
Startdatum: DateOnly.FromDateTime(DateTime.UtcNow),
|
|
Identificatie: Guid.NewGuid().ToString()));
|
|
|
|
var content = System.Text.Encoding.UTF8.GetBytes("%PDF-1.4 synthetic diploma\n");
|
|
var documentUrl = await gateway.StoreDocumentAsync(new DocumentRequest(
|
|
Bronorganisatie: "517439943",
|
|
Informatieobjecttype: informatieobjecttype!,
|
|
Vertrouwelijkheidaanduiding: "openbaar",
|
|
Zaak: zaakUrl,
|
|
Creatiedatum: DateOnly.FromDateTime(DateTime.UtcNow),
|
|
Titel: "Diploma",
|
|
Auteur: "zorgprofessional",
|
|
Taal: "nld",
|
|
Bestandsnaam: "diploma.pdf",
|
|
Formaat: "application/pdf",
|
|
Inhoud: content));
|
|
|
|
// The gateway returns the canonical informatieobject URL...
|
|
Assert.StartsWith(
|
|
new Uri(stack.BaseUrl, "/documenten/api/v1/enkelvoudiginformatieobjecten/").ToString(),
|
|
documentUrl.ToString());
|
|
|
|
// ...the document is really persisted with the default-filled fields...
|
|
var doc = await stack.GetJsonAsync(documentUrl);
|
|
Assert.Equal("diploma.pdf", doc.GetProperty("bestandsnaam").GetString());
|
|
Assert.Equal(informatieobjecttype.ToString(), doc.GetProperty("informatieobjecttype").GetString());
|
|
Assert.Equal(content.Length, doc.GetProperty("bestandsomvang").GetInt32());
|
|
// indicatieGebruiksrecht is recorded as "no restrictions"; left null, OpenZaak would refuse to
|
|
// close the zaak this document is related to (the S-10b regression that broke the e2e flow).
|
|
Assert.False(doc.GetProperty("indicatieGebruiksrecht").GetBoolean());
|
|
|
|
// ...and it is related to the zaak (a zaakinformatieobject links the two).
|
|
var relations = await stack.GetJsonAsync(new Uri(stack.BaseUrl,
|
|
"/zaken/api/v1/zaakinformatieobjecten?informatieobject=" + Uri.EscapeDataString(documentUrl.ToString())));
|
|
Assert.Contains(relations.EnumerateArray(),
|
|
r => r.GetProperty("zaak").GetString() == zaakUrl.ToString());
|
|
}
|
|
|
|
[Fact]
|
|
public async Task Resolves_the_published_zaaktype_and_diploma_informatieobjecttype_by_business_key()
|
|
{
|
|
var expectedZaaktype = await stack.FindPublishedBigZaaktypeAsync();
|
|
Assert.True(expectedZaaktype is not null,
|
|
"No published BIG-REGISTRATIE zaaktype found — seed the stack with OZ_PUBLISH=1.");
|
|
var expectedInformatieobjecttype = await stack.FindPublishedDiplomaInformatieobjecttypeAsync();
|
|
Assert.True(expectedInformatieobjecttype is not null,
|
|
"No published Diploma informatieobjecttype found — seed the stack with OZ_PUBLISH=1.");
|
|
|
|
var gateway = new OpenZaakGateway(stack.Http, stack.Options);
|
|
|
|
// The ACL discovers both URLs from the live Catalogi API by their stable business keys (S-27),
|
|
// matching what the fixture found independently — no pinned URL needed.
|
|
Assert.Equal(expectedZaaktype, await gateway.ResolveZaaktypeUrlAsync("BIG-REGISTRATIE"));
|
|
Assert.Equal(expectedInformatieobjecttype, await gateway.ResolveInformatieobjecttypeUrlAsync("Diploma"));
|
|
}
|
|
|
|
[Fact]
|
|
public async Task Resolving_an_unknown_zaaktype_identificatie_throws_a_clear_error()
|
|
{
|
|
var gateway = new OpenZaakGateway(stack.Http, stack.Options);
|
|
|
|
var ex = await Assert.ThrowsAsync<InvalidOperationException>(
|
|
() => gateway.ResolveZaaktypeUrlAsync("NO-SUCH-ZAAKTYPE"));
|
|
Assert.Contains("NO-SUCH-ZAAKTYPE", ex.Message);
|
|
}
|
|
}
|