From fb60ea4f7e428a15c898b935d892fc0bcac23fde Mon Sep 17 00:00:00 2001
From: Arthur Campbell <arfa.camble@gmail.com>
Date: Tue, 24 Jan 2023 17:52:27 +0000
Subject: [PATCH] alter order of before validation methods on sales log so that
 derived fields are calculated after invalidated dependent fields are cleared,
 fix tests broken by this change

---
 app/models/log.rb             |  1 -
 app/models/sales_log.rb       |  2 +-
 spec/models/sales_log_spec.rb | 40 ++++++++++++++++++++++-------------
 3 files changed, 26 insertions(+), 17 deletions(-)

diff --git a/app/models/log.rb b/app/models/log.rb
index fcde08bdb..45f3e9607 100644
--- a/app/models/log.rb
+++ b/app/models/log.rb
@@ -108,7 +108,6 @@ private
     return unless form
 
     form.reset_not_routed_questions(self)
-
     reset_created_by!
   end
 
diff --git a/app/models/sales_log.rb b/app/models/sales_log.rb
index 87e9380e5..80d692fff 100644
--- a/app/models/sales_log.rb
+++ b/app/models/sales_log.rb
@@ -23,13 +23,13 @@ class SalesLog < Log
   has_paper_trail
 
   validates_with SalesLogValidator
-  before_validation :set_derived_fields!
   before_validation :reset_invalidated_dependent_fields!
   before_validation :process_postcode_changes!, if: :postcode_full_changed?
   before_validation :process_previous_postcode_changes!, if: :ppostcode_full_changed?
   before_validation :reset_location_fields!, unless: :postcode_known?
   before_validation :reset_previous_location_fields!, unless: :previous_postcode_known?
   before_validation :set_mortgage_value_zero, if: :mortgage_not_used?
+  before_validation :set_derived_fields!
 
   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) }
diff --git a/spec/models/sales_log_spec.rb b/spec/models/sales_log_spec.rb
index 3924feb65..4acc68380 100644
--- a/spec/models/sales_log_spec.rb
+++ b/spec/models/sales_log_spec.rb
@@ -109,7 +109,7 @@ RSpec.describe SalesLog, type: :model do
     let(:sales_log) { FactoryBot.create(:sales_log, :completed) }
 
     it "correctly derives and saves exday, exmonth and exyear" do
-      sales_log.update!(exdate: Time.gm(2022, 5, 4))
+      sales_log.update!(exdate: Time.gm(2022, 5, 4), ownershipsch: 1, staircase: 2, resale: 2)
       record_from_db = ActiveRecord::Base.connection.execute("select exday, exmonth, exyear from sales_logs where id=#{sales_log.id}").to_a[0]
       expect(record_from_db["exday"]).to eq(4)
       expect(record_from_db["exmonth"]).to eq(5)
@@ -238,39 +238,49 @@ RSpec.describe SalesLog, type: :model do
   end
 
   context "when deriving household variables" do
-    let!(:household_lettings_log) do
-      described_class.create!({
+    let!(:sales_log) do
+      FactoryBot.create(
+        :sales_log,
+        :completed,
         jointpur: 1,
-        hholdcount: 3,
+        hholdcount: 4,
+        details_known_1: 1,
+        details_known_2: 1,
+        details_known_3: 1,
+        details_known_4: 1,
         relat2: "C",
         relat3: "C",
         relat4: "X",
         relat5: "X",
-        age1: 22,
-        age2: 40,
-        age3: 19,
+        relat6: "P",
+        ecstat2: 9,
+        ecstat3: 7,
+        age1: 47,
+        age2: 14,
+        age3: 17,
         age4: 88,
-        age5: 14,
-      })
+        age5: 19,
+        age6: 46,
+      )
     end
 
     it "correctly derives and saves hhmemb" do
-      record_from_db = ActiveRecord::Base.connection.execute("select hhmemb from sales_logs where id=#{household_lettings_log.id}").to_a[0]
-      expect(record_from_db["hhmemb"]).to eq(5)
+      record_from_db = ActiveRecord::Base.connection.execute("select hhmemb from sales_logs where id=#{sales_log.id}").to_a[0]
+      expect(record_from_db["hhmemb"]).to eq(6)
     end
 
     it "correctly derives and saves totchild" do
-      record_from_db = ActiveRecord::Base.connection.execute("select totchild from sales_logs where id=#{household_lettings_log.id}").to_a[0]
+      record_from_db = ActiveRecord::Base.connection.execute("select totchild from sales_logs where id=#{sales_log.id}").to_a[0]
       expect(record_from_db["totchild"]).to eq(2)
     end
 
     it "correctly derives and saves totadult" do
-      record_from_db = ActiveRecord::Base.connection.execute("select totadult from sales_logs where id=#{household_lettings_log.id}").to_a[0]
-      expect(record_from_db["totadult"]).to eq(3)
+      record_from_db = ActiveRecord::Base.connection.execute("select totadult from sales_logs where id=#{sales_log.id}").to_a[0]
+      expect(record_from_db["totadult"]).to eq(4)
     end
 
     it "correctly derives and saves hhtype" do
-      record_from_db = ActiveRecord::Base.connection.execute("select hhtype from sales_logs where id=#{household_lettings_log.id}").to_a[0]
+      record_from_db = ActiveRecord::Base.connection.execute("select hhtype from sales_logs where id=#{sales_log.id}").to_a[0]
       expect(record_from_db["hhtype"]).to eq(9)
     end
   end