diff --git a/app/services/bulk_upload/lettings/year2024/row_parser.rb b/app/services/bulk_upload/lettings/year2024/row_parser.rb index d907d9b14..08fbec85a 100644 --- a/app/services/bulk_upload/lettings/year2024/row_parser.rb +++ b/app/services/bulk_upload/lettings/year2024/row_parser.rb @@ -121,8 +121,8 @@ class BulkUpload::Lettings::Year2024::RowParser field_115: "Was the letting made under the Accessible Register?", field_116: "What was the source of referral for this letting?", field_117: "Do you know the household's combined total income after tax?", - field_119: "How often does the household receive income?", - field_118: "How much income does the household have in total?", + field_118: "How often does the household receive income?", + field_119: "How much income does the household have in total?", field_120: "Is the tenant likely to be receiving any of these housing-related benefits?", field_121: "How much of the household's income is from Universal Credit, state pensions or benefits?", field_122: "Does the household pay rent or other charges for the accommodation?", @@ -258,8 +258,8 @@ class BulkUpload::Lettings::Year2024::RowParser attribute :field_115, :integer attribute :field_116, :integer attribute :field_117, :integer - attribute :field_119, :integer - attribute :field_118, :decimal + attribute :field_118, :integer + attribute :field_119, :decimal attribute :field_120, :integer attribute :field_121, :integer attribute :field_122, :integer @@ -968,8 +968,8 @@ private referral: %i[field_116], net_income_known: %i[field_117], - earnings: %i[field_118], - incfreq: %i[field_119], + incfreq: %i[field_118], + earnings: %i[field_119], hb: %i[field_120], benefits: %i[field_121], @@ -1156,7 +1156,7 @@ private attributes["net_income_known"] = net_income_known attributes["earnings"] = earnings - attributes["incfreq"] = field_119 + attributes["incfreq"] = field_118 attributes["hb"] = field_120 attributes["benefits"] = field_121 @@ -1442,7 +1442,7 @@ private end def earnings - field_118.round if field_118.present? + field_119.round if field_119.present? end def tshortfall_known diff --git a/public/files/bulk-upload-lettings-specification-2024-25.xlsx b/public/files/bulk-upload-lettings-specification-2024-25.xlsx index eedc78478..e8f7602bd 100644 Binary files a/public/files/bulk-upload-lettings-specification-2024-25.xlsx and b/public/files/bulk-upload-lettings-specification-2024-25.xlsx differ diff --git a/public/files/bulk-upload-lettings-template-2024-25.xlsx b/public/files/bulk-upload-lettings-template-2024-25.xlsx index f33098e3b..d5930e885 100644 Binary files a/public/files/bulk-upload-lettings-template-2024-25.xlsx and b/public/files/bulk-upload-lettings-template-2024-25.xlsx differ 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 4b2b08d7e..dddf8a744 100644 --- a/spec/services/bulk_upload/lettings/year2024/row_parser_spec.rb +++ b/spec/services/bulk_upload/lettings/year2024/row_parser_spec.rb @@ -206,8 +206,8 @@ RSpec.describe BulkUpload::Lettings::Year2024::RowParser do field_116: "2", field_117: "1", - field_118: "2300", - field_119: "2", + field_118: "2", + field_119: "2300", field_120: "1", field_121: "1", @@ -1122,8 +1122,8 @@ RSpec.describe BulkUpload::Lettings::Year2024::RowParser do end end - describe "#field_112, 117, 118" do - context "when none of field_112, 117, 118 are given" do + describe "#field_112, 117, 119" do + context "when none of field_112, 117, 119 are given" do let(:attributes) { { bulk_upload:, field_112: "", field_113: "", field_114: "", field_85: "1" } } it "sets correct errors" do @@ -2117,7 +2117,7 @@ RSpec.describe BulkUpload::Lettings::Year2024::RowParser do end describe "#earnings" do - let(:attributes) { { bulk_upload:, field_118: "104.50" } } + let(:attributes) { { bulk_upload:, field_119: "104.50" } } it "rounds to the nearest whole pound" do expect(parser.log.earnings).to eq(105)