#3077 Bug fix (#3079)

GSA-TTS · Dec 22, 2023 · a660153 · a660153
1 parent 4216af2
commit a660153
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 8 deletions.
diff --git a/backend/audit/fixtures/workbooks/should_pass/cluster_names/tests-cluster-names.xlsx b/backend/audit/fixtures/workbooks/should_pass/cluster_names/tests-cluster-names.xlsx
diff --git a/backend/audit/intakelib/checks/check_cluster_names.py b/backend/audit/intakelib/checks/check_cluster_names.py
@@ -4,12 +4,10 @@
 from django.conf import settings
 from audit.intakelib.intermediate_representation import get_range_by_name
 from audit.intakelib.common import get_message, build_cell_error_tuple
+from .check_cluster_total import NOT_APPLICABLE, OTHER_CLUSTER, STATE_CLUSTER
 
 logger = logging.getLogger(__name__)
 
-STATE_CLUSTER = "STATE CLUSTER"
-OTHER_CLUSTER = "OTHER CLUSTER NOT LISTED ABOVE"
-
 
 def check_cluster_names(ir):
     """Check that cluster names are valid when present."""
@@ -29,7 +27,8 @@ def check_cluster_names(ir):
 
         for index, value in enumerate(range_data["values"]):
             if value and value not in (
-                valid_json["cluster_names"] + [STATE_CLUSTER, OTHER_CLUSTER]
+                valid_json["cluster_names"]
+                + [STATE_CLUSTER, OTHER_CLUSTER, NOT_APPLICABLE]
             ):
                 errors.append(
                     build_cell_error_tuple(

diff --git a/backend/audit/intakelib/checks/check_cluster_total.py b/backend/audit/intakelib/checks/check_cluster_total.py
@@ -9,6 +9,7 @@
 
 logger = logging.getLogger(__name__)
 
+# A copy of theses constants exists in schema/source/base/Base.libsonnet
 STATE_CLUSTER = "STATE CLUSTER"
 OTHER_CLUSTER = "OTHER CLUSTER NOT LISTED ABOVE"
 NOT_APPLICABLE = "N/A"

diff --git a/backend/audit/intakelib/checks/check_other_cluster_names.py b/backend/audit/intakelib/checks/check_other_cluster_names.py
@@ -1,11 +1,10 @@
 import logging
 from audit.intakelib.intermediate_representation import get_range_by_name
 from audit.intakelib.common import get_message, build_cell_error_tuple
+from .check_cluster_total import OTHER_CLUSTER
 
 logger = logging.getLogger(__name__)
 
-OTHER_CLUSTER = "OTHER CLUSTER NOT LISTED ABOVE"
-
 
 def other_cluster_names(ir):
     cluster_name = get_range_by_name(ir, "cluster_name")

diff --git a/backend/audit/intakelib/checks/check_state_cluster_names.py b/backend/audit/intakelib/checks/check_state_cluster_names.py
@@ -1,11 +1,10 @@
 import logging
 from audit.intakelib.intermediate_representation import get_range_by_name
 from audit.intakelib.common import get_message, build_cell_error_tuple
+from .check_cluster_total import STATE_CLUSTER
 
 logger = logging.getLogger(__name__)
 
-STATE_CLUSTER = "STATE CLUSTER"
-
 
 def state_cluster_names(ir):
     cluster_name = get_range_by_name(ir, "cluster_name")