Add latest changes from gitlab-org/gitlab@master

1 files changed, 40 insertions, 1 deletions

diff --git a/lib/gitlab/import_export/members_mapper.rb b/lib/gitlab/import_export/members_mapper.rb
index fd76252eb36..5832b72ab46 100644
--- a/lib/gitlab/import_export/members_mapper.rb
+++ b/lib/gitlab/import_export/members_mapper.rb
@@ -64,8 +64,19 @@ module Gitlab
 
       def add_team_member(member, existing_user = nil)
         member['user'] = existing_user
+        member_hash = member_hash(member)
 
-        relation_class.create(member_hash(member)).persisted?
+        member = relation_class.create(member_hash)
+
+        if member.persisted?
+          log_member_addition(member_hash)
+
+          true
+        else
+          log_member_addition_failure(member_hash, member.errors.full_messages)
+
+          false
+        end
       end
 
       def member_hash(member)
@@ -103,6 +114,34 @@ module Gitlab
 
         relation_class::MAINTAINER
       end
+
+      def log_member_addition(member_hash)
+        log_params = base_log_params(member_hash)
+        log_params[:message] = '[Project/Group Import] Added new member'
+
+        logger.info(log_params)
+      end
+
+      def log_member_addition_failure(member_hash, errors)
+        log_params = base_log_params(member_hash)
+        log_params[:message] = "[Project/Group Import] Member addition failed: #{errors&.join(', ')}"
+
+        logger.info(log_params)
+      end
+
+      def base_log_params(member_hash)
+        {
+          user_id: member_hash['user']&.id,
+          access_level: member_hash['access_level'],
+          importable_type: @importable.class.to_s,
+          importable_id: @importable.id,
+          root_namespace_id: @importable.try(:root_ancestor)&.id
+        }
+      end
+
+      def logger
+        @logger ||= Gitlab::Import::Logger.build
+      end
     end
   end
 end