migration to delete mandatarissen, and person (#226 )

fix missing governing bodies (#224 )
Fix / Change bedienaar roles (#217 )
2023-01-27 15:29:24 +01:00 · 2023-01-25 16:30:35 +01:00 · 2023-01-25 13:10:36 +02:00 · 2023-01-25 13:09:38 +02:00 · 2023-01-23 10:54:06 +01:00 · 2023-01-21 11:07:56 +01:00
5 changed files with 293 additions and 3 deletions
--- a/config/migrations/2023/20230118155500-modify-bedienaar-role.sparql
+++ b/config/migrations/2023/20230118155500-modify-bedienaar-role.sparql
@@ -0,0 +1,129 @@
+PREFIX org: <http://www.w3.org/ns/org#>
+PREFIX ere: <http://data.lblod.info/vocabularies/erediensten/>
+
+DELETE {
+  GRAPH ?g {
+    ?role ere:functie <http://lblod.data.gift/concepts/e357bc8f4cc3a694fde2239748768a22> . # Eerste Imam in rang
+  }
+} INSERT {
+  GRAPH ?g {
+    ?role ere:functie <http://lblod.data.gift/concepts/5ebb798bd59c3b48c25116032caa02b7> . # Derde Imam in rang
+  }
+} WHERE {
+  GRAPH ?g {
+    VALUES ?rolBedienaar {
+        <http://data.lblod.info/id/rollenBedienaar/6332F95A036B579F0A26FF39>    # OP-2045
+        <http://data.lblod.info/id/rollenBedienaar/63515D0E8DE5818A7C9F41B6>    # OP-2046
+    }
+    ?rolBedienaar org:holds ?role .
+    ?role ere:functie <http://lblod.data.gift/concepts/e357bc8f4cc3a694fde2239748768a22> .
+  }
+}
+;
+DELETE {
+  GRAPH ?g {
+    ?role ere:functie <http://lblod.data.gift/concepts/c4a3fd586211b17b06f574885e23f355> . # Tweede Imam in rang
+  }
+} INSERT {
+  GRAPH ?g {
+    ?role ere:functie <http://lblod.data.gift/concepts/5ebb798bd59c3b48c25116032caa02b7> . # Derde Imam in rang
+  }
+} WHERE {
+  GRAPH ?g {
+    <http://data.lblod.info/id/rollenBedienaar/63515DDE8DE5818A7C9F41BB> org:holds ?role .  # OP-2046
+    ?role ere:functie <http://lblod.data.gift/concepts/c4a3fd586211b17b06f574885e23f355> .
+  }
+}
+;
+DELETE {
+  GRAPH ?g {
+    ?role ere:functie <http://lblod.data.gift/concepts/efbf2ff50b5c4f693f129ac03319c4f2> . # Priester
+  }
+} INSERT {
+  GRAPH ?g {
+    ?role ere:functie <http://lblod.data.gift/concepts/04d3b5325f2ebc5eaf96849519af4254> . # Rector
+  }
+} WHERE {
+  GRAPH ?g {
+    VALUES ?rolBedienaar {
+        <http://data.lblod.info/id/rollenBedienaar/633309B8036B579F0A26FF4D>    # OP-2056
+        <http://data.lblod.info/id/rollenBedienaar/6308BA29BB4106FB970C4D15>    # OP-2057
+        <http://data.lblod.info/id/rollenBedienaar/633308FD036B579F0A26FF48>    # OP-2060
+    }
+    ?rolBedienaar org:holds ?role .
+    ?role ere:functie <http://lblod.data.gift/concepts/efbf2ff50b5c4f693f129ac03319c4f2> .
+  }
+}
+
+# The associated call to trigger a reindex is :
+
+# curl --location --request POST '172.26.0.28/update' \
+# --header 'Content-Type: application/vnd.api+json' \
+# --data-raw ' [
+#   {
+#     "deletes": [
+#       {
+#         "subject": { "type": "uri", "value": "http://data.lblod.info/id/positiesBedienaar/63515D0E8DE5818A7C9F41B5" },
+#         "predicate": { "type": "uri", "value": "http://data.lblod.info/vocabularies/erediensten/functie" },
+#         "object": { "type": "uri", "value": "http://lblod.data.gift/concepts/e357bc8f4cc3a694fde2239748768a22" }
+#       },
+#       {
+#         "subject": { "type": "uri", "value": "http://data.lblod.info/id/positiesBedienaar/6332F959036B579F0A26FF38" },
+#         "predicate": { "type": "uri", "value": "http://data.lblod.info/vocabularies/erediensten/functie" },
+#         "object": { "type": "uri", "value": "http://lblod.data.gift/concepts/e357bc8f4cc3a694fde2239748768a22" }
+#       },
+#       {
+#         "subject": { "type": "uri", "value": "http://data.lblod.info/id/positiesBedienaar/63515DDE8DE5818A7C9F41BA" },
+#         "predicate": { "type": "uri", "value": "http://data.lblod.info/vocabularies/erediensten/functie" },
+#         "object": { "type": "uri", "value": "http://lblod.data.gift/concepts/c4a3fd586211b17b06f574885e23f355" }
+#       },
+#       {
+#         "subject": { "type": "uri", "value": "http://data.lblod.info/id/positiesBedienaar/6308BA29BB4106FB970C4D14" },
+#         "predicate": { "type": "uri", "value": "http://data.lblod.info/vocabularies/erediensten/functie" },
+#         "object": { "type": "uri", "value": "http://lblod.data.gift/concepts/efbf2ff50b5c4f693f129ac03319c4f2" }
+#       },
+#       {
+#         "subject": { "type": "uri", "value": "http://data.lblod.info/id/positiesBedienaar/633308FC036B579F0A26FF47" },
+#         "predicate": { "type": "uri", "value": "http://data.lblod.info/vocabularies/erediensten/functie" },
+#         "object": { "type": "uri", "value": "http://lblod.data.gift/concepts/efbf2ff50b5c4f693f129ac03319c4f2" }
+#       },
+#       {
+#         "subject": { "type": "uri", "value": "http://data.lblod.info/id/positiesBedienaar/633309B8036B579F0A26FF4C" },
+#         "predicate": { "type": "uri", "value": "http://data.lblod.info/vocabularies/erediensten/functie" },
+#         "object": { "type": "uri", "value": "http://lblod.data.gift/concepts/efbf2ff50b5c4f693f129ac03319c4f2" }
+#       }
+#     ],
+#     "inserts": [
+#       {
+#         "subject": { "type": "uri", "value": "http://data.lblod.info/id/positiesBedienaar/63515D0E8DE5818A7C9F41B5" },
+#         "predicate": { "type": "uri", "value": "http://data.lblod.info/vocabularies/erediensten/functie" },
+#         "object": { "type": "uri", "value": "http://lblod.data.gift/concepts/5ebb798bd59c3b48c25116032caa02b7" }
+#       },
+#       {
+#         "subject": { "type": "uri", "value": "http://data.lblod.info/id/positiesBedienaar/6332F959036B579F0A26FF38" },
+#         "predicate": { "type": "uri", "value": "http://data.lblod.info/vocabularies/erediensten/functie" },
+#         "object": { "type": "uri", "value": "http://lblod.data.gift/concepts/5ebb798bd59c3b48c25116032caa02b7" }
+#       },
+#       {
+#         "subject": { "type": "uri", "value": "http://data.lblod.info/id/positiesBedienaar/63515DDE8DE5818A7C9F41BA" },
+#         "predicate": { "type": "uri", "value": "http://data.lblod.info/vocabularies/erediensten/functie" },
+#         "object": { "type": "uri", "value": "http://lblod.data.gift/concepts/5ebb798bd59c3b48c25116032caa02b7" }
+#       },
+#       {
+#         "subject": { "type": "uri", "value": "http://data.lblod.info/id/positiesBedienaar/6308BA29BB4106FB970C4D14" },
+#         "predicate": { "type": "uri", "value": "http://data.lblod.info/vocabularies/erediensten/functie" },
+#         "object": { "type": "uri", "value": "http://lblod.data.gift/concepts/04d3b5325f2ebc5eaf96849519af4254" }
+#       },
+#       {
+#         "subject": { "type": "uri", "value": "http://data.lblod.info/id/positiesBedienaar/633308FC036B579F0A26FF47" },
+#         "predicate": { "type": "uri", "value": "http://data.lblod.info/vocabularies/erediensten/functie" },
+#         "object": { "type": "uri", "value": "http://lblod.data.gift/concepts/04d3b5325f2ebc5eaf96849519af4254" }
+#       },
+#       {
+#         "subject": { "type": "uri", "value": "http://data.lblod.info/id/positiesBedienaar/633309B8036B579F0A26FF4C" },
+#         "predicate": { "type": "uri", "value": "http://data.lblod.info/vocabularies/erediensten/functie" },
+#         "object": { "type": "uri", "value": "http://lblod.data.gift/concepts/04d3b5325f2ebc5eaf96849519af4254" }
+#       }      
+#     ]
+#   }
+# ]'
--- a/config/migrations/2023/20230123100000-delete-bedienaren-from-worship-service.sparql
+++ b/config/migrations/2023/20230123100000-delete-bedienaren-from-worship-service.sparql
@@ -0,0 +1,67 @@
+PREFIX rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#> 
+PREFIX org: <http://www.w3.org/ns/org#>
+PREFIX locn: <http://www.w3.org/ns/locn#>
+PREFIX schema: <http://schema.org/>
+PREFIX ch: <http://data.lblod.info/vocabularies/contacthub/>
+PREFIX ere: <http://data.lblod.info/vocabularies/erediensten/>
+
+DELETE {
+  GRAPH <http://mu.semte.ch/graphs/organisatieportaal> {     
+    ?rolBedienaar ?pRolBedienaar ?oRolBedienaar .
+    ?contactPoint ?pContactPoint ?ocontactPoint .
+    ?address ?pAddress ?oAddress .
+  }
+}
+WHERE {
+  GRAPH <http://mu.semte.ch/graphs/organisatieportaal> { 
+
+    VALUES ?rolBedienaar {
+      <http://data.lblod.info/id/rollenBedienaar/6332F770036B579F0A26FF2F>    # OP-2043
+      <http://data.lblod.info/id/rollenBedienaar/6332F6C9036B579F0A26FF2A>    # OP-2043
+      <http://data.lblod.info/id/rollenBedienaar/6332F7FB036B579F0A26FF34>    # OP-2043 
+      <http://data.lblod.info/id/rollenBedienaar/638F083FA742F4FD4AB55907>    # OP-2047
+    }
+
+    ?rolBedienaar rdf:type ere:RolBedienaar ;
+      schema:contactPoint ?contactPoint ;
+      ?pRolBedienaar ?oRolBedienaar .
+
+    ?contactPoint locn:address ?address ;
+      ?pContactPoint ?ocontactPoint .
+
+    ?address ?pAddress ?oAddress .
+    
+  }
+}
+
+# The associated call to trigger a reindex is :
+
+# curl --location --request POST '172.22.0.30/update' \
+# --header 'Content-Type: application/vnd.api+json' \
+# --data-raw ' [
+#   {
+#     "deletes": [
+#       {
+#         "subject": { "type": "uri", "value": "http://data.lblod.info/id/rollenBedienaar/6332F770036B579F0A26FF2F" },
+#         "predicate": { "type": "uri", "value": "http://www.w3.org/ns/org#heldBy" },
+#         "object": { "type": "uri", "value": "http://data.lblod.info/id/personen/6332F6FD036B579F0A26FF2B" }
+#       },
+#       {
+#         "subject": { "type": "uri", "value": "http://data.lblod.info/id/rollenBedienaar/6332F6C9036B579F0A26FF2A" },
+#         "predicate": { "type": "uri", "value": "http://www.w3.org/ns/org#heldBy" },
+#         "object": { "type": "uri", "value": "http://data.lblod.info/id/personen/6332F648036B579F0A26FF26" }
+#       },
+#       {
+#         "subject": { "type": "uri", "value": "http://data.lblod.info/id/rollenBedienaar/6332F7FB036B579F0A26FF34" },
+#         "predicate": { "type": "uri", "value": "http://www.w3.org/ns/org#heldBy" },
+#         "object": { "type": "uri", "value": "http://data.lblod.info/id/personen/6332F7AF036B579F0A26FF30" }
+#       },
+#       {
+#         "subject": { "type": "uri", "value": "http://data.lblod.info/id/rollenBedienaar/638F083FA742F4FD4AB55907" },
+#         "predicate": { "type": "uri", "value": "http://www.w3.org/ns/org#heldBy" },
+#         "object": { "type": "uri", "value": "http://data.lblod.info/id/personen/638F07A6A742F4FD4AB55903" }
+#       }
+#     ],
+#     "inserts": []
+#   }
+# ]'
--- a/config/migrations/2023/20230124100000-delete-person-mandatarissen.sparql
+++ b/config/migrations/2023/20230124100000-delete-person-mandatarissen.sparql
@@ -0,0 +1,59 @@
+PREFIX mandaat: <http://data.vlaanderen.be/ns/mandaat#>
+PREFIX schema: <http://schema.org/>
+PREFIX locn: <http://www.w3.org/ns/locn#>
+PREFIX org: <http://www.w3.org/ns/org#>
+
+DELETE {
+    GRAPH <http://mu.semte.ch/graphs/organisatieportaal>  {
+        ?mandatarissen ?pMandatarissen ?oMandatarissen .
+        ?mandaat ?pMandaat ?oMandaat .
+        ?person ?pPerson ?oPerson .
+        ?contactPoint ?pContactPoint ?oContactPoint .
+        ?address ?pAddress ?oAddress .
+    }
+} WHERE {
+    GRAPH <http://mu.semte.ch/graphs/organisatieportaal> {
+        VALUES ?mandatarissen {
+            <http://data.lblod.info/id/mandatarissen/807a3e07c95fe40962d64695069af946> #1
+            <http://data.lblod.info/id/mandatarissen/40ed3cb19f9fa33e47b39016780dce1d> #2
+        }
+
+        ?mandatarissen org:holds ?mandaat ;
+            mandaat:isBestuurlijkeAliasVan ?person ;
+            ?pMandatarissen ?oMandatarissen .
+
+        OPTIONAL {
+            ?mandatarissen schema:contactPoint ?contactPoint .
+            OPTIONAL {
+                ?contactPoint locn:address ?address ;
+                    ?pContactPoint ?oContactPoint .
+                ?address ?pAddress ?oAddress .
+            }
+        }
+
+        ?person ?pPerson ?oPerson . 
+        ?mandaat ?pMandaat ?oMandaat .            
+    }
+}
+
+# An associated call to trigger a reindex is:
+
+# curl --location --request POST '172.32.0.21/update' \
+# --header 'Content-Type: application/vnd.api+json' \
+# --data-raw ' [
+#   {
+#     "deletes": [
+#       {
+#         "subject": { "type": "uri", "value": "http://data.lblod.info/id/mandatarissen/807a3e07c95fe40962d64695069af946" },
+#         "predicate": { "type": "uri", "value": "http://data.vlaanderen.be/ns/mandaat#isBestuurlijkeAliasVan" },
+#         "object": { "type": "uri", "value": "http://data.lblod.info/id/personen/620523C451BFC225E4ECFA97" }
+#       },
+#       {
+#         "subject": { "type": "uri", "value": "http://data.lblod.info/id/mandatarissen/40ed3cb19f9fa33e47b39016780dce1d" },
+#         "predicate": { "type": "uri", "value": "http://data.vlaanderen.be/ns/mandaat#isBestuurlijkeAliasVan" },
+#         "object": { "type": "uri", "value": "http://data.lblod.info/id/personen/620523C451BFC225E4ECFA97" }
+#       }
+#     ],
+#     "inserts": []
+#   }
+# ]'
--- a/config/migrations/2023/20230125140612-add-missing-governing-body.sparql
+++ b/config/migrations/2023/20230125140612-add-missing-governing-body.sparql
@@ -0,0 +1,35 @@
+PREFIX mu: <http://mu.semte.ch/vocabularies/core/> 
+PREFIX org: <http://www.w3.org/ns/org#> 
+PREFIX besluit: <http://data.vlaanderen.be/ns/besluit#> 
+PREFIX generiek: <https://data.vlaanderen.be/ns/generiek#> 
+
+# OP-2070
+INSERT DATA {
+  GRAPH <http://mu.semte.ch/graphs/organisatieportaal> {
+
+   <http://data.lblod.info/id/bestuursorganen/56c71a29-bff0-4b67-804d-2c98fd4bd10f> a <http://data.vlaanderen.be/ns/besluit#Bestuursorgaan>;
+                                                                                    mu:uuid "56c71a29-bff0-4b67-804d-2c98fd4bd10f";
+                                                                                    besluit:bestuurt <http://data.lblod.info/id/besturenVanDeEredienst/6232329df9377210c3576b17e116de8b>;
+                                                                                    org:classification <http://data.vlaanderen.be/id/concept/BestuursorgaanClassificatieCode/b475fa47e17a8a05ae04a9e1fb9c9258>.
+   <http://data.lblod.info/id/bestuursorganen/54f16d44-2f2c-45df-83c1-5a9fbe4756ca> a <http://data.vlaanderen.be/ns/besluit#Bestuursorgaan>;
+                                                                                    mu:uuid "54f16d44-2f2c-45df-83c1-5a9fbe4756ca";
+                                                                                    generiek:isTijdspecialisatieVan <http://data.lblod.info/id/bestuursorganen/56c71a29-bff0-4b67-804d-2c98fd4bd10f> .
+  }
+}
+
+;
+
+# OP-2084
+
+INSERT DATA {
+  GRAPH <http://mu.semte.ch/graphs/organisatieportaal> {
+
+   <http://data.lblod.info/id/bestuursorganen/1179426b-69d4-4974-8aa2-c4d46a22c9cc> a <http://data.vlaanderen.be/ns/besluit#Bestuursorgaan>;
+                                                                                    mu:uuid "1179426b-69d4-4974-8aa2-c4d46a22c9cc";
+                                                                                    besluit:bestuurt <http://data.lblod.info/id/besturenVanDeEredienst/88cc9ab83a5a94caeb2f4b04615b20f2>;
+                                                                                    org:classification <http://data.vlaanderen.be/id/concept/BestuursorgaanClassificatieCode/b475fa47e17a8a05ae04a9e1fb9c9258>.
+   <http://data.lblod.info/id/bestuursorganen/b3db6a8d-d6cb-4b78-af87-b80dfda580c7> a <http://data.vlaanderen.be/ns/besluit#Bestuursorgaan>;
+                                                                                    mu:uuid "b3db6a8d-d6cb-4b78-af87-b80dfda580c7";
+                                                                                    generiek:isTijdspecialisatieVan <http://data.lblod.info/id/bestuursorganen/1179426b-69d4-4974-8aa2-c4d46a22c9cc> .
+  }
+}
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -157,7 +157,7 @@ services:
    restart: always
    logging: *default-logging
  frontend:
-    image: lblod/frontend-organization-portal:1.14.0-1
+    image: lblod/frontend-organization-portal:1.14.0
    volumes:
      - ./config/frontend/add-x-frame-options-header.conf:/config/add-x-frame-options.conf
    environment:
@@ -287,7 +287,7 @@ services:
      DUMP_FILE_CREATION_JOB_OPERATION: "http://redpencil.data.gift/id/jobs/concept/JobOperation/deltas/deltaDumpFileCreation/organizations"
      INITIAL_PUBLICATION_GRAPH_SYNC_JOB_OPERATION: "http://redpencil.data.gift/id/jobs/concept/JobOperation/deltas/initialPublicationGraphSyncing/organizations"
      HEALING_JOB_OPERATION: "http://redpencil.data.gift/id/jobs/concept/JobOperation/deltas/healingOperation/organizations"
-      CRON_PATTERN_DUMP_JOB: "42 * * * *" # At minute 42 every hour
+      CRON_PATTERN_DUMP_JOB: "40 * * * *" # At minute 40 every hour
      CRON_PATTERN_HEALING_JOB: "0 0 4 * * *" # everyday at 4 AM
      START_INITIAL_SYNC: "false" # prefer to disable it now. We want to have feeling with how the DB acts.
    labels:
@@ -548,7 +548,7 @@ services:
  # MU SEARCH
  ################################################################################
  search:
-    image: semtech/mu-search:0.9.0-beta.1
+    image: semtech/mu-search:0.9.0-beta.2
    links:
      - db:database
    restart: always
Author	SHA1	Message	Date
Nordine Bittich	76cb2ef547	migration to delete mandatarissen, and person (#226 )	2023-01-27 15:29:24 +01:00
Nordine Bittich	c41175cbb1	fix missing governing bodies (#224 )	2023-01-25 16:30:35 +01:00
Iulian Andriescu	9818c0e38e	Fix / Change bedienaar roles (#217 ) migration to change bedienaar roles	2023-01-25 13:10:36 +02:00
Iulian Andriescu	9c5ee85080	Fix / migration to delete bedienaren (#215 ) migration to delete bedienaren	2023-01-25 13:09:38 +02:00
Claire Lovisa	07c762d845	Bump mu-search	2023-01-23 10:54:06 +01:00
Nordine Bittich	e9dfdbbcf2	bump frontend	2023-01-21 11:07:56 +01:00
Nordine Bittich	cd5bc1d0e7	Merge commit 'f95b285ff8666b6fa9e9a47b1a6403ec257e50a6'	2023-01-21 11:06:23 +01:00
Boris De Vloed	462d30dbc4	change start time	2023-01-21 11:06:14 +01:00
Nordine Bittich	a336ff05fd	Merge commit '55c8b45cc7788ebfcc63357bca92109fb71ce498'	2023-01-21 11:05:58 +01:00
Boris De Vloed	ede4e60907	move metadata	2023-01-21 11:04:37 +01:00
Boris De Vloed	0f3bfbc6c4	typo	2023-01-21 11:04:30 +01:00
Boris De Vloed	546a5d7815	use same graph for dcat and files to avoid bug	2023-01-21 11:04:22 +01:00
Boris De Vloed	f95b285ff8	Merge pull request #220 from lblod/fix/kal-api-job-start change start time	2023-01-20 13:16:34 +01:00
Boris De Vloed	2139f11878	change start time	2023-01-20 12:13:28 +00:00