diff --git a/app/services/bulk_upload/lettings/year2026/csv_parser.rb b/app/services/bulk_upload/lettings/year2026/csv_parser.rb index 2484cbc4b..85c130c76 100644 --- a/app/services/bulk_upload/lettings/year2026/csv_parser.rb +++ b/app/services/bulk_upload/lettings/year2026/csv_parser.rb @@ -4,7 +4,7 @@ class BulkUpload::Lettings::Year2026::CsvParser include CollectionTimeHelper # TODO: CLDC-4162: Update when 2026 format is known - FIELDS = 129 + FIELDS = 137 MAX_COLUMNS = 130 FORM_YEAR = 2026 diff --git a/spec/services/bulk_upload/lettings/validator_spec.rb b/spec/services/bulk_upload/lettings/validator_spec.rb index 0658d95f0..71db52258 100644 --- a/spec/services/bulk_upload/lettings/validator_spec.rb +++ b/spec/services/bulk_upload/lettings/validator_spec.rb @@ -11,7 +11,7 @@ RSpec.describe BulkUpload::Lettings::Validator do let(:user) { create(:user, organisation:) } let(:log) { build(:lettings_log, :completed, period: 2, assigned_to: user) } let(:log_to_csv) { BulkUpload::LettingsLogToCsv.new(log:) } - let(:bulk_upload) { create(:bulk_upload, user:, year: log.collection_start_year) } + let(:bulk_upload) { create(:bulk_upload, :lettings, user:, year: year) } let(:path) { file.path } let(:file) { Tempfile.new } @@ -190,8 +190,8 @@ RSpec.describe BulkUpload::Lettings::Validator do expect(error.tenant_code).to eql(log.tenancycode) expect(error.property_ref).to eql(log.propcode) expect(error.row).to eql("2") - expect(error.cell).to eql("CX2") - expect(error.col).to eql("CX") + expect(error.cell).to eql("DL2") + expect(error.col).to eql("DL") end end end diff --git a/spec/services/bulk_upload/sales/validator_spec.rb b/spec/services/bulk_upload/sales/validator_spec.rb index b665b2b5c..43fedc969 100644 --- a/spec/services/bulk_upload/sales/validator_spec.rb +++ b/spec/services/bulk_upload/sales/validator_spec.rb @@ -11,7 +11,7 @@ RSpec.describe BulkUpload::Sales::Validator do let(:organisation) { create(:organisation, old_visible_id: "123") } let(:log) { build(:sales_log, :completed, assigned_to: user) } let(:log_to_csv) { BulkUpload::SalesLogToCsv.new(log:) } - let(:bulk_upload) { create(:bulk_upload, user:, year: log.collection_start_year) } + let(:bulk_upload) { create(:bulk_upload, :sales, user:, year: year) } let(:path) { file.path } let(:file) { Tempfile.new }