Merge pull request #544 from lblod/hotfix/remove-suborganization-from-inactive-ckb-deinze

Remove suborganization from inactive ckb deinze
Release v1.31.3
2025-05-08 16:31:29 +02:00 · 2025-05-08 16:27:34 +02:00 · 2025-05-08 16:26:52 +02:00 · 2025-04-02 11:27:35 +02:00 · 2025-04-02 11:02:30 +02:00 · 2025-04-01 20:39:09 +02:00
6 changed files with 306 additions and 3 deletions
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,33 @@
 # Changelog
-## Unreleased
+## v1.31.3 (2025-05-08)
+### Backend
+ - Migrate active organizations linked to inactive CKB to the active one. [DL-6604]
+### Deploy notes
+```
+drc restart migrations-triggering-indexing && drc logs -ft --tail=200 migrations-triggering-indexing
+```
+
+## v1.31.2 (2025-04-02)
+### Backend
+- Extend the public producer to include: [CLBV-980]
+  - NIS codes
+  - Sites and statuses of representative organs
+  - Secondary sites with their contacts and addresses
+  - Site descriptions
+
+### Deploy notes
+```
+drc restart delta-producer-publication-graph-maintainer
+```
+
+## v1.31.1 (2025-04-01)
+### Backend
+- Removal of change events of 8 ckb's + update of their status [OP-3562]
+### Deploy Notes
+```
+drc restart migrations-triggering-indexing; drc logs -ft --tail=200 migrations-triggering-indexing
+drc restart migrations; drc logs -ft --tail=200 migrations
+```

 ## v1.31.0 (2025-03-27)
 ### Frontend
@@ -41,7 +69,7 @@ Before we can generate a user we need to add an application salt to the server.

 Once this is done you can generate a user by running `mu script project-scripts generate-dashboard-login` and following the prompts. A new local migration will be generated which can be run by restarting the migrations service and which will insert the new user into the database.

-Store the login credentials as a comment in the docker-compose.override.yml file. 
+Store the login credentials as a comment in the docker-compose.override.yml file.

 ##### 3. (Re)start the needed services
 `drc up -d frontend-dashboard dashboard-login identifier; drc restart dispatcher resource db`
--- a/config/delta-producer/public/export.json
+++ b/config/delta-producer/public/export.json
@@ -157,6 +157,9 @@
        "http://www.w3.org/2004/02/skos/core#prefLabel",
        "http://www.w3.org/ns/regorg#legalName",
        "http://www.w3.org/2004/02/skos/core#altLabel",
+        "http://www.w3.org/ns/regorg#orgStatus",
+        "http://www.w3.org/ns/org#hasPrimarySite",
+        "http://www.w3.org/ns/org#hasSite",
        "http://www.w3.org/ns/org#linkedTo",
        "http://data.lblod.info/vocabularies/erediensten/typeEredienst",
        "http://www.w3.org/ns/org#classification",
@@ -204,7 +207,28 @@
        "http://mu.semte.ch/vocabularies/core/uuid",
        "http://www.w3.org/ns/org#siteAddress",
        "https://data.vlaanderen.be/ns/organisatie#bestaatUit",
-        "http://data.lblod.info/vocabularies/erediensten/vestigingstype"
+        "http://data.lblod.info/vocabularies/erediensten/vestigingstype",
+        "http://purl.org/dc/terms/description"
+      ]
+    },
+    {
+      "type": "http://www.w3.org/ns/org#Site",
+      "graphsFilter": [
+        "http://mu.semte.ch/graphs/shared",
+        "http://mu.semte.ch/graphs/worship-service",
+        "http://mu.semte.ch/graphs/administrative-unit"
+      ],
+      "pathToConceptScheme": [
+        "^http://www.w3.org/ns/org#hasSite",
+        "http://www.w3.org/ns/org#classification",
+        "http://www.w3.org/2004/02/skos/core#inScheme"
+      ],
+      "properties": [
+        "http://mu.semte.ch/vocabularies/core/uuid",
+        "http://www.w3.org/ns/org#siteAddress",
+        "https://data.vlaanderen.be/ns/organisatie#bestaatUit",
+        "http://data.lblod.info/vocabularies/erediensten/vestigingstype",
+        "http://purl.org/dc/terms/description"
      ]
    },
    {
@@ -234,6 +258,33 @@
        "http://purl.org/dc/terms/source"
      ]
    },
+    {
+      "type": "http://www.w3.org/ns/locn#Address",
+      "graphsFilter": [
+        "http://mu.semte.ch/graphs/shared",
+        "http://mu.semte.ch/graphs/worship-service",
+        "http://mu.semte.ch/graphs/administrative-unit"
+      ],
+      "pathToConceptScheme": [
+        "^https://data.vlaanderen.be/ns/organisatie#bestaatUit",
+        "^http://www.w3.org/ns/org#hasSite",
+        "http://www.w3.org/ns/org#classification",
+        "http://www.w3.org/2004/02/skos/core#inScheme"
+      ],
+      "properties": [
+        "http://mu.semte.ch/vocabularies/core/uuid",
+        "https://data.vlaanderen.be/ns/adres#Adresvoorstelling.huisnummer",
+        "https://data.vlaanderen.be/ns/adres#Adresvoorstelling.busnummer",
+        "http://www.w3.org/ns/locn#thoroughfare",
+        "http://www.w3.org/ns/locn#postCode",
+        "https://data.vlaanderen.be/ns/adres#gemeentenaam",
+        "http://www.w3.org/ns/locn#adminUnitL2",
+        "https://data.vlaanderen.be/ns/adres#land",
+        "http://www.w3.org/ns/locn#fullAddress",
+        "https://data.vlaanderen.be/ns/adres#verwijstNaar",
+        "http://purl.org/dc/terms/source"
+      ]
+    },
    {
      "type": "http://schema.org/ContactPoint",
      "graphsFilter": [
@@ -258,6 +309,30 @@
        "http://schema.org/telephone"
      ]
    },
+    {
+      "type": "http://schema.org/ContactPoint",
+      "graphsFilter": [
+        "http://mu.semte.ch/graphs/shared",
+        "http://mu.semte.ch/graphs/worship-service",
+        "http://mu.semte.ch/graphs/administrative-unit"
+      ],
+      "pathToConceptScheme": [
+        "^http://www.w3.org/ns/org#siteAddress",
+        "^http://www.w3.org/ns/org#hasSite",
+        "http://www.w3.org/ns/org#classification",
+        "http://www.w3.org/2004/02/skos/core#inScheme"
+      ],
+      "properties": [
+        "http://mu.semte.ch/vocabularies/core/uuid",
+        "http://www.w3.org/ns/locn#address",
+        "http://xmlns.com/foaf/0.1/page",
+        "http://schema.org/faxNumber",
+        "http://schema.org/contactType",
+        "http://xmlns.com/foaf/0.1/page",
+        "http://schema.org/email",
+        "http://schema.org/telephone"
+      ]
+    },
    {
      "type": "http://www.w3.org/ns/adms#Identifier",
      "graphsFilter": [
@@ -564,6 +639,41 @@
        "http://www.opengis.net/ont/geosparql#sfWithin",
        "http://www.w3.org/2004/02/skos/core#exactMatch"
      ]
+    },
+    {
+      "type": "http://www.w3.org/2004/02/skos/core#Concept",
+      "graphsFilter": [
+        "http://mu.semte.ch/graphs/public"
+      ],
+      "pathToConceptScheme": [
+        "http://www.w3.org/2004/02/skos/core#inScheme"
+      ],
+      "properties": [
+        "http://mu.semte.ch/vocabularies/core/uuid",
+        "http://www.w3.org/2004/02/skos/core#altLabel",
+        "http://www.w3.org/2004/02/skos/core#broadMatch",
+        "http://www.w3.org/2004/02/skos/core#broader",
+        "http://www.w3.org/2004/02/skos/core#exactMatch",
+        "http://www.w3.org/2004/02/skos/core#inScheme",
+        "http://www.w3.org/2004/02/skos/core#narrowMatch",
+        "http://www.w3.org/2004/02/skos/core#narrower",
+        "http://www.w3.org/2004/02/skos/core#notation",
+        "http://www.w3.org/2004/02/skos/core#prefLabel",
+        "http://www.w3.org/2004/02/skos/core#relatedMatch",
+        "http://www.w3.org/2004/02/skos/core#topConceptOf",
+        "https://schema.org/endDate",
+        "https://schema.org/startDate"
+      ]
+    },
+    {
+      "type": "http://publications.europa.eu/ontology/euvoc#Country",
+      "graphsFilter": [
+        "http://mu.semte.ch/graphs/public"
+      ],
+      "properties": [
+        "http://www.w3.org/2004/02/skos/core#prefLabel",
+        "http://www.w3.org/2000/01/rdf-schema#label"
+      ]
    }
  ]
 }
--- a/config/migrations-triggering-indexing/2025/20250327135401-update-ckb-statuses.sparql
+++ b/config/migrations-triggering-indexing/2025/20250327135401-update-ckb-statuses.sparql
@@ -0,0 +1,42 @@
+PREFIX regorg: <http://www.w3.org/ns/regorg#>
+
+DELETE {
+  GRAPH <http://mu.semte.ch/graphs/worship-service> {
+    ?s regorg:orgStatus ?activeStatus.
+  }
+} INSERT {
+  GRAPH <http://mu.semte.ch/graphs/worship-service> {
+    ?s regorg:orgStatus ?notActiveStatus.
+  }
+} WHERE {
+  VALUES ?s {
+    <http://data.lblod.info/id/centraleBesturenVanDeEredienst/ed0914f40dfed83ca44af845a2bf4d81>
+    <http://data.lblod.info/id/centraleBesturenVanDeEredienst/9e0e8f060ca954da6263243642433f44>
+    <http://data.lblod.info/id/centraleBesturenVanDeEredienst/b93ae92a8eb4912125094d98b8b4841d>
+    <http://data.lblod.info/id/centraleBesturenVanDeEredienst/988321712204bd0104fb62e6f5dbe104>
+    <http://data.lblod.info/id/centraleBesturenVanDeEredienst/70e058024a3cd58f76005d645b892e01>
+    <http://data.lblod.info/id/centraleBesturenVanDeEredienst/cf4add06db226861767559753fb50206>
+    <http://data.lblod.info/id/centraleBesturenVanDeEredienst/5442c1374ed159347bc0c64518a9b1a9>
+  }
+  BIND (<http://lblod.data.gift/concepts/d02c4e12bf88d2fdf5123b07f29c9311> AS ?notActiveStatus)
+  BIND (<http://lblod.data.gift/concepts/63cc561de9188d64ba5840a42ae8f0d6> AS ?activeStatus)
+}
+
+;
+
+DELETE {
+  GRAPH <http://mu.semte.ch/graphs/worship-service> {
+    ?s regorg:orgStatus ?notActiveStatus.
+  }
+} INSERT {
+  GRAPH <http://mu.semte.ch/graphs/worship-service> {
+    ?s regorg:orgStatus ?activeStatus.
+  }
+} WHERE {
+  VALUES ?s {
+    <http://data.lblod.info/id/centraleBesturenVanDeEredienst/e12c4f9f7167cd0074a97a2f658d1d51>
+
+  }
+  BIND (<http://lblod.data.gift/concepts/d02c4e12bf88d2fdf5123b07f29c9311> AS ?notActiveStatus)
+  BIND (<http://lblod.data.gift/concepts/63cc561de9188d64ba5840a42ae8f0d6> AS ?activeStatus)
+}
--- a/config/migrations-triggering-indexing/2025/20250429103515-remove-has-suborganization-from-inactive-ckb-deinze.sparql
+++ b/config/migrations-triggering-indexing/2025/20250429103515-remove-has-suborganization-from-inactive-ckb-deinze.sparql
@@ -0,0 +1,55 @@
+PREFIX org: <http://www.w3.org/ns/org#>
+PREFIX mu: <http://mu.semte.ch/vocabularies/core/>
+
+INSERT {
+  GRAPH <http://mu.semte.ch/graphs/worship-service> {
+    ?activeOrg
+      <http://www.w3.org/ns/org#hasSubOrganization> ?sub .
+
+    ?membership a org:Membership ;
+      mu:uuid ?uuid ;
+      org:organization ?activeOrg ;
+      org:member ?sub ;
+      org:role <http://data.lblod.info/id/rollen/4ec7d5c39bdc4e84b4174379b9e22ad8> .
+  }
+}
+WHERE {
+  BIND(<http://data.lblod.info/id/centraleBesturenVanDeEredienst/643ddbd9448ca43828702527af7bfbb8> AS ?inactiveOrg)
+  BIND(<http://data.lblod.info/id/centraleBesturenVanDeEredienst/7f5475cfb202d12f54779f046441c9e1> AS ?activeOrg)
+
+  GRAPH <http://mu.semte.ch/graphs/worship-service> {
+    ?inactiveOrg
+      <http://www.w3.org/ns/org#hasSubOrganization> ?sub .
+  }
+
+  FILTER NOT EXISTS {
+   ?activeOrg
+     <http://www.w3.org/ns/org#hasSubOrganization> ?sub .
+  }
+
+  BIND(SHA1(CONCAT(STR(?activeOrg), STR(?sub), "sub organization")) as ?uuid)
+  BIND(IRI(CONCAT("http://data.lblod.info/id/lidmaatschap/", ?uuid)) AS ?membership)
+}
+
+;
+
+DELETE {
+  GRAPH <http://mu.semte.ch/graphs/worship-service> {
+    ?inactiveOrg
+      <http://www.w3.org/ns/org#hasSubOrganization> ?sub .
+
+    ?membership ?membershipP ?membershipO .
+  }
+}
+WHERE {
+  BIND(<http://data.lblod.info/id/centraleBesturenVanDeEredienst/643ddbd9448ca43828702527af7bfbb8> AS ?inactiveOrg)
+
+  GRAPH <http://mu.semte.ch/graphs/worship-service> {
+    ?inactiveOrg
+      <http://www.w3.org/ns/org#hasSubOrganization> ?sub .
+
+    ?membership a org:Membership ;
+      org:organization ?inactiveOrg ;
+      ?membershipP ?membershipO .
+  }
+}
--- a/config/migrations/2025/20250325131100-add-public-producer-concept-scheme-to-nis-codes.sparql
+++ b/config/migrations/2025/20250325131100-add-public-producer-concept-scheme-to-nis-codes.sparql
@@ -0,0 +1,15 @@
+INSERT  {
+   GRAPH <http://mu.semte.ch/graphs/public> {
+     ?s skos:inScheme <http://lblod.data.gift/concept-schemes/10caf4a4-1ff5-4c05-917e-56489910d68b>.
+   }
+} WHERE {
+  GRAPH <http://mu.semte.ch/graphs/public> {
+    VALUES ?nisScheme {
+      <http://vocab.belgif.be/auth/refnis2025>
+      <http://vocab.belgif.be/auth/refnis2019>
+    }
+
+    ?s a <http://www.w3.org/2004/02/skos/core#Concept> ;
+      <http://www.w3.org/2004/02/skos/core#inScheme> ?nisScheme .
+  }
+}
--- a/config/migrations/2025/20250327135321-delete-change-events.sparql
+++ b/config/migrations/2025/20250327135321-delete-change-events.sparql
@@ -0,0 +1,53 @@
+PREFIX core: <http://mu.semte.ch/vocabularies/core/>
+PREFIX org: <http://www.w3.org/ns/org#>
+PREFIX lblodorg: <http://lblod.data.gift/vocabularies/organisatie/>
+PREFIX euro: <http://data.europa.eu/m8g/>
+PREFIX besluit: <http://data.vlaanderen.be/ns/besluit#>
+
+DELETE {
+  GRAPH <http://mu.semte.ch/graphs/worship-service> {
+    ?event ?ep ?eo .
+
+    ?result ?rp ?ro .
+
+    ?decision ?de ?do .
+  }
+}
+WHERE {
+  GRAPH <http://mu.semte.ch/graphs/worship-service> {
+    VALUES ?changeEventUuid {
+      "675AFDCA29299CC832892989" # CKB Beveren
+
+      "675AC8C529299CC83289296D" # CKB De Pinte
+
+      "675AC99229299CC83289296F" # CKB Merelbeke
+
+      "675AB94329299CC83289295D" # CKB Galmaarden
+      "675AD32529299CC83289297B" # CKB Galmaarden
+
+      "675AB98C29299CC83289295F" # CKB Gooik
+      "675AD47629299CC83289297D" # CKB Gooik
+
+      "675AD50229299CC83289297F" # CKB Herne
+      "675AB9D229299CC832892961" # CKB Herne
+
+      "675ACA5F29299CC832892971" # CKB Tessenderlo
+
+      "6774F73E29299CC8328929D3" # CKB Ham
+    }
+
+    ?event a org:ChangeEvent ;
+           core:uuid ?changeEventUuid ;
+           lblodorg:veranderingsgebeurtenisResultaat ?result ;
+           ?ep ?eo .
+
+    ?result a lblodorg:VeranderingsgebeurtenisResultaat ;
+            ?rp ?ro .
+
+    OPTIONAL {
+      ?event euro:hasFormalFramework ?decision .
+      ?decision a besluit:Besluit ;
+                ?de ?do .
+    }
+  }
+}
Author	SHA1	Message	Date
Riad Abdallah	273c3d1f10	Merge pull request #544 from lblod/hotfix/remove-suborganization-from-inactive-ckb-deinze Remove suborganization from inactive ckb deinze	2025-05-08 16:31:29 +02:00
Riad Abdallah	464da76876	Release v1.31.3	2025-05-08 16:27:34 +02:00
Riad Abdallah	eb7d8949cd	Remove Active Organization from Inactive CKB Deinze There is a 'double' instance of CKB Deinze in the database. One is active, and the other is inactive. This confuses systems, and it doesn't make sense that active organizations are linked (almost managed) by an inactive organization. * Insert suborganization(s) belonging to non-active org to the active one * Insert new membership belonging to the suborganization(s) and active org * Delete memberships for non-active org	2025-05-08 16:26:52 +02:00
Claire Lovisa	539376c47c	Release v1.31.2	2025-04-02 11:27:35 +02:00
Claire Lovisa	57ef47cef9	Merge pull request #536 from lblod/fix/produce-secondary-sites-in-public-producer Produce secondary sites in public producer as well	2025-04-02 11:02:30 +02:00
Claire Lovisa	12265b7eee	Update changelog	2025-04-01 20:39:09 +02:00
Claire Lovisa	a019ee1025	Merge branch 'development' into fix/produce-secondary-sites-in-public-producer	2025-04-01 20:37:00 +02:00
Claire Lovisa	50d9db571b	Produce site description	2025-04-01 20:10:00 +02:00
Claire Lovisa	f41aaae912	Produce secondary site addresses and contact (public producer)	2025-04-01 20:06:37 +02:00
mirdono	c0d23e6178	chore: corrected changelog The entries about the public producer changes accidentally ended up in the v1.31.0 section but were not actually part of this release. This moves them back to the unreleased section so they are correctly included in the next release.	2025-04-01 17:26:28 +02:00
mirdono	67a8e9c6df	Merge branch 'master' into development	2025-04-01 17:24:31 +02:00
Claire Lovisa	b6ac54df46	Produce secondary sites in public producer as well	2025-04-01 12:43:57 +02:00
wolfez	0497b23fac	release v1.31.1	2025-04-01 09:53:23 +02:00
wolfderechter	0d87feb119	Remove change events from ckb's and update their status (#535 ) * Remove change events from ckb's and update their status * move status migration to triggering-indexing * remove unneeded code * update changelog	2025-04-01 09:42:56 +02:00
Claire Lovisa	725f608a3b	Update changelog	2025-03-31 14:30:02 +02:00
Claire Lovisa	a3d1ec1b81	Merge pull request #534 from lblod/fix/produce-ro-status-and-sites-in-public Add sites and status to representative organ in public producer	2025-03-31 14:26:00 +02:00
Claire Lovisa	285bb6f6cb	Add sites and status to representative organ in public producer	2025-03-28 13:35:15 +01:00
Claire Lovisa	9dde9bf2b9	Merge pull request #533 from lblod/feature/produce-nis-codes-in-public-producer Produce NIS codes and countries in public producer	2025-03-27 14:07:27 +01:00
Claire Lovisa	262fe89248	Produce countries in public producer	2025-03-26 11:00:41 +01:00
Claire Lovisa	d5c8f699b1	Update changelog	2025-03-25 14:05:37 +01:00
Claire Lovisa	d017d1b0e3	Produce NIS codes in public producer	2025-03-25 13:58:06 +01:00