From 3f415aadf08b60491a3f359222a21190414b180c Mon Sep 17 00:00:00 2001
From: Kat <katrina@madetech.com>
Date: Mon, 11 Oct 2021 09:00:22 +0100
Subject: [PATCH] Update case_log params before checking them with page_params

---
 app/controllers/case_logs_controller.rb | 37 +++++++++++++++----------
 app/models/form.rb                      | 10 +++++++
 2 files changed, 32 insertions(+), 15 deletions(-)

diff --git a/app/controllers/case_logs_controller.rb b/app/controllers/case_logs_controller.rb
index fcecc5797..654129695 100644
--- a/app/controllers/case_logs_controller.rb
+++ b/app/controllers/case_logs_controller.rb
@@ -20,14 +20,33 @@ class CaseLogsController < ApplicationController
     render :edit
   end
 
+  def update_checkbox_responses(case_log, questions_for_page)
+    result = {}
+    case_log.each do |question, answer|
+      if question == "previous_page"
+        result[question] = answer
+      elsif questions_for_page[question]["type"] == "checkbox"
+        questions_for_page[question]["answer_options"].keys.reject { |x| x.match(/divider/) }.each do |option|
+          result[option] = case_log[question].include?(option) ? true : false
+        end
+      else
+        result[question] = answer
+      end
+    end
+    result
+  end
+
   def submit_form
     form = Form.new(2021, 2022)
     @case_log = CaseLog.find(params[:id])
     previous_page = params[:case_log][:previous_page]
     questions_for_page = form.questions_for_page(previous_page)
-    answers_for_page = page_params(questions_for_page.keys).select { |k, _v| questions_for_page.key?(k) }
-    checked_answers = get_checked_answers(params[:case_log], questions_for_page)
-    if @case_log.update(checked_answers) && @case_log.update(answers_for_page)
+    checkbox_questions_for_page = form.checkbox_questions_for_page(previous_page)
+    all_question_keys = questions_for_page.keys + checkbox_questions_for_page
+    params[:case_log] = update_checkbox_responses(params[:case_log], questions_for_page)
+
+    answers_for_page = page_params(all_question_keys).select { |k, _v| all_question_keys.include?(k) }
+    if @case_log.update(answers_for_page)
       redirect_path = form.next_page_redirect_path(previous_page)
       redirect_to(send(redirect_path, @case_log))
     else
@@ -36,18 +55,6 @@ class CaseLogsController < ApplicationController
     end
   end
 
-  def get_checked_answers(case_log_params, questions_for_page)
-    checked_questions = {}
-    checkbox_questions = questions_for_page.select { |_title, question| question["type"] == "checkbox" }
-    checkbox_questions.each do |title, question|
-      valid_answer_options = question["answer_options"].reject { |key, _value| key.match?(/divider/) }
-      valid_answer_options.each do |value, _label|
-        checked_questions[value] = case_log_params[title].include?(value) ? true : false
-      end
-    end
-    checked_questions
-  end
-
   def check_answers
     @case_log = CaseLog.find(params[:case_log_id])
     current_url = request.env["PATH_INFO"]
diff --git a/app/models/form.rb b/app/models/form.rb
index 031c0093c..e6483ba50 100644
--- a/app/models/form.rb
+++ b/app/models/form.rb
@@ -75,4 +75,14 @@ class Form
 
     pages_for_subsection(subsection).keys[current_page_idx - 1]
   end
+
+  def checkbox_questions_for_page(page)
+    questions = {}
+    questions_for_page = all_pages[page]["questions"]
+    checkbox_questions = questions_for_page.select { |_title, question| question["type"] == "checkbox" }
+    checkbox_questions.each { |title, question|
+      questions[title] = question["answer_options"].keys.reject { |key, _value| key.match?(/divider/) } }
+    questions.map { |_key, value| value }.flatten
+  end
+
 end