Rename DomainTransfer#transfer_from to old_registrar

This commit is contained in:
Artur Beljajev 2018-01-23 19:00:46 +02:00
parent 404932316d
commit d99a63d476
8 changed files with 18 additions and 11 deletions

View file

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

View file

@ -1,7 +1,7 @@
class DomainTransfer < ActiveRecord::Base
belongs_to :domain
belongs_to :transfer_from, class_name: 'Registrar'
belongs_to :old_registrar, class_name: 'Registrar'
belongs_to :transfer_to, class_name: 'Registrar'
PENDING = 'pending'
@ -37,7 +37,7 @@ class DomainTransfer < ActiveRecord::Base
end
def notify_losing_registrar(contacts, registrant)
transfer_from.messages.create!(
old_registrar.messages.create!(
body: I18n.t('domain_transfer_was_approved', contacts: contacts, registrant: registrant),
attached_obj_id: id,
attached_obj_type: self.class.to_s

View file

@ -667,7 +667,7 @@ class Epp::Domain < Domain
dt = domain_transfers.create!(
transfer_requested_at: Time.zone.now,
transfer_to: current_user.registrar,
transfer_from: registrar
old_registrar: registrar
)
if dt.pending?
@ -696,7 +696,7 @@ class Epp::Domain < Domain
def approve_transfer(frame, current_user)
pt = pending_transfer
if current_user.registrar != pt.transfer_from
if current_user.registrar != pt.old_registrar
throw :epp_error, {
msg: I18n.t('transfer_can_be_approved_only_by_current_registrar'),
code: '2304'
@ -722,7 +722,7 @@ class Epp::Domain < Domain
def reject_transfer(frame, current_user)
pt = pending_transfer
if current_user.registrar != pt.transfer_from
if current_user.registrar != pt.old_registrar
throw :epp_error, {
msg: I18n.t('transfer_can_be_rejected_only_by_current_registrar'),
code: '2304'

View file

@ -141,7 +141,7 @@ class Registrar < ActiveRecord::Base
at = DomainTransfer.arel_table
DomainTransfer.where(
at[:transfer_to_id].eq(id).or(
at[:transfer_from_id].eq(id)
at[:old_registrar_id].eq(id)
)
)
end

View file

@ -3,7 +3,7 @@ builder.tag!('domain:trnData', 'xmlns:domain' => 'https://epp.tld.ee/schema/doma
builder.tag!('domain:trStatus', dt.status)
builder.tag!('domain:reID', dt.transfer_to.code)
builder.tag!('domain:reDate', dt.transfer_requested_at.try(:iso8601))
builder.tag!('domain:acID', dt.transfer_from.code)
builder.tag!('domain:acID', dt.old_registrar.code)
builder.tag!('domain:acDate', dt.transferred_at.try(:iso8601) || dt.wait_until.try(:iso8601))
builder.tag!('domain:exDate', dt.domain_valid_to.try(:iso8601))
end