summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGrzegorz Bizon <grzesiek.bizon@gmail.com>2017-04-12 11:46:24 +0200
committerGrzegorz Bizon <grzesiek.bizon@gmail.com>2017-04-12 11:46:24 +0200
commit6c6bc400d1d8a96f6e443788cd0b2c14addd88e3 (patch)
tree81dd71fad366f25a7fa92638f50d9dc1ccf04835
parentb09465f38d66d7ff6074843177bcdb7d72caf07f (diff)
downloadgitlab-ce-6c6bc400d1d8a96f6e443788cd0b2c14addd88e3.tar.gz
Move code for playing an action to separate service
-rw-r--r--app/models/ci/build.rb15
-rw-r--r--app/policies/ci/build_policy.rb2
-rw-r--r--app/services/ci/play_build_service.rb17
3 files changed, 21 insertions, 13 deletions
diff --git a/app/models/ci/build.rb b/app/models/ci/build.rb
index 159b3b2e101..9edc4cd96b9 100644
--- a/app/models/ci/build.rb
+++ b/app/models/ci/build.rb
@@ -122,18 +122,9 @@ module Ci
end
def play(current_user)
- unless can_play?(current_user)
- raise Gitlab::Access::AccessDeniedError
- end
-
- # Try to queue a current build
- if self.enqueue
- self.update(user: current_user)
- self
- else
- # Otherwise we need to create a duplicate
- Ci::Build.retry(self, current_user)
- end
+ Ci::PlayBuildService
+ .new(project, current_user)
+ .execute(self)
end
def cancelable?
diff --git a/app/policies/ci/build_policy.rb b/app/policies/ci/build_policy.rb
index 0522cbdb331..2c39d31488f 100644
--- a/app/policies/ci/build_policy.rb
+++ b/app/policies/ci/build_policy.rb
@@ -17,7 +17,7 @@ module Ci
alias_method :build, :subject
def can_play_action?
- return false unless build.playable?
+ return false unless build.action?
::Gitlab::UserAccess
.new(user, project: build.project)
diff --git a/app/services/ci/play_build_service.rb b/app/services/ci/play_build_service.rb
new file mode 100644
index 00000000000..c9ed45408f2
--- /dev/null
+++ b/app/services/ci/play_build_service.rb
@@ -0,0 +1,17 @@
+module Ci
+ class PlayBuildService < ::BaseService
+ def execute(build)
+ unless can?(current_user, :play_build, build)
+ raise Gitlab::Access::AccessDeniedError
+ end
+
+ # Try to enqueue thebuild, otherwise create a duplicate.
+ #
+ if build.enqueue
+ build.tap { |action| action.update(user: current_user) }
+ else
+ Ci::Build.retry(build, current_user)
+ end
+ end
+ end
+end