From e10c825f75a159094abc94076d5eb4b789538139 Mon Sep 17 00:00:00 2001 From: mirdono Date: Tue, 21 Jan 2025 20:35:17 +0100 Subject: [PATCH 1/4] fix: index municipality names as keywords instead of regular text Index municipality names as keywords instead of as plain text. This prevents them from being split at word separators. Thereby avoiding that searches for a municipality name, as used by the frontend's municipality filter, return organisations whose municipality is a partial match. For example, previously the results when searching for "Puurs" also included the organisations located in "Sint-Amands-Puurs". The latter was tokenized into three terms, therefore also matching plain "Puurs". By treating the municipality name as keyword this split non longer happens. --- config/search/config.json | 10 +++++----- config/search/dev/config.json | 10 +++++----- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/config/search/config.json b/config/search/config.json index 643458d..3a5d67e 100644 --- a/config/search/config.json +++ b/config/search/config.json @@ -223,7 +223,7 @@ } }, "organization_municipality": { - "type": "text", + "type": "keyword", "fields": { "field": { "type": "keyword", @@ -385,7 +385,7 @@ } }, "organization_municipality": { - "type": "text", + "type": "keyword", "fields": { "field": { "type": "keyword", @@ -540,7 +540,7 @@ } }, "organization_municipality": { - "type": "text", + "type": "keyword", "fields": { "field": { "type": "keyword", @@ -727,7 +727,7 @@ } }, "organization_municipality": { - "type": "text", + "type": "keyword", "fields": { "field": { "type": "keyword", @@ -880,7 +880,7 @@ } }, "municipality": { - "type": "text", + "type": "keyword", "fields": { "field": { "type": "keyword", diff --git a/config/search/dev/config.json b/config/search/dev/config.json index bdb3394..ab1902c 100644 --- a/config/search/dev/config.json +++ b/config/search/dev/config.json @@ -195,7 +195,7 @@ } }, "organization_municipality": { - "type": "text", + "type": "keyword", "fields": { "field": { "type": "keyword", @@ -357,7 +357,7 @@ } }, "organization_municipality": { - "type": "text", + "type": "keyword", "fields": { "field": { "type": "keyword", @@ -512,7 +512,7 @@ } }, "organization_municipality": { - "type": "text", + "type": "keyword", "fields": { "field": { "type": "keyword", @@ -700,7 +700,7 @@ } }, "organization_municipality": { - "type": "text", + "type": "keyword", "fields": { "field": { "type": "keyword", @@ -853,7 +853,7 @@ } }, "municipality": { - "type": "text", + "type": "keyword", "fields": { "field": { "type": "keyword", From eb8790f40bdf3ea319e66d877402a127d1d6953e Mon Sep 17 00:00:00 2001 From: mirdono Date: Wed, 22 Jan 2025 09:24:33 +0100 Subject: [PATCH 2/4] chore: add changelog entry --- CHANGELOG.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index f3ead38..4b5e906 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,9 +4,11 @@ - 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) +- Avoid municipality filter to include partial matches (OP-3509) ### Deploy notes - `drc restart migrations-triggering-indexing; drc logs -ft --tail=200 migrations-triggering-indexing` - `drc pull frontend; drc up -d frontend` +- Perform a full re-index by executing `./scripts/reset-elastic.sh` ## 1.28.4 (2025-01-16) ### Backend From 43e7cb0daccb1cb519201c6836525410ab65c6c7 Mon Sep 17 00:00:00 2001 From: mirdono Date: Wed, 22 Jan 2025 20:26:33 +0100 Subject: [PATCH 3/4] chore: bump frontend --- CHANGELOG.md | 2 +- docker-compose.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 4b5e906..d8b51a4 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,7 +1,7 @@ # Changelog ## 1.28.5 (TODO) ### Frontend -- Bump to [v1.28.2](https://github.com/lblod/frontend-organization-portal/releases/tag/v1.28.2) +- Bump to [v1.28.3](https://github.com/lblod/frontend-organization-portal/releases/tag/v1.28.3) ### Backend - Datafix: correct merger change events for worship organisations (OP-3534) - Avoid municipality filter to include partial matches (OP-3509) diff --git a/docker-compose.yml b/docker-compose.yml index 4928d01..b9557ad 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -179,7 +179,7 @@ services: restart: always logging: *default-logging frontend: - image: lblod/frontend-organization-portal:1.28.2 + image: lblod/frontend-organization-portal:1.28.3 volumes: - ./config/frontend/add-x-frame-options-header.conf:/config/add-x-frame-options.conf environment: From 7316df1ab2e4e02f28cdd8accf41ca466298ffd7 Mon Sep 17 00:00:00 2001 From: mirdono Date: Thu, 23 Jan 2025 16:47:32 +0100 Subject: [PATCH 4/4] chore: added release date --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index d8b51a4..7b7a5d3 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,5 @@ # Changelog -## 1.28.5 (TODO) +## 1.28.5 (2025-01-23) ### Frontend - Bump to [v1.28.3](https://github.com/lblod/frontend-organization-portal/releases/tag/v1.28.3) ### Backend