From 613e7c7521252bd85e473d9c63cbc8b8e1a733a8 Mon Sep 17 00:00:00 2001 From: Akihiko Odaki Date: Mon, 22 Jan 2018 22:25:09 +0900 Subject: Rename ResolveRemoteAccountService to ResolveAccountService (#6327) The service used to be named ResolveRemoteAccountService resolves local accounts as well. --- app/workers/import/relationship_worker.rb | 2 +- app/workers/resolve_account_worker.rb | 11 +++++++++++ app/workers/resolve_remote_account_worker.rb | 11 ----------- 3 files changed, 12 insertions(+), 12 deletions(-) create mode 100644 app/workers/resolve_account_worker.rb delete mode 100644 app/workers/resolve_remote_account_worker.rb (limited to 'app/workers') diff --git a/app/workers/import/relationship_worker.rb b/app/workers/import/relationship_worker.rb index ed4c962c1..1dd8bf8fb 100644 --- a/app/workers/import/relationship_worker.rb +++ b/app/workers/import/relationship_worker.rb @@ -7,7 +7,7 @@ class Import::RelationshipWorker def perform(account_id, target_account_uri, relationship) from_account = Account.find(account_id) - target_account = ResolveRemoteAccountService.new.call(target_account_uri) + target_account = ResolveAccountService.new.call(target_account_uri) return if target_account.nil? diff --git a/app/workers/resolve_account_worker.rb b/app/workers/resolve_account_worker.rb new file mode 100644 index 000000000..cd7c4d7dd --- /dev/null +++ b/app/workers/resolve_account_worker.rb @@ -0,0 +1,11 @@ +# frozen_string_literal: true + +class ResolveAccountWorker + include Sidekiq::Worker + + sidekiq_options queue: 'pull', unique: :until_executed + + def perform(uri) + ResolveAccountService.new.call(uri) + end +end diff --git a/app/workers/resolve_remote_account_worker.rb b/app/workers/resolve_remote_account_worker.rb deleted file mode 100644 index 5dd84ccb6..000000000 --- a/app/workers/resolve_remote_account_worker.rb +++ /dev/null @@ -1,11 +0,0 @@ -# frozen_string_literal: true - -class ResolveRemoteAccountWorker - include Sidekiq::Worker - - sidekiq_options queue: 'pull', unique: :until_executed - - def perform(uri) - ResolveRemoteAccountService.new.call(uri) - end -end -- cgit