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

Merge branch 'development' into poc/add-gemeenten

Browse Source
This commit is contained in:
Claire Lovisa
2022-03-11 13:52:47 +01:00
parent 9bd1140944 f064965f99
commit c9d7906b30
15 changed files with 172 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
config/authorization/config.ex
View File

@@ -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",

11
config/delta-producer/administrative-units/export.json
View File

@@ -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"
]
}
]
}

11
config/delta-producer/organizations/export.json
View File

@@ -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": [

1
config/dev-migrations/20210910120000-pseudonimize-UPDATE-BEFORE-RUNNING.sparql.disabled
View File

@@ -42,6 +42,7 @@ DELETE {
?address adres:gemeentenaam ?gemeente_s.
}
} WHERE {
VALUES ?g { <http://mu.semte.ch/graphs/organisatieportaal> <http://redpencil.data.gift/id/deltas/producer/organizations>}
GRAPH ?g {
BIND("REPLACE_ME_WITH_A_RANDOM_STRING" AS ?salt).
?person a person:Person.

4
config/dispatcher/dispatcher.ex
View File

@@ -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

38
config/migrations/2022/20220304152947-delete-centraal-kerkbestuur-wachtebeke.sparql Normal file
View File

@@ -0,0 +1,38 @@
DELETE {
GRAPH ?g {
?representatieveOrgaan <http://www.w3.org/ns/org#linkedTo> ?bestuur .
?bestuur ?pbestuur ?obestuur .
?primarySite ?pprimarySite ?oprimarySite .
?address ?paddress ?oaddress .
?contactPoint ?pcontactPoint ?ocontactPoint .
?identifier ?pidentifier ?oidentifier .
?structuredIdentifier ?pstructuredIdentifier ?ostructuredIdentifier .
}
} WHERE {
GRAPH ?g {
VALUES ?bestuur {
<http://data.lblod.info/id/centraleBesturenVanDeEredienst/6167E3E2375CFC000A0007C2>
<http://data.lblod.info/id/centraleBesturenVanDeEredienst/616FE419375CFC000A000893>
}
?representatieveOrgaan <http://www.w3.org/ns/org#linkedTo> ?bestuur .
?bestuur <http://www.w3.org/ns/org#hasPrimarySite> ?primarySite ;
<http://www.w3.org/ns/adms#identifier> ?identifier ;
?pbestuur ?obestuur .
?primarySite <https://data.vlaanderen.be/ns/organisatie#bestaatUit> ?address ;
<http://www.w3.org/ns/org#siteAddress> ?contactPoint ;
?pprimarySite ?oprimarySite .
?address ?paddress ?oaddress .
?contactPoint ?pcontactPoint ?ocontactPoint .
?identifier <https://data.vlaanderen.be/ns/generiek#gestructureerdeIdentificator> ?structuredIdentifier ;
?pidentifier ?oidentifier .
?structuredIdentifier ?pstructuredIdentifier ?ostructuredIdentifier .
}
}

15
config/migrations/2022/20220307092611-update-date-change-event-Zonhoven.sparql Normal file
View File

@@ -0,0 +1,15 @@
PREFIX dct: <http://purl.org/dc/terms/>
DELETE {
GRAPH ?g {
<http://data.lblod.info/id/veranderingsgebeurtenissen/61F90CAF51BFC225E4ECF2CA> dct:date "2021-11-28"^^xsd:date .
}
} INSERT {
GRAPH ?g {
<http://data.lblod.info/id/veranderingsgebeurtenissen/61F90CAF51BFC225E4ECF2CA> dct:date "2021-12-20"^^xsd:date .
}
} WHERE {
GRAPH ?g {
<http://data.lblod.info/id/veranderingsgebeurtenissen/61F90CAF51BFC225E4ECF2CA> dct:date "2021-11-28"^^xsd:date .
}
}

26
config/migrations/2022/20220307104523-update-change-event-glabbeek.sparql Normal file
View File

@@ -0,0 +1,26 @@
PREFIX dct: <http://purl.org/dc/terms/>
PREFIX regorg: <http://www.w3.org/ns/regorg#>
DELETE {
GRAPH ?g {
<http://data.lblod.info/id/veranderingsgebeurtenissen/61F92B0A51BFC225E4ECF2FF>
dct:date "2021-02-04"^^xsd:date .
<http://data.lblod.info/id/besturenVanDeEredienst/2a75e67f9a8aacf52896944c59b09eb0>
regorg:orgStatus <http://lblod.data.gift/concepts/63cc561de9188d64ba5840a42ae8f0d6> . # Actief
}
} INSERT {
GRAPH ?g {
<http://data.lblod.info/id/veranderingsgebeurtenissen/61F92B0A51BFC225E4ECF2FF>
dct:date "2022-02-04"^^xsd:date .
<http://data.lblod.info/id/besturenVanDeEredienst/2a75e67f9a8aacf52896944c59b09eb0>
regorg:orgStatus <http://lblod.data.gift/concepts/d02c4e12bf88d2fdf5123b07f29c9311> . # Niet Actief
}
} WHERE {
GRAPH ?g {
<http://data.lblod.info/id/veranderingsgebeurtenissen/61F92B0A51BFC225E4ECF2FF>
dct:date "2021-02-04"^^xsd:date .
<http://data.lblod.info/id/besturenVanDeEredienst/2a75e67f9a8aacf52896944c59b09eb0>
regorg:orgStatus <http://lblod.data.gift/concepts/63cc561de9188d64ba5840a42ae8f0d6> .
}
}

77
config/migrations/2022/20220307140756-remove-duplicated-bestuurseenheden.sparql Normal file
View File

@@ -0,0 +1,77 @@
# Splitting the query in two because of execution time
## Links to the bestuur
DELETE {
GRAPH ?g {
?representatieveOrgaan <http://www.w3.org/ns/org#linkedTo> ?bestuur .
?orgaanInTijd ?porgaanInTijd ?oorgaanInTijd .
?orgaan ?porgaan ?oorgaan .
?betrokken ?pbetrokken ?obetrokken .
?eenheid <http://data.lblod.info/vocabularies/erediensten/betrokkenBestuur> ?betrokken .
}
} WHERE {
GRAPH ?g {
VALUES ?bestuur {
<http://data.lblod.info/id/besturenVanDeEredienst/6183A207375CFC000A000933>
<http://data.lblod.info/id/besturenVanDeEredienst/61AE0A9B3C1A230C43B44FFF>
}
?representatieveOrgaan <http://www.w3.org/ns/org#linkedTo> ?bestuur .
OPTIONAL {
?orgaanInTijd <http://data.vlaanderen.be/ns/besluit#bestuurt> ?bestuur ;
?porgaanInTijd ?oorgaanInTijd .
?orgaan <https://data.vlaanderen.be/ns/generiek#isTijdspecialisatieVan> ?orgaanInTijd ;
?porgaan ?oorgaan .
}
OPTIONAL {
?betrokken <http://www.w3.org/ns/org#organization> ?bestuur ;
?pbetrokken ?obetrokken .
?eenheid <http://data.lblod.info/vocabularies/erediensten/betrokkenBestuur> ?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 {
<http://data.lblod.info/id/besturenVanDeEredienst/6183A207375CFC000A000933>
<http://data.lblod.info/id/besturenVanDeEredienst/61AE0A9B3C1A230C43B44FFF>
}
?bestuur <http://www.w3.org/ns/org#hasPrimarySite> ?primarySite ;
<http://www.w3.org/ns/adms#identifier> ?identifier ;
?pbestuur ?obestuur .
?primarySite <https://data.vlaanderen.be/ns/organisatie#bestaatUit> ?address ;
<http://www.w3.org/ns/org#siteAddress> ?contactPoint ;
?pprimarySite ?oprimarySite .
?address ?paddress ?oaddress .
?contactPoint ?pcontactPoint ?ocontactPoint .
?identifier <https://data.vlaanderen.be/ns/generiek#gestructureerdeIdentificator> ?structuredIdentifier ;
?pidentifier ?oidentifier .
?structuredIdentifier ?pstructuredIdentifier ?ostructuredIdentifier .
}
}

10
config/migrations/2022/20220308092436-delete-werkingsgebieden.sparql Normal file
View File

@@ -0,0 +1,10 @@
DELETE {
GRAPH ?g {
?s ?p ?o .
}
} WHERE {
GRAPH ?g {
?s a <http://www.w3.org/ns/prov#Location> ;
?p ?o .
}
}

27
config/resources/domain.json
View File

@@ -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": {

2
config/search/config.json
View File

@@ -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" }],

3
config/search/update-handler.store
View File

@@ -1,3 +0,0 @@
---
queue: []
index: {}

2
docker-compose.dev.yml
View File

@@ -14,6 +14,8 @@ services:
db:
restart: "no"
migrations:
volumes:
- ./config/dev-migrations:/data/migrations/dev/
restart: "no"
resource:
restart: "no"

4
docker-compose.yml
View File

@@ -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: