Add validation to prevent selecting 'None' with other respiratory conditions

Author: miriam-z

lung_cancer_screening/core/tests/acceptance/test_questionnaire.py

@@ -97,7 +97,7 @@ def test_full_questionnaire_user_journey(self):
 
         expect(page).to_have_url(f"{self.live_server_url}/respiratory-conditions")
         expect_back_link_to_have_url(page, "/education")
-        fill_in_and_submit_respiratory_conditions(page, "None of the above")
+        fill_in_and_submit_respiratory_conditions(page, "No, I have not had any of these respiratory conditions")
 
         expect(page).to_have_url(f"{self.live_server_url}/asbestos-exposure")
         expect_back_link_to_have_url(page, "/respiratory-conditions")
@@ -123,6 +123,7 @@ def test_full_questionnaire_user_journey(self):
         expect(responses).to_contain_text("Which of these best describes you? Male")
         expect(responses).to_contain_text("What is your ethnic background? White")
         expect(responses).to_contain_text("Have you ever worked in a job where you might have been exposed to asbestos? No")
+        expect(responses).to_contain_text("Have you ever been diagnosed with any of the following respiratory conditions?" ['N'])
 
         page.click("text=Submit")
 

lung_cancer_screening/core/tests/acceptance/test_questionnaire_validation_errors.py

@@ -115,3 +115,37 @@ def test_ethnicity_validation_errors(self):
         expect(page.locator(".nhsuk-error-message")).to_contain_text(
             "Select your ethnic background."
         )
+
+    def test_respiratory_conditions_validation_errors(self):
+        participant_id = '123'
+
+        page = self.browser.new_page()
+        page.goto(f"{self.live_server_url}/start")
+        fill_in_and_submit_participant_id(page, participant_id)
+        page.goto(f"{self.live_server_url}/respiratory-conditions")
+
+        page.click("text=Continue")
+        expect(page.locator(".nhsuk-error-message")).to_contain_text(
+            "Select if you have had any respiratory conditions"
+        )
+
+        # Select one respiratory condition
+        page.get_by_label("Bronchitis").click()
+
+        # Select None option
+        page.get_by_label("No, I have not had any of these respiratory conditions").click()
+        expect(page.locator(".nhsuk-error-message")).to_contain_text(
+            "Select if you have had any respiratory conditions"
+        )
+
+        # Continue
+        page.click("text=Continue")
+
+        # Assert error is shown
+        expect(page.locator(".nhsuk-error-message")).to_contain_text(
+            "Select if you have had any respiratory conditions, or select 'No, I have not had any of these respiratory conditions'"
+        )
+
+        expect(page).to_have_url(f"{self.live_server_url}/respiratory-conditions")
+
+

lung_cancer_screening/questions/forms/respiratory_conditions_form.py

@@ -18,7 +18,8 @@ def __init__(self, *args, **kwargs):
             label_classes="nhsuk-fieldset__legend--l",
             hint="Select all that apply",
             error_messages={
-                'required': 'Select if you have had any respiratory conditions'
+                'required': 'Select if you have had any respiratory conditions',
+                'singleton_option': 'Select if you have had any respiratory conditions, or select \'No, I have not had any of these respiratory conditions\''
             }
         )
 

lung_cancer_screening/questions/jinja2/responses.jinja

@@ -24,11 +24,10 @@
         <li>Which of these best describes you? {{ response_set.get_gender_display() }}</li>
         <li>What is your ethnic background? {{ response_set.get_ethnicity_display() }}</li>
         <li>Have you ever worked in a job where you might have been exposed to asbestos? {{ "Yes" if response_set.asbestos_exposure else "No" }}</li>
+        <li>Have you ever been diagnosed with any of the following respiratory conditions? {{ response_set.respiratory_conditions }}</li>
       </ul>
-
       <form action="{{ request.path }}" method="post">
         {{ csrf_input }}
-
         {{ button({
           "text": "Submit"
         }) }}

lung_cancer_screening/questions/models/response_set.py

@@ -40,7 +40,14 @@ class RespiratoryConditionValues(models.TextChoices):
     BRONCHITIS = "B", "Chronic bronchitis"
     TUBERCULOSIS = "T", "Tuberculosis (TB)"
     COPD = "C", "Chronic obstructive pulmonary disease (COPD)"
-    NONE = "N", "None of the above"
+    NONE = "N", "No, I have not had any of these respiratory conditions"
+
+def validate_singleton_option(value):
+    if value and "N" in value and len(value) > 1:
+        raise ValidationError(
+            "Cannot have singleton value and other values selected",
+            code="singleton_option",
+        )
 
 class ResponseSet(BaseModel):
     participant = models.ForeignKey(Participant, on_delete=models.CASCADE)
@@ -104,10 +111,12 @@ class ResponseSet(BaseModel):
         blank=True
     )
 
+
     respiratory_conditions = ArrayField(
         models.CharField(max_length=1, choices=RespiratoryConditionValues.choices),
         null=True,
-        blank=True
+        blank=True,
+        validators=[validate_singleton_option]
     )
 
     asbestos_exposure = models.BooleanField(
@@ -154,4 +163,3 @@ def formatted_weight(self):
             value = Decimal(self.weight_imperial)
             return f"{value // 14} stone {value % 14} pounds"
 
-

lung_cancer_screening/questions/tests/unit/forms/test_respiratory_conditions_form.py

@@ -74,17 +74,16 @@ def test_is_invalid_when_no_option_is_selected(self):
         )
 
     # TODO: Add test for when none of the above is selected and other options are selected
-    # def test_is_invalid_with_none_of_the_above_selected_and_other_options_selected(self):
-    #     form = RespiratoryConditionsForm(
-    #         participant=self.participant,
-    #         data={
-    #             "respiratory_conditions": ["N", "P", "E", "C"]
-    #         }
-    #     )
-    #     self.assertFalse(form.is_valid())
-    #     self.assertEqual(
-    #         form.errors["respiratory_conditions"],
-    #         ["Select if you have had any respiratory conditions"]
-    #     )
-
-
+    def test_is_invalid_with_none_of_the_above_selected_and_other_options_selected(self):
+        form = RespiratoryConditionsForm(
+            participant=self.participant,
+            data={
+                "respiratory_conditions": ["N", "P", "E", "C"]
+            }
+        )
+        self.assertFalse(form.is_valid())
+        print(form.errors.as_json())
+        self.assertEqual(
+            form.errors["respiratory_conditions"][0],
+            "Select if you have had any respiratory conditions, or select 'No, I have not had any of these respiratory conditions'"
+        )