PPHA-262: height page

jamiefalcus · jamiefalcus · commit 47c65d05fbee · 2025-10-10T10:07:53.000+01:00
diff --git a/lung_cancer_screening/core/tests/acceptance/helpers/user_interaction_helpers.py b/lung_cancer_screening/core/tests/acceptance/helpers/user_interaction_helpers.py
@@ -22,3 +22,10 @@ def fill_in_and_submit_date_of_birth(page, age):
     page.get_by_label("Year").fill(str(age.year))
 
     page.click("text=Continue")
+
+def fill_in_and_submit_height(page, height):
+    expect(page.locator("h1")).to_have_text("What is your height?")
+
+    page.get_by_label("Centimeter").fill(str(height))
+
+    page.click("text=Continue")
diff --git a/lung_cancer_screening/core/tests/acceptance/test_questionnaire.py b/lung_cancer_screening/core/tests/acceptance/test_questionnaire.py
@@ -5,6 +5,7 @@
 from dateutil.relativedelta import relativedelta
 
 from .helpers.user_interaction_helpers import (
+    fill_in_and_submit_height,
     fill_in_and_submit_participant_id,
     fill_in_and_submit_smoking_elligibility,
     fill_in_and_submit_date_of_birth
@@ -31,6 +32,7 @@ def test_full_questionaire_user_journey(self):
         participant_id = '123'
         smoking_status = 'Yes, I used to smoke regularly'
         age = datetime.now() - relativedelta(years=55)
+        height = "170"
 
         page = self.browser.new_page()
         page.goto(f"{self.live_server_url}/start")
@@ -47,12 +49,20 @@ def test_full_questionaire_user_journey(self):
 
         fill_in_and_submit_date_of_birth(page, age)
 
+        expect(page).to_have_url(f"{self.live_server_url}/height")
+
+        fill_in_and_submit_height(page, height)
+
         expect(page).to_have_url(f"{self.live_server_url}/responses")
 
-        expect(page.locator(".responses")).to_contain_text(
-            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"))
+        response = page.locator(".responses")
+        expect(responses).to_contain_text("Have you ever smoked? Yes, I used to smoke regularly")
+        expect(responses).to_contain_text(
+            age.strftime("What is your date of birth? %Y-%m-%d"))
+        expect(responses).to_contain_text(f"Height: {height}")
 
         page.click("text=Submit")
 
+
+
         expect(page).to_have_url(f"{self.live_server_url}/your-results")
diff --git a/lung_cancer_screening/core/tests/unit/__init__.py b/lung_cancer_screening/core/tests/unit/__init__.py
diff --git a/lung_cancer_screening/questions/jinja2/height.jinja b/lung_cancer_screening/questions/jinja2/height.jinja
@@ -0,0 +1,49 @@
+{% extends 'layout.jinja' %}
+{% from 'nhsuk/components/button/macro.jinja' import button %}
+{% from 'nhsuk/components/back-link/macro.jinja' import backLink %}
+{% from 'nhsuk/components/input/macro.jinja' import input %}
+{% from 'nhsuk/components/fieldset/macro.jinja' import fieldset %}
+
+{% block beforeContent %}
+  {{
+    backLink({
+      "href": url("questions:date_of_birth"),
+      "text": "Back"
+    })
+  }}
+{% endblock beforeContent %}
+
+{% block page_content %}
+  <div class="nhsuk-grid-row">
+    <div class="nhsuk-grid-column-two-thirds">
+      <form action="{{ request.path }}" method="POST">
+        {{ csrf_input }}
+        <h1 class="nhsuk-heading-l">What is your height?</h1>
+        <p>An accurate measurement is important.
+
+        <p>You can measure your height at home with a measuring tape. Some pharmacies and gyms have machines to measure your height.
+        {% call fieldset({
+          "legend": {
+            "text": "Enter your height",
+            "classes": "nhsuk-label--m"
+          }
+        }) %}
+          {{
+            input({
+              "id": "height",
+              "name": "height",
+              "label": {
+                "text": "Centimetres",
+              },
+              "classes": "nhsuk-input--width-4"
+            }) 
+          }}
+        {% endcall %}
+
+        {{ button({
+            "text": "Continue"
+        }) }}
+      </form>
+    </div>
+  </div>
+{% endblock %}
diff --git a/lung_cancer_screening/questions/migrations/0009_responseset_height_and_more.py b/lung_cancer_screening/questions/migrations/0009_responseset_height_and_more.py
@@ -0,0 +1,18 @@
+# Generated by Django 5.2.6 on 2025-10-06 15:16
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('questions', '0008_remove_responseset_submitted_and_more'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='responseset',
+            name='height',
+            field=models.PositiveIntegerField(blank=True, null=True),
+        ),
+    ]
diff --git a/lung_cancer_screening/questions/models/response_set.py b/lung_cancer_screening/questions/models/response_set.py
@@ -1,5 +1,6 @@
 from django.db import models
 from django.core.exceptions import ValidationError
+from django.core.validators import MaxValueValidator, MinValueValidator
 from dateutil.relativedelta import relativedelta
 from django.utils import timezone
 
@@ -22,6 +23,13 @@ class ResponseSet(BaseModel):
     )
     date_of_birth = models.DateField(null=True, blank=True)
 
+    height = models.PositiveIntegerField(null=True, blank=True, validators=[
+        MinValueValidator(1397, message="Height must be between 139.7cm and 243.8 cm"),
+        MaxValueValidator(2438, message="Height must be between 139.7cm and 243.8 cm"),
+    ])
+
+    #height_type
+
     submitted_at = models.DateTimeField(null=True, blank=True)
 
     class Meta:
diff --git a/lung_cancer_screening/questions/tests/unit/models/test_response_set.py b/lung_cancer_screening/questions/tests/unit/models/test_response_set.py
@@ -8,6 +8,7 @@
 from ....models.participant import Participant
 from ....models.response_set import HaveYouEverSmokedValues
 
+
 class TestResponseSet(TestCase):
     def setUp(self):
         participant = Participant.objects.create(unique_id="12345")
@@ -31,6 +32,15 @@ def test_has_date_of_birth_as_a_date(self):
             date
         )
 
+    def test_has_height_as_a_int(self):
+        self.response_set.height = 1700
+        self.response_set.save()
+
+        self.assertIsInstance(
+            self.response_set.height,
+            int
+        )
+
     def test_has_a_participant_as_a_foreign_key(self):
         self.assertIsInstance(
             self.response_set.participant,
@@ -62,12 +72,12 @@ def test_has_submitted_at_as_a_datetime(self):
             datetime
         )
 
-    def  test_is_invalid_if_another_unsubmitted_response_set_exists(self):
+    def test_is_invalid_if_another_unsubmitted_response_set_exists(self):
         participant = Participant.objects.create(unique_id="56789")
-        participant.responseset_set.create(submitted_at = None)
+        participant.responseset_set.create(submitted_at=None)
 
         with self.assertRaises(ValidationError) as context:
-            participant.responseset_set.create(submitted_at = None)
+            participant.responseset_set.create(submitted_at=None)
 
         self.assertEqual(
             context.exception.messages[0],
@@ -88,3 +98,24 @@ def test_is_invalid_if_another_response_set_was_submitted_within_the_last_year(s
             "Responses have already been submitted for this participant"
         )
 
+    def test_is_invalid_if_height_is_below_lower_bound(self):
+        self.response_set.height = 1396
+
+        with self.assertRaises(ValidationError) as context:
+            self.response_set.full_clean()
+
+        self.assertIn(
+            "Height must be between 139.7cm and 243.8 cm",
+            context.exception.messages
+        )
+
+    def test_is_invalid_if_height_is_above_upper_bound(self):
+        self.response_set.height = 2439
+
+        with self.assertRaises(ValidationError) as context:
+            self.response_set.full_clean()
+
+        self.assertIn(
+            "Height must be between 139.7cm and 243.8 cm",
+            context.exception.messages
+        )
diff --git a/lung_cancer_screening/questions/tests/unit/views/test_date_of_birth.py b/lung_cancer_screening/questions/tests/unit/views/test_date_of_birth.py
@@ -73,13 +73,13 @@ def test_post_sets_the_participant_id_in_session(self):
 
         self.assertEqual(self.client.session["participant_id"], "12345")
 
-    def test_post_redirects_to_responses_path(self):
+    def test_post_redirects_to_height_path(self):
         response = self.client.post(
             reverse("questions:date_of_birth"),
             self.valid_params
         )
 
-        self.assertRedirects(response, reverse("questions:responses"))
+        self.assertRedirects(response, reverse("questions:height"))
 
     def test_post_responds_with_422_if_the_resource_is_invalid(self):
         response = self.client.post(
diff --git a/lung_cancer_screening/questions/tests/unit/views/test_height.py b/lung_cancer_screening/questions/tests/unit/views/test_height.py
@@ -0,0 +1,85 @@
+from django.test import TestCase
+from django.urls import reverse
+from datetime import date
+from dateutil.relativedelta import relativedelta
+
+from ....models.participant import Participant
+
+
+class TestPostDateOfBirth(TestCase):
+    def setUp(self):
+        self.participant = Participant.objects.create(unique_id="12345")
+        self.participant.responseset_set.create()
+
+        self.valid_height = 170
+        self.valid_params = {"height": self.valid_height}
+        self.invalid_height = 80000
+
+        session = self.client.session
+        session['participant_id'] = self.participant.unique_id
+
+        session.save()
+
+    def test_get_redirects_if_the_participant_does_not_exist(self):
+        session = self.client.session
+        session['participant_id'] = "somebody none existent participant"
+        session.save()
+
+        response = self.client.get(
+            reverse("questions:height")
+        )
+
+        self.assertRedirects(response, reverse("questions:start"))
+
+    def test_get_responds_successfully(self):
+        response = self.client.get(reverse("questions:height"))
+
+        self.assertEqual(response.status_code, 200)
+
+    def test_post_redirects_if_the_participant_does_not_exist(self):
+        session = self.client.session
+        session['participant_id'] = "somebody none existent participant"
+        session.save()
+
+        response = self.client.post(
+            reverse("questions:height"),
+            self.valid_params
+        )
+
+        self.assertRedirects(response, reverse("questions:start"))
+
+    def test_post_stores_a_valid_response_set_for_the_participant(self):
+        self.client.post(
+            reverse("questions:height"),
+            self.valid_params
+        )
+
+        response_set = self.participant.responseset_set.first()
+
+        self.assertEqual(response_set.height, self.valid_height*10)
+        self.assertEqual(response_set.participant, self.participant)
+
+    def test_post_redirects_to_responses_path(self):
+        response = self.client.post(
+            reverse("questions:height"),
+            self.valid_params
+        )
+
+        self.assertRedirects(response, reverse("questions:responses"))
+
+    def test_post_responds_with_422_if_the_resource_is_invalid(self):
+        response = self.client.post(
+            reverse("questions:height"),
+            {"height": "a"}
+        )
+
+        self.assertEqual(response.status_code, 422)
+
+
+# If nothing is entered - Enter your height
+# User enters a height that is outside the accepted range (cms) - Height must be between 139.7cm and 243.8 cm
+# User enters a height that is outside the accepted range (feet and inches) - Height must be between 4 feet 7 inches and 8 feet
+# User enters a reading for feet that is outside the accepted range - Feet must be between 4 and 8
+# User enters a reading for inches that is outside the accepted range - Inches must be between 0 and 11
+# User enters a reading for feet using a decimal point - Feet must be in whole numbers
+# User enters a reading for inches using a decimal point - I
diff --git a/lung_cancer_screening/questions/urls.py b/lung_cancer_screening/questions/urls.py
@@ -22,11 +22,13 @@
 from .views.age_range_exit import age_range_exit
 from .views.non_smoker_exit import non_smoker_exit
 from .views.your_results import your_results
+from .views.height import height
 
 urlpatterns = [
     path('start', start, name='start'),
     path('have-you-ever-smoked', have_you_ever_smoked, name='have_you_ever_smoked'),
     path('date-of-birth', date_of_birth, name='date_of_birth'),
+    path('height', height, name='height'),
     path('responses', responses, name='responses'),
     path('age-range-exit', age_range_exit, name='age_range_exit'),
     path('non-smoker-exit', non_smoker_exit, name='non_smoker_exit'),
diff --git a/lung_cancer_screening/questions/views/date_of_birth.py b/lung_cancer_screening/questions/views/date_of_birth.py
@@ -24,7 +24,7 @@ def date_of_birth(request):
                 response_set.date_of_birth = date_of_birth
                 response_set.save()
 
-                return redirect(reverse("questions:responses"))
+                return redirect(reverse("questions:height"))
             else:
                 return redirect(reverse("questions:age_range_exit"))
 
diff --git a/lung_cancer_screening/questions/views/height.py b/lung_cancer_screening/questions/views/height.py
@@ -0,0 +1,32 @@
+from django.shortcuts import render, redirect
+from django.core.exceptions import ValidationError
+#from django.urls import reverse
+
+from .decorators.participant_decorators import require_participant
+
+@require_participant
+def height(request): 
+  if request.method == "POST":
+    response_set = request.participant.responseset_set.last()
+    
+    height = request.POST.get("height")
+
+    if height.isdigit() and int(height) > 0 :
+      height = int(height)*10
+    response_set.height = height
+    #response_set.height_type = request.POST.get("height_type")
+    try:
+      response_set.save()
+      return redirect("questions:responses")
+    except ValidationError:
+      return render(
+        request,
+        "height.jinja",
+        status=422
+      )
+
+  return render(
+        request,
+        "height.jinja",
+        {}
+    )
diff --git a/scripts/tests/ui.sh b/scripts/tests/ui.sh
@@ -0,0 +1,21 @@
+#!/bin/bash
+
+set -euo pipefail
+
+cd "$(git rev-parse --show-toplevel)"
+
+# This file is for you! Edit it to call your unit test suite. Note that the same
+# file will be called if you run it locally as if you run it on CI.
+
+# Replace the following line with something like:
+#
+#   rails test:unit
+#   python manage.py test
+#   npm run test
+#
+# or whatever is appropriate to your project. You should *only* run your fast
+# tests from here. If you want to run other test suites, see the predefined
+# tasks in scripts/test.mk.
+
+docker compose run --rm --remove-orphans web poetry run python manage.py test lung_cancer_screening.core.tests.acceptance
+
diff --git a/scripts/tests/unit.sh b/scripts/tests/unit.sh
@@ -17,5 +17,5 @@ cd "$(git rev-parse --show-toplevel)"
 # tests from here. If you want to run other test suites, see the predefined
 # tasks in scripts/test.mk.
 
-docker compose run --rm --remove-orphans web poetry run python manage.py test --settings=lung_cancer_screening.settings_test
+docker compose run --rm --remove-orphans web poetry run python manage.py test lung_cancer_screening.questions.tests.unit
 
