Move HaveYouEverSmokedResponse to its own model

Author: Themitchell

lung_cancer_screening/questions/forms/have_you_ever_smoked_form.py

@@ -1,14 +1,14 @@
 from django import forms
 
 from ...nhsuk_forms.typed_choice_field import TypedChoiceField
-from ..models.response_set import ResponseSet, HaveYouEverSmokedValues
+from ..models.have_you_ever_smoked_response import HaveYouEverSmokedResponse, HaveYouEverSmokedValues
 
 class HaveYouEverSmokedForm(forms.ModelForm):
 
     def __init__(self, *args, **kwargs):
         super().__init__(*args, **kwargs)
 
-        self.fields["have_you_ever_smoked"] = TypedChoiceField(
+        self.fields["value"] = TypedChoiceField(
             choices=HaveYouEverSmokedValues.choices,
             widget=forms.RadioSelect,
             label="Have you ever smoked?",
@@ -21,5 +21,5 @@ def __init__(self, *args, **kwargs):
         )
 
     class Meta:
-        model = ResponseSet
-        fields = ['have_you_ever_smoked']
+        model = HaveYouEverSmokedResponse
+        fields = ['value']

lung_cancer_screening/questions/jinja2/responses.jinja

@@ -18,15 +18,24 @@
     <div class="nhsuk-grid-column-two-thirds">
       <h1 class="nhsuk-heading-l">Responses</h1>
       <ul class="responses">
-        <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>
-        <li>What is your height? {{ response_set.formatted_height }}</li>
-        <li>What is your weight? {{ response_set.formatted_weight }}</li>
-        <li>What was your sex at birth? {{ response_set.get_sex_at_birth_display() }}</li>
-        <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.formatted_respiratory_conditions }}</li>
+        {% set have_you_ever_smoked = response_set.have_you_ever_smoked_response %}
+        {% set date_of_birth = response_set.date_of_birth_response %}
+        {% set height = response_set.height_response %}
+        {% set weight = response_set.weight_response %}
+        {% set sex_at_birth = response_set.sex_at_birth_response %}
+        {% set gender = response_set.gender_response %}
+        {% set ethnicity = response_set.ethnicity_response %}
+        {% set asbestos_exposure = response_set.asbestos_exposure_response %}
+        {% set respiratory_conditions = response_set.respiratory_conditions_response %}
+        <li>Have you ever smoked? {% if have_you_ever_smoked %}{{ have_you_ever_smoked.get_value_display() }}{% endif %}</li>
+        <li>What is your date of birth? {% if date_of_birth %}{{ date_of_birth.value }}{% endif %}</li>
+        <li>What is your height? {% if height %}{{ height.formatted }}{% endif %}</li>
+        <li>What is your weight? {% if weight %}{{ weight.formatted }}{% endif %}</li>
+        <li>What was your sex at birth? {% if sex_at_birth %}{{ sex_at_birth.get_value_display() }}{% endif %}</li>
+        <li>Which of these best describes you? {% if gender %}{{ gender.get_value_display() }}{% endif %}</li>
+        <li>What is your ethnic background? {% if ethnicity %}{{ ethnicity.get_value_display() }}{% endif %}</li>
+        <li>Have you ever worked in a job where you might have been exposed to asbestos? {% if asbestos_exposure %}{{ "Yes" if asbestos_exposure.value else "No" }}{% else %}No{% endif %}</li>
+        <li>Have you ever been diagnosed with any of the following respiratory conditions? {% if respiratory_conditions %}{{ respiratory_conditions.formatted }}{% endif %}</li>
       </ul>
       <form action="{{ request.path }}" method="post">
         {{ csrf_input }}

lung_cancer_screening/questions/migrations/0025_haveyoueversmokedresponse.py

@@ -0,0 +1,53 @@
+# Generated by Django 5.2.9 on 2025-12-18 17:15
+
+import django.db.models.deletion
+from django.db import migrations, models
+
+
+def copy_have_you_ever_smoked_data(apps, schema_editor):
+    with schema_editor.connection.cursor() as cursor:
+        cursor.execute("""
+            INSERT INTO questions_haveyoueversmokedresponse (created_at, updated_at, value, response_set_id)
+            SELECT NOW(), NOW(), have_you_ever_smoked, id
+            FROM questions_responseset
+            WHERE have_you_ever_smoked IS NOT NULL
+            ON CONFLICT (response_set_id) DO NOTHING
+        """)
+
+
+def reverse_copy_have_you_ever_smoked_data(apps, schema_editor):
+    with schema_editor.connection.cursor() as cursor:
+        cursor.execute("""
+            UPDATE questions_responseset rs
+            SET have_you_ever_smoked = h.value
+            FROM questions_haveyoueversmokedresponse h
+            WHERE rs.id = h.response_set_id
+        """)
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('questions', '0024_add_email_to_user'),
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name='HaveYouEverSmokedResponse',
+            fields=[
+                ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('created_at', models.DateTimeField(auto_now_add=True)),
+                ('updated_at', models.DateTimeField(auto_now=True)),
+                ('value', models.IntegerField(choices=[(0, 'Yes, I currently smoke'), (1, 'Yes, I used to smoke'), (2, 'Yes, but I have smoked fewer than 100 cigarettes in my lifetime'), (3, 'No, I have never smoked')])),
+                ('response_set', models.OneToOneField(on_delete=django.db.models.deletion.CASCADE, to='questions.responseset')),
+            ],
+            options={
+                'abstract': False,
+            },
+        ),
+        migrations.RunPython(copy_have_you_ever_smoked_data, reverse_copy_have_you_ever_smoked_data),
+        migrations.RemoveField(
+            model_name='responseset',
+            name='have_you_ever_smoked',
+        ),
+    ]

lung_cancer_screening/questions/models/__init__.py

@@ -1,2 +1,3 @@
 from .response_set import ResponseSet # noqa: F401
 from .user import User # noqa: F401
+from .have_you_ever_smoked_response import HaveYouEverSmokedResponse # noqa: F401

lung_cancer_screening/questions/models/have_you_ever_smoked_response.py

@@ -0,0 +1,16 @@
+from django.db import models
+
+from .base import BaseModel
+from .response_set import ResponseSet
+
+
+class HaveYouEverSmokedValues(models.IntegerChoices):
+    YES_I_CURRENTLY_SMOKE = 0, 'Yes, I currently smoke'
+    YES_I_USED_TO_SMOKE_REGULARLY = 1, 'Yes, I used to smoke'
+    YES_BUT_ONLY_A_FEW_TIMES = 2, 'Yes, but I have smoked fewer than 100 cigarettes in my lifetime'
+    NO_I_HAVE_NEVER_SMOKED = 3, 'No, I have never smoked'
+
+
+class HaveYouEverSmokedResponse(BaseModel):
+    response_set = models.OneToOneField(ResponseSet, on_delete=models.CASCADE, related_name='have_you_ever_smoked_response')
+    value = models.IntegerField(choices=HaveYouEverSmokedValues.choices)

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

@@ -1,20 +1,23 @@
 from django.test import TestCase
 
-from ...factories.user_factory import UserFactory
-from ....models.response_set import ResponseSet, HaveYouEverSmokedValues
+from ...factories.response_set_factory import ResponseSetFactory
+from ....models.have_you_ever_smoked_response import HaveYouEverSmokedResponse, HaveYouEverSmokedValues
 from ....forms.have_you_ever_smoked_form import HaveYouEverSmokedForm
 
 
 class TestHaveYouEverSmokedForm(TestCase):
     def setUp(self):
-        self.user = UserFactory()
-        self.response_set = ResponseSet(user=self.user)
+        self.response_set = ResponseSetFactory()
+        self.response = HaveYouEverSmokedResponse.objects.create(
+            response_set=self.response_set,
+            value=HaveYouEverSmokedValues.YES_I_USED_TO_SMOKE_REGULARLY
+        )
 
     def test_is_valid(self):
         form = HaveYouEverSmokedForm(
-            instance=self.response_set,
+            instance=self.response,
             data={
-                "have_you_ever_smoked": (
+                "value": (
                     HaveYouEverSmokedValues.YES_I_USED_TO_SMOKE_REGULARLY
                 )
             }
@@ -23,41 +26,41 @@ def test_is_valid(self):
 
     def test_is_invalid(self):
         form = HaveYouEverSmokedForm(
-            instance=self.response_set,
+            instance=self.response,
             data={
-                "have_you_ever_smoked": "invalid"
+                "value": "invalid"
             }
         )
         self.assertFalse(form.is_valid())
         self.assertEqual(
-            form.errors["have_you_ever_smoked"],
+            form.errors["value"],
             ["Select a valid choice. invalid is not one of the available choices."]
         )
 
     def test_is_invalid_when_no_option_is_selected(self):
         form = HaveYouEverSmokedForm(
-            instance=self.response_set,
+            instance=self.response,
             data={
-                "have_you_ever_smoked": None
+                "value": None
             }
         )
         self.assertFalse(form.is_valid())
         self.assertEqual(
-            form.errors["have_you_ever_smoked"],
+            form.errors["value"],
             ["Select if you have ever smoked"]
         )
 
     def test_returns_a_boolean_type(self):
         form = HaveYouEverSmokedForm(
-            instance=self.response_set,
+            instance=self.response,
             data={
-                "have_you_ever_smoked": (
+                "value": (
                     HaveYouEverSmokedValues.YES_I_USED_TO_SMOKE_REGULARLY
                 )
             }
         )
         form.is_valid()
         self.assertEqual(
-            form.cleaned_data["have_you_ever_smoked"],
+            form.cleaned_data["value"],
             HaveYouEverSmokedValues.YES_I_USED_TO_SMOKE_REGULARLY.value
         )

lung_cancer_screening/questions/tests/unit/models/test_have_you_ever_smoked_response.py

@@ -0,0 +1,27 @@
+from django.test import TestCase
+
+from ...factories.response_set_factory import ResponseSetFactory
+from ....models.have_you_ever_smoked_response import HaveYouEverSmokedResponse, HaveYouEverSmokedValues
+
+
+class TestHaveYouEverSmokedResponse(TestCase):
+    def test_has_response_set_as_foreign_key(self):
+        response_set = ResponseSetFactory()
+        response = HaveYouEverSmokedResponse.objects.create(
+            response_set=response_set,
+            value=HaveYouEverSmokedValues.YES_I_CURRENTLY_SMOKE
+        )
+
+        self.assertEqual(response.response_set, response_set)
+
+    def test_has_value_as_enum(self):
+        response_set = ResponseSetFactory()
+        response = HaveYouEverSmokedResponse.objects.create(
+            response_set=response_set,
+            value=HaveYouEverSmokedValues.YES_I_USED_TO_SMOKE_REGULARLY
+        )
+
+        self.assertEqual(
+            response.get_value_display(),
+            HaveYouEverSmokedValues.YES_I_USED_TO_SMOKE_REGULARLY.label
+        )

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

@@ -4,7 +4,7 @@
 from django.utils import timezone
 
 from .helpers.authentication import login_user
-from lung_cancer_screening.questions.models.response_set import HaveYouEverSmokedValues
+from lung_cancer_screening.questions.models.have_you_ever_smoked_response import HaveYouEverSmokedResponse, HaveYouEverSmokedValues
 
 class TestGetHaveYouEverSmoked(TestCase):
     def setUp(self):
@@ -43,7 +43,7 @@ class TestPostHaveYouEverSmoked(TestCase):
     def setUp(self):
         self.user = login_user(self.client)
 
-        self.valid_params = { "have_you_ever_smoked": HaveYouEverSmokedValues.YES_I_USED_TO_SMOKE_REGULARLY }
+        self.valid_params = { "value": HaveYouEverSmokedValues.YES_I_USED_TO_SMOKE_REGULARLY }
 
 
     def test_post_redirects_if_the_user_is_not_logged_in(self):
@@ -66,7 +66,7 @@ def test_post_creates_an_unsubmitted_response_set_for_the_user_when_no_response_
         response_set = self.user.responseset_set.first()
         self.assertEqual(self.user.responseset_set.count(), 1)
         self.assertEqual(response_set.submitted_at, None)
-        self.assertEqual(response_set.have_you_ever_smoked, self.valid_params["have_you_ever_smoked"])
+        self.assertEqual(HaveYouEverSmokedResponse.objects.get(response_set=response_set).value, self.valid_params["value"])
         self.assertEqual(response_set.user, self.user)
 
 
@@ -81,7 +81,7 @@ def test_post_updates_an_unsubmitted_response_set_for_the_user_when_an_unsubmitt
         response_set.refresh_from_db()
         self.assertEqual(self.user.responseset_set.count(), 1)
         self.assertEqual(response_set.submitted_at, None)
-        self.assertEqual(response_set.have_you_ever_smoked, self.valid_params["have_you_ever_smoked"])
+        self.assertEqual(HaveYouEverSmokedResponse.objects.get(response_set=response_set).value, self.valid_params["value"])
         self.assertEqual(response_set.user, self.user)
 
 
@@ -100,7 +100,7 @@ def test_post_creates_an_new_unsubmitted_response_set_for_the_user_when_an_submi
 
         response_set = self.user.responseset_set.last()
         self.assertEqual(response_set.submitted_at, None)
-        self.assertEqual(response_set.have_you_ever_smoked, self.valid_params["have_you_ever_smoked"])
+        self.assertEqual(HaveYouEverSmokedResponse.objects.get(response_set=response_set).value, self.valid_params["value"])
         self.assertEqual(response_set.user, self.user)
 
 
@@ -128,23 +128,25 @@ def test_post_redirects_to_the_date_of_birth_path(self):
     def test_post_responds_with_422_if_the_date_response_fails_to_create(self):
         response = self.client.post(
             reverse("questions:have_you_ever_smoked"),
-            {"have_you_ever_smoked": "something not in list"}
+            {"value": "something not in list"}
         )
 
         self.assertEqual(response.status_code, 422)
 
     def test_post_does_not_update_the_response_set_if_the_user_is_not_a_smoker(self):
         self.client.post(
             reverse("questions:have_you_ever_smoked"),
-            { "have_you_ever_smoked": HaveYouEverSmokedValues.NO_I_HAVE_NEVER_SMOKED.value }
+            { "value": HaveYouEverSmokedValues.NO_I_HAVE_NEVER_SMOKED.value }
         )
 
-        self.assertEqual(self.user.responseset_set.first().have_you_ever_smoked, None)
+        response_set = self.user.responseset_set.first()
+        if response_set:
+            self.assertFalse(HaveYouEverSmokedResponse.objects.filter(response_set=response_set).exists())
 
     def test_post_redirects_if_the_user_not_a_smoker(self):
         response = self.client.post(
             reverse("questions:have_you_ever_smoked"),
-            {"have_you_ever_smoked": HaveYouEverSmokedValues.NO_I_HAVE_NEVER_SMOKED.value }
+            {"value": HaveYouEverSmokedValues.NO_I_HAVE_NEVER_SMOKED.value }
         )
 
         self.assertRedirects(response, reverse("questions:non_smoker_exit"))

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

@@ -6,16 +6,17 @@
 
 from ...factories.user_factory import UserFactory
 from .helpers.authentication import login_user
+from ....models.have_you_ever_smoked_response import HaveYouEverSmokedResponse, HaveYouEverSmokedValues
+from ....models.date_of_birth_response import DateOfBirthResponse
 
 
 class TestGetResponses(TestCase):
     def setUp(self):
         self.user = login_user(self.client)
 
-        self.response_set = self.user.responseset_set.create(
-            have_you_ever_smoked=True,
-            date_of_birth=date(2000, 9, 8)
-        )
+        self.response_set = self.user.responseset_set.create()
+        HaveYouEverSmokedResponse.objects.create(response_set=self.response_set, value=HaveYouEverSmokedValues.YES_I_CURRENTLY_SMOKE)
+        DateOfBirthResponse.objects.create(response_set=self.response_set, value=date(2000, 9, 8))
 
     def test_get_redirects_if_the_user_is_not_logged_in(self):
         self.client.logout()
@@ -55,39 +56,37 @@ def test_get_contains_the_users_responses(self):
             reverse("questions:responses")
         )
 
+        have_you_ever_smoked = HaveYouEverSmokedResponse.objects.get(response_set=self.response_set)
+        date_of_birth = DateOfBirthResponse.objects.get(response_set=self.response_set)
         self.assertContains(
             response,
-            self.response_set.get_have_you_ever_smoked_display()
+            have_you_ever_smoked.get_value_display()
         )
         self.assertContains(
-            response, self.response_set.date_of_birth
+            response, date_of_birth.value
         )
 
     def test_get_does_not_contain_responses_for_other_users(self):
         other_user = UserFactory()
-        other_date_response = other_user.responseset_set.create(
-            have_you_ever_smoked=0, date_of_birth=date(1990, 1, 1)
-        )
+        other_response_set = other_user.responseset_set.create()
+        DateOfBirthResponse.objects.create(response_set=other_response_set, value=date(1990, 1, 1))
 
         response = self.client.get(reverse("questions:responses"))
 
+        other_date_of_birth = DateOfBirthResponse.objects.get(response_set=other_response_set)
+
         self.assertNotContains(
-            response,
-            other_date_response.get_have_you_ever_smoked_display()
-        )
-        self.assertNotContains(
-            response, other_date_response.date_of_birth
+            response, other_date_of_birth.value
         )
 
 
 class TestPostResponses(TestCase):
     def setUp(self):
         self.user = login_user(self.client)
 
-        self.response_set = self.user.responseset_set.create(
-            have_you_ever_smoked=True,
-            date_of_birth=date(2000, 9, 8)
-        )
+        self.response_set = self.user.responseset_set.create()
+        HaveYouEverSmokedResponse.objects.create(response_set=self.response_set, value=HaveYouEverSmokedValues.YES_I_CURRENTLY_SMOKE)
+        DateOfBirthResponse.objects.create(response_set=self.response_set, value=date(2000, 9, 8))
 
     def test_post_redirects_if_the_user_is_not_logged_in(self):
         self.client.logout()