Merge pull request #219 from NHSDigital/spike-use-django-forms-more-succinctly

SPIKE: Test more succint views with DoB

Author: Themitchell

features/date_of_birth_page.feature

@@ -1,3 +1,4 @@
+@DateOfBirth
 Feature: Date of birth page
   Scenario: The page is accessible
     Given I am logged in
@@ -45,6 +46,7 @@ Feature: Date of birth page
     And I see "/date-of-birth?change=True" as a link to change "Date of birth" under "Eligibility"
     When I click the link to change "Date of birth" under "Eligibility"
     Then I am on "/date-of-birth?change=True"
+    And I see a date 55 years ago filled in
     When I fill in and submit my date of birth as 60 years ago
     Then I am on "/check-your-answers"
     And I see a date 60 years ago as a response to "Date of birth" under "Eligibility"

features/steps/form_steps.py

@@ -112,3 +112,10 @@ def when_i_submit_the_form(context):
 @then(u'I see "{value}" selected')
 def then_i_see_value_selected(context, value):
     assert context.page.get_by_label(value, exact=True).is_checked()
+
+@then(u'I see a date {years} years ago filled in')
+def then_i_see_a_date_x_years_ago_filled_in(context, years):
+    date_of_birth = datetime.now() - relativedelta(years=int(years))
+    assert context.page.get_by_label('Day').input_value() == str(date_of_birth.day)
+    assert context.page.get_by_label('Month').input_value() == str(date_of_birth.month)
+    assert context.page.get_by_label('Year').input_value() == str(date_of_birth.year)

lung_cancer_screening/questions/models/date_of_birth_response.py

@@ -1,4 +1,6 @@
 from django.db import models
+from datetime import date
+from dateutil.relativedelta import relativedelta
 
 from .base import BaseModel
 from .response_set import ResponseSet
@@ -7,3 +9,9 @@
 class DateOfBirthResponse(BaseModel):
     response_set = models.OneToOneField(ResponseSet, on_delete=models.CASCADE, related_name='date_of_birth_response')
     value = models.DateField()
+
+    def is_currently_in_age_range(self):
+        fifty_five_years_ago = date.today() - relativedelta(years=55)
+        seventy_five_years_ago = date.today() - relativedelta(years=75)
+
+        return seventy_five_years_ago < self.value <= fifty_five_years_ago

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

@@ -1,11 +1,12 @@
-from django.test import TestCase
+from django.test import TestCase, tag
 from datetime import date
 
 from ...factories.response_set_factory import ResponseSetFactory
 from ....models.date_of_birth_response import DateOfBirthResponse
 from ....forms.date_of_birth_form import DateOfBirthForm
 
 
+@tag("DateOfBirth")
 class TestDateOfBirthForm(TestCase):
     def setUp(self):
         self.response_set = ResponseSetFactory()

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

@@ -1,12 +1,14 @@
-from django.test import TestCase
+from django.test import TestCase, tag
 from datetime import date
+from dateutil.relativedelta import relativedelta
 
 from ...factories.response_set_factory import ResponseSetFactory
 from ...factories.date_of_birth_response_factory import DateOfBirthResponseFactory
 
 from ....models.date_of_birth_response import DateOfBirthResponse
 
 
+@tag("DateOfBirth")
 class TestDateOfBirthResponse(TestCase):
     def setUp(self):
         self.response_set = ResponseSetFactory()
@@ -17,19 +19,33 @@ def test_has_a_valid_factory(self):
 
 
     def test_has_response_set_as_foreign_key(self):
-        response_set = ResponseSetFactory()
         response = DateOfBirthResponse.objects.create(
-            response_set=response_set,
+            response_set=self.response_set,
             value=date(2000, 9, 8)
         )
 
-        self.assertEqual(response.response_set, response_set)
+        self.assertEqual(response.response_set, self.response_set)
 
     def test_has_value_as_date(self):
-        response_set = ResponseSetFactory()
         response = DateOfBirthResponse.objects.create(
-            response_set=response_set,
+            response_set=self.response_set,
             value=date(2000, 9, 8)
         )
 
         self.assertIsInstance(response.value, date)
+
+    def test_is_currently_in_age_range_returns_true_when_in_range(self):
+        fifty_five_years_ago = date.today() - relativedelta(years=55)
+        response = DateOfBirthResponseFactory.build(
+            value=fifty_five_years_ago
+        )
+
+        self.assertTrue(response.is_currently_in_age_range())
+
+    def test_is_currently_in_age_range_returns_false_when_too_old(self):
+        fifty_five_years_ago = date.today() - relativedelta(years=55)
+        response = DateOfBirthResponseFactory.build(
+            value=fifty_five_years_ago
+        )
+
+        self.assertTrue(response.is_currently_in_age_range())

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

@@ -1,4 +1,4 @@
-from django.test import TestCase
+from django.test import TestCase, tag
 from django.urls import reverse
 from datetime import date
 from dateutil.relativedelta import relativedelta
@@ -8,6 +8,7 @@
 from lung_cancer_screening.questions.models.date_of_birth_response import DateOfBirthResponse
 
 
+@tag("DateOfBirth")
 class TestGetDateOfBirth(TestCase):
     def setUp(self):
         self.user = login_user(self.client)
@@ -44,6 +45,7 @@ def test_get_responds_successfully(self):
         self.assertEqual(response.status_code, 200)
 
 
+@tag("DateOfBirth")
 class TestPostDateOfBirth(TestCase):
     def setUp(self):
         self.user = login_user(self.client)
@@ -179,17 +181,6 @@ def test_post_responds_with_422_if_the_resource_is_invalid(self):
 
         self.assertEqual(response.status_code, 422)
 
-    def test_post_does_not_set_date_of_birth_if_user_not_in_correct_age_range(
-        self
-    ):
-        self.client.post(
-            reverse("questions:date_of_birth"),
-            self.invalid_params
-        )
-
-        response_set = self.user.responseset_set.first()
-        if response_set:
-            self.assertFalse(DateOfBirthResponse.objects.filter(response_set=response_set).exists())
 
     def test_post_redirects_if_user_not_in_correct_age_range(self):
         response = self.client.post(

lung_cancer_screening/questions/views/date_of_birth.py

@@ -1,66 +1,19 @@
-from django.shortcuts import render, redirect
-from django.urls import reverse
-from datetime import date
-from dateutil.relativedelta import relativedelta
+from django.urls import reverse, reverse_lazy
 
 from .question_base_view import QuestionBaseView
 from ..forms.date_of_birth_form import DateOfBirthForm
 from ..models.date_of_birth_response import DateOfBirthResponse
 
 
 class DateOfBirthView(QuestionBaseView):
-    def get(self, request):
-        response, _ = DateOfBirthResponse.objects.get_or_build(
-            response_set=request.response_set
-        )
-        return render_template(
-            request,
-            DateOfBirthForm(instance=response)
-        )
-
-    def post(self, request):
-        response, _ = DateOfBirthResponse.objects.get_or_build(
-            response_set=request.response_set
-        )
-        form = DateOfBirthForm(
-            instance=response,
-            data=request.POST
-        )
-
-        if form.is_valid():
-            fifty_five_years_ago = date.today() - relativedelta(years=55)
-            seventy_five_years_ago = date.today() - relativedelta(years=75)
-            date_of_birth = form.cleaned_data["value"]
-
-            age_in_range = (
-                seventy_five_years_ago < date_of_birth <= fifty_five_years_ago
-            )
-            if age_in_range:
-                response.value = date_of_birth
-                response.save()
-
-                return self.redirect_to_response_or_next_question(
-                    request,
-                    "questions:check_need_appointment"
-                )
-            else:
-                return redirect(reverse("questions:age_range_exit"))
-
+    template_name = "question_form.jinja"
+    form_class = DateOfBirthForm
+    model = DateOfBirthResponse
+    success_url = reverse_lazy("questions:check_need_appointment")
+    back_link_url = reverse_lazy("questions:have_you_ever_smoked")
+
+    def get_success_url(self):
+        if self.object.is_currently_in_age_range():
+            return super().get_success_url()
         else:
-            return render_template(
-                request,
-                form,
-                status=422
-            )
-
-
-def render_template(request, form, status=200):
-    return render(
-        request,
-        "question_form.jinja",
-        {
-            "form": form,
-            "back_link_url": reverse("questions:have_you_ever_smoked")
-        },
-        status=status
-    )
+            return reverse("questions:age_range_exit")