From 60524b82a9d94510e59855fab81d07a072271fc5 Mon Sep 17 00:00:00 2001 From: Samuel Young Date: Mon, 2 Feb 2026 14:55:51 +0000 Subject: [PATCH] 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 --- app/helpers/bulk_upload/lettings_log_to_csv.rb | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/app/helpers/bulk_upload/lettings_log_to_csv.rb b/app/helpers/bulk_upload/lettings_log_to_csv.rb index d8a6d9b82..a1b5c29e3 100644 --- a/app/helpers/bulk_upload/lettings_log_to_csv.rb +++ b/app/helpers/bulk_upload/lettings_log_to_csv.rb @@ -98,13 +98,8 @@ class BulkUpload::LettingsLogToCsv def to_2026_row # 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, log.assigned_to&.email, log.needstype, @@ -230,7 +225,7 @@ class BulkUpload::LettingsLogToCsv chr, cap, accessible_register, - owning_organisation&.la? ? log.referral_register : nil, + log.owning_organisation.la? ? log.referral_register : nil, net_income_known, log.incfreq, log.earnings, @@ -245,7 +240,7 @@ class BulkUpload::LettingsLogToCsv log.supcharg, log.hbrentshortfall, log.tshortfall, - owning_organisation&.prp? ? log.referral_register : nil, + log.owning_organisation.prp? ? log.referral_register : nil, log.referral_noms, log.referral_org, # 132 ]