Browse Source

slight refactor to reduce nesting and dodge linter complaints

pull/1744/head
Arthur Campbell 3 years ago
parent
commit
ea6393e71b
  1. 10
      app/services/imports/lettings_logs_field_import_service.rb
  2. 10
      app/services/imports/sales_logs_field_import_service.rb

10
app/services/imports/lettings_logs_field_import_service.rb

@ -42,23 +42,19 @@ module Imports
old_id = meta_field_value(xml_doc, "document-id") old_id = meta_field_value(xml_doc, "document-id")
log = LettingsLog.find_by(old_id:) log = LettingsLog.find_by(old_id:)
if log return @logger.warn "lettings log with old id #{old_id} not found" unless log
upload_id = meta_field_value(xml_doc, "upload-id") upload_id = meta_field_value(xml_doc, "upload-id")
if upload_id.nil? if upload_id.nil?
@logger.info "lettings log with old id #{old_id} entered manually, no need for update" @logger.info "lettings log with old id #{old_id} entered manually, no need for update"
else elsif log.creation_method_bulk_upload?
if log.creation_method_bulk_upload?
@logger.info "lettings log #{log.id} creation method already set to bulk upload, no need for update" @logger.info "lettings log #{log.id} creation method already set to bulk upload, no need for update"
else else
log.creation_method_bulk_upload! log.creation_method_bulk_upload!
@logger.info "lettings log #{log.id} creation method set to bulk upload" @logger.info "lettings log #{log.id} creation method set to bulk upload"
end end
end end
else
@logger.warn "lettings log with old id #{old_id} not found"
end
end
def update_lettings_allocation(xml_doc) def update_lettings_allocation(xml_doc)
return if meta_field_value(xml_doc, "form-name").include?("Sales") return if meta_field_value(xml_doc, "form-name").include?("Sales")

10
app/services/imports/sales_logs_field_import_service.rb

@ -15,22 +15,18 @@ module Imports
old_id = meta_field_value(xml_doc, "document-id") old_id = meta_field_value(xml_doc, "document-id")
log = SalesLog.find_by(old_id:) log = SalesLog.find_by(old_id:)
if log return @logger.warn "sales log with old id #{old_id} not found" unless log
upload_id = meta_field_value(xml_doc, "upload-id") upload_id = meta_field_value(xml_doc, "upload-id")
if upload_id.nil? if upload_id.nil?
@logger.info "sales log with old id #{old_id} entered manually, no need for update" @logger.info "sales log with old id #{old_id} entered manually, no need for update"
else elsif log.creation_method_bulk_upload?
if log.creation_method_bulk_upload?
@logger.info "sales log #{log.id} creation method already set to bulk upload, no need for update" @logger.info "sales log #{log.id} creation method already set to bulk upload, no need for update"
else else
log.creation_method_bulk_upload! log.creation_method_bulk_upload!
@logger.info "sales log #{log.id} creation method set to bulk upload" @logger.info "sales log #{log.id} creation method set to bulk upload"
end end
end end
else
@logger.warn "sales log with old id #{old_id} not found"
end
end
end end
end end

Loading…
Cancel
Save