From a7eceb44bfefec7e28ed47a14acab4924c605d1c Mon Sep 17 00:00:00 2001 From: Boris De Vloed Date: Fri, 24 Jul 2026 13:40:00 +0200 Subject: [PATCH 1/3] OP-3844: add Regionaal zorgplatform + Andere codes, move legacy 'other' orgs to Andere --- CHANGELOG.md | 11 ++++++ ...orm-and-andere-classification-codes.sparql | 25 +++++++++++++ .../20260714162300-move-orgs-to-andere.sparql | 36 +++++++++++++++++++ ...e-legacy-other-classification-codes.sparql | 27 ++++++++++++++ 4 files changed, 99 insertions(+) create mode 100644 config/migrations-triggering-indexing/2026/20260714162242-restructure-other-org-types/20260714162242-add-zorgplatform-and-andere-classification-codes.sparql create mode 100644 config/migrations-triggering-indexing/2026/20260714162242-restructure-other-org-types/20260714162300-move-orgs-to-andere.sparql create mode 100644 config/migrations-triggering-indexing/2026/20260714162242-restructure-other-org-types/20260714162400-delete-legacy-other-classification-codes.sparql diff --git a/CHANGELOG.md b/CHANGELOG.md index ca1dfd7..2984659 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -12,6 +12,9 @@ - Added "werkingsgebied" filter [OP-3812] - Inhoudelijk thema [OP-3817] - Werkingsgebied (dct:spatial) for private OCMW associations [OP-3832] +- Add organization types "Regionaal zorgplatform" (altLabel "Regionale zorgzone") and residual "Andere" [OP-3844] +- Move organizations from "Vereniging algemeen" / "Vennootschap algemeen" / "Energieholdings en -participaties" to "Andere"; delete those codes [OP-3844] +- Bump construct-organization-relationships [OP-3844] ### Deploy notes ``` @@ -45,6 +48,14 @@ drc up -d frontend /bin/bash scripts/reset-elastic.sh ``` +``` +# requires compose bumps first: construct-organization-relationships 1.1.4, frontend >= 1.40.3 +drc pull construct-organization-relationships && drc up -d construct-organization-relationships +drc restart migrations-triggering-indexing +drc up -d frontend +drc restart cache resource +``` + ## v1.40.0 - Query to check missing address URI's [OP-3784] - Create new query 'organisations shown in OP frontend' in Dashboard [OP-3774] diff --git a/config/migrations-triggering-indexing/2026/20260714162242-restructure-other-org-types/20260714162242-add-zorgplatform-and-andere-classification-codes.sparql b/config/migrations-triggering-indexing/2026/20260714162242-restructure-other-org-types/20260714162242-add-zorgplatform-and-andere-classification-codes.sparql new file mode 100644 index 0000000..3894671 --- /dev/null +++ b/config/migrations-triggering-indexing/2026/20260714162242-restructure-other-org-types/20260714162242-add-zorgplatform-and-andere-classification-codes.sparql @@ -0,0 +1,25 @@ +PREFIX rdf: +PREFIX skos: +PREFIX mu: +PREFIX ext: +PREFIX scheme: + +INSERT DATA { + GRAPH { + + rdf:type ext:OrganizationClassificationCode , ext:GeregistreerdeOrganisatieClassificatieCode ; + mu:uuid "e3afe092-6ca6-4685-94c6-1ee20811efc4" ; + skos:prefLabel "Regionaal zorgplatform" ; + skos:altLabel "Regionale zorgzone" ; + skos:topConceptOf scheme:GeregistreerdeOrganisatieClassificatieCode ; + skos:inScheme scheme:GeregistreerdeOrganisatieClassificatieCode , . + + + rdf:type ext:OrganizationClassificationCode , ext:GeregistreerdeOrganisatieClassificatieCode ; + mu:uuid "7a199d27-31c3-44bb-a58f-b3a64673a8b6" ; + skos:prefLabel "Andere" ; + skos:definition "Restcategorie: geregistreerde organisatie die niet onder een van de andere classificaties valt." ; + skos:topConceptOf scheme:GeregistreerdeOrganisatieClassificatieCode ; + skos:inScheme scheme:GeregistreerdeOrganisatieClassificatieCode , . + } +} diff --git a/config/migrations-triggering-indexing/2026/20260714162242-restructure-other-org-types/20260714162300-move-orgs-to-andere.sparql b/config/migrations-triggering-indexing/2026/20260714162242-restructure-other-org-types/20260714162300-move-orgs-to-andere.sparql new file mode 100644 index 0000000..18cef29 --- /dev/null +++ b/config/migrations-triggering-indexing/2026/20260714162242-restructure-other-org-types/20260714162300-move-orgs-to-andere.sparql @@ -0,0 +1,36 @@ +PREFIX org: +PREFIX skos: +PREFIX ext: + +DELETE { + GRAPH ?g { ?org org:classification ?legacy . } +} +INSERT { + GRAPH ?g { ?org org:classification . } +} +WHERE { + BIND( AS ?g) + VALUES ?legacy { + + + } + GRAPH ?g { ?org org:classification ?legacy . } +} + +; + +DELETE { + GRAPH ?g { ?org org:classification ?legacy . } +} +INSERT { + GRAPH ?g { ?org org:classification . } +} +WHERE { + BIND( AS ?g) + GRAPH { + ?legacy a ext:OrganizationClassificationCode ; + skos:prefLabel ?label . + FILTER(REGEX(STR(?label), "^Energieholding", "i")) + } + GRAPH ?g { ?org org:classification ?legacy . } +} diff --git a/config/migrations-triggering-indexing/2026/20260714162242-restructure-other-org-types/20260714162400-delete-legacy-other-classification-codes.sparql b/config/migrations-triggering-indexing/2026/20260714162242-restructure-other-org-types/20260714162400-delete-legacy-other-classification-codes.sparql new file mode 100644 index 0000000..62553a6 --- /dev/null +++ b/config/migrations-triggering-indexing/2026/20260714162242-restructure-other-org-types/20260714162400-delete-legacy-other-classification-codes.sparql @@ -0,0 +1,27 @@ +PREFIX skos: +PREFIX ext: + +DELETE { + GRAPH { ?code ?p ?o . } +} +WHERE { + VALUES ?code { + + + } + GRAPH { ?code ?p ?o . } +} + +; + +DELETE { + GRAPH { ?code ?p ?o . } +} +WHERE { + GRAPH { + ?code a ext:OrganizationClassificationCode ; + skos:prefLabel ?label . + FILTER(REGEX(STR(?label), "^Energieholding", "i")) + ?code ?p ?o . + } +} From 7da8c4a1db74648f09c4e08c755d488c6a96feed Mon Sep 17 00:00:00 2001 From: Boris De Vloed Date: Thu, 6 Aug 2026 13:44:13 +0200 Subject: [PATCH 2/3] OP-3844: address review: bump construct-organization-relationships to 1.1.4, cover all org graphs in move, drop Energieholding statements --- CHANGELOG.md | 5 ++-- .../20260714162300-move-orgs-to-andere.sparql | 26 +++++-------------- ...e-legacy-other-classification-codes.sparql | 14 ---------- docker-compose.yml | 2 +- 4 files changed, 11 insertions(+), 36 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 2984659..af2dd66 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -13,7 +13,7 @@ - Inhoudelijk thema [OP-3817] - Werkingsgebied (dct:spatial) for private OCMW associations [OP-3832] - Add organization types "Regionaal zorgplatform" (altLabel "Regionale zorgzone") and residual "Andere" [OP-3844] -- Move organizations from "Vereniging algemeen" / "Vennootschap algemeen" / "Energieholdings en -participaties" to "Andere"; delete those codes [OP-3844] +- Move organizations from "Vereniging algemeen" / "Vennootschap algemeen" to "Andere"; delete those codes [OP-3844] - Bump construct-organization-relationships [OP-3844] ### Deploy notes @@ -49,7 +49,8 @@ drc up -d frontend ``` ``` -# requires compose bumps first: construct-organization-relationships 1.1.4, frontend >= 1.40.3 +# requires: construct-organization-relationships v1.1.4 released (bumped in compose here), +# and frontend bumped to the release containing frontend-organization-portal#720 drc pull construct-organization-relationships && drc up -d construct-organization-relationships drc restart migrations-triggering-indexing drc up -d frontend diff --git a/config/migrations-triggering-indexing/2026/20260714162242-restructure-other-org-types/20260714162300-move-orgs-to-andere.sparql b/config/migrations-triggering-indexing/2026/20260714162242-restructure-other-org-types/20260714162300-move-orgs-to-andere.sparql index 18cef29..ba5fc26 100644 --- a/config/migrations-triggering-indexing/2026/20260714162242-restructure-other-org-types/20260714162300-move-orgs-to-andere.sparql +++ b/config/migrations-triggering-indexing/2026/20260714162242-restructure-other-org-types/20260714162300-move-orgs-to-andere.sparql @@ -2,6 +2,8 @@ PREFIX org: PREFIX skos: PREFIX ext: +# All graphs authorized for regorg:RegisteredOrganization (see config/authorization/config.lisp), +# so no dangling org:classification survives the code deletion in the next migration. DELETE { GRAPH ?g { ?org org:classification ?legacy . } } @@ -9,28 +11,14 @@ INSERT { GRAPH ?g { ?org org:classification . } } WHERE { - BIND( AS ?g) + VALUES ?g { + + + + } VALUES ?legacy { } GRAPH ?g { ?org org:classification ?legacy . } } - -; - -DELETE { - GRAPH ?g { ?org org:classification ?legacy . } -} -INSERT { - GRAPH ?g { ?org org:classification . } -} -WHERE { - BIND( AS ?g) - GRAPH { - ?legacy a ext:OrganizationClassificationCode ; - skos:prefLabel ?label . - FILTER(REGEX(STR(?label), "^Energieholding", "i")) - } - GRAPH ?g { ?org org:classification ?legacy . } -} diff --git a/config/migrations-triggering-indexing/2026/20260714162242-restructure-other-org-types/20260714162400-delete-legacy-other-classification-codes.sparql b/config/migrations-triggering-indexing/2026/20260714162242-restructure-other-org-types/20260714162400-delete-legacy-other-classification-codes.sparql index 62553a6..56b577c 100644 --- a/config/migrations-triggering-indexing/2026/20260714162242-restructure-other-org-types/20260714162400-delete-legacy-other-classification-codes.sparql +++ b/config/migrations-triggering-indexing/2026/20260714162242-restructure-other-org-types/20260714162400-delete-legacy-other-classification-codes.sparql @@ -11,17 +11,3 @@ WHERE { } GRAPH { ?code ?p ?o . } } - -; - -DELETE { - GRAPH { ?code ?p ?o . } -} -WHERE { - GRAPH { - ?code a ext:OrganizationClassificationCode ; - skos:prefLabel ?label . - FILTER(REGEX(STR(?label), "^Energieholding", "i")) - ?code ?p ?o . - } -} diff --git a/docker-compose.yml b/docker-compose.yml index f848133..88e8263 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.3 + image: lblod/construct-organization-relationships-service:1.1.4 links: - db:database labels: From 96b8e58b4fc4faa85e7cb379cf2adda3ffcaa128 Mon Sep 17 00:00:00 2001 From: Boris De Vloed Date: Fri, 7 Aug 2026 13:46:22 +0200 Subject: [PATCH 3/3] OP-3844: bump frontend to 1.40.5 --- CHANGELOG.md | 4 ++-- docker-compose.yml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 93148f4..575d963 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -19,6 +19,7 @@ - Add organization types "Regionaal zorgplatform" (altLabel "Regionale zorgzone") and residual "Andere" [OP-3844] - Move organizations from "Vereniging algemeen" / "Vennootschap algemeen" to "Andere"; delete those codes [OP-3844] - Bump construct-organization-relationships [OP-3844] +- Frontend [v1.40.5](https://github.com/lblod/frontend-organization-portal/blob/v1.40.5/CHANGELOG.md) [OP-3844] [OP-3808] [OP-3849] ### Deploy notes ``` @@ -46,8 +47,7 @@ drc up -d frontend ``` ``` -# requires: construct-organization-relationships v1.1.4 released (bumped in compose here), -# and frontend bumped to the release containing frontend-organization-portal#720 +# requires frontend >= 1.40.5 and construct-organization-relationships >= 1.1.4 (both bumped in compose here) drc pull construct-organization-relationships && drc up -d construct-organization-relationships drc restart migrations-triggering-indexing drc up -d frontend diff --git a/docker-compose.yml b/docker-compose.yml index fa35bb6..4fa6b2f 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.4 + image: lblod/frontend-organization-portal:1.40.5 volumes: - ./config/frontend/add-x-frame-options-header.conf:/config/add-x-frame-options.conf environment: