diff --git a/app/services/bulk_upload/lettings/year2024/row_parser.rb b/app/services/bulk_upload/lettings/year2024/row_parser.rb index 19bae0ecc..f2b173b74 100644 --- a/app/services/bulk_upload/lettings/year2024/row_parser.rb +++ b/app/services/bulk_upload/lettings/year2024/row_parser.rb @@ -1260,7 +1260,7 @@ private return nil if field_44.blank? case field_44 - when 1, 2, 3, 18 + when 1, 2, 3, 18, 20 0 when 4, 5, 6, 7 1 diff --git a/app/services/bulk_upload/sales/year2024/row_parser.rb b/app/services/bulk_upload/sales/year2024/row_parser.rb index 99d45aea2..a0097637f 100644 --- a/app/services/bulk_upload/sales/year2024/row_parser.rb +++ b/app/services/bulk_upload/sales/year2024/row_parser.rb @@ -583,7 +583,7 @@ private def infer_buyer2_ethnic_group_from_ethnic case field_40 - when 1, 2, 3, 18 + when 1, 2, 3, 18, 20 0 when 4, 5, 6, 7 1 @@ -1015,7 +1015,7 @@ private return nil if field_33.blank? case field_33 - when 1, 2, 3, 18 + when 1, 2, 3, 18, 20 0 when 4, 5, 6, 7 1 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 5f34ec80a..a0e443270 100644 --- a/spec/services/bulk_upload/lettings/year2024/row_parser_spec.rb +++ b/spec/services/bulk_upload/lettings/year2024/row_parser_spec.rb @@ -758,6 +758,17 @@ RSpec.describe BulkUpload::Lettings::Year2024::RowParser do expect(parser).not_to be_valid end end + + context "with a valid ethnic value" do + context "when field_44 is 20" do + let(:attributes) { valid_attributes.merge({ field_44: "20" }) } + + it "is correctly sets ethnic and ethnic group" do + expect(parser.log.ethnic).to eq(20) + expect(parser.log.ethnic_group).to eq(0) + end + end + end end describe "#validate_nulls" do diff --git a/spec/services/bulk_upload/sales/year2024/row_parser_spec.rb b/spec/services/bulk_upload/sales/year2024/row_parser_spec.rb index 9ecf31d21..8d0796bee 100644 --- a/spec/services/bulk_upload/sales/year2024/row_parser_spec.rb +++ b/spec/services/bulk_upload/sales/year2024/row_parser_spec.rb @@ -1063,12 +1063,30 @@ RSpec.describe BulkUpload::Sales::Year2024::RowParser do end end + describe "#ethnic_group" do + context "when field_33 is 20" do + let(:attributes) { setup_section_params.merge({ field_33: "20" }) } + + it "is correctly set" do + expect(parser.log.ethnic_group).to be(0) + end + end + end + describe "#ethnic_group2" do let(:attributes) { setup_section_params.merge({ field_40: "1" }) } it "is correctly set" do expect(parser.log.ethnic_group2).to be(0) end + + context "when field_40 is 20" do + let(:attributes) { setup_section_params.merge({ field_40: "20" }) } + + it "is correctly set" do + expect(parser.log.ethnic_group2).to be(0) + end + end end describe "#ethnicbuy2" do