diff --git a/app/models/derived_variables/sales_log_variables.rb b/app/models/derived_variables/sales_log_variables.rb index 7284e238e..7f160b637 100644 --- a/app/models/derived_variables/sales_log_variables.rb +++ b/app/models/derived_variables/sales_log_variables.rb @@ -98,8 +98,8 @@ module DerivedVariables::SalesLogVariables self.numstair = is_firststair? ? 1 : nil if numstair == 1 && firststair_changed? self.mrent = 0 if stairowned_100? - if buyer_interviewed_changed_to_not_interviewed_and_mortgage_length_known? - self.mortgage_length_known = 0 + if buyer_interviewed_changed_to_not_interviewed_and_mortlen_set? + self.mortlen_known = 0 end set_encoded_derived_values!(DEPENDENCIES) diff --git a/app/models/form/sales/questions/mortgage_length_known.rb b/app/models/form/sales/questions/mortgage_length_known.rb index d2f7e1d0c..e92affb6b 100644 --- a/app/models/form/sales/questions/mortgage_length_known.rb +++ b/app/models/form/sales/questions/mortgage_length_known.rb @@ -1,13 +1,13 @@ class Form::Sales::Questions::MortgageLengthKnown < ::Form::Question def initialize(id, hsh, page, ownershipsch:) super(id, hsh, page) - @id = "mortgage_length_known" + @id = "mortlen_known" @type = "radio" @answer_options = ANSWER_OPTIONS @conditional_for = { "mortlen" => [0] } @hidden_in_check_answers = { "depends_on" => [ - { "mortgage_length_known" => 0 }, + { "mortlen_known" => 0 }, ], } @question_number = QUESTION_NUMBER_FROM_YEAR_AND_OWNERSHIP.fetch(form.start_date.year, QUESTION_NUMBER_FROM_YEAR_AND_OWNERSHIP.max_by { |k, _v| k }.last)[ownershipsch] diff --git a/app/models/sales_log.rb b/app/models/sales_log.rb index de4c3c95c..654808d3a 100644 --- a/app/models/sales_log.rb +++ b/app/models/sales_log.rb @@ -390,7 +390,7 @@ class SalesLog < Log proptype_changed? && proptype_was == 2 end - def buyer_interviewed_changed_to_not_interviewed_and_mortgage_length_known? + def buyer_interviewed_changed_to_not_interviewed_and_mortlen_set? noint_changed? && noint_was == 2 && buyer_not_interviewed? && mortlen.present? end diff --git a/app/services/bulk_upload/sales/year2026/row_parser.rb b/app/services/bulk_upload/sales/year2026/row_parser.rb index b7a327eae..069aabfef 100644 --- a/app/services/bulk_upload/sales/year2026/row_parser.rb +++ b/app/services/bulk_upload/sales/year2026/row_parser.rb @@ -776,7 +776,7 @@ private hb: %i[field_74], mortlen: mortlen_fields, - mortgage_length_known: mortlen_fields, + mortlen_known: mortlen_fields, proplen: proplen_fields, jointmore: %i[field_13], @@ -954,7 +954,7 @@ private attributes["hb"] = field_74 attributes["mortlen"] = mortlen != "R" ? mortlen : nil - attributes["mortgage_length_known"] = mortgage_length_known + attributes["mortlen_known"] = mortlen_known attributes["proplen"] = proplen if proplen&.positive? attributes["proplen_asked"] = attributes["proplen"].present? ? 0 : 1 @@ -1179,7 +1179,7 @@ private field_118 if discounted_ownership? end - def mortgage_length_known + def mortlen_known return nil if buyer_interviewed? if mortlen == "R" diff --git a/config/locales/forms/2026/sales/sale_information.en.yml b/config/locales/forms/2026/sales/sale_information.en.yml index c74388ff0..b253e4074 100644 --- a/config/locales/forms/2026/sales/sale_information.en.yml +++ b/config/locales/forms/2026/sales/sale_information.en.yml @@ -204,7 +204,7 @@ en: hint_text: "You should round up to the nearest year. Value should not exceed 60 years." question_text: "What is the length of the mortgage?" - mortgage_length_known: + mortlen_known: page_header: "" check_answer_label: "Length of mortgage known" check_answer_prompt: "" diff --git a/db/migrate/20260224141705_add_mortgage_length_known_to_sales_logs.rb b/db/migrate/20260224141705_add_mortlen_known_to_sales_logs.rb similarity index 60% rename from db/migrate/20260224141705_add_mortgage_length_known_to_sales_logs.rb rename to db/migrate/20260224141705_add_mortlen_known_to_sales_logs.rb index 745432ac9..6146e5de7 100644 --- a/db/migrate/20260224141705_add_mortgage_length_known_to_sales_logs.rb +++ b/db/migrate/20260224141705_add_mortlen_known_to_sales_logs.rb @@ -1,5 +1,5 @@ class AddMortgageLengthKnownToSalesLogs < ActiveRecord::Migration[7.2] def change - add_column :sales_logs, :mortgage_length_known, :integer + add_column :sales_logs, :mortlen_known, :integer end end diff --git a/db/schema.rb b/db/schema.rb index 6f754f7de..18be9464e 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -822,7 +822,7 @@ ActiveRecord::Schema[7.2].define(version: 2026_02_24_141705) do t.string "sexrab4" t.string "sexrab5" t.string "sexrab6" - t.integer "mortgage_length_known" + t.integer "mortlen_known" t.index ["assigned_to_id"], name: "index_sales_logs_on_assigned_to_id" t.index ["bulk_upload_id"], name: "index_sales_logs_on_bulk_upload_id" t.index ["created_by_id"], name: "index_sales_logs_on_created_by_id" diff --git a/spec/factories/sales_log.rb b/spec/factories/sales_log.rb index 7b0aaa4cd..6baee3100 100644 --- a/spec/factories/sales_log.rb +++ b/spec/factories/sales_log.rb @@ -166,7 +166,7 @@ FactoryBot.define do has_mscharge { 1 } mscharge { 100 } mortlen { 10 } - mortgage_length_known { 0 } + mortlen_known { 0 } pcodenk { 0 } postcode_full { "SW1A 1AA" } is_la_inferred { false } diff --git a/spec/services/bulk_upload/sales/year2026/row_parser_spec.rb b/spec/services/bulk_upload/sales/year2026/row_parser_spec.rb index 24bb06dad..e20b21232 100644 --- a/spec/services/bulk_upload/sales/year2026/row_parser_spec.rb +++ b/spec/services/bulk_upload/sales/year2026/row_parser_spec.rb @@ -2019,7 +2019,7 @@ RSpec.describe BulkUpload::Sales::Year2026::RowParser do end end - describe "mortlen amd mortgage_length_known" do + describe "mortlen amd mortlen_known" do context "when field_90 is a number" do let(:field_90_number_attributes) { valid_attributes.merge({ field_90: 20 }) } @@ -2031,9 +2031,9 @@ RSpec.describe BulkUpload::Sales::Year2026::RowParser do expect(log.mortlen).to eq(20) end - it "sets mortgage_length_known to yes" do + it "sets mortlen_known to yes" do log = parser.log - expect(log.mortgage_length_known).to eq(0) + expect(log.mortlen_known).to eq(0) end end @@ -2045,9 +2045,9 @@ RSpec.describe BulkUpload::Sales::Year2026::RowParser do expect(log.mortlen).to eq(20) end - it "sets mortgage_length_known to nil" do + it "sets mortlen_known to nil" do log = parser.log - expect(log.mortgage_length_known).to be_nil + expect(log.mortlen_known).to be_nil end end end @@ -2063,9 +2063,9 @@ RSpec.describe BulkUpload::Sales::Year2026::RowParser do expect(log.mortlen).to be_nil end - it "sets mortgage_length_known to no" do + it "sets mortlen_known to no" do log = parser.log - expect(log.mortgage_length_known).to eq(1) + expect(log.mortlen_known).to eq(1) end end end