From 1421fff80f40671f2cfdf29e1d55f2f36eeae58c Mon Sep 17 00:00:00 2001
From: Michael Olund <michaelo@openroad.ca>
Date: Thu, 5 Nov 2020 15:34:07 -0800
Subject: [PATCH] Reverted the change in DIV-1158 to make any_other_names field
 optional.  It causes several other bugs

---
 .../apps/core/templates/question/02_claimant.html  |  2 +-
 .../core/templates/question/03_respondent.html     |  2 +-
 edivorce/apps/core/tests/test_step_completeness.py | 14 +++++++-------
 edivorce/apps/core/utils/user_response.py          |  8 +++++---
 edivorce/fixtures/Question.json                    |  4 ++--
 5 files changed, 16 insertions(+), 14 deletions(-)

diff --git a/edivorce/apps/core/templates/question/02_claimant.html b/edivorce/apps/core/templates/question/02_claimant.html
index 09e0deaf..b2c94439 100644
--- a/edivorce/apps/core/templates/question/02_claimant.html
+++ b/edivorce/apps/core/templates/question/02_claimant.html
@@ -60,7 +60,7 @@
 </div>
 
 <div class="question-well {% if any_other_name_you_error %}error{% endif %}">
-    <h3>Do you go by any other names?{% include "partials/optional.html" %}</h3>
+    <h3>Do you go by any other names?{% if any_other_name_you_error %}{% include 'partials/required.html' %}{% endif %}</h3>
 
     <div class="btn-radio-group" data-toggle="buttons">
         <label class="btn btn-radio">
diff --git a/edivorce/apps/core/templates/question/03_respondent.html b/edivorce/apps/core/templates/question/03_respondent.html
index fc4fc05c..889bd68a 100644
--- a/edivorce/apps/core/templates/question/03_respondent.html
+++ b/edivorce/apps/core/templates/question/03_respondent.html
@@ -65,7 +65,7 @@
 </div>
 
 <div class="question-well {% if any_other_name_spouse_error %}error{% endif %}">
-    <h3>Does your spouse go by any other names?{% include "partials/optional.html" %}</h3>
+    <h3>Does your spouse go by any other names?{% if any_other_name_spouse_error %}{% include 'partials/required.html' %}{% endif %}</h3>
 
     <div class="btn-radio-group" data-toggle="buttons">
         <label class="btn btn-radio">
diff --git a/edivorce/apps/core/tests/test_step_completeness.py b/edivorce/apps/core/tests/test_step_completeness.py
index 43300358..a668ea21 100644
--- a/edivorce/apps/core/tests/test_step_completeness.py
+++ b/edivorce/apps/core/tests/test_step_completeness.py
@@ -133,18 +133,18 @@ class StepCompletenessTestCase(TestCase):
 
         # Few required questions with one checking question with hidden question not shown
         self.create_response('lived_in_bc_you', '11/11/1111')
-        self.assertEqual(self.check_completeness(step), True)
+        self.assertEqual(self.check_completeness(step), False)
 
         # All required questions with one checking question with hidden question not shown
         self.create_response('last_name_born_you', 'Jackson')
-        self.assertEqual(self.check_completeness(step), True)
+        self.assertEqual(self.check_completeness(step), False)
 
         UserResponse.objects.filter(question_id='lived_in_bc_you').update(value="Moved to B.C. on")
         self.assertEqual(self.check_completeness(step), False)
 
         # All required questions with one checking question with hidden question
         self.create_response('moved_to_bc_date_you', '12/12/1212')
-        self.assertEqual(self.check_completeness(step), True)
+        self.assertEqual(self.check_completeness(step), False)
 
         # All required questions with two checking question with one hidden and one shown
         self.create_response('any_other_name_you', 'NO')
@@ -189,14 +189,14 @@ class StepCompletenessTestCase(TestCase):
         self.create_response('last_name_born_spouse', 'Jackson')
         self.assertEqual(self.check_completeness(step), False)
 
-        # All required questions with one checking question with hidden question
-        self.create_response('lived_in_bc_spouse', 'Since birth')
-        self.assertEqual(self.check_completeness(step), True)
-
         # All required questions with one checking question with hidden question missing
         UserResponse.objects.filter(question_id='any_other_name_spouse').update(value="YES")
         self.assertEqual(self.check_completeness(step), False)
 
+        # All required questions with one checking question with hidden question
+        self.create_response('lived_in_bc_spouse', 'Since birth')
+        self.assertEqual(self.check_completeness(step), False)
+
         # All required questions with two checking question with one hidden and one shown
         self.create_response('other_name_spouse', '[["also known as","Smith","James","Jerry","Joseph"]]')
         self.assertEqual(self.check_completeness(step), True)
diff --git a/edivorce/apps/core/utils/user_response.py b/edivorce/apps/core/utils/user_response.py
index a280f8ca..1cfa700c 100644
--- a/edivorce/apps/core/utils/user_response.py
+++ b/edivorce/apps/core/utils/user_response.py
@@ -151,9 +151,11 @@ def _is_question_required(question, questions_dict, responses_by_key):
             else:
                 return HIDDEN
         elif target in questions_dict:
-            target_response = responses_by_key.get(target)
-            if target_response and _condition_met(target_response, reveal_response):
-                return REQUIRED
+            target_question_requirement = _is_question_required(target, questions_dict, responses_by_key)
+            if target_question_requirement == REQUIRED:
+                target_response = responses_by_key.get(target)
+                if target_response and _condition_met(target_response, reveal_response):
+                    return REQUIRED
             return HIDDEN
         else:
             raise KeyError(f"Invalid conditional target '{target}' for question '{question}'")
diff --git a/edivorce/fixtures/Question.json b/edivorce/fixtures/Question.json
index 618981e8..af32830d 100644
--- a/edivorce/fixtures/Question.json
+++ b/edivorce/fixtures/Question.json
@@ -242,7 +242,7 @@
         "name": "Do you go by any other names?",
         "description": "For step 2, Form 1 Claimant 1, Form 35 Claimant 1, Form 36 Claimant 1, Form 38 Claimant 1(sole), Form 38 Claimant 1, affidavit section(joint), Form 52 Claimant 1",
         "summary_order": 23,
-        "required": ""
+        "required": "Required"
     },
     "model": "core.question",
     "pk": "any_other_name_you"
@@ -366,7 +366,7 @@
         "name": "Does your spouse go by any other names?",
         "description": "For step 3, Form 1 Claimant 2, Form 35 Claimant 2, Form 36 Claimant 2, Form 38 Claimant 2(sole), Form 38 Claimant 2, affidavit section(joint), Form 52 Claimant 2",
         "summary_order": 35,
-        "required": ""
+        "required": "Required"
     },
     "model": "core.question",
     "pk": "any_other_name_spouse"