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

Merge pull request #2475 from internetee/fix-domain-contacts-repp

Browse source 
Fix domain contacts repp
This commit is contained in:
Timo Võhmar 2022-11-17 09:45:56 +02:00 • committed by GitHub
commit 4328ebbfcc
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 16 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -41,9 +41,7 @@ module Repp
def cta(action = 'add') def cta(action = 'add')
params[:contacts].each { |c| c[:action] = action } params[:contacts].each { |c| c[:action] = action }
action = Actions::DomainUpdate.new(@domain, contact_create_params, false) action = Actions::DomainUpdate.new(@domain, contact_create_params, false)
# rubocop:disable Style/AndOr
handle_errors(@domain) and return unless action.call handle_errors(@domain) and return unless action.call
# rubocop:enable Style/AndOr
render_success(data: { domain: { name: @domain.name } }) render_success(data: { domain: { name: @domain.name } })
end end

21
app/interactions/actions/domain_update.rb
View file

@ -30,7 +30,7 @@ module Actions
end end
def check_for_same_contacts(contacts, contact_type) def check_for_same_contacts(contacts, contact_type)
return unless contacts.uniq.count != contacts.count return if contacts.uniq.count == contacts.count
domain.add_epp_error('2306', contact_type, nil, %i[domain_contacts invalid]) domain.add_epp_error('2306', contact_type, nil, %i[domain_contacts invalid])
end end
@ -194,22 +194,33 @@ module Actions
def contact_for_action(action:, method:, code:) def contact_for_action(action:, method:, code:)
contact = Epp::Contact.find_by(code: code) contact = Epp::Contact.find_by(code: code)
return contact if action == 'add' || !contact return contact if action == 'add' || !contact
return domain.admin_domain_contacts.find_by(contact_id: contact.id) if method == 'admin'
domain.tech_domain_contacts.find_by(contact_id: contact.id) existing_contact(id: contact.id, admin: method == 'admin')
end end
def assign_contact(obj, add: false, admin: true, code:) def existing_contact(id:, admin: true)
return domain.admin_domain_contacts.find_by(contact_id: id) if admin
domain.tech_domain_contacts.find_by(contact_id: id)
end
def assign_contact(obj, code:, add: false, admin: true)
if obj.blank? if obj.blank?
domain.add_epp_error('2303', 'contact', code, %i[domain_contacts not_found]) domain.add_epp_error('2303', 'contact', code, %i[domain_contacts not_found])
elsif obj.try(:org?) && admin && add elsif obj.try(:org?) && admin && add
domain.add_epp_error('2306', 'contact', code, domain.add_epp_error('2306', 'contact', code,
%i[domain_contacts admin_contact_can_be_only_private_person]) %i[domain_contacts admin_contact_can_be_only_private_person])
else else
add ? { contact_id: obj.id, contact_code: obj.code } : { id: obj.id, _destroy: 1 } assigned_contact_hash(obj, add, admin)
end end
end end
def assigned_contact_hash(obj, add, admin)
return if !existing_contact(id: obj.id, admin: admin).nil? && add
add ? { contact_id: obj.id, contact_code: obj.code } : { id: obj.id, _destroy: 1 }
end
def assign_requested_statuses def assign_requested_statuses
return unless params[:statuses] return unless params[:statuses]