Browse Source

update field import services in line with import services to use upload id rather than upload method as the source of truth for how a log was created

pull/1744/head
Arthur Campbell 3 years ago
parent
commit
c3e7ef64a3
  1. 7
      app/services/imports/lettings_logs_field_import_service.rb
  2. 5
      app/services/imports/logs_import_service.rb
  3. 7
      app/services/imports/sales_logs_field_import_service.rb
  4. 3
      spec/fixtures/imports/logs/166fc004-392e-47a8-acb8-1c018734882b.xml

7
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

5
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"

7
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

3
spec/fixtures/imports/logs/166fc004-392e-47a8-acb8-1c018734882b.xml vendored

@ -9,7 +9,8 @@
<meta:modified-date>2022-04-12T14:10:59.953121Z</meta:modified-date>
<meta:status>submitted-valid</meta:status>
<meta:reporting-year>2021</meta:reporting-year>
<meta:upload-method>Manual Entry</meta:upload-method>
<meta:upload-method>Bulk Upload</meta:upload-method>
<meta:upload-id>8dda8f1a-f5a1-4827-8d82-dd7fd9258eab</meta:upload-id>
<meta:schema assert-valid="true"/>
<meta:rules assert-valid="true"/>
</meta:metadata>

Loading…
Cancel
Save