From 764cfb6f1c3ecb8f2ffe176493d4e52eafee566a Mon Sep 17 00:00:00 2001 From: Elias Papanikitas Date: Tue, 6 Feb 2024 11:08:40 +0100 Subject: [PATCH 01/15] added kbo-administrative-unit model --- config/authorization/config.ex | 3 ++- config/dispatcher/dispatcher.ex | 8 ++++++++ config/resources/domain.json | 23 +++++++++++++++++++++++ docker-compose.yml | 8 ++++++++ 4 files changed, 41 insertions(+), 1 deletion(-) diff --git a/config/authorization/config.ex b/config/authorization/config.ex index 12f824e..1b88c90 100644 --- a/config/authorization/config.ex +++ b/config/authorization/config.ex @@ -76,7 +76,8 @@ defmodule Acl.UserGroups.Config do "http://lblod.data.gift/vocabularies/organisatie/VeranderingsgebeurtenisResultaat", "http://www.w3.org/ns/org#Post", "http://www.w3.org/ns/org#ChangeEvent", - "http://data.lblod.info/vocabularies/contacthub/AgentInPositie" + "http://data.lblod.info/vocabularies/contacthub/AgentInPositie", + "http://mu.semte.ch/vocabularies/ext/KboEenheid", ] @shared_protected_type [ diff --git a/config/dispatcher/dispatcher.ex b/config/dispatcher/dispatcher.ex index 7c1c085..6a10342 100644 --- a/config/dispatcher/dispatcher.ex +++ b/config/dispatcher/dispatcher.ex @@ -219,6 +219,10 @@ defmodule Dispatcher do Proxy.forward conn, path, "http://cache/decision-activities/" end + match "/kbo-administrative-units/*path", %{ accept: [:any], layer: :api} do + Proxy.forward conn, path, "http://resource/kbo-administrative-units/" + end + ############### # LOGIN ############### @@ -313,6 +317,10 @@ defmodule Dispatcher do forward conn, path, "http://sync-ovo-numbers/sync-from-kbo/" end + post "/kbo-data-sync/*path", %{ layer: :api_services, accept: %{ json: true } } do + forward conn, path, "http://kbo-data-sync/sync-kbo-data/" + end + get "/ldes/*path", %{ layer: :api_services } do forward conn, path, "http://ldes-backend/" end diff --git a/config/resources/domain.json b/config/resources/domain.json index a454026..d092f6d 100644 --- a/config/resources/domain.json +++ b/config/resources/domain.json @@ -521,8 +521,15 @@ "predicate": "skos:exactMatch", "target": "concepts", "cardinality": "one" + }, + "kbo-administrative-unit": { + "predicate": "owl:sameAs", + "target": "kbo-administrative-units", + "cardinality": "one", + "inverse": true } }, + "new-resource-base": "http://data.lblod.info/id/bestuurseenheden/" }, "organization-classification-codes": { @@ -593,6 +600,21 @@ "super": ["worship-administrative-units"], "new-resource-base": "http://data.lblod.info/id/centraleBesturenVanDeEredienst/" }, + + "kbo-administrative-units": { + "class": "ext:KboEenheid", + "super": ["organizations"], + "relationships": { + "administrative-unit": { + "predicate": "owl:sameAs", + "target": "administrative-units", + "cardinality": "one" + } + }, + "new-resource-base": "http://data.lblod.info/id/kboBestuurseenheden/" + }, + + "representative-bodies": { "class": "ere:RepresentatiefOrgaan", "super": ["organizations"], @@ -813,6 +835,7 @@ "target": "site-types", "cardinality": "one" } + }, "new-resource-base": "http://data.lblod.info/id/vestigingen/" }, diff --git a/docker-compose.yml b/docker-compose.yml index 1e48667..35e05d6 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -306,6 +306,14 @@ services: - "logging=true" restart: always logging: *default-logging + kbo-data-sync: + image: kbo-data-sync-service:0.0.1 + links: + - db:database + labels: + - "logging=true" + restart: always + logging: *default-logging ################################################################################ # DELTA GENERAL From b676c0a743d9c6874cb02e65010ef6785c9e354f Mon Sep 17 00:00:00 2001 From: Elias Papanikitas Date: Wed, 7 Feb 2024 10:45:47 +0100 Subject: [PATCH 02/15] draft: adding more data to kbo-administrative-unit --- config/resources/domain.json | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/config/resources/domain.json b/config/resources/domain.json index d092f6d..004dabe 100644 --- a/config/resources/domain.json +++ b/config/resources/domain.json @@ -604,6 +604,12 @@ "kbo-administrative-units": { "class": "ext:KboEenheid", "super": ["organizations"], + "attributes": { + "rechtsvorm": { + "type": "string", + "predicate": "ext:rechtsvorm" + } + }, "relationships": { "administrative-unit": { "predicate": "owl:sameAs", From 24e9659c3d1b9d09b1009cfa164706ad4578d78b Mon Sep 17 00:00:00 2001 From: Elias Papanikitas Date: Wed, 7 Feb 2024 12:52:19 +0100 Subject: [PATCH 03/15] added contacts --- config/resources/domain.json | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/config/resources/domain.json b/config/resources/domain.json index 004dabe..6f8a410 100644 --- a/config/resources/domain.json +++ b/config/resources/domain.json @@ -608,13 +608,17 @@ "rechtsvorm": { "type": "string", "predicate": "ext:rechtsvorm" - } - }, + }, "relationships": { "administrative-unit": { "predicate": "owl:sameAs", "target": "administrative-units", "cardinality": "one" + }, + "contacts": { + "predicate": "schema:contactPoint", + "target": "contact-points", + "cardinality": "one" } }, "new-resource-base": "http://data.lblod.info/id/kboBestuurseenheden/" From 52bb3b8d6b0b0cd57541844bbfac774230294d96 Mon Sep 17 00:00:00 2001 From: Elias Papanikitas Date: Wed, 7 Feb 2024 13:12:54 +0100 Subject: [PATCH 04/15] fixed missing } --- config/resources/domain.json | 1 + 1 file changed, 1 insertion(+) diff --git a/config/resources/domain.json b/config/resources/domain.json index 6f8a410..5b7140f 100644 --- a/config/resources/domain.json +++ b/config/resources/domain.json @@ -1098,4 +1098,5 @@ "new-resource-base": "http://data.relance.lblod.info/id/nace-bel/" } } + } } From cefdd9aaea4d8009030e23cfcca576664b9fde05 Mon Sep 17 00:00:00 2001 From: Elias Papanikitas Date: Wed, 7 Feb 2024 13:50:12 +0100 Subject: [PATCH 05/15] fixed domain --- config/resources/domain.json | 112 ++++++++++++++++++++++------------- 1 file changed, 72 insertions(+), 40 deletions(-) diff --git a/config/resources/domain.json b/config/resources/domain.json index 5b7140f..321835d 100644 --- a/config/resources/domain.json +++ b/config/resources/domain.json @@ -50,7 +50,9 @@ }, "people": { "class": "person:Person", - "super": ["agents"], + "super": [ + "agents" + ], "attributes": { "given-name": { "type": "string", @@ -89,7 +91,9 @@ }, "agents-in-position": { "class": "ch:AgentInPositie", - "super": ["agents"], + "super": [ + "agents" + ], "attributes": { "agent-start-date": { "type": "date", @@ -137,7 +141,9 @@ }, "mandatories": { "class": "mandaat:Mandataris", - "super": ["agents-in-position"], + "super": [ + "agents-in-position" + ], "attributes": { "start-date": { "type": "date", @@ -180,12 +186,16 @@ "predicate": "skos:prefLabel" } }, - "features": ["include-uri"], + "features": [ + "include-uri" + ], "new-resource-base": "http://data.vlaanderen.be/id/concept/MandatarisStatusCode/" }, "worship-mandatories": { "class": "ere:EredienstMandataris", - "super": ["mandatories"], + "super": [ + "mandatories" + ], "attributes": { "expected-end-date": { "type": "date", @@ -250,7 +260,9 @@ }, "mandates": { "class": "mandaat:Mandaat", - "super": ["posts"], + "super": [ + "posts" + ], "relationships": { "role-board": { "predicate": "org:role", @@ -274,7 +286,9 @@ }, "functionaries": { "class": "lblodlg:Functionaris", - "super": ["agents-in-position"], + "super": [ + "agents-in-position" + ], "attributes": { "start-date": { "type": "datetime", @@ -312,12 +326,16 @@ "predicate": "skos:prefLabel" } }, - "features": ["include-uri"], + "features": [ + "include-uri" + ], "new-resource-base": "http://data.vlaanderen.be/id/concept/functionarisStatusCode/" }, "board-positions": { "class": "lblodlg:Bestuursfunctie", - "super": ["posts"], + "super": [ + "posts" + ], "relationships": { "role-board": { "predicate": "org:role", @@ -367,7 +385,9 @@ }, "organizations": { "class": "org:Organization", - "super": ["agents"], + "super": [ + "agents" + ], "attributes": { "name": { "type": "string", @@ -489,7 +509,9 @@ }, "administrative-units": { "class": "besluit:Bestuurseenheid", - "super": ["organizations"], + "super": [ + "organizations" + ], "relationships": { "classification": { "predicate": "org:classification", @@ -529,7 +551,6 @@ "inverse": true } }, - "new-resource-base": "http://data.lblod.info/id/bestuurseenheden/" }, "organization-classification-codes": { @@ -544,12 +565,16 @@ }, "administrative-unit-classification-codes": { "class": "code:BestuurseenheidClassificatieCode", - "super": ["organization-classification-codes"], + "super": [ + "organization-classification-codes" + ], "new-resource-base": "http://data.vlaanderen.be/id/concept/BestuurseenheidClassificatieCode/" }, "worship-administrative-units": { "class": "ere:EredienstBestuurseenheid", - "super": ["administrative-units"], + "super": [ + "administrative-units" + ], "relationships": { "recognized-worship-type": { "predicate": "ere:typeEredienst", @@ -572,7 +597,9 @@ }, "worship-services": { "class": "ere:BestuurVanDeEredienst", - "super": ["worship-administrative-units"], + "super": [ + "worship-administrative-units" + ], "attributes": { "denomination": { "type": "string", @@ -597,37 +624,36 @@ }, "central-worship-services": { "class": "ere:CentraalBestuurVanDeEredienst", - "super": ["worship-administrative-units"], + "super": [ + "worship-administrative-units" + ], "new-resource-base": "http://data.lblod.info/id/centraleBesturenVanDeEredienst/" }, - "kbo-administrative-units": { "class": "ext:KboEenheid", - "super": ["organizations"], + "super": [ + "organizations" + ], "attributes": { "rechtsvorm": { "type": "string", "predicate": "ext:rechtsvorm" - }, - "relationships": { - "administrative-unit": { - "predicate": "owl:sameAs", - "target": "administrative-units", - "cardinality": "one" - }, - "contacts": { - "predicate": "schema:contactPoint", - "target": "contact-points", - "cardinality": "one" } }, - "new-resource-base": "http://data.lblod.info/id/kboBestuurseenheden/" + "relationships": { + "administrative-unit": { + "predicate": "owl:sameAs", + "target": "administrative-units", + "cardinality": "one" + } + }, + "new-resource-base": "http://data.lblod.info/id/kboBestuurseenheden/" }, - - "representative-bodies": { "class": "ere:RepresentatiefOrgaan", - "super": ["organizations"], + "super": [ + "organizations" + ], "relationships": { "classification": { "predicate": "org:classification", @@ -650,7 +676,9 @@ }, "representative-body-classification-codes": { "class": "ext:RepresentatiefOrgaanClassificatieCode", - "super": ["organization-classification-codes"], + "super": [ + "organization-classification-codes" + ], "new-resource-base": "http://data.vlaanderen.be/id/concept/RepresentatiefOrgaanClassificatieCode/" }, "governing-bodies": { @@ -845,7 +873,6 @@ "target": "site-types", "cardinality": "one" } - }, "new-resource-base": "http://data.lblod.info/id/vestigingen/" }, @@ -875,7 +902,9 @@ "predicate": "skos:prefLabel" } }, - "features": ["include-uri"], + "features": [ + "include-uri" + ], "new-resource-base": "http://lblod.data.gift/concepts/" }, "locations": { @@ -928,7 +957,9 @@ }, "ministers": { "class": "ere:RolBedienaar", - "super": ["agents-in-position"], + "super": [ + "agents-in-position" + ], "relationships": { "minister-position": { "predicate": "org:holds", @@ -996,7 +1027,9 @@ }, "minister-positions": { "class": "ere:PositieBedienaar", - "super": ["posts"], + "super": [ + "posts" + ], "relationships": { "function": { "predicate": "ere:functie", @@ -1098,5 +1131,4 @@ "new-resource-base": "http://data.relance.lblod.info/id/nace-bel/" } } - } -} +} \ No newline at end of file From a8274a8925e8cbbcad73fdcf66d5134d0fa5380f Mon Sep 17 00:00:00 2001 From: Elias Papanikitas Date: Tue, 20 Feb 2024 10:38:40 +0100 Subject: [PATCH 06/15] added all kbo fields to backend --- config/resources/domain.json | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/config/resources/domain.json b/config/resources/domain.json index 321835d..3ab7c87 100644 --- a/config/resources/domain.json +++ b/config/resources/domain.json @@ -638,6 +638,14 @@ "rechtsvorm": { "type": "string", "predicate": "ext:rechtsvorm" + }, + "short-name": { + "type": "string", + "predicate": "ext:shortName" + }, + "start-date": { + "type": "date", + "predicate": "ext:startDate" } }, "relationships": { From 1b2268fc6af314224d915439e61f960d3594b040 Mon Sep 17 00:00:00 2001 From: Elias Papanikitas Date: Mon, 4 Mar 2024 14:12:48 +0100 Subject: [PATCH 07/15] updated configuration to handle new service name --- config/dispatcher/dispatcher.ex | 4 ---- docker-compose.dev.yml | 2 +- docker-compose.yml | 10 +--------- 3 files changed, 2 insertions(+), 14 deletions(-) diff --git a/config/dispatcher/dispatcher.ex b/config/dispatcher/dispatcher.ex index 6a10342..bd2cb77 100644 --- a/config/dispatcher/dispatcher.ex +++ b/config/dispatcher/dispatcher.ex @@ -313,10 +313,6 @@ defmodule Dispatcher do forward conn, path, "http://construct-administrative-unit-relationships/create-relationships/" end - post "/sync-ovo-number/*path", %{ layer: :api_services, accept: %{ json: true } } do - forward conn, path, "http://sync-ovo-numbers/sync-from-kbo/" - end - post "/kbo-data-sync/*path", %{ layer: :api_services, accept: %{ json: true } } do forward conn, path, "http://kbo-data-sync/sync-kbo-data/" end diff --git a/docker-compose.dev.yml b/docker-compose.dev.yml index 0906798..3384ef5 100644 --- a/docker-compose.dev.yml +++ b/docker-compose.dev.yml @@ -92,7 +92,7 @@ services: ldes-backend: environment: BASE_URL: "http://localhost/ldes/" - sync-ovo-numbers: + kbo-data-sync: restart: "no" # use this to test acmidm # tlsproxy: diff --git a/docker-compose.yml b/docker-compose.yml index 35e05d6..251c6e5 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -298,16 +298,8 @@ services: - "logging=true" restart: always logging: *default-logging - sync-ovo-numbers: - image: lblod/sync-ovo-numbers-service:0.1.0 - links: - - db:database - labels: - - "logging=true" - restart: always - logging: *default-logging kbo-data-sync: - image: kbo-data-sync-service:0.0.1 + image: lblod/sync-ovo-numbers-service:improvement-api-expansion links: - db:database labels: From 3f81847c94ae338e9d8a92771e915b5bed59625b Mon Sep 17 00:00:00 2001 From: Elias Papanikitas Date: Wed, 13 Mar 2024 16:09:14 +0100 Subject: [PATCH 08/15] updated the altlable for shortname/commercialname --- config/resources/domain.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/config/resources/domain.json b/config/resources/domain.json index 3ab7c87..f7c50ed 100644 --- a/config/resources/domain.json +++ b/config/resources/domain.json @@ -639,9 +639,9 @@ "type": "string", "predicate": "ext:rechtsvorm" }, - "short-name": { + "commercial-name": { "type": "string", - "predicate": "ext:shortName" + "predicate": "skos:altLabel" }, "start-date": { "type": "date", From fc6f5139c42c872d6be76062cf9ee913c3cad7b2 Mon Sep 17 00:00:00 2001 From: Elias Papanikitas Date: Wed, 13 Mar 2024 16:18:51 +0100 Subject: [PATCH 09/15] added relationships for kbo administrative units --- config/resources/domain.json | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/config/resources/domain.json b/config/resources/domain.json index f7c50ed..2980be2 100644 --- a/config/resources/domain.json +++ b/config/resources/domain.json @@ -591,6 +591,12 @@ "target": "local-involvements", "cardinality": "many", "inverse": true + }, + "kbo-administrative-unit": { + "predicate": "owl:sameAs", + "target": "kbo-administrative-units", + "cardinality": "one", + "inverse": true } }, "new-resource-base": "http://data.lblod.info/id/eredienstBestuurseenheden/" @@ -678,6 +684,12 @@ "target": "minister-positions", "cardinality": "many", "inverse": true + }, + "kbo-administrative-unit": { + "predicate": "owl:sameAs", + "target": "kbo-administrative-units", + "cardinality": "one", + "inverse": true } }, "new-resource-base": "http://data.lblod.info/id/representatieveOrganen/" From 0e63fcc8b0cb38c72fdc61a3eedbdc17552f6ac6 Mon Sep 17 00:00:00 2001 From: Elias Papanikitas Date: Thu, 21 Mar 2024 11:40:02 +0100 Subject: [PATCH 10/15] applied changed according to merge with development --- config/resources/domain.json | 4 ---- 1 file changed, 4 deletions(-) diff --git a/config/resources/domain.json b/config/resources/domain.json index 0c57dfe..3137321 100644 --- a/config/resources/domain.json +++ b/config/resources/domain.json @@ -649,10 +649,6 @@ "type": "string", "predicate": "ext:rechtsvorm" }, - "commercial-name": { - "type": "string", - "predicate": "skos:altLabel" - }, "start-date": { "type": "date", "predicate": "ext:startDate" From b00983c5804cd6c302705fb9eb31f0fb1f59977a Mon Sep 17 00:00:00 2001 From: Elias Papanikitas Date: Thu, 21 Mar 2024 15:34:41 +0100 Subject: [PATCH 11/15] setup for async release --- config/dispatcher/dispatcher.ex | 4 ++++ docker-compose.yml | 8 ++++++++ 2 files changed, 12 insertions(+) diff --git a/config/dispatcher/dispatcher.ex b/config/dispatcher/dispatcher.ex index f1633eb..c13b401 100644 --- a/config/dispatcher/dispatcher.ex +++ b/config/dispatcher/dispatcher.ex @@ -316,6 +316,10 @@ defmodule Dispatcher do forward conn, path, "http://kbo-data-sync/sync-kbo-data/" end + post "/sync-ovo-number/*path", %{ layer: :api_services, accept: %{ json: true } } do + forward conn, path, "http://sync-ovo-numbers/sync-from-kbo/" + end + get "/ldes/*path", %{ layer: :api_services } do forward conn, path, "http://ldes-backend/" end diff --git a/docker-compose.yml b/docker-compose.yml index 5422cd9..5e667a5 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -306,6 +306,14 @@ services: - "logging=true" restart: always logging: *default-logging + sync-ovo-numbers: + image: lblod/sync-ovo-numbers-service:0.1.0 + links: + - db:database + labels: + - "logging=true" + restart: always + logging: *default-logging ################################################################################ # DELTA GENERAL From 7901485e01683aa0792e589da5ce669396dfe697 Mon Sep 17 00:00:00 2001 From: Elias Papanikitas Date: Thu, 21 Mar 2024 16:29:56 +0100 Subject: [PATCH 12/15] updated to correct woodpecker release --- docker-compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker-compose.yml b/docker-compose.yml index 5e667a5..9e5f47c 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -299,7 +299,7 @@ services: restart: always logging: *default-logging kbo-data-sync: - image: lblod/sync-ovo-numbers-service:improvement-api-expansion + image: lblod/sync-ovo-numbers-service:1.0.0 links: - db:database labels: From 23199fc896052ff4deb2c1c5f366bc2500689fce Mon Sep 17 00:00:00 2001 From: Elias Papanikitas Date: Fri, 22 Mar 2024 13:12:22 +0100 Subject: [PATCH 13/15] updated kbo data sync service version --- docker-compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker-compose.yml b/docker-compose.yml index 9e5f47c..0588828 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -299,7 +299,7 @@ services: restart: always logging: *default-logging kbo-data-sync: - image: lblod/sync-ovo-numbers-service:1.0.0 + image: lblod/sync-ovo-numbers-service:1.0.1 links: - db:database labels: From a169184fca1b563674213a34811c0b8e1ce0bf1f Mon Sep 17 00:00:00 2001 From: Elias Papanikitas Date: Tue, 26 Mar 2024 17:38:42 +0100 Subject: [PATCH 14/15] renamed to kboOrganization and linked to organisation --- config/authorization/config.ex | 2 +- config/dispatcher/dispatcher.ex | 4 ++-- config/resources/domain.json | 34 +++++++++++---------------------- 3 files changed, 14 insertions(+), 26 deletions(-) diff --git a/config/authorization/config.ex b/config/authorization/config.ex index 1b88c90..0111b1d 100644 --- a/config/authorization/config.ex +++ b/config/authorization/config.ex @@ -77,7 +77,7 @@ defmodule Acl.UserGroups.Config do "http://www.w3.org/ns/org#Post", "http://www.w3.org/ns/org#ChangeEvent", "http://data.lblod.info/vocabularies/contacthub/AgentInPositie", - "http://mu.semte.ch/vocabularies/ext/KboEenheid", + "http://mu.semte.ch/vocabularies/ext/KboOrganisatie", ] @shared_protected_type [ diff --git a/config/dispatcher/dispatcher.ex b/config/dispatcher/dispatcher.ex index c13b401..798d293 100644 --- a/config/dispatcher/dispatcher.ex +++ b/config/dispatcher/dispatcher.ex @@ -219,8 +219,8 @@ defmodule Dispatcher do Proxy.forward conn, path, "http://cache/decision-activities/" end - match "/kbo-administrative-units/*path", %{ accept: [:any], layer: :api} do - Proxy.forward conn, path, "http://resource/kbo-administrative-units/" + match "/kbo-organizations/*path", %{ accept: [:any], layer: :api} do + Proxy.forward conn, path, "http://resource/kbo-organizations/" end ############### diff --git a/config/resources/domain.json b/config/resources/domain.json index 3137321..8bb43ea 100644 --- a/config/resources/domain.json +++ b/config/resources/domain.json @@ -507,6 +507,12 @@ "target": "organizations", "cardinality": "many", "inverse": true + }, + "kbo-organization": { + "predicate": "owl:sameAs", + "target": "kbo-organizations", + "cardinality": "one", + "inverse": true } }, "new-resource-base": "http://data.lblod.info/id/organisaties/" @@ -547,12 +553,6 @@ "predicate": "skos:exactMatch", "target": "concepts", "cardinality": "one" - }, - "kbo-administrative-unit": { - "predicate": "owl:sameAs", - "target": "kbo-administrative-units", - "cardinality": "one", - "inverse": true } }, "new-resource-base": "http://data.lblod.info/id/bestuurseenheden/" @@ -595,12 +595,6 @@ "target": "local-involvements", "cardinality": "many", "inverse": true - }, - "kbo-administrative-unit": { - "predicate": "owl:sameAs", - "target": "kbo-administrative-units", - "cardinality": "one", - "inverse": true } }, "new-resource-base": "http://data.lblod.info/id/eredienstBestuurseenheden/" @@ -639,8 +633,8 @@ ], "new-resource-base": "http://data.lblod.info/id/centraleBesturenVanDeEredienst/" }, - "kbo-administrative-units": { - "class": "ext:KboEenheid", + "kbo-organizations": { + "class": "ext:KboOrganisatie", "super": [ "organizations" ], @@ -655,13 +649,13 @@ } }, "relationships": { - "administrative-unit": { + "organization": { "predicate": "owl:sameAs", - "target": "administrative-units", + "target": "organizations", "cardinality": "one" } }, - "new-resource-base": "http://data.lblod.info/id/kboBestuurseenheden/" + "new-resource-base": "http://data.lblod.info/id/kboOrganisaties/" }, "representative-bodies": { "class": "ere:RepresentatiefOrgaan", @@ -684,12 +678,6 @@ "target": "minister-positions", "cardinality": "many", "inverse": true - }, - "kbo-administrative-unit": { - "predicate": "owl:sameAs", - "target": "kbo-administrative-units", - "cardinality": "one", - "inverse": true } }, "new-resource-base": "http://data.lblod.info/id/representatieveOrganen/" From 402f7ffce3653708581b7d751388f6e18db1e3be Mon Sep 17 00:00:00 2001 From: Elias Papanikitas Date: Wed, 27 Mar 2024 10:38:07 +0100 Subject: [PATCH 15/15] bumped new vervsion kbo-sync --- docker-compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker-compose.yml b/docker-compose.yml index 0588828..72778fa 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -299,7 +299,7 @@ services: restart: always logging: *default-logging kbo-data-sync: - image: lblod/sync-ovo-numbers-service:1.0.1 + image: lblod/sync-ovo-numbers-service:1.0.2 links: - db:database labels: