From 046ff4f9fb639c3ab02ff4ced874835c2d792954 Mon Sep 17 00:00:00 2001
From: Claire Lovisa <lovisa.claire@gmail.com>
Date: Tue, 7 Mar 2023 16:21:23 +0100
Subject: [PATCH] Fix posts producer

---
 .../delta-producer/worship-posts/export.json  | 66 +++++++++++++++----
 1 file changed, 55 insertions(+), 11 deletions(-)

diff --git a/config/delta-producer/worship-posts/export.json b/config/delta-producer/worship-posts/export.json
index 384e44c..a43e54b 100644
--- a/config/delta-producer/worship-posts/export.json
+++ b/config/delta-producer/worship-posts/export.json
@@ -10,7 +10,7 @@
         "http://mu.semte.ch/vocabularies/core/uuid",
         "http://www.w3.org/ns/org#role"
       ],
-      "additionalFilter": "?orgaan <http://www.w3.org/ns/org#hasPost> ?subject ; <https://data.vlaanderen.be/ns/generiek#isTijdspecialisatieVan>/<http://data.vlaanderen.be/ns/besluit#bestuurt> ?bestuurseenheid . ?bestuurseenheid a ?type. FILTER (?type IN (<http://data.lblod.info/vocabularies/erediensten/CentraalBestuurVanDeEredienst>, <http://data.lblod.info/vocabularies/erediensten/BestuurVanDeEredienst>))"
+      "additionalFilter": "} GRAPH ?h { ?orgaan <http://www.w3.org/ns/org#hasPost> ?subject ; <https://data.vlaanderen.be/ns/generiek#isTijdspecialisatieVan>/<http://data.vlaanderen.be/ns/besluit#bestuurt> ?bestuurseenheid . ?bestuurseenheid a ?type. FILTER (?type IN (<http://data.lblod.info/vocabularies/erediensten/CentraalBestuurVanDeEredienst>, <http://data.lblod.info/vocabularies/erediensten/BestuurVanDeEredienst>))"
     },
     {
       "type": "http://data.lblod.info/vocabularies/erediensten/BestuurVanDeEredienst",
@@ -24,7 +24,6 @@
         "http://www.w3.org/2004/02/skos/core#altLabel",
         "http://www.w3.org/ns/regorg#orgStatus",
         "http://data.lblod.info/vocabularies/erediensten/typeEredienst",
-        "http://data.vlaanderen.be/ns/besluit#werkingsgebied",
         "http://www.w3.org/ns/org#classification",
         "http://data.lblod.info/vocabularies/erediensten/wordtBediendDoor",
         "http://www.w3.org/ns/org#hasPrimarySite",
@@ -43,7 +42,6 @@
         "http://www.w3.org/2004/02/skos/core#altLabel",
         "http://www.w3.org/ns/regorg#orgStatus",
         "http://data.lblod.info/vocabularies/erediensten/typeEredienst",
-        "http://data.vlaanderen.be/ns/besluit#werkingsgebied",
         "http://www.w3.org/ns/org#classification",
         "http://www.w3.org/ns/org#hasPrimarySite",
         "http://www.w3.org/ns/org#hasSite"
@@ -59,13 +57,10 @@
         "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/regorg#orgStatus",
-        "http://data.vlaanderen.be/ns/besluit#werkingsgebied",
         "http://www.w3.org/ns/org#classification",
-        "http://www.w3.org/ns/org#hasPrimarySite",
-        "http://www.w3.org/ns/org#hasSite"
+        "http://www.w3.org/ns/adms#identifier"
       ],
-      "additionalFilter": "?subject <http://www.w3.org/ns/org#classification> ?bestuurClassification . FILTER (?bestuurClassification IN (<http://data.vlaanderen.be/id/concept/BestuurseenheidClassificatieCode/5ab0e9b8a3b2ca7c5e000001>, <http://data.vlaanderen.be/id/concept/BestuurseenheidClassificatieCode/5ab0e9b8a3b2ca7c5e000000>))"
+      "additionalFilter": "} GRAPH ?h { ?subject <http://www.w3.org/ns/org#classification> ?bestuurClassification . FILTER (?bestuurClassification IN (<http://data.vlaanderen.be/id/concept/BestuurseenheidClassificatieCode/5ab0e9b8a3b2ca7c5e000001>, <http://data.vlaanderen.be/id/concept/BestuurseenheidClassificatieCode/5ab0e9b8a3b2ca7c5e000000>))"
     },
     {
       "type": "http://data.vlaanderen.be/ns/besluit#Bestuurseenheid",
@@ -92,7 +87,7 @@
         "https://data.vlaanderen.be/ns/generiek#isTijdspecialisatieVan",
         "http://www.w3.org/ns/org#hasPost"
       ],
-      "additionalFilter": "?subject (<https://data.vlaanderen.be/ns/generiek#isTijdspecialisatieVan>/<http://data.vlaanderen.be/ns/besluit#bestuurt>/<http://www.w3.org/ns/org#classification>)|(<http://data.vlaanderen.be/ns/besluit#bestuurt>/<http://www.w3.org/ns/org#classification>) ?bestuurClassification . FILTER (?bestuurClassification IN (<http://data.vlaanderen.be/id/concept/BestuurseenheidClassificatieCode/5ab0e9b8a3b2ca7c5e000001>, <http://data.vlaanderen.be/id/concept/BestuurseenheidClassificatieCode/5ab0e9b8a3b2ca7c5e000000>, <http://data.vlaanderen.be/id/concept/BestuurseenheidClassificatieCode/f9cac08a-13c1-49da-9bcb-f650b0604054>, <http://data.vlaanderen.be/id/concept/BestuurseenheidClassificatieCode/66ec74fd-8cfc-4e16-99c6-350b35012e86>))"
+      "additionalFilter": "} GRAPH ?h { ?subject (<https://data.vlaanderen.be/ns/generiek#isTijdspecialisatieVan>/<http://data.vlaanderen.be/ns/besluit#bestuurt>/<http://www.w3.org/ns/org#classification>)|(<http://data.vlaanderen.be/ns/besluit#bestuurt>/<http://www.w3.org/ns/org#classification>) ?bestuurClassification . FILTER (?bestuurClassification IN (<http://data.vlaanderen.be/id/concept/BestuurseenheidClassificatieCode/5ab0e9b8a3b2ca7c5e000001>, <http://data.vlaanderen.be/id/concept/BestuurseenheidClassificatieCode/5ab0e9b8a3b2ca7c5e000000>, <http://data.vlaanderen.be/id/concept/BestuurseenheidClassificatieCode/f9cac08a-13c1-49da-9bcb-f650b0604054>, <http://data.vlaanderen.be/id/concept/BestuurseenheidClassificatieCode/66ec74fd-8cfc-4e16-99c6-350b35012e86>))"
     },
     {
       "type": "http://data.lblod.info/vocabularies/erediensten/PositieBedienaar",
@@ -132,9 +127,58 @@
         "http://www.w3.org/ns/org#hasPrimarySite",
         "http://www.w3.org/ns/org#hasSite",
         "http://www.w3.org/ns/org#linkedTo",
-        "http://data.lblod.info/vocabularies/erediensten/typeEredienst"
+        "http://data.lblod.info/vocabularies/erediensten/typeEredienst",
+        "http://www.w3.org/ns/adms#identifier"
       ]
     },
+    {
+      "type": "http://www.w3.org/ns/adms#Identifier",
+      "graphsFilter": [
+        "http://mu.semte.ch/graphs/administrative-unit",
+        "http://mu.semte.ch/graphs/shared"
+      ],
+      "properties": [
+        "http://mu.semte.ch/vocabularies/core/uuid",
+        "http://www.w3.org/2004/02/skos/core#notation",
+        "https://data.vlaanderen.be/ns/generiek#gestructureerdeIdentificator"
+      ],
+      "additionalFilter": "} GRAPH ?h { ?bestuur <http://www.w3.org/ns/adms#identifier> ?subject ; <http://www.w3.org/ns/org#classification> ?bestuurClassification . FILTER (?bestuurClassification IN (<http://data.vlaanderen.be/id/concept/BestuurseenheidClassificatieCode/5ab0e9b8a3b2ca7c5e000001>, <http://data.vlaanderen.be/id/concept/BestuurseenheidClassificatieCode/5ab0e9b8a3b2ca7c5e000000>))"
+    },
+    {
+      "type": "https://data.vlaanderen.be/ns/generiek#GestructureerdeIdentificator",
+      "graphsFilter": [
+        "http://mu.semte.ch/graphs/administrative-unit",
+        "http://mu.semte.ch/graphs/shared"
+      ],
+      "properties": [
+        "http://mu.semte.ch/vocabularies/core/uuid",
+        "https://data.vlaanderen.be/ns/generiek#lokaleIdentificator"
+      ],
+      "additionalFilter": "} GRAPH ?h { ?bestuur <http://www.w3.org/ns/adms#identifier> ?id ; <http://www.w3.org/ns/org#classification> ?bestuurClassification . FILTER (?bestuurClassification IN (<http://data.vlaanderen.be/id/concept/BestuurseenheidClassificatieCode/5ab0e9b8a3b2ca7c5e000001>, <http://data.vlaanderen.be/id/concept/BestuurseenheidClassificatieCode/5ab0e9b8a3b2ca7c5e000000>)) . ?id <https://data.vlaanderen.be/ns/generiek#gestructureerdeIdentificator> ?subject ."
+    },
+    {
+      "type": "http://www.w3.org/ns/adms#Identifier",
+      "graphsFilter": [
+        "http://mu.semte.ch/graphs/worship-service"
+      ],
+      "properties": [
+        "http://mu.semte.ch/vocabularies/core/uuid",
+        "http://www.w3.org/2004/02/skos/core#notation",
+        "https://data.vlaanderen.be/ns/generiek#gestructureerdeIdentificator"
+      ],
+      "additionalFilter": "} GRAPH ?h { ?bestuur <http://www.w3.org/ns/adms#identifier> ?subject . ?bestuur a <http://data.lblod.info/vocabularies/erediensten/RepresentatiefOrgaan> ."
+    },
+    {
+      "type": "https://data.vlaanderen.be/ns/generiek#GestructureerdeIdentificator",
+      "graphsFilter": [
+        "http://mu.semte.ch/graphs/worship-service"
+      ],
+      "properties": [
+        "http://mu.semte.ch/vocabularies/core/uuid",
+        "https://data.vlaanderen.be/ns/generiek#lokaleIdentificator"
+      ],
+      "additionalFilter": "} GRAPH ?h { ?bestuur <http://www.w3.org/ns/adms#identifier> ?id . ?bestuur a <http://data.lblod.info/vocabularies/erediensten/RepresentatiefOrgaan> . ?id <https://data.vlaanderen.be/ns/generiek#gestructureerdeIdentificator> ?subject ."
+    },
     {
       "type": "http://www.w3.org/ns/org#Site",
       "graphsFilter": [
@@ -163,7 +207,7 @@
         "http://www.w3.org/ns/locn#adminUnitL2",
         "http://www.w3.org/ns/locn#fullAddress"
       ],
-      "additionalFilter": "?subject ^<https://data.vlaanderen.be/ns/organisatie#bestaatUit> ?site. ?site a <http://www.w3.org/ns/org#Site>."
+      "additionalFilter": "} GRAPH ?h { ?subject ^<https://data.vlaanderen.be/ns/organisatie#bestaatUit> ?site. ?site a <http://www.w3.org/ns/org#Site>."
     },
     {
       "type": "http://lblod.data.gift/vocabularies/organisatie/BestuurseenheidClassificatieCode",