chore: Bump frontend to pre-release v1.24.0

chore: Bump frontend to pre-release v1.24.0-4
Merge pull request #430 from lblod/fix/correct-agb-addresses-and-contact-data
2024-06-05 18:24:18 +02:00 · 2024-06-04 12:20:10 +02:00 · 2024-06-04 12:14:57 +02:00 · 2024-06-03 16:07:52 +02:00 · 2024-06-03 14:55:12 +02:00 · 2024-06-03 13:27:13 +02:00
5 changed files with 55 additions and 57 deletions
--- 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 
-            <https://data.vlaanderen.be/ns/adres#Adresvoorstelling.huisnummer> "15";
-            
-            <http://www.w3.org/ns/locn#postCode> "8710";
-            <http://www.w3.org/ns/locn#adminUnitL2> "Wielsbeke";
-            <http://www.w3.org/ns/locn#thoroughfare> "Hernieuwenstraat";
-            <https://data.vlaanderen.be/ns/adres#gemeentenaam> "Wielsbeke";
-            <https://data.vlaanderen.be/ns/adres#land> "België";
-            <http://www.w3.org/ns/locn#fullAddress> "Hernieuwenstraat 15, 8710 Wielsbeke, België".
-        }
-      }
-      WHERE {
-        GRAPH ?g {
-          ?adminUnit <http://www.w3.org/ns/adms#identifier> ?id ;
-            <http://www.w3.org/ns/org#hasPrimarySite> ?site .
-
-          ?id <http://www.w3.org/2004/02/skos/core#notation> "KBO nummer" ;
-            <https://data.vlaanderen.be/ns/generiek#gestructureerdeIdentificator>/<https://data.vlaanderen.be/ns/generiek#lokaleIdentificator> "" .
-
-          ?site <https://data.vlaanderen.be/ns/organisatie#bestaatUit> ?boundAddress .
-
-          BIND( ?boundAddress AS ?addressUri )
-        }
-      }
-    
-
      INSERT {
        GRAPH ?g {
          ?addressUri 
--- 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 <http://schema.org/contactType> "Primary" .
          }
        }
-      
-
-        INSERT {
-          GRAPH <http://mu.semte.ch/graphs/administrative-unit> {
-            ?contact <http://schema.org/telephone> "tel:+3256674504" .
-            ?contact <http://xmlns.com/foaf/0.1/page> "https://www.wielsbeke.be/producten/woonzorgcentrum-ter-lembeek" .
-            ?contact <http://schema.org/email> "ouderenhuisvesting@wielsbeke.be" .
-          }
-        }
-        WHERE {
-          GRAPH <http://mu.semte.ch/graphs/administrative-unit> {
-            ?adminUnit <http://www.w3.org/ns/adms#identifier> ?id ;
-              <http://www.w3.org/ns/org#hasPrimarySite> ?primarySite .
-            ?id <http://www.w3.org/2004/02/skos/core#notation> "KBO nummer" ;
-              <https://data.vlaanderen.be/ns/generiek#gestructureerdeIdentificator>/<https://data.vlaanderen.be/ns/generiek#lokaleIdentificator> "" .
-
-            ?primarySite <http://www.w3.org/ns/org#siteAddress> ?contact .
-
-            ?contact <http://schema.org/contactType> "Primary" .
-          }
-        }
-      
-
-
-
-
-
-
--- 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
@@ -0,0 +1,35 @@
+PREFIX adres: <https://data.vlaanderen.be/ns/adres#>
+PREFIX locn: <http://www.w3.org/ns/locn#>
+
+# Remove incorrect address triples
+DELETE {
+  GRAPH <http://mu.semte.ch/graphs/administrative-unit> {
+    ?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 {
+    <http://data.lblod.info/id/adressen/5ab4e6f7-d793-4262-81b6-b84f867c18ae> # AGB LEUVEN (Parkeerbedrijf)
+    <http://data.lblod.info/id/adressen/76a69cd2-f447-4372-8dd5-79c917d0040d> # AGB MECHELEN (Exploitatie)
+    <http://data.lblod.info/id/adressen/af5d342d-0b4c-46fb-bee3-ce46dee74d1f> # AGB MECHELEN (Patrimonium)
+    <http://data.lblod.info/id/adressen/63c85a14-4ee4-4299-b0c1-b3a907ff1ebf> # AGB Renov'O
+    <http://data.lblod.info/id/adressen/df102cb4-8abb-4588-a199-1ce22c211812> # AGB STEKENE
+    <http://data.lblod.info/id/adressen/6cff33b8-6aff-436c-aa34-e9d32d446934> # Vrijetijdsbedrijf Knokke-Heist AG
+  }
+}
+
+# Insert the correct the provinces
+INSERT {
+  GRAPH <http://mu.semte.ch/graphs/administrative-unit> {
+    <http://data.lblod.info/id/adressen/5ab4e6f7-d793-4262-81b6-b84f867c18ae> locn:adminUnitL2 "Vlaams-Brabant" . # AGB LEUVEN (Parkeerbedrijf)
+    <http://data.lblod.info/id/adressen/76a69cd2-f447-4372-8dd5-79c917d0040d> locn:adminUnitL2 "Antwerpen" . # AGB MECHELEN (Exploitatie)
+    <http://data.lblod.info/id/adressen/af5d342d-0b4c-46fb-bee3-ce46dee74d1f> locn:adminUnitL2 "Antwerpen" . # AGB MECHELEN (Patrimonium)
+    <http://data.lblod.info/id/adressen/63c85a14-4ee4-4299-b0c1-b3a907ff1ebf> locn:adminUnitL2 "West-Vlaanderen" . # AGB Renov'O (located in Oostende)
+    <http://data.lblod.info/id/adressen/df102cb4-8abb-4588-a199-1ce22c211812> locn:adminUnitL2 "Oost-Vlaanderen" . # AGB STEKENE
+    <http://data.lblod.info/id/adressen/6cff33b8-6aff-436c-aa34-e9d32d446934> locn:adminUnitL2 "West-Vlaanderen" . # Vrijetijdsbedrijf Knokke-Heist AG
+  }
+}
--- 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
@@ -0,0 +1,19 @@
+PREFIX schema: <http://schema.org/>
+PREFIX foaf: <http://xmlns.com/foaf/0.1/>
+
+DELETE {
+  GRAPH <http://mu.semte.ch/graphs/administrative-unit> {
+    ?contactPoint schema:telephone "tel:+3256674504" ;
+      foaf:page "https://www.wielsbeke.be/producten/woonzorgcentrum-ter-lembeek" ;
+      schema:email "ouderenhuisvesting@wielsbeke.be" .
+  }
+} WHERE {
+  VALUES ?contactPoint {
+    <http://data.lblod.info/id/contact-punten/f5df2649-afba-4cbb-8e97-b3a46e0f5c88> # AGB LEUVEN (Parkeerbedrijf)
+    <http://data.lblod.info/id/contact-punten/58aa2df7-2c48-4dc8-ba60-da72748bcff1> # AGB MECHELEN (Exploitatie)
+    <http://data.lblod.info/id/contact-punten/0a3a1313-511d-41a9-a1f3-32f41f2e613c> # AGB MECHELEN (Patrimonium)
+    <http://data.lblod.info/id/contact-punten/82e65e70-2c3b-4e3c-8f39-ce6f05ec42ea> # AGB Renov'O
+    <http://data.lblod.info/id/contact-punten/364d8e1a-cb18-4970-aeaf-5f6f307370ad> # AGB STEKENE
+    <http://data.lblod.info/id/contact-punten/0d680616-e2a3-41af-bfeb-c76992552c5c> # Vrijetijdsbedrijf Knokke-Heist AG
+  }
+}
--- 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
    volumes:
      - ./config/frontend/add-x-frame-options-header.conf:/config/add-x-frame-options.conf
    environment:
Author	SHA1	Message	Date
Laurent Deketelaere	800924db2e	chore: Bump frontend to pre-release v1.24.0	2024-06-05 18:24:18 +02:00
Laurent Deketelaere	5bbd9a9d69	chore: Bump frontend to pre-release v1.24.0-4	2024-06-04 12:20:10 +02:00
Laurent Deketelaere	4435c1d544	Merge pull request #430 from lblod/fix/correct-agb-addresses-and-contact-data Remove faulty address and contact data for AGBs	2024-06-04 12:14:57 +02:00
mirdono	714994bc3c	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.	2024-06-03 16:07:52 +02:00
mirdono	74a0c92b31	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.	2024-06-03 14:55:12 +02:00
mirdono	a9e9e761c0	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.	2024-06-03 13:27:13 +02:00