From 68b9ff0c71e391e097131591b97b9b0349b68b37 Mon Sep 17 00:00:00 2001 From: dinsmol Date: Fri, 10 Sep 2021 12:06:30 +0300 Subject: [PATCH] refactored contact birth date validator --- .../contact/ident/birth_date_validator.rb | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/app/validators/contact/ident/birth_date_validator.rb b/app/validators/contact/ident/birth_date_validator.rb index 30b46954b..93d7e0940 100644 --- a/app/validators/contact/ident/birth_date_validator.rb +++ b/app/validators/contact/ident/birth_date_validator.rb @@ -8,11 +8,7 @@ class Contact::Ident::BirthDateValidator < ActiveModel::Validator def birth_date_wrong?(record) return unless record.birthday? - begin - Date.parse(record.code) - rescue ArgumentError - return true - end + return true if birth_date_format_wrong?(record.code) contact_ident_date = Date.parse(record.code) date_from = Time.zone.today - 150.years @@ -22,4 +18,11 @@ class Contact::Ident::BirthDateValidator < ActiveModel::Validator true end + + def birth_date_format_wrong?(date) + Date.parse(date) + false + rescue ArgumentError + true + end end