From 8db6b703bd48f0fcd2f1852af281ed32002b69a8 Mon Sep 17 00:00:00 2001 From: Damon Date: Thu, 16 Jul 2026 15:21:51 +0200 Subject: [PATCH 1/3] OP-3832: Added the new spatial werkingsgebied to producers and search + migration to backfill existing orgs --- CHANGELOG.md | 8 +++++ .../organizations-public-info/export.json | 2 +- .../delta-producer/organizations/export.json | 2 +- config/delta-producer/public/export.json | 2 +- ...ngsgebied-private-ocmw-associations.sparql | 36 +++++++++++++++++++ config/search/config.json | 13 +++++++ 6 files changed, 60 insertions(+), 3 deletions(-) create mode 100644 config/migrations/2026/20260716140000-add-werkingsgebied-private-ocmw-associations.sparql diff --git a/CHANGELOG.md b/CHANGELOG.md index e6d6860..abfaf86 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -11,6 +11,7 @@ - "In Oprichting" bestuursorgaan lifecycle [OP-3810] - Added "werkingsgebied" filter [OP-3812] - Inhoudelijk thema [OP-3817] +- Werkingsgebied (dct:spatial) for private OCMW associations [OP-3832] ### Deploy notes ``` @@ -36,6 +37,13 @@ drc restart migrations frontend db resource cache /bin/bash scripts/reset-elastic.sh ``` +``` +drc restart migrations search +drc up -d frontend +# reindex elastic search: +/bin/bash scripts/reset-elastic.sh +``` + ## 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/delta-producer/organizations-public-info/export.json b/config/delta-producer/organizations-public-info/export.json index e3ca489..cc569c1 100644 --- a/config/delta-producer/organizations-public-info/export.json +++ b/config/delta-producer/organizations-public-info/export.json @@ -108,7 +108,7 @@ "graphsFilter": ["http://mu.semte.ch/graphs/administrative-unit"], "properties": [ "http://mu.semte.ch/vocabularies/core/uuid", - "http://data.vlaanderen.be/ns/besluit#werkingsgebied", + "http://purl.org/dc/terms/spatial", "http://www.opengis.net/ont/geosparql#sfWithin", "http://www.w3.org/2002/07/owl#sameAs", "http://www.w3.org/2004/02/skos/core#altLabel", diff --git a/config/delta-producer/organizations/export.json b/config/delta-producer/organizations/export.json index 47190f2..3c68e81 100644 --- a/config/delta-producer/organizations/export.json +++ b/config/delta-producer/organizations/export.json @@ -240,7 +240,7 @@ ], "properties": [ "http://mu.semte.ch/vocabularies/core/uuid", - "http://data.vlaanderen.be/ns/besluit#werkingsgebied", + "http://purl.org/dc/terms/spatial", "http://www.opengis.net/ont/geosparql#sfWithin", "http://www.w3.org/2002/07/owl#sameAs", "http://www.w3.org/2004/02/skos/core#altLabel", diff --git a/config/delta-producer/public/export.json b/config/delta-producer/public/export.json index b34ea6f..ca34f41 100644 --- a/config/delta-producer/public/export.json +++ b/config/delta-producer/public/export.json @@ -126,7 +126,7 @@ ], "properties": [ "http://mu.semte.ch/vocabularies/core/uuid", - "http://data.vlaanderen.be/ns/besluit#werkingsgebied", + "http://purl.org/dc/terms/spatial", "http://www.opengis.net/ont/geosparql#sfWithin", "http://www.w3.org/2002/07/owl#sameAs", "http://www.w3.org/2004/02/skos/core#altLabel", diff --git a/config/migrations/2026/20260716140000-add-werkingsgebied-private-ocmw-associations.sparql b/config/migrations/2026/20260716140000-add-werkingsgebied-private-ocmw-associations.sparql new file mode 100644 index 0000000..e22652f --- /dev/null +++ b/config/migrations/2026/20260716140000-add-werkingsgebied-private-ocmw-associations.sparql @@ -0,0 +1,36 @@ +PREFIX org: +PREFIX skos: +PREFIX organisatie: +PREFIX adres: +PREFIX besluit: +PREFIX dct: + +INSERT { + GRAPH { + ?org dct:spatial ?werkingsgebied . + } +} WHERE { + VALUES ?classification { + + + + } + GRAPH { + ?org org:classification ?classification ; + org:hasPrimarySite ?site . + ?site organisatie:bestaatUit ?address . + ?address adres:gemeentenaam ?municipalityName . + } + FILTER NOT EXISTS { + GRAPH { + ?org dct:spatial ?existing . + } + } + GRAPH { + ?municipality org:classification ; + skos:prefLabel ?municipalityName . + } + GRAPH { + ?municipality besluit:werkingsgebied ?werkingsgebied . + } +} diff --git a/config/search/config.json b/config/search/config.json index 2dfb25d..02772cf 100644 --- a/config/search/config.json +++ b/config/search/config.json @@ -701,6 +701,10 @@ "operation_area": [ "http://data.vlaanderen.be/ns/besluit#werkingsgebied", "http://www.w3.org/2004/02/skos/core#prefLabel" + ], + "operation_area_spatial": [ + "http://purl.org/dc/terms/spatial", + "http://www.w3.org/2004/02/skos/core#prefLabel" ] }, "mappings": { @@ -821,6 +825,15 @@ "normalizer": "custom_sort_normalizer" } } + }, + "operation_area_spatial": { + "type": "keyword", + "fields": { + "field": { + "type": "keyword", + "normalizer": "custom_sort_normalizer" + } + } } } } From da602481d9c23620f325eb9b603fd77b4a49219d Mon Sep 17 00:00:00 2001 From: Damon Date: Mon, 20 Jul 2026 11:16:37 +0200 Subject: [PATCH 2/3] OP-3832: search config label change --- config/search/config.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/config/search/config.json b/config/search/config.json index 02772cf..f12e559 100644 --- a/config/search/config.json +++ b/config/search/config.json @@ -700,11 +700,11 @@ ], "operation_area": [ "http://data.vlaanderen.be/ns/besluit#werkingsgebied", - "http://www.w3.org/2004/02/skos/core#prefLabel" + "http://www.w3.org/2000/01/rdf-schema#label" ], "operation_area_spatial": [ "http://purl.org/dc/terms/spatial", - "http://www.w3.org/2004/02/skos/core#prefLabel" + "http://www.w3.org/2000/01/rdf-schema#label" ] }, "mappings": { From e0982891ca2ea7e1f6040fa28679d13638a99217 Mon Sep 17 00:00:00 2001 From: Boris De Vloed Date: Fri, 24 Jul 2026 09:24:18 +0200 Subject: [PATCH 3/3] Update CHANGELOG.md pick up new export config --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index abfaf86..ca1dfd7 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -29,6 +29,7 @@ drc restart cache resource drc pull construct-organization-relationships && drc up -d construct-organization-relationships drc restart migrations drc restart resource cache +drc restart delta-producer-publication-graph-maintainer scripts/reset-elastic.sh ``` ```