Cache contact code for epp eager errors

app/models/domain.rb

@@ -43,7 +43,7 @@ class Domain < ActiveRecord::Base
 
   before_create :generate_auth_info
   before_create :set_validity_dates
-  after_create :attach_default_contacts
+  before_create :attach_default_contacts
   after_save :manage_automatic_statuses
 
   validates :name_dirty, domain_name: true, uniqueness: true
@@ -186,7 +186,7 @@ class Domain < ActiveRecord::Base
       next unless existing.length > 1
       validated << dc
       errors.add(:domain_contacts, :invalid) if errors[:domain_contacts].blank?
-      dc.errors.add(:contact, :taken)
+      dc.errors.add(:contact_code_cache, :taken)
     end
   end
 
@@ -280,8 +280,22 @@ class Domain < ActiveRecord::Base
   # rubocop:enable Lint/Loop
 
   def attach_default_contacts
-    tech_contacts << owner_contact if tech_contacts_count.zero?
+    if tech_contacts_count.zero?
-    admin_contacts << owner_contact if admin_contacts_count.zero? && owner_contact.citizen?
+      attach_contact(DomainContact::TECH, owner_contact)
+    end
+
+    return unless admin_contacts_count.zero? && owner_contact.citizen?
+    attach_contact(DomainContact::ADMIN, owner_contact)
+  end
+
+  def attach_contact(type, contact)
+    domain_contacts.build(
+      contact: contact, contact_type: DomainContact::TECH, contact_code_cache: contact.code
+    ) if type.to_sym == :tech
+
+    domain_contacts.build(
+      contact: contact, contact_type: DomainContact::ADMIN, contact_code_cache: contact.code
+    ) if type.to_sym == :admin
   end
 
   def set_validity_dates

app/models/domain_contact.rb

@@ -12,7 +12,7 @@ class DomainContact < ActiveRecord::Base
   def epp_code_map
     {
       '2302' => [
-        [:contact, :taken, { value: { obj: 'contact', val: contact.code } }]
+        [:contact_code_cache, :taken, { value: { obj: 'contact', val: contact_code_cache } }]
       ]
     }
   end

app/models/epp/epp_domain.rb

@@ -121,11 +121,6 @@ class Epp::EppDomain < Domain
     attach_contact(DomainContact::ADMIN, owner_contact) if admin_contacts_count.zero? && owner_contact.citizen?
   end
 
-  def attach_contact(type, contact)
-    domain_contacts.build(contact: contact, contact_type: DomainContact::TECH) if type.to_sym == :tech
-    domain_contacts.build(contact: contact, contact_type: DomainContact::ADMIN) if type.to_sym == :admin
-  end
-
   def attach_nameservers(ns_list)
     ns_list.each do |ns_attrs|
       nameservers.build(ns_attrs)
@@ -302,7 +297,6 @@ class Epp::EppDomain < Domain
     end
 
     return pt if pt
-
     if Setting.transfer_wait_time > 0
       dt = domain_transfers.create(
         status: DomainTransfer::PENDING,

config/locales/en.yml

@@ -139,6 +139,8 @@ en:
             contact:
               blank: 'Contact was not found'
               taken: 'Contact already exists on this domain!'
+            contact_code_cache:
+              taken: 'Contact already exists on this domain!'
 
         domain_status:
           attributes:

db/migrate/20141210085432_add_code_cache_for_domain_contact.rb

@@ -0,0 +1,10 @@
+class AddCodeCacheForDomainContact < ActiveRecord::Migration
+  def change
+    add_column :domain_contacts, :contact_code_cache, :string
+
+    DomainContact.all.each do |x|
+      x.contact_code_cache = x.contact.code
+      x.save
+    end
+  end
+end

db/schema.rb

@@ -11,7 +11,7 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema.define(version: 20141203090115) do
+ActiveRecord::Schema.define(version: 20141210085432) do
 
   # These are extensions that must be enabled in order to support this database
   enable_extension "plpgsql"
@@ -139,6 +139,7 @@ ActiveRecord::Schema.define(version: 20141203090115) do
     t.string   "contact_type"
     t.datetime "created_at"
     t.datetime "updated_at"
+    t.string   "contact_code_cache"
   end
 
   create_table "domain_status_versions", force: true do |t|

spec/epp/domain_spec.rb

@@ -892,7 +892,7 @@ describe 'EPP Domain', epp: true do
         expect(response[:results][0][:msg]).to eq('Domain not found')
       end
 
-      it 'updates domain and adds objects', pending: true do
+      it 'updates domain and adds objects' do
         xml = domain_update_xml({
           add: [
             {

spec/fabricators/domain_contact_fabricator.rb

@@ -0,0 +1,7 @@
+Fabricator(:domain_contact) do
+  contact { Fabricate(:contact) }
+  contact_type 'admin'
+  after_build do |x|
+    x.contact_code_cache = x.contact.code
+  end
+end

spec/fabricators/domain_fabricator.rb

@@ -5,7 +5,7 @@ Fabricator(:domain) do
   period_unit 'y'
   owner_contact(fabricator: :contact)
   nameservers(count: 3)
-  admin_contacts(count: 1) { Fabricate(:contact) }
+  domain_contacts(count: 1) { Fabricate(:domain_contact, contact_type: 'admin') }
   registrar
   auth_info '98oiewslkfkd'
   dnskeys(count: 1)