diff --git a/CHANGELOG.md b/CHANGELOG.md index 2984659..af2dd66 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -13,7 +13,7 @@ - Inhoudelijk thema [OP-3817] - Werkingsgebied (dct:spatial) for private OCMW associations [OP-3832] - Add organization types "Regionaal zorgplatform" (altLabel "Regionale zorgzone") and residual "Andere" [OP-3844] -- Move organizations from "Vereniging algemeen" / "Vennootschap algemeen" / "Energieholdings en -participaties" to "Andere"; delete those codes [OP-3844] +- Move organizations from "Vereniging algemeen" / "Vennootschap algemeen" to "Andere"; delete those codes [OP-3844] - Bump construct-organization-relationships [OP-3844] ### Deploy notes @@ -49,7 +49,8 @@ drc up -d frontend ``` ``` -# requires compose bumps first: construct-organization-relationships 1.1.4, frontend >= 1.40.3 +# requires: construct-organization-relationships v1.1.4 released (bumped in compose here), +# and frontend bumped to the release containing frontend-organization-portal#720 drc pull construct-organization-relationships && drc up -d construct-organization-relationships drc restart migrations-triggering-indexing drc up -d frontend diff --git a/config/migrations-triggering-indexing/2026/20260714162242-restructure-other-org-types/20260714162300-move-orgs-to-andere.sparql b/config/migrations-triggering-indexing/2026/20260714162242-restructure-other-org-types/20260714162300-move-orgs-to-andere.sparql index 18cef29..ba5fc26 100644 --- a/config/migrations-triggering-indexing/2026/20260714162242-restructure-other-org-types/20260714162300-move-orgs-to-andere.sparql +++ b/config/migrations-triggering-indexing/2026/20260714162242-restructure-other-org-types/20260714162300-move-orgs-to-andere.sparql @@ -2,6 +2,8 @@ PREFIX org: PREFIX skos: PREFIX 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 . } } @@ -9,28 +11,14 @@ INSERT { GRAPH ?g { ?org org:classification . } } WHERE { - BIND( AS ?g) + VALUES ?g { + + + + } VALUES ?legacy { } GRAPH ?g { ?org org:classification ?legacy . } } - -; - -DELETE { - GRAPH ?g { ?org org:classification ?legacy . } -} -INSERT { - GRAPH ?g { ?org org:classification . } -} -WHERE { - BIND( AS ?g) - GRAPH { - ?legacy a ext:OrganizationClassificationCode ; - skos:prefLabel ?label . - FILTER(REGEX(STR(?label), "^Energieholding", "i")) - } - GRAPH ?g { ?org org:classification ?legacy . } -} diff --git a/config/migrations-triggering-indexing/2026/20260714162242-restructure-other-org-types/20260714162400-delete-legacy-other-classification-codes.sparql b/config/migrations-triggering-indexing/2026/20260714162242-restructure-other-org-types/20260714162400-delete-legacy-other-classification-codes.sparql index 62553a6..56b577c 100644 --- a/config/migrations-triggering-indexing/2026/20260714162242-restructure-other-org-types/20260714162400-delete-legacy-other-classification-codes.sparql +++ b/config/migrations-triggering-indexing/2026/20260714162242-restructure-other-org-types/20260714162400-delete-legacy-other-classification-codes.sparql @@ -11,17 +11,3 @@ WHERE { } GRAPH { ?code ?p ?o . } } - -; - -DELETE { - GRAPH { ?code ?p ?o . } -} -WHERE { - GRAPH { - ?code a ext:OrganizationClassificationCode ; - skos:prefLabel ?label . - FILTER(REGEX(STR(?label), "^Energieholding", "i")) - ?code ?p ?o . - } -} diff --git a/docker-compose.yml b/docker-compose.yml index f848133..88e8263 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -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: