WIP

Author: miriam-z

lung_cancer_screening/core/tests/acceptance/test_questionnaire_validation_errors.py

@@ -83,3 +83,22 @@ def test_height_validation_errors(self):
         expect(page.locator(".nhsuk-error-message")).to_contain_text(
             "Inches must be in whole numbers"
         )
+
+    def test_weight_validation_errors(self):
+        participant_id = '123'
+
+        page = self.browser.new_page()
+        page.goto(f"{self.live_server_url}/start")
+        fill_in_and_submit_participant_id(page, participant_id)
+        page.goto(f"{self.live_server_url}/weight")
+        
+        page.click("text=Continue")
+        expect(page.locator(".nhsuk-error-message")).to_contain_text(
+            "Enter your weight."
+        )
+        # Test weight below minimum 
+        page.get_by_label("Kilograms").fill('25.3')
+        page.click('text=Continue')
+        expect(page.locator(".nhsuk-error-message")).to_contain_text(
+            "Weight must be between 25.4kg and 317.5kg"
+        )

lung_cancer_screening/questions/forms/metric_weight_form.py

@@ -13,6 +13,7 @@ def __init__(self, *args, **kwargs):
         self.fields["weight_metric"] = DecimalField(
             label="Kilograms",
             classes="nhsuk-input--width-4",
+            required=True,
             error_messages={
                 'required': 'Enter your weight.',
             }

lung_cancer_screening/questions/jinja2/weight.jinja

@@ -15,7 +15,7 @@
 {% block page_content %}
   <div class="nhsuk-grid-row">
     <div class="nhsuk-grid-column-two-thirds">
-      <form action="weight" method="POST" novalidate>
+      <form action="{{request.path}}" method="POST" novalidate>
         {{ csrf_input }}
         <h1 class="nhsuk-heading-l">Enter your weight</h1>
 

lung_cancer_screening/questions/models/response_set.py

@@ -39,12 +39,12 @@ 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"),
-    # ]
-    )
+    MIN_WEIGHT_METRIC = 254
+
+    weight_metric = models.PositiveIntegerField(null=True, blank=True, validators=[
+        MinValueValidator(MIN_WEIGHT_METRIC, message="Weight must be between 25.4kg and 317.5kg"),
+    #     MaxValueValidator(MAX_WEIGHT_METRIC, message="Height must be between 139.7cm and 243.8 cm"),
+    ])
 
     submitted_at = models.DateTimeField(null=True, blank=True)
 

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

@@ -19,7 +19,7 @@ def test_is_valid_with_valid_input(self):
         )
         self.assertTrue(form.is_valid())
 
-    def test_is_valid_with_invalid_input(self):
+    def test_is_not_valid_with_invalid_input(self):
         weight = "a"
         form = MetricWeightForm(
             participant=self.participant,
@@ -28,4 +28,16 @@ def test_is_valid_with_invalid_input(self):
                 "weight_metric": weight
             }
         )
-        self.assertFalse(form.is_valid())
+        self.assertFalse(form.is_valid())
+
+    def test_is_not_valid_without_any_weight_value_set(self):
+        weight = "a"
+        form = MetricWeightForm(
+            participant=self.participant,
+            instance=self.response_set,
+            data={
+                "weight_metric": None
+            }
+        )
+        self.assertFalse(form.is_valid())
+        self.assertEqual(form.errors, {"weight_metric": ["Enter your weight."]})

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

@@ -178,3 +178,14 @@ def test_formatted_height_returns_imperial_height_if_set(self):
             self.response_set.formatted_height,
             "5 feet 8 inches"
         )
+    
+    def test_is_invalid_if_weight_metric_is_below_lower_bound(self):
+        self.response_set.weight_metric = ResponseSet.MIN_WEIGHT_METRIC - 1
+
+        with self.assertRaises(ValidationError) as context:
+            self.response_set.full_clean()
+
+        self.assertIn(
+            "Weight must be between 25.4kg and 317.5kg",
+            context.exception.messages
+        )

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

@@ -85,10 +85,10 @@ def test_post_valid_weight_added_to_response_set(self):
         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"}
-    #     )
+    def test_post_responds_with_422_if_the_resource_is_invalid(self):
+        response = self.client.post(
+            reverse("questions:weight"),
+            {"weight": "not a valid weight"}
+        )
 
-    #     self.assertEqual(response.status_code, 422)
+        self.assertEqual(response.status_code, 422)

lung_cancer_screening/questions/views/weight.py

@@ -15,6 +15,15 @@ def weight(request):
         if form.is_valid():
             form.save()
             return redirect("questions:responses")
+        else:
+            return render(
+                request,
+                "weight.jinja",
+                {
+                    "form": form
+                },
+                status=422
+            )
     return render(
         request,
         "weight.jinja",