Update BooleanField and tests

Author: miriam-z

lung_cancer_screening/core/tests/acceptance/helpers/user_interaction_helpers.py

@@ -76,3 +76,11 @@ def fill_in_and_submit_ethnicity(page, ethnicity):
     page.get_by_label(ethnicity, exact=True).check()
 
     page.click("text=Continue")
+
+def fill_in_and_submit_asbestos_exposure(page, answer):
+    expect(page.locator("legend")).to_have_text(
+        "Have you ever worked in a job where you might have been exposed to asbestos?")
+
+    page.get_by_label(answer, exact=True).check()
+
+    page.click("text=Continue")

lung_cancer_screening/core/tests/acceptance/test_cannot_change_answers_after_submission.py

@@ -12,7 +12,8 @@
     fill_in_and_submit_date_of_birth,
     fill_in_and_submit_sex_at_birth,
     fill_in_and_submit_gender,
-    fill_in_and_submit_ethnicity
+    fill_in_and_submit_ethnicity,
+    fill_in_and_submit_asbestos_exposure
 )
 
 class TestQuestionnaire(StaticLiveServerTestCase):
@@ -46,6 +47,7 @@ def test_cannot_change_responses_once_checked_and_submitted(self):
         fill_in_and_submit_sex_at_birth(page, "Male")
         fill_in_and_submit_gender(page, "Male")
         fill_in_and_submit_ethnicity(page, "White")
+        fill_in_and_submit_asbestos_exposure(page, "No")
 
         page.click("text=Submit")
 

lung_cancer_screening/core/tests/acceptance/test_questionnaire.py

@@ -14,7 +14,8 @@
     fill_in_and_submit_weight_imperial,
     fill_in_and_submit_sex_at_birth,
     fill_in_and_submit_gender,
-    fill_in_and_submit_ethnicity
+    fill_in_and_submit_ethnicity,
+    fill_in_and_submit_asbestos_exposure
 )
 
 from .helpers.assertion_helpers import expect_back_link_to_have_url
@@ -90,9 +91,14 @@ def test_full_questionnaire_user_journey(self):
 
         fill_in_and_submit_ethnicity(page, "White")
 
-        expect(page).to_have_url(f"{self.live_server_url}/responses")
+        expect(page).to_have_url(f"{self.live_server_url}/asbestos-exposure")
         expect_back_link_to_have_url(page, "/ethnicity")
 
+        fill_in_and_submit_asbestos_exposure(page, "No")
+
+        expect(page).to_have_url(f"{self.live_server_url}/responses")
+        expect_back_link_to_have_url(page, "/asbestos-exposure")
+
         responses = page.locator(".responses")
         expect(responses).to_contain_text("Have you ever smoked? Yes, I used to smoke regularly")
         expect(responses).to_contain_text(
@@ -102,6 +108,7 @@ def test_full_questionnaire_user_journey(self):
         expect(responses).to_contain_text("What was your sex at birth? Male")
         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")
 
         page.click("text=Submit")
 

lung_cancer_screening/questions/forms/asbestos_exposure_form.py

@@ -1,6 +1,6 @@
 from django import forms
-from ...nhsuk_forms.choice_field import ChoiceField
-from ..models.response_set import ResponseSet, AsbestosExposureValues
+from ...nhsuk_forms.typed_choice_field import TypedChoiceField
+from ..models.response_set import ResponseSet
 
 
 class AsbestosExposureForm(forms.ModelForm):
@@ -9,11 +9,12 @@ def __init__(self, *args, **kwargs):
         super().__init__(*args, **kwargs)
         self.instance.participant = self.participant
 
-        self.fields["asbestos_exposure"] = ChoiceField(
-            choices=AsbestosExposureValues.choices,
+        self.fields["asbestos_exposure"] = TypedChoiceField(
+            choices=[(True, 'Yes'), (False, 'No')],
             widget=forms.RadioSelect,
             label="Have you ever worked in a job where you might have been exposed to asbestos?",
             label_classes="nhsuk-fieldset__legend--m",
+            coerce=lambda x: x == 'True',
             error_messages={
                 'required': 'Select if you have been exposed to asbestos.'
             }

lung_cancer_screening/questions/migrations/0017_alter_responseset_asbestos_exposure.py

@@ -0,0 +1,18 @@
+# Generated by Django 5.2.7 on 2025-11-12 11:00
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('questions', '0016_responseset_asbestos_exposure'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='responseset',
+            name='asbestos_exposure',
+            field=models.BooleanField(blank=True, null=True),
+        ),
+    ]

lung_cancer_screening/questions/models/response_set.py

@@ -33,10 +33,6 @@ class EthnicityValues(models.TextChoices):
     OTHER = "O", "Other ethnic group"
     PREFER_NOT_TO_SAY = "N", "I'd prefer not to say"
 
-class AsbestosExposureValues(models.TextChoices):
-    YES = "Y", "Yes"
-    NO = "N", "No"
-
 class ResponseSet(BaseModel):
     participant = models.ForeignKey(Participant, on_delete=models.CASCADE)
 
@@ -99,9 +95,7 @@ class ResponseSet(BaseModel):
         blank=True
     )
 
-    asbestos_exposure = models.CharField(
-        max_length=1,
-        choices=AsbestosExposureValues.choices,
+    asbestos_exposure = models.BooleanField(
         null=True,
         blank=True
     )

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

@@ -1,6 +1,5 @@
 from django.test import TestCase
 
-from ....models.response_set import AsbestosExposureValues
 from ....models.participant import Participant
 from ....forms.asbestos_exposure_form import AsbestosExposureForm
 
@@ -13,26 +12,26 @@ def test_is_valid_with_yes(self):
         form = AsbestosExposureForm(
             participant=self.participant,
             data={
-                "asbestos_exposure": AsbestosExposureValues.YES
+                "asbestos_exposure": True
             }
         )
         self.assertTrue(form.is_valid())
         self.assertEqual(
             form.cleaned_data["asbestos_exposure"],
-            AsbestosExposureValues.YES.value
+            True
         )
 
     def test_is_valid_with_no(self):
         form = AsbestosExposureForm(
             participant=self.participant,
             data={
-                "asbestos_exposure": AsbestosExposureValues.NO
+                "asbestos_exposure": False
             }
         )
         self.assertTrue(form.is_valid())
         self.assertEqual(
             form.cleaned_data["asbestos_exposure"],
-            AsbestosExposureValues.NO.value
+            False
         )
 
     def test_is_invalid_with_an_invalid_value(self):

lung_cancer_screening/questions/tests/unit/views/test_asbestos_exposure.py

@@ -2,14 +2,13 @@
 from django.urls import reverse
 
 from lung_cancer_screening.questions.models.participant import Participant
-from lung_cancer_screening.questions.models.response_set import AsbestosExposureValues
 
 
 class TestAsbestosExposure(TestCase):
     def setUp(self):
         self.participant = Participant.objects.create(unique_id="12345")
         self.participant.responseset_set.create()
-        self.valid_params = {"asbestos_exposure": AsbestosExposureValues.YES}
+        self.valid_params = {"asbestos_exposure": True}
 
         session = self.client.session
         session['participant_id'] = self.participant.unique_id