fix: combine merger change events

- add the missing original organisation and matching change event result to one
  merger change event
- remove the superfluous merger change event, except for its reused change event
  result

config/dispatcher/dispatcher.ex

@@ -73,15 +73,15 @@ defmodule Dispatcher do
   end
 
   match "/organizations/*path", %{ accept: [:json], layer: :api} do
-    Proxy.forward conn, path, "http://resource/organizations/"
+    Proxy.forward conn, path, "http://cache/organizations/"
   end
 
   match "/registered-organizations/*path", %{ accept: [:json], layer: :api} do
-    Proxy.forward conn, path, "http://resource/registered-organizations/"
+    Proxy.forward conn, path, "http://cache/registered-organizations/"
   end
 
   match "/administrative-units/*path", %{ accept: [:json], layer: :api} do
-    Proxy.forward conn, path, "http://resource/administrative-units/"
+    Proxy.forward conn, path, "http://cache/administrative-units/"
   end
 
   match "/administrative-unit-classification-codes/*path", %{ accept: [:json], layer: :api} do
@@ -97,11 +97,11 @@ defmodule Dispatcher do
   end
 
   match "/worship-administrative-units/*path", %{ accept: [:json], layer: :api} do
-    Proxy.forward conn, path, "http://resource/worship-administrative-units/"
+    Proxy.forward conn, path, "http://cache/worship-administrative-units/"
   end
 
   match "/worship-services/*path", %{ accept: [:json], layer: :api} do
-    Proxy.forward conn, path, "http://resource/worship-services/" # DISABLE CACHING FOR NOW (BUG OP-1404)
+    Proxy.forward conn, path, "http://cache/worship-services/"
   end
 
   match "/recognized-worship-types/*path", %{ accept: [:json], layer: :api} do
@@ -109,7 +109,7 @@ defmodule Dispatcher do
   end
 
   match "/central-worship-services/*path", %{ accept: [:json], layer: :api} do
-    Proxy.forward conn, path, "http://resource/central-worship-services/"
+    Proxy.forward conn, path, "http://cache/central-worship-services/"
   end
 
   match "/representative-bodies/*path", %{ accept: [:json], layer: :api} do
@@ -125,7 +125,7 @@ defmodule Dispatcher do
   end
 
   match "/local-involvements/*path", %{ accept: [:json], layer: :api} do
-    Proxy.forward conn, path, "http://resource/local-involvements/"
+    Proxy.forward conn, path, "http://cache/local-involvements/"
   end
 
   match "/identifiers/*path", %{ accept: [:json], layer: :api} do
@@ -227,6 +227,7 @@ defmodule Dispatcher do
     Proxy.forward conn, path, "http://cache/decision-activities/"
   end
 
+  # There is currently no logic to invalidate the kboOrganization cache when wegwijse updates the content
   match "/kbo-organizations/*path", %{ accept: [:any], layer: :api} do
     Proxy.forward conn, path, "http://resource/kbo-organizations/"
   end

config/migrations/2024/20240529155230-add-other-classification-codes.sparql

@@ -0,0 +1,22 @@
+PREFIX skos: <http://www.w3.org/2004/02/skos/core#>
+PREFIX mu: <http://mu.semte.ch/vocabularies/core/>
+PREFIX ext: <http://mu.semte.ch/vocabularies/ext/>
+PREFIX concept: <http://data.vlaanderen.be/id/concept/GeregistreerdeOrganisatieClassificatieCode/>
+
+INSERT DATA {
+  GRAPH <http://mu.semte.ch/graphs/public> {
+    concept:3e5c8e30-95a7-47b0-b0a4-210d5bd440a7 a ext:GeregistreerdeOrganisatieClassificatieCode ;
+      a ext:OrganizationClassificationCode ;
+      mu:uuid "3e5c8e30-95a7-47b0-b0a4-210d5bd440a7" ;
+      skos:prefLabel "Vereniging" .
+  }
+}
+;
+INSERT DATA {
+  GRAPH <http://mu.semte.ch/graphs/public> {
+    concept:b9ed22af-3661-4c3e-b07f-b641d80ebf61 a ext:GeregistreerdeOrganisatieClassificatieCode ;
+      a ext:OrganizationClassificationCode ;
+      mu:uuid "b9ed22af-3661-4c3e-b07f-b641d80ebf61" ;
+      skos:prefLabel "Vennootschap" .
+  }
+}

config/migrations/20240717145138-st-martinus-herzele-combine-merger-change-events.sparql

@@ -0,0 +1,36 @@
+PREFIX org: <http://www.w3.org/ns/org#>
+PREFIX code: <http://lblod.data.gift/vocabularies/organisatie/>
+PREFIX mu: <http://mu.semte.ch/vocabularies/core/>
+PREFIX euro: <http://data.europa.eu/m8g/>
+PREFIX besluit: <http://data.vlaanderen.be/ns/besluit#>
+
+# Add the necessary additional information to one of the merger change events
+INSERT {
+  GRAPH <http://mu.semte.ch/graphs/worship-service> {
+    ?changeEvent org:originalOrganization <http://data.lblod.info/id/besturenVanDeEredienst/4b7bbaf182fe7eb6dd81a38aa575c1a4> ;
+      code:veranderingsgebeurtenisResultaat <http://lblod.data.info/id/veranderingsgebeurtenis-resultaten/667D078B77E30E85E60D0DAE> .
+  }
+} WHERE {
+  GRAPH <http://mu.semte.ch/graphs/worship-service> {
+    ?changeEvent a org:ChangeEvent ;
+      mu:uuid "667D083A77E30E85E60D0DB1" .
+  }
+}
+;
+# Delete the other merger change event
+DELETE WHERE {
+  GRAPH <http://mu.semte.ch/graphs/worship-service> {
+    ?event a org:ChangeEvent ;
+      mu:uuid "667D078877E30E85E60D0DAC" ;
+      code:veranderingsgebeurtenisResultaat ?result ;
+      euro:hasFormalFramework ?decision ;
+      ?ep ?eo .
+
+    # Note: delete only this change event result as the other one was added to the change event above
+    <http://lblod.data.info/id/veranderingsgebeurtenis-resultaten/667D078B77E30E85E60D0DAD> a code:VeranderingsgebeurtenisResultaat ;
+      ?rp ?ro .
+
+    ?decision a besluit:Besluit ;
+      ?de ?do .
+  }
+}

docker-compose.yml

@@ -72,7 +72,7 @@ services:
     restart: always
     logging: *default-logging
   resource:
-    image: semtech/mu-cl-resources:1.23.0
+    image: semtech/mu-cl-resources:1.24.0
     environment:
       CACHE_CLEAR_PATH: "http://cache/.mu/clear-keys"
     links:
@@ -181,7 +181,7 @@ services:
     restart: always
     logging: *default-logging
   frontend:
-    image: lblod/frontend-organization-portal:1.25.0
+    image: lblod/frontend-organization-portal:1.26.0
     volumes:
       - ./config/frontend/add-x-frame-options-header.conf:/config/add-x-frame-options.conf
     environment:
@@ -258,7 +258,7 @@ services:
     restart: always
     logging: *default-logging
   construct-organization-relationships:
-    image: lblod/construct-organization-relationships-service:1.0.0
+    image: lblod/construct-organization-relationships-service:1.0.1
     environment:
       START_DATE_WORSHIP_GOVERNING_BODY: "2023-04-01T00:00:00"
       END_DATE_WORSHIP_GOVERNING_BODY: "2026-03-31T00:00:00"