From 3ced194b73557f855ade44ee4b7f6bc9fd5214af Mon Sep 17 00:00:00 2001 From: Boris De Vloed Date: Mon, 22 Jun 2026 10:16:55 +0200 Subject: [PATCH 01/17] Added orgs --- ...ew-organization-classification-codes.graph | 1 + ...-new-organization-classification-codes.ttl | 51 +++++++++++++++++++ config/resources/domain.json | 7 +++ 3 files changed, 59 insertions(+) create mode 100644 config/migrations/2026/20260619100000-onboarding-new-org-types/20260619100000-add-new-organization-classification-codes.graph create mode 100644 config/migrations/2026/20260619100000-onboarding-new-org-types/20260619100000-add-new-organization-classification-codes.ttl diff --git a/config/migrations/2026/20260619100000-onboarding-new-org-types/20260619100000-add-new-organization-classification-codes.graph b/config/migrations/2026/20260619100000-onboarding-new-org-types/20260619100000-add-new-organization-classification-codes.graph new file mode 100644 index 0000000..092c3a9 --- /dev/null +++ b/config/migrations/2026/20260619100000-onboarding-new-org-types/20260619100000-add-new-organization-classification-codes.graph @@ -0,0 +1 @@ +http://mu.semte.ch/graphs/public diff --git a/config/migrations/2026/20260619100000-onboarding-new-org-types/20260619100000-add-new-organization-classification-codes.ttl b/config/migrations/2026/20260619100000-onboarding-new-org-types/20260619100000-add-new-organization-classification-codes.ttl new file mode 100644 index 0000000..6efb1ea --- /dev/null +++ b/config/migrations/2026/20260619100000-onboarding-new-org-types/20260619100000-add-new-organization-classification-codes.ttl @@ -0,0 +1,51 @@ +# New organization classification codes (ticket: new org types). +# prefLabel = technically-correct org name; altLabel = colloquial werkingsgebied term. +# URIs minted under lblod.data.gift (not data.vlaanderen.be/id/concept, to avoid extending the squat). +# Each code is inScheme its family scheme AND the public-export scheme (10caf4a4) = the export switch. +@prefix rdf: . +@prefix skos: . +@prefix mu: . +@prefix ext: . +@prefix code: . +@prefix scheme: . + +# --- BestuurseenheidClassificatieCode (besluit:Bestuurseenheid) --- + + + rdf:type ext:OrganizationClassificationCode , code:BestuurseenheidClassificatieCode ; + mu:uuid "3a2649ef-7345-4d3a-8709-f89fc9b44f58" ; + skos:prefLabel "Interlokale vereniging" ; + skos:topConceptOf scheme:BestuurseenheidClassificatieCode ; + skos:inScheme scheme:BestuurseenheidClassificatieCode , . + + + rdf:type ext:OrganizationClassificationCode , code:BestuurseenheidClassificatieCode ; + mu:uuid "b2133b86-24f0-44f0-9d10-5b4c7f944a9d" ; + skos:prefLabel "Vervoerregioraad" ; + skos:altLabel "Vervoerregio" ; # Modelled as the werkingsgebied of a Vervoerregioraad, but colloquially known as a Vervoerregio. + skos:topConceptOf scheme:BestuurseenheidClassificatieCode ; + skos:inScheme scheme:BestuurseenheidClassificatieCode , . + +# --- GeregistreerdeOrganisatieClassificatieCode (regorg:RegisteredOrganization) --- + + + rdf:type ext:OrganizationClassificationCode , ext:GeregistreerdeOrganisatieClassificatieCode ; + mu:uuid "8392b885-a875-4b0d-b6a2-b52e53bda454" ; + skos:prefLabel "Zorgraad" ; + skos:altLabel "Eerstelijnszone" ; # Modelled as the werkingsgebied of a Zorgraad, but colloquially known as an Eerstelijnszone. + skos:topConceptOf scheme:GeregistreerdeOrganisatieClassificatieCode ; + skos:inScheme scheme:GeregistreerdeOrganisatieClassificatieCode , . + + + rdf:type ext:OrganizationClassificationCode , ext:GeregistreerdeOrganisatieClassificatieCode ; + mu:uuid "b22948f9-e695-4f24-a530-b6bf3af3b37f" ; + skos:prefLabel "Bosgroep" ; + skos:topConceptOf scheme:GeregistreerdeOrganisatieClassificatieCode ; + skos:inScheme scheme:GeregistreerdeOrganisatieClassificatieCode , . + + + rdf:type ext:OrganizationClassificationCode , ext:GeregistreerdeOrganisatieClassificatieCode ; + mu:uuid "f4e5bb57-1007-4397-828b-b34bbf1e760d" ; + skos:prefLabel "Woonmaatschappij" ; + skos:topConceptOf scheme:GeregistreerdeOrganisatieClassificatieCode ; + skos:inScheme scheme:GeregistreerdeOrganisatieClassificatieCode , . diff --git a/config/resources/domain.json b/config/resources/domain.json index 7e488d9..a8a8f71 100644 --- a/config/resources/domain.json +++ b/config/resources/domain.json @@ -521,6 +521,13 @@ "registered-organizations": { "class": "regorg:RegisteredOrganization", "super": ["organizations"], + "relationships": { + "scope": { + "predicate": "dc_terms:spatial", + "target": "locations", + "cardinality": "one" + } + }, "new-resource-base": "http://data.lblod.info/id/geregistreerdeOrganisaties/" }, "organization-classification-codes": { From 767ebac6acc0e395620b09a7e98c2aee0a4cbef3 Mon Sep 17 00:00:00 2001 From: Boris De Vloed Date: Mon, 22 Jun 2026 17:53:53 +0200 Subject: [PATCH 02/17] Revert "Added orgs" This reverts commit 3ced194b73557f855ade44ee4b7f6bc9fd5214af. --- ...ew-organization-classification-codes.graph | 1 - ...-new-organization-classification-codes.ttl | 51 ------------------- config/resources/domain.json | 7 --- 3 files changed, 59 deletions(-) delete mode 100644 config/migrations/2026/20260619100000-onboarding-new-org-types/20260619100000-add-new-organization-classification-codes.graph delete mode 100644 config/migrations/2026/20260619100000-onboarding-new-org-types/20260619100000-add-new-organization-classification-codes.ttl diff --git a/config/migrations/2026/20260619100000-onboarding-new-org-types/20260619100000-add-new-organization-classification-codes.graph b/config/migrations/2026/20260619100000-onboarding-new-org-types/20260619100000-add-new-organization-classification-codes.graph deleted file mode 100644 index 092c3a9..0000000 --- a/config/migrations/2026/20260619100000-onboarding-new-org-types/20260619100000-add-new-organization-classification-codes.graph +++ /dev/null @@ -1 +0,0 @@ -http://mu.semte.ch/graphs/public diff --git a/config/migrations/2026/20260619100000-onboarding-new-org-types/20260619100000-add-new-organization-classification-codes.ttl b/config/migrations/2026/20260619100000-onboarding-new-org-types/20260619100000-add-new-organization-classification-codes.ttl deleted file mode 100644 index 6efb1ea..0000000 --- a/config/migrations/2026/20260619100000-onboarding-new-org-types/20260619100000-add-new-organization-classification-codes.ttl +++ /dev/null @@ -1,51 +0,0 @@ -# New organization classification codes (ticket: new org types). -# prefLabel = technically-correct org name; altLabel = colloquial werkingsgebied term. -# URIs minted under lblod.data.gift (not data.vlaanderen.be/id/concept, to avoid extending the squat). -# Each code is inScheme its family scheme AND the public-export scheme (10caf4a4) = the export switch. -@prefix rdf: . -@prefix skos: . -@prefix mu: . -@prefix ext: . -@prefix code: . -@prefix scheme: . - -# --- BestuurseenheidClassificatieCode (besluit:Bestuurseenheid) --- - - - rdf:type ext:OrganizationClassificationCode , code:BestuurseenheidClassificatieCode ; - mu:uuid "3a2649ef-7345-4d3a-8709-f89fc9b44f58" ; - skos:prefLabel "Interlokale vereniging" ; - skos:topConceptOf scheme:BestuurseenheidClassificatieCode ; - skos:inScheme scheme:BestuurseenheidClassificatieCode , . - - - rdf:type ext:OrganizationClassificationCode , code:BestuurseenheidClassificatieCode ; - mu:uuid "b2133b86-24f0-44f0-9d10-5b4c7f944a9d" ; - skos:prefLabel "Vervoerregioraad" ; - skos:altLabel "Vervoerregio" ; # Modelled as the werkingsgebied of a Vervoerregioraad, but colloquially known as a Vervoerregio. - skos:topConceptOf scheme:BestuurseenheidClassificatieCode ; - skos:inScheme scheme:BestuurseenheidClassificatieCode , . - -# --- GeregistreerdeOrganisatieClassificatieCode (regorg:RegisteredOrganization) --- - - - rdf:type ext:OrganizationClassificationCode , ext:GeregistreerdeOrganisatieClassificatieCode ; - mu:uuid "8392b885-a875-4b0d-b6a2-b52e53bda454" ; - skos:prefLabel "Zorgraad" ; - skos:altLabel "Eerstelijnszone" ; # Modelled as the werkingsgebied of a Zorgraad, but colloquially known as an Eerstelijnszone. - skos:topConceptOf scheme:GeregistreerdeOrganisatieClassificatieCode ; - skos:inScheme scheme:GeregistreerdeOrganisatieClassificatieCode , . - - - rdf:type ext:OrganizationClassificationCode , ext:GeregistreerdeOrganisatieClassificatieCode ; - mu:uuid "b22948f9-e695-4f24-a530-b6bf3af3b37f" ; - skos:prefLabel "Bosgroep" ; - skos:topConceptOf scheme:GeregistreerdeOrganisatieClassificatieCode ; - skos:inScheme scheme:GeregistreerdeOrganisatieClassificatieCode , . - - - rdf:type ext:OrganizationClassificationCode , ext:GeregistreerdeOrganisatieClassificatieCode ; - mu:uuid "f4e5bb57-1007-4397-828b-b34bbf1e760d" ; - skos:prefLabel "Woonmaatschappij" ; - skos:topConceptOf scheme:GeregistreerdeOrganisatieClassificatieCode ; - skos:inScheme scheme:GeregistreerdeOrganisatieClassificatieCode , . diff --git a/config/resources/domain.json b/config/resources/domain.json index a8a8f71..7e488d9 100644 --- a/config/resources/domain.json +++ b/config/resources/domain.json @@ -521,13 +521,6 @@ "registered-organizations": { "class": "regorg:RegisteredOrganization", "super": ["organizations"], - "relationships": { - "scope": { - "predicate": "dc_terms:spatial", - "target": "locations", - "cardinality": "one" - } - }, "new-resource-base": "http://data.lblod.info/id/geregistreerdeOrganisaties/" }, "organization-classification-codes": { From 0fe196636212decf38fb019df7b94595a3a48950 Mon Sep 17 00:00:00 2001 From: Sam Van Campenhout Date: Wed, 24 Jun 2026 10:41:46 +0200 Subject: [PATCH 03/17] Add a new `Bezoekadres` site type to the codelist --- CHANGELOG.md | 3 +++ .../20260624101800-add-site-type-bezoekadres.sparql | 10 ++++++++++ 2 files changed, 13 insertions(+) create mode 100644 config/migrations/2026/20260624101800-add-site-type-bezoekadres.sparql diff --git a/CHANGELOG.md b/CHANGELOG.md index c332028..47b46c0 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,7 @@ ## Unreleased - Added service to link addresses to addressregister uris [OP-3795] - Derive an organization's reference region(s) from its werkingsgebied; bump scope-of-operation to 0.2.0 [OP-3799] +- Site type changes [OP-3818] - Frontend [v1.38.0] ### Deploy notes @@ -10,7 +11,9 @@ drc up -d link-adressenregister-uri ``` ``` +drc restart migrations drc up -d frontend scope-of-operation +drc restart cache resource ``` ## v1.40.0 diff --git a/config/migrations/2026/20260624101800-add-site-type-bezoekadres.sparql b/config/migrations/2026/20260624101800-add-site-type-bezoekadres.sparql new file mode 100644 index 0000000..5c3d43e --- /dev/null +++ b/config/migrations/2026/20260624101800-add-site-type-bezoekadres.sparql @@ -0,0 +1,10 @@ +INSERT DATA { + GRAPH { + . + "Bezoekadres" . + "019ef8b6-ba27-7388-a5cc-faf74f357963" . + . + . + . + } +} From 5f5c4f73268ed4eaffa1a3d52a2379075ed801a3 Mon Sep 17 00:00:00 2001 From: Damon Date: Thu, 25 Jun 2026 13:44:54 +0200 Subject: [PATCH 04/17] edit changelog --- CHANGELOG.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index c332028..8b2fab0 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,10 +3,13 @@ - Added service to link addresses to addressregister uris [OP-3795] - Derive an organization's reference region(s) from its werkingsgebied; bump scope-of-operation to 0.2.0 [OP-3799] - Frontend [v1.38.0] +- Added Juridische vorm [OP-3816] [OP-3820] +- Frontend [v1.39.0] ### Deploy notes ``` drc up -d link-adressenregister-uri +drc restart resource migrations ``` ``` From 474e274d444e7992cbc4813200c100e20110e8a9 Mon Sep 17 00:00:00 2001 From: Damon Date: Thu, 25 Jun 2026 13:56:23 +0200 Subject: [PATCH 05/17] frontend bump --- docker-compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker-compose.yml b/docker-compose.yml index 0b2618a..33528e5 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -215,7 +215,7 @@ services: restart: always logging: *default-logging frontend: - image: lblod/frontend-organization-portal:1.38.0 + image: lblod/frontend-organization-portal:1.39.0 volumes: - ./config/frontend/add-x-frame-options-header.conf:/config/add-x-frame-options.conf environment: From 3379785f7ed41431abaa36c2f70e4ebfc79f1f52 Mon Sep 17 00:00:00 2001 From: Damon Date: Thu, 25 Jun 2026 14:06:17 +0200 Subject: [PATCH 06/17] changelog edit frontend --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 8b2fab0..c0a3777 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,7 +8,7 @@ ### Deploy notes ``` -drc up -d link-adressenregister-uri +drc up -d link-adressenregister-uri frontend drc restart resource migrations ``` From 0dedf2f6621dcdaa2a0a1a66d0de0067f15725fc Mon Sep 17 00:00:00 2001 From: Boris De Vloed Date: Mon, 22 Jun 2026 10:16:55 +0200 Subject: [PATCH 07/17] Added orgs --- ...ew-organization-classification-codes.graph | 1 + ...-new-organization-classification-codes.ttl | 51 +++++++++++++++++++ config/resources/domain.json | 7 +++ 3 files changed, 59 insertions(+) create mode 100644 config/migrations/2026/20260619100000-onboarding-new-org-types/20260619100000-add-new-organization-classification-codes.graph create mode 100644 config/migrations/2026/20260619100000-onboarding-new-org-types/20260619100000-add-new-organization-classification-codes.ttl diff --git a/config/migrations/2026/20260619100000-onboarding-new-org-types/20260619100000-add-new-organization-classification-codes.graph b/config/migrations/2026/20260619100000-onboarding-new-org-types/20260619100000-add-new-organization-classification-codes.graph new file mode 100644 index 0000000..092c3a9 --- /dev/null +++ b/config/migrations/2026/20260619100000-onboarding-new-org-types/20260619100000-add-new-organization-classification-codes.graph @@ -0,0 +1 @@ +http://mu.semte.ch/graphs/public diff --git a/config/migrations/2026/20260619100000-onboarding-new-org-types/20260619100000-add-new-organization-classification-codes.ttl b/config/migrations/2026/20260619100000-onboarding-new-org-types/20260619100000-add-new-organization-classification-codes.ttl new file mode 100644 index 0000000..9afe88d --- /dev/null +++ b/config/migrations/2026/20260619100000-onboarding-new-org-types/20260619100000-add-new-organization-classification-codes.ttl @@ -0,0 +1,51 @@ +# New organization classification codes (ticket: new org types). +# prefLabel = technically-correct org name; altLabel = colloquial werkingsgebied term. +# URIs under data.vlaanderen.be/id/concept// (to be published upstream) - matches existing codes. +# Each code is inScheme its family scheme AND the public-export scheme (10caf4a4) = the export switch. +@prefix rdf: . +@prefix skos: . +@prefix mu: . +@prefix ext: . +@prefix code: . +@prefix scheme: . + +# --- BestuurseenheidClassificatieCode (besluit:Bestuurseenheid) --- + + + rdf:type ext:OrganizationClassificationCode , code:BestuurseenheidClassificatieCode ; + mu:uuid "3a2649ef-7345-4d3a-8709-f89fc9b44f58" ; + skos:prefLabel "Interlokale vereniging" ; + skos:topConceptOf scheme:BestuurseenheidClassificatieCode ; + skos:inScheme scheme:BestuurseenheidClassificatieCode , . + + + rdf:type ext:OrganizationClassificationCode , code:BestuurseenheidClassificatieCode ; + mu:uuid "b2133b86-24f0-44f0-9d10-5b4c7f944a9d" ; + skos:prefLabel "Vervoerregioraad" ; + skos:altLabel "Vervoerregio" ; # Modelled as the werkingsgebied of a Vervoerregioraad, but colloquially known as a Vervoerregio. + skos:topConceptOf scheme:BestuurseenheidClassificatieCode ; + skos:inScheme scheme:BestuurseenheidClassificatieCode , . + +# --- GeregistreerdeOrganisatieClassificatieCode (regorg:RegisteredOrganization) --- + + + rdf:type ext:OrganizationClassificationCode , ext:GeregistreerdeOrganisatieClassificatieCode ; + mu:uuid "8392b885-a875-4b0d-b6a2-b52e53bda454" ; + skos:prefLabel "Zorgraad" ; + skos:altLabel "Eerstelijnszone" ; # Modelled as the werkingsgebied of a Zorgraad, but colloquially known as an Eerstelijnszone. + skos:topConceptOf scheme:GeregistreerdeOrganisatieClassificatieCode ; + skos:inScheme scheme:GeregistreerdeOrganisatieClassificatieCode , . + + + rdf:type ext:OrganizationClassificationCode , ext:GeregistreerdeOrganisatieClassificatieCode ; + mu:uuid "b22948f9-e695-4f24-a530-b6bf3af3b37f" ; + skos:prefLabel "Bosgroep" ; + skos:topConceptOf scheme:GeregistreerdeOrganisatieClassificatieCode ; + skos:inScheme scheme:GeregistreerdeOrganisatieClassificatieCode , . + + + rdf:type ext:OrganizationClassificationCode , ext:GeregistreerdeOrganisatieClassificatieCode ; + mu:uuid "f4e5bb57-1007-4397-828b-b34bbf1e760d" ; + skos:prefLabel "Woonmaatschappij" ; + skos:topConceptOf scheme:GeregistreerdeOrganisatieClassificatieCode ; + skos:inScheme scheme:GeregistreerdeOrganisatieClassificatieCode , . diff --git a/config/resources/domain.json b/config/resources/domain.json index 1d33ba4..e8845a5 100644 --- a/config/resources/domain.json +++ b/config/resources/domain.json @@ -527,6 +527,13 @@ "registered-organizations": { "class": "regorg:RegisteredOrganization", "super": ["organizations"], + "relationships": { + "scope": { + "predicate": "dc_terms:spatial", + "target": "locations", + "cardinality": "one" + } + }, "new-resource-base": "http://data.lblod.info/id/geregistreerdeOrganisaties/" }, "organization-classification-codes": { From f69668c5e90d1268ffea2313da66224edcff31e9 Mon Sep 17 00:00:00 2001 From: Boris De Vloed Date: Fri, 26 Jun 2026 13:47:59 +0200 Subject: [PATCH 08/17] Added orgs --- CHANGELOG.md | 7 ++++ ...ervoerregioraad-governing-body-codes.graph | 1 + ...-vervoerregioraad-governing-body-codes.ttl | 35 +++++++++++++++++++ config/resources/domain.json | 4 +++ config/search/config.json | 13 +++++++ 5 files changed, 60 insertions(+) create mode 100644 config/migrations/2026/20260619100000-onboarding-new-org-types/20260619100100-add-vervoerregioraad-governing-body-codes.graph create mode 100644 config/migrations/2026/20260619100000-onboarding-new-org-types/20260619100100-add-vervoerregioraad-governing-body-codes.ttl diff --git a/CHANGELOG.md b/CHANGELOG.md index a24611b..c7458f3 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,6 +6,7 @@ - Frontend [v1.38.0] - Added Juridische vorm [OP-3816] [OP-3820] - Frontend [v1.39.0] +- Add new organization types (interlokale vereniging, vervoerregioraad, zorgraad, bosgroep, woonmaatschappij); add werkingsgebied (dct:spatial) to registered organizations [OP-3828] ### Deploy notes ``` @@ -19,6 +20,12 @@ drc up -d frontend scope-of-operation drc restart cache resource ``` +Release construct-organization-relationships-service first (build + publish image), then bump its tag in docker-compose. Then: +``` +drc pull construct-organization-relationships && drc up -d construct-organization-relationships +drc restart migrations resource cache +``` + ## v1.40.0 - Query to check missing address URI's [OP-3784] - Create new query 'organisations shown in OP frontend' in Dashboard [OP-3774] diff --git a/config/migrations/2026/20260619100000-onboarding-new-org-types/20260619100100-add-vervoerregioraad-governing-body-codes.graph b/config/migrations/2026/20260619100000-onboarding-new-org-types/20260619100100-add-vervoerregioraad-governing-body-codes.graph new file mode 100644 index 0000000..092c3a9 --- /dev/null +++ b/config/migrations/2026/20260619100000-onboarding-new-org-types/20260619100100-add-vervoerregioraad-governing-body-codes.graph @@ -0,0 +1 @@ +http://mu.semte.ch/graphs/public diff --git a/config/migrations/2026/20260619100000-onboarding-new-org-types/20260619100100-add-vervoerregioraad-governing-body-codes.ttl b/config/migrations/2026/20260619100000-onboarding-new-org-types/20260619100100-add-vervoerregioraad-governing-body-codes.ttl new file mode 100644 index 0000000..81fa2d2 --- /dev/null +++ b/config/migrations/2026/20260619100000-onboarding-new-org-types/20260619100100-add-vervoerregioraad-governing-body-codes.ttl @@ -0,0 +1,35 @@ +# Governing body (bestuursorgaan) + mandate (bestuursfunctie) codes for the Vervoerregioraad. +# The vervoerregioraad is itself the deliberative organ (no AV/RvB substructure); members + a +# (dual) voorzitter. URIs under data.vlaanderen.be (to be published), matching existing codes. +# NOTE (business to confirm): exact role set + the dual voorzitterschap (gemeente-vertegenwoordiger +# + Departement MOW) — modeled here as a single Voorzitter + Lid. +@prefix rdf: . +@prefix skos: . +@prefix mu: . +@prefix ext: . +@prefix code: . +@prefix scheme: . + +# --- Bestuursorgaan: the Vervoerregioraad itself --- + + rdf:type code:BestuursorgaanClassificatieCode , skos:Concept , ext:BestuursorgaanClassificatieCode ; + mu:uuid "a04a5fb1-b79c-4b8d-a664-c5410d466d49" ; + skos:prefLabel "Vervoerregioraad" ; + skos:inScheme . + +# --- Bestuursfunctie codes (mandate roles) applying to the Vervoerregioraad --- + + rdf:type code:BestuursfunctieCode ; + mu:uuid "540f3be6-73ed-4935-9de7-30997bab379c" ; + skos:prefLabel "Voorzitter van de vervoerregioraad" ; + ext:appliesTo ; + skos:topConceptOf scheme:BestuursfunctieCode ; + skos:inScheme scheme:BestuursfunctieCode , . + + + rdf:type code:BestuursfunctieCode ; + mu:uuid "1093c55c-84d5-424b-980e-8b2ca32dc445" ; + skos:prefLabel "Lid van de vervoerregioraad" ; + ext:appliesTo ; + skos:topConceptOf scheme:BestuursfunctieCode ; + skos:inScheme scheme:BestuursfunctieCode , . diff --git a/config/resources/domain.json b/config/resources/domain.json index e8845a5..16e3eac 100644 --- a/config/resources/domain.json +++ b/config/resources/domain.json @@ -542,6 +542,10 @@ "label": { "type": "string", "predicate": "skos:prefLabel" + }, + "alt-label": { + "type": "string", + "predicate": "skos:altLabel" } }, "new-resource-base": "http://data.vlaanderen.be/id/concept/OrganizationClassificationCode/" diff --git a/config/search/config.json b/config/search/config.json index d15f2c6..a342e94 100644 --- a/config/search/config.json +++ b/config/search/config.json @@ -663,6 +663,10 @@ "http://www.w3.org/ns/org#classification", "http://www.w3.org/2004/02/skos/core#prefLabel" ], + "classification_alternative_name": [ + "http://www.w3.org/ns/org#classification", + "http://www.w3.org/2004/02/skos/core#altLabel" + ], "status": [ "http://www.w3.org/ns/regorg#orgStatus", "http://www.w3.org/2004/02/skos/core#prefLabel" @@ -745,6 +749,15 @@ } } }, + "classification_alternative_name": { + "type": "text", + "fields": { + "field": { + "type": "keyword", + "normalizer": "custom_sort_normalizer" + } + } + }, "status": { "type": "text", "fields": { From 4ad4ca725d4347432aad0189c73b2dd24563151c Mon Sep 17 00:00:00 2001 From: Boris De Vloed Date: Fri, 26 Jun 2026 15:55:43 +0200 Subject: [PATCH 09/17] bumped construct org relationships --- docker-compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker-compose.yml b/docker-compose.yml index 33528e5..dbee0c6 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -307,7 +307,7 @@ services: restart: always logging: *default-logging construct-organization-relationships: - image: lblod/construct-organization-relationships-service:1.1.1 + image: lblod/construct-organization-relationships-service:1.1.2 links: - db:database labels: From a8f8eb9a3cb3710382bd25d512449d7f525f60dd Mon Sep 17 00:00:00 2001 From: Damon Date: Mon, 29 Jun 2026 15:54:23 +0200 Subject: [PATCH 10/17] OP-3810: edit dispatcher config --- config/dispatcher/dispatcher.ex | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/dispatcher/dispatcher.ex b/config/dispatcher/dispatcher.ex index 7fc74a4..b92cbef 100644 --- a/config/dispatcher/dispatcher.ex +++ b/config/dispatcher/dispatcher.ex @@ -386,7 +386,7 @@ defmodule Dispatcher do layer: :api_services, accept: %{json: true} } do - forward(conn, path, "http://construct-organization-relationships/create-relationships/") + forward(conn, path, "http://construct-organization-relationships/") end post "/kbo-data-sync/*path", %{layer: :api_services, accept: %{json: true}} do From 09c79650e4422ef4a4251d228d4c46f49a631e52 Mon Sep 17 00:00:00 2001 From: Damon Date: Tue, 30 Jun 2026 10:33:31 +0200 Subject: [PATCH 11/17] bump frontend + feature flag to make legal form editable --- docker-compose.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/docker-compose.yml b/docker-compose.yml index 33528e5..b62f37d 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -215,11 +215,12 @@ services: restart: always logging: *default-logging frontend: - image: lblod/frontend-organization-portal:1.39.0 + image: lblod/frontend-organization-portal:1.39.1 volumes: - ./config/frontend/add-x-frame-options-header.conf:/config/add-x-frame-options.conf environment: EMBER_ENABLE_EDIT_CONTACT_DATA_FEATURE: "true" + EMBER_ENABLE_LEGAL_FORM_EDITABLE_FEATURE: "true" EMBER_OAUTH_API_REDIRECT_URL: "https://organisaties.abb.lblod.info/authorization/callback" EMBER_OAUTH_API_KEY: "677af572-2e2f-4e61-ad38-036723bb314c" EMBER_OAUTH_API_BASE_URL: "https://authenticatie-ti.vlaanderen.be/op/v1/auth" From bd81e44662692112f540ee8ed34299233e0ade4a Mon Sep 17 00:00:00 2001 From: Damon Date: Thu, 2 Jul 2026 16:37:54 +0200 Subject: [PATCH 12/17] OP-3810: added migration to handle in oprichting erediensten + changelog edit --- CHANGELOG.md | 3 +- ...anup-in-oprichting-worship-services.sparql | 85 +++++++++++++++++++ 2 files changed, 87 insertions(+), 1 deletion(-) create mode 100644 config/migrations/2026/20260630100000-cleanup-in-oprichting-worship-services.sparql diff --git a/CHANGELOG.md b/CHANGELOG.md index a24611b..aa8619b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,10 +6,11 @@ - Frontend [v1.38.0] - Added Juridische vorm [OP-3816] [OP-3820] - Frontend [v1.39.0] +- "In Oprichting" bestuursorgaan lifecycle [OP-3810] ### Deploy notes ``` -drc up -d link-adressenregister-uri frontend +drc up -d link-adressenregister-uri frontend construct-organization-relationships dispatcher drc restart resource migrations ``` diff --git a/config/migrations/2026/20260630100000-cleanup-in-oprichting-worship-services.sparql b/config/migrations/2026/20260630100000-cleanup-in-oprichting-worship-services.sparql new file mode 100644 index 0000000..2518fa7 --- /dev/null +++ b/config/migrations/2026/20260630100000-cleanup-in-oprichting-worship-services.sparql @@ -0,0 +1,85 @@ +PREFIX mandaat: +PREFIX ere: +PREFIX besluit: +PREFIX generiek: +PREFIX regorg: +PREFIX org: + +DELETE { + GRAPH { + ?otherOrgaanInTime ?p ?o . + ?s ?p2 ?otherOrgaanInTime . + } +} +WHERE { + GRAPH { + ?worshipService a ere:BestuurVanDeEredienst ; + regorg:orgStatus . + + ?bestuursorgaan besluit:bestuurt ?worshipService . + + ?otherOrgaanInTime generiek:isTijdspecialisatieVan ?bestuursorgaan . + + { + SELECT ?bestuursorgaan (SAMPLE(?orgaanInTime) AS ?keptOrgaanInTime) { + GRAPH { + ?orgaanInTime generiek:isTijdspecialisatieVan ?bestuursorgaan . + } + } + GROUP BY ?bestuursorgaan + } + + FILTER(?otherOrgaanInTime != ?keptOrgaanInTime) + + { ?otherOrgaanInTime ?p ?o . } + UNION + { ?s ?p2 ?otherOrgaanInTime . } + } +}; + +DELETE { + GRAPH { + ?mandate ?p ?o . + ?s ?p2 ?mandate . + } +} +WHERE { + GRAPH { + ?worshipService a ere:BestuurVanDeEredienst ; + regorg:orgStatus . + + ?bestuursorgaan besluit:bestuurt ?worshipService . + ?orgaanInTime generiek:isTijdspecialisatieVan ?bestuursorgaan . + + ?orgaanInTime org:hasPost ?mandate . + ?mandate a mandaat:Mandaat ; + org:role ?role . + + FILTER(?role NOT IN ( + , + , + + )) + + { ?mandate ?p ?o . } + UNION + { ?s ?p2 ?mandate . } + } +}; + +DELETE { + GRAPH { + ?orgaanInTime mandaat:bindingEinde ?endDate . + } +} +WHERE { + GRAPH { + ?worshipService a ere:BestuurVanDeEredienst ; + regorg:orgStatus . + + ?bestuursorgaan besluit:bestuurt ?worshipService . + ?orgaanInTime generiek:isTijdspecialisatieVan ?bestuursorgaan . + + ?orgaanInTime mandaat:bindingEinde ?endDate . + } +}; From 1a4453365fedd3be5dc41687a1a88d22258f3bb9 Mon Sep 17 00:00:00 2001 From: Damon Date: Thu, 2 Jul 2026 16:38:55 +0200 Subject: [PATCH 13/17] changelog --- CHANGELOG.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index aa8619b..c7279e5 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -10,8 +10,8 @@ ### Deploy notes ``` -drc up -d link-adressenregister-uri frontend construct-organization-relationships dispatcher -drc restart resource migrations +drc up -d link-adressenregister-uri frontend construct-organization-relationships +drc restart resource migrations dispatcher ``` ``` From f65d4297e8624aa4d13076f8ac928a7c00b04d07 Mon Sep 17 00:00:00 2001 From: Boris De Vloed Date: Fri, 3 Jul 2026 15:50:42 +0200 Subject: [PATCH 14/17] vereniging/vennootschap algemeen --- CHANGELOG.md | 6 ++-- ...me-generic-organization-type-labels.sparql | 31 +++++++++++++++++++ 2 files changed, 35 insertions(+), 2 deletions(-) create mode 100644 config/migrations/2026/20260619100000-onboarding-new-org-types/20260619100200-rename-generic-organization-type-labels.sparql diff --git a/CHANGELOG.md b/CHANGELOG.md index c7458f3..0e0ec67 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,6 +7,7 @@ - Added Juridische vorm [OP-3816] [OP-3820] - Frontend [v1.39.0] - Add new organization types (interlokale vereniging, vervoerregioraad, zorgraad, bosgroep, woonmaatschappij); add werkingsgebied (dct:spatial) to registered organizations [OP-3828] +- Rename generic organization types to "Vereniging algemeen" / "Vennootschap algemeen" [OP-3828] ### Deploy notes ``` @@ -20,10 +21,11 @@ drc up -d frontend scope-of-operation drc restart cache resource ``` -Release construct-organization-relationships-service first (build + publish image), then bump its tag in docker-compose. Then: ``` drc pull construct-organization-relationships && drc up -d construct-organization-relationships -drc restart migrations resource cache +drc restart migrations +drc restart resource cache +scripts/reset-elastic.sh ``` ## v1.40.0 diff --git a/config/migrations/2026/20260619100000-onboarding-new-org-types/20260619100200-rename-generic-organization-type-labels.sparql b/config/migrations/2026/20260619100000-onboarding-new-org-types/20260619100200-rename-generic-organization-type-labels.sparql new file mode 100644 index 0000000..6b52970 --- /dev/null +++ b/config/migrations/2026/20260619100000-onboarding-new-org-types/20260619100200-rename-generic-organization-type-labels.sparql @@ -0,0 +1,31 @@ +DELETE { + GRAPH { + ?oldLabel. + } +} +INSERT { + GRAPH { + "Vereniging algemeen". + } +} +WHERE { + GRAPH { + ?oldLabel. + } +}; + +DELETE { + GRAPH { + ?oldLabel. + } +} +INSERT { + GRAPH { + "Vennootschap algemeen". + } +} +WHERE { + GRAPH { + ?oldLabel. + } +} From e4b09d3295fde67ada5448ebc2da2bf68b506666 Mon Sep 17 00:00:00 2001 From: Sam Van Campenhout Date: Mon, 6 Jul 2026 16:21:34 +0200 Subject: [PATCH 15/17] Update the frontend to v1.40.0 https://github.com/lblod/frontend-organization-portal/blob/5d2147662f620d420f54b9624a12c42ca2ac964a/CHANGELOG.md#v1400-2026-07-06 --- CHANGELOG.md | 3 +-- docker-compose.yml | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 0e0ec67..09625b4 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,9 +3,8 @@ - Added service to link addresses to addressregister uris [OP-3795] - Derive an organization's reference region(s) from its werkingsgebied; bump scope-of-operation to 0.2.0 [OP-3799] - Site type changes [OP-3818] -- Frontend [v1.38.0] +- Frontend [v1.40.0](https://github.com/lblod/frontend-organization-portal/blob/5d2147662f620d420f54b9624a12c42ca2ac964a/CHANGELOG.md#v1400-2026-07-06), [v1.39.0](https://github.com/lblod/frontend-organization-portal/blob/5d2147662f620d420f54b9624a12c42ca2ac964a/CHANGELOG.md#v1390-2026-06-25) ,[v1.38.0](https://github.com/lblod/frontend-organization-portal/blob/5d2147662f620d420f54b9624a12c42ca2ac964a/CHANGELOG.md#v1380-2026-06-12) - Added Juridische vorm [OP-3816] [OP-3820] -- Frontend [v1.39.0] - Add new organization types (interlokale vereniging, vervoerregioraad, zorgraad, bosgroep, woonmaatschappij); add werkingsgebied (dct:spatial) to registered organizations [OP-3828] - Rename generic organization types to "Vereniging algemeen" / "Vennootschap algemeen" [OP-3828] diff --git a/docker-compose.yml b/docker-compose.yml index f451242..05b72e6 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -215,7 +215,7 @@ services: restart: always logging: *default-logging frontend: - image: lblod/frontend-organization-portal:1.39.1 + image: lblod/frontend-organization-portal:1.40.0 volumes: - ./config/frontend/add-x-frame-options-header.conf:/config/add-x-frame-options.conf environment: From f545b55075c2897f4d266fc0aadba445ecf66833 Mon Sep 17 00:00:00 2001 From: Damon Date: Tue, 7 Jul 2026 16:27:24 +0200 Subject: [PATCH 16/17] OP-3810: cleanup migration to keep currently active orgaan + remove mandates from removed organen --- ...eanup-in-oprichting-worship-services.sparql | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) diff --git a/config/migrations/2026/20260630100000-cleanup-in-oprichting-worship-services.sparql b/config/migrations/2026/20260630100000-cleanup-in-oprichting-worship-services.sparql index 2518fa7..70ba656 100644 --- a/config/migrations/2026/20260630100000-cleanup-in-oprichting-worship-services.sparql +++ b/config/migrations/2026/20260630100000-cleanup-in-oprichting-worship-services.sparql @@ -9,6 +9,8 @@ DELETE { GRAPH { ?otherOrgaanInTime ?p ?o . ?s ?p2 ?otherOrgaanInTime . + ?mandate ?mp ?mo . + ?ms ?mp2 ?mandate . } } WHERE { @@ -18,22 +20,30 @@ WHERE { ?bestuursorgaan besluit:bestuurt ?worshipService . - ?otherOrgaanInTime generiek:isTijdspecialisatieVan ?bestuursorgaan . - { - SELECT ?bestuursorgaan (SAMPLE(?orgaanInTime) AS ?keptOrgaanInTime) { + SELECT ?bestuursorgaan (MAX(?start) AS ?keptStart) { GRAPH { - ?orgaanInTime generiek:isTijdspecialisatieVan ?bestuursorgaan . + ?orgaanInTime generiek:isTijdspecialisatieVan ?bestuursorgaan ; + mandaat:bindingStart ?start . + FILTER(?start <= NOW()) } } GROUP BY ?bestuursorgaan } + ?keptOrgaanInTime generiek:isTijdspecialisatieVan ?bestuursorgaan ; + mandaat:bindingStart ?keptStart . + + ?otherOrgaanInTime generiek:isTijdspecialisatieVan ?bestuursorgaan . FILTER(?otherOrgaanInTime != ?keptOrgaanInTime) { ?otherOrgaanInTime ?p ?o . } UNION { ?s ?p2 ?otherOrgaanInTime . } + UNION + { ?otherOrgaanInTime org:hasPost ?mandate . ?mandate ?mp ?mo . } + UNION + { ?otherOrgaanInTime org:hasPost ?mandate . ?ms ?mp2 ?mandate . } } }; From f5a0a73812aab354cb8589a7cb1e4e68e5b1758c Mon Sep 17 00:00:00 2001 From: Damon Date: Thu, 9 Jul 2026 14:29:02 +0200 Subject: [PATCH 17/17] OP-3810: changelog edit --- CHANGELOG.md | 3 ++- docker-compose.yml | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 98ec610..f8125e2 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,10 +3,11 @@ - Added service to link addresses to addressregister uris [OP-3795] - Derive an organization's reference region(s) from its werkingsgebied; bump scope-of-operation to 0.2.0 [OP-3799] - Site type changes [OP-3818] -- Frontend [v1.40.0](https://github.com/lblod/frontend-organization-portal/blob/5d2147662f620d420f54b9624a12c42ca2ac964a/CHANGELOG.md#v1400-2026-07-06), [v1.39.0](https://github.com/lblod/frontend-organization-portal/blob/5d2147662f620d420f54b9624a12c42ca2ac964a/CHANGELOG.md#v1390-2026-06-25) ,[v1.38.0](https://github.com/lblod/frontend-organization-portal/blob/5d2147662f620d420f54b9624a12c42ca2ac964a/CHANGELOG.md#v1380-2026-06-12) +- Frontend [v1.40.1](https://github.com/lblod/frontend-organization-portal/blob/v1.40.1/CHANGELOG.md), [v1.40.0](https://github.com/lblod/frontend-organization-portal/blob/5d2147662f620d420f54b9624a12c42ca2ac964a/CHANGELOG.md#v1400-2026-07-06), [v1.39.0](https://github.com/lblod/frontend-organization-portal/blob/5d2147662f620d420f54b9624a12c42ca2ac964a/CHANGELOG.md#v1390-2026-06-25) ,[v1.38.0](https://github.com/lblod/frontend-organization-portal/blob/5d2147662f620d420f54b9624a12c42ca2ac964a/CHANGELOG.md#v1380-2026-06-12) - Added Juridische vorm [OP-3816] [OP-3820] - Add new organization types (interlokale vereniging, vervoerregioraad, zorgraad, bosgroep, woonmaatschappij); add werkingsgebied (dct:spatial) to registered organizations [OP-3828] - Rename generic organization types to "Vereniging algemeen" / "Vennootschap algemeen" [OP-3828] +- bump construct-organization-relationships [OP-3810] - "In Oprichting" bestuursorgaan lifecycle [OP-3810] ### Deploy notes diff --git a/docker-compose.yml b/docker-compose.yml index 05b72e6..1f6272e 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -215,7 +215,7 @@ services: restart: always logging: *default-logging frontend: - image: lblod/frontend-organization-portal:1.40.0 + image: lblod/frontend-organization-portal:1.40.1 volumes: - ./config/frontend/add-x-frame-options-header.conf:/config/add-x-frame-options.conf environment: @@ -308,7 +308,7 @@ services: restart: always logging: *default-logging construct-organization-relationships: - image: lblod/construct-organization-relationships-service:1.1.2 + image: lblod/construct-organization-relationships-service:1.1.3 links: - db:database labels: