Merge pull request #606 from lblod/OP-3810-eredienst-in-oprichting-lifecyle
Op 3810 eredienst in oprichting lifecyle
This commit is contained in:
@@ -3,15 +3,17 @@
|
|||||||
- Added service to link addresses to addressregister uris [OP-3795]
|
- Added service to link addresses to addressregister uris [OP-3795]
|
||||||
- Derive an organization's reference region(s) from its werkingsgebied; bump scope-of-operation to 0.2.0 [OP-3799]
|
- Derive an organization's reference region(s) from its werkingsgebied; bump scope-of-operation to 0.2.0 [OP-3799]
|
||||||
- Site type changes [OP-3818]
|
- Site type changes [OP-3818]
|
||||||
- Frontend [v1.40.0](https://github.com/lblod/frontend-organization-portal/blob/5d2147662f620d420f54b9624a12c42ca2ac964a/CHANGELOG.md#v1400-2026-07-06), [v1.39.0](https://github.com/lblod/frontend-organization-portal/blob/5d2147662f620d420f54b9624a12c42ca2ac964a/CHANGELOG.md#v1390-2026-06-25) ,[v1.38.0](https://github.com/lblod/frontend-organization-portal/blob/5d2147662f620d420f54b9624a12c42ca2ac964a/CHANGELOG.md#v1380-2026-06-12)
|
- Frontend [v1.40.1](https://github.com/lblod/frontend-organization-portal/blob/v1.40.1/CHANGELOG.md), [v1.40.0](https://github.com/lblod/frontend-organization-portal/blob/5d2147662f620d420f54b9624a12c42ca2ac964a/CHANGELOG.md#v1400-2026-07-06), [v1.39.0](https://github.com/lblod/frontend-organization-portal/blob/5d2147662f620d420f54b9624a12c42ca2ac964a/CHANGELOG.md#v1390-2026-06-25) ,[v1.38.0](https://github.com/lblod/frontend-organization-portal/blob/5d2147662f620d420f54b9624a12c42ca2ac964a/CHANGELOG.md#v1380-2026-06-12)
|
||||||
- Added Juridische vorm [OP-3816] [OP-3820]
|
- Added Juridische vorm [OP-3816] [OP-3820]
|
||||||
- Add new organization types (interlokale vereniging, vervoerregioraad, zorgraad, bosgroep, woonmaatschappij); add werkingsgebied (dct:spatial) to registered organizations [OP-3828]
|
- Add new organization types (interlokale vereniging, vervoerregioraad, zorgraad, bosgroep, woonmaatschappij); add werkingsgebied (dct:spatial) to registered organizations [OP-3828]
|
||||||
- Rename generic organization types to "Vereniging algemeen" / "Vennootschap algemeen" [OP-3828]
|
- Rename generic organization types to "Vereniging algemeen" / "Vennootschap algemeen" [OP-3828]
|
||||||
|
- bump construct-organization-relationships [OP-3810]
|
||||||
|
- "In Oprichting" bestuursorgaan lifecycle [OP-3810]
|
||||||
|
|
||||||
### Deploy notes
|
### Deploy notes
|
||||||
```
|
```
|
||||||
drc up -d link-adressenregister-uri frontend
|
drc up -d link-adressenregister-uri frontend construct-organization-relationships
|
||||||
drc restart resource migrations
|
drc restart resource migrations dispatcher
|
||||||
```
|
```
|
||||||
|
|
||||||
```
|
```
|
||||||
|
|||||||
@@ -386,7 +386,7 @@ defmodule Dispatcher do
|
|||||||
layer: :api_services,
|
layer: :api_services,
|
||||||
accept: %{json: true}
|
accept: %{json: true}
|
||||||
} do
|
} do
|
||||||
forward(conn, path, "http://construct-organization-relationships/create-relationships/")
|
forward(conn, path, "http://construct-organization-relationships/")
|
||||||
end
|
end
|
||||||
|
|
||||||
post "/kbo-data-sync/*path", %{layer: :api_services, accept: %{json: true}} do
|
post "/kbo-data-sync/*path", %{layer: :api_services, accept: %{json: true}} do
|
||||||
|
|||||||
@@ -0,0 +1,95 @@
|
|||||||
|
PREFIX mandaat: <http://data.vlaanderen.be/ns/mandaat#>
|
||||||
|
PREFIX ere: <http://data.lblod.info/vocabularies/erediensten/>
|
||||||
|
PREFIX besluit: <http://data.vlaanderen.be/ns/besluit#>
|
||||||
|
PREFIX generiek: <https://data.vlaanderen.be/ns/generiek#>
|
||||||
|
PREFIX regorg: <http://www.w3.org/ns/regorg#>
|
||||||
|
PREFIX org: <http://www.w3.org/ns/org#>
|
||||||
|
|
||||||
|
DELETE {
|
||||||
|
GRAPH <http://mu.semte.ch/graphs/worship-service> {
|
||||||
|
?otherOrgaanInTime ?p ?o .
|
||||||
|
?s ?p2 ?otherOrgaanInTime .
|
||||||
|
?mandate ?mp ?mo .
|
||||||
|
?ms ?mp2 ?mandate .
|
||||||
|
}
|
||||||
|
}
|
||||||
|
WHERE {
|
||||||
|
GRAPH <http://mu.semte.ch/graphs/worship-service> {
|
||||||
|
?worshipService a ere:BestuurVanDeEredienst ;
|
||||||
|
regorg:orgStatus <http://lblod.data.gift/concepts/abf4fee82019f88cf122f986830621ab> .
|
||||||
|
|
||||||
|
?bestuursorgaan besluit:bestuurt ?worshipService .
|
||||||
|
|
||||||
|
{
|
||||||
|
SELECT ?bestuursorgaan (MAX(?start) AS ?keptStart) {
|
||||||
|
GRAPH <http://mu.semte.ch/graphs/worship-service> {
|
||||||
|
?orgaanInTime generiek:isTijdspecialisatieVan ?bestuursorgaan ;
|
||||||
|
mandaat:bindingStart ?start .
|
||||||
|
FILTER(?start <= NOW())
|
||||||
|
}
|
||||||
|
}
|
||||||
|
GROUP BY ?bestuursorgaan
|
||||||
|
}
|
||||||
|
|
||||||
|
?keptOrgaanInTime generiek:isTijdspecialisatieVan ?bestuursorgaan ;
|
||||||
|
mandaat:bindingStart ?keptStart .
|
||||||
|
|
||||||
|
?otherOrgaanInTime generiek:isTijdspecialisatieVan ?bestuursorgaan .
|
||||||
|
FILTER(?otherOrgaanInTime != ?keptOrgaanInTime)
|
||||||
|
|
||||||
|
{ ?otherOrgaanInTime ?p ?o . }
|
||||||
|
UNION
|
||||||
|
{ ?s ?p2 ?otherOrgaanInTime . }
|
||||||
|
UNION
|
||||||
|
{ ?otherOrgaanInTime org:hasPost ?mandate . ?mandate ?mp ?mo . }
|
||||||
|
UNION
|
||||||
|
{ ?otherOrgaanInTime org:hasPost ?mandate . ?ms ?mp2 ?mandate . }
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
DELETE {
|
||||||
|
GRAPH <http://mu.semte.ch/graphs/worship-service> {
|
||||||
|
?mandate ?p ?o .
|
||||||
|
?s ?p2 ?mandate .
|
||||||
|
}
|
||||||
|
}
|
||||||
|
WHERE {
|
||||||
|
GRAPH <http://mu.semte.ch/graphs/worship-service> {
|
||||||
|
?worshipService a ere:BestuurVanDeEredienst ;
|
||||||
|
regorg:orgStatus <http://lblod.data.gift/concepts/abf4fee82019f88cf122f986830621ab> .
|
||||||
|
|
||||||
|
?bestuursorgaan besluit:bestuurt ?worshipService .
|
||||||
|
?orgaanInTime generiek:isTijdspecialisatieVan ?bestuursorgaan .
|
||||||
|
|
||||||
|
?orgaanInTime org:hasPost ?mandate .
|
||||||
|
?mandate a mandaat:Mandaat ;
|
||||||
|
org:role ?role .
|
||||||
|
|
||||||
|
FILTER(?role NOT IN (
|
||||||
|
<http://data.vlaanderen.be/id/concept/BestuursfunctieCode/67e6e585166cd97575b3e17ffc430a43>,
|
||||||
|
<http://data.vlaanderen.be/id/concept/BestuursfunctieCode/5ac134b9800b81da3c450d6b9605cef2>,
|
||||||
|
<http://data.vlaanderen.be/id/concept/BestuursfunctieCode/180d13930d6f1a3938e0aa7fa9990002>
|
||||||
|
))
|
||||||
|
|
||||||
|
{ ?mandate ?p ?o . }
|
||||||
|
UNION
|
||||||
|
{ ?s ?p2 ?mandate . }
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
DELETE {
|
||||||
|
GRAPH <http://mu.semte.ch/graphs/worship-service> {
|
||||||
|
?orgaanInTime mandaat:bindingEinde ?endDate .
|
||||||
|
}
|
||||||
|
}
|
||||||
|
WHERE {
|
||||||
|
GRAPH <http://mu.semte.ch/graphs/worship-service> {
|
||||||
|
?worshipService a ere:BestuurVanDeEredienst ;
|
||||||
|
regorg:orgStatus <http://lblod.data.gift/concepts/abf4fee82019f88cf122f986830621ab> .
|
||||||
|
|
||||||
|
?bestuursorgaan besluit:bestuurt ?worshipService .
|
||||||
|
?orgaanInTime generiek:isTijdspecialisatieVan ?bestuursorgaan .
|
||||||
|
|
||||||
|
?orgaanInTime mandaat:bindingEinde ?endDate .
|
||||||
|
}
|
||||||
|
};
|
||||||
@@ -215,7 +215,7 @@ services:
|
|||||||
restart: always
|
restart: always
|
||||||
logging: *default-logging
|
logging: *default-logging
|
||||||
frontend:
|
frontend:
|
||||||
image: lblod/frontend-organization-portal:1.40.0
|
image: lblod/frontend-organization-portal:1.40.1
|
||||||
volumes:
|
volumes:
|
||||||
- ./config/frontend/add-x-frame-options-header.conf:/config/add-x-frame-options.conf
|
- ./config/frontend/add-x-frame-options-header.conf:/config/add-x-frame-options.conf
|
||||||
environment:
|
environment:
|
||||||
@@ -308,7 +308,7 @@ services:
|
|||||||
restart: always
|
restart: always
|
||||||
logging: *default-logging
|
logging: *default-logging
|
||||||
construct-organization-relationships:
|
construct-organization-relationships:
|
||||||
image: lblod/construct-organization-relationships-service:1.1.2
|
image: lblod/construct-organization-relationships-service:1.1.3
|
||||||
links:
|
links:
|
||||||
- db:database
|
- db:database
|
||||||
labels:
|
labels:
|
||||||
|
|||||||
Reference in New Issue
Block a user