diff --git a/app/controllers/projects/branches_controller.rb b/app/controllers/projects/branches_controller.rb
index 6845fc5e6e67d6c1020554b77a6d89985f58ffe3..faa0ce67ca894408dcb541b64ef2c466661cdfd7 100644
--- a/app/controllers/projects/branches_controller.rb
+++ b/app/controllers/projects/branches_controller.rb
@@ -17,10 +17,8 @@ class Projects::BranchesController < Projects::ApplicationController
end
def create
- result = CreateBranchService.new.execute(project,
- params[:branch_name],
- params[:ref],
- current_user)
+ result = CreateBranchService.new(project, current_user).
+ execute(params[:branch_name], params[:ref])
if result[:status] == :success
@branch = result[:branch]
redirect_to project_tree_path(@project, @branch.name)
@@ -31,7 +29,7 @@ class Projects::BranchesController < Projects::ApplicationController
end
def destroy
- DeleteBranchService.new.execute(project, params[:id], current_user)
+ DeleteBranchService.new(project, current_user).execute(params[:id])
@branch_name = params[:id]
respond_to do |format|
diff --git a/app/controllers/projects/edit_tree_controller.rb b/app/controllers/projects/edit_tree_controller.rb
index 72a41f771c0a699ec964a69f9f6a657c42d2c3e5..8976d7c7be85b45c0851d3437be385955289a518 100644
--- a/app/controllers/projects/edit_tree_controller.rb
+++ b/app/controllers/projects/edit_tree_controller.rb
@@ -10,7 +10,8 @@ class Projects::EditTreeController < Projects::BaseTreeController
end
def update
- result = Files::UpdateService.new(@project, current_user, params, @ref, @path).execute
+ result = Files::UpdateService.
+ new(@project, current_user, params, @ref, @path).execute
if result[:status] == :success
flash[:notice] = "Your changes have been successfully committed"
diff --git a/app/controllers/projects/tags_controller.rb b/app/controllers/projects/tags_controller.rb
index c80ad8355d5abf7d95ddd50a25a2f8733710c6e0..537c94bda20e956e19a9233a381e98862d6bfc69 100644
--- a/app/controllers/projects/tags_controller.rb
+++ b/app/controllers/projects/tags_controller.rb
@@ -13,9 +13,8 @@ class Projects::TagsController < Projects::ApplicationController
end
def create
- result = CreateTagService.new.execute(@project, params[:tag_name],
- params[:ref], params[:message],
- current_user)
+ result = CreateTagService.new(@project, current_user).
+ execute(params[:tag_name], params[:ref], params[:message])
if result[:status] == :success
@tag = result[:tag]
redirect_to project_tags_path(@project)
diff --git a/app/services/base_service.rb b/app/services/base_service.rb
index 31b38aca5307b9818d3747208ad01e730c546362..051612633cd298fe3f66385cbc0dcfcf1cd47ef5 100644
--- a/app/services/base_service.rb
+++ b/app/services/base_service.rb
@@ -1,7 +1,7 @@
class BaseService
attr_accessor :project, :current_user, :params
- def initialize(project, user, params)
+ def initialize(project, user, params = {})
@project, @current_user, @params = project, user, params.dup
end
@@ -32,4 +32,19 @@ class BaseService
def system_hook_service
SystemHooksService.new
end
+
+ private
+
+ def error(message)
+ {
+ message: message,
+ status: :error
+ }
+ end
+
+ def success
+ {
+ status: :success
+ }
+ end
end
diff --git a/app/services/create_branch_service.rb b/app/services/create_branch_service.rb
index 79b8239602e7fb44052ae63272c03b4e70f70e56..901f67bafb31b71b7a73bba0d879c87a59781bc4 100644
--- a/app/services/create_branch_service.rb
+++ b/app/services/create_branch_service.rb
@@ -1,5 +1,7 @@
-class CreateBranchService
- def execute(project, branch_name, ref, current_user)
+require_relative 'base_service'
+
+class CreateBranchService < BaseService
+ def execute(branch_name, ref)
valid_branch = Gitlab::GitRefValidator.validate(branch_name)
if valid_branch == false
return error('Branch name invalid')
@@ -22,17 +24,9 @@ class CreateBranchService
end
end
- def error(message)
- {
- message: message,
- status: :error
- }
- end
-
def success(branch)
- {
- branch: branch,
- status: :success
- }
+ out = super()
+ out[:branch] = branch
+ out
end
end
diff --git a/app/services/create_tag_service.rb b/app/services/create_tag_service.rb
index 3716abd4b2b6edd77cc7371ced575e74c4024293..9b2a2270233d80129fd2a4e546f7acf0cd65eec0 100644
--- a/app/services/create_tag_service.rb
+++ b/app/services/create_tag_service.rb
@@ -1,5 +1,7 @@
-class CreateTagService
- def execute(project, tag_name, ref, message, current_user)
+require_relative 'base_service'
+
+class CreateTagService < BaseService
+ def execute(tag_name, ref, message)
valid_tag = Gitlab::GitRefValidator.validate(tag_name)
if valid_tag == false
return error('Tag name invalid')
@@ -26,17 +28,9 @@ class CreateTagService
end
end
- def error(message)
- {
- message: message,
- status: :error
- }
- end
-
def success(branch)
- {
- tag: branch,
- status: :success
- }
+ out = super()
+ out[:tag] = branch
+ out
end
end
diff --git a/app/services/delete_branch_service.rb b/app/services/delete_branch_service.rb
index a94dabcdfc0729bae293d23d101923b4d254b73c..cae6327fe7296f0486345f8f9edfe0eab2e5f320 100644
--- a/app/services/delete_branch_service.rb
+++ b/app/services/delete_branch_service.rb
@@ -1,5 +1,7 @@
-class DeleteBranchService
- def execute(project, branch_name, current_user)
+require_relative 'base_service'
+
+class DeleteBranchService < BaseService
+ def execute(branch_name)
repository = project.repository
branch = repository.find_branch(branch_name)
@@ -31,17 +33,14 @@ class DeleteBranchService
end
def error(message, return_code = 400)
- {
- message: message,
- return_code: return_code,
- state: :error
- }
+ out = super(message)
+ out[:return_code] = return_code
+ out
end
def success(message)
- {
- message: message,
- state: :success
- }
+ out = super()
+ out[:message] = message
+ out
end
end
diff --git a/app/services/files/base_service.rb b/app/services/files/base_service.rb
index f1765d389767f79c9e41a5b6baf2c926f9081c72..db6f0831f8b804cfcbdf38fac1c9c8ad9c84858a 100644
--- a/app/services/files/base_service.rb
+++ b/app/services/files/base_service.rb
@@ -10,18 +10,10 @@ module Files
private
- def error(message)
- {
- error: message,
- status: :error
- }
- end
-
def success
- {
- error: '',
- status: :success
- }
+ out = super()
+ out[:error] = ''
+ out
end
def repository
diff --git a/lib/api/branches.rb b/lib/api/branches.rb
index 4db5f61dd28b94b134e17b5f4e50eb2bddd5d16e..75783628e3dd6ba984b1c5519736feeb9ca0bc9a 100644
--- a/lib/api/branches.rb
+++ b/lib/api/branches.rb
@@ -80,10 +80,8 @@ module API
# POST /projects/:id/repository/branches
post ":id/repository/branches" do
authorize_push_project
- result = CreateBranchService.new.execute(user_project,
- params[:branch_name],
- params[:ref],
- current_user)
+ result = CreateBranchService.new(user_project, current_user).
+ execute(params[:branch_name], params[:ref])
if result[:status] == :success
present result[:branch],
with: Entities::RepoObject,
@@ -102,9 +100,10 @@ module API
# DELETE /projects/:id/repository/branches/:branch
delete ":id/repository/branches/:branch" do
authorize_push_project
- result = DeleteBranchService.new.execute(user_project, params[:branch], current_user)
+ result = DeleteBranchService.new(user_project, current_user).
+ execute(params[:branch])
- if result[:state] == :success
+ if result[:status] == :success
true
else
render_api_error!(result[:message], result[:return_code])
diff --git a/lib/api/repositories.rb b/lib/api/repositories.rb
index 07c29aa7b4c1b921266e007c5ae114380467b739..626d99c26491201f4b6712848726fae6ea248128 100644
--- a/lib/api/repositories.rb
+++ b/lib/api/repositories.rb
@@ -38,9 +38,8 @@ module API
post ':id/repository/tags' do
authorize_push_project
message = params[:message] || nil
- result = CreateTagService.new.execute(user_project, params[:tag_name],
- params[:ref], message,
- current_user)
+ result = CreateTagService.new(user_project, current_user).
+ execute(params[:tag_name], params[:ref], message)
if result[:status] == :success
present result[:tag],