diff --git a/app/models/form/sales/questions/joint_purchase.rb b/app/models/form/sales/questions/joint_purchase.rb index b026abfdc..893398399 100644 --- a/app/models/form/sales/questions/joint_purchase.rb +++ b/app/models/form/sales/questions/joint_purchase.rb @@ -1,7 +1,7 @@ class Form::Sales::Questions::JointPurchase < ::Form::Question def initialize(id, hsh, page) super - @id = "type" + @id = "jointpur" @check_answer_label = "Joint purchase" @header = "Is this a joint purchase?" @hint_text = "" @@ -12,6 +12,6 @@ class Form::Sales::Questions::JointPurchase < ::Form::Question ANSWER_OPTIONS = { "1" => { "value" => "Yes" }, - "0" => { "value" => "No" }, + "2" => { "value" => "No" }, }.freeze end diff --git a/db/migrate/20220920132907_add_joint_purchase_to_sales_log.rb b/db/migrate/20220920132907_add_joint_purchase_to_sales_log.rb new file mode 100644 index 000000000..d49eb9896 --- /dev/null +++ b/db/migrate/20220920132907_add_joint_purchase_to_sales_log.rb @@ -0,0 +1,5 @@ +class AddJointPurchaseToSalesLog < ActiveRecord::Migration[7.0] + def change + add_column :sales_logs, :jointpur, :integer + end +end diff --git a/db/schema.rb b/db/schema.rb index 6548f2c86..9b7b1b5f6 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: 2022_09_16_125704) do +ActiveRecord::Schema[7.0].define(version: 2022_09_20_132907) do # These are extensions that must be enabled in order to support this database enable_extension "plpgsql" @@ -324,6 +324,7 @@ ActiveRecord::Schema[7.0].define(version: 2022_09_16_125704) do t.string "purchid" t.integer "type" t.integer "ownershipsch" + t.integer "jointpur" t.index ["created_by_id"], name: "index_sales_logs_on_created_by_id" t.index ["managing_organisation_id"], name: "index_sales_logs_on_managing_organisation_id" t.index ["owning_organisation_id"], name: "index_sales_logs_on_owning_organisation_id" diff --git a/spec/factories/sales_log.rb b/spec/factories/sales_log.rb index 7efdd4039..a95dddb78 100644 --- a/spec/factories/sales_log.rb +++ b/spec/factories/sales_log.rb @@ -8,6 +8,7 @@ FactoryBot.define do trait :completed do purchid { "PC123" } saledate { Time.utc(2022, 2, 2, 10, 36, 49) } + jointpur { 1 } end end end diff --git a/spec/models/form/sales/pages/joint_purchase_spec.rb b/spec/models/form/sales/pages/joint_purchase_spec.rb index 0fa2911ef..eb106e9de 100644 --- a/spec/models/form/sales/pages/joint_purchase_spec.rb +++ b/spec/models/form/sales/pages/joint_purchase_spec.rb @@ -12,7 +12,7 @@ RSpec.describe Form::Sales::Pages::JointPurchase, type: :model do end it "has correct questions" do - expect(page.questions.map(&:id)).to eq(%w[type]) + expect(page.questions.map(&:id)).to eq(%w[jointpur]) end it "has the correct id" do diff --git a/spec/models/form/sales/questions/joint_purchase_spec.rb b/spec/models/form/sales/questions/joint_purchase_spec.rb new file mode 100644 index 000000000..c9f548071 --- /dev/null +++ b/spec/models/form/sales/questions/joint_purchase_spec.rb @@ -0,0 +1,44 @@ +require "rails_helper" + +RSpec.describe Form::Sales::Questions::JointPurchase, type: :model do + subject(:question) { described_class.new(question_id, question_definition, page) } + + let(:question_id) { nil } + let(:question_definition) { nil } + let(:page) { instance_double(Form::Page) } + + it "has correct page" do + expect(question.page).to eq(page) + end + + it "has the correct id" do + expect(question.id).to eq("jointpur") + end + + it "has the correct header" do + expect(question.header).to eq("Is this a joint purchase?") + end + + it "has the correct check_answer_label" do + expect(question.check_answer_label).to eq("Joint purchase") + end + + it "has the correct type" do + expect(question.type).to eq("radio") + end + + it "is not marked as derived" do + expect(question.derived?).to be false + end + + it "has the correct hint_text" do + expect(question.hint_text).to eq("") + end + + it "has the correct answer_options" do + expect(question.answer_options).to eq({ + "1" => { "value" => "Yes" }, + "2" => { "value" => "No" }, + }) + end +end diff --git a/spec/models/form/sales/subsections/setup_spec.rb b/spec/models/form/sales/subsections/setup_spec.rb index 80b27e261..41e5b7a73 100644 --- a/spec/models/form/sales/subsections/setup_spec.rb +++ b/spec/models/form/sales/subsections/setup_spec.rb @@ -13,7 +13,7 @@ RSpec.describe Form::Sales::Subsections::Setup, type: :model do it "has correct pages" do expect(setup.pages.map(&:id)).to eq( - %w[organisation created_by completion_date purchaser_code shared_ownership_type], + %w[organisation created_by completion_date purchaser_code shared_ownership_type joint_purchase], ) end diff --git a/spec/models/form_handler_spec.rb b/spec/models/form_handler_spec.rb index 499101f2b..ced1643dd 100644 --- a/spec/models/form_handler_spec.rb +++ b/spec/models/form_handler_spec.rb @@ -61,14 +61,14 @@ RSpec.describe FormHandler do it "is able to load a current sales form" do form = form_handler.get_form("current_sales") expect(form).to be_a(Form) - expect(form.pages.count).to eq(5) + expect(form.pages.count).to eq(6) expect(form.name).to eq("2022_2023_sales") end it "is able to load a previous sales form" do form = form_handler.get_form("previous_sales") expect(form).to be_a(Form) - expect(form.pages.count).to eq(5) + expect(form.pages.count).to eq(6) expect(form.name).to eq("2021_2022_sales") end end diff --git a/spec/models/form_spec.rb b/spec/models/form_spec.rb index 38caa5ec6..fdea4d9a8 100644 --- a/spec/models/form_spec.rb +++ b/spec/models/form_spec.rb @@ -218,9 +218,9 @@ RSpec.describe Form, type: :model do expect(form.sections[0].class).to eq(Form::Sales::Sections::Setup) expect(form.subsections.count).to eq(1) expect(form.subsections.first.id).to eq("setup") - expect(form.pages.count).to eq(5) + expect(form.pages.count).to eq(6) expect(form.pages.first.id).to eq("organisation") - expect(form.questions.count).to eq(5) + expect(form.questions.count).to eq(6) expect(form.questions.first.id).to eq("owning_organisation_id") expect(form.start_date).to eq(Time.zone.parse("2022-04-01")) expect(form.end_date).to eq(Time.zone.parse("2023-07-01"))