baarkerlounger
/
submit-social-housing-lettings-and-sales-data
mirror of https://github.com/communitiesuk/submit-social-housing-lettings-and-sales-data.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

refactor repetitive sales csv methods (#2954) 

* refactor repetitive sales csv methods

* remove 2025 test until 2025 functionality is actually merged

* fix syntax typo

* fix incorrect method

* fix indentation

---------

Co-authored-by: Carolyn <carolyn.barker@softwire.com>
CLDC-3861-move-newbuild-questions^2 v0.4.99
carolynbarker 1 week ago committed by GitHub
parent
ac1d2ce8d9
commit
f268357616
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
4 changed files with 53 additions and 101 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 100
      app/helpers/bulk_upload/sales_log_to_csv.rb
  2. 4
      spec/services/bulk_upload/sales/validator_spec.rb
  3. 24
      spec/services/bulk_upload/sales/year2023/csv_parser_spec.rb
  4. 26
      spec/services/bulk_upload/sales/year2024/csv_parser_spec.rb

100
app/helpers/bulk_upload/sales_log_to_csv.rb
Unescape View File

@ -18,11 +18,9 @@ class BulkUpload::SalesLogToCsv
year = log.collection_start_year year = log.collection_start_year
case year case year
when 2022 when 2022
to_2022_csv_row(seed:) to_2022_csv_row
when 2023 when 2023, 2024
to_2023_csv_row(seed:) to_year_csv_row(year, seed:)
when 2024
to_2024_csv_row(seed:)
else else
raise NotImplementedError "No mapping function implemented for year #{year}" raise NotImplementedError "No mapping function implemented for year #{year}"
end end
@ -30,93 +28,55 @@ class BulkUpload::SalesLogToCsv
def to_row def to_row
year = log.collection_start_year year = log.collection_start_year
case year send("to_#{year}_row")
when 2022 rescue NoMethodError
to_2022_row raise NotImplementedError "No mapping function implemented for year #{year}"
when 2023
to_2023_row
when 2024
to_2024_row
else
raise NotImplementedError "No mapping function implemented for year #{year}"
end
end end
def default_field_numbers_row(seed: nil) def default_field_numbers_row(seed: nil)
year = log.collection_start_year year = log.collection_start_year
case year default_field_numbers_row_for_year(year, seed:)
when 2022
default_2022_field_numbers_row(seed:)
when 2023
default_2023_field_numbers_row(seed:)
when 2024
default_2024_field_numbers_row(seed:)
else
raise NotImplementedError "No mapping function implemented for year #{year}"
end
end end
def default_field_numbers def default_field_numbers
year = log.collection_start_year year = log.collection_start_year
case year default_field_numbers_for_year(year)
when 2022
default_2022_field_numbers
when 2023
default_2023_field_numbers
when 2024
default_2024_field_numbers
else
raise NotImplementedError "No mapping function implemented for year #{year}"
end
end end
def to_2022_csv_row def to_2022_csv_row
(row_prefix + to_2022_row).flatten.join(",") + line_ending (row_prefix + to_2022_row).flatten.join(",") + line_ending
end end
def to_2023_csv_row(seed: nil) def to_year_csv_row(year, seed: nil)
unshuffled_row = send("to_#{year}_row")
if seed if seed
row = to_2023_row.shuffle(random: Random.new(seed)) row = unshuffled_row.shuffle(random: Random.new(seed))
(row_prefix + row).flatten.join(",") + line_ending (row_prefix + row).flatten.join(",") + line_ending
else else
(row_prefix + to_2023_row).flatten.join(",") + line_ending (row_prefix + unshuffled_row).flatten.join(",") + line_ending
end end
rescue NoMethodError
raise NotImplementedError "No mapping function implemented for year #{year}"
end end
def to_2024_csv_row(seed: nil) def default_field_numbers_for_year(year)
if seed case year
row = to_2024_row.shuffle(random: Random.new(seed)) when 2022
(row_prefix + row).flatten.join(",") + line_ending (1..125).to_a
when 2023
[6, 3, 4, 5, nil, 28, 30, 38, 47, 51, 55, 59, 31, 39, 48, 52, 56, 60, 37, 46, 50, 54, 58, 35, 43, 49, 53, 57, 61, 32, 33, 78, 80, 79, 81, 83, 84, nil, 62, 66, 64, 65, 63, 67, 69, 70, 68, 76, 77, 16, 17, 18, 26, 24, 25, 27, 8, 91, 95, 96, 97, 92, 93, 94, 98, 100, 101, 103, 104, 106, 110, 111, 112, 113, 114, 9, 116, 117, 118, 120, 124, 125, 126, 10, 11, nil, 127, 129, 133, 134, 135, 1, 2, nil, 73, nil, 75, 107, 108, 121, 122, 130, 131, 82, 109, 123, 132, 115, 15, 86, 87, 29, 7, 12, 13, 14, 36, 44, 45, 88, 89, 102, 105, 119, 128, 19, 20, 21, 22, 23, 34, 40, 41, 42, 71, 72, 74, 85, 90, 99]
when 2024
(1..131).to_a
else else
(row_prefix + to_2024_row).flatten.join(",") + line_ending raise NotImplementedError "No mapping function implemented for year #{year}"
end end
end end
def default_2022_field_numbers def default_field_numbers_row_for_year(year, seed: nil)
(1..125).to_a
end
def default_2022_field_numbers_row(seed: nil)
if seed if seed
["Field number"] + default_2022_field_numbers.shuffle(random: Random.new(seed)) ["Field number"] + default_field_numbers_for_year(year).shuffle(random: Random.new(seed))
else else
["Field number"] + default_2022_field_numbers ["Field number"] + default_field_numbers_for_year(year)
end.flatten.join(",") + line_ending
end
def default_2023_field_numbers_row(seed: nil)
if seed
["Field number"] + default_2023_field_numbers.shuffle(random: Random.new(seed))
else
["Field number"] + default_2023_field_numbers
end.flatten.join(",") + line_ending
end
def default_2024_field_numbers_row(seed: nil)
if seed
["Field number"] + default_2024_field_numbers.shuffle(random: Random.new(seed))
else
["Field number"] + default_2024_field_numbers
end.flatten.join(",") + line_ending end.flatten.join(",") + line_ending
end end
@ -435,10 +395,6 @@ class BulkUpload::SalesLogToCsv
] ]
end end
def default_2023_field_numbers
[6, 3, 4, 5, nil, 28, 30, 38, 47, 51, 55, 59, 31, 39, 48, 52, 56, 60, 37, 46, 50, 54, 58, 35, 43, 49, 53, 57, 61, 32, 33, 78, 80, 79, 81, 83, 84, nil, 62, 66, 64, 65, 63, 67, 69, 70, 68, 76, 77, 16, 17, 18, 26, 24, 25, 27, 8, 91, 95, 96, 97, 92, 93, 94, 98, 100, 101, 103, 104, 106, 110, 111, 112, 113, 114, 9, 116, 117, 118, 120, 124, 125, 126, 10, 11, nil, 127, 129, 133, 134, 135, 1, 2, nil, 73, nil, 75, 107, 108, 121, 122, 130, 131, 82, 109, 123, 132, 115, 15, 86, 87, 29, 7, 12, 13, 14, 36, 44, 45, 88, 89, 102, 105, 119, 128, 19, 20, 21, 22, 23, 34, 40, 41, 42, 71, 72, 74, 85, 90, 99]
end
def custom_field_numbers_row(seed: nil, field_numbers: nil) def custom_field_numbers_row(seed: nil, field_numbers: nil)
if seed if seed
["Field number"] + field_numbers.shuffle(random: Random.new(seed)) ["Field number"] + field_numbers.shuffle(random: Random.new(seed))
@ -452,10 +408,6 @@ class BulkUpload::SalesLogToCsv
(row_prefix + row).flatten.join(",") + line_ending (row_prefix + row).flatten.join(",") + line_ending
end end
def default_2024_field_numbers
(1..131).to_a
end
private private
def hhregres def hhregres

4
spec/services/bulk_upload/sales/validator_spec.rb
Unescape View File

@ -47,8 +47,8 @@ RSpec.describe BulkUpload::Sales::Validator do
let(:log) { build(:sales_log, :completed, saledate: Time.zone.local(2023, 10, 10), assigned_to: user) } let(:log) { build(:sales_log, :completed, saledate: Time.zone.local(2023, 10, 10), assigned_to: user) }
before do before do
file.write(log_to_csv.default_2024_field_numbers_row) file.write(log_to_csv.default_field_numbers_row_for_year(2024))
file.write(log_to_csv.to_2024_csv_row) file.write(log_to_csv.to_year_csv_row(2024))
file.rewind file.rewind
end end

24
spec/services/bulk_upload/sales/year2023/csv_parser_spec.rb
Unescape View File

@ -15,8 +15,8 @@ RSpec.describe BulkUpload::Sales::Year2023::CsvParser do
file.write("Can be empty?\n") file.write("Can be empty?\n")
file.write("Type of letting the question applies to\n") file.write("Type of letting the question applies to\n")
file.write("Duplicate check field?\n") file.write("Duplicate check field?\n")
file.write(BulkUpload::SalesLogToCsv.new(log:).default_2023_field_numbers_row) file.write(BulkUpload::SalesLogToCsv.new(log:).default_field_numbers_row_for_year(2023))
file.write(BulkUpload::SalesLogToCsv.new(log:).to_2023_csv_row) file.write(BulkUpload::SalesLogToCsv.new(log:).to_year_csv_row(2023))
file.rewind file.rewind
end end
@ -44,8 +44,8 @@ RSpec.describe BulkUpload::Sales::Year2023::CsvParser do
file.write("Can be empty?\n") file.write("Can be empty?\n")
file.write("Type of letting the question applies to\n") file.write("Type of letting the question applies to\n")
file.write("Duplicate check field?\n") file.write("Duplicate check field?\n")
file.write(BulkUpload::SalesLogToCsv.new(log:).default_2023_field_numbers_row(seed:)) file.write(BulkUpload::SalesLogToCsv.new(log:).default_field_numbers_row_for_year(2023, seed:))
file.write(BulkUpload::SalesLogToCsv.new(log:).to_2023_csv_row(seed:)) file.write(BulkUpload::SalesLogToCsv.new(log:).to_year_csv_row(2023, seed:))
file.rewind file.rewind
end end
@ -65,7 +65,7 @@ RSpec.describe BulkUpload::Sales::Year2023::CsvParser do
let(:log) { build(:sales_log, :completed, :with_uprn) } let(:log) { build(:sales_log, :completed, :with_uprn) }
before do before do
file.write(BulkUpload::SalesLogToCsv.new(log:, col_offset: 0).to_2023_csv_row) file.write(BulkUpload::SalesLogToCsv.new(log:, col_offset: 0).to_year_csv_row(2023))
file.rewind file.rewind
end end
@ -87,7 +87,7 @@ RSpec.describe BulkUpload::Sales::Year2023::CsvParser do
before do before do
file.write(bom) file.write(bom)
file.write(BulkUpload::SalesLogToCsv.new(log:, col_offset: 0).to_2023_csv_row) file.write(BulkUpload::SalesLogToCsv.new(log:, col_offset: 0).to_year_csv_row(2023))
file.close file.close
end end
@ -104,7 +104,7 @@ RSpec.describe BulkUpload::Sales::Year2023::CsvParser do
before do before do
file.write(invalid_sequence) file.write(invalid_sequence)
file.write(BulkUpload::SalesLogToCsv.new(log:, col_offset: 0).to_2023_csv_row) file.write(BulkUpload::SalesLogToCsv.new(log:, col_offset: 0).to_year_csv_row(2023))
file.close file.close
end end
@ -122,8 +122,8 @@ RSpec.describe BulkUpload::Sales::Year2023::CsvParser do
file.write("Can be empty?\n") file.write("Can be empty?\n")
file.write("Type of letting the question applies to\n") file.write("Type of letting the question applies to\n")
file.write("Duplicate check field?\n") file.write("Duplicate check field?\n")
file.write(BulkUpload::SalesLogToCsv.new(log:).default_2023_field_numbers_row) file.write(BulkUpload::SalesLogToCsv.new(log:).default_field_numbers_row_for_year(2023))
file.write(BulkUpload::SalesLogToCsv.new(log:).to_2023_csv_row) file.write(BulkUpload::SalesLogToCsv.new(log:).to_year_csv_row(2023))
file.rewind file.rewind
end end
@ -139,7 +139,7 @@ RSpec.describe BulkUpload::Sales::Year2023::CsvParser do
let(:log) { build(:sales_log, :completed, :with_uprn) } let(:log) { build(:sales_log, :completed, :with_uprn) }
before do before do
file.write(BulkUpload::SalesLogToCsv.new(log:, col_offset: 0).to_2023_csv_row) file.write(BulkUpload::SalesLogToCsv.new(log:, col_offset: 0).to_year_csv_row(2023))
file.rewind file.rewind
end end
@ -158,8 +158,8 @@ RSpec.describe BulkUpload::Sales::Year2023::CsvParser do
file.write("Can be empty?\r") file.write("Can be empty?\r")
file.write("Type of letting the question applies to\r\n") file.write("Type of letting the question applies to\r\n")
file.write("Duplicate check field?\r") file.write("Duplicate check field?\r")
file.write(BulkUpload::SalesLogToCsv.new(log:).default_2023_field_numbers_row) file.write(BulkUpload::SalesLogToCsv.new(log:).default_field_numbers_row_for_year(2023))
file.write(BulkUpload::SalesLogToCsv.new(log:).to_2023_csv_row) file.write(BulkUpload::SalesLogToCsv.new(log:).to_year_csv_row(2023))
file.rewind file.rewind
end end

26
spec/services/bulk_upload/sales/year2024/csv_parser_spec.rb
Unescape View File

@ -15,8 +15,8 @@ RSpec.describe BulkUpload::Sales::Year2024::CsvParser do
file.write("Can be empty?\n") file.write("Can be empty?\n")
file.write("Type of letting the question applies to\n") file.write("Type of letting the question applies to\n")
file.write("Duplicate check field?\n") file.write("Duplicate check field?\n")
file.write(BulkUpload::SalesLogToCsv.new(log:).default_2024_field_numbers_row) file.write(BulkUpload::SalesLogToCsv.new(log:).default_field_numbers_row_for_year(2024))
file.write(BulkUpload::SalesLogToCsv.new(log:).to_2024_csv_row) file.write(BulkUpload::SalesLogToCsv.new(log:).to_year_csv_row(2024))
file.write("\n") file.write("\n")
file.rewind file.rewind
end end
@ -47,8 +47,8 @@ RSpec.describe BulkUpload::Sales::Year2024::CsvParser do
file.write("\n") file.write("\n")
file.write("Type of letting the question applies to\n") file.write("Type of letting the question applies to\n")
file.write("Duplicate check field?\n") file.write("Duplicate check field?\n")
file.write(BulkUpload::SalesLogToCsv.new(log:).default_2024_field_numbers_row) file.write(BulkUpload::SalesLogToCsv.new(log:).default_field_numbers_row_for_year(2024))
file.write(BulkUpload::SalesLogToCsv.new(log:).to_2024_csv_row) file.write(BulkUpload::SalesLogToCsv.new(log:).to_year_csv_row(2024))
file.write("\n") file.write("\n")
file.rewind file.rewind
end end
@ -81,8 +81,8 @@ RSpec.describe BulkUpload::Sales::Year2024::CsvParser do
file.write("Can be empty?\n") file.write("Can be empty?\n")
file.write("Type of letting the question applies to\n") file.write("Type of letting the question applies to\n")
file.write("Duplicate check field?\n") file.write("Duplicate check field?\n")
file.write(BulkUpload::SalesLogToCsv.new(log:).default_2024_field_numbers_row(seed:)) file.write(BulkUpload::SalesLogToCsv.new(log:).default_field_numbers_row_for_year(2024, seed:))
file.write(BulkUpload::SalesLogToCsv.new(log:).to_2024_csv_row(seed:)) file.write(BulkUpload::SalesLogToCsv.new(log:).to_year_csv_row(2024, seed:))
file.rewind file.rewind
end end
@ -102,7 +102,7 @@ RSpec.describe BulkUpload::Sales::Year2024::CsvParser do
let(:log) { build(:sales_log, :completed, :with_uprn) } let(:log) { build(:sales_log, :completed, :with_uprn) }
before do before do
file.write(BulkUpload::SalesLogToCsv.new(log:, col_offset: 0).to_2024_csv_row) file.write(BulkUpload::SalesLogToCsv.new(log:, col_offset: 0).to_year_csv_row(2024))
file.rewind file.rewind
end end
@ -124,7 +124,7 @@ RSpec.describe BulkUpload::Sales::Year2024::CsvParser do
before do before do
file.write(bom) file.write(bom)
file.write(BulkUpload::SalesLogToCsv.new(log:, col_offset: 0).to_2024_csv_row) file.write(BulkUpload::SalesLogToCsv.new(log:, col_offset: 0).to_year_csv_row(2024))
file.close file.close
end end
@ -141,7 +141,7 @@ RSpec.describe BulkUpload::Sales::Year2024::CsvParser do
before do before do
file.write(invalid_sequence) file.write(invalid_sequence)
file.write(BulkUpload::SalesLogToCsv.new(log:, col_offset: 0).to_2024_csv_row) file.write(BulkUpload::SalesLogToCsv.new(log:, col_offset: 0).to_year_csv_row(2024))
file.close file.close
end end
@ -159,8 +159,8 @@ RSpec.describe BulkUpload::Sales::Year2024::CsvParser do
file.write("Can be empty?\n") file.write("Can be empty?\n")
file.write("Type of letting the question applies to\n") file.write("Type of letting the question applies to\n")
file.write("Duplicate check field?\n") file.write("Duplicate check field?\n")
file.write(BulkUpload::SalesLogToCsv.new(log:).default_2024_field_numbers_row) file.write(BulkUpload::SalesLogToCsv.new(log:).default_field_numbers_row_for_year(2024))
file.write(BulkUpload::SalesLogToCsv.new(log:).to_2024_csv_row) file.write(BulkUpload::SalesLogToCsv.new(log:).to_year_csv_row(2024))
file.rewind file.rewind
end end
@ -179,8 +179,8 @@ RSpec.describe BulkUpload::Sales::Year2024::CsvParser do
file.write("Can be empty?\r") file.write("Can be empty?\r")
file.write("Type of letting the question applies to\r\n") file.write("Type of letting the question applies to\r\n")
file.write("Duplicate check field?\r") file.write("Duplicate check field?\r")
file.write(BulkUpload::SalesLogToCsv.new(log:).default_2024_field_numbers_row) file.write(BulkUpload::SalesLogToCsv.new(log:).default_field_numbers_row_for_year(2024))
file.write(BulkUpload::SalesLogToCsv.new(log:).to_2024_csv_row) file.write(BulkUpload::SalesLogToCsv.new(log:).to_year_csv_row(2024))
file.rewind file.rewind
end end

Write Preview
Loading…
Cancel
Save