diff --git a/config/authorization/config.ex b/config/authorization/config.ex index 2befca8..d1784cb 100644 --- a/config/authorization/config.ex +++ b/config/authorization/config.ex @@ -23,7 +23,6 @@ defmodule Acl.UserGroups.Config do "http://www.w3.org/ns/org#ChangeEvent", "http://data.lblod.info/vocabularies/erediensten/BetrokkenLokaleBesturen", "http://data.lblod.info/vocabularies/erediensten/VerbondenJuridischeStructuren", - "http://www.w3.org/ns/prov#Location", "http://www.w3.org/ns/org#Site", "http://www.w3.org/ns/locn#Address", "http://www.w3.org/ns/person#Person", diff --git a/config/delta-producer/administrative-units/export.json b/config/delta-producer/administrative-units/export.json index d6dc195..d38b7b0 100644 --- a/config/delta-producer/administrative-units/export.json +++ b/config/delta-producer/administrative-units/export.json @@ -49,17 +49,6 @@ "http://www.w3.org/2004/02/skos/core#prefLabel", "http://www.w3.org/2004/02/skos/core#scopeNote" ] - }, - { - "type": "http://www.w3.org/ns/prov#Location", - "graphsFilter": [ - "http://mu.semte.ch/graphs/organisatieportaal" - ], - "properties": [ - "http://mu.semte.ch/vocabularies/core/uuid", - "http://www.w3.org/2000/01/rdf-schema#label", - "http://mu.semte.ch/vocabularies/ext/werkingsgebiedNiveau" - ] } ] } diff --git a/config/delta-producer/organizations/export.json b/config/delta-producer/organizations/export.json index 0d5a470..bb86cfb 100644 --- a/config/delta-producer/organizations/export.json +++ b/config/delta-producer/organizations/export.json @@ -306,17 +306,6 @@ "http://www.w3.org/2004/02/skos/core#prefLabel" ] }, - { - "type": "http://www.w3.org/ns/prov#Location", - "graphsFilter": [ - "http://mu.semte.ch/graphs/organisatieportaal" - ], - "properties": [ - "http://www.w3.org/2000/01/rdf-schema#label", - "http://mu.semte.ch/vocabularies/ext/werkingsgebiedNiveau", - "http://data.vlaanderen.be/ns/besluit#werkingsgebied" - ] - }, { "type": "http://lblod.data.gift/vocabularies/organisatie/TypeBetrokkenheid", "graphsFilter": [ diff --git a/config/dev-migrations/20210910120000-pseudonimize-UPDATE-BEFORE-RUNNING.sparql.disabled b/config/dev-migrations/20210910120000-pseudonimize-UPDATE-BEFORE-RUNNING.sparql.disabled index 8bf92c5..5f3fd90 100644 --- a/config/dev-migrations/20210910120000-pseudonimize-UPDATE-BEFORE-RUNNING.sparql.disabled +++ b/config/dev-migrations/20210910120000-pseudonimize-UPDATE-BEFORE-RUNNING.sparql.disabled @@ -42,6 +42,7 @@ DELETE { ?address adres:gemeentenaam ?gemeente_s. } } WHERE { + VALUES ?g { } GRAPH ?g { BIND("REPLACE_ME_WITH_A_RANDOM_STRING" AS ?salt). ?person a person:Person. diff --git a/config/dispatcher/dispatcher.ex b/config/dispatcher/dispatcher.ex index 9854ec6..b155a18 100644 --- a/config/dispatcher/dispatcher.ex +++ b/config/dispatcher/dispatcher.ex @@ -136,10 +136,6 @@ defmodule Dispatcher do Proxy.forward conn, path, "http://cache/organization-status-codes/" end - match "/locations/*path", %{ accept: [:json], layer: :api} do - Proxy.forward conn, path, "http://cache/locations/" - end - match "/involvement-types/*path", %{ accept: [:json], layer: :api} do Proxy.forward conn, path, "http://cache/involvement-types/" end diff --git a/config/migrations/2022/20220304152947-delete-centraal-kerkbestuur-wachtebeke.sparql b/config/migrations/2022/20220304152947-delete-centraal-kerkbestuur-wachtebeke.sparql new file mode 100644 index 0000000..d982e7c --- /dev/null +++ b/config/migrations/2022/20220304152947-delete-centraal-kerkbestuur-wachtebeke.sparql @@ -0,0 +1,38 @@ +DELETE { + GRAPH ?g { + ?representatieveOrgaan ?bestuur . + ?bestuur ?pbestuur ?obestuur . + ?primarySite ?pprimarySite ?oprimarySite . + ?address ?paddress ?oaddress . + ?contactPoint ?pcontactPoint ?ocontactPoint . + ?identifier ?pidentifier ?oidentifier . + ?structuredIdentifier ?pstructuredIdentifier ?ostructuredIdentifier . + } +} WHERE { + GRAPH ?g { + VALUES ?bestuur { + + + } + + ?representatieveOrgaan ?bestuur . + + ?bestuur ?primarySite ; + ?identifier ; + ?pbestuur ?obestuur . + + ?primarySite ?address ; + ?contactPoint ; + ?pprimarySite ?oprimarySite . + + ?address ?paddress ?oaddress . + + ?contactPoint ?pcontactPoint ?ocontactPoint . + + ?identifier ?structuredIdentifier ; + ?pidentifier ?oidentifier . + + ?structuredIdentifier ?pstructuredIdentifier ?ostructuredIdentifier . + } +} + diff --git a/config/migrations/2022/20220307092611-update-date-change-event-Zonhoven.sparql b/config/migrations/2022/20220307092611-update-date-change-event-Zonhoven.sparql new file mode 100644 index 0000000..ced71d1 --- /dev/null +++ b/config/migrations/2022/20220307092611-update-date-change-event-Zonhoven.sparql @@ -0,0 +1,15 @@ +PREFIX dct: + +DELETE { + GRAPH ?g { + dct:date "2021-11-28"^^xsd:date . + } +} INSERT { + GRAPH ?g { + dct:date "2021-12-20"^^xsd:date . + } +} WHERE { + GRAPH ?g { + dct:date "2021-11-28"^^xsd:date . + } +} diff --git a/config/migrations/2022/20220307104523-update-change-event-glabbeek.sparql b/config/migrations/2022/20220307104523-update-change-event-glabbeek.sparql new file mode 100644 index 0000000..eb9d235 --- /dev/null +++ b/config/migrations/2022/20220307104523-update-change-event-glabbeek.sparql @@ -0,0 +1,26 @@ +PREFIX dct: +PREFIX regorg: + +DELETE { + GRAPH ?g { + + dct:date "2021-02-04"^^xsd:date . + + regorg:orgStatus . # Actief + } +} INSERT { + GRAPH ?g { + + dct:date "2022-02-04"^^xsd:date . + + regorg:orgStatus . # Niet Actief + + } +} WHERE { + GRAPH ?g { + + dct:date "2021-02-04"^^xsd:date . + + regorg:orgStatus . + } +} diff --git a/config/migrations/2022/20220307140756-remove-duplicated-bestuurseenheden.sparql b/config/migrations/2022/20220307140756-remove-duplicated-bestuurseenheden.sparql new file mode 100644 index 0000000..ce65032 --- /dev/null +++ b/config/migrations/2022/20220307140756-remove-duplicated-bestuurseenheden.sparql @@ -0,0 +1,77 @@ +# Splitting the query in two because of execution time + +## Links to the bestuur + + + +DELETE { + GRAPH ?g { + ?representatieveOrgaan ?bestuur . + ?orgaanInTijd ?porgaanInTijd ?oorgaanInTijd . + ?orgaan ?porgaan ?oorgaan . + ?betrokken ?pbetrokken ?obetrokken . + ?eenheid ?betrokken . + } +} WHERE { + GRAPH ?g { + VALUES ?bestuur { + + + } + + ?representatieveOrgaan ?bestuur . + + OPTIONAL { + ?orgaanInTijd ?bestuur ; + ?porgaanInTijd ?oorgaanInTijd . + + ?orgaan ?orgaanInTijd ; + ?porgaan ?oorgaan . + } + + OPTIONAL { + ?betrokken ?bestuur ; + ?pbetrokken ?obetrokken . + ?eenheid ?betrokken . + } + } +} + +; + +## Links from the bestuur + +DELETE { + GRAPH ?g { + ?bestuur ?pbestuur ?obestuur . + ?primarySite ?pprimarySite ?oprimarySite . + ?address ?paddress ?oaddress . + ?contactPoint ?pcontactPoint ?ocontactPoint . + ?identifier ?pidentifier ?oidentifier . + ?structuredIdentifier ?pstructuredIdentifier ?ostructuredIdentifier . + } +} WHERE { + GRAPH ?g { + VALUES ?bestuur { + + + } + + ?bestuur ?primarySite ; + ?identifier ; + ?pbestuur ?obestuur . + + ?primarySite ?address ; + ?contactPoint ; + ?pprimarySite ?oprimarySite . + + ?address ?paddress ?oaddress . + + ?contactPoint ?pcontactPoint ?ocontactPoint . + + ?identifier ?structuredIdentifier ; + ?pidentifier ?oidentifier . + + ?structuredIdentifier ?pstructuredIdentifier ?ostructuredIdentifier . + } +} \ No newline at end of file diff --git a/config/migrations/2022/20220308092436-delete-werkingsgebieden.sparql b/config/migrations/2022/20220308092436-delete-werkingsgebieden.sparql new file mode 100644 index 0000000..84d672d --- /dev/null +++ b/config/migrations/2022/20220308092436-delete-werkingsgebieden.sparql @@ -0,0 +1,10 @@ +DELETE { + GRAPH ?g { + ?s ?p ?o . + } +} WHERE { + GRAPH ?g { + ?s a ; + ?p ?o . + } +} diff --git a/config/resources/domain.json b/config/resources/domain.json index 44a0268..f1bd579 100644 --- a/config/resources/domain.json +++ b/config/resources/domain.json @@ -370,11 +370,6 @@ "predicate": "ere:betrokkenBestuur", "target": "local-involvements", "cardinality": "many" - }, - "scope": { - "predicate": "besluit:werkingsgebied", - "target": "locations", - "cardinality": "one" } }, "new-resource-base": "http://data.lblod.info/id/bestuurseenheden/" @@ -666,28 +661,6 @@ "features": ["include-uri"], "new-resource-base": "http://lblod.data.gift/concepts/" }, - "locations": { - "class": "prov:Location", - "attributes": { - "label": { - "type": "string", - "predicate": "rdfs:label" - }, - "level": { - "type": "string", - "predicate": "ext:werkingsgebiedNiveau" - } - }, - "relationships": { - "administrative-units": { - "predicate": "besluit:werkingsgebied", - "target": "administrative-units", - "cardinality": "many", - "inverse": true - } - }, - "new-resource-base": "http://data.lblod.info/id/werkingsgebieden/" - }, "involvement-types": { "class": "code:TypeBetrokkenheid", "attributes": { diff --git a/config/search/config.json b/config/search/config.json index 097bb15..52e8ee3 100644 --- a/config/search/config.json +++ b/config/search/config.json @@ -1,7 +1,7 @@ { "automatic_index_updates": true, "persist_indexes": true, - "number_of_threads": 10, + "number_of_threads": 6, "eager_indexing_groups": [ [{ "variables": [], "name": "acmidm-lezer" }], [{ "variables": [], "name": "acmidm-editeerder" }], diff --git a/config/search/update-handler.store b/config/search/update-handler.store deleted file mode 100644 index 90757d3..0000000 --- a/config/search/update-handler.store +++ /dev/null @@ -1,3 +0,0 @@ ---- -queue: [] -index: {} diff --git a/docker-compose.dev.yml b/docker-compose.dev.yml index cc6d251..61f384e 100644 --- a/docker-compose.dev.yml +++ b/docker-compose.dev.yml @@ -14,6 +14,8 @@ services: db: restart: "no" migrations: + volumes: + - ./config/dev-migrations:/data/migrations/dev/ restart: "no" resource: restart: "no" diff --git a/docker-compose.yml b/docker-compose.yml index db9e39f..dd4c91e 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -159,7 +159,7 @@ services: restart: always logging: *default-logging frontend: - image: lblod/frontend-contact-hub:1.6.0 + image: lblod/frontend-contact-hub:1.6.3 volumes: - ./config/frontend/add-x-frame-options-header.conf:/config/add-x-frame-options.conf environment: @@ -282,7 +282,7 @@ services: DUMP_FILE_CREATION_JOB_OPERATION: 'http://redpencil.data.gift/id/jobs/concept/JobOperation/deltas/deltaDumpFileCreation/organizations' INITIAL_PUBLICATION_GRAPH_SYNC_JOB_OPERATION: 'http://redpencil.data.gift/id/jobs/concept/JobOperation/deltas/initialPublicationGraphSyncing/organizations' HEALING_JOB_OPERATION: 'http://redpencil.data.gift/id/jobs/concept/JobOperation/deltas/healingOperation/organizations' - CRON_PATTERN_DUMP_JOB: '30 9 8-18/2 * * MON-FRI' # At second :30, at minute :09, every 2 hours between hours 08am and 18pm, every day between Monday and Friday, every month + CRON_PATTERN_DUMP_JOB: '42 * * * *' # At minute 42 every hour CRON_PATTERN_HEALING_JOB: '0 0 4 * * *' # everyday at 4 AM START_INITIAL_SYNC: 'false' # prefer to disable it now. We want to have feeling with how the DB acts. labels: