Merge pull request #677 from praekeltfoundation/fix_lets_do_this

fix lets do it next state

yal/assessments.py

@@ -401,10 +401,7 @@ async def state_handle_assessment_reminder_response(self):
                     f"state_{assessment_name.replace('_v2', '')}_assessment_v2"
                 )
             if "endline" in assessment_name:
-                assessment_name_replace = assessment_name.replace("_endline", "")
-                return await self.go_to_state(
-                    f"state_{assessment_name_replace}_assessment_endline"
-                )
+                return await self.go_to_state("state_start_terms")
 
             return await self.go_to_state(f"state_{assessment_name}_assessment")
 

yal/endline_terms_and_conditions.py

@@ -302,12 +302,9 @@ async def state_set_reminder_timer(self):
         msisdn = normalise_phonenumber(self.inbound.from_addr)
         whatsapp_id = msisdn.lstrip(" + ")
 
-        assessment_name = self.user.metadata.get(
-            "assessment_name", "locus_of_control_endline"
-        )
         data = {
             "assessment_reminder": get_current_datetime().isoformat(),
-            "assessment_reminder_name": assessment_name,
+            "assessment_reminder_name": "locus_of_control_endline",
             "assessment_reminder_type": "endline reengagement 30min",
         }
 

yal/surveys/endline.py

@@ -413,10 +413,10 @@ async def state_alcohol_assessment_endline_end(self):
         if error:
             return await self.go_to_state("state_error")
 
-        return await self.go_to_state("state_platform_review_endline")
+        return await self.go_to_state("state_platform_review_assessment_endline")
 
     # Platform Review
-    async def state_platform_review_endline(self):
+    async def state_platform_review_assessment_endline(self):
         self.save_metadata("assessment_name", "platform_review_endline")
         self.save_metadata("assessment_end_state", "state_submit_endline_completed")
 

yal/tests/states_dictionary.md

@@ -611,7 +611,7 @@
 | state_accept_consent | False | Text | Consent to the endline study |
 | state_no_consent | False | Text | No consent to the endline study |
 | state_consent | False | Text | Ask for consent to the study |
-| state_platform_review_endline | False | Text | Review the platform |
+| state_platform_review_assessment_endline | False | Text | Review the platform |
 | state_relationship_status_endline | False | Text | endline relationship status |
 | state_submit_terms_and_conditions_endline | False | Text | Endline Terms and Condition Submit |
 | state_not_interested | False | Text | Endline Survery not interested |

yal/tests/surveys/test_endline.py

@@ -1294,3 +1294,26 @@ async def test_endline_agree_terms_and_condition(tester: AppTester, rapidpro_moc
 
     await tester.user_input("Yes, I agree")
     tester.assert_state("state_accept_consent")
+
+
+@pytest.mark.asyncio
+async def test_state_accept_consent_reminder_lets_do_this(
+    tester: AppTester, rapidpro_mock
+):
+
+    tester.user.metadata["baseline_survey_completed"] = True
+    tester.user.metadata["endline_survey_started"] = "True"
+    tester.user.metadata["terms_accepted"] = True
+    tester.user.metadata["onboarding_completed"] = True
+
+    tester.setup_state("state_accept_consent")
+    await tester.user_input("I can't right now")
+
+    tester.assert_state("state_set_reminder_timer")
+    tester.assert_metadata("assessment_reminder_name", "locus_of_control_endline")
+    tester.assert_metadata("assessment_reminder_type", "endline reengagement 30min")
+
+    tester.user.metadata["assessment_reminder_sent"] = True
+    await tester.user_input("Let's do it")
+
+    tester.assert_state("state_start_terms")

yal/tests/test_main.py

@@ -460,7 +460,7 @@ async def test_assessment_reminder_keywords(
     ] = "locus_of_control_endline"
 
     await tester.user_input("continue now")
-    tester.assert_state("state_survey_question")
+    tester.assert_state("state_start_terms")
 
 
 @pytest.mark.asyncio