felix.ruizdearcaute/app-organization-portal
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'development' into feature/db-cleanup-werkingsgebieden-codelist

Browse Source
This commit is contained in:
NikiDeVisscher
2026-08-07 16:31:43 +02:00
parent 18c803410a 88059fd091
commit 1eb487eeb2
7 changed files with 199 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
CHANGELOG.md
View File

@@ -16,6 +16,12 @@
- Add a new "Wijkkantoor" site type [OP-3837]
- cleanup local involvement herne [OP-3858]
- Search organizations by vendor [OP-3808]
- Add organization types "Regionaal zorgplatform" (altLabel "Regionale zorgzone") and residual "Andere" [OP-3844]
- Move organizations from "Vereniging algemeen" / "Vennootschap algemeen" to "Andere"; delete those codes [OP-3844]
- Bump construct-organization-relationships [OP-3844]
- Frontend [v1.40.5](https://github.com/lblod/frontend-organization-portal/blob/v1.40.5/CHANGELOG.md) [OP-3844] [OP-3808] [OP-3849]
- Consume and serve provenance properties on harvested Worship positions [DL-7437]
- Frontend [v1.41.0](https://github.com/lblod/frontend-organization-portal/blob/v1.41.0/CHANGELOG.md) [DL-7438]
- Keep werkingsgebied filter up to date via db-cleanup service [OP-3841]
### Deploy notes
@@ -46,6 +52,15 @@ drc up -d frontend
drc restart migrations
drc restart db-cleanup
```
```
# requires frontend >= 1.40.5 and construct-organization-relationships >= 1.1.4 (both bumped in compose here)
drc pull construct-organization-relationships && drc up -d construct-organization-relationships
drc restart migrations-triggering-indexing
drc up -d frontend
drc restart cache resource
```
## v1.41.0
- added explicit healtchecks [DL-7466]

7
config/delta-consumers/worship-services-main-info/mapping/queries/dl2op/pass/person.sparql
View File

@@ -7,7 +7,12 @@ CONSTRUCT {
FILTER (?p IN (
<http://www.w3.org/1999/02/22-rdf-syntax-ns#type>,
<http://mu.semte.ch/vocabularies/core/uuid>,
<http://xmlns.com/foaf/0.1/familyName>
<http://xmlns.com/foaf/0.1/familyName>,
<http://www.w3.org/2002/07/owl#sameAs>,
<http://www.w3.org/ns/prov#wasGeneratedBy>,
<http://www.w3.org/ns/prov#wasAssociatedWith>,
<http://redpencil.data.gift/vocabularies/tasks/modifiedOn>,
<http://redpencil.data.gift/vocabularies/tasks/modifiedBy>
))
FILTER NOT EXISTS {

25
config/migrations-triggering-indexing/2026/20260714162242-restructure-other-org-types/20260714162242-add-zorgplatform-and-andere-classification-codes.sparql Normal file
View File

@@ -0,0 +1,25 @@
PREFIX rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#>
PREFIX skos: <http://www.w3.org/2004/02/skos/core#>
PREFIX mu: <http://mu.semte.ch/vocabularies/core/>
PREFIX ext: <http://mu.semte.ch/vocabularies/ext/>
PREFIX scheme: <http://data.vlaanderen.be/id/conceptscheme/>
INSERT DATA {
GRAPH <http://mu.semte.ch/graphs/public> {
<http://data.vlaanderen.be/id/concept/GeregistreerdeOrganisatieClassificatieCode/e3afe092-6ca6-4685-94c6-1ee20811efc4>
rdf:type ext:OrganizationClassificationCode , ext:GeregistreerdeOrganisatieClassificatieCode ;
mu:uuid "e3afe092-6ca6-4685-94c6-1ee20811efc4" ;
skos:prefLabel "Regionaal zorgplatform" ;
skos:altLabel "Regionale zorgzone" ;
skos:topConceptOf scheme:GeregistreerdeOrganisatieClassificatieCode ;
skos:inScheme scheme:GeregistreerdeOrganisatieClassificatieCode , <http://lblod.data.gift/concept-schemes/10caf4a4-1ff5-4c05-917e-56489910d68b> .
<http://data.vlaanderen.be/id/concept/GeregistreerdeOrganisatieClassificatieCode/7a199d27-31c3-44bb-a58f-b3a64673a8b6>
rdf:type ext:OrganizationClassificationCode , ext:GeregistreerdeOrganisatieClassificatieCode ;
mu:uuid "7a199d27-31c3-44bb-a58f-b3a64673a8b6" ;
skos:prefLabel "Andere" ;
skos:definition "Restcategorie: geregistreerde organisatie die niet onder een van de andere classificaties valt." ;
skos:topConceptOf scheme:GeregistreerdeOrganisatieClassificatieCode ;
skos:inScheme scheme:GeregistreerdeOrganisatieClassificatieCode , <http://lblod.data.gift/concept-schemes/10caf4a4-1ff5-4c05-917e-56489910d68b> .
}
}

24
config/migrations-triggering-indexing/2026/20260714162242-restructure-other-org-types/20260714162300-move-orgs-to-andere.sparql Normal file
View File

@@ -0,0 +1,24 @@
PREFIX org: <http://www.w3.org/ns/org#>
PREFIX skos: <http://www.w3.org/2004/02/skos/core#>
PREFIX ext: <http://mu.semte.ch/vocabularies/ext/>
# All graphs authorized for regorg:RegisteredOrganization (see config/authorization/config.lisp),
# so no dangling org:classification survives the code deletion in the next migration.
DELETE {
GRAPH ?g { ?org org:classification ?legacy . }
}
INSERT {
GRAPH ?g { ?org org:classification <http://data.vlaanderen.be/id/concept/GeregistreerdeOrganisatieClassificatieCode/7a199d27-31c3-44bb-a58f-b3a64673a8b6> . }
}
WHERE {
VALUES ?g {
<http://mu.semte.ch/graphs/administrative-unit>
<http://mu.semte.ch/graphs/shared>
<http://mu.semte.ch/graphs/worship-service>
}
VALUES ?legacy {
<http://data.vlaanderen.be/id/concept/GeregistreerdeOrganisatieClassificatieCode/3e5c8e30-95a7-47b0-b0a4-210d5bd440a7>
<http://data.vlaanderen.be/id/concept/GeregistreerdeOrganisatieClassificatieCode/b9ed22af-3661-4c3e-b07f-b641d80ebf61>
}
GRAPH ?g { ?org org:classification ?legacy . }
}

13
config/migrations-triggering-indexing/2026/20260714162242-restructure-other-org-types/20260714162400-delete-legacy-other-classification-codes.sparql Normal file
View File

@@ -0,0 +1,13 @@
PREFIX skos: <http://www.w3.org/2004/02/skos/core#>
PREFIX ext: <http://mu.semte.ch/vocabularies/ext/>
DELETE {
GRAPH <http://mu.semte.ch/graphs/public> { ?code ?p ?o . }
}
WHERE {
VALUES ?code {
<http://data.vlaanderen.be/id/concept/GeregistreerdeOrganisatieClassificatieCode/3e5c8e30-95a7-47b0-b0a4-210d5bd440a7>
<http://data.vlaanderen.be/id/concept/GeregistreerdeOrganisatieClassificatieCode/b9ed22af-3661-4c3e-b07f-b641d80ebf61>
}
GRAPH <http://mu.semte.ch/graphs/public> { ?code ?p ?o . }
}

115
config/resources/domain.json
View File

@@ -32,7 +32,10 @@
"nacebel": "http://data.gift/vocabularies/nace-bel/",
"time": "http://www.w3.org/2006/time#",
"muAccount": "http://mu.semte.ch/vocabularies/account/",
"sh": "http://www.w3.org/ns/shacl#"
"sh": "http://www.w3.org/ns/shacl#",
"rdfs": "http://www.w3.org/2000/01/rdf-schema#",
"owl": "http://www.w3.org/2002/07/owl#",
"task": "http://redpencil.data.gift/vocabularies/tasks/"
},
"resources": {
"agents": {
@@ -66,9 +69,30 @@
"first-name-used": {
"type": "string",
"predicate": "persoon:gebruikteVoornaam"
},
"harvest-source": {
"type": "string",
"predicate": "prov:wasGeneratedBy"
},
"harvest-original-uri": {
"type": "uri",
"predicate": "owl:sameAs"
},
"harvest-date": {
"type": "datetime",
"predicate": "task:modifiedOn"
},
"harvest-job": {
"type": "uri",
"predicate": "task:modifiedBy"
}
},
"relationships": {
"vendor": {
"predicate": "prov:wasAssociatedWith",
"target": "vendors",
"cardinality": "one"
},
"mandatories": {
"predicate": "mandaat:isBestuurlijkeAliasVan",
"target": "mandatories",
@@ -101,9 +125,34 @@
"agent-end-date": {
"type": "datetime",
"predicate": "ch:eindedatum"
},
"harvest-source": {
"type": "string",
"predicate": "prov:wasGeneratedBy"
},
"harvest-original-uri": {
"type": "uri",
"predicate": "owl:sameAs"
},
"harvest-date": {
"type": "datetime",
"predicate": "task:modifiedOn"
},
"harvest-job": {
"type": "uri",
"predicate": "task:modifiedBy"
},
"harvestLink": {
"type": "uri",
"predicate": "rdfs:seeAlso"
}
},
"relationships": {
"vendor": {
"predicate": "prov:wasAssociatedWith",
"target": "vendors",
"cardinality": "one"
},
"person": {
"predicate": "org:heldBy",
"target": "people",
@@ -197,9 +246,30 @@
"reason-stopped": {
"type": "string",
"predicate": "ere:redenVanStopzetting"
},
"harvest-source": {
"type": "string",
"predicate": "prov:wasGeneratedBy"
},
"harvest-original-uri": {
"type": "uri",
"predicate": "owl:sameAs"
},
"harvest-date": {
"type": "datetime",
"predicate": "task:modifiedOn"
},
"harvest-job": {
"type": "uri",
"predicate": "task:modifiedBy"
}
},
"relationships": {
"vendor": {
"predicate": "prov:wasAssociatedWith",
"target": "vendors",
"cardinality": "one"
},
"type-half": {
"predicate": "ere:typeHelft",
"target": "half-elections",
@@ -240,9 +310,30 @@
"type": {
"type": "string",
"predicate": "schema:contactType"
},
"harvest-source": {
"type": "string",
"predicate": "prov:wasGeneratedBy"
},
"harvest-original-uri": {
"type": "uri",
"predicate": "owl:sameAs"
},
"harvest-date": {
"type": "datetime",
"predicate": "task:modifiedOn"
},
"harvest-job": {
"type": "uri",
"predicate": "task:modifiedBy"
}
},
"relationships": {
"vendor": {
"predicate": "prov:wasAssociatedWith",
"target": "vendors",
"cardinality": "one"
},
"contact-address": {
"predicate": "locn:address",
"target": "addresses",
@@ -603,6 +694,7 @@
"cardinality": "many"
}
},
"features": ["include-uri"],
"new-resource-base": "http://data.lblod.info/vendors/"
},
"worship-services": {
@@ -846,9 +938,30 @@
"address-register-uri": {
"type": "url",
"predicate": "adres:verwijstNaar"
},
"harvest-source": {
"type": "string",
"predicate": "prov:wasGeneratedBy"
},
"harvest-original-uri": {
"type": "uri",
"predicate": "owl:sameAs"
},
"harvest-date": {
"type": "datetime",
"predicate": "task:modifiedOn"
},
"harvest-job": {
"type": "uri",
"predicate": "task:modifiedBy"
}
},
"relationships": {
"vendor": {
"predicate": "prov:wasAssociatedWith",
"target": "vendors",
"cardinality": "one"
},
"source": {
"predicate": "dc_terms:source",
"target": "concepts",

4
docker-compose.yml
View File

@@ -215,7 +215,7 @@ services:
restart: always
logging: *default-logging
frontend:
image: lblod/frontend-organization-portal:1.40.4
image: lblod/frontend-organization-portal:1.41.0
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.3
image: lblod/construct-organization-relationships-service:1.1.4
links:
- db:database
labels: