Browse Source

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 <jacopo.scotti@softwire.com>

* 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 <jacopo.scotti@softwire.com>
CLDC-1222-improve-case-log-import-performance
natdeanlewissoftwire 2 years ago committed by GitHub
parent
commit
0981ce7c4a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 15
      app/models/form/sales/pages/buyer_interview.rb
  2. 17
      app/models/form/sales/questions/buyer_interview.rb
  3. 1
      app/models/form/sales/subsections/household_characteristics.rb
  4. 7
      db/migrate/20221003092048_add_noint_to_sales_log.rb
  5. 7
      db/schema.rb
  6. 1
      spec/factories/sales_log.rb
  7. 29
      spec/models/form/sales/pages/buyer_interview_spec.rb
  8. 44
      spec/models/form/sales/questions/buyer_interview_spec.rb
  9. 1
      spec/models/form/sales/subsections/household_characteristics_spec.rb
  10. 4
      spec/models/form_handler_spec.rb

15
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

17
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

1
app/models/form/sales/subsections/household_characteristics.rb

@ -9,6 +9,7 @@ class Form::Sales::Subsections::HouseholdCharacteristics < ::Form::Subsection
def pages def pages
@pages ||= [ @pages ||= [
Form::Sales::Pages::BuyerInterview.new(nil, nil, self),
Form::Sales::Pages::Age1.new(nil, nil, self), Form::Sales::Pages::Age1.new(nil, nil, self),
Form::Sales::Pages::GenderIdentity1.new(nil, nil, self), Form::Sales::Pages::GenderIdentity1.new(nil, nil, self),
Form::Sales::Pages::Buyer1LiveInProperty.new(nil, nil, self), Form::Sales::Pages::Buyer1LiveInProperty.new(nil, nil, self),

7
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

7
db/schema.rb

@ -10,7 +10,7 @@
# #
# It's strongly recommended that you check this file into your version control system. # 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 # These are extensions that must be enabled in order to support this database
enable_extension "plpgsql" enable_extension "plpgsql"
@ -341,13 +341,14 @@ ActiveRecord::Schema[7.0].define(version: 2022_09_30_134358) do
t.integer "buylivein" t.integer "buylivein"
t.integer "builtype" t.integer "builtype"
t.integer "proptype" t.integer "proptype"
t.string "relat2"
t.string "otherrelat2"
t.integer "age2" t.integer "age2"
t.integer "age2_known" t.integer "age2_known"
t.integer "ethnic" t.integer "ethnic"
t.integer "ethnic_group" t.integer "ethnic_group"
t.string "relat2"
t.string "otherrelat2"
t.string "sex2" t.string "sex2"
t.integer "noint"
t.index ["created_by_id"], name: "index_sales_logs_on_created_by_id" 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 ["managing_organisation_id"], name: "index_sales_logs_on_managing_organisation_id"
t.index ["owning_organisation_id"], name: "index_sales_logs_on_owning_organisation_id" t.index ["owning_organisation_id"], name: "index_sales_logs_on_owning_organisation_id"

1
spec/factories/sales_log.rb

@ -20,6 +20,7 @@ FactoryBot.define do
jointpur { 1 } jointpur { 1 }
beds { 2 } beds { 2 }
jointmore { 1 } jointmore { 1 }
noint { 2 }
age1_known { 0 } age1_known { 0 }
age1 { 30 } age1 { 30 }
sex1 { "X" } sex1 { "X" }

29
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

44
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

1
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 it "has correct pages" do
expect(household_characteristics.pages.map(&:id)).to eq( expect(household_characteristics.pages.map(&:id)).to eq(
%w[ %w[
buyer_interview
buyer_1_age buyer_1_age
buyer_1_gender_identity buyer_1_gender_identity
buyer_1_live_in_property buyer_1_live_in_property

4
spec/models/form_handler_spec.rb

@ -61,14 +61,14 @@ RSpec.describe FormHandler do
it "is able to load a current sales form" do it "is able to load a current sales form" do
form = form_handler.get_form("current_sales") form = form_handler.get_form("current_sales")
expect(form).to be_a(Form) 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") expect(form.name).to eq("2022_2023_sales")
end end
it "is able to load a previous sales form" do it "is able to load a previous sales form" do
form = form_handler.get_form("previous_sales") form = form_handler.get_form("previous_sales")
expect(form).to be_a(Form) 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") expect(form.name).to eq("2021_2022_sales")
end end
end end

Loading…
Cancel
Save