From dbb9c06dd7f995b119d59f8fbe2aa27016fa818b Mon Sep 17 00:00:00 2001 From: Claire Lovisa Date: Fri, 6 Jan 2023 12:48:59 +0100 Subject: [PATCH] Limit producer to worship posts --- .../dump-file-publisher/config.json | 16 +++++----- .../{posts => worship-posts}/export.json | 12 +++---- config/delta/rules.js | 6 ++-- docker-compose.dev.yml | 4 +-- docker-compose.yml | 32 +++++++++---------- 5 files changed, 34 insertions(+), 36 deletions(-) rename config/delta-producer/{posts => worship-posts}/export.json (61%) diff --git a/config/delta-producer/dump-file-publisher/config.json b/config/delta-producer/dump-file-publisher/config.json index 7456a19..b4d972e 100644 --- a/config/delta-producer/dump-file-publisher/config.json +++ b/config/delta-producer/dump-file-publisher/config.json @@ -35,16 +35,16 @@ "fileBaseName": "dump-public", "compression": false }, - "http://redpencil.data.gift/id/jobs/concept/JobOperation/deltas/deltaDumpFileCreation/posts" : { - "dcatDataSetSubject": "http://data.lblod.info/datasets/delta-producer/dumps/PostsCacheGraphDump", - "targetGraph": "http://redpencil.data.gift/id/deltas/producer/posts", - "fileBaseName": "dump-posts", + "http://redpencil.data.gift/id/jobs/concept/JobOperation/deltas/deltaDumpFileCreation/worship-posts" : { + "dcatDataSetSubject": "http://data.lblod.info/datasets/delta-producer/dumps/WorshipPostsCacheGraphDump", + "targetGraph": "http://redpencil.data.gift/id/deltas/producer/worship-posts", + "fileBaseName": "dump-worship-posts", "compression": false }, - "http://redpencil.data.gift/id/jobs/concept/JobOperation/deltas/initialPublicationGraphSyncing/posts" : { - "dcatDataSetSubject": "http://data.lblod.info/datasets/delta-producer/dumps/PostsCacheGraphDump", - "targetGraph": "http://redpencil.data.gift/id/deltas/producer/posts", - "fileBaseName": "dump-posts", + "http://redpencil.data.gift/id/jobs/concept/JobOperation/deltas/initialPublicationGraphSyncing/worship-posts" : { + "dcatDataSetSubject": "http://data.lblod.info/datasets/delta-producer/dumps/WorshipPostsCacheGraphDump", + "targetGraph": "http://redpencil.data.gift/id/deltas/producer/worship-posts", + "fileBaseName": "dump-worship-posts", "compression": false } } diff --git a/config/delta-producer/posts/export.json b/config/delta-producer/worship-posts/export.json similarity index 61% rename from config/delta-producer/posts/export.json rename to config/delta-producer/worship-posts/export.json index df6a82a..9c4b9ad 100644 --- a/config/delta-producer/posts/export.json +++ b/config/delta-producer/worship-posts/export.json @@ -7,10 +7,9 @@ ], "properties": [ "http://mu.semte.ch/vocabularies/core/uuid", - "http://www.w3.org/ns/org#role", - "http://www.w3.org/ns/org#postIn", "http://www.w3.org/ns/org#role" - ] + ], + "additionalFilter": "?orgaan ?subject ; / ?bestuurseenheid . ?bestuurseenheid a ?type. FILTER (?type IN (, ))" }, { "type": "http://data.lblod.info/vocabularies/erediensten/BestuurVanDeEredienst", @@ -30,7 +29,8 @@ ], "properties": [ "http://www.w3.org/ns/org#hasPost" - ] + ], + "additionalFilter": "?subject / ?bestuurseenheid . ?bestuurseenheid a ?type. FILTER (?type IN (, ))" }, { "type": "http://data.lblod.info/vocabularies/erediensten/PositieBedienaar", @@ -40,9 +40,7 @@ "properties": [ "http://mu.semte.ch/vocabularies/core/uuid", "http://www.w3.org/ns/org#role", - "http://www.w3.org/ns/org#postIn", - "http://data.lblod.info/vocabularies/erediensten/functie", - "http://data.lblod.info/vocabularies/erediensten/behoort" + "http://data.lblod.info/vocabularies/erediensten/functie" ] } ] diff --git a/config/delta/rules.js b/config/delta/rules.js index 5fad7c0..0578070 100644 --- a/config/delta/rules.js +++ b/config/delta/rules.js @@ -160,7 +160,7 @@ export default [ match: { }, callback: { - url: 'http://delta-producer-pub-graph-maintainer-posts/delta', + url: 'http://delta-producer-pub-graph-maintainer-worship-posts/delta', method: 'POST' }, options: { @@ -177,11 +177,11 @@ export default [ match: { graph: { type: 'uri', - value: 'http://redpencil.data.gift/id/deltas/producer/posts' + value: 'http://redpencil.data.gift/id/deltas/producer/worship-posts' } }, callback: { - url: 'http://delta-producer-json-diff-publisher-posts/delta', + url: 'http://delta-producer-json-diff-publisher-worship-posts/delta', method: 'POST' }, options: { diff --git a/docker-compose.dev.yml b/docker-compose.dev.yml index 8066f8a..5eecc28 100644 --- a/docker-compose.dev.yml +++ b/docker-compose.dev.yml @@ -71,7 +71,7 @@ services: restart: "no" construct-administrative-unit-relationships: restart: "no" - delta-producer-bg-jobs-initiator-posts: + delta-producer-bg-jobs-initiator-worship-posts: restart: "no" - delta-producer-pub-graph-maintainer-posts: + delta-producer-pub-graph-maintainer-worship-posts: restart: "no" diff --git a/docker-compose.yml b/docker-compose.yml index c2b4c5e..eaa277f 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -405,15 +405,15 @@ services: ################################################################################ ################################################################################ - # DELTA POSTS: START + # DELTA WORSHIP POSTS: START ################################################################################ - delta-producer-bg-jobs-initiator-posts: + 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/organisatieportaal" - DUMP_FILE_CREATION_JOB_OPERATION: "http://redpencil.data.gift/id/jobs/concept/JobOperation/deltas/deltaDumpFileCreation/posts" - INITIAL_PUBLICATION_GRAPH_SYNC_JOB_OPERATION: "http://redpencil.data.gift/id/jobs/concept/JobOperation/deltas/initialPublicationGraphSyncing/posts" - HEALING_JOB_OPERATION: "http://redpencil.data.gift/id/jobs/concept/JobOperation/deltas/healingOperation/posts" + 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. @@ -423,35 +423,35 @@ services: - db:database restart: always logging: *default-logging - delta-producer-pub-graph-maintainer-posts: + delta-producer-pub-graph-maintainer-worship-posts: image: lblod/delta-producer-publication-graph-maintainer:0.15.1 environment: MAX_BODY_SIZE: "50mb" JOBS_GRAPH: "http://mu.semte.ch/graphs/organisatieportaal" - RELATIVE_FILE_PATH: "deltas/public" - PUBLICATION_GRAPH: "http://redpencil.data.gift/id/deltas/producer/posts" - HEALING_JOB_OPERATION: "http://redpencil.data.gift/id/jobs/concept/JobOperation/deltas/healingOperation/posts" - INITIAL_PUBLICATION_GRAPH_SYNC_JOB_OPERATION: "http://redpencil.data.gift/id/jobs/concept/JobOperation/deltas/initialPublicationGraphSyncing/posts" + 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 volumes: - - ./config/delta-producer/posts:/config + - ./config/delta-producer/worship-posts:/config - ./data/files/:/share links: - db:database - triplestore:virtuoso restart: always logging: *default-logging - delta-producer-json-diff-publisher-posts: + delta-producer-json-diff-publisher-worship-posts: image: lblod/delta-producer-json-diff-file-publisher:0.2.3 environment: MAX_BODY_SIZE: "50mb" ERROR_GRAPH: "http://mu.semte.ch/graphs/organisatieportaal" - RELATIVE_FILE_PATH: "deltas/posts" - PUBLISHER_URI: "http://data.lblod.info/services/delta-production-json-diff-file-manager/posts" - PUBLICATION_GRAPH: "http://redpencil.data.gift/id/deltas/producer/posts" + RELATIVE_FILE_PATH: "deltas/worship-posts" + PUBLISHER_URI: "http://data.lblod.info/services/delta-production-json-diff-file-manager/worship-posts" + PUBLICATION_GRAPH: "http://redpencil.data.gift/id/deltas/producer/worship-posts" DELTA_INTERVAL_MS: 10000 PRETTY_PRINT_DIFF_JSON: "true" volumes: @@ -463,7 +463,7 @@ services: restart: always logging: *default-logging ################################################################################ - # DELTA POSTS: END + # DELTA WORSHIP POSTS: END ################################################################################ ################################################################################