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

Refactor

Browse source
This commit is contained in:
Artur Beljajev 2019-02-18 15:05:52 +02:00
parent 2862dd81d1
commit b81c971b37
3 changed files with 11 additions and 33 deletions
Download patch file Download diff file Expand all files Collapse all files

24
app/controllers/epp/domains_controller.rb
View file

@ -10,17 +10,17 @@ class Epp::DomainsController < EppController
if domain_name.at_auction? if domain_name.at_auction?
@name = domain_name @name = domain_name
@status = 'At auction' @status = 'At auction'
render_epp_response '/epp/domains/info_auction' render_epp_response '/epp/domains/info/unregistered_domain'
return return
elsif domain_name.awaiting_payment? elsif domain_name.awaiting_payment?
@name = domain_name @name = domain_name
@status = 'Awaiting payment' @status = 'Awaiting payment'
render_epp_response '/epp/domains/info_auction' render_epp_response '/epp/domains/info/unregistered_domain'
return return
elsif domain_name.pending_registration? elsif domain_name.pending_registration?
@name = domain_name @name = domain_name
@status = 'Reserved' @status = 'Reserved'
render_epp_response '/epp/domains/info_auction' render_epp_response '/epp/domains/info/unregistered_domain'
return return
end end
end end
@ -42,16 +42,14 @@ class Epp::DomainsController < EppController
end end
render_epp_response '/epp/domains/info/registered_domain' render_epp_response '/epp/domains/info/registered_domain'
else elsif domain_name.blocked?
if domain_name.blocked? @name = domain_name
@name = domain_name @status = 'Blocked'
@status = 'Blocked' render_epp_response '/epp/domains/info/unregistered_domain'
render_epp_response '/epp/domains/info/unregistered_domain' elsif domain_name.reserved?
elsif domain_name.reserved? @name = domain_name
@name = domain_name @status = 'Reserved'
@status = 'Reserved' render_epp_response '/epp/domains/info/unregistered_domain'
render_epp_response '/epp/domains/info/unregistered_domain'
end
end end
end end

4
app/models/dns/domain_name.rb
View file

@ -53,10 +53,6 @@ module DNS
Whois::Record.refresh(self) Whois::Record.refresh(self)
end end
def to_s
name
end
def registered? def registered?
Domain.find_by_idn(name) Domain.find_by_idn(name)
end end

16
app/views/epp/domains/info_auction.xml.builder
View file

@ -1,16 +0,0 @@
xml.epp_head do
xml.response do
xml.result('code' => '1000') do
xml.msg 'Command completed successfully'
end
xml.resData do
xml.tag! 'domain:infData', 'xmlns:domain' => 'https://epp.tld.ee/schema/domain-eis-1.0.xsd' do
xml.tag!('domain:name', @name)
xml.tag!('domain:status', 's' => @status)
end
end
render('epp/shared/trID', builder: xml)
end
end