From 6f1227859220c16fd9d043f5f19da9dd8b09a231 Mon Sep 17 00:00:00 2001 From: Phil Lee Date: Thu, 27 Apr 2023 12:12:37 +0100 Subject: [PATCH] rename class --- .../bulk_upload/lettings/log_creator_spec.rb | 8 ++--- .../bulk_upload/lettings/validator_spec.rb | 30 ++++++++-------- .../lettings/year2022/csv_parser_spec.rb | 30 ++++++++-------- .../lettings/year2023/csv_parser_spec.rb | 30 ++++++++-------- spec/services/bulk_upload/processor_spec.rb | 6 ++-- .../bulk_upload/sales/log_creator_spec.rb | 8 ++--- .../bulk_upload/sales/validator_spec.rb | 34 +++++++++---------- .../sales/year2022/csv_parser_spec.rb | 8 ++--- .../{log_to_csv.rb => lettings_log_to_csv.rb} | 2 +- 9 files changed, 78 insertions(+), 78 deletions(-) rename spec/support/bulk_upload/{log_to_csv.rb => lettings_log_to_csv.rb} (99%) diff --git a/spec/services/bulk_upload/lettings/log_creator_spec.rb b/spec/services/bulk_upload/lettings/log_creator_spec.rb index 2f05a0ba5..adf4d3845 100644 --- a/spec/services/bulk_upload/lettings/log_creator_spec.rb +++ b/spec/services/bulk_upload/lettings/log_creator_spec.rb @@ -35,9 +35,9 @@ RSpec.describe BulkUpload::Lettings::LogCreator do let(:log) { LettingsLog.new } before do - file.write(BulkUpload::LogToCsv.new(log:, col_offset: 0).to_2022_csv_row) - file.write(BulkUpload::LogToCsv.new(log:, col_offset: 0).to_2022_csv_row) - file.write(BulkUpload::LogToCsv.new(log:, col_offset: 0).to_2022_csv_row) + file.write(BulkUpload::LettingsLogToCsv.new(log:, col_offset: 0).to_2022_csv_row) + file.write(BulkUpload::LettingsLogToCsv.new(log:, col_offset: 0).to_2022_csv_row) + file.write(BulkUpload::LettingsLogToCsv.new(log:, col_offset: 0).to_2022_csv_row) file.rewind end @@ -66,7 +66,7 @@ RSpec.describe BulkUpload::Lettings::LogCreator do end before do - file.write(BulkUpload::LogToCsv.new(log:, col_offset: 0).to_2022_csv_row) + file.write(BulkUpload::LettingsLogToCsv.new(log:, col_offset: 0).to_2022_csv_row) file.rewind end diff --git a/spec/services/bulk_upload/lettings/validator_spec.rb b/spec/services/bulk_upload/lettings/validator_spec.rb index 679602ec0..10adcb86a 100644 --- a/spec/services/bulk_upload/lettings/validator_spec.rb +++ b/spec/services/bulk_upload/lettings/validator_spec.rb @@ -50,7 +50,7 @@ RSpec.describe BulkUpload::Lettings::Validator do context "when file has headers" do context "and file has extra invalid headers" do let(:seed) { rand } - let(:log_to_csv) { BulkUpload::LogToCsv.new(log:) } + let(:log_to_csv) { BulkUpload::LettingsLogToCsv.new(log:) } let(:field_numbers) { log_to_csv.default_2022_field_numbers + %w[invalid_field_number] } let(:field_values) { log_to_csv.to_2022_row + %w[value_for_invalid_field_number] } @@ -67,7 +67,7 @@ RSpec.describe BulkUpload::Lettings::Validator do context "and file has too few valid headers" do let(:seed) { rand } - let(:log_to_csv) { BulkUpload::LogToCsv.new(log:) } + let(:log_to_csv) { BulkUpload::LettingsLogToCsv.new(log:) } let(:field_numbers) { log_to_csv.default_2022_field_numbers } let(:field_values) { log_to_csv.to_2022_row } @@ -87,7 +87,7 @@ RSpec.describe BulkUpload::Lettings::Validator do context "and file has too many valid headers" do let(:seed) { rand } - let(:log_to_csv) { BulkUpload::LogToCsv.new(log:) } + let(:log_to_csv) { BulkUpload::LettingsLogToCsv.new(log:) } let(:field_numbers) { log_to_csv.default_2022_field_numbers + %w[23] } let(:field_values) { log_to_csv.to_2022_row + %w[value] } @@ -138,7 +138,7 @@ RSpec.describe BulkUpload::Lettings::Validator do context "when file has headers" do context "and file has extra invalid headers" do let(:seed) { rand } - let(:log_to_csv) { BulkUpload::LogToCsv.new(log:) } + let(:log_to_csv) { BulkUpload::LettingsLogToCsv.new(log:) } let(:field_numbers) { log_to_csv.default_2023_field_numbers + %w[invalid_field_number] } let(:field_values) { log_to_csv.to_2023_row + %w[value_for_invalid_field_number] } @@ -155,7 +155,7 @@ RSpec.describe BulkUpload::Lettings::Validator do context "and file has too few valid headers" do let(:seed) { rand } - let(:log_to_csv) { BulkUpload::LogToCsv.new(log:) } + let(:log_to_csv) { BulkUpload::LettingsLogToCsv.new(log:) } let(:field_numbers) { log_to_csv.default_2023_field_numbers } let(:field_values) { log_to_csv.to_2023_row } @@ -175,7 +175,7 @@ RSpec.describe BulkUpload::Lettings::Validator do context "and file has too many valid headers" do let(:seed) { rand } - let(:log_to_csv) { BulkUpload::LogToCsv.new(log:) } + let(:log_to_csv) { BulkUpload::LettingsLogToCsv.new(log:) } let(:field_numbers) { log_to_csv.default_2023_field_numbers + %w[23] } let(:field_values) { log_to_csv.to_2023_row + %w[value] } @@ -233,8 +233,8 @@ RSpec.describe BulkUpload::Lettings::Validator do end before do - file.write(BulkUpload::LogToCsv.new(log:, line_ending: "\r\n").default_2023_field_numbers_row(seed:)) - file.write(BulkUpload::LogToCsv.new(log:, line_ending: "\r\n").to_2023_csv_row(seed:)) + file.write(BulkUpload::LettingsLogToCsv.new(log:, line_ending: "\r\n").default_2023_field_numbers_row(seed:)) + file.write(BulkUpload::LettingsLogToCsv.new(log:, line_ending: "\r\n").to_2023_csv_row(seed:)) file.close end @@ -280,7 +280,7 @@ RSpec.describe BulkUpload::Lettings::Validator do let(:path) { file.path } before do - file.write(BulkUpload::LogToCsv.new(log:, line_ending: "\r\n", col_offset: 0).to_2022_csv_row) + file.write(BulkUpload::LettingsLogToCsv.new(log:, line_ending: "\r\n", col_offset: 0).to_2022_csv_row) file.close end @@ -322,8 +322,8 @@ RSpec.describe BulkUpload::Lettings::Validator do let(:log_2) { build(:lettings_log, :completed, created_by: user) } before do - file.write(BulkUpload::LogToCsv.new(log: log_1, line_ending: "\r\n", col_offset: 0).to_2022_csv_row) - file.write(BulkUpload::LogToCsv.new(log: log_2, line_ending: "\r\n", col_offset: 0, overrides: { illness: 100 }).to_2022_csv_row) + file.write(BulkUpload::LettingsLogToCsv.new(log: log_1, line_ending: "\r\n", col_offset: 0).to_2022_csv_row) + file.write(BulkUpload::LettingsLogToCsv.new(log: log_2, line_ending: "\r\n", col_offset: 0, overrides: { illness: 100 }).to_2022_csv_row) file.close end @@ -338,8 +338,8 @@ RSpec.describe BulkUpload::Lettings::Validator do let(:log_2) { build(:lettings_log, :completed, renttype: 1, created_by: user) } before do - file.write(BulkUpload::LogToCsv.new(log: log_1, line_ending: "\r\n", col_offset: 0).to_2022_csv_row) - file.write(BulkUpload::LogToCsv.new(log: log_2, line_ending: "\r\n", col_offset: 0).to_2022_csv_row) + file.write(BulkUpload::LettingsLogToCsv.new(log: log_1, line_ending: "\r\n", col_offset: 0).to_2022_csv_row) + file.write(BulkUpload::LettingsLogToCsv.new(log: log_2, line_ending: "\r\n", col_offset: 0).to_2022_csv_row) file.close end @@ -355,7 +355,7 @@ RSpec.describe BulkUpload::Lettings::Validator do let(:log_1) { build(:lettings_log, :completed, renttype: 1, created_by: user, owning_organisation: unaffiliated_org) } before do - file.write(BulkUpload::LogToCsv.new(log: log_1, line_ending: "\r\n", col_offset: 0).to_2022_csv_row) + file.write(BulkUpload::LettingsLogToCsv.new(log: log_1, line_ending: "\r\n", col_offset: 0).to_2022_csv_row) file.close end @@ -369,7 +369,7 @@ RSpec.describe BulkUpload::Lettings::Validator do let(:log) { build(:lettings_log, :in_progress, created_by: user, startdate: Time.zone.local(2022, 5, 1)) } before do - file.write(BulkUpload::LogToCsv.new(log:, line_ending: "\r\n", col_offset: 0).to_2022_csv_row) + file.write(BulkUpload::LettingsLogToCsv.new(log:, line_ending: "\r\n", col_offset: 0).to_2022_csv_row) file.close end diff --git a/spec/services/bulk_upload/lettings/year2022/csv_parser_spec.rb b/spec/services/bulk_upload/lettings/year2022/csv_parser_spec.rb index 10e722e9a..cae0285bf 100644 --- a/spec/services/bulk_upload/lettings/year2022/csv_parser_spec.rb +++ b/spec/services/bulk_upload/lettings/year2022/csv_parser_spec.rb @@ -9,8 +9,8 @@ RSpec.describe BulkUpload::Lettings::Year2022::CsvParser do context "when parsing csv with headers" do before do - file.write(BulkUpload::LogToCsv.new(log:).default_2022_field_numbers_row) - file.write(BulkUpload::LogToCsv.new(log:).to_2022_csv_row) + file.write(BulkUpload::LettingsLogToCsv.new(log:).default_2022_field_numbers_row) + file.write(BulkUpload::LettingsLogToCsv.new(log:).to_2022_csv_row) file.rewind end @@ -27,8 +27,8 @@ RSpec.describe BulkUpload::Lettings::Year2022::CsvParser do context "when parsing csv with headers with extra rows" do before do file.write("Extra row\n") - file.write(BulkUpload::LogToCsv.new(log:).default_2022_field_numbers_row) - file.write(BulkUpload::LogToCsv.new(log:).to_2022_csv_row) + file.write(BulkUpload::LettingsLogToCsv.new(log:).default_2022_field_numbers_row) + file.write(BulkUpload::LettingsLogToCsv.new(log:).to_2022_csv_row) file.rewind end @@ -46,8 +46,8 @@ RSpec.describe BulkUpload::Lettings::Year2022::CsvParser do let(:seed) { rand } before do - file.write(BulkUpload::LogToCsv.new(log:).default_2022_field_numbers_row(seed:)) - file.write(BulkUpload::LogToCsv.new(log:).to_2022_csv_row(seed:)) + file.write(BulkUpload::LettingsLogToCsv.new(log:).default_2022_field_numbers_row(seed:)) + file.write(BulkUpload::LettingsLogToCsv.new(log:).to_2022_csv_row(seed:)) file.rewind end @@ -63,7 +63,7 @@ RSpec.describe BulkUpload::Lettings::Year2022::CsvParser do context "when parsing csv with extra invalid headers" do let(:seed) { rand } - let(:log_to_csv) { BulkUpload::LogToCsv.new(log:) } + let(:log_to_csv) { BulkUpload::LettingsLogToCsv.new(log:) } let(:field_numbers) { log_to_csv.default_2022_field_numbers + %w[invalid_field_number] } let(:field_values) { log_to_csv.to_2022_row + %w[value_for_invalid_field_number] } @@ -84,7 +84,7 @@ RSpec.describe BulkUpload::Lettings::Year2022::CsvParser do context "when parsing csv without headers" do before do - file.write(BulkUpload::LogToCsv.new(log:, col_offset: 0).to_2022_csv_row) + file.write(BulkUpload::LettingsLogToCsv.new(log:, col_offset: 0).to_2022_csv_row) file.rewind end @@ -103,7 +103,7 @@ RSpec.describe BulkUpload::Lettings::Year2022::CsvParser do before do file.write(bom) - file.write(BulkUpload::LogToCsv.new(log:, col_offset: 0).to_2022_csv_row) + file.write(BulkUpload::LettingsLogToCsv.new(log:, col_offset: 0).to_2022_csv_row) file.rewind end @@ -117,7 +117,7 @@ RSpec.describe BulkUpload::Lettings::Year2022::CsvParser do before do file.write(invalid_sequence) - file.write(BulkUpload::LogToCsv.new(log:, col_offset: 0).to_2022_csv_row) + file.write(BulkUpload::LettingsLogToCsv.new(log:, col_offset: 0).to_2022_csv_row) file.rewind end @@ -129,8 +129,8 @@ RSpec.describe BulkUpload::Lettings::Year2022::CsvParser do describe "#column_for_field", aggregate_failures: true do context "when with headers using default ordering" do before do - file.write(BulkUpload::LogToCsv.new(log:).default_2022_field_numbers_row) - file.write(BulkUpload::LogToCsv.new(log:).to_2022_csv_row) + file.write(BulkUpload::LettingsLogToCsv.new(log:).default_2022_field_numbers_row) + file.write(BulkUpload::LettingsLogToCsv.new(log:).to_2022_csv_row) file.rewind end @@ -142,7 +142,7 @@ RSpec.describe BulkUpload::Lettings::Year2022::CsvParser do context "when without headers using default ordering" do before do - file.write(BulkUpload::LogToCsv.new(log:).to_2022_csv_row) + file.write(BulkUpload::LettingsLogToCsv.new(log:).to_2022_csv_row) file.rewind end @@ -156,8 +156,8 @@ RSpec.describe BulkUpload::Lettings::Year2022::CsvParser do let(:seed) { 123 } before do - file.write(BulkUpload::LogToCsv.new(log:).default_2022_field_numbers_row(seed:)) - file.write(BulkUpload::LogToCsv.new(log:).to_2022_csv_row(seed:)) + file.write(BulkUpload::LettingsLogToCsv.new(log:).default_2022_field_numbers_row(seed:)) + file.write(BulkUpload::LettingsLogToCsv.new(log:).to_2022_csv_row(seed:)) file.rewind end diff --git a/spec/services/bulk_upload/lettings/year2023/csv_parser_spec.rb b/spec/services/bulk_upload/lettings/year2023/csv_parser_spec.rb index fc82faa8d..c94bdae35 100644 --- a/spec/services/bulk_upload/lettings/year2023/csv_parser_spec.rb +++ b/spec/services/bulk_upload/lettings/year2023/csv_parser_spec.rb @@ -15,8 +15,8 @@ RSpec.describe BulkUpload::Lettings::Year2023::CsvParser do file.write("Can be empty?\n") file.write("Type of letting the question applies to\n") file.write("Duplicate check field?\n") - file.write(BulkUpload::LogToCsv.new(log:).default_2023_field_numbers_row) - file.write(BulkUpload::LogToCsv.new(log:).to_2023_csv_row) + file.write(BulkUpload::LettingsLogToCsv.new(log:).default_2023_field_numbers_row) + file.write(BulkUpload::LettingsLogToCsv.new(log:).to_2023_csv_row) file.rewind end @@ -39,8 +39,8 @@ RSpec.describe BulkUpload::Lettings::Year2023::CsvParser do file.write("Can be empty?\n") file.write("Type of letting the question applies to\n") file.write("Duplicate check field?\n") - file.write(BulkUpload::LogToCsv.new(log:).default_2023_field_numbers_row) - file.write(BulkUpload::LogToCsv.new(log:).to_2023_csv_row) + file.write(BulkUpload::LettingsLogToCsv.new(log:).default_2023_field_numbers_row) + file.write(BulkUpload::LettingsLogToCsv.new(log:).to_2023_csv_row) file.rewind end @@ -64,8 +64,8 @@ RSpec.describe BulkUpload::Lettings::Year2023::CsvParser do file.write("Can be empty?\n") file.write("Type of letting the question applies to\n") file.write("Duplicate check field?\n") - file.write(BulkUpload::LogToCsv.new(log:).default_2023_field_numbers_row(seed:)) - file.write(BulkUpload::LogToCsv.new(log:).to_2023_csv_row(seed:)) + file.write(BulkUpload::LettingsLogToCsv.new(log:).default_2023_field_numbers_row(seed:)) + file.write(BulkUpload::LettingsLogToCsv.new(log:).to_2023_csv_row(seed:)) file.rewind end @@ -81,7 +81,7 @@ RSpec.describe BulkUpload::Lettings::Year2023::CsvParser do context "when parsing csv with extra invalid headers" do let(:seed) { rand } - let(:log_to_csv) { BulkUpload::LogToCsv.new(log:) } + let(:log_to_csv) { BulkUpload::LettingsLogToCsv.new(log:) } let(:field_numbers) { log_to_csv.default_2023_field_numbers + %w[invalid_field_number] } let(:field_values) { log_to_csv.to_2023_row + %w[value_for_invalid_field_number] } @@ -108,7 +108,7 @@ RSpec.describe BulkUpload::Lettings::Year2023::CsvParser do context "when parsing csv without headers" do before do - file.write(BulkUpload::LogToCsv.new(log:, col_offset: 0).to_2023_csv_row) + file.write(BulkUpload::LettingsLogToCsv.new(log:, col_offset: 0).to_2023_csv_row) file.rewind end @@ -127,7 +127,7 @@ RSpec.describe BulkUpload::Lettings::Year2023::CsvParser do before do file.write(bom) - file.write(BulkUpload::LogToCsv.new(log:, col_offset: 0).to_2023_csv_row) + file.write(BulkUpload::LettingsLogToCsv.new(log:, col_offset: 0).to_2023_csv_row) file.rewind end @@ -141,7 +141,7 @@ RSpec.describe BulkUpload::Lettings::Year2023::CsvParser do before do file.write(invalid_sequence) - file.write(BulkUpload::LogToCsv.new(log:, col_offset: 0).to_2023_csv_row) + file.write(BulkUpload::LettingsLogToCsv.new(log:, col_offset: 0).to_2023_csv_row) file.rewind end @@ -159,8 +159,8 @@ RSpec.describe BulkUpload::Lettings::Year2023::CsvParser do file.write("Can be empty?\n") file.write("Type of letting the question applies to\n") file.write("Duplicate check field?\n") - file.write(BulkUpload::LogToCsv.new(log:).default_2023_field_numbers_row) - file.write(BulkUpload::LogToCsv.new(log:).to_2023_csv_row) + file.write(BulkUpload::LettingsLogToCsv.new(log:).default_2023_field_numbers_row) + file.write(BulkUpload::LettingsLogToCsv.new(log:).to_2023_csv_row) file.rewind end @@ -172,7 +172,7 @@ RSpec.describe BulkUpload::Lettings::Year2023::CsvParser do context "when without headers using default ordering" do before do - file.write(BulkUpload::LogToCsv.new(log:, col_offset: 0).to_2023_csv_row) + file.write(BulkUpload::LettingsLogToCsv.new(log:, col_offset: 0).to_2023_csv_row) file.rewind end @@ -192,8 +192,8 @@ RSpec.describe BulkUpload::Lettings::Year2023::CsvParser do file.write("Can be empty?\n") file.write("Type of letting the question applies to\n") file.write("Duplicate check field?\n") - file.write(BulkUpload::LogToCsv.new(log:).default_2023_field_numbers_row(seed:)) - file.write(BulkUpload::LogToCsv.new(log:).to_2023_csv_row(seed:)) + file.write(BulkUpload::LettingsLogToCsv.new(log:).default_2023_field_numbers_row(seed:)) + file.write(BulkUpload::LettingsLogToCsv.new(log:).to_2023_csv_row(seed:)) file.rewind end diff --git a/spec/services/bulk_upload/processor_spec.rb b/spec/services/bulk_upload/processor_spec.rb index 64ee0e197..0c9d50be8 100644 --- a/spec/services/bulk_upload/processor_spec.rb +++ b/spec/services/bulk_upload/processor_spec.rb @@ -165,7 +165,7 @@ RSpec.describe BulkUpload::Processor do end before do - file.write(BulkUpload::LogToCsv.new(log:, col_offset: 0).to_2022_csv_row) + file.write(BulkUpload::LettingsLogToCsv.new(log:, col_offset: 0).to_2022_csv_row) file.rewind allow(BulkUpload::Downloader).to receive(:new).with(bulk_upload:).and_return(mock_downloader) @@ -213,7 +213,7 @@ RSpec.describe BulkUpload::Processor do end before do - file.write(BulkUpload::LogToCsv.new(log:, col_offset: 0).to_2022_csv_row) + file.write(BulkUpload::LettingsLogToCsv.new(log:, col_offset: 0).to_2022_csv_row) file.rewind allow(BulkUpload::Downloader).to receive(:new).with(bulk_upload:).and_return(mock_downloader) @@ -265,7 +265,7 @@ RSpec.describe BulkUpload::Processor do end before do - file.write(BulkUpload::LogToCsv.new(log:, col_offset: 0).to_2022_csv_row) + file.write(BulkUpload::LettingsLogToCsv.new(log:, col_offset: 0).to_2022_csv_row) file.rewind allow(BulkUpload::Downloader).to receive(:new).with(bulk_upload:).and_return(mock_downloader) diff --git a/spec/services/bulk_upload/sales/log_creator_spec.rb b/spec/services/bulk_upload/sales/log_creator_spec.rb index 4ec1a07fd..2e28ce81b 100644 --- a/spec/services/bulk_upload/sales/log_creator_spec.rb +++ b/spec/services/bulk_upload/sales/log_creator_spec.rb @@ -35,9 +35,9 @@ RSpec.describe BulkUpload::Sales::LogCreator do let(:log) { SalesLog.new } before do - file.write(BulkUpload::LogToCsv.new(log:, col_offset: 0).to_2022_sales_csv_row) - file.write(BulkUpload::LogToCsv.new(log:, col_offset: 0).to_2022_sales_csv_row) - file.write(BulkUpload::LogToCsv.new(log:, col_offset: 0).to_2022_sales_csv_row) + file.write(BulkUpload::LettingsLogToCsv.new(log:, col_offset: 0).to_2022_sales_csv_row) + file.write(BulkUpload::LettingsLogToCsv.new(log:, col_offset: 0).to_2022_sales_csv_row) + file.write(BulkUpload::LettingsLogToCsv.new(log:, col_offset: 0).to_2022_sales_csv_row) file.rewind end @@ -59,7 +59,7 @@ RSpec.describe BulkUpload::Sales::LogCreator do end before do - file.write(BulkUpload::LogToCsv.new(log:, col_offset: 0).to_2022_sales_csv_row) + file.write(BulkUpload::LettingsLogToCsv.new(log:, col_offset: 0).to_2022_sales_csv_row) file.rewind end diff --git a/spec/services/bulk_upload/sales/validator_spec.rb b/spec/services/bulk_upload/sales/validator_spec.rb index c2236f38d..f10fc8e44 100644 --- a/spec/services/bulk_upload/sales/validator_spec.rb +++ b/spec/services/bulk_upload/sales/validator_spec.rb @@ -87,7 +87,7 @@ RSpec.describe BulkUpload::Sales::Validator do let(:path) { file.path } before do - file.write(BulkUpload::LogToCsv.new(log:, line_ending: "\r\n", col_offset: 0).to_2022_sales_csv_row) + file.write(BulkUpload::LettingsLogToCsv.new(log:, line_ending: "\r\n", col_offset: 0).to_2022_sales_csv_row) file.close end @@ -129,8 +129,8 @@ RSpec.describe BulkUpload::Sales::Validator do let(:log_2) { build(:sales_log, :completed, created_by: user) } before do - file.write(BulkUpload::LogToCsv.new(log: log_1, line_ending: "\r\n", col_offset: 0).to_2022_sales_csv_row) - file.write(BulkUpload::LogToCsv.new(log: log_2, line_ending: "\r\n", col_offset: 0, overrides: { organisation_id: "random" }).to_2022_sales_csv_row) + file.write(BulkUpload::LettingsLogToCsv.new(log: log_1, line_ending: "\r\n", col_offset: 0).to_2022_sales_csv_row) + file.write(BulkUpload::LettingsLogToCsv.new(log: log_2, line_ending: "\r\n", col_offset: 0, overrides: { organisation_id: "random" }).to_2022_sales_csv_row) file.close end @@ -145,8 +145,8 @@ RSpec.describe BulkUpload::Sales::Validator do let(:log_2) { build(:sales_log, :completed, created_by: user) } before do - file.write(BulkUpload::LogToCsv.new(log: log_1, line_ending: "\r\n", col_offset: 0).to_2022_sales_csv_row) - file.write(BulkUpload::LogToCsv.new(log: log_2, line_ending: "\r\n", col_offset: 0).to_2022_sales_csv_row) + file.write(BulkUpload::LettingsLogToCsv.new(log: log_1, line_ending: "\r\n", col_offset: 0).to_2022_sales_csv_row) + file.write(BulkUpload::LettingsLogToCsv.new(log: log_2, line_ending: "\r\n", col_offset: 0).to_2022_sales_csv_row) file.close end @@ -162,7 +162,7 @@ RSpec.describe BulkUpload::Sales::Validator do let(:log_1) { build(:sales_log, :completed, created_by: user, owning_organisation: unaffiliated_org) } before do - file.write(BulkUpload::LogToCsv.new(log: log_1, line_ending: "\r\n", col_offset: 0).to_2022_sales_csv_row) + file.write(BulkUpload::LettingsLogToCsv.new(log: log_1, line_ending: "\r\n", col_offset: 0).to_2022_sales_csv_row) file.close end @@ -176,7 +176,7 @@ RSpec.describe BulkUpload::Sales::Validator do let(:log) { build(:sales_log, created_by: user, saledate: Time.zone.local(2022, 5, 1)) } before do - file.write(BulkUpload::LogToCsv.new(log:, line_ending: "\r\n", col_offset: 0).to_2022_sales_csv_row) + file.write(BulkUpload::LettingsLogToCsv.new(log:, line_ending: "\r\n", col_offset: 0).to_2022_sales_csv_row) file.close end @@ -195,11 +195,11 @@ RSpec.describe BulkUpload::Sales::Validator do let(:log_5) { build(:sales_log, :in_progress, created_by: user, saledate: Time.zone.local(2022, 5, 1)) } before do - file.write(BulkUpload::LogToCsv.new(log: log_1, line_ending: "\r\n", col_offset: 0).to_2022_sales_csv_row) - file.write(BulkUpload::LogToCsv.new(log: log_2, line_ending: "\r\n", col_offset: 0).to_2022_sales_csv_row) - file.write(BulkUpload::LogToCsv.new(log: log_3, line_ending: "\r\n", col_offset: 0).to_2022_sales_csv_row) - file.write(BulkUpload::LogToCsv.new(log: log_4, line_ending: "\r\n", col_offset: 0).to_2022_sales_csv_row) - file.write(BulkUpload::LogToCsv.new(log: log_5, line_ending: "\r\n", col_offset: 0).to_2022_sales_csv_row) + file.write(BulkUpload::LettingsLogToCsv.new(log: log_1, line_ending: "\r\n", col_offset: 0).to_2022_sales_csv_row) + file.write(BulkUpload::LettingsLogToCsv.new(log: log_2, line_ending: "\r\n", col_offset: 0).to_2022_sales_csv_row) + file.write(BulkUpload::LettingsLogToCsv.new(log: log_3, line_ending: "\r\n", col_offset: 0).to_2022_sales_csv_row) + file.write(BulkUpload::LettingsLogToCsv.new(log: log_4, line_ending: "\r\n", col_offset: 0).to_2022_sales_csv_row) + file.write(BulkUpload::LettingsLogToCsv.new(log: log_5, line_ending: "\r\n", col_offset: 0).to_2022_sales_csv_row) file.close end @@ -217,11 +217,11 @@ RSpec.describe BulkUpload::Sales::Validator do let(:log_5) { build(:sales_log, :in_progress, created_by: user, saledate: Time.zone.local(2022, 5, 1)) } before do - file.write(BulkUpload::LogToCsv.new(log: log_1, line_ending: "\r\n", col_offset: 0).to_2022_sales_csv_row) - file.write(BulkUpload::LogToCsv.new(log: log_2, line_ending: "\r\n", col_offset: 0).to_2022_sales_csv_row) - file.write(BulkUpload::LogToCsv.new(log: log_3, line_ending: "\r\n", col_offset: 0).to_2022_sales_csv_row) - file.write(BulkUpload::LogToCsv.new(log: log_4, line_ending: "\r\n", col_offset: 0).to_2022_sales_csv_row) - file.write(BulkUpload::LogToCsv.new(log: log_5, line_ending: "\r\n", col_offset: 0).to_2022_sales_csv_row) + file.write(BulkUpload::LettingsLogToCsv.new(log: log_1, line_ending: "\r\n", col_offset: 0).to_2022_sales_csv_row) + file.write(BulkUpload::LettingsLogToCsv.new(log: log_2, line_ending: "\r\n", col_offset: 0).to_2022_sales_csv_row) + file.write(BulkUpload::LettingsLogToCsv.new(log: log_3, line_ending: "\r\n", col_offset: 0).to_2022_sales_csv_row) + file.write(BulkUpload::LettingsLogToCsv.new(log: log_4, line_ending: "\r\n", col_offset: 0).to_2022_sales_csv_row) + file.write(BulkUpload::LettingsLogToCsv.new(log: log_5, line_ending: "\r\n", col_offset: 0).to_2022_sales_csv_row) file.close end diff --git a/spec/services/bulk_upload/sales/year2022/csv_parser_spec.rb b/spec/services/bulk_upload/sales/year2022/csv_parser_spec.rb index cabcefc1a..0fe8c5a64 100644 --- a/spec/services/bulk_upload/sales/year2022/csv_parser_spec.rb +++ b/spec/services/bulk_upload/sales/year2022/csv_parser_spec.rb @@ -22,7 +22,7 @@ RSpec.describe BulkUpload::Sales::Year2022::CsvParser do let(:log) { build(:sales_log, :completed) } before do - file.write(BulkUpload::LogToCsv.new(log:, col_offset: 0).to_2022_sales_csv_row) + file.write(BulkUpload::LettingsLogToCsv.new(log:, col_offset: 0).to_2022_sales_csv_row) file.rewind end @@ -44,7 +44,7 @@ RSpec.describe BulkUpload::Sales::Year2022::CsvParser do before do file.write(bom) - file.write(BulkUpload::LogToCsv.new(log:, col_offset: 0).to_2022_sales_csv_row) + file.write(BulkUpload::LettingsLogToCsv.new(log:, col_offset: 0).to_2022_sales_csv_row) file.close end @@ -61,7 +61,7 @@ RSpec.describe BulkUpload::Sales::Year2022::CsvParser do before do file.write(invalid_sequence) - file.write(BulkUpload::LogToCsv.new(log:, col_offset: 0).to_2022_sales_csv_row) + file.write(BulkUpload::LettingsLogToCsv.new(log:, col_offset: 0).to_2022_sales_csv_row) file.close end @@ -84,7 +84,7 @@ RSpec.describe BulkUpload::Sales::Year2022::CsvParser do let(:log) { build(:sales_log, :completed) } before do - file.write(BulkUpload::LogToCsv.new(log:, col_offset: 0).to_2022_sales_csv_row) + file.write(BulkUpload::LettingsLogToCsv.new(log:, col_offset: 0).to_2022_sales_csv_row) file.rewind end diff --git a/spec/support/bulk_upload/log_to_csv.rb b/spec/support/bulk_upload/lettings_log_to_csv.rb similarity index 99% rename from spec/support/bulk_upload/log_to_csv.rb rename to spec/support/bulk_upload/lettings_log_to_csv.rb index 6064e57e3..771569c2c 100644 --- a/spec/support/bulk_upload/log_to_csv.rb +++ b/spec/support/bulk_upload/lettings_log_to_csv.rb @@ -1,4 +1,4 @@ -class BulkUpload::LogToCsv +class BulkUpload::LettingsLogToCsv attr_reader :log, :line_ending, :col_offset, :overrides def initialize(log:, line_ending: "\n", col_offset: 1, overrides: {})