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

2 files changed, 21 insertions, 6 deletions

diff --git a/app/services/jira_import/start_import_service.rb b/app/services/jira_import/start_import_service.rb
index a06cc6df719..f85f686c61a 100644
--- a/app/services/jira_import/start_import_service.rb
+++ b/app/services/jira_import/start_import_service.rb
@@ -2,23 +2,39 @@
 
 module JiraImport
   class StartImportService
-    attr_reader :user, :project, :jira_project_key
+    attr_reader :user, :project, :jira_project_key, :users_mapping
 
-    def initialize(user, project, jira_project_key)
+    def initialize(user, project, jira_project_key, users_mapping)
       @user = user
       @project = project
       @jira_project_key = jira_project_key
+      @users_mapping = users_mapping
     end
 
     def execute
       validation_response = validate
       return validation_response if validation_response&.error?
 
+      store_users_mapping
       create_and_schedule_import
     end
 
     private
 
+    def store_users_mapping
+      return if users_mapping.blank?
+
+      mapping = users_mapping.map do |map|
+        next if !map[:jira_account_id] || !map[:gitlab_id]
+
+        [map[:jira_account_id], map[:gitlab_id]]
+      end.compact.to_h
+
+      return if mapping.blank?
+
+      Gitlab::JiraImport.cache_users_mapping(project.id, mapping)
+    end
+
     def create_and_schedule_import
       jira_import = build_jira_import
       project.import_type = 'jira'
diff --git a/app/services/jira_import/users_mapper.rb b/app/services/jira_import/users_mapper.rb
index 31a3f721556..c3cbeb157bd 100644
--- a/app/services/jira_import/users_mapper.rb
+++ b/app/services/jira_import/users_mapper.rb
@@ -14,9 +14,8 @@ module JiraImport
         {
           jira_account_id: jira_user['accountId'],
           jira_display_name: jira_user['displayName'],
-          jira_email: jira_user['emailAddress'],
-          gitlab_id: match_user(jira_user)
-        }
+          jira_email: jira_user['emailAddress']
+        }.merge(match_user(jira_user))
       end
     end
 
@@ -25,7 +24,7 @@ module JiraImport
     # TODO: Matching user by email and displayName will be done as the part
     # of follow-up issue: https://gitlab.com/gitlab-org/gitlab/-/issues/219023
     def match_user(jira_user)
-      nil
+      { gitlab_id: nil, gitlab_username: nil, gitlab_name: nil }
     end
   end
 end