Rename private method

This commit is contained in:
Maciej Szlosarczyk 2018-07-23 15:00:37 +03:00
parent f92ece5467
commit 65676ae637
No known key found for this signature in database
GPG key ID: 41D62D42D3B0D765

View file

@ -46,7 +46,7 @@ class RegistrantUser < User
user_data[:last_name] = parse_str.scan(/,SN=([^,]+)/).flatten.first user_data[:last_name] = parse_str.scan(/,SN=([^,]+)/).flatten.first
end end
find_or_create_by_certificate_data(user_data) find_or_create_by_user_data(user_data)
end end
def find_or_create_by_api_data(user_data = {}) def find_or_create_by_api_data(user_data = {})
@ -57,26 +57,26 @@ class RegistrantUser < User
user_data.each { |k, v| v.upcase! if v.is_a?(String) } user_data.each { |k, v| v.upcase! if v.is_a?(String) }
user_data[:country_code] ||= "EE" user_data[:country_code] ||= "EE"
find_or_create_by_certificate_data(user_data) find_or_create_by_user_data(user_data)
end end
def find_or_create_by_mid_data(response) def find_or_create_by_mid_data(response)
user_data = { first_name: response.user_givenname, last_name: response.user_surname, user_data = { first_name: response.user_givenname, last_name: response.user_surname,
ident: response.user_id_code, country_code: response.user_country } ident: response.user_id_code, country_code: response.user_country }
find_or_create_by_certificate_data(user_data) find_or_create_by_user_data(user_data)
end end
private private
def find_or_create_by_certificate_data(opts = {}) def find_or_create_by_user_data(user_data = {})
return unless opts[:first_name] return unless user_data[:first_name]
return unless opts[:last_name] return unless user_data[:last_name]
return unless opts[:ident] return unless user_data[:ident]
return unless opts[:country_code] return unless user_data[:country_code]
user = find_or_create_by(registrant_ident: "#{opts[:country_code]}-#{opts[:ident]}") user = find_or_create_by(registrant_ident: "#{user_data[:country_code]}-#{user_data[:ident]}")
user.username = "#{opts[:first_name]} #{opts[:last_name]}" user.username = "#{user_data[:first_name]} #{user_data[:last_name]}"
user.save user.save
user user