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

Merge branch 'development' into feature/onboarding-igs

Browse Source
This commit is contained in:
Claire Lovisa
2023-07-07 16:37:12 +02:00
parent a340f1c175 9f4ec2f3d9
commit ea03febb98
16 changed files with 9709 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

51
config/migrations/2023/20230627110500-add-missing-country.sparql Normal file
View File

@@ -0,0 +1,51 @@
PREFIX org: <http://www.w3.org/ns/org#>
PREFIX locn: <http://www.w3.org/ns/locn#>
PREFIX schema: <http://schema.org/>
PREFIX regorg: <http://www.w3.org/ns/regorg#>
PREFIX person: <http://www.w3.org/ns/person#>
PREFIX vcard: <http://www.w3.org/2006/vcard/ns#>
PREFIX dbpedia: <http://dbpedia.org/ontology/>
PREFIX adms: <http://www.w3.org/ns/adms#>
PREFIX euro: <http://data.europa.eu/m8g/>
PREFIX prov: <http://www.w3.org/ns/prov#>
PREFIX organisatie: <https://data.vlaanderen.be/ns/organisatie#>
PREFIX persoon: <https://data.vlaanderen.be/ns/persoon#>
PREFIX adres: <https://data.vlaanderen.be/ns/adres#>
PREFIX generiek: <https://data.vlaanderen.be/ns/generiek#>
PREFIX mandaat: <http://data.vlaanderen.be/ns/mandaat#>
PREFIX besluit: <http://data.vlaanderen.be/ns/besluit#>
PREFIX lblodlg: <https://data.lblod.info/vocabularies/leidinggevenden/>
PREFIX dc_terms: <http://purl.org/dc/terms/>
PREFIX foaf: <http://xmlns.com/foaf/0.1/>
PREFIX skos: <http://www.w3.org/2004/02/skos/core#>
PREFIX euvoc: <http://publications.europa.eu/ontology/euvoc#>
PREFIX ere: <http://data.lblod.info/vocabularies/erediensten/>
PREFIX ch: <http://data.lblod.info/vocabularies/contacthub/>
PREFIX code: <http://lblod.data.gift/vocabularies/organisatie/>
PREFIX ext: <http://mu.semte.ch/vocabularies/ext/>
PREFIX rdfs: <http://www.w3.org/2000/01/rdf-schema#>
INSERT {
GRAPH ?g {
<http://data.lblod.info/id/adressen/15f057e425c2823809b079afe1ff82c4> adres:land "Frankrijk" .
}
} WHERE {
GRAPH ?g {
<http://data.lblod.info/id/adressen/15f057e425c2823809b079afe1ff82c4> ?p ?o.
}
};
INSERT {
GRAPH ?g {
?address adres:land "België" .
}
} WHERE {
GRAPH ?g {
?address
a locn:Address .
FILTER NOT EXISTS {
?address
adres:land ?land .
}
}
};

59
config/migrations/2023/20230627111000-add-country-to-full-address.sparql Normal file
View File

@@ -0,0 +1,59 @@
PREFIX org: <http://www.w3.org/ns/org#>
PREFIX locn: <http://www.w3.org/ns/locn#>
PREFIX schema: <http://schema.org/>
PREFIX regorg: <http://www.w3.org/ns/regorg#>
PREFIX person: <http://www.w3.org/ns/person#>
PREFIX vcard: <http://www.w3.org/2006/vcard/ns#>
PREFIX dbpedia: <http://dbpedia.org/ontology/>
PREFIX adms: <http://www.w3.org/ns/adms#>
PREFIX euro: <http://data.europa.eu/m8g/>
PREFIX prov: <http://www.w3.org/ns/prov#>
PREFIX organisatie: <https://data.vlaanderen.be/ns/organisatie#>
PREFIX persoon: <https://data.vlaanderen.be/ns/persoon#>
PREFIX adres: <https://data.vlaanderen.be/ns/adres#>
PREFIX generiek: <https://data.vlaanderen.be/ns/generiek#>
PREFIX mandaat: <http://data.vlaanderen.be/ns/mandaat#>
PREFIX besluit: <http://data.vlaanderen.be/ns/besluit#>
PREFIX lblodlg: <https://data.lblod.info/vocabularies/leidinggevenden/>
PREFIX dc_terms: <http://purl.org/dc/terms/>
PREFIX foaf: <http://xmlns.com/foaf/0.1/>
PREFIX skos: <http://www.w3.org/2004/02/skos/core#>
PREFIX euvoc: <http://publications.europa.eu/ontology/euvoc#>
PREFIX ere: <http://data.lblod.info/vocabularies/erediensten/>
PREFIX ch: <http://data.lblod.info/vocabularies/contacthub/>
PREFIX code: <http://lblod.data.gift/vocabularies/organisatie/>
PREFIX ext: <http://mu.semte.ch/vocabularies/ext/>
PREFIX rdfs: <http://www.w3.org/2000/01/rdf-schema#>
DELETE {
GRAPH ?g {
?address locn:fullAddress ?fullAddress .
}
} WHERE {
GRAPH ?g {
?address locn:fullAddress ?fullAddress .
}
};
INSERT {
GRAPH ?g {
?address locn:fullAddress ?fullAddress .
}
} WHERE {
GRAPH ?g {
?address
a locn:Address;
locn:thoroughfare ?straatnaam;
adres:Adresvoorstelling.huisnummer ?huisnummer;
locn:postCode ?postcode;
adres:gemeentenaam ?gemeentenaam;
adres:land ?land .
OPTIONAL {
?address adres:Adresvoorstelling.busnummer ?busnummer .
}
BIND(IF(BOUND(?busnummer), CONCAT(?straatnaam, " ", ?huisnummer, " ", ?busnummer, ", ", ?postcode, " ", ?gemeentenaam, ", ", ?land), CONCAT(?straatnaam, " ", ?huisnummer, ", ", ?postcode, " ", ?gemeentenaam, ", ", ?land)) AS ?fullAddress)
}
};

11
config/migrations/2023/20230703181102-set-executief-van-de-moslims-van-belgie-to-not-active.sparql Normal file
View File

@@ -0,0 +1,11 @@
DELETE DATA {
GRAPH <http://mu.semte.ch/graphs/worship-service> {
<http://data.lblod.info/id/representatieveOrganen/e224c637ba8bb0e5dfbb87da225b4652> <http://www.w3.org/ns/regorg#orgStatus> <http://lblod.data.gift/concepts/63cc561de9188d64ba5840a42ae8f0d6> .
}
}
;
INSERT DATA {
GRAPH <http://mu.semte.ch/graphs/worship-service> {
<http://data.lblod.info/id/representatieveOrganen/e224c637ba8bb0e5dfbb87da225b4652> <http://www.w3.org/ns/regorg#orgStatus> <http://lblod.data.gift/concepts/d02c4e12bf88d2fdf5123b07f29c9311> .
}
}

9
config/migrations/2023/20230706142054-agb-apb-link-positions-to-unit-classifications.sparql Normal file
View File

@@ -0,0 +1,9 @@
PREFIX ext: <http://mu.semte.ch/vocabularies/ext/>
INSERT DATA {
GRAPH <http://mu.semte.ch/graphs/public> {
<http://data.vlaanderen.be/id/concept/BestuursfunctieCode/855489b9-b584-4f34-90b2-39aea808cd9f> ext:appliesTo <http://data.vlaanderen.be/id/concept/BestuursorgaanClassificatieCode/41caf7e6-b040-4720-9cc2-a96cfffed5b4> . # Leidend ambtenaar
<http://data.vlaanderen.be/id/concept/BestuursorgaanClassificatieCode/41caf7e6-b040-4720-9cc2-a96cfffed5b4> ext:appliesWithin <http://data.vlaanderen.be/id/concept/BestuurseenheidClassificatieCode/36a82ba0-7ff1-4697-a9dd-2e94df73b721> , <http://data.vlaanderen.be/id/concept/BestuurseenheidClassificatieCode/80310756-ce0a-4a1b-9b8e-7c01b6cc7a2d> .
}
}

1
config/migrations/2023/2O230630101056-agbapb-organen/20230630100645-agbapb-orgaan.graph Normal file
View File

@@ -0,0 +1 @@
http://mu.semte.ch/graphs/administrative-unit

4529
config/migrations/2023/2O230630101056-agbapb-organen/20230630100645-agbapb-orgaan.ttl Normal file
View File

File diff suppressed because it is too large Load Diff

1
config/migrations/2023/2O230630101056-agbapb-organen/20230630102045-agbap-specialization.graph Normal file
View File

@@ -0,0 +1 @@
http://mu.semte.ch/graphs/administrative-unit

3853
config/migrations/2023/2O230630101056-agbapb-organen/20230630102045-agbap-specialization.ttl Normal file
View File

File diff suppressed because it is too large Load Diff

1
config/migrations/2023/2O230630101056-agbapb-organen/20230630102345-agbapb-functie.graph Normal file
View File

@@ -0,0 +1 @@
http://mu.semte.ch/graphs/administrative-unit

1139
config/migrations/2023/2O230630101056-agbapb-organen/20230630102345-agbapb-functie.ttl Normal file
View File

File diff suppressed because it is too large Load Diff

1
config/migrations/2023/2O230630101056-agbapb-organen/20230630102445-agbapb-functie-code.graph Normal file
View File

@@ -0,0 +1 @@
http://mu.semte.ch/graphs/public

13
config/migrations/2023/2O230630101056-agbapb-organen/20230630102445-agbapb-functie-code.ttl Normal file
View File

@@ -0,0 +1,13 @@
@prefix rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#> .
@prefix skos: <http://www.w3.org/2004/02/skos/core#> .
@prefix ns2: <http://mu.semte.ch/vocabularies/ext/> .
@prefix ns3: <http://mu.semte.ch/vocabularies/core/> .
@prefix ns4: <http://data.vlaanderen.be/id/conceptscheme/> .
@prefix ns5: <http://data.lblod.info/id/conceptscheme/> .
<http://data.vlaanderen.be/id/concept/BestuursfunctieCode/855489b9-b584-4f34-90b2-39aea808cd9f>
rdf:type skos:Concept , ns2:BestuursfunctieCode ;
ns3:uuid "855489b9-b584-4f34-90b2-39aea808cd9f" ;
skos:prefLabel "Leidend ambtenaar" ;
skos:topConceptOf ns4:BestuursfunctieCode , ns5:LocalOfficerMandateRole ;
skos:inScheme ns5:LocalOfficerMandateRole .

32
config/reasoner/dl2op/main/query.n3q
View File

@@ -26,7 +26,7 @@
?p ?o .
}.
# Functionarissen should be linked to a gemeente, district, provincie or ocmw only (FOR NOW)
# Functionarissen should be linked to a agb, apb, gemeente, district, provincie or ocmw only (FOR NOW)
{
?s a <http://data.lblod.info/vocabularies/leidinggevenden/Functionaris> ;
@@ -83,6 +83,34 @@
?s a <http://data.lblod.info/vocabularies/leidinggevenden/Functionaris> ;
?p ?o .
}.
{
?s a <http://data.lblod.info/vocabularies/leidinggevenden/Functionaris> ;
<http://www.w3.org/ns/org#holds> ?bestuursfunctie ;
?p ?o .
?orgaanInTime <http://data.lblod.info/vocabularies/leidinggevenden/heeftBestuursfunctie> ?bestuursfunctie ;
<https://data.vlaanderen.be/ns/generiek#isTijdspecialisatieVan> ?orgaan .
?orgaan <http://data.vlaanderen.be/ns/besluit#bestuurt> ?bestuur .
?bestuur <http://www.w3.org/ns/org#classification> <http://data.vlaanderen.be/id/concept/BestuurseenheidClassificatieCode/36a82ba0-7ff1-4697-a9dd-2e94df73b721> .
} => {
?s a <http://data.lblod.info/vocabularies/leidinggevenden/Functionaris> ;
?p ?o .
}.
{
?s a <http://data.lblod.info/vocabularies/leidinggevenden/Functionaris> ;
<http://www.w3.org/ns/org#holds> ?bestuursfunctie ;
?p ?o .
?orgaanInTime <http://data.lblod.info/vocabularies/leidinggevenden/heeftBestuursfunctie> ?bestuursfunctie ;
<https://data.vlaanderen.be/ns/generiek#isTijdspecialisatieVan> ?orgaan .
?orgaan <http://data.vlaanderen.be/ns/besluit#bestuurt> ?bestuur .
?bestuur <http://www.w3.org/ns/org#classification> <http://data.vlaanderen.be/id/concept/BestuurseenheidClassificatieCode/80310756-ce0a-4a1b-9b8e-7c01b6cc7a2d> .
} => {
?s a <http://data.lblod.info/vocabularies/leidinggevenden/Functionaris> ;
?p ?o .
}.
# Mandatarissen should be linked to a gemeente, district, provincie or ocmw only (FOR NOW)
@@ -142,6 +170,8 @@
?p ?o .
}.
{
?s a <http://www.w3.org/ns/org#Membership> ;
?p ?o .

16
config/search/dev/config.json
View File

@@ -1,22 +1,8 @@
{
"automatic_index_updates": true,
"persist_indexes": true,
"number_of_threads": 6,
"number_of_threads": 8,
"eager_indexing_groups": [
[
{
"variables": [],
"name": "acmidm-worship-editeerder"
},
{
"variables": [],
"name": "clean"
},
{
"variables": [],
"name": "public"
}
],
[
{
"variables": [],

6
docker-compose.dev.yml
View File

@@ -75,6 +75,12 @@ services:
restart: "no"
delta-producer-pub-graph-maintainer-public:
restart: "no"
mandatarissen-consumer:
restart: "no"
leidinggevenden-consumer:
restart: "no"
worship-services-sensitive-consumer:
restart: "no"
# use this to test acmidm
# tlsproxy:
# image: caddy:2

6
docker-compose.yml
View File

@@ -175,7 +175,7 @@ services:
links:
- db:database
adressenregister:
image: lblod/adressenregister-fuzzy-search-service:0.6.3
image: lblod/adressenregister-fuzzy-search-service:0.7.0
labels:
- "logging=true"
restart: always
@@ -219,7 +219,7 @@ services:
volumes:
- ./config/jobs-controller/:/config/
construct-administrative-unit-relationships:
image: lblod/construct-administrative-unit-relationships-service:0.1.2
image: lblod/construct-administrative-unit-relationships-service:0.1.3
environment:
START_DATE_WORSHIP_GOVERNING_BODY: "2023-04-01T00:00:00"
END_DATE_WORSHIP_GOVERNING_BODY: "2026-03-31T00:00:00"
@@ -428,7 +428,7 @@ services:
# LOKET LEIDINGGEVENDEN CONSUMERS
################################################################################
leidinggevenden-consumer:
image: lblod/delta-consumer:0.0.17-rc.7
image: lblod/delta-consumer:0.0.18
environment:
DCR_SERVICE_NAME: "leidinggevenden-consumer"
DCR_SYNC_BASE_URL: "https://loket.lblod.info" # replace with link to Loket API