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

refactor: remove unused data

Browse source
This commit is contained in:
simon lehericey 2024-05-14 16:51:44 +02:00
parent 43fb1ddeb5
commit 1c0bd3e0e5
No known key found for this signature in database
GPG key ID: CDE670D827C7B3C5
1 changed files with 12 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
app/models/concerns/tags_substitution_concern.rb
View file

@ -283,20 +283,18 @@ module TagsSubstitutionConcern
@escape_unsafe_tags = escape @escape_unsafe_tags = escape
flat_tags = tags_and_datas_list(dossier).each_with_object({}) do |(tags, data), result| flat_tags = tags_and_datas_list(dossier).each_with_object({}) do |tags, result|
next if data.nil?
valid_tags = tags_for_dossier_state(tags) valid_tags = tags_for_dossier_state(tags)
valid_tags.each do |tag| valid_tags.each do |tag|
result[tag[:id]] = [tag, data] result[tag[:id]] = [tag, dossier]
end end
end end
tags_and_libelles.each_with_object({}) do |(tag_id, libelle), substitutions| tags_and_libelles.each_with_object({}) do |(tag_id, libelle), substitutions|
substitutions[tag_id] = case flat_tags[tag_id] substitutions[tag_id] = case flat_tags[tag_id]
in tag, data in tag, dossier
replace_tag(tag, data) replace_tag(tag, dossier)
else # champ not in dossier, for example during preview on draft revision else # champ not in dossier, for example during preview on draft revision
libelle libelle
end end
@ -372,8 +370,8 @@ module TagsSubstitutionConcern
tokens = parse_tags(text) tokens = parse_tags(text)
tags_and_datas = tags_and_datas_list(dossier).filter_map do |(tags, data)| tags_and_datas = tags_and_datas_list(dossier).filter_map do |tags|
data && [tags_for_dossier_state(tags).index_by { _1[:id] }, data] dossier && [tags_for_dossier_state(tags).index_by { _1[:id] }, dossier]
end end
tags_and_datas.reduce(tokens) do |tokens, (tags, data)| tags_and_datas.reduce(tokens) do |tokens, (tags, data)|
@ -449,12 +447,12 @@ module TagsSubstitutionConcern
def tags_and_datas_list(dossier) def tags_and_datas_list(dossier)
[ [
[champ_public_tags(dossier:), dossier], champ_public_tags(dossier:),
[champ_private_tags(dossier:), dossier], champ_private_tags(dossier:),
[dossier_tags, dossier], dossier_tags,
[ROUTAGE_TAGS, dossier], ROUTAGE_TAGS,
[INDIVIDUAL_TAGS, dossier], INDIVIDUAL_TAGS,
[ENTREPRISE_TAGS, dossier] ENTREPRISE_TAGS
] ]
end end
end end