Merge branch 'master' into alpha

app/mailers/contact_mailer.rb

@@ -8,7 +8,14 @@ class ContactMailer < ApplicationMailer
     return if contact.deliver_emails != true
 
     @contact = contact
-    mail(to: [@contact.email, @contact.email_was], 
-         subject: "#{I18n.t(:contact_email_update_subject)} [#{@contact.code}]")
+
+    emails = []
+    emails << [@contact.email, @contact.email_was] if @contact.registrant_domains.present?
+    emails << @contact.domains.map(&:email) if @contact.domains.present?
+    emails = emails.uniq
+    
+    emails.each do |email|
+      mail(to: email, subject: "#{I18n.t(:contact_email_update_subject)} [#{@contact.code}]")
+    end
   end
 end

app/models/domain.rb

@@ -147,10 +147,49 @@ class Domain < ActiveRecord::Base
       )
     end
 
-    def expire_domains
-      Domain.where('valid_to <= ?', Time.zone.now).each do |x|
+    def start_expire_period
+      logger.info "#{Time.zone.now.utc} - Expiring domains\n"
+
+      d = Domain.where('valid_to <= ?', Time.zone.now)
+      d.each do |x|
         x.domain_statuses.create(value: DomainStatus::EXPIRED) if x.expirable?
       end
+
+      logger.info "#{Time.zone.now.utc} - Successfully expired #{d.count} domains\n"
+    end
+
+    def start_redemption_grace_period
+      logger.info "#{Time.zone.now.utc} - Setting server_hold to domains\n"
+
+      d = Domain.where('outzone_at <= ?', Time.zone.now)
+      d.each do |x|
+        x.domain_statuses.create(value: DomainStatus::SERVER_HOLD) if x.server_holdable?
+      end
+
+      logger.info "#{Time.zone.now.utc} - Successfully set server_hold to #{d.count} domains\n"
+    end
+
+    def start_delete_period
+      logger.info "#{Time.zone.now.utc} - Setting delete_candidate to domains\n"
+
+      d = Domain.where('delete_at <= ?', Time.zone.now)
+      d.each do |x|
+        x.domain_statuses.create(value: DomainStatus::DELETE_CANDIDATE) if x.delete_candidateable?
+      end
+
+      logger.info "#{Time.zone.now.utc} - Successfully set delete_candidate to #{d.count} domains\n"
+    end
+
+    def destroy_delete_candidates
+      logger.info "#{Time.zone.now.utc} - Destroying domains\n"
+
+      c = 0
+      DomainStatus.where(value: DomainStatus::DELETE_CANDIDATE).each do |x|
+        x.domain.destroy
+        c += 1
+      end
+
+      logger.info "#{Time.zone.now.utc} - Successfully destroyed #{c} domains\n"
     end
   end
 
@@ -189,6 +228,32 @@ class Domain < ActiveRecord::Base
     domain_statuses.where(value: DomainStatus::EXPIRED).empty?
   end
 
+  def server_holdable?
+    return false if outzone_at > Time.zone.now
+    return false if domain_statuses.where(value: DomainStatus::SERVER_HOLD).any?
+    return false if domain_statuses.where(value: DomainStatus::SERVER_MANUAL_INZONE).any?
+    true
+  end
+
+  def delete_candidateable?
+    return false if delete_at > Time.zone.now
+    return false if domain_statuses.where(value: DomainStatus::DELETE_CANDIDATE).any?
+    return false if domain_statuses.where(value: DomainStatus::SERVER_DELETE_PROHIBITED).any?
+    true
+  end
+
+  def renewable?
+    if Setting.days_to_renew_domain_before_expire != 0
+      if (valid_to - Time.zone.now).to_i / 1.day >= Setting.days_to_renew_domain_before_expire
+        return false
+      end
+    end
+
+    return false if domain_statuses.where(value: DomainStatus::DELETE_CANDIDATE).any?
+
+    true
+  end
+
   def pending_update?
     (domain_statuses.pluck(:value) & %W(
       #{DomainStatus::PENDING_UPDATE}
@@ -327,11 +392,15 @@ class Domain < ActiveRecord::Base
 
   def set_validity_dates
     self.registered_at = Time.zone.now
-    self.valid_from = Time.zone.now.to_date
+    self.valid_from = Time.zone.now
     self.valid_to = valid_from + self.class.convert_period_to_time(period, period_unit)
+    self.outzone_at = valid_to + Setting.expire_warning_period.days
+    self.delete_at = outzone_at + Setting.redemption_grace_period.days
   end
 
   def manage_automatic_statuses
+    # domain_statuses.create(value: DomainStatus::DELETE_CANDIDATE) if delete_candidateable?
+
     if domain_statuses.empty? && valid?
       domain_statuses.create(value: DomainStatus::OK)
     elsif domain_statuses.length > 1 || !valid?

app/models/epp/domain.rb

@@ -427,21 +427,19 @@ class Epp::Domain < Domain
   ### RENEW ###
 
   def renew(cur_exp_date, period, unit = 'y')
-    # TODO: Check how much time before domain exp date can it be renewed
     validate_exp_dates(cur_exp_date)
 
-    if Setting.days_to_renew_domain_before_expire != 0
-      if (valid_to - Time.zone.now).to_i / 1.day >= Setting.days_to_renew_domain_before_expire
-        add_epp_error('2105', nil, nil, I18n.t('object_is_not_eligible_for_renewal'))
-      end
-    end
-
+    add_epp_error('2105', nil, nil, I18n.t('object_is_not_eligible_for_renewal')) unless renewable?
     return false if errors.any?
 
     p = self.class.convert_period_to_time(period, unit)
     self.valid_to = valid_to + p
     self.period = period
     self.period_unit = unit
+
+    domain_statuses.where(value: DomainStatus::SERVER_HOLD).destroy_all
+    domain_statuses.where(value: DomainStatus::EXPIRED).destroy_all
+
     save
   end
 

config/initializers/initial_settings.rb

@@ -32,6 +32,8 @@ if con.present? && con.table_exists?('settings')
   Setting.save_default(:invoice_number_max, '149999')
   Setting.save_default(:days_to_keep_overdue_invoices_active, 30)
   Setting.save_default(:days_to_renew_domain_before_expire, 90)
+  Setting.save_default(:expire_warning_period, 15)
+  Setting.save_default(:redemption_grace_period, 30)
 end
 
 # dev only setting

config/schedule.rb

@@ -31,3 +31,13 @@ end
 every 3.hours do
   runner 'Certificate.update_crl'
 end
+
+every :hour do
+  runner 'Domain.start_expire_period'
+  runner 'Domain.start_redemption_grace_period'
+  runner 'Domain.start_delete_period'
+end
+
+every 42.minutes do
+  runner 'Domain.destroy_delete_candidates'
+end

db/data/20150610111019_add_expire_settings.rb

@@ -0,0 +1,10 @@
+class AddExpireSettings < ActiveRecord::Migration
+  def self.up
+    Setting.expire_warning_period = 15
+    Setting.redemption_grace_period = 30
+  end
+
+  def self.down
+    raise ActiveRecord::IrreversibleMigration
+  end
+end

spec/epp/domain_spec.rb

@@ -317,7 +317,7 @@ describe 'EPP Domain', epp: true do
       response = epp_plain_request(xml)
       response[:msg].should == 'Command completed successfully'
       response[:result_code].should == '1000'
-      Domain.first.valid_to.should == 1.year.since.to_date
+      Domain.first.valid_to.should be_within(5).of(1.year.since)
     end
 
     it 'does not create a domain with invalid period' do
@@ -2047,6 +2047,53 @@ describe 'EPP Domain', epp: true do
       Setting.days_to_renew_domain_before_expire = 90
     end
 
+    it 'does not renew a domain if it is a delete candidate' do
+      domain.valid_to = Time.zone.now + 10.days
+      domain.delete_at = Time.zone.now
+      domain.save
+
+      Domain.start_delete_period
+
+      exp_date = domain.valid_to.to_date
+
+      xml = @epp_xml.domain.renew(
+        name: { value: domain.name },
+        curExpDate: { value: exp_date.to_s },
+        period: { value: '1', attrs: { unit: 'y' } }
+      )
+
+      response = epp_plain_request(xml)
+      response[:results][0][:msg].should == 'Object is not eligible for renewal'
+      response[:results][0][:result_code].should == '2105'
+    end
+
+    it 'should renew a expired domain' do
+      domain.valid_to = Time.zone.now - 50.days
+      domain.outzone_at = Time.zone.now - 50.days
+      domain.save
+
+      Domain.start_expire_period
+      Domain.start_redemption_grace_period
+
+      domain.domain_statuses.where(value: DomainStatus::EXPIRED).count.should == 1
+      domain.domain_statuses.where(value: DomainStatus::SERVER_HOLD).count.should == 1
+
+      exp_date = domain.valid_to.to_date
+
+      xml = @epp_xml.domain.renew(
+        name: { value: domain.name },
+        curExpDate: { value: exp_date.to_s },
+        period: { value: '1', attrs: { unit: 'y' } }
+      )
+
+      response = epp_plain_request(xml)
+      response[:results][0][:msg].should == 'Command completed successfully'
+      response[:results][0][:result_code].should == '1000'
+
+      domain.domain_statuses.where(value: DomainStatus::EXPIRED).count.should == 0
+      domain.domain_statuses.where(value: DomainStatus::SERVER_HOLD).count.should == 0
+    end
+
     it 'does not renew foreign domain' do
       login_as :registrar2 do
         exp_date = 1.year.since.to_date

spec/mailers/contact_mailer_spec.rb

@@ -27,7 +27,8 @@ describe ContactMailer do
 
   describe 'email changed notification' do
     before :all do 
-      @contact = Fabricate(:contact, email: 'test@example.com')
+      @domain = Fabricate(:domain)
+      @contact = @domain.registrant
       @contact.deliver_emails = true
       @contact.email = 'test@example.org' # new email
       @mail = ContactMailer.email_updated(@contact)
@@ -42,7 +43,8 @@ describe ContactMailer do
     end
 
     it 'should have both old and new receiver email' do
-      @mail.to.should == ["test@example.org", "test@example.com"]
+      @mail.to.size.should == 2 
+      @mail.to.include? "test@example.org"
     end
 
     it 'should render body' do

spec/models/domain_spec.rb

@@ -55,6 +55,15 @@ describe Domain do
       @domain.errors.full_messages.should match_array([])
     end
 
+    it 'should have correct validity dates' do
+      valid_to = Time.zone.now + 1.year
+      @domain.valid_to.should be_within(5).of(valid_to)
+      @domain.outzone_at.should be_within(5).of(valid_to + Setting.expire_warning_period.days)
+      @domain.delete_at.should be_within(5).of(
+        valid_to + Setting.expire_warning_period.days + Setting.redemption_grace_period.days
+      )
+    end
+
     it 'should validate uniqueness of tech contacts' do
       same_contact = Fabricate(:contact, code: 'same_contact')
       domain = Fabricate(:domain)
@@ -86,14 +95,64 @@ describe Domain do
     end
 
     it 'should expire domains' do
-      Domain.expire_domains
+      Domain.start_expire_period
       @domain.domain_statuses.where(value: DomainStatus::EXPIRED).count.should == 0
 
       @domain.valid_to = Time.zone.now - 10.days
       @domain.save
 
-      Domain.expire_domains
+      Domain.start_expire_period
       @domain.domain_statuses.where(value: DomainStatus::EXPIRED).count.should == 1
+
+      Domain.start_expire_period
+      @domain.domain_statuses.where(value: DomainStatus::EXPIRED).count.should == 1
+    end
+
+    it 'should start redemption grace period' do
+      Domain.start_redemption_grace_period
+      @domain.domain_statuses.where(value: DomainStatus::SERVER_HOLD).count.should == 0
+
+      @domain.outzone_at = Time.zone.now
+      @domain.domain_statuses.create(value: DomainStatus::SERVER_MANUAL_INZONE) # this prohibits server_hold
+      @domain.save
+
+      Domain.start_redemption_grace_period
+      @domain.domain_statuses.where(value: DomainStatus::SERVER_HOLD).count.should == 0
+
+      @domain.domain_statuses.destroy_all
+
+      Domain.start_redemption_grace_period
+      @domain.domain_statuses.where(value: DomainStatus::SERVER_HOLD).count.should == 1
+    end
+
+    it 'should start delete period' do
+      Domain.start_delete_period
+      @domain.domain_statuses.where(value: DomainStatus::DELETE_CANDIDATE).count.should == 0
+
+      @domain.delete_at = Time.zone.now
+      @domain.domain_statuses.create(value: DomainStatus::SERVER_DELETE_PROHIBITED) # this prohibits delete_candidate
+      @domain.save
+
+      Domain.start_delete_period
+      @domain.domain_statuses.where(value: DomainStatus::DELETE_CANDIDATE).count.should == 0
+
+      @domain.domain_statuses.destroy_all
+      Domain.start_delete_period
+
+      @domain.domain_statuses.where(value: DomainStatus::DELETE_CANDIDATE).count.should == 1
+    end
+
+    it 'should destroy delete candidates' do
+      Fabricate(:domain)
+      Domain.count.should == 2
+
+      @domain.delete_at = Time.zone.now
+      @domain.save
+
+      Domain.start_delete_period
+
+      Domain.destroy_delete_candidates
+      Domain.count.should == 1
     end
 
     context 'about registrant update confirm' do