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

refactor code based on feedback

Browse source
This commit is contained in:
James Lopez 2018-06-22 09:00:10 +02:00
parent 92ec58abeb
commit 3d3e441c91
No known key found for this signature in database
GPG key ID: 756BF8E9D7C0CF39
4 changed files with 84 additions and 91 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

51
lib/gitlab/import_export/group_project_finder.rb → lib/gitlab/import_export/group_project_object_builder.rb
View file

@ -1,15 +1,18 @@
module Gitlab
module ImportExport
class GroupProjectFinder
def self.find_or_new(*args)
# Given a class, it finds or creates a new object
# (initializes in the case of Label) at group or project level
# If it does not exist in the group, it creates it at project level
#
# For example:
# `GroupProjectObjectBuilder.build(Label, label_attributes)`
# finds or initializes a label with the given attributes.
#
# It also adds some logic around Group Labels/Milestones for edge cases.
class GroupProjectObjectBuilder
def self.build(*args)
Project.transaction do
new(*args).find_or_new
end
end
def self.find_or_create(*args)
Project.transaction do
new(*args).find_or_create
new(*args).find
end
end
@ -20,30 +23,38 @@ module Gitlab
@project = @attributes[:project]
end
def find_or_new
@klass.where(where_clause).first || @klass.new(project_attributes)
end
def find_or_create
@klass.where(where_clause).first || @klass.create(project_attributes)
def find
find_or_action do
label? ? @klass.new(project_attributes) : @klass.create(project_attributes)
end
end
private
def find_or_action(&block)
@klass.where(where_clause).first || yield
end
def where_clause
return { project_id: @project.id } unless milestone? || label?
@attributes.slice('title').map do |key, value|
project_clause = table[key].eq(value).and(table[:project_id].eq(@project.id))
if @group
project_clause.or(table[key].eq(value).and(table[:group_id].eq(@group.id)))
project_clause(key, value).or(group_clause(key, value))
else
project_clause
project_clause(key, value)
end
end.reduce(:or)
end
def group_clause(key, value)
table[key].eq(value).and(table[:group_id].eq(@group.id))
end
def project_clause(key, value)
table[key].eq(value).and(table[:project_id].eq(@project.id))
end
def table
@table ||= @klass.arel_table
end
@ -71,7 +82,7 @@ module Gitlab
@klass == Milestone
end
# If an existing group milesone used the IIID
# If an existing group milesone used the IID
# claim the IID back and set the group milestone to use one available
# This is neccessary to fix situations like the following:
# - Importing into a user namespace project with exported group milestones

2
lib/gitlab/import_export/relation_factory.rb
View file

@ -266,7 +266,7 @@ module Gitlab
hash.delete('project_id')
end
GroupProjectFinder.find_or_create(relation_class, finder_hash)
GroupProjectObjectBuilder.build(relation_class, finder_hash)
end
end
end

70
spec/lib/gitlab/import_export/group_project_finder_spec.rb
View file

@ -1,70 +0,0 @@
require 'spec_helper'
describe Gitlab::ImportExport::GroupProjectFinder do
let(:project) do
create(:project,
:builds_disabled,
:issues_disabled,
name: 'project',
path: 'project',
group: create(:group))
end
context 'labels' do
it 'finds the right group label' do
group_label = create(:group_label, 'name': 'group label', 'group': project.group)
expect(described_class.find_or_new(Label,
title: 'group label',
project: project,
group: project.group)).to eq(group_label)
end
it 'initializes a new label' do
label = described_class.find_or_new(Label,
title: 'group label',
project: project,
group: project.group)
expect(label.persisted?).to be false
end
it 'creates a new label' do
label = described_class.find_or_create(Label,
title: 'group label',
project: project,
group: project.group)
expect(label.persisted?).to be true
end
end
context 'milestones' do
it 'finds the right group milestone' do
milestone = create(:milestone, 'name' => 'group milestone', 'group' => project.group)
expect(described_class.find_or_new(Milestone,
title: 'group milestone',
project: project,
group: project.group)).to eq(milestone)
end
it 'initializes a new milestone' do
milestone = described_class.find_or_new(Milestone,
title: 'group milestone',
project: project,
group: project.group)
expect(milestone.persisted?).to be false
end
it 'creates a new milestone' do
milestone = described_class.find_or_create(Milestone,
title: 'group milestone',
project: project,
group: project.group)
expect(milestone.persisted?).to be true
end
end
end

52
spec/lib/gitlab/import_export/group_project_object_builder_spec.rb Normal file
View file

@ -0,0 +1,52 @@
require 'spec_helper'
describe Gitlab::ImportExport::GroupProjectObjectBuilder do
let(:project) do
create(:project,
:builds_disabled,
:issues_disabled,
name: 'project',
path: 'project',
group: create(:group))
end
context 'labels' do
it 'finds the right group label' do
group_label = create(:group_label, 'name': 'group label', 'group': project.group)
expect(described_class.build(Label,
title: 'group label',
project: project,
group: project.group)).to eq(group_label)
end
it 'initializes a new label' do
label = described_class.build(Label,
title: 'group label',
project: project,
group: project.group)
expect(label.persisted?).to be false
end
end
context 'milestones' do
it 'finds the right group milestone' do
milestone = create(:milestone, 'name' => 'group milestone', 'group' => project.group)
expect(described_class.build(Milestone,
title: 'group milestone',
project: project,
group: project.group)).to eq(milestone)
end
it 'creates a new milestone' do
milestone = described_class.build(Milestone,
title: 'group milestone',
project: project,
group: project.group)
expect(milestone.persisted?).to be true
end
end
end