提交 ef52d34d 编写于 作者: C Carlos Antonio da Silva

Refactor blank date parameter validation

上级 5021c13c
......@@ -214,7 +214,7 @@ def read_time_parameter_value(column, name, values_hash_from_param)
validate_missing_parameters!(name, [1,2,3], values_hash_from_param)
# If Date bits were provided but blank, then return nil
return nil if (1..3).any? { |position| values_hash_from_param[position].blank? }
return if blank_date_parameter?(values_hash_from_param)
end
max_position = extract_max_param_for_multiparameter_attributes(values_hash_from_param, 6)
......@@ -225,7 +225,7 @@ def read_time_parameter_value(column, name, values_hash_from_param)
end
def read_date_parameter_value(name, values_hash_from_param)
return nil if (1..3).any? {|position| values_hash_from_param[position].blank?}
return if blank_date_parameter?(values_hash_from_param)
set_values = [values_hash_from_param[1], values_hash_from_param[2], values_hash_from_param[3]]
begin
Date.new(*set_values)
......@@ -243,6 +243,10 @@ def read_other_parameter_value(klass, name, values_hash_from_param)
klass.new(*values)
end
def blank_date_parameter?(values_hash)
(1..3).any? { |position| values_hash[position].blank? }
end
# If some position is not provided, it errors out a missing parameter exception.
def validate_missing_parameters!(name, positions, values_hash)
if missing_parameter = positions.detect { |position| !values_hash.key?(position) }
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册