Revert domain expirable

#186

app/models/concerns/domain/expirable.rb

@@ -1,31 +0,0 @@
-module Concerns::Domain::Expirable
-  extend ActiveSupport::Concern
-
-  included do
-    alias_attribute :expire_time, :valid_to
-  end
-
-  class_methods do
-    def expired
-      where("#{attribute_alias(:expire_time)} <= ?", Time.zone.now)
-    end
-  end
-
-  def registered?
-    !expired?
-  end
-
-  def expired?
-    expire_time <= Time.zone.now
-  end
-
-  def expirable?
-    return false if valid_to > Time.zone.now
-
-    if statuses.include?(DomainStatus::EXPIRED) && outzone_at.present? && delete_at.present?
-      return false
-    end
-
-    true
-  end
-end

app/models/domain.rb

@@ -3,7 +3,6 @@ class Domain < ActiveRecord::Base
   include UserEvents
   include Versions # version/domain_version.rb
   include Statuses
-  include Concerns::Domain::Expirable
   has_paper_trail class_name: "DomainVersion", meta: { children: :children_log }
 
   attr_accessor :roles
@@ -11,7 +10,6 @@ class Domain < ActiveRecord::Base
   attr_accessor :legal_document_id
 
   alias_attribute :on_hold_time, :outzone_at
-  alias_attribute :delete_time, :delete_at
   alias_attribute :force_delete_time, :force_delete_at
 
   # TODO: whois requests ip whitelist for full info for own domains and partial info for other domains
@@ -285,6 +283,16 @@ class Domain < ActiveRecord::Base
     domain_transfers.find_by(status: DomainTransfer::PENDING)
   end
 
+  def expirable?
+    return false if valid_to > Time.zone.now
+
+    if statuses.include?(DomainStatus::EXPIRED) && outzone_at.present? && delete_at.present?
+      return false
+    end
+
+    true
+  end
+
   def server_holdable?
     return false if statuses.include?(DomainStatus::SERVER_HOLD)
     return false if statuses.include?(DomainStatus::SERVER_MANUAL_INZONE)