Add review comments

ONSdigital · Jun 17, 2024 · 946bb34 · 946bb34
1 parent 6451607
commit 946bb34
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 15 deletions.
diff --git a/app/error_messages.py b/app/error_messages.py
@@ -40,4 +40,4 @@
     "Variants have more than one question type for block."
 )
 PREVIEW_WITHOUT_INTRODUCTION_BLOCK = "No introduction block found. Introduction block is mandatory when using the preview questions feature."
-LIST_REFERENCED_BEFORE_ADDED = "List referenced as source before it has been created."
+LIST_REFERENCED_BEFORE_CREATED = "List referenced as source before it has been created."
diff --git a/app/validators/questionnaire_schema.py b/app/validators/questionnaire_schema.py
@@ -212,9 +212,6 @@ def answers_with_context(self):
 
     @property
     def lists_with_context(self):
-        if self._lists_with_context:
-            return self._lists_with_context
-
         if supplementary_list := self.supplementary_lists:
             for list_id in supplementary_list:
                 self._lists_with_context[list_id] = {

diff --git a/app/validators/questionnaire_validator.py b/app/validators/questionnaire_validator.py
@@ -157,7 +157,7 @@ def validate_list_references(self):
                             < lists_with_context[list_identifier]["block_index"]
                         ):
                             self.add_error(
-                                error_messages.LIST_REFERENCED_BEFORE_ADDED.format(),
+                                error_messages.LIST_REFERENCED_BEFORE_CREATED.format(),
                                 list_id=list_identifier,
                                 section_id=section["id"],
                                 block_id=parent_block["id"],
@@ -169,7 +169,7 @@ def validate_list_references(self):
                         # Section level "enabled" rule that can use list source,
                         # check: common_definitions.json#/section_enabled
                         self.add_error(
-                            error_messages.LIST_REFERENCED_BEFORE_ADDED.format(),
+                            error_messages.LIST_REFERENCED_BEFORE_CREATED.format(),
                             list_name=list_identifier,
                             section_id=section["id"],
                         )
diff --git a/tests/test_questionnaire_validator.py b/tests/test_questionnaire_validator.py
@@ -415,48 +415,48 @@ def test_list_as_source_referenced_before_created():
     expected_errors = [
         {
             "list_id": "household",
-            "message": error_messages.LIST_REFERENCED_BEFORE_ADDED,
+            "message": error_messages.LIST_REFERENCED_BEFORE_CREATED,
             "block_id": "individual-interstitial",
             "section_id": "individuals-section",
         },
         {
             "list_id": "household",
-            "message": error_messages.LIST_REFERENCED_BEFORE_ADDED,
+            "message": error_messages.LIST_REFERENCED_BEFORE_CREATED,
             "block_id": "individual-interstitial",
             "section_id": "individuals-section",
         },
         {
             "list_id": "household",
-            "message": error_messages.LIST_REFERENCED_BEFORE_ADDED,
+            "message": error_messages.LIST_REFERENCED_BEFORE_CREATED,
             "block_id": "list-status-2",
             "section_id": "individuals-section",
         },
         {
             "list_id": "household",
-            "message": error_messages.LIST_REFERENCED_BEFORE_ADDED,
+            "message": error_messages.LIST_REFERENCED_BEFORE_CREATED,
             "block_id": "list-status-2",
             "section_id": "individuals-section",
         },
         {
             "list_id": "household",
-            "message": error_messages.LIST_REFERENCED_BEFORE_ADDED,
+            "message": error_messages.LIST_REFERENCED_BEFORE_CREATED,
             "block_id": "list-status-2",
             "section_id": "individuals-section",
         },
         {
             "list_name": "household",
-            "message": error_messages.LIST_REFERENCED_BEFORE_ADDED,
+            "message": error_messages.LIST_REFERENCED_BEFORE_CREATED,
             "section_id": "individuals-section",
         },
         {
             "list_id": "utility-bills",
-            "message": error_messages.LIST_REFERENCED_BEFORE_ADDED,
+            "message": error_messages.LIST_REFERENCED_BEFORE_CREATED,
             "block_id": "dynamic-answer",
             "section_id": "utility-bills-section",
         },
         {
             "list_id": "utility-bills",
-            "message": error_messages.LIST_REFERENCED_BEFORE_ADDED,
+            "message": error_messages.LIST_REFERENCED_BEFORE_CREATED,
             "block_id": "dynamic-answer",
             "section_id": "utility-bills-section",
         },
@@ -476,7 +476,7 @@ def test_list_as_source_referenced_before_created_repeating_blocks():
     expected_errors = [
         {
             "list_id": "companies",
-            "message": error_messages.LIST_REFERENCED_BEFORE_ADDED,
+            "message": error_messages.LIST_REFERENCED_BEFORE_CREATED,
             "block_id": "any-other-companies-or-branches",
             "section_id": "section-companies",
         }