Cldc 1498 still serving armed forces (#1123)

* feat: new question and tests

* test: update subsection spec

* test: update tests

* feat: (future) conflict resolving

* feat: more conflict resolution

* feat: update db field

* test: update id

* test: updates

app/models/form/sales/pages/buyer_still_serving.rb

@@ -0,0 +1,18 @@
+class Form::Sales::Pages::BuyerStillServing < ::Form::Page
+  def initialize(id, hsh, subsection)
+    super
+    @id = "buyer_still_serving"
+    @header = ""
+    @description = ""
+    @subsection = subsection
+    @depends_on = [{
+      "hhregres" => 1,
+    }]
+  end
+
+  def questions
+    @questions ||= [
+      Form::Sales::Questions::BuyerStillServing.new(nil, nil, self),
+    ]
+  end
+end

app/models/form/sales/questions/buyer_still_serving.rb

@@ -0,0 +1,19 @@
+class Form::Sales::Questions::BuyerStillServing < ::Form::Question
+  def initialize(id, hsh, page)
+    super
+    @id = "hhregresstill"
+    @check_answer_label = "Are they still serving in the UK armed forces?"
+    @header = "Is the buyer still serving in the UK armed forces?"
+    @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

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

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

db/migrate/20221223151033_add_still_serving_to_sales.rb

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

db/schema.rb

@@ -441,6 +441,7 @@ ActiveRecord::Schema[7.0].define(version: 2023_01_04_093057) do
     t.decimal "grant", precision: 10, scale: 2
     t.integer "proplen"
     t.integer "wheel_value_check"
+    t.integer "hhregresstill"
     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"

spec/factories/sales_log.rb

@@ -79,6 +79,7 @@ FactoryBot.define do
       pregghb { 1 }
       disabled { 1 }
       hhregres { 1 }
+      hhregresstill { 4 }
     end
   end
 end

spec/models/form/sales/pages/buyer_still_serving_spec.rb

@@ -0,0 +1,33 @@
+require "rails_helper"
+
+RSpec.describe Form::Sales::Pages::BuyerStillServing, 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[hhregresstill])
+  end
+
+  it "has the correct id" do
+    expect(page.id).to eq("buyer_still_serving")
+  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
+
+  it "has correct depends_on" do
+    expect(page.depends_on).to eq([{ "hhregres" => 1 }])
+  end
+end

spec/models/form/sales/questions/buyer_still_serving_spec.rb

@@ -0,0 +1,46 @@
+require "rails_helper"
+
+RSpec.describe Form::Sales::Questions::BuyerStillServing, 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("hhregresstill")
+  end
+
+  it "has the correct header" do
+    expect(question.header).to eq("Is the buyer still serving in the UK armed forces?")
+  end
+
+  it "has the correct check_answer_label" do
+    expect(question.check_answer_label).to eq("Are they still serving in the UK armed forces?")
+  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

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

@@ -15,6 +15,7 @@ RSpec.describe Form::Sales::Subsections::HouseholdNeeds, type: :model do
     expect(household_characteristics.pages.map(&:id)).to eq(
       %w[
         armed_forces
+        buyer_still_serving
         household_wheelchair
         household_disability
         wheelchair_check