From 544f7b10ae0aa69a3c1b8078de129067cda49df2 Mon Sep 17 00:00:00 2001
From: natdeanlewissoftwire <nat.dean-lewis@softwire.com>
Date: Tue, 3 Jan 2023 11:30:25 +0000
Subject: [PATCH 1/3] feat: add page, question, and update db

---
 .../form/sales/pages/leasehold_charges.rb     | 15 ++++++++++
 .../form/sales/questions/leasehold_charges.rb | 18 +++++++++++
 .../questions/leasehold_charges_known.rb      | 30 +++++++++++++++++++
 .../discounted_ownership_scheme.rb            |  1 +
 .../form/sales/subsections/outright_sale.rb   |  1 +
 .../subsections/shared_ownership_scheme.rb    |  3 +-
 ...30103112225_add_mscharge_known_to_sales.rb |  8 +++++
 db/schema.rb                                  |  5 +++-
 8 files changed, 79 insertions(+), 2 deletions(-)
 create mode 100644 app/models/form/sales/pages/leasehold_charges.rb
 create mode 100644 app/models/form/sales/questions/leasehold_charges.rb
 create mode 100644 app/models/form/sales/questions/leasehold_charges_known.rb
 create mode 100644 db/migrate/20230103112225_add_mscharge_known_to_sales.rb

diff --git a/app/models/form/sales/pages/leasehold_charges.rb b/app/models/form/sales/pages/leasehold_charges.rb
new file mode 100644
index 000000000..7aed92db9
--- /dev/null
+++ b/app/models/form/sales/pages/leasehold_charges.rb
@@ -0,0 +1,15 @@
+class Form::Sales::Pages::LeaseholdCharges < ::Form::Page
+  def initialize(id, hsh, subsection)
+    super
+    @header = ""
+    @description = ""
+    @subsection = subsection
+  end
+
+  def questions
+    @questions ||= [
+      Form::Sales::Questions::LeaseholdChargesKnown.new(nil, nil, self),
+      Form::Sales::Questions::LeaseholdCharges.new(nil, nil, self),
+    ]
+  end
+end
diff --git a/app/models/form/sales/questions/leasehold_charges.rb b/app/models/form/sales/questions/leasehold_charges.rb
new file mode 100644
index 000000000..dc2e39291
--- /dev/null
+++ b/app/models/form/sales/questions/leasehold_charges.rb
@@ -0,0 +1,18 @@
+class Form::Sales::Questions::LeaseholdCharges < ::Form::Question
+  def initialize(id, hsh, page)
+    super
+    @id = "mscharge"
+    @check_answer_label = "Monthly rent"
+    @header = "Enter the total monthly charge"
+    @type = "numeric"
+    @page = page
+    @width = 2
+    @prefix = "£"
+    @inferred_check_answers_value = {
+      "condition" => {
+        "mscharge_known" => 0,
+      },
+      "value" => 0,
+    }
+  end
+end
diff --git a/app/models/form/sales/questions/leasehold_charges_known.rb b/app/models/form/sales/questions/leasehold_charges_known.rb
new file mode 100644
index 000000000..7874e28bc
--- /dev/null
+++ b/app/models/form/sales/questions/leasehold_charges_known.rb
@@ -0,0 +1,30 @@
+class Form::Sales::Questions::LeaseholdChargesKnown < ::Form::Question
+  def initialize(id, hsh, page)
+    super
+    @id = "mscharge_known"
+    @check_answer_label = "Monthly rent"
+    @header = "Does the property have any monthly leasehold charges?"
+    @hint_text = "For example, service and management charges"
+    @type = "radio"
+    @answer_options = ANSWER_OPTIONS
+    @page = page
+    @conditional_for = {
+      "mscharge" => [1],
+    }
+    @hidden_in_check_answers = {
+      "depends_on" => [
+        {
+          "mscharge_known" => 0,
+        },
+        {
+          "mscharge_known" => 1,
+        },
+      ],
+    }
+  end
+
+  ANSWER_OPTIONS = {
+    "1" => { "value" => "Yes" },
+    "0" => { "value" => "No" },
+  }.freeze
+end
diff --git a/app/models/form/sales/subsections/discounted_ownership_scheme.rb b/app/models/form/sales/subsections/discounted_ownership_scheme.rb
index b432e0700..14e5e4e11 100644
--- a/app/models/form/sales/subsections/discounted_ownership_scheme.rb
+++ b/app/models/form/sales/subsections/discounted_ownership_scheme.rb
@@ -12,6 +12,7 @@ class Form::Sales::Subsections::DiscountedOwnershipScheme < ::Form::Subsection
       Form::Sales::Pages::AboutDeposit.new("about_deposit_discounted_ownership", nil, self),
       Form::Sales::Pages::AboutPriceRtb.new("about_deposit_discounted_ownership", nil, self),
       Form::Sales::Pages::AboutPriceNotRtb.new("about_deposit_discounted_ownership", nil, self),
+      Form::Sales::Pages::LeaseholdCharges.new("leasehold_charges_discounted_ownership", nil, self),
     ]
   end
 
diff --git a/app/models/form/sales/subsections/outright_sale.rb b/app/models/form/sales/subsections/outright_sale.rb
index cc566c396..c2d5dbdbd 100644
--- a/app/models/form/sales/subsections/outright_sale.rb
+++ b/app/models/form/sales/subsections/outright_sale.rb
@@ -10,6 +10,7 @@ class Form::Sales::Subsections::OutrightSale < ::Form::Subsection
   def pages
     @pages ||= [
       Form::Sales::Pages::AboutDeposit.new("about_deposit_outright_sale", nil, self),
+      Form::Sales::Pages::LeaseholdCharges.new("leasehold_charges_outright_sale", nil, self),
     ]
   end
 
diff --git a/app/models/form/sales/subsections/shared_ownership_scheme.rb b/app/models/form/sales/subsections/shared_ownership_scheme.rb
index b22adc11e..e1318401e 100644
--- a/app/models/form/sales/subsections/shared_ownership_scheme.rb
+++ b/app/models/form/sales/subsections/shared_ownership_scheme.rb
@@ -12,6 +12,7 @@ class Form::Sales::Subsections::SharedOwnershipScheme < ::Form::Subsection
       Form::Sales::Pages::Staircase.new(nil, nil, self),
       Form::Sales::Pages::AboutStaircase.new(nil, nil, self),
       Form::Sales::Pages::Resale.new(nil, nil, self),
+      Form::Sales::Pages::ExchangeDate.new(nil, nil, self),
       Form::Sales::Pages::LaNominations.new(nil, nil, self),
       Form::Sales::Pages::BuyerPrevious.new(nil, nil, self),
       Form::Sales::Pages::PreviousBedrooms.new(nil, nil, self),
@@ -19,7 +20,7 @@ class Form::Sales::Subsections::SharedOwnershipScheme < ::Form::Subsection
       Form::Sales::Pages::AboutPriceSocialHousing.new(nil, nil, self),
       Form::Sales::Pages::AboutDeposit.new("about_deposit_shared_ownership", nil, self),
       Form::Sales::Pages::MonthlyRent.new(nil, nil, self),
-      Form::Sales::Pages::ExchangeDate.new(nil, nil, self),
+      Form::Sales::Pages::LeaseholdCharges.new("leasehold_charges_shared_ownership", nil, self),
     ]
   end
 
diff --git a/db/migrate/20230103112225_add_mscharge_known_to_sales.rb b/db/migrate/20230103112225_add_mscharge_known_to_sales.rb
new file mode 100644
index 000000000..cf09e8a52
--- /dev/null
+++ b/db/migrate/20230103112225_add_mscharge_known_to_sales.rb
@@ -0,0 +1,8 @@
+class AddMschargeKnownToSales < ActiveRecord::Migration[7.0]
+  def change
+    change_table :sales_logs, bulk: true do |t|
+      t.column :mscharge_known, :integer
+      t.column :mscharge, :decimal, precision: 10, scale: 2
+    end
+  end
+end
diff --git a/db/schema.rb b/db/schema.rb
index 0b85e7f1d..39be059e8 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_12_22_133600) do
+ActiveRecord::Schema[7.0].define(version: 2023_01_03_112225) do
   # These are extensions that must be enabled in order to support this database
   enable_extension "plpgsql"
 
@@ -434,6 +434,9 @@ ActiveRecord::Schema[7.0].define(version: 2022_12_22_133600) do
     t.decimal "equity", precision: 10, scale: 2
     t.decimal "discount", precision: 10, scale: 2
     t.decimal "grant", precision: 10, scale: 2
+    t.integer "proplen"
+    t.integer "mscharge_known"
+    t.decimal "mscharge", precision: 10, scale: 2
     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"

From a1b975b1a78debea273371dd9eeb42f96e601733 Mon Sep 17 00:00:00 2001
From: natdeanlewissoftwire <nat.dean-lewis@softwire.com>
Date: Tue, 3 Jan 2023 14:13:42 +0000
Subject: [PATCH 2/3] feat: infer mscharge if mscharge_known == No

---
 app/models/form/sales/questions/leasehold_charges.rb  | 11 +++--------
 .../form/sales/questions/leasehold_charges_known.rb   |  5 +----
 app/models/sales_log.rb                               |  7 +++++++
 3 files changed, 11 insertions(+), 12 deletions(-)

diff --git a/app/models/form/sales/questions/leasehold_charges.rb b/app/models/form/sales/questions/leasehold_charges.rb
index dc2e39291..eb19a7377 100644
--- a/app/models/form/sales/questions/leasehold_charges.rb
+++ b/app/models/form/sales/questions/leasehold_charges.rb
@@ -2,17 +2,12 @@ class Form::Sales::Questions::LeaseholdCharges < ::Form::Question
   def initialize(id, hsh, page)
     super
     @id = "mscharge"
-    @check_answer_label = "Monthly rent"
+    @check_answer_label = "Monthly leasehold charges"
     @header = "Enter the total monthly charge"
     @type = "numeric"
     @page = page
-    @width = 2
+    @min = 0
+    @width = 5
     @prefix = "£"
-    @inferred_check_answers_value = {
-      "condition" => {
-        "mscharge_known" => 0,
-      },
-      "value" => 0,
-    }
   end
 end
diff --git a/app/models/form/sales/questions/leasehold_charges_known.rb b/app/models/form/sales/questions/leasehold_charges_known.rb
index 7874e28bc..a94e7f63e 100644
--- a/app/models/form/sales/questions/leasehold_charges_known.rb
+++ b/app/models/form/sales/questions/leasehold_charges_known.rb
@@ -2,7 +2,7 @@ class Form::Sales::Questions::LeaseholdChargesKnown < ::Form::Question
   def initialize(id, hsh, page)
     super
     @id = "mscharge_known"
-    @check_answer_label = "Monthly rent"
+    @check_answer_label = "Monthly leasehold charges known?"
     @header = "Does the property have any monthly leasehold charges?"
     @hint_text = "For example, service and management charges"
     @type = "radio"
@@ -13,9 +13,6 @@ class Form::Sales::Questions::LeaseholdChargesKnown < ::Form::Question
     }
     @hidden_in_check_answers = {
       "depends_on" => [
-        {
-          "mscharge_known" => 0,
-        },
         {
           "mscharge_known" => 1,
         },
diff --git a/app/models/sales_log.rb b/app/models/sales_log.rb
index cda76d10e..d00093aaf 100644
--- a/app/models/sales_log.rb
+++ b/app/models/sales_log.rb
@@ -20,6 +20,7 @@ class SalesLog < Log
   validates_with SalesLogValidator
   before_validation :set_derived_fields!
   before_validation :reset_invalidated_dependent_fields!
+  before_validation :process_mscharge_known_changes!, if: :mscharge_known_changed?
 
   scope :filter_by_year, ->(year) { where(saledate: Time.zone.local(year.to_i, 4, 1)...Time.zone.local(year.to_i + 1, 4, 1)) }
   scope :search_by, ->(param) { filter_by_id(param) }
@@ -115,4 +116,10 @@ class SalesLog < Log
   def right_to_buy?
     [9, 14, 27].include?(type)
   end
+
+  def process_mscharge_known_changes!
+    return if mscharge_known.blank?
+
+    self["mscharge"] = 0 if mscharge_known.zero?
+  end
 end

From 399e658b5d859f3f4577aab798e2b102d2b59879 Mon Sep 17 00:00:00 2001
From: natdeanlewissoftwire <nat.dean-lewis@softwire.com>
Date: Tue, 3 Jan 2023 15:10:59 +0000
Subject: [PATCH 3/3] test: add and update tests

---
 spec/factories/sales_log.rb                   |  2 +
 .../sales/pages/leasehold_charges_spec.rb     | 33 ++++++++++
 .../questions/leasehold_charges_known_spec.rb | 60 +++++++++++++++++++
 .../sales/questions/leasehold_charges_spec.rb | 49 +++++++++++++++
 .../discounted_ownership_scheme_spec.rb       |  3 +-
 .../sales/subsections/outright_sale_spec.rb   |  3 +-
 .../shared_ownership_scheme_spec.rb           |  3 +-
 spec/models/form_handler_spec.rb              |  4 +-
 8 files changed, 152 insertions(+), 5 deletions(-)
 create mode 100644 spec/models/form/sales/pages/leasehold_charges_spec.rb
 create mode 100644 spec/models/form/sales/questions/leasehold_charges_known_spec.rb
 create mode 100644 spec/models/form/sales/questions/leasehold_charges_spec.rb

diff --git a/spec/factories/sales_log.rb b/spec/factories/sales_log.rb
index 922e265e4..00801f89b 100644
--- a/spec/factories/sales_log.rb
+++ b/spec/factories/sales_log.rb
@@ -72,6 +72,8 @@ FactoryBot.define do
       cashdis { 1_000 }
       value { 110_000 }
       grant { 1_000 }
+      mscharge_known { 1 }
+      mscharge { 100 }
     end
   end
 end
diff --git a/spec/models/form/sales/pages/leasehold_charges_spec.rb b/spec/models/form/sales/pages/leasehold_charges_spec.rb
new file mode 100644
index 000000000..d35d1076b
--- /dev/null
+++ b/spec/models/form/sales/pages/leasehold_charges_spec.rb
@@ -0,0 +1,33 @@
+require "rails_helper"
+
+RSpec.describe Form::Sales::Pages::LeaseholdCharges, 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[mscharge_known mscharge])
+  end
+
+  it "has the correct id" do
+    expect(page.id).to eq(nil)
+  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 be_nil
+  end
+end
diff --git a/spec/models/form/sales/questions/leasehold_charges_known_spec.rb b/spec/models/form/sales/questions/leasehold_charges_known_spec.rb
new file mode 100644
index 000000000..d47b535eb
--- /dev/null
+++ b/spec/models/form/sales/questions/leasehold_charges_known_spec.rb
@@ -0,0 +1,60 @@
+require "rails_helper"
+
+RSpec.describe Form::Sales::Questions::LeaseholdChargesKnown, 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("mscharge_known")
+  end
+
+  it "has the correct header" do
+    expect(question.header).to eq("Does the property have any monthly leasehold charges?")
+  end
+
+  it "has the correct check_answer_label" do
+    expect(question.check_answer_label).to eq("Monthly leasehold charges known?")
+  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 answer_options" do
+    expect(question.answer_options).to eq({
+      "0" => { "value" => "No" },
+      "1" => { "value" => "Yes" },
+    })
+  end
+
+  it "has correct conditional for" do
+    expect(question.conditional_for).to eq({
+      "mscharge" => [1],
+    })
+  end
+
+  it "has the correct hint" do
+    expect(question.hint_text).to eq("For example, service and management charges")
+  end
+
+  it "has correct hidden_in_check_answers for" do
+    expect(question.hidden_in_check_answers).to eq({
+      "depends_on" => [
+        {
+          "mscharge_known" => 1,
+        },
+      ],
+    })
+  end
+end
diff --git a/spec/models/form/sales/questions/leasehold_charges_spec.rb b/spec/models/form/sales/questions/leasehold_charges_spec.rb
new file mode 100644
index 000000000..a06fc9975
--- /dev/null
+++ b/spec/models/form/sales/questions/leasehold_charges_spec.rb
@@ -0,0 +1,49 @@
+require "rails_helper"
+
+RSpec.describe Form::Sales::Questions::LeaseholdCharges, 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("mscharge")
+  end
+
+  it "has the correct header" do
+    expect(question.header).to eq("Enter the total monthly charge")
+  end
+
+  it "has the correct check_answer_label" do
+    expect(question.check_answer_label).to eq("Monthly leasehold charges")
+  end
+
+  it "has the correct type" do
+    expect(question.type).to eq("numeric")
+  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 be_nil
+  end
+
+  it "has the correct width" do
+    expect(question.width).to eq(5)
+  end
+
+  it "has the correct min" do
+    expect(question.min).to eq(0)
+  end
+
+  it "has the correct prefix" do
+    expect(question.prefix).to eq("£")
+  end
+end
diff --git a/spec/models/form/sales/subsections/discounted_ownership_scheme_spec.rb b/spec/models/form/sales/subsections/discounted_ownership_scheme_spec.rb
index c3220bb51..799b7ef9a 100644
--- a/spec/models/form/sales/subsections/discounted_ownership_scheme_spec.rb
+++ b/spec/models/form/sales/subsections/discounted_ownership_scheme_spec.rb
@@ -15,7 +15,8 @@ RSpec.describe Form::Sales::Subsections::DiscountedOwnershipScheme, type: :model
     expect(discounted_ownership_scheme.pages.map(&:id)).to eq(
       %w[about_deposit_discounted_ownership
          about_price_rtb
-         about_price_not_rtb],
+         about_price_not_rtb
+         leasehold_charges_discounted_ownership],
     )
   end
 
diff --git a/spec/models/form/sales/subsections/outright_sale_spec.rb b/spec/models/form/sales/subsections/outright_sale_spec.rb
index 75f47bbc0..433c9cb59 100644
--- a/spec/models/form/sales/subsections/outright_sale_spec.rb
+++ b/spec/models/form/sales/subsections/outright_sale_spec.rb
@@ -13,7 +13,8 @@ RSpec.describe Form::Sales::Subsections::OutrightSale, type: :model do
 
   it "has correct pages" do
     expect(outright_sale.pages.map(&:id)).to eq(
-      %w[about_deposit_outright_sale],
+      %w[about_deposit_outright_sale
+         leasehold_charges_outright_sale],
     )
   end
 
diff --git a/spec/models/form/sales/subsections/shared_ownership_scheme_spec.rb b/spec/models/form/sales/subsections/shared_ownership_scheme_spec.rb
index ecabae734..b9d6b4dd6 100644
--- a/spec/models/form/sales/subsections/shared_ownership_scheme_spec.rb
+++ b/spec/models/form/sales/subsections/shared_ownership_scheme_spec.rb
@@ -17,6 +17,7 @@ RSpec.describe Form::Sales::Subsections::SharedOwnershipScheme, type: :model do
         staircasing
         about_staircasing
         resale
+        exchange_contracts
         la_nominations
         buyer_previous
         previous_bedrooms
@@ -24,7 +25,7 @@ RSpec.describe Form::Sales::Subsections::SharedOwnershipScheme, type: :model do
         about_price_social_housing
         about_deposit_shared_ownership
         monthly_rent
-        exchange_contracts
+        leasehold_charges_shared_ownership
       ],
     )
   end
diff --git a/spec/models/form_handler_spec.rb b/spec/models/form_handler_spec.rb
index eac4f5825..ff46f2560 100644
--- a/spec/models/form_handler_spec.rb
+++ b/spec/models/form_handler_spec.rb
@@ -52,14 +52,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(84)
+      expect(form.pages.count).to eq(87)
       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(84)
+      expect(form.pages.count).to eq(87)
       expect(form.name).to eq("2021_2022_sales")
     end
   end