From 842e9f720505d9425b4d8f95ffa95519b295f069 Mon Sep 17 00:00:00 2001 From: Laurent Deketelaere Date: Thu, 16 May 2024 10:06:09 +0200 Subject: [PATCH 1/8] chore: Bump frontend to per-release v1.24.0-0 --- docker-compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker-compose.yml b/docker-compose.yml index f76d0f4..03ef910 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -181,7 +181,7 @@ services: restart: always logging: *default-logging frontend: - image: lblod/frontend-organization-portal:1.23.2 + image: lblod/frontend-organization-portal:1.24.0-0 volumes: - ./config/frontend/add-x-frame-options-header.conf:/config/add-x-frame-options.conf environment: From 66c3703f228afe558f24d7b1775b3788c8032876 Mon Sep 17 00:00:00 2001 From: Laurent Deketelaere Date: Thu, 23 May 2024 11:28:31 +0200 Subject: [PATCH 2/8] refactor: Remove obsolete kbo-data-sync endpoint --- config/dispatcher/dispatcher.ex | 5 ----- 1 file changed, 5 deletions(-) diff --git a/config/dispatcher/dispatcher.ex b/config/dispatcher/dispatcher.ex index 95ae84b..aeffb99 100644 --- a/config/dispatcher/dispatcher.ex +++ b/config/dispatcher/dispatcher.ex @@ -316,11 +316,6 @@ defmodule Dispatcher do forward conn, path, "http://kbo-data-sync/sync-kbo-data/" end - # TODO: Remove when the kbo feature flag is removed on the frontend - post "/sync-ovo-number/*path", %{ layer: :api_services, accept: %{ json: true } } do - forward conn, path, "http://kbo-data-sync/sync-kbo-data/" - end - get "/ldes/*path", %{ layer: :api_services } do forward conn, path, "http://ldes-backend/" end From 50c03a2205e3f1e1f712d9c4d3c2ac29d45b0876 Mon Sep 17 00:00:00 2001 From: Laurent Deketelaere Date: Fri, 24 May 2024 12:38:14 +0200 Subject: [PATCH 3/8] chore: Bump frontend to pre-release v1.24.0-2 --- docker-compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker-compose.yml b/docker-compose.yml index 03ef910..196c2e3 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -181,7 +181,7 @@ services: restart: always logging: *default-logging frontend: - image: lblod/frontend-organization-portal:1.24.0-0 + image: lblod/frontend-organization-portal:1.24.0-2 volumes: - ./config/frontend/add-x-frame-options-header.conf:/config/add-x-frame-options.conf environment: From a9e9e761c0faeef8aede459a1a47d2821db5a155 Mon Sep 17 00:00:00 2001 From: mirdono Date: Mon, 3 Jun 2024 13:27:13 +0200 Subject: [PATCH 4/8] chore: removed faulty queries from migration Removed incorrect queries that match on empty KBO numbers. This is to avoid the same incorrect data being imported in case the migration is executed again at some point. --- ...t-public-ocmw-association-addresses.sparql | 28 ------------------- ...ic-ocmw-association-contact-details.sparql | 28 ------------------- 2 files changed, 56 deletions(-) diff --git a/config/migrations/2024/20240212141020-onboarding-public-ocmw-associations/20240215140212-import-public-ocmw-association-addresses.sparql b/config/migrations/2024/20240212141020-onboarding-public-ocmw-associations/20240215140212-import-public-ocmw-association-addresses.sparql index eb3df8c..1b5983d 100644 --- a/config/migrations/2024/20240212141020-onboarding-public-ocmw-associations/20240215140212-import-public-ocmw-association-addresses.sparql +++ b/config/migrations/2024/20240212141020-onboarding-public-ocmw-associations/20240215140212-import-public-ocmw-association-addresses.sparql @@ -2127,34 +2127,6 @@ } - INSERT { - GRAPH ?g { - ?addressUri - "15"; - - "8710"; - "Wielsbeke"; - "Hernieuwenstraat"; - "Wielsbeke"; - "België"; - "Hernieuwenstraat 15, 8710 Wielsbeke, België". - } - } - WHERE { - GRAPH ?g { - ?adminUnit ?id ; - ?site . - - ?id "KBO nummer" ; - / "" . - - ?site ?boundAddress . - - BIND( ?boundAddress AS ?addressUri ) - } - } - - INSERT { GRAPH ?g { ?addressUri diff --git a/config/migrations/2024/20240212141020-onboarding-public-ocmw-associations/20240215140236-import-public-ocmw-association-contact-details.sparql b/config/migrations/2024/20240212141020-onboarding-public-ocmw-associations/20240215140236-import-public-ocmw-association-contact-details.sparql index a9cebd4..d188b75 100644 --- a/config/migrations/2024/20240212141020-onboarding-public-ocmw-associations/20240215140236-import-public-ocmw-association-contact-details.sparql +++ b/config/migrations/2024/20240212141020-onboarding-public-ocmw-associations/20240215140236-import-public-ocmw-association-contact-details.sparql @@ -1554,31 +1554,3 @@ ?contact "Primary" . } } - - - INSERT { - GRAPH { - ?contact "tel:+3256674504" . - ?contact "https://www.wielsbeke.be/producten/woonzorgcentrum-ter-lembeek" . - ?contact "ouderenhuisvesting@wielsbeke.be" . - } - } - WHERE { - GRAPH { - ?adminUnit ?id ; - ?primarySite . - ?id "KBO nummer" ; - / "" . - - ?primarySite ?contact . - - ?contact "Primary" . - } - } - - - - - - - From 74a0c92b312b62d00fcbd75a41bcd0ed1f882d7c Mon Sep 17 00:00:00 2001 From: mirdono Date: Mon, 3 Jun 2024 14:11:15 +0200 Subject: [PATCH 5/8] fix: remove faulty address data for some AGBs The migrations importing the public OCMW association's address data contained a faulty query that matched on empty KBO numbers. As a result address data was incorrectly inserted to some AGBs that also do not have a KBO number. This migration removes the incorrect data, which as inserted into the triplestore next to actual address. Furthermore, this also (re-)inserts the correct provinces for the affected AGBs. --- ...20240603115306-fix-agb-address-data.sparql | 35 +++++++++++++++++++ 1 file changed, 35 insertions(+) create mode 100644 config/migrations/2024/20240603115300-correct-agb-address-and-contact-data/20240603115306-fix-agb-address-data.sparql diff --git a/config/migrations/2024/20240603115300-correct-agb-address-and-contact-data/20240603115306-fix-agb-address-data.sparql b/config/migrations/2024/20240603115300-correct-agb-address-and-contact-data/20240603115306-fix-agb-address-data.sparql new file mode 100644 index 0000000..c541f0e --- /dev/null +++ b/config/migrations/2024/20240603115300-correct-agb-address-and-contact-data/20240603115306-fix-agb-address-data.sparql @@ -0,0 +1,35 @@ +PREFIX adres: +PREFIX locn: + +# Remove incorrect address triples +DELETE { + GRAPH { + ?address adres:Adresvoorstelling.huisnummer "15" ; + locn:postCode "8710" ; + locn:adminUnitL2 "West-Vlaanderen" ; + locn:thoroughfare "Hernieuwenstraat" ; + locn:fullAddress "Hernieuwenstraat 15, 8710 Wielsbeke, België" ; + adres:gemeentenaam "Wielsbeke" . + } +} WHERE { + VALUES ?address { + # AGB LEUVEN (Parkeerbedrijf) + # AGB MECHELEN (Exploitatie) + # AGB MECHELEN (Patrimonium) + # AGB Renov'O + # AGB STEKENE + # Vrijetijdsbedrijf Knokke-Heist AG + } +} + +# Insert the correct the provinces +INSERT { + GRAPH { + locn:adminUnitL2 "Vlaams-Brabant" . # AGB LEUVEN (Parkeerbedrijf) + locn:adminUnitL2 "Antwerpen" . # AGB MECHELEN (Exploitatie) + locn:adminUnitL2 "Antwerpen" . # AGB MECHELEN (Patrimonium) + locn:adminUnitL2 "West-Vlaanderen" . # AGB Renov'O (located in Oostende) + locn:adminUnitL2 "Oost-Vlaanderen" . # AGB STEKENE + locn:adminUnitL2 "West-Vlaanderen" . # Vrijetijdsbedrijf Knokke-Heist AG + } +} From 714994bc3ceac0a057016bdc95ac0030041638a7 Mon Sep 17 00:00:00 2001 From: mirdono Date: Mon, 3 Jun 2024 16:07:52 +0200 Subject: [PATCH 6/8] fix: remove faulty contact data for some AGBs The migrations importing the public OCMW association's contact data contained a faulty query that matched on empty KBO numbers. As a result contact data was incorrectly inserted to some AGBs that also do not have a KBO number. This migration removes the incorrect data. --- ...20240603133736-fix-agb-contact-data.sparql | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) create mode 100644 config/migrations/2024/20240603115300-correct-agb-address-and-contact-data/20240603133736-fix-agb-contact-data.sparql diff --git a/config/migrations/2024/20240603115300-correct-agb-address-and-contact-data/20240603133736-fix-agb-contact-data.sparql b/config/migrations/2024/20240603115300-correct-agb-address-and-contact-data/20240603133736-fix-agb-contact-data.sparql new file mode 100644 index 0000000..c939bce --- /dev/null +++ b/config/migrations/2024/20240603115300-correct-agb-address-and-contact-data/20240603133736-fix-agb-contact-data.sparql @@ -0,0 +1,19 @@ +PREFIX schema: +PREFIX foaf: + +DELETE { + GRAPH { + ?contactPoint schema:telephone "tel:+3256674504" ; + foaf:page "https://www.wielsbeke.be/producten/woonzorgcentrum-ter-lembeek" ; + schema:email "ouderenhuisvesting@wielsbeke.be" . + } +} WHERE { + VALUES ?contactPoint { + # AGB LEUVEN (Parkeerbedrijf) + # AGB MECHELEN (Exploitatie) + # AGB MECHELEN (Patrimonium) + # AGB Renov'O + # AGB STEKENE + # Vrijetijdsbedrijf Knokke-Heist AG + } +} From 5bbd9a9d69673b91c112e3dbca0e81801e3794a5 Mon Sep 17 00:00:00 2001 From: Laurent Deketelaere Date: Tue, 4 Jun 2024 12:20:10 +0200 Subject: [PATCH 7/8] chore: Bump frontend to pre-release v1.24.0-4 --- docker-compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker-compose.yml b/docker-compose.yml index 196c2e3..43b6962 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -181,7 +181,7 @@ services: restart: always logging: *default-logging frontend: - image: lblod/frontend-organization-portal:1.24.0-2 + image: lblod/frontend-organization-portal:1.24.0-4 volumes: - ./config/frontend/add-x-frame-options-header.conf:/config/add-x-frame-options.conf environment: From 800924db2e5b403750e843b2ae4a4daa73fc0027 Mon Sep 17 00:00:00 2001 From: Laurent Deketelaere Date: Wed, 5 Jun 2024 18:24:18 +0200 Subject: [PATCH 8/8] chore: Bump frontend to pre-release v1.24.0 --- docker-compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker-compose.yml b/docker-compose.yml index 43b6962..99fcb88 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -181,7 +181,7 @@ services: restart: always logging: *default-logging frontend: - image: lblod/frontend-organization-portal:1.24.0-4 + image: lblod/frontend-organization-portal:1.24.0 volumes: - ./config/frontend/add-x-frame-options-header.conf:/config/add-x-frame-options.conf environment: