Make HaveYouEverSmoked use simpler view pattern

Author: Themitchell

features/have_you_ever_smoked_page.feature

@@ -1,3 +1,4 @@
+@HaveYouEverSmoked
 Feature: Have you ever smoked page
   Scenario: The page is accessible
     Given I am logged in
@@ -36,6 +37,7 @@ Feature: Have you ever smoked page
     And I see "/have-you-ever-smoked?change=True" as a link to change "Have you ever smoked tobacco?" under "Eligibility"
     When I click the link to change "Have you ever smoked tobacco?" under "Eligibility"
     Then I am on "/have-you-ever-smoked?change=True"
+    And I see "Yes, I used to smoke" selected
     When I fill in and submit my smoking status with "Yes, I currently smoke"
     Then I am on "/check-your-answers"
     And I see "Yes, I currently smoke" as a response to "Have you ever smoked tobacco?" under "Eligibility"

lung_cancer_screening/questions/models/have_you_ever_smoked_response.py

@@ -14,3 +14,9 @@ class HaveYouEverSmokedValues(models.IntegerChoices):
 class HaveYouEverSmokedResponse(BaseModel):
     response_set = models.OneToOneField(ResponseSet, on_delete=models.CASCADE, related_name='have_you_ever_smoked_response')
     value = models.IntegerField(choices=HaveYouEverSmokedValues.choices)
+
+    def has_smoked_regularly(self):
+        return self.value in [
+            HaveYouEverSmokedValues.YES_I_USED_TO_SMOKE_REGULARLY.value,
+            HaveYouEverSmokedValues.YES_I_CURRENTLY_SMOKE.value
+        ]

lung_cancer_screening/questions/tests/unit/forms/test_have_you_ever_smoked_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.have_you_ever_smoked_response import HaveYouEverSmokedResponse, HaveYouEverSmokedValues
 from ....forms.have_you_ever_smoked_form import HaveYouEverSmokedForm
 
 
+@tag("HaveYouEverSmoked")
 class TestHaveYouEverSmokedForm(TestCase):
     def setUp(self):
         self.response_set = ResponseSetFactory()

lung_cancer_screening/questions/tests/unit/models/test_have_you_ever_smoked_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.have_you_ever_smoked_response_factory import HaveYouEverSmokedResponseFactory
 
 from ....models.have_you_ever_smoked_response import HaveYouEverSmokedResponse, HaveYouEverSmokedValues
 
 
+@tag("HaveYouEverSmoked")
 class TestHaveYouEverSmokedResponse(TestCase):
     def setUp(self):
         self.response_set = ResponseSetFactory()
@@ -16,22 +17,52 @@ def test_has_a_valid_factory(self):
 
 
     def test_has_response_set_as_foreign_key(self):
-        response_set = ResponseSetFactory()
         response = HaveYouEverSmokedResponse.objects.create(
-            response_set=response_set,
+            response_set=self.response_set,
             value=HaveYouEverSmokedValues.YES_I_CURRENTLY_SMOKE
         )
 
-        self.assertEqual(response.response_set, response_set)
+        self.assertEqual(response.response_set, self.response_set)
 
     def test_has_value_as_enum(self):
-        response_set = ResponseSetFactory()
         response = HaveYouEverSmokedResponse.objects.create(
-            response_set=response_set,
+            response_set=self.response_set,
             value=HaveYouEverSmokedValues.YES_I_USED_TO_SMOKE_REGULARLY
         )
 
         self.assertEqual(
             response.get_value_display(),
             HaveYouEverSmokedValues.YES_I_USED_TO_SMOKE_REGULARLY.label
         )
+
+    def test_has_smoked_regularly_returns_truewhen_they_currently_smoke(self):
+        response = HaveYouEverSmokedResponse.objects.create(
+            response_set=self.response_set,
+            value=HaveYouEverSmokedValues.YES_I_CURRENTLY_SMOKE
+        )
+
+        self.assertTrue(response.has_smoked_regularly())
+
+    def test_has_smoked_regularly_returns_true_when_they_used_to_smoke_regularly(self):
+        response = HaveYouEverSmokedResponse.objects.create(
+            response_set=self.response_set,
+            value=HaveYouEverSmokedValues.YES_I_USED_TO_SMOKE_REGULARLY
+        )
+
+        self.assertTrue(response.has_smoked_regularly())
+
+    def test_has_smoked_regularly_returns_false_when_they_have_smoked_a_few_times(self):
+        response = HaveYouEverSmokedResponse.objects.create(
+            response_set=self.response_set,
+            value=HaveYouEverSmokedValues.YES_BUT_ONLY_A_FEW_TIMES
+        )
+
+        self.assertFalse(response.has_smoked_regularly())
+
+    def test_has_smoked_regularly_returns_false_when_they_have_never_smoked(self):
+        response = HaveYouEverSmokedResponse.objects.create(
+            response_set=self.response_set,
+            value=HaveYouEverSmokedValues.NO_I_HAVE_NEVER_SMOKED
+        )
+
+        self.assertFalse(response.has_smoked_regularly())

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

@@ -1,11 +1,13 @@
 from dateutil.relativedelta import relativedelta
-from django.test import TestCase
+from django.test import TestCase, tag
 from django.urls import reverse
 from django.utils import timezone
 
 from .helpers.authentication import login_user
 from lung_cancer_screening.questions.models.have_you_ever_smoked_response import HaveYouEverSmokedResponse, HaveYouEverSmokedValues
 
+
+@tag("HaveYouEverSmoked")
 class TestGetHaveYouEverSmoked(TestCase):
     def setUp(self):
         self.user = login_user(self.client)
@@ -39,6 +41,7 @@ def test_get_responds_successfully(self):
         self.assertEqual(response.status_code, 200)
 
 
+@tag("HaveYouEverSmoked")
 class TestPostHaveYouEverSmoked(TestCase):
     def setUp(self):
         self.user = login_user(self.client)
@@ -144,15 +147,6 @@ def test_post_responds_with_422_if_the_date_response_fails_to_create(self):
 
         self.assertEqual(response.status_code, 422)
 
-    def test_post_does_not_update_the_response_set_if_the_user_is_not_a_smoker(self):
-        self.client.post(
-            reverse("questions:have_you_ever_smoked"),
-            { "value": HaveYouEverSmokedValues.NO_I_HAVE_NEVER_SMOKED.value }
-        )
-
-        response_set = self.user.responseset_set.first()
-        if response_set:
-            self.assertFalse(HaveYouEverSmokedResponse.objects.filter(response_set=response_set).exists())
 
     def test_post_redirects_if_the_user_not_a_smoker(self):
         response = self.client.post(

lung_cancer_screening/questions/views/have_you_ever_smoked.py

@@ -1,60 +1,21 @@
-from django.shortcuts import render, redirect
-from django.urls import reverse
+from django.urls import reverse, reverse_lazy
 
 from .question_base_view import QuestionBaseView
 from ..forms.have_you_ever_smoked_form import HaveYouEverSmokedForm
-from ..models.have_you_ever_smoked_response import HaveYouEverSmokedResponse, HaveYouEverSmokedValues
+from ..models.have_you_ever_smoked_response import (
+    HaveYouEverSmokedResponse
+)
 
-class HaveYouEverSmokedView(QuestionBaseView):
-    def get(self, request):
-        response, _ = HaveYouEverSmokedResponse.objects.get_or_build(
-            response_set=request.response_set
-        )
-        return render_template(
-            request,
-            HaveYouEverSmokedForm(
-                instance=response
-            )
-        )
-
-    def post(self, request):
-        response, _ = HaveYouEverSmokedResponse.objects.get_or_build(
-            response_set=request.response_set
-        )
-        form = HaveYouEverSmokedForm(
-            data=request.POST, instance=response
-        )
-
-        if form.is_valid():
-            has_smoked_values = (HaveYouEverSmokedValues.YES_I_USED_TO_SMOKE_REGULARLY.value, HaveYouEverSmokedValues.YES_I_CURRENTLY_SMOKE.value)
-            have_you_ever_smoked = form.cleaned_data["value"]
-
-            if have_you_ever_smoked in has_smoked_values:
-                response.value = have_you_ever_smoked
-                response.save()
-
-                return self.redirect_to_response_or_next_question(
-                    request,
-                    "questions:date_of_birth"
-                )
-            else:
-                return redirect(reverse("questions:non_smoker_exit"))
 
+class HaveYouEverSmokedView(QuestionBaseView):
+    template_name = "have_you_ever_smoked.jinja"
+    form_class = HaveYouEverSmokedForm
+    model = HaveYouEverSmokedResponse
+    success_url = reverse_lazy("questions:date_of_birth")
+    back_link_url = reverse_lazy("questions:start")
+
+    def get_success_url(self):
+        if self.object.has_smoked_regularly():
+            return super().get_success_url()
         else:
-            return render_template(
-                request,
-                form,
-                status=422
-            )
-
-
-def render_template(request, form, status=200):
-    return render(
-        request,
-        "have_you_ever_smoked.jinja",
-        {
-            "form": form,
-            "back_link_url": reverse("questions:start")
-        },
-        status=status
-    )
+            return reverse("questions:non_smoker_exit")