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

Merge branch 'master' into alpha

Browse source
This commit is contained in:
Priit Tark 2015-06-12 10:49:45 +03:00
commit e6e9d9cbf7
15 changed files with 150 additions and 41 deletions
Download patch file Download diff file Expand all files Collapse all files

18
app/controllers/admin/domains_controller.rb
View file

@ -28,6 +28,24 @@ class Admin::DomainsController < AdminController
end
end
def set_force_delete
if @domain.set_force_delete
flash[:notice] = I18n.t('domain_updated')
else
flash.now[:alert] = I18n.t('failed_to_update_domain')
end
redirect_to [:admin, @domain]
end
def unset_force_delete
if @domain.unset_force_delete
flash[:notice] = I18n.t('domain_updated')
else
flash.now[:alert] = I18n.t('failed_to_update_domain')
end
redirect_to [:admin, @domain]
end
private
def set_domain

2
app/mailers/contact_mailer.rb
View file

@ -1,4 +1,5 @@
class ContactMailer < ApplicationMailer
# rubocop: disable Metrics/CyclomaticComplexity
def email_updated(contact)
unless Rails.env.production?
return unless TEST_EMAILS.include?(contact.email) || TEST_EMAILS.include?(contact.email_was)
@ -18,4 +19,5 @@ class ContactMailer < ApplicationMailer
mail(to: email, subject: "#{I18n.t(:contact_email_update_subject)} [#{@contact.code}]")
end
end
# rubocop: enable Metrics/CyclomaticComplexity
end

2
app/models/depp/contact.rb
View file

@ -230,7 +230,7 @@ module Depp
def extension_xml
xml = { _anonymus: [] }
ident = ident_xml[:_anonymus].try(:first) if !persisted?
ident = ident_xml[:_anonymus].try(:first) unless persisted?
legal = legal_document_xml[:_anonymus].try(:first)
xml[:_anonymus] << ident if ident.present?
xml[:_anonymus] << legal if legal.present?

52
app/models/domain.rb
View file

@ -1,3 +1,4 @@
# rubocop: disable Metrics/ClassLength
class Domain < ActiveRecord::Base
include Versions # version/domain_version.rb
has_paper_trail class_name: "DomainVersion", meta: { children: :children_log }
@ -152,7 +153,10 @@ class Domain < ActiveRecord::Base
d = Domain.where('valid_to <= ?', Time.zone.now)
d.each do |x|
x.domain_statuses.create(value: DomainStatus::EXPIRED) if x.expirable?
next unless x.expirable?
x.domain_statuses.create(value: DomainStatus::EXPIRED)
# TODO: This should be managed by automatic_statuses
x.domain_statuses.where(value: DomainStatus::OK).destroy_all
end
STDOUT << "#{Time.zone.now.utc} - Successfully expired #{d.count} domains\n" unless Rails.env.test?
@ -163,7 +167,10 @@ class Domain < ActiveRecord::Base
d = Domain.where('outzone_at <= ?', Time.zone.now)
d.each do |x|
x.domain_statuses.create(value: DomainStatus::SERVER_HOLD) if x.server_holdable?
next unless x.server_holdable?
x.domain_statuses.create(value: DomainStatus::SERVER_HOLD)
# TODO: This should be managed by automatic_statuses
x.domain_statuses.where(value: DomainStatus::OK).destroy_all
end
STDOUT << "#{Time.zone.now.utc} - Successfully set server_hold to #{d.count} domains\n" unless Rails.env.test?
@ -175,6 +182,8 @@ class Domain < ActiveRecord::Base
d = Domain.where('delete_at <= ?', Time.zone.now)
d.each do |x|
x.domain_statuses.create(value: DomainStatus::DELETE_CANDIDATE) if x.delete_candidateable?
# TODO: This should be managed by automatic_statuses
x.domain_statuses.where(value: DomainStatus::OK).destroy_all
end
return if Rails.env.test?
@ -190,6 +199,11 @@ class Domain < ActiveRecord::Base
c += 1
end
Domain.where('force_delete_at <= ?', Time.zone.now).each do |x|
x.destroy
c += 1
end
STDOUT << "#{Time.zone.now.utc} - Successfully destroyed #{c} domains\n" unless Rails.env.test?
end
end
@ -245,7 +259,7 @@ class Domain < ActiveRecord::Base
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
if ((valid_to - Time.zone.now.beginning_of_day).to_i / 1.day) + 1 > Setting.days_to_renew_domain_before_expire
return false
end
end
@ -298,6 +312,10 @@ class Domain < ActiveRecord::Base
true
end
def force_deletable?
domain_statuses.where(value: DomainStatus::FORCE_DELETE).empty?
end
def registrant_verification_asked?
registrant_verification_asked_at.present? && registrant_verification_token.present?
end
@ -399,9 +417,34 @@ class Domain < ActiveRecord::Base
self.delete_at = outzone_at + Setting.redemption_grace_period.days
end
def set_force_delete
domain_statuses.where(value: DomainStatus::FORCE_DELETE).first_or_create
domain_statuses.where(value: DomainStatus::SERVER_RENEW_PROHIBITED).first_or_create
domain_statuses.where(value: DomainStatus::SERVER_TRANSFER_PROHIBITED).first_or_create
domain_statuses.where(value: DomainStatus::SERVER_UPDATE_PROHIBITED).first_or_create
domain_statuses.where(value: DomainStatus::SERVER_MANUAL_INZONE).first_or_create
domain_statuses.where(value: DomainStatus::PENDING_DELETE).first_or_create
domain_statuses.where(value: DomainStatus::CLIENT_DELETE_PROHIBITED).destroy_all
domain_statuses.where(value: DomainStatus::SERVER_DELETE_PROHIBITED).destroy_all
domain_statuses.reload
self.force_delete_at = Time.zone.now + Setting.redemption_grace_period.days unless force_delete_at
save(validate: false)
end
def unset_force_delete
domain_statuses.where(value: DomainStatus::FORCE_DELETE).destroy_all
domain_statuses.where(value: DomainStatus::SERVER_RENEW_PROHIBITED).destroy_all
domain_statuses.where(value: DomainStatus::SERVER_TRANSFER_PROHIBITED).destroy_all
domain_statuses.where(value: DomainStatus::SERVER_UPDATE_PROHIBITED).destroy_all
domain_statuses.where(value: DomainStatus::SERVER_MANUAL_INZONE).destroy_all
domain_statuses.where(value: DomainStatus::PENDING_DELETE).destroy_all
domain_statuses.reload
self.force_delete_at = nil
save(validate: false)
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?
@ -437,3 +480,4 @@ class Domain < ActiveRecord::Base
whois_record.blank? ? create_whois_record : whois_record.save
end
end
# rubocop: enable Metrics/ClassLength

22
app/models/domain_status.rb
View file

@ -73,23 +73,23 @@ class DomainStatus < ActiveRecord::Base
EXPIRED = 'expired'
STATUSES = [
CLIENT_DELETE_PROHIBITED, SERVER_DELETE_PROHIBITED, CLIENT_HOLD, SERVER_HOLD,
CLIENT_RENEW_PROHIBITED, SERVER_RENEW_PROHIBITED, CLIENT_TRANSFER_PROHIBITED,
SERVER_TRANSFER_PROHIBITED, CLIENT_UPDATE_PROHIBITED, SERVER_UPDATE_PROHIBITED,
INACTIVE, OK, PENDING_CREATE, PENDING_DELETE, PENDING_RENEW, PENDING_TRANSFER,
PENDING_UPDATE, SERVER_MANUAL_INZONE, SERVER_REGISTRANT_CHANGE_PROHIBITED,
SERVER_ADMIN_CHANGE_PROHIBITED, SERVER_TECH_CHANGE_PROHIBITED, FORCE_DELETE,
CLIENT_DELETE_PROHIBITED, SERVER_DELETE_PROHIBITED, CLIENT_HOLD, SERVER_HOLD,
CLIENT_RENEW_PROHIBITED, SERVER_RENEW_PROHIBITED, CLIENT_TRANSFER_PROHIBITED,
SERVER_TRANSFER_PROHIBITED, CLIENT_UPDATE_PROHIBITED, SERVER_UPDATE_PROHIBITED,
INACTIVE, OK, PENDING_CREATE, PENDING_DELETE, PENDING_RENEW, PENDING_TRANSFER,
PENDING_UPDATE, SERVER_MANUAL_INZONE, SERVER_REGISTRANT_CHANGE_PROHIBITED,
SERVER_ADMIN_CHANGE_PROHIBITED, SERVER_TECH_CHANGE_PROHIBITED, FORCE_DELETE,
DELETE_CANDIDATE, EXPIRED
]
CLIENT_STATUSES = [
CLIENT_DELETE_PROHIBITED, CLIENT_HOLD, CLIENT_RENEW_PROHIBITED, CLIENT_TRANSFER_PROHIBITED,
CLIENT_DELETE_PROHIBITED, CLIENT_HOLD, CLIENT_RENEW_PROHIBITED, CLIENT_TRANSFER_PROHIBITED,
CLIENT_UPDATE_PROHIBITED
]
SERVER_STATUSES = [
SERVER_DELETE_PROHIBITED, SERVER_HOLD, SERVER_RENEW_PROHIBITED, SERVER_TRANSFER_PROHIBITED,
SERVER_UPDATE_PROHIBITED, SERVER_MANUAL_INZONE, SERVER_REGISTRANT_CHANGE_PROHIBITED,
SERVER_UPDATE_PROHIBITED, SERVER_MANUAL_INZONE, SERVER_REGISTRANT_CHANGE_PROHIBITED,
SERVER_ADMIN_CHANGE_PROHIBITED, SERVER_TECH_CHANGE_PROHIBITED
]
@ -113,7 +113,7 @@ class DomainStatus < ActiveRecord::Base
case value
when 'ok'
'ok (paid and in zone)'
else
else
value
end
end

2
app/models/epp/domain.rb
View file

@ -434,6 +434,8 @@ class Epp::Domain < Domain
p = self.class.convert_period_to_time(period, unit)
self.valid_to = valid_to + p
self.outzone_at = outzone_at + p
self.delete_at = delete_at + p
self.period = period
self.period_unit = unit

2
app/models/pricelist.rb
View file

@ -7,7 +7,7 @@ class Pricelist < ActiveRecord::Base
:valid_from, :category, :operation_category, :duration, presence: true
CATEGORIES = %w(ee pri.ee fie.ee med.ee com.ee)
OPERATION_CATEGORIES = %w(new renew)
OPERATION_CATEGORIES = %w(create renew)
DURATIONS = %w(1year 2years 3years)
after_initialize :init_values

5
app/views/admin/domains/show.haml
View file

@ -1,6 +1,11 @@
- content_for :actions do
= link_to(t(:edit_statuses), edit_admin_domain_path(@domain), class: 'btn btn-primary')
= link_to(t(:history), admin_domain_domain_versions_path(@domain.id), method: :get, class: 'btn btn-primary')
- if @domain.force_deletable?
= link_to(t(:set_force_delete), set_force_delete_admin_domain_path(@domain), method: :post, data: { confirm: t(:are_you_sure) }, class: 'btn btn-warning')
- else
= link_to(t(:unset_force_delete), unset_force_delete_admin_domain_path(@domain), method: :post, data: { confirm: t(:are_you_sure) }, class: 'btn btn-warning')
= render 'shared/title', name: @domain.name
.row

4
app/views/shared/_title.haml
View file

@ -2,10 +2,10 @@
%title= "#{truncate(name, length: 60)}#{head_title_sufix}"
.row
.col-sm-7
.col-sm-6
%h1.text-center-xs
= truncate(name, length: 35)
.col-sm-5
.col-sm-6
%h1.text-right.text-center-xs
= yield :actions
%hr

2
config/locales/en.yml
View file

@ -818,3 +818,5 @@ en:
valid: Valid
category: Zone
object_is_not_eligible_for_renewal: 'Object is not eligible for renewal'
set_force_delete: 'Set force delete'
unset_force_delete: 'Unset force delete'

4
config/routes.rb
View file

@ -175,6 +175,10 @@ Rails.application.routes.draw do
resources :domains do
resources :domain_versions
member do
post 'set_force_delete'
post 'unset_force_delete'
end
end
resources :settings

5
db/migrate/20150610144547_add_force_delete_at_to_domain.rb Normal file
View file

@ -0,0 +1,5 @@
class AddForceDeleteAtToDomain < ActiveRecord::Migration
def change
add_column :domains, :force_delete_at, :datetime
end
end

34
db/schema.rb
View file

@ -19,7 +19,7 @@ ActiveRecord::Schema.define(version: 20150609103333) do
create_table "account_activities", force: :cascade do |t|
t.integer "account_id"
t.integer "invoice_id"
t.decimal "sum", precision: 8, scale: 2
t.decimal "sum", precision: 10, scale: 2
t.string "currency"
t.integer "bank_transaction_id"
t.datetime "created_at"
@ -36,7 +36,7 @@ ActiveRecord::Schema.define(version: 20150609103333) do
create_table "accounts", force: :cascade do |t|
t.integer "registrar_id"
t.string "account_type"
t.decimal "balance", precision: 8, scale: 2, default: 0.0, null: false
t.decimal "balance", precision: 10, scale: 2, default: 0.0, null: false
t.datetime "created_at"
t.datetime "updated_at"
t.string "currency"
@ -98,7 +98,7 @@ ActiveRecord::Schema.define(version: 20150609103333) do
t.string "buyer_name"
t.string "document_no"
t.string "description"
t.decimal "sum", precision: 8, scale: 2
t.decimal "sum", precision: 10, scale: 2
t.string "reference_no"
t.datetime "paid_at"
t.datetime "created_at"
@ -114,7 +114,7 @@ ActiveRecord::Schema.define(version: 20150609103333) do
t.string "vk_rec_id"
t.string "vk_stamp"
t.string "vk_t_no"
t.decimal "vk_amount", precision: 8, scale: 2
t.decimal "vk_amount", precision: 10, scale: 2
t.string "vk_curr"
t.string "vk_rec_acc"
t.string "vk_rec_name"
@ -328,10 +328,10 @@ ActiveRecord::Schema.define(version: 20150609103333) do
create_table "invoice_items", force: :cascade do |t|
t.integer "invoice_id"
t.string "description", null: false
t.string "description", null: false
t.string "unit"
t.integer "amount"
t.decimal "price", precision: 8, scale: 2
t.decimal "price", precision: 10, scale: 2
t.datetime "created_at"
t.datetime "updated_at"
t.string "creator_str"
@ -341,20 +341,20 @@ ActiveRecord::Schema.define(version: 20150609103333) do
add_index "invoice_items", ["invoice_id"], name: "index_invoice_items_on_invoice_id", using: :btree
create_table "invoices", force: :cascade do |t|
t.datetime "created_at", null: false
t.datetime "updated_at", null: false
t.string "invoice_type", null: false
t.datetime "due_date", null: false
t.datetime "created_at", null: false
t.datetime "updated_at", null: false
t.string "invoice_type", null: false
t.datetime "due_date", null: false
t.string "payment_term"
t.string "currency", null: false
t.string "currency", null: false
t.string "description"
t.string "reference_no"
t.decimal "vat_prc", precision: 8, scale: 2, null: false
t.decimal "vat_prc", precision: 10, scale: 2, null: false
t.datetime "paid_at"
t.integer "seller_id"
t.string "seller_name", null: false
t.string "seller_name", null: false
t.string "seller_reg_no"
t.string "seller_iban", null: false
t.string "seller_iban", null: false
t.string "seller_bank"
t.string "seller_swift"
t.string "seller_vat_no"
@ -368,7 +368,7 @@ ActiveRecord::Schema.define(version: 20150609103333) do
t.string "seller_email"
t.string "seller_contact_name"
t.integer "buyer_id"
t.string "buyer_name", null: false
t.string "buyer_name", null: false
t.string "buyer_reg_no"
t.string "buyer_country_code"
t.string "buyer_state"
@ -382,7 +382,7 @@ ActiveRecord::Schema.define(version: 20150609103333) do
t.string "updator_str"
t.integer "number"
t.datetime "cancelled_at"
t.decimal "sum_cache", precision: 8, scale: 2
t.decimal "sum_cache", precision: 10, scale: 2
end
add_index "invoices", ["buyer_id"], name: "index_invoices_on_buyer_id", using: :btree
@ -983,7 +983,7 @@ ActiveRecord::Schema.define(version: 20150609103333) do
t.text "crt"
t.string "type"
t.string "registrant_ident"
t.string "encrypted_password", default: "", null: false
t.string "encrypted_password", default: ""
t.datetime "remember_created_at"
t.integer "failed_attempts", default: 0, null: false
t.datetime "locked_at"

15
spec/epp/domain_spec.rb
View file

@ -1999,7 +1999,8 @@ describe 'EPP Domain', epp: true do
end
it 'does not renew a domain unless less than 90 days till expiration' do
domain.valid_to = Time.zone.now.to_date + 91.days
# both days are inclusive
domain.valid_to = Time.zone.now.to_date + 90.days
domain.save
exp_date = domain.valid_to.to_date
@ -2013,7 +2014,7 @@ describe 'EPP Domain', epp: true do
response[:results][0][:msg].should == 'Object is not eligible for renewal'
response[:results][0][:result_code].should == '2105'
domain.valid_to = Time.zone.now.to_date + 90.days
domain.valid_to = Time.zone.now.to_date + 89.days
domain.save
exp_date = domain.valid_to.to_date
@ -2069,7 +2070,10 @@ describe 'EPP Domain', epp: true do
it 'should renew a expired domain' do
domain.valid_to = Time.zone.now - 50.days
new_valid_to = domain.valid_to + 1.year
domain.outzone_at = Time.zone.now - 50.days
new_outzone_at = domain.outzone_at + 1.year
new_delete_at = domain.delete_at + 1.year
domain.save
Domain.start_expire_period
@ -2077,6 +2081,7 @@ describe 'EPP Domain', epp: true do
domain.domain_statuses.where(value: DomainStatus::EXPIRED).count.should == 1
domain.domain_statuses.where(value: DomainStatus::SERVER_HOLD).count.should == 1
domain.domain_statuses.where(value: DomainStatus::OK).count.should == 0
exp_date = domain.valid_to.to_date
@ -2092,6 +2097,12 @@ describe 'EPP Domain', epp: true do
domain.domain_statuses.where(value: DomainStatus::EXPIRED).count.should == 0
domain.domain_statuses.where(value: DomainStatus::SERVER_HOLD).count.should == 0
domain.domain_statuses.where(value: DomainStatus::OK).count.should == 1
domain.reload
domain.valid_to.should be_within(5).of(new_valid_to)
domain.outzone_at.should be_within(5).of(new_outzone_at)
domain.delete_at.should be_within(5).of(new_delete_at)
end
it 'does not renew foreign domain' do

22
spec/models/domain_spec.rb
View file

@ -143,16 +143,32 @@ describe Domain do
end
it 'should destroy delete candidates' do
Fabricate(:domain)
Domain.count.should == 2
d = Fabricate(:domain)
d.force_delete_at = Time.zone.now
d.save
@domain.delete_at = Time.zone.now
@domain.save
Domain.count.should == 2
Domain.start_delete_period
Domain.destroy_delete_candidates
Domain.count.should == 1
Domain.count.should == 0
end
it 'should set force delete time' do
@domain.set_force_delete
@domain.domain_statuses.count.should == 6
fda = Time.zone.now + Setting.redemption_grace_period
@domain.force_delete_at.should be_within(20).of(fda)
@domain.unset_force_delete
@domain.domain_statuses.count.should == 1
@domain.force_delete_at.should be_nil
end
context 'about registrant update confirm' do