From 0981ce7c4af6c0287c15bb1133736114af0ffc92 Mon Sep 17 00:00:00 2001 From: natdeanlewissoftwire <94526761+natdeanlewissoftwire@users.noreply.github.com> Date: Mon, 3 Oct 2022 14:17:15 +0100 Subject: [PATCH] Cldc 1480 buyer interview (#927) * feat: add functionality * test: make old tests pass * test: add new tests * [CLDC-1524] Add buyer 2 gender question (#926) * changes for buyer 2 gender * Rubocop Co-authored-by: Jack S * feat: add updated schema post rebase * refactor: remove blank line * test: update tests Co-authored-by: Dushan <47317567+dushan-madetech@users.noreply.github.com> Co-authored-by: Jack S --- .../form/sales/pages/buyer_interview.rb | 15 +++++++ .../form/sales/questions/buyer_interview.rb | 17 +++++++ .../subsections/household_characteristics.rb | 1 + .../20221003092048_add_noint_to_sales_log.rb | 7 +++ db/schema.rb | 7 +-- spec/factories/sales_log.rb | 1 + .../form/sales/pages/buyer_interview_spec.rb | 29 ++++++++++++ .../sales/questions/buyer_interview_spec.rb | 44 +++++++++++++++++++ .../household_characteristics_spec.rb | 1 + spec/models/form_handler_spec.rb | 4 +- 10 files changed, 121 insertions(+), 5 deletions(-) create mode 100644 app/models/form/sales/pages/buyer_interview.rb create mode 100644 app/models/form/sales/questions/buyer_interview.rb create mode 100644 db/migrate/20221003092048_add_noint_to_sales_log.rb create mode 100644 spec/models/form/sales/pages/buyer_interview_spec.rb create mode 100644 spec/models/form/sales/questions/buyer_interview_spec.rb diff --git a/app/models/form/sales/pages/buyer_interview.rb b/app/models/form/sales/pages/buyer_interview.rb new file mode 100644 index 000000000..a781d8a07 --- /dev/null +++ b/app/models/form/sales/pages/buyer_interview.rb @@ -0,0 +1,15 @@ +class Form::Sales::Pages::BuyerInterview < ::Form::Page + def initialize(id, hsh, subsection) + super + @id = "buyer_interview" + @header = "" + @description = "" + @subsection = subsection + end + + def questions + @questions ||= [ + Form::Sales::Questions::BuyerInterview.new(nil, nil, self), + ] + end +end diff --git a/app/models/form/sales/questions/buyer_interview.rb b/app/models/form/sales/questions/buyer_interview.rb new file mode 100644 index 000000000..d270d9d33 --- /dev/null +++ b/app/models/form/sales/questions/buyer_interview.rb @@ -0,0 +1,17 @@ +class Form::Sales::Questions::BuyerInterview < ::Form::Question + def initialize(id, hsh, page) + super + @id = "noint" + @check_answer_label = "Buyer interviewed in person?" + @header = "Was the buyer interviewed for any of the answers you will provide on this log?" + @type = "radio" + @hint_text = "You should still try to answer all questions even if the buyer wasn't interviewed in person" + @page = page + @answer_options = ANSWER_OPTIONS + end + + ANSWER_OPTIONS = { + "1" => { "value" => "No" }, + "2" => { "value" => "Yes" }, + }.freeze +end diff --git a/app/models/form/sales/subsections/household_characteristics.rb b/app/models/form/sales/subsections/household_characteristics.rb index 841ad6245..55a66b92d 100644 --- a/app/models/form/sales/subsections/household_characteristics.rb +++ b/app/models/form/sales/subsections/household_characteristics.rb @@ -9,6 +9,7 @@ class Form::Sales::Subsections::HouseholdCharacteristics < ::Form::Subsection def pages @pages ||= [ + Form::Sales::Pages::BuyerInterview.new(nil, nil, self), Form::Sales::Pages::Age1.new(nil, nil, self), Form::Sales::Pages::GenderIdentity1.new(nil, nil, self), Form::Sales::Pages::Buyer1LiveInProperty.new(nil, nil, self), diff --git a/db/migrate/20221003092048_add_noint_to_sales_log.rb b/db/migrate/20221003092048_add_noint_to_sales_log.rb new file mode 100644 index 000000000..ab21aead6 --- /dev/null +++ b/db/migrate/20221003092048_add_noint_to_sales_log.rb @@ -0,0 +1,7 @@ +class AddNointToSalesLog < ActiveRecord::Migration[7.0] + def change + change_table :sales_logs, bulk: true do |t| + t.column :noint, :int + end + end +end diff --git a/db/schema.rb b/db/schema.rb index 2454ad80f..73108ade5 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_30_134358) do +ActiveRecord::Schema[7.0].define(version: 2022_10_03_092048) do # These are extensions that must be enabled in order to support this database enable_extension "plpgsql" @@ -341,13 +341,14 @@ ActiveRecord::Schema[7.0].define(version: 2022_09_30_134358) do t.integer "buylivein" t.integer "builtype" t.integer "proptype" + t.string "relat2" + t.string "otherrelat2" t.integer "age2" t.integer "age2_known" t.integer "ethnic" t.integer "ethnic_group" - t.string "relat2" - t.string "otherrelat2" t.string "sex2" + t.integer "noint" 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 1f8dfccc2..221ce0910 100644 --- a/spec/factories/sales_log.rb +++ b/spec/factories/sales_log.rb @@ -20,6 +20,7 @@ FactoryBot.define do jointpur { 1 } beds { 2 } jointmore { 1 } + noint { 2 } age1_known { 0 } age1 { 30 } sex1 { "X" } diff --git a/spec/models/form/sales/pages/buyer_interview_spec.rb b/spec/models/form/sales/pages/buyer_interview_spec.rb new file mode 100644 index 000000000..1347fb782 --- /dev/null +++ b/spec/models/form/sales/pages/buyer_interview_spec.rb @@ -0,0 +1,29 @@ +require "rails_helper" + +RSpec.describe Form::Sales::Pages::BuyerInterview, type: :model do + subject(:page) { described_class.new(page_id, page_definition, subsection) } + + let(:page_id) { nil } + let(:page_definition) { nil } + let(:subsection) { instance_double(Form::Subsection) } + + it "has correct subsection" do + expect(page.subsection).to eq(subsection) + end + + it "has correct questions" do + expect(page.questions.map(&:id)).to eq(%w[noint]) + end + + it "has the correct id" do + expect(page.id).to eq("buyer_interview") + end + + it "has the correct header" do + expect(page.header).to eq("") + end + + it "has the correct description" do + expect(page.description).to eq("") + end +end diff --git a/spec/models/form/sales/questions/buyer_interview_spec.rb b/spec/models/form/sales/questions/buyer_interview_spec.rb new file mode 100644 index 000000000..69c45ee4e --- /dev/null +++ b/spec/models/form/sales/questions/buyer_interview_spec.rb @@ -0,0 +1,44 @@ +require "rails_helper" + +RSpec.describe Form::Sales::Questions::BuyerInterview, 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("noint") + end + + it "has the correct header" do + expect(question.header).to eq("Was the buyer interviewed for any of the answers you will provide on this log?") + end + + it "has the correct check_answer_label" do + expect(question.check_answer_label).to eq("Buyer interviewed in person?") + 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" do + expect(question.hint_text).to eq("You should still try to answer all questions even if the buyer wasn't interviewed in person") + end + + it "has the correct answer_options" do + expect(question.answer_options).to eq({ + "1" => { "value" => "No" }, + "2" => { "value" => "Yes" }, + }) + end +end diff --git a/spec/models/form/sales/subsections/household_characteristics_spec.rb b/spec/models/form/sales/subsections/household_characteristics_spec.rb index 26ddf5184..f8e258e20 100644 --- a/spec/models/form/sales/subsections/household_characteristics_spec.rb +++ b/spec/models/form/sales/subsections/household_characteristics_spec.rb @@ -14,6 +14,7 @@ RSpec.describe Form::Sales::Subsections::HouseholdCharacteristics, type: :model it "has correct pages" do expect(household_characteristics.pages.map(&:id)).to eq( %w[ + buyer_interview buyer_1_age buyer_1_gender_identity buyer_1_live_in_property diff --git a/spec/models/form_handler_spec.rb b/spec/models/form_handler_spec.rb index 12b7c214b..c06b41bf5 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(27) + expect(form.pages.count).to eq(28) 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(27) + expect(form.pages.count).to eq(28) expect(form.name).to eq("2021_2022_sales") end end