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

SPIKE: use django forms more succinctly

Author: Themitchell

features/asbestos_exposure.feature

@@ -1,3 +1,4 @@
+@AsbestosExposure
 Feature: Asbestos exposure page
   Scenario: The page is accessible
     Given I am logged in
@@ -28,6 +29,7 @@ Feature: Asbestos exposure page
     And I see "/asbestos-exposure?change=True" as a link to change "Have you ever worked in a job where you were exposed to asbestos?" under "Your health"
     When I click the link to change "Have you ever worked in a job where you were exposed to asbestos?" under "Your health"
     Then I am on "/asbestos-exposure?change=True"
+    And I see "No" selected
     When I fill in and submit my asbestos exposure with "Yes"
     Then I am on "/check-your-answers"
     And I see "Yes" as a response to "Have you ever worked in a job where you were exposed to asbestos?" under "Your health"

features/steps/form_steps.py

@@ -108,3 +108,7 @@ def when_i_fill_in_and_submit_my_cancer_diagnosis(context, relatives_age_when_di
 @when('I submit the form')
 def when_i_submit_the_form(context):
     when_i_click(context, "Continue")
+
+@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()

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

@@ -1,10 +1,11 @@
-from django.test import TestCase
+from django.test import TestCase, tag
 
 from ...factories.response_set_factory import ResponseSetFactory
 from ....models.asbestos_exposure_response import AsbestosExposureResponse
 from ....forms.asbestos_exposure_form import AsbestosExposureForm
 
 
+@tag("AsbestosExposure")
 class TestAsbestosExposureForm(TestCase):
     def setUp(self):
         self.response_set = ResponseSetFactory()

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

@@ -1,11 +1,12 @@
-from django.test import TestCase
+from django.test import TestCase, tag
 
 from ...factories.response_set_factory import ResponseSetFactory
 from ...factories.asbestos_exposure_response_factory import AsbestosExposureResponseFactory
 
 from ....models.asbestos_exposure_response import AsbestosExposureResponse
 
 
+@tag("AsbestosExposure")
 class TestAsbestosExposureResponse(TestCase):
     def setUp(self):
         self.response_set = ResponseSetFactory()

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

@@ -1,4 +1,4 @@
-from django.test import TestCase
+from django.test import TestCase, tag
 from django.urls import reverse
 from dateutil.relativedelta import relativedelta
 from django.utils import timezone
@@ -7,6 +7,7 @@
 from lung_cancer_screening.questions.models.asbestos_exposure_response import AsbestosExposureResponse
 
 
+@tag("AsbestosExposure")
 class TestGetAsbestosExposure(TestCase):
     def setUp(self):
         self.user = login_user(self.client)
@@ -46,6 +47,7 @@ def test_get_contains_the_correct_form_fields(self):
         self.assertContains(response, "Have you ever worked in a job where you might have been exposed to asbestos?")
 
 
+@tag("AsbestosExposure")
 class TestPostAsbestosExposure(TestCase):
     def setUp(self):
         self.user = login_user(self.client)

lung_cancer_screening/questions/views/asbestos_exposure.py

@@ -1,46 +1,12 @@
-from django.shortcuts import render
-from django.urls import reverse
+from django.urls import reverse_lazy
 
 from .question_base_view import QuestionBaseView
 from ..forms.asbestos_exposure_form import AsbestosExposureForm
 from ..models.asbestos_exposure_response import AsbestosExposureResponse
 
 class AsbestosExposureView(QuestionBaseView):
-    def get(self, request):
-        response, _ = AsbestosExposureResponse.objects.get_or_build(
-            response_set=request.response_set
-        )
-        return render_template(
-            request,
-            AsbestosExposureForm(instance=response)
-        )
-
-    def post(self, request):
-        response, _ = AsbestosExposureResponse.objects.get_or_build(
-            response_set=request.response_set
-        )
-        form = AsbestosExposureForm(
-            instance=response,
-            data=request.POST
-        )
-
-        if form.is_valid():
-            response.value = form.cleaned_data["value"]
-            response.save()
-            return self.redirect_to_response_or_next_question(
-                request,
-                "questions:cancer_diagnosis"
-            )
-        else:
-            return render_template(request, form, 422)
-
-def render_template(request, form, status=200):
-    return render(
-        request,
-        "asbestos_exposure.jinja",
-        {
-            "form": form,
-            "back_link_url": reverse("questions:respiratory_conditions")
-        },
-        status=status
-    )
+    template_name = "asbestos_exposure.jinja"
+    form_class = AsbestosExposureForm
+    model = AsbestosExposureResponse
+    success_url = reverse_lazy("questions:cancer_diagnosis")
+    back_link_url = reverse_lazy("questions:respiratory_conditions")

lung_cancer_screening/questions/views/question_base_view.py

@@ -1,12 +1,12 @@
 from django.shortcuts import redirect
 from django.urls import reverse
 from django.contrib.auth.mixins import LoginRequiredMixin
-from django.views import View
+from django.views.generic.edit import UpdateView
 
 from .mixins.ensure_response_set import EnsureResponseSet
 
 
-class QuestionBaseView(LoginRequiredMixin, EnsureResponseSet, View):
+class QuestionBaseView(LoginRequiredMixin, EnsureResponseSet, UpdateView):
 
     def should_redirect_to_responses(self, request):
         return bool(request.POST.get("change"))
@@ -16,3 +16,25 @@ def redirect_to_response_or_next_question(self, request, next_question_url, quer
             return redirect(reverse("questions:responses", query=query))
         else:
             return redirect(reverse(next_question_url))
+
+    def get_context_data(self, **kwargs):
+        context = super().get_context_data(**kwargs)
+        context["back_link_url"] = self.back_link_url
+        return context
+
+    def get_success_url(self):
+        if self.should_redirect_to_responses(self.request):
+            return reverse("questions:responses")
+        else:
+            return super().get_success_url()
+
+    def get_object(self):
+        return self.model.objects.get_or_build(
+            response_set=self.request.response_set
+        )[0]
+
+    def form_invalid(self, form):
+        return self.render_to_response(
+            self.get_context_data(form=form),
+            status=422
+        )