zydronium/internetee-registry
1
0
Fork 0
mirror of https://github.com/internetee/registry.git synced 2025-07-03 09:43:36 +02:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'task#104941754' into staging

Browse source
This commit is contained in:
Stas 2015-10-22 12:34:41 +03:00
commit 418dc465b3
2 changed files with 13 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

1
app/models/legacy/object.rb
View file

@ -1,6 +1,7 @@
module Legacy module Legacy
class Object < Db class Object < Db
self.table_name = :object self.table_name = :object
belongs_to :registrar, foreign_key: :upid, primary_key: :legacy_id, class_name: '::Registrar'
def self.instance_method_already_implemented?(method_name) def self.instance_method_already_implemented?(method_name)
return true if method_name == 'update' return true if method_name == 'update'

24
lib/tasks/import.rake
View file

@ -189,9 +189,9 @@ namespace :import do
x.object.authinfopw.try(:strip), x.object.authinfopw.try(:strip),
name, name,
x.organization.try(:strip), x.organization.try(:strip),
x.object.try(:clid), x.object_registry.try(:registrar).try(:id),
x.object_registry.try(:crid), user,
x.object.try(:upid) ? x.object.try(:upid) : x.object_registry.try(:crid), x.object.try(:registrar).try(:name) ? x.object.try(:registrar).try(:name) : x.object_registry.try(:registrar).try(:name),
x.country.try(:strip), x.country.try(:strip),
x.id, x.id,
[x.street1.try(:strip), x.street2.try(:strip), x.street3.try(:strip)].join("\n"), [x.street1.try(:strip), x.street2.try(:strip), x.street3.try(:strip)].join("\n"),
@ -321,8 +321,8 @@ namespace :import do
SimpleIDN.to_ascii(x.object_registry.name.try(:strip)), SimpleIDN.to_ascii(x.object_registry.name.try(:strip)),
1, 1,
'y', 'y',
x.object_registry.try(:crid), user,
x.object.try(:upid) ? x.object.try(:upid) : x.object_registry.try(:crid), x.object.try(:registrar).try(:name) ? x.object.try(:registrar).try(:name) : x.object_registry.try(:registrar).try(:name),
x.id, x.id,
x.object_registry.try(:crid), x.object_registry.try(:crid),
x.registrant, x.registrant,
@ -333,8 +333,8 @@ namespace :import do
x.domain_contact_maps.each do |dc| x.domain_contact_maps.each do |dc|
domain_contacts << [ domain_contacts << [
'AdminDomainContact', 'AdminDomainContact',
x.object_registry.try(:crid), user,
x.object.try(:upid) ? x.object.try(:upid) : x.object_registry.try(:crid), x.object.try(:registrar).try(:name) ? x.object.try(:registrar).try(:name) : x.object_registry.try(:registrar).try(:name),
x.id, x.id,
dc.contactid dc.contactid
] ]
@ -344,8 +344,8 @@ namespace :import do
x.nsset_contact_maps.each do |dc| x.nsset_contact_maps.each do |dc|
domain_contacts << [ domain_contacts << [
'TechDomainContact', 'TechDomainContact',
x.object_registry.try(:crid), user,
x.object.try(:upid) ? x.object.try(:upid) : x.object_registry.try(:crid), x.object.try(:registrar).try(:name) ? x.object.try(:registrar).try(:name) : x.object_registry.try(:registrar).try(:name),
x.id, x.id,
dc.contactid dc.contactid
] ]
@ -365,8 +365,8 @@ namespace :import do
host.fqdn.try(:strip), host.fqdn.try(:strip),
ips[:ipv4].try(:strip), ips[:ipv4].try(:strip),
ips[:ipv6].try(:strip), ips[:ipv6].try(:strip),
x.object_registry.try(:crid), user,
x.object.try(:upid) ? x.object.try(:upid) : x.object_registry.try(:crid), x.object.try(:registrar).try(:name) ? x.object.try(:registrar).try(:name) : x.object_registry.try(:registrar).try(:name),
x.id x.id
] ]
end if x.nsset && x.nsset.hosts end if x.nsset && x.nsset.hosts
@ -380,7 +380,7 @@ namespace :import do
3, # ds_alg 3, # ds_alg
1, # ds_digest_type /SHA1) 1, # ds_digest_type /SHA1)
user, user,
x.object.try(:upid) ? x.object.try(:upid) : x.object_registry.try(:crid), x.object.try(:registrar).try(:name) ? x.object.try(:registrar).try(:name) : x.object_registry.try(:registrar).try(:name),
x.id x.id
] ]
end end