From 79206902e99a0039abd4c5e86aa8e86be6732bc6 Mon Sep 17 00:00:00 2001 From: Claire Date: Tue, 22 Sep 2026 09:04:55 +0000 Subject: [PATCH] Fix deleted-because-of-suspension accounts being marked as manually deleted (#40645) --- app/workers/admin/account_deletion_worker.rb | 6 +++--- spec/workers/admin/account_deletion_worker_spec.rb | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/app/workers/admin/account_deletion_worker.rb b/app/workers/admin/account_deletion_worker.rb index cd0d9c1f5e5..48adfd9045f 100644 --- a/app/workers/admin/account_deletion_worker.rb +++ b/app/workers/admin/account_deletion_worker.rb @@ -6,10 +6,10 @@ class Admin::AccountDeletionWorker sidekiq_options queue: 'pull', lock: :until_executed, lock_ttl: 1.week.to_i def perform(account_id) - delete_account = Account.find(account_id) - return unless delete_account.unavailable? + account = Account.find(account_id) + return unless account.unavailable? - DeleteAccountService.new.call(delete_account, reserve_username: true, reserve_email: true) + DeleteAccountService.new.call(account, reserve_username: true, reserve_email: true, suspended_at: account.suspended_at) rescue ActiveRecord::RecordNotFound true end diff --git a/spec/workers/admin/account_deletion_worker_spec.rb b/spec/workers/admin/account_deletion_worker_spec.rb index 7fc56e42891..84f62ad6aac 100644 --- a/spec/workers/admin/account_deletion_worker_spec.rb +++ b/spec/workers/admin/account_deletion_worker_spec.rb @@ -13,7 +13,7 @@ RSpec.describe Admin::AccountDeletionWorker do allow(DeleteAccountService).to receive(:new).and_return(service) worker.perform(account.id) - expect(service).to have_received(:call).with(account, { reserve_email: true, reserve_username: true }) + expect(service).to have_received(:call).with(account, { reserve_email: true, reserve_username: true, suspended_at: account.reload.suspended_at }) end end end