Expire old pendings #2557

app/controllers/admin/settings_controller.rb

@@ -56,7 +56,8 @@ class Admin::SettingsController < AdminController
       :days_to_keep_overdue_invoices_active,
       :days_to_renew_domain_before_expire,
       :expire_warning_period,
-      :redemption_grace_period
+      :redemption_grace_period,
+      :expire_pending_confirmation
     ]
 
     floats = [:registry_vat_prc]

app/models/domain.rb

@@ -183,6 +183,27 @@ class Domain < ActiveRecord::Base
       )
     end
 
+    def clean_expired_pendings
+      STDOUT << "#{Time.zone.now.utc} - Clean expired domain pendings\n" unless Rails.env.test?
+
+      expire_at = Setting.expire_pending_confirmation.hours.ago
+      count = 0
+      expired_pending_domains = Domain.where('registrant_verification_asked_at <= ?', expire_at)
+      expired_pending_domains.each do |domain|
+        unless domain.pending_update? || domain.pending_delete?
+          msg = "#{Time.zone.now.utc} - ISSUE: DOMAIN #{domain.id}: #{domain.name} IS IN EXPIRED PENDING LIST, " \
+                "but no pendingDelete/pendingUpdate state present!\n"
+          STDOUT << msg unless Rails.env.test?
+          next
+        end
+        count += 1
+        domain.clean_pendings!
+      end
+
+      STDOUT << "#{Time.zone.now.utc} - Successfully cancelled #{count} domain pendings\n" unless Rails.env.test?
+      count
+    end
+
     def start_expire_period
       STDOUT << "#{Time.zone.now.utc} - Expiring domains\n" unless Rails.env.test?
 

app/views/admin/settings/index.haml

@@ -21,6 +21,7 @@
           = render 'setting_row', var: :dnskeys_max_count
           = render 'setting_row', var: :ns_min_count
           = render 'setting_row', var: :ns_max_count
+          = render 'setting_row', var: :expire_pending_confirmation
 
   .panel.panel-default
     .panel-heading.clearfix

app/views/domain_mailer/pending_deleted.html.erb

@@ -4,7 +4,7 @@ Registrisse laekus taotlus domeeni <%= @domain.name %> kustutamiseks. Palun veen
 <br><br>
 Muudatuse kinnitamiseks külastage palun allolevat võrgulehekülge, kontrollige uuesti üle muudatuse andmed ning vajutage nuppu kinnitan:
 <br><br>
-Taotlus on aktiivne 48 tundi ja lükatakse automaatselt tagasi kui te seda enne ise ei kinnita või tagasi lükka.<br>
+Taotlus on aktiivne <%= Setting.expire_pending_confirmation %> tundi ja lükatakse automaatselt tagasi kui te seda enne ise ei kinnita või tagasi lükka.<br>
 <%= link_to @verification_url, @verification_url %>
 <br><br>
 Lugupidamisega<br>
@@ -19,7 +19,7 @@ Application for deletion of your domain <%= @domain.name %> has been filed. Plea
 To confirm the update please visit this website, once again review the data and press approve:<br>
 <%= link_to @verification_url, @verification_url %>
 <br><br>
-The application will remain in pending status for <48> hrs and will be automaticcally rejected if it is not approved nor rejected before.
+The application will remain in pending status for <%= Setting.expire_pending_confirmation %> hrs and will be automaticcally rejected if it is not approved nor rejected before.
 <br><br>
 Best Regards,<br>
 Estonian Internet Foundation

app/views/domain_mailer/pending_deleted.text.erb

@@ -4,7 +4,7 @@ Registrisse laekus taotlus domeeni <%= @domain.name %> kustutamiseks. Palun veen
 
 Muudatuse kinnitamiseks külastage palun allolevat võrgulehekülge, kontrollige uuesti üle muudatuse andmed ning vajutage nuppu kinnitan:
 
-Taotlus on aktiivne <48> tundi ja lükatakse automaatselt tagasi kui te seda enne ise ei kinnita või tagasi lükka.
+Taotlus on aktiivne <%= Setting.expire_pending_confirmation %> tundi ja lükatakse automaatselt tagasi kui te seda enne ise ei kinnita või tagasi lükka.
 <%= link_to @verification_url, @verification_url %>
 
 Lugupidamisega
@@ -19,7 +19,7 @@ Application for deletion of your domain <%= @domain.name %> has been filed. Plea
 To confirm the update please visit this website, once again review the data and press approve:
 <%= link_to @verification_url, @verification_url %>
 
-The application will remain in pending status for <48> hrs and will be automaticcally rejected if it is not approved nor rejected before.
+The application will remain in pending status for <%= Setting.expire_pending_confirmation %> hrs and will be automaticcally rejected if it is not approved nor rejected before.
 
 Best Regards,
 Estonian Internet Foundation

app/views/domain_mailer/registrant_pending_updated.html.erb

@@ -13,7 +13,9 @@ Tänav: <%= @domain.registrant_street %><br>
 Linn: <%= @domain.registrant_city %><br>
 Riik: <%= @domain.registrant_country %>
 <br><br>
+Taotlus on aktiivne <%= Setting.expire_pending_confirmation %> tundi ja lükatakse automaatselt tagasi kui te seda enne ise ei kinnita või tagasi lükka.<br>
 Muudatuse kinnitamiseks külastage palun allolevat võrgulehekülge, kontrollige uuesti üle muudatuse andmed ning vajutage nuppu kinnitan:<br>
+
 <%= link_to @verification_url, @verification_url %>
 <br><br>
 Lugupidamisega<br>
@@ -36,6 +38,7 @@ Street: <%= @domain.registrant_street %><br>
 City: <%= @domain.registrant_city %><br>
 Country: <%= @domain.registrant_country %>
 <br><br>
+The application will remain in pending status for <%= Setting.expire_pending_confirmation %> hrs and will be automaticcally rejected if it is not approved nor rejected before.<br>
 To confirm the update please visit this website, once again review the data and press approve:<br>
 <%= link_to @verification_url, @verification_url %>
 <br><br>

app/views/domain_mailer/registrant_pending_updated.text.erb

@@ -13,6 +13,7 @@ Tänav: <%= @domain.registrant_street %>
 Linn: <%= @domain.registrant_city %>
 Riik: <%= @domain.registrant_country %>
 
+Taotlus on aktiivne <%= Setting.expire_pending_confirmation %> tundi ja lükatakse automaatselt tagasi kui te seda enne ise ei kinnita või tagasi lükka.
 Muudatuse kinnitamiseks külastage palun allolevat võrgulehekülge, kontrollige uuesti üle muudatuse andmed ning vajutage nuppu kinnitan:
 <%= @verification_url %>
 
@@ -36,6 +37,7 @@ Street: <%= @domain.registrant_street %>
 City: <%= @domain.registrant_city %>
 Country: <%= @domain.registrant_country %>
 
+The application will remain in pending status for <%= Setting.expire_pending_confirmation %> hrs and will be automaticcally rejected if it is not approved nor rejected before.
 To confirm the update please visit this website, once again review the data and press approve:
 <%= @verification_url %>