Merge pull request #337 from NHSDigital/PPHA-589-ensure-smoking-history-blocks-submission

PPHA-589: Ensure smoking responses must be complete before submitting

Author: Themitchell

features/questionnaire.feature

@@ -71,7 +71,6 @@ Feature: Questionnaire
 
     Then I am on "/types-tobacco-smoking"
     When I check "Cigarettes"
-    And I check "Pipe"
     And I submit the form
 
     Then I am on "/cigarettes-smoking-current"
@@ -89,17 +88,7 @@ Feature: Questionnaire
     And I submit the form
 
     Then I am on "/cigarettes-smoking-change"
-    When I check "Yes, I used to smoke more than 15 cigarettes a day" and submit
-
-    Then I am on "/cigarettes-smoking-increased-frequency"
-    When I check "Weekly" and submit
-
-    Then I am on "/cigarettes-smoked-increased-amount"
-    When I fill in "When you smoked more than 15 cigarettes a day, roughly how many cigarettes did you normally smoke a week?" with "20"
-    And I submit the form
-
-    Then I am on "/cigarettes-smoked-increased-years"
-    When I go to "/check-your-answers"
+    When I check "No, it has not changed" and submit
 
     Then I am on "/check-your-answers"
     And I see "Yes, I used to smoke" as a response to "Have you ever smoked tobacco?" under "Eligibility"

lung_cancer_screening/questions/models/response_set.py

@@ -65,6 +65,7 @@ def _validate_complete_on_submission(self):
 
     def _response_attrs(self):
         response_attrs = [
+            'age_when_started_smoking_response',
             'asbestos_exposure_response',
             'cancer_diagnosis_response',
             'check_need_appointment_response',
@@ -87,8 +88,22 @@ def _response_attrs(self):
         return response_attrs
 
 
+    def has_complete_smoking_history(self):
+        if not self.tobacco_smoking_history.exists():
+            return False
+
+        return all(
+            tobacco_smoking_history.is_complete()
+            for tobacco_smoking_history
+            in self.tobacco_smoking_history.all()
+        )
+
+
     def is_complete(self):
-        return all(hasattr(self, attr) for attr in self._response_attrs())
+        return all([
+            all(hasattr(self, attr) for attr in self._response_attrs()),
+            self.has_complete_smoking_history()
+        ])
 
 
     def is_eligible(self):

lung_cancer_screening/questions/models/tobacco_smoking_history.py

@@ -168,6 +168,9 @@ def is_decreased(self):
     def is_normal(self):
         return self.level == self.Levels.NORMAL
 
+    def is_no_change(self):
+        return self.level == self.Levels.NO_CHANGE
+
     def is_current(self):
         if hasattr(self, "smoking_current_response"):
             return self.smoking_current_response.value
@@ -186,3 +189,19 @@ def is_rolling_tobacco(self):
     def url_type(self):
         return slugify(self.get_type_display())
 
+    def required_responses(self):
+        if self.is_no_change():
+            return []
+
+        return filter(
+            None,
+            [
+                "smoking_current_response" if self.is_normal() else None,
+                "smoked_total_years_response",
+                "smoking_frequency_response",
+                "smoked_amount_response",
+            ],
+        )
+
+    def is_complete(self):
+        return all(hasattr(self, response) for response in self.required_responses())

lung_cancer_screening/questions/tests/factories/response_set_factory.py

@@ -43,59 +43,69 @@ class Params:
             ),
         )
 
-        complete = factory.Trait(
+        complete_without_smoking = factory.Trait(
             eligible=True,
             asbestos_exposure_response=factory.RelatedFactory(
                 "lung_cancer_screening.questions.tests.factories.asbestos_exposure_response_factory.AsbestosExposureResponseFactory",
-                factory_related_name="response_set"
+                factory_related_name="response_set",
             ),
             cancer_diagnosis_response=factory.RelatedFactory(
                 "lung_cancer_screening.questions.tests.factories.cancer_diagnosis_response_factory.CancerDiagnosisResponseFactory",
-                factory_related_name="response_set"
+                factory_related_name="response_set",
             ),
             education_response=factory.RelatedFactory(
                 "lung_cancer_screening.questions.tests.factories.education_response_factory.EducationResponseFactory",
-                factory_related_name="response_set"
+                factory_related_name="response_set",
             ),
             ethnicity_response=factory.RelatedFactory(
                 "lung_cancer_screening.questions.tests.factories.ethnicity_response_factory.EthnicityResponseFactory",
-                factory_related_name="response_set"
+                factory_related_name="response_set",
             ),
             family_history_lung_cancer_response=factory.RelatedFactory(
                 "lung_cancer_screening.questions.tests.factories.family_history_lung_cancer_response_factory.FamilyHistoryLungCancerResponseFactory",
-                factory_related_name="response_set"
+                factory_related_name="response_set",
             ),
             gender_response=factory.RelatedFactory(
                 "lung_cancer_screening.questions.tests.factories.gender_response_factory.GenderResponseFactory",
-                factory_related_name="response_set"
+                factory_related_name="response_set",
             ),
             height_response=factory.RelatedFactory(
                 "lung_cancer_screening.questions.tests.factories.height_response_factory.HeightResponseFactory",
-                factory_related_name="response_set"
+                factory_related_name="response_set",
             ),
             age_when_started_smoking_response=factory.RelatedFactory(
                 "lung_cancer_screening.questions.tests.factories.age_when_started_smoking_response_factory.AgeWhenStartedSmokingResponseFactory",
-                factory_related_name="response_set"
+                factory_related_name="response_set",
             ),
             periods_when_you_stopped_smoking_response=factory.RelatedFactory(
                 "lung_cancer_screening.questions.tests.factories.periods_when_you_stopped_smoking_response_factory.PeriodsWhenYouStoppedSmokingResponseFactory",
-                factory_related_name="response_set"
+                factory_related_name="response_set",
             ),
             relatives_age_when_diagnosed_response=factory.RelatedFactory(
                 "lung_cancer_screening.questions.tests.factories.relatives_age_when_diagnosed_response_factory.RelativesAgeWhenDiagnosedResponseFactory",
-                factory_related_name="response_set"
+                factory_related_name="response_set",
             ),
             respiratory_conditions_response=factory.RelatedFactory(
                 "lung_cancer_screening.questions.tests.factories.respiratory_conditions_response_factory.RespiratoryConditionsResponseFactory",
-                factory_related_name="response_set"
+                factory_related_name="response_set",
             ),
             sex_at_birth_response=factory.RelatedFactory(
                 "lung_cancer_screening.questions.tests.factories.sex_at_birth_response_factory.SexAtBirthResponseFactory",
-                factory_related_name="response_set"
+                factory_related_name="response_set",
             ),
             weight_response=factory.RelatedFactory(
                 "lung_cancer_screening.questions.tests.factories.weight_response_factory.WeightResponseFactory",
-                factory_related_name="response_set"
+                factory_related_name="response_set",
+            ),
+        )
+
+        complete = factory.Trait(
+            complete_without_smoking=True,
+            tobacco_smoking_history=factory.RelatedFactory(
+                "lung_cancer_screening.questions.tests.factories.tobacco_smoking_history_factory.TobaccoSmokingHistoryFactory",
+                factory_related_name="response_set",
+                normal=True,
+                complete=True,
             ),
         )
 

lung_cancer_screening/questions/tests/factories/tobacco_smoking_history_factory.py

@@ -68,3 +68,6 @@ class Params:
         decreased = factory.Trait(
             level=TobaccoSmokingHistory.Levels.DECREASED,
         )
+        no_change = factory.Trait(
+            level=TobaccoSmokingHistory.Levels.NO_CHANGE,
+        )

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

@@ -9,7 +9,7 @@
 @tag("SmokingChange")
 class TestSmokingChangeForm(TestCase):
     def setUp(self):
-        self.response_set = ResponseSetFactory.create(complete=True)
+        self.response_set = ResponseSetFactory.create(complete_without_smoking=True)
         self.normal_smoking_history = TobaccoSmokingHistoryFactory.create(
             response_set=self.response_set,
             cigarettes=True,

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

@@ -10,7 +10,7 @@
 @tag("SmokingFrequency")
 class TestSmokingFrequencyForm(TestCase):
     def setUp(self):
-        self.response_set = ResponseSetFactory.create(complete=True)
+        self.response_set = ResponseSetFactory.create(complete_without_smoking=True)
         self.normal_smoking_history = TobaccoSmokingHistoryFactory.create(
             response_set=self.response_set,
             normal=True,

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

@@ -193,13 +193,28 @@ def test_is_complete_returns_true_if_family_history_cancer_no_and_none_age_diagn
         self.assertTrue(response_set.is_complete())
 
 
-    def test_is_ineligble_returns_false_when_any_eligibility_question_is_not_answered(self):
+    def test_is_complete_returns_false_if_any_tobacco_smoking_history_is_not_complete(self):
+        response_set = ResponseSetFactory.create(complete=True)
+        response_set.tobacco_smoking_history.first().smoking_current_response.delete()
+        response_set.refresh_from_db()
+
+        self.assertFalse(response_set.is_complete())
+
+
+    def test_is_complete_returns_false_if_there_are_no_smoking_histories(self):
+        response_set = ResponseSetFactory.create(complete=True)
+        response_set.tobacco_smoking_history.all().delete()
+        response_set.refresh_from_db()
+        self.assertFalse(response_set.is_complete())
+
+
+    def test_is_ineligible_returns_false_when_any_eligibility_question_is_not_answered(self):
         response_set = ResponseSetFactory.create()
 
         self.assertFalse(response_set.is_eligible())
 
 
-    def test_is_eligble_returns_true_when_smoked_age_and_need_appointment_are_eligible(self):
+    def test_is_eligible_returns_true_when_smoked_age_and_need_appointment_are_eligible(self):
         HaveYouEverSmokedResponseFactory(
             response_set=self.response_set,
             eligible=True
@@ -216,7 +231,7 @@ def test_is_eligble_returns_true_when_smoked_age_and_need_appointment_are_eligib
         self.assertTrue(self.response_set.is_eligible())
 
 
-    def test_is_ineligble_returns_false_when_smoking_is_inelgible(self):
+    def test_is_ineligible_returns_false_when_smoking_is_ineligible(self):
         HaveYouEverSmokedResponseFactory(
             response_set=self.response_set,
             ineligible=True
@@ -233,7 +248,7 @@ def test_is_ineligble_returns_false_when_smoking_is_inelgible(self):
         self.assertFalse(self.response_set.is_eligible())
 
 
-    def test_is_ineligble_returns_false_when_age_is_inelgible(self):
+    def test_is_ineligible_returns_false_when_age_is_ineligible(self):
         HaveYouEverSmokedResponseFactory(
             response_set=self.response_set,
             eligible=True
@@ -250,7 +265,7 @@ def test_is_ineligble_returns_false_when_age_is_inelgible(self):
         self.assertFalse(self.response_set.is_eligible())
 
 
-    def test_is_ineligble_returns_false_when_need_appointment_is_inelgible(self):
+    def test_is_ineligible_returns_false_when_need_appointment_is_ineligible(self):
         HaveYouEverSmokedResponseFactory(
             response_set=self.response_set,
             eligible=True