From 1acb349d8c47e2633f974e0443cea83442159a59 Mon Sep 17 00:00:00 2001 From: natdeanlewissoftwire Date: Thu, 3 Aug 2023 15:42:47 +0100 Subject: [PATCH] feat: wip commit --- .../form/lettings/questions/stock_owner.rb | 20 +++++++++++++++---- 1 file changed, 16 insertions(+), 4 deletions(-) diff --git a/app/models/form/lettings/questions/stock_owner.rb b/app/models/form/lettings/questions/stock_owner.rb index ef01e6538..bc0c7f7ed 100644 --- a/app/models/form/lettings/questions/stock_owner.rb +++ b/app/models/form/lettings/questions/stock_owner.rb @@ -20,14 +20,26 @@ 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)" + answer_opts[user.organisation.id] = "#{user.organisation.name} (Your organisation, active as of #{user.organisation.created_at.to_time.to_formatted_s(:govuk_date)})" end user_answer_options = if user.support? - Organisation.where(holds_own_stock: true) + Organisation.where(holds_own_stock: true).pluck(:id, :name).to_h else - user.organisation.stock_owners + user.organisation.absorbed_organisations.where(holds_own_stock: true) - end.pluck(:id, :name).to_h + stock_owners = user.organisation.stock_owners + .map { |stock_owner| + # if user.organisation.absorbed_organisations.find { |absorbed_org| absorbed_org.stock_owners.include?(stock_owner) }.present? + # [stock_owner.id, "#{stock_owner.name} (Active as of #{user.organisation.absorbed_organisations.find { |absorbed_org| absorbed_org.stock_owners.include?(stock_owner) }.merge_date})"] + # else + [stock_owner.id, stock_owner.name] + # end + }.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 answer_opts.merge(user_answer_options) end