Merge branch 'main' into BuClearingError

app/models/form/lettings/questions/declaration.rb

@@ -5,7 +5,7 @@ class Form::Lettings::Questions::Declaration < ::Form::Question
     @check_answer_label = "Tenant has seen the privacy notice"
     @header = "Declaration"
     @type = "checkbox"
-    @check_answers_card_number = 0
+    @check_answers_card_number = 0 unless form.start_year_after_2024?
     @top_guidance_partial = form.start_year_after_2024? ? "privacy_notice_tenant_2024" : "privacy_notice_tenant"
     @question_number = 30
   end

lib/tasks/clear_invalidated_earnings.rake

@@ -3,7 +3,7 @@ task clear_invalidated_earnings: :environment do
   LettingsLog.filter_by_year(2023).find_each do |lettings_log|
     lettings_log.validate_net_income(lettings_log)
     if lettings_log.errors[:earnings].present?
-      Rails.logger.info "Clearing earnings for lettings log #{lettings_log.id}, owning_organisation_id: #{lettings_log.owning_organisation_id}, managing_organisation_id: #{lettings_log.managing_organisation_id}, startdate: #{lettings_log.startdate.to_date}, tenancy reference: #{lettings_log.tenancycode}, property reference: #{lettings_log.propcode}, created_by: #{lettings_log.created_by.email}(#{lettings_log.created_by_id})"
+      Rails.logger.info "Clearing earnings for lettings log #{lettings_log.id}, owning_organisation_id: #{lettings_log.owning_organisation_id}, managing_organisation_id: #{lettings_log.managing_organisation_id}, startdate: #{lettings_log.startdate.to_date}, tenancy reference: #{lettings_log.tenancycode}, property reference: #{lettings_log.propcode}, created_by: #{lettings_log.created_by.email}(#{lettings_log.created_by_id}), earnings: #{lettings_log.earnings}, incfreq: #{lettings_log.incfreq}"
       lettings_log.earnings = nil
       lettings_log.incfreq = nil
       lettings_log.save!(validate: false)

spec/lib/tasks/clear_invalidated_earnings_spec.rb

@@ -32,7 +32,7 @@ RSpec.describe "clear_invalidated_earnings" do
           expect(lettings_log.earnings).to eq(20)
           expect(lettings_log.hhmemb).to eq(1)
           expect(lettings_log.ecstat1).to eq(1)
-          expect(Rails.logger).to receive(:info).with("Clearing earnings for lettings log #{lettings_log.id}, owning_organisation_id: #{lettings_log.owning_organisation_id}, managing_organisation_id: #{lettings_log.managing_organisation_id}, startdate: 2023-04-04, tenancy reference: 123, property reference: 321, created_by: #{user.email}(#{user.id})")
+          expect(Rails.logger).to receive(:info).with("Clearing earnings for lettings log #{lettings_log.id}, owning_organisation_id: #{lettings_log.owning_organisation_id}, managing_organisation_id: #{lettings_log.managing_organisation_id}, startdate: 2023-04-04, tenancy reference: 123, property reference: 321, created_by: #{user.email}(#{user.id}), earnings: 20, incfreq: 1")
 
           task.invoke
           lettings_log.reload

spec/models/form/lettings/questions/declaration_spec.rb

@@ -57,6 +57,10 @@ RSpec.describe Form::Lettings::Questions::Declaration, type: :model do
     it "uses the expected top guidance partial" do
       expect(question.top_guidance_partial).to eq("privacy_notice_tenant")
     end
+
+    it "has check_answers_card_number = 0" do
+      expect(question.check_answers_card_number).to eq(0)
+    end
   end
 
   context "when the form year is >= 2024" do
@@ -73,6 +77,10 @@ RSpec.describe Form::Lettings::Questions::Declaration, type: :model do
     it "uses the expected top guidance partial" do
       expect(question.top_guidance_partial).to eq("privacy_notice_tenant_2024")
     end
+
+    it "has check_answers_card_number nil" do
+      expect(question.check_answers_card_number).to be_nil
+    end
   end
 
   it "returns correct unanswered_error_message" do