Unfloyded/Legamunt
0
0
Fork 0
Code Activity

Use existing SeveredRelationship.about_local_account scope in more places (#29673)

Browse source
This commit is contained in:
Matt Jankowski 2024-03-21 04:36:49 -04:00 • committed by GitHub
parent 718ee72c80
commit 77897cd24c
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
5 changed files with 8 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

2
app/models/account_relationship_severance_event.rb
View file

@ -29,6 +29,6 @@ class AccountRelationshipSeveranceEvent < ApplicationRecord
private
def set_relationships_count!
self.relationships_count = severed_relationships.where(local_account: account).count
self.relationships_count = severed_relationships.about_local_account(account).count
end
end

4
app/models/concerns/account/merging.rb
View file

@ -48,13 +48,13 @@ module Account::Merging
record.update_attribute(:account_warning_id, id)
end
SeveredRelationship.where(local_account_id: other_account.id).reorder(nil).find_each do |record|
SeveredRelationship.about_local_account(other_account).reorder(nil).find_each do |record|
record.update_attribute(:local_account_id, id)
rescue ActiveRecord::RecordNotUnique
next
end
SeveredRelationship.where(remote_account_id: other_account.id).reorder(nil).find_each do |record|
SeveredRelationship.about_remote_account(other_account).reorder(nil).find_each do |record|
record.update_attribute(:remote_account_id, id)
rescue ActiveRecord::RecordNotUnique
next

1
app/models/severed_relationship.rb
View file

@ -26,6 +26,7 @@ class SeveredRelationship < ApplicationRecord
}
scope :about_local_account, ->(account) { where(local_account: account) }
scope :about_remote_account, ->(account) { where(remote_account: account) }
scope :active, -> { where(direction: :active) }
scope :passive, -> { where(direction: :passive) }