From 76a0715df3f6da3b9f0f6a844b55cd746d846af1 Mon Sep 17 00:00:00 2001 From: Claire Lovisa Date: Thu, 14 Dec 2023 11:04:00 +0100 Subject: [PATCH 1/7] Add purpose and expected end date to producer (#361) --- config/delta-producer/organizations-public-info/export.json | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/config/delta-producer/organizations-public-info/export.json b/config/delta-producer/organizations-public-info/export.json index f3bb667..7336a51 100644 --- a/config/delta-producer/organizations-public-info/export.json +++ b/config/delta-producer/organizations-public-info/export.json @@ -80,7 +80,9 @@ "http://www.w3.org/ns/org#hasSubOrganization", "http://www.w3.org/ns/org#linkedTo", "http://www.w3.org/ns/org#resultedFrom", - "http://www.w3.org/ns/regorg#orgStatus" + "http://www.w3.org/ns/regorg#orgStatus", + "https://data.lblod.info/vocabularies/generiek/geplandeEindDatum", + "http://www.w3.org/ns/org#purpose" ] }, { From 9c322a2faba9143e0d6f343a1c2d13cfe58cf04e Mon Sep 17 00:00:00 2001 From: mirdono Date: Thu, 14 Dec 2023 14:24:15 +0100 Subject: [PATCH 2/7] Bump frontend version --- docker-compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker-compose.yml b/docker-compose.yml index e328563..1d31f10 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.20.0 + image: lblod/frontend-organization-portal:1.21.0-0 volumes: - ./config/frontend/add-x-frame-options-header.conf:/config/add-x-frame-options.conf environment: From 78ff81de653655908f0103c3928a2eb6888ab490 Mon Sep 17 00:00:00 2001 From: Claire Lovisa Date: Thu, 14 Dec 2023 16:47:47 +0100 Subject: [PATCH 3/7] Ignore publication triplestore data folder (#362) --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index ccfbba6..4b8e33a 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,5 @@ # Virtuoso files /data/db +/data/publication-triplestore/* /data/db.bck/** /data/db/* /data/db/virtuoso.ini From f104078cd60251f58a5b56a3e020ceeff81ce72d Mon Sep 17 00:00:00 2001 From: Claire Lovisa Date: Fri, 15 Dec 2023 09:07:36 +0100 Subject: [PATCH 4/7] Add placeholder variables to prevent deltanotifier being slow (#363) --- docker-compose.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/docker-compose.yml b/docker-compose.yml index 1d31f10..bd37ae6 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -245,6 +245,10 @@ services: INITIAL_SYNC_JOB_OPERATION: "http://redpencil.data.gift/id/jobs/concept/JobOperation/sp-sync/initialSyncing/organizations" HEALING_JOB_OPERATION: "http://redpencil.data.gift/id/jobs/concept/JobOperation/sp-sync/healingOperation/organizations" USE_VIRTUOSO_FOR_EXPENSIVE_SELECTS: "true" + USERNAME: 'username-to-override' + PASSWORD: 'password-to-override' + SITE: 'site-to-override' + LIST: 'list-to-override' links: - db:database volumes: From 53bbc003279fb659b0b45e7d7b5427604aa61af8 Mon Sep 17 00:00:00 2001 From: Claire Lovisa Date: Mon, 18 Dec 2023 13:30:21 +0100 Subject: [PATCH 5/7] Replace https by http in lblodlg prefix (#364) This prefix has wrongly been defined with https instead of http. Luckily, it has no impact on the data because everywhere where it has been defined that way, it also never has been used. So here we just rectify the (unused) prefixes to avoid bringing further confusion. --- .../2022/20220719112423-update-toezicht.sparql.disabled | 2 +- .../2022/20220819133740-delete-bestrokke-islam-orthodox.sparql | 2 +- config/migrations/2022/20220822133740-delete-bestrokke.sparql | 2 +- config/migrations/2022/20221007132340-delete-bestrokke.sparql | 2 +- .../20221015132000-delete-bestrokken-besturen-hemiksem.sparql | 2 +- .../2022/20221015134000-delete-bestrokken-besturen-ronse.sparql | 2 +- .../20221019174000-delete-bestrokken-besturen-anglican.sparql | 2 +- config/migrations/2022/20221222160000-fix-kbo-uris.sparql | 2 +- .../20230616110000-street-and-bus-number-concatination.sparql | 2 +- .../migrations/2023/20230627110500-add-missing-country.sparql | 2 +- .../2023/20230627111000-add-country-to-full-address.sparql | 2 +- config/reports/utils.js | 2 +- 12 files changed, 12 insertions(+), 12 deletions(-) diff --git a/config/migrations/2022/20220719112423-update-toezicht.sparql.disabled b/config/migrations/2022/20220719112423-update-toezicht.sparql.disabled index 36ae9d7..4068e50 100644 --- a/config/migrations/2022/20220719112423-update-toezicht.sparql.disabled +++ b/config/migrations/2022/20220719112423-update-toezicht.sparql.disabled @@ -14,7 +14,7 @@ PREFIX adres: PREFIX generiek: PREFIX mandaat: PREFIX besluit: -PREFIX lblodlg: +PREFIX lblodlg: PREFIX dc_terms: PREFIX foaf: PREFIX skos: diff --git a/config/migrations/2022/20220819133740-delete-bestrokke-islam-orthodox.sparql b/config/migrations/2022/20220819133740-delete-bestrokke-islam-orthodox.sparql index 1f96d85..abfa6fa 100644 --- a/config/migrations/2022/20220819133740-delete-bestrokke-islam-orthodox.sparql +++ b/config/migrations/2022/20220819133740-delete-bestrokke-islam-orthodox.sparql @@ -15,7 +15,7 @@ PREFIX generiek: PREFIX mandaat: PREFIX besluit: - PREFIX lblodlg: + PREFIX lblodlg: PREFIX dc_terms: PREFIX foaf: PREFIX skos: diff --git a/config/migrations/2022/20220822133740-delete-bestrokke.sparql b/config/migrations/2022/20220822133740-delete-bestrokke.sparql index 974e5f5..15482e4 100644 --- a/config/migrations/2022/20220822133740-delete-bestrokke.sparql +++ b/config/migrations/2022/20220822133740-delete-bestrokke.sparql @@ -15,7 +15,7 @@ PREFIX generiek: PREFIX mandaat: PREFIX besluit: - PREFIX lblodlg: + PREFIX lblodlg: PREFIX dc_terms: PREFIX foaf: PREFIX skos: diff --git a/config/migrations/2022/20221007132340-delete-bestrokke.sparql b/config/migrations/2022/20221007132340-delete-bestrokke.sparql index 837c062..5e5dc77 100644 --- a/config/migrations/2022/20221007132340-delete-bestrokke.sparql +++ b/config/migrations/2022/20221007132340-delete-bestrokke.sparql @@ -15,7 +15,7 @@ PREFIX generiek: PREFIX mandaat: PREFIX besluit: - PREFIX lblodlg: + PREFIX lblodlg: PREFIX dc_terms: PREFIX foaf: PREFIX skos: diff --git a/config/migrations/2022/20221015132000-delete-bestrokken-besturen-hemiksem.sparql b/config/migrations/2022/20221015132000-delete-bestrokken-besturen-hemiksem.sparql index 53fdb90..f144564 100644 --- a/config/migrations/2022/20221015132000-delete-bestrokken-besturen-hemiksem.sparql +++ b/config/migrations/2022/20221015132000-delete-bestrokken-besturen-hemiksem.sparql @@ -15,7 +15,7 @@ PREFIX adres: PREFIX generiek: PREFIX mandaat: PREFIX besluit: -PREFIX lblodlg: +PREFIX lblodlg: PREFIX dc_terms: PREFIX foaf: PREFIX skos: diff --git a/config/migrations/2022/20221015134000-delete-bestrokken-besturen-ronse.sparql b/config/migrations/2022/20221015134000-delete-bestrokken-besturen-ronse.sparql index 2331e30..69dee20 100644 --- a/config/migrations/2022/20221015134000-delete-bestrokken-besturen-ronse.sparql +++ b/config/migrations/2022/20221015134000-delete-bestrokken-besturen-ronse.sparql @@ -15,7 +15,7 @@ PREFIX adres: PREFIX generiek: PREFIX mandaat: PREFIX besluit: -PREFIX lblodlg: +PREFIX lblodlg: PREFIX dc_terms: PREFIX foaf: PREFIX skos: diff --git a/config/migrations/2022/20221019174000-delete-bestrokken-besturen-anglican.sparql b/config/migrations/2022/20221019174000-delete-bestrokken-besturen-anglican.sparql index 50fc173..e90845f 100644 --- a/config/migrations/2022/20221019174000-delete-bestrokken-besturen-anglican.sparql +++ b/config/migrations/2022/20221019174000-delete-bestrokken-besturen-anglican.sparql @@ -15,7 +15,7 @@ PREFIX adres: PREFIX generiek: PREFIX mandaat: PREFIX besluit: -PREFIX lblodlg: +PREFIX lblodlg: PREFIX dc_terms: PREFIX foaf: PREFIX skos: diff --git a/config/migrations/2022/20221222160000-fix-kbo-uris.sparql b/config/migrations/2022/20221222160000-fix-kbo-uris.sparql index 54cc7f6..4ed1a91 100644 --- a/config/migrations/2022/20221222160000-fix-kbo-uris.sparql +++ b/config/migrations/2022/20221222160000-fix-kbo-uris.sparql @@ -21,7 +21,7 @@ PREFIX euvoc: PREFIX ext: PREFIX foaf: PREFIX generiek: -PREFIX lblodlg: +PREFIX lblodlg: PREFIX locn: PREFIX mandaat: PREFIX mu: diff --git a/config/migrations/2023/20230616110000-street-and-bus-number-concatination.sparql b/config/migrations/2023/20230616110000-street-and-bus-number-concatination.sparql index daf8db8..55f3430 100644 --- a/config/migrations/2023/20230616110000-street-and-bus-number-concatination.sparql +++ b/config/migrations/2023/20230616110000-street-and-bus-number-concatination.sparql @@ -14,7 +14,7 @@ PREFIX adres: PREFIX generiek: PREFIX mandaat: PREFIX besluit: -PREFIX lblodlg: +PREFIX lblodlg: PREFIX dc_terms: PREFIX foaf: PREFIX skos: diff --git a/config/migrations/2023/20230627110500-add-missing-country.sparql b/config/migrations/2023/20230627110500-add-missing-country.sparql index 1fa5962..cade850 100644 --- a/config/migrations/2023/20230627110500-add-missing-country.sparql +++ b/config/migrations/2023/20230627110500-add-missing-country.sparql @@ -14,7 +14,7 @@ PREFIX adres: PREFIX generiek: PREFIX mandaat: PREFIX besluit: -PREFIX lblodlg: +PREFIX lblodlg: PREFIX dc_terms: PREFIX foaf: PREFIX skos: diff --git a/config/migrations/2023/20230627111000-add-country-to-full-address.sparql b/config/migrations/2023/20230627111000-add-country-to-full-address.sparql index 86552ec..f11c303 100644 --- a/config/migrations/2023/20230627111000-add-country-to-full-address.sparql +++ b/config/migrations/2023/20230627111000-add-country-to-full-address.sparql @@ -14,7 +14,7 @@ PREFIX adres: PREFIX generiek: PREFIX mandaat: PREFIX besluit: -PREFIX lblodlg: +PREFIX lblodlg: PREFIX dc_terms: PREFIX foaf: PREFIX skos: diff --git a/config/reports/utils.js b/config/reports/utils.js index fdda6e4..42c9732 100644 --- a/config/reports/utils.js +++ b/config/reports/utils.js @@ -12,7 +12,7 @@ export const PREFIXES = ` PREFIX ext: PREFIX foaf: PREFIX generiek: - PREFIX lblodlg: + PREFIX lblodlg: PREFIX locn: PREFIX mandaat: PREFIX org: From 9c8616ffab1d5769383c3cba55c23d63c7adeb2b Mon Sep 17 00:00:00 2001 From: Claire Lovisa Date: Tue, 19 Dec 2023 12:00:04 +0100 Subject: [PATCH 6/7] Add fusion change events for gemeenten and ocmws from 2019 (#365) --- ...2317-add-fusions-gemeente-ocmw-2019.sparql | 162 ++++++++++++++++++ 1 file changed, 162 insertions(+) create mode 100644 config/migrations/2023/20231218162317-add-fusions-gemeente-ocmw-2019.sparql diff --git a/config/migrations/2023/20231218162317-add-fusions-gemeente-ocmw-2019.sparql b/config/migrations/2023/20231218162317-add-fusions-gemeente-ocmw-2019.sparql new file mode 100644 index 0000000..784b213 --- /dev/null +++ b/config/migrations/2023/20231218162317-add-fusions-gemeente-ocmw-2019.sparql @@ -0,0 +1,162 @@ +PREFIX org: +PREFIX dct: +PREFIX ch: +PREFIX lblodOrg: +PREFIX ext: +PREFIX mu: + +INSERT { + GRAPH { + ?changeEvent a org:ChangeEvent ; + mu:uuid ?uuidChangeEvent ; + ch:typeWijziging ; + org:resultingOrganization ?resultingOrg ; + dct:date "2019-01-01"^^xsd:date ; + dct:description ?description ; + org:originalOrganization ?firstOrgToMerge ; + org:originalOrganization ?secondOrgToMerge ; + lblodOrg:veranderingsgebeurtenisResultaat ?changeEventFirstNotActiveResult ; + lblodOrg:veranderingsgebeurtenisResultaat ?changeEventSecondNotActiveResult ; + lblodOrg:veranderingsgebeurtenisResultaat ?changeEventActiveResult . + + ?changeEventFirstNotActiveResult a lblodOrg:VeranderingsgebeurtenisResultaat ; + mu:uuid ?uuidChangeEventFirstNotActiveResult ; + lblodOrg:resulterendeStatus ; # not active + ext:resultingOrganization ?firstOrgToMerge . + + ?changeEventSecondNotActiveResult a lblodOrg:VeranderingsgebeurtenisResultaat ; + mu:uuid ?uuidChangeEventSecondNotActiveResult ; + lblodOrg:resulterendeStatus ; # not active + ext:resultingOrganization ?secondOrgToMerge . + + ?changeEventActiveResult a lblodOrg:VeranderingsgebeurtenisResultaat ; + mu:uuid ?uuidChangeEventActiveResult ; + lblodOrg:resulterendeStatus ; # active + ext:resultingOrganization ?resultingOrg . + } +} WHERE { + VALUES (?firstOrgToMerge ?secondOrgToMerge ?resultingOrg) { + ( ) # Gemeente Oudsbergen + ( ) # OCMW Oudsbergen + ( ) # Gemeente Pelt + ( ) # OCMW Pelt + ( ) # Gemeente Puurs-Sint-Amands + ( ) # OCMW Puurs-Sint-Amands + ( ) # Gemeente Aalter + ( ) # OCMW Aalter + ( ) # Gemeente Deinze + ( ) # OCMW Deinze + ( ) # Gemeente Kruisem + ( ) # OCMW Kruisem + } + + VALUES ?g { + + + } + + GRAPH ?g { + ?firstOrgToMerge skos:prefLabel ?labelFirstOrg . + ?secondOrgToMerge skos:prefLabel ?labelSecondOrg . + ?resultingOrg skos:prefLabel ?labelResultingOrg ; + org:classification ?classification . + } + + GRAPH { + ?classification skos:prefLabel ?classificationResultingOrg . + } + + BIND(CONCAT("Fusie tussen ", ?labelFirstOrg," en ", ?labelSecondOrg, " resulteert in ", ?classificationResultingOrg, " ", ?labelResultingOrg) as ?description) + + BIND(SHA256(CONCAT(STR(?firstOrgToMerge), STR(?secondOrgToMerge), STR(?resultingOrg),"fusieChangeEvent")) AS ?uuidChangeEvent) . + BIND(IRI(CONCAT("http://data.lblod.info/id/veranderingsgebeurtenissen/", STR(?uuidChangeEvent))) AS ?changeEvent) . + + BIND(SHA256(CONCAT(STR(?firstOrgToMerge),"fusieChangeEventFirstNotActiveResult")) AS ?uuidChangeEventFirstNotActiveResult) . + BIND(IRI(CONCAT("http://lblod.data.info/id/veranderingsgebeurtenis-resultaten/", STR(?uuidChangeEventFirstNotActiveResult))) AS ?changeEventFirstNotActiveResult) . + + BIND(SHA256(CONCAT(STR(?secondOrgToMerge),"fusieChangeEventSecondNotActiveResult")) AS ?uuidChangeEventSecondNotActiveResult) . + BIND(IRI(CONCAT("http://lblod.data.info/id/veranderingsgebeurtenis-resultaten/", STR(?uuidChangeEventSecondNotActiveResult))) AS ?changeEventSecondNotActiveResult) . + + + BIND(SHA256(CONCAT(STR(?firstOrgToMerge), STR(?secondOrgToMerge), STR(?resultingOrg),"fusieChangeEventActiveResult")) AS ?uuidChangeEventActiveResult) . + BIND(IRI(CONCAT("http://lblod.data.info/id/veranderingsgebeurtenis-resultaten/", STR(?uuidChangeEventActiveResult))) AS ?changeEventActiveResult) . +} + +; + +INSERT { + GRAPH { + ?changeEvent a org:ChangeEvent ; + mu:uuid ?uuidChangeEvent ; + ch:typeWijziging ; + org:resultingOrganization ?resultingOrg ; + dct:date "2019-01-01"^^xsd:date ; + dct:description ?description ; + org:originalOrganization ?firstOrgToMerge ; + org:originalOrganization ?secondOrgToMerge ; + org:originalOrganization ?thirdOrgToMerge ; + lblodOrg:veranderingsgebeurtenisResultaat ?changeEventFirstNotActiveResult ; + lblodOrg:veranderingsgebeurtenisResultaat ?changeEventSecondNotActiveResult ; + lblodOrg:veranderingsgebeurtenisResultaat ?changeEventThirdNotActiveResult ; + lblodOrg:veranderingsgebeurtenisResultaat ?changeEventActiveResult . + + ?changeEventFirstNotActiveResult a lblodOrg:VeranderingsgebeurtenisResultaat ; + mu:uuid ?uuidChangeEventFirstNotActiveResult ; + lblodOrg:resulterendeStatus ; # not active + ext:resultingOrganization ?firstOrgToMerge . + + ?changeEventSecondNotActiveResult a lblodOrg:VeranderingsgebeurtenisResultaat ; + mu:uuid ?uuidChangeEventSecondNotActiveResult ; + lblodOrg:resulterendeStatus ; # not active + ext:resultingOrganization ?secondOrgToMerge . + + ?changeEventThirdNotActiveResult a lblodOrg:VeranderingsgebeurtenisResultaat ; + mu:uuid ?uuidChangeEventThirdNotActiveResult ; + lblodOrg:resulterendeStatus ; # not active + ext:resultingOrganization ?thirdOrgToMerge . + + ?changeEventActiveResult a lblodOrg:VeranderingsgebeurtenisResultaat ; + mu:uuid ?uuidChangeEventActiveResult ; + lblodOrg:resulterendeStatus ; # active + ext:resultingOrganization ?resultingOrg . + } +} WHERE { + VALUES (?firstOrgToMerge ?secondOrgToMerge ?thirdOrgToMerge ?resultingOrg) { + ( ) # Gemeente Lievegem + ( ) # OCMW Lievegem + } + + VALUES ?g { + + + } + + GRAPH ?g { + ?firstOrgToMerge skos:prefLabel ?labelFirstOrg . + ?secondOrgToMerge skos:prefLabel ?labelSecondOrg . + ?thirdOrgToMerge skos:prefLabel ?labelThirdOrg . + ?resultingOrg skos:prefLabel ?labelResultingOrg ; + org:classification ?classification . + } + + GRAPH { + ?classification skos:prefLabel ?classificationResultingOrg . + } + + BIND(CONCAT("Fusie tussen ", ?labelFirstOrg, ", ", ?labelSecondOrg," en ", ?labelThirdOrg, " resulteert in ", ?classificationResultingOrg, " ", ?labelResultingOrg) as ?description) + + BIND(SHA256(CONCAT(STR(?firstOrgToMerge), STR(?secondOrgToMerge), STR(?thirdOrgToMerge), STR(?resultingOrg),"fusieChangeEvent")) AS ?uuidChangeEvent) . + BIND(IRI(CONCAT("http://data.lblod.info/id/veranderingsgebeurtenissen/", STR(?uuidChangeEvent))) AS ?changeEvent) . + + BIND(SHA256(CONCAT(STR(?firstOrgToMerge),"fusieChangeEventFirstNotActiveResult")) AS ?uuidChangeEventFirstNotActiveResult) . + BIND(IRI(CONCAT("http://lblod.data.info/id/veranderingsgebeurtenis-resultaten/", STR(?uuidChangeEventFirstNotActiveResult))) AS ?changeEventFirstNotActiveResult) . + + BIND(SHA256(CONCAT(STR(?secondOrgToMerge),"fusieChangeEventSecondNotActiveResult")) AS ?uuidChangeEventSecondNotActiveResult) . + BIND(IRI(CONCAT("http://lblod.data.info/id/veranderingsgebeurtenis-resultaten/", STR(?uuidChangeEventSecondNotActiveResult))) AS ?changeEventSecondNotActiveResult) . + + BIND(SHA256(CONCAT(STR(?thirdOrgToMerge),"fusieChangeEventThirdNotActiveResult")) AS ?uuidChangeEventThirdNotActiveResult) . + BIND(IRI(CONCAT("http://lblod.data.info/id/veranderingsgebeurtenis-resultaten/", STR(?uuidChangeEventThirdNotActiveResult))) AS ?changeEventThirdNotActiveResult) . + + BIND(SHA256(CONCAT(STR(?resultingOrg),"fusieChangeEventActiveResult")) AS ?uuidChangeEventActiveResult) . + BIND(IRI(CONCAT("http://lblod.data.info/id/veranderingsgebeurtenis-resultaten/", STR(?uuidChangeEventActiveResult))) AS ?changeEventActiveResult) . +} From 518db8fb3f004106054066d0f79cee3fd474abdd Mon Sep 17 00:00:00 2001 From: Claire Lovisa Date: Tue, 19 Dec 2023 17:00:30 +0100 Subject: [PATCH 7/7] 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: