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

CLDC-4173: update sales export spec and make sales log csv service future-proof

pull/3186/head
Nat Dean-Lewis 1 month ago
parent
47a67e7d92
commit
52f0103691
4 changed files with 14 additions and 9 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. 6
      app/services/csv/sales_log_csv_service.rb
  2. 6
      spec/fixtures/files/sales_logs_csv_export_codes_26.csv
  3. 6
      spec/fixtures/files/sales_logs_csv_export_labels_26.csv
  4. 5
      spec/services/csv/sales_log_csv_service_spec.rb

6
app/services/csv/sales_log_csv_service.rb
Unescape View File

@ -249,7 +249,7 @@ module Csv
return @attributes unless @user.support? return @attributes unless @user.support?
mappings = SUPPORT_ATTRIBUTE_NAME_MAPPINGS mappings = SUPPORT_ATTRIBUTE_NAME_MAPPINGS
mappings = mappings.merge(SUPPORT_ATTRIBUTE_NAME_MAPPINGS_2025) if @year == 2025 mappings = mappings.merge(SUPPORT_ATTRIBUTE_NAME_MAPPINGS_2025) if @year >= 2025
@attributes.map do |attribute| @attributes.map do |attribute|
mappings[attribute] || attribute.upcase mappings[attribute] || attribute.upcase
@ -300,7 +300,7 @@ module Csv
mappings = case @year mappings = case @year
when 2024 when 2024
ATTRIBUTE_MAPPINGS.merge(ATTRIBUTE_MAPPINGS_2024) ATTRIBUTE_MAPPINGS.merge(ATTRIBUTE_MAPPINGS_2024)
when 2025 when (2025..)
ATTRIBUTE_MAPPINGS.merge(ATTRIBUTE_MAPPINGS_2024).merge(ATTRIBUTE_MAPPINGS_2025) ATTRIBUTE_MAPPINGS.merge(ATTRIBUTE_MAPPINGS_2024).merge(ATTRIBUTE_MAPPINGS_2025)
else else
ATTRIBUTE_MAPPINGS ATTRIBUTE_MAPPINGS
@ -346,7 +346,7 @@ module Csv
%w[id status duplicate_set_id created_at updated_at old_form_id collection_start_year creation_method is_dpo] %w[id status duplicate_set_id created_at updated_at old_form_id collection_start_year creation_method is_dpo]
when 2024 when 2024
%w[id status duplicate_set_id created_at updated_at collection_start_year creation_method bulk_upload_id is_dpo] %w[id status duplicate_set_id created_at updated_at collection_start_year creation_method bulk_upload_id is_dpo]
when 2025 when 2025, 2026
%w[id status duplicate_set_id created_at created_by_id updated_at updated_by_id creation_method bulk_upload_id] %w[id status duplicate_set_id created_at created_by_id updated_at updated_by_id creation_method bulk_upload_id]
else else
%w[id status duplicate_set_id created_at updated_at collection_start_year creation_method bulk_upload_id is_dpo] %w[id status duplicate_set_id created_at updated_at collection_start_year creation_method bulk_upload_id is_dpo]

6
spec/fixtures/files/sales_logs_csv_export_codes_26.csv vendored
View File

File diff suppressed because one or more lines are too long

6
spec/fixtures/files/sales_logs_csv_export_labels_26.csv vendored
View File

File diff suppressed because one or more lines are too long

5
spec/services/csv/sales_log_csv_service_spec.rb
Unescape View File

@ -21,17 +21,22 @@ RSpec.describe Csv::SalesLogCsvService do
purchid: nil, purchid: nil,
hholdcount: 3, hholdcount: 3,
age1: 30, age1: 30,
sexrab1: "F",
sex1: "X", sex1: "X",
age2: 35, age2: 35,
sexrab2: "M",
sex2: "X", sex2: "X",
sexrab3: "F",
sex3: "X", sex3: "X",
age4_known: 1, age4_known: 1,
sexrab4: "R",
sex4: "X", sex4: "X",
details_known_5: 2, details_known_5: 2,
age6_known: nil, age6_known: nil,
age6: nil, age6: nil,
ecstat6: nil, ecstat6: nil,
relat6: nil, relat6: nil,
sexrab6: nil,
sex6: nil, sex6: nil,
town_or_city: "Town or city", town_or_city: "Town or city",
address_line1_as_entered: "address line 1 as entered", address_line1_as_entered: "address line 1 as entered",

Write Preview
Loading…
Cancel
Save