Fix: リモートからのアカウント削除時エラーが出る問題 (#872)

* Fix: アカウント削除時エラーが出る問題

* nilに変更

* 削除するタイミングと条件を調整

* Fix test
This commit is contained in:
KMY(雪あすか) 2024-10-10 07:47:21 +09:00 committed by GitHub
parent 74a6238d10
commit be567228ef
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 6 additions and 0 deletions

View file

@ -19,6 +19,7 @@ module Account::Associations
has_many :conversations, class_name: 'AccountConversation', dependent: :destroy, inverse_of: :account
has_many :scheduled_statuses, inverse_of: :account, dependent: :destroy
has_many :scheduled_expiration_statuses, inverse_of: :account, dependent: :destroy
has_many :ng_rule_histories, inverse_of: :account, dependent: :destroy
# Notifications
has_many :notifications, inverse_of: :account, dependent: :destroy

View file

@ -170,6 +170,7 @@ class DeleteAccountService < BaseService
purge_feeds!
purge_other_associations!
remove_ng_rule_history_relations! unless keep_account_record?
@account.destroy unless keep_account_record?
end
@ -273,6 +274,10 @@ class DeleteAccountService < BaseService
@account.save!
end
def remove_ng_rule_history_relations!
@account.ng_rule_histories.update_all(account_id: nil)
end
def fulfill_deletion_request!
@account.deletion_request&.destroy
end