Bump frontend

Fix/delete duplicate services (#194 )
* update fuzzy search version * migration to delete duplicate services * Revert "update fuzzy search version" This reverts commit b0dc0ebad472c7e9e57e4ab792d6fce382147bb5.
2022-12-06 13:29:57 +01:00 · 2022-12-06 13:22:59 +01:00 · 2022-12-06 12:36:52 +02:00 · 2022-12-05 16:44:37 +01:00 · 2022-12-05 15:48:15 +01:00 · 2022-11-30 12:49:47 +01:00
8 changed files with 2520 additions and 2 deletions
--- a/config/migrations/2022/20221019174000-delete-bestrokken-besturen-anglican.sparql
+++ b/config/migrations/2022/20221019174000-delete-bestrokken-besturen-anglican.sparql
@@ -0,0 +1,66 @@
+PREFIX org: <http://www.w3.org/ns/org#>
+PREFIX rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#>
+PREFIX locn: <http://www.w3.org/ns/locn#>
+PREFIX schema: <http://schema.org/>
+PREFIX regorg: <http://www.w3.org/ns/regorg#>
+PREFIX person: <http://www.w3.org/ns/person#>
+PREFIX vcard: <http://www.w3.org/2006/vcard/ns#>
+PREFIX dbpedia: <http://dbpedia.org/ontology/>
+PREFIX adms: <http://www.w3.org/ns/adms#>
+PREFIX euro: <http://data.europa.eu/m8g/>
+PREFIX prov: <http://www.w3.org/ns/prov#>
+PREFIX organisatie: <https://data.vlaanderen.be/ns/organisatie#>
+PREFIX persoon: <https://data.vlaanderen.be/ns/persoon#>
+PREFIX adres: <https://data.vlaanderen.be/ns/adres#>
+PREFIX generiek: <https://data.vlaanderen.be/ns/generiek#>
+PREFIX mandaat: <http://data.vlaanderen.be/ns/mandaat#>
+PREFIX besluit: <http://data.vlaanderen.be/ns/besluit#>
+PREFIX lblodlg: <https://data.lblod.info/vocabularies/leidinggevenden/>
+PREFIX dc_terms: <http://purl.org/dc/terms/>
+PREFIX foaf: <http://xmlns.com/foaf/0.1/>
+PREFIX skos: <http://www.w3.org/2004/02/skos/core#>
+PREFIX euvoc: <http://publications.europa.eu/ontology/euvoc#>
+PREFIX ere: <http://data.lblod.info/vocabularies/erediensten/>
+PREFIX ch: <http://data.lblod.info/vocabularies/contacthub/>
+PREFIX code: <http://lblod.data.gift/vocabularies/organisatie/>
+PREFIX ext: <http://mu.semte.ch/vocabularies/ext/>
+PREFIX rdfs: <http://www.w3.org/2000/01/rdf-schema#>
+PREFIX adres: <https://data.vlaanderen.be/ns/adres#>
+
+DELETE {
+  GRAPH <http://mu.semte.ch/graphs/organisatieportaal> {
+    ?administrativeUnit ere:betrokkenBestuur ?betrokkenheid.
+    ?betrokkenheid ?p ?o
+  }
+}
+WHERE {
+  GRAPH <http://mu.semte.ch/graphs/organisatieportaal> {
+    VALUES ?administrativeUnit{
+      <http://data.lblod.info/id/bestuurseenheden/3b1e0143755729396654f651bfed689681274839c427f9598e930d816fb7a1c8> # Kraainem
+      <http://data.lblod.info/id/bestuurseenheden/476ddecbaf169d4c9af3ca8ed6725f4efebdfdb9647fe82ec4406496c6e930d9> # Overijse
+      <http://data.lblod.info/id/bestuurseenheden/3b337ebeb02ede5e152c952e2f24aa1bff3ebbb6afb968a647cb05efe72c0237> # Wezembeek-Oppem
+      <http://data.lblod.info/id/bestuurseenheden/003e84121111866af60611a59e13d4c478718f60472655936edec1e352a34c5f> # Huldenberg
+      <http://data.lblod.info/id/bestuurseenheden/319db6e275f281d0280da90d6f6aba3462f4e47b6f53a34639feb91015a5822b> # Oud-Heverlee
+      <http://data.lblod.info/id/bestuurseenheden/7c44225c68f7535a603d3a0a0c57a6424e8baa9fd066b6b9baa636d0facddb72> # Bertem
+    }
+
+    VALUES ?worshipService {
+      <http://data.lblod.info/id/besturenVanDeEredienst/a596850e9aa27969a25f73137d300306> #Anglicaanse Kerk Saint Paul's Church van Tervuren
+      <http://data.lblod.info/id/besturenVanDeEredienst/e2eea8a352821c9c1f1827f1cfde9f24> #Anglicaanse Kerk Saint Martha and Mary's van Leuven
+    }
+
+    ?betrokkenheid
+      org:organization ?bestuur;
+      rdf:type ere:BetrokkenLokaleBesturen.
+
+    ?administrativeUnit ere:betrokkenBestuur ?betrokkenheid.
+
+    ?betrokkenheid
+      org:organization ?worshipService;
+      ere:typebetrokkenheid ?typebetrokkenheid;
+      ere:financieringspercentage 0;
+      ?p ?o.
+  }
+}
+
+
--- a/config/migrations/2022/20221021140000-delete-non-uniwue-site-uris.sparql
+++ b/config/migrations/2022/20221021140000-delete-non-uniwue-site-uris.sparql
@@ -0,0 +1,38 @@
+PREFIX adms: <http://www.w3.org/ns/adms#>
+PREFIX adres: <https://data.vlaanderen.be/ns/adres#>
+PREFIX ere: <http://data.lblod.info/vocabularies/erediensten/>
+PREFIX generiek: <https://data.vlaanderen.be/ns/generiek#>
+PREFIX locn: <http://www.w3.org/ns/locn#>
+PREFIX mu: <http://mu.semte.ch/vocabularies/core/>
+PREFIX org: <http://www.w3.org/ns/org#>
+PREFIX organisatie: <https://data.vlaanderen.be/ns/organisatie#>
+PREFIX owl: <http://www.w3.org/2002/07/owl#>
+PREFIX regorg: <http://www.w3.org/ns/regorg#>
+PREFIX skos: <http://www.w3.org/2004/02/skos/core#>
+
+DELETE {
+  GRAPH <http://mu.semte.ch/graphs/organisatieportaal> {
+    ?org org:hasPrimarySite ?site.
+    ?site
+      organisatie:bestaatUit ?address;
+      ?sp ?so.
+    ?address ?ap ?ao.
+  }
+} WHERE {
+  GRAPH <http://mu.semte.ch/graphs/organisatieportaal> {
+    ?org org:hasPrimarySite ?site.
+    ?site
+      organisatie:bestaatUit ?address;
+      ?sp ?so.
+    ?address ?ap ?ao.
+    {
+      SELECT ?site (count(?o) AS ?c)
+      WHERE {
+          ?o org:hasPrimarySite ?site
+      }
+      GROUP BY ?site
+      HAVING (COUNT(DISTINCT ?o) > 1)
+      ORDER BY ?site
+    }
+  }
+}
--- a/config/migrations/2022/20221021141000-fixed-primary-site-uris.graph
+++ b/config/migrations/2022/20221021141000-fixed-primary-site-uris.graph
@@ -0,0 +1 @@
+http://mu.semte.ch/graphs/organisatieportaal
--- a/config/migrations/2022/20221021141000-fixed-primary-site-uris.ttl
+++ b/config/migrations/2022/20221021141000-fixed-primary-site-uris.ttl
--- a/config/migrations/2022/20221202110000-delete-duplicate-worship-services.sparql
+++ b/config/migrations/2022/20221202110000-delete-duplicate-worship-services.sparql
@@ -0,0 +1,41 @@
+DELETE {
+  GRAPH <http://mu.semte.ch/graphs/organisatieportaal> {
+    ?representatieveOrgaan <http://www.w3.org/ns/org#linkedTo> ?bestuur .
+    ?bestuur ?pbestuur ?obestuur .
+    ?primarySite ?pprimarySite ?oprimarySite .
+    ?address ?paddress ?oaddress .
+    ?contactPoint ?pcontactPoint ?ocontactPoint .
+    ?identifier ?pidentifier ?oidentifier .
+    ?structuredIdentifier ?pstructuredIdentifier ?ostructuredIdentifier .
+  }
+} WHERE {
+  GRAPH <http://mu.semte.ch/graphs/organisatieportaal> {
+    VALUES ?bestuur {
+      <http://data.lblod.info/id/besturenVanDeEredienst/63638B718DE5818A7C9F4358> # OP-1909 :: Ensar
+      <http://data.lblod.info/id/besturenVanDeEredienst/6374E1604B5FEAF28DEDE73C> # OP-1913 :: Attaqwa
+      <http://data.lblod.info/id/besturenVanDeEredienst/6374E0034B5FEAF28DEDE730> # OP-1914 :: Imam-i Buhari
+      <http://data.lblod.info/id/besturenVanDeEredienst/62C2DB1AD7779543F7779588> # OP-1926 :: Orthodoxe Parochie van de Heilige Nino
+      <http://data.lblod.info/id/besturenVanDeEredienst/625E764BFEE49A5CF118EE5C> # OP-1924 :: Islamitisch en cultureel centrum Al Umma Linkeroever
+      <http://data.lblod.info/id/besturenVanDeEredienst/62E8C415D7779543F77796A7> # OP-1922 :: Essalaam
+    }
+
+    ?representatieveOrgaan <http://www.w3.org/ns/org#linkedTo> ?bestuur .
+
+    ?bestuur <http://www.w3.org/ns/org#hasPrimarySite> ?primarySite ;
+      <http://www.w3.org/ns/adms#identifier> ?identifier ;
+      ?pbestuur ?obestuur .
+
+    ?primarySite <https://data.vlaanderen.be/ns/organisatie#bestaatUit> ?address ;
+      <http://www.w3.org/ns/org#siteAddress> ?contactPoint ;
+      ?pprimarySite ?oprimarySite .
+
+    ?address ?paddress ?oaddress .
+
+    ?contactPoint ?pcontactPoint ?ocontactPoint .
+
+    ?identifier <https://data.vlaanderen.be/ns/generiek#gestructureerdeIdentificator> ?structuredIdentifier ;
+      ?pidentifier ?oidentifier .
+
+    ?structuredIdentifier ?pstructuredIdentifier ?ostructuredIdentifier .
+  }
+}
--- a/config/migrations/2022/20221205110000-update-date-change-event-Attaqwa.sparql
+++ b/config/migrations/2022/20221205110000-update-date-change-event-Attaqwa.sparql
@@ -0,0 +1,15 @@
+PREFIX dct: <http://purl.org/dc/terms/>
+
+DELETE {
+  GRAPH ?g {
+    <http://data.lblod.info/id/veranderingsgebeurtenissen/6375D6B34B5FEAF28DEDE7CA> dct:date "2001-01-01"^^xsd:date .
+  }
+} INSERT {
+  GRAPH ?g {
+    <http://data.lblod.info/id/veranderingsgebeurtenissen/6375D6B34B5FEAF28DEDE7CA> dct:date "2008-01-01"^^xsd:date .
+  }
+} WHERE {
+  GRAPH ?g {
+    <http://data.lblod.info/id/veranderingsgebeurtenissen/6375D6B34B5FEAF28DEDE7CA> dct:date "2001-01-01"^^xsd:date .
+  }
+}
--- a/config/migrations/2022/20221205161742-update-bedienaar-roles.sparql
+++ b/config/migrations/2022/20221205161742-update-bedienaar-roles.sparql
@@ -0,0 +1,26 @@
+DELETE {
+  GRAPH ?g {
+    ?role <http://data.lblod.info/vocabularies/erediensten/functie> <http://lblod.data.gift/concepts/e357bc8f4cc3a694fde2239748768a22> .
+  }
+} INSERT {
+  GRAPH ?g {
+    ?role <http://data.lblod.info/vocabularies/erediensten/functie> <http://lblod.data.gift/concepts/5ebb798bd59c3b48c25116032caa02b7> .
+  }
+} WHERE {
+  GRAPH ?g {
+    VALUES ?bedienaar {
+      <http://data.lblod.info/id/rollenBedienaar/6332F3D4036B579F0A26FF25>
+      <http://data.lblod.info/id/rollenBedienaar/6363D2938DE5818A7C9F43F1>
+      <http://data.lblod.info/id/rollenBedienaar/63568F678DE5818A7C9F4253>
+      <http://data.lblod.info/id/rollenBedienaar/6363D6068DE5818A7C9F4408>
+      <http://data.lblod.info/id/rollenBedienaar/63568E2B8DE5818A7C9F424C>
+      <http://data.lblod.info/id/rollenBedienaar/636A5E368DE5818A7C9F447C>
+      <http://data.lblod.info/id/rollenBedienaar/636A5D1B8DE5818A7C9F4478>
+      <http://data.lblod.info/id/rollenBedienaar/63330740036B579F0A26FF43>
+      <http://data.lblod.info/id/rollenBedienaar/63330552036B579F0A26FF3E>
+    }
+
+    ?bedienaar <http://www.w3.org/ns/org#holds> ?role .
+    ?role <http://data.lblod.info/vocabularies/erediensten/functie> <http://lblod.data.gift/concepts/e357bc8f4cc3a694fde2239748768a22> .
+  }
+}
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -152,13 +152,13 @@ services:
    links:
      - db:database
  adressenregister:
-    image: lblod/adressenregister-fuzzy-search-service:0.6.0
+    image: lblod/adressenregister-fuzzy-search-service:0.6.2
    labels:
      - "logging=true"
    restart: always
    logging: *default-logging
  frontend:
-    image: lblod/frontend-organization-portal:1.13.1
+    image: lblod/frontend-organization-portal:1.13.3
    volumes:
      - ./config/frontend/add-x-frame-options-header.conf:/config/add-x-frame-options.conf
    environment:
Author	SHA1	Message	Date
Claire Lovisa	21ee39edd6	Bump frontend	2022-12-06 13:29:57 +01:00
Iulian Andriescu	75d77f2b2e	Fix/delete duplicate services (#194 ) * update fuzzy search version * migration to delete duplicate services * Revert "update fuzzy search version" This reverts commit b0dc0ebad472c7e9e57e4ab792d6fce382147bb5.	2022-12-06 13:22:59 +01:00
Iulian Andriescu	cc6c73eb5b	Incidents handling (#197 ) * update fuzzy search version * Revert "update fuzzy search version" This reverts commit `18efa236dc`. * update fuzzy search version (#193) * Fix change event date for Attaqwa * migrationto delete duplicates * Revert "Fix change event date for Attaqwa" This reverts commit 924bc407eb1a012ce69a85b762978f92fdbc4288. * Revert "migrationto delete duplicates" This reverts commit 7736607655e1b7343e553174528d487981da8027. * re-upload Attaqwa migration	2022-12-06 12:36:52 +02:00
Claire Lovisa	13170dfd26	Change role of some bedienaren (#196 )	2022-12-05 16:44:37 +01:00
Claire Lovisa	b4b997f89a	update fuzzy search version (#195 ) Co-authored-by: iurianu <iulianandriescu@gmail.com>	2022-12-05 15:48:15 +01:00
Boris De Vloed	b19f8f070f	bump frontend version	2022-11-30 12:49:47 +01:00
Boris De Vloed	352c41502b	Merge pull request #192 from lblod/hotfix-1.13.2 Hotfix 1.13.2	2022-11-30 10:11:20 +01:00
Boris De Vloed	4c8c4877c0	Merge pull request #185 from lblod/fix/op-1806 Fix/op 1806	2022-11-30 10:06:43 +01:00
Boris De Vloed	91b49104a6	Merge pull request #186 from lblod/fix/primary-site-uris delete wrong and insert new primary addresses	2022-11-30 10:06:07 +01:00
Boris De Vloed	c37ad8c764	delete wrong and insert new primary addresses	2022-10-21 14:57:03 +02:00
Boris De Vloed	996f81bb76	Delete duplicate betrokken lokale besturen	2022-10-20 11:59:57 +02:00
Boris De Vloed	9a1188fa7d	remove duplicate relationships	2022-10-20 11:54:33 +02:00
				`@@ -0,0 +1 @@`
				`http://mu.semte.ch/graphs/organisatieportaal`