From 229a6c80b55e2806d0cf9a82c662392c522760af Mon Sep 17 00:00:00 2001 From: Viktor Bozhinov Date: Thu, 9 Dec 2021 16:06:27 +0000 Subject: [PATCH] refactor: set `get_condition_values` to return `tuple` #259 --- .../src/search_api/query_filter_factory.py | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) diff --git a/datagateway_api/src/search_api/query_filter_factory.py b/datagateway_api/src/search_api/query_filter_factory.py index 99d8767b..a49e1396 100644 --- a/datagateway_api/src/search_api/query_filter_factory.py +++ b/datagateway_api/src/search_api/query_filter_factory.py @@ -119,12 +119,13 @@ def get_where_filter(filter_input, entity_name): filter_data = SearchAPIQueryFilterFactory.get_condition_values( filter_input, ) - for condition in filter_data: - where_filters.append( - SearchAPIWhereFilter( - field=condition[0], value=condition[1], operation=condition[2], - ), - ) + where_filters.append( + SearchAPIWhereFilter( + field=filter_data[0], + value=filter_data[1], + operation=filter_data[2], + ), + ) return where_filters @@ -174,7 +175,6 @@ def get_include_filter(filter_input): @staticmethod def get_condition_values(filter_input): - where_filter_data = [] field = list(filter_input.keys())[0] filter_data = list(filter_input.values())[0] @@ -187,9 +187,7 @@ def get_condition_values(filter_input): value = list(filter_input[field].values())[0] operation = list(filter_input[field].keys())[0] - where_filter_data.append((field, value, operation)) - - return where_filter_data + return field, value, operation @staticmethod def prefix_where_filter_field_with_entity_name(where_filters, entity_name):