zydronium/internetee-registry
1
0
Fork 0
mirror of https://github.com/internetee/registry.git synced 2025-07-25 20:18:22 +02:00
Code Issues Projects Releases Packages Wiki Activity

Rename method

Browse source
This commit is contained in:
Artur Beljajev 2019-06-21 17:49:47 +03:00
parent 3b3c9966e7
commit d14fa5b701
6 changed files with 29 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

8
app/models/contact.rb
View file

@ -188,7 +188,7 @@ class Contact < ActiveRecord::Base
ver_scope << "(children->'#{type}')::jsonb <@ json_build_array(#{contact.id})::jsonb"
end
next if DomainVersion.where("created_at > ?", Time.now - Setting.orphans_contacts_in_months.to_i.months).where(ver_scope.join(" OR ")).any?
next if contact.in_use?
next if contact.linked?
contact.destroy
counter.next
@ -279,7 +279,7 @@ class Contact < ActiveRecord::Base
calculated.delete(Contact::OK)
calculated.delete(Contact::LINKED)
calculated << Contact::OK if calculated.empty?# && valid?
calculated << Contact::LINKED if in_use?
calculated << Contact::LINKED if linked?
calculated.uniq
end
@ -345,7 +345,7 @@ class Contact < ActiveRecord::Base
# no need separate method
# should use only in transaction
def destroy_and_clean frame
if in_use?
if linked?
errors.add(:domains, :exist)
return false
end
@ -513,7 +513,7 @@ class Contact < ActiveRecord::Base
Country.new(ident_country_code)
end
def in_use?
def linked?
registrant_domains.any? || domain_contacts.any?
end