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

Renumber bulk upload fields for 2024

pull/2154/head
Kat 2 years ago
parent
7b0337c541
commit
0d8f269a64
6 changed files with 909 additions and 764 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. 4
      app/services/bulk_upload/sales/year2024/csv_parser.rb
  2. 1012
      app/services/bulk_upload/sales/year2024/row_parser.rb
  3. 4
      config/locales/en.yml
  4. 32
      spec/services/bulk_upload/sales/year2024/csv_parser_spec.rb
  5. 452
      spec/services/bulk_upload/sales/year2024/row_parser_spec.rb
  6. 169
      spec/support/bulk_upload/sales_log_to_csv.rb

4
app/services/bulk_upload/sales/year2024/csv_parser.rb
Unescape View File

@ -3,7 +3,7 @@ require "csv"
class BulkUpload::Sales::Year2024::CsvParser class BulkUpload::Sales::Year2024::CsvParser
include CollectionTimeHelper include CollectionTimeHelper
MAX_COLUMNS = 142 MAX_COLUMNS = 132
FORM_YEAR = 2024 FORM_YEAR = 2024
attr_reader :path attr_reader :path
@ -58,7 +58,7 @@ class BulkUpload::Sales::Year2024::CsvParser
private private
def default_field_numbers def default_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].map do |number| (1..131).map do |number|
if number.to_s.match?(/^[0-9]+$/) if number.to_s.match?(/^[0-9]+$/)
"field_#{number}" "field_#{number}"
else else

1012
app/services/bulk_upload/sales/year2024/row_parser.rb
View File

File diff suppressed because it is too large Load Diff

4
config/locales/en.yml
Unescape View File

@ -44,11 +44,11 @@ en:
bulk_upload/row_parser: &bulk_upload__row_parser__base bulk_upload/row_parser: &bulk_upload__row_parser__base
inclusion: Enter a valid value for %{question} inclusion: Enter a valid value for %{question}
spreadsheet_dupe: This is a duplicate of a log in your file spreadsheet_dupe: This is a duplicate of a log in your file
bulk_upload/lettings/year2022/row_parser: bulk_upload/lettings/year2024/row_parser:
<<: *bulk_upload__row_parser__base <<: *bulk_upload__row_parser__base
bulk_upload/lettings/year2023/row_parser: bulk_upload/lettings/year2023/row_parser:
<<: *bulk_upload__row_parser__base <<: *bulk_upload__row_parser__base
bulk_upload/sales/year2022/row_parser: bulk_upload/sales/year2024/row_parser:
<<: *bulk_upload__row_parser__base <<: *bulk_upload__row_parser__base
bulk_upload/sales/year2023/row_parser: bulk_upload/sales/year2023/row_parser:
<<: *bulk_upload__row_parser__base <<: *bulk_upload__row_parser__base

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

@ -26,7 +26,7 @@ RSpec.describe BulkUpload::Sales::Year2024::CsvParser do
end end
it "parses csv correctly" do it "parses csv correctly" do
expect(service.row_parsers[0].field_19).to eql(log.uprn) expect(service.row_parsers[0].field_22).to eql(log.uprn)
end end
end end
@ -51,7 +51,7 @@ RSpec.describe BulkUpload::Sales::Year2024::CsvParser do
end end
it "parses csv correctly" do it "parses csv correctly" do
expect(service.row_parsers[0].field_19).to eql(log.uprn) expect(service.row_parsers[0].field_22).to eql(log.uprn)
end end
end end
@ -71,7 +71,7 @@ RSpec.describe BulkUpload::Sales::Year2024::CsvParser do
end end
it "parses csv correctly" do it "parses csv correctly" do
expect(service.row_parsers[0].field_19).to eql(log.uprn) expect(service.row_parsers[0].field_22).to eql(log.uprn)
end end
end end
@ -88,7 +88,7 @@ RSpec.describe BulkUpload::Sales::Year2024::CsvParser do
end end
it "parses csv correctly" do it "parses csv correctly" do
expect(service.row_parsers[0].field_19).to eql(log.uprn) expect(service.row_parsers[0].field_22).to eql(log.uprn)
end end
end end
@ -105,7 +105,7 @@ RSpec.describe BulkUpload::Sales::Year2024::CsvParser do
end end
it "parses csv correctly" do it "parses csv correctly" do
expect(service.row_parsers[0].field_19).to eql(log.uprn) expect(service.row_parsers[0].field_22).to eql(log.uprn)
end end
end end
@ -124,24 +124,8 @@ RSpec.describe BulkUpload::Sales::Year2024::CsvParser do
end end
it "returns correct column" do it "returns correct column" do
expect(service.column_for_field("field_1")).to eql("CO") expect(service.column_for_field("field_1")).to eql("B")
expect(service.column_for_field("field_99")).to eql("EK") expect(service.column_for_field("field_99")).to eql("CV")
end
end
context "when no headers" do
let(:file) { Tempfile.new }
let(:path) { file.path }
let(:log) { build(:sales_log, :completed, :with_uprn) }
before do
file.write(BulkUpload::SalesLogToCsv.new(log:, col_offset: 0).to_2024_csv_row)
file.rewind
end
it "returns correct column" do
expect(service.column_for_field("field_1")).to eql("CN")
expect(service.column_for_field("field_99")).to eql("EJ")
end end
end end
end end
@ -160,7 +144,7 @@ RSpec.describe BulkUpload::Sales::Year2024::CsvParser do
end end
it "parses csv correctly" do it "parses csv correctly" do
expect(service.row_parsers[0].field_19).to eql(log.uprn) expect(service.row_parsers[0].field_22).to eql(log.uprn)
end end
end end
end end

452
spec/services/bulk_upload/sales/year2024/row_parser_spec.rb
View File

File diff suppressed because it is too large Load Diff

169
spec/support/bulk_upload/sales_log_to_csv.rb
Unescape View File

@ -25,6 +25,15 @@ class BulkUpload::SalesLogToCsv
end end
end end
def to_2024_csv_row(seed: nil)
if seed
row = to_2024_row.shuffle(random: Random.new(seed))
(row_prefix + row).flatten.join(",") + line_ending
else
(row_prefix + to_2024_row).flatten.join(",") + line_ending
end
end
def default_2022_field_numbers def default_2022_field_numbers
(1..125).to_a (1..125).to_a
end end
@ -45,6 +54,14 @@ class BulkUpload::SalesLogToCsv
end.flatten.join(",") + line_ending end.flatten.join(",") + line_ending
end end
def default_2024_field_numbers_row(seed: nil)
if seed
["Bulk upload field number"] + default_2024_field_numbers.shuffle(random: Random.new(seed))
else
["Bulk upload field number"] + default_2024_field_numbers
end.flatten.join(",") + line_ending
end
def to_2023_row def to_2023_row
to_2022_row + [ to_2022_row + [
log.uprn, log.uprn,
@ -212,6 +229,154 @@ class BulkUpload::SalesLogToCsv
] ]
end end
def to_2024_row
[
overrides[:organisation_id] || log.owning_organisation&.old_visible_id,
log.managing_organisation,
log.created_by&.email,
log.saledate&.day,
log.saledate&.month,
log.saledate&.strftime("%y"),
log.purchid,
log.ownershipsch,
log.type, # field_9: "What is the type of shared ownership sale?",
log.type, # field_10: "What is the type of discounted ownership sale?",
log.type, # field_11: "What is the type of outright sale?",
log.othtype,
log.companybuy,
log.buylivein,
log.jointpur,
log.jointmore,
log.noint,
log.privacynotice,
log.beds,
log.proptype, # 20
log.builtype,
log.uprn,
log.address_line1,
log.address_line2,
log.town_or_city,
log.county,
((log.postcode_full || "").split(" ") || [""]).first,
((log.postcode_full || "").split(" ") || [""]).last,
log.la,
log.wchair, # 30
log.age1,
log.sex1,
log.ethnic,
log.national,
log.ecstat1,
log.buy1livein,
log.relat2,
log.age2,
log.sex2,
log.ethnic_group2, # 40
log.nationalbuy2,
log.ecstat2,
log.buy2livein,
log.hholdcount,
log.relat3,
log.age3,
log.sex3,
log.ecstat3,
log.relat4,
log.age4, # 50
log.sex4,
log.ecstat4,
log.relat5,
log.age5,
log.sex5,
log.ecstat5,
log.relat6,
log.age6,
log.sex6,
log.ecstat6, # 60
log.prevten,
log.ppcodenk,
((log.ppostcode_full || "").split(" ") || [""]).first,
((log.ppostcode_full || "").split(" ") || [""]).last,
log.prevloc,
log.pregyrha,
log.pregother,
log.pregla,
log.pregghb,
log.buy2living, # 70
log.prevtenbuy2,
hhregres,
log.hhregresstill,
log.armedforcesspouse,
log.disabled,
log.wheel,
log.income1,
log.inc1mort,
log.income2,
log.inc2mort, # 80
log.hb,
log.savings,
log.prevown,
log.prevshared,
log.proplen,
log.staircase,
log.stairbought,
log.stairowned,
log.staircasesale,
log.resale, # 90
log.exdate&.day,
log.exdate&.month,
log.exdate&.strftime("%y"),
log.hodate&.day,
log.hodate&.month, # 60
log.hodate&.strftime("%y"),
log.lanomagr,
log.frombeds,
log.fromprop,
log.socprevten, # 100
log.value,
log.equity,
log.mortgageused,
log.mortgage,
log.mortgagelender,
log.mortgagelenderother,
log.mortlen,
log.extrabor,
log.deposit,
log.cashdis, # 110
log.mrent,
log.mscharge,
log.proplen,
log.value,
log.grant,
log.discount,
log.mortgageused,
log.mortgage,
log.mortgagelender,
log.mortgagelenderother, # 120
log.mortlen,
log.extrabor,
log.deposit,
log.mscharge,
log.value,
log.mortgageused,
log.mortgage,
log.mortlen,
log.extrabor,
log.deposit, # 130
log.mscharge,
]
end
private private
def default_2023_field_numbers def default_2023_field_numbers
@ -225,4 +390,8 @@ private
log.hhregres log.hhregres
end end
end end
def default_2024_field_numbers
(1..131).to_a
end
end end

Write Preview
Loading…
Cancel
Save