Browse Source

fixup! CLDC-4151: Add new fields to bulk upload

handle the old_visible_id not existing

use override org ID only for the output owning ID. it's only passed as eg ORG1
CLDC-4151-new-referral-questions
Samuel Young 2 weeks ago
parent
commit
98c0bf0a48
  1. 11
      app/helpers/bulk_upload/lettings_log_to_csv.rb

11
app/helpers/bulk_upload/lettings_log_to_csv.rb

@ -98,13 +98,8 @@ class BulkUpload::LettingsLogToCsv
def to_2026_row def to_2026_row
# TODO: CLDC-4162: Implement when 2026 format is known # TODO: CLDC-4162: Implement when 2026 format is known
owning_organisation = if overrides[:organisation_id]
then Organisation.find(overrides[:organisation_id])
else
log.owning_organisation
end
[ [
owning_organisation&.old_visible_id, # 1 overrides[:organisation_id] || log.owning_organisation&.old_visible_id, # 1
overrides[:managing_organisation_id] || log.managing_organisation&.old_visible_id, overrides[:managing_organisation_id] || log.managing_organisation&.old_visible_id,
log.assigned_to&.email, log.assigned_to&.email,
log.needstype, log.needstype,
@ -230,7 +225,7 @@ class BulkUpload::LettingsLogToCsv
chr, chr,
cap, cap,
accessible_register, accessible_register,
owning_organisation&.la? ? log.referral_register : nil, log.owning_organisation.la? ? log.referral_register : nil,
net_income_known, net_income_known,
log.incfreq, log.incfreq,
log.earnings, log.earnings,
@ -245,7 +240,7 @@ class BulkUpload::LettingsLogToCsv
log.supcharg, log.supcharg,
log.hbrentshortfall, log.hbrentshortfall,
log.tshortfall, log.tshortfall,
owning_organisation&.prp? ? log.referral_register : nil, log.owning_organisation.prp? ? log.referral_register : nil,
log.referral_noms, log.referral_noms,
log.referral_org, # 132 log.referral_org, # 132
] ]

Loading…
Cancel
Save