From f628342a87869fe109d2c74e308bfaee2f327b4b Mon Sep 17 00:00:00 2001
From: Manny Dinssa <44172848+Dinssa@users.noreply.github.com>
Date: Mon, 7 Apr 2025 09:29:49 +0100
Subject: [PATCH] CLDC-4000: Buyer/Tenant nationality other answer option
 exclude UK (#3043)

* Buyer Tenant nationality other answer option exclude UK

* Fix answer options count in nationality_all_spec to reflect correct value

* Update nationality_all to use GlobalConstants for answer options and adjust displayed options
---
 app/models/form/lettings/questions/nationality_all.rb       | 4 ++++
 app/models/form/sales/questions/nationality_all.rb          | 4 ++++
 spec/models/form/lettings/questions/nationality_all_spec.rb | 4 ++++
 spec/models/form/sales/questions/nationality_all_spec.rb    | 4 ++++
 4 files changed, 16 insertions(+)

diff --git a/app/models/form/lettings/questions/nationality_all.rb b/app/models/form/lettings/questions/nationality_all.rb
index 8a0e3d1d9..a4bb750a1 100644
--- a/app/models/form/lettings/questions/nationality_all.rb
+++ b/app/models/form/lettings/questions/nationality_all.rb
@@ -13,6 +13,10 @@ class Form::Lettings::Questions::NationalityAll < ::Form::Question
     answer_options[log.nationality_all.to_s]["name"]
   end
 
+  def displayed_answer_options(_log, _current_user = nil)
+    @answer_options.reject { |key, _| key == "826" }
+  end
+
   QUESTION_NUMBER_FROM_YEAR = { 2023 => 36, 2024 => 35 }.freeze
 
   def label_from_value(value)
diff --git a/app/models/form/sales/questions/nationality_all.rb b/app/models/form/sales/questions/nationality_all.rb
index 6338bb529..5610e0264 100644
--- a/app/models/form/sales/questions/nationality_all.rb
+++ b/app/models/form/sales/questions/nationality_all.rb
@@ -12,6 +12,10 @@ class Form::Sales::Questions::NationalityAll < ::Form::Question
     answer_options[log.send(id).to_s]["name"]
   end
 
+  def displayed_answer_options(_log, _current_user = nil)
+    @answer_options.reject { |key, _| key == "826" }
+  end
+
   QUESTION_NUMBER_FROM_YEAR_AND_BUYER_INDEX = {
     2023 => { 1 => 24, 2 => 32 },
     2024 => { 1 => 26, 2 => 34 },
diff --git a/spec/models/form/lettings/questions/nationality_all_spec.rb b/spec/models/form/lettings/questions/nationality_all_spec.rb
index a4d187a16..e041f60a0 100644
--- a/spec/models/form/lettings/questions/nationality_all_spec.rb
+++ b/spec/models/form/lettings/questions/nationality_all_spec.rb
@@ -20,4 +20,8 @@ RSpec.describe Form::Lettings::Questions::NationalityAll, type: :model do
   it "has the correct answer_options" do
     expect(question.answer_options.count).to eq(203)
   end
+
+  it "has the correct displayed_answer_options" do
+    expect(question.displayed_answer_options(nil, nil).count).to eq(202)
+  end
 end
diff --git a/spec/models/form/sales/questions/nationality_all_spec.rb b/spec/models/form/sales/questions/nationality_all_spec.rb
index a83beb51d..4ed01cc70 100644
--- a/spec/models/form/sales/questions/nationality_all_spec.rb
+++ b/spec/models/form/sales/questions/nationality_all_spec.rb
@@ -23,6 +23,10 @@ RSpec.describe Form::Sales::Questions::NationalityAll, type: :model do
     expect(question.answer_options.count).to eq(203)
   end
 
+  it "has the correct displayed_answer_options" do
+    expect(question.displayed_answer_options(nil, nil).count).to eq(202)
+  end
+
   it "has correct conditional for" do
     expect(question.conditional_for).to be_nil
   end