From c24233d3cf8ae3e0b143d6f740061c3f2a77f909 Mon Sep 17 00:00:00 2001 From: natdeanlewissoftwire Date: Thu, 3 Aug 2023 15:45:47 +0100 Subject: [PATCH] feat: revert previous commits --- app/models/form/lettings/questions/stock_owner.rb | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) diff --git a/app/models/form/lettings/questions/stock_owner.rb b/app/models/form/lettings/questions/stock_owner.rb index c99f32ea0..ef01e6538 100644 --- a/app/models/form/lettings/questions/stock_owner.rb +++ b/app/models/form/lettings/questions/stock_owner.rb @@ -20,20 +20,14 @@ class Form::Lettings::Questions::StockOwner < ::Form::Question end if !user.support? && user.organisation.holds_own_stock? - answer_opts[user.organisation.id] = "#{user.organisation.name} (Your organisation, active as of #{user.organisation.created_at.to_time.to_formatted_s(:govuk_date)})" + answer_opts[user.organisation.id] = "#{user.organisation.name} (Your organisation)" end user_answer_options = if user.support? - Organisation.where(holds_own_stock: true).pluck(:id, :name).to_h + Organisation.where(holds_own_stock: true) else - stock_owners = user.organisation.stock_owners - .map { |stock_owner| [stock_owner.id, stock_owner.name] }.to_h - absorbed_stock_owning_orgs = user.organisation.absorbed_organisations - .where(holds_own_stock: true) - .map { |org| [org.id, "#{org.name} (Inactive as of #{org.merge_date.to_time.to_formatted_s(:govuk_date)})"] }.to_h - - stock_owners.merge(absorbed_stock_owning_orgs) - end + user.organisation.stock_owners + user.organisation.absorbed_organisations.where(holds_own_stock: true) + end.pluck(:id, :name).to_h answer_opts.merge(user_answer_options) end