Merge branch 'master' into chore/update-leidinggevenden-consumer

CHANGELOG.md

@@ -1,8 +1,12 @@
 # Changelog
-## 1.28.x
-### Backend
-  - Upgraded `leidinggevenden-consumer` (OP-3533, OP-3511)
 
+## 1.28.5 (TODO)
+### Frontend
+- Bump to [v1.28.2](https://github.com/lblod/frontend-organization-portal/releases/tag/v1.28.2)
+### Backend
+- Datafix: correct merger change events for worship organisations (OP-3534)
+#### Consumer
+- Upgraded `leidinggevenden-consumer` [OP-3533], [OP-3511]
 ### Deploy notes
 ```
 drc down;
@@ -19,7 +23,7 @@ Update `docker-compose.override.yml` to:
 ```
 Then:
 ```
-drc up -d migrations
+drc up -d migrations migrations-triggering-indexing; drc logs -ft --tail=200 migrations migrations-triggering-indexing
 drc up -d db leidinggevenden-consumer
 # Wait until success of the previous step
 ```
@@ -34,9 +38,11 @@ Then, update `docker-compose.override.yml` to:
       DCR_DISABLE_INITIAL_SYNC: "false"
 ```
 ```
+drc pull frontend
 drc up -d
 sh scripts/reset-elastic.sh
 ```
+
 ## 1.28.4 (2025-01-16)
 ### Backend
 #### Data

config/migrations-triggering-indexing/20250114093158-fix-merger-change-event-sint_martinus-st_amandus.sparql

@@ -0,0 +1,23 @@
+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> {
+    ?stAmandus regorg:orgStatus ?oldStatus.
+  }
+} INSERT {
+  GRAPH <http://mu.semte.ch/graphs/worship-service> {
+    ?stAmandus regorg:orgStatus ?notActiveStatus.
+
+    ?mergerChangeEvent org:originalOrganization ?stAmandus.
+  }
+} WHERE {
+  GRAPH <http://mu.semte.ch/graphs/worship-service> {
+    ?stAmandus regorg:orgStatus ?oldStatus.
+  }
+  VALUES ?stAmandus {
+    <http://data.lblod.info/id/besturenVanDeEredienst/b18a5d3943087d509d76dcceeba102c3>
+  }
+  BIND (<http://data.lblod.info/id/veranderingsgebeurtenissen/677E445E29299CC832892A0F> AS ?mergerChangeEvent)
+  BIND (<http://lblod.data.gift/concepts/d02c4e12bf88d2fdf5123b07f29c9311> AS ?notActiveStatus)
+}

docker-compose.yml

@@ -179,7 +179,7 @@ services:
     restart: always
     logging: *default-logging
   frontend:
-    image: lblod/frontend-organization-portal:1.28.0
+    image: lblod/frontend-organization-portal:1.28.2
     volumes:
       - ./config/frontend/add-x-frame-options-header.conf:/config/add-x-frame-options.conf
     environment: