From 132cd20bdcfdc565ad8ab722e12bcf051f6014f6 Mon Sep 17 00:00:00 2001 From: Damon Date: Wed, 12 Aug 2026 14:06:27 +0200 Subject: [PATCH 1/5] DL-7473: added politiecollege bestuursorgaan via migrations + ended politieraad orgs --- CHANGELOG.md | 8 +++++ ...d-politiecollege-governing-body-code.graph | 1 + ...add-politiecollege-governing-body-code.ttl | 11 ++++++ ...00-end-politieraad-governing-bodies.sparql | 19 +++++++++++ ...ate-politiecollege-governing-bodies.sparql | 34 +++++++++++++++++++ 5 files changed, 73 insertions(+) create mode 100644 config/migrations/2026/20260811100000-add-politiecollege-governing-body/20260811100000-add-politiecollege-governing-body-code.graph create mode 100644 config/migrations/2026/20260811100000-add-politiecollege-governing-body/20260811100000-add-politiecollege-governing-body-code.ttl create mode 100644 config/migrations/2026/20260811100000-add-politiecollege-governing-body/20260811100100-end-politieraad-governing-bodies.sparql create mode 100644 config/migrations/2026/20260811100000-add-politiecollege-governing-body/20260811100200-create-politiecollege-governing-bodies.sparql diff --git a/CHANGELOG.md b/CHANGELOG.md index cff6b9e..a4020b9 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -25,6 +25,8 @@ - Keep werkingsgebied filter up to date via db-cleanup service [OP-3841] - Restrict available imam roles based on worship organisation status [DL-7485] - IMPORTANT NOTE: Make sure first the [DL-7485] loket migration has completed + data has flown from loket to OP +- Add the value politiecollege to the existing dropdown list beslissingsorgaan [DL-7473] + - Bump construct-organization-relationships ### Deploy notes ``` @@ -67,6 +69,12 @@ drc restart cache resource drc restart migrations resource delta-producer-publication-graph-maintainer ``` +``` +drc restart migrations +drc exec delta-producer-background-jobs-initiator curl -X POST http://localhost/public/healing-jobs +drc up -d construct-organization-relationships +``` + ## v1.41.0 - added explicit healtchecks [DL-7466] diff --git a/config/migrations/2026/20260811100000-add-politiecollege-governing-body/20260811100000-add-politiecollege-governing-body-code.graph b/config/migrations/2026/20260811100000-add-politiecollege-governing-body/20260811100000-add-politiecollege-governing-body-code.graph new file mode 100644 index 0000000..092c3a9 --- /dev/null +++ b/config/migrations/2026/20260811100000-add-politiecollege-governing-body/20260811100000-add-politiecollege-governing-body-code.graph @@ -0,0 +1 @@ +http://mu.semte.ch/graphs/public diff --git a/config/migrations/2026/20260811100000-add-politiecollege-governing-body/20260811100000-add-politiecollege-governing-body-code.ttl b/config/migrations/2026/20260811100000-add-politiecollege-governing-body/20260811100000-add-politiecollege-governing-body-code.ttl new file mode 100644 index 0000000..b053b9f --- /dev/null +++ b/config/migrations/2026/20260811100000-add-politiecollege-governing-body/20260811100000-add-politiecollege-governing-body-code.ttl @@ -0,0 +1,11 @@ +@prefix rdf: . +@prefix skos: . +@prefix mu: . +@prefix ext: . +@prefix code: . + + + rdf:type code:BestuursorgaanClassificatieCode , skos:Concept , ext:BestuursorgaanClassificatieCode ; + mu:uuid "4f82dfea-0581-43d4-b672-3bdb261d2d33" ; + skos:prefLabel "Politiecollege" ; + skos:inScheme . diff --git a/config/migrations/2026/20260811100000-add-politiecollege-governing-body/20260811100100-end-politieraad-governing-bodies.sparql b/config/migrations/2026/20260811100000-add-politiecollege-governing-body/20260811100100-end-politieraad-governing-bodies.sparql new file mode 100644 index 0000000..91c0d49 --- /dev/null +++ b/config/migrations/2026/20260811100000-add-politiecollege-governing-body/20260811100100-end-politieraad-governing-bodies.sparql @@ -0,0 +1,19 @@ +PREFIX mandaat: +PREFIX besluit: +PREFIX org: +PREFIX generiek: + +INSERT { + GRAPH { + ?timedBody mandaat:bindingEinde "2026-07-02T00:00:00"^^xsd:dateTime . + } +} WHERE { + GRAPH { + ?politiezone a besluit:Bestuurseenheid ; + org:classification . # Politiezone + ?governingBody besluit:bestuurt ?politiezone ; + org:classification . # Politieraad + ?timedBody generiek:isTijdspecialisatieVan ?governingBody . + FILTER NOT EXISTS { ?timedBody mandaat:bindingEinde ?endDate . } + } +} diff --git a/config/migrations/2026/20260811100000-add-politiecollege-governing-body/20260811100200-create-politiecollege-governing-bodies.sparql b/config/migrations/2026/20260811100000-add-politiecollege-governing-body/20260811100200-create-politiecollege-governing-bodies.sparql new file mode 100644 index 0000000..0edd9b4 --- /dev/null +++ b/config/migrations/2026/20260811100000-add-politiecollege-governing-body/20260811100200-create-politiecollege-governing-bodies.sparql @@ -0,0 +1,34 @@ +PREFIX mandaat: +PREFIX besluit: +PREFIX org: +PREFIX generiek: +PREFIX mu: +PREFIX skos: + +INSERT { + GRAPH { + ?newGoverningBody a besluit:Bestuursorgaan ; + mu:uuid ?newGoverningBodyUuid ; + skos:prefLabel ?newGoverningBodyLabel ; + besluit:bestuurt ?politiezone ; + org:classification . # Politiecollege + ?newTimedGoverningBody a besluit:Bestuursorgaan ; + mu:uuid ?newTimedGoverningBodyUuid ; + generiek:isTijdspecialisatieVan ?newGoverningBody ; + mandaat:bindingStart "2026-07-02T00:00:00"^^xsd:dateTime . + } +} WHERE { + GRAPH { + ?politiezone a besluit:Bestuurseenheid ; + org:classification ; # Politiezone + mu:uuid ?politiezoneUuid ; + skos:prefLabel ?politiezoneLabel . + ?oldGoverningBody besluit:bestuurt ?politiezone ; + org:classification . # Politieraad + } + BIND(CONCAT("Politiecollege ", ?politiezoneLabel) AS ?newGoverningBodyLabel) + BIND(SHA256(CONCAT("politiecollege-", STR(?politiezoneUuid))) AS ?newGoverningBodyUuid) + BIND(IRI(CONCAT("http://data.lblod.info/id/bestuursorganen/", STR(?newGoverningBodyUuid))) AS ?newGoverningBody) + BIND(SHA256(CONCAT("politiecollege-timed-", STR(?politiezoneUuid))) AS ?newTimedGoverningBodyUuid) + BIND(IRI(CONCAT("http://data.lblod.info/id/bestuursorganen/", STR(?newTimedGoverningBodyUuid))) AS ?newTimedGoverningBody) +} From f46cd2012e0493feab19ef169497e4d3d3d92c70 Mon Sep 17 00:00:00 2001 From: Damon Date: Wed, 19 Aug 2026 16:10:56 +0200 Subject: [PATCH 2/5] OP-3867: fix to mandataris mapping query + backfil migration for stuck mandatarissen --- .../queries/dl2op/pass/mandataris.sparql | 4 +- ...uck-mandatarissen-from-landing-zone.sparql | 40 +++++++++++++++++++ 2 files changed, 42 insertions(+), 2 deletions(-) create mode 100644 config/migrations/2026/20260819145231-promote-stuck-mandatarissen-from-landing-zone.sparql diff --git a/config/delta-consumers/mandatarissen/mapping/queries/dl2op/pass/mandataris.sparql b/config/delta-consumers/mandatarissen/mapping/queries/dl2op/pass/mandataris.sparql index 0805d36..dd4ee07 100644 --- a/config/delta-consumers/mandatarissen/mapping/queries/dl2op/pass/mandataris.sparql +++ b/config/delta-consumers/mandatarissen/mapping/queries/dl2op/pass/mandataris.sparql @@ -8,10 +8,10 @@ CONSTRUCT { ?p ?o. ?orgaanInTime ?mandate ; - ?orgaan . + ?orgaan . ?orgaan ?bestuur . - ?bestuur ?classification . + ?bestuur ?classification . FILTER(?classification IN ( diff --git a/config/migrations/2026/20260819145231-promote-stuck-mandatarissen-from-landing-zone.sparql b/config/migrations/2026/20260819145231-promote-stuck-mandatarissen-from-landing-zone.sparql new file mode 100644 index 0000000..656b0d0 --- /dev/null +++ b/config/migrations/2026/20260819145231-promote-stuck-mandatarissen-from-landing-zone.sparql @@ -0,0 +1,40 @@ +PREFIX mandaat: +PREFIX generiek: +PREFIX org: +PREFIX besluit: + +INSERT { + GRAPH { + ?s ?p ?o. + } +} +WHERE { + GRAPH { + ?s a mandaat:Mandataris; + org:holds ?mandate; + ?p ?o. + } + + ?orgaanInTime org:hasPost ?mandate ; + generiek:isTijdspecialisatieVan ?orgaan . + + ?orgaan besluit:bestuurt ?bestuur . + ?bestuur org:classification ?classification . + + FILTER(?classification IN ( + , + , + , + + )) + + FILTER (?p NOT IN (mandaat:start, mandaat:einde)) + + FILTER NOT EXISTS { + ?s ?p "" . + } + + FILTER NOT EXISTS { + GRAPH { ?s org:holds ?mandate } + } +} From 072277e5456dd409fc9dabcf0411f6a2fab0475c Mon Sep 17 00:00:00 2001 From: Damon Date: Thu, 20 Aug 2026 13:29:35 +0200 Subject: [PATCH 3/5] frontend bump --- CHANGELOG.md | 1 + docker-compose.yml | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index cff6b9e..0dc39e8 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -25,6 +25,7 @@ - Keep werkingsgebied filter up to date via db-cleanup service [OP-3841] - Restrict available imam roles based on worship organisation status [DL-7485] - IMPORTANT NOTE: Make sure first the [DL-7485] loket migration has completed + data has flown from loket to OP +- Frontend [v1.41.1](https://github.com/lblod/frontend-organization-portal/blob/v1.41.1/CHANGELOG.md) [DL-7438] ### Deploy notes ``` diff --git a/docker-compose.yml b/docker-compose.yml index d10cf56..b1b6c4d 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -215,7 +215,7 @@ services: restart: always logging: *default-logging frontend: - image: lblod/frontend-organization-portal:1.41.0 + image: lblod/frontend-organization-portal:1.41.1 volumes: - ./config/frontend/add-x-frame-options-header.conf:/config/add-x-frame-options.conf environment: From 8413f79c178fd0b8667b930c65188f8881050eb9 Mon Sep 17 00:00:00 2001 From: Damon Date: Fri, 21 Aug 2026 11:28:42 +0200 Subject: [PATCH 4/5] OP-3867: changelog update --- CHANGELOG.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index cff6b9e..e7d99a7 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -25,6 +25,7 @@ - Keep werkingsgebied filter up to date via db-cleanup service [OP-3841] - Restrict available imam roles based on worship organisation status [DL-7485] - IMPORTANT NOTE: Make sure first the [DL-7485] loket migration has completed + data has flown from loket to OP +- Fix broken lmb mandataris mappin query [OP-3867] ### Deploy notes ``` @@ -67,6 +68,9 @@ drc restart cache resource drc restart migrations resource delta-producer-publication-graph-maintainer ``` +``` +drc restart migrations mandatarissen-consumer +``` ## v1.41.0 - added explicit healtchecks [DL-7466] From d34ccaafc89e5dffe0531d7fde6aaffb9df923cc Mon Sep 17 00:00:00 2001 From: Damon Date: Fri, 21 Aug 2026 14:09:55 +0200 Subject: [PATCH 5/5] DL-7473: bump construct service --- CHANGELOG.md | 2 +- docker-compose.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 67c24b5..5d9de9e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -28,7 +28,7 @@ - Frontend [v1.41.1](https://github.com/lblod/frontend-organization-portal/blob/v1.41.1/CHANGELOG.md) [DL-7438] - Fix broken lmb mandataris mappin query [OP-3867] - Add the value politiecollege to the existing dropdown list beslissingsorgaan [DL-7473] - - Bump construct-organization-relationships +- Bump construct-organization-relationships [DL-7473] ### Deploy notes ``` diff --git a/docker-compose.yml b/docker-compose.yml index b1b6c4d..29d2c73 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -308,7 +308,7 @@ services: restart: always logging: *default-logging construct-organization-relationships: - image: lblod/construct-organization-relationships-service:1.1.4 + image: lblod/construct-organization-relationships-service:1.2.0 links: - db:database labels: