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

Made contact accept address as nested attribute

Browse source
This commit is contained in:
Andres Keskküla 2014-08-05 16:55:42 +03:00
parent 27ca5714cd
commit 1349abbbc7
3 changed files with 20 additions and 30 deletions
Download patch file Download diff file Expand all files Collapse all files

45
app/helpers/epp/contacts_helper.rb
View file

@ -1,17 +1,8 @@
module Epp::ContactsHelper module Epp::ContactsHelper
def create_contact def create_contact
ph = params_hash['epp']['command']['create']['create']
#todo, remove the first_or_initialize logic, since it's redundant due to
#<contact:id> from EPP api
@contact = Contact.new @contact = Contact.new( contact_and_address_attributes )
@contact = Contact.where(ident: ph[:ident]).first_or_initialize( new_contact_info ) if ph[:ident]
@contact.assign_attributes(name: ph[:postalInfo][:name])
@contact.address = new_address
stamp @contact stamp @contact
@contact.save @contact.save
render '/epp/contacts/create' render '/epp/contacts/create'
@ -66,24 +57,7 @@ module Epp::ContactsHelper
private private
def has_rights def contact_and_address_attributes
if @contact.created_by.registrar == current_epp_user.registrar
return true
end
return false
end
def new_address
ph = params_hash['epp']['command']['create']['create']
Address.new(
country_id: Country.find_by(iso: ph[:postalInfo][:addr][:cc]),
street: tidy_street,
zip: ph[:postalInfo][:addr][:pc]
)
end
def new_contact_info
ph = params_hash['epp']['command']['create']['create'] ph = params_hash['epp']['command']['create']['create']
{ {
code: ph[:id], code: ph[:id],
@ -91,8 +65,21 @@ module Epp::ContactsHelper
ident: ph[:ident], ident: ph[:ident],
ident_type: ident_type, ident_type: ident_type,
email: ph[:email], email: ph[:email],
org_name: ph[:postalInfo][:org] name: ph[:postalInfo][:name],
org_name: ph[:postalInfo][:org],
address_attributes: {
country_id: Country.find_by(iso: ph[:postalInfo][:addr][:cc]),
street: tidy_street,
zip: ph[:postalInfo][:addr][:pc]
} }
}
end
def has_rights
if @contact.created_by.registrar == current_epp_user.registrar
return true
end
return false
end end
def tidy_street def tidy_street

2
app/models/contact.rb
View file

@ -9,6 +9,8 @@ class Contact < ActiveRecord::Base
belongs_to :created_by, class_name: 'EppUser', foreign_key: :created_by_id belongs_to :created_by, class_name: 'EppUser', foreign_key: :created_by_id
belongs_to :updated_by, class_name: 'EppUser', foreign_key: :updated_by_id belongs_to :updated_by, class_name: 'EppUser', foreign_key: :updated_by_id
accepts_nested_attributes_for :address
validates_presence_of :code, :name, :phone, :email, :ident validates_presence_of :code, :name, :phone, :email, :ident
validate :ident_must_be_valid validate :ident_must_be_valid

3
spec/epp/contact_spec.rb
View file

@ -19,7 +19,8 @@ describe 'EPP Contact', epp: true do
expect(Contact.first.org_name).to eq('Example Inc.') expect(Contact.first.org_name).to eq('Example Inc.')
end end
it 'updates a contact with same ident' do it 'updates a contact with same ident', pending: true do
pending 'fixing this as soon as contact#update is done'
Fabricate(:contact) Fabricate(:contact)
response = epp_request('contacts/create.xml') response = epp_request('contacts/create.xml')
expect(response[:result_code]).to eq('1000') expect(response[:result_code]).to eq('1000')