From 05faa6efede01d81d4e32cf719728c1e213607ca Mon Sep 17 00:00:00 2001
From: Sam Seed <sam.seed@softwire.com>
Date: Thu, 30 Mar 2023 19:03:52 +0100
Subject: [PATCH] refactor: simplify owning/managing org logic in 23/24 row
 parser

---
 .../bulk_upload/lettings/year2023/row_parser.rb      | 12 ++----------
 1 file changed, 2 insertions(+), 10 deletions(-)

diff --git a/app/services/bulk_upload/lettings/year2023/row_parser.rb b/app/services/bulk_upload/lettings/year2023/row_parser.rb
index bd0cb984e..918361638 100644
--- a/app/services/bulk_upload/lettings/year2023/row_parser.rb
+++ b/app/services/bulk_upload/lettings/year2023/row_parser.rb
@@ -899,8 +899,8 @@ private
     attributes["la"] = field_25
     attributes["postcode_known"] = postcode_known
     attributes["postcode_full"] = postcode_full
-    attributes["owning_organisation_id"] = owning_organisation_id
-    attributes["managing_organisation_id"] = managing_organisation_id
+    attributes["owning_organisation"] = owning_organisation
+    attributes["managing_organisation"] = managing_organisation
     attributes["renewal"] = renewal
     attributes["scheme"] = scheme
     attributes["location"] = location
@@ -1094,18 +1094,10 @@ private
     Organisation.find_by_id_on_multiple_fields(field_1)
   end
 
-  def owning_organisation_id
-    owning_organisation&.id
-  end
-
   def managing_organisation
     Organisation.find_by_id_on_multiple_fields(field_2)
   end
 
-  def managing_organisation_id
-    managing_organisation&.id
-  end
-
   def renewal
     case field_6
     when 1