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

Fix CC issues

Browse source
This commit is contained in:
Karl Erik Õunapuu 2020-10-12 15:28:31 +03:00
parent 8755fbdbf4
commit a495c2ab1c
No known key found for this signature in database
GPG key ID: C9DD647298A34764
2 changed files with 13 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

17
app/controllers/repp/v1/base_controller.rb
View file

@ -21,34 +21,37 @@ module Repp
end end
def epp_errors def epp_errors
@errors ||= [] @epp_errors ||= []
end end
def handle_errors(obj = nil, update: false) def handle_errors(obj = nil, update: false)
@errors ||= [] @epp_errors ||= []
if obj if obj
obj.construct_epp_errors obj.construct_epp_errors
@errors += obj.errors[:epp_errors] @epp_errors += obj.errors[:epp_errors]
end end
if update if update
@errors.each_with_index do |errors, index| @epp_errors.each_with_index do |errors, index|
next unless errors[:code] == '2304' && errors[:value].present? && next unless errors[:code] == '2304' && errors[:value].present? &&
errors[:value][:val] == DomainStatus::SERVER_DELETE_PROHIBITED && errors[:value][:val] == DomainStatus::SERVER_DELETE_PROHIBITED &&
errors[:value][:obj] == 'status' errors[:value][:obj] == 'status'
@errors[index][:value][:val] = DomainStatus::PENDING_UPDATE @epp_errors[index][:value][:val] = DomainStatus::PENDING_UPDATE
end end
end end
@errors.uniq! @epp_errors.uniq!
render_epp_error render_epp_error
end end
def render_epp_error def render_epp_error
render(json: { code: @errors[0][:code], message: @errors[0][:msg] }, status: :bad_request) render(
json: { code: @epp_errors[0][:code], message: @epp_errors[0][:msg] },
status: :bad_request
)
end end
def ip_whitelisted? def ip_whitelisted?

7
app/controllers/repp/v1/contacts_controller.rb
View file

@ -6,9 +6,8 @@ module Repp
## GET /repp/v1/contacts ## GET /repp/v1/contacts
def index def index
record_count = current_user.registrar.contacts.count record_count = current_user.registrar.contacts.count
show_addresses = Contact.address_processing? && params[:details] == 'true'
contacts = showable_contacts(params[:details], params[:limit] || 200, contacts = showable_contacts(params[:details], params[:limit] || 200,
params[:offset] || 0, show_addresses) params[:offset] || 0)
render(json: { contacts: contacts, total_number_of_records: record_count }, status: :ok) render(json: { contacts: contacts, total_number_of_records: record_count }, status: :ok)
end end
@ -65,9 +64,9 @@ module Repp
message: opt_addr? ? I18n.t('epp.contacts.completed_without_address') : nil } message: opt_addr? ? I18n.t('epp.contacts.completed_without_address') : nil }
end end
def showable_contacts(details, limit, offset, addresses) def showable_contacts(details, limit, offset)
contacts = current_user.registrar.contacts.limit(limit).offset(offset) contacts = current_user.registrar.contacts.limit(limit).offset(offset)
unless addresses unless Contact.address_processing? && params[:details] == 'true'
contacts = contacts.select(Contact.attribute_names - Contact.address_attribute_names) contacts = contacts.select(Contact.attribute_names - Contact.address_attribute_names)
end end