From 577ad844baaa4243bf17e731d22e9d446e137058 Mon Sep 17 00:00:00 2001 From: Kat Date: Wed, 12 Apr 2023 15:37:20 +0100 Subject: [PATCH] Update field name across the codebase --- app/models/derived_variables/sales_log_variables.rb | 2 +- app/models/form/sales/questions/leasehold_charges_known.rb | 4 ++-- app/models/sales_log.rb | 4 ++-- app/services/imports/sales_logs_import_service.rb | 2 +- spec/factories/sales_log.rb | 2 +- spec/models/form/sales/pages/leasehold_charges_spec.rb | 2 +- .../form/sales/questions/leasehold_charges_known_spec.rb | 4 ++-- 7 files changed, 10 insertions(+), 10 deletions(-) diff --git a/app/models/derived_variables/sales_log_variables.rb b/app/models/derived_variables/sales_log_variables.rb index 1e7489015..b4ff1a671 100644 --- a/app/models/derived_variables/sales_log_variables.rb +++ b/app/models/derived_variables/sales_log_variables.rb @@ -1,7 +1,7 @@ module DerivedVariables::SalesLogVariables def set_derived_fields! self.ethnic = 17 if ethnic_refused? - self.mscharge = nil if monthly_leasehold_charges_unknown? + self.mscharge = nil if no_monthly_leasehold_charges? if exdate.present? self.exday = exdate.day self.exmonth = exdate.month diff --git a/app/models/form/sales/questions/leasehold_charges_known.rb b/app/models/form/sales/questions/leasehold_charges_known.rb index 92370a3ac..36ff0af1f 100644 --- a/app/models/form/sales/questions/leasehold_charges_known.rb +++ b/app/models/form/sales/questions/leasehold_charges_known.rb @@ -1,7 +1,7 @@ class Form::Sales::Questions::LeaseholdChargesKnown < ::Form::Question def initialize(id, hsh, subsection, ownershipsch:) super(id, hsh, subsection) - @id = "mscharge_known" + @id = "has_mscharge" @check_answer_label = "Monthly leasehold charges known?" @header = "Do you know the monthly leasehold charges for the property?" @hint_text = "For example, service and management charges" @@ -13,7 +13,7 @@ class Form::Sales::Questions::LeaseholdChargesKnown < ::Form::Question @hidden_in_check_answers = { "depends_on" => [ { - "mscharge_known" => 1, + "has_mscharge" => 1, }, ], } diff --git a/app/models/sales_log.rb b/app/models/sales_log.rb index b86124a2f..38beb850f 100644 --- a/app/models/sales_log.rb +++ b/app/models/sales_log.rb @@ -292,8 +292,8 @@ class SalesLog < Log companybuy == 1 end - def monthly_leasehold_charges_unknown? - mscharge_known&.zero? + def no_monthly_leasehold_charges? + has_mscharge&.zero? end def buyers_age_for_old_persons_shared_ownership_invalid? diff --git a/app/services/imports/sales_logs_import_service.rb b/app/services/imports/sales_logs_import_service.rb index 4d26639da..b3a3cd52b 100644 --- a/app/services/imports/sales_logs_import_service.rb +++ b/app/services/imports/sales_logs_import_service.rb @@ -107,7 +107,7 @@ module Imports attributes["hhregresstill"] = still_serving(xml_doc) attributes["proplen"] = safe_string_as_integer(xml_doc, "Q16aProplen2") || safe_string_as_integer(xml_doc, "Q16aProplensec2") attributes["mscharge"] = monthly_charges(xml_doc, attributes) - attributes["mscharge_known"] = 1 if attributes["mscharge"].present? + attributes["has_mscharge"] = 1 if attributes["mscharge"].present? attributes["prevten"] = unsafe_string_as_integer(xml_doc, "Q6PrevTenure") attributes["mortlen"] = mortgage_length(xml_doc, attributes) attributes["extrabor"] = borrowing(xml_doc, attributes) diff --git a/spec/factories/sales_log.rb b/spec/factories/sales_log.rb index b2d6f37a5..4bea77a65 100644 --- a/spec/factories/sales_log.rb +++ b/spec/factories/sales_log.rb @@ -92,7 +92,7 @@ FactoryBot.define do mortgageused { 1 } wchair { 1 } armedforcesspouse { 5 } - mscharge_known { 1 } + has_mscharge { 1 } mscharge { 100 } mortlen { 10 } pcodenk { 1 } diff --git a/spec/models/form/sales/pages/leasehold_charges_spec.rb b/spec/models/form/sales/pages/leasehold_charges_spec.rb index d58b965c3..9eedf1830 100644 --- a/spec/models/form/sales/pages/leasehold_charges_spec.rb +++ b/spec/models/form/sales/pages/leasehold_charges_spec.rb @@ -12,7 +12,7 @@ RSpec.describe Form::Sales::Pages::LeaseholdCharges, type: :model do end it "has correct questions" do - expect(page.questions.map(&:id)).to eq(%w[mscharge_known mscharge]) + expect(page.questions.map(&:id)).to eq(%w[has_mscharge mscharge]) end it "has the correct id" do diff --git a/spec/models/form/sales/questions/leasehold_charges_known_spec.rb b/spec/models/form/sales/questions/leasehold_charges_known_spec.rb index b8d191d3b..e4c9bd798 100644 --- a/spec/models/form/sales/questions/leasehold_charges_known_spec.rb +++ b/spec/models/form/sales/questions/leasehold_charges_known_spec.rb @@ -12,7 +12,7 @@ RSpec.describe Form::Sales::Questions::LeaseholdChargesKnown, type: :model do end it "has the correct id" do - expect(question.id).to eq("mscharge_known") + expect(question.id).to eq("has_mscharge") end it "has the correct header" do @@ -52,7 +52,7 @@ RSpec.describe Form::Sales::Questions::LeaseholdChargesKnown, type: :model do expect(question.hidden_in_check_answers).to eq({ "depends_on" => [ { - "mscharge_known" => 1, + "has_mscharge" => 1, }, ], })