diff --git a/config/authorization/config.ex b/config/authorization/config.ex index 5268cc5..9d91fd6 100644 --- a/config/authorization/config.ex +++ b/config/authorization/config.ex @@ -135,6 +135,12 @@ defmodule Acl.UserGroups.Config do constraint: %ResourceConstraint{ resource_types: @org_type } + }, + %GraphSpec{ + graph: "http://mu.semte.ch/graphs/vendor-management-data", + constraint: %ResourceConstraint{ + resource_types: @vendor_type + } } ] }, @@ -148,6 +154,12 @@ defmodule Acl.UserGroups.Config do constraint: %ResourceConstraint{ resource_types: @org_type ++ @error_type } + }, + %GraphSpec{ + graph: "http://mu.semte.ch/graphs/vendor-management-data", + constraint: %ResourceConstraint{ + resource_types: @vendor_type + } } ] }, @@ -161,6 +173,12 @@ defmodule Acl.UserGroups.Config do constraint: %ResourceConstraint{ resource_types: @org_type ++ @error_type } + }, + %GraphSpec{ + graph: "http://mu.semte.ch/graphs/vendor-management-data", + constraint: %ResourceConstraint{ + resource_types: @vendor_type + } } ] }, diff --git a/config/delta-consumers/vendor-management/mapping/queries/dl2op/pass/vendor.sparql b/config/delta-consumers/vendor-management/mapping/queries/dl2op/pass/vendor.sparql deleted file mode 100644 index b387da5..0000000 --- a/config/delta-consumers/vendor-management/mapping/queries/dl2op/pass/vendor.sparql +++ /dev/null @@ -1,19 +0,0 @@ -CONSTRUCT { - ?s ?p ?o. -} WHERE { - ?s a ; - ?p ?o. - - FILTER (?s IN ( - - )) - - FILTER (?p IN ( - , - , - , - - )) - - -} diff --git a/config/resources/domain.json b/config/resources/domain.json index 5b32279..139fe4f 100644 --- a/config/resources/domain.json +++ b/config/resources/domain.json @@ -468,7 +468,13 @@ "target": "kbo-organizations", "cardinality": "one", "inverse": true - } + }, + "vendors": { + "predicate": "muAccount:canActOnBehalfOf", + "target": "vendors", + "cardinality": "many", + "inverse": true + } }, "features": ["include-uri"], "new-resource-base": "http://data.lblod.info/id/organisaties/" @@ -563,9 +569,9 @@ } }, "relationships": { - "worship-service": { + "organizations": { "predicate": "muAccount:canActOnBehalfOf", - "target": "worship-services", + "target": "organizations", "cardinality": "many" } }, @@ -584,14 +590,6 @@ "predicate": "ere:grensoverschrijdend" } }, - "relationships": { - "vendor": { - "predicate": "muAccount:canActOnBehalfOf", - "target": "vendors", - "cardinality": "one", - "inverse": true - } - }, "new-resource-base": "http://data.lblod.info/id/besturenVanDeEredienst/" }, "recognized-worship-types": { diff --git a/docker-compose.yml b/docker-compose.yml index d4e8f39..a31923f 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -544,32 +544,19 @@ services: image: lblod/delta-consumer:0.1.1 environment: DCR_SYNC_BASE_URL: "https://loket.lblod.info/" - DCR_SYNC_LOGIN_ENDPOINT: 'https://loket.lblod.info/sync/vendor-management/login' - DCR_SECRET_KEY: "" + DCR_SYNC_LOGIN_ENDPOINT: 'https://loket.lblod.info/sync/vendor-management/login' # Add DCR_SECRET_KEY in docker-compose.override.yml DCR_SERVICE_NAME: "vendor-management-consumer" + DCR_SYNC_FILES_PATH: "/sync/vendor-management/files" DCR_SYNC_DATASET_SUBJECT: "http://data.lblod.info/datasets/delta-producer/dumps/VendorManagementCacheGraphDump" DCR_INITIAL_SYNC_JOB_OPERATION: "http://redpencil.data.gift/id/jobs/concept/JobOperation/deltas/consumer/initialSync/vendor-management" - DCR_DELTA_SYNC_JOB_OPERATION: "http://redpencil.data.gift/id/jobs/concept/JobOperation/deltas/consumer/VendorManagementFileSyncing" DCR_JOB_CREATOR_URI: "http://data.lblod.info/services/id/vendor-management-consumer" DCR_DISABLE_INITIAL_SYNC: "true" - DCR_SYNC_FILES_PATH: "/sync/vendor-management/files" DCR_KEEP_DELTA_FILES: "true" - DCR_DELTA_JOBS_RETENTION_PERIOD: "30" - DCR_ENABLE_TRIPLE_REMAPPING: "true" - DCR_LANDING_ZONE_GRAPH: "http://mu.semte.ch/graphs/landing-zone/vendor-management-data" - DCR_REMAPPING_GRAPH: "http://mu.semte.ch/graphs/vendor-management-data" - BATCH_SIZE: "500" - SUDO_QUERY_RETRY_FOR_HTTP_STATUS_CODES: "404,500,503" - SUDO_QUERY_RETRY: "true" DCR_DELTA_FILE_FOLDER: "/consumer-files" - volumes: - - ./config/delta-consumers/vendor-management/mapping:/config/mapping - - ./data/files/consumer-files/vendor-management:/consumer-files/ + DCR_DELTA_SYNC_JOB_OPERATION: "http://redpencil.data.gift/id/jobs/concept/JobOperation/deltas/consumer/VendorManagementFileSyncing" + INGEST_GRAPH: "http://mu.semte.ch/graphs/vendor-management-data" labels: - "logging=true" - links: - - db:database - - triplestore:virtuoso restart: always logging: *default-logging ################################################################################