refactor StockOwner question

app/models/form/lettings/questions/stock_owner.rb

@@ -1,6 +1,4 @@
 class Form::Lettings::Questions::StockOwner < ::Form::Question
-  attr_accessor :current_user, :log
-
   def initialize(id, hsh, page)
     super
     @id = "owning_organisation_id"
@@ -9,38 +7,38 @@ class Form::Lettings::Questions::StockOwner < ::Form::Question
     @type = "select"
   end
 
-  def answer_options
+  def answer_options(log = nil, user = nil)
     answer_opts = { "" => "Select an option" }
 
     return answer_opts unless ActiveRecord::Base.connected?
-    return answer_opts unless current_user
+    return answer_opts unless user
     return answer_opts unless log
 
     if log.owning_organisation_id.present?
       answer_opts = answer_opts.merge({ log.owning_organisation.id => log.owning_organisation.name })
     end
 
-    if !current_user.support? && current_user.organisation.holds_own_stock?
-      answer_opts[current_user.organisation.id] = "#{current_user.organisation.name} (Your organisation)"
+    if !user.support? && user.organisation.holds_own_stock?
+      answer_opts[user.organisation.id] = "#{user.organisation.name} (Your organisation)"
     end
 
+    stock_owners_answer_options = if user.support?
+                                    Organisation
+                                  else
+                                    user.organisation.stock_owners
+                                  end.pluck(:id, :name).to_h
+
     answer_opts.merge(stock_owners_answer_options)
   end
 
   def displayed_answer_options(log, user = nil)
-    @current_user = user
-    @log = log
-
-    answer_options
+    answer_options(log, user)
   end
 
   def label_from_value(value, log = nil, user = nil)
-    @log = log
-    @current_user = user
-
     return unless value
 
-    answer_options[value]
+    answer_options(log, user)[value]
   end
 
   def derived?
@@ -48,13 +46,11 @@ class Form::Lettings::Questions::StockOwner < ::Form::Question
   end
 
   def hidden_in_check_answers?(_log, user = nil)
-    @current_user = user
+    return false if user.support?
 
-    return false if current_user.support?
+    stock_owners = user.organisation.stock_owners
 
-    stock_owners = current_user.organisation.stock_owners
-
-    if current_user.organisation.holds_own_stock?
+    if user.organisation.holds_own_stock?
       stock_owners.count.zero?
     else
       stock_owners.count <= 1
@@ -70,12 +66,4 @@ private
   def selected_answer_option_is_derived?(_log)
     true
   end
-
-  def stock_owners_answer_options
-    if current_user.support?
-      Organisation
-    else
-      current_user.organisation.stock_owners
-    end.pluck(:id, :name).to_h
-  end
 end