From 62d36ed177b3b0932f87397f8cb28e91a9bcfd1f Mon Sep 17 00:00:00 2001
From: Kat <kosiak.katrina@gmail.com>
Date: Thu, 8 Sep 2022 11:34:20 +0100
Subject: [PATCH] Update form controller to use correct log types

---
 app/controllers/form_controller.rb | 8 ++++----
 app/models/sales_log.rb            | 2 ++
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/app/controllers/form_controller.rb b/app/controllers/form_controller.rb
index fdd9dfa0e..5173a364a 100644
--- a/app/controllers/form_controller.rb
+++ b/app/controllers/form_controller.rb
@@ -70,7 +70,7 @@ private
     end
     if session["fields"]
       session["fields"].each do |field, value|
-        unless @log.form.get_question(field, @log)&.type == "date"
+        if @log.form.get_question(field, @log)&.type != "date" && @log.respond_to?(field)
           @log[field] = value
         end
       end
@@ -153,7 +153,7 @@ private
   end
 
   def question_is_required?(question)
-    LettingsLog::OPTIONAL_FIELDS.exclude?(question.id) && required_questions.include?(question.id)
+    @log.class::OPTIONAL_FIELDS.exclude?(question.id) && required_questions.include?(question.id)
   end
 
   def required_questions
@@ -167,8 +167,8 @@ private
   def question_missing_response?(responses_for_page, question)
     if %w[checkbox validation_override].include?(question.type)
       answered = question.answer_options.keys.reject { |x| x.match(/divider/) }.map do |option|
-        session["fields"][option] = @log[option] = params["lettings_log"][question.id].include?(option) ? 1 : 0
-        params["lettings_log"][question.id].exclude?(option)
+        session["fields"][option] = @log[option] = params[@log.model_name.param_key][question.id].include?(option) ? 1 : 0
+        params[@log.model_name.param_key][question.id].exclude?(option)
       end
       answered.all?
     else
diff --git a/app/models/sales_log.rb b/app/models/sales_log.rb
index 57cb892ae..7977972a1 100644
--- a/app/models/sales_log.rb
+++ b/app/models/sales_log.rb
@@ -13,6 +13,8 @@ class SalesLog < Log
   STATUS = { "not_started" => 0, "in_progress" => 1, "completed" => 2 }.freeze
   enum status: STATUS
 
+  OPTIONAL_FIELDS = []
+  
   def startdate
     saledate
   end