From 1e924ca1cd49da4f90d5e02d6b5f0519bb645e60 Mon Sep 17 00:00:00 2001
From: natdeanlewissoftwire <nat.dean-lewis@softwire.com>
Date: Mon, 9 Jan 2023 14:39:13 +0000
Subject: [PATCH] faet: move mscharge derivation

---
 app/models/derived_variables/sales_log_variables.rb | 3 +++
 app/models/sales_log.rb                             | 7 -------
 2 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/app/models/derived_variables/sales_log_variables.rb b/app/models/derived_variables/sales_log_variables.rb
index 5fff0900d..c9675d84a 100644
--- a/app/models/derived_variables/sales_log_variables.rb
+++ b/app/models/derived_variables/sales_log_variables.rb
@@ -7,5 +7,8 @@ module DerivedVariables::SalesLogVariables
       self.exyear = exdate.year
     end
     self.deposit = value if outright_sale? && mortgage_not_used?
+    if mscharge_known.present? && mscharge_known.zero?
+      self.mscharge = 0
+    end
   end
 end
diff --git a/app/models/sales_log.rb b/app/models/sales_log.rb
index a613a27c2..22f750148 100644
--- a/app/models/sales_log.rb
+++ b/app/models/sales_log.rb
@@ -23,7 +23,6 @@ class SalesLog < Log
   before_validation :reset_invalidated_dependent_fields!
   before_validation :process_previous_postcode_changes!, if: :ppostcode_full_changed?
   before_validation :reset_previous_location_fields!, unless: :previous_postcode_known?
-  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) }
@@ -152,10 +151,4 @@ class SalesLog < Log
   def mortgage_not_used?
     mortgageused == 2
   end
-
-  def process_mscharge_known_changes!
-    return if mscharge_known.blank?
-
-    self["mscharge"] = 0 if mscharge_known.zero?
-  end
 end