Merge pull request #463 from lblod/hotfix/add-type-bestuurseenheid-to-centrale-besturen

Added migration to add besluit:Bestuurseenheid to centrale besturen
Added migration to add besluit:Bestuurseenheid to centrale besture
2024-10-18 11:29:15 +02:00 · 2024-10-18 11:20:37 +02:00 · 2024-10-17 15:16:54 +02:00 · 2024-10-17 12:19:54 +02:00 · 2024-10-17 11:11:41 +02:00 · 2024-10-15 10:49:54 +02:00
13 changed files with 352 additions and 261 deletions
--- a/config/delta-producer/background-job-initiator/config.json
+++ b/config/delta-producer/background-job-initiator/config.json
@@ -1,12 +1,42 @@
 [
-    {
-        "name": "organizations",
-        "jobsGraph": "http://mu.semte.ch/graphs/jobs",
-        "dumpFileCreationJobOperation": "http://redpencil.data.gift/id/jobs/concept/JobOperation/deltas/deltaDumpFileCreation/organizations",
-        "initialPublicationGraphSyncJobOperation": "http://redpencil.data.gift/id/jobs/concept/JobOperation/deltas/initialPublicationGraphSyncing/organizations",
-        "healingJobOperation": "http://redpencil.data.gift/id/jobs/concept/JobOperation/deltas/healingOperation/organizations",
-        "cronPatternDumpJob": "42 * * * *",
-        "cronPatternHealingJob": "0 0 4 * * *",
-        "startInitialSync": true
-    }
-]
+  {
+    "name": "organizations",
+    "jobsGraph": "http://mu.semte.ch/graphs/jobs",
+    "dumpFileCreationJobOperation": "http://redpencil.data.gift/id/jobs/concept/JobOperation/deltas/deltaDumpFileCreation/organizations",
+    "initialPublicationGraphSyncJobOperation": "http://redpencil.data.gift/id/jobs/concept/JobOperation/deltas/initialPublicationGraphSyncing/organizations",
+    "healingJobOperation": "http://redpencil.data.gift/id/jobs/concept/JobOperation/deltas/healingOperation/organizations",
+    "cronPatternDumpJob": "42 * * * *",
+    "cronPatternHealingJob": "0 0 4 * * *",
+    "startInitialSync": true
+  },
+  {
+    "name": "public",
+    "jobsGraph": "http://mu.semte.ch/graphs/jobs",
+    "dumpFileCreationJobOperation": "http://redpencil.data.gift/id/jobs/concept/JobOperation/deltas/deltaDumpFileCreation/public",
+    "initialPublicationGraphSyncJobOperation": "http://redpencil.data.gift/id/jobs/concept/JobOperation/deltas/initialPublicationGraphSyncing/public",
+    "healingJobOperation": "http://redpencil.data.gift/id/jobs/concept/JobOperation/deltas/healingOperation/public",
+    "cronPatternDumpJob": "11 */4 * * *",
+    "cronPatternHealingJob": "0 0 4 * * *",
+    "startInitialSync": true
+  },
+  {
+    "name": "organizations-public-info",
+    "jobsGraph": "http://mu.semte.ch/graphs/jobs",
+    "dumpFileCreationJobOperation": "http://redpencil.data.gift/id/jobs/concept/JobOperation/deltas/deltaDumpFileCreation/organizations-public-info",
+    "initialPublicationGraphSyncJobOperation": "http://redpencil.data.gift/id/jobs/concept/JobOperation/deltas/initialPublicationGraphSyncing/organizations-public-info",
+    "healingJobOperation": "http://redpencil.data.gift/id/jobs/concept/JobOperation/deltas/healingOperation/organizations-public-info",
+    "cronPatternDumpJob": "27 */4 * * *",
+    "cronPatternHealingJob": "0 0 4 * * *",
+    "startInitialSync": true
+  },
+  {
+    "name": "worship-posts",
+    "jobsGraph": "http://mu.semte.ch/graphs/jobs",
+    "dumpFileCreationJobOperation": "http://redpencil.data.gift/id/jobs/concept/JobOperation/deltas/deltaDumpFileCreation/worship-posts",
+    "initialPublicationGraphSyncJobOperation": "http://redpencil.data.gift/id/jobs/concept/JobOperation/deltas/initialPublicationGraphSyncing/worship-posts",
+    "healingJobOperation": "http://redpencil.data.gift/id/jobs/concept/JobOperation/deltas/healingOperation/worship-posts",
+    "cronPatternDumpJob": "17 */4 * * *",
+    "cronPatternHealingJob": "0 0 3 * * *",
+    "startInitialSync": true
+  }
+]
--- a/config/delta-producer/publication-graph-maintainer/config.json
+++ b/config/delta-producer/publication-graph-maintainer/config.json
@@ -1,25 +1,93 @@
 {
-    "organizations": {
-        "deltaInterval": 10000,
-        "deltaPath": "/organizations/delta",
-        "errorCreatorUri": "http://lblod.data.gift/services/delta-producer-publication-graph-maintainer-organizations",
-        "exportConfigPath": "/config/organizations/export.json",
-        "filesPath": "/organizations/files",
-        "healingJobOperation": "http://redpencil.data.gift/id/jobs/concept/JobOperation/deltas/healingOperation/organizations",
-        "initialPublicationGraphSyncJobOperation": "http://redpencil.data.gift/id/jobs/concept/JobOperation/deltas/initialPublicationGraphSyncing/organizations",
-        "jobsGraph": "http://mu.semte.ch/graphs/jobs",
-        "publicationGraph": "http://redpencil.data.gift/id/deltas/producer/organizations",
-        "publisherUri": "http://data.lblod.info/services/delta-production-json-diff-file-manager/organizations",
-        "queuePollInterval": 3000,
-        "relativeFilePath": "/deltas/organizations",
-        "serveDeltaFiles": true,
-        "skipMuAuthInitialSync": true,
-        "skipMuAuthHealing": true,
-        "useFileDiff": true,
-        "healingInitialBatchSizeInsert": 1000,
-        "useVirtuosoForExpensiveSelects": true,
-        "errorGraph": "http://mu.semte.ch/graphs/jobs",
-        "loginPath": "/organizations/login",
-        "logOutgoingDelta": true
-    }
-}
+  "organizations": {
+    "deltaInterval": 10000,
+    "errorCreatorUri": "http://lblod.data.gift/services/delta-producer-publication-graph-maintainer-organizations",
+    "exportConfigPath": "/config/organizations/export.json",
+    "filesPath": "/organizations/files",
+    "healingJobOperation": "http://redpencil.data.gift/id/jobs/concept/JobOperation/deltas/healingOperation/organizations",
+    "initialPublicationGraphSyncJobOperation": "http://redpencil.data.gift/id/jobs/concept/JobOperation/deltas/initialPublicationGraphSyncing/organizations",
+    "jobsGraph": "http://mu.semte.ch/graphs/jobs",
+    "publicationGraph": "http://redpencil.data.gift/id/deltas/producer/organizations",
+    "publisherUri": "http://data.lblod.info/services/delta-production-json-diff-file-manager/organizations",
+    "queuePollInterval": 3000,
+    "relativeFilePath": "/deltas/organizations",
+    "serveDeltaFiles": true,
+    "skipMuAuthInitialSync": true,
+    "skipMuAuthHealing": true,
+    "useFileDiff": true,
+    "healingInitialBatchSizeInsert": 1000,
+    "useVirtuosoForExpensiveSelects": true,
+    "errorGraph": "http://mu.semte.ch/graphs/jobs",
+    "loginPath": "/organizations/login",
+    "logOutgoingDelta": true
+  },
+  "public": {
+    "deltaInterval": 10000,
+    "errorCreatorUri": "http://lblod.data.gift/services/delta-producer-publication-graph-maintainer-public",
+    "exportConfigPath": "/config/public/export.json",
+    "filesPath": "/public/files",
+    "healingJobOperation": "http://redpencil.data.gift/id/jobs/concept/JobOperation/deltas/healingOperation/public",
+    "initialPublicationGraphSyncJobOperation": "http://redpencil.data.gift/id/jobs/concept/JobOperation/deltas/initialPublicationGraphSyncing/public",
+    "jobsGraph": "http://mu.semte.ch/graphs/jobs",
+    "publicationGraph": "http://redpencil.data.gift/id/deltas/producer/public",
+    "publisherUri": "http://data.lblod.info/services/delta-production-json-diff-file-manager/public",
+    "queuePollInterval": 3000,
+    "relativeFilePath": "/deltas/public",
+    "serveDeltaFiles": true,
+    "skipMuAuthInitialSync": true,
+    "skipMuAuthHealing": true,
+    "useFileDiff": true,
+    "healingInitialBatchSizeInsert": 1000,
+    "healingPatchPublicationGraphTaskOperation": 500,
+    "useVirtuosoForExpensiveSelects": true,
+    "errorGraph": "http://mu.semte.ch/graphs/jobs",
+    "loginPath": "/public/login",
+    "logOutgoingDelta": true
+  },
+  "organizations-public-info": {
+    "deltaInterval": 10000,
+    "errorCreatorUri": "http://lblod.data.gift/services/delta-producer-publication-graph-maintainer-organizations-public-info",
+    "exportConfigPath": "/config/organizations-public-info/export.json",
+    "filesPath": "/organizations-public-info/files",
+    "healingJobOperation": "http://redpencil.data.gift/id/jobs/concept/JobOperation/deltas/healingOperation/organizations-public-info",
+    "initialPublicationGraphSyncJobOperation": "http://redpencil.data.gift/id/jobs/concept/JobOperation/deltas/initialPublicationGraphSyncing/organizations-public-info",
+    "jobsGraph": "http://mu.semte.ch/graphs/jobs",
+    "publicationGraph": "http://redpencil.data.gift/id/deltas/producer/organizations-public-info",
+    "publisherUri": "http://data.lblod.info/services/delta-production-json-diff-file-manager/organizations-public-info",
+    "queuePollInterval": 3000,
+    "relativeFilePath": "/deltas/organizations-public-info",
+    "serveDeltaFiles": true,
+    "skipMuAuthInitialSync": true,
+    "skipMuAuthHealing": true,
+    "useFileDiff": true,
+    "healingInitialBatchSizeInsert": 1000,
+    "healingPatchPublicationGraphTaskOperation": 500,
+    "useVirtuosoForExpensiveSelects": true,
+    "errorGraph": "http://mu.semte.ch/graphs/jobs",
+    "loginPath": "/organizations-public-info/login",
+    "logOutgoingDelta": true
+  },
+  "worship-posts": {
+    "deltaInterval": 10000,
+    "errorCreatorUri": "http://lblod.data.gift/services/delta-producer-publication-graph-maintainer-worship-posts",
+    "exportConfigPath": "/config/worship-posts/export.json",
+    "filesPath": "/worship-posts/files",
+    "healingJobOperation": "http://redpencil.data.gift/id/jobs/concept/JobOperation/deltas/healingOperation/worship-posts",
+    "initialPublicationGraphSyncJobOperation": "http://redpencil.data.gift/id/jobs/concept/JobOperation/deltas/initialPublicationGraphSyncing/worship-posts",
+    "jobsGraph": "http://mu.semte.ch/graphs/jobs",
+    "publicationGraph": "http://redpencil.data.gift/id/deltas/producer/worship-posts",
+    "publisherUri": "http://data.lblod.info/services/delta-production-json-diff-file-manager/worship-posts",
+    "queuePollInterval": 3000,
+    "relativeFilePath": "/deltas/worship-posts",
+    "serveDeltaFiles": true,
+    "skipMuAuthInitialSync": true,
+    "skipMuAuthHealing": true,
+    "useFileDiff": true,
+    "healingInitialBatchSizeInsert": 1000,
+    "healingPatchPublicationGraphTaskOperation": 500,
+    "useVirtuosoForExpensiveSelects": true,
+    "errorGraph": "http://mu.semte.ch/graphs/jobs",
+    "loginPath": "/worship-posts/login",
+    "logOutgoingDelta": true
+  }
+}
--- a/config/delta/rules.js
+++ b/config/delta/rules.js
@@ -33,7 +33,6 @@ export default [
      ignoreFromSelf: true
    }
  },
-
  {
    match: {
      graph: {
@@ -51,7 +50,6 @@ export default [
      ignoreFromSelf: true
    }
  },
-
  {
    match: {
      graph: {
@@ -69,7 +67,6 @@ export default [
      ignoreFromSelf: true
    }
  },
-
  {
    match: {
      predicate: {
@@ -92,59 +89,7 @@ export default [
    match: {
    },
    callback: {
-      url: 'http://delta-producer-publication-graph-maintainer/organizations/delta',
-      method: 'POST'
-    },
-    options: {
-      resourceFormat: 'v0.0.1',
-      gracePeriod: 1000,
-      ignoreFromSelf: true,
-      optOutMuScopeIds: [
-        "http://redpencil.data.gift/id/concept/muScope/deltas/initialSync",
-        "http://redpencil.data.gift/id/concept/muScope/deltas/publicationGraphMaintenance"
-      ]
-    }
-  },
-  {
-    match: {
-    },
-    callback: {
-      url: 'http://delta-producer-pub-graph-maintainer-organizations-public-info/delta',
-      method: 'POST'
-    },
-    options: {
-      resourceFormat: 'v0.0.1',
-      gracePeriod: 1000,
-      ignoreFromSelf: true,
-      optOutMuScopeIds: [
-        "http://redpencil.data.gift/id/concept/muScope/deltas/initialSync",
-        "http://redpencil.data.gift/id/concept/muScope/deltas/publicationGraphMaintenance"
-      ]
-    }
-  },
-  {
-    match: {
-    },
-    callback: {
-      url: 'http://delta-producer-pub-graph-maintainer-public/delta',
-      method: 'POST'
-    },
-    options: {
-      resourceFormat: 'v0.0.1',
-      gracePeriod: 1000,
-      ignoreFromSelf: true,
-      optOutMuScopeIds: [
-        "http://redpencil.data.gift/id/concept/muScope/deltas/initialSync",
-        "http://redpencil.data.gift/id/concept/muScope/deltas/publicationGraphMaintenance"
-      ]
-    }
-  },
-  {
-    match: {
-      // anything
-    },
-    callback: {
-      url: 'http://delta-producer-pub-graph-maintainer-worship-posts/delta',
+      url: 'http://delta-producer-publication-graph-maintainer/delta',
      method: 'POST'
    },
    options: {
--- a/config/dispatcher/dispatcher.ex
+++ b/config/dispatcher/dispatcher.ex
@@ -366,7 +366,7 @@ defmodule Dispatcher do
  #################################################################

  get "/sync/organizations/files/*path" do
-    Proxy.forward conn, path, "http://delta-producer-publication-graph-maintainer/files/"
+    Proxy.forward conn, path, "http://delta-producer-publication-graph-maintainer/organizations/files/"
  end

  #################################################################
@@ -374,7 +374,7 @@ defmodule Dispatcher do
  #################################################################

  get "/sync/organizations-public-info/files/*path" do
-    Proxy.forward conn, path, "http://delta-producer-pub-graph-maintainer-organizations-public-info/files/"
+    Proxy.forward(conn, path, "http://delta-producer-publication-graph-maintainer/organizations-public-info/files/")
  end

  #################################################################
@@ -382,7 +382,7 @@ defmodule Dispatcher do
  #################################################################

  get "/sync/public/files/*path" do
-    Proxy.forward conn, path, "http://delta-producer-pub-graph-maintainer-public/files/"
+    Proxy.forward(conn, path, "http://delta-producer-publication-graph-maintainer/public/files/")
  end

  #################################################################
@@ -390,7 +390,7 @@ defmodule Dispatcher do
  #################################################################

  get "/sync/worship-posts/files/*path" do
-    Proxy.forward conn, path, "http://delta-producer-pub-graph-maintainer-worship-posts/files/"
+    Proxy.forward(conn, path, "http://delta-producer-publication-graph-maintainer/worship-posts/files/")
  end

  #################################################################
--- a/config/migrations/2024/20241011105932-link-bestuursfunctie-to-public-producers-concept-scheme.sparql
+++ b/config/migrations/2024/20241011105932-link-bestuursfunctie-to-public-producers-concept-scheme.sparql
@@ -0,0 +1,34 @@
+INSERT DATA {
+  GRAPH <http://mu.semte.ch/graphs/public> {
+    <http://data.vlaanderen.be/id/concept/BestuursorgaanClassificatieCode/41caf7e6-b040-4720-9cc2-a96cfffed5b4>
+      <http://www.w3.org/2004/02/skos/core#inScheme> <http://lblod.data.gift/concept-schemes/10caf4a4-1ff5-4c05-917e-56489910d68b> .
+
+    <http://data.vlaanderen.be/id/concept/BestuursorgaanClassificatieCode/11f0af9e-016c-4e0b-983a-d8bc73804abc>
+      <http://www.w3.org/2004/02/skos/core#inScheme> <http://lblod.data.gift/concept-schemes/10caf4a4-1ff5-4c05-917e-56489910d68b> .
+
+    <http://data.vlaanderen.be/id/concept/BestuursorgaanClassificatieCode/62644b9c-4514-41dd-a660-4c35257f2b35>
+      <http://www.w3.org/2004/02/skos/core#inScheme> <http://lblod.data.gift/concept-schemes/10caf4a4-1ff5-4c05-917e-56489910d68b> .
+
+    <http://data.vlaanderen.be/id/concept/BestuursorgaanClassificatieCode/ed40469e-3b6f-4f38-99ba-18912ee352b0>
+      <http://www.w3.org/2004/02/skos/core#inScheme> <http://lblod.data.gift/concept-schemes/10caf4a4-1ff5-4c05-917e-56489910d68b> .
+
+    <http://data.vlaanderen.be/id/concept/BestuursorgaanClassificatieCode/5ab19107-82d2-4273-a986-3da86fda050d>
+      <http://www.w3.org/2004/02/skos/core#inScheme> <http://lblod.data.gift/concept-schemes/10caf4a4-1ff5-4c05-917e-56489910d68b> .
+
+    <http://data.vlaanderen.be/id/concept/BestuursorgaanClassificatieCode/3e9f22c1-0d35-445b-8a37-494addedf2d8>
+      <http://www.w3.org/2004/02/skos/core#inScheme> <http://lblod.data.gift/concept-schemes/10caf4a4-1ff5-4c05-917e-56489910d68b> .
+
+    <http://data.vlaanderen.be/id/concept/BestuursorgaanClassificatieCode/39854196-f214-4688-87a1-d6ad12baa2fa>
+      <http://www.w3.org/2004/02/skos/core#inScheme> <http://lblod.data.gift/concept-schemes/10caf4a4-1ff5-4c05-917e-56489910d68b> .
+  }
+} 
+
+# # To find the relevant classifications:
+# SELECT DISTINCT ?classification WHERE {
+#   ?bestuursfunctie a <http://data.lblod.info/vocabularies/leidinggevenden/Bestuursfunctie> .
+# 
+#   ?orgaanInTime <http://data.lblod.info/vocabularies/leidinggevenden/heeftBestuursfunctie> ?bestuursfunctie ;
+#     <https://data.vlaanderen.be/ns/generiek#isTijdspecialisatieVan> ?orgaan .
+# 
+#   ?orgaan <http://www.w3.org/ns/org#classification> ?classification .
+# }
--- a/config/migrations/2024/20241017102700-fix-governing-bodies-start-date/20241017102700-district-governing-body-start-date.sparql
+++ b/config/migrations/2024/20241017102700-fix-governing-bodies-start-date/20241017102700-district-governing-body-start-date.sparql
@@ -0,0 +1,28 @@
+PREFIX mandaat: <http://data.vlaanderen.be/ns/mandaat#>
+PREFIX org: <http://www.w3.org/ns/org#>
+PREFIX besluit: <http://data.vlaanderen.be/ns/besluit#>
+PREFIX generiek: <https://data.vlaanderen.be/ns/generiek#>
+
+DELETE {
+  GRAPH <http://mu.semte.ch/graphs/administrative-unit> {
+    ?timedGoverningBody mandaat:bindingStart "2025-01-01T00:00:00"^^xsd:dateTime .
+  }
+} INSERT {
+  GRAPH <http://mu.semte.ch/graphs/administrative-unit> {
+    ?timedGoverningBody mandaat:bindingStart "2024-12-02T00:00:00"^^xsd:dateTime .
+  }
+} WHERE {
+  GRAPH <http://mu.semte.ch/graphs/administrative-unit> {
+    ?organization org:classification <http://data.vlaanderen.be/id/concept/BestuurseenheidClassificatieCode/5ab0e9b8a3b2ca7c5e000003> . # District
+
+    # Filter new district Borsbeek which is the result of municipality Borsbeek
+    # merging into Antwerp
+    FILTER (?organization != <http://data.lblod.info/id/bestuurseenheden/4b44e6f1-113b-4692-b149-44a889b215f2>)
+
+    ?governingBody besluit:bestuurt ?organization .
+
+    ?timedGoverningBody a besluit:Bestuursorgaan ;
+    generiek:isTijdspecialisatieVan ?governingBody ;
+    mandaat:bindingStart "2025-01-01T00:00:00"^^xsd:dateTime .
+  }
+}
--- a/config/migrations/2024/20241017102700-fix-governing-bodies-start-date/20241017112316-municipalities-governing-body-start-date.sparql
+++ b/config/migrations/2024/20241017102700-fix-governing-bodies-start-date/20241017112316-municipalities-governing-body-start-date.sparql
@@ -0,0 +1,46 @@
+PREFIX mandaat: <http://data.vlaanderen.be/ns/mandaat#>
+PREFIX org: <http://www.w3.org/ns/org#>
+PREFIX besluit: <http://data.vlaanderen.be/ns/besluit#>
+PREFIX generiek: <https://data.vlaanderen.be/ns/generiek#>
+
+DELETE {
+  GRAPH <http://mu.semte.ch/graphs/administrative-unit> {
+    ?timedGoverningBody mandaat:bindingStart "2025-01-01T00:00:00"^^xsd:dateTime .
+  }
+} INSERT {
+  GRAPH <http://mu.semte.ch/graphs/administrative-unit> {
+    ?timedGoverningBody mandaat:bindingStart "2024-12-02T00:00:00"^^xsd:dateTime .
+  }
+} WHERE {
+  GRAPH <http://mu.semte.ch/graphs/shared> {
+    ?organization org:classification <http://data.vlaanderen.be/id/concept/BestuurseenheidClassificatieCode/5ab0e9b8a3b2ca7c5e000001> . # Municipality
+
+    # Filter new municipalities that will the result of a merger
+    FILTER (?organization NOT IN
+            (
+             # Merged municipalities with new URIs
+             <http://data.lblod.info/id/bestuurseenheden/19483103-318e-435a-aa37-45e485406ee9> , # Beveren-Kruibeke-Zwijndrecht
+             <http://data.lblod.info/id/bestuurseenheden/b8bb293d-aa22-4b43-bda4-0b6af76e9493> , # Merelbeke-Melle
+             <http://data.lblod.info/id/bestuurseenheden/1ca65d65-54ff-4b44-b750-bd70c91191af> , # Nazareth-De Pinte
+             <http://data.lblod.info/id/bestuurseenheden/add1e4eb-9ec7-4ea6-af82-335aa76b7d48> , # Pajottegem
+             # Merged municipalities that keep URI
+             <http://data.lblod.info/id/bestuurseenheden/670db1d66c0de3b931962e1044033ccfa9d6e3023aa9828a5f252c3bc69bd32c> , # Antwerpen
+             <http://data.lblod.info/id/bestuurseenheden/99da98a7a0087d3429b084ebfc4eb5d488c593790d4d5af7253982a2e21a6a5f> , # Bilzen
+             <http://data.lblod.info/id/bestuurseenheden/05099fa1f6524b8b994d86f61549455d2c00b2a956d5308683ac2d1f810fc729> , # Ham
+             <http://data.lblod.info/id/bestuurseenheden/9db1b46874a57fe63c08fb5f16b117e6f61fdd98e7f64f745d0fceb9d3731169> , # Hasselt
+             <http://data.lblod.info/id/bestuurseenheden/2ac1bb2a7d7bbd98e2e7a24be2c67e42171788a71c2436a33060626593bb2f78> , # Lochristi
+             <http://data.lblod.info/id/bestuurseenheden/cb2a6e0a490ee881ddd0d9ded7f2b3d1dc2df7e57a19d014caac054bfa355f5a> , # Lokeren
+             <http://data.lblod.info/id/bestuurseenheden/b36da606fba6dd4dc99ae1ef5f4a52bba3268d33f4bc2cd1e65b87f01f35101a> , # Tielt
+             <http://data.lblod.info/id/bestuurseenheden/104f32d7fb8d4b8b61b71717301656f136fe046eabaf126fb3325896b5c2d625> , # Tongeren
+             <http://data.lblod.info/id/bestuurseenheden/99ed6eee81a7aca47517cbffb46eaba38f3987eeb4ad32c020898644769eb615> # Wingene
+             )
+            )
+  }
+  GRAPH <http://mu.semte.ch/graphs/administrative-unit> {
+    ?governingBody besluit:bestuurt ?organization .
+
+    ?timedGoverningBody a besluit:Bestuursorgaan ;
+    generiek:isTijdspecialisatieVan ?governingBody ;
+    mandaat:bindingStart "2025-01-01T00:00:00"^^xsd:dateTime .
+  }
+}
--- a/config/migrations/2024/20241017102700-fix-governing-bodies-start-date/20241017114628-ocmws-governing-body-start-date.sparql
+++ b/config/migrations/2024/20241017102700-fix-governing-bodies-start-date/20241017114628-ocmws-governing-body-start-date.sparql
@@ -0,0 +1,45 @@
+PREFIX mandaat: <http://data.vlaanderen.be/ns/mandaat#>
+PREFIX org: <http://www.w3.org/ns/org#>
+PREFIX besluit: <http://data.vlaanderen.be/ns/besluit#>
+PREFIX generiek: <https://data.vlaanderen.be/ns/generiek#>
+
+DELETE {
+  GRAPH <http://mu.semte.ch/graphs/administrative-unit> {
+    ?timedGoverningBody mandaat:bindingStart "2025-01-01T00:00:00"^^xsd:dateTime .
+  }
+} INSERT {
+  GRAPH <http://mu.semte.ch/graphs/administrative-unit> {
+    ?timedGoverningBody mandaat:bindingStart "2024-12-02T00:00:00"^^xsd:dateTime .
+  }
+} WHERE {
+  GRAPH <http://mu.semte.ch/graphs/administrative-unit> {
+    ?organization org:classification <http://data.vlaanderen.be/id/concept/BestuurseenheidClassificatieCode/5ab0e9b8a3b2ca7c5e000002> . # OCMW
+
+    # Filter new OCMWs that will the result of a merger
+    FILTER (?organization NOT IN
+            (
+             # Merged OCMWs with new URIs
+             <http://data.lblod.info/id/bestuurseenheden/fd41f573-7d9a-4d9f-b7d0-d5b6114d1622> , # Beveren-Kruibeke-Zwijndrecht
+             <http://data.lblod.info/id/bestuurseenheden/5d94b2fd-60ee-4e56-a1f0-a586d596adf6> , # Merelbeke-Melle
+             <http://data.lblod.info/id/bestuurseenheden/7d53f659-3a3b-44b1-9e77-3ea067678c0e> , # Nazareth-De Pinte
+             <http://data.lblod.info/id/bestuurseenheden/650378e7-1bee-4737-91ff-5b20ac4623cf> , # Pajottegem
+             # Merged OCMWs that keep URI
+             <http://data.lblod.info/id/bestuurseenheden/83c7a12a4a8ac8dd82895715095a866dc4794e60de61b967419bdfc1e207ad96> , # Antwerpen
+             <http://data.lblod.info/id/bestuurseenheden/9ae900a5447b7d727ca6496910220d4389aba7f1869923f1bbf9729bdeca28e2> , # Bilzen
+             <http://data.lblod.info/id/bestuurseenheden/42a43591e0db1dca9432f480f0f49f9bd4056c2b131e2fc997497130f5e099d0> , # Ham
+             <http://data.lblod.info/id/bestuurseenheden/026509cf3b4eeb7ad88fe57a270060574f60abd1c3524837d36700e40809d210> , # Hasselt
+             <http://data.lblod.info/id/bestuurseenheden/ee5d6d9da5fcf9e7bbd5c60931e37451f6bc816233c9c269565d79c2b2a37af5> , # Lochristi
+             <http://data.lblod.info/id/bestuurseenheden/323a24f2fe81ee0b6586ec78be36760e478092e07386b2785992ea8b61941833> , # Lokeren
+             <http://data.lblod.info/id/bestuurseenheden/f6ef0202c1dca780c66e269f2d21aa39a690f4c57ad05ece63f178b629bbb98e> , # Tielt
+             <http://data.lblod.info/id/bestuurseenheden/ab684633d605d93dbbe6b9ea40667e2bcf03a0856cafe1825e95b7829ed502a3> , # Tongeren
+             <http://data.lblod.info/id/bestuurseenheden/518c31a6e89f514c075e0927bce9fb2c91a552b6d65208c04a687d4bcb81148c> # Wingene
+             )
+            )
+
+    ?governingBody besluit:bestuurt ?organization .
+
+    ?timedGoverningBody a besluit:Bestuursorgaan ;
+    generiek:isTijdspecialisatieVan ?governingBody ;
+    mandaat:bindingStart "2025-01-01T00:00:00"^^xsd:dateTime .
+  }
+}
--- a/config/migrations/2024/20241017102700-fix-governing-bodies-start-date/20241017120456-provinces-governing-body-start-date.sparql
+++ b/config/migrations/2024/20241017102700-fix-governing-bodies-start-date/20241017120456-provinces-governing-body-start-date.sparql
@@ -0,0 +1,26 @@
+PREFIX mandaat: <http://data.vlaanderen.be/ns/mandaat#>
+PREFIX org: <http://www.w3.org/ns/org#>
+PREFIX besluit: <http://data.vlaanderen.be/ns/besluit#>
+PREFIX generiek: <https://data.vlaanderen.be/ns/generiek#>
+
+DELETE {
+  GRAPH <http://mu.semte.ch/graphs/administrative-unit> {
+    ?timedGoverningBody mandaat:bindingStart "2025-01-01T00:00:00"^^xsd:dateTime .
+  }
+} INSERT {
+  GRAPH <http://mu.semte.ch/graphs/administrative-unit> {
+    ?timedGoverningBody mandaat:bindingStart "2024-12-02T00:00:00"^^xsd:dateTime .
+  }
+} WHERE {
+  GRAPH <http://mu.semte.ch/graphs/shared> {
+    ?organization org:classification <http://data.vlaanderen.be/id/concept/BestuurseenheidClassificatieCode/5ab0e9b8a3b2ca7c5e000000> . # Province
+  }
+
+  GRAPH <http://mu.semte.ch/graphs/administrative-unit> {
+    ?governingBody besluit:bestuurt ?organization .
+
+    ?timedGoverningBody a besluit:Bestuursorgaan ;
+    generiek:isTijdspecialisatieVan ?governingBody ;
+    mandaat:bindingStart "2025-01-01T00:00:00"^^xsd:dateTime .
+  }
+}
--- a/config/migrations/2024/20241017102700-fix-governing-bodies-start-date/20241017121145-merged-organizations-governing-body-start-date.sparql
+++ b/config/migrations/2024/20241017102700-fix-governing-bodies-start-date/20241017121145-merged-organizations-governing-body-start-date.sparql
@@ -0,0 +1,23 @@
+PREFIX mandaat: <http://data.vlaanderen.be/ns/mandaat#>
+PREFIX org: <http://www.w3.org/ns/org#>
+PREFIX besluit: <http://data.vlaanderen.be/ns/besluit#>
+PREFIX generiek: <https://data.vlaanderen.be/ns/generiek#>
+
+# Set the start date for governing bodies for organisations that are the result
+# of a merger to 02 January 2025 which is the first working day of the year.
+# Note: this migration assumes that all other `2025-01-01` starting dates have
+# already been replaced by previous migrations. So order matters here!
+DELETE {
+  GRAPH <http://mu.semte.ch/graphs/administrative-unit> {
+    ?timedGoverningBody mandaat:bindingStart "2025-01-01T00:00:00"^^xsd:dateTime .
+  }
+} INSERT {
+  GRAPH <http://mu.semte.ch/graphs/administrative-unit> {
+    ?timedGoverningBody mandaat:bindingStart "2025-01-02T00:00:00"^^xsd:dateTime .
+  }
+} WHERE {
+  GRAPH <http://mu.semte.ch/graphs/administrative-unit> {
+    ?timedGoverningBody a besluit:Bestuursorgaan ;
+    mandaat:bindingStart "2025-01-01T00:00:00"^^xsd:dateTime .
+  }
+}
--- a/config/migrations/2024/20241018111200-add-type-bestuurseenheid-to-centrale-besturen.sparql
+++ b/config/migrations/2024/20241018111200-add-type-bestuurseenheid-to-centrale-besturen.sparql
@@ -0,0 +1,10 @@
+INSERT {
+  GRAPH <http://mu.semte.ch/graphs/worship-service> {
+    ?s a <http://data.vlaanderen.be/ns/besluit#Bestuurseenheid>.
+  }
+}
+WHERE {
+  GRAPH <http://mu.semte.ch/graphs/worship-service> {
+    ?s a <http://data.lblod.info/vocabularies/erediensten/CentraalBestuurVanDeEredienst>.
+  }
+}
--- a/docker-compose.dev.yml
+++ b/docker-compose.dev.yml
@@ -30,7 +30,7 @@ services:
  deltanotifier:
    restart: "no"
  mocklogin:
-    image: lblod/mock-login-service:latest
+    image: lblod/mock-login-service:0.7.0
    links:
      - db:database
    restart: "no"
@@ -47,7 +47,6 @@ services:
  adressenregister:
    restart: "no"
  frontend:
-    image: lblod/frontend-organization-portal:latest
    restart: "no"
  uri-info:
    restart: "no"
@@ -75,14 +74,6 @@ services:
    restart: "no"
  construct-organization-relationships:
    restart: "no"
-  delta-producer-bg-jobs-initiator-worship-posts:
-    restart: "no"
-  delta-producer-pub-graph-maintainer-worship-posts:
-    restart: "no"
-  delta-producer-bg-jobs-initiator-public:
-    restart: "no"
-  delta-producer-pub-graph-maintainer-public:
-    restart: "no"
  mandatarissen-consumer:
    restart: "no"
  leidinggevenden-consumer:
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -344,7 +344,7 @@ services:
    restart: always
    logging: *default-logging
  delta-producer-publication-graph-maintainer:
-    image: lblod/delta-producer-publication-graph-maintainer:1.1.1-rc.1
+    image: lblod/delta-producer-publication-graph-maintainer:1.2.2
    environment:
      MAX_BODY_SIZE: "50mb"
      PRETTY_PRINT_DIFF_JSON: "true"
@@ -363,161 +363,6 @@ services:
    restart: always
    logging: *default-logging

-  ################################################################################
-  # DELTA ORGANIZATIONS PUBLIC INFO: START
-  ################################################################################
-  delta-producer-bg-jobs-initiator-organizations-public-info:
-    image: lblod/delta-producer-background-jobs-initiator:0.3.1
-    environment:
-      JOBS_GRAPH: "http://mu.semte.ch/graphs/jobs"
-      DUMP_FILE_CREATION_JOB_OPERATION: "http://redpencil.data.gift/id/jobs/concept/JobOperation/deltas/deltaDumpFileCreation/organizations-public-info"
-      INITIAL_PUBLICATION_GRAPH_SYNC_JOB_OPERATION: "http://redpencil.data.gift/id/jobs/concept/JobOperation/deltas/initialPublicationGraphSyncing/organizations-public-info"
-      HEALING_JOB_OPERATION: "http://redpencil.data.gift/id/jobs/concept/JobOperation/deltas/healingOperation/organizations-public-info"
-      CRON_PATTERN_DUMP_JOB: "27 */4 * * *" # At minute 27 every 4 hours
-      CRON_PATTERN_HEALING_JOB: "0 0 4 * * *" # everyday at 4 AM
-      START_INITIAL_SYNC: "false" # Enable in override when ready to initial sync
-    labels:
-      - "logging=true"
-    links:
-      - db:database
-    restart: always
-    logging: *default-logging
-  delta-producer-pub-graph-maintainer-organizations-public-info:
-    image: lblod/delta-producer-publication-graph-maintainer:0.15.5
-    environment:
-      MAX_BODY_SIZE: "50mb"
-      JOBS_GRAPH: "http://mu.semte.ch/graphs/jobs"
-      RELATIVE_FILE_PATH: "deltas/organizations-public-info"
-      PUBLICATION_GRAPH: "http://redpencil.data.gift/id/deltas/producer/organizations-public-info"
-      HEALING_JOB_OPERATION: "http://redpencil.data.gift/id/jobs/concept/JobOperation/deltas/healingOperation/organizations-public-info"
-      INITIAL_PUBLICATION_GRAPH_SYNC_JOB_OPERATION: "http://redpencil.data.gift/id/jobs/concept/JobOperation/deltas/initialPublicationGraphSyncing/organizations-public-info"
-      QUEUE_POLL_INTERVAL: 3000
-      USE_VIRTUOSO_FOR_EXPENSIVE_SELECTS: "true" # some queries are just too expensive
-      SKIP_MU_AUTH_INITIAL_SYNC: "true"
-      HEALING_PATCH_GRAPH_BATCH_SIZE: 500
-      SERVE_DELTA_FILES: "true"
-      PUBLISHER_URI: "http://data.lblod.info/services/delta-production-json-diff-file-manager/organizations-public-info"
-      DELTA_INTERVAL_MS: 10000
-      PRETTY_PRINT_DIFF_JSON: "true"
-      PUBLICATION_VIRTUOSO_ENDPOINT: "http://publication-triplestore:8890/sparql"
-      PUBLICATION_MU_AUTH_ENDPOINT: "http://publication-triplestore:8890/sparql"
-      ERROR_GRAPH: "http://mu.semte.ch/graphs/jobs"
-    volumes:
-      - ./config/delta-producer/organizations-public-info:/config
-      - ./data/files/:/share
-    links:
-      - db:database
-      - triplestore:virtuoso
-    restart: always
-    labels:
-      - "logging=true"
-    logging: *default-logging
-  ################################################################################
-  # DELTA ORGANIZATIONS PUBLIC INFO: END
-  ################################################################################
-
-  ################################################################################
-  # DELTA PUBLIC INFORMATION: START
-  ################################################################################
-  delta-producer-bg-jobs-initiator-public:
-    image: lblod/delta-producer-background-jobs-initiator:0.3.1
-    environment:
-      JOBS_GRAPH: "http://mu.semte.ch/graphs/jobs"
-      DUMP_FILE_CREATION_JOB_OPERATION: "http://redpencil.data.gift/id/jobs/concept/JobOperation/deltas/deltaDumpFileCreation/public"
-      INITIAL_PUBLICATION_GRAPH_SYNC_JOB_OPERATION: "http://redpencil.data.gift/id/jobs/concept/JobOperation/deltas/initialPublicationGraphSyncing/public"
-      HEALING_JOB_OPERATION: "http://redpencil.data.gift/id/jobs/concept/JobOperation/deltas/healingOperation/public"
-      CRON_PATTERN_DUMP_JOB: "11 */4 * * *" # At minute 11 every 4 hours
-      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:
-      - "logging=true"
-    links:
-      - db:database
-    restart: always
-    logging: *default-logging
-  delta-producer-pub-graph-maintainer-public:
-    image: lblod/delta-producer-publication-graph-maintainer:0.15.5
-    environment:
-      MAX_BODY_SIZE: "50mb"
-      JOBS_GRAPH: "http://mu.semte.ch/graphs/jobs"
-      RELATIVE_FILE_PATH: "deltas/public"
-      PUBLICATION_GRAPH: "http://redpencil.data.gift/id/deltas/producer/public"
-      HEALING_JOB_OPERATION: "http://redpencil.data.gift/id/jobs/concept/JobOperation/deltas/healingOperation/public"
-      INITIAL_PUBLICATION_GRAPH_SYNC_JOB_OPERATION: "http://redpencil.data.gift/id/jobs/concept/JobOperation/deltas/initialPublicationGraphSyncing/public"
-      QUEUE_POLL_INTERVAL: 3000
-      USE_VIRTUOSO_FOR_EXPENSIVE_SELECTS: "true" # some queries are just too expensive
-      SKIP_MU_AUTH_INITIAL_SYNC: "true"
-      HEALING_PATCH_GRAPH_BATCH_SIZE: 500
-      SERVE_DELTA_FILES: "true"
-      PUBLISHER_URI: "http://data.lblod.info/services/delta-production-json-diff-file-manager/public"
-      DELTA_INTERVAL_MS: 10000
-      PRETTY_PRINT_DIFF_JSON: "true"
-      ERROR_GRAPH: "http://mu.semte.ch/graphs/jobs"
-    volumes:
-      - ./config/delta-producer/public:/config
-      - ./data/files/:/share
-    links:
-      - db:database
-      - triplestore:virtuoso
-    restart: always
-    labels:
-      - "logging=true"
-    logging: *default-logging
-  ################################################################################
-  # DELTA PUBLIC INFORMATION: END
-  ################################################################################
-
-  ################################################################################
-  # DELTA WORSHIP POSTS: START
-  ################################################################################
-  delta-producer-bg-jobs-initiator-worship-posts:
-    image: lblod/delta-producer-background-jobs-initiator:0.3.1
-    environment:
-      JOBS_GRAPH: "http://mu.semte.ch/graphs/jobs"
-      DUMP_FILE_CREATION_JOB_OPERATION: "http://redpencil.data.gift/id/jobs/concept/JobOperation/deltas/deltaDumpFileCreation/worship-posts"
-      INITIAL_PUBLICATION_GRAPH_SYNC_JOB_OPERATION: "http://redpencil.data.gift/id/jobs/concept/JobOperation/deltas/initialPublicationGraphSyncing/worship-posts"
-      HEALING_JOB_OPERATION: "http://redpencil.data.gift/id/jobs/concept/JobOperation/deltas/healingOperation/worship-posts"
-      CRON_PATTERN_DUMP_JOB: "17 */4 * * *" # At minute 17 every 4 hours
-      CRON_PATTERN_HEALING_JOB: "0 0 3 * * *" # everyday at 3 AM
-      START_INITIAL_SYNC: "false" # prefer to disable it now. We want to have feeling with how the DB acts.
-    labels:
-      - "logging=true"
-    links:
-      - db:database
-    restart: always
-    logging: *default-logging
-  delta-producer-pub-graph-maintainer-worship-posts:
-    image: lblod/delta-producer-publication-graph-maintainer:0.15.5
-    environment:
-      MAX_BODY_SIZE: "50mb"
-      JOBS_GRAPH: "http://mu.semte.ch/graphs/jobs"
-      RELATIVE_FILE_PATH: "deltas/worship-posts"
-      PUBLICATION_GRAPH: "http://redpencil.data.gift/id/deltas/producer/worship-posts"
-      HEALING_JOB_OPERATION: "http://redpencil.data.gift/id/jobs/concept/JobOperation/deltas/healingOperation/worship-posts"
-      INITIAL_PUBLICATION_GRAPH_SYNC_JOB_OPERATION: "http://redpencil.data.gift/id/jobs/concept/JobOperation/deltas/initialPublicationGraphSyncing/worship-posts"
-      QUEUE_POLL_INTERVAL: 3000
-      USE_VIRTUOSO_FOR_EXPENSIVE_SELECTS: "true" # some queries are just too expensive
-      SKIP_MU_AUTH_INITIAL_SYNC: "true"
-      HEALING_PATCH_GRAPH_BATCH_SIZE: 500
-      SERVE_DELTA_FILES: "true"
-      PUBLISHER_URI: "http://data.lblod.info/services/delta-production-json-diff-file-manager/worship-posts"
-      DELTA_INTERVAL_MS: 10000
-      PRETTY_PRINT_DIFF_JSON: "true"
-      ERROR_GRAPH: "http://mu.semte.ch/graphs/jobs"
-    volumes:
-      - ./config/delta-producer/worship-posts:/config
-      - ./data/files/:/share
-    links:
-      - db:database
-      - triplestore:virtuoso
-    restart: always
-    labels:
-      - "logging=true"
-    logging: *default-logging
-  ################################################################################
-  # DELTA WORSHIP POSTS: END
-  ################################################################################
-
  ################################################################################
  # DELTA CONSUMERS
  ################################################################################
Author	SHA1	Message	Date
cecemel	14a290b82f	Merge pull request #463 from lblod/hotfix/add-type-bestuurseenheid-to-centrale-besturen Added migration to add besluit:Bestuurseenheid to centrale besturen	2024-10-18 11:29:15 +02:00
felix	ba4a4aa5da	Added migration to add besluit:Bestuurseenheid to centrale besture	2024-10-18 11:20:37 +02:00
mirdono	b1cc9c7329	fix: correct governing body start dates for new legislature Originally the starting dates for the new governing bodies for the new legislature was set to `2025-01-01` for all relevant municipalities, OCMWs, districts, and provinces. These migrations change that to more correct starting dates: * For organisations that are not involved in mergers the new starting data is `2024-12-02`, the first day installation meetings are allowed[1]. * For organisations that are involved in mergers the new starting date is `2025-01-01`, the first work day of the new year on which the mergers take effect. Note: this migration assumes there are no other start dates on `2025-01-01`, so the migrations have to be run in the specified order. [1] https://www.vlaanderen.be/lokaal-bestuur/organisatie-en-werking/gemeenteraad/installatie	2024-10-17 15:16:54 +02:00
mirdono	98ed3260ed	fix: remove incorrect image line	2024-10-17 12:19:54 +02:00
Achraf Atauil	5e0d47053d	Small indent issue	2024-10-17 11:11:41 +02:00
cecemel	99dd506f8f	Merge pull request #458 from lblod/chore/remove-latest-tags-from-docker-compose-dev Chore/remove latest tags from docker compose dev	2024-10-15 10:49:54 +02:00
cecemel	b9695eb255	Merge branch 'master' into chore/remove-latest-tags-from-docker-compose-dev	2024-10-15 10:49:41 +02:00
cecemel	4389a743b6	Merge pull request #459 from lblod/fix/produce-bestuursfunctie Link missing classifications to public producer concept scheme	2024-10-15 10:48:52 +02:00
cecemel	e40d85b22c	Merge pull request #452 from lblod/feature/bump-delta-producers-and-move-to-publication-triplestore Bump delta producers and move to publication triplestore	2024-10-15 10:48:36 +02:00
felix	340937bc85	Remove the :latest tag from frontend in docker-compose.dev.yml	2024-10-15 10:36:50 +02:00
felix	f08e2e3df0	changed mock-login-service to tagged version in drc.dev.yml	2024-10-15 10:36:38 +02:00
Claire Lovisa	77245adbaa	Link missing classifications to public producer concept scheme	2024-10-15 10:27:46 +02:00
felix	cb0191f28b	Fix syntax issue in docker-compose.dev.yml	2024-10-14 15:04:22 +02:00
felix	3f460ce329	Some uri's of JobOperations were off. Fixing it here.	2024-10-14 14:51:20 +02:00
felix	6397ce2923	Change the namse of the stream to be in line with previous	2024-10-14 14:50:54 +02:00
felix	7e0a668573	Restore the old public path, to not break clients	2024-10-14 14:50:14 +02:00
Riad Abdallah	b6dd8b4519	Fix public info stream name	2024-10-08 13:35:35 +02:00
Riad Abdallah	797d3a8d44	Fix public info stream name	2024-10-08 13:19:00 +02:00
Riad Abdallah	a98f860d3c	Remove individual delta rules	2024-10-03 17:05:19 +02:00
Riad Abdallah	162a6ff654	Update dispatcher rules for the delta streams	2024-10-03 16:42:00 +02:00
Riad Abdallah	d3b40b88ea	Remove individual streams from docker compose configs	2024-10-03 16:40:08 +02:00
Riad Abdallah	a7d6dcfb32	Move streams to consolidated background job initiator	2024-10-03 16:39:14 +02:00
Riad Abdallah	d4f9352c61	Move streams to consolidated publication graph maintainer	2024-10-03 16:38:57 +02:00