Merge branch 'kassio/do-not-add-missing-not-if-importer-user-is-mapped' into 'master'

Allow member mapping to map importer user on Group/Project Import

See merge request gitlab-org/gitlab!42882

changelogs/unreleased/kassio-do-not-add-missing-not-if-importer-user-is-mapped.yml

+---
+title: Allow member mapping to map importer user on Group/Project Import
+merge_request: 42882
+author:
+type: changed

lib/gitlab/import_export/members_mapper.rb

@@ -35,7 +35,7 @@ module Gitlab
       end
 
       def include?(old_user_id)
-        map.has_key?(old_user_id) && map[old_user_id] != default_user_id
+        map.has_key?(old_user_id)
       end
 
       private
@@ -63,6 +63,8 @@ module Gitlab
       end
 
       def add_team_member(member, existing_user = nil)
+        return true if existing_user && @importable.members.exists?(user_id: existing_user.id)
+
         member['user'] = existing_user
         member_hash = member_hash(member)
 

spec/support/shared_examples/lib/gitlab/import_export/relation_factory_shared_examples.rb

@@ -65,7 +65,7 @@ RSpec.shared_examples 'Notes user references' do
 
       include_examples 'sets the note author to the mapped user'
 
-      include_examples 'adds original autor note'
+      include_examples 'does not add original autor note'
     end
 
     context 'and the note author exists in the target instance' do