kotovalexarian-likes-gitlab/gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity

addressing MR feedback, few changes to members mapper

Browse source
This commit is contained in:
James Lopez 2016-06-13 16:12:40 +02:00
parent e5cf4cd745
commit f4d762d7c2
1 changed files with 14 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

33
lib/gitlab/import_export/members_mapper.rb
View file

@ -10,13 +10,23 @@ module Gitlab
@project = project @project = project
@note_member_list = [] @note_member_list = []
# This needs to run first, as second call would be from generate_map # This needs to run first, as second call would be from #map
# which means project members already exist. # which means project members already exist.
ensure_default_member! ensure_default_member!
end end
def map def map
@map ||= generate_map @map ||=
begin
@exported_members.inject(missing_keys_tracking_hash) do |hash, member|
existing_user = User.where(find_project_user_query(member)).first
old_user_id = member['user']['id']
if existing_user && add_user_as_team_member(existing_user, member)
hash[old_user_id] = existing_user.id
end
hash
end
end
end end
def default_user_id def default_user_id
@ -25,25 +35,10 @@ module Gitlab
private private
def generate_map
@map ||=
begin
@exported_members.inject(missing_keys_tracking_hash) do |hash, member|
existing_user = User.where(find_project_user_query(member)).first
old_user_id = member['user']['id']
if existing_user && add_user_as_team_member(existing_user, member).persisted?
hash[old_user_id] = existing_user.id
end
hash
end
end
end
def missing_keys_tracking_hash def missing_keys_tracking_hash
Hash.new do |_, key| Hash.new do |_, key|
@note_member_list << key @note_member_list << key
@user.id default_user_id
end end
end end
@ -54,7 +49,7 @@ module Gitlab
def add_user_as_team_member(existing_user, member) def add_user_as_team_member(existing_user, member)
member['user'] = existing_user member['user'] = existing_user
ProjectMember.create(member_hash(member)) ProjectMember.create(member_hash(member)).persisted?
end end
def member_hash(member) def member_hash(member)