diff options
Diffstat (limited to 'lib/bulk_imports/common')
4 files changed, 4 insertions, 40 deletions
diff --git a/lib/bulk_imports/common/pipelines/badges_pipeline.rb b/lib/bulk_imports/common/pipelines/badges_pipeline.rb index 33a24e61a3f..8259a90292f 100644 --- a/lib/bulk_imports/common/pipelines/badges_pipeline.rb +++ b/lib/bulk_imports/common/pipelines/badges_pipeline.rb @@ -5,6 +5,7 @@ module BulkImports module Pipelines class BadgesPipeline include Pipeline + include HexdigestCacheStrategy extractor BulkImports::Common::Extractors::RestExtractor, query: BulkImports::Common::Rest::GetBadgesQuery diff --git a/lib/bulk_imports/common/pipelines/lfs_objects_pipeline.rb b/lib/bulk_imports/common/pipelines/lfs_objects_pipeline.rb index bd09b6add00..ab12c590e54 100644 --- a/lib/bulk_imports/common/pipelines/lfs_objects_pipeline.rb +++ b/lib/bulk_imports/common/pipelines/lfs_objects_pipeline.rb @@ -5,6 +5,7 @@ module BulkImports module Pipelines class LfsObjectsPipeline include Pipeline + include IndexCacheStrategy file_extraction_pipeline! diff --git a/lib/bulk_imports/common/pipelines/uploads_pipeline.rb b/lib/bulk_imports/common/pipelines/uploads_pipeline.rb index ea17af36c9a..bc42ddc59ca 100644 --- a/lib/bulk_imports/common/pipelines/uploads_pipeline.rb +++ b/lib/bulk_imports/common/pipelines/uploads_pipeline.rb @@ -5,8 +5,9 @@ module BulkImports module Pipelines class UploadsPipeline include Pipeline + include IndexCacheStrategy - AVATAR_PATTERN = %r{.*\/#{BulkImports::UploadsExportService::AVATAR_PATH}\/(?<identifier>.*)}.freeze + AVATAR_PATTERN = %r{.*\/#{BulkImports::UploadsExportService::AVATAR_PATH}\/(?<identifier>.*)} AvatarLoadingError = Class.new(StandardError) diff --git a/lib/bulk_imports/common/transformers/user_reference_transformer.rb b/lib/bulk_imports/common/transformers/user_reference_transformer.rb deleted file mode 100644 index c330ea59113..00000000000 --- a/lib/bulk_imports/common/transformers/user_reference_transformer.rb +++ /dev/null @@ -1,39 +0,0 @@ -# frozen_string_literal: true - -# UserReferenceTransformer replaces specified user -# reference key with a user id being either: -# - A user id found by `public_email` in the group -# - Current user id -# under a new key `"#{@reference}_id"`. -module BulkImports - module Common - module Transformers - class UserReferenceTransformer - DEFAULT_REFERENCE = 'user' - - def initialize(options = {}) - @reference = options[:reference].to_s.presence || DEFAULT_REFERENCE - @suffixed_reference = "#{@reference}_id" - end - - def transform(context, data) - return unless data - - user = find_user(context, data&.dig(@reference, 'public_email')) || context.current_user - - data - .except(@reference) - .merge(@suffixed_reference => user.id) - end - - private - - def find_user(context, email) - return if email.blank? - - context.group.users.find_by_any_email(email, confirmed: true) # rubocop: disable CodeReuse/ActiveRecord - end - end - end - end -end |