DGNum/demarches-normaliennes
14
1
Fork 0
Code Issues 1 Pull requests Projects Releases Packages Wiki Activity

refactor(champ): remove call to validation from value formatting code

Browse source
This commit is contained in:
Paul Chavard 2024-07-08 11:42:40 +02:00
parent f954d07cf6
commit 133689b4d3
No known key found for this signature in database
4 changed files with 4 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
app/models/champ.rb
View file

@ -107,11 +107,6 @@ class Champ < ApplicationRecord
[to_s] [to_s]
end end
def valid_value
return unless valid_champ_value?
value
end
def to_s def to_s
TypeDeChamp.champ_value(type_champ, self) TypeDeChamp.champ_value(type_champ, self)
end end

2
app/models/types_de_champ/decimal_number_type_de_champ.rb
View file

@ -20,7 +20,7 @@ class TypesDeChamp::DecimalNumberTypeDeChamp < TypesDeChamp::TypeDeChampBase
private private
def champ_formatted_value(champ) def champ_formatted_value(champ)
champ.valid_value&.to_f champ.value&.to_f
end end
end end
end end

2
app/models/types_de_champ/integer_number_type_de_champ.rb
View file

@ -20,7 +20,7 @@ class TypesDeChamp::IntegerNumberTypeDeChamp < TypesDeChamp::TypeDeChampBase
private private
def champ_formatted_value(champ) def champ_formatted_value(champ)
champ.valid_value&.to_i champ.value&.to_i
end end
end end
end end

4
app/models/types_de_champ/type_de_champ_base.rb
View file

@ -66,12 +66,12 @@ class TypesDeChamp::TypeDeChampBase
when 2 when 2
champ_value(champ) champ_value(champ)
else else
champ.valid_value.presence || champ_default_api_value(version) champ.value.presence || champ_default_api_value(version)
end end
end end
def champ_value_for_export(champ, path = :value) def champ_value_for_export(champ, path = :value)
path == :value ? champ.valid_value.presence : champ_default_export_value(path) path == :value ? champ.value.presence : champ_default_export_value(path)
end end
def champ_value_for_tag(champ, path = :value) def champ_value_for_tag(champ, path = :value)