From d10200b6c7db9f3f3f71e1b61d6f3ce27c6aa751 Mon Sep 17 00:00:00 2001
From: Kat <katrina@madetech.com>
Date: Thu, 21 Oct 2021 15:47:05 +0100
Subject: [PATCH] Change condition format in json

---
 app/controllers/case_logs_controller.rb | 6 +++---
 app/helpers/check_answers_helper.rb     | 2 +-
 spec/fixtures/forms/test_form.json      | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/app/controllers/case_logs_controller.rb b/app/controllers/case_logs_controller.rb
index c7025e1a7..290d1d9e6 100644
--- a/app/controllers/case_logs_controller.rb
+++ b/app/controllers/case_logs_controller.rb
@@ -131,11 +131,11 @@ private
 
   def get_next_page_path(form, previous_page, responses_for_page = {})
     questions_for_page = form.questions_for_page(previous_page)
-    questions_for_page.each do |question, content|
+    questions_for_page.each do |_question, content|
       next unless content.key?("conditional_route_to")
 
-      content["conditional_route_to"].each do |route, answer|
-        if responses_for_page[question].present? && answer.include?(responses_for_page[question])
+      content["conditional_route_to"].each do |route, conditions|
+        if responses_for_page[conditions.keys[0]].present? && conditions.values[0].include?(responses_for_page[conditions.keys[0]])
           return "case_log_#{route}_path"
         end
       end
diff --git a/app/helpers/check_answers_helper.rb b/app/helpers/check_answers_helper.rb
index 5224850f3..1607fe36e 100644
--- a/app/helpers/check_answers_helper.rb
+++ b/app/helpers/check_answers_helper.rb
@@ -43,7 +43,7 @@ module CheckAnswersHelper
   def get_next_page_name(form, page_name, applicable_questions, question_key, case_log, question_value)
     if applicable_questions[question_key].key?("conditional_route_to")
       applicable_questions[question_key]["conditional_route_to"].each do |conditional_page_key, condition|
-        unless condition_not_met(case_log, question_key, question_value, condition)
+        unless condition_not_met(case_log, condition.keys[0], question_value, condition.values[0])
           return conditional_page_key
         end
       end
diff --git a/spec/fixtures/forms/test_form.json b/spec/fixtures/forms/test_form.json
index 783c16f3f..cfe9f5012 100644
--- a/spec/fixtures/forms/test_form.json
+++ b/spec/fixtures/forms/test_form.json
@@ -250,8 +250,8 @@
                     "1": "No"
                   },
                   "conditional_route_to": {
-                    "conditional_question_yes_page": "Yes",
-                    "conditional_question_no_page": "No"
+                    "conditional_question_yes_page": {"pregnancy": "Yes"},
+                    "conditional_question_no_page": {"pregnancy": "No"}
                   }
                 }
               },