Weight page starter

Author: jamiefalcus

lung_cancer_screening/core/tests/acceptance/helpers/user_interaction_helpers.py

@@ -37,3 +37,10 @@ def fill_in_and_submit_height_imperial(page, feet, inches):
     page.get_by_label("Inches").fill(str(inches))
 
     page.click("text=Continue")
+
+def fill_in_and_submit_weight(page, kilograms):
+    expect(page.locator("h1")).to_have_text("Enter your weight")
+
+    page.get_by_label("Kilograms").fill(str(kilograms))
+
+    page.click("text=Continue")

lung_cancer_screening/core/tests/acceptance/test_questionnaire.py

@@ -9,7 +9,8 @@
     fill_in_and_submit_height_metric,
     fill_in_and_submit_participant_id,
     fill_in_and_submit_smoking_eligibility,
-    fill_in_and_submit_date_of_birth
+    fill_in_and_submit_date_of_birth,
+    fill_in_and_submit_weight
 )
 
 from .helpers.assertion_helpers import expect_back_link_to_have_url
@@ -56,7 +57,7 @@ def test_full_questionnaire_user_journey(self):
 
         fill_in_and_submit_height_metric(page, height)
 
-        expect(page).to_have_url(f"{self.live_server_url}/responses")
+        expect(page).to_have_url(f"{self.live_server_url}/weight")
 
         page.click("text=Back")
 
@@ -66,6 +67,12 @@ def test_full_questionnaire_user_journey(self):
 
         fill_in_and_submit_height_imperial(page, feet, inches)
 
+        expect(page).to_have_url(f"{self.live_server_url}/weight")
+
+        fill_in_and_submit_weight(page, "70")
+
+        expect(page).to_have_url(f"{self.live_server_url}/responses")
+
         responses = page.locator(".responses")
         expect(responses).to_contain_text("Have you ever smoked? Yes, I used to smoke regularly")
         expect(responses).to_contain_text(
@@ -74,6 +81,4 @@ def test_full_questionnaire_user_journey(self):
 
         page.click("text=Submit")
 
-
-
         expect(page).to_have_url(f"{self.live_server_url}/your-results")

lung_cancer_screening/questions/forms/metric_weight_form.py

@@ -0,0 +1,23 @@
+from django import forms
+
+from lung_cancer_screening.core.form_fields import DecimalField
+from ..models.response_set import ResponseSet
+
+class MetricWeightForm(forms.ModelForm):
+
+    def __init__(self, *args, **kwargs):
+        self.participant = kwargs.pop('participant')
+        super().__init__(*args, **kwargs)
+        self.instance.participant = self.participant
+
+        self.fields["weight_metric"] = DecimalField(
+            label="Kilograms",
+            classes="nhsuk-input--width-4",
+            error_messages={
+                'required': 'Enter your weight.',
+            }
+        )
+
+    class Meta:
+      model = ResponseSet
+      fields = ['weight_metric']

lung_cancer_screening/questions/jinja2/weight.jinja

@@ -0,0 +1,43 @@
+{% extends 'layout.jinja' %}
+{% from 'nhsuk/components/button/macro.jinja' import button %}
+{% from 'nhsuk/components/back-link/macro.jinja' import backLink %}
+{% from 'nhsuk/components/fieldset/macro.jinja' import fieldset %}
+
+{% block beforeContent %}
+  {{
+    backLink({
+      "href": url("questions:height"),
+      "text": "Back"
+    })
+  }}
+{% endblock beforeContent %}
+
+{% block page_content %}
+  <div class="nhsuk-grid-row">
+    <div class="nhsuk-grid-column-two-thirds">
+      <form action="weight" method="POST" novalidate>
+        {{ csrf_input }}
+        <h1 class="nhsuk-heading-l">Enter your weight</h1>
+
+        <p>An accurate measurement is important. 
+        
+        <p>If you have digital scales, use these to check your weight. Some pharmacies and gyms have scales where you can check for free.
+
+        {% call fieldset({
+          "legend": {
+            "text": "What is your weight",
+            "classes": "nhsuk-label--m"
+          }
+        }) %}
+
+          {{form.weight_metric.as_field_group()}}
+
+        {% endcall %}
+
+        {{ button({
+            "text": "Continue"
+        }) }}
+      </form>
+    </div>
+  </div>
+{% endblock %}

lung_cancer_screening/questions/migrations/0011_responseset_weight_metric_and_more.py

@@ -0,0 +1,24 @@
+# Generated by Django 5.2.7 on 2025-10-21 13:13
+
+import django.core.validators
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('questions', '0010_responseset_height_imperial_alter_responseset_height_and_more'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='responseset',
+            name='weight_metric',
+            field=models.PositiveIntegerField(blank=True, null=True),
+        ),
+        migrations.AlterField(
+            model_name='responseset',
+            name='height_imperial',
+            field=models.PositiveIntegerField(blank=True, null=True, validators=[django.core.validators.MinValueValidator(55, message='Height must be between 4 feet 7 inches and 8 feet'), django.core.validators.MaxValueValidator(96, message='Height must be between 4 feet 7 inches and 8 feet')]),
+        ),
+    ]

lung_cancer_screening/questions/models/response_set.py

@@ -39,6 +39,13 @@ class ResponseSet(BaseModel):
             MAX_HEIGHT_IMPERIAL, message="Height must be between 4 feet 7 inches and 8 feet"),
     ])
 
+    weight_metric = models.PositiveIntegerField(null=True, blank=True
+    #                                              validators=[
+    #     MinValueValidator(MIN_HEIGHT_METRIC, message="Height must be between 139.7cm and 243.8 cm"),
+    #     MaxValueValidator(MAX_HEIGHT_METRIC, message="Height must be between 139.7cm and 243.8 cm"),
+    # ]
+    )
+
     submitted_at = models.DateTimeField(null=True, blank=True)
 
     class Meta:

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

@@ -0,0 +1,31 @@
+from django.test import TestCase
+
+from ....models.participant import Participant
+from ....forms.metric_weight_form import MetricWeightForm
+
+class TestMetricWeightForm(TestCase):
+    def setUp(self):
+        self.participant = Participant.objects.create(unique_id="1234567890")
+        self.response_set = self.participant.responseset_set.create()
+
+    def test_is_valid_with_valid_input(self):
+        weight = "70.5"
+        form = MetricWeightForm(
+            participant=self.participant,
+            instance=self.response_set,
+            data={
+                "weight_metric": weight
+            }
+        )
+        self.assertTrue(form.is_valid())
+
+    def test_is_valid_with_invalid_input(self):
+        weight = "a"
+        form = MetricWeightForm(
+            participant=self.participant,
+            instance=self.response_set,
+            data={
+                "weight_metric": weight
+            }
+        )
+        self.assertFalse(form.is_valid())

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

@@ -51,6 +51,15 @@ def test_has_an_imperial_height_as_a_int(self):
             int
         )
 
+    def test_has_an_metric_weight_as_a_int(self):
+        self.response_set.weight_metric = 68
+        self.response_set.save()
+
+        self.assertIsInstance(
+            self.response_set.weight_metric,
+            int
+        )
+
     def test_has_a_participant_as_a_foreign_key(self):
         self.assertIsInstance(
             self.response_set.participant,

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

@@ -68,13 +68,13 @@ def test_post_stores_a_valid_response_set_for_the_participant(self):
         self.assertEqual(response_set.height, self.valid_height*10)
         self.assertEqual(response_set.participant, self.participant)
 
-    def test_post_redirects_to_responses_path(self):
+    def test_post_redirects_to_weight_path(self):
         response = self.client.post(
             reverse("questions:height"),
             self.valid_params
         )
 
-        self.assertRedirects(response, reverse("questions:responses"))
+        self.assertRedirects(response, reverse("questions:weight"))
 
     def test_post_responds_with_422_if_the_resource_is_invalid(self):
         response = self.client.post(

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

@@ -0,0 +1,94 @@
+from django.test import TestCase
+from django.urls import reverse
+from requests import session
+
+from ....models.participant import Participant
+
+
+class TestWeight(TestCase):
+    def setUp(self):
+        self.participant = Participant.objects.create(unique_id="12345")
+        self.participant.responseset_set.create()
+
+        self.valid_weight = 70
+        self.valid_params = {"weight_metric": self.valid_weight}
+
+        self.session = self.client.session
+        self.session['participant_id'] = self.participant.unique_id
+
+        self.session.save()
+
+    def test_get_redirects_if_the_participant_does_not_exist(self):
+        self.session['participant_id'] = "somebody none existent participant"
+        self.session.save()
+
+        response = self.client.get(
+            reverse("questions:weight")
+        )
+
+        self.assertRedirects(response, reverse("questions:start"))
+    
+    def test_get_redirects_if_the_participant_is_none(self):
+        self.session.flush()
+
+        response = self.client.get(
+            reverse("questions:weight")
+        )
+
+        self.assertRedirects(response, reverse("questions:start"))
+
+    def test_get_responds_successfully(self):
+        response = self.client.get(reverse("questions:weight"))
+
+        self.assertEqual(response.status_code, 200)
+
+    def test_get_renders_the_metric_form(self):
+        response = self.client.get(reverse("questions:weight"))
+
+        self.assertContains(response, "Kilograms")
+
+    def test_post_redirects_if_the_participant_does_not_exist(self):
+        self.session['participant_id'] = "somebody none existent participant"
+        self.session.save()
+
+        response = self.client.post(
+            reverse("questions:weight")
+        )
+
+        self.assertRedirects(response, reverse("questions:start"))
+
+    def test_post_redirects_if_the_participant_is_none(self):
+        self.session.flush()
+
+        response = self.client.post(
+            reverse("questions:weight")
+        )
+
+        self.assertRedirects(response, reverse("questions:start"))
+
+
+    def test_post_redirects_if_the_weight_is_valid(self):
+        response = self.client.post(
+            reverse("questions:weight"),
+            self.valid_params
+        )
+
+        self.assertRedirects(response, reverse("questions:responses"))
+
+    def test_post_valid_weight_added_to_response_set(self):
+        response = self.client.post(
+            reverse("questions:weight"),
+            self.valid_params
+        )
+
+        response_set = self.participant.responseset_set.first()
+        self.assertEqual(response_set.weight_metric, self.valid_weight)
+
+
+    # def test_post_redirects_if_the_weight_is_invalid(self):
+    #     response = self.client.post(
+    #         reverse("questions:weight"),
+    #         {"weight": "not a valid weight"}
+    #     )
+
+    #     self.assertEqual(response.status_code, 422)