diff options
author | Claire <claire.github-309c@sitedethib.com> | 2023-03-02 17:32:38 +0100 |
---|---|---|
committer | Claire <claire.github-309c@sitedethib.com> | 2023-03-02 17:32:38 +0100 |
commit | 276c1d32d6fc857a768244c3f5d835c9c5da1747 (patch) | |
tree | 4619ffd871db93c3932cfb79f9852368096dc5b5 /app/services | |
parent | 6a4be4e96677eb3e1303ddcab8f8b4bea7298453 (diff) | |
parent | af578e8ce0aabdbe9c0cd3d72d6fa2cc30b7fc66 (diff) |
Merge branch 'main' into glitch-soc/merge-upstream
Diffstat (limited to 'app/services')
-rw-r--r-- | app/services/import_service.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/services/import_service.rb b/app/services/import_service.rb index 7a68e4ca3..940c236d4 100644 --- a/app/services/import_service.rb +++ b/app/services/import_service.rb @@ -67,7 +67,7 @@ class ImportService < BaseService def import_relationships!(action, undo_action, overwrite_scope, limit, extra_fields = {}) local_domain_suffix = "@#{Rails.configuration.x.local_domain}" - items = @data.take(limit).map { |row| [row['Account address']&.strip&.delete_suffix(local_domain_suffix), Hash[extra_fields.map { |key, field_settings| [key, row[field_settings[:header]]&.strip || field_settings[:default]] }]] }.reject { |(id, _)| id.blank? } + items = @data.take(limit).map { |row| [row['Account address']&.strip&.delete_suffix(local_domain_suffix), extra_fields.to_h { |key, field_settings| [key, row[field_settings[:header]]&.strip || field_settings[:default]] }] }.reject { |(id, _)| id.blank? } if @import.overwrite? presence_hash = items.each_with_object({}) { |(id, extra), mapping| mapping[id] = [true, extra] } |