Merge pull request #256 from lblod/feature/adapt-public-producer-to-hardsplit

Adapt public producer to hardsplit
2023-03-22 11:12:28 +01:00
parent 7b2b577cc1 211708754c
commit 9eea11c2e0
4 changed files with 184 additions and 8 deletions
--- a/config/authorization/config.ex
+++ b/config/authorization/config.ex
@@ -186,12 +186,12 @@ defmodule Acl.UserGroups.Config do
        name: "public",
        useage: [:read],
        access: %AlwaysAccessible{},
-        graphs: [ 
+        graphs: [
          %GraphSpec{
-                    graph: "http://mu.semte.ch/graphs/public", 
+                    graph: "http://mu.semte.ch/graphs/public",
                    constraint: %ResourceConstraint{
                      resource_types: @public_type
-                    } 
+                    }
          },
          %GraphSpec{
            graph: "http://mu.semte.ch/graphs/shared",
--- a/config/delta-producer/public/export.json
+++ b/config/delta-producer/public/export.json
@@ -13,6 +13,7 @@
        "http://www.w3.org/2004/02/skos/core#inScheme"
      ],
      "properties": [
+        "http://mu.semte.ch/vocabularies/core/uuid",
        "http://www.w3.org/2004/02/skos/core#prefLabel",
        "http://www.w3.org/2004/02/skos/core#altLabel",
        "http://www.w3.org/ns/adms#identifier",
@@ -25,8 +26,6 @@
        "http://www.w3.org/ns/org#linkedTo",
        "http://www.w3.org/ns/org#hasSubOrganization",
        "http://www.w3.org/ns/org#classification",
-        "http://data.lblod.info/vocabularies/erediensten/betrokkenBestuur",
-        "http://mu.semte.ch/vocabularies/ext/werkingsgebiedNiveau",
        "http://data.lblod.info/vocabularies/erediensten/denominatie",
        "http://data.lblod.info/vocabularies/erediensten/grensoverschrijdend",
        "http://data.lblod.info/vocabularies/erediensten/wordtBediendDoor",
@@ -45,6 +44,7 @@
        "http://www.w3.org/2004/02/skos/core#inScheme"
      ],
      "properties": [
+        "http://mu.semte.ch/vocabularies/core/uuid",
        "http://www.w3.org/2004/02/skos/core#prefLabel",
        "http://www.w3.org/2004/02/skos/core#altLabel",
        "http://www.w3.org/ns/adms#identifier",
@@ -57,14 +57,88 @@
        "http://www.w3.org/ns/org#linkedTo",
        "http://www.w3.org/ns/org#hasSubOrganization",
        "http://www.w3.org/ns/org#classification",
-        "http://data.lblod.info/vocabularies/erediensten/betrokkenBestuur",
-        "http://mu.semte.ch/vocabularies/ext/werkingsgebiedNiveau",
        "http://data.lblod.info/vocabularies/erediensten/typeEredienst"
      ]
    },
+    {
+      "type": "http://data.vlaanderen.be/ns/besluit#Bestuurseenheid",
+      "strictTypeExport": "true",
+      "graphsFilter": [
+        "http://mu.semte.ch/graphs/worship-service",
+        "http://mu.semte.ch/graphs/shared",
+        "http://mu.semte.ch/graphs/administrative-unit"
+      ],
+      "pathToConceptScheme": [
+        "http://www.w3.org/ns/org#classification",
+        "http://www.w3.org/2004/02/skos/core#inScheme"
+      ],
+      "properties": [
+        "http://mu.semte.ch/vocabularies/core/uuid",
+        "http://data.lblod.info/vocabularies/erediensten/betrokkenBestuur",
+        "http://data.lblod.info/vocabularies/erediensten/denominatie",
+        "http://data.lblod.info/vocabularies/erediensten/grensoverschrijdend",
+        "http://data.lblod.info/vocabularies/erediensten/typeEredienst",
+        "http://data.lblod.info/vocabularies/erediensten/wordtBediendDoor",
+        "http://data.vlaanderen.be/ns/besluit#werkingsgebied",
+        "http://www.opengis.net/ont/geosparql#sfWithin",
+        "http://www.w3.org/2002/07/owl#sameAs",
+        "http://www.w3.org/2004/02/skos/core#altLabel",
+        "http://www.w3.org/2004/02/skos/core#prefLabel",
+        "http://www.w3.org/ns/adms#identifier",
+        "http://www.w3.org/ns/org#changedBy",
+        "http://www.w3.org/ns/org#classification",
+        "http://www.w3.org/ns/org#hasPost",
+        "http://www.w3.org/ns/org#hasPrimarySite",
+        "http://www.w3.org/ns/org#hasSite",
+        "http://www.w3.org/ns/org#hasSubOrganization",
+        "http://www.w3.org/ns/org#linkedTo",
+        "http://www.w3.org/ns/org#resultedFrom",
+        "http://www.w3.org/ns/regorg#orgStatus"
+      ]
+    },
+    {
+      "type": "http://data.lblod.info/vocabularies/erediensten/RepresentatiefOrgaan",
+      "graphsFilter": [
+        "http://mu.semte.ch/graphs/shared",
+        "http://mu.semte.ch/graphs/worship-service"
+      ],
+      "properties": [
+        "http://mu.semte.ch/vocabularies/core/uuid",
+        "http://www.w3.org/2004/02/skos/core#prefLabel",
+        "http://www.w3.org/ns/org#linkedTo",
+        "http://data.lblod.info/vocabularies/erediensten/typeEredienst",
+        "http://www.w3.org/ns/adms#identifier"
+      ]
+    },
+    {
+      "type": "http://data.lblod.info/vocabularies/erediensten/BetrokkenLokaleBesturen",
+      "graphsFilter": [
+        "http://mu.semte.ch/graphs/shared",
+        "http://mu.semte.ch/graphs/worship-service"
+      ],
+      "properties": [
+        "http://mu.semte.ch/vocabularies/core/uuid",
+        "http://data.lblod.info/vocabularies/erediensten/typebetrokkenheid",
+        "http://www.w3.org/ns/org#organization",
+        "http://data.lblod.info/vocabularies/erediensten/financieringspercentage"
+      ]
+    },
+    {
+      "type": "http://data.lblod.info/vocabularies/erediensten/PositieBedienaar",
+      "graphsFilter": [
+        "http://mu.semte.ch/graphs/shared",
+        "http://mu.semte.ch/graphs/worship-service"
+      ],
+      "properties": [
+        "http://mu.semte.ch/vocabularies/core/uuid",
+        "http://www.w3.org/ns/org#role",
+        "http://data.lblod.info/vocabularies/erediensten/functie"
+      ]
+    },
    {
      "type": "http://www.w3.org/ns/org#Site",
      "graphsFilter": [
+        "http://mu.semte.ch/graphs/shared",
        "http://mu.semte.ch/graphs/worship-service",
        "http://mu.semte.ch/graphs/administrative-unit"
      ],
@@ -74,6 +148,7 @@
        "http://www.w3.org/2004/02/skos/core#inScheme"
      ],
      "properties": [
+        "http://mu.semte.ch/vocabularies/core/uuid",
        "http://www.w3.org/ns/org#siteAddress",
        "https://data.vlaanderen.be/ns/organisatie#bestaatUit",
        "http://data.lblod.info/vocabularies/erediensten/vestigingstype"
@@ -82,6 +157,7 @@
    {
      "type": "http://www.w3.org/ns/locn#Address",
      "graphsFilter": [
+        "http://mu.semte.ch/graphs/shared",
        "http://mu.semte.ch/graphs/worship-service",
        "http://mu.semte.ch/graphs/administrative-unit"
      ],
@@ -92,6 +168,7 @@
        "http://www.w3.org/2004/02/skos/core#inScheme"
      ],
      "properties": [
+        "http://mu.semte.ch/vocabularies/core/uuid",
        "https://data.vlaanderen.be/ns/adres#Adresvoorstelling.huisnummer",
        "https://data.vlaanderen.be/ns/adres#Adresvoorstelling.busnummer",
        "http://www.w3.org/ns/locn#thoroughfare",
@@ -141,6 +218,7 @@
        "http://www.w3.org/2004/02/skos/core#inScheme"
      ],
      "properties": [
+        "http://mu.semte.ch/vocabularies/core/uuid",
        "http://www.w3.org/2004/02/skos/core#notation",
        "https://data.vlaanderen.be/ns/generiek#gestructureerdeIdentificator"
      ]
@@ -159,6 +237,7 @@
        "http://www.w3.org/2004/02/skos/core#inScheme"
      ],
      "properties": [
+        "http://mu.semte.ch/vocabularies/core/uuid",
        "https://data.vlaanderen.be/ns/generiek#lokaleIdentificator"
      ]
    },
@@ -171,6 +250,7 @@
        "http://www.w3.org/2004/02/skos/core#inScheme"
      ],
      "properties": [
+        "http://mu.semte.ch/vocabularies/core/uuid",
        "http://www.w3.org/2004/02/skos/core#prefLabel"
      ]
    },
@@ -187,11 +267,36 @@
        "http://www.w3.org/2004/02/skos/core#inScheme"
      ],
      "properties": [
+        "http://mu.semte.ch/vocabularies/core/uuid",
        "http://data.vlaanderen.be/ns/mandaat#bindingEinde",
        "http://data.vlaanderen.be/ns/mandaat#bindingStart",
        "http://data.vlaanderen.be/ns/besluit#bestuurt",
        "http://www.w3.org/ns/org#classification",
-        "https://data.vlaanderen.be/ns/generiek#isTijdspecialisatieVan"
+        "https://data.vlaanderen.be/ns/generiek#isTijdspecialisatieVan",
+        "http://www.w3.org/ns/org#hasPost"
+      ]
+    },
+    {
+      "type": "http://data.vlaanderen.be/ns/besluit#Bestuursorgaan",
+      "strictTypeExport": "true",
+      "graphsFilter": [
+        "http://mu.semte.ch/graphs/shared",
+        "http://mu.semte.ch/graphs/worship-service",
+        "http://mu.semte.ch/graphs/administrative-unit"
+      ],
+      "pathToConceptScheme": [
+        "https://data.vlaanderen.be/ns/generiek#isTijdspecialisatieVan",
+        "http://www.w3.org/ns/org#classification",
+        "http://www.w3.org/2004/02/skos/core#inScheme"
+      ],
+      "properties": [
+        "http://mu.semte.ch/vocabularies/core/uuid",
+        "http://data.vlaanderen.be/ns/mandaat#bindingEinde",
+        "http://data.vlaanderen.be/ns/mandaat#bindingStart",
+        "http://data.vlaanderen.be/ns/besluit#bestuurt",
+        "http://www.w3.org/ns/org#classification",
+        "https://data.vlaanderen.be/ns/generiek#isTijdspecialisatieVan",
+        "http://www.w3.org/ns/org#hasPost"
      ]
    },
    {
@@ -203,6 +308,7 @@
        "http://www.w3.org/2004/02/skos/core#inScheme"
      ],
      "properties": [
+        "http://mu.semte.ch/vocabularies/core/uuid",
        "http://www.w3.org/2004/02/skos/core#prefLabel"
      ]
    },
@@ -215,6 +321,7 @@
        "http://www.w3.org/2004/02/skos/core#inScheme"
      ],
      "properties": [
+        "http://mu.semte.ch/vocabularies/core/uuid",
        "http://www.w3.org/2004/02/skos/core#prefLabel"
      ]
    },
@@ -230,6 +337,7 @@
        "http://www.w3.org/2004/02/skos/core#inScheme"
      ],
      "properties": [
+        "http://mu.semte.ch/vocabularies/core/uuid",
        "http://purl.org/dc/terms/date",
        "http://purl.org/dc/terms/description",
        "http://data.lblod.info/vocabularies/contacthub/typeWijziging",
@@ -250,6 +358,7 @@
        "http://www.w3.org/2004/02/skos/core#inScheme"
      ],
      "properties": [
+        "http://mu.semte.ch/vocabularies/core/uuid",
        "http://www.w3.org/2004/02/skos/core#prefLabel"
      ]
    },
@@ -262,6 +371,7 @@
        "http://www.w3.org/2004/02/skos/core#inScheme"
      ],
      "properties": [
+        "http://mu.semte.ch/vocabularies/core/uuid",
        "http://www.w3.org/2004/02/skos/core#prefLabel"
      ]
    },
@@ -274,6 +384,44 @@
        "http://www.w3.org/2004/02/skos/core#inScheme"
      ],
      "properties": [
+        "http://mu.semte.ch/vocabularies/core/uuid",
+        "http://www.w3.org/2004/02/skos/core#prefLabel"
+      ]
+    },
+    {
+      "type": "http://data.vlaanderen.be/ns/mandaat#Mandaat",
+      "graphsFilter": [
+        "http://mu.semte.ch/graphs/shared",
+        "http://mu.semte.ch/graphs/worship-service",
+        "http://mu.semte.ch/graphs/administrative-unit"
+      ],
+      "pathToConceptScheme": [
+        "^http://www.w3.org/ns/org#hasPost",
+        "https://data.vlaanderen.be/ns/generiek#isTijdspecialisatieVan",
+        "http://www.w3.org/ns/org#classification",
+        "http://www.w3.org/2004/02/skos/core#inScheme"
+      ],
+      "properties": [
+        "http://mu.semte.ch/vocabularies/core/uuid",
+        "http://www.w3.org/ns/org#role"
+      ]
+    },
+    {
+      "type": "http://data.lblod.info/vocabularies/leidinggevenden/Bestuursfunctie",
+      "graphsFilter": [
+        "http://mu.semte.ch/graphs/shared",
+        "http://mu.semte.ch/graphs/worship-service",
+        "http://mu.semte.ch/graphs/administrative-unit"
+      ],
+      "pathToConceptScheme": [
+        "^http://data.lblod.info/vocabularies/leidinggevenden/heeftBestuursfunctie",
+        "https://data.vlaanderen.be/ns/generiek#isTijdspecialisatieVan",
+        "http://www.w3.org/ns/org#classification",
+        "http://www.w3.org/2004/02/skos/core#inScheme"
+      ],
+      "properties": [
+        "http://mu.semte.ch/vocabularies/core/uuid",
+        "http://www.w3.org/ns/org#role",
        "http://www.w3.org/2004/02/skos/core#prefLabel"
      ]
    }
--- a/config/dispatcher/dispatcher.ex
+++ b/config/dispatcher/dispatcher.ex
@@ -354,6 +354,14 @@ defmodule Dispatcher do
    Proxy.forward conn, path, "http://delta-producer-json-diff-file-publisher-organizations/files/"
  end

+  #################################################################
+  #  DELTA: public
+  #################################################################
+
+  get "/sync/public/files/*path" do
+    Proxy.forward conn, path, "http://delta-producer-json-diff-publisher-public/files/"
+  end
+
  #################################################################
  #  DELTA: posts
  #################################################################
--- a/config/migrations/2023/20230228155501-publish-all-bestuurseenheden-in-public.sparql
+++ b/config/migrations/2023/20230228155501-publish-all-bestuurseenheden-in-public.sparql
@@ -0,0 +1,20 @@
+INSERT DATA {
+  GRAPH <http://mu.semte.ch/graphs/public> {
+    <http://data.vlaanderen.be/id/concept/BestuurseenheidClassificatieCode/f9cac08a-13c1-49da-9bcb-f650b0604054> <http://www.w3.org/2004/02/skos/core#inScheme> <http://lblod.data.gift/concept-schemes/10caf4a4-1ff5-4c05-917e-56489910d68b>. #Centraal bestuur van de eredienst"
+    <http://data.vlaanderen.be/id/concept/BestuurseenheidClassificatieCode/5ab0e9b8a3b2ca7c5e000001> <http://www.w3.org/2004/02/skos/core#inScheme> <http://lblod.data.gift/concept-schemes/10caf4a4-1ff5-4c05-917e-56489910d68b>. #Gemeente"
+    <http://data.vlaanderen.be/id/concept/BestuurseenheidClassificatieCode/5ab0e9b8a3b2ca7c5e000000> <http://www.w3.org/2004/02/skos/core#inScheme> <http://lblod.data.gift/concept-schemes/10caf4a4-1ff5-4c05-917e-56489910d68b>. #Provincie"
+    <http://data.vlaanderen.be/id/concept/BestuurseenheidClassificatieCode/66ec74fd-8cfc-4e16-99c6-350b35012e86> <http://www.w3.org/2004/02/skos/core#inScheme> <http://lblod.data.gift/concept-schemes/10caf4a4-1ff5-4c05-917e-56489910d68b>. #Bestuur van de eredienst"
+    <http://data.vlaanderen.be/id/concept/BestuurseenheidClassificatieCode/36a82ba0-7ff1-4697-a9dd-2e94df73b721> <http://www.w3.org/2004/02/skos/core#inScheme> <http://lblod.data.gift/concept-schemes/10caf4a4-1ff5-4c05-917e-56489910d68b>. #Autonoom gemeentebedrijf"
+    <http://data.vlaanderen.be/id/concept/BestuurseenheidClassificatieCode/cc4e2d67-603b-4784-9b61-e50bac1ec089> <http://www.w3.org/2004/02/skos/core#inScheme> <http://lblod.data.gift/concept-schemes/10caf4a4-1ff5-4c05-917e-56489910d68b>. #OCMW vereniging"
+    <http://data.vlaanderen.be/id/concept/BestuurseenheidClassificatieCode/ea446861-2c51-45fa-afd3-4e4a37b71562> <http://www.w3.org/2004/02/skos/core#inScheme> <http://lblod.data.gift/concept-schemes/10caf4a4-1ff5-4c05-917e-56489910d68b>. #Hulpverleningszone"
+    <http://data.vlaanderen.be/id/concept/BestuurseenheidClassificatieCode/a3922c6d-425b-474f-9a02-ffb71a436bfc> <http://www.w3.org/2004/02/skos/core#inScheme> <http://lblod.data.gift/concept-schemes/10caf4a4-1ff5-4c05-917e-56489910d68b>. #Politiezone"
+    <http://data.vlaanderen.be/id/concept/BestuurseenheidClassificatieCode/b156b67f-c5f4-4584-9b30-4c090be02fdc> <http://www.w3.org/2004/02/skos/core#inScheme> <http://lblod.data.gift/concept-schemes/10caf4a4-1ff5-4c05-917e-56489910d68b>. #Projectvereniging"
+    <http://data.vlaanderen.be/id/concept/BestuurseenheidClassificatieCode/cd93f147-3ece-4308-acab-5c5ada3ec63d> <http://www.w3.org/2004/02/skos/core#inScheme> <http://lblod.data.gift/concept-schemes/10caf4a4-1ff5-4c05-917e-56489910d68b>. #Opdrachthoudende vereniging"
+    <http://data.vlaanderen.be/id/concept/BestuurseenheidClassificatieCode/d01bb1f6-2439-4e33-9c25-1fc295de2e71> <http://www.w3.org/2004/02/skos/core#inScheme> <http://lblod.data.gift/concept-schemes/10caf4a4-1ff5-4c05-917e-56489910d68b>. #Dienstverlenende vereniging"
+    <http://data.vlaanderen.be/id/concept/BestuurseenheidClassificatieCode/5ab0e9b8a3b2ca7c5e000003> <http://www.w3.org/2004/02/skos/core#inScheme> <http://lblod.data.gift/concept-schemes/10caf4a4-1ff5-4c05-917e-56489910d68b>. #District"
+    <http://data.vlaanderen.be/id/concept/BestuurseenheidClassificatieCode/5ab0e9b8a3b2ca7c5e000002> <http://www.w3.org/2004/02/skos/core#inScheme> <http://lblod.data.gift/concept-schemes/10caf4a4-1ff5-4c05-917e-56489910d68b>. #OCMW"
+    <http://data.vlaanderen.be/id/concept/BestuurseenheidClassificatieCode/80310756-ce0a-4a1b-9b8e-7c01b6cc7a2d> <http://www.w3.org/2004/02/skos/core#inScheme> <http://lblod.data.gift/concept-schemes/10caf4a4-1ff5-4c05-917e-56489910d68b>. #Autonoom provinciebedrijf"
+  }
+}
+
+