Merge remote-tracking branch 'origin/development' into feature/OP-3844-andere-org-types

# Conflicts:
#	CHANGELOG.md

CHANGELOG.md

@@ -1,4 +1,5 @@
 # Changelog
+
 ## Unreleased
 - 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]
@@ -12,6 +13,9 @@
 - Added "werkingsgebied" filter [OP-3812]
 - Inhoudelijk thema [OP-3817]
 - Werkingsgebied (dct:spatial) for private OCMW associations [OP-3832]
+- Add a new "Wijkkantoor" site type [OP-3837]
+- cleanup local involvement herne [OP-3858]
+- Search organizations by vendor [OP-3808]
 - Add organization types "Regionaal zorgplatform" (altLabel "Regionale zorgzone") and residual "Andere" [OP-3844]
 - Move organizations from "Vereniging algemeen" / "Vennootschap algemeen" to "Andere"; delete those codes [OP-3844]
 - Bump construct-organization-relationships [OP-3844]
@@ -34,18 +38,11 @@ drc restart migrations
 drc restart resource cache
 drc restart delta-producer-publication-graph-maintainer
 scripts/reset-elastic.sh
-```
-```
 drc restart migrations frontend db resource cache
 # reindex elastic search:
 /bin/bash scripts/reset-elastic.sh
-```
-
-```
 drc restart migrations search
 drc up -d frontend
-# reindex elastic search:
-/bin/bash scripts/reset-elastic.sh
 ```
 
 ```
@@ -57,6 +54,14 @@ drc up -d frontend
 drc restart cache resource
 ```
 
+## v1.41.0
+ - added explicit healtchecks [DL-7466]
+
+### Deploy notes
+```
+drc restart dispatcher
+```
+
 ## v1.40.0
 - Query to check missing address URI's [OP-3784]
 - Create new query 'organisations shown in OP frontend' in Dashboard [OP-3774]

config/dispatcher/dispatcher.ex

@@ -235,6 +235,10 @@ defmodule Dispatcher do
     Proxy.forward(conn, path, "http://cache/membership-roles/")
   end
 
+  match "/vendors/*path", %{accept: [:json], layer: :api} do
+    Proxy.forward(conn, path, "http://cache/vendors/")
+  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/")
@@ -507,6 +511,14 @@ defmodule Dispatcher do
 #    forward(conn, path, "http://db:8890/sparql/")
 #  end
 
+  #################################################################
+  # Health checks
+  #################################################################
+
+  get "/health/accounts", %{layer: :api} do
+    Proxy.forward(conn, [], "http://resource/accounts/")
+  end
+
   ###############################################################
   # errors
   ###############################################################

config/migrations/2026/20260728160900-add-site-type-wijkkantoor-pz.sparql

@@ -0,0 +1,10 @@
+INSERT DATA {
+  GRAPH <http://mu.semte.ch/graphs/public> {
+    <http://lblod.data.gift/concepts/eeaf623d-9629-4de3-9c37-2dbb132b13d8> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://lblod.data.gift/vocabularies/organisatie/TypeVestiging> .
+    <http://lblod.data.gift/concepts/eeaf623d-9629-4de3-9c37-2dbb132b13d8> <http://www.w3.org/2004/02/skos/core#prefLabel> "Wijkkantoor" .
+    <http://lblod.data.gift/concepts/eeaf623d-9629-4de3-9c37-2dbb132b13d8> <http://mu.semte.ch/vocabularies/core/uuid> "eeaf623d-9629-4de3-9c37-2dbb132b13d8" .
+    <http://lblod.data.gift/concepts/eeaf623d-9629-4de3-9c37-2dbb132b13d8> <http://www.w3.org/2004/02/skos/core#topConceptOf> <http://lblod.data.gift/concept-schemes/f8319ccf40fc2a1697edc5cf7e03018f> .
+    <http://lblod.data.gift/concepts/eeaf623d-9629-4de3-9c37-2dbb132b13d8> <http://www.w3.org/2004/02/skos/core#inScheme> <http://lblod.data.gift/concept-schemes/f8319ccf40fc2a1697edc5cf7e03018f> .
+    <http://lblod.data.gift/concepts/eeaf623d-9629-4de3-9c37-2dbb132b13d8> <http://www.w3.org/2004/02/skos/core#inScheme> <http://lblod.data.gift/concept-schemes/10caf4a4-1ff5-4c05-917e-56489910d68b> .    
+  }
+}

config/migrations/2026/20260804101638-cleanup-local-involvement-herne.sparql

@@ -0,0 +1,35 @@
+DELETE WHERE {
+  graph <http://mu.semte.ch/graphs/worship-service> {
+    <http://data.lblod.info/id/betrokkenLokaleBesturen/6187e2d787cc954587dd7dce215e96b5> ?p ?o.
+  }
+}
+
+;
+
+DELETE WHERE {
+  graph <http://mu.semte.ch/graphs/worship-service> {
+    <http://data.lblod.info/id/bestuurseenheden/73840d393bd94828f0903e8357c7f328d4bf4b8fbd63adbfa443e784f056a589> <http://data.lblod.info/vocabularies/erediensten/betrokkenBestuur> <http://data.lblod.info/id/betrokkenLokaleBesturen/6187e2d787cc954587dd7dce215e96b5>.
+  }
+}
+
+;
+
+DELETE {
+  GRAPH ?g {
+      ?localInvolvementPajottegem <http://data.lblod.info/vocabularies/erediensten/financieringspercentage> ?percentage.
+  }
+}
+INSERT {
+  GRAPH ?g {
+    ?localInvolvementPajottegem <http://data.lblod.info/vocabularies/erediensten/financieringspercentage> 100.
+  }
+}
+WHERE {
+  BIND(<http://mu.semte.ch/graphs/worship-service> AS ?g)
+  GRAPH ?g {
+    ?localInvolvementPajottegem <http://data.lblod.info/vocabularies/erediensten/financieringspercentage> ?percentage.
+  }
+  VALUES ?localInvolvementPajottegem {
+    <http://data.lblod.info/id/betrokkenLokaleBesturen/58bfe3f61f5a661383a5db8502994210>
+  }
+}

config/search/config.json

@@ -705,6 +705,10 @@
         "operation_area_spatial": [
           "http://purl.org/dc/terms/spatial",
           "http://www.w3.org/2000/01/rdf-schema#label"
+        ],
+        "vendor": [
+          "^http://mu.semte.ch/vocabularies/account/canActOnBehalfOf",
+          "http://mu.semte.ch/vocabularies/core/uuid"
         ]
       },
       "mappings": {
@@ -834,6 +838,9 @@
                 "normalizer": "custom_sort_normalizer"
               }
             }
+          },
+          "vendor": {
+            "type": "keyword"
           }
         }
       }

docker-compose.yml

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