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

Refactor contact phone validation

Browse source 
#569
This commit is contained in:
Artur Beljajev 2017-08-05 19:21:32 +03:00
parent 9e8f806a43
commit 71b92afba3
2 changed files with 6 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

4
app/models/contact.rb
View file

@ -19,10 +19,10 @@ class Contact < ActiveRecord::Base
accepts_nested_attributes_for :legal_documents accepts_nested_attributes_for :legal_documents
validates :name, :phone, :email, :ident, :ident_type, presence: true validates :name, :email, :ident, :ident_type, presence: true
validates :street, :city, :zip, :country_code, presence: true, if: 'self.class.address_processing?' validates :street, :city, :zip, :country_code, presence: true, if: 'self.class.address_processing?'
validates :phone, format: /\+[0-9]{1,3}\.[0-9]{1,14}?/, phone: true validates :phone, presence: true, format: /\+[0-9]{1,3}\.[0-9]{1,14}?/, phone: true
validates :email, format: /@/ validates :email, format: /@/
validates :email, email_format: { message: :invalid }, if: proc { |c| c.email_changed? } validates :email, email_format: { message: :invalid }, if: proc { |c| c.email_changed? }

8
lib/validators/phone_validator.rb
View file

@ -2,11 +2,11 @@ class PhoneValidator < ActiveModel::EachValidator
def validate_each(record, attribute, value) def validate_each(record, attribute, value)
return if record.errors[:phone].any? return if record.errors[:phone].any?
splitted_phone = value.split('.') phone_parts = value.split('.')
country_code = splitted_phone.first country_code = phone_parts.first
phone_number = splitted_phone.second subscriber_no = phone_parts.second
if zeros_only?(country_code) || zeros_only?(phone_number) if zeros_only?(country_code) || zeros_only?(subscriber_no)
record.errors.add(attribute, :invalid) record.errors.add(attribute, :invalid)
end end
end end