Browse Source

Cldc 1500 armed forces spouse (#1147)

* Add armed forces spouse column to the db

* Add armed forces spouse page and question

* Add armed forces spouse question to the subsection

* rebase test
pull/1157/head
kosiakkatrina 2 years ago committed by GitHub
parent
commit
5d2976db89
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 15
      app/models/form/sales/pages/armed_forces_spouse.rb
  2. 19
      app/models/form/sales/questions/armed_forces_spouse.rb
  3. 1
      app/models/form/sales/subsections/household_needs.rb
  4. 7
      db/migrate/20230105103733_add_armed_forces_spouse.rb
  5. 3
      db/schema.rb
  6. 1
      spec/factories/sales_log.rb
  7. 29
      spec/models/form/sales/pages/armed_forces_spouse_spec.rb
  8. 46
      spec/models/form/sales/questions/armed_forces_spouse_spec.rb
  9. 1
      spec/models/form/sales/subsections/household_needs_spec.rb
  10. 4
      spec/models/form_handler_spec.rb

15
app/models/form/sales/pages/armed_forces_spouse.rb

@ -0,0 +1,15 @@
class Form::Sales::Pages::ArmedForcesSpouse < ::Form::Page
def initialize(id, hsh, subsection)
super
@id = "armed_forces_spouse"
@header = ""
@description = ""
@subsection = subsection
end
def questions
@questions ||= [
Form::Sales::Questions::ArmedForcesSpouse.new(nil, nil, self),
]
end
end

19
app/models/form/sales/questions/armed_forces_spouse.rb

@ -0,0 +1,19 @@
class Form::Sales::Questions::ArmedForcesSpouse < ::Form::Question
def initialize(id, hsh, page)
super
@id = "armedforcesspouse"
@check_answer_label = "Are any of the buyers a spouse or civil partner of a UK armed forces regular who died in service within the last 2 years?"
@header = "Are any of the buyers a spouse or civil partner of a UK armed forces regular who died in service within the last 2 years?"
@type = "radio"
@hint_text = ""
@answer_options = ANSWER_OPTIONS
@page = page
end
ANSWER_OPTIONS = {
"4" => { "value" => "Yes" },
"5" => { "value" => "No" },
"6" => { "value" => "Buyer prefers not to say" },
"7" => { "value" => "Don't know" },
}.freeze
end

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

@ -11,6 +11,7 @@ class Form::Sales::Subsections::HouseholdNeeds < ::Form::Subsection
@pages ||= [ @pages ||= [
Form::Sales::Pages::ArmedForces.new(nil, nil, self), Form::Sales::Pages::ArmedForces.new(nil, nil, self),
Form::Sales::Pages::BuyerStillServing.new(nil, nil, self), Form::Sales::Pages::BuyerStillServing.new(nil, nil, self),
Form::Sales::Pages::ArmedForcesSpouse.new(nil, nil, self),
Form::Sales::Pages::HouseholdDisability.new(nil, nil, self), Form::Sales::Pages::HouseholdDisability.new(nil, nil, self),
Form::Sales::Pages::HouseholdWheelchair.new(nil, nil, self), Form::Sales::Pages::HouseholdWheelchair.new(nil, nil, self),
Form::Sales::Pages::HouseholdWheelchairCheck.new("wheelchair_check", nil, self), Form::Sales::Pages::HouseholdWheelchairCheck.new("wheelchair_check", nil, self),

7
db/migrate/20230105103733_add_armed_forces_spouse.rb

@ -0,0 +1,7 @@
class AddArmedForcesSpouse < ActiveRecord::Migration[7.0]
def change
change_table :sales_logs, bulk: true do |t|
t.column :armedforcesspouse, :integer
end
end
end

3
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: 2023_01_04_164318) do ActiveRecord::Schema[7.0].define(version: 2023_01_05_103733) 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"
@ -460,6 +460,7 @@ ActiveRecord::Schema[7.0].define(version: 2023_01_04_164318) do
t.integer "hb" t.integer "hb"
t.integer "mortgageused" t.integer "mortgageused"
t.integer "wchair" t.integer "wchair"
t.integer "armedforcesspouse"
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

@ -89,6 +89,7 @@ FactoryBot.define do
hb { 4 } hb { 4 }
mortgageused { 1 } mortgageused { 1 }
wchair { 1 } wchair { 1 }
armedforcesspouse { 5 }
end end
end end
end end

29
spec/models/form/sales/pages/armed_forces_spouse_spec.rb

@ -0,0 +1,29 @@
require "rails_helper"
RSpec.describe Form::Sales::Pages::ArmedForcesSpouse, 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[armedforcesspouse])
end
it "has the correct id" do
expect(page.id).to eq("armed_forces_spouse")
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

46
spec/models/form/sales/questions/armed_forces_spouse_spec.rb

@ -0,0 +1,46 @@
require "rails_helper"
RSpec.describe Form::Sales::Questions::ArmedForcesSpouse, 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("armedforcesspouse")
end
it "has the correct header" do
expect(question.header).to eq("Are any of the buyers a spouse or civil partner of a UK armed forces regular who died in service within the last 2 years?")
end
it "has the correct check_answer_label" do
expect(question.check_answer_label).to eq("Are any of the buyers a spouse or civil partner of a UK armed forces regular who died in service within the last 2 years?")
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("")
end
it "has the correct answer_options" do
expect(question.answer_options).to eq({
"4" => { "value" => "Yes" },
"5" => { "value" => "No" },
"6" => { "value" => "Buyer prefers not to say" },
"7" => { "value" => "Don't know" },
})
end
end

1
spec/models/form/sales/subsections/household_needs_spec.rb

@ -16,6 +16,7 @@ RSpec.describe Form::Sales::Subsections::HouseholdNeeds, type: :model do
%w[ %w[
armed_forces armed_forces
buyer_still_serving buyer_still_serving
armed_forces_spouse
household_disability household_disability
household_wheelchair household_wheelchair
wheelchair_check wheelchair_check

4
spec/models/form_handler_spec.rb

@ -52,14 +52,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(117) expect(form.pages.count).to eq(118)
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(117) expect(form.pages.count).to eq(118)
expect(form.name).to eq("2021_2022_sales") expect(form.name).to eq("2021_2022_sales")
end end
end end

Loading…
Cancel
Save