diff --git a/app/models/concerns/domain/transferable.rb b/app/models/concerns/domain/transferable.rb
index 08d04d6e0..1fe34f296 100644
--- a/app/models/concerns/domain/transferable.rb
+++ b/app/models/concerns/domain/transferable.rb
@@ -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
)
diff --git a/app/models/domain_transfer.rb b/app/models/domain_transfer.rb
index 55cab821c..4887b5597 100644
--- a/app/models/domain_transfer.rb
+++ b/app/models/domain_transfer.rb
@@ -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
diff --git a/app/models/epp/domain.rb b/app/models/epp/domain.rb
index 4b944c9d3..abe1bf768 100644
--- a/app/models/epp/domain.rb
+++ b/app/models/epp/domain.rb
@@ -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'
diff --git a/app/models/registrar.rb b/app/models/registrar.rb
index 418277b8a..b6f07efc8 100644
--- a/app/models/registrar.rb
+++ b/app/models/registrar.rb
@@ -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
diff --git a/app/views/epp/domains/partials/_transfer.xml.builder b/app/views/epp/domains/partials/_transfer.xml.builder
index 13daf8014..f29ffb1b6 100644
--- a/app/views/epp/domains/partials/_transfer.xml.builder
+++ b/app/views/epp/domains/partials/_transfer.xml.builder
@@ -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
diff --git a/db/migrate/20180123165604_rename_domain_transfers_transfer_from_id_to_old_registrar_id.rb b/db/migrate/20180123165604_rename_domain_transfers_transfer_from_id_to_old_registrar_id.rb
new file mode 100644
index 000000000..0eae471e4
--- /dev/null
+++ b/db/migrate/20180123165604_rename_domain_transfers_transfer_from_id_to_old_registrar_id.rb
@@ -0,0 +1,5 @@
+class RenameDomainTransfersTransferFromIdToOldRegistrarId < ActiveRecord::Migration
+ def change
+ rename_column :domain_transfers, :transfer_from_id, :old_registrar_id
+ end
+end
diff --git a/db/structure.sql b/db/structure.sql
index 1ba85fc02..af7d0fc18 100644
--- a/db/structure.sql
+++ b/db/structure.sql
@@ -958,7 +958,7 @@ CREATE TABLE domain_transfers (
status character varying,
transfer_requested_at timestamp without time zone,
transferred_at timestamp without time zone,
- transfer_from_id integer,
+ old_registrar_id integer,
transfer_to_id integer,
created_at timestamp without time zone,
updated_at timestamp without time zone,
@@ -4441,7 +4441,7 @@ ALTER TABLE ONLY domains
--
ALTER TABLE ONLY domain_transfers
- ADD CONSTRAINT fk_rails_59c422f73d FOREIGN KEY (transfer_from_id) REFERENCES registrars(id);
+ ADD CONSTRAINT fk_rails_59c422f73d FOREIGN KEY (old_registrar_id) REFERENCES registrars(id);
--
@@ -5062,3 +5062,5 @@ INSERT INTO schema_migrations (version) VALUES ('20180123124342');
INSERT INTO schema_migrations (version) VALUES ('20180123154407');
+INSERT INTO schema_migrations (version) VALUES ('20180123165604');
+
diff --git a/doc/models_complete.svg b/doc/models_complete.svg
index 0d8af5f9d..5fcb222a4 100644
--- a/doc/models_complete.svg
+++ b/doc/models_complete.svg
@@ -1281,7 +1281,7 @@
status :string
transfer_requested_at :datetime
transferred_at :datetime
-transfer_from_id :integer
+old_registrar_id :integer
transfer_to_id :integer
created_at :datetime
updated_at :datetime