PPHA-527: Adding currently smoking cigarettes question

Author: jamiefalcus

features/currently_smoking.feature

@@ -0,0 +1,39 @@
+@CurrentlySmokingCigarettes
+Feature: Currently smoking page
+  Scenario: The page is accessible
+    Given I am logged in
+    And I have answered questions showing I am eligible
+    When I go to "/currently-smoking-cigarettes"
+    Then there are no accessibility violations
+
+  Scenario: Form errors
+    Given I am logged in
+    And I have answered questions showing I am eligible
+    When I go to "/currently-smoking-cigarettes"
+    And I click "Continue"
+    Then I am on "/currently-smoking-cigarettes"
+    And I see a form error "Select if you currently smoke cigarettes"
+    And there are no accessibility violations
+
+  Scenario: Navigating backwards and forwards
+    Given I am logged in
+    And I have answered questions showing I am eligible
+    When I go to "/currently-smoking-cigarettes"
+    Then I see a back link to "/age-when-started-smoking"
+    When I check "Yes" and submit
+    Then I am on "/check-your-answers"
+
+  Scenario: Checking responses and changing them
+    Given I am logged in
+    And I have answered questions showing I am eligible
+    When I go to "/currently-smoking-cigarettes"
+    When I check "Yes" and submit
+    When I go to "/check-your-answers"
+    Then I see "Yes" as a response to "Do you currently smoke cigarettes?" under "Smoking history"
+    And I see "/currently-smoking-cigarettes?change=True" as a link to change "Do you currently smoke cigarettes?" under "Smoking history"
+    When I click the link to change "Do you currently smoke cigarettes?" under "Smoking history"
+    Then I am on "/currently-smoking-cigarettes?change=True"
+    And I see "Yes" selected
+    When I check "No" and submit
+    Then I am on "/check-your-answers"
+    And I see "No" as a response to "Do you currently smoke cigarettes?" under "Smoking history"

features/questionnaire.feature

@@ -1,4 +1,3 @@
-@AgeWhenStartedSmoking
 Feature: Questionnaire
   Scenario: Cannot change responses once submitted
     Given I am logged in
@@ -59,8 +58,11 @@ Feature: Questionnaire
     Then I am on "/age-when-started-smoking"
     When I fill in "How old were you when you started smoking?" as "18" and submit
 
+    Then I am on "/currently-smoking-cigarettes"
+    When I check "Yes" and submit
+
     Then I am on "/check-your-answers"
-    And I see a back link to "/age-when-started-smoking"
+    And I see a back link to "/currently-smoking-cigarettes"
 
     And I see "Yes, I used to smoke" as a response to "Have you ever smoked tobacco?" under "Eligibility"
     And I see a date 55 years ago as a response to "Date of birth" under "Eligibility"

lung_cancer_screening/questions/forms/currently_smoking_cigarettes_form.py

@@ -0,0 +1,25 @@
+from django import forms
+
+from ..models.currently_smoking_cigarettes_response import CurrentlySmokingCigarettesResponse
+
+from ...nhsuk_forms.typed_choice_field import TypedChoiceField
+
+class CurrentlySmokingCigarettesForm(forms.ModelForm):
+    def __init__(self, *args, **kwargs):
+        super().__init__(*args, **kwargs)
+
+        self.fields["value"] = TypedChoiceField(
+        choices=[(True, 'Yes'), (False, 'No')],
+        widget=forms.RadioSelect,
+        label="Do you currently smoke cigarettes?",
+        label_classes="nhsuk-fieldset__legend--l",
+        label_is_page_heading=True,
+        coerce=lambda x: x == 'True',
+        error_messages={
+            'required': 'Select if you currently smoke cigarettes',
+        }
+    )
+
+    class Meta:
+        model = CurrentlySmokingCigarettesResponse
+        fields = ['value']

lung_cancer_screening/questions/migrations/0044_alter_agewhenstartedsmokingresponse_value_and_more.py

@@ -0,0 +1,43 @@
+# Generated by Django 5.2.10 on 2026-01-26 16:07
+
+import django.core.validators
+import django.db.models.deletion
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('questions', '0043_agewhenstartedsmokingresponse'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='agewhenstartedsmokingresponse',
+            name='value',
+            field=models.PositiveIntegerField(validators=[django.core.validators.MinValueValidator(1, message='The age you started smoking must be between 1 and your current age')]),
+        ),
+        migrations.AlterField(
+            model_name='ethnicityresponse',
+            name='value',
+            field=models.CharField(choices=[('A', 'Asian or Asian British'), ('B', 'Black, African, Caribbean or Black British'), ('M', 'Mixed or multiple ethnic groups'), ('W', 'White'), ('O', 'Other ethnic group'), ('N', 'Prefer not to say')], max_length=1),
+        ),
+        migrations.AlterField(
+            model_name='sexatbirthresponse',
+            name='value',
+            field=models.CharField(choices=[('F', 'Female'), ('M', 'Male'), ('I', 'Intersex')], max_length=1),
+        ),
+        migrations.CreateModel(
+            name='CurrentlySmokingCigarettesResponse',
+            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.BooleanField()),
+                ('response_set', models.OneToOneField(on_delete=django.db.models.deletion.CASCADE, related_name='currently_smoking_cigarettes_response', to='questions.responseset')),
+            ],
+            options={
+                'abstract': False,
+            },
+        ),
+    ]

lung_cancer_screening/questions/models/__init__.py

@@ -6,6 +6,7 @@
 from .asbestos_exposure_response import AsbestosExposureResponse # noqa: F401
 from .cancer_diagnosis_response import CancerDiagnosisResponse # noqa: F401
 from .check_need_appointment_response import CheckNeedAppointmentResponse # noqa: F401
+from .currently_smoking_cigarettes_response import CurrentlySmokingCigarettesResponse # noqa: F401
 from .date_of_birth_response import DateOfBirthResponse # noqa: F401
 from .ethnicity_response import EthnicityResponse # noqa: F401
 from .family_history_lung_cancer_response import FamilyHistoryLungCancerResponse # noqa: F401

lung_cancer_screening/questions/models/currently_smoking_cigarettes_response.py

@@ -0,0 +1,9 @@
+from django.db import models
+
+from .base import BaseModel
+from .response_set import ResponseSet
+
+
+class CurrentlySmokingCigarettesResponse(BaseModel):
+    response_set = models.OneToOneField(ResponseSet, on_delete=models.CASCADE, related_name='currently_smoking_cigarettes_response')
+    value = models.BooleanField()

lung_cancer_screening/questions/presenters/response_set_presenter.py

@@ -117,6 +117,13 @@ def age_when_started_smoking(self):
 
         return str(self.response_set.age_when_started_smoking_response.value)
 
+    @property
+    def currently_smoking_cigarettes(self):
+        if not hasattr(self.response_set, 'currently_smoking_cigarettes_response'):
+            return None
+
+        return "Yes" if self.response_set.currently_smoking_cigarettes_response.value else "No"
+
     @property
     def respiratory_conditions(self):
         if not hasattr(self.response_set, 'respiratory_conditions_response'):
@@ -229,6 +236,11 @@ def smoking_history_responses_items(self):
                 "Age you started smoking",
                 self.age_when_started_smoking,
                 "questions:age_when_started_smoking",
+            ),
+            self._check_your_answer_item(
+                "Do you currently smoke cigarettes?",
+                self.currently_smoking_cigarettes,
+                "questions:currently_smoking_cigarettes",
             )
         ]
 

lung_cancer_screening/questions/tests/factories/age_when_started_smoking_response_factory.py

@@ -13,8 +13,20 @@ class Meta:
     response_set = factory.SubFactory(ResponseSetFactory)
     value = factory.Faker('pyint', min_value=15, max_value=50)
 
-    # Create a DateOfBirthResponse linked to the same response_set
-    date_of_birth_response = factory.RelatedFactory(
-        DateOfBirthResponseFactory,
-        factory_related_name="value",
-    )
+    @factory.post_generation
+    def date_of_birth_response(obj, create, extracted, **kwargs):
+        """Create a DateOfBirthResponse linked to the same response_set if one doesn't exist."""
+        if extracted:
+            # Use the provided DateOfBirthResponse
+            return extracted
+
+        # Check if response_set already has a date_of_birth_response
+        if hasattr(obj.response_set, 'date_of_birth_response'):
+            return obj.response_set.date_of_birth_response
+
+        if create:
+            # Create a DateOfBirthResponse with the same response_set
+            DateOfBirthResponseFactory.create(response_set=obj.response_set, **kwargs)
+        else:
+            # Build a DateOfBirthResponse with the same response_set
+            DateOfBirthResponseFactory.build(response_set=obj.response_set, **kwargs)

lung_cancer_screening/questions/tests/factories/currently_smoking_cigarettes_response_factory.py

@@ -0,0 +1,13 @@
+import factory
+
+from ...models.currently_smoking_cigarettes_response import CurrentlySmokingCigarettesResponse
+
+from .response_set_factory import ResponseSetFactory
+
+
+class CurrentlySmokingCigarettesResponseFactory(factory.django.DjangoModelFactory):
+    class Meta:
+        model = CurrentlySmokingCigarettesResponse
+
+    response_set = factory.SubFactory(ResponseSetFactory)
+    value = factory.Faker('boolean')

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

@@ -0,0 +1,57 @@
+from django.test import TestCase, tag
+
+from ....models.currently_smoking_cigarettes_response import CurrentlySmokingCigarettesResponse
+
+from ...factories.response_set_factory import ResponseSetFactory
+
+from ....forms.currently_smoking_cigarettes_form import CurrentlySmokingCigarettesForm
+
+
+@tag("CurrentlySmokingCigarettes")
+class TestCurrentlySmokingCigarettesForm(TestCase):
+    def setUp(self):
+        self.response_set = ResponseSetFactory()
+        self.response = CurrentlySmokingCigarettesResponse.objects.create(
+            response_set=self.response_set,
+            value=False
+        )
+
+
+    def test_is_valid_with_a_valid_value(self):
+        form = CurrentlySmokingCigarettesForm(
+            instance=self.response,
+            data={
+                "value": False
+            }
+        )
+        self.assertTrue(form.is_valid())
+        self.assertEqual(
+            form.cleaned_data["value"],
+            False
+        )
+
+    def test_is_invalid_with_an_invalid_value(self):
+        form = CurrentlySmokingCigarettesForm(
+            instance=self.response,
+            data={
+                "value": "invalid"
+            }
+        )
+        self.assertFalse(form.is_valid())
+        self.assertEqual(
+            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 = CurrentlySmokingCigarettesForm(
+            instance=self.response,
+            data={
+                "value": None
+            }
+        )
+        self.assertFalse(form.is_valid())
+        self.assertEqual(
+            form.errors["value"],
+            ["Select if you currently smoke cigarettes"]
+        )