From 2666301048cc4d70d2a9a4d5928c0758c093861e Mon Sep 17 00:00:00 2001 From: mirdono Date: Wed, 22 Jan 2025 12:04:00 +0100 Subject: [PATCH 1/3] chore: align search service configuration for dev and prod This makes diff'ing the dev and prod configurations for the `search` service slightly more readable. - use same order of eager index entries with prod confiuration - remove an extra normalizer setting in the dev config - remove duplicate person id index - correct property name in identifier mappings - add missing `first_name_used` mappings - order properties and mappings consistently across file --- config/search/config.json | 231 +++++++++++++++++++--------------- config/search/dev/config.json | 226 ++++++++++++++++++--------------- 2 files changed, 255 insertions(+), 202 deletions(-) diff --git a/config/search/config.json b/config/search/config.json index 3a5d67e..a9dd6f4 100644 --- a/config/search/config.json +++ b/config/search/config.json @@ -92,22 +92,18 @@ "http://data.lblod.info/vocabularies/erediensten/EredienstMandataris" ], "properties": { - "given_name": [ - "http://data.vlaanderen.be/ns/mandaat#isBestuurlijkeAliasVan", - "http://xmlns.com/foaf/0.1/givenName" - ], "person_id": [ "http://data.vlaanderen.be/ns/mandaat#isBestuurlijkeAliasVan", "http://mu.semte.ch/vocabularies/core/uuid" ], - "person_uuid": [ - "http://data.vlaanderen.be/ns/mandaat#isBestuurlijkeAliasVan", - "http://mu.semte.ch/vocabularies/core/uuid" - ], "family_name": [ "http://data.vlaanderen.be/ns/mandaat#isBestuurlijkeAliasVan", "http://xmlns.com/foaf/0.1/familyName" ], + "given_name": [ + "http://data.vlaanderen.be/ns/mandaat#isBestuurlijkeAliasVan", + "http://xmlns.com/foaf/0.1/givenName" + ], "first_name_used": [ "http://data.vlaanderen.be/ns/mandaat#isBestuurlijkeAliasVan", "https://data.vlaanderen.be/ns/persoon#gebruikteVoornaam" @@ -166,6 +162,14 @@ }, "mappings": { "properties": { + "person_id": { + "type": "text", + "fields": { + "field": { + "type": "keyword" + } + } + }, "family_name": { "type": "text", "fields": { @@ -175,14 +179,6 @@ } } }, - "id": { - "type": "text", - "fields": { - "field": { - "type": "keyword" - } - } - }, "given_name": { "type": "text", "fields": { @@ -192,10 +188,7 @@ } } }, - "organization_id": { - "type": "text" - }, - "organization_classification": { + "first_name_used": { "type": "text", "fields": { "field": { @@ -204,7 +197,13 @@ } } }, - "organization_province": { + "end_date": { + "type": "date" + }, + "organization_id": { + "type": "text" + }, + "organization_classification": { "type": "text", "fields": { "field": { @@ -231,6 +230,15 @@ } } }, + "organization_province": { + "type": "text", + "fields": { + "field": { + "type": "keyword", + "normalizer": "custom_sort_normalizer" + } + } + }, "position_id": { "type": "text" }, @@ -242,9 +250,6 @@ "normalizer": "custom_sort_normalizer" } } - }, - "end_date": { - "type": "date" } } } @@ -254,22 +259,18 @@ "on_path": "functionaries", "rdf_type": "http://data.lblod.info/vocabularies/leidinggevenden/Functionaris", "properties": { - "given_name": [ - "http://data.vlaanderen.be/ns/mandaat#isBestuurlijkeAliasVan", - "http://xmlns.com/foaf/0.1/givenName" - ], "person_id": [ "http://data.vlaanderen.be/ns/mandaat#isBestuurlijkeAliasVan", "http://mu.semte.ch/vocabularies/core/uuid" ], - "person_uuid": [ - "http://data.vlaanderen.be/ns/mandaat#isBestuurlijkeAliasVan", - "http://mu.semte.ch/vocabularies/core/uuid" - ], "family_name": [ "http://data.vlaanderen.be/ns/mandaat#isBestuurlijkeAliasVan", "http://xmlns.com/foaf/0.1/familyName" ], + "given_name": [ + "http://data.vlaanderen.be/ns/mandaat#isBestuurlijkeAliasVan", + "http://xmlns.com/foaf/0.1/givenName" + ], "first_name_used": [ "http://data.vlaanderen.be/ns/mandaat#isBestuurlijkeAliasVan", "https://data.vlaanderen.be/ns/persoon#gebruikteVoornaam" @@ -328,6 +329,14 @@ }, "mappings": { "properties": { + "person_id": { + "type": "text", + "fields": { + "field": { + "type": "keyword" + } + } + }, "family_name": { "type": "text", "fields": { @@ -337,14 +346,6 @@ } } }, - "id": { - "type": "text", - "fields": { - "field": { - "type": "keyword" - } - } - }, "given_name": { "type": "text", "fields": { @@ -354,10 +355,7 @@ } } }, - "organization_id": { - "type": "text" - }, - "organization_classification": { + "first_name_used": { "type": "text", "fields": { "field": { @@ -366,7 +364,13 @@ } } }, - "organization_province": { + "end_date": { + "type": "date" + }, + "organization_id": { + "type": "text" + }, + "organization_classification": { "type": "text", "fields": { "field": { @@ -393,6 +397,15 @@ } } }, + "organization_province": { + "type": "text", + "fields": { + "field": { + "type": "keyword", + "normalizer": "custom_sort_normalizer" + } + } + }, "position_id": { "type": "text" }, @@ -404,9 +417,6 @@ "normalizer": "custom_sort_normalizer" } } - }, - "end_date": { - "type": "date" } } } @@ -419,22 +429,18 @@ "http://data.lblod.info/vocabularies/contacthub/AgentInPositie" ], "properties": { - "given_name": [ - "http://www.w3.org/ns/org#heldBy", - "http://xmlns.com/foaf/0.1/givenName" - ], "person_id": [ "http://www.w3.org/ns/org#heldBy", "http://mu.semte.ch/vocabularies/core/uuid" ], - "person_uuid": [ - "http://www.w3.org/ns/org#heldBy", - "http://mu.semte.ch/vocabularies/core/uuid" - ], "family_name": [ "http://www.w3.org/ns/org#heldBy", "http://xmlns.com/foaf/0.1/familyName" ], + "given_name": [ + "http://www.w3.org/ns/org#heldBy", + "http://xmlns.com/foaf/0.1/givenName" + ], "first_name_used": [ "http://www.w3.org/ns/org#heldBy", "https://data.vlaanderen.be/ns/persoon#gebruikteVoornaam" @@ -483,6 +489,14 @@ }, "mappings": { "properties": { + "person_id": { + "type": "text", + "fields": { + "field": { + "type": "keyword" + } + } + }, "family_name": { "type": "text", "fields": { @@ -492,14 +506,6 @@ } } }, - "person_id": { - "type": "text", - "fields": { - "field": { - "type": "keyword" - } - } - }, "given_name": { "type": "text", "fields": { @@ -509,10 +515,7 @@ } } }, - "organization_id": { - "type": "text" - }, - "organization_classification": { + "first_name_used": { "type": "text", "fields": { "field": { @@ -521,7 +524,13 @@ } } }, - "organization_province": { + "end_date": { + "type": "date" + }, + "organization_id": { + "type": "text" + }, + "organization_classification": { "type": "text", "fields": { "field": { @@ -548,6 +557,15 @@ } } }, + "organization_province": { + "type": "text", + "fields": { + "field": { + "type": "keyword", + "normalizer": "custom_sort_normalizer" + } + } + }, "position_id": { "type": "text" }, @@ -559,9 +577,6 @@ "normalizer": "custom_sort_normalizer" } } - }, - "end_date": { - "type": "date" } } } @@ -571,14 +586,6 @@ "composite_types": ["minister", "functionary", "mandatory"], "on_path": "people", "properties": [ - { - "name": "given_name", - "mappings": { - "minister": "given_name", - "functionary": "given_name", - "mandatory": "given_name" - } - }, { "name": "person_id", "mappings": { @@ -595,6 +602,14 @@ "mandatory": "family_name" } }, + { + "name": "given_name", + "mappings": { + "minister": "given_name", + "functionary": "given_name", + "mandatory": "given_name" + } + }, { "name": "first_name_used", "mappings": { @@ -670,6 +685,14 @@ ], "mappings": { "properties": { + "person_id": { + "type": "text", + "fields": { + "field": { + "type": "keyword" + } + } + }, "family_name": { "type": "text", "fields": { @@ -679,14 +702,6 @@ } } }, - "id": { - "type": "text", - "fields": { - "field": { - "type": "keyword" - } - } - }, "given_name": { "type": "text", "fields": { @@ -696,10 +711,7 @@ } } }, - "organization_id": { - "type": "text" - }, - "organization_classification": { + "first_name_used": { "type": "text", "fields": { "field": { @@ -708,7 +720,13 @@ } } }, - "organization_province": { + "end_date": { + "type": "date" + }, + "organization_id": { + "type": "text" + }, + "organization_classification": { "type": "text", "fields": { "field": { @@ -735,6 +753,15 @@ } } }, + "organization_province": { + "type": "text", + "fields": { + "field": { + "type": "keyword", + "normalizer": "custom_sort_normalizer" + } + } + }, "position_id": { "type": "text" }, @@ -746,9 +773,6 @@ "normalizer": "custom_sort_normalizer" } } - }, - "end_date": { - "type": "date" } } } @@ -810,12 +834,6 @@ }, "mappings": { "properties": { - "classification_id": { - "type": "text" - }, - "recognized_worship_type_id": { - "type": "text" - }, "name": { "type": "text", "fields": { @@ -843,6 +861,9 @@ } } }, + "classification_id": { + "type": "text" + }, "classification_name": { "type": "text", "fields": { @@ -861,6 +882,12 @@ } } }, + "status_id": { + "type": "text" + }, + "recognized_worship_type_id": { + "type": "text" + }, "recognized_worship_type_name": { "type": "text", "fields": { diff --git a/config/search/dev/config.json b/config/search/dev/config.json index ab1902c..bfc90d7 100644 --- a/config/search/dev/config.json +++ b/config/search/dev/config.json @@ -6,7 +6,7 @@ [ { "variables": [], - "name": "acmidm-worship-editeerder" + "name": "acmidm-editeerder" }, { "variables": [], @@ -20,7 +20,7 @@ [ { "variables": [], - "name": "acmidm-editeerder" + "name": "acmidm-worship-editeerder" }, { "variables": [], @@ -64,22 +64,18 @@ "http://data.lblod.info/vocabularies/erediensten/EredienstMandataris" ], "properties": { - "given_name": [ - "http://data.vlaanderen.be/ns/mandaat#isBestuurlijkeAliasVan", - "http://xmlns.com/foaf/0.1/givenName" - ], "person_id": [ "http://data.vlaanderen.be/ns/mandaat#isBestuurlijkeAliasVan", "http://mu.semte.ch/vocabularies/core/uuid" ], - "person_uuid": [ - "http://data.vlaanderen.be/ns/mandaat#isBestuurlijkeAliasVan", - "http://mu.semte.ch/vocabularies/core/uuid" - ], "family_name": [ "http://data.vlaanderen.be/ns/mandaat#isBestuurlijkeAliasVan", "http://xmlns.com/foaf/0.1/familyName" ], + "given_name": [ + "http://data.vlaanderen.be/ns/mandaat#isBestuurlijkeAliasVan", + "http://xmlns.com/foaf/0.1/givenName" + ], "first_name_used": [ "http://data.vlaanderen.be/ns/mandaat#isBestuurlijkeAliasVan", "https://data.vlaanderen.be/ns/persoon#gebruikteVoornaam" @@ -138,6 +134,14 @@ }, "mappings": { "properties": { + "person_id": { + "type": "text", + "fields": { + "field": { + "type": "keyword" + } + } + }, "family_name": { "type": "text", "fields": { @@ -147,14 +151,6 @@ } } }, - "person_id": { - "type": "text", - "fields": { - "field": { - "type": "keyword" - } - } - }, "given_name": { "type": "text", "fields": { @@ -164,10 +160,7 @@ } } }, - "organization_id": { - "type": "text" - }, - "organization_classification": { + "first_name_used": { "type": "text", "fields": { "field": { @@ -176,7 +169,13 @@ } } }, - "organization_province": { + "end_date": { + "type": "date" + }, + "organization_id": { + "type": "text" + }, + "organization_classification": { "type": "text", "fields": { "field": { @@ -203,6 +202,15 @@ } } }, + "organization_province": { + "type": "text", + "fields": { + "field": { + "type": "keyword", + "normalizer": "custom_sort_normalizer" + } + } + }, "position_id": { "type": "text" }, @@ -214,9 +222,6 @@ "normalizer": "custom_sort_normalizer" } } - }, - "end_date": { - "type": "date" } } } @@ -226,22 +231,18 @@ "on_path": "functionaries", "rdf_type": "http://data.lblod.info/vocabularies/leidinggevenden/Functionaris", "properties": { - "given_name": [ - "http://data.vlaanderen.be/ns/mandaat#isBestuurlijkeAliasVan", - "http://xmlns.com/foaf/0.1/givenName" - ], "person_id": [ "http://data.vlaanderen.be/ns/mandaat#isBestuurlijkeAliasVan", "http://mu.semte.ch/vocabularies/core/uuid" ], - "person_uuid": [ - "http://data.vlaanderen.be/ns/mandaat#isBestuurlijkeAliasVan", - "http://mu.semte.ch/vocabularies/core/uuid" - ], "family_name": [ "http://data.vlaanderen.be/ns/mandaat#isBestuurlijkeAliasVan", "http://xmlns.com/foaf/0.1/familyName" ], + "given_name": [ + "http://data.vlaanderen.be/ns/mandaat#isBestuurlijkeAliasVan", + "http://xmlns.com/foaf/0.1/givenName" + ], "first_name_used": [ "http://data.vlaanderen.be/ns/mandaat#isBestuurlijkeAliasVan", "https://data.vlaanderen.be/ns/persoon#gebruikteVoornaam" @@ -300,6 +301,14 @@ }, "mappings": { "properties": { + "person_id": { + "type": "text", + "fields": { + "field": { + "type": "keyword" + } + } + }, "family_name": { "type": "text", "fields": { @@ -309,14 +318,6 @@ } } }, - "person_id": { - "type": "text", - "fields": { - "field": { - "type": "keyword" - } - } - }, "given_name": { "type": "text", "fields": { @@ -326,10 +327,7 @@ } } }, - "organization_id": { - "type": "text" - }, - "organization_classification": { + "first_name_used": { "type": "text", "fields": { "field": { @@ -338,7 +336,13 @@ } } }, - "organization_province": { + "end_date": { + "type": "date" + }, + "organization_id": { + "type": "text" + }, + "organization_classification": { "type": "text", "fields": { "field": { @@ -365,6 +369,15 @@ } } }, + "organization_province": { + "type": "text", + "fields": { + "field": { + "type": "keyword", + "normalizer": "custom_sort_normalizer" + } + } + }, "position_id": { "type": "text" }, @@ -376,9 +389,6 @@ "normalizer": "custom_sort_normalizer" } } - }, - "end_date": { - "type": "date" } } } @@ -391,22 +401,18 @@ "http://data.lblod.info/vocabularies/contacthub/AgentInPositie" ], "properties": { - "given_name": [ - "http://www.w3.org/ns/org#heldBy", - "http://xmlns.com/foaf/0.1/givenName" - ], "person_id": [ "http://www.w3.org/ns/org#heldBy", "http://mu.semte.ch/vocabularies/core/uuid" ], - "person_uuid": [ - "http://www.w3.org/ns/org#heldBy", - "http://mu.semte.ch/vocabularies/core/uuid" - ], "family_name": [ "http://www.w3.org/ns/org#heldBy", "http://xmlns.com/foaf/0.1/familyName" ], + "given_name": [ + "http://www.w3.org/ns/org#heldBy", + "http://xmlns.com/foaf/0.1/givenName" + ], "first_name_used": [ "http://www.w3.org/ns/org#heldBy", "https://data.vlaanderen.be/ns/persoon#gebruikteVoornaam" @@ -455,6 +461,14 @@ }, "mappings": { "properties": { + "person_id": { + "type": "text", + "fields": { + "field": { + "type": "keyword" + } + } + }, "family_name": { "type": "text", "fields": { @@ -464,14 +478,6 @@ } } }, - "person_id": { - "type": "text", - "fields": { - "field": { - "type": "keyword" - } - } - }, "given_name": { "type": "text", "fields": { @@ -481,10 +487,7 @@ } } }, - "organization_id": { - "type": "text" - }, - "organization_classification": { + "first_name_used": { "type": "text", "fields": { "field": { @@ -493,7 +496,13 @@ } } }, - "organization_province": { + "end_date": { + "type": "date" + }, + "organization_id": { + "type": "text" + }, + "organization_classification": { "type": "text", "fields": { "field": { @@ -520,6 +529,15 @@ } } }, + "organization_province": { + "type": "text", + "fields": { + "field": { + "type": "keyword", + "normalizer": "custom_sort_normalizer" + } + } + }, "position_id": { "type": "text" }, @@ -531,9 +549,6 @@ "normalizer": "custom_sort_normalizer" } } - }, - "end_date": { - "type": "date" } } } @@ -543,14 +558,6 @@ "composite_types": ["minister", "functionary", "mandatory"], "on_path": "people", "properties": [ - { - "name": "given_name", - "mappings": { - "minister": "given_name", - "functionary": "given_name", - "mandatory": "given_name" - } - }, { "name": "person_id", "mappings": { @@ -567,6 +574,14 @@ "mandatory": "family_name" } }, + { + "name": "given_name", + "mappings": { + "minister": "given_name", + "functionary": "given_name", + "mandatory": "given_name" + } + }, { "name": "first_name_used", "mappings": { @@ -642,16 +657,15 @@ ], "mappings": { "properties": { - "family_name": { + "person_id": { "type": "text", "fields": { "field": { - "type": "keyword", - "normalizer": "custom_sort_normalizer" + "type": "keyword" } } }, - "person_id": { + "family_name": { "type": "text", "fields": { "field": { @@ -669,10 +683,7 @@ } } }, - "organization_id": { - "type": "text" - }, - "organization_classification": { + "first_name_used": { "type": "text", "fields": { "field": { @@ -681,7 +692,13 @@ } } }, - "organization_province": { + "end_date": { + "type": "date" + }, + "organization_id": { + "type": "text" + }, + "organization_classification": { "type": "text", "fields": { "field": { @@ -708,6 +725,15 @@ } } }, + "organization_province": { + "type": "text", + "fields": { + "field": { + "type": "keyword", + "normalizer": "custom_sort_normalizer" + } + } + }, "position_id": { "type": "text" }, @@ -719,9 +745,6 @@ "normalizer": "custom_sort_normalizer" } } - }, - "end_date": { - "type": "date" } } } @@ -783,12 +806,6 @@ }, "mappings": { "properties": { - "classification_id": { - "type": "text" - }, - "recognized_worship_type_id": { - "type": "text" - }, "name": { "type": "text", "fields": { @@ -816,6 +833,9 @@ } } }, + "classification_id": { + "type": "text" + }, "classification_name": { "type": "text", "fields": { @@ -834,6 +854,12 @@ } } }, + "status_id": { + "type": "text" + }, + "recognized_worship_type_id": { + "type": "text" + }, "recognized_worship_type_name": { "type": "text", "fields": { From 3a375a45811d445a38ec122511940e3b4b5ef259 Mon Sep 17 00:00:00 2001 From: mirdono Date: Thu, 23 Jan 2025 08:58:20 +0100 Subject: [PATCH 2/3] chore: remove unused indexes for positions The indexes for the municipality and province of a position's organisation are not used in the app. Removing them to decrease the time required to index data. --- config/search/config.json | 138 ---------------------------------- config/search/dev/config.json | 138 ---------------------------------- 2 files changed, 276 deletions(-) diff --git a/config/search/config.json b/config/search/config.json index a9dd6f4..95a016e 100644 --- a/config/search/config.json +++ b/config/search/config.json @@ -131,24 +131,6 @@ "http://data.vlaanderen.be/ns/besluit#bestuurt", "http://www.w3.org/2004/02/skos/core#prefLabel" ], - "organization_municipality": [ - "http://www.w3.org/ns/org#holds", - "^http://www.w3.org/ns/org#hasPost", - "https://data.vlaanderen.be/ns/generiek#isTijdspecialisatieVan", - "http://data.vlaanderen.be/ns/besluit#bestuurt", - "http://www.w3.org/ns/org#hasPrimarySite", - "https://data.vlaanderen.be/ns/organisatie#bestaatUit", - "https://data.vlaanderen.be/ns/adres#gemeentenaam" - ], - "organization_province": [ - "http://www.w3.org/ns/org#holds", - "^http://www.w3.org/ns/org#hasPost", - "https://data.vlaanderen.be/ns/generiek#isTijdspecialisatieVan", - "http://data.vlaanderen.be/ns/besluit#bestuurt", - "http://www.w3.org/ns/org#hasPrimarySite", - "https://data.vlaanderen.be/ns/organisatie#bestaatUit", - "http://www.w3.org/ns/locn#adminUnitL2" - ], "position_id": [ "http://www.w3.org/ns/org#holds", "http://www.w3.org/ns/org#role", @@ -221,24 +203,6 @@ } } }, - "organization_municipality": { - "type": "keyword", - "fields": { - "field": { - "type": "keyword", - "normalizer": "custom_sort_normalizer" - } - } - }, - "organization_province": { - "type": "text", - "fields": { - "field": { - "type": "keyword", - "normalizer": "custom_sort_normalizer" - } - } - }, "position_id": { "type": "text" }, @@ -298,24 +262,6 @@ "http://data.vlaanderen.be/ns/besluit#bestuurt", "http://www.w3.org/2004/02/skos/core#prefLabel" ], - "organization_municipality": [ - "http://www.w3.org/ns/org#holds", - "^http://data.lblod.info/vocabularies/leidinggevenden/heeftBestuursfunctie", - "https://data.vlaanderen.be/ns/generiek#isTijdspecialisatieVan", - "http://data.vlaanderen.be/ns/besluit#bestuurt", - "http://www.w3.org/ns/org#hasPrimarySite", - "https://data.vlaanderen.be/ns/organisatie#bestaatUit", - "https://data.vlaanderen.be/ns/adres#gemeentenaam" - ], - "organization_province": [ - "http://www.w3.org/ns/org#holds", - "^http://data.lblod.info/vocabularies/leidinggevenden/heeftBestuursfunctie", - "https://data.vlaanderen.be/ns/generiek#isTijdspecialisatieVan", - "http://data.vlaanderen.be/ns/besluit#bestuurt", - "http://www.w3.org/ns/org#hasPrimarySite", - "https://data.vlaanderen.be/ns/organisatie#bestaatUit", - "http://www.w3.org/ns/locn#adminUnitL2" - ], "position_id": [ "http://www.w3.org/ns/org#holds", "http://www.w3.org/ns/org#role", @@ -388,24 +334,6 @@ } } }, - "organization_municipality": { - "type": "keyword", - "fields": { - "field": { - "type": "keyword", - "normalizer": "custom_sort_normalizer" - } - } - }, - "organization_province": { - "type": "text", - "fields": { - "field": { - "type": "keyword", - "normalizer": "custom_sort_normalizer" - } - } - }, "position_id": { "type": "text" }, @@ -462,20 +390,6 @@ "^http://data.lblod.info/vocabularies/erediensten/wordtBediendDoor", "http://www.w3.org/2004/02/skos/core#prefLabel" ], - "organization_municipality": [ - "http://www.w3.org/ns/org#holds", - "^http://data.lblod.info/vocabularies/erediensten/wordtBediendDoor", - "http://www.w3.org/ns/org#hasPrimarySite", - "https://data.vlaanderen.be/ns/organisatie#bestaatUit", - "https://data.vlaanderen.be/ns/adres#gemeentenaam" - ], - "organization_province": [ - "http://www.w3.org/ns/org#holds", - "^http://data.lblod.info/vocabularies/erediensten/wordtBediendDoor", - "http://www.w3.org/ns/org#hasPrimarySite", - "https://data.vlaanderen.be/ns/organisatie#bestaatUit", - "http://www.w3.org/ns/locn#adminUnitL2" - ], "position_id": [ "http://www.w3.org/ns/org#holds", "http://data.lblod.info/vocabularies/erediensten/functie", @@ -548,24 +462,6 @@ } } }, - "organization_municipality": { - "type": "keyword", - "fields": { - "field": { - "type": "keyword", - "normalizer": "custom_sort_normalizer" - } - } - }, - "organization_province": { - "type": "text", - "fields": { - "field": { - "type": "keyword", - "normalizer": "custom_sort_normalizer" - } - } - }, "position_id": { "type": "text" }, @@ -650,22 +546,6 @@ "mandatory": "organization_name" } }, - { - "name": "organization_municipality", - "mappings": { - "minister": "organization_municipality", - "functionary": "organization_municipality", - "mandatory": "organization_municipality" - } - }, - { - "name": "organization_province", - "mappings": { - "minister": "organization_province", - "functionary": "organization_province", - "mandatory": "organization_province" - } - }, { "name": "position_id", "mappings": { @@ -744,24 +624,6 @@ } } }, - "organization_municipality": { - "type": "keyword", - "fields": { - "field": { - "type": "keyword", - "normalizer": "custom_sort_normalizer" - } - } - }, - "organization_province": { - "type": "text", - "fields": { - "field": { - "type": "keyword", - "normalizer": "custom_sort_normalizer" - } - } - }, "position_id": { "type": "text" }, diff --git a/config/search/dev/config.json b/config/search/dev/config.json index bfc90d7..e178c04 100644 --- a/config/search/dev/config.json +++ b/config/search/dev/config.json @@ -103,24 +103,6 @@ "http://data.vlaanderen.be/ns/besluit#bestuurt", "http://www.w3.org/2004/02/skos/core#prefLabel" ], - "organization_municipality": [ - "http://www.w3.org/ns/org#holds", - "^http://www.w3.org/ns/org#hasPost", - "https://data.vlaanderen.be/ns/generiek#isTijdspecialisatieVan", - "http://data.vlaanderen.be/ns/besluit#bestuurt", - "http://www.w3.org/ns/org#hasPrimarySite", - "https://data.vlaanderen.be/ns/organisatie#bestaatUit", - "https://data.vlaanderen.be/ns/adres#gemeentenaam" - ], - "organization_province": [ - "http://www.w3.org/ns/org#holds", - "^http://www.w3.org/ns/org#hasPost", - "https://data.vlaanderen.be/ns/generiek#isTijdspecialisatieVan", - "http://data.vlaanderen.be/ns/besluit#bestuurt", - "http://www.w3.org/ns/org#hasPrimarySite", - "https://data.vlaanderen.be/ns/organisatie#bestaatUit", - "http://www.w3.org/ns/locn#adminUnitL2" - ], "position_id": [ "http://www.w3.org/ns/org#holds", "http://www.w3.org/ns/org#role", @@ -193,24 +175,6 @@ } } }, - "organization_municipality": { - "type": "keyword", - "fields": { - "field": { - "type": "keyword", - "normalizer": "custom_sort_normalizer" - } - } - }, - "organization_province": { - "type": "text", - "fields": { - "field": { - "type": "keyword", - "normalizer": "custom_sort_normalizer" - } - } - }, "position_id": { "type": "text" }, @@ -270,24 +234,6 @@ "http://data.vlaanderen.be/ns/besluit#bestuurt", "http://www.w3.org/2004/02/skos/core#prefLabel" ], - "organization_municipality": [ - "http://www.w3.org/ns/org#holds", - "^http://data.lblod.info/vocabularies/leidinggevenden/heeftBestuursfunctie", - "https://data.vlaanderen.be/ns/generiek#isTijdspecialisatieVan", - "http://data.vlaanderen.be/ns/besluit#bestuurt", - "http://www.w3.org/ns/org#hasPrimarySite", - "https://data.vlaanderen.be/ns/organisatie#bestaatUit", - "https://data.vlaanderen.be/ns/adres#gemeentenaam" - ], - "organization_province": [ - "http://www.w3.org/ns/org#holds", - "^http://data.lblod.info/vocabularies/leidinggevenden/heeftBestuursfunctie", - "https://data.vlaanderen.be/ns/generiek#isTijdspecialisatieVan", - "http://data.vlaanderen.be/ns/besluit#bestuurt", - "http://www.w3.org/ns/org#hasPrimarySite", - "https://data.vlaanderen.be/ns/organisatie#bestaatUit", - "http://www.w3.org/ns/locn#adminUnitL2" - ], "position_id": [ "http://www.w3.org/ns/org#holds", "http://www.w3.org/ns/org#role", @@ -360,24 +306,6 @@ } } }, - "organization_municipality": { - "type": "keyword", - "fields": { - "field": { - "type": "keyword", - "normalizer": "custom_sort_normalizer" - } - } - }, - "organization_province": { - "type": "text", - "fields": { - "field": { - "type": "keyword", - "normalizer": "custom_sort_normalizer" - } - } - }, "position_id": { "type": "text" }, @@ -434,20 +362,6 @@ "^http://data.lblod.info/vocabularies/erediensten/wordtBediendDoor", "http://www.w3.org/2004/02/skos/core#prefLabel" ], - "organization_municipality": [ - "http://www.w3.org/ns/org#holds", - "^http://data.lblod.info/vocabularies/erediensten/wordtBediendDoor", - "http://www.w3.org/ns/org#hasPrimarySite", - "https://data.vlaanderen.be/ns/organisatie#bestaatUit", - "https://data.vlaanderen.be/ns/adres#gemeentenaam" - ], - "organization_province": [ - "http://www.w3.org/ns/org#holds", - "^http://data.lblod.info/vocabularies/erediensten/wordtBediendDoor", - "http://www.w3.org/ns/org#hasPrimarySite", - "https://data.vlaanderen.be/ns/organisatie#bestaatUit", - "http://www.w3.org/ns/locn#adminUnitL2" - ], "position_id": [ "http://www.w3.org/ns/org#holds", "http://data.lblod.info/vocabularies/erediensten/functie", @@ -520,24 +434,6 @@ } } }, - "organization_municipality": { - "type": "keyword", - "fields": { - "field": { - "type": "keyword", - "normalizer": "custom_sort_normalizer" - } - } - }, - "organization_province": { - "type": "text", - "fields": { - "field": { - "type": "keyword", - "normalizer": "custom_sort_normalizer" - } - } - }, "position_id": { "type": "text" }, @@ -622,22 +518,6 @@ "mandatory": "organization_name" } }, - { - "name": "organization_municipality", - "mappings": { - "minister": "organization_municipality", - "functionary": "organization_municipality", - "mandatory": "organization_municipality" - } - }, - { - "name": "organization_province", - "mappings": { - "minister": "organization_province", - "functionary": "organization_province", - "mandatory": "organization_province" - } - }, { "name": "position_id", "mappings": { @@ -716,24 +596,6 @@ } } }, - "organization_municipality": { - "type": "keyword", - "fields": { - "field": { - "type": "keyword", - "normalizer": "custom_sort_normalizer" - } - } - }, - "organization_province": { - "type": "text", - "fields": { - "field": { - "type": "keyword", - "normalizer": "custom_sort_normalizer" - } - } - }, "position_id": { "type": "text" }, From 1edc4cf0a6da80f0f291d443277330a8f24c3371 Mon Sep 17 00:00:00 2001 From: mirdono Date: Fri, 24 Jan 2025 14:18:13 +0100 Subject: [PATCH 3/3] chore: remove separate search configuration for dev Considering the time it takes to do a full re-index the speed benefit of the development-specific configuration is limited. To the point that it does not seem to outweigh the added complexity of maintaining two configurations and the added chance of errors that brings. --- config/search/dev/config.json | 765 ---------------------------------- docker-compose.dev.yml | 2 - 2 files changed, 767 deletions(-) delete mode 100644 config/search/dev/config.json diff --git a/config/search/dev/config.json b/config/search/dev/config.json deleted file mode 100644 index e178c04..0000000 --- a/config/search/dev/config.json +++ /dev/null @@ -1,765 +0,0 @@ -{ - "automatic_index_updates": true, - "persist_indexes": true, - "number_of_threads": 8, - "eager_indexing_groups": [ - [ - { - "variables": [], - "name": "acmidm-editeerder" - }, - { - "variables": [], - "name": "clean" - }, - { - "variables": [], - "name": "public" - } - ], - [ - { - "variables": [], - "name": "acmidm-worship-editeerder" - }, - { - "variables": [], - "name": "clean" - }, - { - "variables": [], - "name": "public" - } - ] - ], - "default_settings": { - "analysis": { - "normalizer": { - "custom_sort_normalizer": { - "type": "custom", - "char_filter": [], - "filter": ["lowercase", "trim", "asciifolding"] - }, - "identifier_normalizer": { - "type": "custom", - "char_filter": ["identifier_alphanumeric_filter"], - "filter": ["lowercase", "trim", "asciifolding"] - } - }, - "char_filter": { - "identifier_alphanumeric_filter": { - "type": "pattern_replace", - "pattern": "[^a-zA-Z0-9]", - "replacement": "" - } - } - } - }, - "types": [ - { - "type": "mandatory", - "on_path": "mandatories", - "rdf_type": [ - "http://data.vlaanderen.be/ns/mandaat#Mandataris", - "http://data.lblod.info/vocabularies/erediensten/EredienstMandataris" - ], - "properties": { - "person_id": [ - "http://data.vlaanderen.be/ns/mandaat#isBestuurlijkeAliasVan", - "http://mu.semte.ch/vocabularies/core/uuid" - ], - "family_name": [ - "http://data.vlaanderen.be/ns/mandaat#isBestuurlijkeAliasVan", - "http://xmlns.com/foaf/0.1/familyName" - ], - "given_name": [ - "http://data.vlaanderen.be/ns/mandaat#isBestuurlijkeAliasVan", - "http://xmlns.com/foaf/0.1/givenName" - ], - "first_name_used": [ - "http://data.vlaanderen.be/ns/mandaat#isBestuurlijkeAliasVan", - "https://data.vlaanderen.be/ns/persoon#gebruikteVoornaam" - ], - "end_date": "http://data.vlaanderen.be/ns/mandaat#einde", - "organization_id": [ - "http://www.w3.org/ns/org#holds", - "^http://www.w3.org/ns/org#hasPost", - "https://data.vlaanderen.be/ns/generiek#isTijdspecialisatieVan", - "http://data.vlaanderen.be/ns/besluit#bestuurt", - "http://mu.semte.ch/vocabularies/core/uuid" - ], - "organization_classification": [ - "http://www.w3.org/ns/org#holds", - "^http://www.w3.org/ns/org#hasPost", - "https://data.vlaanderen.be/ns/generiek#isTijdspecialisatieVan", - "http://data.vlaanderen.be/ns/besluit#bestuurt", - "http://www.w3.org/ns/org#classification", - "http://www.w3.org/2004/02/skos/core#prefLabel" - ], - "organization_name": [ - "http://www.w3.org/ns/org#holds", - "^http://www.w3.org/ns/org#hasPost", - "https://data.vlaanderen.be/ns/generiek#isTijdspecialisatieVan", - "http://data.vlaanderen.be/ns/besluit#bestuurt", - "http://www.w3.org/2004/02/skos/core#prefLabel" - ], - "position_id": [ - "http://www.w3.org/ns/org#holds", - "http://www.w3.org/ns/org#role", - "http://mu.semte.ch/vocabularies/core/uuid" - ], - "position_name": [ - "http://www.w3.org/ns/org#holds", - "http://www.w3.org/ns/org#role", - "http://www.w3.org/2004/02/skos/core#prefLabel" - ] - }, - "mappings": { - "properties": { - "person_id": { - "type": "text", - "fields": { - "field": { - "type": "keyword" - } - } - }, - "family_name": { - "type": "text", - "fields": { - "field": { - "type": "keyword", - "normalizer": "custom_sort_normalizer" - } - } - }, - "given_name": { - "type": "text", - "fields": { - "field": { - "type": "keyword", - "normalizer": "custom_sort_normalizer" - } - } - }, - "first_name_used": { - "type": "text", - "fields": { - "field": { - "type": "keyword", - "normalizer": "custom_sort_normalizer" - } - } - }, - "end_date": { - "type": "date" - }, - "organization_id": { - "type": "text" - }, - "organization_classification": { - "type": "text", - "fields": { - "field": { - "type": "keyword", - "normalizer": "custom_sort_normalizer" - } - } - }, - "organization_name": { - "type": "text", - "fields": { - "field": { - "type": "keyword", - "normalizer": "custom_sort_normalizer" - } - } - }, - "position_id": { - "type": "text" - }, - "position_name": { - "type": "text", - "fields": { - "field": { - "type": "keyword", - "normalizer": "custom_sort_normalizer" - } - } - } - } - } - }, - { - "type": "functionary", - "on_path": "functionaries", - "rdf_type": "http://data.lblod.info/vocabularies/leidinggevenden/Functionaris", - "properties": { - "person_id": [ - "http://data.vlaanderen.be/ns/mandaat#isBestuurlijkeAliasVan", - "http://mu.semte.ch/vocabularies/core/uuid" - ], - "family_name": [ - "http://data.vlaanderen.be/ns/mandaat#isBestuurlijkeAliasVan", - "http://xmlns.com/foaf/0.1/familyName" - ], - "given_name": [ - "http://data.vlaanderen.be/ns/mandaat#isBestuurlijkeAliasVan", - "http://xmlns.com/foaf/0.1/givenName" - ], - "first_name_used": [ - "http://data.vlaanderen.be/ns/mandaat#isBestuurlijkeAliasVan", - "https://data.vlaanderen.be/ns/persoon#gebruikteVoornaam" - ], - "end_date": "http://data.vlaanderen.be/ns/mandaat#einde", - "organization_id": [ - "http://www.w3.org/ns/org#holds", - "^http://data.lblod.info/vocabularies/leidinggevenden/heeftBestuursfunctie", - "https://data.vlaanderen.be/ns/generiek#isTijdspecialisatieVan", - "http://data.vlaanderen.be/ns/besluit#bestuurt", - "http://mu.semte.ch/vocabularies/core/uuid" - ], - "organization_classification": [ - "http://www.w3.org/ns/org#holds", - "^http://data.lblod.info/vocabularies/leidinggevenden/heeftBestuursfunctie", - "https://data.vlaanderen.be/ns/generiek#isTijdspecialisatieVan", - "http://data.vlaanderen.be/ns/besluit#bestuurt", - "http://www.w3.org/ns/org#classification", - "http://www.w3.org/2004/02/skos/core#prefLabel" - ], - "organization_name": [ - "http://www.w3.org/ns/org#holds", - "^http://data.lblod.info/vocabularies/leidinggevenden/heeftBestuursfunctie", - "https://data.vlaanderen.be/ns/generiek#isTijdspecialisatieVan", - "http://data.vlaanderen.be/ns/besluit#bestuurt", - "http://www.w3.org/2004/02/skos/core#prefLabel" - ], - "position_id": [ - "http://www.w3.org/ns/org#holds", - "http://www.w3.org/ns/org#role", - "http://mu.semte.ch/vocabularies/core/uuid" - ], - "position_name": [ - "http://www.w3.org/ns/org#holds", - "http://www.w3.org/ns/org#role", - "http://www.w3.org/2004/02/skos/core#prefLabel" - ] - }, - "mappings": { - "properties": { - "person_id": { - "type": "text", - "fields": { - "field": { - "type": "keyword" - } - } - }, - "family_name": { - "type": "text", - "fields": { - "field": { - "type": "keyword", - "normalizer": "custom_sort_normalizer" - } - } - }, - "given_name": { - "type": "text", - "fields": { - "field": { - "type": "keyword", - "normalizer": "custom_sort_normalizer" - } - } - }, - "first_name_used": { - "type": "text", - "fields": { - "field": { - "type": "keyword", - "normalizer": "custom_sort_normalizer" - } - } - }, - "end_date": { - "type": "date" - }, - "organization_id": { - "type": "text" - }, - "organization_classification": { - "type": "text", - "fields": { - "field": { - "type": "keyword", - "normalizer": "custom_sort_normalizer" - } - } - }, - "organization_name": { - "type": "text", - "fields": { - "field": { - "type": "keyword", - "normalizer": "custom_sort_normalizer" - } - } - }, - "position_id": { - "type": "text" - }, - "position_name": { - "type": "text", - "fields": { - "field": { - "type": "keyword", - "normalizer": "custom_sort_normalizer" - } - } - } - } - } - }, - { - "type": "minister", - "on_path": "ministers", - "rdf_type": [ - "http://data.lblod.info/vocabularies/erediensten/RolBedienaar", - "http://data.lblod.info/vocabularies/contacthub/AgentInPositie" - ], - "properties": { - "person_id": [ - "http://www.w3.org/ns/org#heldBy", - "http://mu.semte.ch/vocabularies/core/uuid" - ], - "family_name": [ - "http://www.w3.org/ns/org#heldBy", - "http://xmlns.com/foaf/0.1/familyName" - ], - "given_name": [ - "http://www.w3.org/ns/org#heldBy", - "http://xmlns.com/foaf/0.1/givenName" - ], - "first_name_used": [ - "http://www.w3.org/ns/org#heldBy", - "https://data.vlaanderen.be/ns/persoon#gebruikteVoornaam" - ], - "end_date": "http://data.lblod.info/vocabularies/contacthub/eindedatum", - "organization_id": [ - "http://www.w3.org/ns/org#holds", - "^http://data.lblod.info/vocabularies/erediensten/wordtBediendDoor", - "http://mu.semte.ch/vocabularies/core/uuid" - ], - "organization_classification": [ - "http://www.w3.org/ns/org#holds", - "^http://data.lblod.info/vocabularies/erediensten/wordtBediendDoor", - "http://www.w3.org/ns/org#classification", - "http://www.w3.org/2004/02/skos/core#prefLabel" - ], - "organization_name": [ - "http://www.w3.org/ns/org#holds", - "^http://data.lblod.info/vocabularies/erediensten/wordtBediendDoor", - "http://www.w3.org/2004/02/skos/core#prefLabel" - ], - "position_id": [ - "http://www.w3.org/ns/org#holds", - "http://data.lblod.info/vocabularies/erediensten/functie", - "http://mu.semte.ch/vocabularies/core/uuid" - ], - "position_name": [ - "http://www.w3.org/ns/org#holds", - "http://data.lblod.info/vocabularies/erediensten/functie", - "http://www.w3.org/2004/02/skos/core#prefLabel" - ] - }, - "mappings": { - "properties": { - "person_id": { - "type": "text", - "fields": { - "field": { - "type": "keyword" - } - } - }, - "family_name": { - "type": "text", - "fields": { - "field": { - "type": "keyword", - "normalizer": "custom_sort_normalizer" - } - } - }, - "given_name": { - "type": "text", - "fields": { - "field": { - "type": "keyword", - "normalizer": "custom_sort_normalizer" - } - } - }, - "first_name_used": { - "type": "text", - "fields": { - "field": { - "type": "keyword", - "normalizer": "custom_sort_normalizer" - } - } - }, - "end_date": { - "type": "date" - }, - "organization_id": { - "type": "text" - }, - "organization_classification": { - "type": "text", - "fields": { - "field": { - "type": "keyword", - "normalizer": "custom_sort_normalizer" - } - } - }, - "organization_name": { - "type": "text", - "fields": { - "field": { - "type": "keyword", - "normalizer": "custom_sort_normalizer" - } - } - }, - "position_id": { - "type": "text" - }, - "position_name": { - "type": "text", - "fields": { - "field": { - "type": "keyword", - "normalizer": "custom_sort_normalizer" - } - } - } - } - } - }, - { - "type": "person", - "composite_types": ["minister", "functionary", "mandatory"], - "on_path": "people", - "properties": [ - { - "name": "person_id", - "mappings": { - "minister": "person_id", - "functionary": "person_id", - "mandatory": "person_id" - } - }, - { - "name": "family_name", - "mappings": { - "minister": "family_name", - "functionary": "family_name", - "mandatory": "family_name" - } - }, - { - "name": "given_name", - "mappings": { - "minister": "given_name", - "functionary": "given_name", - "mandatory": "given_name" - } - }, - { - "name": "first_name_used", - "mappings": { - "minister": "first_name_used", - "functionary": "first_name_used", - "mandatory": "first_name_used" - } - }, - { - "name": "end_date", - "mappings": { - "minister": "end_date", - "functionary": "end_date", - "mandatory": "end_date" - } - }, - { - "name": "organization_id", - "mappings": { - "minister": "organization_id", - "functionary": "organization_id", - "mandatory": "organization_id" - } - }, - { - "name": "organization_classification", - "mappings": { - "minister": "organization_classification", - "functionary": "organization_classification", - "mandatory": "organization_classification" - } - }, - { - "name": "organization_name", - "mappings": { - "minister": "organization_name", - "functionary": "organization_name", - "mandatory": "organization_name" - } - }, - { - "name": "position_id", - "mappings": { - "minister": "position_id", - "functionary": "position_id", - "mandatory": "position_id" - } - }, - { - "name": "position_name", - "mappings": { - "minister": "position_name", - "functionary": "position_name", - "mandatory": "position_name" - } - } - ], - "mappings": { - "properties": { - "person_id": { - "type": "text", - "fields": { - "field": { - "type": "keyword" - } - } - }, - "family_name": { - "type": "text", - "fields": { - "field": { - "type": "keyword", - "normalizer": "custom_sort_normalizer" - } - } - }, - "given_name": { - "type": "text", - "fields": { - "field": { - "type": "keyword", - "normalizer": "custom_sort_normalizer" - } - } - }, - "first_name_used": { - "type": "text", - "fields": { - "field": { - "type": "keyword", - "normalizer": "custom_sort_normalizer" - } - } - }, - "end_date": { - "type": "date" - }, - "organization_id": { - "type": "text" - }, - "organization_classification": { - "type": "text", - "fields": { - "field": { - "type": "keyword", - "normalizer": "custom_sort_normalizer" - } - } - }, - "organization_name": { - "type": "text", - "fields": { - "field": { - "type": "keyword", - "normalizer": "custom_sort_normalizer" - } - } - }, - "position_id": { - "type": "text" - }, - "position_name": { - "type": "text", - "fields": { - "field": { - "type": "keyword", - "normalizer": "custom_sort_normalizer" - } - } - } - } - } - }, - { - "type": "organization", - "on_path": "organizations", - "rdf_type": [ - "http://data.vlaanderen.be/ns/besluit#Bestuurseenheid", - "http://data.lblod.info/vocabularies/erediensten/EredienstBestuurseenheid", - "http://data.lblod.info/vocabularies/erediensten/CentraalBestuurVanDeEredienst", - "http://data.lblod.info/vocabularies/erediensten/BestuurVanDeEredienst", - "http://data.lblod.info/vocabularies/erediensten/RepresentatiefOrgaan", - "http://www.w3.org/ns/regorg#RegisteredOrganization" - ], - "properties": { - "name": "http://www.w3.org/2004/02/skos/core#prefLabel", - "legal_name": "http://www.w3.org/ns/regorg#legalName", - "alternative_name": "http://www.w3.org/2004/02/skos/core#altLabel", - "classification_id": [ - "http://www.w3.org/ns/org#classification", - "http://mu.semte.ch/vocabularies/core/uuid" - ], - "classification_name": [ - "http://www.w3.org/ns/org#classification", - "http://www.w3.org/2004/02/skos/core#prefLabel" - ], - "status": [ - "http://www.w3.org/ns/regorg#orgStatus", - "http://www.w3.org/2004/02/skos/core#prefLabel" - ], - "status_id": [ - "http://www.w3.org/ns/regorg#orgStatus", - "http://mu.semte.ch/vocabularies/core/uuid" - ], - "recognized_worship_type_id": [ - "http://data.lblod.info/vocabularies/erediensten/typeEredienst", - "http://mu.semte.ch/vocabularies/core/uuid" - ], - "recognized_worship_type_name": [ - "http://data.lblod.info/vocabularies/erediensten/typeEredienst", - "http://www.w3.org/2004/02/skos/core#prefLabel" - ], - "province": [ - "http://www.w3.org/ns/org#hasPrimarySite", - "https://data.vlaanderen.be/ns/organisatie#bestaatUit", - "http://www.w3.org/ns/locn#adminUnitL2" - ], - "municipality": [ - "http://www.w3.org/ns/org#hasPrimarySite", - "https://data.vlaanderen.be/ns/organisatie#bestaatUit", - "https://data.vlaanderen.be/ns/adres#gemeentenaam" - ], - "identifier": [ - "http://www.w3.org/ns/adms#identifier", - "https://data.vlaanderen.be/ns/generiek#gestructureerdeIdentificator", - "https://data.vlaanderen.be/ns/generiek#lokaleIdentificator" - ] - }, - "mappings": { - "properties": { - "name": { - "type": "text", - "fields": { - "field": { - "type": "keyword", - "normalizer": "custom_sort_normalizer" - } - } - }, - "legal_name": { - "type": "text", - "fields": { - "field": { - "type": "keyword", - "normalizer": "custom_sort_normalizer" - } - } - }, - "alternative_name": { - "type": "text", - "fields": { - "field": { - "type": "keyword", - "normalizer": "custom_sort_normalizer" - } - } - }, - "classification_id": { - "type": "text" - }, - "classification_name": { - "type": "text", - "fields": { - "field": { - "type": "keyword", - "normalizer": "custom_sort_normalizer" - } - } - }, - "status": { - "type": "text", - "fields": { - "field": { - "type": "keyword", - "normalizer": "custom_sort_normalizer" - } - } - }, - "status_id": { - "type": "text" - }, - "recognized_worship_type_id": { - "type": "text" - }, - "recognized_worship_type_name": { - "type": "text", - "fields": { - "field": { - "type": "keyword", - "normalizer": "custom_sort_normalizer" - } - } - }, - "province": { - "type": "text", - "fields": { - "field": { - "type": "keyword", - "normalizer": "custom_sort_normalizer" - } - } - }, - "municipality": { - "type": "keyword", - "fields": { - "field": { - "type": "keyword", - "normalizer": "custom_sort_normalizer" - } - } - }, - "identifier": { - "type": "text", - "fields": { - "index": { - "type": "keyword", - "normalizer": "identifier_normalizer" - } - } - } - } - } - } - ] -} diff --git a/docker-compose.dev.yml b/docker-compose.dev.yml index b25c943..d938b5f 100644 --- a/docker-compose.dev.yml +++ b/docker-compose.dev.yml @@ -58,8 +58,6 @@ services: restart: "no" search: restart: "no" - volumes: - - ./config/search/dev:/config elasticsearch: restart: "no" file: