From 0bcfc6a63a0b3208c92386c8de7eaabe0bcfdddc Mon Sep 17 00:00:00 2001 From: mirdono Date: Wed, 29 Nov 2023 15:51:29 +0100 Subject: [PATCH 01/17] Migrations to add new classification codes for - Autonome verzorgingsinstelling - Ziekenhuisvereniging - Vereniging of vennootschap voor sociale dienstverlening - Woonzorgvereniging of woonzorgvennootschap --- ...9134823-autonome-verzorginginstelling.sparql | 17 +++++++++++++++++ .../20231129143736-ziekenhuisvereniging.sparql | 17 +++++++++++++++++ ...ootschap-voor-sociale-dienstverlening.sparql | 17 +++++++++++++++++ ...orgvereniging-of-woonzorgvennootschap.sparql | 17 +++++++++++++++++ 4 files changed, 68 insertions(+) create mode 100644 config/migrations/2023/20231129134822-onboarding-ocmw-verenigingen/20231129134823-autonome-verzorginginstelling.sparql create mode 100644 config/migrations/2023/20231129134822-onboarding-ocmw-verenigingen/20231129143736-ziekenhuisvereniging.sparql create mode 100644 config/migrations/2023/20231129134822-onboarding-ocmw-verenigingen/20231129144255-vereniging-of-vennootschap-voor-sociale-dienstverlening.sparql create mode 100644 config/migrations/2023/20231129134822-onboarding-ocmw-verenigingen/20231129144514-woonzorgvereniging-of-woonzorgvennootschap.sparql diff --git a/config/migrations/2023/20231129134822-onboarding-ocmw-verenigingen/20231129134823-autonome-verzorginginstelling.sparql b/config/migrations/2023/20231129134822-onboarding-ocmw-verenigingen/20231129134823-autonome-verzorginginstelling.sparql new file mode 100644 index 0000000..15cab74 --- /dev/null +++ b/config/migrations/2023/20231129134822-onboarding-ocmw-verenigingen/20231129134823-autonome-verzorginginstelling.sparql @@ -0,0 +1,17 @@ +PREFIX skos: +PREFIX core: +PREFIX scheme: +PREFIX code: +PREFIX ext: +PREFIX concept: + +INSERT DATA { + GRAPH { + concept:34b5af85-dc9f-468f-9e03-ef89b174c267 a code:BestuurseenheidClassificatieCode ; + a ext:OrganizationClassificationCode ; + core:uuid "34b5af85-dc9f-468f-9e03-ef89b174c267" ; + skos:prefLabel "Autonome verzorgingsinstelling" ; + skos:inScheme scheme:BestuurseenheidClassificatieCode ; + skos:topConceptOf scheme:BestuurseenheidClassificatieCode . + } +} diff --git a/config/migrations/2023/20231129134822-onboarding-ocmw-verenigingen/20231129143736-ziekenhuisvereniging.sparql b/config/migrations/2023/20231129134822-onboarding-ocmw-verenigingen/20231129143736-ziekenhuisvereniging.sparql new file mode 100644 index 0000000..144887c --- /dev/null +++ b/config/migrations/2023/20231129134822-onboarding-ocmw-verenigingen/20231129143736-ziekenhuisvereniging.sparql @@ -0,0 +1,17 @@ +PREFIX skos: +PREFIX core: +PREFIX scheme: +PREFIX code: +PREFIX ext: +PREFIX concept: + +INSERT DATA { + GRAPH { + concept:82250452-83a0-48f4-89cc-b430320493ce a code:BestuurseenheidClassificatieCode ; + a ext:OrganizationClassificationCode ; + core:uuid "82250452-83a0-48f4-89cc-b430320493ce" ; + skos:prefLabel "Ziekenhuisvereniging" ; + skos:inScheme scheme:BestuurseenheidClassificatieCode ; + skos:topConceptOf scheme:BestuurseenheidClassificatieCode . + } +} diff --git a/config/migrations/2023/20231129134822-onboarding-ocmw-verenigingen/20231129144255-vereniging-of-vennootschap-voor-sociale-dienstverlening.sparql b/config/migrations/2023/20231129134822-onboarding-ocmw-verenigingen/20231129144255-vereniging-of-vennootschap-voor-sociale-dienstverlening.sparql new file mode 100644 index 0000000..512a7c8 --- /dev/null +++ b/config/migrations/2023/20231129134822-onboarding-ocmw-verenigingen/20231129144255-vereniging-of-vennootschap-voor-sociale-dienstverlening.sparql @@ -0,0 +1,17 @@ +PREFIX skos: +PREFIX core: +PREFIX scheme: +PREFIX code: +PREFIX ext: +PREFIX concept: + +INSERT DATA { + GRAPH { + concept:35833ba2-7371-400b-8df2-2912f66fb153 a code:BestuurseenheidClassificatieCode ; + a ext:OrganizationClassificationCode ; + core:uuid "35833ba2-7371-400b-8df2-2912f66fb153" ; + skos:prefLabel "Vereniging of vennootschap voor sociale dienstverlening" ; + skos:inScheme scheme:BestuurseenheidClassificatieCode ; + skos:topConceptOf scheme:BestuurseenheidClassificatieCode . + } +} diff --git a/config/migrations/2023/20231129134822-onboarding-ocmw-verenigingen/20231129144514-woonzorgvereniging-of-woonzorgvennootschap.sparql b/config/migrations/2023/20231129134822-onboarding-ocmw-verenigingen/20231129144514-woonzorgvereniging-of-woonzorgvennootschap.sparql new file mode 100644 index 0000000..740477f --- /dev/null +++ b/config/migrations/2023/20231129134822-onboarding-ocmw-verenigingen/20231129144514-woonzorgvereniging-of-woonzorgvennootschap.sparql @@ -0,0 +1,17 @@ +PREFIX skos: +PREFIX core: +PREFIX scheme: +PREFIX code: +PREFIX ext: +PREFIX concept: + +INSERT DATA { + GRAPH { + concept:82fd21dc-e8bb-4d13-a010-f4a12358ef10 a code:BestuurseenheidClassificatieCode ; + a ext:OrganizationClassificationCode ; + core:uuid "82fd21dc-e8bb-4d13-a010-f4a12358ef10" ; + skos:prefLabel "Woonzorgvereniging of woonzorgvennootschap" ; + skos:inScheme scheme:BestuurseenheidClassificatieCode ; + skos:topConceptOf scheme:BestuurseenheidClassificatieCode . + } +} From 13a9b599a5ea9965e753f9c0aac7e0005d887c5f Mon Sep 17 00:00:00 2001 From: mirdono Date: Tue, 5 Dec 2023 10:31:42 +0100 Subject: [PATCH 02/17] Formatted authorisation configuration --- config/authorization/config.ex | 157 ++++++++++++++++----------------- 1 file changed, 78 insertions(+), 79 deletions(-) diff --git a/config/authorization/config.ex b/config/authorization/config.ex index f6fa2de..1ba31c2 100644 --- a/config/authorization/config.ex +++ b/config/authorization/config.ex @@ -7,92 +7,92 @@ alias Acl.GroupSpec, as: GroupSpec alias Acl.GroupSpec.GraphCleanup, as: GraphCleanup defmodule Acl.UserGroups.Config do - @error_type [ "https://docs.oasis-open-projects.org/oslc-op/core/v3.0/os/core-vocab.html#Error" ] @worship_type [ - "http://data.lblod.info/vocabularies/erediensten/EredienstMandataris", - "http://data.lblod.info/vocabularies/erediensten/BestuurVanDeEredienst", - "http://data.lblod.info/vocabularies/erediensten/EredienstBestuurseenheid", - "http://data.lblod.info/vocabularies/erediensten/RolBedienaar", - "http://data.lblod.info/vocabularies/erediensten/VoorwaardenBedienaar", - "http://data.lblod.info/vocabularies/erediensten/PositieBedienaar", - "http://data.lblod.info/vocabularies/erediensten/BetrokkenLokaleBesturen", - "http://data.lblod.info/vocabularies/erediensten/VerbondenJuridischeStructuren", - "http://data.lblod.info/vocabularies/erediensten/CentraalBestuurVanDeEredienst", - "http://data.lblod.info/vocabularies/erediensten/RepresentatiefOrgaan", + "http://data.lblod.info/vocabularies/erediensten/EredienstMandataris", + "http://data.lblod.info/vocabularies/erediensten/BestuurVanDeEredienst", + "http://data.lblod.info/vocabularies/erediensten/EredienstBestuurseenheid", + "http://data.lblod.info/vocabularies/erediensten/RolBedienaar", + "http://data.lblod.info/vocabularies/erediensten/VoorwaardenBedienaar", + "http://data.lblod.info/vocabularies/erediensten/PositieBedienaar", + "http://data.lblod.info/vocabularies/erediensten/BetrokkenLokaleBesturen", + "http://data.lblod.info/vocabularies/erediensten/VerbondenJuridischeStructuren", + "http://data.lblod.info/vocabularies/erediensten/CentraalBestuurVanDeEredienst", + "http://data.lblod.info/vocabularies/erediensten/RepresentatiefOrgaan" ] @public_type [ - "http://www.w3.org/ns/org#Role", - "http://data.vlaanderen.be/ns/besluit#Bestuurseenheid", - "http://xmlns.com/foaf/0.1/Person", - "http://xmlns.com/foaf/0.1/OnlineAccount", - "http://www.semanticdesktop.org/ontologies/2007/03/22/nfo#FileDataObject", - "http://www.w3.org/ns/dcat#Dataset", - "http://www.w3.org/ns/dcat#Distribution", - "http://www.w3.org/ns/dcat#Catalog", - "http://mu.semte.ch/vocabularies/ext/GeslachtCode", - "http://data.lblod.info/vocabularies/leidinggevenden/FunctionarisStatusCode", - "http://lblod.data.gift/vocabularies/organisatie/OrganisatieStatusCode", - "http://lblod.data.gift/vocabularies/organisatie/BestuursfunctieCode", - "http://lblod.data.gift/vocabularies/organisatie/BestuursorgaanClassificatieCode", - "http://lblod.data.gift/vocabularies/organisatie/MandatarisStatusCode", - "http://lblod.data.gift/vocabularies/organisatie/BestuurseenheidClassificatieCode", - "http://lblod.data.gift/vocabularies/organisatie/TypeEredienst", - "http://www.w3.org/2004/02/skos/core#ConceptScheme", - "http://lblod.data.gift/vocabularies/organisatie/BedienaarFinancieringCode", - "http://www.w3.org/2004/02/skos/core#Concept", - "http://publications.europa.eu/ontology/euvoc#Country", - "http://lblod.data.gift/vocabularies/organisatie/TypeVestiging", - "http://lblod.data.gift/vocabularies/organisatie/HelftVerkiezing", - "http://lblod.data.gift/vocabularies/organisatie/Veranderingsgebeurtenis", - "http://lblod.data.gift/vocabularies/organisatie/TypeBetrokkenheid", - "http://lblod.data.gift/vocabularies/organisatie/VoorwaardenBedienaarCriterium", - "http://lblod.data.gift/vocabularies/organisatie/BedienaarCriteriumBewijsstuk", - "http://lblod.data.gift/vocabularies/organisatie/EredienstBeroepen", - "http://lblod.data.gift/vocabularies/organisatie/Rechtsvormtype" + "http://www.w3.org/ns/org#Role", + "http://data.vlaanderen.be/ns/besluit#Bestuurseenheid", + "http://xmlns.com/foaf/0.1/Person", + "http://xmlns.com/foaf/0.1/OnlineAccount", + "http://www.semanticdesktop.org/ontologies/2007/03/22/nfo#FileDataObject", + "http://www.w3.org/ns/dcat#Dataset", + "http://www.w3.org/ns/dcat#Distribution", + "http://www.w3.org/ns/dcat#Catalog", + "http://mu.semte.ch/vocabularies/ext/GeslachtCode", + "http://data.lblod.info/vocabularies/leidinggevenden/FunctionarisStatusCode", + "http://lblod.data.gift/vocabularies/organisatie/OrganisatieStatusCode", + "http://lblod.data.gift/vocabularies/organisatie/BestuursfunctieCode", + "http://lblod.data.gift/vocabularies/organisatie/BestuursorgaanClassificatieCode", + "http://lblod.data.gift/vocabularies/organisatie/MandatarisStatusCode", + "http://lblod.data.gift/vocabularies/organisatie/BestuurseenheidClassificatieCode", + "http://lblod.data.gift/vocabularies/organisatie/TypeEredienst", + "http://www.w3.org/2004/02/skos/core#ConceptScheme", + "http://lblod.data.gift/vocabularies/organisatie/BedienaarFinancieringCode", + "http://www.w3.org/2004/02/skos/core#Concept", + "http://publications.europa.eu/ontology/euvoc#Country", + "http://lblod.data.gift/vocabularies/organisatie/TypeVestiging", + "http://lblod.data.gift/vocabularies/organisatie/HelftVerkiezing", + "http://lblod.data.gift/vocabularies/organisatie/Veranderingsgebeurtenis", + "http://lblod.data.gift/vocabularies/organisatie/TypeBetrokkenheid", + "http://lblod.data.gift/vocabularies/organisatie/VoorwaardenBedienaarCriterium", + "http://lblod.data.gift/vocabularies/organisatie/BedienaarCriteriumBewijsstuk", + "http://lblod.data.gift/vocabularies/organisatie/EredienstBeroepen", + "http://lblod.data.gift/vocabularies/organisatie/Rechtsvormtype" ] @org_type [ - "http://purl.org/dc/terms/Agent", - "http://www.w3.org/ns/org#Organization", - "http://data.vlaanderen.be/ns/besluit#Besluit", - "https://data.vlaanderen.be/ns/besluitvorming#Beslissingsactiviteit", - "http://www.w3.org/ns/org#Site", - "http://www.w3.org/ns/locn#Address", - "http://www.w3.org/ns/person#Person", - "http://schema.org/ContactPoint", - "http://data.vlaanderen.be/ns/besluit#Bestuurseenheid", - "http://data.vlaanderen.be/ns/besluit#Bestuursorgaan", - "http://www.w3.org/ns/adms#Identifier", - "https://data.vlaanderen.be/ns/generiek#GestructureerdeIdentificator", - "http://data.vlaanderen.be/ns/mandaat#Mandaat", - "http://data.vlaanderen.be/ns/mandaat#Mandataris", - "http://data.lblod.info/vocabularies/leidinggevenden/Functionaris", - "http://data.lblod.info/vocabularies/leidinggevenden/Bestuursfunctie", - "http://lblod.data.gift/vocabularies/organisatie/VeranderingsgebeurtenisResultaat", - "http://www.w3.org/ns/org#Post", - "http://www.w3.org/ns/org#ChangeEvent", - "http://data.lblod.info/vocabularies/contacthub/AgentInPositie" + "http://purl.org/dc/terms/Agent", + "http://www.w3.org/ns/org#Organization", + "http://data.vlaanderen.be/ns/besluit#Besluit", + "https://data.vlaanderen.be/ns/besluitvorming#Beslissingsactiviteit", + "http://www.w3.org/ns/org#Site", + "http://www.w3.org/ns/locn#Address", + "http://www.w3.org/ns/person#Person", + "http://schema.org/ContactPoint", + "http://data.vlaanderen.be/ns/besluit#Bestuurseenheid", + "http://data.vlaanderen.be/ns/besluit#Bestuursorgaan", + "http://www.w3.org/ns/adms#Identifier", + "https://data.vlaanderen.be/ns/generiek#GestructureerdeIdentificator", + "http://data.vlaanderen.be/ns/mandaat#Mandaat", + "http://data.vlaanderen.be/ns/mandaat#Mandataris", + "http://data.lblod.info/vocabularies/leidinggevenden/Functionaris", + "http://data.lblod.info/vocabularies/leidinggevenden/Bestuursfunctie", + "http://lblod.data.gift/vocabularies/organisatie/VeranderingsgebeurtenisResultaat", + "http://www.w3.org/ns/org#Post", + "http://www.w3.org/ns/org#ChangeEvent", + "http://data.lblod.info/vocabularies/contacthub/AgentInPositie" ] @shared_protected_type [ - "http://www.w3.org/ns/prov#Location", - "http://xmlns.com/foaf/0.1/Image", - "http://www.semanticdesktop.org/ontologies/2007/03/22/nfo#FileDataObject" + "http://www.w3.org/ns/prov#Location", + "http://xmlns.com/foaf/0.1/Image", + "http://www.semanticdesktop.org/ontologies/2007/03/22/nfo#FileDataObject" ] - defp access_by_role( group_string ) do + defp access_by_role(group_string) do %AccessByQuery{ -# vars: ["session_group","session_role"], todo we might have to create multiple graph depending on 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 ) } + query: sparql_query_for_access_role(group_string) + } end - defp sparql_query_for_access_role( group_string ) do + defp sparql_query_for_access_role(group_string) do "PREFIX ext: PREFIX mu: SELECT distinct ?session_group ?session_role WHERE { @@ -104,11 +104,10 @@ defmodule Acl.UserGroups.Config do def user_groups do [ - %GroupSpec{ name: "acmidm-lezer", useage: [:read], - access: access_by_role( "ABBOrganisatiePortaalGebruiker-lezer" ), + access: access_by_role("ABBOrganisatiePortaalGebruiker-lezer"), graphs: [ %GraphSpec{ graph: "http://mu.semte.ch/graphs/administrative-unit", @@ -121,7 +120,7 @@ defmodule Acl.UserGroups.Config do %GroupSpec{ name: "acmidm-editeerder", useage: [:read, :write, :read_for_write], - access: access_by_role( "ABBOrganisatiePortaalGebruiker-editeerder" ), + access: access_by_role("ABBOrganisatiePortaalGebruiker-editeerder"), graphs: [ %GraphSpec{ graph: "http://mu.semte.ch/graphs/administrative-unit", @@ -134,7 +133,7 @@ defmodule Acl.UserGroups.Config do %GroupSpec{ name: "acmidm-beheerder", useage: [:read, :write, :read_for_write], - access: access_by_role( "ABBOrganisatiePortaalGebruiker-beheerder" ), + access: access_by_role("ABBOrganisatiePortaalGebruiker-beheerder"), graphs: [ %GraphSpec{ graph: "http://mu.semte.ch/graphs/administrative-unit", @@ -147,7 +146,7 @@ defmodule Acl.UserGroups.Config do %GroupSpec{ name: "acmidm-worship-lezer", useage: [:read], - access: access_by_role( "ABBOrganisatiePortaalErediensten-lezer" ), + access: access_by_role("ABBOrganisatiePortaalErediensten-lezer"), graphs: [ %GraphSpec{ graph: "http://mu.semte.ch/graphs/worship-service", @@ -160,7 +159,7 @@ defmodule Acl.UserGroups.Config do %GroupSpec{ name: "acmidm-worship-editeerder", useage: [:read, :write, :read_for_write], - access: access_by_role( "ABBOrganisatiePortaalErediensten-editeerder" ), + access: access_by_role("ABBOrganisatiePortaalErediensten-editeerder"), graphs: [ %GraphSpec{ graph: "http://mu.semte.ch/graphs/worship-service", @@ -173,7 +172,7 @@ defmodule Acl.UserGroups.Config do %GroupSpec{ name: "acmidm-worship-beheerder", useage: [:read, :write, :read_for_write], - access: access_by_role( "ABBOrganisatiePortaalErediensten-beheerder" ), + access: access_by_role("ABBOrganisatiePortaalErediensten-beheerder"), graphs: [ %GraphSpec{ graph: "http://mu.semte.ch/graphs/worship-service", @@ -189,10 +188,10 @@ defmodule Acl.UserGroups.Config do access: %AlwaysAccessible{}, graphs: [ %GraphSpec{ - graph: "http://mu.semte.ch/graphs/public", - constraint: %ResourceConstraint{ - resource_types: @public_type - } + graph: "http://mu.semte.ch/graphs/public", + constraint: %ResourceConstraint{ + resource_types: @public_type + } }, %GraphSpec{ graph: "http://mu.semte.ch/graphs/shared", @@ -200,8 +199,8 @@ defmodule Acl.UserGroups.Config do resource_types: @shared_protected_type ++ @org_type } } - - ]}, + ] + }, # // CLEANUP # From b49f0ffd3feb62ede61472552f8d2d9026e3dcd6 Mon Sep 17 00:00:00 2001 From: mirdono Date: Wed, 6 Dec 2023 16:31:41 +0100 Subject: [PATCH 03/17] Corrected migrations for non-administrative unit OCMW vereniging organisations --- ....sparql => 20231204120700-ziekenhuisvereniging.sparql} | 8 ++++---- ...900-woonzorgvereniging-of-woonzorgvennootschap.sparql} | 8 ++++---- ...g-of-vennootschap-voor-sociale-dienstverlening.sparql} | 8 ++++---- 3 files changed, 12 insertions(+), 12 deletions(-) rename config/migrations/2023/20231129134822-onboarding-ocmw-verenigingen/{20231129143736-ziekenhuisvereniging.sparql => 20231204120700-ziekenhuisvereniging.sparql} (58%) rename config/migrations/2023/20231129134822-onboarding-ocmw-verenigingen/{20231129144514-woonzorgvereniging-of-woonzorgvennootschap.sparql => 20231204120900-woonzorgvereniging-of-woonzorgvennootschap.sparql} (59%) rename config/migrations/2023/20231129134822-onboarding-ocmw-verenigingen/{20231129144255-vereniging-of-vennootschap-voor-sociale-dienstverlening.sparql => 20231204121000-vereniging-of-vennootschap-voor-sociale-dienstverlening.sparql} (60%) diff --git a/config/migrations/2023/20231129134822-onboarding-ocmw-verenigingen/20231129143736-ziekenhuisvereniging.sparql b/config/migrations/2023/20231129134822-onboarding-ocmw-verenigingen/20231204120700-ziekenhuisvereniging.sparql similarity index 58% rename from config/migrations/2023/20231129134822-onboarding-ocmw-verenigingen/20231129143736-ziekenhuisvereniging.sparql rename to config/migrations/2023/20231129134822-onboarding-ocmw-verenigingen/20231204120700-ziekenhuisvereniging.sparql index 144887c..1a07c8f 100644 --- a/config/migrations/2023/20231129134822-onboarding-ocmw-verenigingen/20231129143736-ziekenhuisvereniging.sparql +++ b/config/migrations/2023/20231129134822-onboarding-ocmw-verenigingen/20231204120700-ziekenhuisvereniging.sparql @@ -3,15 +3,15 @@ PREFIX core: PREFIX scheme: PREFIX code: PREFIX ext: -PREFIX concept: +PREFIX concept: INSERT DATA { GRAPH { - concept:82250452-83a0-48f4-89cc-b430320493ce a code:BestuurseenheidClassificatieCode ; + concept:82250452-83a0-48f4-89cc-b430320493ce a ext:GeregistreerdeOrganisatieClassificatieCode ; a ext:OrganizationClassificationCode ; core:uuid "82250452-83a0-48f4-89cc-b430320493ce" ; skos:prefLabel "Ziekenhuisvereniging" ; - skos:inScheme scheme:BestuurseenheidClassificatieCode ; - skos:topConceptOf scheme:BestuurseenheidClassificatieCode . + skos:inScheme scheme:GeregistreerdeOrganisatieClassificatieCode ; + skos:topConceptOf scheme:GeregistreerdeOrganisatieClassificatieCode . } } diff --git a/config/migrations/2023/20231129134822-onboarding-ocmw-verenigingen/20231129144514-woonzorgvereniging-of-woonzorgvennootschap.sparql b/config/migrations/2023/20231129134822-onboarding-ocmw-verenigingen/20231204120900-woonzorgvereniging-of-woonzorgvennootschap.sparql similarity index 59% rename from config/migrations/2023/20231129134822-onboarding-ocmw-verenigingen/20231129144514-woonzorgvereniging-of-woonzorgvennootschap.sparql rename to config/migrations/2023/20231129134822-onboarding-ocmw-verenigingen/20231204120900-woonzorgvereniging-of-woonzorgvennootschap.sparql index 740477f..460ab28 100644 --- a/config/migrations/2023/20231129134822-onboarding-ocmw-verenigingen/20231129144514-woonzorgvereniging-of-woonzorgvennootschap.sparql +++ b/config/migrations/2023/20231129134822-onboarding-ocmw-verenigingen/20231204120900-woonzorgvereniging-of-woonzorgvennootschap.sparql @@ -3,15 +3,15 @@ PREFIX core: PREFIX scheme: PREFIX code: PREFIX ext: -PREFIX concept: +PREFIX concept: INSERT DATA { GRAPH { - concept:82fd21dc-e8bb-4d13-a010-f4a12358ef10 a code:BestuurseenheidClassificatieCode ; + concept:82fd21dc-e8bb-4d13-a010-f4a12358ef10 a ext:GeregistreerdeOrganisatieClassificatieCode ; a ext:OrganizationClassificationCode ; core:uuid "82fd21dc-e8bb-4d13-a010-f4a12358ef10" ; skos:prefLabel "Woonzorgvereniging of woonzorgvennootschap" ; - skos:inScheme scheme:BestuurseenheidClassificatieCode ; - skos:topConceptOf scheme:BestuurseenheidClassificatieCode . + skos:inScheme scheme:GeregistreerdeOrganisatieClassificatieCode ; + skos:topConceptOf scheme:GeregistreerdeOrganisatieClassificatieCode . } } diff --git a/config/migrations/2023/20231129134822-onboarding-ocmw-verenigingen/20231129144255-vereniging-of-vennootschap-voor-sociale-dienstverlening.sparql b/config/migrations/2023/20231129134822-onboarding-ocmw-verenigingen/20231204121000-vereniging-of-vennootschap-voor-sociale-dienstverlening.sparql similarity index 60% rename from config/migrations/2023/20231129134822-onboarding-ocmw-verenigingen/20231129144255-vereniging-of-vennootschap-voor-sociale-dienstverlening.sparql rename to config/migrations/2023/20231129134822-onboarding-ocmw-verenigingen/20231204121000-vereniging-of-vennootschap-voor-sociale-dienstverlening.sparql index 512a7c8..a2ace78 100644 --- a/config/migrations/2023/20231129134822-onboarding-ocmw-verenigingen/20231129144255-vereniging-of-vennootschap-voor-sociale-dienstverlening.sparql +++ b/config/migrations/2023/20231129134822-onboarding-ocmw-verenigingen/20231204121000-vereniging-of-vennootschap-voor-sociale-dienstverlening.sparql @@ -3,15 +3,15 @@ PREFIX core: PREFIX scheme: PREFIX code: PREFIX ext: -PREFIX concept: +PREFIX concept: INSERT DATA { GRAPH { - concept:35833ba2-7371-400b-8df2-2912f66fb153 a code:BestuurseenheidClassificatieCode ; + concept:35833ba2-7371-400b-8df2-2912f66fb153 a ext:GeregistreerdeOrganisatieClassificatieCode ; a ext:OrganizationClassificationCode ; core:uuid "35833ba2-7371-400b-8df2-2912f66fb153" ; skos:prefLabel "Vereniging of vennootschap voor sociale dienstverlening" ; - skos:inScheme scheme:BestuurseenheidClassificatieCode ; - skos:topConceptOf scheme:BestuurseenheidClassificatieCode . + skos:inScheme scheme:GeregistreerdeOrganisatieClassificatieCode ; + skos:topConceptOf scheme:GeregistreerdeOrganisatieClassificatieCode . } } From 60b5f1e3a0b3cc528ccaa468bfdb1b6e97f51881 Mon Sep 17 00:00:00 2001 From: mirdono Date: Wed, 6 Dec 2023 16:32:42 +0100 Subject: [PATCH 04/17] Introducing registered organisations --- config/authorization/config.ex | 1 + config/dispatcher/dispatcher.ex | 8 ++++++++ config/resources/domain.json | 18 ++++++++++++++++++ config/search/config.json | 1 + config/search/dev/config.json | 1 + 5 files changed, 29 insertions(+) diff --git a/config/authorization/config.ex b/config/authorization/config.ex index 1ba31c2..12f824e 100644 --- a/config/authorization/config.ex +++ b/config/authorization/config.ex @@ -58,6 +58,7 @@ defmodule Acl.UserGroups.Config do @org_type [ "http://purl.org/dc/terms/Agent", "http://www.w3.org/ns/org#Organization", + "http://www.w3.org/ns/regorg#RegisteredOrganization", "http://data.vlaanderen.be/ns/besluit#Besluit", "https://data.vlaanderen.be/ns/besluitvorming#Beslissingsactiviteit", "http://www.w3.org/ns/org#Site", diff --git a/config/dispatcher/dispatcher.ex b/config/dispatcher/dispatcher.ex index 4ef9420..7406d45 100644 --- a/config/dispatcher/dispatcher.ex +++ b/config/dispatcher/dispatcher.ex @@ -80,10 +80,18 @@ defmodule Dispatcher do Proxy.forward conn, path, "http://resource/administrative-units/" end + match "/registered-organizations/*path", %{ accept: [:json], layer: :api} do + Proxy.forward conn, path, "http://cache/registered-organizations/" + end + match "/administrative-unit-classification-codes/*path", %{ accept: [:json], layer: :api} do Proxy.forward conn, path, "http://cache/administrative-unit-classification-codes/" end + match "/registered-organization-classification-codes/*path", %{ accept: [:json], layer: :api} do + Proxy.forward conn, path, "http://cache/registered-organization-classification-codes/" + end + match "/organization-classification-codes/*path", %{ accept: [:json], layer: :api} do Proxy.forward conn, path, "http://cache/organization-classification-codes/" end diff --git a/config/resources/domain.json b/config/resources/domain.json index 7a33825..8bbb947 100644 --- a/config/resources/domain.json +++ b/config/resources/domain.json @@ -487,6 +487,19 @@ }, "new-resource-base": "http://data.lblod.info/id/organisaties/" }, + "registered-organizations": { + "class": "regorg:RegisteredOrganization", + "super": ["organizations"], + "attributes": {}, + "relationships": { + "classification": { + "predicate": "org:classification", + "target": "registered-organization-classification-codes", + "cardinality": "one" + } + }, + "new-resource-base": "http://data.lblod.info/id/geregistreerde-organisaties/" + }, "administrative-units": { "class": "besluit:Bestuurseenheid", "super": ["organizations"], @@ -535,6 +548,11 @@ }, "new-resource-base": "http://data.vlaanderen.be/id/concept/OrganizationClassificationCode/" }, + "registered-organization-classification-codes": { + "class": "ext:GeregistreerdeOrganisatieClassificatieCode", + "super": ["organization-classification-codes"], + "new-resource-base": "http://data.vlaanderen.be/id/concept/GeregistreerdeOrganisatieClassificatieCode/" + }, "administrative-unit-classification-codes": { "class": "code:BestuurseenheidClassificatieCode", "super": ["organization-classification-codes"], diff --git a/config/search/config.json b/config/search/config.json index db8733f..9f71e21 100644 --- a/config/search/config.json +++ b/config/search/config.json @@ -758,6 +758,7 @@ "on_path": "units", "rdf_type": [ "http://data.vlaanderen.be/ns/besluit#Bestuurseenheid", + "http://www.w3.org/ns/regorg#RegisteredOrganization", "http://data.lblod.info/vocabularies/erediensten/EredienstBestuurseenheid", "http://data.lblod.info/vocabularies/erediensten/CentraalBestuurVanDeEredienst", "http://data.lblod.info/vocabularies/erediensten/BestuurVanDeEredienst", diff --git a/config/search/dev/config.json b/config/search/dev/config.json index c58fda3..599b3dc 100644 --- a/config/search/dev/config.json +++ b/config/search/dev/config.json @@ -731,6 +731,7 @@ "on_path": "units", "rdf_type": [ "http://data.vlaanderen.be/ns/besluit#Bestuurseenheid", + "http://www.w3.org/ns/regorg#RegisteredOrganization", "http://data.lblod.info/vocabularies/erediensten/EredienstBestuurseenheid", "http://data.lblod.info/vocabularies/erediensten/CentraalBestuurVanDeEredienst", "http://data.lblod.info/vocabularies/erediensten/BestuurVanDeEredienst", From 66f907eddc65b41837f7e217043c68115913e1f5 Mon Sep 17 00:00:00 2001 From: mirdono Date: Wed, 13 Dec 2023 14:14:01 +0100 Subject: [PATCH 05/17] Added some comments indicating which type or organisation a rule covers --- config/reasoner/dl2op/main/query.n3q | 22 +++++++++++++++++++--- 1 file changed, 19 insertions(+), 3 deletions(-) diff --git a/config/reasoner/dl2op/main/query.n3q b/config/reasoner/dl2op/main/query.n3q index 1db4e37..ed20b54 100644 --- a/config/reasoner/dl2op/main/query.n3q +++ b/config/reasoner/dl2op/main/query.n3q @@ -36,8 +36,10 @@ ?o . }. -# Functionarissen should be linked to an igs, agb, apb, gemeente, district, provincie or ocmw only (FOR NOW) +# Functionarissen should only be linked to an IGS, AGB, APB, gemeente, district, +# provincie, OCMW, or OCMW association (FOR NOW) +## Province { ?s a ; ?bestuursfunctie ; @@ -52,6 +54,7 @@ ?p ?o . }. +## Municipality { ?s a ; ?bestuursfunctie ; @@ -66,6 +69,7 @@ ?p ?o . }. +## OCMW { ?s a ; ?bestuursfunctie ; @@ -80,6 +84,7 @@ ?p ?o . }. +## district { ?s a ; ?bestuursfunctie ; @@ -93,6 +98,8 @@ ?s a ; ?p ?o . }. + +## AGB { ?s a ; ?bestuursfunctie ; @@ -107,6 +114,7 @@ ?p ?o . }. +## APB { ?s a ; ?bestuursfunctie ; @@ -121,6 +129,7 @@ ?p ?o . }. +## projectvereniging (IGS) { ?s a ; ?bestuursfunctie ; @@ -134,7 +143,7 @@ ?s a ; ?p ?o . }. - +## dienstverlenend vereniging (IGS) { ?s a ; ?bestuursfunctie ; @@ -149,6 +158,7 @@ ?p ?o . }. +## opdrachthoudende vereniging (IGS) { ?s a ; ?bestuursfunctie ; @@ -163,6 +173,7 @@ ?p ?o . }. +## opdrachthoudende vereniging met private deelname (IGS) { ?s a ; ?bestuursfunctie ; @@ -177,8 +188,10 @@ ?p ?o . }. -# Mandatarissen should be linked to a gemeente, district, provincie or ocmw only (FOR NOW) +# Mandatarissen should only be linked to a gemeente, district, provincie or OCMW +# (FOR NOW) +## province { ?s a ; ?mandate ; @@ -193,6 +206,7 @@ ?p ?o . }. +## municipality { ?s a ; ?mandate ; @@ -207,6 +221,7 @@ ?p ?o . }. +## OCMW { ?s a ; ?mandate ; @@ -221,6 +236,7 @@ ?p ?o . }. +## district { ?s a ; ?mandate ; From 4418349b9e890b3a1a40b4d7034a365ed91d6a6c Mon Sep 17 00:00:00 2001 From: mirdono Date: Fri, 15 Dec 2023 18:34:41 +0100 Subject: [PATCH 06/17] Added query rule for OCMW associations --- config/reasoner/dl2op/main/query.n3q | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/config/reasoner/dl2op/main/query.n3q b/config/reasoner/dl2op/main/query.n3q index ed20b54..55d3d9d 100644 --- a/config/reasoner/dl2op/main/query.n3q +++ b/config/reasoner/dl2op/main/query.n3q @@ -188,6 +188,23 @@ ?p ?o . }. +## OCMW associations +# Note: Loket uses only the general classification code for OCMW associations, +# while OP uses its 5 more specific subtypes +{ + ?s a ; + ?bestuursfunctie ; + ?p ?o . + + ?orgaanInTime ?bestuursfunctie ; + ?orgaan . + ?orgaan ?bestuur . + ?bestuur . + } => { + ?s a ; + ?p ?o . +}. + # Mandatarissen should only be linked to a gemeente, district, provincie or OCMW # (FOR NOW) From c9c2cd23ed240e6635001827b03f9350b96e8e59 Mon Sep 17 00:00:00 2001 From: mirdono Date: Mon, 18 Dec 2023 11:58:17 +0100 Subject: [PATCH 07/17] Allow an organisation to be founded by multiple other organisations --- config/resources/domain.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/resources/domain.json b/config/resources/domain.json index 8bbb947..abf5daa 100644 --- a/config/resources/domain.json +++ b/config/resources/domain.json @@ -460,7 +460,7 @@ "was-founded-by-organization": { "predicate": "ext:isFounderOfOrganization", "target": "organizations", - "cardinality": "one", + "cardinality": "many", "inverse": true }, "sector": { From 518db8fb3f004106054066d0f79cee3fd474abdd Mon Sep 17 00:00:00 2001 From: Claire Lovisa Date: Tue, 19 Dec 2023 17:00:30 +0100 Subject: [PATCH 08/17] Bump frontend --- docker-compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker-compose.yml b/docker-compose.yml index 1d31f10..1538db3 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -181,7 +181,7 @@ services: restart: always logging: *default-logging frontend: - image: lblod/frontend-organization-portal:1.21.0-0 + image: lblod/frontend-organization-portal:1.21.0 volumes: - ./config/frontend/add-x-frame-options-header.conf:/config/add-x-frame-options.conf environment: From d752d162afaad0dd9167dc79b4bac92b74bef1eb Mon Sep 17 00:00:00 2001 From: mirdono Date: Tue, 19 Dec 2023 18:10:31 +0100 Subject: [PATCH 09/17] Renamed was-founde-organization association to plural to match its multiplicity --- config/resources/domain.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/resources/domain.json b/config/resources/domain.json index abf5daa..cbf6311 100644 --- a/config/resources/domain.json +++ b/config/resources/domain.json @@ -457,7 +457,7 @@ "target": "organizations", "cardinality": "many" }, - "was-founded-by-organization": { + "was-founded-by-organizations": { "predicate": "ext:isFounderOfOrganization", "target": "organizations", "cardinality": "many", From d57c850ba44a25a8d240bdddff85215195fa3b95 Mon Sep 17 00:00:00 2001 From: mirdono Date: Thu, 21 Dec 2023 18:56:15 +0100 Subject: [PATCH 10/17] Removed remnants from registered organisations attempt --- config/dispatcher/dispatcher.ex | 8 -------- config/resources/domain.json | 18 ------------------ config/search/config.json | 1 - config/search/dev/config.json | 1 - 4 files changed, 28 deletions(-) diff --git a/config/dispatcher/dispatcher.ex b/config/dispatcher/dispatcher.ex index 6ba4f97..7c1c085 100644 --- a/config/dispatcher/dispatcher.ex +++ b/config/dispatcher/dispatcher.ex @@ -80,18 +80,10 @@ defmodule Dispatcher do Proxy.forward conn, path, "http://resource/administrative-units/" end - match "/registered-organizations/*path", %{ accept: [:json], layer: :api} do - Proxy.forward conn, path, "http://cache/registered-organizations/" - end - match "/administrative-unit-classification-codes/*path", %{ accept: [:json], layer: :api} do Proxy.forward conn, path, "http://cache/administrative-unit-classification-codes/" end - match "/registered-organization-classification-codes/*path", %{ accept: [:json], layer: :api} do - Proxy.forward conn, path, "http://cache/registered-organization-classification-codes/" - end - match "/organization-classification-codes/*path", %{ accept: [:json], layer: :api} do Proxy.forward conn, path, "http://cache/organization-classification-codes/" end diff --git a/config/resources/domain.json b/config/resources/domain.json index cbf6311..cef0d50 100644 --- a/config/resources/domain.json +++ b/config/resources/domain.json @@ -487,19 +487,6 @@ }, "new-resource-base": "http://data.lblod.info/id/organisaties/" }, - "registered-organizations": { - "class": "regorg:RegisteredOrganization", - "super": ["organizations"], - "attributes": {}, - "relationships": { - "classification": { - "predicate": "org:classification", - "target": "registered-organization-classification-codes", - "cardinality": "one" - } - }, - "new-resource-base": "http://data.lblod.info/id/geregistreerde-organisaties/" - }, "administrative-units": { "class": "besluit:Bestuurseenheid", "super": ["organizations"], @@ -548,11 +535,6 @@ }, "new-resource-base": "http://data.vlaanderen.be/id/concept/OrganizationClassificationCode/" }, - "registered-organization-classification-codes": { - "class": "ext:GeregistreerdeOrganisatieClassificatieCode", - "super": ["organization-classification-codes"], - "new-resource-base": "http://data.vlaanderen.be/id/concept/GeregistreerdeOrganisatieClassificatieCode/" - }, "administrative-unit-classification-codes": { "class": "code:BestuurseenheidClassificatieCode", "super": ["organization-classification-codes"], diff --git a/config/search/config.json b/config/search/config.json index 9f71e21..db8733f 100644 --- a/config/search/config.json +++ b/config/search/config.json @@ -758,7 +758,6 @@ "on_path": "units", "rdf_type": [ "http://data.vlaanderen.be/ns/besluit#Bestuurseenheid", - "http://www.w3.org/ns/regorg#RegisteredOrganization", "http://data.lblod.info/vocabularies/erediensten/EredienstBestuurseenheid", "http://data.lblod.info/vocabularies/erediensten/CentraalBestuurVanDeEredienst", "http://data.lblod.info/vocabularies/erediensten/BestuurVanDeEredienst", diff --git a/config/search/dev/config.json b/config/search/dev/config.json index 599b3dc..c58fda3 100644 --- a/config/search/dev/config.json +++ b/config/search/dev/config.json @@ -731,7 +731,6 @@ "on_path": "units", "rdf_type": [ "http://data.vlaanderen.be/ns/besluit#Bestuurseenheid", - "http://www.w3.org/ns/regorg#RegisteredOrganization", "http://data.lblod.info/vocabularies/erediensten/EredienstBestuurseenheid", "http://data.lblod.info/vocabularies/erediensten/CentraalBestuurVanDeEredienst", "http://data.lblod.info/vocabularies/erediensten/BestuurVanDeEredienst", From 2eb960265f6d041c06a7c65b46b9b7b7229ec9c8 Mon Sep 17 00:00:00 2001 From: mirdono Date: Fri, 22 Dec 2023 10:40:18 +0100 Subject: [PATCH 11/17] Added example Welzijnsvereniging that syncs with Loket --- ...add-ocmw-association-wieltjesgracht.sparql | 182 ++++++++++++++++++ 1 file changed, 182 insertions(+) create mode 100644 config/dev-migrations/20231222092546-add-ocmw-association-wieltjesgracht.sparql diff --git a/config/dev-migrations/20231222092546-add-ocmw-association-wieltjesgracht.sparql b/config/dev-migrations/20231222092546-add-ocmw-association-wieltjesgracht.sparql new file mode 100644 index 0000000..2e96ad2 --- /dev/null +++ b/config/dev-migrations/20231222092546-add-ocmw-association-wieltjesgracht.sparql @@ -0,0 +1,182 @@ +PREFIX org: +PREFIX locn: +PREFIX schema: +PREFIX regorg: +PREFIX person: +PREFIX vcard: +PREFIX dbpedia: +PREFIX adms: +PREFIX euro: +PREFIX prov: +PREFIX organisatie: +PREFIX persoon: +PREFIX adres: +PREFIX generiek: +PREFIX mandaat: +PREFIX besluit: +PREFIX lblodlg: +PREFIX lblodorg: +PREFIX lblodgeneriek: +PREFIX dc_terms: +PREFIX foaf: +PREFIX skos: +PREFIX euvoc: +PREFIX ere: +PREFIX ch: +PREFIX code: +PREFIX ext: +PREFIX geo: +PREFIX nacebel: +PREFIX core: + +# Core data +INSERT DATA { + GRAPH { + core:uuid """7d1254994765887e47ee3c9a2551f6a790a02a1747809285f52e7e690c12f2ca""". + a besluit:Bestuurseenheid. + a org:Organization. + a dc_terms:Agent. + skos:prefLabel """VERENIGING OCMW-WIELTJESGRACHT""". + + org:classification . + + # Site + core:uuid """6585490A8CEC3153DEA3A208""" . + a schema:ContactPoint . + schema:email """mail@adres.com""" . + schema:telephone """tel:+3211211430""" . + foaf:page """https://www.vlaanderen.be""" . + schema:contactType """Primary""" . + + core:uuid """6585490B8CEC3153DEA3A209""" . + a schema:ContactPoint . + schema:telephone """tel:+3211211431""" . + schema:contactType """Secondary""" . + + core:uuid """6585490B8CEC3153DEA3A20A""" . + a locn:Address . + adres:Adresvoorstelling.huisnummer """1""" . + locn:thoroughfare """Oude Markt""" . + locn:postCode """3000""" . + adres:gemeentenaam """Leuven""" . + locn:adminUnitL2 """Vlaams-Brabant""" . + adres:land """België""" . + locn:fullAddress """Oude Markt 1, 3000 Leuven, België""" . + adres:verwijstNaar . + dc_terms:source . + + core:uuid """6585490B8CEC3153DEA3A20B""" . + a org:Site . + organisatie:bestaatUit . + org:siteAddress . + org:siteAddress . + ere:vestigingstype . + org:hasPrimarySite . + + # KBO number + generiek:lokaleIdentificator """0262925527""" . + skos:notation """KBO nummer""" . + generiek:gestructureerdeIdentificator . + adms:identifier . + + # Sharepoint identifier + generiek:lokaleIdentificator """sp_test""" . + skos:notation """SharePoint identificator""" . + generiek:gestructureerdeIdentificator . + adms:identifier . + + besluit:werkingsgebied . + + regorg:orgStatus . + + org:hasSubOrganization . + + ext:isFounderOfOrganization . + } +} +; +INSERT { + GRAPH { + a besluit:Bestuursorgaan ; + core:uuid """16875d1ad2294295c576de9837756a4c6796d3ee7e0b7ebd6e8d3e8f65930353""" ; + skos:prefLabel ?governingBodyLabel ; + besluit:bestuurt ; + org:classification . + } +} WHERE { + GRAPH { + ?administrativeUnit core:uuid """7d1254994765887e47ee3c9a2551f6a790a02a1747809285f52e7e690c12f2ca""" ; + skos:prefLabel ?administrativeUnitLabel . + BIND(CONCAT("""Raad van bestuur""", " ", ?administrativeUnitLabel) as ?governingBodyLabel) + } +} +; +INSERT DATA { + GRAPH { + a besluit:Bestuursorgaan ; + core:uuid """47e52223b3e27ad63c7233f93df0331f6d45bfb743f81d1110cbca4b3ac933ee""" ; + generiek:isTijdspecialisatieVan ; + mandaat:bindingStart "1971-11-03T00:00:00.000Z"^^xsd:dateTime . + } +} +; +INSERT { + GRAPH { + a besluit:Bestuursorgaan ; + core:uuid """e891dc823e0d924a94cd067d0b291c169c95695cdd73a3c259e79c39e91d0034""" ; + skos:prefLabel ?governingBodyLabel ; + besluit:bestuurt ; + org:classification . + } +} WHERE { + GRAPH { + ?administrativeUnit core:uuid """7d1254994765887e47ee3c9a2551f6a790a02a1747809285f52e7e690c12f2ca""" ; + skos:prefLabel ?administrativeUnitLabel . + BIND(CONCAT("""Algemene vergadering""", " ", ?administrativeUnitLabel) as ?governingBodyLabel) + } +} +; +INSERT DATA { + GRAPH { + a besluit:Bestuursorgaan ; + core:uuid """be22b1988874583b0773677665596200c9586f758207cdf335278a9380180d86""" ; + generiek:isTijdspecialisatieVan ; + mandaat:bindingStart "1971-11-03T00:00:00.000Z"^^xsd:dateTime . + } +} +; +INSERT { + GRAPH { + a besluit:Bestuursorgaan ; + core:uuid """0f87572fb2968c17383dc7574320031dffa339f17a974e3b194588d685c1fc5d""" ; + skos:prefLabel ?governingBodyLabel ; + besluit:bestuurt ; + org:classification . + } +} WHERE { + GRAPH { + ?administrativeUnit core:uuid """7d1254994765887e47ee3c9a2551f6a790a02a1747809285f52e7e690c12f2ca""" ; + skos:prefLabel ?administrativeUnitLabel . + BIND(CONCAT("""Leidend Ambtenaar""", " ", ?administrativeUnitLabel) as ?governingBodyLabel) + } +} +; +INSERT DATA { + GRAPH { + a besluit:Bestuursorgaan ; + core:uuid """a48a21167ca609b76d621be5d5714e28f48711f1eb49d704985d1476565fdd66""" ; + generiek:isTijdspecialisatieVan ; + mandaat:bindingStart "2019-01-01T00:00:00.000Z"^^xsd:dateTime . + } +} +; +INSERT DATA { + GRAPH { + lblodlg:heeftBestuursfunctie . + + a lblodlg:Bestuursfunctie ; + core:uuid """73e7ef49c748e7f475feb952355f4a6bee2db1d85cd30b17b722a6291739b490""" ; + org:role ; + skos:prefLabel """VERENIGING OCMW-WIELTJESGRACHT Leidend ambtenaar""" . + } +} From 15a033af939ddd458700cbe00da70bd685ea885f Mon Sep 17 00:00:00 2001 From: mirdono Date: Fri, 22 Dec 2023 12:36:02 +0100 Subject: [PATCH 12/17] Use unique identifiers --- ...dd-ocmw-association-wieltjesgracht.sparql} | 24 ++++++++++++------- 1 file changed, 16 insertions(+), 8 deletions(-) rename config/dev-migrations/{20231222092546-add-ocmw-association-wieltjesgracht.sparql => 20231222103146-add-ocmw-association-wieltjesgracht.sparql} (86%) diff --git a/config/dev-migrations/20231222092546-add-ocmw-association-wieltjesgracht.sparql b/config/dev-migrations/20231222103146-add-ocmw-association-wieltjesgracht.sparql similarity index 86% rename from config/dev-migrations/20231222092546-add-ocmw-association-wieltjesgracht.sparql rename to config/dev-migrations/20231222103146-add-ocmw-association-wieltjesgracht.sparql index 2e96ad2..333b713 100644 --- a/config/dev-migrations/20231222092546-add-ocmw-association-wieltjesgracht.sparql +++ b/config/dev-migrations/20231222103146-add-ocmw-association-wieltjesgracht.sparql @@ -74,16 +74,24 @@ INSERT DATA { org:hasPrimarySite . # KBO number - generiek:lokaleIdentificator """0262925527""" . - skos:notation """KBO nummer""" . - generiek:gestructureerdeIdentificator . - adms:identifier . + core:uuid """65856287B12D00C739F23920""". + a generiek:GestructureerdeIdentificator. + generiek:lokaleIdentificator """0262925527""". + core:uuid """65856287B12D00C739F23921""". + a adms:Identifier. + skos:notation """KBO nummer""". + generiek:gestructureerdeIdentificator . + adms:identifier . # Sharepoint identifier - generiek:lokaleIdentificator """sp_test""" . - skos:notation """SharePoint identificator""" . - generiek:gestructureerdeIdentificator . - adms:identifier . + core:uuid """65856287B12D00C739F23922""". + a generiek:GestructureerdeIdentificator. + generiek:lokaleIdentificator """sp-id-test""" . + core:uuid """65856287B12D00C739F23923""". + a adms:Identifier. + skos:notation """SharePoint identificator""". + generiek:gestructureerdeIdentificator . + adms:identifier . besluit:werkingsgebied . From 9637ed4cfa2061ece2c49bb22884bbf635760520 Mon Sep 17 00:00:00 2001 From: mirdono Date: Fri, 22 Dec 2023 13:28:56 +0100 Subject: [PATCH 13/17] Added OVO number --- ...2112146-add-ocmw-association-wieltjesgracht.sparql} | 10 ++++++++++ 1 file changed, 10 insertions(+) rename config/dev-migrations/{20231222103146-add-ocmw-association-wieltjesgracht.sparql => 20231222112146-add-ocmw-association-wieltjesgracht.sparql} (94%) diff --git a/config/dev-migrations/20231222103146-add-ocmw-association-wieltjesgracht.sparql b/config/dev-migrations/20231222112146-add-ocmw-association-wieltjesgracht.sparql similarity index 94% rename from config/dev-migrations/20231222103146-add-ocmw-association-wieltjesgracht.sparql rename to config/dev-migrations/20231222112146-add-ocmw-association-wieltjesgracht.sparql index 333b713..7d6df0e 100644 --- a/config/dev-migrations/20231222103146-add-ocmw-association-wieltjesgracht.sparql +++ b/config/dev-migrations/20231222112146-add-ocmw-association-wieltjesgracht.sparql @@ -93,6 +93,16 @@ INSERT DATA { generiek:gestructureerdeIdentificator . adms:identifier . + # OVO number + adms:identifier . + a adms:Identifier ; + core:uuid """d5713a51-40d4-4b79-bf72-0d917f78c37b""" ; + skos:notation "OVO-nummer" ; + generiek:gestructureerdeIdentificator . + a generiek:GestructureerdeIdentificator ; + core:uuid """438b542b-6841-4137-b8da-287b394328ee""" ; + generiek:lokaleIdentificator "OVO009999" . + besluit:werkingsgebied . regorg:orgStatus . From df3ccdc06a5f714d0853e03d53cf8bc9b774913a Mon Sep 17 00:00:00 2001 From: mirdono Date: Mon, 8 Jan 2024 15:55:40 +0100 Subject: [PATCH 14/17] Added classification codes for PEVAs --- ...a-classification-code-peva-gemeente.sparql | 20 +++++++++++++++++++ ...-classification-code-peva-provincie.sparql | 20 +++++++++++++++++++ 2 files changed, 40 insertions(+) create mode 100644 config/migrations/2024/20240108134546-onboarding-peva/20240108134546-onboarding-peva-classification-code-peva-gemeente.sparql create mode 100644 config/migrations/2024/20240108134546-onboarding-peva/20240108134610-onboarding-peva-classification-code-peva-provincie.sparql diff --git a/config/migrations/2024/20240108134546-onboarding-peva/20240108134546-onboarding-peva-classification-code-peva-gemeente.sparql b/config/migrations/2024/20240108134546-onboarding-peva/20240108134546-onboarding-peva-classification-code-peva-gemeente.sparql new file mode 100644 index 0000000..3a73d52 --- /dev/null +++ b/config/migrations/2024/20240108134546-onboarding-peva/20240108134546-onboarding-peva-classification-code-peva-gemeente.sparql @@ -0,0 +1,20 @@ +PREFIX skos: +PREFIX core: +PREFIX scheme: +PREFIX code: +PREFIX ext: +PREFIX lblodorg: +PREFIX concept: + +INSERT DATA { + GRAPH { + concept:2ad46df5-5c79-4d67-84d5-604c1377231e a skos:Concept ; + a lblodorg:BestuurseenheidClassificatieCode ; + a ext:BestuurseenheidClassificatieCode ; + a ext:OrganizationClassificationCode ; + core:uuid "2ad46df5-5c79-4d67-84d5-604c1377231e" ; + skos:prefLabel "PEVA gemeente" ; + skos:inScheme scheme:BestuurseenheidClassificatieCode ; + skos:topConceptOf scheme:BestuurseenheidClassificatieCode . + } +} diff --git a/config/migrations/2024/20240108134546-onboarding-peva/20240108134610-onboarding-peva-classification-code-peva-provincie.sparql b/config/migrations/2024/20240108134546-onboarding-peva/20240108134610-onboarding-peva-classification-code-peva-provincie.sparql new file mode 100644 index 0000000..53e463a --- /dev/null +++ b/config/migrations/2024/20240108134546-onboarding-peva/20240108134610-onboarding-peva-classification-code-peva-provincie.sparql @@ -0,0 +1,20 @@ +PREFIX skos: +PREFIX core: +PREFIX scheme: +PREFIX code: +PREFIX ext: +PREFIX lblodorg: +PREFIX concept: + +INSERT DATA { + GRAPH { + concept:088784b6-e188-48bf-b94f-94665f9e1f53 a skos:Concept ; + a lblodorg:BestuurseenheidClassificatieCode ; + a ext:BestuurseenheidClassificatieCode ; + a ext:OrganizationClassificationCode ; + core:uuid "088784b6-e188-48bf-b94f-94665f9e1f53" ; + skos:prefLabel "PEVA provincie" ; + skos:inScheme scheme:BestuurseenheidClassificatieCode ; + skos:topConceptOf scheme:BestuurseenheidClassificatieCode . + } +} From e67e8e749feca3e5a737c3f9b27153ab8c60b328 Mon Sep 17 00:00:00 2001 From: mirdono Date: Tue, 9 Jan 2024 17:18:19 +0100 Subject: [PATCH 15/17] Revert "Added classification codes for PEVAs" This reverts commit df3ccdc06a5f714d0853e03d53cf8bc9b774913a. --- ...a-classification-code-peva-gemeente.sparql | 20 ------------------- ...-classification-code-peva-provincie.sparql | 20 ------------------- 2 files changed, 40 deletions(-) delete mode 100644 config/migrations/2024/20240108134546-onboarding-peva/20240108134546-onboarding-peva-classification-code-peva-gemeente.sparql delete mode 100644 config/migrations/2024/20240108134546-onboarding-peva/20240108134610-onboarding-peva-classification-code-peva-provincie.sparql diff --git a/config/migrations/2024/20240108134546-onboarding-peva/20240108134546-onboarding-peva-classification-code-peva-gemeente.sparql b/config/migrations/2024/20240108134546-onboarding-peva/20240108134546-onboarding-peva-classification-code-peva-gemeente.sparql deleted file mode 100644 index 3a73d52..0000000 --- a/config/migrations/2024/20240108134546-onboarding-peva/20240108134546-onboarding-peva-classification-code-peva-gemeente.sparql +++ /dev/null @@ -1,20 +0,0 @@ -PREFIX skos: -PREFIX core: -PREFIX scheme: -PREFIX code: -PREFIX ext: -PREFIX lblodorg: -PREFIX concept: - -INSERT DATA { - GRAPH { - concept:2ad46df5-5c79-4d67-84d5-604c1377231e a skos:Concept ; - a lblodorg:BestuurseenheidClassificatieCode ; - a ext:BestuurseenheidClassificatieCode ; - a ext:OrganizationClassificationCode ; - core:uuid "2ad46df5-5c79-4d67-84d5-604c1377231e" ; - skos:prefLabel "PEVA gemeente" ; - skos:inScheme scheme:BestuurseenheidClassificatieCode ; - skos:topConceptOf scheme:BestuurseenheidClassificatieCode . - } -} diff --git a/config/migrations/2024/20240108134546-onboarding-peva/20240108134610-onboarding-peva-classification-code-peva-provincie.sparql b/config/migrations/2024/20240108134546-onboarding-peva/20240108134610-onboarding-peva-classification-code-peva-provincie.sparql deleted file mode 100644 index 53e463a..0000000 --- a/config/migrations/2024/20240108134546-onboarding-peva/20240108134610-onboarding-peva-classification-code-peva-provincie.sparql +++ /dev/null @@ -1,20 +0,0 @@ -PREFIX skos: -PREFIX core: -PREFIX scheme: -PREFIX code: -PREFIX ext: -PREFIX lblodorg: -PREFIX concept: - -INSERT DATA { - GRAPH { - concept:088784b6-e188-48bf-b94f-94665f9e1f53 a skos:Concept ; - a lblodorg:BestuurseenheidClassificatieCode ; - a ext:BestuurseenheidClassificatieCode ; - a ext:OrganizationClassificationCode ; - core:uuid "088784b6-e188-48bf-b94f-94665f9e1f53" ; - skos:prefLabel "PEVA provincie" ; - skos:inScheme scheme:BestuurseenheidClassificatieCode ; - skos:topConceptOf scheme:BestuurseenheidClassificatieCode . - } -} From 1d144520841c77eeff4c7985883680d0481e9427 Mon Sep 17 00:00:00 2001 From: mirdono Date: Tue, 9 Jan 2024 17:23:54 +0100 Subject: [PATCH 16/17] Added new classification codes for PEVAs --- ...a-classification-code-peva-gemeente.sparql | 20 +++++++++++++++++++ ...-classification-code-peva-provincie.sparql | 20 +++++++++++++++++++ 2 files changed, 40 insertions(+) create mode 100644 config/migrations/2024/20240108134546-onboarding-peva/20240108134546-onboarding-peva-classification-code-peva-gemeente.sparql create mode 100644 config/migrations/2024/20240108134546-onboarding-peva/20240108134610-onboarding-peva-classification-code-peva-provincie.sparql diff --git a/config/migrations/2024/20240108134546-onboarding-peva/20240108134546-onboarding-peva-classification-code-peva-gemeente.sparql b/config/migrations/2024/20240108134546-onboarding-peva/20240108134546-onboarding-peva-classification-code-peva-gemeente.sparql new file mode 100644 index 0000000..3a73d52 --- /dev/null +++ b/config/migrations/2024/20240108134546-onboarding-peva/20240108134546-onboarding-peva-classification-code-peva-gemeente.sparql @@ -0,0 +1,20 @@ +PREFIX skos: +PREFIX core: +PREFIX scheme: +PREFIX code: +PREFIX ext: +PREFIX lblodorg: +PREFIX concept: + +INSERT DATA { + GRAPH { + concept:2ad46df5-5c79-4d67-84d5-604c1377231e a skos:Concept ; + a lblodorg:BestuurseenheidClassificatieCode ; + a ext:BestuurseenheidClassificatieCode ; + a ext:OrganizationClassificationCode ; + core:uuid "2ad46df5-5c79-4d67-84d5-604c1377231e" ; + skos:prefLabel "PEVA gemeente" ; + skos:inScheme scheme:BestuurseenheidClassificatieCode ; + skos:topConceptOf scheme:BestuurseenheidClassificatieCode . + } +} diff --git a/config/migrations/2024/20240108134546-onboarding-peva/20240108134610-onboarding-peva-classification-code-peva-provincie.sparql b/config/migrations/2024/20240108134546-onboarding-peva/20240108134610-onboarding-peva-classification-code-peva-provincie.sparql new file mode 100644 index 0000000..53e463a --- /dev/null +++ b/config/migrations/2024/20240108134546-onboarding-peva/20240108134610-onboarding-peva-classification-code-peva-provincie.sparql @@ -0,0 +1,20 @@ +PREFIX skos: +PREFIX core: +PREFIX scheme: +PREFIX code: +PREFIX ext: +PREFIX lblodorg: +PREFIX concept: + +INSERT DATA { + GRAPH { + concept:088784b6-e188-48bf-b94f-94665f9e1f53 a skos:Concept ; + a lblodorg:BestuurseenheidClassificatieCode ; + a ext:BestuurseenheidClassificatieCode ; + a ext:OrganizationClassificationCode ; + core:uuid "088784b6-e188-48bf-b94f-94665f9e1f53" ; + skos:prefLabel "PEVA provincie" ; + skos:inScheme scheme:BestuurseenheidClassificatieCode ; + skos:topConceptOf scheme:BestuurseenheidClassificatieCode . + } +} From a1fc67b970716e3f0a0cff96082a6982a28aa6e3 Mon Sep 17 00:00:00 2001 From: mirdono Date: Wed, 10 Jan 2024 17:15:07 +0100 Subject: [PATCH 17/17] Bump construct-administrative-unit-relationships-service --- docker-compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker-compose.yml b/docker-compose.yml index 5871b32..dfa4094 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -258,7 +258,7 @@ services: restart: always logging: *default-logging construct-administrative-unit-relationships: - image: lblod/construct-administrative-unit-relationships-service:0.1.6 + image: lblod/construct-administrative-unit-relationships-service:0.1.7 environment: START_DATE_WORSHIP_GOVERNING_BODY: "2023-04-01T00:00:00" END_DATE_WORSHIP_GOVERNING_BODY: "2026-03-31T00:00:00"