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

changed validation rules

Browse source
This commit is contained in:
dinsmol 2021-09-27 16:15:54 +03:00
parent cc8cc95c38
commit 8365bede3f
2 changed files with 10 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

4
app/interactions/whois/update.rb
View file

@ -33,7 +33,11 @@ module Whois
end end
def find_record(klass, name) def find_record(klass, name)
if klass == Dispute.active
klass.find_by(domain_name: name)
else
klass == DNS::Zone ? klass.find_by(origin: name) : klass.find_by(name: name) klass == DNS::Zone ? klass.find_by(origin: name) : klass.find_by(name: name)
end end
end end
end
end end

6
app/models/concerns/domain/disputable.rb
View file

@ -21,12 +21,16 @@ module Domain::Disputable
@in_disputed_list ||= Dispute.active.find_by(domain_name: name).present? @in_disputed_list ||= Dispute.active.find_by(domain_name: name).present?
end end
def in_auction_list?
@in_auction_list ||= Auction.find_by(domain: name, status: Auction.statuses[:started]).present?
end
def disputed? def disputed?
Dispute.active.where(domain_name: name).any? Dispute.active.where(domain_name: name).any?
end end
def validate_disputed def validate_disputed
return if persisted? || !in_disputed_list? return if persisted? || !in_disputed_list? || in_auction_list?
if reserved_pw.blank? if reserved_pw.blank?
errors.add(:base, :required_parameter_missing_disputed) errors.add(:base, :required_parameter_missing_disputed)