Refactor EPP Errors once again

app/models/concerns/epp_errors.rb

@@ -1,6 +1,36 @@
 module EppErrors
   extend ActiveSupport::Concern
 
+  def generate_epp_errors
+    epp_errors = []
+    errors.messages.each do |key, values|
+      key = key.to_s.split('.')[0].to_sym
+      if self.class.reflect_on_association(key)
+        send(key).each do |x|
+          epp_errors << x.generate_epp_errors
+        end
+      end
+
+      epp_errors << collect_parent_errors(values)
+    end
+
+    errors[:epp_errors] = epp_errors
+    errors[:epp_errors].flatten!
+    # epp_errors = []
+    # errors.messages.each do |key, values|
+    #   if self.class.reflect_on_association(key)
+    #     send(key).each do |x|
+    #       epp_errors << x.errors[:epp_errors]
+    #     end
+    #   end
+
+    #   epp_errors << collect_parent_errors(values)
+    # end
+
+    # errors[:epp_errors] = epp_errors
+    # errors[:epp_errors].flatten!
+  end
+
   def construct_epp_errors
     epp_errors = []
     errors.messages.each do |key, values|

app/models/delegation_signer.rb

@@ -1,3 +1,23 @@
 class DelegationSigner < ActiveRecord::Base
+  include EppErrors
   has_many :dnskeys
+
+  validate :validate_dnskeys_uniqueness
+
+  def epp_code_map
+    {}
+  end
+
+def validate_dnskeys_uniqueness
+    validated = []
+    list = dnskeys.reject(&:marked_for_destruction?)
+    list.each do |dnskey|
+      next if dnskey.public_key.blank?
+      existing = list.select { |x| x.public_key == dnskey.public_key }
+      next unless existing.length > 1
+      validated << dnskey.public_key
+      errors.add(:dnskeys, :invalid) if errors[:dnskeys].blank?
+      dnskey.errors.add(:public_key, :taken)
+    end
+  end
 end

app/models/dnskey.rb

@@ -9,6 +9,8 @@ class Dnskey < ActiveRecord::Base
   validate :validate_protocol
   validate :validate_flags
 
+  # after_validation :generate_epp_errors
+
   ALGORITHMS = %w(3 5 6 7 8 252 253 254 255)
   PROTOCOLS = %w(3)
   FLAGS = %w(0 256 257)

app/models/domain.rb

@@ -54,7 +54,6 @@ class Domain < ActiveRecord::Base
   validate :validate_tech_contacts_uniqueness
   validate :validate_admin_contacts_uniqueness
   validate :validate_domain_statuses_uniqueness
-  #validate :validate_dnskeys_uniqueness
   validate :validate_nameserver_ips
 
   attr_accessor :owner_contact_typeahead
@@ -159,19 +158,6 @@ class Domain < ActiveRecord::Base
     end
   end
 
-  def validate_dnskeys_uniqueness
-    validated = []
-    list = dnskeys.reject(&:marked_for_destruction?)
-    list.each do |dnskey|
-      next if dnskey.public_key.blank?
-      existing = list.select { |x| x.public_key == dnskey.public_key }
-      next unless existing.length > 1
-      validated << dnskey.public_key
-      errors.add(:dnskeys, :invalid) if errors[:dnskeys].blank?
-      dnskey.errors.add(:public_key, :taken)
-    end
-  end
-
   def validate_period
     return unless period.present?
     if period_unit == 'd'

app/models/nameserver.rb

@@ -8,6 +8,8 @@ class Nameserver < ActiveRecord::Base
   validates :ipv4, format: { with: /\A(([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])\.){3}([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])\z/, allow_blank: true }
   validates :ipv6, format: { with: /(([0-9a-fA-F]{1,4}:){7,7}[0-9a-fA-F]{1,4}|([0-9a-fA-F]{1,4}:){1,7}:|([0-9a-fA-F]{1,4}:){1,6}:[0-9a-fA-F]{1,4}|([0-9a-fA-F]{1,4}:){1,5}(:[0-9a-fA-F]{1,4}){1,2}|([0-9a-fA-F]{1,4}:){1,4}(:[0-9a-fA-F]{1,4}){1,3}|([0-9a-fA-F]{1,4}:){1,3}(:[0-9a-fA-F]{1,4}){1,4}|([0-9a-fA-F]{1,4}:){1,2}(:[0-9a-fA-F]{1,4}){1,5}|[0-9a-fA-F]{1,4}:((:[0-9a-fA-F]{1,4}){1,6})|:((:[0-9a-fA-F]{1,4}){1,7}|:)|fe80:(:[0-9a-fA-F]{0,4}){0,4}%[0-9a-zA-Z]{1,}|::(ffff(:0{1,4}){0,1}:){0,1}((25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9]).){3,3}(25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9])|([0-9a-fA-F]{1,4}:){1,4}:((25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9]).){3,3}(25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9]))/, allow_blank: true }
 
+
+
   # archiving
   has_paper_trail class_name: 'NameserverVersion'