fix tests after rebasing

db/schema.rb

@@ -502,11 +502,11 @@ ActiveRecord::Schema[7.0].define(version: 2023_01_26_145529) do
     t.boolean "is_la_inferred"
     t.bigint "bulk_upload_id"
     t.integer "retirement_value_check"
-    t.integer "deposit_and_mortgage_value_check"
-    t.integer "grant_value_check"
     t.integer "hodate_check"
     t.integer "extrabor_value_check"
     t.integer "old_persons_shared_ownership_value_check"
+    t.integer "deposit_and_mortgage_value_check"
+    t.integer "grant_value_check"
     t.index ["bulk_upload_id"], name: "index_sales_logs_on_bulk_upload_id"
     t.integer "shared_ownership_deposit_value_check"
     t.index ["created_by_id"], name: "index_sales_logs_on_created_by_id"

spec/models/sales_log_spec.rb

@@ -142,7 +142,9 @@ RSpec.describe SalesLog, type: :model do
     end
 
     it "derives a mortgage value of 0 when mortgage is not used" do
-      sales_log.update!(mortgageused: 2)
+      # to avoid log failing validations when mortgage value is removed:
+      new_grant_value = sales_log.grant + sales_log.mortgage
+      sales_log.update!(mortgageused: 2, grant: new_grant_value)
       record_from_db = ActiveRecord::Base.connection.execute("select mortgage from sales_logs where id=#{sales_log.id}").to_a[0]
       expect(record_from_db["mortgage"]).to eq(0.0)
     end