From 5f11da4baa8b677ea8042a2563138821492f9bf9 Mon Sep 17 00:00:00 2001
From: Jack S <jacopo.scotti@softwire.com>
Date: Mon, 14 Nov 2022 12:00:44 +0000
Subject: [PATCH] Pass current_user to questions

---
 app/models/form/common/questions/created_by_id.rb          | 2 +-
 app/models/form/common/questions/owning_organisation_id.rb | 2 +-
 app/models/form/lettings/questions/scheme_id.rb            | 2 +-
 app/models/form/question.rb                                | 2 +-
 app/views/form/_radio_question.html.erb                    | 2 +-
 app/views/form/_select_question.html.erb                   | 2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/app/models/form/common/questions/created_by_id.rb b/app/models/form/common/questions/created_by_id.rb
index b0558e5e2..b8409d99c 100644
--- a/app/models/form/common/questions/created_by_id.rb
+++ b/app/models/form/common/questions/created_by_id.rb
@@ -19,7 +19,7 @@ class Form::Common::Questions::CreatedById < ::Form::Question
     end
   end
 
-  def displayed_answer_options(log)
+  def displayed_answer_options(log, _user = nil)
     return answer_options unless log.owning_organisation
 
     user_ids = log.owning_organisation.users.pluck(:id) + [""]
diff --git a/app/models/form/common/questions/owning_organisation_id.rb b/app/models/form/common/questions/owning_organisation_id.rb
index 84eefbf21..9adb0bf64 100644
--- a/app/models/form/common/questions/owning_organisation_id.rb
+++ b/app/models/form/common/questions/owning_organisation_id.rb
@@ -19,7 +19,7 @@ class Form::Common::Questions::OwningOrganisationId < ::Form::Question
     end
   end
 
-  def displayed_answer_options(_log)
+  def displayed_answer_options(_log, _user = nil)
     answer_options
   end
 
diff --git a/app/models/form/lettings/questions/scheme_id.rb b/app/models/form/lettings/questions/scheme_id.rb
index 7d7966c00..d576a3f72 100644
--- a/app/models/form/lettings/questions/scheme_id.rb
+++ b/app/models/form/lettings/questions/scheme_id.rb
@@ -20,7 +20,7 @@ class Form::Lettings::Questions::SchemeId < ::Form::Question
     end
   end
 
-  def displayed_answer_options(lettings_log)
+  def displayed_answer_options(lettings_log, _user = nil)
     organisation = lettings_log.owning_organisation || lettings_log.created_by&.organisation
     schemes = organisation ? Scheme.select(:id).where(owning_organisation_id: organisation.id, confirmed: true) : Scheme.select(:id).where(confirmed: true)
     filtered_scheme_ids = schemes.joins(:locations).merge(Location.where("startdate <= ? or startdate IS NULL", Time.zone.today)).map(&:id)
diff --git a/app/models/form/question.rb b/app/models/form/question.rb
index 7f3717d4a..13b1c62c9 100644
--- a/app/models/form/question.rb
+++ b/app/models/form/question.rb
@@ -107,7 +107,7 @@ class Form::Question
     false
   end
 
-  def displayed_answer_options(log)
+  def displayed_answer_options(log, _current_user = nil)
     answer_options.select do |_key, val|
       !val.is_a?(Hash) || !val["depends_on"] || form.depends_on_met(val["depends_on"], log)
     end
diff --git a/app/views/form/_radio_question.html.erb b/app/views/form/_radio_question.html.erb
index ed5e71a0b..bac6fec8f 100644
--- a/app/views/form/_radio_question.html.erb
+++ b/app/views/form/_radio_question.html.erb
@@ -5,7 +5,7 @@
   legend: legend(question, page_header, conditional),
   hint: { text: question.hint_text&.html_safe } do %>
 
-  <% question.displayed_answer_options(@log).map do |key, options| %>
+  <% question.displayed_answer_options(@log, current_user).map do |key, options| %>
     <% if key.starts_with?("divider") %>
       <%= f.govuk_radio_divider %>
     <% else %>
diff --git a/app/views/form/_select_question.html.erb b/app/views/form/_select_question.html.erb
index 63f50fb94..c1ee8c3e0 100644
--- a/app/views/form/_select_question.html.erb
+++ b/app/views/form/_select_question.html.erb
@@ -1,7 +1,7 @@
 <%= render partial: "form/guidance/#{question.guidance_partial}" if question.top_guidance? %>
 
 <% selected = @log.public_send(question.id) || "" %>
-<% answers = question.displayed_answer_options(@log).map { |key, value| OpenStruct.new(id: key, name: value.respond_to?(:service_name) ? value.service_name : nil, resource: value) } %>
+<% answers = question.displayed_answer_options(@log, current_user).map { |key, value| OpenStruct.new(id: key, name: value.respond_to?(:service_name) ? value.service_name : nil, resource: value) } %>
 <%= f.govuk_select(question.id.to_sym,
   label: legend(question, page_header, conditional),
   "data-controller": "accessible-autocomplete",