From ea6393e71b3aa5348184e3d6e7c8645e16c163c8 Mon Sep 17 00:00:00 2001
From: Arthur Campbell <arfa.camble@gmail.com>
Date: Tue, 11 Jul 2023 12:57:45 +0100
Subject: [PATCH] slight refactor to reduce nesting and dodge linter complaints

---
 .../lettings_logs_field_import_service.rb     | 22 ++++++++-----------
 .../sales_logs_field_import_service.rb        | 22 ++++++++-----------
 2 files changed, 18 insertions(+), 26 deletions(-)

diff --git a/app/services/imports/lettings_logs_field_import_service.rb b/app/services/imports/lettings_logs_field_import_service.rb
index ec69c5b03..e65625445 100644
--- a/app/services/imports/lettings_logs_field_import_service.rb
+++ b/app/services/imports/lettings_logs_field_import_service.rb
@@ -42,21 +42,17 @@ module Imports
       old_id = meta_field_value(xml_doc, "document-id")
       log = LettingsLog.find_by(old_id:)
 
-      if log
-        upload_id = meta_field_value(xml_doc, "upload-id")
+      return @logger.warn "lettings log with old id #{old_id} not found" unless log
 
-        if upload_id.nil?
-          @logger.info "lettings log with old id #{old_id} entered manually, no need for update"
-        else
-          if log.creation_method_bulk_upload?
-            @logger.info "lettings log #{log.id} creation method already set to bulk upload, no need for update"
-          else
-            log.creation_method_bulk_upload!
-            @logger.info "lettings log #{log.id} creation method set to bulk upload"
-          end
-        end
+      upload_id = meta_field_value(xml_doc, "upload-id")
+
+      if upload_id.nil?
+        @logger.info "lettings log with old id #{old_id} entered manually, no need for update"
+      elsif log.creation_method_bulk_upload?
+        @logger.info "lettings log #{log.id} creation method already set to bulk upload, no need for update"
       else
-        @logger.warn "lettings log with old id #{old_id} not found"
+        log.creation_method_bulk_upload!
+        @logger.info "lettings log #{log.id} creation method set to bulk upload"
       end
     end
 
diff --git a/app/services/imports/sales_logs_field_import_service.rb b/app/services/imports/sales_logs_field_import_service.rb
index 51335d6d7..4da19dbc3 100644
--- a/app/services/imports/sales_logs_field_import_service.rb
+++ b/app/services/imports/sales_logs_field_import_service.rb
@@ -15,21 +15,17 @@ module Imports
       old_id = meta_field_value(xml_doc, "document-id")
       log = SalesLog.find_by(old_id:)
 
-      if log
-        upload_id = meta_field_value(xml_doc, "upload-id")
+      return @logger.warn "sales log with old id #{old_id} not found" unless log
 
-        if upload_id.nil?
-          @logger.info "sales log with old id #{old_id} entered manually, no need for update"
-        else
-          if log.creation_method_bulk_upload?
-            @logger.info "sales log #{log.id} creation method already set to bulk upload, no need for update"
-          else
-            log.creation_method_bulk_upload!
-            @logger.info "sales log #{log.id} creation method set to bulk upload"
-          end
-        end
+      upload_id = meta_field_value(xml_doc, "upload-id")
+
+      if upload_id.nil?
+        @logger.info "sales log with old id #{old_id} entered manually, no need for update"
+      elsif log.creation_method_bulk_upload?
+        @logger.info "sales log #{log.id} creation method already set to bulk upload, no need for update"
       else
-        @logger.warn "sales log with old id #{old_id} not found"
+        log.creation_method_bulk_upload!
+        @logger.info "sales log #{log.id} creation method set to bulk upload"
       end
     end
   end