Validate response set cannot be submitted without being complete

Author: Themitchell

features/questionnaire.feature

@@ -1,7 +1,7 @@
 Feature: Questionnaire
   Scenario: Cannot change responses once submitted
     Given I am logged in
-    And I have already submitted my responses
+    And I have recently submitted my responses
     When I go to "/start"
     And I click "Start now"
     Then I am on "/confirmation"

features/steps/participant_steps.py

@@ -1,11 +1,14 @@
 from behave import given
 from django.utils import timezone
 
+from lung_cancer_screening.questions.tests.factories.response_set_factory import ResponseSetFactory
 
-@given('I have already submitted my responses')
+
+@given('I have recently submitted my responses')
 def given_i_have_already_submitted_my_responses(context):
-    context.current_user.responseset_set.create(
-        submitted_at=timezone.now()
+    ResponseSetFactory.create(
+        user=context.current_user,
+        recently_submitted=True
     )
 
 @given('I have started the questionnaire')

lung_cancer_screening/questions/models/response_set.py

@@ -42,6 +42,7 @@ class Meta:
     def clean(self):
         super().clean()
         self._validate_any_submitted_response_set_recently()
+        self._validate_complete_on_submission()
 
 
     def has_user_submitted_response_set_recently(self):
@@ -55,6 +56,13 @@ def _validate_any_submitted_response_set_recently(self):
             )
 
 
+    def _validate_complete_on_submission(self):
+        if self.submitted_at and not self.is_complete():
+            raise ValidationError(
+                "Response set must be complete before it can be submitted"
+            )
+
+
     def _response_attrs(self):
         response_attrs = [
             'asbestos_exposure_response',

lung_cancer_screening/questions/tests/factories/response_set_factory.py

@@ -1,9 +1,23 @@
 import factory
+from datetime import timedelta
+from django.utils import timezone
 
 from .user_factory import UserFactory
 from ...models.response_set import ResponseSet
 
 
+def set_submitted_at_recently(response_set, create, extracted):
+    response_set.submitted_at = timezone.now() - timedelta(
+        days=ResponseSet.RECENTLY_SUBMITTED_PERIOD_DAYS - 1
+    )
+
+
+def set_submitted_at_not_recently(response_set, create, extracted):
+    response_set.submitted_at = timezone.now() - timedelta(
+        days=ResponseSet.RECENTLY_SUBMITTED_PERIOD_DAYS + 1
+    )
+
+
 class ResponseSetFactory(factory.django.DjangoModelFactory):
     class Meta:
         model = ResponseSet
@@ -69,3 +83,13 @@ class Params:
                 factory_related_name="response_set"
             ),
         )
+
+        not_recently_submitted = factory.Trait(
+            complete=True,
+            submitted_at=factory.PostGeneration(set_submitted_at_not_recently)
+        )
+
+        recently_submitted = factory.Trait(
+            complete=True,
+            submitted_at=factory.PostGeneration(set_submitted_at_recently)
+        )

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

@@ -1,6 +1,5 @@
 from django.test import TestCase, tag
 from datetime import datetime
-from dateutil.relativedelta import relativedelta
 from django.utils import timezone
 
 from django.core.exceptions import ValidationError
@@ -70,25 +69,34 @@ def test_is_invalid_if_another_unsubmitted_response_set_exists(self):
         )
 
     def test_is_invalid_if_another_response_set_was_submitted_within_the_recently_submitted_period(self):
-        user = UserFactory()
-        user.responseset_set.create(
-            submitted_at=timezone.now() - relativedelta(days=ResponseSet.RECENTLY_SUBMITTED_PERIOD_DAYS - 1)
-        )
+        response_set = ResponseSetFactory.create(recently_submitted=True)
 
         with self.assertRaises(ValidationError) as context:
-            user.responseset_set.create()
+            response_set.user.responseset_set.create()
 
         self.assertEqual(
             context.exception.messages[0],
             "Responses have already been submitted for this user"
         )
 
 
-    def test_submitted_response_set_is_valid_on_update(self):
+    def test_Saving_a_submitted_response_Set_does_not_included_itself_in_unsubmitted_response_sets_validation(self):
+        response_set = ResponseSetFactory.create(complete=True)
+        response_set.submitted_at = timezone.now()
+
+        response_set.full_clean()
+
+
+    def test_submitted_response_set_is_invalid_if_incomplete(self):
         self.response_set.submitted_at = timezone.now()
-        self.response_set.save()
 
-        self.response_set.full_clean()
+        with self.assertRaises(ValidationError) as context:
+            self.response_set.full_clean()
+
+        self.assertEqual(
+            context.exception.messages[0],
+            "Response set must be complete before it can be submitted"
+        )
 
 
     # Query managers
@@ -110,7 +118,7 @@ def test_objects_returns_all_response_sets(self):
 
     def test_unsubmitted_returns_only_unsubmitted_response_sets(self):
         unsubmitted_response_set = ResponseSetFactory()
-        submitted_response_set = ResponseSetFactory(submitted_at=timezone.now())
+        submitted_response_set = ResponseSetFactory(recently_submitted=True)
 
         unsubmitted_response_sets = ResponseSet.objects.unsubmitted().all()
         self.assertIn(
@@ -124,7 +132,7 @@ def test_unsubmitted_returns_only_unsubmitted_response_sets(self):
 
     def test_submitted_returns_only_submitted_response_sets(self):
         unsubmitted_response_set = ResponseSetFactory()
-        submitted_response_set = ResponseSetFactory(submitted_at=timezone.now() - relativedelta(years=1))
+        submitted_response_set = ResponseSetFactory(not_recently_submitted=True)
 
         submitted_response_sets = ResponseSet.objects.submitted().all()
         self.assertIn(
@@ -138,14 +146,10 @@ def test_submitted_returns_only_submitted_response_sets(self):
 
     def test_submitted_recently_returns_only_submitted_response_sets_in_the_recently_submitted_period(self):
         recently_submitted_response = ResponseSetFactory(
-            submitted_at=timezone.now() - relativedelta(
-                days=ResponseSet.RECENTLY_SUBMITTED_PERIOD_DAYS - 1
-            )
+            recently_submitted=True
         )
         old_submitted_response = ResponseSetFactory(
-            submitted_at=timezone.now() - relativedelta(
-                days=ResponseSet.RECENTLY_SUBMITTED_PERIOD_DAYS + 1
-            )
+            not_recently_submitted=True
         )
 
         recently_submitted_response_sets = ResponseSet.objects.recently_submitted().all()

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

@@ -1,10 +1,8 @@
 from datetime import datetime
 from django.test import TestCase, tag
 from django.core.exceptions import ValidationError
-from django.utils import timezone
-from datetime import timedelta
 
-from lung_cancer_screening.questions.models.response_set import ResponseSet
+from ...factories.response_set_factory import ResponseSetFactory
 from ...factories.user_factory import UserFactory
 
 
@@ -82,14 +80,16 @@ def test_raises_a_validation_error_if_nhs_number_is_duplicate(self):
 
 
     def test_has_recently_submitted_responses_returns_true_if_has_recently_submitted_response_set(self):
-        self.user.responseset_set.create(
-            submitted_at=timezone.now() - timedelta(days=ResponseSet.RECENTLY_SUBMITTED_PERIOD_DAYS - 1)
+        ResponseSetFactory.create(
+            user=self.user,
+            recently_submitted=True
         )
         self.assertTrue(self.user.has_recently_submitted_responses())
 
 
     def test_has_recently_submitted_responses_returns_false_if_has_no_recently_submitted_response_set(self):
-        self.user.responseset_set.create(
-            submitted_at=timezone.now() - timedelta(days=ResponseSet.RECENTLY_SUBMITTED_PERIOD_DAYS)
+        ResponseSetFactory.create(
+            user=self.user,
+            not_recently_submitted=True
         )
         self.assertFalse(self.user.has_recently_submitted_responses())

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

@@ -1,10 +1,8 @@
 from django.test import TestCase
 from django.urls import reverse
-from dateutil.relativedelta import relativedelta
-from django.utils import timezone
 
 from .helpers.authentication import login_user
-
+from ...factories.response_set_factory import ResponseSetFactory
 
 class TestGetAgeRangeExit(TestCase):
     def setUp(self):
@@ -26,8 +24,9 @@ def test_get_redirects_if_the_user_is_not_logged_in(self):
     def test_get_redirects_when_submitted_response_set_exists_within_last_year(  # noqa: E501
         self
     ):
-        self.user.responseset_set.create(
-            submitted_at=timezone.now() - relativedelta(days=364)
+        ResponseSetFactory.create(
+            user=self.user,
+            recently_submitted=True
         )
 
         response = self.client.get(

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

@@ -1,10 +1,9 @@
 from django.test import TestCase, tag
 from django.urls import reverse
-from dateutil.relativedelta import relativedelta
-from django.utils import timezone
 
 from .helpers.authentication import login_user
 from lung_cancer_screening.questions.models.asbestos_exposure_response import AsbestosExposureResponse
+from ...factories.response_set_factory import ResponseSetFactory
 
 
 @tag("AsbestosExposure")
@@ -24,8 +23,9 @@ def test_get_redirects_if_the_user_is_not_logged_in(self):
 
 
     def test_get_redirects_when_an_submitted_response_set_exists_within_the_last_year(self):
-        self.user.responseset_set.create(
-            submitted_at=timezone.now() - relativedelta(days=364)
+        ResponseSetFactory.create(
+            user=self.user,
+            recently_submitted=True
         )
 
         response = self.client.get(
@@ -94,9 +94,10 @@ def test_post_updates_an_unsubmitted_response_set_for_the_user_when_an_unsubmitt
         self.assertEqual(response_set.user, self.user)
 
 
-    def test_post_creates_an_new_unsubmitted_response_set_for_the_user_when_an_submitted_response_set_exists_over_a_year_ago(self):
-        self.user.responseset_set.create(
-            submitted_at=timezone.now() - relativedelta(years=1)
+    def test_post_creates_an_new_unsubmitted_response_set_for_the_user_when_a_non_recently_submitted_response_set_exists(self):
+        ResponseSetFactory.create(
+            user=self.user,
+            not_recently_submitted=True
         )
 
         self.client.post(
@@ -114,8 +115,9 @@ def test_post_creates_an_new_unsubmitted_response_set_for_the_user_when_an_submi
 
 
     def test_post_redirects_when_an_submitted_response_set_exists_within_the_last_year(self):
-        self.user.responseset_set.create(
-            submitted_at=timezone.now() - relativedelta(days=364)
+        ResponseSetFactory.create(
+            user=self.user,
+            recently_submitted=True
         )
 
         response = self.client.post(

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

@@ -1,10 +1,8 @@
 from django.test import TestCase, tag
 from django.urls import reverse
-from dateutil.relativedelta import relativedelta
-from django.utils import timezone
 
 from .helpers.authentication import login_user
-
+from ...factories.response_set_factory import ResponseSetFactory
 
 @tag("CancerDiagnosis")
 class TestGetCancerDiagnosis(TestCase):
@@ -27,8 +25,9 @@ def test_get_redirects_if_the_user_is_not_logged_in(self):
     def test_get_redirects_when_submitted_response_set_exists_within_last_year(
         self
     ):
-        self.user.responseset_set.create(
-            submitted_at=timezone.now() - relativedelta(days=364)
+        ResponseSetFactory.create(
+            user=self.user,
+            recently_submitted=True
         )
 
         response = self.client.get(
@@ -88,11 +87,12 @@ def test_post_updates_unsubmitted_response_set_when_one_exists(self):
         self.assertEqual(response_set.submitted_at, None)
         self.assertEqual(response_set.user, self.user)
 
-    def test_post_creates_new_unsubmitted_response_set_when_submitted_exists_over_year_ago(
+    def test_post_creates_new_unsubmitted_response_set_when_not_recently_submitted_exists(
         self
     ):
-        self.user.responseset_set.create(
-            submitted_at=timezone.now() - relativedelta(years=1)
+        ResponseSetFactory.create(
+            user=self.user,
+            not_recently_submitted=True
         )
 
         self.client.post(
@@ -109,8 +109,9 @@ def test_post_creates_new_unsubmitted_response_set_when_submitted_exists_over_ye
     def test_post_redirects_when_submitted_response_set_exists_within_last_year(
         self
     ):
-        self.user.responseset_set.create(
-            submitted_at=timezone.now() - relativedelta(days=364)
+        ResponseSetFactory.create(
+            user=self.user,
+            recently_submitted=True
         )
 
         response = self.client.post(

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

@@ -1,10 +1,9 @@
 from django.test import TestCase, tag
 from django.urls import reverse
-from dateutil.relativedelta import relativedelta
-from django.utils import timezone
 
 from .helpers.authentication import login_user
 from lung_cancer_screening.questions.models.check_need_appointment_response import CheckNeedAppointmentResponse
+from ...factories.response_set_factory import ResponseSetFactory
 
 @tag("CheckNeedAppointment")
 class TestGetCheckNeedAppointment(TestCase):
@@ -23,8 +22,9 @@ def test_get_redirects_if_the_user_is_not_logged_in(self):
 
 
     def test_get_redirects_when_an_submitted_response_set_exists_within_the_last_year(self):
-        self.user.responseset_set.create(
-            submitted_at=timezone.now() - relativedelta(days=364)
+        ResponseSetFactory.create(
+            user=self.user,
+            recently_submitted=True
         )
 
         response = self.client.get(
@@ -92,9 +92,10 @@ def test_post_updates_an_unsubmitted_response_set_for_the_user_when_an_unsubmitt
         self.assertEqual(response_set.user, self.user)
 
 
-    def test_post_creates_an_new_unsubmitted_response_set_for_the_user_when_an_submitted_response_set_exists_over_a_year_ago(self):
-        self.user.responseset_set.create(
-            submitted_at=timezone.now() - relativedelta(years=1)
+    def test_post_creates_an_new_unsubmitted_response_set_for_the_user_when_a_non_recently_submitted_response_set_exists(self):
+        ResponseSetFactory.create(
+            user=self.user,
+            not_recently_submitted=True
         )
 
         self.client.post(
@@ -112,8 +113,9 @@ def test_post_creates_an_new_unsubmitted_response_set_for_the_user_when_an_submi
 
 
     def test_post_redirects_when_an_submitted_response_set_exists_within_the_last_year(self):
-        self.user.responseset_set.create(
-            submitted_at=timezone.now() - relativedelta(days=364)
+        ResponseSetFactory.create(
+            user=self.user,
+            recently_submitted=True
         )
 
         response = self.client.post(