From 86614e64949937b0e86b4fdea328c13506b4906a Mon Sep 17 00:00:00 2001 From: Rachael Booth Date: Thu, 15 Feb 2024 15:09:55 +0000 Subject: [PATCH 1/2] Fix: Ensure declaration doesn't use a separate check answers card in 2024 forms now it's in setup (#2244) --- app/models/form/lettings/questions/declaration.rb | 2 +- spec/models/form/lettings/questions/declaration_spec.rb | 8 ++++++++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/app/models/form/lettings/questions/declaration.rb b/app/models/form/lettings/questions/declaration.rb index 4805a9f1e..985c4eed1 100644 --- a/app/models/form/lettings/questions/declaration.rb +++ b/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 diff --git a/spec/models/form/lettings/questions/declaration_spec.rb b/spec/models/form/lettings/questions/declaration_spec.rb index 4a22ea453..8230235cf 100644 --- a/spec/models/form/lettings/questions/declaration_spec.rb +++ b/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 From 364b19c1849dc282d7bd0b9e5822d5ff4f6fad86 Mon Sep 17 00:00:00 2001 From: kosiakkatrina <54268893+kosiakkatrina@users.noreply.github.com> Date: Thu, 15 Feb 2024 15:27:24 +0000 Subject: [PATCH 2/2] Also log earnings and incfrew (#2248) --- lib/tasks/clear_invalidated_earnings.rake | 2 +- spec/lib/tasks/clear_invalidated_earnings_spec.rb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/tasks/clear_invalidated_earnings.rake b/lib/tasks/clear_invalidated_earnings.rake index b474a675a..1229c4be9 100644 --- a/lib/tasks/clear_invalidated_earnings.rake +++ b/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) diff --git a/spec/lib/tasks/clear_invalidated_earnings_spec.rb b/spec/lib/tasks/clear_invalidated_earnings_spec.rb index b7cd617ff..796b43e8a 100644 --- a/spec/lib/tasks/clear_invalidated_earnings_spec.rb +++ b/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