Browse Source

CLDC-4141: revert changes to csv service

pull/3176/head
Nat Dean-Lewis 6 days ago
parent
commit
e64b0bf049
  1. 9
      app/services/csv/lettings_log_csv_service.rb
  2. 2
      spec/fixtures/files/lettings_log_csv_export_labels_23.csv
  3. 2
      spec/fixtures/files/lettings_log_csv_export_labels_24.csv
  4. 2
      spec/fixtures/files/lettings_log_csv_export_labels_25.csv
  5. 2
      spec/fixtures/files/lettings_log_csv_export_labels_26.csv
  6. 2
      spec/fixtures/files/lettings_log_csv_export_non_support_labels_23.csv
  7. 2
      spec/fixtures/files/lettings_log_csv_export_non_support_labels_24.csv
  8. 2
      spec/fixtures/files/lettings_log_csv_export_non_support_labels_25.csv
  9. 2
      spec/fixtures/files/lettings_log_csv_export_non_support_labels_26.csv

9
app/services/csv/lettings_log_csv_service.rb

@ -135,9 +135,6 @@ module Csv
PERSON_DETAILS = {}.tap { |hash| PERSON_DETAILS = {}.tap { |hash|
hash["age1"] = { "refused_code" => "-9", "refused_label" => "Not known", "age_known_field" => "age1_known" } hash["age1"] = { "refused_code" => "-9", "refused_label" => "Not known", "age_known_field" => "age1_known" }
hash["sexrab1"] = { "refused_code" => "R", "refused_label" => "Prefers not to say" }
hash["sex1"] = { "refused_code" => "R", "refused_label" => "Prefers not to say" }
hash["ecstat1"] = { "refused_code" => "10", "refused_label" => "Prefers not to say" }
(2..8).each do |i| (2..8).each do |i|
hash["age#{i}"] = { "refused_code" => "-9", "refused_label" => "Not known", "details_known_field" => "details_known_#{i}", "age_known_field" => "age#{i}_known" } hash["age#{i}"] = { "refused_code" => "-9", "refused_label" => "Not known", "details_known_field" => "details_known_#{i}", "age_known_field" => "age#{i}_known" }
hash["sexrab#{i}"] = { "refused_code" => "R", "refused_label" => "Prefers not to say", "details_known_field" => "details_known_#{i}" } hash["sexrab#{i}"] = { "refused_code" => "R", "refused_label" => "Prefers not to say", "details_known_field" => "details_known_#{i}" }
@ -359,11 +356,7 @@ module Csv
log.public_send(attribute)&.iso8601 log.public_send(attribute)&.iso8601
elsif USER_DATE_FIELDS.include? attribute elsif USER_DATE_FIELDS.include? attribute
log.public_send(attribute)&.strftime("%F") log.public_send(attribute)&.strftime("%F")
elsif PERSON_DETAILS.any? { |key, _value| key == attribute } && elsif PERSON_DETAILS.any? { |key, _value| key == attribute } && (person_details_not_known?(log, attribute) || age_not_known?(log, attribute))
(
person_details_not_known?(log, attribute) || age_not_known?(log, attribute) ||
log.public_send(attribute).to_s == PERSON_DETAILS.find { |key, _value| key == attribute }[1]["refused_code"]
)
case @export_type case @export_type
when "codes" when "codes"
PERSON_DETAILS.find { |key, _value| key == attribute }[1]["refused_code"] PERSON_DETAILS.find { |key, _value| key == attribute }[1]["refused_code"]

2
spec/fixtures/files/lettings_log_csv_export_labels_23.csv vendored

File diff suppressed because one or more lines are too long

2
spec/fixtures/files/lettings_log_csv_export_labels_24.csv vendored

File diff suppressed because one or more lines are too long

2
spec/fixtures/files/lettings_log_csv_export_labels_25.csv vendored

File diff suppressed because one or more lines are too long

2
spec/fixtures/files/lettings_log_csv_export_labels_26.csv vendored

File diff suppressed because one or more lines are too long

2
spec/fixtures/files/lettings_log_csv_export_non_support_labels_23.csv vendored

File diff suppressed because one or more lines are too long

2
spec/fixtures/files/lettings_log_csv_export_non_support_labels_24.csv vendored

File diff suppressed because one or more lines are too long

2
spec/fixtures/files/lettings_log_csv_export_non_support_labels_25.csv vendored

File diff suppressed because one or more lines are too long

2
spec/fixtures/files/lettings_log_csv_export_non_support_labels_26.csv vendored

File diff suppressed because one or more lines are too long
Loading…
Cancel
Save