From a8f8eb9a3cb3710382bd25d512449d7f525f60dd Mon Sep 17 00:00:00 2001 From: Damon Date: Mon, 29 Jun 2026 15:54:23 +0200 Subject: [PATCH 1/5] OP-3810: edit dispatcher config --- config/dispatcher/dispatcher.ex | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/dispatcher/dispatcher.ex b/config/dispatcher/dispatcher.ex index 7fc74a4..b92cbef 100644 --- a/config/dispatcher/dispatcher.ex +++ b/config/dispatcher/dispatcher.ex @@ -386,7 +386,7 @@ defmodule Dispatcher do layer: :api_services, accept: %{json: true} } do - forward(conn, path, "http://construct-organization-relationships/create-relationships/") + forward(conn, path, "http://construct-organization-relationships/") end post "/kbo-data-sync/*path", %{layer: :api_services, accept: %{json: true}} do From bd81e44662692112f540ee8ed34299233e0ade4a Mon Sep 17 00:00:00 2001 From: Damon Date: Thu, 2 Jul 2026 16:37:54 +0200 Subject: [PATCH 2/5] OP-3810: added migration to handle in oprichting erediensten + changelog edit --- CHANGELOG.md | 3 +- ...anup-in-oprichting-worship-services.sparql | 85 +++++++++++++++++++ 2 files changed, 87 insertions(+), 1 deletion(-) create mode 100644 config/migrations/2026/20260630100000-cleanup-in-oprichting-worship-services.sparql diff --git a/CHANGELOG.md b/CHANGELOG.md index a24611b..aa8619b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,10 +6,11 @@ - Frontend [v1.38.0] - Added Juridische vorm [OP-3816] [OP-3820] - Frontend [v1.39.0] +- "In Oprichting" bestuursorgaan lifecycle [OP-3810] ### Deploy notes ``` -drc up -d link-adressenregister-uri frontend +drc up -d link-adressenregister-uri frontend construct-organization-relationships dispatcher drc restart resource migrations ``` diff --git a/config/migrations/2026/20260630100000-cleanup-in-oprichting-worship-services.sparql b/config/migrations/2026/20260630100000-cleanup-in-oprichting-worship-services.sparql new file mode 100644 index 0000000..2518fa7 --- /dev/null +++ b/config/migrations/2026/20260630100000-cleanup-in-oprichting-worship-services.sparql @@ -0,0 +1,85 @@ +PREFIX mandaat: +PREFIX ere: +PREFIX besluit: +PREFIX generiek: +PREFIX regorg: +PREFIX org: + +DELETE { + GRAPH { + ?otherOrgaanInTime ?p ?o . + ?s ?p2 ?otherOrgaanInTime . + } +} +WHERE { + GRAPH { + ?worshipService a ere:BestuurVanDeEredienst ; + regorg:orgStatus . + + ?bestuursorgaan besluit:bestuurt ?worshipService . + + ?otherOrgaanInTime generiek:isTijdspecialisatieVan ?bestuursorgaan . + + { + SELECT ?bestuursorgaan (SAMPLE(?orgaanInTime) AS ?keptOrgaanInTime) { + GRAPH { + ?orgaanInTime generiek:isTijdspecialisatieVan ?bestuursorgaan . + } + } + GROUP BY ?bestuursorgaan + } + + FILTER(?otherOrgaanInTime != ?keptOrgaanInTime) + + { ?otherOrgaanInTime ?p ?o . } + UNION + { ?s ?p2 ?otherOrgaanInTime . } + } +}; + +DELETE { + GRAPH { + ?mandate ?p ?o . + ?s ?p2 ?mandate . + } +} +WHERE { + GRAPH { + ?worshipService a ere:BestuurVanDeEredienst ; + regorg:orgStatus . + + ?bestuursorgaan besluit:bestuurt ?worshipService . + ?orgaanInTime generiek:isTijdspecialisatieVan ?bestuursorgaan . + + ?orgaanInTime org:hasPost ?mandate . + ?mandate a mandaat:Mandaat ; + org:role ?role . + + FILTER(?role NOT IN ( + , + , + + )) + + { ?mandate ?p ?o . } + UNION + { ?s ?p2 ?mandate . } + } +}; + +DELETE { + GRAPH { + ?orgaanInTime mandaat:bindingEinde ?endDate . + } +} +WHERE { + GRAPH { + ?worshipService a ere:BestuurVanDeEredienst ; + regorg:orgStatus . + + ?bestuursorgaan besluit:bestuurt ?worshipService . + ?orgaanInTime generiek:isTijdspecialisatieVan ?bestuursorgaan . + + ?orgaanInTime mandaat:bindingEinde ?endDate . + } +}; From 1a4453365fedd3be5dc41687a1a88d22258f3bb9 Mon Sep 17 00:00:00 2001 From: Damon Date: Thu, 2 Jul 2026 16:38:55 +0200 Subject: [PATCH 3/5] changelog --- CHANGELOG.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index aa8619b..c7279e5 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -10,8 +10,8 @@ ### Deploy notes ``` -drc up -d link-adressenregister-uri frontend construct-organization-relationships dispatcher -drc restart resource migrations +drc up -d link-adressenregister-uri frontend construct-organization-relationships +drc restart resource migrations dispatcher ``` ``` From f545b55075c2897f4d266fc0aadba445ecf66833 Mon Sep 17 00:00:00 2001 From: Damon Date: Tue, 7 Jul 2026 16:27:24 +0200 Subject: [PATCH 4/5] OP-3810: cleanup migration to keep currently active orgaan + remove mandates from removed organen --- ...eanup-in-oprichting-worship-services.sparql | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) diff --git a/config/migrations/2026/20260630100000-cleanup-in-oprichting-worship-services.sparql b/config/migrations/2026/20260630100000-cleanup-in-oprichting-worship-services.sparql index 2518fa7..70ba656 100644 --- a/config/migrations/2026/20260630100000-cleanup-in-oprichting-worship-services.sparql +++ b/config/migrations/2026/20260630100000-cleanup-in-oprichting-worship-services.sparql @@ -9,6 +9,8 @@ DELETE { GRAPH { ?otherOrgaanInTime ?p ?o . ?s ?p2 ?otherOrgaanInTime . + ?mandate ?mp ?mo . + ?ms ?mp2 ?mandate . } } WHERE { @@ -18,22 +20,30 @@ WHERE { ?bestuursorgaan besluit:bestuurt ?worshipService . - ?otherOrgaanInTime generiek:isTijdspecialisatieVan ?bestuursorgaan . - { - SELECT ?bestuursorgaan (SAMPLE(?orgaanInTime) AS ?keptOrgaanInTime) { + SELECT ?bestuursorgaan (MAX(?start) AS ?keptStart) { GRAPH { - ?orgaanInTime generiek:isTijdspecialisatieVan ?bestuursorgaan . + ?orgaanInTime generiek:isTijdspecialisatieVan ?bestuursorgaan ; + mandaat:bindingStart ?start . + FILTER(?start <= NOW()) } } GROUP BY ?bestuursorgaan } + ?keptOrgaanInTime generiek:isTijdspecialisatieVan ?bestuursorgaan ; + mandaat:bindingStart ?keptStart . + + ?otherOrgaanInTime generiek:isTijdspecialisatieVan ?bestuursorgaan . FILTER(?otherOrgaanInTime != ?keptOrgaanInTime) { ?otherOrgaanInTime ?p ?o . } UNION { ?s ?p2 ?otherOrgaanInTime . } + UNION + { ?otherOrgaanInTime org:hasPost ?mandate . ?mandate ?mp ?mo . } + UNION + { ?otherOrgaanInTime org:hasPost ?mandate . ?ms ?mp2 ?mandate . } } }; From f5a0a73812aab354cb8589a7cb1e4e68e5b1758c Mon Sep 17 00:00:00 2001 From: Damon Date: Thu, 9 Jul 2026 14:29:02 +0200 Subject: [PATCH 5/5] OP-3810: changelog edit --- CHANGELOG.md | 3 ++- docker-compose.yml | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 98ec610..f8125e2 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,10 +3,11 @@ - Added service to link addresses to addressregister uris [OP-3795] - Derive an organization's reference region(s) from its werkingsgebied; bump scope-of-operation to 0.2.0 [OP-3799] - Site type changes [OP-3818] -- Frontend [v1.40.0](https://github.com/lblod/frontend-organization-portal/blob/5d2147662f620d420f54b9624a12c42ca2ac964a/CHANGELOG.md#v1400-2026-07-06), [v1.39.0](https://github.com/lblod/frontend-organization-portal/blob/5d2147662f620d420f54b9624a12c42ca2ac964a/CHANGELOG.md#v1390-2026-06-25) ,[v1.38.0](https://github.com/lblod/frontend-organization-portal/blob/5d2147662f620d420f54b9624a12c42ca2ac964a/CHANGELOG.md#v1380-2026-06-12) +- Frontend [v1.40.1](https://github.com/lblod/frontend-organization-portal/blob/v1.40.1/CHANGELOG.md), [v1.40.0](https://github.com/lblod/frontend-organization-portal/blob/5d2147662f620d420f54b9624a12c42ca2ac964a/CHANGELOG.md#v1400-2026-07-06), [v1.39.0](https://github.com/lblod/frontend-organization-portal/blob/5d2147662f620d420f54b9624a12c42ca2ac964a/CHANGELOG.md#v1390-2026-06-25) ,[v1.38.0](https://github.com/lblod/frontend-organization-portal/blob/5d2147662f620d420f54b9624a12c42ca2ac964a/CHANGELOG.md#v1380-2026-06-12) - Added Juridische vorm [OP-3816] [OP-3820] - Add new organization types (interlokale vereniging, vervoerregioraad, zorgraad, bosgroep, woonmaatschappij); add werkingsgebied (dct:spatial) to registered organizations [OP-3828] - Rename generic organization types to "Vereniging algemeen" / "Vennootschap algemeen" [OP-3828] +- bump construct-organization-relationships [OP-3810] - "In Oprichting" bestuursorgaan lifecycle [OP-3810] ### Deploy notes diff --git a/docker-compose.yml b/docker-compose.yml index 05b72e6..1f6272e 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.40.0 + image: lblod/frontend-organization-portal:1.40.1 volumes: - ./config/frontend/add-x-frame-options-header.conf:/config/add-x-frame-options.conf environment: @@ -308,7 +308,7 @@ services: restart: always logging: *default-logging construct-organization-relationships: - image: lblod/construct-organization-relationships-service:1.1.2 + image: lblod/construct-organization-relationships-service:1.1.3 links: - db:database labels: