From ef7811ead9e898f460df6830bc8e7d30ef4cfbfe Mon Sep 17 00:00:00 2001
From: Ana Rosas <a.rosas10@gmail.com>
Date: Fri, 27 May 2016 16:10:16 +0200
Subject: [PATCH] Small refacto
---
lib/travis/api/app/endpoint/builds.rb | 5 ++---
lib/travis/api/enqueue/services/cancel_model.rb | 9 ++++-----
2 files changed, 6 insertions(+), 8 deletions(-)
diff --git a/lib/travis/api/app/endpoint/builds.rb b/lib/travis/api/app/endpoint/builds.rb
index 477731ed..57ae056a 100644
--- a/lib/travis/api/app/endpoint/builds.rb
+++ b/lib/travis/api/app/endpoint/builds.rb
@@ -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
diff --git a/lib/travis/api/enqueue/services/cancel_model.rb b/lib/travis/api/enqueue/services/cancel_model.rb
index d8868a50..fb434c9d 100644
--- a/lib/travis/api/enqueue/services/cancel_model.rb
+++ b/lib/travis/api/enqueue/services/cancel_model.rb
@@ -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