Merge branch 'enhancement/change-nc-cc-dep-validation' into 'develop'

Change the NC_CC_DEP validation error handling

See merge request !9

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)

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])
     )