diff --git a/app/services/imports/lettings_logs_field_import_service.rb b/app/services/imports/lettings_logs_field_import_service.rb
index 9148c99b7..ec69c5b03 100644
--- a/app/services/imports/lettings_logs_field_import_service.rb
+++ b/app/services/imports/lettings_logs_field_import_service.rb
@@ -43,12 +43,11 @@ module Imports
log = LettingsLog.find_by(old_id:)
if log
- upload_method = meta_field_value(xml_doc, "upload-method")
+ upload_id = meta_field_value(xml_doc, "upload-id")
- case upload_method
- when "Manual Entry"
+ if upload_id.nil?
@logger.info "lettings log with old id #{old_id} entered manually, no need for update"
- when "Bulk Upload"
+ 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
diff --git a/app/services/imports/logs_import_service.rb b/app/services/imports/logs_import_service.rb
index f6a4f8a22..c6c158089 100644
--- a/app/services/imports/logs_import_service.rb
+++ b/app/services/imports/logs_import_service.rb
@@ -25,11 +25,6 @@ module Imports
end
end
- CREATION_METHODS = {
- "Bulk Upload" => "bulk upload",
- "Manual Entry" => "single log",
- }.freeze
-
def creation_method(xml_doc)
upload_id = meta_field_value(xml_doc, "upload-id")
upload_id.present? ? "bulk upload" : "single log"
diff --git a/app/services/imports/sales_logs_field_import_service.rb b/app/services/imports/sales_logs_field_import_service.rb
index d34aa878a..51335d6d7 100644
--- a/app/services/imports/sales_logs_field_import_service.rb
+++ b/app/services/imports/sales_logs_field_import_service.rb
@@ -16,12 +16,11 @@ module Imports
log = SalesLog.find_by(old_id:)
if log
- upload_method = meta_field_value(xml_doc, "upload-method")
+ upload_id = meta_field_value(xml_doc, "upload-id")
- case upload_method
- when "Manual Entry"
+ if upload_id.nil?
@logger.info "sales log with old id #{old_id} entered manually, no need for update"
- when "Bulk Upload"
+ 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
diff --git a/spec/fixtures/imports/logs/166fc004-392e-47a8-acb8-1c018734882b.xml b/spec/fixtures/imports/logs/166fc004-392e-47a8-acb8-1c018734882b.xml
index 0ddca74c3..adf26924c 100644
--- a/spec/fixtures/imports/logs/166fc004-392e-47a8-acb8-1c018734882b.xml
+++ b/spec/fixtures/imports/logs/166fc004-392e-47a8-acb8-1c018734882b.xml
@@ -9,7 +9,8 @@
2022-04-12T14:10:59.953121Z
submitted-valid
2021
- Manual Entry
+ Bulk Upload
+ 8dda8f1a-f5a1-4827-8d82-dd7fd9258eab