fix regression mu search (#128 )

Fix status ckb melle
Add migration to reformat weird kbos
2022-04-07 12:03:48 +02:00 · 2022-04-06 14:13:42 +02:00 · 2022-04-01 16:38:28 +02:00 · 2022-03-31 19:52:28 +02:00 · 2022-03-31 14:59:32 +02:00 · 2022-03-31 14:49:10 +02:00
8 changed files with 199 additions and 4 deletions
--- a/config/migrations/2022/20220328171923-update-date-change-event-Eeklo.sparql
+++ b/config/migrations/2022/20220328171923-update-date-change-event-Eeklo.sparql
@@ -0,0 +1,15 @@
+PREFIX dct: <http://purl.org/dc/terms/>
+
+DELETE {
+  GRAPH ?g {
+    <http://data.lblod.info/id/veranderingsgebeurtenissen/6217A27A5747C883CA1D34E9> dct:date "2018-06-09"^^xsd:date .
+  }
+} INSERT {
+  GRAPH ?g {
+    <http://data.lblod.info/id/veranderingsgebeurtenissen/6217A27A5747C883CA1D34E9> dct:date "2018-06-15"^^xsd:date .
+  }
+} WHERE {
+  GRAPH ?g {
+    <http://data.lblod.info/id/veranderingsgebeurtenissen/6217A27A5747C883CA1D34E9> dct:date "2018-06-09"^^xsd:date .
+  }
+}
--- a/config/migrations/2022/20220328172743-update-date-change-event-Glabbeek.sparql
+++ b/config/migrations/2022/20220328172743-update-date-change-event-Glabbeek.sparql
@@ -0,0 +1,15 @@
+PREFIX dct: <http://purl.org/dc/terms/>
+
+DELETE {
+  GRAPH ?g {
+    <http://data.lblod.info/id/veranderingsgebeurtenissen/61F92B8D51BFC225E4ECF307> dct:date "2021-02-04"^^xsd:date .
+  }
+} INSERT {
+  GRAPH ?g {
+    <http://data.lblod.info/id/veranderingsgebeurtenissen/61F92B8D51BFC225E4ECF307> dct:date "2022-02-04"^^xsd:date .
+  }
+} WHERE {
+  GRAPH ?g {
+    <http://data.lblod.info/id/veranderingsgebeurtenissen/61F92B8D51BFC225E4ECF307> dct:date "2021-02-04"^^xsd:date .
+  }
+}
--- a/config/migrations/2022/20220329114750-remove-kbo-of-Centraal-Comite-van-de-Anglicaanse-Eredienst-in-Belgie.sparql
+++ b/config/migrations/2022/20220329114750-remove-kbo-of-Centraal-Comite-van-de-Anglicaanse-Eredienst-in-Belgie.sparql
@@ -0,0 +1,19 @@
+DELETE {
+  GRAPH ?g {
+    <http://data.lblod.info/id/representatieveOrganen/bf83abb71bd810ad1ebe05ac8cb72a1c>
+      <http://www.w3.org/ns/adms#identifier> ?identifier .
+    ?identifier
+      <https://data.vlaanderen.be/ns/generiek#gestructureerdeIdentificator> ?structuredIdentifier ;
+      ?pidentifier ?oidentifier .
+    ?structuredIdentifier ?pstructuredIdentifier ?ostructuredIdentifier .
+  }
+} WHERE {
+  GRAPH ?g {
+    <http://data.lblod.info/id/representatieveOrganen/bf83abb71bd810ad1ebe05ac8cb72a1c>
+      <http://www.w3.org/ns/adms#identifier> ?identifier .
+    ?identifier
+      <https://data.vlaanderen.be/ns/generiek#gestructureerdeIdentificator> ?structuredIdentifier ;
+      ?pidentifier ?oidentifier .
+    ?structuredIdentifier ?pstructuredIdentifier ?ostructuredIdentifier .
+  }
+}
--- a/config/migrations/2022/20220329150729-delete-positions-Protestantse-Kerk-van-Kortrijk.sparql
+++ b/config/migrations/2022/20220329150729-delete-positions-Protestantse-Kerk-van-Kortrijk.sparql
@@ -0,0 +1,38 @@
+DELETE {
+  GRAPH ?g {
+    <http://data.lblod.info/id/eredienstbestuursorganen/3c07a7f0db44632737d1657ea9035e9f>
+      <http://www.w3.org/ns/org#hasPost> ?post .
+
+    ?post ?ppost ?opost .
+
+    ?role <http://www.w3.org/ns/org#holds> ?post ;
+      <http://schema.org/contactPoint> ?contactPoint ;
+      ?prole ?orole .
+
+    ?contactPoint <http://www.w3.org/ns/locn#address> ?address ;
+      ?pcontactPoint ?ocontactPoint .
+
+    ?address ?paddress ?oaddress .
+  }
+} WHERE {
+  GRAPH ?g {
+    <http://data.lblod.info/id/eredienstbestuursorganen/3c07a7f0db44632737d1657ea9035e9f>
+      <http://www.w3.org/ns/org#hasPost> ?post .
+
+    ?post ?ppost ?opost .
+
+    ?role <http://www.w3.org/ns/org#holds> ?post ;
+      ?prole ?orole .
+
+    OPTIONAL {
+      ?role <http://schema.org/contactPoint> ?contactPoint .
+
+      ?contactPoint ?pcontactPoint ?ocontactPoint .
+
+      OPTIONAL {
+        ?contactPoint <http://www.w3.org/ns/locn#address> ?address .
+        ?address ?paddress ?oaddress .
+      }
+    }
+  }
+}
--- a/config/migrations/2022/20220329154322-delete-positions-ckb-staden.sparql
+++ b/config/migrations/2022/20220329154322-delete-positions-ckb-staden.sparql
@@ -0,0 +1,38 @@
+DELETE {
+  GRAPH ?g {
+    <http://data.lblod.info/id/centralebestuursorganen/d2b5a4e1a4e66c9e0319f4704c96bf4c>
+      <http://www.w3.org/ns/org#hasPost> ?post .
+
+    ?post ?ppost ?opost .
+
+    ?role <http://www.w3.org/ns/org#holds> ?post ;
+      <http://schema.org/contactPoint> ?contactPoint ;
+      ?prole ?orole .
+
+    ?contactPoint <http://www.w3.org/ns/locn#address> ?address ;
+      ?pcontactPoint ?ocontactPoint .
+
+    ?address ?paddress ?oaddress .
+  }
+} WHERE {
+  GRAPH ?g {
+    <http://data.lblod.info/id/centralebestuursorganen/d2b5a4e1a4e66c9e0319f4704c96bf4c>
+      <http://www.w3.org/ns/org#hasPost> ?post .
+
+    ?post ?ppost ?opost .
+
+    ?role <http://www.w3.org/ns/org#holds> ?post ;
+      ?prole ?orole .
+
+    OPTIONAL {
+      ?role <http://schema.org/contactPoint> ?contactPoint .
+
+      ?contactPoint ?pcontactPoint ?ocontactPoint .
+
+      OPTIONAL {
+        ?contactPoint <http://www.w3.org/ns/locn#address> ?address .
+        ?address ?paddress ?oaddress .
+      }
+    }
+  }
+}
--- a/config/migrations/2022/20220401162146-fix-wrongly-formatted-kbo.sparql
+++ b/config/migrations/2022/20220401162146-fix-wrongly-formatted-kbo.sparql
@@ -0,0 +1,51 @@
+PREFIX generiek: <https://data.vlaanderen.be/ns/generiek#>
+
+DELETE {
+  GRAPH ?g {
+    <http://data.lblod.info/id/gestructureerdeIdentificatoren/6130DFFB375CFC000A0000A1> generiek:lokaleIdentificator ?kbo1 .
+    <http://data.lblod.info/id/gestructureerdeIdentificatoren/61DFFBF9BA00DD4BE2501BC2> generiek:lokaleIdentificator ?kbo2 .
+    <http://data.lblod.info/id/gestructureerdeIdentificatoren/5d50bc3fdf941de8b56c8def78407436> generiek:lokaleIdentificator ?kbo3 .
+    <http://data.lblod.info/id/gestructureerdeIdentificatoren/52c1f29b51e8a92972c57f2c7b229b5a> generiek:lokaleIdentificator ?kbo4 .
+    <http://data.lblod.info/id/gestructureerdeIdentificatoren/406fec8a5923e85511ca92c39edfd6ec> generiek:lokaleIdentificator ?kbo5 .
+    <http://data.lblod.info/id/gestructureerdeIdentificatoren/fa7c56c097294e0c31aca1ac99fd0b6a> generiek:lokaleIdentificator ?kbo6 .
+    <http://data.lblod.info/id/gestructureerdeIdentificatoren/b48f6b751fd53f9ef0e249b0234480ff> generiek:lokaleIdentificator ?kbo7 .
+    <http://data.lblod.info/id/gestructureerdeIdentificatoren/b4af7f119ea6a0b012e01ef8494c5f72> generiek:lokaleIdentificator ?kbo8 .
+    <http://data.lblod.info/id/gestructureerdeIdentificatoren/40022a348133be5a8da995c6770ced56> generiek:lokaleIdentificator ?kbo9 .
+    <http://data.lblod.info/id/gestructureerdeIdentificatoren/d5c5db3a99201463e6f18daba19efb52> generiek:lokaleIdentificator ?kbo10 .
+    <http://data.lblod.info/id/gestructureerdeIdentificatoren/79cd43bc157fcf9d4440edf4c40ebd2b> generiek:lokaleIdentificator ?kbo11 .
+    <http://data.lblod.info/id/gestructureerdeIdentificatoren/2dbeed0bd11f472a304580748b1c30a9> generiek:lokaleIdentificator ?kbo12 .
+    <http://data.lblod.info/id/gestructureerdeIdentificatoren/bf7c674a89e693d52bd1152e0026b550> generiek:lokaleIdentificator ?kbo13 .
+  }
+} INSERT {
+  GRAPH ?g {
+    <http://data.lblod.info/id/gestructureerdeIdentificatoren/6130DFFB375CFC000A0000A1> generiek:lokaleIdentificator "0777683642" .
+    <http://data.lblod.info/id/gestructureerdeIdentificatoren/61DFFBF9BA00DD4BE2501BC2> generiek:lokaleIdentificator "0780386972" .
+    <http://data.lblod.info/id/gestructureerdeIdentificatoren/5d50bc3fdf941de8b56c8def78407436> generiek:lokaleIdentificator "0408140861" .
+    <http://data.lblod.info/id/gestructureerdeIdentificatoren/52c1f29b51e8a92972c57f2c7b229b5a> generiek:lokaleIdentificator "0408472839" .
+    <http://data.lblod.info/id/gestructureerdeIdentificatoren/406fec8a5923e85511ca92c39edfd6ec> generiek:lokaleIdentificator "0409677223" .
+    <http://data.lblod.info/id/gestructureerdeIdentificatoren/fa7c56c097294e0c31aca1ac99fd0b6a> generiek:lokaleIdentificator "0409771253" .
+    <http://data.lblod.info/id/gestructureerdeIdentificatoren/b48f6b751fd53f9ef0e249b0234480ff> generiek:lokaleIdentificator "0410195380" .
+    <http://data.lblod.info/id/gestructureerdeIdentificatoren/b4af7f119ea6a0b012e01ef8494c5f72> generiek:lokaleIdentificator "0412914944" .
+    <http://data.lblod.info/id/gestructureerdeIdentificatoren/40022a348133be5a8da995c6770ced56> generiek:lokaleIdentificator "0413234648" .
+    <http://data.lblod.info/id/gestructureerdeIdentificatoren/d5c5db3a99201463e6f18daba19efb52> generiek:lokaleIdentificator "0464533790" .
+    <http://data.lblod.info/id/gestructureerdeIdentificatoren/79cd43bc157fcf9d4440edf4c40ebd2b> generiek:lokaleIdentificator "0687815914" .
+    <http://data.lblod.info/id/gestructureerdeIdentificatoren/2dbeed0bd11f472a304580748b1c30a9> generiek:lokaleIdentificator "0864330673" .
+    <http://data.lblod.info/id/gestructureerdeIdentificatoren/bf7c674a89e693d52bd1152e0026b550> generiek:lokaleIdentificator "0898987189" .
+  }
+} WHERE {
+  GRAPH ?g {
+    <http://data.lblod.info/id/gestructureerdeIdentificatoren/6130DFFB375CFC000A0000A1> generiek:lokaleIdentificator ?kbo1 .
+    <http://data.lblod.info/id/gestructureerdeIdentificatoren/61DFFBF9BA00DD4BE2501BC2> generiek:lokaleIdentificator ?kbo2 .
+    <http://data.lblod.info/id/gestructureerdeIdentificatoren/5d50bc3fdf941de8b56c8def78407436> generiek:lokaleIdentificator ?kbo3 .
+    <http://data.lblod.info/id/gestructureerdeIdentificatoren/52c1f29b51e8a92972c57f2c7b229b5a> generiek:lokaleIdentificator ?kbo4 .
+    <http://data.lblod.info/id/gestructureerdeIdentificatoren/406fec8a5923e85511ca92c39edfd6ec> generiek:lokaleIdentificator ?kbo5 .
+    <http://data.lblod.info/id/gestructureerdeIdentificatoren/fa7c56c097294e0c31aca1ac99fd0b6a> generiek:lokaleIdentificator ?kbo6 .
+    <http://data.lblod.info/id/gestructureerdeIdentificatoren/b48f6b751fd53f9ef0e249b0234480ff> generiek:lokaleIdentificator ?kbo7 .
+    <http://data.lblod.info/id/gestructureerdeIdentificatoren/b4af7f119ea6a0b012e01ef8494c5f72> generiek:lokaleIdentificator ?kbo8 .
+    <http://data.lblod.info/id/gestructureerdeIdentificatoren/40022a348133be5a8da995c6770ced56> generiek:lokaleIdentificator ?kbo9 .
+    <http://data.lblod.info/id/gestructureerdeIdentificatoren/d5c5db3a99201463e6f18daba19efb52> generiek:lokaleIdentificator ?kbo10 .
+    <http://data.lblod.info/id/gestructureerdeIdentificatoren/79cd43bc157fcf9d4440edf4c40ebd2b> generiek:lokaleIdentificator ?kbo11 .
+    <http://data.lblod.info/id/gestructureerdeIdentificatoren/2dbeed0bd11f472a304580748b1c30a9> generiek:lokaleIdentificator ?kbo12 .
+    <http://data.lblod.info/id/gestructureerdeIdentificatoren/bf7c674a89e693d52bd1152e0026b550> generiek:lokaleIdentificator ?kbo13 .
+  }
+}
--- a/config/migrations/2022/20220406134511-change-status-ckb-melle.sparql
+++ b/config/migrations/2022/20220406134511-change-status-ckb-melle.sparql
@@ -0,0 +1,19 @@
+PREFIX regorg: <http://www.w3.org/ns/regorg#>
+
+DELETE {
+  GRAPH ?g {
+    <http://data.lblod.info/id/centraleBesturenVanDeEredienst/08223304e42d99067f54a753f8c685fe>
+      regorg:orgStatus <http://lblod.data.gift/concepts/63cc561de9188d64ba5840a42ae8f0d6> . # Actief
+  }
+} INSERT {
+  GRAPH ?g {
+    <http://data.lblod.info/id/centraleBesturenVanDeEredienst/08223304e42d99067f54a753f8c685fe>
+      regorg:orgStatus <http://lblod.data.gift/concepts/d02c4e12bf88d2fdf5123b07f29c9311> . # Niet Actief
+
+  }
+} WHERE {
+  GRAPH ?g {
+    <http://data.lblod.info/id/centraleBesturenVanDeEredienst/08223304e42d99067f54a753f8c685fe>
+      regorg:orgStatus <http://lblod.data.gift/concepts/63cc561de9188d64ba5840a42ae8f0d6> .
+  }
+}
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -79,7 +79,7 @@ services:
    restart: always
    logging: *default-logging
  kalliope-api:
-    image: lblod/jsonld-delta-service:0.5.5
+    image: lblod/jsonld-delta-service:0.5.6
    volumes:
      - ./config/kalliope:/config
      - ./data/files:/share
@@ -138,7 +138,7 @@ services:
    restart: always
    logging: *default-logging
  privacy:
-    image: lblod/privacy-centric-service:0.4.1
+    image: lblod/privacy-centric-service:0.4.2
    labels:
      - "logging=true"
    environment:
@@ -159,7 +159,7 @@ services:
    restart: always
    logging: *default-logging
  frontend:
-    image: lblod/frontend-organization-portal:1.7.0-3
+    image: lblod/frontend-organization-portal:1.7.0
    volumes:
      - ./config/frontend/add-x-frame-options-header.conf:/config/add-x-frame-options.conf
    environment:
@@ -339,7 +339,7 @@ services:
 # MU SEARCH - TODO USE THE CORRECT IMAGE ONCE INHERITANCE IS IN MU SEARCH
 ################################################################################
  search:
-    image: nbittich/mu-search:wip-inheritance # Bump to fixed version when merged and release to the original repo
+    image: nbittich/mu-search:wip-inheritance-alpha2 # Bump to fixed version when merged and release to the original repo
    links:
      - db:database
    restart: always
Author	SHA1	Message	Date
Nordine Bittich	1b152e688b	fix regression mu search (#128 )	2022-04-07 12:03:48 +02:00
Claire Lovisa	6d492bb1a0	Fix status ckb melle	2022-04-06 14:13:42 +02:00
Claire Lovisa	5f96fb22e1	Add migration to reformat weird kbos	2022-04-01 16:38:28 +02:00
Nordine Bittich	1411dd872a	bump frontend	2022-03-31 19:52:28 +02:00
Nordine Bittich	2a1e75628d	bump java deps (#124 )	2022-03-31 14:59:32 +02:00
Claire Lovisa	049ae5f041	Merge branch 'master' into development	2022-03-31 14:49:10 +02:00
Claire Lovisa	d2d60e1339	Bump frontend	2022-03-31 14:48:45 +02:00
Nordine Bittich	6471b8c87a	Merge branch 'master' into development	2022-03-30 13:38:21 +02:00
Nordine Bittich	7866e89d4e	bump frontend	2022-03-30 13:38:10 +02:00
claire-lovisa	fdabbb5b5d	Merge pull request #122 from lblod/fix/incident-handlings Adds migrations to fix wrong data	2022-03-30 09:48:23 +02:00
Claire Lovisa	a1655337c2	Adds migrations to fix wrong data	2022-03-29 15:55:43 +02:00