From 8fb2c8e866f035cf2fd9bf39c61fafad60173b7b Mon Sep 17 00:00:00 2001 From: Kat Date: Thu, 23 Feb 2023 12:39:35 +0000 Subject: [PATCH] refactor setting default values --- app/services/imports/sales_logs_import_service.rb | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/app/services/imports/sales_logs_import_service.rb b/app/services/imports/sales_logs_import_service.rb index ba979f3dd..675dddf52 100644 --- a/app/services/imports/sales_logs_import_service.rb +++ b/app/services/imports/sales_logs_import_service.rb @@ -104,7 +104,7 @@ module Imports attributes["hhregresstill"] = still_serving(xml_doc) attributes["proplen"] = safe_string_as_integer(xml_doc, "Q16aProplen2") attributes["mscharge"] = monthly_charges(xml_doc, attributes) - attributes["mscharge_known"] = mscharge_known(attributes) + attributes["mscharge_known"] = 1 if attributes["mscharge"].present? attributes["prevten"] = unsafe_string_as_integer(xml_doc, "Q6PrevTenure") attributes["mortgageused"] = unsafe_string_as_integer(xml_doc, "MORTGAGEUSED") attributes["wchair"] = unsafe_string_as_integer(xml_doc, "Q15Wheelchair") @@ -145,6 +145,7 @@ module Imports attributes["created_by"] = user end + set_default_values(attributes) if previous_status.include?("submitted") sales_log = save_sales_log(attributes, previous_status) compute_differences(sales_log, attributes) check_status_completed(sales_log, previous_status) unless @logs_overridden.include?(sales_log.old_id) @@ -395,10 +396,12 @@ module Imports end end - def mscharge_known(attributes) - return 1 if attributes["mscharge"].present? - + def default_mscharge_known(attributes) 0 if attributes["ownershipsch"] == 3 end + + def set_default_values(attributes) + attributes["mscharge_known"] ||= default_mscharge_known(attributes) + end end end