From 834897c0c284a11c4379eee8849016106220dec5 Mon Sep 17 00:00:00 2001 From: Boris De Vloed Date: Wed, 8 Dec 2021 15:24:46 +0100 Subject: [PATCH 1/3] added typeEredienst --- .../delta-producer/organizations/export.json | 6 ++-- config/delta/rules.js | 32 +++++++++---------- config/jobs-controller/config.json | 10 +++--- 3 files changed, 25 insertions(+), 23 deletions(-) diff --git a/config/delta-producer/organizations/export.json b/config/delta-producer/organizations/export.json index 894ab75..555a5f7 100644 --- a/config/delta-producer/organizations/export.json +++ b/config/delta-producer/organizations/export.json @@ -134,7 +134,8 @@ "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" + "http://data.lblod.info/vocabularies/erediensten/wordtBediendDoor", + "http://data.lblod.info/vocabularies/erediensten/typeEredienst" ] }, { @@ -157,7 +158,8 @@ "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://mu.semte.ch/vocabularies/ext/werkingsgebiedNiveau", + "http://data.lblod.info/vocabularies/erediensten/typeEredienst" ] }, { diff --git a/config/delta/rules.js b/config/delta/rules.js index 8d1b1ca..ba9c72a 100644 --- a/config/delta/rules.js +++ b/config/delta/rules.js @@ -1,21 +1,21 @@ export default [ - { - match: { - graph: { - type: "uri", - value: "http://mu.semte.ch/graphs/organisatieportaal" - } - }, - callback: { - url: "http://kalliope-api/delta", method: "POST" - }, - options: { - resourceFormat: "v0.0.1", - gracePeriod: 1000, - ignoreFromSelf: true, - optOutMuScopeIds: [ "http://redpencil.data.gift/id/concept/muScope/deltas/initialSync" ] + { + match: { + graph: { + type: "uri", + value: "http://mu.semte.ch/graphs/organisatieportaal" } }, + callback: { + url: "http://kalliope-api/delta", method: "POST" + }, + options: { + resourceFormat: "v0.0.1", + gracePeriod: 1000, + ignoreFromSelf: true, + optOutMuScopeIds: [ "http://redpencil.data.gift/id/concept/muScope/deltas/initialSync" ] + } + }, { match: { predicate: { @@ -85,7 +85,7 @@ export default [ "http://redpencil.data.gift/id/concept/muScope/deltas/publicationGraphMaintenance" ] } - },, + }, { match: { graph: { diff --git a/config/jobs-controller/config.json b/config/jobs-controller/config.json index 19432d7..317c490 100644 --- a/config/jobs-controller/config.json +++ b/config/jobs-controller/config.json @@ -37,6 +37,11 @@ "currentOperation": null, "nextOperation": "http://redpencil.data.gift/id/jobs/concept/TaskOperation/deltas/initialPublicationGraphSyncing", "nextIndex": "0" + }, + { + "currentOperation": "http://redpencil.data.gift/id/jobs/concept/TaskOperation/deltas/initialPublicationGraphSyncing", + "nextOperation": "http://redpencil.data.gift/id/jobs/concept/TaskOperation/deltas/deltaDumpFileCreation", + "nextIndex": "1" } ] }, @@ -46,11 +51,6 @@ "currentOperation": null, "nextOperation": "http://redpencil.data.gift/id/jobs/concept/TaskOperation/deltas/healing/patchPublicationGraph", "nextIndex": "0" - }, - { - "currentOperation": "http://redpencil.data.gift/id/jobs/concept/TaskOperation/deltas/initialPublicationGraphSyncing", - "nextOperation": "http://redpencil.data.gift/id/jobs/concept/TaskOperation/deltas/deltaDumpFileCreation", - "nextIndex": "1" } ] }, From cbfe243b3ef0f4c42751e73bfff86e67d655e391 Mon Sep 17 00:00:00 2001 From: Boris De Vloed Date: Wed, 8 Dec 2021 16:53:39 +0100 Subject: [PATCH 2/3] fix typo in graph name --- .../delta-producer/organizations/export.json | 70 +++++++++---------- 1 file changed, 35 insertions(+), 35 deletions(-) diff --git a/config/delta-producer/organizations/export.json b/config/delta-producer/organizations/export.json index 555a5f7..0d5a470 100644 --- a/config/delta-producer/organizations/export.json +++ b/config/delta-producer/organizations/export.json @@ -3,7 +3,7 @@ { "type": "http://www.w3.org/ns/person#Person", "graphsFilter": [ - "http://mu.semte.ch/graphs/organisatieportaal/" + "http://mu.semte.ch/graphs/organisatieportaal" ], "properties": [ "http://xmlns.com/foaf/0.1/givenName", @@ -16,7 +16,7 @@ { "type": "http://lblod.data.gift/vocabularies/organisatie/MandatarisStatusCode", "graphsFilter": [ - "http://mu.semte.ch/graphs/organisatieportaal/" + "http://mu.semte.ch/graphs/organisatieportaal" ], "properties": [ "http://www.w3.org/2004/02/skos/core#prefLabel" @@ -26,7 +26,7 @@ "type": "http://data.lblod.info/vocabularies/erediensten/EredienstMandataris", "strictTypeExport": "true", "graphsFilter": [ - "http://mu.semte.ch/graphs/organisatieportaal/" + "http://mu.semte.ch/graphs/organisatieportaal" ], "properties": [ "http://data.lblod.info/vocabularies/contacthub/startdatum", @@ -46,7 +46,7 @@ { "type": "http://lblod.data.gift/vocabularies/organisatie/HelftVerkiezing", "graphsFilter": [ - "http://mu.semte.ch/graphs/organisatieportaal/" + "http://mu.semte.ch/graphs/organisatieportaal" ], "properties": [ "http://www.w3.org/2004/02/skos/core#prefLabel" @@ -55,7 +55,7 @@ { "type": "http://schema.org/ContactPoint", "graphsFilter": [ - "http://mu.semte.ch/graphs/organisatieportaal/" + "http://mu.semte.ch/graphs/organisatieportaal" ], "properties": [ "http://schema.org/email", @@ -67,7 +67,7 @@ { "type": "http://data.vlaanderen.be/ns/mandaat#Mandaat", "graphsFilter": [ - "http://mu.semte.ch/graphs/organisatieportaal/" + "http://mu.semte.ch/graphs/organisatieportaal" ], "properties": [ "http://www.w3.org/ns/org#role", @@ -78,7 +78,7 @@ { "type": "http://lblod.data.gift/vocabularies/organisatie/BestuursfunctieCode", "graphsFilter": [ - "http://mu.semte.ch/graphs/organisatieportaal/" + "http://mu.semte.ch/graphs/organisatieportaal" ], "properties": [ "http://www.w3.org/2004/02/skos/core#prefLabel" @@ -87,7 +87,7 @@ { "type": "http://www.w3.org/ns/org#Role", "graphsFilter": [ - "http://mu.semte.ch/graphs/organisatieportaal/" + "http://mu.semte.ch/graphs/organisatieportaal" ], "properties": [ "http://www.w3.org/2004/02/skos/core#prefLabel" @@ -96,7 +96,7 @@ { "type": "http://lblod.data.gift/vocabularies/organisatie/BestuurseenheidClassificatieCode", "graphsFilter": [ - "http://mu.semte.ch/graphs/organisatieportaal/" + "http://mu.semte.ch/graphs/organisatieportaal" ], "properties": [ "http://www.w3.org/2004/02/skos/core#prefLabel" @@ -105,7 +105,7 @@ { "type": "http://lblod.data.gift/vocabularies/organisatie/TypeEredienst", "graphsFilter": [ - "http://mu.semte.ch/graphs/organisatieportaal/" + "http://mu.semte.ch/graphs/organisatieportaal" ], "properties": [ "http://www.w3.org/2004/02/skos/core#prefLabel" @@ -115,7 +115,7 @@ "type": "http://data.lblod.info/vocabularies/erediensten/BestuurVanDeEredienst", "strictTypeExport": "true", "graphsFilter": [ - "http://mu.semte.ch/graphs/organisatieportaal/" + "http://mu.semte.ch/graphs/organisatieportaal" ], "properties": [ "http://www.w3.org/2004/02/skos/core#prefLabel", @@ -142,7 +142,7 @@ "type": "http://data.lblod.info/vocabularies/erediensten/CentraalBestuurVanDeEredienst", "strictTypeExport": "true", "graphsFilter": [ - "http://mu.semte.ch/graphs/organisatieportaal/" + "http://mu.semte.ch/graphs/organisatieportaal" ], "properties": [ "http://www.w3.org/2004/02/skos/core#prefLabel", @@ -166,7 +166,7 @@ "type": "http://data.lblod.info/vocabularies/erediensten/RepresentatiefOrgaan", "strictTypeExport": "true", "graphsFilter": [ - "http://mu.semte.ch/graphs/organisatieportaal/" + "http://mu.semte.ch/graphs/organisatieportaal" ], "properties": [ "http://www.w3.org/2004/02/skos/core#prefLabel", @@ -187,7 +187,7 @@ "type": "http://data.vlaanderen.be/ns/besluit#Bestuursorgaan", "strictTypeExport": "true", "graphsFilter": [ - "http://mu.semte.ch/graphs/organisatieportaal/" + "http://mu.semte.ch/graphs/organisatieportaal" ], "properties": [ "http://data.vlaanderen.be/ns/mandaat#bindingEinde", @@ -201,7 +201,7 @@ { "type": "http://lblod.data.gift/vocabularies/organisatie/BestuursorgaanClassificatieCode", "graphsFilter": [ - "http://mu.semte.ch/graphs/organisatieportaal/" + "http://mu.semte.ch/graphs/organisatieportaal" ], "properties": [ "http://www.w3.org/2004/02/skos/core#prefLabel" @@ -210,7 +210,7 @@ { "type": "http://data.lblod.info/vocabularies/erediensten/BetrokkenLokaleBesturen", "graphsFilter": [ - "http://mu.semte.ch/graphs/organisatieportaal/" + "http://mu.semte.ch/graphs/organisatieportaal" ], "properties": [ "http://data.lblod.info/vocabularies/erediensten/financieringspercentage", @@ -221,7 +221,7 @@ { "type": "http://www.w3.org/ns/adms#Identifier", "graphsFilter": [ - "http://mu.semte.ch/graphs/organisatieportaal/" + "http://mu.semte.ch/graphs/organisatieportaal" ], "properties": [ "http://www.w3.org/2004/02/skos/core#notation", @@ -231,7 +231,7 @@ { "type": "https://data.vlaanderen.be/ns/generiek#GestructureerdeIdentificator", "graphsFilter": [ - "http://mu.semte.ch/graphs/organisatieportaal/" + "http://mu.semte.ch/graphs/organisatieportaal" ], "properties": [ "https://data.vlaanderen.be/ns/generiek#lokaleIdentificator" @@ -240,7 +240,7 @@ { "type": "http://www.w3.org/ns/locn#Address", "graphsFilter": [ - "http://mu.semte.ch/graphs/organisatieportaal/" + "http://mu.semte.ch/graphs/organisatieportaal" ], "properties": [ "https://data.vlaanderen.be/ns/adres#Adresvoorstelling.huisnummer", @@ -258,7 +258,7 @@ { "type": "http://www.w3.org/ns/org#Site", "graphsFilter": [ - "http://mu.semte.ch/graphs/organisatieportaal/" + "http://mu.semte.ch/graphs/organisatieportaal" ], "properties": [ "http://www.w3.org/ns/org#siteAddress", @@ -269,7 +269,7 @@ { "type": "http://www.w3.org/ns/org#ChangeEvent", "graphsFilter": [ - "http://mu.semte.ch/graphs/organisatieportaal/" + "http://mu.semte.ch/graphs/organisatieportaal" ], "properties": [ "http://purl.org/dc/terms/date", @@ -282,7 +282,7 @@ { "type": "http://lblod.data.gift/vocabularies/organisatie/Veranderingsgebeurtenis", "graphsFilter": [ - "http://mu.semte.ch/graphs/organisatieportaal/" + "http://mu.semte.ch/graphs/organisatieportaal" ], "properties": [ "http://www.w3.org/2004/02/skos/core#prefLabel" @@ -291,7 +291,7 @@ { "type": "http://www.w3.org/2004/02/skos/core#Concept", "graphsFilter": [ - "http://mu.semte.ch/graphs/organisatieportaal/" + "http://mu.semte.ch/graphs/organisatieportaal" ], "properties": [ "http://www.w3.org/2004/02/skos/core#prefLabel" @@ -300,7 +300,7 @@ { "type": "http://lblod.data.gift/vocabularies/organisatie/OrganisatieStatusCode", "graphsFilter": [ - "http://mu.semte.ch/graphs/organisatieportaal/" + "http://mu.semte.ch/graphs/organisatieportaal" ], "properties": [ "http://www.w3.org/2004/02/skos/core#prefLabel" @@ -309,7 +309,7 @@ { "type": "http://www.w3.org/ns/prov#Location", "graphsFilter": [ - "http://mu.semte.ch/graphs/organisatieportaal/" + "http://mu.semte.ch/graphs/organisatieportaal" ], "properties": [ "http://www.w3.org/2000/01/rdf-schema#label", @@ -320,7 +320,7 @@ { "type": "http://lblod.data.gift/vocabularies/organisatie/TypeBetrokkenheid", "graphsFilter": [ - "http://mu.semte.ch/graphs/organisatieportaal/" + "http://mu.semte.ch/graphs/organisatieportaal" ], "properties": [ "http://www.w3.org/2004/02/skos/core#prefLabel" @@ -329,7 +329,7 @@ { "type": "http://data.lblod.info/vocabularies/erediensten/RolBedienaar", "graphsFilter": [ - "http://mu.semte.ch/graphs/organisatieportaal/" + "http://mu.semte.ch/graphs/organisatieportaal" ], "properties": [ "http://data.lblod.info/vocabularies/contacthub/startdatum", @@ -344,7 +344,7 @@ { "type": "http://data.lblod.info/vocabularies/erediensten/VoorwaardenBedienaar", "graphsFilter": [ - "http://mu.semte.ch/graphs/organisatieportaal/" + "http://mu.semte.ch/graphs/organisatieportaal" ], "properties": [ "http://data.lblod.info/vocabularies/erediensten/voldaan", @@ -354,7 +354,7 @@ },{ "type": "http://publications.europa.eu/ontology/euvoc#Country", "graphsFilter": [ - "http://mu.semte.ch/graphs/organisatieportaal/" + "http://mu.semte.ch/graphs/organisatieportaal" ], "properties": [ "http://www.w3.org/2004/02/skos/core#prefLabel", @@ -363,7 +363,7 @@ },{ "type": "http://data.lblod.info/vocabularies/erediensten/PositieBedienaar", "graphsFilter": [ - "http://mu.semte.ch/graphs/organisatieportaal/" + "http://mu.semte.ch/graphs/organisatieportaal" ], "properties": [ "http://www.w3.org/ns/org#role", @@ -375,7 +375,7 @@ { "type": "http://lblod.data.gift/vocabularies/organisatie/EredienstBeroepen", "graphsFilter": [ - "http://mu.semte.ch/graphs/organisatieportaal/" + "http://mu.semte.ch/graphs/organisatieportaal" ], "properties": [ "http://www.w3.org/2004/02/skos/core#prefLabel" @@ -384,7 +384,7 @@ { "type": "http://lblod.data.gift/vocabularies/organisatie/BedienaarFinanceringCode", "graphsFilter": [ - "http://mu.semte.ch/graphs/organisatieportaal/" + "http://mu.semte.ch/graphs/organisatieportaal" ], "properties": [ "http://www.w3.org/2004/02/skos/core#prefLabel" @@ -393,7 +393,7 @@ { "type": "http://lblod.data.gift/vocabularies/organisatie/VoorwaardenBedienaarCriterium", "graphsFilter": [ - "http://mu.semte.ch/graphs/organisatieportaal/" + "http://mu.semte.ch/graphs/organisatieportaal" ], "properties": [ "http://www.w3.org/2004/02/skos/core#prefLabel" @@ -402,7 +402,7 @@ { "type": "http://lblod.data.gift/vocabularies/organisatie/BedienaarCriteriumBewijsstuk", "graphsFilter": [ - "http://mu.semte.ch/graphs/organisatieportaal/" + "http://mu.semte.ch/graphs/organisatieportaal" ], "properties": [ "http://www.w3.org/2004/02/skos/core#prefLabel" @@ -411,7 +411,7 @@ { "type": "http://lblod.data.gift/vocabularies/organisatie/TypeVestiging", "graphsFilter": [ - "http://mu.semte.ch/graphs/organisatieportaal/" + "http://mu.semte.ch/graphs/organisatieportaal" ], "properties": [ "http://www.w3.org/2004/02/skos/core#prefLabel" From 3930b8723764c41d366a1e2c9cdb0b66e1a3d0db Mon Sep 17 00:00:00 2001 From: Boris De Vloed Date: Fri, 10 Dec 2021 09:38:15 +0100 Subject: [PATCH 3/3] add config changes --- config/delta-producer/dump-file-publisher/config.json | 4 ++-- docker-compose.yml | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/config/delta-producer/dump-file-publisher/config.json b/config/delta-producer/dump-file-publisher/config.json index 8096db7..66391ca 100644 --- a/config/delta-producer/dump-file-publisher/config.json +++ b/config/delta-producer/dump-file-publisher/config.json @@ -12,11 +12,11 @@ "http://redpencil.data.gift/id/jobs/concept/JobOperation/deltas/deltaDumpFileCreation/organizations" : { "dcatDataSetSubject": "http://data.lblod.info/datasets/delta-producer/dumps/OrganizationsCacheGraphDump", "targetGraph": "http://redpencil.data.gift/id/deltas/producer/organizations", - "fileBaseName": "dump-administrative-units" + "fileBaseName": "dump-organizations" }, "http://redpencil.data.gift/id/jobs/concept/JobOperation/deltas/initialPublicationGraphSyncing/organizations" : { "dcatDataSetSubject": "http://data.lblod.info/datasets/delta-producer/dumps/OrganizationsCacheGraphDump", "targetGraph": "http://redpencil.data.gift/id/deltas/producer/organizations", - "fileBaseName": "dump-administrative-units" + "fileBaseName": "dump-organizations" } } diff --git a/docker-compose.yml b/docker-compose.yml index 2a1e6ee..58f0ce0 100644 --- 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.4.0 + image: lblod/jsonld-delta-service:0.5.0 volumes: - ./config/kalliope:/config - ./data/files:/share @@ -280,7 +280,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: '0 0 4 * * 6' # weekly on saturday + CRON_PATTERN_DUMP_JOB: '30 9 8-18/2 ? * MON,TUE,WED,THU,FRI *' # At second :30, at minute :09, every 2 hours between hours 08:00-18:00, on every Monday, Tuesday, Wednesday, Thursday and Friday, every month 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: