From 3541a5f66b78ad94870cdf8c1b68772b47f1f248 Mon Sep 17 00:00:00 2001 From: Nordine Bittich Date: Fri, 3 Dec 2021 10:56:37 +0100 Subject: [PATCH 1/5] acm idm roles --- .gitignore | 3 +- config/authorization/config.ex | 69 ++++++++++---- config/delta/rules.js | 2 +- ...11511111121112333224-bestuur-admidm.sparql | 13 +++ ...1511111121112333225-mock-user-roles.sparql | 91 +++++++++++++++++++ ...212411511111121112333226-move-graph.sparql | 8 ++ docker-compose.yml | 8 +- 7 files changed, 170 insertions(+), 24 deletions(-) create mode 100644 config/migrations/2022212411511111121112333224-bestuur-admidm.sparql create mode 100644 config/migrations/2022212411511111121112333225-mock-user-roles.sparql create mode 100644 config/migrations/2022212411511111121112333226-move-graph.sparql diff --git a/.gitignore b/.gitignore index be3b6dc..39c29a4 100644 --- a/.gitignore +++ b/.gitignore @@ -25,4 +25,5 @@ DS_STORE source.json out.json -security.yml \ No newline at end of file +security.yml +config/proxy-https/proxy_ssl.conf diff --git a/config/authorization/config.ex b/config/authorization/config.ex index a94aaab..831ee72 100644 --- a/config/authorization/config.ex +++ b/config/authorization/config.ex @@ -59,7 +59,8 @@ defmodule Acl.UserGroups.Config do ] defp access_by_role( group_string ) do %AccessByQuery{ - vars: ["session_group","session_role"], +# vars: ["session_group","session_role"], todo we might have to create multiple graph depending on role + vars: [], query: sparql_query_for_access_role( group_string ) } end @@ -76,20 +77,38 @@ defmodule Acl.UserGroups.Config do def user_groups do [ %GroupSpec{ - name: "acmidm", - useage: [:read, :write, :read_for_write], - access: %AccessByQuery{ - query: "PREFIX ext: - PREFIX mu: - PREFIX session: - SELECT ?account WHERE { - session:account ?account. - } LIMIT 1", - vars: [] - }, + name: "acmidm-lezer", + useage: [:read], + access: access_by_role( "ABBOrganisatiePortaalGebruiker-lezer" ), graphs: [ %GraphSpec{ - graph: "http://mu.semte.ch/graphs/contacthub/141d9d6b-54af-4d17-b313-8d1c30bc3f5b/ChAdmin", + graph: "http://mu.semte.ch/graphs/organisatieportaal", + constraint: %ResourceConstraint{ + resource_types: @protected_resource_type + } + } + ] + }, + %GroupSpec{ + name: "acmidm-editeerder", + useage: [:read, :write, :read_for_write], + access: access_by_role( "ABBOrganisatiePortaalGebruiker-editeerder" ), + graphs: [ + %GraphSpec{ + graph: "http://mu.semte.ch/graphs/organisatieportaal", + constraint: %ResourceConstraint{ + resource_types: @protected_resource_type + } + } + ] + }, + %GroupSpec{ + name: "acmidm-beheerder", + useage: [:read, :write, :read_for_write], + access: access_by_role( "ABBOrganisatiePortaalGebruiker-beheerder" ), + graphs: [ + %GraphSpec{ + graph: "http://mu.semte.ch/graphs/organisatieportaal", constraint: %ResourceConstraint{ resource_types: @protected_resource_type } @@ -97,11 +116,27 @@ defmodule Acl.UserGroups.Config do ] }, %GroupSpec{ - name: "ch-admin", - useage: [:read, :write, :read_for_write], - access: access_by_role( "ChAdmin" ), + name: "ch-lezer", + useage: [:read], + access: access_by_role( "ABBOrganisatiePortaalGebruiker-lezer" ), graphs: [ %GraphSpec{ - graph: "http://mu.semte.ch/graphs/contacthub/", + graph: "http://mu.semte.ch/graphs/organisatieportaal", + constraint: %ResourceConstraint{ + resource_types: @protected_resource_type } } ] }, + %GroupSpec{ + name: "ch-editeerder", + useage: [:read, :write, :read_for_write], + access: access_by_role( "ABBOrganisatiePortaalGebruiker-editeerder" ), + graphs: [ %GraphSpec{ + graph: "http://mu.semte.ch/graphs/organisatieportaal", + constraint: %ResourceConstraint{ + resource_types: @protected_resource_type } } ] }, + %GroupSpec{ + name: "ch-beheerder", + useage: [:read, :write, :read_for_write], + access: access_by_role( "ABBOrganisatiePortaalGebruiker-beheerder" ), + graphs: [ %GraphSpec{ + graph: "http://mu.semte.ch/graphs/organisatieportaal", constraint: %ResourceConstraint{ resource_types: @protected_resource_type } } ] }, %GroupSpec{ diff --git a/config/delta/rules.js b/config/delta/rules.js index 5476fc4..8d1b1ca 100644 --- a/config/delta/rules.js +++ b/config/delta/rules.js @@ -3,7 +3,7 @@ export default [ match: { graph: { type: "uri", - value: "http://mu.semte.ch/graphs/contacthub/141d9d6b-54af-4d17-b313-8d1c30bc3f5b/ChAdmin" + value: "http://mu.semte.ch/graphs/organisatieportaal" } }, callback: { diff --git a/config/migrations/2022212411511111121112333224-bestuur-admidm.sparql b/config/migrations/2022212411511111121112333224-bestuur-admidm.sparql new file mode 100644 index 0000000..a47e046 --- /dev/null +++ b/config/migrations/2022212411511111121112333224-bestuur-admidm.sparql @@ -0,0 +1,13 @@ +PREFIX mu: +PREFIX skos: +PREFIX dcterms: +PREFIX besluit: + +INSERT DATA { + GRAPH { + a besluit:Bestuurseenheid ; + mu:uuid "141d9d6b-54af-4d17-b313-8d1c30bc3f5b" ; + skos:prefLabel "Agentschap Binnenlands Bestuur" ; + dcterms:identifier "OVO001835" . + } +} \ No newline at end of file diff --git a/config/migrations/2022212411511111121112333225-mock-user-roles.sparql b/config/migrations/2022212411511111121112333225-mock-user-roles.sparql new file mode 100644 index 0000000..fb3a265 --- /dev/null +++ b/config/migrations/2022212411511111121112333225-mock-user-roles.sparql @@ -0,0 +1,91 @@ +PREFIX mu: +PREFIX skos: +PREFIX dcterms: +PREFIX besluit: +PREFIX foaf: +PREFIX ext: + DELETE { + GRAPH { + ?s ?p ?o + } + } INSERT { + GRAPH { + a besluit:Bestuurseenheid ; + mu:uuid "141d9d6b-54af-4d17-b313-8d1c30bc3f5b" ; + skos:prefLabel "Agentschap Binnenlands Bestuur" ; + dcterms:identifier "OVO001835" . + + a foaf:Person ; + mu:uuid "d39fe09e-d339-4e43-8680-dbbcfb3d3470" ; + foaf:firstName "Josephine" ; + foaf:familyName "Lezer" ; + foaf:member ; + foaf:account . + a foaf:OnlineAccount ; + mu:uuid "3a91ff60-07c1-4136-ac5e-55cf401e0956" ; + foaf:accountServiceHomepage ; + ext:sessionRole "ABBOrganisatiePortaalGebruiker-lezer". + + a foaf:Person ; + mu:uuid "d39fe09e-d339-4e43-8680-dbbcfb3d3471" ; + foaf:firstName "Josephine" ; + foaf:familyName "Editeerder" ; + foaf:member ; + foaf:account . + a foaf:OnlineAccount ; + mu:uuid "3a91ff60-07c1-4136-ac5e-55cf401e0957" ; + foaf:accountServiceHomepage ; + ext:sessionRole "ABBOrganisatiePortaalGebruiker-editeerder". + + a foaf:Person ; + mu:uuid "d39fe09e-d339-4e43-8680-dbbcfb3d3472" ; + foaf:firstName "Josephine" ; + foaf:familyName "Beheerder" ; + foaf:member ; + foaf:account . + a foaf:OnlineAccount ; + mu:uuid "3a91ff60-07c1-4136-ac5e-55cf401e0958" ; + foaf:accountServiceHomepage ; + ext:sessionRole "ABBOrganisatiePortaalGebruiker-beheerder". + } + + GRAPH { + + a foaf:Person ; + mu:uuid "d39fe09e-d339-4e43-8680-dbbcfb3d3470" ; + foaf:firstName "Josephine" ; + foaf:familyName "Lezer" ; + foaf:member ; + foaf:account . + a foaf:OnlineAccount ; + mu:uuid "3a91ff60-07c1-4136-ac5e-55cf401e0956" ; + foaf:accountServiceHomepage ; + ext:sessionRole "ABBOrganisatiePortaalGebruiker-lezer". + + a foaf:Person ; + mu:uuid "d39fe09e-d339-4e43-8680-dbbcfb3d3471" ; + foaf:firstName "Josephine" ; + foaf:familyName "Editeerder" ; + foaf:member ; + foaf:account . + a foaf:OnlineAccount ; + mu:uuid "3a91ff60-07c1-4136-ac5e-55cf401e0957" ; + foaf:accountServiceHomepage ; + ext:sessionRole "ABBOrganisatiePortaalGebruiker-editeerder". + + a foaf:Person ; + mu:uuid "d39fe09e-d339-4e43-8680-dbbcfb3d3472" ; + foaf:firstName "Josephine" ; + foaf:familyName "Beheerder" ; + foaf:member ; + foaf:account . + a foaf:OnlineAccount ; + mu:uuid "3a91ff60-07c1-4136-ac5e-55cf401e0958" ; + foaf:accountServiceHomepage ; + ext:sessionRole "ABBOrganisatiePortaalGebruiker-beheerder". + } + } WHERE { + GRAPH { + ?s ?p ?o + } + } \ No newline at end of file diff --git a/config/migrations/2022212411511111121112333226-move-graph.sparql b/config/migrations/2022212411511111121112333226-move-graph.sparql new file mode 100644 index 0000000..6279267 --- /dev/null +++ b/config/migrations/2022212411511111121112333226-move-graph.sparql @@ -0,0 +1,8 @@ +PREFIX mu: +PREFIX skos: +PREFIX dcterms: +PREFIX besluit: +PREFIX foaf: +PREFIX ext: +MOVE TO + \ No newline at end of file diff --git a/docker-compose.yml b/docker-compose.yml index c528e2f..7eb1ff9 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -111,17 +111,15 @@ services: restart: always logging: *default-logging login: - image: lblod/acmidm-login-service:0.9.3-organisatie_portaal - links: - - db:database + image: lblod/acmidm-login-service:0.9.2 environment: + MU_APPLICATION_AUTH_USERID_CLAIM: "vo_id" MU_APPLICATION_GRAPH: "http://mu.semte.ch/graphs/contacthub/accounts" + MU_APPLICATION_AUTH_ROLE_CLAIM: "abb_organisatieportaal_rol_3d" MU_APPLICATION_AUTH_DISCOVERY_URL: "https://authenticatie-ti.vlaanderen.be/op" MU_APPLICATION_AUTH_CLIENT_ID: "677af572-2e2f-4e61-ad38-036723bb314c" MU_APPLICATION_AUTH_REDIRECT_URI: "https://organisaties.abb.lblod.info/authorization/callback" MU_APPLICATION_AUTH_CLIENT_SECRET: "secret" - links: - - db:database labels: - "logging=true" restart: always From 9e63016553f6a4ffb6c8aaaf3f1e2059f1d8d136 Mon Sep 17 00:00:00 2001 From: Nordine Bittich Date: Fri, 3 Dec 2021 11:24:05 +0100 Subject: [PATCH 2/5] change graph --- .../delta-producer/administrative-units/export.json | 10 +++++----- docker-compose.yml | 12 ++++++------ 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/config/delta-producer/administrative-units/export.json b/config/delta-producer/administrative-units/export.json index f06ea4b..d6dc195 100644 --- a/config/delta-producer/administrative-units/export.json +++ b/config/delta-producer/administrative-units/export.json @@ -3,7 +3,7 @@ { "type": "http://lblod.data.gift/vocabularies/organisatie/BestuurseenheidClassificatieCode", "graphsFilter": [ - "http://mu.semte.ch/graphs/contacthub/141d9d6b-54af-4d17-b313-8d1c30bc3f5b/ChAdmin" + "http://mu.semte.ch/graphs/organisatieportaal" ], "properties": [ "http://mu.semte.ch/vocabularies/core/uuid", @@ -14,7 +14,7 @@ { "type": "http://data.vlaanderen.be/ns/besluit#Bestuurseenheid", "graphsFilter": [ - "http://mu.semte.ch/graphs/contacthub/141d9d6b-54af-4d17-b313-8d1c30bc3f5b/ChAdmin" + "http://mu.semte.ch/graphs/organisatieportaal" ], "properties": [ "http://mu.semte.ch/vocabularies/core/uuid", @@ -27,7 +27,7 @@ { "type": "http://data.vlaanderen.be/ns/besluit#Bestuursorgaan", "graphsFilter": [ - "http://mu.semte.ch/graphs/contacthub/141d9d6b-54af-4d17-b313-8d1c30bc3f5b/ChAdmin" + "http://mu.semte.ch/graphs/organisatieportaal" ], "properties": [ "http://mu.semte.ch/vocabularies/core/uuid", @@ -42,7 +42,7 @@ { "type": "http://lblod.data.gift/vocabularies/organisatie/BestuursorgaanClassificatieCode", "graphsFilter": [ - "http://mu.semte.ch/graphs/contacthub/141d9d6b-54af-4d17-b313-8d1c30bc3f5b/ChAdmin" + "http://mu.semte.ch/graphs/organisatieportaal" ], "properties": [ "http://mu.semte.ch/vocabularies/core/uuid", @@ -53,7 +53,7 @@ { "type": "http://www.w3.org/ns/prov#Location", "graphsFilter": [ - "http://mu.semte.ch/graphs/contacthub/141d9d6b-54af-4d17-b313-8d1c30bc3f5b/ChAdmin" + "http://mu.semte.ch/graphs/organisatieportaal" ], "properties": [ "http://mu.semte.ch/vocabularies/core/uuid", diff --git a/docker-compose.yml b/docker-compose.yml index 7eb1ff9..2a1e6ee 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -215,7 +215,7 @@ services: delta-producer-bg-jobs-initiator-administrative-units: image: lblod/delta-producer-background-jobs-initiator:0.3.1 environment: - JOBS_GRAPH: "http://mu.semte.ch/graphs/contacthub/141d9d6b-54af-4d17-b313-8d1c30bc3f5b/ChAdmin" + JOBS_GRAPH: "http://mu.semte.ch/graphs/organisatieportaal" DUMP_FILE_CREATION_JOB_OPERATION: 'http://redpencil.data.gift/id/jobs/concept/JobOperation/deltas/deltaDumpFileCreation/administrative-units' INITIAL_PUBLICATION_GRAPH_SYNC_JOB_OPERATION: 'http://redpencil.data.gift/id/jobs/concept/JobOperation/deltas/initialPublicationGraphSyncing/administrative-units' HEALING_JOB_OPERATION: 'http://redpencil.data.gift/id/jobs/concept/JobOperation/deltas/healingOperation/administrative-units' @@ -232,7 +232,7 @@ services: image: lblod/delta-producer-publication-graph-maintainer:0.7.0 environment: MAX_BODY_SIZE: "50mb" - JOBS_GRAPH: "http://mu.semte.ch/graphs/contacthub/141d9d6b-54af-4d17-b313-8d1c30bc3f5b/ChAdmin" + JOBS_GRAPH: "http://mu.semte.ch/graphs/organisatieportaal" RELATIVE_FILE_PATH: "deltas/administrative-units" PUBLICATION_GRAPH: 'http://redpencil.data.gift/id/deltas/producer/administrative-units' HEALING_JOB_OPERATION: 'http://redpencil.data.gift/id/jobs/concept/JobOperation/deltas/healingOperation/administrative-units' @@ -253,7 +253,7 @@ services: image: lblod/delta-producer-json-diff-file-publisher:0.2.3 environment: MAX_BODY_SIZE: "50mb" - ERROR_GRAPH: "http://mu.semte.ch/graphs/contacthub/141d9d6b-54af-4d17-b313-8d1c30bc3f5b/ChAdmin" + ERROR_GRAPH: "http://mu.semte.ch/graphs/organisatieportaal" RELATIVE_FILE_PATH: "deltas/administrative-units" PUBLISHER_URI: "http://data.lblod.info/services/delta-production-json-diff-file-manager/administrative-units" PUBLICATION_GRAPH: 'http://redpencil.data.gift/id/deltas/producer/administrative-units' @@ -276,7 +276,7 @@ services: delta-producer-bg-jobs-initiator-organizations: image: lblod/delta-producer-background-jobs-initiator:0.3.1 environment: - JOBS_GRAPH: "http://mu.semte.ch/graphs/contacthub/141d9d6b-54af-4d17-b313-8d1c30bc3f5b/ChAdmin" + JOBS_GRAPH: "http://mu.semte.ch/graphs/organisatieportaal" 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' @@ -293,7 +293,7 @@ services: image: lblod/delta-producer-publication-graph-maintainer:0.7.0 environment: MAX_BODY_SIZE: "50mb" - JOBS_GRAPH: "http://mu.semte.ch/graphs/contacthub/141d9d6b-54af-4d17-b313-8d1c30bc3f5b/ChAdmin" + JOBS_GRAPH: "http://mu.semte.ch/graphs/organisatieportaal" RELATIVE_FILE_PATH: "deltas/organizations" PUBLICATION_GRAPH: 'http://redpencil.data.gift/id/deltas/producer/organizations' HEALING_JOB_OPERATION: 'http://redpencil.data.gift/id/jobs/concept/JobOperation/deltas/healingOperation/organizations' @@ -314,7 +314,7 @@ services: image: lblod/delta-producer-json-diff-file-publisher:0.2.3 environment: MAX_BODY_SIZE: "50mb" - ERROR_GRAPH: "http://mu.semte.ch/graphs/contacthub/141d9d6b-54af-4d17-b313-8d1c30bc3f5b/ChAdmin" + ERROR_GRAPH: "http://mu.semte.ch/graphs/organisatieportaal" RELATIVE_FILE_PATH: "deltas/organizations" PUBLISHER_URI: "http://data.lblod.info/services/delta-production-json-diff-file-manager/organizations" PUBLICATION_GRAPH: 'http://redpencil.data.gift/id/deltas/producer/organizations' From 4000c9a50fdb6740ddb0975677b41625754282d5 Mon Sep 17 00:00:00 2001 From: Nordine Bittich Date: Fri, 3 Dec 2021 11:32:03 +0100 Subject: [PATCH 3/5] changing graph --- .../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 460beee..894ab75 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/contacthub/141d9d6b-54af-4d17-b313-8d1c30bc3f5b/ChAdmin" + "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/contacthub/141d9d6b-54af-4d17-b313-8d1c30bc3f5b/ChAdmin" + "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/contacthub/141d9d6b-54af-4d17-b313-8d1c30bc3f5b/ChAdmin" + "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/contacthub/141d9d6b-54af-4d17-b313-8d1c30bc3f5b/ChAdmin" + "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/contacthub/141d9d6b-54af-4d17-b313-8d1c30bc3f5b/ChAdmin" + "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/contacthub/141d9d6b-54af-4d17-b313-8d1c30bc3f5b/ChAdmin" + "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/contacthub/141d9d6b-54af-4d17-b313-8d1c30bc3f5b/ChAdmin" + "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/contacthub/141d9d6b-54af-4d17-b313-8d1c30bc3f5b/ChAdmin" + "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/contacthub/141d9d6b-54af-4d17-b313-8d1c30bc3f5b/ChAdmin" + "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/contacthub/141d9d6b-54af-4d17-b313-8d1c30bc3f5b/ChAdmin" + "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/contacthub/141d9d6b-54af-4d17-b313-8d1c30bc3f5b/ChAdmin" + "http://mu.semte.ch/graphs/organisatieportaal/" ], "properties": [ "http://www.w3.org/2004/02/skos/core#prefLabel", @@ -141,7 +141,7 @@ "type": "http://data.lblod.info/vocabularies/erediensten/CentraalBestuurVanDeEredienst", "strictTypeExport": "true", "graphsFilter": [ - "http://mu.semte.ch/graphs/contacthub/141d9d6b-54af-4d17-b313-8d1c30bc3f5b/ChAdmin" + "http://mu.semte.ch/graphs/organisatieportaal/" ], "properties": [ "http://www.w3.org/2004/02/skos/core#prefLabel", @@ -164,7 +164,7 @@ "type": "http://data.lblod.info/vocabularies/erediensten/RepresentatiefOrgaan", "strictTypeExport": "true", "graphsFilter": [ - "http://mu.semte.ch/graphs/contacthub/141d9d6b-54af-4d17-b313-8d1c30bc3f5b/ChAdmin" + "http://mu.semte.ch/graphs/organisatieportaal/" ], "properties": [ "http://www.w3.org/2004/02/skos/core#prefLabel", @@ -185,7 +185,7 @@ "type": "http://data.vlaanderen.be/ns/besluit#Bestuursorgaan", "strictTypeExport": "true", "graphsFilter": [ - "http://mu.semte.ch/graphs/contacthub/141d9d6b-54af-4d17-b313-8d1c30bc3f5b/ChAdmin" + "http://mu.semte.ch/graphs/organisatieportaal/" ], "properties": [ "http://data.vlaanderen.be/ns/mandaat#bindingEinde", @@ -199,7 +199,7 @@ { "type": "http://lblod.data.gift/vocabularies/organisatie/BestuursorgaanClassificatieCode", "graphsFilter": [ - "http://mu.semte.ch/graphs/contacthub/141d9d6b-54af-4d17-b313-8d1c30bc3f5b/ChAdmin" + "http://mu.semte.ch/graphs/organisatieportaal/" ], "properties": [ "http://www.w3.org/2004/02/skos/core#prefLabel" @@ -208,7 +208,7 @@ { "type": "http://data.lblod.info/vocabularies/erediensten/BetrokkenLokaleBesturen", "graphsFilter": [ - "http://mu.semte.ch/graphs/contacthub/141d9d6b-54af-4d17-b313-8d1c30bc3f5b/ChAdmin" + "http://mu.semte.ch/graphs/organisatieportaal/" ], "properties": [ "http://data.lblod.info/vocabularies/erediensten/financieringspercentage", @@ -219,7 +219,7 @@ { "type": "http://www.w3.org/ns/adms#Identifier", "graphsFilter": [ - "http://mu.semte.ch/graphs/contacthub/141d9d6b-54af-4d17-b313-8d1c30bc3f5b/ChAdmin" + "http://mu.semte.ch/graphs/organisatieportaal/" ], "properties": [ "http://www.w3.org/2004/02/skos/core#notation", @@ -229,7 +229,7 @@ { "type": "https://data.vlaanderen.be/ns/generiek#GestructureerdeIdentificator", "graphsFilter": [ - "http://mu.semte.ch/graphs/contacthub/141d9d6b-54af-4d17-b313-8d1c30bc3f5b/ChAdmin" + "http://mu.semte.ch/graphs/organisatieportaal/" ], "properties": [ "https://data.vlaanderen.be/ns/generiek#lokaleIdentificator" @@ -238,7 +238,7 @@ { "type": "http://www.w3.org/ns/locn#Address", "graphsFilter": [ - "http://mu.semte.ch/graphs/contacthub/141d9d6b-54af-4d17-b313-8d1c30bc3f5b/ChAdmin" + "http://mu.semte.ch/graphs/organisatieportaal/" ], "properties": [ "https://data.vlaanderen.be/ns/adres#Adresvoorstelling.huisnummer", @@ -256,7 +256,7 @@ { "type": "http://www.w3.org/ns/org#Site", "graphsFilter": [ - "http://mu.semte.ch/graphs/contacthub/141d9d6b-54af-4d17-b313-8d1c30bc3f5b/ChAdmin" + "http://mu.semte.ch/graphs/organisatieportaal/" ], "properties": [ "http://www.w3.org/ns/org#siteAddress", @@ -267,7 +267,7 @@ { "type": "http://www.w3.org/ns/org#ChangeEvent", "graphsFilter": [ - "http://mu.semte.ch/graphs/contacthub/141d9d6b-54af-4d17-b313-8d1c30bc3f5b/ChAdmin" + "http://mu.semte.ch/graphs/organisatieportaal/" ], "properties": [ "http://purl.org/dc/terms/date", @@ -280,7 +280,7 @@ { "type": "http://lblod.data.gift/vocabularies/organisatie/Veranderingsgebeurtenis", "graphsFilter": [ - "http://mu.semte.ch/graphs/contacthub/141d9d6b-54af-4d17-b313-8d1c30bc3f5b/ChAdmin" + "http://mu.semte.ch/graphs/organisatieportaal/" ], "properties": [ "http://www.w3.org/2004/02/skos/core#prefLabel" @@ -289,7 +289,7 @@ { "type": "http://www.w3.org/2004/02/skos/core#Concept", "graphsFilter": [ - "http://mu.semte.ch/graphs/contacthub/141d9d6b-54af-4d17-b313-8d1c30bc3f5b/ChAdmin" + "http://mu.semte.ch/graphs/organisatieportaal/" ], "properties": [ "http://www.w3.org/2004/02/skos/core#prefLabel" @@ -298,7 +298,7 @@ { "type": "http://lblod.data.gift/vocabularies/organisatie/OrganisatieStatusCode", "graphsFilter": [ - "http://mu.semte.ch/graphs/contacthub/141d9d6b-54af-4d17-b313-8d1c30bc3f5b/ChAdmin" + "http://mu.semte.ch/graphs/organisatieportaal/" ], "properties": [ "http://www.w3.org/2004/02/skos/core#prefLabel" @@ -307,7 +307,7 @@ { "type": "http://www.w3.org/ns/prov#Location", "graphsFilter": [ - "http://mu.semte.ch/graphs/contacthub/141d9d6b-54af-4d17-b313-8d1c30bc3f5b/ChAdmin" + "http://mu.semte.ch/graphs/organisatieportaal/" ], "properties": [ "http://www.w3.org/2000/01/rdf-schema#label", @@ -318,7 +318,7 @@ { "type": "http://lblod.data.gift/vocabularies/organisatie/TypeBetrokkenheid", "graphsFilter": [ - "http://mu.semte.ch/graphs/contacthub/141d9d6b-54af-4d17-b313-8d1c30bc3f5b/ChAdmin" + "http://mu.semte.ch/graphs/organisatieportaal/" ], "properties": [ "http://www.w3.org/2004/02/skos/core#prefLabel" @@ -327,7 +327,7 @@ { "type": "http://data.lblod.info/vocabularies/erediensten/RolBedienaar", "graphsFilter": [ - "http://mu.semte.ch/graphs/contacthub/141d9d6b-54af-4d17-b313-8d1c30bc3f5b/ChAdmin" + "http://mu.semte.ch/graphs/organisatieportaal/" ], "properties": [ "http://data.lblod.info/vocabularies/contacthub/startdatum", @@ -342,7 +342,7 @@ { "type": "http://data.lblod.info/vocabularies/erediensten/VoorwaardenBedienaar", "graphsFilter": [ - "http://mu.semte.ch/graphs/contacthub/141d9d6b-54af-4d17-b313-8d1c30bc3f5b/ChAdmin" + "http://mu.semte.ch/graphs/organisatieportaal/" ], "properties": [ "http://data.lblod.info/vocabularies/erediensten/voldaan", @@ -352,7 +352,7 @@ },{ "type": "http://publications.europa.eu/ontology/euvoc#Country", "graphsFilter": [ - "http://mu.semte.ch/graphs/contacthub/141d9d6b-54af-4d17-b313-8d1c30bc3f5b/ChAdmin" + "http://mu.semte.ch/graphs/organisatieportaal/" ], "properties": [ "http://www.w3.org/2004/02/skos/core#prefLabel", @@ -361,7 +361,7 @@ },{ "type": "http://data.lblod.info/vocabularies/erediensten/PositieBedienaar", "graphsFilter": [ - "http://mu.semte.ch/graphs/contacthub/141d9d6b-54af-4d17-b313-8d1c30bc3f5b/ChAdmin" + "http://mu.semte.ch/graphs/organisatieportaal/" ], "properties": [ "http://www.w3.org/ns/org#role", @@ -373,7 +373,7 @@ { "type": "http://lblod.data.gift/vocabularies/organisatie/EredienstBeroepen", "graphsFilter": [ - "http://mu.semte.ch/graphs/contacthub/141d9d6b-54af-4d17-b313-8d1c30bc3f5b/ChAdmin" + "http://mu.semte.ch/graphs/organisatieportaal/" ], "properties": [ "http://www.w3.org/2004/02/skos/core#prefLabel" @@ -382,7 +382,7 @@ { "type": "http://lblod.data.gift/vocabularies/organisatie/BedienaarFinanceringCode", "graphsFilter": [ - "http://mu.semte.ch/graphs/contacthub/141d9d6b-54af-4d17-b313-8d1c30bc3f5b/ChAdmin" + "http://mu.semte.ch/graphs/organisatieportaal/" ], "properties": [ "http://www.w3.org/2004/02/skos/core#prefLabel" @@ -391,7 +391,7 @@ { "type": "http://lblod.data.gift/vocabularies/organisatie/VoorwaardenBedienaarCriterium", "graphsFilter": [ - "http://mu.semte.ch/graphs/contacthub/141d9d6b-54af-4d17-b313-8d1c30bc3f5b/ChAdmin" + "http://mu.semte.ch/graphs/organisatieportaal/" ], "properties": [ "http://www.w3.org/2004/02/skos/core#prefLabel" @@ -400,7 +400,7 @@ { "type": "http://lblod.data.gift/vocabularies/organisatie/BedienaarCriteriumBewijsstuk", "graphsFilter": [ - "http://mu.semte.ch/graphs/contacthub/141d9d6b-54af-4d17-b313-8d1c30bc3f5b/ChAdmin" + "http://mu.semte.ch/graphs/organisatieportaal/" ], "properties": [ "http://www.w3.org/2004/02/skos/core#prefLabel" @@ -409,7 +409,7 @@ { "type": "http://lblod.data.gift/vocabularies/organisatie/TypeVestiging", "graphsFilter": [ - "http://mu.semte.ch/graphs/contacthub/141d9d6b-54af-4d17-b313-8d1c30bc3f5b/ChAdmin" + "http://mu.semte.ch/graphs/organisatieportaal/" ], "properties": [ "http://www.w3.org/2004/02/skos/core#prefLabel" From 9a74e1e1ba98cfadef4e10073fcc329f498c4194 Mon Sep 17 00:00:00 2001 From: Nordine Bittich Date: Fri, 3 Dec 2021 14:21:23 +0100 Subject: [PATCH 4/5] bugfix --- ...1511111121112333225-clear-mock-data.sparql | 3 +++ ...1511111121112333225-mock-user-roles.sparql | 24 +++++++------------ 2 files changed, 11 insertions(+), 16 deletions(-) create mode 100644 config/migrations/2022212411511111121112333225-clear-mock-data.sparql diff --git a/config/migrations/2022212411511111121112333225-clear-mock-data.sparql b/config/migrations/2022212411511111121112333225-clear-mock-data.sparql new file mode 100644 index 0000000..e020b95 --- /dev/null +++ b/config/migrations/2022212411511111121112333225-clear-mock-data.sparql @@ -0,0 +1,3 @@ + +CLEAR GRAPH ; +CLEAR GRAPH ; \ No newline at end of file diff --git a/config/migrations/2022212411511111121112333225-mock-user-roles.sparql b/config/migrations/2022212411511111121112333225-mock-user-roles.sparql index fb3a265..ac66fb8 100644 --- a/config/migrations/2022212411511111121112333225-mock-user-roles.sparql +++ b/config/migrations/2022212411511111121112333225-mock-user-roles.sparql @@ -4,11 +4,7 @@ PREFIX dcterms: PREFIX besluit: PREFIX foaf: PREFIX ext: - DELETE { - GRAPH { - ?s ?p ?o - } - } INSERT { + INSERT DATA { GRAPH { a besluit:Bestuurseenheid ; mu:uuid "141d9d6b-54af-4d17-b313-8d1c30bc3f5b" ; @@ -20,9 +16,9 @@ PREFIX ext: foaf:firstName "Josephine" ; foaf:familyName "Lezer" ; foaf:member ; - foaf:account . - a foaf:OnlineAccount ; - mu:uuid "3a91ff60-07c1-4136-ac5e-55cf401e0956" ; + foaf:account . + a foaf:OnlineAccount ; + mu:uuid "3a91ff60-07c1-4136-ac5e-55cf401e0989" ; foaf:accountServiceHomepage ; ext:sessionRole "ABBOrganisatiePortaalGebruiker-lezer". @@ -56,9 +52,9 @@ PREFIX ext: foaf:firstName "Josephine" ; foaf:familyName "Lezer" ; foaf:member ; - foaf:account . - a foaf:OnlineAccount ; - mu:uuid "3a91ff60-07c1-4136-ac5e-55cf401e0956" ; + foaf:account . + a foaf:OnlineAccount ; + mu:uuid "3a91ff60-07c1-4136-ac5e-55cf401e0989" ; foaf:accountServiceHomepage ; ext:sessionRole "ABBOrganisatiePortaalGebruiker-lezer". @@ -84,8 +80,4 @@ PREFIX ext: foaf:accountServiceHomepage ; ext:sessionRole "ABBOrganisatiePortaalGebruiker-beheerder". } - } WHERE { - GRAPH { - ?s ?p ?o - } - } \ No newline at end of file + } \ No newline at end of file From a47c9c384d8ab2de584ee4b21e8d9c9f41a9b7c9 Mon Sep 17 00:00:00 2001 From: Nordine Bittich Date: Mon, 6 Dec 2021 10:54:17 +0100 Subject: [PATCH 5/5] order migrations --- ...sparql => 2022212411511111121112333226-mock-user-roles.sparql} | 0 ...raph.sparql => 2022212411511111121112333227-move-graph.sparql} | 0 2 files changed, 0 insertions(+), 0 deletions(-) rename config/migrations/{2022212411511111121112333225-mock-user-roles.sparql => 2022212411511111121112333226-mock-user-roles.sparql} (100%) rename config/migrations/{2022212411511111121112333226-move-graph.sparql => 2022212411511111121112333227-move-graph.sparql} (100%) diff --git a/config/migrations/2022212411511111121112333225-mock-user-roles.sparql b/config/migrations/2022212411511111121112333226-mock-user-roles.sparql similarity index 100% rename from config/migrations/2022212411511111121112333225-mock-user-roles.sparql rename to config/migrations/2022212411511111121112333226-mock-user-roles.sparql diff --git a/config/migrations/2022212411511111121112333226-move-graph.sparql b/config/migrations/2022212411511111121112333227-move-graph.sparql similarity index 100% rename from config/migrations/2022212411511111121112333226-move-graph.sparql rename to config/migrations/2022212411511111121112333227-move-graph.sparql