From 93edbf9cb3612af7d2d5591f195a9523a74ab4ff Mon Sep 17 00:00:00 2001 From: "Ed (ODSC)" Date: Fri, 1 Sep 2023 15:13:23 +0100 Subject: [PATCH] cove_rdls/process.py: Calculate validation_errors_grouped --- cove_rdls/lib/utils.py | 12 ++++++------ cove_rdls/process.py | 2 +- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/cove_rdls/lib/utils.py b/cove_rdls/lib/utils.py index 5e08144..871eae1 100644 --- a/cove_rdls/lib/utils.py +++ b/cove_rdls/lib/utils.py @@ -4,10 +4,10 @@ def group_validation_errors(validation_errors): validation_errors_grouped = defaultdict(list) - for error_json, values in validation_errors: - error = json.loads(error_json) - if error["validator"] == "required": - validation_errors_grouped["required"].append((error_json, values)) + for key in validation_errors: + vtype = validation_errors[key][0]["validator"] + if vtype == "required": + validation_errors_grouped["required"].append(validation_errors[key]) elif error["validator"] in [ "format", "pattern", @@ -19,7 +19,7 @@ def group_validation_errors(validation_errors): "integer", "array", ]: - validation_errors_grouped["format"].append((error_json, values)) + validation_errors_grouped["format"].append(validation_errors[key]) else: - validation_errors_grouped["other"].append((error_json, values)) + validation_errors_grouped["other"].append(validation_errors[key]) return validation_errors_grouped diff --git a/cove_rdls/process.py b/cove_rdls/process.py index 592776b..2c292c2 100644 --- a/cove_rdls/process.py +++ b/cove_rdls/process.py @@ -413,7 +413,7 @@ def process_get_state(self, process_data: dict) -> dict: validation_errors, lambda i: f"{i['validator']}_{i['validator_value']}_{str(i['path_ending'])}" ) } -# context["validation_errors_grouped"] = group_validation_errors(context["validation_errors"]) + context["validation_errors_grouped"] = group_validation_errors(context["validation_errors"]) return context, process_data