From a7c9879776a7c1458ef42804d37d82957a79e071 Mon Sep 17 00:00:00 2001
From: Neda Moeini <neda.moeini@geant.org>
Date: Wed, 30 Apr 2025 15:32:58 +0200
Subject: [PATCH] Change the NC_CC_DEP validation error handling
---
sage_validation/file_validator/forms.py | 4 ++--
test/test_file_validator/test_forms.py | 3 +--
2 files changed, 3 insertions(+), 4 deletions(-)
diff --git a/sage_validation/file_validator/forms.py b/sage_validation/file_validator/forms.py
index 5a1034f..71d908e 100644
--- a/sage_validation/file_validator/forms.py
+++ b/sage_validation/file_validator/forms.py
@@ -245,10 +245,10 @@ class CSVUploadForm(forms.Form):
nominal_account_name = row.get(nominal_account_field)
if not cc and not dep and not nominal_account_name:
- errors.append(
- f"Row {index}: Missing values in '{cc_field}', '{dep_field}', and '{nominal_account_field}'.")
continue
if not cc or not dep or not nominal_account_name:
+ errors.append(
+ f"Row {index}: Missing values in '{cc_field}', '{dep_field}', or '{nominal_account_field}'.")
continue
cc_type = cost_centre_map.get(cc)
diff --git a/test/test_file_validator/test_forms.py b/test/test_file_validator/test_forms.py
index 3a779cd..e1f51de 100644
--- a/test/test_file_validator/test_forms.py
+++ b/test/test_file_validator/test_forms.py
@@ -102,14 +102,13 @@ def test_validate_nc_cc_dep_combination_against_meo_sage_account_blank_values(
{
"NominalAnalysisNominalCostCentre/1": "",
"NominalAnalysisNominalDepartment/1": "",
- "NominalAnalysisNominalAccountNumber/1": ""
})
form = CSVUploadForm(files={"file": modified_file})
assert not form.is_valid()
assert (
"Row 1: Missing values in 'NominalAnalysisNominalCostCentre/1', 'NominalAnalysisNominalDepartment/1',"
- " and 'NominalAnalysisNominalAccountNumber/1'."
+ " or 'NominalAnalysisNominalAccountNumber/1'."
in str(form.errors["file"][0])
)
--
GitLab