From 0b0d35e007344b446f85656bca248ae84f544550 Mon Sep 17 00:00:00 2001 From: Jonathan Tang Date: Tue, 12 Dec 2023 13:39:48 -0800 Subject: [PATCH] refactor: improve logic readability for validation --- corehq/apps/app_manager/helpers/validators.py | 20 +++++++++---------- 1 file changed, 9 insertions(+), 11 deletions(-) diff --git a/corehq/apps/app_manager/helpers/validators.py b/corehq/apps/app_manager/helpers/validators.py index 20c7d4168d52..dc42c10658ac 100644 --- a/corehq/apps/app_manager/helpers/validators.py +++ b/corehq/apps/app_manager/helpers/validators.py @@ -538,17 +538,15 @@ def validate_search_config(self): "module": self.get_module_info(), "details": search_config.get_instance_name() } - - contains_ungrouped_properties = any(not prop.group_key for prop in search_config.properties) - contains_grouping_property = any(prop.is_group for prop in search_config.properties) - if contains_ungrouped_properties and contains_grouping_property: - for prop in search_config.properties: - if not prop.group_key: - yield { - "type": "invalid grouping from ungrouped search property", - "module": self.get_module_info(), - "property": prop.name, - } + module_contains_grouping_property = any(prop.is_group for prop in search_config.properties) + if module_contains_grouping_property: + ungrouped_properties = [prop for prop in search_config.properties if not prop.group_key] + for prop in ungrouped_properties: + yield { + "type": "invalid grouping from ungrouped search property", + "module": self.get_module_info(), + "property": prop.name, + } def validate_case_list_field_actions(self): if hasattr(self.module, 'case_details'):