not
4777ff2b1d
## What & why S-10a, the **workflow/timeout spine** of the (split) document-upload slice: the registratie process now parks at a **`WachtOpDocumenten`** user task with an **interrupting `P30D` boundary timer**. When the documents arrive the task completes and the process continues into the diploma routing (S-13) → Beoordelen; if the 30 days lapse, the timer cancels the wait, runs a `RegistratieVerlopen` external-worker task, and the domain expires the aggregate to a new terminal status **`Verlopen`**. Backend only — the real upload trigger (portal → BFF → ACL → Documenten API) is S-10b (#103). Closes #102 Mechanism recorded in **ADR-0017**; opened as proposal #104. Mirrors the S-14 escalation (boundary-timer + external-worker) and S-11 withdrawal (interrupting cancel) patterns. ## Definition of Done - [x] Linked Gitea issue (above). - [x] Failing test committed before the implementation (red→green pairs per layer). - [x] Implementation makes the test pass. - [x] Conventional Commits referencing the issue (`refs #102`). - [ ] CI green — all Gitea Actions jobs (pending on this PR). - [x] `docker compose up` health unaffected (no new services; deploy path unchanged). - [x] Docs updated (ADR-0017, demo-script, BACKLOG split). - [x] ADR added (`docs/architecture/adr-0017-document-wait-timeout-cancellation.md`). - [x] Demo note in `docs/demo-script.md`. ## Notes for reviewers - **Domain** (`Registration.Expire()` + `Verlopen`), **application** (`ExpireRegistrationWorker`), **infra** (`RegistratieVerlopenProcessor`/`Pump`, `IRegistratieVerlopenClient`, Flowable acquire/complete + `CompleteDocumentWaitAsync`) — the timeout counterpart to the OpenZaak/escalation worker trios; idempotent per §8.6. - **BPMN** verified live against a `flowable-rest` probe: complete `WachtOpDocumenten` → routes to Beoordelen; fire the P30D timer → `RegistratieVerlopen` job (carrying `registrationId`) + the wait task cancelled. `verify-domain` exercises both branches in-stack (completes the wait in every existing block; fires the timer and asserts `Verlopen` in a new block). - **Scope boundary:** on expiry the aggregate goes `Verlopen` and the process ends, but the ZGW *zaak* is not yet set to a cancellation status — that needs a new ACL method + statustype seeding and is folded into S-10b (noted in ADR-0017). - `CompleteDocumentWaitAsync` is built and HTTP-tested here but not yet called from a domain endpoint; S-10b wires the upload trigger to it. 🤖 Generated with [Claude Code](https://claude.com/claude-code) Reviewed-on: #105
247 lines
13 KiB
XML
247 lines
13 KiB
XML
<?xml version="1.0" encoding="UTF-8"?>
|
|
<definitions xmlns="http://www.omg.org/spec/BPMN/20100524/MODEL"
|
|
xmlns:flowable="http://flowable.org/bpmn"
|
|
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
|
|
xmlns:bpmndi="http://www.omg.org/spec/BPMN/20100524/DI"
|
|
xmlns:omgdc="http://www.omg.org/spec/DD/20100524/DC"
|
|
xmlns:omgdi="http://www.omg.org/spec/DD/20100524/DI"
|
|
targetNamespace="http://respellion.nl/big">
|
|
|
|
<!-- Registratie ontvangen flow.
|
|
start -> external-worker task (OpenZaakAanmaken) -> Beoordelen (behandelaar user task) -> end.
|
|
S-03 added the external task (Workflow Client / ACL). S-12 adds the behandelaar's beoordeling
|
|
as a user task: the process parks here until a behandelaar claims and completes it with a
|
|
`besluit` (goedkeuren/afwijzen). The registrationId set at start rides along as a process
|
|
variable so the werkbak can correlate each task back to its aggregate.
|
|
S-11 adds withdrawal: while parked at Beoordelen the citizen can trek de aanvraag in — an
|
|
interrupting message boundary event (RegistratieIngetrokken) cancels the task and ends the
|
|
process via a dedicated "ingetrokken" end (ADR-0014). The Workflow Client delivers the message
|
|
to the task's execution; the BPMN owns the cancellation path.
|
|
S-14 adds escalation: a NON-interrupting boundary timer (P14D) on Beoordelen. If a behandelaar
|
|
has not picked the task up within 14 days it fires a parallel token to an external-worker task
|
|
(BeoordelingEscaleren); the Workflow Client reassigns the still-open Beoordelen task from the
|
|
behandelaar group to teamlead (ADR-0015). The Beoordelen task stays open throughout — the timer
|
|
only changes who may claim it.
|
|
S-13 adds diploma-eligibility routing: between the document wait and Beoordelen a DMN service
|
|
task (flowable:type="dmn") evaluates the `diploma-eligibility` decision on the diplomaOrigin
|
|
start variable; an exclusive gateway routes a foreign diploma through the CBGV-advies user task
|
|
before Beoordelen, a domestic one straight there (ADR-0016).
|
|
S-10a adds the document wait: right after the zaak is opened the process parks at a
|
|
WachtOpDocumenten user task with an INTERRUPTING P30D boundary timer. "Documents received"
|
|
(the S-10b upload, via the Workflow Client) completes the task and the process continues to the
|
|
diploma routing; if the 30 days lapse first the timer cancels the task and runs the
|
|
RegistratieVerlopen external-worker task, whose worker expires the registration to VERLOPEN,
|
|
ending the process as "verlopen" (ADR-0017). -->
|
|
<message id="Message_Ingetrokken" name="RegistratieIngetrokken"/>
|
|
|
|
<process id="registratie" name="Registratie ontvangen" isExecutable="true">
|
|
|
|
<startEvent id="start" name="Registratie ontvangen"/>
|
|
|
|
<sequenceFlow id="flow1" sourceRef="start" targetRef="OpenZaakAanmaken"/>
|
|
|
|
<serviceTask id="OpenZaakAanmaken" name="OpenZaak aanmaken"
|
|
flowable:type="external-worker"
|
|
flowable:topic="OpenZaakAanmaken"/>
|
|
|
|
<sequenceFlow id="flow2" sourceRef="OpenZaakAanmaken" targetRef="WachtOpDocumenten"/>
|
|
|
|
<!-- S-10a: wait for the citizen's documents (diploma). The process parks here; "documents received"
|
|
(the S-10b upload path) completes the task via the Workflow Client. An INTERRUPTING P30D
|
|
boundary timer cancels the case if the documents never arrive (ADR-0017). -->
|
|
<userTask id="WachtOpDocumenten" name="Wacht op documenten"/>
|
|
|
|
<sequenceFlow id="flow2doc" sourceRef="WachtOpDocumenten" targetRef="DiplomaEligibiliteit"/>
|
|
|
|
<boundaryEvent id="DocumentenTimer" attachedToRef="WachtOpDocumenten" cancelActivity="true">
|
|
<timerEventDefinition>
|
|
<timeDuration>P30D</timeDuration>
|
|
</timerEventDefinition>
|
|
</boundaryEvent>
|
|
|
|
<sequenceFlow id="flow7" sourceRef="DocumentenTimer" targetRef="RegistratieVerlopen"/>
|
|
|
|
<!-- On timeout: an external-worker task the Workflow Client picks up to expire the registration to
|
|
VERLOPEN (S-10a). Its topic mirrors OpenZaakAanmaken/BeoordelingEscaleren. -->
|
|
<serviceTask id="RegistratieVerlopen" name="Registratie laten verlopen"
|
|
flowable:type="external-worker"
|
|
flowable:topic="RegistratieVerlopen"/>
|
|
|
|
<sequenceFlow id="flow8" sourceRef="RegistratieVerlopen" targetRef="endVerlopen"/>
|
|
|
|
<endEvent id="endVerlopen" name="Registratie verlopen"/>
|
|
|
|
<!-- S-13: evaluate the diploma-eligibility DMN inline (ADR-0016). A Flowable DMN service task
|
|
(flowable:type="dmn" — NOT a businessRuleTask, whose default implementation is the legacy
|
|
Drools/KIE one that flowable-rest does not bundle) runs the deployed `diploma-eligibility`
|
|
decision against the diplomaOrigin start variable and sets the `route` output as a process
|
|
variable. The gateway then routes a foreign diploma through CBGV-advies, a domestic one
|
|
straight to Beoordelen. -->
|
|
<serviceTask id="DiplomaEligibiliteit" name="Diploma-eligibiliteit bepalen" flowable:type="dmn">
|
|
<extensionElements>
|
|
<flowable:field name="decisionTableReferenceKey">
|
|
<flowable:string><![CDATA[diploma-eligibility]]></flowable:string>
|
|
</flowable:field>
|
|
</extensionElements>
|
|
</serviceTask>
|
|
|
|
<sequenceFlow id="flow2a" sourceRef="DiplomaEligibiliteit" targetRef="RouteOpDiploma"/>
|
|
|
|
<exclusiveGateway id="RouteOpDiploma" name="Buitenlands diploma?" default="flowDirect"/>
|
|
|
|
<sequenceFlow id="flowCbgv" sourceRef="RouteOpDiploma" targetRef="CBGVAdvies">
|
|
<conditionExpression xsi:type="tFormalExpression"><![CDATA[${route == 'CBGV_ADVIES'}]]></conditionExpression>
|
|
</sequenceFlow>
|
|
|
|
<!-- The extra CBGV-style assessment for foreign diplomas (PRD flow 4). A CBGV medewerker
|
|
completes it, after which the case continues to the regular beoordeling. -->
|
|
<userTask id="CBGVAdvies" name="CBGV-advies" flowable:candidateGroups="cbgv"/>
|
|
|
|
<sequenceFlow id="flowCbgvNaarBeoordelen" sourceRef="CBGVAdvies" targetRef="Beoordelen"/>
|
|
|
|
<sequenceFlow id="flowDirect" sourceRef="RouteOpDiploma" targetRef="Beoordelen"/>
|
|
|
|
<userTask id="Beoordelen" name="Beoordelen" flowable:candidateGroups="behandelaar"/>
|
|
|
|
<sequenceFlow id="flow3" sourceRef="Beoordelen" targetRef="end"/>
|
|
|
|
<endEvent id="end" name="Registratie beoordeeld"/>
|
|
|
|
<!-- Withdrawal (S-11): interrupting message boundary event on Beoordelen. On RegistratieIngetrokken
|
|
the task is cancelled and the process ends as "ingetrokken". -->
|
|
<boundaryEvent id="Ingetrokken" attachedToRef="Beoordelen" cancelActivity="true">
|
|
<messageEventDefinition messageRef="Message_Ingetrokken"/>
|
|
</boundaryEvent>
|
|
|
|
<sequenceFlow id="flow4" sourceRef="Ingetrokken" targetRef="endIngetrokken"/>
|
|
|
|
<endEvent id="endIngetrokken" name="Registratie ingetrokken"/>
|
|
|
|
<!-- Escalation (S-14): non-interrupting P14D boundary timer on Beoordelen. On timeout a parallel
|
|
token runs EscaleerBeoordeling, an external-worker task the Workflow Client picks up to
|
|
reassign the still-open Beoordelen task from behandelaar to teamlead (ADR-0015). -->
|
|
<boundaryEvent id="EscaleerTimer" attachedToRef="Beoordelen" cancelActivity="false">
|
|
<timerEventDefinition>
|
|
<timeDuration>P14D</timeDuration>
|
|
</timerEventDefinition>
|
|
</boundaryEvent>
|
|
|
|
<sequenceFlow id="flow5" sourceRef="EscaleerTimer" targetRef="EscaleerBeoordeling"/>
|
|
|
|
<serviceTask id="EscaleerBeoordeling" name="Beoordeling escaleren"
|
|
flowable:type="external-worker"
|
|
flowable:topic="BeoordelingEscaleren"/>
|
|
|
|
<sequenceFlow id="flow6" sourceRef="EscaleerBeoordeling" targetRef="endEscaleren"/>
|
|
|
|
<endEvent id="endEscaleren" name="Beoordeling geëscaleerd"/>
|
|
</process>
|
|
|
|
<bpmndi:BPMNDiagram id="diagram">
|
|
<bpmndi:BPMNPlane id="plane" bpmnElement="registratie">
|
|
<bpmndi:BPMNShape id="s_start" bpmnElement="start">
|
|
<omgdc:Bounds x="100" y="100" width="30" height="30"/>
|
|
</bpmndi:BPMNShape>
|
|
<bpmndi:BPMNShape id="s_task" bpmnElement="OpenZaakAanmaken">
|
|
<omgdc:Bounds x="180" y="85" width="120" height="60"/>
|
|
</bpmndi:BPMNShape>
|
|
<bpmndi:BPMNShape id="s_wacht" bpmnElement="WachtOpDocumenten">
|
|
<omgdc:Bounds x="340" y="85" width="120" height="60"/>
|
|
</bpmndi:BPMNShape>
|
|
<bpmndi:BPMNShape id="s_documentenTimer" bpmnElement="DocumentenTimer">
|
|
<omgdc:Bounds x="385" y="130" width="30" height="30"/>
|
|
</bpmndi:BPMNShape>
|
|
<bpmndi:BPMNShape id="s_verlopen" bpmnElement="RegistratieVerlopen">
|
|
<omgdc:Bounds x="340" y="220" width="120" height="60"/>
|
|
</bpmndi:BPMNShape>
|
|
<bpmndi:BPMNShape id="s_endVerlopen" bpmnElement="endVerlopen">
|
|
<omgdc:Bounds x="510" y="235" width="30" height="30"/>
|
|
</bpmndi:BPMNShape>
|
|
<bpmndi:BPMNShape id="s_dmn" bpmnElement="DiplomaEligibiliteit">
|
|
<omgdc:Bounds x="510" y="85" width="120" height="60"/>
|
|
</bpmndi:BPMNShape>
|
|
<bpmndi:BPMNShape id="s_route" bpmnElement="RouteOpDiploma" isMarkerVisible="true">
|
|
<omgdc:Bounds x="680" y="90" width="40" height="40"/>
|
|
</bpmndi:BPMNShape>
|
|
<bpmndi:BPMNShape id="s_cbgv" bpmnElement="CBGVAdvies">
|
|
<omgdc:Bounds x="660" y="200" width="120" height="60"/>
|
|
</bpmndi:BPMNShape>
|
|
<bpmndi:BPMNShape id="s_beoordelen" bpmnElement="Beoordelen">
|
|
<omgdc:Bounds x="790" y="85" width="120" height="60"/>
|
|
</bpmndi:BPMNShape>
|
|
<bpmndi:BPMNShape id="s_end" bpmnElement="end">
|
|
<omgdc:Bounds x="970" y="100" width="30" height="30"/>
|
|
</bpmndi:BPMNShape>
|
|
<bpmndi:BPMNShape id="s_ingetrokken" bpmnElement="Ingetrokken">
|
|
<omgdc:Bounds x="850" y="135" width="30" height="30"/>
|
|
</bpmndi:BPMNShape>
|
|
<bpmndi:BPMNShape id="s_endIngetrokken" bpmnElement="endIngetrokken">
|
|
<omgdc:Bounds x="850" y="250" width="30" height="30"/>
|
|
</bpmndi:BPMNShape>
|
|
<bpmndi:BPMNShape id="s_escaleerTimer" bpmnElement="EscaleerTimer">
|
|
<omgdc:Bounds x="860" y="70" width="30" height="30"/>
|
|
</bpmndi:BPMNShape>
|
|
<bpmndi:BPMNShape id="s_escaleerBeoordeling" bpmnElement="EscaleerBeoordeling">
|
|
<omgdc:Bounds x="960" y="20" width="120" height="60"/>
|
|
</bpmndi:BPMNShape>
|
|
<bpmndi:BPMNShape id="s_endEscaleren" bpmnElement="endEscaleren">
|
|
<omgdc:Bounds x="1130" y="35" width="30" height="30"/>
|
|
</bpmndi:BPMNShape>
|
|
<bpmndi:BPMNEdge id="e_flow1" bpmnElement="flow1">
|
|
<omgdi:waypoint x="130" y="115"/>
|
|
<omgdi:waypoint x="180" y="115"/>
|
|
</bpmndi:BPMNEdge>
|
|
<bpmndi:BPMNEdge id="e_flow2" bpmnElement="flow2">
|
|
<omgdi:waypoint x="300" y="115"/>
|
|
<omgdi:waypoint x="340" y="115"/>
|
|
</bpmndi:BPMNEdge>
|
|
<bpmndi:BPMNEdge id="e_flow2doc" bpmnElement="flow2doc">
|
|
<omgdi:waypoint x="460" y="115"/>
|
|
<omgdi:waypoint x="510" y="115"/>
|
|
</bpmndi:BPMNEdge>
|
|
<bpmndi:BPMNEdge id="e_flow7" bpmnElement="flow7">
|
|
<omgdi:waypoint x="400" y="160"/>
|
|
<omgdi:waypoint x="400" y="220"/>
|
|
</bpmndi:BPMNEdge>
|
|
<bpmndi:BPMNEdge id="e_flow8" bpmnElement="flow8">
|
|
<omgdi:waypoint x="460" y="250"/>
|
|
<omgdi:waypoint x="510" y="250"/>
|
|
</bpmndi:BPMNEdge>
|
|
<bpmndi:BPMNEdge id="e_flow2a" bpmnElement="flow2a">
|
|
<omgdi:waypoint x="630" y="115"/>
|
|
<omgdi:waypoint x="680" y="110"/>
|
|
</bpmndi:BPMNEdge>
|
|
<bpmndi:BPMNEdge id="e_flowDirect" bpmnElement="flowDirect">
|
|
<omgdi:waypoint x="720" y="110"/>
|
|
<omgdi:waypoint x="790" y="115"/>
|
|
</bpmndi:BPMNEdge>
|
|
<bpmndi:BPMNEdge id="e_flowCbgv" bpmnElement="flowCbgv">
|
|
<omgdi:waypoint x="700" y="130"/>
|
|
<omgdi:waypoint x="700" y="200"/>
|
|
</bpmndi:BPMNEdge>
|
|
<bpmndi:BPMNEdge id="e_flowCbgvNaarBeoordelen" bpmnElement="flowCbgvNaarBeoordelen">
|
|
<omgdi:waypoint x="780" y="230"/>
|
|
<omgdi:waypoint x="820" y="230"/>
|
|
<omgdi:waypoint x="820" y="145"/>
|
|
</bpmndi:BPMNEdge>
|
|
<bpmndi:BPMNEdge id="e_flow3" bpmnElement="flow3">
|
|
<omgdi:waypoint x="910" y="115"/>
|
|
<omgdi:waypoint x="970" y="115"/>
|
|
</bpmndi:BPMNEdge>
|
|
<bpmndi:BPMNEdge id="e_flow4" bpmnElement="flow4">
|
|
<omgdi:waypoint x="865" y="165"/>
|
|
<omgdi:waypoint x="865" y="250"/>
|
|
</bpmndi:BPMNEdge>
|
|
<bpmndi:BPMNEdge id="e_flow5" bpmnElement="flow5">
|
|
<omgdi:waypoint x="875" y="70"/>
|
|
<omgdi:waypoint x="875" y="50"/>
|
|
<omgdi:waypoint x="960" y="50"/>
|
|
</bpmndi:BPMNEdge>
|
|
<bpmndi:BPMNEdge id="e_flow6" bpmnElement="flow6">
|
|
<omgdi:waypoint x="1080" y="50"/>
|
|
<omgdi:waypoint x="1130" y="50"/>
|
|
</bpmndi:BPMNEdge>
|
|
</bpmndi:BPMNPlane>
|
|
</bpmndi:BPMNDiagram>
|
|
</definitions>
|