From 172a1bf6648213666e716b1f05d3750e83b10b98 Mon Sep 17 00:00:00 2001 From: Martin Lensment Date: Fri, 2 Jan 2015 16:39:35 +0200 Subject: [PATCH] Refactor --- app/models/domain.rb | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/app/models/domain.rb b/app/models/domain.rb index 280577f5c..76667f530 100644 --- a/app/models/domain.rb +++ b/app/models/domain.rb @@ -239,11 +239,11 @@ class Domain < ActiveRecord::Base # rubocop:enable Lint/Loop def attach_default_contacts - if tech_contacts_count.zero? + if tech_domain_contacts.count.zero? attach_contact(DomainContact::TECH, owner_contact) end - return unless admin_contacts_count.zero? && owner_contact.citizen? + return unless admin_domain_contacts.count.zero? && owner_contact.citizen? attach_contact(DomainContact::ADMIN, owner_contact) end @@ -263,14 +263,6 @@ class Domain < ActiveRecord::Base self.valid_to = valid_from + self.class.convert_period_to_time(period, period_unit) end - def tech_contacts_count - domain_contacts.reject(&:marked_for_destruction?).select { |x| x.contact_type == DomainContact::TECH }.count - end - - def admin_contacts_count - domain_contacts.reject(&:marked_for_destruction?).select { |x| x.contact_type == DomainContact::ADMIN }.count - end - def manage_automatic_statuses if domain_statuses.empty? && valid? domain_statuses.create(value: DomainStatus::OK)