Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Use in_batches.destroy_all instead of destroy_all #2802

Merged
merged 1 commit into from May 4, 2017
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
22 changes: 15 additions & 7 deletions app/services/suspend_account_service.rb
Expand Up @@ -17,12 +17,16 @@ def purge_content
RemoveStatusService.new.call(status)
end

@account.media_attachments.destroy_all
@account.stream_entries.destroy_all
@account.notifications.destroy_all
@account.favourites.destroy_all
@account.active_relationships.destroy_all
@account.passive_relationships.destroy_all
[
@account.media_attachments,
@account.stream_entries,
@account.notifications,
@account.favourites,
@account.active_relationships,
@account.passive_relationships
].each do |association|
destroy_all(association)
end
end

def purge_profile
Expand All @@ -35,6 +39,10 @@ def purge_profile
end

def unsubscribe_push_subscribers
@account.subscriptions.destroy_all
destroy_all(@account.subscriptions)
end

def destroy_all(association)
association.in_batches.destroy_all
end
end
3 changes: 2 additions & 1 deletion spec/fabricators/favourite_fabricator.rb
@@ -1,3 +1,4 @@
Fabricator(:favourite) do

account
status
end
33 changes: 33 additions & 0 deletions spec/services/suspend_account_service_spec.rb
@@ -0,0 +1,33 @@
require 'rails_helper'

RSpec.describe SuspendAccountService do
describe '#call' do
subject do
-> { described_class.new.call(account) }
end

let!(:account) { Fabricate(:account) }
let!(:status) { Fabricate(:status, account: account) }
let!(:media_attachment) { Fabricate(:media_attachment, account: account) }
let!(:notification) { Fabricate(:notification, account: account) }
let!(:favourite) { Fabricate(:favourite, account: account) }
let!(:active_relationship) { Fabricate(:follow, account: account) }
let!(:passive_relationship) { Fabricate(:follow, target_account: account) }
let!(:subscription) { Fabricate(:subscription, account: account) }

it 'deletes associated records' do
is_expected.to change {
[
account.statuses,
account.media_attachments,
account.stream_entries,
account.notifications,
account.favourites,
account.active_relationships,
account.passive_relationships,
account.subscriptions
].map(&:count)
}.from([1, 1, 1, 1, 1, 1, 1, 1]).to([0, 0, 0, 0, 0, 0, 0, 0])
end
end
end