Add latest changes from gitlab-org/gitlab@13-2-stable-ee

2 files changed, 3 insertions, 54 deletions

diff --git a/lib/gitlab/jira_import/issue_serializer.rb b/lib/gitlab/jira_import/issue_serializer.rb
index df57680073e..43280606bb6 100644
--- a/lib/gitlab/jira_import/issue_serializer.rb
+++ b/lib/gitlab/jira_import/issue_serializer.rb
@@ -52,7 +52,9 @@ module Gitlab
       end
 
       def map_user_id(jira_user)
-        Gitlab::JiraImport::UserMapper.new(project, jira_user).execute&.id
+        return unless jira_user&.dig('accountId')
+
+        Gitlab::JiraImport.get_user_mapping(project.id, jira_user['accountId'])
       end
 
       def reporter
diff --git a/lib/gitlab/jira_import/user_mapper.rb b/lib/gitlab/jira_import/user_mapper.rb
deleted file mode 100644
index 208ee49b724..00000000000
--- a/lib/gitlab/jira_import/user_mapper.rb
+++ /dev/null
@@ -1,53 +0,0 @@
-# frozen_string_literal: true
-
-module Gitlab
-  module JiraImport
-    class UserMapper
-      include ::Gitlab::Utils::StrongMemoize
-
-      def initialize(project, jira_user)
-        @project = project
-        @jira_user = jira_user
-      end
-
-      def execute
-        return unless jira_user
-
-        email = jira_user['emailAddress']
-
-        # We also include emails that are not yet confirmed
-        users = User.by_any_email(email).to_a
-
-        user = users.first
-
-        # this event should never happen but we should log it in case we have invalid data
-        log_user_mapping_message('Multiple users found for an email address', email) if users.count > 1
-
-        unless project.project_member(user) || project.group&.group_member(user)
-          log_user_mapping_message('Jira user not found', email)
-
-          return
-        end
-
-        user
-      end
-
-      private
-
-      attr_reader :project, :jira_user, :params
-
-      def log_user_mapping_message(message, email)
-        logger.info(
-          project_id: project.id,
-          project_path: project.full_path,
-          user_email: email,
-          message: message
-        )
-      end
-
-      def logger
-        @logger ||= Gitlab::Import::Logger.build
-      end
-    end
-  end
-end