From 2e6e56720d3d9299c0d246d37bd43ffbc8ae51a7 Mon Sep 17 00:00:00 2001 From: Rachael Booth Date: Thu, 17 Oct 2024 13:14:03 +0100 Subject: [PATCH 1/3] CLDC-3257: Default to current collection year for BU guidance pages (#2695) * CLDC-3257: Default to current collection year for BU guidance pages * Ignore rubocop RSpec/AnyInstance when necessary --- .../forms/bulk_upload_lettings/guidance.rb | 7 +++++++ app/models/forms/bulk_upload_sales/guidance.rb | 7 +++++++ .../forms/bulk_upload_lettings/guidance_spec.rb | 17 +++++++++++++++++ .../forms/bulk_upload_sales/guidance_spec.rb | 17 +++++++++++++++++ 4 files changed, 48 insertions(+) diff --git a/app/models/forms/bulk_upload_lettings/guidance.rb b/app/models/forms/bulk_upload_lettings/guidance.rb index dc0de3271..b2fcf947e 100644 --- a/app/models/forms/bulk_upload_lettings/guidance.rb +++ b/app/models/forms/bulk_upload_lettings/guidance.rb @@ -4,11 +4,18 @@ module Forms include ActiveModel::Model include ActiveModel::Attributes include Rails.application.routes.url_helpers + include CollectionTimeHelper attribute :year, :integer attribute :referrer attribute :organisation_id, :integer + def initialize(params) + super(params) + + self.year = current_collection_start_year if year.nil? + end + def view_path "bulk_upload_shared/guidance" end diff --git a/app/models/forms/bulk_upload_sales/guidance.rb b/app/models/forms/bulk_upload_sales/guidance.rb index be61ef650..80cfc5143 100644 --- a/app/models/forms/bulk_upload_sales/guidance.rb +++ b/app/models/forms/bulk_upload_sales/guidance.rb @@ -4,11 +4,18 @@ module Forms include ActiveModel::Model include ActiveModel::Attributes include Rails.application.routes.url_helpers + include CollectionTimeHelper attribute :year, :integer attribute :referrer attribute :organisation_id, :integer + def initialize(params) + super(params) + + self.year = current_collection_start_year if year.nil? + end + def view_path "bulk_upload_shared/guidance" end diff --git a/spec/models/forms/bulk_upload_lettings/guidance_spec.rb b/spec/models/forms/bulk_upload_lettings/guidance_spec.rb index 271ff8b27..41e74c50c 100644 --- a/spec/models/forms/bulk_upload_lettings/guidance_spec.rb +++ b/spec/models/forms/bulk_upload_lettings/guidance_spec.rb @@ -6,6 +6,7 @@ RSpec.describe Forms::BulkUploadLettings::Guidance do subject(:bu_guidance) { described_class.new(year:, referrer:) } let(:year) { 2024 } + let(:referrer) { nil } describe "#back_path" do context "when referrer is prepare-your-file" do @@ -40,4 +41,20 @@ RSpec.describe Forms::BulkUploadLettings::Guidance do end end end + + describe "year" do + context "when year is not provided" do + let(:year) { nil } + + before do + # rubocop:disable RSpec/AnyInstance + allow_any_instance_of(CollectionTimeHelper).to receive(:current_collection_start_year).and_return(2030) + # rubocop:enable RSpec/AnyInstance + end + + it "is set to the current collection start year" do + expect(bu_guidance.year).to eq(2030) + end + end + end end diff --git a/spec/models/forms/bulk_upload_sales/guidance_spec.rb b/spec/models/forms/bulk_upload_sales/guidance_spec.rb index 6eacf6d0c..f9c986cb2 100644 --- a/spec/models/forms/bulk_upload_sales/guidance_spec.rb +++ b/spec/models/forms/bulk_upload_sales/guidance_spec.rb @@ -6,6 +6,7 @@ RSpec.describe Forms::BulkUploadSales::Guidance do subject(:bu_guidance) { described_class.new(year:, referrer:) } let(:year) { 2024 } + let(:referrer) { nil } describe "#back_path" do context "when referrer is prepare-your-file" do @@ -40,4 +41,20 @@ RSpec.describe Forms::BulkUploadSales::Guidance do end end end + + describe "year" do + context "when year is not provided" do + let(:year) { nil } + + before do + # rubocop:disable RSpec/AnyInstance + allow_any_instance_of(CollectionTimeHelper).to receive(:current_collection_start_year).and_return(2030) + # rubocop:enable RSpec/AnyInstance + end + + it "is set to the current collection start year" do + expect(bu_guidance.year).to eq(2030) + end + end + end end From 2246b8cce556ac21f3d7b7233da1990edcb07415 Mon Sep 17 00:00:00 2001 From: kosiakkatrina <54268893+kosiakkatrina@users.noreply.github.com> Date: Fri, 18 Oct 2024 10:50:41 +0100 Subject: [PATCH 2/3] Update email allowlist (#2710) --- config/credentials.yml.enc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/credentials.yml.enc b/config/credentials.yml.enc index 9cd4bba71..8e0af1b34 100644 --- a/config/credentials.yml.enc +++ b/config/credentials.yml.enc @@ -1 +1 @@ -QGn9IiI91BaO4IGAtfy92FrNP46X9T2jJErRv+o/PRG9LrimEGeuOE+FwhArKZQ5cTipaDqo8u9Ajv45Kitv3c0GynOOvz0r3OjPRHO/p4hW8BFWQDv581cWWPsyZT2JO51zZ5LnwNFvWrjEB2q49YESgtfADPkJWmtx/By5Cg2/PVIRxvhGKOnheme5cih050wqg/43BdiF0PD9FDTZXJDLJg/QQ8nQYkvQe2jN4nM4mTVpkQkmzDKgGknmUWFfW3qWFzlsdMkdkPdeP9wLnJVbFTeyaaJT3wv6l19d2rKqo8iVvacdaQjRev+LVXqOsNAjVHwcPNQVq9s8pxG24HLk3aQ14Eyjf6tHAuZAV4jLnNqQtBQ0AIldWeOl6SKmlTom1P1tcLp9KpajEADplmWSwUktIGmaakFjk/ApYaUBiYTku2iLHMrT/xSc3jPj5W/ZggeJ0Ij6nuGYE1cmBxWGxda9PzOrDP8coEK9vPHiNeDDM1RoukVmf8gwDmshILi5EwIAsO2gJXM1wtPYMu41+H4/y3c0GIwgfv9QP11q+nqhG1MMcOrAUKGhypAS+M+uLwfGQudfQDKP9Zv3VCnOk3mkKlpIzMMD4UdJxQeE/8sfwIsEhWggEo3oa93ptbRdvJ7YYcVvmMmkVBxk0KWFprl4i/BkFHLWrKNl5LBOGA==--ziMOTnYBB5TDyXYU--3FJMs8e6R8lheqcqB8p8uQ== \ No newline at end of file +M2+y4Ll2PwjN9IiCvliQ5Ytiy+/9bSepV2siwg6hvttLc63q0W4hbNobseAZAYqWLajrnJ7lm9AfT8CuBreHtwFsdQ/HV8NPrvzLB/P+X15MKLtb1Sg7bNjtW24uoE3zYrWILecpNygLc1ZXxgjka3yjc7XdV7MA3NR2/2zvkGREJvjbJlEn7036CWnNfN7PD0S57O1z+LqilrrhecWAmGeJRU2Ve2UZNoUExz865ovpk1enGReiU5+0jlNTIK3SCc75HH3grET6HkAbzsZvC763OkEkEQGVJeaytQ2cGkyk8t98nqGRq6fK9uAwKyGh6KwHH8BT++OOF3Re4Uf2A9boFdJ5AOwuV7ZK+OonPu7x/bThRmb+Sl057+L1pSrpILvFUzA3K8k34G9ZMHMLIX0/rHLEav+ToFFwBxARleiUdSgEv9txP0wU+7fPyuJlHJb7CIrC9dRQIeyM9RAIvxZYhP2KrTqm9eEyCJNttAWpYnXfnoxgbQEoQw94KOal/i26bK09TZNwv10oTYZqxB6PqfsQQ9wVIesO9v6uK3HQ2jVXeCb4caj1HWFOjFLhcDoAEFe6DUmjSdxf2tDQ90pwQKQ7IWi9jPOOQSVQ7VoCc1uD3cImDjsY/04sGbCdSpGt53E3Rn9UCGHdVhzzOXRhU4wQLBFEFin79KJ7q0m71jesGEpVNKI2s8aC+Ux8btSBu92JLS4b9zZHT13D729CW2T8--EZ5GxuRKaFfGdzCE--OZ1EwaObJ4ZF59N0JcJ7Dg== \ No newline at end of file From 2974bcddd7fd7f634a2c99fe3d63512752fd3d74 Mon Sep 17 00:00:00 2001 From: Rachael Booth Date: Mon, 21 Oct 2024 10:58:53 +0100 Subject: [PATCH 3/3] CLDC-3330: Use partial postcodes in bulk upload (#2692) * CLDC-3330: Use partial postcodes in bulk upload * Adjust key address fields provided validations * Use join to only insert space when both parts of postcode are provided --- app/services/bulk_upload/lettings/year2024/row_parser.rb | 4 ++-- app/services/bulk_upload/sales/year2024/row_parser.rb | 4 ++-- .../bulk_upload/lettings/year2024/row_parser_spec.rb | 8 ++++++++ 3 files changed, 12 insertions(+), 4 deletions(-) diff --git a/app/services/bulk_upload/lettings/year2024/row_parser.rb b/app/services/bulk_upload/lettings/year2024/row_parser.rb index a40094e26..a7eb96c61 100644 --- a/app/services/bulk_upload/lettings/year2024/row_parser.rb +++ b/app/services/bulk_upload/lettings/year2024/row_parser.rb @@ -618,7 +618,7 @@ private end def key_address_fields_provided? - field_17.present? && field_19.present? && field_21.present? && field_22.present? + field_17.present? && field_19.present? && postcode_full.present? end def validate_address_fields @@ -1355,7 +1355,7 @@ private end def postcode_full - "#{field_21} #{field_22}" if field_21 && field_22 + [field_21, field_22].compact_blank.join(" ") if field_21 || field_22 end def owning_organisation diff --git a/app/services/bulk_upload/sales/year2024/row_parser.rb b/app/services/bulk_upload/sales/year2024/row_parser.rb index 44e81786b..fbc99ba02 100644 --- a/app/services/bulk_upload/sales/year2024/row_parser.rb +++ b/app/services/bulk_upload/sales/year2024/row_parser.rb @@ -616,7 +616,7 @@ private end def key_address_fields_provided? - field_23.present? && field_25.present? && field_27.present? && field_28.present? + field_23.present? && field_25.present? && postcode_full.present? end def validate_address_fields @@ -1074,7 +1074,7 @@ private end def postcode_full - "#{field_27} #{field_28}" if field_27 && field_28 + [field_27, field_28].compact_blank.join(" ") if field_27 || field_28 end def ppostcode_full diff --git a/spec/services/bulk_upload/lettings/year2024/row_parser_spec.rb b/spec/services/bulk_upload/lettings/year2024/row_parser_spec.rb index 596712162..2e4c82635 100644 --- a/spec/services/bulk_upload/lettings/year2024/row_parser_spec.rb +++ b/spec/services/bulk_upload/lettings/year2024/row_parser_spec.rb @@ -2718,6 +2718,14 @@ RSpec.describe BulkUpload::Lettings::Year2024::RowParser do it "strips whitespace" do expect(parser.log.postcode_full).to eql("EC1N 2TD") end + + context "when a partial postcode is provided" do + let(:attributes) { { bulk_upload:, field_4: 1, field_21: "EC1N", field_22: "" } } + + it "is set to the partial value" do + expect(parser.log.postcode_full).to eql("EC1N") + end + end end describe "#la" do