From c014b015897c19b991bfbc86eb14cdf5a599695f Mon Sep 17 00:00:00 2001
From: Arthur Campbell <arfa.camble@gmail.com>
Date: Wed, 28 Jun 2023 17:27:41 +0100
Subject: [PATCH] some minor refactoring remove methods from child class that
 replicate methods on the parent class tidy up check for nil remove gubbins
 and inline method body given only used once

---
 .../lettings_logs_field_import_service.rb     | 26 -------------------
 app/services/imports/logs_import_service.rb   |  6 +----
 ...lettings_logs_field_import_service_spec.rb |  8 +-----
 3 files changed, 2 insertions(+), 38 deletions(-)

diff --git a/app/services/imports/lettings_logs_field_import_service.rb b/app/services/imports/lettings_logs_field_import_service.rb
index a976e15b2..22fc0fe8e 100644
--- a/app/services/imports/lettings_logs_field_import_service.rb
+++ b/app/services/imports/lettings_logs_field_import_service.rb
@@ -110,31 +110,5 @@ module Imports
         @logger.warn("Could not find record matching legacy ID #{old_id}")
       end
     end
-
-    def compose_date(xml_doc, day_str, month_str, year_str)
-      day = Integer(field_value(xml_doc, "xmlns", day_str), exception: false)
-      month = Integer(field_value(xml_doc, "xmlns", month_str), exception: false)
-      year = Integer(field_value(xml_doc, "xmlns", year_str), exception: false)
-      if day.nil? || month.nil? || year.nil?
-        nil
-      else
-        Time.zone.local(year, month, day)
-      end
-    end
-
-    def string_or_nil(xml_doc, attribute)
-      str = field_value(xml_doc, "xmlns", attribute)
-      str.presence
-    end
-
-    # Unsafe: A string that has more than just the integer value
-    def unsafe_string_as_integer(xml_doc, attribute)
-      str = string_or_nil(xml_doc, attribute)
-      if str.nil?
-        nil
-      else
-        str.to_i
-      end
-    end
   end
 end
diff --git a/app/services/imports/logs_import_service.rb b/app/services/imports/logs_import_service.rb
index 0a3d2df87..e0780aad0 100644
--- a/app/services/imports/logs_import_service.rb
+++ b/app/services/imports/logs_import_service.rb
@@ -11,11 +11,7 @@ module Imports
     # Unsafe: A string that has more than just the integer value
     def unsafe_string_as_integer(xml_doc, attribute)
       str = string_or_nil(xml_doc, attribute)
-      if str.nil?
-        nil
-      else
-        str.to_i
-      end
+      str&.to_i
     end
 
     def compose_date(xml_doc, day_str, month_str, year_str)
diff --git a/spec/services/imports/lettings_logs_field_import_service_spec.rb b/spec/services/imports/lettings_logs_field_import_service_spec.rb
index 3cd4e930d..491e40ca7 100644
--- a/spec/services/imports/lettings_logs_field_import_service_spec.rb
+++ b/spec/services/imports/lettings_logs_field_import_service_spec.rb
@@ -10,7 +10,7 @@ RSpec.describe Imports::LettingsLogsFieldImportService do
   let(:fixture_directory) { "spec/fixtures/imports/logs" }
 
   let(:lettings_log_id) { "0ead17cb-1668-442d-898c-0d52879ff592" }
-  let(:lettings_log_file) { open_file(fixture_directory, lettings_log_id) }
+  let(:lettings_log_file) { File.open("#{fixture_directory}/#{lettings_log_id}.xml") }
   let(:lettings_log_xml) { Nokogiri::XML(lettings_log_file) }
   let(:remote_folder) { "lettings_logs" }
   let(:old_user_id) { "c3061a2e6ea0b702e6f6210d5c52d2a92612d2aa" }
@@ -21,12 +21,6 @@ RSpec.describe Imports::LettingsLogsFieldImportService do
       Singleton.__init__(FormHandler)
       example.run
     end
-    Timecop.return
-    Singleton.__init__(FormHandler)
-  end
-
-  def open_file(directory, filename)
-    File.open("#{directory}/#{filename}.xml")
   end
 
   before do