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

Merge pull request #7548 from tchak/improuve-types-de-champ-for-tags

Browse source 
feat(tags): expose used_type_de_champ_tags
This commit is contained in:
Paul Chavard 2022-07-11 14:33:54 +02:00 committed by GitHub
commit 0c2afd0b81
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 82 additions and 38 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
app/models/attestation_template.rb
View file

@ -143,14 +143,7 @@ class AttestationTemplate < ApplicationRecord
private
def used_tags
delimiters_regex = /--(?<capture>((?!--).)*)--/
# We can't use flat_map as scan will return 3 levels of array,
# using flat_map would give us 2, whereas flatten will
# give us 1, which is what we want
[normalize_tags(title), normalize_tags(body)]
.map { |str| str.scan(delimiters_regex) }
.flatten
used_tags_for(title) + used_tags_for(body)
end
def build_pdf(dossier)

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

@ -139,6 +139,10 @@ module TagsSubstitutionConcern
}
]
SHARED_TAG_LIBELLES = (DOSSIER_TAGS + DOSSIER_TAGS_FOR_MAIL + INDIVIDUAL_TAGS + ENTREPRISE_TAGS + ROUTAGE_TAGS).map { |tag| tag[:libelle] }
TAG_DELIMITERS_REGEX = /--(?<capture>((?!--).)*)--/
def tags
if procedure.for_individual?
identity_tags = INDIVIDUAL_TAGS
@ -154,6 +158,33 @@ module TagsSubstitutionConcern
filter_tags(identity_tags + dossier_tags + champ_public_tags + champ_private_tags + routage_tags)
end
def used_type_de_champ_tags(text)
used_tags_for(text, with_libelle: true).filter_map do |(tag, libelle)|
if !tag.in?(SHARED_TAG_LIBELLES)
if tag.start_with?('tdc')
[libelle, tag.gsub('tdc', '').to_i]
else
[tag]
end
end
end
end
def used_tags_for(text, with_libelle: false)
text, tags = normalize_tags(text)
text
.scan(TAG_DELIMITERS_REGEX)
.flatten
.map do |tag_str|
if with_libelle
tag = tags.find { |tag| tag[:id] == tag_str }
[tag_str, tag ? tag[:libelle] : nil]
else
tag_str
end
end
end
private
def format_date(date)
@ -197,7 +228,7 @@ module TagsSubstitutionConcern
end
def champ_public_tags(dossier: nil)
types_de_champ = dossier&.types_de_champ || procedure.active_revision.types_de_champ_public
types_de_champ = (dossier || procedure.active_revision).types_de_champ_public
types_de_champ_tags(types_de_champ, Dossier::SOUMIS)
end
@ -219,7 +250,7 @@ module TagsSubstitutionConcern
return ''
end
text = normalize_tags(text)
text, _ = normalize_tags(text)
tags_and_datas = [
[champ_public_tags(dossier: dossier), dossier.champs],
@ -262,8 +293,8 @@ module TagsSubstitutionConcern
end
def normalize_tags(text)
tags = types_de_champ_tags(procedure.types_de_champ_for_tags, Dossier::SOUMIS) + types_de_champ_tags(procedure.types_de_champ_private_for_tags, Dossier::INSTRUCTION_COMMENCEE)
filter_tags(tags).reduce(text) { |text, tag| normalize_tag(text, tag) }
tags = types_de_champ_tags(procedure.types_de_champ_public_for_tags, Dossier::SOUMIS) + types_de_champ_tags(procedure.types_de_champ_private_for_tags, Dossier::INSTRUCTION_COMMENCEE)
[filter_tags(tags).reduce(text) { |text, tag| normalize_tag(text, tag) }, tags]
end
def normalize_tag(text, tag)

4
app/models/dossier.rb
View file

@ -435,6 +435,10 @@ class Dossier < ApplicationRecord
validates :individual, presence: true, if: -> { revision.procedure.for_individual? }
validates :groupe_instructeur, presence: true, if: -> { !brouillon? }
def types_de_champ_public
types_de_champ
end
EXPORT_BATCH_SIZE = 2000
def self.downloadable_sorted_batch

38
app/models/procedure.rb
View file

@ -163,35 +163,21 @@ class Procedure < ApplicationRecord
end
def types_de_champ_for_tags
if brouillon?
draft_types_de_champ
else
TypeDeChamp
.public_only
.fillable
.joins(:revisions)
.where(procedure_revisions: { procedure_id: id })
.where.not(procedure_revisions: { id: draft_revision_id })
.where(revision_types_de_champ: { parent_id: nil })
.order(:created_at)
.uniq
end
TypeDeChamp
.fillable
.joins(:revisions)
.where(procedure_revisions: brouillon? ? { id: draft_revision_id } : { procedure_id: id })
.where(revision_types_de_champ: { parent_id: nil })
.order(:created_at)
.distinct(:id)
end
def types_de_champ_public_for_tags
types_de_champ_for_tags.public_only
end
def types_de_champ_private_for_tags
if brouillon?
draft_types_de_champ_private
else
TypeDeChamp
.private_only
.fillable
.joins(:revisions)
.where(procedure_revisions: { procedure_id: id })
.where.not(procedure_revisions: { id: draft_revision_id })
.where(revision_types_de_champ: { parent_id: nil })
.order(:created_at)
.uniq
end
types_de_champ_for_tags.private_only
end
has_many :administrateurs_procedures, dependent: :delete_all

30
spec/models/concern/tags_substitution_concern_spec.rb
View file

@ -467,4 +467,34 @@ describe TagsSubstitutionConcern, type: :model do
it { is_expected.to include(include({ libelle: 'public' })) }
end
end
describe 'used_tags_for' do
let(:text) { 'hello world --public--, --numéro du dossier--, --yolo--' }
subject { template_concern.used_tags_for(text) }
let(:types_de_champ) do
[
build(:type_de_champ, libelle: 'public'),
build(:type_de_champ_header_section, libelle: 'entête de section'),
build(:type_de_champ_explication, libelle: 'explication')
]
end
it { is_expected.to eq(["tdc#{types_de_champ.first.stable_id}", 'numéro du dossier', 'yolo']) }
end
describe 'used_type_de_champ_tags' do
let(:text) { 'hello world --public--, --numéro du dossier--, --yolo--' }
subject { template_concern.used_type_de_champ_tags(text) }
let(:types_de_champ) do
[
build(:type_de_champ, libelle: 'public'),
build(:type_de_champ_header_section, libelle: 'entête de section'),
build(:type_de_champ_explication, libelle: 'explication')
]
end
it { is_expected.to eq([["public", types_de_champ.first.stable_id], ['yolo']]) }
end
end