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

Add epp errors support to bulk renew

Browse source
This commit is contained in:
Alex Sherman 2021-05-05 13:36:13 +05:00
parent 0f812d0b15
commit 79351d50d9
8 changed files with 42 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

4
app/controllers/repp/v1/domains/admin_contacts_controller.rb
View file

@ -6,7 +6,9 @@ module Repp
super
unless @new_contact.identical_to?(@current_contact)
@epp_errors << { code: 2304, msg: 'Admin contacts must be identical' }
@epp_errors.add(:epp_errors,
msg: 'Admin contacts must be identical',
code: '2304')
end
return handle_errors if @epp_errors.any?

8
app/controllers/repp/v1/domains/base_contacts_controller.rb
View file

@ -15,8 +15,12 @@ module Repp
end
def update
@epp_errors ||= []
@epp_errors << { code: 2304, msg: 'New contact must be valid' } if @new_contact.invalid?
@epp_errors ||= ActiveModel::Errors.new(self)
if @new_contact.invalid?
@epp_errors.add(:epp_errors,
msg: 'New contact must be valid',
code: '2304')
end
end
private

4
app/controllers/repp/v1/domains/contacts_controller.rb
View file

@ -50,7 +50,9 @@ module Repp
super
if @new_contact == @current_contact
@epp_errors << { code: 2304, msg: 'New contact must be different from current' }
@epp_errors.add(:epp_errors,
msg: 'New contact must be different from current',
code: '2304')
end
return handle_errors if @epp_errors.any?

20
app/controllers/repp/v1/domains/renews_controller.rb
View file

@ -29,8 +29,8 @@ module Repp
renew = run_bulk_renew_task(@domains, bulk_renew_params[:renew_period])
return render_success(data: { updated_domains: @domains.map(&:name) }) if renew.valid?
@epp_errors << { code: 2002,
msg: renew.errors.keys.map { |k, _v| renew.errors[k] }.join(', ') }
msg = renew.errors.keys.map { |k, _v| renew.errors[k] }.join(', ')
@epp_errors.add(:epp_errors, msg: msg , code: '2002')
handle_errors
end
@ -41,20 +41,20 @@ module Repp
end
def validate_renew_period
@epp_errors ||= []
@epp_errors ||= ActiveModel::Errors.new(self)
periods = Depp::Domain::PERIODS.map { |p| p[1] }
return if periods.include? bulk_renew_params[:renew_period]
@epp_errors << { code: 2005, msg: 'Invalid renew period' }
@epp_errors.add(:epp_errors, msg: 'Invalid renew period' , code: '2005')
end
def select_renewable_domains
@epp_errors ||= []
@epp_errors ||= ActiveModel::Errors.new(self)
if bulk_renew_params[:domains].instance_of?(Array)
@domains = bulk_renew_domains
else
@epp_errors << { code: 2005, msg: 'Domains attribute must be an array' }
@epp_errors.add(:epp_errors, msg: 'Domains attribute must be an array' , code: '2005')
end
return handle_errors if @epp_errors.any?
@ -73,12 +73,16 @@ module Repp
end
def bulk_renew_domains
@epp_errors ||= []
@epp_errors ||= ActiveModel::Errors.new(self)
domains = []
bulk_renew_params[:domains].each do |idn|
domain = Epp::Domain.find_by(name: idn)
domains << domain if domain
@epp_errors << { code: 2304, msg: "Object does not exist: #{idn}" } unless domain
unless domain
@epp_errors.add(:epp_errors,
msg: "Object does not exist: #{idn}",
code: '2304')
end
end
domains