diff --git a/app/models/form/sales/questions/buyers_organisations.rb b/app/models/form/sales/questions/buyers_organisations.rb index 735a1563d..ec76aebcd 100644 --- a/app/models/form/sales/questions/buyers_organisations.rb +++ b/app/models/form/sales/questions/buyers_organisations.rb @@ -14,8 +14,18 @@ class Form::Sales::Questions::BuyersOrganisations < ::Form::Question "pregother" => { "value" => "Other private registered provider (PRP) - housing association" }, "pregla" => { "value" => "Local Authority" }, "pregghb" => { "value" => "Help to Buy Agent" }, + "pregblank" => { "value" => "None of the above" }, }.freeze + def displayed_answer_options(_log, _user = nil) + { + "pregyrha" => { "value" => "Their private registered provider (PRP) - housing association" }, + "pregother" => { "value" => "Other private registered provider (PRP) - housing association" }, + "pregla" => { "value" => "Local Authority" }, + "pregghb" => { "value" => "Help to Buy Agent" }, + } + end + def unanswered_error_message "At least one option must be selected of these four" end diff --git a/db/migrate/20230301144555_add_pregblank.rb b/db/migrate/20230301144555_add_pregblank.rb new file mode 100644 index 000000000..308ca5e10 --- /dev/null +++ b/db/migrate/20230301144555_add_pregblank.rb @@ -0,0 +1,5 @@ +class AddPregblank < ActiveRecord::Migration[7.0] + def change + add_column :sales_logs, :pregblank, :integer + end +end diff --git a/db/schema.rb b/db/schema.rb index 3bc97927c..bc7a504a7 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -10,7 +10,7 @@ # # It's strongly recommended that you check this file into your version control system. -ActiveRecord::Schema[7.0].define(version: 2023_02_15_112932) do +ActiveRecord::Schema[7.0].define(version: 2023_03_01_144555) do # These are extensions that must be enabled in order to support this database enable_extension "plpgsql" @@ -526,11 +526,12 @@ ActiveRecord::Schema[7.0].define(version: 2023_02_15_112932) do t.integer "details_known_5" t.integer "details_known_6" t.integer "ethnic_group2" - t.integer "proplen_asked" t.integer "ethnicbuy2" + t.integer "proplen_asked" t.integer "prevshared" t.integer "staircasesale" t.string "old_id" + t.integer "pregblank" t.index ["bulk_upload_id"], name: "index_sales_logs_on_bulk_upload_id" t.index ["created_by_id"], name: "index_sales_logs_on_created_by_id" t.index ["old_id"], name: "index_sales_logs_on_old_id", unique: true diff --git a/spec/models/form/sales/questions/buyers_organisations_spec.rb b/spec/models/form/sales/questions/buyers_organisations_spec.rb index d9f61df5f..88af9917d 100644 --- a/spec/models/form/sales/questions/buyers_organisations_spec.rb +++ b/spec/models/form/sales/questions/buyers_organisations_spec.rb @@ -41,6 +41,18 @@ RSpec.describe Form::Sales::Questions::BuyersOrganisations, type: :model do it "has the correct answer_options" do expect(question.answer_options).to eq( + { + "pregyrha" => { "value" => "Their private registered provider (PRP) - housing association" }, + "pregother" => { "value" => "Other private registered provider (PRP) - housing association" }, + "pregla" => { "value" => "Local Authority" }, + "pregghb" => { "value" => "Help to Buy Agent" }, + "pregblank" => { "value" => "None of the above" }, + }, + ) + end + + it "has the correct displayed_answer_options" do + expect(question.displayed_answer_options(FactoryBot.create(:sales_log))).to eq( { "pregyrha" => { "value" => "Their private registered provider (PRP) - housing association" }, "pregother" => { "value" => "Other private registered provider (PRP) - housing association" }, diff --git a/spec/models/form/sales/questions/mortgage_length_spec.rb b/spec/models/form/sales/questions/mortgage_length_spec.rb index 414f757ca..0f3193244 100644 --- a/spec/models/form/sales/questions/mortgage_length_spec.rb +++ b/spec/models/form/sales/questions/mortgage_length_spec.rb @@ -52,13 +52,4 @@ RSpec.describe Form::Sales::Questions::MortgageLength, type: :model do it "has correct max" do expect(question.max).to eq(60) end - - it "has correct inferred check answers value" do - expect(question.inferred_check_answers_value).to eq([ - { - "condition" => { "mortlen_known" => 2 }, - "value" => "Not known", - }, - ]) - end end