From 7e2761dc32b24462c86588c9900061a77c705e7c Mon Sep 17 00:00:00 2001 From: Sebastian Gode Date: Fri, 25 Aug 2023 08:16:16 +0000 Subject: [PATCH 1/2] Sorting for Search Index --- tools/index_metadata.py | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/tools/index_metadata.py b/tools/index_metadata.py index 12e4dd41..55740af2 100644 --- a/tools/index_metadata.py +++ b/tools/index_metadata.py @@ -78,6 +78,9 @@ def main(): all_doc_types=args.all_doc_types ) + sorted_services = sortData(data['services'], sort_key='service_title') + sorted_data = {'services': sorted_services, 'docs': data['docs']} + logging.debug("Indexing data into OpenSearch") indexData( deleteIndex=args.delete_index, @@ -85,7 +88,7 @@ def main(): index=args.index, username=args.username, password=args.password, - data=data + data=sorted_data ) @@ -105,6 +108,8 @@ def getData(environment, all_doc_types): final_data = filter_docs(metadatadata) return final_data +def sortData(data, sort_key): + return sorted(data, key=lambda x: x[sort_key]) def indexData(deleteIndex, hosts, index, username, password, data): hosts = generate_os_host_list(hosts) -- 2.34.1 From 3f414e55a783176625bff3046506f5f1bf324a05 Mon Sep 17 00:00:00 2001 From: Sebastian Gode Date: Wed, 30 Aug 2023 08:03:14 +0000 Subject: [PATCH 2/2] Fix pep8 --- tools/index_metadata.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/tools/index_metadata.py b/tools/index_metadata.py index 55740af2..25252dc5 100644 --- a/tools/index_metadata.py +++ b/tools/index_metadata.py @@ -108,9 +108,11 @@ def getData(environment, all_doc_types): final_data = filter_docs(metadatadata) return final_data + def sortData(data, sort_key): return sorted(data, key=lambda x: x[sort_key]) + def indexData(deleteIndex, hosts, index, username, password, data): hosts = generate_os_host_list(hosts) client = OpenSearch( -- 2.34.1