fix: update label for locations to match their merged municipality

As part of the 2025 municipality mergers, three municipalities kept their URI but were renamed. This updates the labels for their scope of operation (nl. werkingsgebied) locations accordingly. This way the label of the location resources matches the name of the municipality administrative unit.
Merge pull request #551 from lblod/hotfix/add-vlaamse-regering-as-eenheid
2025-06-20 12:52:41 +02:00 · 2025-06-17 13:39:28 +02:00 · 2025-06-16 14:50:16 +02:00 · 2025-06-16 14:49:13 +02:00 · 2025-06-05 14:00:34 +02:00 · 2025-06-05 14:00:20 +02:00
11 changed files with 227 additions and 9 deletions
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,9 +1,47 @@
 # Changelog
 ## Unreleased

-## v1.32.0-0 (2025-05-23)
+## v1.33.2 (2025-06-20)
+### Backend
+- datafix: correct name for locations whose municipalities kept their URI in the 2025 mergers
+### Deploy notes
+```
+drc restart migrations-triggering-indexing && drc logs -ft --tail=200
+```
+
+## v1.33.1 (2025-06-16)
+### Backend
+- Added Vlaams Parlement as bestuurseenheid. [DL-6686]
+### Deploy Notes
+```
+drc restart migrations;
+drc exec delta-producer-background-jobs-initiator curl -X POST http://localhost/public/healing-jobs
+```
+
+## v1.33.0 (2025-06-05)
 ### Frontend
- Bump to version [v1.31.0-0](https://github.com/lblod/frontend-organization-portal/releases/tag/v1.31.0-0)
+- Bump to version [v1.32.0](https://github.com/lblod/frontend-organization-portal/releases/tag/v1.32.0)
+### Backend
+- datafix: move memberships involving provinces and municipalities to shared graph [OP-3619]
+### Deploy notes
+```
+drc restart migrations; drc logs -ft --tail=200 migrations
+drc exec db-cleanup curl -X POST "http://localhost/cleanup"
+drc pull frontend; drc up -d frontend
+```
+
+## v1.32.1 (2025-06-02)
+### Backend
+- Added Kabinet Crevits as bestuurseenheid. [DL-6655]
+### Deploy Notes
+```
+drc restart migrations;
+drc exec delta-producer-background-jobs-initiator curl -X POST http://localhost/public/healing-jobs
+```
+
+## v1.32.0 (2025-05-23)
+### Frontend
+- Bump to version [v1.31.0](https://github.com/lblod/frontend-organization-portal/releases/tag/v1.31.0)
 ### Backend
 - Fix KBO statuses not being displayed [OP-3584]
 - datafix: update NIS2019 end dates and link additional NIS2025 to werkingsgebieden [part of OP-3566]
@@ -21,6 +59,7 @@
 ```
 drc pull frontend; drc up -d frontend
 drc restart migrations; drc logs -ft --tail=200 migrations
+drc restart migrations-triggering-indexing && drc logs -ft --tail=200 migrations-triggering-indexing
 drc up -d kbo-data-sync
 drc exec kbo-data-sync curl -X POST http://localhost/sync-all-kbo-data

@@ -28,8 +67,6 @@ drc restart delta-producer-publication-graph-maintainer
 drc exec delta-producer-background-jobs-initiator curl -X POST http://localhost/public/healing-jobs # or wait until nightly healing kicks in
 drc exec delta-producer-background-jobs-initiator curl -X POST http://localhost/organizations/healing-jobs # or wait until nightly healing kicks in
 drc exec db-cleanup curl -X POST "http://localhost/cleanup"
-
-drc restart migrations-triggering-indexing && drc logs -ft --tail=200 migrations-triggering-indexing
 ```

 ## v1.31.3 (2025-05-08)
--- a/config/migrations-triggering-indexing/2025/20250619113048-fix--rename-locations-merged-municipalities-that-kept-uri.sparql
+++ b/config/migrations-triggering-indexing/2025/20250619113048-fix--rename-locations-merged-municipalities-that-kept-uri.sparql
@@ -0,0 +1,22 @@
+PREFIX rdfs: <http://www.w3.org/2000/01/rdf-schema#>
+PREFIX prov: <http://www.w3.org/ns/prov#>
+
+DELETE {
+  GRAPH <http://mu.semte.ch/graphs/public> {
+    ?scope rdfs:label ?oldLabel .
+  }
+} INSERT {
+  GRAPH <http://mu.semte.ch/graphs/public> {
+    ?scope rdfs:label ?newLabel .
+  }
+} WHERE {
+  GRAPH <http://mu.semte.ch/graphs/public> {
+    ?scope a prov:Location ;
+           rdfs:label ?oldLabel .
+    VALUES (?scope ?newLabel) {
+      (<http://data.lblod.info/id/werkingsgebieden/1f5dd7043ad54d07751da8689d5b47ad9ae0e52dccce8f00cc8debab35f8e2b2> "Bilzen-Hoeselt")
+      (<http://data.lblod.info/id/werkingsgebieden/fc34bb0a1dbf157ac5e5f8e657dd774210f03d2efa21370dd3b9a6342906c7ab> "Tessenderlo-Ham")
+      (<http://data.lblod.info/id/werkingsgebieden/fabec9e745fc9efa32afadd8b7268938805b9679dcf3b032c9b9a9a3530d6b59> "Tongeren-Borgloon")
+    }
+  }
+}
--- a/config/migrations/2025/20250602141402-add-kabinet-crevits.sparql
+++ b/config/migrations/2025/20250602141402-add-kabinet-crevits.sparql
@@ -0,0 +1,32 @@
+PREFIX rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#>
+PREFIX owl: <http://www.w3.org/2002/07/owl#>
+PREFIX dcterms: <http://purl.org/dc/terms/>
+PREFIX skos: <http://www.w3.org/2004/02/skos/core#>
+
+INSERT DATA {
+
+  GRAPH <http://mu.semte.ch/graphs/administrative-unit> {
+    <http://data.lblod.info/id/bestuurseenheden/a33d5059-d527-4c9a-a788-1b7f5c75d10e>
+        rdf:type  <http://www.w3.org/ns/org#Organization> , <http://data.vlaanderen.be/ns/besluit#Bestuurseenheid> , dcterms:Agent ;
+        owl:sameAs <http://data.vlaanderen.be/doc/organisatie/OVO053550> ;
+        <http://www.w3.org/ns/org#classification>  <http://data.vlaanderen.be/id/concept/BestuurseenheidClassificatieCode/52cc9d8d-1c9a-4d92-9936-da9d4a622ec4> ;
+        <http://www.w3.org/ns/org#linkedTo>  <http://data.lblod.info/id/bestuurseenheden/141d9d6b-54af-4d17-b313-8d1c30bc3f5b> ;
+        <http://mu.semte.ch/vocabularies/core/uuid>  "a33d5059-d527-4c9a-a788-1b7f5c75d10e" ;
+        skos:prefLabel	"Kabinet Crevits" ;
+        <http://www.w3.org/2004/02/skos/core#note> """This is a special case, we consider (for now) Kabinet Crevits as a bestuurseenheid, of org:classification ABB.""";
+        <http://www.w3.org/ns/adms#identifier>  <http://data.lblod.info/id/identificatoren/b53dc2b0-7fca-4c59-8f2a-276753edb81e> ;
+        <http://www.w3.org/ns/regorg#orgStatus>  <http://lblod.data.gift/concepts/63cc561de9188d64ba5840a42ae8f0d6> ;
+        <http://www.w3.org/ns/regorg#legalName>  "Kabinet Crevits" .
+
+    <http://data.lblod.info/id/identificatoren/b53dc2b0-7fca-4c59-8f2a-276753edb81e>
+      <https://data.vlaanderen.be/ns/generiek#gestructureerdeIdentificator>  <http://data.lblod.info/id/gestructureerdeIdentificator/aac3f5c0-e525-4cec-8432-2d59806661e5>;
+      <http://www.w3.org/1999/02/22-rdf-syntax-ns#type>  <http://www.w3.org/ns/adms#Identifier>;
+      <http://www.w3.org/2004/02/skos/core#notation>  "OVO-nummer" ;
+      <http://mu.semte.ch/vocabularies/core/uuid>  "b53dc2b0-7fca-4c59-8f2a-276753edb81e" .
+
+    <http://data.lblod.info/id/gestructureerdeIdentificator/aac3f5c0-e525-4cec-8432-2d59806661e5>
+      <http://mu.semte.ch/vocabularies/core/uuid>  "aac3f5c0-e525-4cec-8432-2d59806661e5";
+      <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <https://data.vlaanderen.be/ns/generiek#GestructureerdeIdentificator>;
+      <https://data.vlaanderen.be/ns/generiek#lokaleIdentificator>	"OVO053550" .
+  }
+}
--- a/config/migrations/2025/20250603161306-fix--move-memberships-for-municipalities-and-provinces-to-shared/20250603161306-fix--move-memberships-for-municipalities-and-provinces-to-shared.sparql
+++ b/config/migrations/2025/20250603161306-fix--move-memberships-for-municipalities-and-provinces-to-shared/20250603161306-fix--move-memberships-for-municipalities-and-provinces-to-shared.sparql
@@ -0,0 +1,24 @@
+PREFIX org: <http://www.w3.org/ns/org#>
+
+DELETE {
+  GRAPH <http://mu.semte.ch/graphs/administrative-unit> {
+    ?membership ?p ?o .
+    ?organization org:hasSubOrganization ?member .
+  }
+} INSERT {
+  GRAPH <http://mu.semte.ch/graphs/shared>{
+    ?membership ?p ?o .
+    ?organization org:hasSubOrganization ?member .
+  }
+} WHERE {
+  GRAPH <http://mu.semte.ch/graphs/administrative-unit> {
+    ?membership a org:Membership ;
+                org:member ?member ;
+                org:organization ?organization ;
+                ?p ?o .
+  }
+  GRAPH <http://mu.semte.ch/graphs/shared> {
+    ?member org:classification <http://data.vlaanderen.be/id/concept/BestuurseenheidClassificatieCode/5ab0e9b8a3b2ca7c5e000001> . # Municipality
+    ?organization org:classification <http://data.vlaanderen.be/id/concept/BestuurseenheidClassificatieCode/5ab0e9b8a3b2ca7c5e000000> . # Province
+  }
+}
--- a/config/migrations/2025/20250603161306-fix--move-memberships-for-municipalities-and-provinces-to-shared/20250603163337-feat--cleanup-job-insert-suborganization-province-municipality.graph
+++ b/config/migrations/2025/20250603161306-fix--move-memberships-for-municipalities-and-provinces-to-shared/20250603163337-feat--cleanup-job-insert-suborganization-province-municipality.graph
@@ -0,0 +1 @@
+http://mu.semte.ch/graphs/public
--- a/config/migrations/2025/20250603161306-fix--move-memberships-for-municipalities-and-provinces-to-shared/20250603163337-feat--cleanup-job-insert-suborganization-province-municipality.ttl
+++ b/config/migrations/2025/20250603161306-fix--move-memberships-for-municipalities-and-provinces-to-shared/20250603163337-feat--cleanup-job-insert-suborganization-province-municipality.ttl
@@ -0,0 +1,36 @@
+@prefix cleanup: <http://mu.semte.ch/vocabularies/ext/cleanup/> .
+@prefix mu: <http://mu.semte.ch/vocabularies/core/> .
+@prefix dcterms: <http://purl.org/dc/terms/> .
+
+# Insert triples of the form
+# <Province> <http://www.w3.org/ns/org#hasSubOrganization> <Municipality>
+# matching memberships for which no such triple exists.
+
+# Province: <http://data.vlaanderen.be/id/concept/BestuurseenheidClassificatieCode/5ab0e9b8a3b2ca7c5e000000>
+#
+# Municipality: <http://data.vlaanderen.be/id/concept/BestuurseenheidClassificatieCode/5ab0e9b8a3b2ca7c5e000001>
+
+<http://data.lblod.info/id/cleanup-job/0cc5e981-a61e-433e-b6f2-c59fd8599944> a cleanup:Job ;
+    mu:uuid "0cc5e981-a61e-433e-b6f2-c59fd8599944" ;
+    dcterms:title "Insert missing `org:hasSubOrganization` triples relating provinces and municipalities." ;
+    cleanup:randomQuery """
+      PREFIX org: <http://www.w3.org/ns/org#>
+
+      INSERT {
+        GRAPH <http://mu.semte.ch/graphs/shared> {
+          ?province org:hasSubOrganization ?municipality .
+        }
+      } WHERE {
+        GRAPH <http://mu.semte.ch/graphs/shared> {
+          ?membership a org:Membership ;
+            org:organization ?province ;
+            org:member ?municipality ;
+            org:role <http://data.lblod.info/id/rollen/4ec7d5c39bdc4e84b4174379b9e22ad8> .
+
+          FILTER NOT EXISTS { ?province org:hasSubOrganization ?municipality . }
+
+          ?municipality org:classification <http://data.vlaanderen.be/id/concept/BestuurseenheidClassificatieCode/5ab0e9b8a3b2ca7c5e000001> .
+          ?province org:classification <http://data.vlaanderen.be/id/concept/BestuurseenheidClassificatieCode/5ab0e9b8a3b2ca7c5e000000> .
+        }
+    }
+    """ .
--- a/config/migrations/2025/20250603161306-fix--move-memberships-for-municipalities-and-provinces-to-shared/20250603164149-feat--cleanup-job-delete-suborganization-province-municipality.graph
+++ b/config/migrations/2025/20250603161306-fix--move-memberships-for-municipalities-and-provinces-to-shared/20250603164149-feat--cleanup-job-delete-suborganization-province-municipality.graph
@@ -0,0 +1 @@
+http://mu.semte.ch/graphs/public
--- a/config/migrations/2025/20250603161306-fix--move-memberships-for-municipalities-and-provinces-to-shared/20250603164149-feat--cleanup-job-delete-suborganization-province-municipality.ttl
+++ b/config/migrations/2025/20250603161306-fix--move-memberships-for-municipalities-and-provinces-to-shared/20250603164149-feat--cleanup-job-delete-suborganization-province-municipality.ttl
@@ -0,0 +1,37 @@
+@prefix cleanup: <http://mu.semte.ch/vocabularies/ext/cleanup/> .
+@prefix mu: <http://mu.semte.ch/vocabularies/core/> .
+@prefix dcterms: <http://purl.org/dc/terms/> .
+
+# Delete triples of the form
+# <Province> <http://www.w3.org/ns/org#hasSubOrganization> <Municipality>
+# for which no matching membership exists.
+
+# Province: <http://data.vlaanderen.be/id/concept/BestuurseenheidClassificatieCode/5ab0e9b8a3b2ca7c5e000000>
+#
+# Municipality: <http://data.vlaanderen.be/id/concept/BestuurseenheidClassificatieCode/5ab0e9b8a3b2ca7c5e000001>
+
+<http://data.lblod.info/id/cleanup-job/7354dfd9-bdef-48d6-b81e-e814bd4f4e9c> a cleanup:Job ;
+    mu:uuid "7354dfd9-bdef-48d6-b81e-e814bd4f4e9c" ;
+    dcterms:title "Delete leftover `org:hasSubOrganization` triples between Provinces and municipalities." ;
+    cleanup:randomQuery """
+      PREFIX org: <http://www.w3.org/ns/org#>
+
+      DELETE {
+        GRAPH <http://mu.semte.ch/graphs/shared> {
+          ?province org:hasSubOrganization ?municipality .
+        }
+      } WHERE {
+        GRAPH <http://mu.semte.ch/graphs/shared> {
+          ?province org:hasSubOrganization ?municipality .
+          FILTER NOT EXISTS {
+            ?membership a org:Membership ;
+              org:organization ?province ;
+              org:member ?municipality ;
+              org:role <http://data.lblod.info/id/rollen/4ec7d5c39bdc4e84b4174379b9e22ad8> .
+          }
+
+          ?municipality org:classification <http://data.vlaanderen.be/id/concept/BestuurseenheidClassificatieCode/5ab0e9b8a3b2ca7c5e000001> .
+          ?province org:classification <http://data.vlaanderen.be/id/concept/BestuurseenheidClassificatieCode/5ab0e9b8a3b2ca7c5e000000> .
+      }
+    }
+    """ .
--- a/config/migrations/2025/20250616142232-add-vlaams-parlement.sparql
+++ b/config/migrations/2025/20250616142232-add-vlaams-parlement.sparql
@@ -0,0 +1,32 @@
+PREFIX rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#>
+PREFIX owl: <http://www.w3.org/2002/07/owl#>
+PREFIX dcterms: <http://purl.org/dc/terms/>
+PREFIX skos: <http://www.w3.org/2004/02/skos/core#>
+
+INSERT DATA {
+
+  GRAPH <http://mu.semte.ch/graphs/administrative-unit> {
+    <http://data.lblod.info/id/bestuurseenheden/862d7e64-fa34-4cd8-a948-00327c6260a6>
+        rdf:type  <http://www.w3.org/ns/org#Organization> , <http://data.vlaanderen.be/ns/besluit#Bestuurseenheid> , dcterms:Agent ;
+        owl:sameAs <http://data.vlaanderen.be/doc/organisatie/OVO000617> ;
+        <http://www.w3.org/ns/org#classification>  <http://data.vlaanderen.be/id/concept/BestuurseenheidClassificatieCode/52cc9d8d-1c9a-4d92-9936-da9d4a622ec4> ;
+        <http://www.w3.org/ns/org#linkedTo>  <http://data.lblod.info/id/bestuurseenheden/141d9d6b-54af-4d17-b313-8d1c30bc3f5b> ;
+        <http://mu.semte.ch/vocabularies/core/uuid>  "862d7e64-fa34-4cd8-a948-00327c6260a6" ;
+        skos:prefLabel	"Vlaams Parlement" ;
+        <http://www.w3.org/2004/02/skos/core#note> """This is a special case, we consider (for now) Vlaams Parlement as a bestuurseenheid, of org:classification ABB.""";
+        <http://www.w3.org/ns/adms#identifier>  <http://data.lblod.info/id/identificatoren/a03f0b48-1a6d-40af-84eb-5aee7b757986> ;
+        <http://www.w3.org/ns/regorg#orgStatus>  <http://lblod.data.gift/concepts/63cc561de9188d64ba5840a42ae8f0d6> ;
+        <http://www.w3.org/ns/regorg#legalName>  "Vlaams Parlement" .
+
+    <http://data.lblod.info/id/identificatoren/a03f0b48-1a6d-40af-84eb-5aee7b757986>
+      <https://data.vlaanderen.be/ns/generiek#gestructureerdeIdentificator>  <http://data.lblod.info/id/gestructureerdeIdentificator/666c8cb7-030b-4e28-9042-82ac685684b9>;
+      <http://www.w3.org/1999/02/22-rdf-syntax-ns#type>  <http://www.w3.org/ns/adms#Identifier>;
+      <http://www.w3.org/2004/02/skos/core#notation>  "OVO-nummer" ;
+      <http://mu.semte.ch/vocabularies/core/uuid>  "a03f0b48-1a6d-40af-84eb-5aee7b757986" .
+
+    <http://data.lblod.info/id/gestructureerdeIdentificator/666c8cb7-030b-4e28-9042-82ac685684b9>
+      <http://mu.semte.ch/vocabularies/core/uuid>  "666c8cb7-030b-4e28-9042-82ac685684b9";
+      <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <https://data.vlaanderen.be/ns/generiek#GestructureerdeIdentificator>;
+      <https://data.vlaanderen.be/ns/generiek#lokaleIdentificator>	"OVO000617" .
+  }
+}
--- a/docker-compose.dev.yml
+++ b/docker-compose.dev.yml
@@ -1,5 +1,3 @@
-version: "3.4"
-
 services:
  identifier:
    restart: "no"
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -1,5 +1,3 @@
-version: "3.4"
-
 x-logging: &default-logging
  driver: "json-file"
  options:
@@ -196,7 +194,7 @@ services:
    restart: always
    logging: *default-logging
  frontend:
-    image: lblod/frontend-organization-portal:1.31.0-0
+    image: lblod/frontend-organization-portal:1.32.0
    volumes:
      - ./config/frontend/add-x-frame-options-header.conf:/config/add-x-frame-options.conf
    environment:
Author	SHA1	Message	Date
mirdono	b31d6c65e6	fix: update label for locations to match their merged municipality As part of the 2025 municipality mergers, three municipalities kept their URI but were renamed. This updates the labels for their scope of operation (nl. werkingsgebied) locations accordingly. This way the label of the location resources matches the name of the municipality administrative unit.	2025-06-20 12:52:41 +02:00
cecemel	c77f1e9139	Merge pull request #551 from lblod/hotfix/add-vlaamse-regering-as-eenheid Hotfix/add vlaamse regering as eenheid	2025-06-17 13:39:28 +02:00
felix	8a76be40e8	Release v1.33.1	2025-06-16 14:50:16 +02:00
felix	3dffca6623	Added migration for Vlaams Parlement Note: `<http://mu.semte.ch/graphs/shared>` is only needed when data needs to be availible to worship and non-worship users	2025-06-16 14:49:13 +02:00
mirdono	f6fe8ac87d	chore: update changelog	2025-06-05 14:00:34 +02:00
mirdono	7defbf9009	chore: bump frontend	2025-06-05 14:00:20 +02:00
mirdono	5f1bfe96c7	feat: cleanup jobs municipality and province relations Add cleanup jobs to automatically insert and delete `org:hasSubOrganization` relations between provinces and municipalities. These memberships were moved to the `shared` graph causing the existing cleanup jobs to no longer work for them.	2025-06-04 11:41:21 +02:00
mirdono	d2ec188373	fix: relate provinces and municipalities in shared graph The frontend relies on the memberships relating municipalities and province to - automatically select the appropriate province given a municipality; and - limit the municipality options to those in a given province. This kind of functionality is used in both the worship and non-worship module so the data should be readable by users with either roles. This moves the appropriate data the `shared` graph, which can be read by all authenticated users. Thereby fixing that that functionality was broken for users with the worship role.	2025-06-04 11:41:21 +02:00
mirdono	9515aec9ad	Merge branch 'master' into development	2025-06-04 11:40:58 +02:00
cecemel	d4cd0d5cbd	Hotfix/add kabinet crevits as eenheid (#548 ) * Added migration for Kabinet Crevits Note: `<http://mu.semte.ch/graphs/shared>` is only needed when data needs to be availible to worship and non-worship users * Update CHANGELOG.md	2025-06-02 16:46:51 +02:00
mirdono	6036b030c1	Merge branch 'master' into development	2025-05-23 18:12:40 +02:00
mirdono	d3420cf935	chore: set correct release version	2025-05-23 18:08:27 +02:00
mirdono	f2a65697db	chore: remove deprecated version from docker compose configurations The version property has been deprecated for a while. Now that the servers are on a recent version of docker compose these can be removed from our configurations. This avoids that the warnings are shown each time.	2025-05-23 14:40:09 +02:00
mirdono	f279c1dba5	chore: bump frontend to latest release	2025-05-23 14:19:28 +02:00
mirdono	d0d3440338	chore: adjust order of commands in deploy notes This simplifies deploying the release correctly as it decreases the chance of missing a command.	2025-05-23 14:16:28 +02:00