Commit cf002738 authored by James Lopez's avatar James Lopez
Browse files

refactor a few things based on feedback

parent 9652500a2ac8
......@@ -15,7 +15,9 @@ def edit
end
def update
if service.update_and_propagate(service_params[:service])
if service.update_attributes(service_params[:service])
PropagateProjectServiceWorker.perform_async(service.id) if service.active?
redirect_to admin_application_settings_services_path,
notice: 'Application settings saved successfully'
else
......
......@@ -254,16 +254,6 @@ def self.build_from_template(project_id, template)
service
end
def update_and_propagate(service_params)
return false unless update_attributes(service_params)
if service_params[:active]
PropagateProjectServiceWorker.perform_async(id)
end
true
end
private
def cache_project_has_external_issue_tracker
......
......@@ -2,15 +2,15 @@ module Projects
class PropagateService
BATCH_SIZE = 100
def self.propagate!(*args)
new(*args).propagate!
def self.propagate(*args)
new(*args).propagate
end
def initialize(template)
@template = template
end
def propagate!
def propagate
return unless @template&.active
Rails.logger.info("Propagating services for template #{@template.id}")
......@@ -28,7 +28,7 @@ def propagate_projects_with_template
batch.each { |project_id| create_from_template(project_id) }
break if batch.count < BATCH_SIZE
break if batch.size < BATCH_SIZE
offset += BATCH_SIZE
end
......
......@@ -10,7 +10,7 @@ class PropagateProjectServiceWorker
def perform(template_id)
return unless try_obtain_lease_for(template_id)
Projects::PropagateService.propagate!(Service.find_by(id: template_id))
Projects::PropagateService.propagate(Service.find_by(id: template_id))
end
private
......
......@@ -23,4 +23,36 @@
end
end
end
describe "#update" do
let(:project) { create(:empty_project) }
let!(:service) do
RedmineService.create(
project: project,
active: false,
template: true,
properties: {
project_url: 'http://abc',
issues_url: 'http://abc',
new_issue_url: 'http://abc'
}
)
end
it 'updates the service params successfully and calls the propagation worker' do
expect(PropagateProjectServiceWorker).to receive(:perform_async).with(service.id)
put :update, id: service.id, service: { active: true }
expect(response).to have_http_status(302)
end
it 'updates the service params successfully' do
expect(PropagateProjectServiceWorker).not_to receive(:perform_async)
put :update, id: service.id, service: { properties: {} }
expect(response).to have_http_status(302)
end
end
end
......@@ -254,31 +254,4 @@
end
end
end
describe "#update_and_propagate" do
let(:project) { create(:empty_project) }
let!(:service) do
RedmineService.create(
project: project,
active: false,
properties: {
project_url: 'http://abc',
issues_url: 'http://abc',
new_issue_url: 'http://abc'
}
)
end
it 'updates the service params successfully and calls the propagation worker' do
expect(PropagateProjectServiceWorker).to receive(:perform_async).with(service.id)
expect(service.update_and_propagate(active: true)).to be true
end
it 'updates the service params successfully' do
expect(PropagateProjectServiceWorker).not_to receive(:perform_async)
expect(service.update_and_propagate(properties: {})).to be true
end
end
end
......@@ -18,7 +18,7 @@
let!(:project) { create(:empty_project) }
it 'creates services for projects' do
expect { described_class.propagate!(service_template) }.
expect { described_class.propagate(service_template) }.
to change { Service.count }.by(1)
end
......@@ -36,7 +36,7 @@
Service.build_from_template(project.id, other_service).save!
expect { described_class.propagate!(service_template) }.
expect { described_class.propagate(service_template) }.
to change { Service.count }.by(1)
end
......@@ -55,12 +55,12 @@
Service.build_from_template(project.id, service_template).save!
Service.build_from_template(project.id, other_service).save!
expect { described_class.propagate!(service_template) }.
expect { described_class.propagate(service_template) }.
not_to change { Service.count }
end
it 'creates the service containing the template attributes' do
described_class.propagate!(service_template)
described_class.propagate(service_template)
service = Service.find_by(type: service_template.type, template: false)
......
......@@ -21,7 +21,7 @@
describe '#perform' do
it 'calls the propagate service with the template' do
expect(Projects::PropagateService).to receive(:propagate!).with(service_template)
expect(Projects::PropagateService).to receive(:propagate).with(service_template)
subject.perform(service_template.id)
end
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment