Merge branch 'main' into update-rails-admin-styling

app/models/bulk_upload.rb

@@ -129,6 +129,7 @@ class BulkUpload < ApplicationRecord
   def unpend_and_confirm_soft_validations
     logs.find_each do |log|
       fields_to_confirm(log).each { |field| log[field] = 0 }
+      log.status = log.status_cache
       log.save!
     end
   end

spec/models/bulk_upload_spec.rb

@@ -257,4 +257,18 @@ RSpec.describe BulkUpload, type: :model do
       end
     end
   end
+
+  describe "#unpend_and_confirm_soft_validations" do
+    let(:bulk_upload) { create(:bulk_upload, :lettings) }
+    let(:log) { create(:lettings_log, :completed, bulk_upload:, status: "pending", status_cache: "in_progress", supcharg: 183.24) }
+
+    it "resets the fields to confirm and updates the status to status_cache" do
+      expect(log.status).to eq("pending")
+
+      bulk_upload.unpend_and_confirm_soft_validations
+
+      log.reload
+      expect(log.status).to eq("completed")
+    end
+  end
 end