Skip to content
Snippets Groups Projects
Commit 22dbe54c authored by geant-release-service's avatar geant-release-service
Browse files

Finished release 0.11.

parents e9384e65 da28d9b7
No related branches found
No related tags found
No related merge requests found
# Changelog # Changelog
## [0.11] - 2025-04-29
- Changed NC-CC-DEP validation. The validator raises error when all NC, CC and DEP are missing
## [0.10] - 2025-04-29 ## [0.10] - 2025-04-29
- Enhance NC-CC-DEP validation to raise errors when any field is missing - Enhance NC-CC-DEP validation to raise errors when any field is missing
......
...@@ -244,9 +244,11 @@ class CSVUploadForm(forms.Form): ...@@ -244,9 +244,11 @@ class CSVUploadForm(forms.Form):
dep = row.get(dep_field) dep = row.get(dep_field)
nominal_account_name = row.get(nominal_account_field) 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: if not cc or not dep or not nominal_account_name:
errors.append(f"Row {index}: Missing values in '{cc_field}', '{dep_field}', or "
f"'{nominal_account_field}'.")
continue continue
cc_type = cost_centre_map.get(cc) cc_type = cost_centre_map.get(cc)
......
...@@ -3,7 +3,7 @@ from setuptools import find_packages, setup ...@@ -3,7 +3,7 @@ from setuptools import find_packages, setup
setup( setup(
name="sage-validation", name="sage-validation",
version="0.10", version="0.11",
packages=find_packages(), packages=find_packages(),
include_package_data=True, include_package_data=True,
install_requires=[ install_requires=[
......
...@@ -101,13 +101,15 @@ def test_validate_nc_cc_dep_combination_against_meo_sage_account_blank_values( ...@@ -101,13 +101,15 @@ def test_validate_nc_cc_dep_combination_against_meo_sage_account_blank_values(
sample_input_file, sample_input_file,
{ {
"NominalAnalysisNominalCostCentre/1": "", "NominalAnalysisNominalCostCentre/1": "",
"NominalAnalysisNominalDepartment/1": "",
"NominalAnalysisNominalAccountNumber/1": ""
}) })
form = CSVUploadForm(files={"file": modified_file}) form = CSVUploadForm(files={"file": modified_file})
assert not form.is_valid() assert not form.is_valid()
assert ( assert (
"Row 1: Missing values in 'NominalAnalysisNominalCostCentre/1', 'NominalAnalysisNominalDepartment/1'," "Row 1: Missing values in 'NominalAnalysisNominalCostCentre/1', 'NominalAnalysisNominalDepartment/1',"
" or 'NominalAnalysisNominalAccountNumber/1'." " and 'NominalAnalysisNominalAccountNumber/1'."
in str(form.errors["file"][0]) in str(form.errors["file"][0])
) )
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment