PPHA-528: test age when started smoking

jamiefalcus · jamiefalcus · commit 9ba2cd9a152f · 2026-01-23T12:11:31.000Z
diff --git a/features/age_when_started_smoking.feature b/features/age_when_started_smoking.feature
@@ -0,0 +1,43 @@
+@AgeWhenStartedSmoking
+Feature: Age when started smoking
+  Scenario: The page is accessible
+    Given I am logged in
+    And I am 60 years old
+    When I go to "/age-when-started-smoking"
+    Then there are no accessibility violations
+
+  Scenario: Form errors
+    Given I am logged in
+    And I am 60 years old
+    When I go to "/age-when-started-smoking"
+    And I click "Continue"
+    Then I am on "/age-when-started-smoking"
+    And I see a form error "Enter your age when you started smoking"
+    When I fill in "How old were you when you started smoking?" as "0" and submit
+    Then I see a form error "The age you started smoking must be between 1 and your current age"
+    When I fill in "How old were you when you started smoking?" as "70" and submit
+    Then I see a form error "The age you started smoking must be the same as, or less than your current age"
+    And there are no accessibility violations
+
+  Scenario: Navigating backwards and forwards
+    Given I am logged in
+    And I am 60 years old
+    When I go to "/age-when-started-smoking"
+    Then I see a back link to "/relatives-age-when-diagnosed"
+    When I fill in "How old were you when you started smoking?" as "18" and submit
+    Then I am on "/check-your-answers"
+
+  Scenario: Checking responses and changing them
+    Given I am logged in
+    And I am 60 years old
+    When I go to "/age-when-started-smoking"
+    And I fill in "How old were you when you started smoking?" as "18" and submit
+    When I go to "/check-your-answers"
+    Then I see "18" as a response to "Age you started smoking" under "Smoking history"
+    And I see "/age-when-started-smoking?change=True" as a link to change "Age you started smoking" under "Smoking history"
+    When I click the link to change "Age you started smoking" under "Smoking History"
+    Then I am on "/age-when-started-smoking?change=True"
+    And I see "18" filled in for "How old were you when you started smoking?"
+    When I fill in "How old were you when you started smoking?" as "22" and submit
+    Then I am on "/check-your-answers"
+    And I see "22" as a response to "Age you started smoking" under "Smoking history"
diff --git a/features/family_history_lung_cancer.feature b/features/family_history_lung_cancer.feature
@@ -17,8 +17,8 @@ Feature: Family history of lung cancer page
     Given I am logged in
     When I go to "/family-history-lung-cancer"
     Then I see a back link to "/cancer-diagnosis"
-    When I fill in and submit my asbestos exposure with "No"
-    Then I am on "/check-your-answers"
+    When I fill in and submit my family history lung cancer with "No"
+    Then I am on "/age-when-started-smoking"
     When I click "Back"
     When I fill in and submit my family history lung cancer with "Yes"
     Then I am on "/relatives-age-when-diagnosed"
diff --git a/features/relatives_age_when_diagnosed.feature b/features/relatives_age_when_diagnosed.feature
@@ -17,7 +17,6 @@ Feature: Relatives age when diagnosed page
     And I see a form error "Select if your relatives were younger than 60 when they were diagnosed with lung cancer"
     And there are no accessibility violations
 
-  @AgeWhenStartedSmoking
   Scenario: Navigating backwards and forwards
     Given I am logged in
     When I go to "/family-history-lung-cancer"
diff --git a/features/steps/form_steps.py b/features/steps/form_steps.py
@@ -1,4 +1,4 @@
-from behave import when
+from behave import when, then
 from datetime import datetime
 from dateutil.relativedelta import relativedelta
 
diff --git a/features/steps/participant_steps.py b/features/steps/participant_steps.py
@@ -1,6 +1,8 @@
 from behave import given
 from django.utils import timezone
 
+from features.steps.form_steps import when_i_fill_in_and_submit_my_date_of_birth_as_x_years_ago
+from features.steps.navigation_steps import given_i_go_to
 from lung_cancer_screening.questions.tests.factories.response_set_factory import ResponseSetFactory
 
 
@@ -15,3 +17,8 @@ def given_i_have_already_submitted_my_responses(context):
 def given_i_have_started_the_questionnaire(context):
     context.page.goto(f'{context.live_server_url}/start')
     context.page.click('text=Start')
+
+@given("I am {years:d} years old")
+def given_i_am_years_old(context, years):
+    given_i_go_to(context, '/date-of-birth')
+    when_i_fill_in_and_submit_my_date_of_birth_as_x_years_ago(context, years)
diff --git a/lung_cancer_screening/nhsuk_forms/jinja2/input.jinja b/lung_cancer_screening/nhsuk_forms/jinja2/input.jinja
@@ -28,7 +28,7 @@
   {% if field.errors %}
     {% set error_params = {
       "errorMessage": {
-        "text": field.errors | first
+        "html": field.errors | first
       }
     } %}
     {% set input_params = dict(input_params, **error_params) %}
diff --git a/lung_cancer_screening/questions/forms/age_when_started_smoking_form.py b/lung_cancer_screening/questions/forms/age_when_started_smoking_form.py
@@ -1,8 +1,10 @@
 from django import forms
+from django.urls import reverse_lazy
+from django.utils.html import format_html
+
 from ...nhsuk_forms.integer_field import IntegerField
 from ..models.age_when_started_smoking_response import AgeWhenStartedSmokingResponse
 
-
 class AgeWhenStartedSmokingForm(forms.ModelForm):
     def __init__(self, *args, **kwargs):
         super().__init__(*args, **kwargs)
@@ -15,13 +17,14 @@ def __init__(self, *args, **kwargs):
             hint="Give an estimate if you are not sure",
             prefix="Age",
             error_messages={
-                'required': 'Enter your age when you started smoking',
-                'invalid': 'Enter your age when you started smoking',
-                'zero_entered':'The age you started smoking must be between 1 and your current age',
-                'old_current_age':'The age you started smoking must be the same as, or younger than your current age'
+                "required": "Enter your age when you started smoking",
+                "invalid": "Enter your age when you started smoking",
+                "zero_entered":"The age you started smoking must be between 1 and your current age",
+                "age_started_smoking_greater_than_current_age":"The age you started smoking must be the same as, or less than your current age",
+                "no_date_of_birth" : format_html("<a href=\"{}\">Provide your date of birth</a> before answering this question", reverse_lazy("questions:date_of_birth"))
             }
         )
 
     class Meta:
         model = AgeWhenStartedSmokingResponse
-        fields = ['value']
+        fields = ["value"]
diff --git a/lung_cancer_screening/questions/jinja2/responses.jinja b/lung_cancer_screening/questions/jinja2/responses.jinja
@@ -39,6 +39,14 @@
         }) }}
       </section>
 
+      <section>
+      <h2 class="nhsuk-heading-m">Smoking history</h2>
+
+        {{ summaryList({
+          "rows": response_set.smoking_history_responses_items()
+        }) }}
+      </section>
+
       <form action="{{ request.path }}" method="post">
         {{ csrf_input }}
         {{ button({
diff --git a/lung_cancer_screening/questions/models/age_when_started_smoking_response.py b/lung_cancer_screening/questions/models/age_when_started_smoking_response.py
@@ -1,53 +1,32 @@
-import json
-
 from django.db import models
 from django.forms import ValidationError
-from django.utils import timezone
 
 from .base import BaseModel
 from .response_set import ResponseSet
 
-from django.core.validators import MaxValueValidator, MinValueValidator
-
-
-
-# def validate_less_than_age(self, value):
-#     print(f"self : {self}")
-#     print(f"value : {self.value}")
-#     print("what")
-#     print(f"dob : {self.response_set.date_of_birth}")
-#     print(hasattr(self.response_set, "date_of_birth"))
-#     if hasattr(self.response_set, "date_of_birth") :
-#         if value < self.get_age :
-#             raise ValidationError(
-#                 "Must be less than your age",
-#                 code="less_than_age",
-#             )
+from django.core.validators import MinValueValidator
 
 class AgeWhenStartedSmokingResponse(BaseModel):
-    response_set = models.OneToOneField(ResponseSet, on_delete=models.CASCADE, related_name='age_when_started_smoking_response')
+    response_set = models.OneToOneField(ResponseSet, on_delete=models.CASCADE, related_name="age_when_started_smoking_response")
     value = models.PositiveIntegerField(validators=[
-        MinValueValidator(1, message="The age you started smoking must be between 1 and your current age"),
-        # validate_less_than_age
+        MinValueValidator(1, message="The age you started smoking must be between 1 and your current age")
     ]
     )
 
-    # def clean(self):
-    #     super().clean()
-    #     print(f"clean 1:{self.response_set}")
-    #     if hasattr(self.response_set, "date_of_birth_response") :
-    #         print(f"clean 2:{self.response_set.date_of_birth_response.value}")
-    #         today = timezone.now()
-    #         born = self.response_set.date_of_birth_response.value
-    #         age = today.year - born.year - ((today.month, today.day) < (born.month, born.day))
-    #         print(f"value : {self.value}")
-    #         print(f"Age {age}")
-    #         if (self.value and self.value < age):
-    #             raise ValidationError(
-    #                 "The age you started smoking must be the same as, or younger than your current age"
-    #         )
-            #if submitted_response_sets_in_last_year:
-            #    raise ValidationError(
-            #        "Responses have already been submitted for this user"
-            #    )
-
+    def clean(self):
+        super().clean()
+        if hasattr(self.response_set, "date_of_birth_response") :
+            if (self.value and self.value > self.response_set.date_of_birth_response.age_in_years()):
+                raise ValidationError({
+                    "value":ValidationError(
+                        "age started smoking must be less than current age",
+                        code="age_started_smoking_greater_than_current_age")
+                }
+                )
+        else:
+            raise ValidationError({
+                    "value":ValidationError(
+                        "date of birth not set",
+                        code="no_date_of_birth")
+                }
+                )
diff --git a/lung_cancer_screening/questions/models/date_of_birth_response.py b/lung_cancer_screening/questions/models/date_of_birth_response.py
@@ -15,3 +15,9 @@ def is_currently_in_age_range(self):
         seventy_five_years_ago = date.today() - relativedelta(years=75)
 
         return seventy_five_years_ago < self.value <= fifty_five_years_ago
+
+    def age_in_years(self):
+        today = date.today()
+        born = self.value
+        age = int(today.year - born.year - ((today.month, today.day) < (born.month, born.day)))
+        return age
diff --git a/lung_cancer_screening/questions/presenters/response_set_presenter.py b/lung_cancer_screening/questions/presenters/response_set_presenter.py
@@ -110,6 +110,12 @@ def relatives_age_when_diagnosed(self):
 
         return self.response_set.relatives_age_when_diagnosed.get_value_display()
 
+    @property
+    def age_when_started_smoking(self):
+        if not hasattr(self.response_set, 'age_when_started_smoking_response'):
+            return None
+
+        return str(self.response_set.age_when_started_smoking_response.value)
 
     @property
     def respiratory_conditions(self):
@@ -217,6 +223,15 @@ def family_history_responses_items(self):
 
         return items
 
+    def smoking_history_responses_items(self):
+        return [
+            self._check_your_answer_item(
+                "Age you started smoking",
+                self.age_when_started_smoking,
+                "questions:age_when_started_smoking",
+            )
+        ]
+
 
     def is_complete(self):
         return self.response_set.is_complete()
diff --git a/lung_cancer_screening/questions/tests/factories/age_when_started_smoking_response_factory.py b/lung_cancer_screening/questions/tests/factories/age_when_started_smoking_response_factory.py
@@ -1,5 +1,7 @@
 import factory
 
+from ..factories.date_of_birth_response_factory import DateOfBirthResponseFactory
+
 from .response_set_factory import ResponseSetFactory
 from ...models.age_when_started_smoking_response import AgeWhenStartedSmokingResponse
 
@@ -9,6 +11,10 @@ class Meta:
         model = AgeWhenStartedSmokingResponse
 
     response_set = factory.SubFactory(ResponseSetFactory)
-    #response_set = factory.SubFactory(ResponseSetFactory(date_of_birth_response="01-01-1963"))
-    #print(f"response_set.date_of_birth_response.value : {response_set.date_of_birth_response.value}")
     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",
+    )
diff --git a/lung_cancer_screening/questions/tests/unit/forms/test_age_when_started_smoking_form.py b/lung_cancer_screening/questions/tests/unit/forms/test_age_when_started_smoking_form.py
@@ -7,7 +7,6 @@
 
 from ...factories.response_set_factory import ResponseSetFactory
 from ...factories.date_of_birth_response_factory import DateOfBirthResponseFactory
-#from ...factories.age_when_started_smoking_response_factory import AgeWhenStartedSmokingResponseFactory
 from ....forms.age_when_started_smoking_form import AgeWhenStartedSmokingForm
 
 
@@ -19,9 +18,8 @@ def setUp(self):
             response_set=self.response_set,
             value=timezone.now() - relativedelta(years=int(60))
         )
-        self.response = AgeWhenStartedSmokingResponse.objects.create(
-            response_set=self.response_set,
-            value=18
+        self.response = AgeWhenStartedSmokingResponse(
+            response_set=self.response_set
         )
 
     def test_is_valid_with_valid_input(self):
@@ -33,7 +31,7 @@ def test_is_valid_with_valid_input(self):
         )
         self.assertTrue(form.is_valid())
         self.assertEqual(
-            form.cleaned_data['value'],
+            form.cleaned_data["value"],
             18
         )
 
@@ -76,17 +74,35 @@ def test_is_invalid_when_zero_is_entered(self):
             ["The age you started smoking must be between 1 and your current age"]
         )
 
-    @tag("wip")
+    def test_is_invalid_if_no_date_of_birth(self):
+        response_set = ResponseSetFactory()
+        response = AgeWhenStartedSmokingResponse(
+            response_set=response_set
+        )
+        form = AgeWhenStartedSmokingForm(
+            instance=response,
+            data={
+                "value": 70
+            }
+        )
+
+        self.assertFalse(form.is_valid())
+        self.assertEqual(
+            form.errors["value"],
+            ["<a href=\"/date-of-birth\">Provide your date of birth</a> before answering this question"]
+        )
+
     def test_is_invalid_when_age_entered_greater_than_current_age(self):
         form = AgeWhenStartedSmokingForm(
-            instance=self.response_set,
+            instance=self.response,
             data={
                 "value": 70
             }
         )
 
         self.assertFalse(form.is_valid())
+
         self.assertEqual(
             form.errors["value"],
-            ["The age you started smoking must be the same as, or younger than your current age"]
+            ["The age you started smoking must be the same as, or less than your current age"]
         )
diff --git a/lung_cancer_screening/questions/tests/unit/models/test_age_when_started_smoking_response.py b/lung_cancer_screening/questions/tests/unit/models/test_age_when_started_smoking_response.py
diff --git a/lung_cancer_screening/questions/tests/unit/models/test_date_of_birth_response.py b/lung_cancer_screening/questions/tests/unit/models/test_date_of_birth_response.py
diff --git a/lung_cancer_screening/questions/tests/unit/views/test_age_when_started_smoking.py b/lung_cancer_screening/questions/tests/unit/views/test_age_when_started_smoking.py
diff --git a/lung_cancer_screening/questions/tests/unit/views/test_relatives_age_when_diagnosed.py b/lung_cancer_screening/questions/tests/unit/views/test_relatives_age_when_diagnosed.py
diff --git a/lung_cancer_screening/questions/views/relatives_age_when_diagnosed.py b/lung_cancer_screening/questions/views/relatives_age_when_diagnosed.py
diff --git a/scripts/tests/lint.sh b/scripts/tests/lint.sh

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-from behave import when`
	`1`	`+from behave import when, then`
`2`	`2`	`from datetime import datetime`
`3`	`3`	`from dateutil.relativedelta import relativedelta`
`4`	`4`
Original file line number	Diff line number	Diff line change
`@@ -28,7 +28,7 @@`
`28`	`28`	`{% if field.errors %}`
`29`	`29`	`{% set error_params = {`
`30`	`30`	`"errorMessage": {`
`31`		`- "text": field.errors \| first`
	`31`	`+ "html": field.errors \| first`
`32`	`32`	`}`
`33`	`33`	`} %}`
`34`	`34`	`{% set input_params = dict(input_params, **error_params) %}`