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

Automatic error handling

Browse source
This commit is contained in:
Martin Lensment 2014-08-01 11:59:49 +03:00
parent dce3357e1e
commit fb8cba9ef4
6 changed files with 73 additions and 40 deletions
Download patch file Download diff file Expand all files Collapse all files

23
app/helpers/epp/domains_helper.rb
View file

@ -6,8 +6,7 @@ module Epp::DomainsHelper
if @domain.save && @domain.attach_contacts(domain_contacts)
render '/epp/domains/create'
else
handle_domain_name_errors
handle_contact_errors
handle_errors
render '/epp/error'
raise ActiveRecord::Rollback
end
@ -50,18 +49,18 @@ module Epp::DomainsHelper
res
end
def handle_domain_name_errors
[:epp_domain_taken, :epp_domain_reserved].each do |x|
if @domain.errors.added?(:name, x)
epp_errors << {code: '2302', msg: @domain.errors[:name].first}
def handle_errors
error_code_map = {
'2302' => [:epp_domain_taken, :epp_domain_reserved],
'2306' => [:blank],
'2303' => [:epp_contact_not_found]
}
@domain.errors.each do |key, err|
error_code_map.each do |code, values|
epp_errors << {code: code, msg: err} and break if values.any? {|x| @domain.errors.added?(key, x) }
end
end
end
def handle_contact_errors
if @domain.errors.added?(:admin_contacts, :blank)
epp_errors << {code: '2306', msg: @domain.errors[:admin_contacts].first}
end
end
end

13
app/models/domain.rb
View file

@ -17,14 +17,9 @@ class Domain < ActiveRecord::Base
has_and_belongs_to_many :nameservers
validates_presence_of :name
validates :name, domain_name: true, uniqueness: { message: I18n.t('errors.messages.epp_domain_taken') }
validates :name_puny, domain_name: true
validates :name_dirty, domain_name: true, uniqueness: { message: I18n.t('errors.messages.epp_domain_taken') }
validates :period, numericality: { only_integer: true, greater_than: 0, less_than: 100 }
validates :owner_contact, presence: true
# validates :tech_contacts_count
#validate :admin_contacts_count, on: :update
validates :name, :owner_contact, presence: true
def name=(value)
value.strip!
@ -36,7 +31,9 @@ class Domain < ActiveRecord::Base
def attach_contacts(contacts)
contacts.each do |k, v|
v.each do |x|
attach_contact(k, Contact.find_by(code: x[:contact]))
contact = Contact.find_by(code: x[:contact])
attach_contact(k, contact) and next if contact
errors.add(:domain_contacts, I18n.t('errors.messages.epp_contact_not_found'))
end
end