suzanne.soy/travis-api
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Small refacto

Browse Source
This commit is contained in:
Ana Rosas 2016-05-27 16:10:16 +02:00
parent c3e0d6d6bb
commit ef7811ead9
2 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
lib/travis/api/app/endpoint/builds.rb
View File

@ -23,7 +23,7 @@ class Travis::Api::App
Metriks.meter("api.request.cancel_build").mark
if Travis::Features.owner_active?(:enqueue_to_hub, current_user)
service = Travis::Enqueue::Services::CancelModel.new(current_user, { build_id: params[:id], source: 'api' })
service = Travis::Enqueue::Services::CancelModel.new(current_user, { build_id: params[:id] })
else
service = self.service(:cancel_build, params.merge(source: 'api'))
end
@ -47,8 +47,7 @@ class Travis::Api::App
respond_with json
else
if service.respond_to?(:enqueue_to_hub)
payload = { build_id: params[:id], source: 'api'}
service.enqueue_to_hub(payload)
service.enqueue_to_hub
else
Travis::Sidekiq::BuildCancellation.perform_async(id: params[:id], user_id: current_user.id, source: 'api')
end

9
lib/travis/api/enqueue/services/cancel_model.rb
View File

@ -4,12 +4,11 @@ module Travis
class CancelModel
attr_reader :current_user, :source, :target
attr_reader :current_user, :target
def initialize(current_user, params)
@current_user = current_user
@params = params
@source = params.delete(:source) || 'unknown'
target
end
@ -21,16 +20,16 @@ module Travis
messages
end
def enqueue_to_hub(payload)
def enqueue_to_hub
# target may have been retrieved with a :join query, so we need to reset the readonly status
if can_cancel?
target.send(:instance_variable_set, :@readonly, false)
target.cancel!
if type == :build
push_matrix(payload)
push_matrix(@params)
else
push(payload, target)
push(@params, target)
end
end
end