Simplify model structure

Dont use a model for each response, use a single ResposeSet to
collate all responses

Author: Themitchell

lung_cancer_screening/core/tests/acceptance/test_participant_not_smoker.py

@@ -33,7 +33,7 @@ def test_participant_not_smoker(self):
         expect(page.locator("legend")).to_have_text(
             "Have you ever smoked?")
 
-        page.get_by_label('No').check()
+        page.get_by_label('No, I have never smoked').check()
 
         page.click("text=Continue")
 

lung_cancer_screening/core/tests/acceptance/test_participant_out_of_age_range.py

@@ -36,7 +36,7 @@ def test_participant_out_of_age_range(self):
         expect(page.locator("legend")).to_have_text(
             "Have you ever smoked?")
 
-        page.get_by_label('Yes').check()
+        page.get_by_label('Yes, I used to smoke regularly').check()
 
         page.click("text=Continue")
 

lung_cancer_screening/core/tests/acceptance/test_questionnaire.py

@@ -35,7 +35,7 @@ def test_full_questionaire_user_journey(self):
         expect(page.locator("legend")).to_have_text(
             "Have you ever smoked?")
 
-        page.get_by_label('Yes').check()
+        page.get_by_label('Yes, I used to smoke regularly').check()
 
         page.click("text=Continue")
 
@@ -55,5 +55,5 @@ def test_full_questionaire_user_journey(self):
         expect(page).to_have_url(f"{self.live_server_url}/responses")
 
         expect(page.locator(".responses")).to_contain_text(
-            age.strftime("Have you ever smoked? True"))
+            age.strftime("Have you ever smoked? Yes, I used to smoke regularly"))
         expect(page.locator(".responses")).to_contain_text(age.strftime("What is your date of birth? %Y-%m-%d"))

lung_cancer_screening/core/tests/acceptance/test_questionnaire_validation_errors.py

@@ -33,7 +33,7 @@ def test_full_questionaire_user_journey_with_validation_errors(self):
         expect(page.locator("legend")).to_have_text(
             "Have you ever smoked?")
 
-        page.get_by_label('Yes').check()
+        page.get_by_label('Yes, I currently smoke').check()
 
         page.click("text=Continue")
 

lung_cancer_screening/questions/forms/boolean_response_form.py

@@ -1,20 +1,20 @@
 from django import forms
 from datetime import date
 
-from ..models.date_response import DateResponse
+from ..models.response_set import ResponseSet
 from lung_cancer_screening.core.form_fields import SplitDateField
 
-class DateResponseForm(forms.ModelForm):
+class DateOfBirthForm(forms.ModelForm):
     def __init__(self, *args, **kwargs):
         super().__init__(*args, **kwargs)
 
-        self.fields["value"] = SplitDateField(
+        self.fields["date_of_birth"] = SplitDateField(
             max_value=date.today(),
             required=False,
             hint="For example, 15 3 2025",
             label="What is your date of birth?"
         )
 
     class Meta:
-        model = DateResponse
-        fields = ['value']
+        model = ResponseSet
+        fields = ['date_of_birth']

…ng/questions/forms/date_response_form.py …ng/questions/forms/date_of_birth_form.pylung_cancer_screening/questions/forms/date_response_form.py renamed to lung_cancer_screening/questions/forms/date_of_birth_form.py lung_cancer_screening/questions/forms/date_response_form.py renamed to lung_cancer_screening/questions/forms/date_of_birth_form.py

@@ -0,0 +1,21 @@
+from django import forms
+
+from lung_cancer_screening.core.form_fields import TypedChoiceField
+from ..models.response_set import ResponseSet, HaveYouEverSmokedValues
+
+class HaveYouEverSmokedForm(forms.ModelForm):
+
+    def __init__(self, *args, **kwargs):
+        super().__init__(*args, **kwargs)
+
+        self.fields["have_you_ever_smoked"] = TypedChoiceField(
+            choices=HaveYouEverSmokedValues.choices,
+            widget=forms.RadioSelect,
+            label="Have you ever smoked?",
+            label_classes="nhsuk-fieldset__legend--m",
+            coerce=int
+        )
+
+    class Meta:
+        model = ResponseSet
+        fields = ['have_you_ever_smoked']

lung_cancer_screening/questions/forms/have_you_ever_smoked_form.py

@@ -8,7 +8,7 @@
       <form action="{{ request.path }}" method="POST">
         {{ csrf_input }}
 
-        {{ form.value.as_field_group() }}
+        {{ form.have_you_ever_smoked.as_field_group() }}
 
 
         {{ button({

lung_cancer_screening/questions/jinja2/have_you_ever_smoked.jinja

@@ -6,9 +6,8 @@
     <div class="nhsuk-grid-column-two-thirds">
       <h1 class="nhsuk-heading-l">Responses</h1>
       <ul class="responses">
-        {% for response in responses %}
-          <li>{{ response.question }} {{ response.value }}</li>
-        {% endfor %}
+        <li>Have you ever smoked? {{ response_set.get_have_you_ever_smoked_display() }}</li>
+        <li>What is your date of birth? {{ response_set.date_of_birth }}</li>
       </ul>
     </div>
   </div>

lung_cancer_screening/questions/jinja2/responses.jinja

@@ -13,7 +13,7 @@ class Migration(migrations.Migration):
         migrations.AddField(
             model_name='BooleanResponse',
             name='question',
-            field=models.CharField(null='Have you ever smoked?', max_length=255),
+            field=models.CharField(default='Have you ever smoked?', max_length=255),
             preserve_default=False,
         ),
         migrations.AddField(