Rename DomainTransfer#transfer_to to new_registrar

This commit is contained in:
Artur Beljajev 2018-01-23 19:07:17 +02:00
parent d99a63d476
commit 189129ec48
8 changed files with 18 additions and 11 deletions

View file

@ -14,7 +14,7 @@ module Concerns::Domain::Transferable
domain_transfers.create!(
transfer_requested_at: Time.zone.now,
old_registrar: old_registrar,
transfer_to: new_registrar
new_registrar: new_registrar
)
transfer_contacts(new_registrar)

View file

@ -2,7 +2,7 @@ class DomainTransfer < ActiveRecord::Base
belongs_to :domain
belongs_to :old_registrar, class_name: 'Registrar'
belongs_to :transfer_to, class_name: 'Registrar'
belongs_to :new_registrar, class_name: 'Registrar'
PENDING = 'pending'
CLIENT_APPROVED = 'clientApproved'

View file

@ -666,8 +666,8 @@ class Epp::Domain < Domain
transaction do
dt = domain_transfers.create!(
transfer_requested_at: Time.zone.now,
transfer_to: current_user.registrar,
old_registrar: registrar
old_registrar: registrar,
new_registrar: current_user.registrar
)
if dt.pending?
@ -709,9 +709,9 @@ class Epp::Domain < Domain
transferred_at: Time.zone.now
)
transfer_contacts(pt.transfer_to)
transfer_contacts(pt.new_registrar)
regenerate_transfer_code
self.registrar = pt.transfer_to
self.registrar = pt.new_registrar
attach_legal_document(self.class.parse_legal_document_from_frame(frame))
save!(validate: false)

View file

@ -140,7 +140,7 @@ class Registrar < ActiveRecord::Base
def domain_transfers
at = DomainTransfer.arel_table
DomainTransfer.where(
at[:transfer_to_id].eq(id).or(
at[:new_registrar_id].eq(id).or(
at[:old_registrar_id].eq(id)
)
)

View file

@ -1,7 +1,7 @@
builder.tag!('domain:trnData', 'xmlns:domain' => 'https://epp.tld.ee/schema/domain-eis-1.0.xsd') do
builder.tag!('domain:name', dt.domain_name)
builder.tag!('domain:trStatus', dt.status)
builder.tag!('domain:reID', dt.transfer_to.code)
builder.tag!('domain:reID', dt.new_registrar.code)
builder.tag!('domain:reDate', dt.transfer_requested_at.try(:iso8601))
builder.tag!('domain:acID', dt.old_registrar.code)
builder.tag!('domain:acDate', dt.transferred_at.try(:iso8601) || dt.wait_until.try(:iso8601))