From 81df0332828e69209f5a058ae8878dedf64b53ca Mon Sep 17 00:00:00 2001
From: Damien Le Thiec <damien.lethiec@gmail.com>
Date: Thu, 26 Jan 2023 17:57:57 +0100
Subject: [PATCH 001/202] First draft repeatable

---
 app/models/champ.rb                           |  2 ++
 .../concerns/dossier_prefillable_concern.rb   |  2 +-
 app/models/prefill_params.rb                  | 25 +++++++++++++++----
 app/models/type_de_champ.rb                   |  3 ++-
 4 files changed, 25 insertions(+), 7 deletions(-)

diff --git a/app/models/champ.rb b/app/models/champ.rb
index 21e170978..b53e0e710 100644
--- a/app/models/champ.rb
+++ b/app/models/champ.rb
@@ -72,6 +72,8 @@ class Champ < ApplicationRecord
     :refresh_after_update?,
     to: :type_de_champ
 
+  delegate :revision, to: :dossier, prefix: true
+
   scope :updated_since?, -> (date) { where('champs.updated_at > ?', date) }
   scope :public_only, -> { where(private: false) }
   scope :private_only, -> { where(private: true) }
diff --git a/app/models/concerns/dossier_prefillable_concern.rb b/app/models/concerns/dossier_prefillable_concern.rb
index 245527e6f..3ecbe7a04 100644
--- a/app/models/concerns/dossier_prefillable_concern.rb
+++ b/app/models/concerns/dossier_prefillable_concern.rb
@@ -7,7 +7,7 @@ module DossierPrefillableConcern
     return unless champs_public_attributes.any?
 
     attr = { prefilled: true }
-    attr[:champs_public_attributes] = champs_public_attributes.map { |h| h.merge(prefilled: true) }
+    attr[:champs_public_all_attributes] = champs_public_attributes.map { |h| h.merge(prefilled: true) }
 
     assign_attributes(attr)
     save(validate: false)
diff --git a/app/models/prefill_params.rb b/app/models/prefill_params.rb
index e4ded1975..68f717df2 100644
--- a/app/models/prefill_params.rb
+++ b/app/models/prefill_params.rb
@@ -5,7 +5,7 @@ class PrefillParams
   end
 
   def to_a
-    build_prefill_values.filter(&:prefillable?).map(&:to_h)
+    build_prefill_values.filter(&:prefillable?).map(&:to_h).flatten
   end
 
   private
@@ -55,10 +55,14 @@ class PrefillParams
     end
 
     def to_h
-      {
-        id: champ.id,
-        value: value
-      }
+      if champ.type_champ == TypeDeChamp.type_champs.fetch(:repetition)
+        repeatable_hashes
+      else
+        {
+          id: champ.id,
+          value: value
+        }
+      end
     end
 
     private
@@ -69,5 +73,16 @@ class PrefillParams
       champ.value = value
       champ.valid?(:prefill)
     end
+
+    def repeatable_hashes
+      value.map.with_index do |repetition, index|
+        row = champ.rows[index] || champ.add_row(champ.dossier_revision)
+        JSON.parse(repetition).map do |key, value|
+          id = row.find { |champ| champ.libelle == key }.id
+          { id: id, value: value }
+        end
+      rescue JSON::ParserError
+      end.flatten
+    end
   end
 end
diff --git a/app/models/type_de_champ.rb b/app/models/type_de_champ.rb
index 4c1a7cb71..16bfb5cbf 100644
--- a/app/models/type_de_champ.rb
+++ b/app/models/type_de_champ.rb
@@ -269,7 +269,8 @@ class TypeDeChamp < ApplicationRecord
       TypeDeChamp.type_champs.fetch(:yes_no),
       TypeDeChamp.type_champs.fetch(:checkbox),
       TypeDeChamp.type_champs.fetch(:drop_down_list),
-      TypeDeChamp.type_champs.fetch(:regions)
+      TypeDeChamp.type_champs.fetch(:regions),
+      TypeDeChamp.type_champs.fetch(:repetition),
     ])
   end
 

From 20ba96ba3c2c96c7493af2b1fa2c007435ff58df Mon Sep 17 00:00:00 2001
From: Damien Le Thiec <damien.lethiec@gmail.com>
Date: Tue, 31 Jan 2023 14:54:23 +0100
Subject: [PATCH 002/202] POST working with prefill query example for repeating
 fields

---
 .../api/public/v1/dossiers_controller.rb      |  1 +
 .../concerns/dossier_prefillable_concern.rb   |  2 +-
 app/models/prefill_description.rb             |  8 +++-
 app/models/prefill_params.rb                  |  8 +++-
 app/models/type_de_champ.rb                   |  7 ++++
 .../prefill_repetition_type_de_champ.rb       | 37 +++++++++++++++++++
 .../types_de_champ/prefill_type_de_champ.rb   | 14 ++++++-
 .../_types_de_champs.html.haml                |  7 +---
 config/locales/en.yml                         |  1 +
 config/locales/fr.yml                         |  1 +
 10 files changed, 76 insertions(+), 10 deletions(-)
 create mode 100644 app/models/types_de_champ/prefill_repetition_type_de_champ.rb

diff --git a/app/controllers/api/public/v1/dossiers_controller.rb b/app/controllers/api/public/v1/dossiers_controller.rb
index 2e770d6ce..051bc9aac 100644
--- a/app/controllers/api/public/v1/dossiers_controller.rb
+++ b/app/controllers/api/public/v1/dossiers_controller.rb
@@ -2,6 +2,7 @@ class API::Public::V1::DossiersController < API::Public::V1::BaseController
   before_action :retrieve_procedure
 
   def create
+    byebug
     dossier = Dossier.new(
       revision: @procedure.active_revision,
       groupe_instructeur: @procedure.defaut_groupe_instructeur_for_new_dossier,
diff --git a/app/models/concerns/dossier_prefillable_concern.rb b/app/models/concerns/dossier_prefillable_concern.rb
index 3ecbe7a04..7537a7357 100644
--- a/app/models/concerns/dossier_prefillable_concern.rb
+++ b/app/models/concerns/dossier_prefillable_concern.rb
@@ -7,7 +7,7 @@ module DossierPrefillableConcern
     return unless champs_public_attributes.any?
 
     attr = { prefilled: true }
-    attr[:champs_public_all_attributes] = champs_public_attributes.map { |h| h.merge(prefilled: true) }
+    attr[:champs_public_all_attributes] = champs_public_attributes.compact.map { |h| h.merge(prefilled: true) }
 
     assign_attributes(attr)
     save(validate: false)
diff --git a/app/models/prefill_description.rb b/app/models/prefill_description.rb
index a09d89c80..2198f5412 100644
--- a/app/models/prefill_description.rb
+++ b/app/models/prefill_description.rb
@@ -50,7 +50,13 @@ class PrefillDescription < SimpleDelegator
   end
 
   def prefilled_champs_for_query
-    prefilled_champs.map { |type_de_champ| "\"champ_#{type_de_champ.to_typed_id}\": \"#{type_de_champ.example_value}\"" } .join(', ')
+    prefilled_champs.map do |type_de_champ|
+      if type_de_champ.type_champ == TypeDeChamp.type_champs.fetch(:repetition)
+        "\"champ_#{type_de_champ.to_typed_id}\": #{type_de_champ.example_value}"
+      else
+        "\"champ_#{type_de_champ.to_typed_id}\": \"#{type_de_champ.example_value}\""
+      end
+    end.join(', ')
   end
 
   def active_fillable_public_types_de_champ
diff --git a/app/models/prefill_params.rb b/app/models/prefill_params.rb
index 68f717df2..177aef1b4 100644
--- a/app/models/prefill_params.rb
+++ b/app/models/prefill_params.rb
@@ -11,6 +11,9 @@ class PrefillParams
   private
 
   def build_prefill_values
+    byebug
+    # nop : "[{\"txt\":\"Texte court\", \"nb\":\"3.14\", \"Test dropdown\":\"Premier choix\", \"régio\":\"53\"}, {\"txt\":\"Texte court\", \"nb\":\"3.14\", \"Test dropdown\":\"Premier choix\", \"régio\":\"53\"}]"
+    # {"champ_Q2hhbXAtNDI="=>["{\"txt\":\"abc\", \"nb\":\"1,12\"}", "{\"txt\":\"def\", \"nb\":\"2,12\"}"]}
     value_by_stable_id = @params
       .map { |prefixed_typed_id, value| [stable_id_from_typed_id(prefixed_typed_id), value] }
       .filter { |stable_id, value| stable_id.present? && value.present? }
@@ -78,11 +81,12 @@ class PrefillParams
       value.map.with_index do |repetition, index|
         row = champ.rows[index] || champ.add_row(champ.dossier_revision)
         JSON.parse(repetition).map do |key, value|
-          id = row.find { |champ| champ.libelle == key }.id
+          id = row.find { |champ| champ.libelle == key }&.id
+          next unless id
           { id: id, value: value }
         end
       rescue JSON::ParserError
-      end.flatten
+      end.compact
     end
   end
 end
diff --git a/app/models/type_de_champ.rb b/app/models/type_de_champ.rb
index 16bfb5cbf..c52c2ab08 100644
--- a/app/models/type_de_champ.rb
+++ b/app/models/type_de_champ.rb
@@ -128,6 +128,7 @@ class TypeDeChamp < ApplicationRecord
   has_one :procedure, through: :revision
 
   delegate :estimated_fill_duration, :estimated_read_duration, :tags_for_template, :libelle_for_export, to: :dynamic_type
+  delegate :active_revision, to: :procedure, prefix: true
 
   class WithIndifferentAccess
     def self.load(options)
@@ -486,6 +487,12 @@ class TypeDeChamp < ApplicationRecord
     end
   end
 
+  def active_revision_type_de_champ
+    procedure_active_revision.revision_types_de_champ_public.find do |rtc|
+      rtc.type_de_champ_id == id
+    end
+  end
+
   private
 
   DEFAULT_EMPTY = ['']
diff --git a/app/models/types_de_champ/prefill_repetition_type_de_champ.rb b/app/models/types_de_champ/prefill_repetition_type_de_champ.rb
new file mode 100644
index 000000000..01112ec58
--- /dev/null
+++ b/app/models/types_de_champ/prefill_repetition_type_de_champ.rb
@@ -0,0 +1,37 @@
+class TypesDeChamp::PrefillRepetitionTypeDeChamp < TypesDeChamp::PrefillTypeDeChamp
+  include ActionView::Helpers::UrlHelper
+
+  def possible_values
+    prefillable_subchamps.map do |prefill_type_de_champ|
+      if prefill_type_de_champ.too_many_possible_values?
+        link = link_to "Voir toutes les valeurs possibles", Rails.application.routes.url_helpers.prefill_type_de_champ_path("piece-jointe", self)
+        "#{prefill_type_de_champ.libelle}: #{link}"
+      else
+        "#{prefill_type_de_champ.libelle}: #{prefill_type_de_champ.possible_values_sentence}"
+      end
+    end
+  end
+
+  def possible_values_sentence
+    "#{I18n.t("views.prefill_descriptions.edit.possible_values.#{type_champ}_html")}<br>#{possible_values.join("<br>")}".html_safe
+  end
+
+  def example_value
+    [row_values_format, row_values_format].map { |row| row.to_s.gsub("=>", ":") }
+  end
+
+  private
+
+  def row_values_format
+    @row_example_value ||=
+      prefillable_subchamps.map do |prefill_type_de_champ|
+      [prefill_type_de_champ.libelle, prefill_type_de_champ.example_value.to_s]
+    end.to_h
+  end
+
+  def prefillable_subchamps
+    return [] unless active_revision_type_de_champ
+
+    TypesDeChamp::PrefillTypeDeChamp.wrap(active_revision_type_de_champ.revision_types_de_champ.map(&:type_de_champ).filter(&:prefillable?))
+  end
+end
diff --git a/app/models/types_de_champ/prefill_type_de_champ.rb b/app/models/types_de_champ/prefill_type_de_champ.rb
index 296c04c48..6e481cd88 100644
--- a/app/models/types_de_champ/prefill_type_de_champ.rb
+++ b/app/models/types_de_champ/prefill_type_de_champ.rb
@@ -9,6 +9,8 @@ class TypesDeChamp::PrefillTypeDeChamp < SimpleDelegator
       TypesDeChamp::PrefillPaysTypeDeChamp.new(type_de_champ)
     when TypeDeChamp.type_champs.fetch(:regions)
       TypesDeChamp::PrefillRegionTypeDeChamp.new(type_de_champ)
+    when TypeDeChamp.type_champs.fetch(:repetition)
+      TypesDeChamp::PrefillRepetitionTypeDeChamp.new(type_de_champ)
     else
       new(type_de_champ)
     end
@@ -19,7 +21,9 @@ class TypesDeChamp::PrefillTypeDeChamp < SimpleDelegator
   end
 
   def possible_values
-    []
+    return [] unless prefillable?
+
+    [I18n.t("views.prefill_descriptions.edit.possible_values.#{type_champ}_html")]
   end
 
   def example_value
@@ -31,4 +35,12 @@ class TypesDeChamp::PrefillTypeDeChamp < SimpleDelegator
   def too_many_possible_values?
     possible_values.count > POSSIBLE_VALUES_THRESHOLD
   end
+
+  def possible_values_sentence
+    if too_many_possible_values?
+      I18n.t("views.prefill_descriptions.edit.possible_values.#{type_champ}_html").html_safe
+    else
+      possible_values.to_sentence
+    end
+  end
 end
diff --git a/app/views/prefill_descriptions/_types_de_champs.html.haml b/app/views/prefill_descriptions/_types_de_champs.html.haml
index bab61b198..01db2707d 100644
--- a/app/views/prefill_descriptions/_types_de_champs.html.haml
+++ b/app/views/prefill_descriptions/_types_de_champs.html.haml
@@ -39,13 +39,10 @@
                 %th
                   = t("views.prefill_descriptions.edit.possible_values.title")
                 %td
-                  - if I18n.exists?("views.prefill_descriptions.edit.possible_values.#{type_de_champ.type_champ}_html")
-                    = t("views.prefill_descriptions.edit.possible_values.#{type_de_champ.type_champ}_html")
-                    %br
+                  = type_de_champ.possible_values_sentence
+                  %br
                   - if type_de_champ.too_many_possible_values?
                     = link_to "Voir toutes les valeurs possibles", prefill_type_de_champ_path(prefill_description.path, type_de_champ)
-                  - else
-                    = type_de_champ.possible_values.to_sentence
               %tr{ class: prefillable ? "" : "fr-text-mention--grey" }
                 %th
                   = t("views.prefill_descriptions.edit.examples.title")
diff --git a/config/locales/en.yml b/config/locales/en.yml
index 916baa59f..6b70d5d3c 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -128,6 +128,7 @@ en:
           date_html: ISO8601 date
           datetime_html: ISO8601 datetime
           drop_down_list_other_html: Any value
+          repetition_html: A array of hashes with possible values for each field of the repetition.
         examples:
           title: Example
           text: Short text
diff --git a/config/locales/fr.yml b/config/locales/fr.yml
index 70e562cc2..e69c9df4c 100644
--- a/config/locales/fr.yml
+++ b/config/locales/fr.yml
@@ -119,6 +119,7 @@ fr:
           datetime_html: Datetime au format ISO8601
           date_html: Date au format ISO8601
           drop_down_list_other_html: Toute valeur
+          repetition_html: Un array de hash avec les valeurs possibles pour chaque champ de la répétition.
         examples:
           title: Exemple
           text: Texte court

From f91cc05d953f8a738b3034f72569ec070338d3ba Mon Sep 17 00:00:00 2001
From: Damien Le Thiec <damien.lethiec@gmail.com>
Date: Tue, 31 Jan 2023 16:24:32 +0100
Subject: [PATCH 003/202] Small fix link to prefill type de champ

---
 app/controllers/api/public/v1/dossiers_controller.rb          | 1 -
 app/controllers/prefill_type_de_champs_controller.rb          | 2 +-
 app/models/prefill_params.rb                                  | 3 ---
 app/models/types_de_champ/prefill_repetition_type_de_champ.rb | 2 +-
 4 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/app/controllers/api/public/v1/dossiers_controller.rb b/app/controllers/api/public/v1/dossiers_controller.rb
index 051bc9aac..2e770d6ce 100644
--- a/app/controllers/api/public/v1/dossiers_controller.rb
+++ b/app/controllers/api/public/v1/dossiers_controller.rb
@@ -2,7 +2,6 @@ class API::Public::V1::DossiersController < API::Public::V1::BaseController
   before_action :retrieve_procedure
 
   def create
-    byebug
     dossier = Dossier.new(
       revision: @procedure.active_revision,
       groupe_instructeur: @procedure.defaut_groupe_instructeur_for_new_dossier,
diff --git a/app/controllers/prefill_type_de_champs_controller.rb b/app/controllers/prefill_type_de_champs_controller.rb
index 22f5f1a54..82817f324 100644
--- a/app/controllers/prefill_type_de_champs_controller.rb
+++ b/app/controllers/prefill_type_de_champs_controller.rb
@@ -12,6 +12,6 @@ class PrefillTypeDeChampsController < ApplicationController
   end
 
   def set_prefill_type_de_champ
-    @type_de_champ = TypesDeChamp::PrefillTypeDeChamp.build(@procedure.active_revision.types_de_champ_public.fillable.find(params[:id]))
+    @type_de_champ = TypesDeChamp::PrefillTypeDeChamp.build(@procedure.active_revision.types_de_champ.fillable.find(params[:id]))
   end
 end
diff --git a/app/models/prefill_params.rb b/app/models/prefill_params.rb
index 177aef1b4..6f16c1e2e 100644
--- a/app/models/prefill_params.rb
+++ b/app/models/prefill_params.rb
@@ -11,9 +11,6 @@ class PrefillParams
   private
 
   def build_prefill_values
-    byebug
-    # nop : "[{\"txt\":\"Texte court\", \"nb\":\"3.14\", \"Test dropdown\":\"Premier choix\", \"régio\":\"53\"}, {\"txt\":\"Texte court\", \"nb\":\"3.14\", \"Test dropdown\":\"Premier choix\", \"régio\":\"53\"}]"
-    # {"champ_Q2hhbXAtNDI="=>["{\"txt\":\"abc\", \"nb\":\"1,12\"}", "{\"txt\":\"def\", \"nb\":\"2,12\"}"]}
     value_by_stable_id = @params
       .map { |prefixed_typed_id, value| [stable_id_from_typed_id(prefixed_typed_id), value] }
       .filter { |stable_id, value| stable_id.present? && value.present? }
diff --git a/app/models/types_de_champ/prefill_repetition_type_de_champ.rb b/app/models/types_de_champ/prefill_repetition_type_de_champ.rb
index 01112ec58..cdf435f6e 100644
--- a/app/models/types_de_champ/prefill_repetition_type_de_champ.rb
+++ b/app/models/types_de_champ/prefill_repetition_type_de_champ.rb
@@ -4,7 +4,7 @@ class TypesDeChamp::PrefillRepetitionTypeDeChamp < TypesDeChamp::PrefillTypeDeCh
   def possible_values
     prefillable_subchamps.map do |prefill_type_de_champ|
       if prefill_type_de_champ.too_many_possible_values?
-        link = link_to "Voir toutes les valeurs possibles", Rails.application.routes.url_helpers.prefill_type_de_champ_path("piece-jointe", self)
+        link = link_to "Voir toutes les valeurs possibles", Rails.application.routes.url_helpers.prefill_type_de_champ_path("piece-jointe", prefill_type_de_champ)
         "#{prefill_type_de_champ.libelle}: #{link}"
       else
         "#{prefill_type_de_champ.libelle}: #{prefill_type_de_champ.possible_values_sentence}"

From d7b01255fe8054c2cdc08bbdc0b743e790173612 Mon Sep 17 00:00:00 2001
From: Damien Le Thiec <damien.lethiec@gmail.com>
Date: Tue, 31 Jan 2023 16:39:00 +0100
Subject: [PATCH 004/202] Merge branch 'main' into feature/prefill_repetible

---
 Gemfile.lock                                  |   2 +-
 app/assets/stylesheets/auth.scss              |   1 -
 app/assets/stylesheets/contact.scss           |   8 +
 app/assets/stylesheets/forms.scss             |   6 +
 app/assets/stylesheets/instructeur.scss       |   4 +
 app/assets/stylesheets/new_footer.scss        |   6 +
 app/assets/stylesheets/procedure_context.scss |  11 +-
 .../export_component.html.haml                |  40 ++--
 app/components/dropdown/menu_component.rb     |  50 +++++
 .../menu_component/menu_component.html.haml   |  15 ++
 .../drop_down_other_input_component.html.haml |   4 +-
 .../attestation_templates_controller.rb       |   1 +
 app/controllers/experts/avis_controller.rb    |   2 +-
 .../instructeurs/dossiers_controller.rb       |   2 +-
 app/controllers/users/dossiers_controller.rb  |   6 +-
 app/javascript/components/shared/hooks.ts     |   7 +-
 .../controllers/application_controller.ts     |   5 +-
 .../controllers/autosave_controller.ts        |   9 +-
 .../controllers/champ_dropdown_controller.ts  |   1 +
 .../controllers/menu_button_controller.ts     |  61 ++---
 app/lib/active_storage/downloadable_file.rb   |   6 +-
 app/models/avis.rb                            |   1 +
 app/models/champ.rb                           |   4 +-
 app/models/champs/date_champ.rb               |  14 +-
 app/models/concerns/dossier_rebase_concern.rb |  48 ++--
 app/models/dossier.rb                         |   2 +-
 app/models/dossier_transfer.rb                |   3 +
 app/models/procedure_presentation.rb          |   7 +-
 app/models/type_de_champ.rb                   |   2 +-
 app/services/pieces_justificatives_service.rb |  12 +-
 app/services/procedure_archive_service.rb     |   2 +-
 app/services/procedure_export_service.rb      |   2 +-
 .../procedures/_procedures_list.html.haml     |  69 +++---
 app/views/experts/avis/_header.html.haml      |  10 +-
 .../dossiers/_header_actions.html.haml        |  42 ++--
 .../dossiers/_state_button.html.haml          | 211 ++++++++----------
 .../procedures/_dossier_actions.html.haml     |  55 ++---
 .../_dossiers_filter_dropdown.html.haml       |   8 +-
 .../instructeurs/procedures/show.html.haml    |   7 +-
 app/views/invites/_dropdown.html.haml         |   7 +-
 .../layouts/_search_dossiers_form.html.haml   |  10 +-
 .../layouts/commencer/_no_procedure.html.haml |  17 +-
 .../layouts/mailers/_service_footer.html.haml |   3 -
 .../_types_de_champs.html.haml                |   2 +-
 app/views/recherche/index.html.haml           |  28 +--
 .../help/_help_dropdown_dossier.html.haml     |  25 ++-
 .../help/_help_dropdown_instructeur.html.haml |  13 +-
 .../help/_help_dropdown_procedure.html.haml   |  15 +-
 .../help/dropdown_items/_email_item.html.haml |   4 +-
 .../help/dropdown_items/_faq_item.html.haml   |  16 +-
 .../dropdown_items/_messagerie_item.html.haml |  11 +-
 .../dropdown_items/_service_item.html.haml    |  29 ++-
 app/views/support/index.html.haml             |   7 +-
 app/views/users/_procedure_footer.html.haml   |   7 +-
 .../users/dossiers/_dossier_actions.html.haml |  82 +++----
 .../dossiers/_identity_dropdown.html.haml     |   6 +-
 app/views/users/dossiers/demande.html.haml    |   2 +-
 .../users/dossiers/show/_header.html.haml     |   2 +-
 .../dossiers/show/_print_dossier.html.haml    |   7 +-
 .../users/dossiers/update.turbo_stream.haml   |   2 +-
 config/locales/en.yml                         |   6 +-
 config/locales/fr.yml                         |   6 +-
 config/locales/views/support/en.yml           |  28 +--
 config/locales/views/support/fr.yml           |  32 ++-
 .../20230126145329_add_reminded_at_to_avis.rb |   5 +
 db/schema.rb                                  |   3 +-
 lib/tasks/benchmarks.rake                     |  23 +-
 ...6_fix_dossier_transfer_with_uppercase.rake |  20 ++
 .../instructeurs/dossiers_controller_spec.rb  |   4 +
 .../users/transfers_controller_spec.rb        |   5 +
 .../active_storage/downloadable_file_spec.rb  |   2 +-
 spec/models/champs/date_champ_spec.rb         |   8 +-
 .../concern/tags_substitution_concern_spec.rb |   9 +-
 spec/models/dossier_rebase_concern_spec.rb    |   9 +-
 spec/models/dossier_spec.rb                   |  53 +++++
 spec/models/procedure_presentation_spec.rb    |  11 +
 spec/models/procedure_revision_spec.rb        |  17 ++
 .../pieces_justificatives_service_spec.rb     |  17 +-
 .../administrateurs/procedure_cloning_spec.rb |   2 +-
 spec/system/experts/expert_spec.rb            |   1 -
 spec/system/users/dropdown_spec.rb            |  15 ++
 .../dossiers/show/_header.html.haml_spec.rb   |  10 +-
 82 files changed, 764 insertions(+), 563 deletions(-)
 create mode 100644 app/components/dropdown/menu_component.rb
 create mode 100644 app/components/dropdown/menu_component/menu_component.html.haml
 create mode 100644 db/migrate/20230126145329_add_reminded_at_to_avis.rb
 create mode 100644 lib/tasks/deployment/20230131132616_fix_dossier_transfer_with_uppercase.rake

diff --git a/Gemfile.lock b/Gemfile.lock
index 557559d7f..2463d2b2a 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -635,7 +635,7 @@ GEM
       nokogiri (>= 1.6.2)
       rexml
       xmlenc (>= 0.7.1)
-    sanitize (6.0.0)
+    sanitize (6.0.1)
       crass (~> 1.0.2)
       nokogiri (>= 1.12.0)
     sanitize-url (0.1.4)
diff --git a/app/assets/stylesheets/auth.scss b/app/assets/stylesheets/auth.scss
index 57a11d5f2..a7f8f4e4b 100644
--- a/app/assets/stylesheets/auth.scss
+++ b/app/assets/stylesheets/auth.scss
@@ -11,7 +11,6 @@
   // The procedure description can still be read from the /commencer
   // pages.
   @media (max-width: $two-columns-breakpoint) {
-    .procedure-preview,
     .agent-intro {
       display: none;
     }
diff --git a/app/assets/stylesheets/contact.scss b/app/assets/stylesheets/contact.scss
index 3e6cd4496..0da338204 100644
--- a/app/assets/stylesheets/contact.scss
+++ b/app/assets/stylesheets/contact.scss
@@ -9,6 +9,14 @@ $contact-padding: $default-space * 2;
     padding-bottom: $contact-padding;
   }
 
+  .recommandations {
+    p {
+      font-size: 1.5rem;
+      font-weight: bold;
+      line-height: 1.5rem;
+    }
+  }
+
   ul {
     margin-bottom: $default-space;
   }
diff --git a/app/assets/stylesheets/forms.scss b/app/assets/stylesheets/forms.scss
index 0a0cb8154..b73872b55 100644
--- a/app/assets/stylesheets/forms.scss
+++ b/app/assets/stylesheets/forms.scss
@@ -163,6 +163,12 @@
     }
   }
 
+  .drop_down_other { // scss-lint:disable SelectorFormat
+    label {
+      font-weight: normal;
+    }
+  }
+
   input[type=text],
   input[type=email],
   input[type=password],
diff --git a/app/assets/stylesheets/instructeur.scss b/app/assets/stylesheets/instructeur.scss
index e1737651e..9227d5063 100644
--- a/app/assets/stylesheets/instructeur.scss
+++ b/app/assets/stylesheets/instructeur.scss
@@ -44,6 +44,10 @@
   position: relative;
 }
 
+.dropdown-export .dropdown-content {
+  width: 450px;
+}
+
 .print-menu {
   display: none;
   position: absolute;
diff --git a/app/assets/stylesheets/new_footer.scss b/app/assets/stylesheets/new_footer.scss
index 53c69617f..68cfeffba 100644
--- a/app/assets/stylesheets/new_footer.scss
+++ b/app/assets/stylesheets/new_footer.scss
@@ -18,3 +18,9 @@
     width: 9rem;
   }
 }
+
+.fr-footer__top-link p {
+  margin-bottom: 0;
+  font-size: 0.75rem;
+  line-height: 1.25rem;
+}
diff --git a/app/assets/stylesheets/procedure_context.scss b/app/assets/stylesheets/procedure_context.scss
index e734c5a31..ee5a96010 100644
--- a/app/assets/stylesheets/procedure_context.scss
+++ b/app/assets/stylesheets/procedure_context.scss
@@ -17,7 +17,8 @@ $procedure-description-line-height: 22px;
   }
 
   .simple {
-    font-size: 24px;
+    margin-bottom: 0.2rem;
+    font-size: 1.5rem;
     color: $blue-france-500;
     font-weight: bold;
   }
@@ -143,6 +144,14 @@ $procedure-description-line-height: 22px;
   }
 }
 
+.no-procedure-presentation {
+  margin-bottom: 1.6rem;
+
+  p {
+    margin: 0;
+  }
+}
+
 .procedure-context-content {
   @media (max-width: $procedure-context-breakpoint) {
     input[type=submit] {
diff --git a/app/components/dossiers/export_component/export_component.html.haml b/app/components/dossiers/export_component/export_component.html.haml
index 3e986e433..12bc03cd7 100644
--- a/app/components/dossiers/export_component/export_component.html.haml
+++ b/app/components/dossiers/export_component/export_component.html.haml
@@ -1,21 +1,21 @@
-%span.dropdown{ data: { controller: 'menu-button' } }
-  %button.fr-btn.fr-btn--sm.dropdown-button{ data: { menu_button_target: 'button' }, class: @class_btn.present? ? @class_btn : 'fr-btn--secondary' }
-    - if @count.nil?
-      = t(".download_all")
+= render Dropdown::MenuComponent.new(wrapper: :span, button_options: { class: ['fr-btn--sm', @class_btn.present? ? @class_btn : 'fr-btn--secondary']}, menu_options: { id: @count.nil? ? "download_menu" : "download_all_menu", class: ['dropdown-export'] }) do |menu|
+  - menu.with_button_inner_html do
+    = @count.nil? ? t(".download_all") : t(".download", count: @count)
+  - exports.each do |item|
+    - export = item[:export]
+
+    - if export.nil?
+      - menu.with_item do
+        = link_to download_export_path(export_format: item[:format]), role: 'menuitem', data: { turbo_method: :post, turbo: true } do
+          = t(".everything_#{item[:format]}_html")
+    - elsif export.available?
+      - menu.with_item do
+        %div
+          = link_to ready_link_label(export), export.file.service_url, target: "_blank", rel: "noopener", role: 'menuitem'
+          - if export.old?
+            = button_to download_export_path(export_format: export.format, force_export: true), refresh_button_options(export).merge(role: 'menuitem') do
+              .icon.retry
     - else
-      = t(".download", count: @count)
-  .dropdown-content.fade-in-down{ style: 'width: 450px', data: { menu_button_target: 'menu' }, id: @count.nil? ? "download_menu" : "download_all_menu" }
-    %ul.dropdown-items{ 'data-turbo': 'true' }
-      - exports.each do |item|
-        - export = item[:export]
-        %li
-          - if export.nil?
-            = link_to t(".everything_#{item[:format]}_html"), download_export_path(export_format: item[:format]), data: { turbo_method: :post }
-          - elsif export.available?
-            = link_to ready_link_label(export), export.file.service_url, target: "_blank", rel: "noopener"
-            - if export.old?
-              = button_to download_export_path(export_format: export.format, force_export: true), **refresh_button_options(export) do
-                .icon.retry
-          - else
-            %span{ data: poll_controller_options(export) }
-              = pending_label(export)
+      - menu.with_item(aria: {disabled:"true"}, class: 'selected') do
+        %span{ data: poll_controller_options(export) }
+          = pending_label(export)
diff --git a/app/components/dropdown/menu_component.rb b/app/components/dropdown/menu_component.rb
new file mode 100644
index 000000000..72457abc1
--- /dev/null
+++ b/app/components/dropdown/menu_component.rb
@@ -0,0 +1,50 @@
+class Dropdown::MenuComponent < ApplicationComponent
+  renders_one :button_inner_html
+  # beware, items elements like button_to/link_to must include role: 'menuitem' for aria reason
+  renders_many :items, -> (options = {}, &block) do
+    tag.li(**options.merge(role: 'none'), &block)
+  end
+  renders_many :forms
+
+  def initialize(wrapper:,
+    wrapper_options: {},
+    button_options: {},
+    menu_options: {})
+    @wrapper = wrapper
+    @wrapper_options = wrapper_options
+    @button_options = button_options
+    @menu_options = menu_options
+  end
+
+  def wrapper_options
+    @wrapper_options.deep_merge({
+      class: wrapper_class_names,
+      data: { controller: 'menu-button' }
+    })
+  end
+
+  def wrapper_class_names
+    ['dropdown'] + Array(@wrapper_options[:class])
+  end
+
+  def button_id
+    "#{menu_id}_button"
+  end
+
+  def menu_id
+    @menu_options[:id] ||= SecureRandom.uuid
+    @menu_options[:id]
+  end
+
+  def menu_role
+    forms? ? :region : :menu
+  end
+
+  def menu_class_names
+    ['dropdown-content'] + Array(@menu_options[:class])
+  end
+
+  def button_class_names
+    ['fr-btn', 'dropdown-button'] + Array(@button_options[:class])
+  end
+end
diff --git a/app/components/dropdown/menu_component/menu_component.html.haml b/app/components/dropdown/menu_component/menu_component.html.haml
new file mode 100644
index 000000000..a1f3859ed
--- /dev/null
+++ b/app/components/dropdown/menu_component/menu_component.html.haml
@@ -0,0 +1,15 @@
+= content_tag(@wrapper, wrapper_options) do
+  %button{ class: button_class_names, id: button_id, data: { menu_button_target: 'button' }, "aria-expanded": "false", 'aria-haspopup': 'true', 'aria-controls': menu_id }
+    = button_inner_html
+
+  %div{ data: { menu_button_target: 'menu' }, id: menu_id, 'aria-labelledby': button_id, role: menu_role, 'tab-index': -1, class: menu_class_names }
+
+    -# the dropdown can be a menu with a list of item
+    - if items?
+      %ul.dropdown-items.fr-pl-0{ role: 'none' }
+        - items.each do |dropdown_item|
+          = dropdown_item
+    -# the dropdown can be a menu with forms
+    - if forms?
+      - forms.each do |form|
+        = form
diff --git a/app/components/editable_champ/drop_down_other_input_component/drop_down_other_input_component.html.haml b/app/components/editable_champ/drop_down_other_input_component/drop_down_other_input_component.html.haml
index e41e1a435..168c008dc 100644
--- a/app/components/editable_champ/drop_down_other_input_component/drop_down_other_input_component.html.haml
+++ b/app/components/editable_champ/drop_down_other_input_component/drop_down_other_input_component.html.haml
@@ -1,4 +1,4 @@
 .drop_down_other{ class: @champ.other_value_present? ? '' : 'hidden' }
   .notice
-    %p Veuillez saisir votre autre choix
-  = @form.text_field :value_other, maxlength: 200, size: nil, disabled: !@champ.other_value_present?
+    %label{ for: dom_id(@champ, :value_other) } Veuillez saisir votre autre choix
+  = @form.text_field :value_other, maxlength: 200, size: nil, id: dom_id(@champ, :value_other), disabled: !@champ.other_value_present?
diff --git a/app/controllers/administrateurs/attestation_templates_controller.rb b/app/controllers/administrateurs/attestation_templates_controller.rb
index a71c64bed..3308eb36d 100644
--- a/app/controllers/administrateurs/attestation_templates_controller.rb
+++ b/app/controllers/administrateurs/attestation_templates_controller.rb
@@ -8,6 +8,7 @@ module Administrateurs
 
     def edit
       @attestation_template = build_attestation_template
+      @attestation_template.validate
     end
 
     def update
diff --git a/app/controllers/experts/avis_controller.rb b/app/controllers/experts/avis_controller.rb
index 4971fc676..2801c3343 100644
--- a/app/controllers/experts/avis_controller.rb
+++ b/app/controllers/experts/avis_controller.rb
@@ -140,7 +140,7 @@ module Experts
     end
 
     def telecharger_pjs
-      files = ActiveStorage::DownloadableFile.create_list_from_dossiers(Dossier.where(id: @dossier.id), true)
+      files = ActiveStorage::DownloadableFile.create_list_from_dossiers(Dossier.where(id: @dossier.id))
       cleaned_files = ActiveStorage::DownloadableFile.cleanup_list_from_dossier(files)
 
       zipline(cleaned_files, "dossier-#{@dossier.id}.zip")
diff --git a/app/controllers/instructeurs/dossiers_controller.rb b/app/controllers/instructeurs/dossiers_controller.rb
index db2f996f3..09bf7222b 100644
--- a/app/controllers/instructeurs/dossiers_controller.rb
+++ b/app/controllers/instructeurs/dossiers_controller.rb
@@ -235,7 +235,7 @@ module Instructeurs
     end
 
     def telecharger_pjs
-      files = ActiveStorage::DownloadableFile.create_list_from_dossiers(Dossier.where(id: dossier.id), true)
+      files = ActiveStorage::DownloadableFile.create_list_from_dossiers(Dossier.where(id: dossier.id), with_champs_private: true, include_infos_administration: true)
       cleaned_files = ActiveStorage::DownloadableFile.cleanup_list_from_dossier(files)
 
       zipline(cleaned_files, "dossier-#{dossier.id}.zip")
diff --git a/app/controllers/users/dossiers_controller.rb b/app/controllers/users/dossiers_controller.rb
index c1e5ed2ed..4e2791be8 100644
--- a/app/controllers/users/dossiers_controller.rb
+++ b/app/controllers/users/dossiers_controller.rb
@@ -26,11 +26,7 @@ module Users
       @dossiers_invites = current_user.dossiers_invites.merge(dossiers_visibles)
       @dossiers_supprimes_recemment = current_user.dossiers.hidden_by_user.merge(dossiers)
       @dossiers_supprimes_definitivement = current_user.deleted_dossiers.order_by_updated_at.page(page)
-      @dossier_transfers = DossierTransfer
-        .includes(dossiers: :user)
-        .with_dossiers
-        .where(email: current_user.email)
-        .page(page)
+      @dossier_transfers = DossierTransfer.for_email(current_user.email).page(page)
       @statut = statut(@user_dossiers, @dossiers_traites, @dossiers_invites, @dossiers_supprimes_recemment, @dossiers_supprimes_definitivement, @dossier_transfers, @dossiers_close_to_expiration, params[:statut])
     end
 
diff --git a/app/javascript/components/shared/hooks.ts b/app/javascript/components/shared/hooks.ts
index dd000143f..4bbf579d0 100644
--- a/app/javascript/components/shared/hooks.ts
+++ b/app/javascript/components/shared/hooks.ts
@@ -17,8 +17,11 @@ export function useDeferredSubmit(input?: HTMLInputElement): {
         runCallback();
 
         if (
-          !Array.from(form.elements).some((e) =>
-            e.hasAttribute('data-direct-upload-url')
+          !Array.from(form.elements).some(
+            (e) =>
+              e.hasAttribute('data-direct-upload-url') &&
+              'value' in e &&
+              e.value != ''
           )
         ) {
           form.submit();
diff --git a/app/javascript/controllers/application_controller.ts b/app/javascript/controllers/application_controller.ts
index 4070dbb03..ada9f6a78 100644
--- a/app/javascript/controllers/application_controller.ts
+++ b/app/javascript/controllers/application_controller.ts
@@ -65,7 +65,10 @@ export class ApplicationController extends Controller {
         FOCUS_EVENTS.includes(targetOrEventName)
       );
     } else {
-      invariant(eventNameOrHandler == 'string', 'event name is required');
+      invariant(
+        typeof eventNameOrHandler == 'string',
+        'event name is required'
+      );
       invariant(handler, 'handler is required');
       this.onTarget(targetOrEventName, eventNameOrHandler, handler);
     }
diff --git a/app/javascript/controllers/autosave_controller.ts b/app/javascript/controllers/autosave_controller.ts
index a71efd9fc..6f4389af6 100644
--- a/app/javascript/controllers/autosave_controller.ts
+++ b/app/javascript/controllers/autosave_controller.ts
@@ -89,9 +89,12 @@ export class AutosaveController extends ApplicationController {
         isCheckboxOrRadioInputElement(target) ||
         (!this.saveOnInput && isTextInputElement(target))
       ) {
-        this.enqueueAutosaveRequest();
-
-        this.showConditionnalSpinner(target);
+        // Wait next tick so champs having JS can interact
+        // with form elements before extracting form data.
+        setTimeout(() => {
+          this.enqueueAutosaveRequest();
+          this.showConditionnalSpinner(target);
+        }, 0);
       }
     }
   }
diff --git a/app/javascript/controllers/champ_dropdown_controller.ts b/app/javascript/controllers/champ_dropdown_controller.ts
index 1615439df..b9dbfe1e4 100644
--- a/app/javascript/controllers/champ_dropdown_controller.ts
+++ b/app/javascript/controllers/champ_dropdown_controller.ts
@@ -34,6 +34,7 @@ export class ChampDropdownController extends ApplicationController {
         if (target.value == '__other__') {
           show(inputGroup);
           input.disabled = false;
+          input.focus();
         } else {
           hide(inputGroup);
           input.disabled = true;
diff --git a/app/javascript/controllers/menu_button_controller.ts b/app/javascript/controllers/menu_button_controller.ts
index f1a31e02d..208252260 100644
--- a/app/javascript/controllers/menu_button_controller.ts
+++ b/app/javascript/controllers/menu_button_controller.ts
@@ -6,53 +6,26 @@ export class MenuButtonController extends ApplicationController {
   declare readonly buttonTarget: HTMLButtonElement;
   declare readonly menuTarget: HTMLElement;
 
-  #teardown?: () => void;
-
   connect() {
     this.setup();
   }
 
-  disconnect(): void {
-    this.#teardown?.();
-  }
-
   private get isOpen() {
     return (this.element as HTMLElement).classList.contains('open');
   }
 
   private get isMenu() {
-    return !(this.element as HTMLElement).dataset.popover;
+    return this.menuTarget.getAttribute('role') == 'menu';
   }
 
   private setup() {
-    this.buttonTarget.setAttribute(
-      'aria-haspopup',
-      this.isMenu ? 'menu' : 'true'
-    );
-    this.buttonTarget.setAttribute('aria-controls', this.menuTarget.id);
-    if (!this.buttonTarget.id) {
-      this.buttonTarget.id = `${this.menuTarget.id}_button`;
-    }
-
-    this.menuTarget.setAttribute('aria-labelledby', this.buttonTarget.id);
-    this.menuTarget.setAttribute('role', this.isMenu ? 'menu' : 'region');
+    // see:
+    // To progressively enhance this navigation widget that is by default accessible,
+    // the class to hide the menu and the inclusion of tabindex="-1" on the interactive menuitem
+    // content should be added with JavaScript on load.
     this.menuTarget.classList.add('fade-in-down');
-    this.menuTarget.setAttribute('tab-index', '-1');
-
     if (this.isMenu) {
-      for (const menuItem of this.menuTarget.querySelectorAll('a')) {
-        menuItem.setAttribute('role', 'menuitem');
-      }
-      for (const dropdownItems of this.menuTarget.querySelectorAll(
-        '.dropdown-items'
-      )) {
-        dropdownItems.setAttribute('role', 'none');
-      }
-      for (const dropdownItems of this.menuTarget.querySelectorAll(
-        '.dropdown-items > li'
-      )) {
-        dropdownItems.setAttribute('role', 'none');
-      }
+      this.menuItems.map((menuItem) => menuItem.setAttribute('tabindex', '-1'));
     }
 
     this.on('click', (event) => {
@@ -78,6 +51,14 @@ export class MenuButtonController extends ApplicationController {
         this.onMenuKeydown(event);
       }
     });
+
+    this.on(document.body, 'click', (event) => {
+      const target = event.target as HTMLElement;
+      if (this.isOpen && this.isClickOutside(target)) {
+        this.menuTarget.classList.remove('fade-in-down');
+        this.close();
+      }
+    });
   }
 
   private open(focusMenuItem: 'first' | 'last' = 'first') {
@@ -85,30 +66,18 @@ export class MenuButtonController extends ApplicationController {
     this.menuTarget.parentElement?.classList.add('open');
     this.menuTarget.focus();
 
-    const onClickBody = (event: Event) => {
-      const target = event.target as HTMLElement;
-      if (this.isClickOutside(target)) {
-        this.menuTarget.classList.remove('fade-in-down');
-        this.close();
-      }
-    };
     requestAnimationFrame(() => {
       if (focusMenuItem == 'first') {
         this.setFocusToFirstMenuitem();
       } else {
         this.setFocusToLastMenuitem();
       }
-      document.body.addEventListener('click', onClickBody);
     });
-
-    this.#teardown = () =>
-      document.body.removeEventListener('click', onClickBody);
   }
 
   private close() {
-    this.buttonTarget.removeAttribute('aria-expanded');
+    this.buttonTarget.setAttribute('aria-expanded', 'false');
     this.menuTarget.parentElement?.classList.remove('open');
-    this.#teardown?.();
     this.setFocusToMenuitem(null);
   }
 
diff --git a/app/lib/active_storage/downloadable_file.rb b/app/lib/active_storage/downloadable_file.rb
index 4f84c7940..09713dadb 100644
--- a/app/lib/active_storage/downloadable_file.rb
+++ b/app/lib/active_storage/downloadable_file.rb
@@ -1,7 +1,7 @@
 class ActiveStorage::DownloadableFile
-  def self.create_list_from_dossiers(dossiers, for_expert = false)
-    PiecesJustificativesService.generate_dossier_export(dossiers, include_infos_administration: !for_expert) +
-      PiecesJustificativesService.liste_documents(dossiers, for_expert)
+  def self.create_list_from_dossiers(dossiers, with_bills: false, with_champs_private: false, include_infos_administration: false)
+    PiecesJustificativesService.generate_dossier_export(dossiers, include_infos_administration:) +
+      PiecesJustificativesService.liste_documents(dossiers, with_bills:, with_champs_private:)
   end
 
   def self.cleanup_list_from_dossier(files)
diff --git a/app/models/avis.rb b/app/models/avis.rb
index 15d49d894..334625fe7 100644
--- a/app/models/avis.rb
+++ b/app/models/avis.rb
@@ -8,6 +8,7 @@
 #  confidentiel         :boolean          default(FALSE), not null
 #  email                :string
 #  introduction         :text
+#  reminded_at          :datetime
 #  revoked_at           :datetime
 #  created_at           :datetime         not null
 #  updated_at           :datetime         not null
diff --git a/app/models/champ.rb b/app/models/champ.rb
index b53e0e710..06a7d365f 100644
--- a/app/models/champ.rb
+++ b/app/models/champ.rb
@@ -226,7 +226,7 @@ class Champ < ApplicationRecord
   private
 
   def html_id
-    "#{stable_id}-#{id}"
+    "champ-#{stable_id}-#{id}"
   end
 
   def needs_dossier_id?
@@ -238,7 +238,7 @@ class Champ < ApplicationRecord
   end
 
   def cleanup_if_empty
-    if external_id_changed?
+    if persisted? && external_id_changed?
       self.data = nil
     end
   end
diff --git a/app/models/champs/date_champ.rb b/app/models/champs/date_champ.rb
index b7ce24a46..a462a242d 100644
--- a/app/models/champs/date_champ.rb
+++ b/app/models/champs/date_champ.rb
@@ -39,7 +39,7 @@ class Champs::DateChamp < Champ
   private
 
   def convert_to_iso8601
-    return if valid_iso8601?
+    return if likely_iso8601_format? && parsable_iso8601?
 
     self.value = if /^\d{2}\/\d{2}\/\d{4}$/.match?(value)
       Date.parse(value).iso8601
@@ -49,12 +49,20 @@ class Champs::DateChamp < Champ
   end
 
   def iso_8601
-    return if valid_iso8601? || value.blank?
+    return if parsable_iso8601? || value.blank?
     # i18n-tasks-use t('errors.messages.not_a_date')
     errors.add :date, errors.generate_message(:value, :not_a_date)
   end
 
-  def valid_iso8601?
+  def likely_iso8601_format?
     /^\d{4}-\d{2}-\d{2}$/.match?(value)
   end
+
+  def parsable_iso8601?
+    Date.parse(value)
+    true
+  rescue ArgumentError, # case 2023-27-02, out of range
+         TypeError # nil
+    false
+  end
 end
diff --git a/app/models/concerns/dossier_rebase_concern.rb b/app/models/concerns/dossier_rebase_concern.rb
index 5e2f5be67..54f1445fa 100644
--- a/app/models/concerns/dossier_rebase_concern.rb
+++ b/app/models/concerns/dossier_rebase_concern.rb
@@ -54,32 +54,32 @@ module DossierRebaseConcern
       .group_by(&:op)
       .tap { _1.default = [] }
 
+    champs_by_stable_id = champs
+      .joins(:type_de_champ)
+      .group_by(&:stable_id)
+      .transform_values { Champ.where(id: _1) }
+
     # add champ
     changes_by_op[:add]
-      .map(&:stable_id)
-      .map { target_coordinates_by_stable_id[_1] }
-      .each { add_new_champs_for_revision(_1) }
+      .each { add_new_champs_for_revision(target_coordinates_by_stable_id[_1.stable_id]) }
 
     # remove champ
     changes_by_op[:remove]
-      .each { delete_champs_for_revision(_1.stable_id) }
+      .each { champs_by_stable_id[_1.stable_id].destroy_all }
 
     if brouillon?
       changes_by_op[:update]
-        .map { |change| [change, champs.joins(:type_de_champ).where(type_de_champ: { stable_id: change.stable_id })] }
-        .each { |change, champs| apply(change, champs) }
+        .each { apply(_1, champs_by_stable_id[_1.stable_id]) }
     end
 
     # due to repetition tdc clone on update or erase
     # we must reassign tdc to the latest version
-    Champ
-      .includes(:type_de_champ)
-      .where(dossier: self)
-      .map { [_1, target_coordinates_by_stable_id[_1.stable_id].type_de_champ] }
-      .each { |champ, target_tdc| champ.update_columns(type_de_champ_id: target_tdc.id, rebased_at: Time.zone.now) }
+    champs_by_stable_id
+      .filter_map { |stable_id, champs| [target_coordinates_by_stable_id[stable_id].type_de_champ_id, champs] if champs.present? }
+      .each { |type_de_champ_id, champs| champs.update_all(type_de_champ_id:) }
 
     # update dossier revision
-    self.update_column(:revision_id, target_revision.id)
+    update_column(:revision_id, target_revision.id)
   end
 
   def apply(change, champs)
@@ -92,18 +92,27 @@ module DossierRebaseConcern
         value: nil,
         value_json: nil,
         external_id: nil,
-        data: nil)
+        data: nil,
+        rebased_at: Time.zone.now)
     when :drop_down_options
       # we are removing options, we need to remove the value if it contains one of the removed options
       removed_options = change.from - change.to
       if removed_options.present? && champs.any? { _1.in?(removed_options) }
-        champs.filter { _1.in?(removed_options) }.each { _1.remove_option(removed_options) }
+        champs.filter { _1.in?(removed_options) }.each do
+          _1.remove_option(removed_options)
+          _1.update_column(:rebased_at, Time.zone.now)
+        end
       end
     when :carte_layers
       # if we are removing cadastres layer, we need to remove cadastre geo areas
       if change.from.include?(:cadastres) && !change.to.include?(:cadastres)
-        champs.each { _1.cadastres.each(&:destroy) }
+        champs.filter { _1.cadastres.present? }.each do
+          _1.cadastres.each(&:destroy)
+          _1.update_column(:rebased_at, Time.zone.now)
+        end
       end
+    else
+      champs.update_all(rebased_at: Time.zone.now)
     end
   end
 
@@ -126,20 +135,13 @@ module DossierRebaseConcern
   end
 
   def create_champ(target_coordinate, parent, row_id: nil)
-    params = { revision: target_coordinate.revision, row_id: }.compact
+    params = { revision: target_coordinate.revision, rebased_at: Time.zone.now, row_id: }.compact
     champ = target_coordinate
       .type_de_champ
       .build_champ(params)
     parent.champs << champ
   end
 
-  def delete_champs_for_revision(stable_id)
-    champs
-      .joins(:type_de_champ)
-      .where(types_de_champ: { stable_id: })
-      .destroy_all
-  end
-
   def purge_piece_justificative_file(champ)
     ActiveStorage::Attachment.where(id: champ.piece_justificative_file.ids).delete_all
   end
diff --git a/app/models/dossier.rb b/app/models/dossier.rb
index 9ba6b74c0..6964e1a8a 100644
--- a/app/models/dossier.rb
+++ b/app/models/dossier.rb
@@ -1184,7 +1184,7 @@ class Dossier < ApplicationRecord
   end
 
   def geo_data?
-    geo_areas.present?
+    GeoArea.exists?(champ_id: champs_public.ids + champs_private.ids)
   end
 
   def to_feature_collection
diff --git a/app/models/dossier_transfer.rb b/app/models/dossier_transfer.rb
index 8fbf6ec1d..15c77d845 100644
--- a/app/models/dossier_transfer.rb
+++ b/app/models/dossier_transfer.rb
@@ -8,15 +8,18 @@
 #  updated_at :datetime         not null
 #
 class DossierTransfer < ApplicationRecord
+  include EmailSanitizableConcern
   has_many :dossiers, dependent: :nullify
 
   EXPIRATION_LIMIT = 2.weeks
 
   validates :email, format: { with: Devise.email_regexp }
+  before_validation -> { sanitize_email(:email) }
 
   scope :pending, -> { where('created_at > ?', (Time.zone.now - EXPIRATION_LIMIT)) }
   scope :stale, -> { where('created_at < ?', (Time.zone.now - EXPIRATION_LIMIT)) }
   scope :with_dossiers, -> { joins(:dossiers).merge(Dossier.visible_by_user) }
+  scope :for_email, -> (email) { includes(dossiers: :user).with_dossiers.where(email: email) }
 
   after_create_commit :send_notification
 
diff --git a/app/models/procedure_presentation.rb b/app/models/procedure_presentation.rb
index f6dd14071..4f536db34 100644
--- a/app/models/procedure_presentation.rb
+++ b/app/models/procedure_presentation.rb
@@ -330,8 +330,11 @@ class ProcedurePresentation < ApplicationRecord
     if field['scope'].present?
       I18n.t(field['scope']).map(&:to_a).map(&:reverse)
     elsif field['table'] == 'groupe_instructeur'
-      instructeur.groupe_instructeurs
-        .map { [_1.label, _1.id] }
+      instructeur.groupe_instructeurs.filter_map do
+        if _1.procedure_id == procedure.id
+          [_1.label, _1.id]
+        end
+      end
     end
   end
 
diff --git a/app/models/type_de_champ.rb b/app/models/type_de_champ.rb
index c52c2ab08..098a7e8c0 100644
--- a/app/models/type_de_champ.rb
+++ b/app/models/type_de_champ.rb
@@ -243,7 +243,7 @@ class TypeDeChamp < ApplicationRecord
   end
 
   def only_present_on_draft?
-    revisions.size == 1
+    revisions.one? && revisions.first.draft?
   end
 
   def drop_down_other?
diff --git a/app/services/pieces_justificatives_service.rb b/app/services/pieces_justificatives_service.rb
index f7bb33861..1b18ea4ca 100644
--- a/app/services/pieces_justificatives_service.rb
+++ b/app/services/pieces_justificatives_service.rb
@@ -1,13 +1,13 @@
 class PiecesJustificativesService
-  def self.liste_documents(dossiers, for_expert)
+  def self.liste_documents(dossiers, with_bills:, with_champs_private:)
     bill_ids = []
 
     docs = dossiers.in_batches.flat_map do |batch|
-      pjs = pjs_for_champs(batch, for_expert) +
+      pjs = pjs_for_champs(batch, with_champs_private:) +
         pjs_for_commentaires(batch) +
         pjs_for_dossier(batch)
 
-      if !for_expert
+      if with_bills
         # some bills are shared among operations
         # so first, all the bill_ids are fetched
         operation_logs, some_bill_ids = operation_logs_and_signature_ids(batch)
@@ -19,7 +19,7 @@ class PiecesJustificativesService
       pjs
     end
 
-    if !for_expert
+    if with_bills
       # then the bills are retrieved without duplication
       docs += signatures(bill_ids.uniq)
     end
@@ -117,12 +117,12 @@ class PiecesJustificativesService
 
   private
 
-  def self.pjs_for_champs(dossiers, for_expert = false)
+  def self.pjs_for_champs(dossiers, with_champs_private:)
     champs = Champ
       .joins(:piece_justificative_file_attachments)
       .where(type: "Champs::PieceJustificativeChamp", dossier: dossiers)
 
-    if for_expert
+    if !with_champs_private
       champs = champs.where(private: false)
     end
 
diff --git a/app/services/procedure_archive_service.rb b/app/services/procedure_archive_service.rb
index 594801961..db87c0785 100644
--- a/app/services/procedure_archive_service.rb
+++ b/app/services/procedure_archive_service.rb
@@ -15,7 +15,7 @@ class ProcedureArchiveService
       dossiers.processed_in_month(archive.month)
     end
 
-    attachments = ActiveStorage::DownloadableFile.create_list_from_dossiers(dossiers)
+    attachments = ActiveStorage::DownloadableFile.create_list_from_dossiers(dossiers, with_bills: true, with_champs_private: true)
 
     DownloadableFileService.download_and_zip(@procedure, attachments, zip_root_folder(archive)) do |zip_filepath|
       ArchiveUploader.new(procedure: @procedure, filename: archive.filename(@procedure), filepath: zip_filepath)
diff --git a/app/services/procedure_export_service.rb b/app/services/procedure_export_service.rb
index def935f06..ee24e574c 100644
--- a/app/services/procedure_export_service.rb
+++ b/app/services/procedure_export_service.rb
@@ -35,7 +35,7 @@ class ProcedureExportService
   end
 
   def to_zip
-    attachments = ActiveStorage::DownloadableFile.create_list_from_dossiers(dossiers, true)
+    attachments = ActiveStorage::DownloadableFile.create_list_from_dossiers(dossiers, with_champs_private: true)
 
     DownloadableFileService.download_and_zip(procedure, attachments, base_filename) do |zip_filepath|
       ArchiveUploader.new(procedure: procedure, filename: filename(:zip), filepath: zip_filepath).blob
diff --git a/app/views/administrateurs/procedures/_procedures_list.html.haml b/app/views/administrateurs/procedures/_procedures_list.html.haml
index b58e0e573..3cbec375e 100644
--- a/app/views/administrateurs/procedures/_procedures_list.html.haml
+++ b/app/views/administrateurs/procedures/_procedures_list.html.haml
@@ -41,42 +41,43 @@
           %li
             = link_to admin_procedure_path(procedure), class: 'fr-btn fr-icon-draft-line fr-btn--tertiary' do
               Modifier
-        %li.dropdown{ data: { controller: 'menu-button' } }
-          %button.fr-btn.fr-btn--tertiary.dropdown-button.procedures-actions-btn{ data: { menu_button_target: 'button' } }
+
+        = render Dropdown::MenuComponent.new(wrapper: :li, button_options: { class: ['fr-btn--tertiary'] }, menu_options: { id: dom_id(procedure, :actions_menu)}) do |menu|
+          - menu.with_button_inner_html do
             Actions
-          .dropdown-content.fade-in-down{ data: { menu_button_target: 'menu' }, id: dom_id(procedure, :actions_menu) }
-            %ul.dropdown-items.pl-0
-              - if !procedure.close? && !procedure.discarded?
-                %li
-                  = link_to sanitize_url(procedure.brouillon? ? commencer_test_url(path: procedure.path) : commencer_url(path: procedure.path)), target: :blank, rel: :noopener do
-                    %span.icon.in-progress
-                    .dropdown-description
-                      %h4= t('administrateurs.dropdown_actions.to_test')
 
-              - unless procedure.discarded?
-                %li
-                  = link_to admin_procedure_clone_path(procedure.id), class: 'clone-btn', data: { method: :put } do
-                    %span.icon.new-folder
-                    .dropdown-description
-                      %h4= t('administrateurs.dropdown_actions.to_clone')
+          - if !procedure.close? && !procedure.discarded?
+            - menu.with_item do
+              = link_to(sanitize_url(procedure.brouillon? ? commencer_test_url(path: procedure.path) : commencer_url(path: procedure.path)), target: :blank, rel: :noopener, role: 'menuitem') do
+                %span.icon.in-progress
+                .dropdown-description
+                  %h4= t('administrateurs.dropdown_actions.to_test')
 
-              - if procedure.publiee?
-                %li
-                  = link_to admin_procedure_close_path(procedure_id: procedure.id) do
-                    %span.icon.archive
-                    .dropdown-description
-                      %h4= t('administrateurs.dropdown_actions.to_close')
+          - if !procedure.discarded?
+            - menu.with_item do
+              = link_to(admin_procedure_clone_path(procedure.id), role: 'menuitem', class: 'clone-btn', data: { method: :put }) do
+                %span.icon.new-folder
+                .dropdown-description
+                  %h4= t('administrateurs.dropdown_actions.to_clone')
 
-              - if procedure.can_be_deleted_by_administrateur? && !procedure.discarded?
-                %li
-                  = link_to admin_procedure_path(procedure), method: :delete, data: { confirm:  "Voulez-vous vraiment supprimer la démarche ? \nToute suppression est définitive et s'appliquera aux éventuels autres administrateurs de cette démarche !" } do
-                    %span.icon.refuse
-                    .dropdown-description
-                      %h4= t('administrateurs.dropdown_actions.delete')
+          - if procedure.publiee?
+            - menu.with_item do
+              = link_to(admin_procedure_close_path(procedure_id: procedure.id), role: 'menuitem') do
+                %span.icon.archive
+                .dropdown-description
+                  %h4= t('administrateurs.dropdown_actions.to_close')
+
+          - if procedure.can_be_deleted_by_administrateur? && !procedure.discarded?
+            - menu.with_item do
+              = link_to admin_procedure_path(procedure), role: 'menuitem', method: :delete, data: { confirm: "Voulez-vous vraiment supprimer la démarche ? \nToute suppression est définitive et s'appliquera aux éventuels autres administrateurs de cette démarche !" } do
+                %span.icon.refuse
+                .dropdown-description
+                  %h4= t('administrateurs.dropdown_actions.delete')
+
+          - if procedure.discarded?
+            - menu.with_item do
+              = link_to  restore_admin_procedure_path(procedure), role: 'menuitem',  method: :put do
+                %span.icon.unarchive
+                .dropdown-description
+                  %h4= t('administrateurs.dropdown_actions.restore')
 
-              - if procedure.discarded?
-                %li
-                  = link_to restore_admin_procedure_path(procedure), method: :put do
-                    %span.icon.unarchive
-                    .dropdown-description
-                      %h4= t('administrateurs.dropdown_actions.restore')
diff --git a/app/views/experts/avis/_header.html.haml b/app/views/experts/avis/_header.html.haml
index 1fe7ea5e0..24312fd9f 100644
--- a/app/views/experts/avis/_header.html.haml
+++ b/app/views/experts/avis/_header.html.haml
@@ -9,11 +9,11 @@
         %li= link_to("Dossier nº #{dossier.id}", expert_avis_path(avis.procedure, avis))
 
       .header-actions
-        %span.dropdown.print-menu-opener{ data: { controller: 'menu-button' } }
-          %button.button.dropdown-button.icon-only{ data: { menu_button_target: 'button' } }
-            %span.icon.attached
-          %ul.print-menu.dropdown-content#print-pj-menu{ data: { menu_button_target: 'menu' } }
-            %li= link_to "Télécharger le dossier et toutes ses pièces jointes", telecharger_pjs_expert_avis_path(avis.procedure, avis), target: "_blank", rel: "noopener", class: "menu-item menu-link"
+        .fr-download
+          = link_to telecharger_pjs_expert_avis_path(avis.procedure, avis), download: :download, class: "menu-item menu-link fr-download__link" do
+            Télécharger le dossier et toutes ses pièces jointes
+            %span.fr-download__detail
+              ZIP
 
     %nav.tabs
       %ul
diff --git a/app/views/instructeurs/dossiers/_header_actions.html.haml b/app/views/instructeurs/dossiers/_header_actions.html.haml
index 9a03b37ce..9cdba1d83 100644
--- a/app/views/instructeurs/dossiers/_header_actions.html.haml
+++ b/app/views/instructeurs/dossiers/_header_actions.html.haml
@@ -1,21 +1,31 @@
 %ul.fr-btns-group.fr-btns-group--sm.fr-btns-group--inline-md.fr-btns-group--icon-right
-  %li.dropdown.print-menu-opener{ data: { controller: 'menu-button' } }
-    %button.fr-btn.fr-btn--tertiary.fr-icon-printer-line.dropdown-button{ title: 'imprimer', 'aria-label': 'Imprimer', data: { menu_button_target: 'button' } } Imprimer
-    %ul#print-menu.print-menu.dropdown-content{ data: { menu_button_target: 'menu' } }
-      %li
-        = link_to "Tout le dossier", print_instructeur_dossier_path(dossier.procedure, dossier), target: "_blank", rel: "noopener", class: "menu-item menu-link"
-      %li
-        = link_to "Uniquement cet onglet", "#", onclick: "window.print()", class: "menu-item menu-link"
-      %li
-        = link_to "Export PDF", instructeur_dossier_path(dossier.procedure, dossier, format: :pdf), target: "_blank", rel: "noopener", class: "menu-item menu-link"
-      - if dossier.geo_data?
-        %li
-          = link_to "Export GeoJSON", geo_data_instructeur_dossier_path(dossier.procedure, dossier), target: "_blank", rel: "noopener", class: "menu-item menu-link"
+  = render Dropdown::MenuComponent.new(wrapper: :li, menu_options: { id: 'print-menu'}, button_options: { class: ['fr-btn--tertiary', 'fr-icon-printer-line']}) do |menu|
+    - menu.with_button_inner_html do
+      Imprimer
 
-  %li.dropdown.print-menu-opener{ data: { controller: 'menu-button' } }
-    %button.fr-btn.fr-btn--tertiary.fr-icon-download-line.dropdown-button{ data: { menu_button_target: 'button', 'aria-label': 'Télécharger' } } Télécharger
-    %ul#print-pj-menu.print-menu.dropdown-content{ data: { menu_button_target: 'menu' } }
-      %li= link_to "Télécharger le dossier et toutes ses pièces jointes", telecharger_pjs_instructeur_dossier_path(dossier.procedure, dossier), target: "_blank", rel: "noopener", class: "menu-item menu-link"
+    - menu.with_item do
+      = link_to print_instructeur_dossier_path(dossier.procedure, dossier), role: 'menuitem', target: "_blank", rel: "noopener", class: "menu-item menu-link" do
+        Tout le dossier
+
+    - menu.with_item do
+      = link_to '#', role: 'menuitem', onclick: "window.print()", class: "menu-item menu-link" do
+        Uniquement cet onglet
+
+    - menu.with_item do
+      = link_to instructeur_dossier_path(dossier.procedure, dossier, format: :pdf), target: "_blank", rel: "noopener", class: "menu-item menu-link", role: 'menuitem' do
+        Export PDF
+
+    - if dossier.geo_data?
+      - menu.with_item do
+        = link_to  geo_data_instructeur_dossier_path(dossier.procedure, dossier), target: "_blank", rel: "noopener", class: "menu-item menu-link", role: 'menuitem' do
+          Export GeoJSON
+
+  = render Dropdown::MenuComponent.new(wrapper: :li, menu_options: { id: 'print-pj-menu'}, button_options: { class: ['fr-btn--tertiary', 'fr-icon-download-line']}) do |menu|
+    - menu.with_button_inner_html do
+      Télécharger
+    - menu.with_item do
+      = link_to telecharger_pjs_instructeur_dossier_path(dossier.procedure, dossier), target: "_blank", rel: "noopener", class: "menu-item menu-link", role: 'menuitem'  do
+        Télécharger le dossier et toutes ses pièces jointes
 
   %li
     = render partial: "instructeurs/procedures/dossier_actions",
diff --git a/app/views/instructeurs/dossiers/_state_button.html.haml b/app/views/instructeurs/dossiers/_state_button.html.haml
index 296edd63b..c8a2e172e 100644
--- a/app/views/instructeurs/dossiers/_state_button.html.haml
+++ b/app/views/instructeurs/dossiers/_state_button.html.haml
@@ -1,120 +1,107 @@
-.dropdown{ data: { controller: 'menu-button', popover: 'true', turbo_force: true } }
-  -# Dropdown button title
-  %button.fr-btn.dropdown-button{ class: button_or_label_class(dossier), data: { menu_button_target: 'button' } }
-    = dossier_display_state dossier
+= render Dropdown::MenuComponent.new(wrapper: :div, wrapper_options: { data: {'turbo-force': true} }, button_options: { class: [button_or_label_class(dossier)] }) do |menu|
+  - menu.with_button_inner_html do
+    = dossier_display_state(dossier)
 
-  -# Dropdown content
-  #state-menu.dropdown-content.fade-in-down{ data: { menu_button_target: 'menu' } }
+  - if dossier.en_construction?
+    - menu.with_item(aria: {disabled:"true"}, class: 'selected') do
+      %span.icon.edit
+      .dropdown-description
+        %h4 En construction
+        Vous permettez à l'usager de modifier ses réponses au formulaire
 
-    - if dossier.en_construction?
-      -# ------------------------------------------------------
-      -# EN CONSTRUCTION
-      -# ------------------------------------------------------
-      %ul.dropdown-items
+    - menu.with_item('data-turbo': 'true') do
+      = link_to(passer_en_instruction_instructeur_dossier_path(dossier.procedure, dossier), data: { turbo_method: :post, turbo_confirm: "Confirmez-vous le passage en instruction de ce dossier ?", turbo: true }, role: 'menuitem') do
+        %span.icon.in-progress
+        .dropdown-description
+          %h4 Passer en instruction
+          L’usager ne pourra plus modifier le formulaire
 
-        %li.selected
-          %span.icon.edit
+  - elsif dossier.en_instruction?
+    - menu.with_item('data-turbo': 'true') do
+      = link_to(repasser_en_construction_instructeur_dossier_path(dossier.procedure, dossier), data: { turbo_method: :post, turbo_confirm: "Confirmez-vous le passage en construction de ce dossier ?"}, role: 'menuitem') do
+        %span.icon.edit
+        .dropdown-description
+          %h4 Repasser en construction
+          Vous permettrez à l'usager de modifier ses réponses au formulaire
+
+    - menu.with_item(aria: {disabled:"true"}, class: 'selected') do
+      %span.icon.in-progress
+      .dropdown-description
+        %h4 En instruction
+        L’usager ne peut modifier son dossier pendant l'instruction
+
+    - menu.with_item do
+      = link_to('#', onclick: "DS.showMotivation(event, 'accept');", role: 'menuitem') do
+        %span.icon.accept
+        .dropdown-description
+          %h4 Accepter
+          L’usager sera notifié que son dossier a été accepté
+
+
+    - menu.with_item do
+      = link_to('#', onclick: "DS.showMotivation(event, 'without-continuation');", role: 'menuitem') do
+        %span.icon.without-continuation
+        .dropdown-description
+          %h4 Classer sans suite
+          L’usager sera notifié que son dossier a été classé sans suite
+
+
+    - menu.with_item do
+      = link_to('#', onclick: "DS.showMotivation(event, 'refuse');", role: 'menuitem') do
+        %span.icon.refuse
+        .dropdown-description
+          %h4 Refuser
+          L’usager sera notifié que son dossier a été refusé
+
+    - menu.with_form do
+      = render partial: 'instructeurs/dossiers/state_button_motivation', locals: { dossier: dossier, popup_title: 'Accepter le dossier', placeholder: 'Expliquez au demandeur pourquoi ce dossier est accepté (facultatif)', popup_class: 'accept', process_action: 'accepter', title: 'Accepter', confirm: "Confirmez-vous l'acceptation ce dossier ?" }
+
+    - menu.with_form do
+      = render partial: 'instructeurs/dossiers/state_button_motivation', locals: { dossier: dossier, popup_title: 'Classer le dossier sans suite', placeholder: 'Expliquez au demandeur pourquoi ce dossier est classé sans suite (obligatoire)', popup_class: 'without-continuation', process_action: 'classer_sans_suite', title: 'Classer sans suite', confirm: 'Confirmez-vous le classement sans suite de ce dossier ?' }
+
+    - menu.with_form do
+      = render partial: 'instructeurs/dossiers/state_button_motivation', locals: { dossier: dossier, popup_title: 'Refuser le dossier', placeholder: 'Expliquez au demandeur pourquoi ce dossier est refusé (obligatoire)', popup_class: 'refuse', process_action: 'refuser', title: 'Refuser', confirm: 'Confirmez-vous le refus de ce dossier ?' }
+
+  - elsif dossier.termine?
+    - if dossier.motivation.present?
+      - menu.with_item(class: 'inactive') do
+        %span.icon.info
+        .dropdown-description
+          %h4 Motivation
+          %p « #{dossier.motivation} »
+
+    - if dossier.justificatif_motivation.attached?
+      - menu.with_item(class: 'inactive') do
+        %span.icon.justificatif
+        .dropdown-description
+          %h4 Justificatif
+          %p Ce justificatif joint par l’instructeur a été envoyé au demandeur.
+          = render partial: 'users/dossiers/show/download_justificatif', locals: { dossier: dossier }
+
+    - if dossier.attestation.present?
+      - menu.with_item do
+        = link_to(attestation_instructeur_dossier_path(dossier.procedure, dossier), target: '_blank', rel: 'noopener', role: 'menuitem') do
+          %span.icon.preview
           .dropdown-description
-            %h4 En construction
-            Vous permettez à l'usager de modifier ses réponses au formulaire
+            %h4 Voir l’attestation
+            %p Cette attestation a été envoyée automatiquement au demandeur.
 
-        %li{ 'data-turbo': 'true' }
-          = link_to passer_en_instruction_instructeur_dossier_path(dossier.procedure, dossier), data: { turbo_method: :post, turbo_confirm: "Confirmez-vous le passage en instruction de ce dossier ?" } do
-            %span.icon.in-progress
-            .dropdown-description
-              %h4 Passer en instruction
-              L’usager ne pourra plus modifier le formulaire
-
-    - elsif dossier.en_instruction?
-      -# ------------------------------------------------------
-      -# EN INSTRUCTION
-      -# ------------------------------------------------------
-      %ul.dropdown-items
-
-        %li{ 'data-turbo': 'true' }
-          = link_to repasser_en_construction_instructeur_dossier_path(dossier.procedure, dossier), data: { turbo_method: :post, turbo_confirm: "Confirmez-vous le passage en construction de ce dossier ?" } do
-            %span.icon.edit
-            .dropdown-description
-              %h4 Repasser en construction
-              Vous permettrez à l'usager de modifier ses réponses au formulaire
-
-        %li.selected
+    - if dossier.can_repasser_en_instruction?
+      - menu.with_item do
+        = link_to(repasser_en_instruction_instructeur_dossier_path(dossier.procedure, dossier), data: { turbo_method: :post, turbo_confirm: "Voulez vous remettre le dossier #{dossier.id} en instruction ?", turbo: true }, role: 'menuitem') do
           %span.icon.in-progress
           .dropdown-description
-            %h4 En instruction
-            L’usager ne peut modifier son dossier pendant l'instruction
+            %h4 Repasser en instruction
+            L’usager sera notifié que son dossier est réexaminé.
+    - elsif dossier.user_deleted?
+      - menu.with_item do
+        %span.icon.info
+        .dropdown-description
+          %h4 En attente d’archivage
+          L’usager a supprimé son compte. Vous pouvez archiver puis supprimer le dossier.
 
-        %li
-          %a{ href: '#', onclick: "DS.showMotivation(event, 'accept');" }
-            %span.icon.accept
-            .dropdown-description
-              %h4 Accepter
-              L’usager sera notifié que son dossier a été accepté
-
-        %li
-          %a{ href: '#', onclick: "DS.showMotivation(event, 'without-continuation');" }
-            %span.icon.without-continuation
-            .dropdown-description
-              %h4 Classer sans suite
-              L’usager sera notifié que son dossier a été classé sans suite
-
-        %li
-          %a{ href: '#', onclick: "DS.showMotivation(event, 'refuse');" }
-            %span.icon.refuse
-            .dropdown-description
-              %h4 Refuser
-              L’usager sera notifié que son dossier a été refusé
-
-        = render partial: 'instructeurs/dossiers/state_button_motivation', locals: { dossier: dossier, popup_title: 'Accepter le dossier', placeholder: 'Expliquez au demandeur pourquoi ce dossier est accepté (facultatif)', popup_class: 'accept', process_action: 'accepter', title: 'Accepter', confirm: "Confirmez-vous l'acceptation ce dossier ?" }
-
-        = render partial: 'instructeurs/dossiers/state_button_motivation', locals: { dossier: dossier, popup_title: 'Classer le dossier sans suite', placeholder: 'Expliquez au demandeur pourquoi ce dossier est classé sans suite (obligatoire)', popup_class: 'without-continuation', process_action: 'classer_sans_suite', title: 'Classer sans suite', confirm: 'Confirmez-vous le classement sans suite de ce dossier ?' }
-
-        = render partial: 'instructeurs/dossiers/state_button_motivation', locals: { dossier: dossier, popup_title: 'Refuser le dossier', placeholder: 'Expliquez au demandeur pourquoi ce dossier est refusé (obligatoire)', popup_class: 'refuse', process_action: 'refuser', title: 'Refuser', confirm: 'Confirmez-vous le refus de ce dossier ?' }
-
-    - elsif dossier.termine?
-      -# ---------------------------------------------------
-      -# TERMINÉ
-      -# ---------------------------------------------------
-      %ul.dropdown-items
-        - if dossier.motivation.present?
-          %li.inactive
-            %span.icon.info
-            .dropdown-description
-              %h4 Motivation
-              %p « #{dossier.motivation} »
-
-        - if dossier.justificatif_motivation.attached?
-          %li.inactive
-            %span.icon.justificatif
-            .dropdown-description
-              %h4 Justificatif
-              %p Ce justificatif joint par l’instructeur a été envoyé au demandeur.
-              = render partial: 'users/dossiers/show/download_justificatif', locals: { dossier: dossier }
-
-        - if dossier.attestation.present?
-          %li
-            = link_to attestation_instructeur_dossier_path(dossier.procedure, dossier), target: '_blank', rel: 'noopener' do
-              %span.icon.preview
-              .dropdown-description
-                %h4 Voir l’attestation
-                %p Cette attestation a été envoyée automatiquement au demandeur.
-
-        - if dossier.can_repasser_en_instruction?
-          %li{ 'data-turbo': 'true' }
-            = link_to repasser_en_instruction_instructeur_dossier_path(dossier.procedure, dossier), data: { turbo_method: :post, turbo_confirm: "Voulez vous remettre le dossier #{dossier.id} en instruction ?" } do
-              %span.icon.in-progress
-              .dropdown-description
-                %h4 Repasser en instruction
-                L’usager sera notifié que son dossier est réexaminé.
-        - elsif dossier.user_deleted?
-          %li
-            %span.icon.info
-            .dropdown-description
-              %h4 En attente d’archivage
-              L’usager a supprimé son compte. Vous pouvez archiver puis supprimer le dossier.
-
-        %li
-          = link_to instructeur_dossier_path(dossier.procedure, dossier), method: :delete do
-            %span.icon.delete
-            .dropdown-description
-              %h4 Supprimer le dossier
+    - menu.with_item do
+      = link_to(instructeur_dossier_path(dossier.procedure, dossier), method: :delete, role: 'menuitem') do
+        %span.icon.delete
+        .dropdown-description
+          %h4 Supprimer le dossier
diff --git a/app/views/instructeurs/procedures/_dossier_actions.html.haml b/app/views/instructeurs/procedures/_dossier_actions.html.haml
index 582af3ab6..3c9bf64d4 100644
--- a/app/views/instructeurs/procedures/_dossier_actions.html.haml
+++ b/app/views/instructeurs/procedures/_dossier_actions.html.haml
@@ -2,33 +2,36 @@
   = link_to restore_instructeur_dossier_path(procedure_id, dossier_id), method: :patch, class: "fr-btn fr-btn--secondary" do
     = t('views.instructeurs.dossiers.restore')
 - elsif close_to_expiration || Dossier::TERMINE.include?(state)
-  %li.dropdown.user-dossier-actions{ data: { controller: 'menu-button' } }
-    %button.fr-btn.fr-mb-0.dropdown-button{ data: { menu_button_target: 'button' } }
+  = render Dropdown::MenuComponent.new(wrapper: :li, button_options: { class: ['fr-mb-0']}, menu_options: { id: "dossier_#{dossier_id}_actions_menu", class: 'user-dossier-actions' }) do |menu|
+    - menu.with_button_inner_html do
       Actions
-    .dropdown-content.fade-in-down{ data: { menu_button_target: 'menu' }, id: "dossier_#{dossier_id}_actions_menu" }
-      %ul.dropdown-items
-        - if close_to_expiration
-          %li
-            = link_to repousser_expiration_instructeur_dossier_path(procedure_id, dossier_id), method: :post do
-              %span.icon.standby
-              %span.dropdown-description= t('instructeurs.dossiers.header.banner.button_delay_expiration')
-        - if archived
-          %li
-            = link_to unarchive_instructeur_dossier_path(procedure_id, dossier_id), method: :patch do
-              %span.icon.unarchive
-              %span.dropdown-description
-                Désarchiver le dossier
-        - else
-          %li
-            = link_to archive_instructeur_dossier_path(procedure_id, dossier_id), method: :patch do
-              %span.icon.archive
-              %span.dropdown-description
-                Archiver le dossier
-          %li.danger
-            = link_to instructeur_dossier_path(procedure_id, dossier_id), method: :delete do
-              %span.icon.delete
-              %span.dropdown-description
-                = t('views.instructeurs.dossiers.delete_dossier')
+
+    - if close_to_expiration
+      - menu.with_item do
+        = link_to(repousser_expiration_instructeur_dossier_path(procedure_id, dossier_id), method: :post, role: 'menuitem') do
+          %span.icon.standby
+          %span.dropdown-description= t('instructeurs.dossiers.header.banner.button_delay_expiration')
+
+    - if archived
+      - menu.with_item do
+        = link_to( unarchive_instructeur_dossier_path(procedure_id, dossier_id), role: 'menuitem', method: :patch) do
+          %span.icon.unarchive
+          %span.dropdown-description
+            Désarchiver le dossier
+
+    - else
+      - menu.with_item do
+        = link_to(  archive_instructeur_dossier_path(procedure_id, dossier_id), method: :patch, role: 'menuitem') do
+          %span.icon.archive
+          %span.dropdown-description
+            Archiver le dossier
+
+      - menu.with_item(class: 'danger') do
+        = link_to(instructeur_dossier_path(procedure_id, dossier_id), method: :delete, role: 'menuitem') do
+          %span.icon.delete
+          %span.dropdown-description
+            = t('views.instructeurs.dossiers.delete_dossier')
+
 
 - elsif Dossier::EN_CONSTRUCTION_OU_INSTRUCTION.include?(state)
   - if dossier_is_followed
diff --git a/app/views/instructeurs/procedures/_dossiers_filter_dropdown.html.haml b/app/views/instructeurs/procedures/_dossiers_filter_dropdown.html.haml
index 896b2d0ed..7106f0d58 100644
--- a/app/views/instructeurs/procedures/_dossiers_filter_dropdown.html.haml
+++ b/app/views/instructeurs/procedures/_dossiers_filter_dropdown.html.haml
@@ -1,5 +1,7 @@
-%span.dropdown{ data: { controller: 'menu-button', popover: 'true' } }
-  %button.fr-btn.fr-btn--tertiary.fr-btn--sm.fr-mr-2w.dropdown-button{ data: { menu_button_target: 'button' } }
+= render Dropdown::MenuComponent.new(wrapper: :div, button_options: { class: ['fr-btn--secondary', 'fr-btn--sm', 'fr-mr-1w'] }, menu_options: { id: 'filter-menu', class:['left-aligned'] }) do |menu|
+  - menu.with_button_inner_html do
     = t('views.instructeurs.dossiers.filters.title')
-  #filter-menu.dropdown-content.left-aligned.fade-in-down{ data: { menu_button_target: 'menu' } }
+
+  - menu.with_form do
     = render Dossiers::FilterComponent.new(procedure: procedure, procedure_presentation: @procedure_presentation, statut: statut)
+
diff --git a/app/views/instructeurs/procedures/show.html.haml b/app/views/instructeurs/procedures/show.html.haml
index 07ca9acca..074a6f27e 100644
--- a/app/views/instructeurs/procedures/show.html.haml
+++ b/app/views/instructeurs/procedures/show.html.haml
@@ -62,10 +62,10 @@
         = render Dossiers::NotifiedToggleComponent.new(procedure: @procedure, procedure_presentation: @procedure_presentation)
 
         .fr-ml-auto
-          %span.dropdown{ data: { controller: 'menu-button', popover: 'true' } }
-            %button.fr-btn.fr-btn--sm.fr-btn--tertiary.dropdown-button.fr-ml-1w{ data: { menu_button_target: 'button' } }
+          = render Dropdown::MenuComponent.new(wrapper: :span, button_options: { class: ['fr-btn--sm', 'fr-btn--secondary'] }, menu_options: { id: 'custom-menu' }) do |menu|
+            - menu.with_button_inner_html do
               = t('views.instructeurs.dossiers.personalize')
-            #custom-menu.dropdown-content.fade-in-down{ data: { menu_button_target: 'menu' } }
+            - menu.with_form do
               = form_tag update_displayed_fields_instructeur_procedure_path(@procedure), method: :patch, class: 'dropdown-form large columns-form' do
                 = hidden_field_tag :values, nil
                 = react_component("ComboMultiple",
@@ -120,6 +120,7 @@
 
                 %th.action-col.follow-col
                   Actions
+
               %tr
 
             %tbody
diff --git a/app/views/invites/_dropdown.html.haml b/app/views/invites/_dropdown.html.haml
index 5902deb5d..dad812910 100644
--- a/app/views/invites/_dropdown.html.haml
+++ b/app/views/invites/_dropdown.html.haml
@@ -1,6 +1,6 @@
 - invites = dossier.invites.load
-.dropdown.invite-user-action{ data: { controller: 'menu-button', popover: 'true' } }
-  %button.button.dropdown-button{ data: { menu_button_target: 'button' } }
+= render Dropdown::MenuComponent.new(wrapper: :span, wrapper_options: {class: 'invite-user-action'}, button_options: { class: ['fr-btn--secondary'] }, menu_options: { id: 'invite-content' }) do |menu|
+  - menu.with_button_inner_html do
     %span.icon.person
     - if invites.present?
       = t('views.invites.dropdown.view_invited_people')
@@ -10,6 +10,5 @@
         = t('views.invites.dropdown.invite_to_view')
       - else
         = t('views.invites.dropdown.invite_to_edit')
-
-  #invite-content.dropdown-content.fade-in-down{ data: { menu_button_target: 'menu' } }
+  - menu.with_form do
     = render partial: "invites/form", locals: { dossier: dossier, invites: invites }
diff --git a/app/views/layouts/_search_dossiers_form.html.haml b/app/views/layouts/_search_dossiers_form.html.haml
index 9662e116d..7299098f5 100644
--- a/app/views/layouts/_search_dossiers_form.html.haml
+++ b/app/views/layouts/_search_dossiers_form.html.haml
@@ -1,11 +1,9 @@
 #search-modal.fr-header__search.fr-modal
   .fr-container.fr-container-lg--fluid
     %button.fr-btn--close.fr-btn{ "aria-controls" => "search-modal", :title => t('close_modal', scope: [:layouts, :header]) }= t('close_modal', scope: [:layouts, :header])
-    #search-473.fr-search-bar{ :role => "search" }
-      = form_tag "#{search_endpoint}", method: :get, class: "flex width-100" do
+    #search-473.fr-search-bar
+      = form_tag "#{search_endpoint}", method: :get, :role => "search", class: "flex width-100" do
         = label_tag "q", t('views.users.dossiers.search.search_file'), class: 'fr-label'
-        = text_field_tag "q", "#{@search_terms if @search_terms.present?}", placeholder: t('views.users.dossiers.search.search_file'), aria: { label: t('views.users.dossiers.search.search_file') }, class: "fr-input"
+        = text_field_tag "q", "#{@search_terms if @search_terms.present?}", placeholder: t('views.users.dossiers.search.placeholder'), class: "fr-input"
         %button.fr-btn{ title: t('views.users.dossiers.search.search_file') }
-          = image_tag "icons/search-blue.svg", alt: t('views.users.dossiers.search.search_file'), 'aria-hidden':'true', width: 24, height: 24, loading: 'lazy'
-
-
+          = t('views.users.dossiers.search.search_file')
diff --git a/app/views/layouts/commencer/_no_procedure.html.haml b/app/views/layouts/commencer/_no_procedure.html.haml
index 2580c0243..c1573b002 100644
--- a/app/views/layouts/commencer/_no_procedure.html.haml
+++ b/app/views/layouts/commencer/_no_procedure.html.haml
@@ -1,15 +1,10 @@
 .no-procedure
   = image_tag "landing/hero/dematerialiser.svg", class: "paperless-logo", alt: ""
   .baseline.center
-    %p
-      %span.simple= t('.line1')
-      %br
-      = t('.line2')
-      %br
-      = t('.line3')
+    .no-procedure-presentation
+      %p.simple= t('.line1')
+      %p= t('.line2')
+      %p= t('.line3')
     %hr
-    %p
-      %span.small-simple= t('.are_you_new', app_name: APPLICATION_NAME.gsub("-","&#8209;")).html_safe
-      %br
-      %br
-      = link_to t('views.users.sessions.new.find_procedure'), t("links.common.faq.comment_trouver_ma_demarche_url"), title: new_tab_suffix(t('views.users.sessions.new.find_procedure')), class: "fr-btn fr-btn--secondary", **external_link_attributes
+    %p.small-simple= t('.are_you_new', app_name: APPLICATION_NAME.gsub("-","&#8209;")).html_safe
+    = link_to t('views.users.sessions.new.find_procedure'), t("links.common.faq.comment_trouver_ma_demarche_url"), title: new_tab_suffix(t('views.users.sessions.new.find_procedure')), class: "fr-btn fr-btn--secondary", **external_link_attributes
diff --git a/app/views/layouts/mailers/_service_footer.html.haml b/app/views/layouts/mailers/_service_footer.html.haml
index c5e5a3958..984a7ce9e 100644
--- a/app/views/layouts/mailers/_service_footer.html.haml
+++ b/app/views/layouts/mailers/_service_footer.html.haml
@@ -12,11 +12,8 @@
         %p
           %strong
             = t('.procedure_management')
-          %br
           = service.nom
-          %br
           = service.organisme
-          %br
           = service.adresse
       %td{ width: "50%", valign: "top" }
         %p
diff --git a/app/views/prefill_descriptions/_types_de_champs.html.haml b/app/views/prefill_descriptions/_types_de_champs.html.haml
index 01db2707d..b668fc17d 100644
--- a/app/views/prefill_descriptions/_types_de_champs.html.haml
+++ b/app/views/prefill_descriptions/_types_de_champs.html.haml
@@ -42,7 +42,7 @@
                   = type_de_champ.possible_values_sentence
                   %br
                   - if type_de_champ.too_many_possible_values?
-                    = link_to "Voir toutes les valeurs possibles", prefill_type_de_champ_path(prefill_description.path, type_de_champ)
+                    = link_to t("views.prefill_descriptions.edit.possible_values.link.text"), prefill_type_de_champ_path(prefill_description.path, type_de_champ), title: new_tab_suffix(t("views.prefill_descriptions.edit.possible_values.link.title")), **external_link_attributes
               %tr{ class: prefillable ? "" : "fr-text-mention--grey" }
                 %th
                   = t("views.prefill_descriptions.edit.examples.title")
diff --git a/app/views/recherche/index.html.haml b/app/views/recherche/index.html.haml
index 69cfb52fc..46aa5b6ed 100644
--- a/app/views/recherche/index.html.haml
+++ b/app/views/recherche/index.html.haml
@@ -67,21 +67,21 @@
 
             - if instructeur_dossier && expert_dossier
               %td.action-col.follow-col
-                .dropdown{ data: { controller: 'menu-button' } }
-                  %button.button.dropdown-button{ data: { menu_button_target: 'button' } }
+                = render Dropdown::MenuComponent.new(wrapper: :div, button_options: {class: ['fr-btn--sm']}) do |menu|
+                  - menu.with_button_inner_html do
                     Actions
-                  .dropdown-content{ data: { menu_button_target: 'menu' } }
-                    %ul.dropdown-items
-                      %li
-                        = link_to(instructeur_dossier_path(procedure_id, p.dossier_id)) do
-                          %span.icon.in-progress>
-                          .dropdown-description
-                            Voir le dossier
-                      %li
-                        = link_to(expert_avis_path(procedure_id, @dossier_avis_ids_h[p.dossier_id])) do
-                          %span.icon.in-progress>
-                          .dropdown-description
-                            Donner mon avis
+
+                  - menu.with_item do
+                    = link_to(instructeur_dossier_path(procedure_id, p.dossier_id), role: 'menuitem') do
+                      %span.icon.in-progress>
+                      .dropdown-description
+                        Voir le dossier
+
+                  - menu.with_item do
+                    = link_to(expert_avis_path(procedure_id, @dossier_avis_ids_h[p.dossier_id]), role: 'menuitem') do
+                      %span.icon.in-progress>
+                      .dropdown-description
+                        Donner mon avis
 
             - elsif instructeur_dossier
               - if hidden_by_administration
diff --git a/app/views/shared/help/_help_dropdown_dossier.html.haml b/app/views/shared/help/_help_dropdown_dossier.html.haml
index 51f1460e3..7b58386af 100644
--- a/app/views/shared/help/_help_dropdown_dossier.html.haml
+++ b/app/views/shared/help/_help_dropdown_dossier.html.haml
@@ -1,15 +1,16 @@
-.dropdown.help-dropdown{ data: { controller: 'menu-button' } }
-  %button.fr-btn.dropdown-button{ data: { menu_button_target: 'button' } }
+= render Dropdown::MenuComponent.new(wrapper: :span, wrapper_options: { class: ['help-dropdown']}, menu_options: { id: "help-menu" }) do |menu|
+  - menu.with_button_inner_html do
     = t('help')
-  #help-menu.dropdown-content.fade-in-down{ data: { menu_button_target: 'menu' } }
-    %ul.dropdown-items
-      - title = dossier.brouillon? ? "Besoin d’aide pour remplir votre dossier ?" : "Une question sur votre dossier ?"
+  - title = dossier.brouillon? ? "Besoin d’aide pour remplir votre dossier ?" : "Une question sur votre dossier ?"
 
-      - if dossier.messagerie_available?
-        = render partial: 'shared/help/dropdown_items/messagerie_item',
-          locals: { dossier: dossier, title: title }
-      - elsif dossier.procedure.service.present?
-        = render partial: 'shared/help/dropdown_items/service_item',
-          locals: { service: dossier.procedure.service, title: title }
+  - if dossier.messagerie_available?
+    - menu.with_item do
+      = render partial: 'shared/help/dropdown_items/messagerie_item', locals: { dossier: dossier, title: title }
 
-      = render partial: 'shared/help/dropdown_items/faq_item'
+  - elsif dossier.procedure.service.present?
+    - menu.with_item do
+      = render partial: 'shared/help/dropdown_items/service_item',
+        locals: { service: dossier.procedure.service, title: title }
+
+  - menu.with_item do
+    = render partial: 'shared/help/dropdown_items/faq_item'
diff --git a/app/views/shared/help/_help_dropdown_instructeur.html.haml b/app/views/shared/help/_help_dropdown_instructeur.html.haml
index d1e8ef299..329b80e50 100644
--- a/app/views/shared/help/_help_dropdown_instructeur.html.haml
+++ b/app/views/shared/help/_help_dropdown_instructeur.html.haml
@@ -1,7 +1,8 @@
-.dropdown.help-dropdown{ data: { controller: 'menu-button' } }
-  %button.fr-btn.dropdown-button{ data: { menu_button_target: 'button' } }
+= render Dropdown::MenuComponent.new(wrapper: :span, wrapper_options: { class: ['help-dropdown']}, menu_options: { id: "help-menu" }) do |menu|
+  - menu.with_button_inner_html do
     = t('help')
-  #help-menu.dropdown-content.fade-in-down{ data: { menu_button_target: 'menu' } }
-    %ul.dropdown-items
-      = render partial: 'shared/help/dropdown_items/faq_item'
-      = render partial: 'shared/help/dropdown_items/email_item'
+
+  - menu.with_item do
+    = render partial: 'shared/help/dropdown_items/faq_item'
+  - menu.with_item do
+    = render partial: 'shared/help/dropdown_items/email_item'
diff --git a/app/views/shared/help/_help_dropdown_procedure.html.haml b/app/views/shared/help/_help_dropdown_procedure.html.haml
index b3781d6eb..80b939161 100644
--- a/app/views/shared/help/_help_dropdown_procedure.html.haml
+++ b/app/views/shared/help/_help_dropdown_procedure.html.haml
@@ -1,10 +1,9 @@
-.dropdown.help-dropdown{ data: { controller: 'menu-button' } }
-  %button.fr-btn.dropdown-button{ data: { menu_button_target: 'button' } }
+= render Dropdown::MenuComponent.new(wrapper: :span, wrapper_options: { class: ['help-dropdown']}, menu_options: { id: "help-menu" }) do |menu|
+  - menu.with_button_inner_html do
     = t('help')
-  #help-menu.dropdown-content.fade-in-down{ data: { menu_button_target: 'menu' } }
-    %ul.dropdown-items
-      - if procedure.service.present?
-        = render partial: 'shared/help/dropdown_items/service_item',
-          locals: { service: procedure.service, title: "Une question sur cette démarche ?" }
 
-      = render partial: 'shared/help/dropdown_items/faq_item'
+  - if procedure.service.present?
+    - menu.with_item do
+      = render partial: 'shared/help/dropdown_items/service_item', locals: { service: procedure.service, title: "Une question sur cette démarche ?" }
+  - menu.with_item do
+    = render partial: 'shared/help/dropdown_items/faq_item'
diff --git a/app/views/shared/help/dropdown_items/_email_item.html.haml b/app/views/shared/help/dropdown_items/_email_item.html.haml
index 834fb5924..3eecc2f5e 100644
--- a/app/views/shared/help/dropdown_items/_email_item.html.haml
+++ b/app/views/shared/help/dropdown_items/_email_item.html.haml
@@ -1,5 +1,5 @@
-%li
-  = mail_to CONTACT_EMAIL do
+%li{ role: 'none' }
+  = mail_to CONTACT_EMAIL, role: 'menuitem' do
     %span.icon.mail
     .dropdown-description
       %span.help-dropdown-title
diff --git a/app/views/shared/help/dropdown_items/_faq_item.html.haml b/app/views/shared/help/dropdown_items/_faq_item.html.haml
index 28e52de5d..cea9ceaa4 100644
--- a/app/views/shared/help/dropdown_items/_faq_item.html.haml
+++ b/app/views/shared/help/dropdown_items/_faq_item.html.haml
@@ -1,9 +1,7 @@
-%li
-  = link_to t("links.common.faq.url"), title: new_tab_suffix(t('help_dropdown.general_title')), **external_link_attributes do
-    %span.icon.help
-    .dropdown-description
-      %span.help-dropdown-title
-        = t('help_dropdown.problem_title')
-      %p
-        = t('help_dropdown.problem_description')
-
+= link_to t("links.common.faq.url"), title: new_tab_suffix(t('help_dropdown.general_title')), **external_link_attributes, role: 'menuitem' do
+  %span.icon.help
+  .dropdown-description
+    %span.help-dropdown-title
+      = t('help_dropdown.problem_title')
+    %p
+      = t('help_dropdown.problem_description')
diff --git a/app/views/shared/help/dropdown_items/_messagerie_item.html.haml b/app/views/shared/help/dropdown_items/_messagerie_item.html.haml
index 94d31143d..87244e6af 100644
--- a/app/views/shared/help/dropdown_items/_messagerie_item.html.haml
+++ b/app/views/shared/help/dropdown_items/_messagerie_item.html.haml
@@ -1,6 +1,5 @@
-%li
-  = link_to messagerie_dossier_path(dossier) do
-    %span.icon.mail
-    .dropdown-description
-      %span.help-dropdown-title= title
-      %p Envoyez directement un message à l’instructeur.
+= link_to messagerie_dossier_path(dossier), role: 'menuitem' do
+  %span.icon.mail
+  .dropdown-description
+    %span.help-dropdown-title= title
+    %p Envoyez directement un message à l’instructeur.
diff --git a/app/views/shared/help/dropdown_items/_service_item.html.haml b/app/views/shared/help/dropdown_items/_service_item.html.haml
index 215793ec5..3aae66c04 100644
--- a/app/views/shared/help/dropdown_items/_service_item.html.haml
+++ b/app/views/shared/help/dropdown_items/_service_item.html.haml
@@ -1,15 +1,14 @@
-%li.help-dropdown-service
-  %span.icon.person
-  .dropdown-description
-    %span.help-dropdown-title= title
-    .help-dropdown-service-action
-      %p Contactez directement l’administration :
-      %p.help-dropdown-service-item
-        %span.icon.small.mail
-        = link_to service.email, "mailto:#{service.email}"
-      %p.help-dropdown-service-item
-        %span.icon.small.phone
-        = link_to service.telephone, service.telephone_url
-      %p.help-dropdown-service-item
-        %span.icon.small.clock
-        = service.horaires
+%span.icon.person
+.dropdown-description
+  %span.help-dropdown-title= title
+  .help-dropdown-service-action
+    %p Contactez directement l’administration :
+    %p.help-dropdown-service-item
+      %span.icon.small.mail
+      = link_to service.email, "mailto:#{service.email}", role: 'menuitem'
+    %p.help-dropdown-service-item
+      %span.icon.small.phone
+      = link_to service.telephone, service.telephone_url, role: 'menuitem'
+    %p.help-dropdown-service-item
+      %span.icon.small.clock
+      = service.horaires
diff --git a/app/views/support/index.html.haml b/app/views/support/index.html.haml
index e8d4c950e..261304735 100644
--- a/app/views/support/index.html.haml
+++ b/app/views/support/index.html.haml
@@ -10,8 +10,9 @@
     = form_tag contact_path, method: :post, multipart: true, class: 'fr-form-group', data: {controller: :support } do
 
       .description
-        %h2= t('.intro_html')
-        %br
+        .recommandations
+          %h2
+            = t('.intro_html')
         %p.mandatory-explanation= t('asterisk_html', scope: [:utils])
 
       - if !user_signed_in?
@@ -34,7 +35,7 @@
 
               - if link.present?
                 .support.card.featured.mb-4.ml-4.hidden{ id: "card-#{question_type}", "aria-hidden": true , data: { "support-target": "content" } }
-                  .card-title
+                  %p.card-title
                     = t('.our_answer')
                   .card-content
                     -# i18n-tasks-use t("support.index.#{question_type}.answer_html")
diff --git a/app/views/users/_procedure_footer.html.haml b/app/views/users/_procedure_footer.html.haml
index b12929bb1..cda5f0b6d 100644
--- a/app/views/users/_procedure_footer.html.haml
+++ b/app/views/users/_procedure_footer.html.haml
@@ -15,9 +15,10 @@
               %li
                 - horaires = "#{I18n.t('users.procedure_footer.contact.schedule.prefix')}#{formatted_horaires(service.horaires)}"
                 = link_to service.telephone_url, class: 'fr-footer__top-link' do
-                  = I18n.t('users.procedure_footer.contact.phone.link', service_telephone: service.telephone)
-                  %br
-                  = horaires
+                  %p
+                    = I18n.t('users.procedure_footer.contact.phone.link', service_telephone: service.telephone)
+                  %p
+                    = horaires
               %li
                 = link_to I18n.t('users.procedure_footer.contact.stats.link'), statistiques_path(procedure.path), class: 'fr-footer__top-link', rel: 'noopener'
 
diff --git a/app/views/users/dossiers/_dossier_actions.html.haml b/app/views/users/dossiers/_dossier_actions.html.haml
index 52a89f4f3..4ca3f6118 100644
--- a/app/views/users/dossiers/_dossier_actions.html.haml
+++ b/app/views/users/dossiers/_dossier_actions.html.haml
@@ -4,49 +4,51 @@
 - has_transfer_action = dossier.user == current_user
 - has_actions = has_edit_action || has_delete_action || has_new_dossier_action || has_transfer_action
 
+
+
 - if has_actions
-  .dropdown.user-dossier-actions{ data: { controller: 'menu-button' } }
-    %button.fr-btn.fr-btn--secondary.dropdown-button{ data: { menu_button_target: 'button' } }
+  = render Dropdown::MenuComponent.new(wrapper: :div, wrapper_options: {class: 'invite-user-actions'}, menu_options: {id: dom_id(dossier, :actions_menu)}, button_options: {class: 'fr-btn--sm fr-btn--secondary'}) do |menu|
+    - menu.with_button_inner_html do
       = t('views.users.dossiers.dossier_action.actions')
-    .dropdown-content.fade-in-down{ data: { menu_button_target: 'menu' }, id: dom_id(dossier, :actions_menu) }
-      %ul.dropdown-items
-        - if has_edit_action
-          - if dossier.brouillon?
-            %li
-              = link_to(url_for_dossier(dossier)) do
-                %span.icon.edit
-                .dropdown-description
-                  = t('views.users.dossiers.dossier_action.edit_draft')
-          - else
-            %li
-              = link_to modifier_dossier_path(dossier) do
-                %span.icon.edit
-                .dropdown-description
-                  = t('views.users.dossiers.dossier_action.edit_dossier')
 
-        - if has_transfer_action
-          %li
-            = link_to transferer_dossier_path(dossier) do
-              %span.icon.person
-              .dropdown-description
-                = t('views.users.dossiers.dossier_action.transfer_dossier')
+    - if has_edit_action
+      - if dossier.brouillon?
+        - menu.with_item do
+          = link_to(url_for_dossier(dossier), role: 'menuitem') do
+            %span.icon.edit
+            .dropdown-description
+              = t('views.users.dossiers.dossier_action.edit_draft')
+      - else
+        - menu.with_item do
+          = link_to(modifier_dossier_path(dossier), role: 'menuitem') do
+            %span.icon.edit
+            .dropdown-description
+              = t('views.users.dossiers.dossier_action.edit_dossier')
 
-        - if has_new_dossier_action
-          %li
-            = link_to procedure_lien(dossier.procedure) do
-              %span.icon.new-folder
-              .dropdown-description
-                = t('views.users.dossiers.dossier_action.start_other_dossier')
-          %li
-            = link_to clone_dossier_path(dossier), method: :post do
-              %span.icon.new-folder
-              .dropdown-description
-                = t('views.users.dossiers.dossier_action.clone')
+    - if has_transfer_action
+      - menu.with_item do
+        = link_to(transferer_dossier_path(dossier), role: 'menuitem') do
+          %span.icon.person
+          .dropdown-description
+            = t('views.users.dossiers.dossier_action.transfer_dossier')
 
-        - if has_delete_action
-          %li.danger
-            = link_to delete_dossier_dossier_path(dossier), method: :patch, data: { disable: true, confirm: "En continuant, vous allez supprimer ce dossier ainsi que les informations qu’il contient. Toute suppression entraîne l’annulation de la démarche en cours.\n\nConfirmer la suppression ?" } do
-              %span.icon.delete
-              .dropdown-description
-                = t('views.users.dossiers.dossier_action.delete_dossier')
+    - if has_new_dossier_action
+      - menu.with_item do
+        = link_to(procedure_lien(dossier.procedure), role: 'menuitem') do
+          %span.icon.new-folder
+          .dropdown-description
+            = t('views.users.dossiers.dossier_action.start_other_dossier')
 
+      - menu.with_item do
+        = link_to(clone_dossier_path(dossier), method: :post, role: 'menuitem') do
+          %span.icon.new-folder
+          .dropdown-description
+            = t('views.users.dossiers.dossier_action.clone')
+
+    - if has_delete_action
+      - menu.with_item(class: 'danger') do
+        = link_to(delete_dossier_dossier_path(dossier), role: 'menuitem', method: :patch, data: { disable: true, confirm: "En continuant, vous allez supprimer ce dossier ainsi que les informations qu’il contient. Toute suppression entraîne l’annulation de la démarche en cours.\n\nConfirmer la suppression ?" }) do
+
+          %span.icon.delete
+          .dropdown-description
+            = t('views.users.dossiers.dossier_action.delete_dossier')
diff --git a/app/views/users/dossiers/_identity_dropdown.html.haml b/app/views/users/dossiers/_identity_dropdown.html.haml
index 3da4cd863..88781adfb 100644
--- a/app/views/users/dossiers/_identity_dropdown.html.haml
+++ b/app/views/users/dossiers/_identity_dropdown.html.haml
@@ -1,8 +1,8 @@
-.dropdown.edit-identity-action{ data: { controller: 'menu-button', popover: 'true' } }
-  %button.button.dropdown-button{ data: { menu_button_target: 'button' } }
+= render Dropdown::MenuComponent.new(wrapper: :div, wrapper_options: {class: ['edit-identity-action']}, menu_options: {  class:['edit-identity-content'] }) do |menu|
+  - menu.with_button_inner_html do
     = t("views.shared.dossiers.demande.my_identity")
 
-  #edit-identity-content.dropdown-content.fade-in-down{ data: { menu_button_target: 'menu' } }
+  - menu.with_form do
     - if dossier.procedure.for_individual
       = render partial: "shared/dossiers/identite_individual", locals: { individual: dossier.individual }
 
diff --git a/app/views/users/dossiers/demande.html.haml b/app/views/users/dossiers/demande.html.haml
index e9b3b7710..56e88e5df 100644
--- a/app/views/users/dossiers/demande.html.haml
+++ b/app/views/users/dossiers/demande.html.haml
@@ -10,5 +10,5 @@
 
   .container
     - if !@dossier.read_only?
-      = link_to t('views.users.dossiers.demande.edit_dossier'), modifier_dossier_path(@dossier), class: 'button accepted edit-form', title: "Modifier mon dossier tant qu'il n'est pas passé en instruction"
+      = link_to t('views.users.dossiers.demande.edit_dossier'), modifier_dossier_path(@dossier), class: 'fr-btn fr-btn-sm', 'title'=> "Modifier mon dossier tant qu'il n'est pas passé en instruction"
       .clearfix
diff --git a/app/views/users/dossiers/show/_header.html.haml b/app/views/users/dossiers/show/_header.html.haml
index 602354561..6139f57ba 100644
--- a/app/views/users/dossiers/show/_header.html.haml
+++ b/app/views/users/dossiers/show/_header.html.haml
@@ -18,7 +18,7 @@
       .header-actions
         = render partial: 'invites/dropdown', locals: { dossier: dossier }
         - if dossier.can_be_updated_by_user? && !current_page?(modifier_dossier_path(dossier))
-          = link_to t('views.users.dossiers.show.header.edit_dossier'), modifier_dossier_path(dossier), class: 'button accepted edit-form',
+          = link_to t('views.users.dossiers.show.header.edit_dossier'), modifier_dossier_path(dossier), class: 'fr-btn fr-btn-sm',
             title: { label: t('views.users.dossiers.show.header.edit_dossier_title') }
         = render(partial: 'users/dossiers/show/print_dossier', locals: { dossier: dossier })
 
diff --git a/app/views/users/dossiers/show/_print_dossier.html.haml b/app/views/users/dossiers/show/_print_dossier.html.haml
index 58e030960..1e2392431 100644
--- a/app/views/users/dossiers/show/_print_dossier.html.haml
+++ b/app/views/users/dossiers/show/_print_dossier.html.haml
@@ -1,6 +1 @@
-.dropdown.print-menu-opener{ data: { controller: 'menu-button' } }
-  %button.button.dropdown-button.icon-only{ title: t('views.users.dossiers.show.header.print'), 'aria-label': 'imprimer', data: { menu_button_target: 'button' } }
-    %span.icon.printer
-  %ul#print-menu.print-menu.dropdown-content{ data: { menu_button_target: 'menu' } }
-    %li
-      = link_to t('views.users.dossiers.show.header.print_dossier'), dossier_path(dossier, format: :pdf), target: "_blank", rel: "noopener", class: "menu-item menu-link"
+= link_to t('views.users.dossiers.show.header.print'), dossier_path(dossier, format: :pdf), target: "_blank", rel: "noopener", title: t('views.users.dossiers.show.header.print_dossier'), class: 'fr-btn fr-icon-printer-line fr-btn--tertiary'
diff --git a/app/views/users/dossiers/update.turbo_stream.haml b/app/views/users/dossiers/update.turbo_stream.haml
index 4963c0c17..ce7539ab1 100644
--- a/app/views/users/dossiers/update.turbo_stream.haml
+++ b/app/views/users/dossiers/update.turbo_stream.haml
@@ -4,7 +4,7 @@
   = turbo_stream.hide_all(@to_hide)
 - @to_update.each do |champ|
   = fields_for champ.input_name, champ do |form|
-    = turbo_stream.morph champ.input_group_id do
+    = turbo_stream.replace champ.input_group_id do
       = render EditableChamp::EditableChampComponent.new champ:, form:
 
 = turbo_stream.remove_all(".editable-champ .spinner-removable");
diff --git a/config/locales/en.yml b/config/locales/en.yml
index 6b70d5d3c..ed8ed14c7 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -112,6 +112,9 @@ en:
         champ_remove: Remove
         champ_unavailable: Unavailable
         possible_values:
+          link:
+            title: All possible values
+            text: See all possible values
           title: Values
           text_html: A short text
           textarea_html: A long text
@@ -314,7 +317,8 @@ en:
         demande:
           edit_dossier: "Edit file"
         search:
-          search_file: Search a file
+          placeholder: Search a file
+          search_file: Search
         index:
           dossiers: "Files"
         dossiers_list:
diff --git a/config/locales/fr.yml b/config/locales/fr.yml
index e69c9df4c..3c37f96b5 100644
--- a/config/locales/fr.yml
+++ b/config/locales/fr.yml
@@ -103,6 +103,9 @@ fr:
         champ_remove: Retirer
         champ_unavailable: Indisponible
         possible_values:
+          link:
+            title: Toutes les valeurs possibles
+            text: Voir toutes les valeurs possibles
           title: Valeurs
           text_html: Un texte court
           textarea_html: Un texte long
@@ -310,7 +313,8 @@ fr:
         demande:
           edit_dossier: "Modifier le dossier"
         search:
-          search_file: Rechercher un dossier
+          placeholder: Rechercher un dossier
+          search_file: Rechercher
         index:
           dossiers: "Dossiers"
         dossiers_list:
diff --git a/config/locales/views/support/en.yml b/config/locales/views/support/en.yml
index 96fafee96..1b16ef2ed 100644
--- a/config/locales/views/support/en.yml
+++ b/config/locales/views/support/en.yml
@@ -2,7 +2,8 @@ en:
   support:
     index:
       contact: Contact
-      intro_html: Contact us via this form and we will answer you as quickly as possible.<br>Make sure you provide all the required information so we can help you in the best way.
+      intro_html: "<p>Contact us via this form and we will answer you as quickly as possible.</p>
+        <p>Make sure you provide all the required information so we can help you in the best way.</p>"
       your_question: Your question
       our_answer: 👉 Our answer
       notice_pj_product: A screenshot can help us identify the element to improve.
@@ -10,35 +11,28 @@ en:
       procedure_info:
         question: I've encountered a problem while completing my application
         answer_html: "<p>Are you sure that all the mandatory fields (<span class= mandatory> * </span>) are properly filled?
-              <p>If you have questions about the information requested, contact the service in charge of the procedure.</p>
-              <p><a href=%{link_procedure_info}>Find more information</a></p>"
+              <p>If you have questions about the information requested, <a href=\"%{link_procedure_info}\">contact the service in charge of the procedure (FAQ)</a>.</p>"
       instruction_info:
         question: I have a question about the instruction of my application
-        answer_html: "<p>If you have questions about the instruction of your application (response delay for example), contact directly the instructor via our mail system.</p>
-              <p><a href=%{link_instruction_info}>Find more information</a></p>
-              <br>
-              <p>If you are facing technical issues on the website, use the form below. We will not be able to inform you about the instruction of your application.</p>"
+        answer_html: "<p>If you have questions about the instruction of your application (response delay for example), <a href=\"%{link_instruction_info}\">contact directly the instructor via our mail system (FAQ)</a>.</p>
+          <p>If you are facing technical issues on the website, use the form below. We will not be able to inform you about the instruction of your application.</p>"
       product:
         question: I have an idea to improve the website
-        answer_html: "<p>Got an idea? Please check our <strong>enhancement dashboard</strong></p>
+        answer_html: "<p>Got an idea? <a href=\"%{link_product}\" rel=\"noopener noreferrer\" target=\"_blank\" title=\"Open features dashboard - New tab\">Please check our enhancement dashboard</a> :</p>
               <ul><li>Vote for your priority improvements</li>
-              <li>Share your own ideas</li></ul>
-              <p><strong><a href=%{link_product}>➡ Access the enhancement dashboard</a></strong></p>"
+              <li>Share your own ideas</li></ul>"
       lost_user:
         question: I am having trouble finding the procedure I am looking for
         answer_html: "<p>We invite you to contact the administration in charge of the procedure so they can provide you the link.
-              It should look like this: %{base_url}/commencer/NOM_DE_LA_DEMARCHE.</p>
-              <br>
-              <p>You can find here the most popular procedures (licence, detr, etc.) :</p>
-              <p><a href=%{link_lost_user}>%{link_lost_user}</a></p>"
+              It should look like this: <code>%{base_url}/commencer/NOM_DE_LA_DEMARCHE</code>.</p>
+              <p>You can <a href=\"%{link_lost_user}\">find here the most popular procedures (licence, detr, etc.)</a>.</p>"
       other:
         question: Other topic
     admin:
       your_question: Your question
       admin_intro_html: "<p>As an administration, you can contact us through this form. We'll answer you as quickly as possibly by e-mail or phone.</p>
-      <br>
-      <p><strong>Caution, this form is dedicated to public bodies only.</strong>
-      It does not concern individuals, companies nor associations (except those recognised of public utility). If you belong to one of these categories, contact us <a href=%{contact_path}>here</a>.</p>"
+        <p><strong>Caution, this form is dedicated to public bodies only.</strong>
+        It does not concern individuals, companies nor associations (except those recognised of public utility). If you belong to one of these categories, contact us <a href=\"%{contact_path}\">here</a>.</p>"
       contact_team: Contact our team
       pro_phone_number: Professional phone number (direct line)
       pro_mail: Professional email address
diff --git a/config/locales/views/support/fr.yml b/config/locales/views/support/fr.yml
index 8b8632060..aebe2ca2e 100644
--- a/config/locales/views/support/fr.yml
+++ b/config/locales/views/support/fr.yml
@@ -2,7 +2,8 @@ fr:
   support:
     index:
       contact: Contact
-      intro_html: Contactez-nous via ce formulaire et nous vous répondrons dans les plus brefs délais.<br>Pensez bien à nous donner le plus d’informations possible pour que nous puissions vous aider au mieux.
+      intro_html: "<p>Contactez-nous via ce formulaire et nous vous répondrons dans les plus brefs délais.</p>
+        <p>Pensez bien à nous donner le plus d’informations possible pour que nous puissions vous aider au mieux.</p>"
       your_question: Votre question
       our_answer: 👉 Notre réponse
       notice_pj_product: Une capture d’écran peut nous aider à identifier plus facilement l’endroit à améliorer.
@@ -10,35 +11,28 @@ fr:
       procedure_info:
         question: J’ai un problème lors du remplissage de mon dossier
         answer_html: "<p>Avez-vous bien vérifié que tous les champs obligatoires (<span class= mandatory> * </span>) sont remplis ?
-        <p>Si vous avez des questions sur les informations à saisir, contactez les services en charge de la démarche.</p>
-        <p><a href=%{link_procedure_info}>En savoir plus</a></p>"
+          <p>Si vous avez des questions sur les informations à saisir, <a href=\"%{link_procedure_info}\">contactez les services en charge de la démarche (FAQ)</a>.</p>"
       instruction_info:
         question: J’ai une question sur l’instruction de mon dossier
-        answer_html: "<p>Si vous avez des questions sur l’instruction de votre dossier (par exemple sur les délais), nous vous invitons à contacter directement les services qui instruisent votre dossier par votre messagerie.</p>
-        <p><a href=%{link_instruction_info}>En savoir plus</a></p>
-        <br>
-        <p>Si vous souhaitez poser une question pour un problème technique sur le site, utilisez le formulaire ci-dessous. Nous ne pourrons pas vous renseigner sur l’instruction de votre dossier.</p>"
+        answer_html: "<p>Si vous avez des questions sur l’instruction de votre dossier (par exemple sur les délais), nous vous invitons à <a href=\"%{link_instruction_info}\">contacter directement les services qui instruisent votre dossier par votre messagerie (FAQ)</a>.</p>
+          <p>Si vous souhaitez poser une question pour un problème technique sur le site, utilisez le formulaire ci-dessous. Nous ne pourrons pas vous renseigner sur l’instruction de votre dossier.</p>"
       product:
         question: J’ai une idée d’amélioration pour votre site
-        answer_html: "<p>Une idée ? Pensez à consulter notre <strong>tableau de bord des améliorations</strong></p>
-        <ul><li>Votez pour vos améliorations prioritaires;</li>
-        <li>Proposez votre propre idée.</li></ul>
-        <p><strong><a href=%{link_product}>➡ Accéder au tableau des améliorations</a></strong></p>"
+        answer_html: "<p>Une idée ? Pensez à <a href=\"%{link_product}\" rel=\"noopener noreferrer\" target=\"_blank\" title=\"Ouvrir le tableau des évolutions - Nouvel onglet\">consulter notre tableau de bord des améliorations</a> :</p>
+          <ul><li>Votez pour vos améliorations prioritaires,</li>
+          <li>Proposez votre propre idée.</li></ul>"
       lost_user:
         question: Je ne trouve pas la démarche que je veux faire
-        answer_html: "<p>Nous vous invitons à contacter l’administration en charge de votre démarche pour qu’elle vous indique le lien à suivre. Celui-ci devrait ressembler à cela : %{base_url}/commencer/NOM_DE_LA_DEMARCHE.</p>
-        <br>
-        <p>Vous pouvez aussi consulter ici la liste de nos démarches les plus frequentes (permis, detr etc) :</p>
-        <p><a href=%{link_lost_user}>%{link_lost_user}</a></p>"
+        answer_html: "<p>Nous vous invitons à contacter l’administration en charge de votre démarche pour qu’elle vous indique le lien à suivre. Celui-ci devrait ressembler à cela : <code>%{base_url}/commencer/NOM_DE_LA_DEMARCHE</code>.</p>
+          <p>Vous pouvez aussi <a href=\"%{link_lost_user}\">consulter ici la liste de nos démarches les plus fréquentes (permis, detr etc)</a>.</p>"
       other:
         question: Autre sujet
     admin:
       your_question: Votre question
       admin_intro_html: "<p>En tant qu’administration, vous pouvez nous contactez via ce formulaire. Nous vous répondrons dans les plus brefs délais, par email ou par téléphone.</p>
-      <br>
-      <p><strong>Attention, ce formulaire est réservé uniquement aux organismes publics.</strong>
-      Il ne concerne ni les particuliers, ni les entreprises, ni les associations (sauf celles reconnues d’utilité publique). Si c'est votre cas, rendez-vous sur notre
-      <a href=%{contact_path}>formulaire de contact public</a>.</p>"
+        <p><strong>Attention, ce formulaire est réservé uniquement aux organismes publics.</strong>
+        Il ne concerne ni les particuliers, ni les entreprises, ni les associations (sauf celles reconnues d’utilité publique). Si c'est votre cas, rendez-vous sur notre
+        <a href=\"%{contact_path}\">formulaire de contact public</a>.</p>"
       contact_team: Contactez notre équipe
       pro_phone_number: Numéro de téléphone professionnel (ligne directe)
       pro_mail: Adresse e-mail professionnelle
diff --git a/db/migrate/20230126145329_add_reminded_at_to_avis.rb b/db/migrate/20230126145329_add_reminded_at_to_avis.rb
new file mode 100644
index 000000000..3efce26ae
--- /dev/null
+++ b/db/migrate/20230126145329_add_reminded_at_to_avis.rb
@@ -0,0 +1,5 @@
+class AddRemindedAtToAvis < ActiveRecord::Migration[6.1]
+  def change
+    add_column :avis, :reminded_at, :datetime
+  end
+end
diff --git a/db/schema.rb b/db/schema.rb
index 6456963e5..3e62b05e0 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -10,7 +10,7 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema.define(version: 2023_01_17_094317) do
+ActiveRecord::Schema.define(version: 2023_01_26_145329) do
 
   # These are extensions that must be enabled in order to support this database
   enable_extension "pgcrypto"
@@ -164,6 +164,7 @@ ActiveRecord::Schema.define(version: 2023_01_17_094317) do
     t.text "introduction"
     t.datetime "revoked_at"
     t.datetime "updated_at", null: false
+    t.datetime "reminded_at"
     t.index ["claimant_id"], name: "index_avis_on_claimant_id"
     t.index ["dossier_id"], name: "index_avis_on_dossier_id"
     t.index ["experts_procedure_id"], name: "index_avis_on_experts_procedure_id"
diff --git a/lib/tasks/benchmarks.rake b/lib/tasks/benchmarks.rake
index ec734a662..b33904134 100644
--- a/lib/tasks/benchmarks.rake
+++ b/lib/tasks/benchmarks.rake
@@ -32,25 +32,10 @@ namespace :benchmarks do
 
   desc 'Attestation Template parser'
   task attestation_template_parser: :environment do
-    progress = ProgressReport.new(AttestationTemplate.count)
-    AttestationTemplate.find_each do |template|
-      parsed = TagsSubstitutionConcern::TagsParser.parse(template.body)
-      serialized = parsed.map do |token|
-        case token
-        in { tag: tag }
-          "--#{tag}--"
-        in { text: text }
-          text
-        end
-      end.join('')
-      if serialized != template.body
-        throw "Template '#{serialized}' is not eq '#{template.body}' with attestation template #{template.id}"
-      end
-      progress.inc
-    rescue => e
-      pp "Error with attestation template #{template.id}"
-      throw e
+    procedure = Procedure.find(68139)
+    Benchmark.bm do |x|
+      x.report("Empty") { TagsSubstitutionConcern::TagsParser.parse('') }
+      x.report("Démarche 68139") { TagsSubstitutionConcern::TagsParser.parse(procedure.attestation_template.body) }
     end
-    progress.finish
   end
 end
diff --git a/lib/tasks/deployment/20230131132616_fix_dossier_transfer_with_uppercase.rake b/lib/tasks/deployment/20230131132616_fix_dossier_transfer_with_uppercase.rake
new file mode 100644
index 000000000..55db50e00
--- /dev/null
+++ b/lib/tasks/deployment/20230131132616_fix_dossier_transfer_with_uppercase.rake
@@ -0,0 +1,20 @@
+namespace :after_party do
+  desc 'Deployment task: fix_dossier_transfer_with_uppercase'
+  task fix_dossier_transfer_with_uppercase: :environment do
+    puts "Running deploy task 'fix_dossier_transfer_with_uppercase'"
+    # in production, about 1000, no need to track progress
+
+    DossierTransfer.all.find_each do |dt|
+      if /A-Z/.match?(dt.email)
+        dt.email = dt.email.downcase
+        dt.save
+      end
+    end
+    # Put your task implementation HERE.
+
+    # Update task as completed.  If you remove the line below, the task will
+    # run with every deploy (or every time you call after_party:run).
+    AfterParty::TaskRecord
+      .create version: AfterParty::TaskRecorder.new(__FILE__).timestamp
+  end
+end
diff --git a/spec/controllers/instructeurs/dossiers_controller_spec.rb b/spec/controllers/instructeurs/dossiers_controller_spec.rb
index 8058657fb..ab5873235 100644
--- a/spec/controllers/instructeurs/dossiers_controller_spec.rb
+++ b/spec/controllers/instructeurs/dossiers_controller_spec.rb
@@ -865,6 +865,10 @@ describe Instructeurs::DossiersController, type: :controller do
       }
     end
 
+    before do
+      allow(PiecesJustificativesService).to receive(:generate_dossier_export).with([dossier], include_infos_administration: true).and_call_original
+    end
+
     it 'includes an attachment' do
       expect(subject.headers['Content-Disposition']).to start_with('attachment; ')
     end
diff --git a/spec/controllers/users/transfers_controller_spec.rb b/spec/controllers/users/transfers_controller_spec.rb
index 9c8809063..d5f80ae0f 100644
--- a/spec/controllers/users/transfers_controller_spec.rb
+++ b/spec/controllers/users/transfers_controller_spec.rb
@@ -26,6 +26,11 @@ describe Users::TransfersController, type: :controller do
       it { expect(DossierTransfer.last.dossiers).to eq([dossier]) }
     end
 
+    context 'with upper case email' do
+      let(:email) { "Test@rspec.net" }
+      it { expect(DossierTransfer.last.email).to eq(email.strip.downcase) }
+    end
+
     shared_examples 'email error' do
       it { expect { subject }.not_to change { DossierTransfer.count } }
       it { expect(flash.alert).to match([/invalide/]) }
diff --git a/spec/lib/active_storage/downloadable_file_spec.rb b/spec/lib/active_storage/downloadable_file_spec.rb
index 93fcccc98..93ae1378a 100644
--- a/spec/lib/active_storage/downloadable_file_spec.rb
+++ b/spec/lib/active_storage/downloadable_file_spec.rb
@@ -1,7 +1,7 @@
 describe ActiveStorage::DownloadableFile do
   let(:dossier) { create(:dossier, :en_construction) }
 
-  subject(:list) { ActiveStorage::DownloadableFile.create_list_from_dossiers(Dossier.where(id: dossier.id)) }
+  subject(:list) { ActiveStorage::DownloadableFile.create_list_from_dossiers(Dossier.where(id: dossier.id), with_bills: true, with_champs_private: true) }
 
   describe 'create_list_from_dossiers' do
     context 'when no piece_justificative is present' do
diff --git a/spec/models/champs/date_champ_spec.rb b/spec/models/champs/date_champ_spec.rb
index 9579a43eb..5578943c5 100644
--- a/spec/models/champs/date_champ_spec.rb
+++ b/spec/models/champs/date_champ_spec.rb
@@ -1,5 +1,5 @@
 describe Champs::DateChamp do
-  let(:date_champ) { build(:champ_date) }
+  let(:date_champ) { create(:champ_date) }
 
   describe '#convert_to_iso8601' do
     it 'preserves nil' do
@@ -37,6 +37,12 @@ describe Champs::DateChamp do
       champ.save
       expect(champ.reload.value).to eq("2023-12-21")
     end
+
+    it 'converts to nil if false iso' do
+      champ = champ_with_value("2023-27-02")
+      champ.save
+      expect(champ.reload.value).to eq(nil)
+    end
   end
 
   def champ_with_value(number)
diff --git a/spec/models/concern/tags_substitution_concern_spec.rb b/spec/models/concern/tags_substitution_concern_spec.rb
index 23cdf4ccb..421af6cdd 100644
--- a/spec/models/concern/tags_substitution_concern_spec.rb
+++ b/spec/models/concern/tags_substitution_concern_spec.rb
@@ -516,7 +516,7 @@ describe TagsSubstitutionConcern, type: :model do
 
   describe 'parser' do
     it do
-      tokens = TagsSubstitutionConcern::TagsParser.parse("hello world --public--, --numéro du dossier--, un test--yolo-- encore du text\n---\n encore du text")
+      tokens = TagsSubstitutionConcern::TagsParser.parse("hello world --public--, --numéro du dossier--, un test--yolo-- encore du text\n---\n encore du text --- et encore du text\n--tag--")
       expect(tokens).to eq([
         { text: "hello world " },
         { tag: "public" },
@@ -524,14 +524,15 @@ describe TagsSubstitutionConcern, type: :model do
         { tag: "numéro du dossier" },
         { text: ", un test" },
         { tag: "yolo" },
-        { text: " encore du text\n" + "---\n" + " encore du text" }
+        { text: " encore du text\n" + "---\n" + " encore du text --- et encore du text\n" },
+        { tag: "tag" }
       ])
     end
 
     it 'allow for - before tag' do
-      tokens = TagsSubstitutionConcern::TagsParser.parse("hello --yolo-- --  before-- --after -- -- around -- world ---numéro-du - dossier--")
+      tokens = TagsSubstitutionConcern::TagsParser.parse("-----------------\nhello --yolo-- --  before-- --after -- -- around -- world ---numéro-du - dossier--")
       expect(tokens).to eq([
-        { text: "hello " },
+        { text: "-----------------\nhello " },
         { tag: "yolo" },
         { text: " " },
         { tag: "before" },
diff --git a/spec/models/dossier_rebase_concern_spec.rb b/spec/models/dossier_rebase_concern_spec.rb
index 1e5183412..afeef5926 100644
--- a/spec/models/dossier_rebase_concern_spec.rb
+++ b/spec/models/dossier_rebase_concern_spec.rb
@@ -239,7 +239,7 @@ describe Dossier do
   end
 
   describe "#rebase" do
-    let(:procedure) { create(:procedure, :with_type_de_champ_mandatory, :with_yes_no, :with_repetition, :with_datetime) }
+    let(:procedure) { create(:procedure, types_de_champ_public: [{ type: :text, mandatory: true }, { type: :repetition, children: [{ type: :text }] }, { type: :datetime }, { type: :yes_no }, { type: :integer_number }]) }
     let(:dossier) { create(:dossier, procedure: procedure) }
 
     let(:yes_no_type_de_champ) { procedure.active_revision.types_de_champ_public.find { |tdc| tdc.type_champ == TypeDeChamp.type_champs.fetch(:yes_no) } }
@@ -248,6 +248,8 @@ describe Dossier do
     let(:text_champ) { dossier.champs_public.find(&:mandatory?) }
     let(:rebased_text_champ) { dossier.champs_public.find { |c| c.type_champ == TypeDeChamp.type_champs.fetch(:text) } }
 
+    let(:rebased_number_champ) { dossier.champs_public.find { |c| c.type_champ == TypeDeChamp.type_champs.fetch(:integer_number) } }
+
     let(:datetime_type_de_champ) { procedure.active_revision.types_de_champ_public.find { |tdc| tdc.type_champ == TypeDeChamp.type_champs.fetch(:datetime) } }
     let(:datetime_champ) { dossier.champs_public.find { |c| c.type_champ == TypeDeChamp.type_champs.fetch(:datetime) } }
     let(:rebased_datetime_champ) { dossier.champs_public.find { |c| c.type_champ == TypeDeChamp.type_champs.fetch(:date) } }
@@ -287,7 +289,7 @@ describe Dossier do
       libelle = text_type_de_champ.libelle
 
       expect(dossier.revision).to eq(procedure.published_revision)
-      expect(dossier.champs_public.size).to eq(4)
+      expect(dossier.champs_public.size).to eq(5)
       expect(repetition_champ.rows.size).to eq(2)
       expect(repetition_champ.rows[0].size).to eq(1)
       expect(repetition_champ.rows[1].size).to eq(1)
@@ -299,7 +301,7 @@ describe Dossier do
 
       expect(procedure.revisions.size).to eq(3)
       expect(dossier.revision).to eq(procedure.published_revision)
-      expect(dossier.champs_public.size).to eq(4)
+      expect(dossier.champs_public.size).to eq(5)
       expect(rebased_text_champ.value).to eq(text_champ.value)
       expect(rebased_text_champ.type_de_champ_id).not_to eq(text_champ.type_de_champ_id)
       expect(rebased_datetime_champ.type_champ).to eq(TypeDeChamp.type_champs.fetch(:date))
@@ -309,6 +311,7 @@ describe Dossier do
       expect(rebased_repetition_champ.rows[1].size).to eq(2)
       expect(rebased_text_champ.rebased_at).not_to be_nil
       expect(rebased_datetime_champ.rebased_at).not_to be_nil
+      expect(rebased_number_champ.rebased_at).to be_nil
     end
   end
 
diff --git a/spec/models/dossier_spec.rb b/spec/models/dossier_spec.rb
index 56faa1b48..9a684dcb7 100644
--- a/spec/models/dossier_spec.rb
+++ b/spec/models/dossier_spec.rb
@@ -1405,6 +1405,46 @@ describe Dossier do
     end
   end
 
+  describe '#geo_data' do
+    let(:dossier) { create(:dossier) }
+    let(:type_de_champ_carte) { create(:type_de_champ_carte, procedure: dossier.procedure) }
+    let(:geo_area) { create(:geo_area) }
+    let(:champ_carte) { create(:champ_carte, type_de_champ: type_de_champ_carte, geo_areas: [geo_area]) }
+
+    context "without data" do
+      it { expect(dossier.geo_data?).to be_falsey }
+    end
+
+    context "with geo data in public champ" do
+      before do
+        dossier.champs_public << champ_carte
+      end
+
+      it { expect(dossier.geo_data?).to be_truthy }
+    end
+
+    context "with geo data in private champ" do
+      before do
+        dossier.champs_private << champ_carte
+      end
+
+      it { expect(dossier.geo_data?).to be_truthy }
+    end
+
+    it "should solve N+1 problem" do
+      dossier.champs_public << create_list(:champ_carte, 3, type_de_champ: type_de_champ_carte, geo_areas: [create(:geo_area)])
+
+      count = 0
+
+      callback = lambda { |*_args| count += 1 }
+      ActiveSupport::Notifications.subscribed(callback, "sql.active_record") do
+        dossier.geo_data?
+      end
+
+      expect(count).to eq(1)
+    end
+  end
+
   describe 'dossier_operation_log after dossier deletion' do
     let(:dossier) { create(:dossier) }
     let(:dossier_operation_log) { create(:dossier_operation_log, dossier: dossier) }
@@ -1853,6 +1893,19 @@ describe Dossier do
           before { dossier.champs_public << champ_piece_justificative }
           it { expect(Champs::PieceJustificativeChamp.where(dossier: new_dossier).first.piece_justificative_file.first.blob).to eq(champ_piece_justificative.piece_justificative_file.first.blob) }
         end
+
+        context 'for Champs::AddressChamp, original_champ.data is duped' do
+          let(:dossier) { create(:dossier) }
+          let(:type_de_champs_adress) { create(:type_de_champ_address, procedure: dossier.procedure) }
+          let(:etablissement) { create(:etablissement) }
+          let(:champ_address) { create(:champ_address, type_de_champ: type_de_champs_adress, external_id: 'Address', data: { city_code: '75019' }) }
+          before { dossier.champs_public << champ_address }
+
+          it { expect(Champs::AddressChamp.where(dossier: dossier).first.data).not_to be_nil }
+          it { expect(Champs::AddressChamp.where(dossier: dossier).first.external_id).not_to be_nil }
+          it { expect(Champs::AddressChamp.where(dossier: new_dossier).first.external_id).to eq(champ_address.external_id) }
+          it { expect(Champs::AddressChamp.where(dossier: new_dossier).first.data).to eq(champ_address.data) }
+        end
       end
 
       context 'private are renewd' do
diff --git a/spec/models/procedure_presentation_spec.rb b/spec/models/procedure_presentation_spec.rb
index 2e7168e21..63d489532 100644
--- a/spec/models/procedure_presentation_spec.rb
+++ b/spec/models/procedure_presentation_spec.rb
@@ -854,4 +854,15 @@ describe ProcedurePresentation do
       it { is_expected.to eq(sorted_ids) }
     end
   end
+
+  describe '#field_enum' do
+    context "field is groupe_instructeur" do
+      let!(:gi_2) { instructeur.groupe_instructeurs.create(label: 'gi2', procedure:) }
+      let!(:gi_3) { instructeur.groupe_instructeurs.create(label: 'gi3', procedure: create(:procedure)) }
+
+      subject { procedure_presentation.field_enum('groupe_instructeur/id') }
+
+      it { is_expected.to eq([['défaut', procedure.defaut_groupe_instructeur.id], ['gi2', gi_2.id]]) }
+    end
+  end
 end
diff --git a/spec/models/procedure_revision_spec.rb b/spec/models/procedure_revision_spec.rb
index b394fa2d0..9f3277267 100644
--- a/spec/models/procedure_revision_spec.rb
+++ b/spec/models/procedure_revision_spec.rb
@@ -872,4 +872,21 @@ describe ProcedureRevision do
     it { expect(draft.dependent_conditions(first_champ)).to eq([second_champ]) }
     it { expect(draft.dependent_conditions(second_champ)).to eq([]) }
   end
+
+  describe 'only_present_on_draft?' do
+    let(:procedure) { create(:procedure, types_de_champ_public: [{ libelle: 'Un champ texte' }]) }
+    let(:type_de_champ) { procedure.draft_revision.types_de_champ_public.first }
+
+    it {
+      expect(type_de_champ.only_present_on_draft?).to be_truthy
+      procedure.publish!
+      expect(type_de_champ.only_present_on_draft?).to be_falsey
+      procedure.draft_revision.remove_type_de_champ(type_de_champ.stable_id)
+      expect(type_de_champ.only_present_on_draft?).to be_falsey
+      expect(type_de_champ.revisions.count).to eq(1)
+      procedure.publish_revision!
+      expect(type_de_champ.only_present_on_draft?).to be_falsey
+      expect(type_de_champ.revisions.count).to eq(1)
+    }
+  end
 end
diff --git a/spec/services/pieces_justificatives_service_spec.rb b/spec/services/pieces_justificatives_service_spec.rb
index fb58bcc54..bdfbda7a3 100644
--- a/spec/services/pieces_justificatives_service_spec.rb
+++ b/spec/services/pieces_justificatives_service_spec.rb
@@ -1,10 +1,11 @@
 describe PiecesJustificativesService do
   describe '.liste_documents' do
-    let(:for_expert) { false }
+    let(:with_champs_private) { true }
+    let(:with_bills) { true }
 
     subject do
       PiecesJustificativesService
-        .liste_documents(Dossier.where(id: dossier.id), for_expert)
+        .liste_documents(Dossier.where(id: dossier.id), with_bills:, with_champs_private:)
         .map(&:first)
     end
 
@@ -59,8 +60,8 @@ describe PiecesJustificativesService do
 
       it { expect(subject).to match_array(private_pj_champ.call(dossier).piece_justificative_file.attachments) }
 
-      context 'for expert' do
-        let(:for_expert) { true }
+      context 'without private champ' do
+        let(:with_champs_private) { false }
 
         it { expect(subject).to be_empty }
       end
@@ -171,8 +172,8 @@ describe PiecesJustificativesService do
         expect(subject).to match_array([dossier_bs.serialized.attachment, dossier_bs.signature.attachment])
       end
 
-      context 'for expert' do
-        let(:for_expert) { true }
+      context 'without bills' do
+        let(:with_bills) { false }
 
         it { expect(subject).to be_empty }
       end
@@ -192,8 +193,8 @@ describe PiecesJustificativesService do
 
       it { expect(subject).to match_array(dol.serialized.attachment) }
 
-      context 'for expert' do
-        let(:for_expert) { true }
+      context 'without bills' do
+        let(:with_bills) { false }
 
         it { expect(subject).to be_empty }
       end
diff --git a/spec/system/administrateurs/procedure_cloning_spec.rb b/spec/system/administrateurs/procedure_cloning_spec.rb
index 945cb514e..c8e301253 100644
--- a/spec/system/administrateurs/procedure_cloning_spec.rb
+++ b/spec/system/administrateurs/procedure_cloning_spec.rb
@@ -18,7 +18,7 @@ describe 'As an administrateur I wanna clone a procedure', js: true do
     scenario do
       visit admin_procedures_path
       expect(page.find_by_id('procedures')['data-item-count']).to eq('1')
-      page.all('.procedures-actions-btn').first.click
+      page.all('.admin-procedures-list-row .dropdown .fr-btn').first.click
       page.all('.clone-btn').first.click
       visit admin_procedures_path(statut: "brouillons")
       expect(page.find_by_id('procedures')['data-item-count']).to eq('1')
diff --git a/spec/system/experts/expert_spec.rb b/spec/system/experts/expert_spec.rb
index b02abc1d2..f5e67a2b2 100644
--- a/spec/system/experts/expert_spec.rb
+++ b/spec/system/experts/expert_spec.rb
@@ -116,7 +116,6 @@ describe 'Inviting an expert:' do
         click_on '1 avis à donner'
         click_on avis.dossier.user.email
 
-        find(:css, '[aria-controls=print-pj-menu]').click
         click_on 'Télécharger le dossier et toutes ses pièces jointes'
         # For some reason, clicking the download link does not trigger the download in the headless browser ;
         # So we need to go to the download link directly
diff --git a/spec/system/users/dropdown_spec.rb b/spec/system/users/dropdown_spec.rb
index 8b288dab3..dc5cb0735 100644
--- a/spec/system/users/dropdown_spec.rb
+++ b/spec/system/users/dropdown_spec.rb
@@ -26,6 +26,21 @@ describe 'dropdown list with other option activated', js: true do
       find('.radios').find('label:last-child').find('input').select_option
       expect(page).to have_selector('.drop_down_other', visible: true)
     end
+
+    scenario "Getting back from other save the new option", js: true do
+      fill_individual
+
+      choose "Autre"
+      fill_in("Veuillez saisir votre autre choix", with: "My choice")
+
+      wait_until { user_dossier.champs_public.first.value == "My choice" }
+      expect(user_dossier.champs_public.first.value).to eq("My choice")
+
+      choose "Secondary 1.1"
+
+      wait_until { user_dossier.champs_public.first.value == "Secondary 1.1" }
+      expect(user_dossier.champs_public.first.value).to eq("Secondary 1.1")
+    end
   end
 
   context 'with select' do
diff --git a/spec/views/users/dossiers/show/_header.html.haml_spec.rb b/spec/views/users/dossiers/show/_header.html.haml_spec.rb
index 033d1eb20..bc931b537 100644
--- a/spec/views/users/dossiers/show/_header.html.haml_spec.rb
+++ b/spec/views/users/dossiers/show/_header.html.haml_spec.rb
@@ -27,7 +27,7 @@ describe 'users/dossiers/show/header.html.haml', type: :view do
     end
 
     it 'can download the dossier' do
-      expect(rendered).to have_text("Tout le dossier")
+      expect(rendered).to have_selector('a[title="Tout le dossier"]')
     end
   end
 
@@ -45,7 +45,7 @@ describe 'users/dossiers/show/header.html.haml', type: :view do
     end
 
     it 'can download the dossier' do
-      expect(rendered).to have_text("Tout le dossier")
+      expect(rendered).to have_selector('a[title="Tout le dossier"]')
     end
 
     it 'does not display a new procedure link' do
@@ -68,7 +68,7 @@ describe 'users/dossiers/show/header.html.haml', type: :view do
     end
 
     it 'can download the dossier' do
-      expect(rendered).to have_text("Tout le dossier")
+      expect(rendered).to have_selector('a[title="Tout le dossier"]')
     end
 
     it 'displays a new procedure link' do
@@ -105,7 +105,7 @@ describe 'users/dossiers/show/header.html.haml', type: :view do
     end
 
     it 'can download the dossier' do
-      expect(rendered).to have_text("Tout le dossier")
+      expect(rendered).to have_selector('a[title="Tout le dossier"]')
     end
   end
 
@@ -124,7 +124,7 @@ describe 'users/dossiers/show/header.html.haml', type: :view do
       end
 
       it 'can not download the dossier' do
-        expect(rendered).not_to have_text("Tout le dossier")
+        expect(rendered).not_to have_selector('a[title="Tout le dossier"]')
       end
     end
   end

From e1748a26663212e0db2ca0099f19c5bad1a84639 Mon Sep 17 00:00:00 2001
From: Damien Le Thiec <damien.lethiec@gmail.com>
Date: Tue, 31 Jan 2023 16:48:38 +0100
Subject: [PATCH 005/202] Fix "see more" link for prefillable fields

---
 app/helpers/application_helper.rb                             | 2 +-
 app/models/type_de_champ.rb                                   | 1 +
 app/models/types_de_champ/prefill_repetition_type_de_champ.rb | 3 ++-
 3 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index 70b116d78..03e393d1d 100644
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -142,7 +142,7 @@ module ApplicationHelper
   end
 
   def new_tab_suffix(title)
-    "#{title} — #{t('utils.new_tab')}"
+    "#{title} — #{I18n.t('utils.new_tab')}"
   end
 
   def download_details(attachment)
diff --git a/app/models/type_de_champ.rb b/app/models/type_de_champ.rb
index 098a7e8c0..60308633c 100644
--- a/app/models/type_de_champ.rb
+++ b/app/models/type_de_champ.rb
@@ -129,6 +129,7 @@ class TypeDeChamp < ApplicationRecord
 
   delegate :estimated_fill_duration, :estimated_read_duration, :tags_for_template, :libelle_for_export, to: :dynamic_type
   delegate :active_revision, to: :procedure, prefix: true
+  delegate :path, to: :procedure
 
   class WithIndifferentAccess
     def self.load(options)
diff --git a/app/models/types_de_champ/prefill_repetition_type_de_champ.rb b/app/models/types_de_champ/prefill_repetition_type_de_champ.rb
index cdf435f6e..b46809f3e 100644
--- a/app/models/types_de_champ/prefill_repetition_type_de_champ.rb
+++ b/app/models/types_de_champ/prefill_repetition_type_de_champ.rb
@@ -1,10 +1,11 @@
 class TypesDeChamp::PrefillRepetitionTypeDeChamp < TypesDeChamp::PrefillTypeDeChamp
   include ActionView::Helpers::UrlHelper
+  include ApplicationHelper
 
   def possible_values
     prefillable_subchamps.map do |prefill_type_de_champ|
       if prefill_type_de_champ.too_many_possible_values?
-        link = link_to "Voir toutes les valeurs possibles", Rails.application.routes.url_helpers.prefill_type_de_champ_path("piece-jointe", prefill_type_de_champ)
+        link = link_to I18n.t("views.prefill_descriptions.edit.possible_values.link.text"), Rails.application.routes.url_helpers.prefill_type_de_champ_path(prefill_type_de_champ.path, prefill_type_de_champ), title: ActionController::Base.helpers.sanitize(new_tab_suffix(I18n.t("views.prefill_descriptions.edit.possible_values.link.title"))), **external_link_attributes
         "#{prefill_type_de_champ.libelle}: #{link}"
       else
         "#{prefill_type_de_champ.libelle}: #{prefill_type_de_champ.possible_values_sentence}"

From 4a5e866974b8246c92acf35a0608eee9403c114b Mon Sep 17 00:00:00 2001
From: Damien Le Thiec <damien.lethiec@gmail.com>
Date: Tue, 31 Jan 2023 17:01:38 +0100
Subject: [PATCH 006/202] Fix problem schema

---
 db/schema.rb | 1 -
 1 file changed, 1 deletion(-)

diff --git a/db/schema.rb b/db/schema.rb
index 8055c3aea..0d5ffd1d9 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -165,7 +165,6 @@ ActiveRecord::Schema.define(version: 2023_01_26_145329) do
     t.datetime "reminded_at"
     t.datetime "revoked_at"
     t.datetime "updated_at", null: false
-    t.datetime "reminded_at"
     t.index ["claimant_id"], name: "index_avis_on_claimant_id"
     t.index ["dossier_id"], name: "index_avis_on_dossier_id"
     t.index ["experts_procedure_id"], name: "index_avis_on_experts_procedure_id"

From 5a7b740f5873c280b198051550abbb1318698433 Mon Sep 17 00:00:00 2001
From: Damien Le Thiec <damien.lethiec@gmail.com>
Date: Tue, 31 Jan 2023 17:06:00 +0100
Subject: [PATCH 007/202] Clean rubocop alerts

---
 app/models/type_de_champ.rb                                   | 2 +-
 app/models/types_de_champ/prefill_repetition_type_de_champ.rb | 2 +-
 app/models/types_de_champ/prefill_type_de_champ.rb            | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/models/type_de_champ.rb b/app/models/type_de_champ.rb
index 60308633c..46293894e 100644
--- a/app/models/type_de_champ.rb
+++ b/app/models/type_de_champ.rb
@@ -272,7 +272,7 @@ class TypeDeChamp < ApplicationRecord
       TypeDeChamp.type_champs.fetch(:checkbox),
       TypeDeChamp.type_champs.fetch(:drop_down_list),
       TypeDeChamp.type_champs.fetch(:regions),
-      TypeDeChamp.type_champs.fetch(:repetition),
+      TypeDeChamp.type_champs.fetch(:repetition)
     ])
   end
 
diff --git a/app/models/types_de_champ/prefill_repetition_type_de_champ.rb b/app/models/types_de_champ/prefill_repetition_type_de_champ.rb
index b46809f3e..e72ce1709 100644
--- a/app/models/types_de_champ/prefill_repetition_type_de_champ.rb
+++ b/app/models/types_de_champ/prefill_repetition_type_de_champ.rb
@@ -14,7 +14,7 @@ class TypesDeChamp::PrefillRepetitionTypeDeChamp < TypesDeChamp::PrefillTypeDeCh
   end
 
   def possible_values_sentence
-    "#{I18n.t("views.prefill_descriptions.edit.possible_values.#{type_champ}_html")}<br>#{possible_values.join("<br>")}".html_safe
+    "#{I18n.t("views.prefill_descriptions.edit.possible_values.#{type_champ}_html")}<br>#{possible_values.join("<br>")}".html_safe # rubocop:disable Rails/OutputSafety
   end
 
   def example_value
diff --git a/app/models/types_de_champ/prefill_type_de_champ.rb b/app/models/types_de_champ/prefill_type_de_champ.rb
index 6e481cd88..99017da47 100644
--- a/app/models/types_de_champ/prefill_type_de_champ.rb
+++ b/app/models/types_de_champ/prefill_type_de_champ.rb
@@ -38,7 +38,7 @@ class TypesDeChamp::PrefillTypeDeChamp < SimpleDelegator
 
   def possible_values_sentence
     if too_many_possible_values?
-      I18n.t("views.prefill_descriptions.edit.possible_values.#{type_champ}_html").html_safe
+      I18n.t("views.prefill_descriptions.edit.possible_values.#{type_champ}_html").html_safe # rubocop:disable Rails/OutputSafety
     else
       possible_values.to_sentence
     end

From a4645855d3c19539764bf772b6830777d46930fa Mon Sep 17 00:00:00 2001
From: Damien Le Thiec <damien.lethiec@gmail.com>
Date: Wed, 1 Feb 2023 12:02:09 +0100
Subject: [PATCH 008/202] Fix tests prefillable repetition

---
 spec/models/type_de_champ_spec.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/spec/models/type_de_champ_spec.rb b/spec/models/type_de_champ_spec.rb
index e1ca7bac6..5de887616 100644
--- a/spec/models/type_de_champ_spec.rb
+++ b/spec/models/type_de_champ_spec.rb
@@ -250,6 +250,7 @@ describe TypeDeChamp do
     it_behaves_like "a prefillable type de champ", :type_de_champ_checkbox
     it_behaves_like "a prefillable type de champ", :type_de_champ_drop_down_list
     it_behaves_like "a prefillable type de champ", :type_de_champ_regions
+    it_behaves_like "a prefillable type de champ", :type_de_champ_repetition
 
     it_behaves_like "a non-prefillable type de champ", :type_de_champ_number
     it_behaves_like "a non-prefillable type de champ", :type_de_champ_communes
@@ -260,7 +261,6 @@ describe TypeDeChamp do
     it_behaves_like "a non-prefillable type de champ", :type_de_champ_header_section
     it_behaves_like "a non-prefillable type de champ", :type_de_champ_explication
     it_behaves_like "a non-prefillable type de champ", :type_de_champ_piece_justificative
-    it_behaves_like "a non-prefillable type de champ", :type_de_champ_repetition
     it_behaves_like "a non-prefillable type de champ", :type_de_champ_cnaf
     it_behaves_like "a non-prefillable type de champ", :type_de_champ_dgfip
     it_behaves_like "a non-prefillable type de champ", :type_de_champ_pole_emploi

From e7c78321d96ef680413b147ffbb6dd1e4c8b8a85 Mon Sep 17 00:00:00 2001
From: Damien Le Thiec <damien.lethiec@gmail.com>
Date: Wed, 1 Feb 2023 13:35:32 +0100
Subject: [PATCH 009/202] Fix new failing tests

---
 app/models/prefill_params.rb                             | 2 ++
 spec/models/types_de_champ/prefill_type_de_champ_spec.rb | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/app/models/prefill_params.rb b/app/models/prefill_params.rb
index 6f16c1e2e..335cd005b 100644
--- a/app/models/prefill_params.rb
+++ b/app/models/prefill_params.rb
@@ -75,6 +75,8 @@ class PrefillParams
     end
 
     def repeatable_hashes
+      return [] unless value.is_a?(Array)
+
       value.map.with_index do |repetition, index|
         row = champ.rows[index] || champ.add_row(champ.dossier_revision)
         JSON.parse(repetition).map do |key, value|
diff --git a/spec/models/types_de_champ/prefill_type_de_champ_spec.rb b/spec/models/types_de_champ/prefill_type_de_champ_spec.rb
index af0e3cfc9..f75fc8f1b 100644
--- a/spec/models/types_de_champ/prefill_type_de_champ_spec.rb
+++ b/spec/models/types_de_champ/prefill_type_de_champ_spec.rb
@@ -50,7 +50,7 @@ RSpec.describe TypesDeChamp::PrefillTypeDeChamp, type: :model do
     context 'when the type de champ is prefillable' do
       let(:type_de_champ) { build(:type_de_champ_email) }
 
-      it { expect(possible_values).to match([]) }
+      it { expect(possible_values).to match(["Une adresse email"]) }
     end
   end
 

From 63e7c17fdaef0e91c5e838a9ffd3965d0b752bba Mon Sep 17 00:00:00 2001
From: Damien Le Thiec <damien.lethiec@gmail.com>
Date: Fri, 3 Feb 2023 12:14:18 +0100
Subject: [PATCH 010/202] First tests for prefill repetition

---
 .../concerns/dossier_prefillable_concern.rb   |  2 +-
 spec/factories/type_de_champ.rb               |  1 +
 spec/models/champ_spec.rb                     |  4 ++--
 spec/models/dossier_spec.rb                   |  2 +-
 .../prefill_type_de_champ_spec.rb             |  6 +++++
 .../shared_examples_for_prefilled_dossier.rb  |  3 +++
 spec/system/users/dossier_prefill_get_spec.rb | 22 +++++++++++++++++--
 .../system/users/dossier_prefill_post_spec.rb | 14 +++++++++++-
 8 files changed, 47 insertions(+), 7 deletions(-)

diff --git a/app/models/concerns/dossier_prefillable_concern.rb b/app/models/concerns/dossier_prefillable_concern.rb
index 7537a7357..3ecbe7a04 100644
--- a/app/models/concerns/dossier_prefillable_concern.rb
+++ b/app/models/concerns/dossier_prefillable_concern.rb
@@ -7,7 +7,7 @@ module DossierPrefillableConcern
     return unless champs_public_attributes.any?
 
     attr = { prefilled: true }
-    attr[:champs_public_all_attributes] = champs_public_attributes.compact.map { |h| h.merge(prefilled: true) }
+    attr[:champs_public_all_attributes] = champs_public_attributes.map { |h| h.merge(prefilled: true) }
 
     assign_attributes(attr)
     save(validate: false)
diff --git a/spec/factories/type_de_champ.rb b/spec/factories/type_de_champ.rb
index 1b90fa19f..c67b2f7e3 100644
--- a/spec/factories/type_de_champ.rb
+++ b/spec/factories/type_de_champ.rb
@@ -198,6 +198,7 @@ FactoryBot.define do
           parent = revision.revision_types_de_champ.find { |rtdc| rtdc.type_de_champ == type_de_champ_repetition }
 
           build(:type_de_champ, procedure: evaluator.procedure, libelle: 'sub type de champ', parent: parent, position: 0)
+          build(:type_de_champ, type_champ: TypeDeChamp.type_champs.fetch(:integer_number), procedure: evaluator.procedure, libelle: 'sub type de champ2', parent: parent, position: 1)
         end
       end
     end
diff --git a/spec/models/champ_spec.rb b/spec/models/champ_spec.rb
index 1fe22200f..84bbbbc6d 100644
--- a/spec/models/champ_spec.rb
+++ b/spec/models/champ_spec.rb
@@ -545,12 +545,12 @@ describe Champ do
 
         champ.champs << champ_integer
         first_row = champ.reload.rows.first
-        expect(first_row.size).to eq(2)
+        expect(first_row.size).to eq(3)
         expect(first_row.second).to eq(champ_integer)
 
         champ.champs << champ_text
         first_row = champ.reload.rows.first
-        expect(first_row.size).to eq(2)
+        expect(first_row.size).to eq(3)
         expect(first_row.first).to eq(champ_text)
 
         expect(champ.rows.size).to eq(2)
diff --git a/spec/models/dossier_spec.rb b/spec/models/dossier_spec.rb
index 9a684dcb7..f4d94a27b 100644
--- a/spec/models/dossier_spec.rb
+++ b/spec/models/dossier_spec.rb
@@ -1861,7 +1861,7 @@ describe Dossier do
           let(:champ_repetition) { create(:champ_repetition, type_de_champ: type_de_champ_repetition, dossier: dossier) }
           before { dossier.champs_public << champ_repetition }
 
-          it { expect(Champs::RepetitionChamp.where(dossier: new_dossier).first.champs.count).to eq(2) }
+          it { expect(Champs::RepetitionChamp.where(dossier: new_dossier).first.champs.count).to eq(4) }
           it { expect(Champs::RepetitionChamp.where(dossier: new_dossier).first.champs.ids).not_to eq(champ_repetition.champs.ids) }
         end
 
diff --git a/spec/models/types_de_champ/prefill_type_de_champ_spec.rb b/spec/models/types_de_champ/prefill_type_de_champ_spec.rb
index f75fc8f1b..c870b61a9 100644
--- a/spec/models/types_de_champ/prefill_type_de_champ_spec.rb
+++ b/spec/models/types_de_champ/prefill_type_de_champ_spec.rb
@@ -22,6 +22,12 @@ RSpec.describe TypesDeChamp::PrefillTypeDeChamp, type: :model do
       it { expect(built).to be_kind_of(TypesDeChamp::PrefillRegionTypeDeChamp) }
     end
 
+    context 'when the type de champ is a repetition' do
+      let(:type_de_champ) { build(:type_de_champ_repetition) }
+
+      it { expect(built).to be_kind_of(TypesDeChamp::PrefillRepetitionTypeDeChamp) }
+    end
+
     context 'when any other type de champ' do
       let(:type_de_champ) { build(:type_de_champ_date) }
 
diff --git a/spec/support/shared_examples_for_prefilled_dossier.rb b/spec/support/shared_examples_for_prefilled_dossier.rb
index 274588a75..78fcf74c7 100644
--- a/spec/support/shared_examples_for_prefilled_dossier.rb
+++ b/spec/support/shared_examples_for_prefilled_dossier.rb
@@ -18,5 +18,8 @@ shared_examples "the user has got a prefilled dossier, owned by themselves" do
     expect(page).to have_field(type_de_champ_text.libelle, with: text_value)
     expect(page).to have_field(type_de_champ_phone.libelle, with: phone_value)
     expect(page).to have_css('label', text: type_de_champ_phone.libelle)
+    expect(page).to have_css('h3', text: type_de_champ_repetition.libelle)
+    expect(page).to have_field(text_repetition_libelle, with: text_repetition_value)
+    expect(page).to have_field(integer_repetition_libelle, with: integer_repetition_value)
   end
 end
diff --git a/spec/system/users/dossier_prefill_get_spec.rb b/spec/system/users/dossier_prefill_get_spec.rb
index d7b9eed35..7be6f739e 100644
--- a/spec/system/users/dossier_prefill_get_spec.rb
+++ b/spec/system/users/dossier_prefill_get_spec.rb
@@ -6,8 +6,14 @@ describe 'Prefilling a dossier (with a GET request):' do
 
   let(:type_de_champ_text) { create(:type_de_champ_text, procedure: procedure) }
   let(:type_de_champ_phone) { create(:type_de_champ_phone, procedure: procedure) }
+  let(:type_de_champ_repetition) { create(:type_de_champ_repetition, :with_types_de_champ, procedure: procedure) }
   let(:text_value) { "My Neighbor Totoro is the best movie ever" }
   let(:phone_value) { "invalid phone value" }
+  let(:sub_type_de_champs_repetition) { type_de_champ_repetition.active_revision_type_de_champ.revision_types_de_champ.map(&:type_de_champ) }
+  let(:text_repetition_libelle) { sub_type_de_champs_repetition.first.libelle }
+  let(:integer_repetition_libelle) { sub_type_de_champs_repetition.second.libelle }
+  let(:text_repetition_value) { "First repetition text" }
+  let(:integer_repetition_value) { "42" }
 
   context 'when authenticated' do
     it_behaves_like "the user has got a prefilled dossier, owned by themselves" do
@@ -20,7 +26,13 @@ describe 'Prefilling a dossier (with a GET request):' do
         visit commencer_path(
           path: procedure.path,
           "champ_#{type_de_champ_text.to_typed_id}" => text_value,
-          "champ_#{type_de_champ_phone.to_typed_id}" => phone_value
+          "champ_#{type_de_champ_phone.to_typed_id}" => phone_value,
+          "champ_#{type_de_champ_repetition.to_typed_id}" => [
+            "{
+              \"#{sub_type_de_champs_repetition.first.libelle}\": \"#{text_repetition_value}\",
+              \"#{sub_type_de_champs_repetition.second.libelle}\": \"#{integer_repetition_value}\"
+            }"
+          ]
         )
 
         click_on "Commencer la démarche"
@@ -33,7 +45,13 @@ describe 'Prefilling a dossier (with a GET request):' do
       visit commencer_path(
         path: procedure.path,
         "champ_#{type_de_champ_text.to_typed_id}" => text_value,
-        "champ_#{type_de_champ_phone.to_typed_id}" => phone_value
+        "champ_#{type_de_champ_phone.to_typed_id}" => phone_value,
+        "champ_#{type_de_champ_repetition.to_typed_id}" => [
+          "{
+            \"#{sub_type_de_champs_repetition.first.libelle}\": \"#{text_repetition_value}\",
+            \"#{sub_type_de_champs_repetition.second.libelle}\": \"#{integer_repetition_value}\"
+          }"
+        ]
       )
     end
 
diff --git a/spec/system/users/dossier_prefill_post_spec.rb b/spec/system/users/dossier_prefill_post_spec.rb
index 8b495da8d..d95371365 100644
--- a/spec/system/users/dossier_prefill_post_spec.rb
+++ b/spec/system/users/dossier_prefill_post_spec.rb
@@ -6,8 +6,14 @@ describe 'Prefilling a dossier (with a POST request):' do
 
   let(:type_de_champ_text) { create(:type_de_champ_text, procedure: procedure) }
   let(:type_de_champ_phone) { create(:type_de_champ_phone, procedure: procedure) }
+  let(:type_de_champ_repetition) { create(:type_de_champ_repetition, :with_types_de_champ, procedure: procedure) }
   let(:text_value) { "My Neighbor Totoro is the best movie ever" }
   let(:phone_value) { "invalid phone value" }
+  let(:sub_type_de_champs_repetition) { type_de_champ_repetition.active_revision_type_de_champ.revision_types_de_champ.map(&:type_de_champ) }
+  let(:text_repetition_libelle) { sub_type_de_champs_repetition.first.libelle }
+  let(:integer_repetition_libelle) { sub_type_de_champs_repetition.second.libelle }
+  let(:text_repetition_value) { "First repetition text" }
+  let(:integer_repetition_value) { "42" }
 
   scenario "the user get the URL of a prefilled orphan brouillon dossier" do
     dossier_url = create_and_prefill_dossier_with_post_request
@@ -95,7 +101,13 @@ describe 'Prefilling a dossier (with a POST request):' do
       headers: { "Content-Type" => "application/json" },
       params: {
         "champ_#{type_de_champ_text.to_typed_id}" => text_value,
-        "champ_#{type_de_champ_phone.to_typed_id}" => phone_value
+        "champ_#{type_de_champ_phone.to_typed_id}" => phone_value,
+        "champ_#{type_de_champ_repetition.to_typed_id}" => [
+          "{
+            \"#{sub_type_de_champs_repetition.first.libelle}\": \"#{text_repetition_value}\",
+            \"#{sub_type_de_champs_repetition.second.libelle}\": \"#{integer_repetition_value}\"
+          }"
+        ]
       }.to_json
     JSON.parse(session.response.body)["dossier_url"].gsub("http://www.example.com", "")
   end

From b9c2d1251b5256996016d48d3739b2bd740d0672 Mon Sep 17 00:00:00 2001
From: Damien Le Thiec <damien.lethiec@gmail.com>
Date: Mon, 6 Feb 2023 17:38:59 +0100
Subject: [PATCH 011/202] Add missing tests repetition prefill

---
 config/locales/en.yml                         |  1 +
 config/locales/fr.yml                         |  1 +
 spec/factories/type_de_champ.rb               |  9 ++++
 spec/models/prefill_description_spec.rb       | 20 +++++----
 spec/models/prefill_params_spec.rb            |  2 +-
 .../prefill_repetition_type_de_champ_spec.rb  | 41 +++++++++++++++++++
 .../prefill_type_de_champ_spec.rb             | 23 +++++++++++
 7 files changed, 89 insertions(+), 8 deletions(-)
 create mode 100644 spec/models/types_de_champ/prefill_repetition_type_de_champ_spec.rb

diff --git a/config/locales/en.yml b/config/locales/en.yml
index ed8ed14c7..b47b1f5e8 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -128,6 +128,7 @@ en:
           checkbox_html: '"true" to check, "false" to uncheck'
           pays_html: An <a href="https://en.wikipedia.org/wiki/ISO_3166-2" target="_blank">ISO 3166-2 country code</a>
           regions_html: An <a href="https://fr.wikipedia.org/wiki/R%C3%A9gion_fran%C3%A7aise" target="_blank">INSEE region code</a>
+          drop_down_list_html: A choice among those selected when the procedure was created
           date_html: ISO8601 date
           datetime_html: ISO8601 datetime
           drop_down_list_other_html: Any value
diff --git a/config/locales/fr.yml b/config/locales/fr.yml
index 3c37f96b5..5d6b6e3ef 100644
--- a/config/locales/fr.yml
+++ b/config/locales/fr.yml
@@ -119,6 +119,7 @@ fr:
           checkbox_html: '"true" pour coché, "false" pour décoché'
           pays_html: Un <a href="https://en.wikipedia.org/wiki/ISO_3166-2" target="_blank">code pays ISO 3166-2</a>
           regions_html: Un <a href="https://fr.wikipedia.org/wiki/R%C3%A9gion_fran%C3%A7aise" target="_blank">code INSEE de région</a>
+          drop_down_list_html: Un choix parmi ceux sélectionnés à la création de la procédure
           datetime_html: Datetime au format ISO8601
           date_html: Date au format ISO8601
           drop_down_list_other_html: Toute valeur
diff --git a/spec/factories/type_de_champ.rb b/spec/factories/type_de_champ.rb
index c67b2f7e3..f538ef10f 100644
--- a/spec/factories/type_de_champ.rb
+++ b/spec/factories/type_de_champ.rb
@@ -201,6 +201,15 @@ FactoryBot.define do
           build(:type_de_champ, type_champ: TypeDeChamp.type_champs.fetch(:integer_number), procedure: evaluator.procedure, libelle: 'sub type de champ2', parent: parent, position: 1)
         end
       end
+
+      trait :with_region_types_de_champ do
+        after(:build) do |type_de_champ_repetition, evaluator|
+          revision = evaluator.procedure.active_revision
+          parent = revision.revision_types_de_champ.find { |rtdc| rtdc.type_de_champ == type_de_champ_repetition }
+
+          build(:type_de_champ, type_champ: TypeDeChamp.type_champs.fetch(:regions), procedure: evaluator.procedure, libelle: 'region sub_champ', parent: parent, position: 10)
+        end
+      end
     end
   end
 end
diff --git a/spec/models/prefill_description_spec.rb b/spec/models/prefill_description_spec.rb
index 8029d2834..362a13c85 100644
--- a/spec/models/prefill_description_spec.rb
+++ b/spec/models/prefill_description_spec.rb
@@ -88,36 +88,42 @@ RSpec.describe PrefillDescription, type: :model do
     end
   end
 
-  describe '#prefill_link' do
+  describe '#prefill_link', vcr: { cassette_name: 'api_geo_regions' } do
     let(:procedure) { create(:procedure) }
     let(:type_de_champ) { create(:type_de_champ_text, procedure: procedure) }
+    let(:type_de_champ_repetition) { build(:type_de_champ_repetition, :with_types_de_champ, :with_region_types_de_champ, procedure: procedure) }
+    let(:prefillable_subchamps) { TypesDeChamp::PrefillRepetitionTypeDeChamp.new(type_de_champ_repetition).send(:prefillable_subchamps) }
+    let(:region_repetition) { prefillable_subchamps.third }
     let(:prefill_description) { described_class.new(procedure) }
 
-    before { prefill_description.update(selected_type_de_champ_ids: [type_de_champ.id]) }
+    before { prefill_description.update(selected_type_de_champ_ids: [type_de_champ.id, type_de_champ_repetition.id]) }
 
     it "builds the URL to create a new prefilled dossier" do
       expect(prefill_description.prefill_link).to eq(
         commencer_url(
           path: procedure.path,
-          "champ_#{type_de_champ.to_typed_id}" => I18n.t("views.prefill_descriptions.edit.examples.#{type_de_champ.type_champ}")
+          "champ_#{type_de_champ.to_typed_id}" => I18n.t("views.prefill_descriptions.edit.examples.#{type_de_champ.type_champ}"),
+          "champ_#{type_de_champ_repetition.to_typed_id}" => TypesDeChamp::PrefillTypeDeChamp.build(type_de_champ_repetition).example_value
         )
       )
     end
   end
 
-  describe '#prefill_query' do
+  describe '#prefill_query', vcr: { cassette_name: 'api_geo_regions' } do
     let(:procedure) { create(:procedure) }
     let(:type_de_champ) { create(:type_de_champ_text, procedure: procedure) }
+    let(:type_de_champ_repetition) { build(:type_de_champ_repetition, :with_types_de_champ, :with_region_types_de_champ, procedure: procedure) }
+    let(:prefillable_subchamps) { TypesDeChamp::PrefillRepetitionTypeDeChamp.new(type_de_champ_repetition).send(:prefillable_subchamps) }
+    let(:region_repetition) { prefillable_subchamps.third }
     let(:prefill_description) { described_class.new(procedure) }
     let(:expected_query) do
       <<~TEXT
         curl --request POST '#{api_public_v1_dossiers_url(procedure)}' \\
              --header 'Content-Type: application/json' \\
-             --data '{"champ_#{type_de_champ.to_typed_id}": "#{I18n.t("views.prefill_descriptions.edit.examples.#{type_de_champ.type_champ}")}"}'
+             --data '{"champ_#{type_de_champ.to_typed_id}": "#{I18n.t("views.prefill_descriptions.edit.examples.#{type_de_champ.type_champ}")}", "champ_#{type_de_champ_repetition.to_typed_id}": #{TypesDeChamp::PrefillTypeDeChamp.build(type_de_champ_repetition).example_value}}'
       TEXT
     end
-
-    before { prefill_description.update(selected_type_de_champ_ids: [type_de_champ.id]) }
+    before { prefill_description.update(selected_type_de_champ_ids: [type_de_champ.id, type_de_champ_repetition.id]) }
 
     it "builds the query to create a new prefilled dossier" do
       expect(prefill_description.prefill_query).to eq(expected_query)
diff --git a/spec/models/prefill_params_spec.rb b/spec/models/prefill_params_spec.rb
index 84c99a26b..5be3f1db8 100644
--- a/spec/models/prefill_params_spec.rb
+++ b/spec/models/prefill_params_spec.rb
@@ -144,6 +144,7 @@ RSpec.describe PrefillParams do
     it_behaves_like "a champ private value that is authorized", :checkbox, "false"
     it_behaves_like "a champ private value that is authorized", :drop_down_list, "value"
     it_behaves_like "a champ private value that is authorized", :regions, "93"
+    it_behaves_like "a champ public value that is unauthorized", :repetition, "[{\"name\":\"value\"}, {\"name\":\"value2\"}]"
 
     it_behaves_like "a champ public value that is unauthorized", :decimal_number, "non decimal string"
     it_behaves_like "a champ public value that is unauthorized", :integer_number, "non integer string"
@@ -160,7 +161,6 @@ RSpec.describe PrefillParams do
     it_behaves_like "a champ public value that is unauthorized", :header_section, "value"
     it_behaves_like "a champ public value that is unauthorized", :explication, "value"
     it_behaves_like "a champ public value that is unauthorized", :piece_justificative, "value"
-    it_behaves_like "a champ public value that is unauthorized", :repetition, "value"
     it_behaves_like "a champ public value that is unauthorized", :cnaf, "value"
     it_behaves_like "a champ public value that is unauthorized", :dgfip, "value"
     it_behaves_like "a champ public value that is unauthorized", :pole_emploi, "value"
diff --git a/spec/models/types_de_champ/prefill_repetition_type_de_champ_spec.rb b/spec/models/types_de_champ/prefill_repetition_type_de_champ_spec.rb
new file mode 100644
index 000000000..cf3b8886b
--- /dev/null
+++ b/spec/models/types_de_champ/prefill_repetition_type_de_champ_spec.rb
@@ -0,0 +1,41 @@
+# frozen_string_literal: true
+
+RSpec.describe TypesDeChamp::PrefillRepetitionTypeDeChamp, type: :model, vcr: { cassette_name: 'api_geo_regions' } do
+  let(:procedure) { build(:procedure) }
+  let(:type_de_champ) { build(:type_de_champ_repetition, :with_types_de_champ, :with_region_types_de_champ, procedure: procedure) }
+  let(:prefillable_subchamps) { TypesDeChamp::PrefillRepetitionTypeDeChamp.new(type_de_champ).send(:prefillable_subchamps) }
+  let(:region_repetition) { prefillable_subchamps.third }
+  let(:memory_store) { ActiveSupport::Cache.lookup_store(:memory_store) }
+
+  before do
+    allow(Rails).to receive(:cache).and_return(memory_store)
+    Rails.cache.clear
+  end
+
+  describe 'ancestors' do
+    subject { described_class.build(type_de_champ) }
+
+    it { is_expected.to be_kind_of(TypesDeChamp::PrefillTypeDeChamp) }
+  end
+
+  describe '#possible_values' do
+    subject(:possible_values) { described_class.new(type_de_champ).possible_values }
+    let(:expected_value) { ["sub type de champ: Un texte court", "sub type de champ2: Un nombre entier", "region sub_champ: <a title=\"Toutes les valeurs possibles — Nouvel onglet\" target=\"_blank\" rel=\"noopener noreferrer\" href=\"/procedures/#{procedure.path}/prefill_type_de_champs/#{region_repetition.id}\">Voir toutes les valeurs possibles</a>"] }
+
+    it { expect(possible_values).to eq(expected_value) }
+  end
+
+  describe '#example_value' do
+    subject(:example_value) { described_class.new(type_de_champ).example_value }
+    let(:expected_value) { ["{\"sub type de champ\":\"Texte court\", \"sub type de champ2\":\"42\", \"region sub_champ\":\"53\"}", "{\"sub type de champ\":\"Texte court\", \"sub type de champ2\":\"42\", \"region sub_champ\":\"53\"}"] }
+
+    it { expect(example_value).to eq(expected_value) }
+  end
+
+  describe '#possible_values_sentence' do
+    subject(:possible_values_sentence) { described_class.new(type_de_champ).possible_values_sentence }
+    let(:expected_value) { "Un array de hash avec les valeurs possibles pour chaque champ de la répétition.<br>sub type de champ: Un texte court<br>sub type de champ2: Un nombre entier<br>region sub_champ: <a title=\"Toutes les valeurs possibles — Nouvel onglet\" target=\"_blank\" rel=\"noopener noreferrer\" href=\"/procedures/#{procedure.path}/prefill_type_de_champs/#{region_repetition.id}\">Voir toutes les valeurs possibles</a>" }
+
+    it { expect(possible_values_sentence).to eq(expected_value) }
+  end
+end
diff --git a/spec/models/types_de_champ/prefill_type_de_champ_spec.rb b/spec/models/types_de_champ/prefill_type_de_champ_spec.rb
index c870b61a9..9c38b49e1 100644
--- a/spec/models/types_de_champ/prefill_type_de_champ_spec.rb
+++ b/spec/models/types_de_champ/prefill_type_de_champ_spec.rb
@@ -60,6 +60,29 @@ RSpec.describe TypesDeChamp::PrefillTypeDeChamp, type: :model do
     end
   end
 
+  describe '#possible_values_sentence' do
+    subject(:possible_values_sentence) { described_class.build(type_de_champ).possible_values_sentence }
+
+    context 'when the type de champ is not prefillable' do
+      let(:type_de_champ) { build(:type_de_champ_mesri) }
+
+      it { expect(possible_values_sentence).to be_empty }
+    end
+
+    context 'when there is too many possible values' do
+      let(:type_de_champ) { build(:type_de_champ_drop_down_list) }
+      before { type_de_champ.drop_down_options = (1..described_class::POSSIBLE_VALUES_THRESHOLD + 1).map(&:to_s) }
+
+      it { expect(possible_values_sentence).to match("Un choix parmi ceux sélectionnés à la création de la procédure") }
+    end
+
+    context 'when the type de champ is prefillable' do
+      let(:type_de_champ) { build(:type_de_champ_email) }
+
+      it { expect(possible_values_sentence).to match("Une adresse email") }
+    end
+  end
+
   describe '#example_value' do
     subject(:example_value) { described_class.build(type_de_champ).example_value }
 

From a51ed0094bc0a30b3efe62ee8673aa8a079453d6 Mon Sep 17 00:00:00 2001
From: Damien Le Thiec <damien.lethiec@gmail.com>
Date: Tue, 7 Feb 2023 00:28:21 +0100
Subject: [PATCH 012/202] Fix tests

---
 .../api/v1/dossiers_controller_spec.rb        |  6 ++--
 ...0220705164551_remove_unused_champs_spec.rb |  4 +--
 spec/models/champ_spec.rb                     | 10 ++----
 spec/models/procedure_revision_spec.rb        | 35 ++++++++++---------
 4 files changed, 26 insertions(+), 29 deletions(-)

diff --git a/spec/controllers/api/v1/dossiers_controller_spec.rb b/spec/controllers/api/v1/dossiers_controller_spec.rb
index af705addd..23ba99781 100644
--- a/spec/controllers/api/v1/dossiers_controller_spec.rb
+++ b/spec/controllers/api/v1/dossiers_controller_spec.rb
@@ -279,9 +279,9 @@ describe API::V1::DossiersController do
             it 'should have rows' do
               expect(subject.size).to eq(2)
               expect(subject[0][:id]).to eq(1)
-              expect(subject[0][:champs].size).to eq(1)
-              expect(subject[0][:champs].map { |c| c[:value] }).to eq(['text'])
-              expect(subject[0][:champs].map { |c| c[:type_de_champ][:type_champ] }).to eq(['text'])
+              expect(subject[0][:champs].size).to eq(2)
+              expect(subject[0][:champs].map { |c| c[:value] }).to eq(['text', 42])
+              expect(subject[0][:champs].map { |c| c[:type_de_champ][:type_champ] }).to eq(['text', 'integer_number'])
             end
           end
         end
diff --git a/spec/lib/tasks/deployment/20220705164551_remove_unused_champs_spec.rb b/spec/lib/tasks/deployment/20220705164551_remove_unused_champs_spec.rb
index bd0180fd7..29161bc24 100644
--- a/spec/lib/tasks/deployment/20220705164551_remove_unused_champs_spec.rb
+++ b/spec/lib/tasks/deployment/20220705164551_remove_unused_champs_spec.rb
@@ -21,9 +21,9 @@ describe '20220705164551_remove_unused_champs' do
 
   describe 'remove_unused_champs', vcr: { cassette_name: 'api_geo_all' } do
     it "with bad champs" do
-      expect(Champ.where(dossier: dossier).count).to eq(38)
+      expect(Champ.where(dossier: dossier).count).to eq(40)
       run_task
-      expect(Champ.where(dossier: dossier).count).to eq(37)
+      expect(Champ.where(dossier: dossier).count).to eq(39)
     end
   end
 end
diff --git a/spec/models/champ_spec.rb b/spec/models/champ_spec.rb
index 84bbbbc6d..622d62cb4 100644
--- a/spec/models/champ_spec.rb
+++ b/spec/models/champ_spec.rb
@@ -510,10 +510,6 @@ describe Champ do
     let(:champ_integer) { champ.champs.find { |c| c.type_champ == 'integer_number' } }
     let(:champ_text_attrs) { attributes_for(:champ_text, type_de_champ: tdc_text, row_id: ULID.generate) }
 
-    before do
-      procedure.active_revision.add_type_de_champ(libelle: 'sub integer', type_champ: 'integer_number', parent_stable_id: tdc_repetition.stable_id)
-    end
-
     context 'when creating the model directly' do
       let(:champ_text_row_1) { create(:champ_text, type_de_champ: tdc_text, row_id: ULID.generate, parent: champ, dossier: nil) }
 
@@ -539,18 +535,18 @@ describe Champ do
 
         expect(dossier.champs_public.size).to eq(2)
         expect(champ.rows.size).to eq(2)
-        second_row = champ.rows.second
+        second_row = champ.reload.rows.second
         expect(second_row.size).to eq(1)
         expect(second_row.first.dossier).to eq(dossier)
 
         champ.champs << champ_integer
         first_row = champ.reload.rows.first
-        expect(first_row.size).to eq(3)
+        expect(first_row.size).to eq(2)
         expect(first_row.second).to eq(champ_integer)
 
         champ.champs << champ_text
         first_row = champ.reload.rows.first
-        expect(first_row.size).to eq(3)
+        expect(first_row.size).to eq(2)
         expect(first_row.first).to eq(champ_text)
 
         expect(champ.rows.size).to eq(2)
diff --git a/spec/models/procedure_revision_spec.rb b/spec/models/procedure_revision_spec.rb
index 9f3277267..7b85c0d39 100644
--- a/spec/models/procedure_revision_spec.rb
+++ b/spec/models/procedure_revision_spec.rb
@@ -134,15 +134,15 @@ describe ProcedureRevision do
       end
 
       it 'move down' do
-        expect(draft.children_of(type_de_champ_repetition).index(second_child)).to eq(1)
-
-        draft.move_type_de_champ(second_child.stable_id, 2)
-
         expect(draft.children_of(type_de_champ_repetition).index(second_child)).to eq(2)
+
+        draft.move_type_de_champ(second_child.stable_id, 3)
+
+        expect(draft.children_of(type_de_champ_repetition).index(second_child)).to eq(3)
       end
 
       it 'move up' do
-        expect(draft.children_of(type_de_champ_repetition).index(last_child)).to eq(2)
+        expect(draft.children_of(type_de_champ_repetition).index(last_child)).to eq(3)
 
         draft.move_type_de_champ(last_child.stable_id, 0)
 
@@ -205,13 +205,13 @@ describe ProcedureRevision do
 
         it 'reorders' do
           children = draft.children_of(type_de_champ_repetition)
-          expect(children.pluck(:position)).to eq([0, 1, 2])
+          expect(children.pluck(:position)).to eq([0, 1, 2, 3])
 
           draft.remove_type_de_champ(children[1].stable_id)
 
           children.reload
 
-          expect(children.pluck(:position)).to eq([0, 1])
+          expect(children.pluck(:position)).to eq([0, 1, 2])
         end
       end
     end
@@ -242,8 +242,8 @@ describe ProcedureRevision do
           new_draft.remove_type_de_champ(child.stable_id)
 
           expect { child.reload }.not_to raise_error
-          expect(draft.children_of(type_de_champ_repetition).size).to eq(1)
-          expect(new_draft.children_of(type_de_champ_repetition)).to be_empty
+          expect(draft.children_of(type_de_champ_repetition).size).to eq(2)
+          expect(new_draft.children_of(type_de_champ_repetition).size).to eq(1)
         end
 
         it 'can remove the parent only in the new revision' do
@@ -291,7 +291,7 @@ describe ProcedureRevision do
       let(:procedure) { create(:procedure, :with_repetition) }
 
       it 'should have the same tdcs with different links' do
-        expect(new_draft.types_de_champ.count).to eq(2)
+        expect(new_draft.types_de_champ.count).to eq(3)
         expect(new_draft.types_de_champ).to eq(draft.types_de_champ)
 
         new_repetition, new_child = new_draft.types_de_champ.partition(&:repetition?).map(&:first)
@@ -320,7 +320,7 @@ describe ProcedureRevision do
 
       it do
         expect(procedure.revisions.size).to eq(2)
-        expect(draft.revision_types_de_champ.where.not(parent_id: nil).size).to eq(1)
+        expect(draft.revision_types_de_champ.where.not(parent_id: nil).size).to eq(2)
       end
     end
   end
@@ -639,9 +639,10 @@ describe ProcedureRevision do
     context 'with a repetition tdc' do
       let(:procedure) { create(:procedure, :with_repetition) }
       let!(:parent) { draft.types_de_champ.find(&:repetition?) }
-      let!(:child) { draft.types_de_champ.reject(&:repetition?).first }
+      let!(:first_child) { draft.types_de_champ.reject(&:repetition?).first }
+      let!(:second_child) { draft.types_de_champ.reject(&:repetition?).second }
 
-      it { expect(draft.children_of(parent)).to match([child]) }
+      it { expect(draft.children_of(parent)).to match([first_child, second_child]) }
 
       context 'with multiple child' do
         let(:child_position_2) { create(:type_de_champ_text) }
@@ -654,7 +655,7 @@ describe ProcedureRevision do
         end
 
         it 'returns the children in order' do
-          expect(draft.children_of(parent)).to eq([child, child_position_1, child_position_2])
+          expect(draft.children_of(parent)).to eq([first_child, second_child, child_position_1, child_position_2])
         end
       end
 
@@ -668,13 +669,13 @@ describe ProcedureRevision do
         before do
           new_draft
             .revision_types_de_champ
-            .where(type_de_champ: child)
+            .where(type_de_champ: first_child)
             .update(type_de_champ: new_child)
         end
 
         it 'returns the children regarding the revision' do
-          expect(draft.children_of(parent)).to match([child])
-          expect(new_draft.children_of(parent)).to match([new_child])
+          expect(draft.children_of(parent)).to match([first_child, second_child])
+          expect(new_draft.children_of(parent)).to match([new_child, second_child])
         end
       end
     end

From c5f1f80d25b20b73669a558359e7fa2ce94a9d5f Mon Sep 17 00:00:00 2001
From: Damien Le Thiec <damien.lethiec@gmail.com>
Date: Wed, 8 Feb 2023 17:38:51 +0100
Subject: [PATCH 013/202] Add prefill params tests repetition

---
 app/models/prefill_params.rb       |  2 +-
 spec/models/prefill_params_spec.rb | 53 +++++++++++++++++++++++++++++-
 2 files changed, 53 insertions(+), 2 deletions(-)

diff --git a/app/models/prefill_params.rb b/app/models/prefill_params.rb
index 335cd005b..591b25fdf 100644
--- a/app/models/prefill_params.rb
+++ b/app/models/prefill_params.rb
@@ -83,7 +83,7 @@ class PrefillParams
           id = row.find { |champ| champ.libelle == key }&.id
           next unless id
           { id: id, value: value }
-        end
+        end.compact
       rescue JSON::ParserError
       end.compact
     end
diff --git a/spec/models/prefill_params_spec.rb b/spec/models/prefill_params_spec.rb
index 5be3f1db8..dc3108efe 100644
--- a/spec/models/prefill_params_spec.rb
+++ b/spec/models/prefill_params_spec.rb
@@ -127,6 +127,20 @@ RSpec.describe PrefillParams do
     it_behaves_like "a champ public value that is authorized", :drop_down_list, "value"
     it_behaves_like "a champ public value that is authorized", :regions, "03"
 
+    context "when the public type de champ is authorized (repetition)" do
+      let(:types_de_champ_public) { [{ type: :repetition, children: [{ type: :text }] }] }
+      let(:type_de_champ) { procedure.published_revision.types_de_champ_public.first }
+      let(:type_de_champ_child) { procedure.published_revision.children_of(type_de_champ).first }
+      let(:type_de_champ_child_value) { "value" }
+      let(:type_de_champ_child_value2) { "value2" }
+
+      let(:params) { { "champ_#{type_de_champ.to_typed_id}" => ["{\"#{type_de_champ_child.libelle}\":\"#{type_de_champ_child_value}\"}", "{\"#{type_de_champ_child.libelle}\":\"#{type_de_champ_child_value2}\"}"] } }
+
+      it "builds an array of hash(id, value) matching the given params" do
+        expect(prefill_params_array).to match([{ id: type_de_champ_child.champ.first.id, value: type_de_champ_child_value }, { id: type_de_champ_child.champ.second.id, value: type_de_champ_child_value2 }])
+      end
+    end
+
     it_behaves_like "a champ private value that is authorized", :text, "value"
     it_behaves_like "a champ private value that is authorized", :textarea, "value"
     it_behaves_like "a champ private value that is authorized", :decimal_number, "3.14"
@@ -144,7 +158,20 @@ RSpec.describe PrefillParams do
     it_behaves_like "a champ private value that is authorized", :checkbox, "false"
     it_behaves_like "a champ private value that is authorized", :drop_down_list, "value"
     it_behaves_like "a champ private value that is authorized", :regions, "93"
-    it_behaves_like "a champ public value that is unauthorized", :repetition, "[{\"name\":\"value\"}, {\"name\":\"value2\"}]"
+
+    context "when the private type de champ is authorized (repetition)" do
+      let(:types_de_champ_private) { [{ type: :repetition, children: [{ type: :text }] }] }
+      let(:type_de_champ) { procedure.published_revision.types_de_champ_private.first }
+      let(:type_de_champ_child) { procedure.published_revision.children_of(type_de_champ).first }
+      let(:type_de_champ_child_value) { "value" }
+      let(:type_de_champ_child_value2) { "value2" }
+
+      let(:params) { { "champ_#{type_de_champ.to_typed_id}" => ["{\"#{type_de_champ_child.libelle}\":\"#{type_de_champ_child_value}\"}", "{\"#{type_de_champ_child.libelle}\":\"#{type_de_champ_child_value2}\"}"] } }
+
+      it "builds an array of hash(id, value) matching the given params" do
+        expect(prefill_params_array).to match([{ id: type_de_champ_child.champ.first.id, value: type_de_champ_child_value }, { id: type_de_champ_child.champ.second.id, value: type_de_champ_child_value2 }])
+      end
+    end
 
     it_behaves_like "a champ public value that is unauthorized", :decimal_number, "non decimal string"
     it_behaves_like "a champ public value that is unauthorized", :integer_number, "non integer string"
@@ -173,6 +200,30 @@ RSpec.describe PrefillParams do
     it_behaves_like "a champ public value that is unauthorized", :siret, "value"
     it_behaves_like "a champ public value that is unauthorized", :rna, "value"
     it_behaves_like "a champ public value that is unauthorized", :annuaire_education, "value"
+
+    context "when the public type de champ is unauthorized because of wrong value format (repetition)" do
+      let(:types_de_champ_public) { [{ type: :repetition, children: [{ type: :text }] }] }
+      let(:type_de_champ) { procedure.published_revision.types_de_champ_public.first }
+      let(:type_de_champ_child) { procedure.published_revision.children_of(type_de_champ).first }
+
+      let(:params) { { "champ_#{type_de_champ.to_typed_id}" => "value" } }
+
+      it "builds an array of hash(id, value) matching the given params" do
+        expect(prefill_params_array).to match([])
+      end
+    end
+
+    context "when the public type de champ is unauthorized because of wrong value libelle (repetition)" do
+      let(:types_de_champ_public) { [{ type: :repetition, children: [{ type: :text }] }] }
+      let(:type_de_champ) { procedure.published_revision.types_de_champ_public.first }
+      let(:type_de_champ_child) { procedure.published_revision.children_of(type_de_champ).first }
+
+      let(:params) { { "champ_#{type_de_champ.to_typed_id}" => ["{\"wrong\":\"value\"}", "{\"wrong\":\"value2\"}"] } }
+
+      it "builds an array of hash(id, value) matching the given params" do
+        expect(prefill_params_array).to match([])
+      end
+    end
   end
 
   private

From 5526cb5173d1c4cd70c5a459e9d66f90471ddf4c Mon Sep 17 00:00:00 2001
From: Colin Darie <colin@darie.eu>
Date: Thu, 9 Feb 2023 17:39:56 +0100
Subject: [PATCH 014/202] fix(mail): limit generated subjects to 100 characters

---
 app/mailers/notification_mailer.rb       |  3 ++-
 config/locales/en.yml                    | 13 +++++++++++++
 config/locales/fr.yml                    | 13 +++++++++++++
 spec/mailers/notification_mailer_spec.rb | 17 +++++++++++++++++
 4 files changed, 45 insertions(+), 1 deletion(-)

diff --git a/app/mailers/notification_mailer.rb b/app/mailers/notification_mailer.rb
index 89f79c1db..8f8bb6c57 100644
--- a/app/mailers/notification_mailer.rb
+++ b/app/mailers/notification_mailer.rb
@@ -7,6 +7,7 @@
 #
 class NotificationMailer < ApplicationMailer
   include ActionView::Helpers::SanitizeHelper
+  include ActionView::Helpers::TextHelper
 
   before_action :set_dossier
   before_action :set_services_publics_plus, only: :send_notification
@@ -67,7 +68,7 @@ class NotificationMailer < ApplicationMailer
         mail_template = @dossier.procedure.mail_template_for(params[:state])
 
         @email = @dossier.user_email_for(:notification)
-        @subject = mail_template.subject_for_dossier(@dossier)
+        @subject = truncate(mail_template.subject_for_dossier(@dossier), length: 100)
         @body = mail_template.body_for_dossier(@dossier)
         @actions = mail_template.actions_for_dossier(@dossier)
         @attachment = mail_template.attachment_for_dossier(@dossier)
diff --git a/config/locales/en.yml b/config/locales/en.yml
index 17d80a709..dc8be05ec 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -395,6 +395,19 @@ en:
         zone: This procedure is run by
       champs:
         value: Value
+      default_mail_attributes: &default_mail_attributes
+        hints:
+          subject: The generated subject will be truncated if it exceeds 100 characters.
+      mails/closed_mail:
+        << : *default_mail_attributes
+      mails/initiated_mail:
+        << : *default_mail_attributes
+      mails/received_mail:
+        << : *default_mail_attributes
+      mails/refused_mail:
+        << : *default_mail_attributes
+      mails/without_continuation_mail:
+        << : *default_mail_attributes
 
     errors:
       messages:
diff --git a/config/locales/fr.yml b/config/locales/fr.yml
index efd5e4d63..d4b864c28 100644
--- a/config/locales/fr.yml
+++ b/config/locales/fr.yml
@@ -392,6 +392,19 @@ fr:
         zone: La démarche est mise en œuvre par
       champs:
         value: Valeur du champ
+      default_mail_attributes: &default_mail_attributes
+        hints:
+          subject: "L’objet généré sera tronqué s’il dépasse 100 caractères."
+      mails/closed_mail:
+        << : *default_mail_attributes
+      mails/initiated_mail:
+        << : *default_mail_attributes
+      mails/received_mail:
+        << : *default_mail_attributes
+      mails/refused_mail:
+        << : *default_mail_attributes
+      mails/without_continuation_mail:
+        << : *default_mail_attributes
 
     errors:
       messages:
diff --git a/spec/mailers/notification_mailer_spec.rb b/spec/mailers/notification_mailer_spec.rb
index 005db343c..4fd8ae6cd 100644
--- a/spec/mailers/notification_mailer_spec.rb
+++ b/spec/mailers/notification_mailer_spec.rb
@@ -101,4 +101,21 @@ RSpec.describe NotificationMailer, type: :mailer do
       end
     end
   end
+
+  describe 'subject length' do
+    let(:procedure) { create(:simple_procedure, libelle: "My super long title " + ("xo " * 100)) }
+    let(:dossier) { create(:dossier, :en_instruction, :with_individual, :with_service, user: user, procedure: procedure) }
+    let(:email_template) { create(:closed_mail, subject:, body: 'Your dossier was accepted. Thanks.') }
+
+    before do
+      dossier.procedure.closed_mail = email_template
+    end
+
+    subject(:mail) { described_class.send_accepte_notification(dossier) }
+
+    context "subject is too long" do
+      let(:subject) { 'Un long libellé --libellé démarche--' }
+      it { expect(mail.subject.length).to be <= 100 }
+    end
+  end
 end

From aeb602a63d5fe716a004f205f7ca83e17274ed16 Mon Sep 17 00:00:00 2001
From: Colin Darie <colin@darie.eu>
Date: Thu, 9 Feb 2023 17:49:43 +0100
Subject: [PATCH 015/202] fix(mail): default subject fallback when subject
 template is empty

Closes #8448
---
 app/models/concerns/mail_template_concern.rb | 2 +-
 spec/mailers/notification_mailer_spec.rb     | 6 ++++++
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/app/models/concerns/mail_template_concern.rb b/app/models/concerns/mail_template_concern.rb
index e778c681d..a5035bbd8 100644
--- a/app/models/concerns/mail_template_concern.rb
+++ b/app/models/concerns/mail_template_concern.rb
@@ -10,7 +10,7 @@ module MailTemplateConcern
   end
 
   def subject_for_dossier(dossier)
-    replace_tags(subject, dossier)
+    replace_tags(subject, dossier).presence || replace_tags(self.class::DEFAULT_SUBJECT, dossier)
   end
 
   def body_for_dossier(dossier)
diff --git a/spec/mailers/notification_mailer_spec.rb b/spec/mailers/notification_mailer_spec.rb
index 4fd8ae6cd..25e77eb4d 100644
--- a/spec/mailers/notification_mailer_spec.rb
+++ b/spec/mailers/notification_mailer_spec.rb
@@ -117,5 +117,11 @@ RSpec.describe NotificationMailer, type: :mailer do
       let(:subject) { 'Un long libellé --libellé démarche--' }
       it { expect(mail.subject.length).to be <= 100 }
     end
+
+    context "subject should fallback to default" do
+      let(:subject) { "" }
+      it { expect(mail.subject).to match(/^Votre dossier .+ a été accepté \(My super long title/) }
+      it { expect(mail.subject.length).to be <= 100 }
+    end
   end
 end

From a4d707f942814d17c0f5a2827e22e4134bb67cf9 Mon Sep 17 00:00:00 2001
From: Damien Le Thiec <damien.lethiec@gmail.com>
Date: Thu, 9 Feb 2023 18:08:51 +0100
Subject: [PATCH 016/202] Improve format prefill possible_values (tests
 missing)

---
 .../prefill_drop_down_list_type_de_champ.rb   |  4 +-
 .../prefill_pays_type_de_champ.rb             |  2 +-
 .../prefill_region_type_de_champ.rb           |  2 +-
 .../prefill_repetition_type_de_champ.rb       | 26 +++++++------
 .../types_de_champ/prefill_type_de_champ.rb   | 23 +++++++++--
 .../_types_de_champs.html.haml                |  5 +--
 .../prefill_type_de_champs/show.html.haml     |  2 +-
 config/locales/fr.yml                         |  2 +-
 .../prefill_repetition_type_de_champ_spec.rb  |  2 +-
 .../prefill_type_de_champ_spec.rb             | 39 ++-----------------
 10 files changed, 45 insertions(+), 62 deletions(-)

diff --git a/app/models/types_de_champ/prefill_drop_down_list_type_de_champ.rb b/app/models/types_de_champ/prefill_drop_down_list_type_de_champ.rb
index 7e3a4ad22..648f2d17e 100644
--- a/app/models/types_de_champ/prefill_drop_down_list_type_de_champ.rb
+++ b/app/models/types_de_champ/prefill_drop_down_list_type_de_champ.rb
@@ -1,5 +1,5 @@
 class TypesDeChamp::PrefillDropDownListTypeDeChamp < TypesDeChamp::PrefillTypeDeChamp
-  def possible_values
+  def possible_values_list
     if drop_down_other?
       drop_down_list_enabled_non_empty_options.insert(
         0,
@@ -11,6 +11,6 @@ class TypesDeChamp::PrefillDropDownListTypeDeChamp < TypesDeChamp::PrefillTypeDe
   end
 
   def example_value
-    possible_values.first
+    possible_values_list.first
   end
 end
diff --git a/app/models/types_de_champ/prefill_pays_type_de_champ.rb b/app/models/types_de_champ/prefill_pays_type_de_champ.rb
index 143f041e7..a5e6aad21 100644
--- a/app/models/types_de_champ/prefill_pays_type_de_champ.rb
+++ b/app/models/types_de_champ/prefill_pays_type_de_champ.rb
@@ -1,5 +1,5 @@
 class TypesDeChamp::PrefillPaysTypeDeChamp < TypesDeChamp::PrefillTypeDeChamp
-  def possible_values
+  def possible_values_list
     countries.map { |country| "#{country[:code]} (#{country[:name]})" }
   end
 
diff --git a/app/models/types_de_champ/prefill_region_type_de_champ.rb b/app/models/types_de_champ/prefill_region_type_de_champ.rb
index 3084206a1..7d52601b4 100644
--- a/app/models/types_de_champ/prefill_region_type_de_champ.rb
+++ b/app/models/types_de_champ/prefill_region_type_de_champ.rb
@@ -1,5 +1,5 @@
 class TypesDeChamp::PrefillRegionTypeDeChamp < TypesDeChamp::PrefillTypeDeChamp
-  def possible_values
+  def possible_values_list
     regions.map { |region| "#{region[:code]} (#{region[:name]})" }
   end
 
diff --git a/app/models/types_de_champ/prefill_repetition_type_de_champ.rb b/app/models/types_de_champ/prefill_repetition_type_de_champ.rb
index e72ce1709..906451d79 100644
--- a/app/models/types_de_champ/prefill_repetition_type_de_champ.rb
+++ b/app/models/types_de_champ/prefill_repetition_type_de_champ.rb
@@ -3,24 +3,26 @@ class TypesDeChamp::PrefillRepetitionTypeDeChamp < TypesDeChamp::PrefillTypeDeCh
   include ApplicationHelper
 
   def possible_values
-    prefillable_subchamps.map do |prefill_type_de_champ|
-      if prefill_type_de_champ.too_many_possible_values?
-        link = link_to I18n.t("views.prefill_descriptions.edit.possible_values.link.text"), Rails.application.routes.url_helpers.prefill_type_de_champ_path(prefill_type_de_champ.path, prefill_type_de_champ), title: ActionController::Base.helpers.sanitize(new_tab_suffix(I18n.t("views.prefill_descriptions.edit.possible_values.link.title"))), **external_link_attributes
-        "#{prefill_type_de_champ.libelle}: #{link}"
-      else
-        "#{prefill_type_de_champ.libelle}: #{prefill_type_de_champ.possible_values_sentence}"
-      end
-    end
+    [
+      I18n.t("views.prefill_descriptions.edit.possible_values.#{type_champ}_html"),
+      subchamps_possible_values_list
+    ].join("</br>").html_safe # rubocop:disable Rails/OutputSafety
   end
 
-  def possible_values_sentence
-    "#{I18n.t("views.prefill_descriptions.edit.possible_values.#{type_champ}_html")}<br>#{possible_values.join("<br>")}".html_safe # rubocop:disable Rails/OutputSafety
+  def subchamps_possible_values_list
+    "<ul>" + prefillable_subchamps.map do |prefill_type_de_champ|
+      "<li>#{prefill_type_de_champ.libelle}: #{prefill_type_de_champ.possible_values}</li>"
+    end.join + "</ul>"
   end
 
   def example_value
     [row_values_format, row_values_format].map { |row| row.to_s.gsub("=>", ":") }
   end
 
+  def too_many_possible_values?
+    false
+  end
+
   private
 
   def row_values_format
@@ -33,6 +35,8 @@ class TypesDeChamp::PrefillRepetitionTypeDeChamp < TypesDeChamp::PrefillTypeDeCh
   def prefillable_subchamps
     return [] unless active_revision_type_de_champ
 
-    TypesDeChamp::PrefillTypeDeChamp.wrap(active_revision_type_de_champ.revision_types_de_champ.map(&:type_de_champ).filter(&:prefillable?))
+    @prefillable_subchamps ||=
+      TypesDeChamp::PrefillTypeDeChamp.wrap(active_revision_type_de_champ.revision_types_de_champ.map(&:type_de_champ).filter(&:prefillable?))
   end
+
 end
diff --git a/app/models/types_de_champ/prefill_type_de_champ.rb b/app/models/types_de_champ/prefill_type_de_champ.rb
index 99017da47..cc3776880 100644
--- a/app/models/types_de_champ/prefill_type_de_champ.rb
+++ b/app/models/types_de_champ/prefill_type_de_champ.rb
@@ -1,5 +1,8 @@
 class TypesDeChamp::PrefillTypeDeChamp < SimpleDelegator
-  POSSIBLE_VALUES_THRESHOLD = 5
+  include ActionView::Helpers::UrlHelper
+  include ApplicationHelper
+
+  POSSIBLE_VALUES_THRESHOLD = 1
 
   def self.build(type_de_champ)
     case type_de_champ.type_champ
@@ -21,11 +24,21 @@ class TypesDeChamp::PrefillTypeDeChamp < SimpleDelegator
   end
 
   def possible_values
+    [possible_values_list_display, link_to_all_possible_values].compact.join('<br>').html_safe
+  end
+
+  def possible_values_list
     return [] unless prefillable?
 
     [I18n.t("views.prefill_descriptions.edit.possible_values.#{type_champ}_html")]
   end
 
+  def link_to_all_possible_values
+    return unless too_many_possible_values?
+
+    link_to I18n.t("views.prefill_descriptions.edit.possible_values.link.text"), Rails.application.routes.url_helpers.prefill_type_de_champ_path(path, self), title: new_tab_suffix(I18n.t("views.prefill_descriptions.edit.possible_values.link.title")), **external_link_attributes
+  end
+
   def example_value
     return nil unless prefillable?
 
@@ -33,14 +46,16 @@ class TypesDeChamp::PrefillTypeDeChamp < SimpleDelegator
   end
 
   def too_many_possible_values?
-    possible_values.count > POSSIBLE_VALUES_THRESHOLD
+    possible_values_list.count > POSSIBLE_VALUES_THRESHOLD
   end
 
-  def possible_values_sentence
+  private
+
+  def possible_values_list_display
     if too_many_possible_values?
       I18n.t("views.prefill_descriptions.edit.possible_values.#{type_champ}_html").html_safe # rubocop:disable Rails/OutputSafety
     else
-      possible_values.to_sentence
+      possible_values_list.to_sentence
     end
   end
 end
diff --git a/app/views/prefill_descriptions/_types_de_champs.html.haml b/app/views/prefill_descriptions/_types_de_champs.html.haml
index b668fc17d..c31804d54 100644
--- a/app/views/prefill_descriptions/_types_de_champs.html.haml
+++ b/app/views/prefill_descriptions/_types_de_champs.html.haml
@@ -39,10 +39,7 @@
                 %th
                   = t("views.prefill_descriptions.edit.possible_values.title")
                 %td
-                  = type_de_champ.possible_values_sentence
-                  %br
-                  - if type_de_champ.too_many_possible_values?
-                    = link_to t("views.prefill_descriptions.edit.possible_values.link.text"), prefill_type_de_champ_path(prefill_description.path, type_de_champ), title: new_tab_suffix(t("views.prefill_descriptions.edit.possible_values.link.title")), **external_link_attributes
+                  = type_de_champ.possible_values
               %tr{ class: prefillable ? "" : "fr-text-mention--grey" }
                 %th
                   = t("views.prefill_descriptions.edit.examples.title")
diff --git a/app/views/prefill_type_de_champs/show.html.haml b/app/views/prefill_type_de_champs/show.html.haml
index bad0c9deb..8a1610340 100644
--- a/app/views/prefill_type_de_champs/show.html.haml
+++ b/app/views/prefill_type_de_champs/show.html.haml
@@ -26,7 +26,7 @@
             = t("views.prefill_descriptions.edit.possible_values.title")
           %td
             .fr-grid-row.fr-grid-row--gutters.fr-py-5w
-              - @type_de_champ.possible_values.each do |possible_value|
+              - @type_de_champ.possible_values_list.each do |possible_value|
                 .fr-col-lg-3.fr-col-md-4.fr-col-sm-6.fr-col-12
                   = possible_value
         %tr
diff --git a/config/locales/fr.yml b/config/locales/fr.yml
index 5d6b6e3ef..f1cc424c7 100644
--- a/config/locales/fr.yml
+++ b/config/locales/fr.yml
@@ -123,7 +123,7 @@ fr:
           datetime_html: Datetime au format ISO8601
           date_html: Date au format ISO8601
           drop_down_list_other_html: Toute valeur
-          repetition_html: Un array de hash avec les valeurs possibles pour chaque champ de la répétition.
+          repetition_html: Un tableau de dictionnaires avec les valeurs possibles pour chaque champ de la répétition.
         examples:
           title: Exemple
           text: Texte court
diff --git a/spec/models/types_de_champ/prefill_repetition_type_de_champ_spec.rb b/spec/models/types_de_champ/prefill_repetition_type_de_champ_spec.rb
index cf3b8886b..0598e0740 100644
--- a/spec/models/types_de_champ/prefill_repetition_type_de_champ_spec.rb
+++ b/spec/models/types_de_champ/prefill_repetition_type_de_champ_spec.rb
@@ -34,7 +34,7 @@ RSpec.describe TypesDeChamp::PrefillRepetitionTypeDeChamp, type: :model, vcr: {
 
   describe '#possible_values_sentence' do
     subject(:possible_values_sentence) { described_class.new(type_de_champ).possible_values_sentence }
-    let(:expected_value) { "Un array de hash avec les valeurs possibles pour chaque champ de la répétition.<br>sub type de champ: Un texte court<br>sub type de champ2: Un nombre entier<br>region sub_champ: <a title=\"Toutes les valeurs possibles — Nouvel onglet\" target=\"_blank\" rel=\"noopener noreferrer\" href=\"/procedures/#{procedure.path}/prefill_type_de_champs/#{region_repetition.id}\">Voir toutes les valeurs possibles</a>" }
+    let(:expected_value) { "Un tableau de dictionnaires avec les valeurs possibles pour chaque champ de la répétition.<br>sub type de champ: Un texte court<br>sub type de champ2: Un nombre entier<br>region sub_champ: <a title=\"Toutes les valeurs possibles — Nouvel onglet\" target=\"_blank\" rel=\"noopener noreferrer\" href=\"/procedures/#{procedure.path}/prefill_type_de_champs/#{region_repetition.id}\">Voir toutes les valeurs possibles</a>" }
 
     it { expect(possible_values_sentence).to eq(expected_value) }
   end
diff --git a/spec/models/types_de_champ/prefill_type_de_champ_spec.rb b/spec/models/types_de_champ/prefill_type_de_champ_spec.rb
index 9c38b49e1..3a8686c6c 100644
--- a/spec/models/types_de_champ/prefill_type_de_champ_spec.rb
+++ b/spec/models/types_de_champ/prefill_type_de_champ_spec.rb
@@ -53,33 +53,17 @@ RSpec.describe TypesDeChamp::PrefillTypeDeChamp, type: :model do
       it { expect(possible_values).to be_empty }
     end
 
-    context 'when the type de champ is prefillable' do
-      let(:type_de_champ) { build(:type_de_champ_email) }
-
-      it { expect(possible_values).to match(["Une adresse email"]) }
-    end
-  end
-
-  describe '#possible_values_sentence' do
-    subject(:possible_values_sentence) { described_class.build(type_de_champ).possible_values_sentence }
-
-    context 'when the type de champ is not prefillable' do
-      let(:type_de_champ) { build(:type_de_champ_mesri) }
-
-      it { expect(possible_values_sentence).to be_empty }
-    end
-
     context 'when there is too many possible values' do
-      let(:type_de_champ) { build(:type_de_champ_drop_down_list) }
+      let(:type_de_champ) { create(:type_de_champ_drop_down_list) }
       before { type_de_champ.drop_down_options = (1..described_class::POSSIBLE_VALUES_THRESHOLD + 1).map(&:to_s) }
 
-      it { expect(possible_values_sentence).to match("Un choix parmi ceux sélectionnés à la création de la procédure") }
+      it { expect(possible_values).to match("Un choix parmi ceux sélectionnés à la création de la procédure") }
     end
 
     context 'when the type de champ is prefillable' do
       let(:type_de_champ) { build(:type_de_champ_email) }
 
-      it { expect(possible_values_sentence).to match("Une adresse email") }
+      it { expect(possible_values).to match("Une adresse email") }
     end
   end
 
@@ -98,21 +82,4 @@ RSpec.describe TypesDeChamp::PrefillTypeDeChamp, type: :model do
       it { expect(example_value).to eq(I18n.t("views.prefill_descriptions.edit.examples.#{type_de_champ.type_champ}")) }
     end
   end
-
-  describe '#too_many_possible_values?' do
-    let(:type_de_champ) { build(:type_de_champ_drop_down_list) }
-    subject(:too_many_possible_values) { described_class.build(type_de_champ).too_many_possible_values? }
-
-    context 'when there are too many possible values' do
-      before { type_de_champ.drop_down_options = (1..described_class::POSSIBLE_VALUES_THRESHOLD + 1).map(&:to_s) }
-
-      it { expect(too_many_possible_values).to eq(true) }
-    end
-
-    context 'when there are not too many possible values' do
-      before { type_de_champ.drop_down_options = (1..described_class::POSSIBLE_VALUES_THRESHOLD).map(&:to_s) }
-
-      it { expect(too_many_possible_values).to eq(false) }
-    end
-  end
 end

From d5f40cfd964f707b95544ce9b0b5da1871eb134f Mon Sep 17 00:00:00 2001
From: Fabrice Gangler <dzc34@users.noreply.github.com>
Date: Fri, 10 Feb 2023 12:40:38 +0100
Subject: [PATCH 017/202] docs: add DATAGOUV_STATISTICS_DATASET environment
 variable  to env.example.optional file

Refs: #8615
---
 config/env.example.optional | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/config/env.example.optional b/config/env.example.optional
index c3924f529..63d32c047 100644
--- a/config/env.example.optional
+++ b/config/env.example.optional
@@ -134,14 +134,16 @@ VITE_LEGACY=""
 
 # around july 2022, we changed the duree_conservation_dossiers_dans_ds, allow instances to choose their own duration
 NEW_MAX_DUREE_CONSERVATION=12
-#
-OPENDATA_ENABLED="enabled"
 
-# Publish to datagouv
+# Open data
+OPENDATA_ENABLED="enabled" # disabled by default if `OPENDATA_ENABLED` not set
+
+# Open data, publish to data.gouv.fr
 DATAGOUV_API_KEY="thisisasecret"
 DATAGOUV_API_URL="https://www.data.gouv.fr/api/1"
-DATAGOUV_DESCRIPTIF_DEMARCHES_DATASET="datasetid"
-DATAGOUV_DESCRIPTIF_DEMARCHES_RESOURCE="resourceid"
+DATAGOUV_STATISTICS_DATASET="dataset-id1"
+DATAGOUV_DESCRIPTIF_DEMARCHES_DATASET="dataset-id2"
+DATAGOUV_DESCRIPTIF_DEMARCHES_RESOURCE="resource-id-of-dataset-id2"
 
 # Zonage
 ZONAGE_ENABLED='enabled' # zonage disabled by default if `ZONAGE_ENABLED` not set

From 2a3ba283438a72e3f7a9ff725f4eb64b3171b8d2 Mon Sep 17 00:00:00 2001
From: Damien Le Thiec <damien.lethiec@gmail.com>
Date: Sat, 11 Feb 2023 22:27:16 +0100
Subject: [PATCH 018/202] Fix tests possible value prefill

---
 .../prefill_drop_down_list_type_de_champ.rb   | 10 +++---
 .../prefill_pays_type_de_champ.rb             |  8 ++---
 .../prefill_region_type_de_champ.rb           |  4 +--
 .../prefill_repetition_type_de_champ.rb       | 13 ++++----
 .../types_de_champ/prefill_type_de_champ.rb   | 32 +++++++++----------
 ...efill_drop_down_list_type_de_champ_spec.rb | 11 ++++---
 .../prefill_pays_type_de_champ_spec.rb        | 11 +++++--
 .../prefill_region_type_de_champ_spec.rb      | 11 +++++--
 .../prefill_repetition_type_de_champ_spec.rb  | 15 ++++-----
 .../prefill_type_de_champ_spec.rb             |  8 ++---
 10 files changed, 68 insertions(+), 55 deletions(-)

diff --git a/app/models/types_de_champ/prefill_drop_down_list_type_de_champ.rb b/app/models/types_de_champ/prefill_drop_down_list_type_de_champ.rb
index 648f2d17e..b5505151f 100644
--- a/app/models/types_de_champ/prefill_drop_down_list_type_de_champ.rb
+++ b/app/models/types_de_champ/prefill_drop_down_list_type_de_champ.rb
@@ -1,4 +1,10 @@
 class TypesDeChamp::PrefillDropDownListTypeDeChamp < TypesDeChamp::PrefillTypeDeChamp
+  def example_value
+    possible_values_list.first
+  end
+
+  private
+
   def possible_values_list
     if drop_down_other?
       drop_down_list_enabled_non_empty_options.insert(
@@ -9,8 +15,4 @@ class TypesDeChamp::PrefillDropDownListTypeDeChamp < TypesDeChamp::PrefillTypeDe
       drop_down_list_enabled_non_empty_options
     end
   end
-
-  def example_value
-    possible_values_list.first
-  end
 end
diff --git a/app/models/types_de_champ/prefill_pays_type_de_champ.rb b/app/models/types_de_champ/prefill_pays_type_de_champ.rb
index a5e6aad21..cf0fa0278 100644
--- a/app/models/types_de_champ/prefill_pays_type_de_champ.rb
+++ b/app/models/types_de_champ/prefill_pays_type_de_champ.rb
@@ -1,14 +1,14 @@
 class TypesDeChamp::PrefillPaysTypeDeChamp < TypesDeChamp::PrefillTypeDeChamp
-  def possible_values_list
-    countries.map { |country| "#{country[:code]} (#{country[:name]})" }
-  end
-
   def example_value
     countries.pick(:code)
   end
 
   private
 
+  def possible_values_list
+    countries.map { |country| "#{country[:code]} (#{country[:name]})" }
+  end
+
   def countries
     @countries ||= APIGeoService.countries.sort_by { |country| country[:code] }
   end
diff --git a/app/models/types_de_champ/prefill_region_type_de_champ.rb b/app/models/types_de_champ/prefill_region_type_de_champ.rb
index 7d52601b4..6362fccac 100644
--- a/app/models/types_de_champ/prefill_region_type_de_champ.rb
+++ b/app/models/types_de_champ/prefill_region_type_de_champ.rb
@@ -1,10 +1,10 @@
 class TypesDeChamp::PrefillRegionTypeDeChamp < TypesDeChamp::PrefillTypeDeChamp
+  private
+
   def possible_values_list
     regions.map { |region| "#{region[:code]} (#{region[:name]})" }
   end
 
-  private
-
   def regions
     @regions ||= APIGeoService.regions.sort_by { |region| region[:code] }
   end
diff --git a/app/models/types_de_champ/prefill_repetition_type_de_champ.rb b/app/models/types_de_champ/prefill_repetition_type_de_champ.rb
index 906451d79..ad809b1ee 100644
--- a/app/models/types_de_champ/prefill_repetition_type_de_champ.rb
+++ b/app/models/types_de_champ/prefill_repetition_type_de_champ.rb
@@ -9,21 +9,22 @@ class TypesDeChamp::PrefillRepetitionTypeDeChamp < TypesDeChamp::PrefillTypeDeCh
     ].join("</br>").html_safe # rubocop:disable Rails/OutputSafety
   end
 
-  def subchamps_possible_values_list
-    "<ul>" + prefillable_subchamps.map do |prefill_type_de_champ|
-      "<li>#{prefill_type_de_champ.libelle}: #{prefill_type_de_champ.possible_values}</li>"
-    end.join + "</ul>"
-  end
 
   def example_value
     [row_values_format, row_values_format].map { |row| row.to_s.gsub("=>", ":") }
   end
 
+  private
+
   def too_many_possible_values?
     false
   end
 
-  private
+  def subchamps_possible_values_list
+    "<ul>" + prefillable_subchamps.map do |prefill_type_de_champ|
+      "<li>#{prefill_type_de_champ.libelle}: #{prefill_type_de_champ.possible_values}</li>"
+    end.join + "</ul>"
+  end
 
   def row_values_format
     @row_example_value ||=
diff --git a/app/models/types_de_champ/prefill_type_de_champ.rb b/app/models/types_de_champ/prefill_type_de_champ.rb
index cc3776880..35a8fd955 100644
--- a/app/models/types_de_champ/prefill_type_de_champ.rb
+++ b/app/models/types_de_champ/prefill_type_de_champ.rb
@@ -2,7 +2,7 @@ class TypesDeChamp::PrefillTypeDeChamp < SimpleDelegator
   include ActionView::Helpers::UrlHelper
   include ApplicationHelper
 
-  POSSIBLE_VALUES_THRESHOLD = 1
+  POSSIBLE_VALUES_THRESHOLD = 5
 
   def self.build(type_de_champ)
     case type_de_champ.type_champ
@@ -24,19 +24,7 @@ class TypesDeChamp::PrefillTypeDeChamp < SimpleDelegator
   end
 
   def possible_values
-    [possible_values_list_display, link_to_all_possible_values].compact.join('<br>').html_safe
-  end
-
-  def possible_values_list
-    return [] unless prefillable?
-
-    [I18n.t("views.prefill_descriptions.edit.possible_values.#{type_champ}_html")]
-  end
-
-  def link_to_all_possible_values
-    return unless too_many_possible_values?
-
-    link_to I18n.t("views.prefill_descriptions.edit.possible_values.link.text"), Rails.application.routes.url_helpers.prefill_type_de_champ_path(path, self), title: new_tab_suffix(I18n.t("views.prefill_descriptions.edit.possible_values.link.title")), **external_link_attributes
+    [possible_values_list_display, link_to_all_possible_values].compact.join('<br>').html_safe # rubocop:disable Rails/OutputSafety
   end
 
   def example_value
@@ -45,12 +33,24 @@ class TypesDeChamp::PrefillTypeDeChamp < SimpleDelegator
     I18n.t("views.prefill_descriptions.edit.examples.#{type_champ}")
   end
 
+  private
+
+  def possible_values_list
+    return [] unless prefillable?
+
+    [I18n.t("views.prefill_descriptions.edit.possible_values.#{type_champ}_html")]
+  end
+
+  def link_to_all_possible_values
+    return unless too_many_possible_values? && prefillable?
+
+    link_to I18n.t("views.prefill_descriptions.edit.possible_values.link.text"), Rails.application.routes.url_helpers.prefill_type_de_champ_path(path, self), title: new_tab_suffix(I18n.t("views.prefill_descriptions.edit.possible_values.link.title")), **external_link_attributes
+  end
+
   def too_many_possible_values?
     possible_values_list.count > POSSIBLE_VALUES_THRESHOLD
   end
 
-  private
-
   def possible_values_list_display
     if too_many_possible_values?
       I18n.t("views.prefill_descriptions.edit.possible_values.#{type_champ}_html").html_safe # rubocop:disable Rails/OutputSafety
diff --git a/spec/models/types_de_champ/prefill_drop_down_list_type_de_champ_spec.rb b/spec/models/types_de_champ/prefill_drop_down_list_type_de_champ_spec.rb
index fc7d4e573..499ce5b3f 100644
--- a/spec/models/types_de_champ/prefill_drop_down_list_type_de_champ_spec.rb
+++ b/spec/models/types_de_champ/prefill_drop_down_list_type_de_champ_spec.rb
@@ -2,22 +2,25 @@
 
 RSpec.describe TypesDeChamp::PrefillDropDownListTypeDeChamp do
   describe '#possible_values' do
+    let(:procedure) { create(:procedure) }
     subject(:possible_values) { described_class.new(type_de_champ).possible_values }
 
+    before { type_de_champ.reload }
+
     context "when the drop down list accepts 'other'" do
-      let(:type_de_champ) { build(:type_de_champ_drop_down_list, :with_other) }
+      let(:type_de_champ) { build(:type_de_champ_drop_down_list, :with_other, procedure: procedure) }
 
       it {
         expect(possible_values).to match(
-          [I18n.t("views.prefill_descriptions.edit.possible_values.drop_down_list_other_html")] + type_de_champ.drop_down_list_enabled_non_empty_options
+          ([I18n.t("views.prefill_descriptions.edit.possible_values.drop_down_list_other_html")] + type_de_champ.drop_down_list_enabled_non_empty_options).to_sentence
         )
       }
     end
 
     context "when the drop down list does not accept 'other'" do
-      let(:type_de_champ) { build(:type_de_champ_drop_down_list) }
+      let(:type_de_champ) { build(:type_de_champ_drop_down_list, procedure:) }
 
-      it { expect(possible_values).to match(type_de_champ.drop_down_list_enabled_non_empty_options) }
+      it { expect(possible_values).to match(type_de_champ.drop_down_list_enabled_non_empty_options.to_sentence) }
     end
   end
 
diff --git a/spec/models/types_de_champ/prefill_pays_type_de_champ_spec.rb b/spec/models/types_de_champ/prefill_pays_type_de_champ_spec.rb
index f651d3d60..baffe29dc 100644
--- a/spec/models/types_de_champ/prefill_pays_type_de_champ_spec.rb
+++ b/spec/models/types_de_champ/prefill_pays_type_de_champ_spec.rb
@@ -1,12 +1,17 @@
 
 RSpec.describe TypesDeChamp::PrefillPaysTypeDeChamp, type: :model do
-  let(:type_de_champ) { build(:type_de_champ_pays) }
+  let(:procedure) { create(:procedure) }
+  let(:type_de_champ) { build(:type_de_champ_pays, procedure: procedure) }
 
   describe '#possible_values' do
-    let(:expected_values) { APIGeoService.countries.sort_by { |country| country[:code] }.map { |country| "#{country[:code]} (#{country[:name]})" } }
+    let(:expected_values) { "Un <a href=\"https://en.wikipedia.org/wiki/ISO_3166-2\" target=\"_blank\">code pays ISO 3166-2</a><br><a title=\"Toutes les valeurs possibles — Nouvel onglet\" target=\"_blank\" rel=\"noopener noreferrer\" href=\"/procedures/#{procedure.path}/prefill_type_de_champs/#{type_de_champ.id}\">Voir toutes les valeurs possibles</a>" }
     subject(:possible_values) { described_class.new(type_de_champ).possible_values }
 
-    it { expect(possible_values).to match(expected_values) }
+    before { type_de_champ.reload }
+
+    it {
+      expect(possible_values).to match(expected_values)
+    }
   end
 
   describe '#example_value' do
diff --git a/spec/models/types_de_champ/prefill_region_type_de_champ_spec.rb b/spec/models/types_de_champ/prefill_region_type_de_champ_spec.rb
index 39fd75fb9..31d7b7a86 100644
--- a/spec/models/types_de_champ/prefill_region_type_de_champ_spec.rb
+++ b/spec/models/types_de_champ/prefill_region_type_de_champ_spec.rb
@@ -1,7 +1,8 @@
 # frozen_string_literal: true
 
 RSpec.describe TypesDeChamp::PrefillRegionTypeDeChamp, type: :model do
-  let(:type_de_champ) { build(:type_de_champ_regions) }
+  let(:procedure) { create(:procedure) }
+  let(:type_de_champ) { create(:type_de_champ_regions, procedure: procedure) }
   let(:memory_store) { ActiveSupport::Cache.lookup_store(:memory_store) }
 
   before do
@@ -16,9 +17,13 @@ RSpec.describe TypesDeChamp::PrefillRegionTypeDeChamp, type: :model do
   end
 
   describe '#possible_values', vcr: { cassette_name: 'api_geo_regions' } do
-    let(:expected_values) { APIGeoService.regions.sort_by { |region| region[:code] }.map { |region| "#{region[:code]} (#{region[:name]})" } }
+    let(:expected_values) { "Un <a href=\"https://fr.wikipedia.org/wiki/R%C3%A9gion_fran%C3%A7aise\" target=\"_blank\">code INSEE de région</a><br><a title=\"Toutes les valeurs possibles — Nouvel onglet\" target=\"_blank\" rel=\"noopener noreferrer\" href=\"/procedures/#{procedure.path}/prefill_type_de_champs/#{type_de_champ.id}\">Voir toutes les valeurs possibles</a>" }
     subject(:possible_values) { described_class.new(type_de_champ).possible_values }
 
-    it { expect(possible_values).to match(expected_values) }
+    before { type_de_champ.reload }
+
+    it {
+      expect(possible_values).to eq(expected_values)
+    }
   end
 end
diff --git a/spec/models/types_de_champ/prefill_repetition_type_de_champ_spec.rb b/spec/models/types_de_champ/prefill_repetition_type_de_champ_spec.rb
index 0598e0740..a613b5c86 100644
--- a/spec/models/types_de_champ/prefill_repetition_type_de_champ_spec.rb
+++ b/spec/models/types_de_champ/prefill_repetition_type_de_champ_spec.rb
@@ -20,9 +20,13 @@ RSpec.describe TypesDeChamp::PrefillRepetitionTypeDeChamp, type: :model, vcr: {
 
   describe '#possible_values' do
     subject(:possible_values) { described_class.new(type_de_champ).possible_values }
-    let(:expected_value) { ["sub type de champ: Un texte court", "sub type de champ2: Un nombre entier", "region sub_champ: <a title=\"Toutes les valeurs possibles — Nouvel onglet\" target=\"_blank\" rel=\"noopener noreferrer\" href=\"/procedures/#{procedure.path}/prefill_type_de_champs/#{region_repetition.id}\">Voir toutes les valeurs possibles</a>"] }
+    let(:expected_value) {
+      "Un tableau de dictionnaires avec les valeurs possibles pour chaque champ de la répétition.</br><ul><li>sub type de champ: Un texte court</li><li>sub type de champ2: Un nombre entier</li><li>region sub_champ: Un <a href=\"https://fr.wikipedia.org/wiki/R%C3%A9gion_fran%C3%A7aise\" target=\"_blank\">code INSEE de région</a><br><a title=\"Toutes les valeurs possibles — Nouvel onglet\" target=\"_blank\" rel=\"noopener noreferrer\" href=\"/procedures/#{procedure.path}/prefill_type_de_champs/#{region_repetition.id}\">Voir toutes les valeurs possibles</a></li></ul>"
+    }
 
-    it { expect(possible_values).to eq(expected_value) }
+    it {
+      expect(possible_values).to eq(expected_value)
+    }
   end
 
   describe '#example_value' do
@@ -31,11 +35,4 @@ RSpec.describe TypesDeChamp::PrefillRepetitionTypeDeChamp, type: :model, vcr: {
 
     it { expect(example_value).to eq(expected_value) }
   end
-
-  describe '#possible_values_sentence' do
-    subject(:possible_values_sentence) { described_class.new(type_de_champ).possible_values_sentence }
-    let(:expected_value) { "Un tableau de dictionnaires avec les valeurs possibles pour chaque champ de la répétition.<br>sub type de champ: Un texte court<br>sub type de champ2: Un nombre entier<br>region sub_champ: <a title=\"Toutes les valeurs possibles — Nouvel onglet\" target=\"_blank\" rel=\"noopener noreferrer\" href=\"/procedures/#{procedure.path}/prefill_type_de_champs/#{region_repetition.id}\">Voir toutes les valeurs possibles</a>" }
-
-    it { expect(possible_values_sentence).to eq(expected_value) }
-  end
 end
diff --git a/spec/models/types_de_champ/prefill_type_de_champ_spec.rb b/spec/models/types_de_champ/prefill_type_de_champ_spec.rb
index 3a8686c6c..34f407e0b 100644
--- a/spec/models/types_de_champ/prefill_type_de_champ_spec.rb
+++ b/spec/models/types_de_champ/prefill_type_de_champ_spec.rb
@@ -45,7 +45,7 @@ RSpec.describe TypesDeChamp::PrefillTypeDeChamp, type: :model do
   end
 
   describe '#possible_values' do
-    subject(:possible_values) { described_class.build(type_de_champ).possible_values }
+    subject(:possible_values) { described_class.new(type_de_champ).possible_values }
 
     context 'when the type de champ is not prefillable' do
       let(:type_de_champ) { build(:type_de_champ_mesri) }
@@ -54,16 +54,16 @@ RSpec.describe TypesDeChamp::PrefillTypeDeChamp, type: :model do
     end
 
     context 'when there is too many possible values' do
-      let(:type_de_champ) { create(:type_de_champ_drop_down_list) }
+      let(:type_de_champ) { create(:type_de_champ_drop_down_list, procedure: create(:procedure)) }
       before { type_de_champ.drop_down_options = (1..described_class::POSSIBLE_VALUES_THRESHOLD + 1).map(&:to_s) }
 
-      it { expect(possible_values).to match("Un choix parmi ceux sélectionnés à la création de la procédure") }
+      it { expect(possible_values).to eq("Un choix parmi ceux sélectionnés à la création de la procédure") }
     end
 
     context 'when the type de champ is prefillable' do
       let(:type_de_champ) { build(:type_de_champ_email) }
 
-      it { expect(possible_values).to match("Une adresse email") }
+      it { expect(possible_values).to eq("Une adresse email") }
     end
   end
 

From 4a6841c0099eba4fe231677751c30220f3884300 Mon Sep 17 00:00:00 2001
From: Damien Le Thiec <damien.lethiec@gmail.com>
Date: Sat, 11 Feb 2023 22:51:37 +0100
Subject: [PATCH 019/202] Fix linter

---
 app/models/types_de_champ/prefill_repetition_type_de_champ.rb | 2 --
 1 file changed, 2 deletions(-)

diff --git a/app/models/types_de_champ/prefill_repetition_type_de_champ.rb b/app/models/types_de_champ/prefill_repetition_type_de_champ.rb
index ad809b1ee..39d1c4f9c 100644
--- a/app/models/types_de_champ/prefill_repetition_type_de_champ.rb
+++ b/app/models/types_de_champ/prefill_repetition_type_de_champ.rb
@@ -9,7 +9,6 @@ class TypesDeChamp::PrefillRepetitionTypeDeChamp < TypesDeChamp::PrefillTypeDeCh
     ].join("</br>").html_safe # rubocop:disable Rails/OutputSafety
   end
 
-
   def example_value
     [row_values_format, row_values_format].map { |row| row.to_s.gsub("=>", ":") }
   end
@@ -39,5 +38,4 @@ class TypesDeChamp::PrefillRepetitionTypeDeChamp < TypesDeChamp::PrefillTypeDeCh
     @prefillable_subchamps ||=
       TypesDeChamp::PrefillTypeDeChamp.wrap(active_revision_type_de_champ.revision_types_de_champ.map(&:type_de_champ).filter(&:prefillable?))
   end
-
 end

From fc94aaaa2133a373f668005064dc0d7db6c27a27 Mon Sep 17 00:00:00 2001
From: Damien Le Thiec <damien.lethiec@gmail.com>
Date: Sun, 12 Feb 2023 11:55:28 +0100
Subject: [PATCH 020/202] Use "to_assignable_attributes"

---
 app/models/prefill_description.rb             |  6 +---
 app/models/prefill_params.rb                  | 31 ++++---------------
 .../prefill_repetition_type_de_champ.rb       | 16 ++++++++++
 .../types_de_champ/prefill_type_de_champ.rb   |  8 +++++
 spec/models/prefill_params_spec.rb            | 14 ++++++---
 .../prefill_type_de_champ_spec.rb             |  9 ++++++
 6 files changed, 50 insertions(+), 34 deletions(-)

diff --git a/app/models/prefill_description.rb b/app/models/prefill_description.rb
index 2198f5412..36dd6de2f 100644
--- a/app/models/prefill_description.rb
+++ b/app/models/prefill_description.rb
@@ -51,11 +51,7 @@ class PrefillDescription < SimpleDelegator
 
   def prefilled_champs_for_query
     prefilled_champs.map do |type_de_champ|
-      if type_de_champ.type_champ == TypeDeChamp.type_champs.fetch(:repetition)
-        "\"champ_#{type_de_champ.to_typed_id}\": #{type_de_champ.example_value}"
-      else
-        "\"champ_#{type_de_champ.to_typed_id}\": \"#{type_de_champ.example_value}\""
-      end
+      "\"champ_#{type_de_champ.to_typed_id}\": #{type_de_champ.formatted_example_value}"
     end.join(', ')
   end
 
diff --git a/app/models/prefill_params.rb b/app/models/prefill_params.rb
index 591b25fdf..5f3f58710 100644
--- a/app/models/prefill_params.rb
+++ b/app/models/prefill_params.rb
@@ -5,7 +5,7 @@ class PrefillParams
   end
 
   def to_a
-    build_prefill_values.filter(&:prefillable?).map(&:to_h).flatten
+    build_prefill_values.filter(&:prefillable?).map(&:champ_attributes).flatten
   end
 
   private
@@ -54,15 +54,10 @@ class PrefillParams
       champ.prefillable? && valid?
     end
 
-    def to_h
-      if champ.type_champ == TypeDeChamp.type_champs.fetch(:repetition)
-        repeatable_hashes
-      else
-        {
-          id: champ.id,
-          value: value
-        }
-      end
+    def champ_attributes
+      TypesDeChamp::PrefillTypeDeChamp
+        .build(champ.type_de_champ)
+        .to_assignable_attributes(champ, value)
     end
 
     private
@@ -70,22 +65,8 @@ class PrefillParams
     def valid?
       return true unless NEED_VALIDATION_TYPES_DE_CHAMPS.include?(champ.type_champ)
 
-      champ.value = value
+      champ.assign_attributes(champ_attributes)
       champ.valid?(:prefill)
     end
-
-    def repeatable_hashes
-      return [] unless value.is_a?(Array)
-
-      value.map.with_index do |repetition, index|
-        row = champ.rows[index] || champ.add_row(champ.dossier_revision)
-        JSON.parse(repetition).map do |key, value|
-          id = row.find { |champ| champ.libelle == key }&.id
-          next unless id
-          { id: id, value: value }
-        end.compact
-      rescue JSON::ParserError
-      end.compact
-    end
   end
 end
diff --git a/app/models/types_de_champ/prefill_repetition_type_de_champ.rb b/app/models/types_de_champ/prefill_repetition_type_de_champ.rb
index 39d1c4f9c..a99b38b2d 100644
--- a/app/models/types_de_champ/prefill_repetition_type_de_champ.rb
+++ b/app/models/types_de_champ/prefill_repetition_type_de_champ.rb
@@ -13,6 +13,22 @@ class TypesDeChamp::PrefillRepetitionTypeDeChamp < TypesDeChamp::PrefillTypeDeCh
     [row_values_format, row_values_format].map { |row| row.to_s.gsub("=>", ":") }
   end
 
+  alias_method :formatted_example_value, :example_value
+
+  def to_assignable_attributes(champ, value)
+    return [] unless value.is_a?(Array)
+
+    value.map.with_index do |repetition, index|
+      row = champ.rows[index] || champ.add_row(champ.dossier_revision)
+      JSON.parse(repetition).map do |key, value|
+        id = row.find { |champ| champ.libelle == key }&.id
+        next unless id
+        { id: id, value: value }
+      end.compact
+    rescue JSON::ParserError
+    end.compact
+  end
+
   private
 
   def too_many_possible_values?
diff --git a/app/models/types_de_champ/prefill_type_de_champ.rb b/app/models/types_de_champ/prefill_type_de_champ.rb
index 35a8fd955..8b6c0bbba 100644
--- a/app/models/types_de_champ/prefill_type_de_champ.rb
+++ b/app/models/types_de_champ/prefill_type_de_champ.rb
@@ -33,6 +33,14 @@ class TypesDeChamp::PrefillTypeDeChamp < SimpleDelegator
     I18n.t("views.prefill_descriptions.edit.examples.#{type_champ}")
   end
 
+  def formatted_example_value
+    "\"#{example_value}\"" if example_value.present?
+  end
+
+  def to_assignable_attributes(champ, value)
+    { id: champ.id, value: value }
+  end
+
   private
 
   def possible_values_list
diff --git a/spec/models/prefill_params_spec.rb b/spec/models/prefill_params_spec.rb
index dc3108efe..cbd6d4300 100644
--- a/spec/models/prefill_params_spec.rb
+++ b/spec/models/prefill_params_spec.rb
@@ -72,12 +72,12 @@ RSpec.describe PrefillParams do
       context "when the type de champ is authorized (#{type_de_champ_type})" do
         let(:types_de_champ_public) { [{ type: type_de_champ_type }] }
         let(:type_de_champ) { procedure.published_revision.types_de_champ_public.first }
-        let(:champ_id) { find_champ_by_stable_id(dossier, type_de_champ.stable_id).id }
+        let(:champ) { find_champ_by_stable_id(dossier, type_de_champ.stable_id) }
 
         let(:params) { { "champ_#{type_de_champ.to_typed_id}" => value } }
 
         it "builds an array of hash(id, value) matching the given params" do
-          expect(prefill_params_array).to match([{ id: champ_id, value: value }])
+          expect(prefill_params_array).to match([{ id: champ.id }.merge(attributes(champ, value))])
         end
       end
     end
@@ -86,12 +86,12 @@ RSpec.describe PrefillParams do
       context "when the type de champ is authorized (#{type_de_champ_type})" do
         let(:types_de_champ_private) { [{ type: type_de_champ_type }] }
         let(:type_de_champ) { procedure.published_revision.types_de_champ_private.first }
-        let(:champ_id) { find_champ_by_stable_id(dossier, type_de_champ.stable_id).id }
+        let(:champ) { find_champ_by_stable_id(dossier, type_de_champ.stable_id) }
 
         let(:params) { { "champ_#{type_de_champ.to_typed_id}" => value } }
 
         it "builds an array of hash(id, value) matching the given params" do
-          expect(prefill_params_array).to match([{ id: champ_id, value: value }])
+          expect(prefill_params_array).to match([{ id: champ.id }.merge(attributes(champ, value))])
         end
       end
     end
@@ -231,4 +231,10 @@ RSpec.describe PrefillParams do
   def find_champ_by_stable_id(dossier, stable_id)
     dossier.champs.joins(:type_de_champ).find_by(types_de_champ: { stable_id: stable_id })
   end
+
+  def attributes(champ, value)
+    TypesDeChamp::PrefillTypeDeChamp
+      .build(champ.type_de_champ)
+      .to_assignable_attributes(champ, value)
+  end
 end
diff --git a/spec/models/types_de_champ/prefill_type_de_champ_spec.rb b/spec/models/types_de_champ/prefill_type_de_champ_spec.rb
index 34f407e0b..d5e322155 100644
--- a/spec/models/types_de_champ/prefill_type_de_champ_spec.rb
+++ b/spec/models/types_de_champ/prefill_type_de_champ_spec.rb
@@ -82,4 +82,13 @@ RSpec.describe TypesDeChamp::PrefillTypeDeChamp, type: :model do
       it { expect(example_value).to eq(I18n.t("views.prefill_descriptions.edit.examples.#{type_de_champ.type_champ}")) }
     end
   end
+
+  describe '#to_assignable_attributes' do
+    let(:type_de_champ) { build(:type_de_champ_email) }
+    let(:champ) { build(:champ, type_de_champ: type_de_champ) }
+    let(:value) { "any@email.org" }
+    subject(:to_assignable_attributes) { described_class.build(type_de_champ).to_assignable_attributes(champ, value) }
+
+    it { is_expected.to match({ id: champ.id, value: value }) }
+  end
 end

From ea126612a1aa094734fbb0b9f4ea054735eb4eee Mon Sep 17 00:00:00 2001
From: Damien Le Thiec <damien.lethiec@gmail.com>
Date: Sun, 12 Feb 2023 13:02:30 +0100
Subject: [PATCH 021/202] Refacto to_assignable_attributes for
 prefill_repetition

---
 .../prefill_repetition_type_de_champ.rb       | 26 +++++++++++----
 .../prefill_repetition_type_de_champ_spec.rb  | 33 +++++++++++++++++++
 2 files changed, 53 insertions(+), 6 deletions(-)

diff --git a/app/models/types_de_champ/prefill_repetition_type_de_champ.rb b/app/models/types_de_champ/prefill_repetition_type_de_champ.rb
index a99b38b2d..d95b03dd7 100644
--- a/app/models/types_de_champ/prefill_repetition_type_de_champ.rb
+++ b/app/models/types_de_champ/prefill_repetition_type_de_champ.rb
@@ -19,12 +19,7 @@ class TypesDeChamp::PrefillRepetitionTypeDeChamp < TypesDeChamp::PrefillTypeDeCh
     return [] unless value.is_a?(Array)
 
     value.map.with_index do |repetition, index|
-      row = champ.rows[index] || champ.add_row(champ.dossier_revision)
-      JSON.parse(repetition).map do |key, value|
-        id = row.find { |champ| champ.libelle == key }&.id
-        next unless id
-        { id: id, value: value }
-      end.compact
+      PrefillRepetitionRow.new(champ, repetition, index).to_assignable_attributes
     rescue JSON::ParserError
     end.compact
   end
@@ -54,4 +49,23 @@ class TypesDeChamp::PrefillRepetitionTypeDeChamp < TypesDeChamp::PrefillTypeDeCh
     @prefillable_subchamps ||=
       TypesDeChamp::PrefillTypeDeChamp.wrap(active_revision_type_de_champ.revision_types_de_champ.map(&:type_de_champ).filter(&:prefillable?))
   end
+
+  class PrefillRepetitionRow
+    def initialize(champ, repetition, index)
+      @champ = champ
+      @repetition = repetition
+      @index = index
+    end
+
+    def to_assignable_attributes
+      row = @champ.rows[@index] || @champ.add_row(@champ.dossier_revision)
+
+      JSON.parse(@repetition).map do |key, value|
+        subchamp = row.find { |champ| champ.libelle == key }
+        return unless subchamp
+
+        TypesDeChamp::PrefillTypeDeChamp.build(subchamp.type_de_champ).to_assignable_attributes(subchamp, value)
+      end.compact
+    end
+  end
 end
diff --git a/spec/models/types_de_champ/prefill_repetition_type_de_champ_spec.rb b/spec/models/types_de_champ/prefill_repetition_type_de_champ_spec.rb
index a613b5c86..4912cfe71 100644
--- a/spec/models/types_de_champ/prefill_repetition_type_de_champ_spec.rb
+++ b/spec/models/types_de_champ/prefill_repetition_type_de_champ_spec.rb
@@ -3,6 +3,7 @@
 RSpec.describe TypesDeChamp::PrefillRepetitionTypeDeChamp, type: :model, vcr: { cassette_name: 'api_geo_regions' } do
   let(:procedure) { build(:procedure) }
   let(:type_de_champ) { build(:type_de_champ_repetition, :with_types_de_champ, :with_region_types_de_champ, procedure: procedure) }
+  let(:champ) { create(:champ_repetition, type_de_champ: type_de_champ) }
   let(:prefillable_subchamps) { TypesDeChamp::PrefillRepetitionTypeDeChamp.new(type_de_champ).send(:prefillable_subchamps) }
   let(:region_repetition) { prefillable_subchamps.third }
   let(:memory_store) { ActiveSupport::Cache.lookup_store(:memory_store) }
@@ -35,4 +36,36 @@ RSpec.describe TypesDeChamp::PrefillRepetitionTypeDeChamp, type: :model, vcr: {
 
     it { expect(example_value).to eq(expected_value) }
   end
+
+  describe '#to_assignable_attributes' do
+    subject(:to_assignable_attributes) { described_class.build(type_de_champ).to_assignable_attributes(champ, value) }
+    let(:type_de_champ_child) { champ.rows.first.first.type_de_champ }
+
+    context 'when the value is nil' do
+      let(:value) { nil }
+      it { is_expected.to match([]) }
+    end
+
+    context 'when the value is empty' do
+      let(:value) { '' }
+      it { is_expected.to match([]) }
+    end
+
+    context 'when the value is a string' do
+      let(:value) { 'hello' }
+      it { is_expected.to match([]) }
+    end
+
+    context 'when the value is an array with wrong keys' do
+      let(:value) { ["{\"blabla\":\"value\"}", "{\"blabla\":\"value2\"}"] }
+
+      it { is_expected.to match([]) }
+    end
+
+    context 'when the value is an array with right keys' do
+      let(:value) { ["{\"#{type_de_champ_child.libelle}\":\"value\"}", "{\"#{type_de_champ_child.libelle}\":\"value2\"}"] }
+
+      it { is_expected.to match([[{ id: type_de_champ_child.champ.first.id, value: "value" }], [{ id: type_de_champ_child.champ.second.id, value: "value2" }]]) }
+    end
+  end
 end

From 0a386994e55260a7a6fe938d8334f993b5b79356 Mon Sep 17 00:00:00 2001
From: Martin <martin@sharypic.com>
Date: Mon, 13 Feb 2023 11:08:54 +0100
Subject: [PATCH 022/202] correctif(messagerie): autorise l'usage des balises
 <a> dans la messagerie quand les messages viennent de l'administration

---
 app/components/dossiers/message_component.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/components/dossiers/message_component.rb b/app/components/dossiers/message_component.rb
index a09f0ef78..1dceaf4ff 100644
--- a/app/components/dossiers/message_component.rb
+++ b/app/components/dossiers/message_component.rb
@@ -60,7 +60,7 @@ class Dossiers::MessageComponent < ApplicationComponent
       t('.deleted_body')
     else
       body_formatted = commentaire.sent_by_system? ? commentaire.body : simple_format(commentaire.body)
-      sanitize(body_formatted)
+      sanitize(body_formatted, commentaire.sent_by_system? ? { scrubber: Sanitizers::MailScrubber.new } : {})
     end
   end
 

From 899c8a65895bfded364b9df46ac28c432a04e9d4 Mon Sep 17 00:00:00 2001
From: Damien Le Thiec <damien.lethiec@gmail.com>
Date: Mon, 13 Feb 2023 14:17:53 +0100
Subject: [PATCH 023/202] Add documentation json parse rescue repetition

---
 .../types_de_champ/prefill_repetition_type_de_champ.rb      | 2 +-
 .../types_de_champ/prefill_repetition_type_de_champ_spec.rb | 6 ++++++
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/app/models/types_de_champ/prefill_repetition_type_de_champ.rb b/app/models/types_de_champ/prefill_repetition_type_de_champ.rb
index d95b03dd7..8b729dc25 100644
--- a/app/models/types_de_champ/prefill_repetition_type_de_champ.rb
+++ b/app/models/types_de_champ/prefill_repetition_type_de_champ.rb
@@ -20,7 +20,6 @@ class TypesDeChamp::PrefillRepetitionTypeDeChamp < TypesDeChamp::PrefillTypeDeCh
 
     value.map.with_index do |repetition, index|
       PrefillRepetitionRow.new(champ, repetition, index).to_assignable_attributes
-    rescue JSON::ParserError
     end.compact
   end
 
@@ -65,6 +64,7 @@ class TypesDeChamp::PrefillRepetitionTypeDeChamp < TypesDeChamp::PrefillTypeDeCh
         return unless subchamp
 
         TypesDeChamp::PrefillTypeDeChamp.build(subchamp.type_de_champ).to_assignable_attributes(subchamp, value)
+      rescue JSON::ParserError # On ignore les valeurs qu'on n'arrive pas à parser
       end.compact
     end
   end
diff --git a/spec/models/types_de_champ/prefill_repetition_type_de_champ_spec.rb b/spec/models/types_de_champ/prefill_repetition_type_de_champ_spec.rb
index 4912cfe71..33197c381 100644
--- a/spec/models/types_de_champ/prefill_repetition_type_de_champ_spec.rb
+++ b/spec/models/types_de_champ/prefill_repetition_type_de_champ_spec.rb
@@ -62,6 +62,12 @@ RSpec.describe TypesDeChamp::PrefillRepetitionTypeDeChamp, type: :model, vcr: {
       it { is_expected.to match([]) }
     end
 
+    context 'when the value is an array with some wrong keys' do
+      let(:value) { ["{\"#{type_de_champ_child.libelle}\":\"value\"}", "{\"blabla\":\"value2\"}"] }
+
+      it { is_expected.to match([[{ id: type_de_champ_child.champ.first.id, value: "value" }]]) }
+    end
+
     context 'when the value is an array with right keys' do
       let(:value) { ["{\"#{type_de_champ_child.libelle}\":\"value\"}", "{\"#{type_de_champ_child.libelle}\":\"value2\"}"] }
 

From f0ffae83203c8b234e7aa340845f57b350b3b7c1 Mon Sep 17 00:00:00 2001
From: sebastiencarceles <sebastien.carceles@gmail.com>
Date: Wed, 8 Feb 2023 09:52:32 +0100
Subject: [PATCH 024/202] migrate(champs): normalize departements

---
 ...departements_with_empty_external_id_job.rb |  24 +
 ...e_departements_with_nil_external_id_job.rb |  22 +
 ...partements_with_present_external_id_job.rb |  15 +
 ...20230208084036_normalize_departements.rake |  32 ++
 ...208084036_normalize_departements_spec.rake | 409 ++++++++++++++++++
 5 files changed, 502 insertions(+)
 create mode 100644 app/jobs/migrations/normalize_departements_with_empty_external_id_job.rb
 create mode 100644 app/jobs/migrations/normalize_departements_with_nil_external_id_job.rb
 create mode 100644 app/jobs/migrations/normalize_departements_with_present_external_id_job.rb
 create mode 100644 lib/tasks/deployment/20230208084036_normalize_departements.rake
 create mode 100644 spec/lib/tasks/deployment/20230208084036_normalize_departements_spec.rake

diff --git a/app/jobs/migrations/normalize_departements_with_empty_external_id_job.rb b/app/jobs/migrations/normalize_departements_with_empty_external_id_job.rb
new file mode 100644
index 000000000..00a8c9e5c
--- /dev/null
+++ b/app/jobs/migrations/normalize_departements_with_empty_external_id_job.rb
@@ -0,0 +1,24 @@
+class Migrations::NormalizeDepartementsWithEmptyExternalIdJob < ApplicationJob
+  def perform(ids)
+    Champs::DepartementChamp.where(id: ids).find_each do |champ|
+      next unless champ.external_id == ''
+
+      if champ.value.nil?
+        champ.update_columns(external_id: nil)
+      elsif champ.value == ''
+        champ.update_columns(external_id: nil, value: nil)
+      elsif champ.value == '85'
+        champ.update_columns(external_id: '85', value: 'Vendée')
+      elsif champ.value.present?
+        match = champ.value.match(/^(\w{2,3}) - (.+)/)
+        if match
+          code = match[1]
+          name = APIGeoService.departement_name(code)
+          champ.update_columns(external_id: code, value: name)
+        else
+          champ.update_columns(external_id: APIGeoService.departement_code(champ.value))
+        end
+      end
+    end
+  end
+end
diff --git a/app/jobs/migrations/normalize_departements_with_nil_external_id_job.rb b/app/jobs/migrations/normalize_departements_with_nil_external_id_job.rb
new file mode 100644
index 000000000..109ca6c9a
--- /dev/null
+++ b/app/jobs/migrations/normalize_departements_with_nil_external_id_job.rb
@@ -0,0 +1,22 @@
+class Migrations::NormalizeDepartementsWithNilExternalIdJob < ApplicationJob
+  def perform(ids)
+    Champs::DepartementChamp.where(id: ids).find_each do |champ|
+      next unless champ.external_id.nil?
+
+      if champ.value == ''
+        champ.update_columns(value: nil)
+      elsif champ.value == '85'
+        champ.update_columns(external_id: '85', value: 'Vendée')
+      elsif champ.value.present?
+        match = champ.value.match(/^(\w{2,3}) - (.+)/)
+        if match
+          code = match[1]
+          name = APIGeoService.departement_name(code)
+          champ.update_columns(external_id: code, value: name)
+        else
+          champ.update_columns(external_id: APIGeoService.departement_code(champ.value))
+        end
+      end
+    end
+  end
+end
diff --git a/app/jobs/migrations/normalize_departements_with_present_external_id_job.rb b/app/jobs/migrations/normalize_departements_with_present_external_id_job.rb
new file mode 100644
index 000000000..a024582d2
--- /dev/null
+++ b/app/jobs/migrations/normalize_departements_with_present_external_id_job.rb
@@ -0,0 +1,15 @@
+class Migrations::NormalizeDepartementsWithPresentExternalIdJob < ApplicationJob
+  def perform(ids)
+    Champs::DepartementChamp.where(id: ids).find_each do |champ|
+      next if champ.external_id.blank?
+
+      if champ.value.blank?
+        champ.update_columns(value: APIGeoService.departement_name(champ.external_id))
+      elsif (match = champ.value.match(/^(\w{2,3}) - (.+)/))
+        code = match[1]
+        name = APIGeoService.departement_name(code)
+        champ.update_columns(external_id: code, value: name)
+      end
+    end
+  end
+end
diff --git a/lib/tasks/deployment/20230208084036_normalize_departements.rake b/lib/tasks/deployment/20230208084036_normalize_departements.rake
new file mode 100644
index 000000000..8ed162bd0
--- /dev/null
+++ b/lib/tasks/deployment/20230208084036_normalize_departements.rake
@@ -0,0 +1,32 @@
+namespace :after_party do
+  desc 'Deployment task: normalize_departements'
+  task normalize_departements: :environment do
+    puts "Running deploy task 'normalize_departements'"
+
+    scope_external_id_nil = Champs::DepartementChamp.where(external_id: nil)
+    scope_external_id_empty = Champs::DepartementChamp.where(external_id: '')
+    scope_external_id_present = Champs::DepartementChamp.where.not(external_id: [nil, ''])
+
+    progress = ProgressReport.new(scope_external_id_nil.count + scope_external_id_empty.count + scope_external_id_present.count)
+
+    normalize_asynchronously(scope_external_id_nil, progress, Migrations::NormalizeDepartementsWithNilExternalIdJob)
+    normalize_asynchronously(scope_external_id_empty, progress, Migrations::NormalizeDepartementsWithEmptyExternalIdJob)
+    normalize_asynchronously(scope_external_id_present, progress, Migrations::NormalizeDepartementsWithPresentExternalIdJob)
+
+    progress.finish
+
+    # Update task as completed.  If you remove the line below, the task will
+    # run with every deploy (or every time you call after_party:run).
+    AfterParty::TaskRecord
+      .create version: AfterParty::TaskRecorder.new(__FILE__).timestamp
+  end
+
+  private
+
+  def normalize_asynchronously(scope, progress, job)
+    scope.in_batches(of: 10_000) do |batch|
+      progress.inc(batch.count)
+      job.perform_later(batch.pluck(:id))
+    end
+  end
+end
diff --git a/spec/lib/tasks/deployment/20230208084036_normalize_departements_spec.rake b/spec/lib/tasks/deployment/20230208084036_normalize_departements_spec.rake
new file mode 100644
index 000000000..968f37fb3
--- /dev/null
+++ b/spec/lib/tasks/deployment/20230208084036_normalize_departements_spec.rake
@@ -0,0 +1,409 @@
+# frozen_string_literal: true
+
+RSpec.describe '20230208084036_normalize_departements', vcr: { cassette_name: 'api_geo_departements' } do
+  let(:champ) { create(:champ_departements) }
+  let(:rake_task) { Rake::Task['after_party:normalize_departements'] }
+  let(:memory_store) { ActiveSupport::Cache.lookup_store(:memory_store) }
+
+  subject(:run_task) { perform_enqueued_jobs { rake_task.invoke } }
+
+  before do
+    allow(Rails).to receive(:cache).and_return(memory_store)
+    Rails.cache.clear
+  end
+
+  after { rake_task.reenable }
+
+  shared_examples "a non-changer" do |external_id, value|
+    before { champ.update_columns(external_id:, value:) }
+
+    it { expect { run_task }.not_to change { champ.reload.external_id } }
+
+    it { expect { run_task }.not_to change { champ.reload.value } }
+  end
+
+  shared_examples "an external_id nullifier" do |external_id, value|
+    before { champ.update_columns(external_id:, value:) }
+
+    it { expect { run_task }.to change { champ.reload.external_id }.from(external_id).to(nil) }
+
+    it { expect { run_task }.not_to change { champ.reload.value } }
+  end
+
+  shared_examples "a value nullifier" do |external_id, value|
+    before { champ.update_columns(external_id:, value:) }
+
+    it { expect { run_task }.not_to change { champ.reload.external_id } }
+
+    it { expect { run_task }.to change { champ.reload.value }.from(value).to(nil) }
+  end
+
+  shared_examples "an external_id and value nullifier" do |external_id, value|
+    before { champ.update_columns(external_id:, value:) }
+
+    it { expect { run_task }.to change { champ.reload.external_id }.from(external_id).to(nil) }
+
+    it { expect { run_task }.to change { champ.reload.value }.from(value).to(nil) }
+  end
+
+  shared_examples "an external_id updater" do |external_id, value, expected_external_id|
+    before { champ.update_columns(external_id:, value:) }
+
+    it { expect { run_task }.to change { champ.reload.external_id }.from(external_id).to(expected_external_id) }
+
+    it { expect { run_task }.not_to change { champ.reload.value } }
+  end
+
+  shared_examples "a value updater" do |external_id, value, expected_value|
+    before { champ.update_columns(external_id:, value:) }
+
+    it { expect { run_task }.not_to change { champ.reload.external_id } }
+
+    it { expect { run_task }.to change { champ.reload.value }.from(value).to(expected_value) }
+  end
+
+  shared_examples "an external_id and value updater" do |external_id, value, expected_external_id, expected_value|
+    before { champ.update_columns(external_id:, value:) }
+
+    it { expect { run_task }.to change { champ.reload.external_id }.from(external_id).to(expected_external_id) }
+
+    it { expect { run_task }.to change { champ.reload.value }.from(value).to(expected_value) }
+  end
+
+  shared_examples "a result checker" do |external_id, value, expected_external_id, expected_value|
+    before do
+      champ.update_columns(external_id:, value:)
+      run_task
+    end
+
+    it { expect(champ.reload.external_id).to eq(expected_external_id) }
+
+    it { expect(champ.reload.value).to eq(expected_value) }
+  end
+
+  it_behaves_like "a non-changer", nil, nil
+  it_behaves_like "an external_id nullifier", '', nil
+  it_behaves_like "a value nullifier", nil, ''
+  it_behaves_like "an external_id and value nullifier", '', ''
+  it_behaves_like "an external_id updater", nil, 'Ain', '01'
+  it_behaves_like "an external_id updater", '', 'Ain', '01'
+  it_behaves_like "a value updater", '01', nil, 'Ain'
+  it_behaves_like "a value updater", '01', '', 'Ain'
+  it_behaves_like "an external_id and value updater", nil, '01 - Ain', '01', 'Ain'
+  it_behaves_like "an external_id and value updater", '', '01 - Ain', '01', 'Ain'
+
+  # Integrity data check:
+  it_behaves_like "a result checker", "972", nil, "972", "Martinique"
+  it_behaves_like "a result checker", "92", nil, "92", "Hauts-de-Seine"
+  it_behaves_like "a result checker", "01", nil, "01", "Ain"
+  it_behaves_like "a result checker", "82", nil, "82", "Tarn-et-Garonne"
+  it_behaves_like "a result checker", "01", "01 - Ain", "01", "Ain"
+  it_behaves_like "a result checker", '', "01 - Ain", "01", "Ain"
+  it_behaves_like "a result checker", nil, "01 - Ain", "01", "Ain"
+  it_behaves_like "a result checker", "02", "02 - Aisne", "02", "Aisne"
+  it_behaves_like "a result checker", nil, "02 - Aisne", "02", "Aisne"
+  it_behaves_like "a result checker", '', "02 - Aisne", "02", "Aisne"
+  it_behaves_like "a result checker", "03", "03 - Allier", "03", "Allier"
+  it_behaves_like "a result checker", nil, "03 - Allier", "03", "Allier"
+  it_behaves_like "a result checker", '', "03 - Allier", "03", "Allier"
+  it_behaves_like "a result checker", "04", "04 - Alpes-de-Haute-Provence", "04", "Alpes-de-Haute-Provence"
+  it_behaves_like "a result checker", nil, "04 - Alpes-de-Haute-Provence", "04", "Alpes-de-Haute-Provence"
+  it_behaves_like "a result checker", '', "04 - Alpes-de-Haute-Provence", "04", "Alpes-de-Haute-Provence"
+  it_behaves_like "a result checker", "05", "05 - Hautes-Alpes", "05", "Hautes-Alpes"
+  it_behaves_like "a result checker", nil, "05 - Hautes-Alpes", "05", "Hautes-Alpes"
+  it_behaves_like "a result checker", '', "05 - Hautes-Alpes", "05", "Hautes-Alpes"
+  it_behaves_like "a result checker", nil, "06 - Alpes-Maritimes", "06", "Alpes-Maritimes"
+  it_behaves_like "a result checker", "06", "06 - Alpes-Maritimes", "06", "Alpes-Maritimes"
+  it_behaves_like "a result checker", '', "06 - Alpes-Maritimes", "06", "Alpes-Maritimes"
+  it_behaves_like "a result checker", "07", "07 - Ardèche", "07", "Ardèche"
+  it_behaves_like "a result checker", nil, "07 - Ardèche", "07", "Ardèche"
+  it_behaves_like "a result checker", '', "07 - Ardèche", "07", "Ardèche"
+  it_behaves_like "a result checker", "08", "08 - Ardennes", "08", "Ardennes"
+  it_behaves_like "a result checker", nil, "08 - Ardennes", "08", "Ardennes"
+  it_behaves_like "a result checker", '', "08 - Ardennes", "08", "Ardennes"
+  it_behaves_like "a result checker", "09", "09 - Ariège", "09", "Ariège"
+  it_behaves_like "a result checker", nil, "09 - Ariège", "09", "Ariège"
+  it_behaves_like "a result checker", '', "09 - Ariège", "09", "Ariège"
+  it_behaves_like "a result checker", nil, "10 - Aube", "10", "Aube"
+  it_behaves_like "a result checker", "10", "10 - Aube", "10", "Aube"
+  it_behaves_like "a result checker", '', "10 - Aube", "10", "Aube"
+  it_behaves_like "a result checker", "11", "11 - Aude", "11", "Aude"
+  it_behaves_like "a result checker", nil, "11 - Aude", "11", "Aude"
+  it_behaves_like "a result checker", '', "11 - Aude", "11", "Aude"
+  it_behaves_like "a result checker", "12", "12 - Aveyron", "12", "Aveyron"
+  it_behaves_like "a result checker", nil, "12 - Aveyron", "12", "Aveyron"
+  it_behaves_like "a result checker", '', "12 - Aveyron", "12", "Aveyron"
+  it_behaves_like "a result checker", "13", "13 - Bouches-du-Rhône", "13", "Bouches-du-Rhône"
+  it_behaves_like "a result checker", nil, "13 - Bouches-du-Rhône", "13", "Bouches-du-Rhône"
+  it_behaves_like "a result checker", '', "13 - Bouches-du-Rhône", "13", "Bouches-du-Rhône"
+  it_behaves_like "a result checker", "14", "14 - Calvados", "14", "Calvados"
+  it_behaves_like "a result checker", nil, "14 - Calvados", "14", "Calvados"
+  it_behaves_like "a result checker", '', "14 - Calvados", "14", "Calvados"
+  it_behaves_like "a result checker", "15", "15 - Cantal", "15", "Cantal"
+  it_behaves_like "a result checker", nil, "15 - Cantal", "15", "Cantal"
+  it_behaves_like "a result checker", '', "15 - Cantal", "15", "Cantal"
+  it_behaves_like "a result checker", "16", "16 - Charente", "16", "Charente"
+  it_behaves_like "a result checker", nil, "16 - Charente", "16", "Charente"
+  it_behaves_like "a result checker", '', "16 - Charente", "16", "Charente"
+  it_behaves_like "a result checker", "17", "17 - Charente-Maritime", "17", "Charente-Maritime"
+  it_behaves_like "a result checker", nil, "17 - Charente-Maritime", "17", "Charente-Maritime"
+  it_behaves_like "a result checker", '', "17 - Charente-Maritime", "17", "Charente-Maritime"
+  it_behaves_like "a result checker", "18", "18 - Cher", "18", "Cher"
+  it_behaves_like "a result checker", nil, "18 - Cher", "18", "Cher"
+  it_behaves_like "a result checker", '', "18 - Cher", "18", "Cher"
+  it_behaves_like "a result checker", "19", "19 - Corrèze", "19", "Corrèze"
+  it_behaves_like "a result checker", nil, "19 - Corrèze", "19", "Corrèze"
+  it_behaves_like "a result checker", '', "19 - Corrèze", "19", "Corrèze"
+  it_behaves_like "a result checker", "21", "21 - Côte-d’Or", "21", "Côte-d’Or"
+  it_behaves_like "a result checker", '', "21 - Côte-d’Or", "21", "Côte-d’Or"
+  it_behaves_like "a result checker", nil, "21 - Côte-d’Or", "21", "Côte-d’Or"
+  it_behaves_like "a result checker", "22", "22 - Côtes-d’Armor", "22", "Côtes-d’Armor"
+  it_behaves_like "a result checker", nil, "22 - Côtes-d’Armor", "22", "Côtes-d’Armor"
+  it_behaves_like "a result checker", '', "22 - Côtes-d’Armor", "22", "Côtes-d’Armor"
+  it_behaves_like "a result checker", "23", "23 - Creuse", "23", "Creuse"
+  it_behaves_like "a result checker", nil, "23 - Creuse", "23", "Creuse"
+  it_behaves_like "a result checker", '', "23 - Creuse", "23", "Creuse"
+  it_behaves_like "a result checker", "24", "24 - Dordogne", "24", "Dordogne"
+  it_behaves_like "a result checker", nil, "24 - Dordogne", "24", "Dordogne"
+  it_behaves_like "a result checker", '', "24 - Dordogne", "24", "Dordogne"
+  it_behaves_like "a result checker", "25", "25 - Doubs", "25", "Doubs"
+  it_behaves_like "a result checker", nil, "25 - Doubs", "25", "Doubs"
+  it_behaves_like "a result checker", '', "25 - Doubs", "25", "Doubs"
+  it_behaves_like "a result checker", "26", "26 - Drôme", "26", "Drôme"
+  it_behaves_like "a result checker", nil, "26 - Drôme", "26", "Drôme"
+  it_behaves_like "a result checker", '', "26 - Drôme", "26", "Drôme"
+  it_behaves_like "a result checker", "27", "27 - Eure", "27", "Eure"
+  it_behaves_like "a result checker", nil, "27 - Eure", "27", "Eure"
+  it_behaves_like "a result checker", '', "27 - Eure", "27", "Eure"
+  it_behaves_like "a result checker", "28", "28 - Eure-et-Loir", "28", "Eure-et-Loir"
+  it_behaves_like "a result checker", nil, "28 - Eure-et-Loir", "28", "Eure-et-Loir"
+  it_behaves_like "a result checker", '', "28 - Eure-et-Loir", "28", "Eure-et-Loir"
+  it_behaves_like "a result checker", "29", "29 - Finistère", "29", "Finistère"
+  it_behaves_like "a result checker", nil, "29 - Finistère", "29", "Finistère"
+  it_behaves_like "a result checker", '', "29 - Finistère", "29", "Finistère"
+  it_behaves_like "a result checker", "2A", "2A - Corse-du-Sud", "2A", "Corse-du-Sud"
+  it_behaves_like "a result checker", nil, "2A - Corse-du-Sud", "2A", "Corse-du-Sud"
+  it_behaves_like "a result checker", '', "2A - Corse-du-Sud", "2A", "Corse-du-Sud"
+  it_behaves_like "a result checker", "2B", "2B - Haute-Corse", "2B", "Haute-Corse"
+  it_behaves_like "a result checker", nil, "2B - Haute-Corse", "2B", "Haute-Corse"
+  it_behaves_like "a result checker", '', "2B - Haute-Corse", "2B", "Haute-Corse"
+  it_behaves_like "a result checker", "30", "30 - Gard", "30", "Gard"
+  it_behaves_like "a result checker", nil, "30 - Gard", "30", "Gard"
+  it_behaves_like "a result checker", '', "30 - Gard", "30", "Gard"
+  it_behaves_like "a result checker", "31", "31 - Haute-Garonne", "31", "Haute-Garonne"
+  it_behaves_like "a result checker", nil, "31 - Haute-Garonne", "31", "Haute-Garonne"
+  it_behaves_like "a result checker", '', "31 - Haute-Garonne", "31", "Haute-Garonne"
+  it_behaves_like "a result checker", "32", "32 - Gers", "32", "Gers"
+  it_behaves_like "a result checker", nil, "32 - Gers", "32", "Gers"
+  it_behaves_like "a result checker", '', "32 - Gers", "32", "Gers"
+  it_behaves_like "a result checker", "33", "33 - Gironde", "33", "Gironde"
+  it_behaves_like "a result checker", nil, "33 - Gironde", "33", "Gironde"
+  it_behaves_like "a result checker", '', "33 - Gironde", "33", "Gironde"
+  it_behaves_like "a result checker", "34", "34 - Hérault", "34", "Hérault"
+  it_behaves_like "a result checker", nil, "34 - Hérault", "34", "Hérault"
+  it_behaves_like "a result checker", '', "34 - Hérault", "34", "Hérault"
+  it_behaves_like "a result checker", "35", "35 - Ille-et-Vilaine", "35", "Ille-et-Vilaine"
+  it_behaves_like "a result checker", nil, "35 - Ille-et-Vilaine", "35", "Ille-et-Vilaine"
+  it_behaves_like "a result checker", '', "35 - Ille-et-Vilaine", "35", "Ille-et-Vilaine"
+  it_behaves_like "a result checker", "36", "36 - Indre", "36", "Indre"
+  it_behaves_like "a result checker", nil, "36 - Indre", "36", "Indre"
+  it_behaves_like "a result checker", '', "36 - Indre", "36", "Indre"
+  it_behaves_like "a result checker", "37", "37 - Indre-et-Loire", "37", "Indre-et-Loire"
+  it_behaves_like "a result checker", nil, "37 - Indre-et-Loire", "37", "Indre-et-Loire"
+  it_behaves_like "a result checker", '', "37 - Indre-et-Loire", "37", "Indre-et-Loire"
+  it_behaves_like "a result checker", "38", "38 - Isère", "38", "Isère"
+  it_behaves_like "a result checker", nil, "38 - Isère", "38", "Isère"
+  it_behaves_like "a result checker", '', "38 - Isère", "38", "Isère"
+  it_behaves_like "a result checker", "39", "39 - Jura", "39", "Jura"
+  it_behaves_like "a result checker", nil, "39 - Jura", "39", "Jura"
+  it_behaves_like "a result checker", '', "39 - Jura", "39", "Jura"
+  it_behaves_like "a result checker", "40", "40 - Landes", "40", "Landes"
+  it_behaves_like "a result checker", nil, "40 - Landes", "40", "Landes"
+  it_behaves_like "a result checker", '', "40 - Landes", "40", "Landes"
+  it_behaves_like "a result checker", "41", "41 - Loir-et-Cher", "41", "Loir-et-Cher"
+  it_behaves_like "a result checker", nil, "41 - Loir-et-Cher", "41", "Loir-et-Cher"
+  it_behaves_like "a result checker", '', "41 - Loir-et-Cher", "41", "Loir-et-Cher"
+  it_behaves_like "a result checker", "42", "42 - Loire", "42", "Loire"
+  it_behaves_like "a result checker", nil, "42 - Loire", "42", "Loire"
+  it_behaves_like "a result checker", '', "42 - Loire", "42", "Loire"
+  it_behaves_like "a result checker", "43", "43 - Haute-Loire", "43", "Haute-Loire"
+  it_behaves_like "a result checker", nil, "43 - Haute-Loire", "43", "Haute-Loire"
+  it_behaves_like "a result checker", '', "43 - Haute-Loire", "43", "Haute-Loire"
+  it_behaves_like "a result checker", "44", "44 - Loire-Atlantique", "44", "Loire-Atlantique"
+  it_behaves_like "a result checker", nil, "44 - Loire-Atlantique", "44", "Loire-Atlantique"
+  it_behaves_like "a result checker", '', "44 - Loire-Atlantique", "44", "Loire-Atlantique"
+  it_behaves_like "a result checker", "45", "45 - Loiret", "45", "Loiret"
+  it_behaves_like "a result checker", nil, "45 - Loiret", "45", "Loiret"
+  it_behaves_like "a result checker", '', "45 - Loiret", "45", "Loiret"
+  it_behaves_like "a result checker", "46", "46 - Lot", "46", "Lot"
+  it_behaves_like "a result checker", nil, "46 - Lot", "46", "Lot"
+  it_behaves_like "a result checker", '', "46 - Lot", "46", "Lot"
+  it_behaves_like "a result checker", "47", "47 - Lot-et-Garonne", "47", "Lot-et-Garonne"
+  it_behaves_like "a result checker", nil, "47 - Lot-et-Garonne", "47", "Lot-et-Garonne"
+  it_behaves_like "a result checker", '', "47 - Lot-et-Garonne", "47", "Lot-et-Garonne"
+  it_behaves_like "a result checker", "48", "48 - Lozère", "48", "Lozère"
+  it_behaves_like "a result checker", nil, "48 - Lozère", "48", "Lozère"
+  it_behaves_like "a result checker", '', "48 - Lozère", "48", "Lozère"
+  it_behaves_like "a result checker", "49", "49 - Maine-et-Loire", "49", "Maine-et-Loire"
+  it_behaves_like "a result checker", nil, "49 - Maine-et-Loire", "49", "Maine-et-Loire"
+  it_behaves_like "a result checker", '', "49 - Maine-et-Loire", "49", "Maine-et-Loire"
+  it_behaves_like "a result checker", "50", "50 - Manche", "50", "Manche"
+  it_behaves_like "a result checker", nil, "50 - Manche", "50", "Manche"
+  it_behaves_like "a result checker", '', "50 - Manche", "50", "Manche"
+  it_behaves_like "a result checker", "51", "51 - Marne", "51", "Marne"
+  it_behaves_like "a result checker", '', "51 - Marne", "51", "Marne"
+  it_behaves_like "a result checker", nil, "51 - Marne", "51", "Marne"
+  it_behaves_like "a result checker", "52", "52 - Haute-Marne", "52", "Haute-Marne"
+  it_behaves_like "a result checker", nil, "52 - Haute-Marne", "52", "Haute-Marne"
+  it_behaves_like "a result checker", '', "52 - Haute-Marne", "52", "Haute-Marne"
+  it_behaves_like "a result checker", "53", "53 - Mayenne", "53", "Mayenne"
+  it_behaves_like "a result checker", nil, "53 - Mayenne", "53", "Mayenne"
+  it_behaves_like "a result checker", '', "53 - Mayenne", "53", "Mayenne"
+  it_behaves_like "a result checker", "54", "54 - Meurthe-et-Moselle", "54", "Meurthe-et-Moselle"
+  it_behaves_like "a result checker", '', "54 - Meurthe-et-Moselle", "54", "Meurthe-et-Moselle"
+  it_behaves_like "a result checker", nil, "54 - Meurthe-et-Moselle", "54", "Meurthe-et-Moselle"
+  it_behaves_like "a result checker", nil, "55 - Meuse", "55", "Meuse"
+  it_behaves_like "a result checker", "55", "55 - Meuse", "55", "Meuse"
+  it_behaves_like "a result checker", '', "55 - Meuse", "55", "Meuse"
+  it_behaves_like "a result checker", "56", "56 - Morbihan", "56", "Morbihan"
+  it_behaves_like "a result checker", nil, "56 - Morbihan", "56", "Morbihan"
+  it_behaves_like "a result checker", '', "56 - Morbihan", "56", "Morbihan"
+  it_behaves_like "a result checker", "57", "57 - Moselle", "57", "Moselle"
+  it_behaves_like "a result checker", nil, "57 - Moselle", "57", "Moselle"
+  it_behaves_like "a result checker", '', "57 - Moselle", "57", "Moselle"
+  it_behaves_like "a result checker", "58", "58 - Nièvre", "58", "Nièvre"
+  it_behaves_like "a result checker", nil, "58 - Nièvre", "58", "Nièvre"
+  it_behaves_like "a result checker", '', "58 - Nièvre", "58", "Nièvre"
+  it_behaves_like "a result checker", "59", "59 - Nord", "59", "Nord"
+  it_behaves_like "a result checker", nil, "59 - Nord", "59", "Nord"
+  it_behaves_like "a result checker", '', "59 - Nord", "59", "Nord"
+  it_behaves_like "a result checker", "60", "60 - Oise", "60", "Oise"
+  it_behaves_like "a result checker", nil, "60 - Oise", "60", "Oise"
+  it_behaves_like "a result checker", '', "60 - Oise", "60", "Oise"
+  it_behaves_like "a result checker", "61", "61 - Orne", "61", "Orne"
+  it_behaves_like "a result checker", nil, "61 - Orne", "61", "Orne"
+  it_behaves_like "a result checker", '', "61 - Orne", "61", "Orne"
+  it_behaves_like "a result checker", nil, "62 - Pas-de-Calais", "62", "Pas-de-Calais"
+  it_behaves_like "a result checker", "62", "62 - Pas-de-Calais", "62", "Pas-de-Calais"
+  it_behaves_like "a result checker", '', "62 - Pas-de-Calais", "62", "Pas-de-Calais"
+  it_behaves_like "a result checker", "63", "63 - Puy-de-Dôme", "63", "Puy-de-Dôme"
+  it_behaves_like "a result checker", nil, "63 - Puy-de-Dôme", "63", "Puy-de-Dôme"
+  it_behaves_like "a result checker", '', "63 - Puy-de-Dôme", "63", "Puy-de-Dôme"
+  it_behaves_like "a result checker", "64", "64 - Pyrénées-Atlantiques", "64", "Pyrénées-Atlantiques"
+  it_behaves_like "a result checker", nil, "64 - Pyrénées-Atlantiques", "64", "Pyrénées-Atlantiques"
+  it_behaves_like "a result checker", '', "64 - Pyrénées-Atlantiques", "64", "Pyrénées-Atlantiques"
+  it_behaves_like "a result checker", "65", "65 - Hautes-Pyrénées", "65", "Hautes-Pyrénées"
+  it_behaves_like "a result checker", nil, "65 - Hautes-Pyrénées", "65", "Hautes-Pyrénées"
+  it_behaves_like "a result checker", '', "65 - Hautes-Pyrénées", "65", "Hautes-Pyrénées"
+  it_behaves_like "a result checker", "66", "66 - Pyrénées-Orientales", "66", "Pyrénées-Orientales"
+  it_behaves_like "a result checker", nil, "66 - Pyrénées-Orientales", "66", "Pyrénées-Orientales"
+  it_behaves_like "a result checker", '', "66 - Pyrénées-Orientales", "66", "Pyrénées-Orientales"
+  it_behaves_like "a result checker", "67", "67 - Bas-Rhin", "67", "Bas-Rhin"
+  it_behaves_like "a result checker", nil, "67 - Bas-Rhin", "67", "Bas-Rhin"
+  it_behaves_like "a result checker", '', "67 - Bas-Rhin", "67", "Bas-Rhin"
+  it_behaves_like "a result checker", "68", "68 - Haut-Rhin", "68", "Haut-Rhin"
+  it_behaves_like "a result checker", nil, "68 - Haut-Rhin", "68", "Haut-Rhin"
+  it_behaves_like "a result checker", '', "68 - Haut-Rhin", "68", "Haut-Rhin"
+  it_behaves_like "a result checker", "69", "69 - Rhône", "69", "Rhône"
+  it_behaves_like "a result checker", nil, "69 - Rhône", "69", "Rhône"
+  it_behaves_like "a result checker", '', "69 - Rhône", "69", "Rhône"
+  it_behaves_like "a result checker", "70", "70 - Haute-Saône", "70", "Haute-Saône"
+  it_behaves_like "a result checker", nil, "70 - Haute-Saône", "70", "Haute-Saône"
+  it_behaves_like "a result checker", '', "70 - Haute-Saône", "70", "Haute-Saône"
+  it_behaves_like "a result checker", "71", "71 - Saône-et-Loire", "71", "Saône-et-Loire"
+  it_behaves_like "a result checker", nil, "71 - Saône-et-Loire", "71", "Saône-et-Loire"
+  it_behaves_like "a result checker", '', "71 - Saône-et-Loire", "71", "Saône-et-Loire"
+  it_behaves_like "a result checker", "72", "72 - Sarthe", "72", "Sarthe"
+  it_behaves_like "a result checker", nil, "72 - Sarthe", "72", "Sarthe"
+  it_behaves_like "a result checker", '', "72 - Sarthe", "72", "Sarthe"
+  it_behaves_like "a result checker", "73", "73 - Savoie", "73", "Savoie"
+  it_behaves_like "a result checker", nil, "73 - Savoie", "73", "Savoie"
+  it_behaves_like "a result checker", '', "73 - Savoie", "73", "Savoie"
+  it_behaves_like "a result checker", "74", "74 - Haute-Savoie", "74", "Haute-Savoie"
+  it_behaves_like "a result checker", nil, "74 - Haute-Savoie", "74", "Haute-Savoie"
+  it_behaves_like "a result checker", '', "74 - Haute-Savoie", "74", "Haute-Savoie"
+  it_behaves_like "a result checker", "75", "75 - Paris", "75", "Paris"
+  it_behaves_like "a result checker", nil, "75 - Paris", "75", "Paris"
+  it_behaves_like "a result checker", '', "75 - Paris", "75", "Paris"
+  it_behaves_like "a result checker", "76", "76 - Seine-Maritime", "76", "Seine-Maritime"
+  it_behaves_like "a result checker", nil, "76 - Seine-Maritime", "76", "Seine-Maritime"
+  it_behaves_like "a result checker", '', "76 - Seine-Maritime", "76", "Seine-Maritime"
+  it_behaves_like "a result checker", "77", "77 - Seine-et-Marne", "77", "Seine-et-Marne"
+  it_behaves_like "a result checker", nil, "77 - Seine-et-Marne", "77", "Seine-et-Marne"
+  it_behaves_like "a result checker", '', "77 - Seine-et-Marne", "77", "Seine-et-Marne"
+  it_behaves_like "a result checker", "78", "78 - Yvelines", "78", "Yvelines"
+  it_behaves_like "a result checker", '', "78 - Yvelines", "78", "Yvelines"
+  it_behaves_like "a result checker", nil, "78 - Yvelines", "78", "Yvelines"
+  it_behaves_like "a result checker", "79", "79 - Deux-Sèvres", "79", "Deux-Sèvres"
+  it_behaves_like "a result checker", nil, "79 - Deux-Sèvres", "79", "Deux-Sèvres"
+  it_behaves_like "a result checker", '', "79 - Deux-Sèvres", "79", "Deux-Sèvres"
+  it_behaves_like "a result checker", "80", "80 - Somme", "80", "Somme"
+  it_behaves_like "a result checker", nil, "80 - Somme", "80", "Somme"
+  it_behaves_like "a result checker", '', "80 - Somme", "80", "Somme"
+  it_behaves_like "a result checker", "81", "81 - Tarn", "81", "Tarn"
+  it_behaves_like "a result checker", '', "81 - Tarn", "81", "Tarn"
+  it_behaves_like "a result checker", nil, "81 - Tarn", "81", "Tarn"
+  it_behaves_like "a result checker", "82", "82 - Tarn-et-Garonne", "82", "Tarn-et-Garonne"
+  it_behaves_like "a result checker", nil, "82 - Tarn-et-Garonne", "82", "Tarn-et-Garonne"
+  it_behaves_like "a result checker", '', "82 - Tarn-et-Garonne", "82", "Tarn-et-Garonne"
+  it_behaves_like "a result checker", "83", "83 - Var", "83", "Var"
+  it_behaves_like "a result checker", nil, "83 - Var", "83", "Var"
+  it_behaves_like "a result checker", '', "83 - Var", "83", "Var"
+  it_behaves_like "a result checker", "84", "84 - Vaucluse", "84", "Vaucluse"
+  it_behaves_like "a result checker", nil, "84 - Vaucluse", "84", "Vaucluse"
+  it_behaves_like "a result checker", '', "84 - Vaucluse", "84", "Vaucluse"
+  it_behaves_like "a result checker", nil, "85", "85", "Vendée"
+  it_behaves_like "a result checker", "85", "85 - Vendée", "85", "Vendée"
+  it_behaves_like "a result checker", nil, "85 - Vendée", "85", "Vendée"
+  it_behaves_like "a result checker", '', "85 - Vendée", "85", "Vendée"
+  it_behaves_like "a result checker", "86", "86 - Vienne", "86", "Vienne"
+  it_behaves_like "a result checker", nil, "86 - Vienne", "86", "Vienne"
+  it_behaves_like "a result checker", '', "86 - Vienne", "86", "Vienne"
+  it_behaves_like "a result checker", "87", "87 - Haute-Vienne", "87", "Haute-Vienne"
+  it_behaves_like "a result checker", nil, "87 - Haute-Vienne", "87", "Haute-Vienne"
+  it_behaves_like "a result checker", '', "87 - Haute-Vienne", "87", "Haute-Vienne"
+  it_behaves_like "a result checker", "88", "88 - Vosges", "88", "Vosges"
+  it_behaves_like "a result checker", nil, "88 - Vosges", "88", "Vosges"
+  it_behaves_like "a result checker", '', "88 - Vosges", "88", "Vosges"
+  it_behaves_like "a result checker", "89", "89 - Yonne", "89", "Yonne"
+  it_behaves_like "a result checker", nil, "89 - Yonne", "89", "Yonne"
+  it_behaves_like "a result checker", '', "89 - Yonne", "89", "Yonne"
+  it_behaves_like "a result checker", "90", "90 - Territoire de Belfort", "90", "Territoire de Belfort"
+  it_behaves_like "a result checker", nil, "90 - Territoire de Belfort", "90", "Territoire de Belfort"
+  it_behaves_like "a result checker", '', "90 - Territoire de Belfort", "90", "Territoire de Belfort"
+  it_behaves_like "a result checker", "91", "91 - Essonne", "91", "Essonne"
+  it_behaves_like "a result checker", nil, "91 - Essonne", "91", "Essonne"
+  it_behaves_like "a result checker", '', "91 - Essonne", "91", "Essonne"
+  it_behaves_like "a result checker", "92", "92 - Hauts-de-Seine", "92", "Hauts-de-Seine"
+  it_behaves_like "a result checker", nil, "92 - Hauts-de-Seine", "92", "Hauts-de-Seine"
+  it_behaves_like "a result checker", '', "92 - Hauts-de-Seine", "92", "Hauts-de-Seine"
+  it_behaves_like "a result checker", "93", "93 - Seine-Saint-Denis", "93", "Seine-Saint-Denis"
+  it_behaves_like "a result checker", nil, "93 - Seine-Saint-Denis", "93", "Seine-Saint-Denis"
+  it_behaves_like "a result checker", '', "93 - Seine-Saint-Denis", "93", "Seine-Saint-Denis"
+  it_behaves_like "a result checker", "94", "94 - Val-de-Marne", "94", "Val-de-Marne"
+  it_behaves_like "a result checker", nil, "94 - Val-de-Marne", "94", "Val-de-Marne"
+  it_behaves_like "a result checker", '', "94 - Val-de-Marne", "94", "Val-de-Marne"
+  it_behaves_like "a result checker", "95", "95 - Val-d’Oise", "95", "Val-d’Oise"
+  it_behaves_like "a result checker", '', "95 - Val-d’Oise", "95", "Val-d’Oise"
+  it_behaves_like "a result checker", nil, "95 - Val-d’Oise", "95", "Val-d’Oise"
+  it_behaves_like "a result checker", "971", "971 - Guadeloupe", "971", "Guadeloupe"
+  it_behaves_like "a result checker", nil, "971 - Guadeloupe", "971", "Guadeloupe"
+  it_behaves_like "a result checker", '', "971 - Guadeloupe", "971", "Guadeloupe"
+  it_behaves_like "a result checker", "972", "972 - Martinique", "972", "Martinique"
+  it_behaves_like "a result checker", nil, "972 - Martinique", "972", "Martinique"
+  it_behaves_like "a result checker", '', "972 - Martinique", "972", "Martinique"
+  it_behaves_like "a result checker", "973", "973 - Guyane", "973", "Guyane"
+  it_behaves_like "a result checker", nil, "973 - Guyane", "973", "Guyane"
+  it_behaves_like "a result checker", '', "973 - Guyane", "973", "Guyane"
+  it_behaves_like "a result checker", "974", "974 - La Réunion", "974", "La Réunion"
+  it_behaves_like "a result checker", nil, "974 - La Réunion", "974", "La Réunion"
+  it_behaves_like "a result checker", '', "974 - La Réunion", "974", "La Réunion"
+  it_behaves_like "a result checker", "976", "976 - Mayotte", "976", "Mayotte"
+  it_behaves_like "a result checker", nil, "976 - Mayotte", "976", "Mayotte"
+  it_behaves_like "a result checker", '', "976 - Mayotte", "976", "Mayotte"
+  it_behaves_like "a result checker", "99", "99 - Etranger", "99", "Etranger"
+  it_behaves_like "a result checker", nil, "99 - Etranger", "99", "Etranger"
+  it_behaves_like "a result checker", '', "99 - Etranger", "99", "Etranger"
+  it_behaves_like "a result checker", '', "99 - Étranger", "99", "Etranger"
+  it_behaves_like "a result checker", nil, "99 - Étranger", "99", "Etranger"
+end

From daa7e17e706a33e5d46999c68be8ba883728af5b Mon Sep 17 00:00:00 2001
From: sebastiencarceles <sebastien.carceles@gmail.com>
Date: Mon, 13 Feb 2023 16:32:07 +0100
Subject: [PATCH 025/202] review: avoid in_batches

---
 .../deployment/20230208084036_normalize_departements.rake   | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/lib/tasks/deployment/20230208084036_normalize_departements.rake b/lib/tasks/deployment/20230208084036_normalize_departements.rake
index 8ed162bd0..78c992b30 100644
--- a/lib/tasks/deployment/20230208084036_normalize_departements.rake
+++ b/lib/tasks/deployment/20230208084036_normalize_departements.rake
@@ -24,9 +24,9 @@ namespace :after_party do
   private
 
   def normalize_asynchronously(scope, progress, job)
-    scope.in_batches(of: 10_000) do |batch|
-      progress.inc(batch.count)
-      job.perform_later(batch.pluck(:id))
+    scope.pluck(:id).in_groups_of(10_000, false) do |champ_ids|
+      job.perform_later(champ_ids)
+      progress.inc(champ_ids.count)
     end
   end
 end

From cd3a72ddce91a54506762197028eb61e7e485a69 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=A9bastien=20Carceles?= <sebastien.carceles@gmail.com>
Date: Fri, 20 Jan 2023 10:38:42 +0100
Subject: [PATCH 026/202] make departements champ prefillable

---
 app/models/type_de_champ.rb        | 3 ++-
 spec/models/prefill_params_spec.rb | 4 +++-
 spec/models/type_de_champ_spec.rb  | 2 +-
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/app/models/type_de_champ.rb b/app/models/type_de_champ.rb
index afa6a821a..05091ec70 100644
--- a/app/models/type_de_champ.rb
+++ b/app/models/type_de_champ.rb
@@ -267,7 +267,8 @@ class TypeDeChamp < ApplicationRecord
       TypeDeChamp.type_champs.fetch(:yes_no),
       TypeDeChamp.type_champs.fetch(:checkbox),
       TypeDeChamp.type_champs.fetch(:drop_down_list),
-      TypeDeChamp.type_champs.fetch(:regions)
+      TypeDeChamp.type_champs.fetch(:regions),
+      TypeDeChamp.type_champs.fetch(:departements)
     ])
   end
 
diff --git a/spec/models/prefill_params_spec.rb b/spec/models/prefill_params_spec.rb
index 84c99a26b..680a7beca 100644
--- a/spec/models/prefill_params_spec.rb
+++ b/spec/models/prefill_params_spec.rb
@@ -126,6 +126,7 @@ RSpec.describe PrefillParams do
     it_behaves_like "a champ public value that is authorized", :checkbox, "false"
     it_behaves_like "a champ public value that is authorized", :drop_down_list, "value"
     it_behaves_like "a champ public value that is authorized", :regions, "03"
+    it_behaves_like "a champ public value that is authorized", :departements, "03"
 
     it_behaves_like "a champ private value that is authorized", :text, "value"
     it_behaves_like "a champ private value that is authorized", :textarea, "value"
@@ -144,6 +145,7 @@ RSpec.describe PrefillParams do
     it_behaves_like "a champ private value that is authorized", :checkbox, "false"
     it_behaves_like "a champ private value that is authorized", :drop_down_list, "value"
     it_behaves_like "a champ private value that is authorized", :regions, "93"
+    it_behaves_like "a champ public value that is authorized", :departements, "03"
 
     it_behaves_like "a champ public value that is unauthorized", :decimal_number, "non decimal string"
     it_behaves_like "a champ public value that is unauthorized", :integer_number, "non integer string"
@@ -169,7 +171,7 @@ RSpec.describe PrefillParams do
     it_behaves_like "a champ public value that is unauthorized", :address, "value"
     it_behaves_like "a champ public value that is unauthorized", :pays, "value"
     it_behaves_like "a champ public value that is unauthorized", :regions, "value"
-    it_behaves_like "a champ public value that is unauthorized", :departements, "value"
+    # TODO: SEB add validation it_behaves_like "a champ public value that is unauthorized", :departements, "value"
     it_behaves_like "a champ public value that is unauthorized", :siret, "value"
     it_behaves_like "a champ public value that is unauthorized", :rna, "value"
     it_behaves_like "a champ public value that is unauthorized", :annuaire_education, "value"
diff --git a/spec/models/type_de_champ_spec.rb b/spec/models/type_de_champ_spec.rb
index e1ca7bac6..9d891f5e1 100644
--- a/spec/models/type_de_champ_spec.rb
+++ b/spec/models/type_de_champ_spec.rb
@@ -250,6 +250,7 @@ describe TypeDeChamp do
     it_behaves_like "a prefillable type de champ", :type_de_champ_checkbox
     it_behaves_like "a prefillable type de champ", :type_de_champ_drop_down_list
     it_behaves_like "a prefillable type de champ", :type_de_champ_regions
+    it_behaves_like "a prefillable type de champ", :type_de_champ_departements
 
     it_behaves_like "a non-prefillable type de champ", :type_de_champ_number
     it_behaves_like "a non-prefillable type de champ", :type_de_champ_communes
@@ -267,7 +268,6 @@ describe TypeDeChamp do
     it_behaves_like "a non-prefillable type de champ", :type_de_champ_mesri
     it_behaves_like "a non-prefillable type de champ", :type_de_champ_carte
     it_behaves_like "a non-prefillable type de champ", :type_de_champ_address
-    it_behaves_like "a non-prefillable type de champ", :type_de_champ_departements
     it_behaves_like "a non-prefillable type de champ", :type_de_champ_siret
     it_behaves_like "a non-prefillable type de champ", :type_de_champ_rna
     it_behaves_like "a non-prefillable type de champ", :type_de_champ_annuaire_education

From a235829ddd4c088086e2beac1a68d2fd0f5a2a8a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=A9bastien=20Carceles?= <sebastien.carceles@gmail.com>
Date: Fri, 20 Jan 2023 10:55:07 +0100
Subject: [PATCH 027/202] add possible and example values

---
 .../prefill_departement_type_de_champ.rb      | 15 +++++++++++
 .../types_de_champ/prefill_type_de_champ.rb   |  2 ++
 .../prefill_departement_type_de_champ_spec.rb | 26 +++++++++++++++++++
 .../prefill_type_de_champ_spec.rb             |  6 +++++
 4 files changed, 49 insertions(+)
 create mode 100644 app/models/types_de_champ/prefill_departement_type_de_champ.rb
 create mode 100644 spec/models/types_de_champ/prefill_departement_type_de_champ_spec.rb

diff --git a/app/models/types_de_champ/prefill_departement_type_de_champ.rb b/app/models/types_de_champ/prefill_departement_type_de_champ.rb
new file mode 100644
index 000000000..9a6fa807a
--- /dev/null
+++ b/app/models/types_de_champ/prefill_departement_type_de_champ.rb
@@ -0,0 +1,15 @@
+class TypesDeChamp::PrefillDepartementTypeDeChamp < TypesDeChamp::PrefillTypeDeChamp
+  def possible_values
+    departements.map { |departement| "#{departement[:code]} (#{departement[:name]})" }
+  end
+
+  def example_value
+    departements.pick(:code)
+  end
+
+  private
+
+  def departements
+    @departements ||= APIGeoService.departements.sort_by { |departement| departement[:code] }
+  end
+end
diff --git a/app/models/types_de_champ/prefill_type_de_champ.rb b/app/models/types_de_champ/prefill_type_de_champ.rb
index 296c04c48..5e9e55380 100644
--- a/app/models/types_de_champ/prefill_type_de_champ.rb
+++ b/app/models/types_de_champ/prefill_type_de_champ.rb
@@ -9,6 +9,8 @@ class TypesDeChamp::PrefillTypeDeChamp < SimpleDelegator
       TypesDeChamp::PrefillPaysTypeDeChamp.new(type_de_champ)
     when TypeDeChamp.type_champs.fetch(:regions)
       TypesDeChamp::PrefillRegionTypeDeChamp.new(type_de_champ)
+    when TypeDeChamp.type_champs.fetch(:departements)
+      TypesDeChamp::PrefillDepartementTypeDeChamp.new(type_de_champ)
     else
       new(type_de_champ)
     end
diff --git a/spec/models/types_de_champ/prefill_departement_type_de_champ_spec.rb b/spec/models/types_de_champ/prefill_departement_type_de_champ_spec.rb
new file mode 100644
index 000000000..bba1b47a7
--- /dev/null
+++ b/spec/models/types_de_champ/prefill_departement_type_de_champ_spec.rb
@@ -0,0 +1,26 @@
+# frozen_string_literal: true
+
+RSpec.describe TypesDeChamp::PrefillDepartementTypeDeChamp, type: :model do
+  let(:type_de_champ) { build(:type_de_champ_departements) }
+  let(:memory_store) { ActiveSupport::Cache.lookup_store(:memory_store) }
+
+  before do
+    allow(Rails).to receive(:cache).and_return(memory_store)
+    Rails.cache.clear
+  end
+
+  describe '#possible_values', vcr: { cassette_name: 'api_geo_departements' } do
+    let(:expected_values) {
+      APIGeoService.departements.sort_by { |departement| departement[:code] }.map { |departement| "#{departement[:code]} (#{departement[:name]})" }
+    }
+    subject(:possible_values) { described_class.new(type_de_champ).possible_values }
+
+    it { expect(possible_values).to match(expected_values) }
+  end
+
+  describe '#example_value', vcr: { cassette_name: 'api_geo_departements' } do
+    subject(:example_value) { described_class.new(type_de_champ).example_value }
+
+    it { expect(example_value).to eq(APIGeoService.departements.sort_by { |departement| departement[:code] }.first[:code]) }
+  end
+end
diff --git a/spec/models/types_de_champ/prefill_type_de_champ_spec.rb b/spec/models/types_de_champ/prefill_type_de_champ_spec.rb
index af0e3cfc9..52508be91 100644
--- a/spec/models/types_de_champ/prefill_type_de_champ_spec.rb
+++ b/spec/models/types_de_champ/prefill_type_de_champ_spec.rb
@@ -22,6 +22,12 @@ RSpec.describe TypesDeChamp::PrefillTypeDeChamp, type: :model do
       it { expect(built).to be_kind_of(TypesDeChamp::PrefillRegionTypeDeChamp) }
     end
 
+    context 'when the type de champ is a departements' do
+      let(:type_de_champ) { build(:type_de_champ_departements) }
+
+      it { expect(built).to be_kind_of(TypesDeChamp::PrefillDepartementTypeDeChamp) }
+    end
+
     context 'when any other type de champ' do
       let(:type_de_champ) { build(:type_de_champ_date) }
 

From 12abf9045b53ea917456035e333ec5c0571e0f64 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=A9bastien=20Carceles?= <sebastien.carceles@gmail.com>
Date: Fri, 20 Jan 2023 11:23:52 +0100
Subject: [PATCH 028/202] add external_id and value validation

---
 app/models/champs/departement_champ.rb        | 18 ++++++
 app/models/prefill_params.rb                  |  3 +-
 config/locales/en.yml                         |  6 ++
 config/locales/fr.yml                         |  6 ++
 .../api/v1/dossiers_controller_spec.rb        |  9 ++-
 .../api/v2/graphql_controller_spec.rb         |  3 +-
 spec/models/champs/departement_champ_spec.rb  | 62 ++++++++++++++++++-
 spec/models/prefill_params_spec.rb            |  4 +-
 8 files changed, 104 insertions(+), 7 deletions(-)

diff --git a/app/models/champs/departement_champ.rb b/app/models/champs/departement_champ.rb
index 13edb4bb4..5a99ce8ad 100644
--- a/app/models/champs/departement_champ.rb
+++ b/app/models/champs/departement_champ.rb
@@ -21,6 +21,9 @@
 #  type_de_champ_id               :integer
 #
 class Champs::DepartementChamp < Champs::TextChamp
+  validate :value_in_departement_names, unless: -> { value.nil? }
+  validate :external_id_in_departement_codes, unless: -> { external_id.nil? }
+
   def for_export
     [name, code]
   end
@@ -65,6 +68,9 @@ class Champs::DepartementChamp < Champs::TextChamp
     elsif code.blank?
       self.external_id = nil
       super(nil)
+    else
+      self.external_id = APIGeoService.departement_code(code)
+      super(code)
     end
   end
 
@@ -73,4 +79,16 @@ class Champs::DepartementChamp < Champs::TextChamp
   def formatted_value
     blank? ? "" : "#{code} – #{name}"
   end
+
+  def value_in_departement_names
+    return if value.in?(APIGeoService.departements.pluck(:name))
+
+    errors.add(:value, :not_in_departement_names)
+  end
+
+  def external_id_in_departement_codes
+    return if external_id.in?(APIGeoService.departements.pluck(:code))
+
+    errors.add(:external_id, :not_in_departement_codes)
+  end
 end
diff --git a/app/models/prefill_params.rb b/app/models/prefill_params.rb
index e4ded1975..33261a8ac 100644
--- a/app/models/prefill_params.rb
+++ b/app/models/prefill_params.rb
@@ -40,7 +40,8 @@ class PrefillParams
       TypeDeChamp.type_champs.fetch(:yes_no),
       TypeDeChamp.type_champs.fetch(:checkbox),
       TypeDeChamp.type_champs.fetch(:pays),
-      TypeDeChamp.type_champs.fetch(:regions)
+      TypeDeChamp.type_champs.fetch(:regions),
+      TypeDeChamp.type_champs.fetch(:departements)
     ]
 
     attr_reader :champ, :value
diff --git a/config/locales/en.yml b/config/locales/en.yml
index dc8be05ec..b6ebae365 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -475,6 +475,12 @@ en:
               not_in_region_names: "must be a valid region name"
             external_id:
               not_in_region_codes: "must be a valid region code"
+        "champs/departement_champ":
+          attributes:
+            value:
+              not_in_departement_names: "must be a valid departement name"
+            external_id:
+              not_in_departement_codes: "must be a valid departement code"
   errors:
     format: "Field « %{attribute} » %{message}"
     messages:
diff --git a/config/locales/fr.yml b/config/locales/fr.yml
index d4b864c28..7ff6a3e7f 100644
--- a/config/locales/fr.yml
+++ b/config/locales/fr.yml
@@ -470,6 +470,12 @@ fr:
               not_in_region_names: "doit être un nom de région valide"
             external_id:
               not_in_region_codes: "doit être un code de région valide"
+        "champs/departement_champ":
+          attributes:
+            value:
+              not_in_departement_names: "doit être un nom de département valide"
+            external_id:
+              not_in_departement_codes: "doit être un code de département valide"
   errors:
     format: "Le champ « %{attribute} » %{message}"
     messages:
diff --git a/spec/controllers/api/v1/dossiers_controller_spec.rb b/spec/controllers/api/v1/dossiers_controller_spec.rb
index af705addd..9c7ef5fe3 100644
--- a/spec/controllers/api/v1/dossiers_controller_spec.rb
+++ b/spec/controllers/api/v1/dossiers_controller_spec.rb
@@ -4,6 +4,13 @@ describe API::V1::DossiersController do
   let(:procedure) { create(:procedure, :with_type_de_champ, :with_type_de_champ_private, administrateur: admin) }
   let(:wrong_procedure) { create(:procedure) }
 
+  let(:memory_store) { ActiveSupport::Cache.lookup_store(:memory_store) }
+
+  before do
+    allow(Rails).to receive(:cache).and_return(memory_store)
+    Rails.cache.clear
+  end
+
   it { expect(described_class).to be < APIController }
 
   describe 'GET index (with bearer token)' do
@@ -258,7 +265,7 @@ describe API::V1::DossiersController do
             end
           end
 
-          describe 'departement' do
+          describe 'departement', vcr: { cassette_name: 'api_geo_departements' } do
             let(:procedure) { create(:procedure, :with_departement, administrateur: admin) }
             let(:dossier) { create(:dossier, :en_construction, :with_populated_champs, procedure: procedure) }
 
diff --git a/spec/controllers/api/v2/graphql_controller_spec.rb b/spec/controllers/api/v2/graphql_controller_spec.rb
index acfe61304..6f70743cd 100644
--- a/spec/controllers/api/v2/graphql_controller_spec.rb
+++ b/spec/controllers/api/v2/graphql_controller_spec.rb
@@ -42,7 +42,6 @@ describe API::V2::GraphqlController do
     allow(Rails).to receive(:cache).and_return(memory_store)
     Rails.cache.clear
 
-    allow(APIGeoService).to receive(:departement_name).with('01').and_return('Ain')
     instructeur.assign_to_procedure(procedure)
   end
 
@@ -397,7 +396,7 @@ describe API::V2::GraphqlController do
         dossier
       end
 
-      context "for individual", vcr: { cassette_name: 'api_geo_regions' } do
+      context "for individual", vcr: { cassette_name: 'api_geo_all' } do
         let(:procedure) { create(:procedure, :published, :for_individual, :with_service, :with_all_champs, :with_all_annotations, administrateurs: [admin]) }
         let(:query) do
           "{
diff --git a/spec/models/champs/departement_champ_spec.rb b/spec/models/champs/departement_champ_spec.rb
index 35353f865..1a70439d5 100644
--- a/spec/models/champs/departement_champ_spec.rb
+++ b/spec/models/champs/departement_champ_spec.rb
@@ -6,9 +6,69 @@ describe Champs::DepartementChamp, type: :model do
     Rails.cache.clear
   end
 
-  let(:champ) { described_class.new }
+  describe 'validations', vcr: { cassette_name: 'api_geo_departements' } do
+    describe 'external link' do
+      subject { build(:champ_departements, external_id: external_id) }
+
+      context 'when nil' do
+        let(:external_id) { nil }
+
+        it { is_expected.to be_valid }
+      end
+
+      context 'when blank' do
+        let(:external_id) { '' }
+
+        it { is_expected.not_to be_valid }
+      end
+
+      context 'when included in the departement codes' do
+        let(:external_id) { "01" }
+
+        it { is_expected.to be_valid }
+      end
+
+      context 'when not included in the departement codes' do
+        let(:external_id) { "totoro" }
+
+        it { is_expected.not_to be_valid }
+      end
+    end
+
+    describe 'value' do
+      subject { create(:champ_departements) }
+
+      before { subject.update_columns(value: value) }
+
+      context 'when nil' do
+        let(:value) { nil }
+
+        it { is_expected.to be_valid }
+      end
+
+      context 'when blank' do
+        let(:value) { '' }
+
+        it { is_expected.not_to be_valid }
+      end
+
+      context 'when included in the departement names' do
+        let(:value) { "Ain" }
+
+        it { is_expected.to be_valid }
+      end
+
+      context 'when not included in the departement names' do
+        let(:value) { "totoro" }
+
+        it { is_expected.not_to be_valid }
+      end
+    end
+  end
 
   describe 'value', vcr: { cassette_name: 'api_geo_departements' } do
+    let(:champ) { described_class.new }
+
     it 'with code having 2 chars' do
       champ.value = '01'
       expect(champ.external_id).to eq('01')
diff --git a/spec/models/prefill_params_spec.rb b/spec/models/prefill_params_spec.rb
index 680a7beca..2c9ff077a 100644
--- a/spec/models/prefill_params_spec.rb
+++ b/spec/models/prefill_params_spec.rb
@@ -1,5 +1,5 @@
 RSpec.describe PrefillParams do
-  describe "#to_a", vcr: { cassette_name: 'api_geo_regions' } do
+  describe "#to_a", vcr: { cassette_name: 'api_geo_all' } do
     let(:memory_store) { ActiveSupport::Cache.lookup_store(:memory_store) }
 
     let(:procedure) { create(:procedure, :published, types_de_champ_public:, types_de_champ_private:) }
@@ -171,7 +171,7 @@ RSpec.describe PrefillParams do
     it_behaves_like "a champ public value that is unauthorized", :address, "value"
     it_behaves_like "a champ public value that is unauthorized", :pays, "value"
     it_behaves_like "a champ public value that is unauthorized", :regions, "value"
-    # TODO: SEB add validation it_behaves_like "a champ public value that is unauthorized", :departements, "value"
+    it_behaves_like "a champ public value that is unauthorized", :departements, "value"
     it_behaves_like "a champ public value that is unauthorized", :siret, "value"
     it_behaves_like "a champ public value that is unauthorized", :rna, "value"
     it_behaves_like "a champ public value that is unauthorized", :annuaire_education, "value"

From a56efe22e5c2081832cd2d9dd0fbe1e36a1dba4b Mon Sep 17 00:00:00 2001
From: sebastiencarceles <sebastien.carceles@gmail.com>
Date: Tue, 24 Jan 2023 08:25:03 +0100
Subject: [PATCH 029/202] review: link about department numbers

---
 config/locales/en.yml | 5 +++--
 config/locales/fr.yml | 1 +
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/config/locales/en.yml b/config/locales/en.yml
index b6ebae365..4994f9127 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -130,6 +130,7 @@ en:
           yes_no_html: '"true" for Yes, "false" pour No'
           checkbox_html: '"true" to check, "false" to uncheck'
           pays_html: An <a href="https://en.wikipedia.org/wiki/ISO_3166-2" target="_blank">ISO 3166-2 country code</a>
+          departements_html: A <a href="https://fr.wikipedia.org/wiki/Num%C3%A9rotation_des_d%C3%A9partements_fran%C3%A7ais" target="_blank">department number</a>
           regions_html: An <a href="https://fr.wikipedia.org/wiki/R%C3%A9gion_fran%C3%A7aise" target="_blank">INSEE region code</a>
           date_html: ISO8601 date
           datetime_html: ISO8601 datetime
@@ -478,9 +479,9 @@ en:
         "champs/departement_champ":
           attributes:
             value:
-              not_in_departement_names: "must be a valid departement name"
+              not_in_departement_names: "must be a valid department name"
             external_id:
-              not_in_departement_codes: "must be a valid departement code"
+              not_in_departement_codes: "must be a valid department code"
   errors:
     format: "Field « %{attribute} » %{message}"
     messages:
diff --git a/config/locales/fr.yml b/config/locales/fr.yml
index 7ff6a3e7f..b8402dfb2 100644
--- a/config/locales/fr.yml
+++ b/config/locales/fr.yml
@@ -121,6 +121,7 @@ fr:
           yes_no_html: '"true" pour Oui, "false" pour Non'
           checkbox_html: '"true" pour coché, "false" pour décoché'
           pays_html: Un <a href="https://en.wikipedia.org/wiki/ISO_3166-2" target="_blank">code pays ISO 3166-2</a>
+          departements_html: Un <a href="https://fr.wikipedia.org/wiki/Num%C3%A9rotation_des_d%C3%A9partements_fran%C3%A7ais" target="_blank">numéro de département</a>
           regions_html: Un <a href="https://fr.wikipedia.org/wiki/R%C3%A9gion_fran%C3%A7aise" target="_blank">code INSEE de région</a>
           datetime_html: Datetime au format ISO8601
           date_html: Date au format ISO8601

From 67ef3a16faabc71565cae4d43a1473c5e8dc7900 Mon Sep 17 00:00:00 2001
From: sebastiencarceles <sebastien.carceles@gmail.com>
Date: Tue, 24 Jan 2023 08:31:19 +0100
Subject: [PATCH 030/202] review: put example values in translation yamls

---
 .../prefill_departement_type_de_champ.rb             |  4 ----
 .../types_de_champ/prefill_pays_type_de_champ.rb     |  4 ----
 config/locales/en.yml                                |  1 +
 config/locales/fr.yml                                |  1 +
 .../prefill_departement_type_de_champ_spec.rb        | 12 ++++++------
 .../prefill_pays_type_de_champ_spec.rb               | 12 ++++++------
 6 files changed, 14 insertions(+), 20 deletions(-)

diff --git a/app/models/types_de_champ/prefill_departement_type_de_champ.rb b/app/models/types_de_champ/prefill_departement_type_de_champ.rb
index 9a6fa807a..2ec1d1d11 100644
--- a/app/models/types_de_champ/prefill_departement_type_de_champ.rb
+++ b/app/models/types_de_champ/prefill_departement_type_de_champ.rb
@@ -3,10 +3,6 @@ class TypesDeChamp::PrefillDepartementTypeDeChamp < TypesDeChamp::PrefillTypeDeC
     departements.map { |departement| "#{departement[:code]} (#{departement[:name]})" }
   end
 
-  def example_value
-    departements.pick(:code)
-  end
-
   private
 
   def departements
diff --git a/app/models/types_de_champ/prefill_pays_type_de_champ.rb b/app/models/types_de_champ/prefill_pays_type_de_champ.rb
index 143f041e7..6e5f9952c 100644
--- a/app/models/types_de_champ/prefill_pays_type_de_champ.rb
+++ b/app/models/types_de_champ/prefill_pays_type_de_champ.rb
@@ -3,10 +3,6 @@ class TypesDeChamp::PrefillPaysTypeDeChamp < TypesDeChamp::PrefillTypeDeChamp
     countries.map { |country| "#{country[:code]} (#{country[:name]})" }
   end
 
-  def example_value
-    countries.pick(:code)
-  end
-
   private
 
   def countries
diff --git a/config/locales/en.yml b/config/locales/en.yml
index 4994f9127..c9f4af19e 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -146,6 +146,7 @@ en:
           iban: FR7611315000011234567890138
           yes_no: "true"
           pays: "FR"
+          departements: "56"
           regions: "53"
           date: "2023-02-01"
           datetime: "2023-02-01T10:30"
diff --git a/config/locales/fr.yml b/config/locales/fr.yml
index b8402dfb2..b530475fc 100644
--- a/config/locales/fr.yml
+++ b/config/locales/fr.yml
@@ -138,6 +138,7 @@ fr:
           yes_no: "true"
           civilite: "M."
           pays: "FR"
+          departements: "56"
           regions: "53"
           date: "2023-02-01"
           datetime: "2023-02-01T10:30"
diff --git a/spec/models/types_de_champ/prefill_departement_type_de_champ_spec.rb b/spec/models/types_de_champ/prefill_departement_type_de_champ_spec.rb
index bba1b47a7..f43a07393 100644
--- a/spec/models/types_de_champ/prefill_departement_type_de_champ_spec.rb
+++ b/spec/models/types_de_champ/prefill_departement_type_de_champ_spec.rb
@@ -9,6 +9,12 @@ RSpec.describe TypesDeChamp::PrefillDepartementTypeDeChamp, type: :model do
     Rails.cache.clear
   end
 
+  describe 'ancestors' do
+    subject { described_class.build(type_de_champ) }
+
+    it { is_expected.to be_kind_of(TypesDeChamp::PrefillTypeDeChamp) }
+  end
+
   describe '#possible_values', vcr: { cassette_name: 'api_geo_departements' } do
     let(:expected_values) {
       APIGeoService.departements.sort_by { |departement| departement[:code] }.map { |departement| "#{departement[:code]} (#{departement[:name]})" }
@@ -17,10 +23,4 @@ RSpec.describe TypesDeChamp::PrefillDepartementTypeDeChamp, type: :model do
 
     it { expect(possible_values).to match(expected_values) }
   end
-
-  describe '#example_value', vcr: { cassette_name: 'api_geo_departements' } do
-    subject(:example_value) { described_class.new(type_de_champ).example_value }
-
-    it { expect(example_value).to eq(APIGeoService.departements.sort_by { |departement| departement[:code] }.first[:code]) }
-  end
 end
diff --git a/spec/models/types_de_champ/prefill_pays_type_de_champ_spec.rb b/spec/models/types_de_champ/prefill_pays_type_de_champ_spec.rb
index f651d3d60..67789ba9e 100644
--- a/spec/models/types_de_champ/prefill_pays_type_de_champ_spec.rb
+++ b/spec/models/types_de_champ/prefill_pays_type_de_champ_spec.rb
@@ -2,16 +2,16 @@
 RSpec.describe TypesDeChamp::PrefillPaysTypeDeChamp, type: :model do
   let(:type_de_champ) { build(:type_de_champ_pays) }
 
+  describe 'ancestors' do
+    subject { described_class.build(type_de_champ) }
+
+    it { is_expected.to be_kind_of(TypesDeChamp::PrefillTypeDeChamp) }
+  end
+
   describe '#possible_values' do
     let(:expected_values) { APIGeoService.countries.sort_by { |country| country[:code] }.map { |country| "#{country[:code]} (#{country[:name]})" } }
     subject(:possible_values) { described_class.new(type_de_champ).possible_values }
 
     it { expect(possible_values).to match(expected_values) }
   end
-
-  describe '#example_value' do
-    subject(:example_value) { described_class.new(type_de_champ).example_value }
-
-    it { expect(example_value).to eq(APIGeoService.countries.sort_by { |country| country[:code] }.first[:code]) }
-  end
 end

From 81bc898cfb9296658941af8630cf03262fb9e06b Mon Sep 17 00:00:00 2001
From: Julie Salha <julie.salha@gmail.com>
Date: Thu, 9 Feb 2023 11:12:04 +0100
Subject: [PATCH 031/202] optimization burger menu dsfr

---
 app/views/layouts/_header.haml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/views/layouts/_header.haml b/app/views/layouts/_header.haml
index e7916f90e..41c23b0e5 100644
--- a/app/views/layouts/_header.haml
+++ b/app/views/layouts/_header.haml
@@ -72,7 +72,7 @@
             = render partial: 'layouts/search_dossiers_form', locals: { search_endpoint: recherche_dossiers_path }
 
   - has_header = [is_instructeur_context, is_expert_context, is_user_context]
-  #burger-menu.fr-header__menu.fr-modal{ "aria-label" => t('layouts.header.label_modal') }
+  #burger-menu.fr-header__menu.fr-modal
     .fr-container
       %button#burger_button.fr-btn--close.fr-btn{ "aria-controls" => "burger-menu", :title => t('close_modal', scope: [:layouts, :header]) }= t('close_modal', scope: [:layouts, :header])
       .fr-header__menu-links

From ee009a2c7e7048a74fafe39f7db57b6a712cb121 Mon Sep 17 00:00:00 2001
From: Julie Salha <julie.salha@gmail.com>
Date: Thu, 9 Feb 2023 11:18:39 +0100
Subject: [PATCH 032/202] fix PR: delete translations

---
 config/locales/en.yml | 1 -
 config/locales/fr.yml | 1 -
 2 files changed, 2 deletions(-)

diff --git a/config/locales/en.yml b/config/locales/en.yml
index c9f4af19e..d1a6b9638 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -68,7 +68,6 @@ en:
         are_you_new: First time on %{app_name}?
     my_account: My account
     header:
-      label_modal: "Burger menu"
       close_modal: 'Close'
       back: "Back"
       back_title: "Revenir sur le site de mon administration"
diff --git a/config/locales/fr.yml b/config/locales/fr.yml
index b530475fc..13aa78315 100644
--- a/config/locales/fr.yml
+++ b/config/locales/fr.yml
@@ -59,7 +59,6 @@ fr:
         are_you_new: Vous êtes nouveau sur %{app_name} ?
     my_account: Mon compte
     header:
-      label_modal: "Menu en-tête de page"
       close_modal: 'Fermer'
       back: "Revenir en arrière"
       back_title: "Revenir sur le site de mon administration"

From a77a0e2c7f7a65b5e1c3585855ed1bb1ae18514f Mon Sep 17 00:00:00 2001
From: sebastiencarceles <sebastien.carceles@gmail.com>
Date: Tue, 14 Feb 2023 11:35:35 +0100
Subject: [PATCH 033/202] :coffin: dead code is dead

---
 app/models/types_de_champ/prefill_repetition_type_de_champ.rb | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/app/models/types_de_champ/prefill_repetition_type_de_champ.rb b/app/models/types_de_champ/prefill_repetition_type_de_champ.rb
index 8b729dc25..c1a879c5c 100644
--- a/app/models/types_de_champ/prefill_repetition_type_de_champ.rb
+++ b/app/models/types_de_champ/prefill_repetition_type_de_champ.rb
@@ -25,10 +25,6 @@ class TypesDeChamp::PrefillRepetitionTypeDeChamp < TypesDeChamp::PrefillTypeDeCh
 
   private
 
-  def too_many_possible_values?
-    false
-  end
-
   def subchamps_possible_values_list
     "<ul>" + prefillable_subchamps.map do |prefill_type_de_champ|
       "<li>#{prefill_type_de_champ.libelle}: #{prefill_type_de_champ.possible_values}</li>"

From 0159a1096930aa69edff7c83646e5d02cda87cfa Mon Sep 17 00:00:00 2001
From: sebastiencarceles <sebastien.carceles@gmail.com>
Date: Tue, 14 Feb 2023 11:41:35 +0100
Subject: [PATCH 034/202] :bug: make possible_values_list method public

---
 .../prefill_drop_down_list_type_de_champ.rb          | 10 ++++------
 .../types_de_champ/prefill_pays_type_de_champ.rb     |  8 ++++----
 .../types_de_champ/prefill_region_type_de_champ.rb   |  4 ++--
 app/models/types_de_champ/prefill_type_de_champ.rb   | 12 ++++++------
 .../prefill_type_de_champs_controller_spec.rb        |  2 ++
 5 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/app/models/types_de_champ/prefill_drop_down_list_type_de_champ.rb b/app/models/types_de_champ/prefill_drop_down_list_type_de_champ.rb
index b5505151f..648f2d17e 100644
--- a/app/models/types_de_champ/prefill_drop_down_list_type_de_champ.rb
+++ b/app/models/types_de_champ/prefill_drop_down_list_type_de_champ.rb
@@ -1,10 +1,4 @@
 class TypesDeChamp::PrefillDropDownListTypeDeChamp < TypesDeChamp::PrefillTypeDeChamp
-  def example_value
-    possible_values_list.first
-  end
-
-  private
-
   def possible_values_list
     if drop_down_other?
       drop_down_list_enabled_non_empty_options.insert(
@@ -15,4 +9,8 @@ class TypesDeChamp::PrefillDropDownListTypeDeChamp < TypesDeChamp::PrefillTypeDe
       drop_down_list_enabled_non_empty_options
     end
   end
+
+  def example_value
+    possible_values_list.first
+  end
 end
diff --git a/app/models/types_de_champ/prefill_pays_type_de_champ.rb b/app/models/types_de_champ/prefill_pays_type_de_champ.rb
index cf0fa0278..a5e6aad21 100644
--- a/app/models/types_de_champ/prefill_pays_type_de_champ.rb
+++ b/app/models/types_de_champ/prefill_pays_type_de_champ.rb
@@ -1,14 +1,14 @@
 class TypesDeChamp::PrefillPaysTypeDeChamp < TypesDeChamp::PrefillTypeDeChamp
+  def possible_values_list
+    countries.map { |country| "#{country[:code]} (#{country[:name]})" }
+  end
+
   def example_value
     countries.pick(:code)
   end
 
   private
 
-  def possible_values_list
-    countries.map { |country| "#{country[:code]} (#{country[:name]})" }
-  end
-
   def countries
     @countries ||= APIGeoService.countries.sort_by { |country| country[:code] }
   end
diff --git a/app/models/types_de_champ/prefill_region_type_de_champ.rb b/app/models/types_de_champ/prefill_region_type_de_champ.rb
index 6362fccac..7d52601b4 100644
--- a/app/models/types_de_champ/prefill_region_type_de_champ.rb
+++ b/app/models/types_de_champ/prefill_region_type_de_champ.rb
@@ -1,10 +1,10 @@
 class TypesDeChamp::PrefillRegionTypeDeChamp < TypesDeChamp::PrefillTypeDeChamp
-  private
-
   def possible_values_list
     regions.map { |region| "#{region[:code]} (#{region[:name]})" }
   end
 
+  private
+
   def regions
     @regions ||= APIGeoService.regions.sort_by { |region| region[:code] }
   end
diff --git a/app/models/types_de_champ/prefill_type_de_champ.rb b/app/models/types_de_champ/prefill_type_de_champ.rb
index 8b6c0bbba..3ab56de61 100644
--- a/app/models/types_de_champ/prefill_type_de_champ.rb
+++ b/app/models/types_de_champ/prefill_type_de_champ.rb
@@ -27,6 +27,12 @@ class TypesDeChamp::PrefillTypeDeChamp < SimpleDelegator
     [possible_values_list_display, link_to_all_possible_values].compact.join('<br>').html_safe # rubocop:disable Rails/OutputSafety
   end
 
+  def possible_values_list
+    return [] unless prefillable?
+
+    [I18n.t("views.prefill_descriptions.edit.possible_values.#{type_champ}_html")]
+  end
+
   def example_value
     return nil unless prefillable?
 
@@ -43,12 +49,6 @@ class TypesDeChamp::PrefillTypeDeChamp < SimpleDelegator
 
   private
 
-  def possible_values_list
-    return [] unless prefillable?
-
-    [I18n.t("views.prefill_descriptions.edit.possible_values.#{type_champ}_html")]
-  end
-
   def link_to_all_possible_values
     return unless too_many_possible_values? && prefillable?
 
diff --git a/spec/controllers/prefill_type_de_champs_controller_spec.rb b/spec/controllers/prefill_type_de_champs_controller_spec.rb
index a4b61f19c..5e13be629 100644
--- a/spec/controllers/prefill_type_de_champs_controller_spec.rb
+++ b/spec/controllers/prefill_type_de_champs_controller_spec.rb
@@ -8,6 +8,8 @@ RSpec.describe PrefillTypeDeChampsController, type: :controller do
     context 'when the procedure is found' do
       context 'when the procedure is publiee' do
         context 'when the procedure is opendata' do
+          render_views
+
           let(:procedure) { create(:procedure, :published, opendata: true) }
 
           it { expect(show_request).to render_template(:show) }

From a07446da6ce6d470bccdb3200d756a59c48ae98b Mon Sep 17 00:00:00 2001
From: sebastiencarceles <sebastien.carceles@gmail.com>
Date: Tue, 14 Feb 2023 11:45:39 +0100
Subject: [PATCH 035/202] :recycle: rename method for clarity

---
 .../types_de_champ/prefill_drop_down_list_type_de_champ.rb  | 4 ++--
 app/models/types_de_champ/prefill_pays_type_de_champ.rb     | 2 +-
 app/models/types_de_champ/prefill_region_type_de_champ.rb   | 2 +-
 .../types_de_champ/prefill_repetition_type_de_champ.rb      | 4 ++--
 app/models/types_de_champ/prefill_type_de_champ.rb          | 6 +++---
 app/views/prefill_type_de_champs/show.html.haml             | 2 +-
 6 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/app/models/types_de_champ/prefill_drop_down_list_type_de_champ.rb b/app/models/types_de_champ/prefill_drop_down_list_type_de_champ.rb
index 648f2d17e..6930905e7 100644
--- a/app/models/types_de_champ/prefill_drop_down_list_type_de_champ.rb
+++ b/app/models/types_de_champ/prefill_drop_down_list_type_de_champ.rb
@@ -1,5 +1,5 @@
 class TypesDeChamp::PrefillDropDownListTypeDeChamp < TypesDeChamp::PrefillTypeDeChamp
-  def possible_values_list
+  def all_possible_values
     if drop_down_other?
       drop_down_list_enabled_non_empty_options.insert(
         0,
@@ -11,6 +11,6 @@ class TypesDeChamp::PrefillDropDownListTypeDeChamp < TypesDeChamp::PrefillTypeDe
   end
 
   def example_value
-    possible_values_list.first
+    all_possible_values.first
   end
 end
diff --git a/app/models/types_de_champ/prefill_pays_type_de_champ.rb b/app/models/types_de_champ/prefill_pays_type_de_champ.rb
index a5e6aad21..9279b2f97 100644
--- a/app/models/types_de_champ/prefill_pays_type_de_champ.rb
+++ b/app/models/types_de_champ/prefill_pays_type_de_champ.rb
@@ -1,5 +1,5 @@
 class TypesDeChamp::PrefillPaysTypeDeChamp < TypesDeChamp::PrefillTypeDeChamp
-  def possible_values_list
+  def all_possible_values
     countries.map { |country| "#{country[:code]} (#{country[:name]})" }
   end
 
diff --git a/app/models/types_de_champ/prefill_region_type_de_champ.rb b/app/models/types_de_champ/prefill_region_type_de_champ.rb
index 7d52601b4..ae9d0501a 100644
--- a/app/models/types_de_champ/prefill_region_type_de_champ.rb
+++ b/app/models/types_de_champ/prefill_region_type_de_champ.rb
@@ -1,5 +1,5 @@
 class TypesDeChamp::PrefillRegionTypeDeChamp < TypesDeChamp::PrefillTypeDeChamp
-  def possible_values_list
+  def all_possible_values
     regions.map { |region| "#{region[:code]} (#{region[:name]})" }
   end
 
diff --git a/app/models/types_de_champ/prefill_repetition_type_de_champ.rb b/app/models/types_de_champ/prefill_repetition_type_de_champ.rb
index c1a879c5c..6cf1f5153 100644
--- a/app/models/types_de_champ/prefill_repetition_type_de_champ.rb
+++ b/app/models/types_de_champ/prefill_repetition_type_de_champ.rb
@@ -5,7 +5,7 @@ class TypesDeChamp::PrefillRepetitionTypeDeChamp < TypesDeChamp::PrefillTypeDeCh
   def possible_values
     [
       I18n.t("views.prefill_descriptions.edit.possible_values.#{type_champ}_html"),
-      subchamps_possible_values_list
+      subchamps_all_possible_values
     ].join("</br>").html_safe # rubocop:disable Rails/OutputSafety
   end
 
@@ -25,7 +25,7 @@ class TypesDeChamp::PrefillRepetitionTypeDeChamp < TypesDeChamp::PrefillTypeDeCh
 
   private
 
-  def subchamps_possible_values_list
+  def subchamps_all_possible_values
     "<ul>" + prefillable_subchamps.map do |prefill_type_de_champ|
       "<li>#{prefill_type_de_champ.libelle}: #{prefill_type_de_champ.possible_values}</li>"
     end.join + "</ul>"
diff --git a/app/models/types_de_champ/prefill_type_de_champ.rb b/app/models/types_de_champ/prefill_type_de_champ.rb
index 3ab56de61..31422be58 100644
--- a/app/models/types_de_champ/prefill_type_de_champ.rb
+++ b/app/models/types_de_champ/prefill_type_de_champ.rb
@@ -27,7 +27,7 @@ class TypesDeChamp::PrefillTypeDeChamp < SimpleDelegator
     [possible_values_list_display, link_to_all_possible_values].compact.join('<br>').html_safe # rubocop:disable Rails/OutputSafety
   end
 
-  def possible_values_list
+  def all_possible_values
     return [] unless prefillable?
 
     [I18n.t("views.prefill_descriptions.edit.possible_values.#{type_champ}_html")]
@@ -56,14 +56,14 @@ class TypesDeChamp::PrefillTypeDeChamp < SimpleDelegator
   end
 
   def too_many_possible_values?
-    possible_values_list.count > POSSIBLE_VALUES_THRESHOLD
+    all_possible_values.count > POSSIBLE_VALUES_THRESHOLD
   end
 
   def possible_values_list_display
     if too_many_possible_values?
       I18n.t("views.prefill_descriptions.edit.possible_values.#{type_champ}_html").html_safe # rubocop:disable Rails/OutputSafety
     else
-      possible_values_list.to_sentence
+      all_possible_values.to_sentence
     end
   end
 end
diff --git a/app/views/prefill_type_de_champs/show.html.haml b/app/views/prefill_type_de_champs/show.html.haml
index 8a1610340..67b52ec66 100644
--- a/app/views/prefill_type_de_champs/show.html.haml
+++ b/app/views/prefill_type_de_champs/show.html.haml
@@ -26,7 +26,7 @@
             = t("views.prefill_descriptions.edit.possible_values.title")
           %td
             .fr-grid-row.fr-grid-row--gutters.fr-py-5w
-              - @type_de_champ.possible_values_list.each do |possible_value|
+              - @type_de_champ.all_possible_values.each do |possible_value|
                 .fr-col-lg-3.fr-col-md-4.fr-col-sm-6.fr-col-12
                   = possible_value
         %tr

From 4fee6f3626143aea4369a3dc10c789479510f9c3 Mon Sep 17 00:00:00 2001
From: Julie Salha <julie.salha@gmail.com>
Date: Tue, 14 Feb 2023 12:17:44 +0100
Subject: [PATCH 036/202] update label button

---
 app/javascript/components/MapEditor/components/PointInput.tsx | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/javascript/components/MapEditor/components/PointInput.tsx b/app/javascript/components/MapEditor/components/PointInput.tsx
index 6bd7496a6..78b7a6cb3 100644
--- a/app/javascript/components/MapEditor/components/PointInput.tsx
+++ b/app/javascript/components/MapEditor/components/PointInput.tsx
@@ -41,9 +41,9 @@ export function PointInput() {
             type="button"
             className="button mr-1"
             onClick={getCurrentPosition}
-            title="Localiser votre position"
+            title="Localiser votre position et l'afficher sur la carte"
           >
-            <span className="sr-only">Localiser votre position</span>
+            <span className="sr-only">Localiser votre position et l'afficher sur la carte</span>
             <LocationMarkerIcon className="icon-size-big" aria-hidden />
           </button>
         ) : null}

From 6db07ca2a3f9262d0425e1bd9dc0444242af93ab Mon Sep 17 00:00:00 2001
From: Julie Salha <julie.salha@gmail.com>
Date: Tue, 14 Feb 2023 12:26:57 +0100
Subject: [PATCH 037/202] fix PR wording

---
 .../components/MapEditor/components/PointInput.tsx          | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/app/javascript/components/MapEditor/components/PointInput.tsx b/app/javascript/components/MapEditor/components/PointInput.tsx
index 78b7a6cb3..c7ef342b0 100644
--- a/app/javascript/components/MapEditor/components/PointInput.tsx
+++ b/app/javascript/components/MapEditor/components/PointInput.tsx
@@ -41,9 +41,11 @@ export function PointInput() {
             type="button"
             className="button mr-1"
             onClick={getCurrentPosition}
-            title="Localiser votre position et l'afficher sur la carte"
+            title="Afficher votre position sur la carte"
           >
-            <span className="sr-only">Localiser votre position et l'afficher sur la carte</span>
+            <span className="sr-only">
+              Afficher votre position sur la carte
+            </span>
             <LocationMarkerIcon className="icon-size-big" aria-hidden />
           </button>
         ) : null}

From 681e1cf51873e32faa9afd810a80124b78255fea Mon Sep 17 00:00:00 2001
From: sebastiencarceles <sebastien.carceles@gmail.com>
Date: Tue, 14 Feb 2023 13:45:30 +0100
Subject: [PATCH 038/202] :recycle: refactor possible_values impl for clarity

---
 .../types_de_champ/prefill_type_de_champ.rb   | 23 +++----
 .../prefill_type_de_champ_spec.rb             | 62 ++++++++++++++-----
 2 files changed, 60 insertions(+), 25 deletions(-)

diff --git a/app/models/types_de_champ/prefill_type_de_champ.rb b/app/models/types_de_champ/prefill_type_de_champ.rb
index 31422be58..aebd01ae2 100644
--- a/app/models/types_de_champ/prefill_type_de_champ.rb
+++ b/app/models/types_de_champ/prefill_type_de_champ.rb
@@ -24,13 +24,18 @@ class TypesDeChamp::PrefillTypeDeChamp < SimpleDelegator
   end
 
   def possible_values
-    [possible_values_list_display, link_to_all_possible_values].compact.join('<br>').html_safe # rubocop:disable Rails/OutputSafety
+    values = []
+    values << description if description.present?
+    if too_many_possible_values?
+      values << link_to_all_possible_values
+    else
+      values << all_possible_values.to_sentence
+    end
+    values.compact.join('<br>').html_safe # rubocop:disable Rails/OutputSafety
   end
 
   def all_possible_values
-    return [] unless prefillable?
-
-    [I18n.t("views.prefill_descriptions.edit.possible_values.#{type_champ}_html")]
+    []
   end
 
   def example_value
@@ -50,7 +55,7 @@ class TypesDeChamp::PrefillTypeDeChamp < SimpleDelegator
   private
 
   def link_to_all_possible_values
-    return unless too_many_possible_values? && prefillable?
+    return unless prefillable?
 
     link_to I18n.t("views.prefill_descriptions.edit.possible_values.link.text"), Rails.application.routes.url_helpers.prefill_type_de_champ_path(path, self), title: new_tab_suffix(I18n.t("views.prefill_descriptions.edit.possible_values.link.title")), **external_link_attributes
   end
@@ -59,11 +64,7 @@ class TypesDeChamp::PrefillTypeDeChamp < SimpleDelegator
     all_possible_values.count > POSSIBLE_VALUES_THRESHOLD
   end
 
-  def possible_values_list_display
-    if too_many_possible_values?
-      I18n.t("views.prefill_descriptions.edit.possible_values.#{type_champ}_html").html_safe # rubocop:disable Rails/OutputSafety
-    else
-      all_possible_values.to_sentence
-    end
+  def description
+    @description ||= I18n.t("views.prefill_descriptions.edit.possible_values.#{type_champ}_html", default: nil)&.html_safe # rubocop:disable Rails/OutputSafety
   end
 end
diff --git a/spec/models/types_de_champ/prefill_type_de_champ_spec.rb b/spec/models/types_de_champ/prefill_type_de_champ_spec.rb
index d5e322155..b0c19a666 100644
--- a/spec/models/types_de_champ/prefill_type_de_champ_spec.rb
+++ b/spec/models/types_de_champ/prefill_type_de_champ_spec.rb
@@ -1,6 +1,9 @@
 # frozen_string_literal: true
 
 RSpec.describe TypesDeChamp::PrefillTypeDeChamp, type: :model do
+  include ActionView::Helpers::UrlHelper
+  include ApplicationHelper
+
   describe '.build' do
     subject(:built) { described_class.build(type_de_champ) }
 
@@ -45,26 +48,57 @@ RSpec.describe TypesDeChamp::PrefillTypeDeChamp, type: :model do
   end
 
   describe '#possible_values' do
-    subject(:possible_values) { described_class.new(type_de_champ).possible_values }
+    let(:built) { described_class.build(type_de_champ) }
+    subject(:possible_values) { built.possible_values }
+
+    context 'when the type de champ is prefillable' do
+      context 'when the type de champ has a description' do
+        let(:type_de_champ) { build(:type_de_champ_text) }
+
+        it { expect(possible_values).to include(I18n.t("views.prefill_descriptions.edit.possible_values.#{type_de_champ.type_champ}_html")) }
+      end
+
+      context 'when the type de champ does not have a description' do
+        let(:type_de_champ) { build(:type_de_champ_mesri) }
+
+        it { expect(possible_values).not_to include(I18n.t("views.prefill_descriptions.edit.possible_values.#{type_de_champ.type_champ}_html")) }
+      end
+
+      describe 'too many possible values or not' do
+        let!(:procedure) { create(:procedure, :with_drop_down_list) }
+        let(:type_de_champ) { procedure.draft_types_de_champ_public.first }
+        let(:link_to_all_possible_values) {
+          link_to(
+            I18n.t("views.prefill_descriptions.edit.possible_values.link.text"),
+            Rails.application.routes.url_helpers.prefill_type_de_champ_path(type_de_champ.path, type_de_champ),
+            title: new_tab_suffix(I18n.t("views.prefill_descriptions.edit.possible_values.link.title")),
+            **external_link_attributes
+          )
+        }
+
+        context 'when there is too many possible values' do
+          before { type_de_champ.drop_down_options = (1..described_class::POSSIBLE_VALUES_THRESHOLD + 1).map(&:to_s) }
+
+          it { expect(possible_values).to include(link_to_all_possible_values) }
+
+          it { expect(possible_values).not_to include(built.all_possible_values.to_sentence) }
+        end
+
+        context 'when there is not too many possible values' do
+          before { type_de_champ.drop_down_options = (1..described_class::POSSIBLE_VALUES_THRESHOLD - 1).map(&:to_s) }
+
+          it { expect(possible_values).not_to include(link_to_all_possible_values) }
+
+          it { expect(possible_values).to include(built.all_possible_values.to_sentence) }
+        end
+      end
+    end
 
     context 'when the type de champ is not prefillable' do
       let(:type_de_champ) { build(:type_de_champ_mesri) }
 
       it { expect(possible_values).to be_empty }
     end
-
-    context 'when there is too many possible values' do
-      let(:type_de_champ) { create(:type_de_champ_drop_down_list, procedure: create(:procedure)) }
-      before { type_de_champ.drop_down_options = (1..described_class::POSSIBLE_VALUES_THRESHOLD + 1).map(&:to_s) }
-
-      it { expect(possible_values).to eq("Un choix parmi ceux sélectionnés à la création de la procédure") }
-    end
-
-    context 'when the type de champ is prefillable' do
-      let(:type_de_champ) { build(:type_de_champ_email) }
-
-      it { expect(possible_values).to eq("Une adresse email") }
-    end
   end
 
   describe '#example_value' do

From 6f65a4c2feafaf31af1e001314f71563bbf9e534 Mon Sep 17 00:00:00 2001
From: sebastiencarceles <sebastien.carceles@gmail.com>
Date: Tue, 14 Feb 2023 13:49:41 +0100
Subject: [PATCH 039/202] :rotating_light: line length

---
 app/models/types_de_champ/prefill_type_de_champ.rb | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/app/models/types_de_champ/prefill_type_de_champ.rb b/app/models/types_de_champ/prefill_type_de_champ.rb
index aebd01ae2..45b8f07cc 100644
--- a/app/models/types_de_champ/prefill_type_de_champ.rb
+++ b/app/models/types_de_champ/prefill_type_de_champ.rb
@@ -57,7 +57,12 @@ class TypesDeChamp::PrefillTypeDeChamp < SimpleDelegator
   def link_to_all_possible_values
     return unless prefillable?
 
-    link_to I18n.t("views.prefill_descriptions.edit.possible_values.link.text"), Rails.application.routes.url_helpers.prefill_type_de_champ_path(path, self), title: new_tab_suffix(I18n.t("views.prefill_descriptions.edit.possible_values.link.title")), **external_link_attributes
+    link_to(
+      I18n.t("views.prefill_descriptions.edit.possible_values.link.text"),
+      Rails.application.routes.url_helpers.prefill_type_de_champ_path(path, self),
+      title: new_tab_suffix(I18n.t("views.prefill_descriptions.edit.possible_values.link.title")),
+      **external_link_attributes
+    )
   end
 
   def too_many_possible_values?

From c45f15ff61771985d20d710fe8c6d1bfe0fe0c64 Mon Sep 17 00:00:00 2001
From: Martin <martin@sharypic.com>
Date: Mon, 13 Feb 2023 15:08:55 +0100
Subject: [PATCH 040/202] correctif(procedure/all.xsls): deconnecte le lien de
 telechargement de toutes les demarche de turbo

---
 .../administrateurs/procedures/all.html.haml      |  2 +-
 .../administrateurs/procedure_cloning_spec.rb     | 15 +++++++++++++++
 2 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/app/views/administrateurs/procedures/all.html.haml b/app/views/administrateurs/procedures/all.html.haml
index 1ac68b3be..56ad5e129 100644
--- a/app/views/administrateurs/procedures/all.html.haml
+++ b/app/views/administrateurs/procedures/all.html.haml
@@ -11,7 +11,7 @@
       = f.search_field 'libelle', size: 30, class: 'fr-input'
     .actions
       .link.fr-mx-1w= link_to 'Voir les administrateurs', administrateurs_admin_procedures_path(@filter.params), class: 'fr-btn fr-btn--secondary'
-      .link.fr-mx-1w= link_to 'Exporter les résultats', all_admin_procedures_path(@filter.params.merge(format: :xlsx)), class: 'fr-btn fr-btn--secondary'
+      .link.fr-mx-1w{ "data-turbo": "false" }= link_to 'Exporter les résultats', all_admin_procedures_path(@filter.params.merge(format: :xlsx)), class: 'fr-btn fr-btn--secondary'
   .fr-table.fr-table--bordered
     %table#all-demarches
       %caption
diff --git a/spec/system/administrateurs/procedure_cloning_spec.rb b/spec/system/administrateurs/procedure_cloning_spec.rb
index dc6dfafe4..a53545f09 100644
--- a/spec/system/administrateurs/procedure_cloning_spec.rb
+++ b/spec/system/administrateurs/procedure_cloning_spec.rb
@@ -14,7 +14,22 @@ describe 'As an administrateur I wanna clone a procedure', js: true do
       published_at: Time.zone.now)
     login_as administrateur.user, scope: :user
   end
+  context 'Visit all admin procedures' do
+    let(:download_dir) { Rails.root.join('tmp/capybara') }
+    let(:download_file_pattern) { download_dir.join('*.xlsx') }
 
+    scenario do
+      Dir[download_file_pattern].map { File.delete(_1) }
+      visit all_admin_procedures_path
+
+      click_on "Exporter les résultats"
+      Timeout.timeout(Capybara.default_max_wait_time,
+                      Timeout::Error,
+                     "File download timeout! can't download procedure/all.xlsx") do
+        sleep 0.1 until !Dir[download_file_pattern].empty?
+      end
+    end
+  end
   context 'Cloning a procedure owned by the current admin' do
     scenario do
       visit admin_procedures_path

From 8b74a6f39b1f32e76f20e9bebddd77f2880142d4 Mon Sep 17 00:00:00 2001
From: Paul Chavard <pro@paul.chavard.net>
Date: Tue, 14 Feb 2023 18:38:01 +0100
Subject: [PATCH 041/202] fix(geometry): implement our own bbox to replace rgeo

---
 app/graphql/types/geo_area_type.rb     |  2 +-
 app/models/champs/carte_champ.rb       | 13 ++----
 app/models/dossier.rb                  |  9 +---
 app/models/geo_area.rb                 | 32 ++++++++------
 app/serializers/champ_serializer.rb    |  2 +-
 app/serializers/geo_area_serializer.rb |  2 +-
 app/services/geojson_service.rb        | 60 ++++++++++++++++++++++++++
 spec/models/champs/carte_champ_spec.rb |  2 +-
 spec/models/dossier_spec.rb            |  4 +-
 spec/models/geo_area_spec.rb           |  6 +--
 10 files changed, 93 insertions(+), 39 deletions(-)

diff --git a/app/graphql/types/geo_area_type.rb b/app/graphql/types/geo_area_type.rb
index 5827b3576..32bc7a26e 100644
--- a/app/graphql/types/geo_area_type.rb
+++ b/app/graphql/types/geo_area_type.rb
@@ -12,7 +12,7 @@ module Types
 
     global_id_field :id
     field :source, GeoAreaSource, null: false
-    field :geometry, Types::GeoJSON, null: false, method: :safe_geometry
+    field :geometry, Types::GeoJSON, null: false
     field :description, String, null: true
 
     definition_methods do
diff --git a/app/models/champs/carte_champ.rb b/app/models/champs/carte_champ.rb
index 8d86789fc..208b72dfb 100644
--- a/app/models/champs/carte_champ.rb
+++ b/app/models/champs/carte_champ.rb
@@ -64,21 +64,14 @@ class Champs::CarteChamp < Champ
   end
 
   def bounding_box
-    factory = RGeo::Geographic.simple_mercator_factory
-    bounding_box = RGeo::Cartesian::BoundingBox.new(factory)
-
     if geo_areas.present?
-      geo_areas.filter_map(&:rgeo_geometry).each do |geometry|
-        bounding_box.add(geometry)
-      end
+      GeojsonService.bbox(type: 'FeatureCollection', features: geo_areas.map(&:to_feature))
     elsif dossier.present?
       point = dossier.geo_position
-      bounding_box.add(factory.point(point[:lon], point[:lat]))
+      GeojsonService.bbox(type: 'Feature', geometry: { type: 'Point', coordinates: [point[:lon], point[:lat]] })
     else
-      bounding_box.add(factory.point(DEFAULT_LON, DEFAULT_LAT))
+      GeojsonService.bbox(type: 'Feature', geometry: { type: 'Point', coordinates: [DEFAULT_LON, DEFAULT_LAT] })
     end
-
-    [bounding_box.max_point, bounding_box.min_point].compact.flat_map(&:coordinates)
   end
 
   def to_feature_collection
diff --git a/app/models/dossier.rb b/app/models/dossier.rb
index db8893a17..31eb93b03 100644
--- a/app/models/dossier.rb
+++ b/app/models/dossier.rb
@@ -1312,14 +1312,7 @@ class Dossier < ApplicationRecord
   end
 
   def bounding_box
-    factory = RGeo::Geographic.simple_mercator_factory
-    bounding_box = RGeo::Cartesian::BoundingBox.new(factory)
-
-    geo_areas.filter_map(&:rgeo_geometry).each do |geometry|
-      bounding_box.add(geometry)
-    end
-
-    [bounding_box.max_point, bounding_box.min_point].compact.flat_map(&:coordinates)
+    GeojsonService.bbox(type: 'FeatureCollection', features: geo_areas.map(&:to_feature))
   end
 
   def log_dossier_operation(author, operation, subject = nil)
diff --git a/app/models/geo_area.rb b/app/models/geo_area.rb
index 024b20d4d..57040c80d 100644
--- a/app/models/geo_area.rb
+++ b/app/models/geo_area.rb
@@ -52,11 +52,12 @@ class GeoArea < ApplicationRecord
   scope :cadastres, -> { where(source: sources.fetch(:cadastre)) }
 
   validates :geometry, geo_json: true, allow_blank: false
+  before_validation :normalize_geometry
 
   def to_feature
     {
       type: 'Feature',
-      geometry: safe_geometry,
+      geometry: geometry.deep_symbolize_keys,
       properties: cadastre_properties.merge(
         source: source,
         area: area,
@@ -96,16 +97,6 @@ class GeoArea < ApplicationRecord
     end
   end
 
-  def safe_geometry
-    RGeo::GeoJSON.encode(rgeo_geometry)
-  end
-
-  def rgeo_geometry
-    RGeo::GeoJSON.decode(geometry.to_json, geo_factory: RGeo::Geographic.simple_mercator_factory)
-  rescue RGeo::Error::InvalidGeometry
-    nil
-  end
-
   def area
     if polygon?
       GeojsonService.area(geometry.deep_symbolize_keys).round(1)
@@ -120,7 +111,7 @@ class GeoArea < ApplicationRecord
 
   def location
     if point?
-      Geo::Coord.new(*rgeo_geometry.coordinates.reverse).to_s
+      Geo::Coord.new(*geometry['coordinates'].reverse).to_s
     end
   end
 
@@ -238,4 +229,21 @@ class GeoArea < ApplicationRecord
       properties['id']
     end
   end
+
+  private
+
+  def normalize_geometry
+    if geometry.present?
+      normalized_geometry = rgeo_geometry
+      if normalized_geometry.present?
+        self.geometry = RGeo::GeoJSON.encode(normalized_geometry)
+      end
+    end
+  end
+
+  def rgeo_geometry
+    RGeo::GeoJSON.decode(geometry.to_json, geo_factory: RGeo::Geographic.simple_mercator_factory)
+  rescue RGeo::Error::InvalidGeometry
+    nil
+  end
 end
diff --git a/app/serializers/champ_serializer.rb b/app/serializers/champ_serializer.rb
index 9802a4874..670979c81 100644
--- a/app/serializers/champ_serializer.rb
+++ b/app/serializers/champ_serializer.rb
@@ -13,7 +13,7 @@ class ChampSerializer < ActiveModel::Serializer
   def value
     case object
     when GeoArea
-      object.safe_geometry
+      object.geometry
     else
       object.for_api
     end
diff --git a/app/serializers/geo_area_serializer.rb b/app/serializers/geo_area_serializer.rb
index f0ff85ccb..39fb6cfd3 100644
--- a/app/serializers/geo_area_serializer.rb
+++ b/app/serializers/geo_area_serializer.rb
@@ -12,7 +12,7 @@ class GeoAreaSerializer < ActiveModel::Serializer
   attribute :code_arr, if: :include_cadastre?
 
   def geometry
-    object.safe_geometry
+    object.geometry
   end
 
   def include_cadastre?
diff --git a/app/services/geojson_service.rb b/app/services/geojson_service.rb
index d2a78d884..154387193 100644
--- a/app/services/geojson_service.rb
+++ b/app/services/geojson_service.rb
@@ -45,6 +45,66 @@ class GeojsonService
     radians * EQUATORIAL_RADIUS
   end
 
+  def self.bbox(geojson)
+    result = [-Float::INFINITY, -Float::INFINITY, Float::INFINITY, Float::INFINITY]
+
+    self.coord_each(geojson) do |coord|
+      if result[3] > coord[1]
+        result[3] = coord[1]
+      end
+      if result[2] > coord[0]
+        result[2] = coord[0]
+      end
+      if result[1] < coord[1]
+        result[1] = coord[1]
+      end
+      if result[0] < coord[0]
+        result[0] = coord[0]
+      end
+    end
+
+    result
+  end
+
+  def self.coord_each(geojson)
+    geometries = if geojson.fetch(:type) == "FeatureCollection"
+      geojson.fetch(:features).map { _1.fetch(:geometry) }
+    else
+      [geojson.fetch(:geometry)]
+    end.compact
+
+    geometries.each do |geometry|
+      geometries = if geometry.fetch(:type) == "GeometryCollection"
+        geometry.fetch(:geometries)
+      else
+        [geometry]
+      end.compact
+
+      geometries.each do |geometry|
+        case geometry.fetch(:type)
+        when "Point"
+          yield geometry.fetch(:coordinates).map(&:to_f)
+        when "LineString", "MultiPoint"
+          geometry.fetch(:coordinates).each { yield _1.map(&:to_f) }
+        when "Polygon", "MultiLineString"
+          geometry.fetch(:coordinates).each do |shapes|
+            shapes.each { yield _1.map(&:to_f) }
+          end
+        when "MultiPolygon"
+          geometry.fetch(:coordinates).each do |polygons|
+            polygons.each do |shapes|
+              shapes.each { yield _1.map(&:to_f) }
+            end
+          end
+        when "GeometryCollection"
+          geometry.fetch(:geometries).each do |geometry|
+            coord_each(geometry) { yield _1 }
+          end
+        end
+      end
+    end
+  end
+
   def self.calculate_area(geom)
     total = 0
     case geom[:type]
diff --git a/spec/models/champs/carte_champ_spec.rb b/spec/models/champs/carte_champ_spec.rb
index b006ad092..c7e4e5c99 100644
--- a/spec/models/champs/carte_champ_spec.rb
+++ b/spec/models/champs/carte_champ_spec.rb
@@ -1,7 +1,7 @@
 describe Champs::CarteChamp do
   let(:champ) { Champs::CarteChamp.new(geo_areas: geo_areas, type_de_champ: create(:type_de_champ_carte)) }
   let(:value) { '' }
-  let(:coordinates) { [[2.3859214782714844, 48.87442541960633], [2.3850631713867183, 48.87273183590832], [2.3809432983398438, 48.87081237174292], [2.3859214782714844, 48.87442541960633]] }
+  let(:coordinates) { [[[2.3859214782714844, 48.87442541960633], [2.3850631713867183, 48.87273183590832], [2.3809432983398438, 48.87081237174292], [2.3859214782714844, 48.87442541960633]]] }
   let(:geo_json) do
     {
       "type" => 'Polygon',
diff --git a/spec/models/dossier_spec.rb b/spec/models/dossier_spec.rb
index 9a684dcb7..ca87290b1 100644
--- a/spec/models/dossier_spec.rb
+++ b/spec/models/dossier_spec.rb
@@ -1516,8 +1516,8 @@ describe Dossier do
           {
             type: 'Feature',
             geometry: {
-              'coordinates' => [[[2.428439855575562, 46.538476837725796], [2.4284291267395024, 46.53842148758162], [2.4282521009445195, 46.53841410755813], [2.42824137210846, 46.53847314771794], [2.428284287452698, 46.53847314771794], [2.428364753723145, 46.538487907747864], [2.4284291267395024, 46.538491597754714], [2.428439855575562, 46.538476837725796]]],
-              'type' => 'Polygon'
+              coordinates: [[[2.428439855575562, 46.538476837725796], [2.4284291267395024, 46.53842148758162], [2.4282521009445195, 46.53841410755813], [2.42824137210846, 46.53847314771794], [2.428284287452698, 46.53847314771794], [2.428364753723145, 46.538487907747864], [2.4284291267395024, 46.538491597754714], [2.428439855575562, 46.538476837725796]]],
+              type: 'Polygon'
             },
             properties: {
               area: 103.6,
diff --git a/spec/models/geo_area_spec.rb b/spec/models/geo_area_spec.rb
index 0a746f363..0cd51a7c6 100644
--- a/spec/models/geo_area_spec.rb
+++ b/spec/models/geo_area_spec.rb
@@ -23,7 +23,7 @@ RSpec.describe GeoArea, type: :model do
     it { expect(geo_area.location).to eq("46°32'19\"N 2°25'42\"E") }
   end
 
-  describe '#rgeo_geometry' do
+  describe '#geometry' do
     let(:geo_area) { build(:geo_area, :polygon, champ: nil) }
     let(:polygon) do
       {
@@ -47,9 +47,9 @@ RSpec.describe GeoArea, type: :model do
 
     context 'polygon_with_extra_coordinate' do
       let(:geo_area) { build(:geo_area, :polygon_with_extra_coordinate, champ: nil) }
+      before { geo_area.valid? }
 
-      it { expect(geo_area.geometry).not_to eq(polygon) }
-      it { expect(geo_area.safe_geometry).to eq(polygon) }
+      it { expect(geo_area.geometry).to eq(polygon) }
     end
   end
 

From f6b528e4974caa47aee2434c0856d62ece02aaee Mon Sep 17 00:00:00 2001
From: Paul Chavard <pro@paul.chavard.net>
Date: Wed, 15 Feb 2023 11:23:58 +0100
Subject: [PATCH 042/202] chore(geo_area): normalize all geo_areas

---
 app/jobs/migrations/normalize_geo_area_job.rb | 11 +++++++++++
 .../20230215100231_normalize_geometries.rake  | 19 +++++++++++++++++++
 2 files changed, 30 insertions(+)
 create mode 100644 app/jobs/migrations/normalize_geo_area_job.rb
 create mode 100644 lib/tasks/deployment/20230215100231_normalize_geometries.rake

diff --git a/app/jobs/migrations/normalize_geo_area_job.rb b/app/jobs/migrations/normalize_geo_area_job.rb
new file mode 100644
index 000000000..e5f8e7d1d
--- /dev/null
+++ b/app/jobs/migrations/normalize_geo_area_job.rb
@@ -0,0 +1,11 @@
+class Migrations::NormalizeGeoAreaJob < ApplicationJob
+  def perform(ids)
+    GeoArea.where(id: ids).find_each do |geo_area|
+      geojson = RGeo::GeoJSON.decode(geo_area.geometry.to_json, geo_factory: RGeo::Geographic.simple_mercator_factory)
+      geometry = RGeo::GeoJSON.encode(geojson)
+      geo_area.update_column(:geometry, geometry)
+    rescue RGeo::Error::InvalidGeometry
+      geo_area.destroy
+    end
+  end
+end
diff --git a/lib/tasks/deployment/20230215100231_normalize_geometries.rake b/lib/tasks/deployment/20230215100231_normalize_geometries.rake
new file mode 100644
index 000000000..275e37169
--- /dev/null
+++ b/lib/tasks/deployment/20230215100231_normalize_geometries.rake
@@ -0,0 +1,19 @@
+namespace :after_party do
+  desc 'Deployment task: normalize_geometries'
+  task normalize_geometries: :environment do
+    puts "Running deploy task 'normalize_geometries'"
+
+    progress = ProgressReport.new(GeoArea.count)
+    GeoArea.in_batches(of: 100) do |geo_areas|
+      ids = geo_areas.ids
+      Migrations::NormalizeGeoAreaJob.perform_later(ids)
+      progress.inc(ids.size)
+    end
+    progress.finish
+
+    # Update task as completed.  If you remove the line below, the task will
+    # run with every deploy (or every time you call after_party:run).
+    AfterParty::TaskRecord
+      .create version: AfterParty::TaskRecorder.new(__FILE__).timestamp
+  end
+end

From 0f483668cf8cd6cda2e8dcf8c2fec658c44de769 Mon Sep 17 00:00:00 2001
From: sebastiencarceles <sebastien.carceles@gmail.com>
Date: Mon, 6 Feb 2023 09:33:27 +0100
Subject: [PATCH 043/202] let epci champ be prefillable

---
 app/models/type_de_champ.rb        | 3 ++-
 spec/models/prefill_params_spec.rb | 4 +++-
 spec/models/type_de_champ_spec.rb  | 1 +
 3 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/app/models/type_de_champ.rb b/app/models/type_de_champ.rb
index 05091ec70..0d9692fdc 100644
--- a/app/models/type_de_champ.rb
+++ b/app/models/type_de_champ.rb
@@ -268,7 +268,8 @@ class TypeDeChamp < ApplicationRecord
       TypeDeChamp.type_champs.fetch(:checkbox),
       TypeDeChamp.type_champs.fetch(:drop_down_list),
       TypeDeChamp.type_champs.fetch(:regions),
-      TypeDeChamp.type_champs.fetch(:departements)
+      TypeDeChamp.type_champs.fetch(:departements),
+      TypeDeChamp.type_champs.fetch(:epci)
     ])
   end
 
diff --git a/spec/models/prefill_params_spec.rb b/spec/models/prefill_params_spec.rb
index 2c9ff077a..057e70d7d 100644
--- a/spec/models/prefill_params_spec.rb
+++ b/spec/models/prefill_params_spec.rb
@@ -127,6 +127,7 @@ RSpec.describe PrefillParams do
     it_behaves_like "a champ public value that is authorized", :drop_down_list, "value"
     it_behaves_like "a champ public value that is authorized", :regions, "03"
     it_behaves_like "a champ public value that is authorized", :departements, "03"
+    it_behaves_like "a champ public value that is authorized", :epci, ['01', '200042935']
 
     it_behaves_like "a champ private value that is authorized", :text, "value"
     it_behaves_like "a champ private value that is authorized", :textarea, "value"
@@ -145,7 +146,8 @@ RSpec.describe PrefillParams do
     it_behaves_like "a champ private value that is authorized", :checkbox, "false"
     it_behaves_like "a champ private value that is authorized", :drop_down_list, "value"
     it_behaves_like "a champ private value that is authorized", :regions, "93"
-    it_behaves_like "a champ public value that is authorized", :departements, "03"
+    it_behaves_like "a champ private value that is authorized", :departements, "03"
+    it_behaves_like "a champ private value that is authorized", :epci, ['01', '200042935']
 
     it_behaves_like "a champ public value that is unauthorized", :decimal_number, "non decimal string"
     it_behaves_like "a champ public value that is unauthorized", :integer_number, "non integer string"
diff --git a/spec/models/type_de_champ_spec.rb b/spec/models/type_de_champ_spec.rb
index 9d891f5e1..cbd34f501 100644
--- a/spec/models/type_de_champ_spec.rb
+++ b/spec/models/type_de_champ_spec.rb
@@ -251,6 +251,7 @@ describe TypeDeChamp do
     it_behaves_like "a prefillable type de champ", :type_de_champ_drop_down_list
     it_behaves_like "a prefillable type de champ", :type_de_champ_regions
     it_behaves_like "a prefillable type de champ", :type_de_champ_departements
+    it_behaves_like "a prefillable type de champ", :type_de_champ_epci
 
     it_behaves_like "a non-prefillable type de champ", :type_de_champ_number
     it_behaves_like "a non-prefillable type de champ", :type_de_champ_communes

From f836f57e987c5e83cbd7234e942768eb7beafa2a Mon Sep 17 00:00:00 2001
From: sebastiencarceles <sebastien.carceles@gmail.com>
Date: Mon, 6 Feb 2023 11:22:26 +0100
Subject: [PATCH 044/202] transform the input value to assignable attributes

Use the prefill decorator to transform the input value (for example
['01', '200042935']) into assignables attributes (for example
{ code_departement: '01', value: '200042935' }), in order to let the
champ be prefilled successfully.
---
 app/models/prefill_params.rb                  | 13 +++--
 .../prefill_epci_type_de_champ.rb             | 23 +++++++++
 .../types_de_champ/prefill_type_de_champ.rb   |  6 +++
 spec/models/prefill_params_spec.rb            | 18 ++++---
 .../prefill_epci_type_de_champ_spec.rb        | 47 +++++++++++++++++++
 .../prefill_type_de_champ_spec.rb             | 14 ++++++
 6 files changed, 110 insertions(+), 11 deletions(-)
 create mode 100644 app/models/types_de_champ/prefill_epci_type_de_champ.rb
 create mode 100644 spec/models/types_de_champ/prefill_epci_type_de_champ_spec.rb

diff --git a/app/models/prefill_params.rb b/app/models/prefill_params.rb
index 33261a8ac..37beddd11 100644
--- a/app/models/prefill_params.rb
+++ b/app/models/prefill_params.rb
@@ -56,10 +56,7 @@ class PrefillParams
     end
 
     def to_h
-      {
-        id: champ.id,
-        value: value
-      }
+      { id: champ.id }.merge(champ_attributes)
     end
 
     private
@@ -67,8 +64,14 @@ class PrefillParams
     def valid?
       return true unless NEED_VALIDATION_TYPES_DE_CHAMPS.include?(champ.type_champ)
 
-      champ.value = value
+      champ.assign_attributes(champ_attributes)
       champ.valid?(:prefill)
     end
+
+    def champ_attributes
+      TypesDeChamp::PrefillTypeDeChamp
+        .build(champ.type_de_champ)
+        .transform_value_to_assignable_attributes(value)
+    end
   end
 end
diff --git a/app/models/types_de_champ/prefill_epci_type_de_champ.rb b/app/models/types_de_champ/prefill_epci_type_de_champ.rb
new file mode 100644
index 000000000..9213aff3f
--- /dev/null
+++ b/app/models/types_de_champ/prefill_epci_type_de_champ.rb
@@ -0,0 +1,23 @@
+class TypesDeChamp::PrefillEpciTypeDeChamp < TypesDeChamp::PrefillTypeDeChamp
+  def possible_values
+    departements.map { |departement| "#{departement[:code]} (#{departement[:name]})" }
+  end
+
+  def example_value
+    departement_code = departements.pick(:code)
+    epci_code = APIGeoService.epcis(departement_code).pick(:code)
+    [departement_code, epci_code]
+  end
+
+  def transform_value_to_assignable_attributes(value)
+    return { code_departement: nil, value: nil } if value.blank? || !value.is_a?(Array)
+    return { code_departement: value.first, value: nil } if value.one?
+    { code_departement: value.first, value: value.second }
+  end
+
+  private
+
+  def departements
+    @departements ||= APIGeoService.departements.sort_by { |departement| departement[:code] }
+  end
+end
diff --git a/app/models/types_de_champ/prefill_type_de_champ.rb b/app/models/types_de_champ/prefill_type_de_champ.rb
index 5e9e55380..a385ea653 100644
--- a/app/models/types_de_champ/prefill_type_de_champ.rb
+++ b/app/models/types_de_champ/prefill_type_de_champ.rb
@@ -11,6 +11,8 @@ class TypesDeChamp::PrefillTypeDeChamp < SimpleDelegator
       TypesDeChamp::PrefillRegionTypeDeChamp.new(type_de_champ)
     when TypeDeChamp.type_champs.fetch(:departements)
       TypesDeChamp::PrefillDepartementTypeDeChamp.new(type_de_champ)
+    when TypeDeChamp.type_champs.fetch(:epci)
+      TypesDeChamp::PrefillEpciTypeDeChamp.new(type_de_champ)
     else
       new(type_de_champ)
     end
@@ -33,4 +35,8 @@ class TypesDeChamp::PrefillTypeDeChamp < SimpleDelegator
   def too_many_possible_values?
     possible_values.count > POSSIBLE_VALUES_THRESHOLD
   end
+
+  def transform_value_to_assignable_attributes(value)
+    { value: value }
+  end
 end
diff --git a/spec/models/prefill_params_spec.rb b/spec/models/prefill_params_spec.rb
index 057e70d7d..1354dcaa6 100644
--- a/spec/models/prefill_params_spec.rb
+++ b/spec/models/prefill_params_spec.rb
@@ -72,12 +72,12 @@ RSpec.describe PrefillParams do
       context "when the type de champ is authorized (#{type_de_champ_type})" do
         let(:types_de_champ_public) { [{ type: type_de_champ_type }] }
         let(:type_de_champ) { procedure.published_revision.types_de_champ_public.first }
-        let(:champ_id) { find_champ_by_stable_id(dossier, type_de_champ.stable_id).id }
+        let(:champ) { find_champ_by_stable_id(dossier, type_de_champ.stable_id) }
 
         let(:params) { { "champ_#{type_de_champ.to_typed_id}" => value } }
 
-        it "builds an array of hash(id, value) matching the given params" do
-          expect(prefill_params_array).to match([{ id: champ_id, value: value }])
+        it "builds an array of hash matching the given params" do
+          expect(prefill_params_array).to match([{ id: champ.id }.merge(attributes(champ, value))])
         end
       end
     end
@@ -86,12 +86,12 @@ RSpec.describe PrefillParams do
       context "when the type de champ is authorized (#{type_de_champ_type})" do
         let(:types_de_champ_private) { [{ type: type_de_champ_type }] }
         let(:type_de_champ) { procedure.published_revision.types_de_champ_private.first }
-        let(:champ_id) { find_champ_by_stable_id(dossier, type_de_champ.stable_id).id }
+        let(:champ) { find_champ_by_stable_id(dossier, type_de_champ.stable_id) }
 
         let(:params) { { "champ_#{type_de_champ.to_typed_id}" => value } }
 
-        it "builds an array of hash(id, value) matching the given params" do
-          expect(prefill_params_array).to match([{ id: champ_id, value: value }])
+        it "builds an array of hash matching the given params" do
+          expect(prefill_params_array).to match([{ id: champ.id }.merge(attributes(champ, value))])
         end
       end
     end
@@ -184,4 +184,10 @@ RSpec.describe PrefillParams do
   def find_champ_by_stable_id(dossier, stable_id)
     dossier.champs.joins(:type_de_champ).find_by(types_de_champ: { stable_id: stable_id })
   end
+
+  def attributes(champ, value)
+    TypesDeChamp::PrefillTypeDeChamp
+      .build(champ.type_de_champ)
+      .transform_value_to_assignable_attributes(value)
+  end
 end
diff --git a/spec/models/types_de_champ/prefill_epci_type_de_champ_spec.rb b/spec/models/types_de_champ/prefill_epci_type_de_champ_spec.rb
new file mode 100644
index 000000000..eecdfdc15
--- /dev/null
+++ b/spec/models/types_de_champ/prefill_epci_type_de_champ_spec.rb
@@ -0,0 +1,47 @@
+# frozen_string_literal: true
+
+RSpec.describe TypesDeChamp::PrefillEpciTypeDeChamp do
+  let(:type_de_champ) { build(:type_de_champ_epci) }
+
+  describe 'ancestors' do
+    subject { described_class.new(type_de_champ) }
+
+    it { is_expected.to be_kind_of(TypesDeChamp::PrefillEpciTypeDeChamp) }
+  end
+  # TODO: SEB describe '#possible_values'
+  # TODO: SEB describe '#example_value'
+
+  describe '#transform_value_to_assignable_attributes' do
+    subject(:transform_value_to_assignable_attributes) { described_class.build(type_de_champ).transform_value_to_assignable_attributes(value) }
+
+    context 'when the value is nil' do
+      let(:value) { nil }
+      it { is_expected.to match({ code_departement: nil, value: nil }) }
+    end
+
+    context 'when the value is empty' do
+      let(:value) { '' }
+      it { is_expected.to match({ code_departement: nil, value: nil }) }
+    end
+
+    context 'when the value is a string' do
+      let(:value) { 'hello' }
+      it { is_expected.to match({ code_departement: nil, value: nil }) }
+    end
+
+    context 'when the value is an array of one element' do
+      let(:value) { ['01'] }
+      it { is_expected.to match({ code_departement: '01', value: nil }) }
+    end
+
+    context 'when the value is an array of two elements' do
+      let(:value) { ['01', '200042935'] }
+      it { is_expected.to match({ code_departement: '01', value: '200042935' }) }
+    end
+
+    context 'when the value is an array of three or more elements' do
+      let(:value) { ['01', '200042935', 'hello'] }
+      it { is_expected.to match({ code_departement: '01', value: '200042935' }) }
+    end
+  end
+end
diff --git a/spec/models/types_de_champ/prefill_type_de_champ_spec.rb b/spec/models/types_de_champ/prefill_type_de_champ_spec.rb
index 52508be91..7477b3789 100644
--- a/spec/models/types_de_champ/prefill_type_de_champ_spec.rb
+++ b/spec/models/types_de_champ/prefill_type_de_champ_spec.rb
@@ -28,6 +28,12 @@ RSpec.describe TypesDeChamp::PrefillTypeDeChamp, type: :model do
       it { expect(built).to be_kind_of(TypesDeChamp::PrefillDepartementTypeDeChamp) }
     end
 
+    context 'when the type de champ is a epci' do
+      let(:type_de_champ) { build(:type_de_champ_epci) }
+
+      it { expect(built).to be_kind_of(TypesDeChamp::PrefillEpciTypeDeChamp) }
+    end
+
     context 'when any other type de champ' do
       let(:type_de_champ) { build(:type_de_champ_date) }
 
@@ -92,4 +98,12 @@ RSpec.describe TypesDeChamp::PrefillTypeDeChamp, type: :model do
       it { expect(too_many_possible_values).to eq(false) }
     end
   end
+
+  describe '#transform_value_to_assignable_attributes' do
+    let(:type_de_champ) { build(:type_de_champ_email) }
+    let(:value) { "any@email.org" }
+    subject(:transform_value_to_assignable_attributes) { described_class.build(type_de_champ).transform_value_to_assignable_attributes(value) }
+
+    it { is_expected.to match({ value: value }) }
+  end
 end

From 5ac80f968af275ca2fb68f7e05e46e45f9015c94 Mon Sep 17 00:00:00 2001
From: sebastiencarceles <sebastien.carceles@gmail.com>
Date: Mon, 6 Feb 2023 12:12:23 +0100
Subject: [PATCH 045/202] add possible and example values

---
 .../prefill_epci_type_de_champ.rb             |  4 +-
 config/locales/en.yml                         |  5 +-
 config/locales/fr.yml                         |  5 +-
 .../prefill_epci_type_de_champ_spec.rb        | 51 ++++++++++++++++++-
 4 files changed, 58 insertions(+), 7 deletions(-)

diff --git a/app/models/types_de_champ/prefill_epci_type_de_champ.rb b/app/models/types_de_champ/prefill_epci_type_de_champ.rb
index 9213aff3f..400e5da3f 100644
--- a/app/models/types_de_champ/prefill_epci_type_de_champ.rb
+++ b/app/models/types_de_champ/prefill_epci_type_de_champ.rb
@@ -1,6 +1,8 @@
 class TypesDeChamp::PrefillEpciTypeDeChamp < TypesDeChamp::PrefillTypeDeChamp
   def possible_values
-    departements.map { |departement| "#{departement[:code]} (#{departement[:name]})" }
+    departements.map do |departement|
+      "#{departement[:code]} (#{departement[:name]}) : https://geo.api.gouv.fr/epcis?codeDepartement=#{departement[:code]}"
+    end
   end
 
   def example_value
diff --git a/config/locales/en.yml b/config/locales/en.yml
index d1a6b9638..d4752fe73 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -128,12 +128,13 @@ en:
           iban_html: An Iban number
           yes_no_html: '"true" for Yes, "false" pour No'
           checkbox_html: '"true" to check, "false" to uncheck'
-          pays_html: An <a href="https://en.wikipedia.org/wiki/ISO_3166-2" target="_blank">ISO 3166-2 country code</a>
+          pays_html: An <a href="https://en.wikipedia.org/wiki/ISO_3166-2" target="_blank" rel="noopener noreferrer">ISO 3166-2 country code</a>
           departements_html: A <a href="https://fr.wikipedia.org/wiki/Num%C3%A9rotation_des_d%C3%A9partements_fran%C3%A7ais" target="_blank">department number</a>
-          regions_html: An <a href="https://fr.wikipedia.org/wiki/R%C3%A9gion_fran%C3%A7aise" target="_blank">INSEE region code</a>
+          regions_html: An <a href="https://fr.wikipedia.org/wiki/R%C3%A9gion_fran%C3%A7aise" target="_blank" rel="noopener noreferrer">INSEE region code</a>
           date_html: ISO8601 date
           datetime_html: ISO8601 datetime
           drop_down_list_other_html: Any value
+          epci_html: An array of the department code and the <a href="https://geo.api.gouv.fr/epcis" target="_blank" rel="noopener noreferrer">EPCI one</a>.
         examples:
           title: Example
           text: Short text
diff --git a/config/locales/fr.yml b/config/locales/fr.yml
index 13aa78315..19e43735c 100644
--- a/config/locales/fr.yml
+++ b/config/locales/fr.yml
@@ -119,12 +119,13 @@ fr:
           iban_html: Un numéro Iban
           yes_no_html: '"true" pour Oui, "false" pour Non'
           checkbox_html: '"true" pour coché, "false" pour décoché'
-          pays_html: Un <a href="https://en.wikipedia.org/wiki/ISO_3166-2" target="_blank">code pays ISO 3166-2</a>
+          pays_html: Un <a href="https://en.wikipedia.org/wiki/ISO_3166-2" target="_blank" rel="noopener noreferrer">code pays ISO 3166-2</a>
           departements_html: Un <a href="https://fr.wikipedia.org/wiki/Num%C3%A9rotation_des_d%C3%A9partements_fran%C3%A7ais" target="_blank">numéro de département</a>
-          regions_html: Un <a href="https://fr.wikipedia.org/wiki/R%C3%A9gion_fran%C3%A7aise" target="_blank">code INSEE de région</a>
+          regions_html: Un <a href="https://fr.wikipedia.org/wiki/R%C3%A9gion_fran%C3%A7aise" target="_blank" rel="noopener noreferrer">code INSEE de région</a>
           datetime_html: Datetime au format ISO8601
           date_html: Date au format ISO8601
           drop_down_list_other_html: Toute valeur
+          epci_html: Un tableau contenant le code de département et <a href="https://geo.api.gouv.fr/epcis" target="_blank" rel="noopener noreferrer">celui de l'EPCI</a>.
         examples:
           title: Exemple
           text: Texte court
diff --git a/spec/models/types_de_champ/prefill_epci_type_de_champ_spec.rb b/spec/models/types_de_champ/prefill_epci_type_de_champ_spec.rb
index eecdfdc15..7f2a1eb31 100644
--- a/spec/models/types_de_champ/prefill_epci_type_de_champ_spec.rb
+++ b/spec/models/types_de_champ/prefill_epci_type_de_champ_spec.rb
@@ -2,14 +2,55 @@
 
 RSpec.describe TypesDeChamp::PrefillEpciTypeDeChamp do
   let(:type_de_champ) { build(:type_de_champ_epci) }
+  let(:memory_store) { ActiveSupport::Cache.lookup_store(:memory_store) }
+
+  before do
+    allow(Rails).to receive(:cache).and_return(memory_store)
+    Rails.cache.clear
+  end
 
   describe 'ancestors' do
     subject { described_class.new(type_de_champ) }
 
     it { is_expected.to be_kind_of(TypesDeChamp::PrefillEpciTypeDeChamp) }
   end
-  # TODO: SEB describe '#possible_values'
-  # TODO: SEB describe '#example_value'
+
+  describe '#possible_values' do
+    let(:expected_values) do
+      departements.map { |departement| "#{departement[:code]} (#{departement[:name]}) : https://geo.api.gouv.fr/epcis?codeDepartement=#{departement[:code]}" }
+    end
+    subject(:possible_values) { described_class.new(type_de_champ).possible_values }
+
+    before do
+      VCR.insert_cassette('api_geo_departements')
+      VCR.insert_cassette('api_geo_epcis')
+    end
+
+    after do
+      VCR.eject_cassette('api_geo_departements')
+      VCR.eject_cassette('api_geo_epcis')
+    end
+
+    it { expect(possible_values).to match(expected_values) }
+  end
+
+  describe '#example_value' do
+    let(:departement_code) { departements.pick(:code) }
+    let(:epci_code) { APIGeoService.epcis(departement_code).pick(:code) }
+    subject(:example_value) { described_class.new(type_de_champ).example_value }
+
+    before do
+      VCR.insert_cassette('api_geo_departements')
+      VCR.insert_cassette('api_geo_epcis')
+    end
+
+    after do
+      VCR.eject_cassette('api_geo_departements')
+      VCR.eject_cassette('api_geo_epcis')
+    end
+
+    it { is_expected.to eq([departement_code, epci_code]) }
+  end
 
   describe '#transform_value_to_assignable_attributes' do
     subject(:transform_value_to_assignable_attributes) { described_class.build(type_de_champ).transform_value_to_assignable_attributes(value) }
@@ -44,4 +85,10 @@ RSpec.describe TypesDeChamp::PrefillEpciTypeDeChamp do
       it { is_expected.to match({ code_departement: '01', value: '200042935' }) }
     end
   end
+
+  private
+
+  def departements
+    APIGeoService.departements.sort_by { |departement| departement[:code] }
+  end
 end

From edf90a77f3a849ee93ec31361827c91fc0219942 Mon Sep 17 00:00:00 2001
From: sebastiencarceles <sebastien.carceles@gmail.com>
Date: Mon, 6 Feb 2023 14:24:51 +0100
Subject: [PATCH 046/202] validate epci to reject incorrect prefill values

---
 app/models/champs/epci_champ.rb       |  22 ++++
 app/models/prefill_params.rb          |   3 +-
 config/locales/en.yml                 |   8 ++
 config/locales/fr.yml                 |   8 ++
 spec/models/champs/epci_champ_spec.rb | 149 +++++++++++++++++++++++++-
 spec/models/prefill_params_spec.rb    |  10 ++
 6 files changed, 198 insertions(+), 2 deletions(-)

diff --git a/app/models/champs/epci_champ.rb b/app/models/champs/epci_champ.rb
index ce48da5a5..45803bd8b 100644
--- a/app/models/champs/epci_champ.rb
+++ b/app/models/champs/epci_champ.rb
@@ -24,6 +24,10 @@ class Champs::EpciChamp < Champs::TextChamp
   store_accessor :value_json, :code_departement
   before_validation :on_departement_change
 
+  validate :code_departement_in_departement_codes, unless: -> { code_departement.nil? }
+  validate :external_id_in_departement_epci_codes, unless: -> { code_departement.nil? || external_id.nil? }
+  validate :value_in_departement_epci_names, unless: -> { code_departement.nil? || external_id.nil? || value.nil? }
+
   def for_export
     [value, code, "#{code_departement} – #{departement_name}"]
   end
@@ -74,4 +78,22 @@ class Champs::EpciChamp < Champs::TextChamp
       self.value = nil
     end
   end
+
+  def code_departement_in_departement_codes
+    return if code_departement.in?(APIGeoService.departements.pluck(:code))
+
+    errors.add(:code_departement, :not_in_departement_codes)
+  end
+
+  def external_id_in_departement_epci_codes
+    return if external_id.in?(APIGeoService.epcis(code_departement).pluck(:code))
+
+    errors.add(:external_id, :not_in_departement_epci_codes)
+  end
+
+  def value_in_departement_epci_names
+    return if value.in?(APIGeoService.epcis(code_departement).pluck(:name))
+
+    errors.add(:value, :not_in_departement_epci_names)
+  end
 end
diff --git a/app/models/prefill_params.rb b/app/models/prefill_params.rb
index 37beddd11..f0841039a 100644
--- a/app/models/prefill_params.rb
+++ b/app/models/prefill_params.rb
@@ -41,7 +41,8 @@ class PrefillParams
       TypeDeChamp.type_champs.fetch(:checkbox),
       TypeDeChamp.type_champs.fetch(:pays),
       TypeDeChamp.type_champs.fetch(:regions),
-      TypeDeChamp.type_champs.fetch(:departements)
+      TypeDeChamp.type_champs.fetch(:departements),
+      TypeDeChamp.type_champs.fetch(:epci)
     ]
 
     attr_reader :champ, :value
diff --git a/config/locales/en.yml b/config/locales/en.yml
index d4752fe73..fad29d059 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -483,6 +483,14 @@ en:
               not_in_departement_names: "must be a valid department name"
             external_id:
               not_in_departement_codes: "must be a valid department code"
+        "champs/epci_champ":
+          attributes:
+            code_departement:
+              not_in_departement_codes: "must be a valid department code"
+            external_id:
+              not_in_departement_epci_codes: "must be a valid EPCI code of the matching department"
+            value:
+              not_in_departement_epci_names: "must be a valid EPCI name of the matching department"
   errors:
     format: "Field « %{attribute} » %{message}"
     messages:
diff --git a/config/locales/fr.yml b/config/locales/fr.yml
index 19e43735c..b1492cc79 100644
--- a/config/locales/fr.yml
+++ b/config/locales/fr.yml
@@ -478,6 +478,14 @@ fr:
               not_in_departement_names: "doit être un nom de département valide"
             external_id:
               not_in_departement_codes: "doit être un code de département valide"
+        "champs/epci_champ":
+          attributes:
+            code_departement:
+              not_in_departement_codes: "doit être un code de département valide"
+            external_id:
+              not_in_departement_epci_codes: "doit être un code d'EPCI du département correspondant"
+            value:
+              not_in_departement_epci_names: "doit être un nom d'EPCI du département correspondant"
   errors:
     format: "Le champ « %{attribute} » %{message}"
     messages:
diff --git a/spec/models/champs/epci_champ_spec.rb b/spec/models/champs/epci_champ_spec.rb
index be06ed379..1b5a56dd4 100644
--- a/spec/models/champs/epci_champ_spec.rb
+++ b/spec/models/champs/epci_champ_spec.rb
@@ -6,9 +6,156 @@ describe Champs::EpciChamp, type: :model do
     Rails.cache.clear
   end
 
-  let(:champ) { described_class.new }
+  describe 'validations' do
+    describe 'code_departement', vcr: { cassette_name: 'api_geo_departements' } do
+      subject { build(:champ_epci, code_departement: code_departement) }
+
+      context 'when nil' do
+        let(:code_departement) { nil }
+
+        it { is_expected.to be_valid }
+      end
+
+      context 'when empty' do
+        let(:code_departement) { '' }
+
+        it { is_expected.not_to be_valid }
+      end
+
+      context 'when included in the departement codes' do
+        let(:code_departement) { "01" }
+
+        it { is_expected.to be_valid }
+      end
+
+      context 'when not included in the departement codes' do
+        let(:code_departement) { "totoro" }
+
+        it { is_expected.not_to be_valid }
+      end
+    end
+
+    describe 'external_id' do
+      let(:champ) { build(:champ_epci, code_departement: code_departement, external_id: nil) }
+
+      subject { champ }
+
+      before do
+        VCR.insert_cassette('api_geo_departements')
+        VCR.insert_cassette('api_geo_epcis')
+
+        champ.save!
+        champ.update_columns(external_id: external_id)
+      end
+
+      after do
+        VCR.eject_cassette('api_geo_departements')
+        VCR.eject_cassette('api_geo_epcis')
+      end
+
+      context 'when code_departement is nil' do
+        let(:code_departement) { nil }
+        let(:external_id) { nil }
+
+        it { is_expected.to be_valid }
+      end
+
+      context 'when code_departement is not nil and valid' do
+        let(:code_departement) { "01" }
+
+        context 'when external_id is nil' do
+          let(:external_id) { nil }
+
+          it { is_expected.to be_valid }
+        end
+
+        context 'when external_id is empty' do
+          let(:external_id) { '' }
+
+          it { is_expected.not_to be_valid }
+        end
+
+        context 'when external_id is included in the epci codes of the departement' do
+          let(:external_id) { '200042935' }
+
+          it { is_expected.to be_valid }
+        end
+
+        context 'when external_id is not included in the epci codes of the departement' do
+          let(:external_id) { 'totoro' }
+
+          it { is_expected.not_to be_valid }
+        end
+      end
+    end
+
+    describe 'value' do
+      let(:champ) { build(:champ_epci, code_departement: code_departement, external_id: nil, value: nil) }
+
+      subject { champ }
+
+      before do
+        VCR.insert_cassette('api_geo_departements')
+        VCR.insert_cassette('api_geo_epcis')
+
+        champ.save!
+        champ.update_columns(external_id: external_id, value: value)
+      end
+
+      after do
+        VCR.eject_cassette('api_geo_departements')
+        VCR.eject_cassette('api_geo_epcis')
+      end
+
+      context 'when code_departement is nil' do
+        let(:code_departement) { nil }
+        let(:external_id) { nil }
+        let(:value) { nil }
+
+        it { is_expected.to be_valid }
+      end
+
+      context 'when external_id is nil' do
+        let(:code_departement) { '01' }
+        let(:external_id) { nil }
+        let(:value) { nil }
+
+        it { is_expected.to be_valid }
+      end
+
+      context 'when code_departement and external_id are not nil and valid' do
+        let(:code_departement) { '01' }
+        let(:external_id) { '200042935' }
+
+        context 'when value is nil' do
+          let(:value) { nil }
+
+          it { is_expected.to be_valid }
+        end
+
+        context 'when value is empty' do
+          let(:value) { '' }
+
+          it { is_expected.not_to be_valid }
+        end
+
+        context 'when value is in departement epci names' do
+          let(:value) { 'CA Haut - Bugey Agglomération' }
+
+          it { is_expected.to be_valid }
+        end
+
+        context 'when value is not in departement epci names' do
+          let(:value) { 'totoro' }
+
+          it { is_expected.not_to be_valid }
+        end
+      end
+    end
+  end
 
   describe 'value', vcr: { cassette_name: 'api_geo_epcis' } do
+    let(:champ) { described_class.new }
     it 'with departement and code' do
       champ.code_departement = '01'
       champ.value = '200042935'
diff --git a/spec/models/prefill_params_spec.rb b/spec/models/prefill_params_spec.rb
index 1354dcaa6..b7e03b27b 100644
--- a/spec/models/prefill_params_spec.rb
+++ b/spec/models/prefill_params_spec.rb
@@ -12,6 +12,16 @@ RSpec.describe PrefillParams do
     before do
       allow(Rails).to receive(:cache).and_return(memory_store)
       Rails.cache.clear
+
+      VCR.insert_cassette('api_geo_regions')
+      VCR.insert_cassette('api_geo_departements')
+      VCR.insert_cassette('api_geo_epcis')
+    end
+
+    after do
+      VCR.eject_cassette('api_geo_regions')
+      VCR.eject_cassette('api_geo_departements')
+      VCR.eject_cassette('api_geo_epcis')
     end
 
     context "when the stable ids match the TypeDeChamp of the corresponding procedure" do

From 07b5a3b4b5e4ca2d2331c32db740f6f81fac6386 Mon Sep 17 00:00:00 2001
From: sebastiencarceles <sebastien.carceles@gmail.com>
Date: Tue, 24 Jan 2023 10:05:58 +0100
Subject: [PATCH 047/202] manage types de champ with multiple example values

---
 app/models/prefill_description.rb       | 34 +++++++++++++++++++------
 spec/models/prefill_description_spec.rb | 28 ++++++++++++++++++++
 2 files changed, 54 insertions(+), 8 deletions(-)

diff --git a/app/models/prefill_description.rb b/app/models/prefill_description.rb
index 2148b3dce..090e02fb8 100644
--- a/app/models/prefill_description.rb
+++ b/app/models/prefill_description.rb
@@ -45,15 +45,33 @@ class PrefillDescription < SimpleDelegator
 
   private
 
-  def prefilled_champs_for_link
-    prefilled_champs.map { |type_de_champ| ["champ_#{type_de_champ.to_typed_id}", type_de_champ.example_value] }.to_h
-  end
-
-  def prefilled_champs_for_query
-    prefilled_champs.map { |type_de_champ| "\"champ_#{type_de_champ.to_typed_id}\": \"#{type_de_champ.example_value}\"" } .join(', ')
-  end
-
   def active_fillable_public_types_de_champ
     active_revision.types_de_champ_public.fillable
   end
+
+  def prefilled_champs_for_link
+    prefilled_champs_as_params.map(&:to_a).to_h
+  end
+
+  def prefilled_champs_for_query
+    prefilled_champs_as_params.map(&:to_s).join(', ')
+  end
+
+  def prefilled_champs_as_params
+    prefilled_champs.map { |type_de_champ| Param.new(type_de_champ.to_typed_id, type_de_champ.example_value) }
+  end
+
+  Param = Struct.new(:key, :value) do
+    def to_a
+      ["champ_#{key}", value]
+    end
+
+    def to_s
+      if value.is_a?(Array)
+        "\"champ_#{key}\": #{value}"
+      else
+        "\"champ_#{key}\": \"#{value}\""
+      end
+    end
+  end
 end
diff --git a/spec/models/prefill_description_spec.rb b/spec/models/prefill_description_spec.rb
index 65c8cd1a5..5c5846965 100644
--- a/spec/models/prefill_description_spec.rb
+++ b/spec/models/prefill_description_spec.rb
@@ -101,6 +101,19 @@ RSpec.describe PrefillDescription, type: :model do
         )
       )
     end
+
+    context 'when the type de champ can have multiple values' do
+      let(:type_de_champ) { create(:type_de_champ_multiple_drop_down_list, procedure: procedure) }
+
+      it 'builds the URL with array parameter' do
+        expect(prefill_description.prefill_link).to eq(
+          commencer_url(
+            path: procedure.path,
+            "champ_#{type_de_champ.to_typed_id}": TypesDeChamp::PrefillMultipleDropDownListTypeDeChamp.new(type_de_champ).example_value
+          )
+        )
+      end
+    end
   end
 
   describe '#prefill_query' do
@@ -120,5 +133,20 @@ RSpec.describe PrefillDescription, type: :model do
     it "builds the query to create a new prefilled dossier" do
       expect(prefill_description.prefill_query).to eq(expected_query)
     end
+
+    context 'when the type de champ can have multiple values' do
+      let(:type_de_champ) { create(:type_de_champ_multiple_drop_down_list, procedure: procedure) }
+      let(:expected_query) do
+        <<~TEXT
+          curl --request POST '#{api_public_v1_dossiers_url(procedure)}' \\
+               --header 'Content-Type: application/json' \\
+               --data '{"champ_#{type_de_champ.to_typed_id}": #{TypesDeChamp::PrefillMultipleDropDownListTypeDeChamp.new(type_de_champ).example_value}}'
+        TEXT
+      end
+
+      it 'builds the query with array parameter' do
+        expect(prefill_description.prefill_query).to eq(expected_query)
+      end
+    end
   end
 end

From 8aa31522b610de3f631faf052ee85f316335c222 Mon Sep 17 00:00:00 2001
From: sebastiencarceles <sebastien.carceles@gmail.com>
Date: Mon, 6 Feb 2023 15:12:34 +0100
Subject: [PATCH 048/202] cover feature with specs

---
 spec/models/prefill_description_spec.rb       | 40 ++++++++++++++++---
 .../shared_examples_for_prefilled_dossier.rb  |  1 +
 spec/system/users/dossier_prefill_get_spec.rb | 23 ++++++++++-
 .../system/users/dossier_prefill_post_spec.rb | 20 +++++++++-
 4 files changed, 76 insertions(+), 8 deletions(-)

diff --git a/spec/models/prefill_description_spec.rb b/spec/models/prefill_description_spec.rb
index 5c5846965..6a1dc13be 100644
--- a/spec/models/prefill_description_spec.rb
+++ b/spec/models/prefill_description_spec.rb
@@ -103,13 +103,28 @@ RSpec.describe PrefillDescription, type: :model do
     end
 
     context 'when the type de champ can have multiple values' do
-      let(:type_de_champ) { create(:type_de_champ_multiple_drop_down_list, procedure: procedure) }
+      let(:type_de_champ) { TypesDeChamp::PrefillTypeDeChamp.build(create(:type_de_champ_epci, procedure: procedure)) }
+
+      let(:memory_store) { ActiveSupport::Cache.lookup_store(:memory_store) }
+
+      before do
+        allow(Rails).to receive(:cache).and_return(memory_store)
+        Rails.cache.clear
+
+        VCR.insert_cassette('api_geo_departements')
+        VCR.insert_cassette('api_geo_epcis')
+      end
+
+      after do
+        VCR.eject_cassette('api_geo_departements')
+        VCR.eject_cassette('api_geo_epcis')
+      end
 
       it 'builds the URL with array parameter' do
         expect(prefill_description.prefill_link).to eq(
           commencer_url(
             path: procedure.path,
-            "champ_#{type_de_champ.to_typed_id}": TypesDeChamp::PrefillMultipleDropDownListTypeDeChamp.new(type_de_champ).example_value
+            "champ_#{type_de_champ.to_typed_id}": type_de_champ.example_value
           )
         )
       end
@@ -128,19 +143,34 @@ RSpec.describe PrefillDescription, type: :model do
       TEXT
     end
 
-    before { prefill_description.update(selected_type_de_champ_ids: [type_de_champ.id]) }
+    let(:memory_store) { ActiveSupport::Cache.lookup_store(:memory_store) }
+
+    before do
+      allow(Rails).to receive(:cache).and_return(memory_store)
+      Rails.cache.clear
+
+      VCR.insert_cassette('api_geo_departements')
+      VCR.insert_cassette('api_geo_epcis')
+
+      prefill_description.update(selected_type_de_champ_ids: [type_de_champ.id])
+    end
+
+    after do
+      VCR.eject_cassette('api_geo_departements')
+      VCR.eject_cassette('api_geo_epcis')
+    end
 
     it "builds the query to create a new prefilled dossier" do
       expect(prefill_description.prefill_query).to eq(expected_query)
     end
 
     context 'when the type de champ can have multiple values' do
-      let(:type_de_champ) { create(:type_de_champ_multiple_drop_down_list, procedure: procedure) }
+      let(:type_de_champ) { TypesDeChamp::PrefillTypeDeChamp.build(create(:type_de_champ_epci, procedure: procedure)) }
       let(:expected_query) do
         <<~TEXT
           curl --request POST '#{api_public_v1_dossiers_url(procedure)}' \\
                --header 'Content-Type: application/json' \\
-               --data '{"champ_#{type_de_champ.to_typed_id}": #{TypesDeChamp::PrefillMultipleDropDownListTypeDeChamp.new(type_de_champ).example_value}}'
+               --data '{"champ_#{type_de_champ.to_typed_id}": #{type_de_champ.example_value}}'
         TEXT
       end
 
diff --git a/spec/support/shared_examples_for_prefilled_dossier.rb b/spec/support/shared_examples_for_prefilled_dossier.rb
index 20dd7dbe0..5ed67c49c 100644
--- a/spec/support/shared_examples_for_prefilled_dossier.rb
+++ b/spec/support/shared_examples_for_prefilled_dossier.rb
@@ -19,5 +19,6 @@ shared_examples "the user has got a prefilled dossier, owned by themselves" do
     expect(page).to have_field(type_de_champ_phone.libelle, with: phone_value)
     expect(page).to have_css('label', text: type_de_champ_phone.libelle)
     expect(page).to have_field(type_de_champ_datetime.libelle, with: datetime_value)
+    expect(page).to have_field(type_de_champ_epci.libelle, with: epci_value.last)
   end
 end
diff --git a/spec/system/users/dossier_prefill_get_spec.rb b/spec/system/users/dossier_prefill_get_spec.rb
index 62aca4e4a..41fc21403 100644
--- a/spec/system/users/dossier_prefill_get_spec.rb
+++ b/spec/system/users/dossier_prefill_get_spec.rb
@@ -1,4 +1,6 @@
 describe 'Prefilling a dossier (with a GET request):' do
+  let(:memory_store) { ActiveSupport::Cache.lookup_store(:memory_store) }
+
   let(:password) { 'my-s3cure-p4ssword' }
 
   let(:procedure) { create(:procedure, :published, opendata: true) }
@@ -7,9 +9,24 @@ describe 'Prefilling a dossier (with a GET request):' do
   let(:type_de_champ_text) { create(:type_de_champ_text, procedure: procedure) }
   let(:type_de_champ_phone) { create(:type_de_champ_phone, procedure: procedure) }
   let(:type_de_champ_datetime) { create(:type_de_champ_datetime, procedure: procedure) }
+  let(:type_de_champ_epci) { create(:type_de_champ_epci, procedure: procedure) }
   let(:text_value) { "My Neighbor Totoro is the best movie ever" }
   let(:phone_value) { "invalid phone value" }
   let(:datetime_value) { "2023-02-01T10:32" }
+  let(:epci_value) { ['01', '200029999'] }
+
+  before do
+    allow(Rails).to receive(:cache).and_return(memory_store)
+    Rails.cache.clear
+
+    VCR.insert_cassette('api_geo_departements')
+    VCR.insert_cassette('api_geo_epcis')
+  end
+
+  after do
+    VCR.eject_cassette('api_geo_departements')
+    VCR.eject_cassette('api_geo_epcis')
+  end
 
   context 'when authenticated' do
     it_behaves_like "the user has got a prefilled dossier, owned by themselves" do
@@ -23,7 +40,8 @@ describe 'Prefilling a dossier (with a GET request):' do
           path: procedure.path,
           "champ_#{type_de_champ_text.to_typed_id}" => text_value,
           "champ_#{type_de_champ_phone.to_typed_id}" => phone_value,
-          "champ_#{type_de_champ_datetime.to_typed_id}" => datetime_value
+          "champ_#{type_de_champ_datetime.to_typed_id}" => datetime_value,
+          "champ_#{type_de_champ_epci.to_typed_id}" => epci_value
         )
 
         click_on "Poursuivre mon dossier prérempli"
@@ -37,7 +55,8 @@ describe 'Prefilling a dossier (with a GET request):' do
         path: procedure.path,
         "champ_#{type_de_champ_text.to_typed_id}" => text_value,
         "champ_#{type_de_champ_phone.to_typed_id}" => phone_value,
-        "champ_#{type_de_champ_datetime.to_typed_id}" => datetime_value
+        "champ_#{type_de_champ_datetime.to_typed_id}" => datetime_value,
+        "champ_#{type_de_champ_epci.to_typed_id}" => epci_value
       )
     end
 
diff --git a/spec/system/users/dossier_prefill_post_spec.rb b/spec/system/users/dossier_prefill_post_spec.rb
index 6e484795f..c0eaa03fe 100644
--- a/spec/system/users/dossier_prefill_post_spec.rb
+++ b/spec/system/users/dossier_prefill_post_spec.rb
@@ -1,4 +1,6 @@
 describe 'Prefilling a dossier (with a POST request):' do
+  let(:memory_store) { ActiveSupport::Cache.lookup_store(:memory_store) }
+
   let(:password) { 'my-s3cure-p4ssword' }
 
   let(:procedure) { create(:procedure, :published) }
@@ -7,9 +9,24 @@ describe 'Prefilling a dossier (with a POST request):' do
   let(:type_de_champ_text) { create(:type_de_champ_text, procedure: procedure) }
   let(:type_de_champ_phone) { create(:type_de_champ_phone, procedure: procedure) }
   let(:type_de_champ_datetime) { create(:type_de_champ_datetime, procedure: procedure) }
+  let(:type_de_champ_epci) { create(:type_de_champ_epci, procedure: procedure) }
   let(:text_value) { "My Neighbor Totoro is the best movie ever" }
   let(:phone_value) { "invalid phone value" }
   let(:datetime_value) { "2023-02-01T10:32" }
+  let(:epci_value) { ['01', '200029999'] }
+
+  before do
+    allow(Rails).to receive(:cache).and_return(memory_store)
+    Rails.cache.clear
+
+    VCR.insert_cassette('api_geo_departements')
+    VCR.insert_cassette('api_geo_epcis')
+  end
+
+  after do
+    VCR.eject_cassette('api_geo_departements')
+    VCR.eject_cassette('api_geo_epcis')
+  end
 
   scenario "the user get the URL of a prefilled orphan brouillon dossier" do
     dossier_url = create_and_prefill_dossier_with_post_request
@@ -98,7 +115,8 @@ describe 'Prefilling a dossier (with a POST request):' do
       params: {
         "champ_#{type_de_champ_text.to_typed_id}" => text_value,
         "champ_#{type_de_champ_phone.to_typed_id}" => phone_value,
-        "champ_#{type_de_champ_datetime.to_typed_id}" => datetime_value
+        "champ_#{type_de_champ_datetime.to_typed_id}" => datetime_value,
+        "champ_#{type_de_champ_epci.to_typed_id}" => epci_value
       }.to_json
     JSON.parse(session.response.body)["dossier_url"].gsub("http://www.example.com", "")
   end

From 5a89a2dbe4e8e4744ca394caf4927c0e49097464 Mon Sep 17 00:00:00 2001
From: Damien Le Thiec <damien.lethiec@gmail.com>
Date: Wed, 15 Feb 2023 12:15:34 +0100
Subject: [PATCH 049/202] Use Stable ID for repetitions prefill

---
 app/models/champ.rb                            |  2 ++
 .../prefill_departement_type_de_champ.rb       |  2 +-
 .../prefill_repetition_type_de_champ.rb        | 10 +++++-----
 .../prefill_repetition_type_de_champ_spec.rb   | 18 ++++++++++--------
 4 files changed, 18 insertions(+), 14 deletions(-)

diff --git a/app/models/champ.rb b/app/models/champ.rb
index 06a7d365f..6a8b409b7 100644
--- a/app/models/champ.rb
+++ b/app/models/champ.rb
@@ -72,6 +72,8 @@ class Champ < ApplicationRecord
     :refresh_after_update?,
     to: :type_de_champ
 
+  delegate :to_typed_id, to: :type_de_champ, prefix: true
+
   delegate :revision, to: :dossier, prefix: true
 
   scope :updated_since?, -> (date) { where('champs.updated_at > ?', date) }
diff --git a/app/models/types_de_champ/prefill_departement_type_de_champ.rb b/app/models/types_de_champ/prefill_departement_type_de_champ.rb
index 2ec1d1d11..4c92cad1d 100644
--- a/app/models/types_de_champ/prefill_departement_type_de_champ.rb
+++ b/app/models/types_de_champ/prefill_departement_type_de_champ.rb
@@ -1,5 +1,5 @@
 class TypesDeChamp::PrefillDepartementTypeDeChamp < TypesDeChamp::PrefillTypeDeChamp
-  def possible_values
+  def all_possible_values
     departements.map { |departement| "#{departement[:code]} (#{departement[:name]})" }
   end
 
diff --git a/app/models/types_de_champ/prefill_repetition_type_de_champ.rb b/app/models/types_de_champ/prefill_repetition_type_de_champ.rb
index 6cf1f5153..35a7dd883 100644
--- a/app/models/types_de_champ/prefill_repetition_type_de_champ.rb
+++ b/app/models/types_de_champ/prefill_repetition_type_de_champ.rb
@@ -20,21 +20,21 @@ class TypesDeChamp::PrefillRepetitionTypeDeChamp < TypesDeChamp::PrefillTypeDeCh
 
     value.map.with_index do |repetition, index|
       PrefillRepetitionRow.new(champ, repetition, index).to_assignable_attributes
-    end.compact
+    end.reject(&:blank?)
   end
 
   private
 
   def subchamps_all_possible_values
     "<ul>" + prefillable_subchamps.map do |prefill_type_de_champ|
-      "<li>#{prefill_type_de_champ.libelle}: #{prefill_type_de_champ.possible_values}</li>"
+      "<li>#{prefill_type_de_champ.to_typed_id}: #{prefill_type_de_champ.possible_values}</li>"
     end.join + "</ul>"
   end
 
   def row_values_format
     @row_example_value ||=
       prefillable_subchamps.map do |prefill_type_de_champ|
-      [prefill_type_de_champ.libelle, prefill_type_de_champ.example_value.to_s]
+      [prefill_type_de_champ.to_typed_id, prefill_type_de_champ.example_value.to_s]
     end.to_h
   end
 
@@ -56,8 +56,8 @@ class TypesDeChamp::PrefillRepetitionTypeDeChamp < TypesDeChamp::PrefillTypeDeCh
       row = @champ.rows[@index] || @champ.add_row(@champ.dossier_revision)
 
       JSON.parse(@repetition).map do |key, value|
-        subchamp = row.find { |champ| champ.libelle == key }
-        return unless subchamp
+        subchamp = row.find { |champ| champ.type_de_champ_to_typed_id == key }
+        next unless subchamp
 
         TypesDeChamp::PrefillTypeDeChamp.build(subchamp.type_de_champ).to_assignable_attributes(subchamp, value)
       rescue JSON::ParserError # On ignore les valeurs qu'on n'arrive pas à parser
diff --git a/spec/models/types_de_champ/prefill_repetition_type_de_champ_spec.rb b/spec/models/types_de_champ/prefill_repetition_type_de_champ_spec.rb
index 33197c381..c351a1321 100644
--- a/spec/models/types_de_champ/prefill_repetition_type_de_champ_spec.rb
+++ b/spec/models/types_de_champ/prefill_repetition_type_de_champ_spec.rb
@@ -5,6 +5,8 @@ RSpec.describe TypesDeChamp::PrefillRepetitionTypeDeChamp, type: :model, vcr: {
   let(:type_de_champ) { build(:type_de_champ_repetition, :with_types_de_champ, :with_region_types_de_champ, procedure: procedure) }
   let(:champ) { create(:champ_repetition, type_de_champ: type_de_champ) }
   let(:prefillable_subchamps) { TypesDeChamp::PrefillRepetitionTypeDeChamp.new(type_de_champ).send(:prefillable_subchamps) }
+  let(:text_repetition) { prefillable_subchamps.first }
+  let(:integer_repetition) { prefillable_subchamps.second }
   let(:region_repetition) { prefillable_subchamps.third }
   let(:memory_store) { ActiveSupport::Cache.lookup_store(:memory_store) }
 
@@ -22,7 +24,7 @@ RSpec.describe TypesDeChamp::PrefillRepetitionTypeDeChamp, type: :model, vcr: {
   describe '#possible_values' do
     subject(:possible_values) { described_class.new(type_de_champ).possible_values }
     let(:expected_value) {
-      "Un tableau de dictionnaires avec les valeurs possibles pour chaque champ de la répétition.</br><ul><li>sub type de champ: Un texte court</li><li>sub type de champ2: Un nombre entier</li><li>region sub_champ: Un <a href=\"https://fr.wikipedia.org/wiki/R%C3%A9gion_fran%C3%A7aise\" target=\"_blank\">code INSEE de région</a><br><a title=\"Toutes les valeurs possibles — Nouvel onglet\" target=\"_blank\" rel=\"noopener noreferrer\" href=\"/procedures/#{procedure.path}/prefill_type_de_champs/#{region_repetition.id}\">Voir toutes les valeurs possibles</a></li></ul>"
+      "Un tableau de dictionnaires avec les valeurs possibles pour chaque champ de la répétition.</br><ul><li>#{text_repetition.to_typed_id}: Un texte court<br></li><li>#{integer_repetition.to_typed_id}: Un nombre entier<br></li><li>#{region_repetition.to_typed_id}: Un <a href=\"https://fr.wikipedia.org/wiki/R%C3%A9gion_fran%C3%A7aise\" target=\"_blank\">code INSEE de région</a><br><a title=\"Toutes les valeurs possibles — Nouvel onglet\" target=\"_blank\" rel=\"noopener noreferrer\" href=\"/procedures/#{procedure.path}/prefill_type_de_champs/#{region_repetition.id}\">Voir toutes les valeurs possibles</a></li></ul>"
     }
 
     it {
@@ -32,14 +34,13 @@ RSpec.describe TypesDeChamp::PrefillRepetitionTypeDeChamp, type: :model, vcr: {
 
   describe '#example_value' do
     subject(:example_value) { described_class.new(type_de_champ).example_value }
-    let(:expected_value) { ["{\"sub type de champ\":\"Texte court\", \"sub type de champ2\":\"42\", \"region sub_champ\":\"53\"}", "{\"sub type de champ\":\"Texte court\", \"sub type de champ2\":\"42\", \"region sub_champ\":\"53\"}"] }
+    let(:expected_value) { ["{\"#{text_repetition.to_typed_id}\":\"Texte court\", \"#{integer_repetition.to_typed_id}\":\"42\", \"#{region_repetition.to_typed_id}\":\"53\"}", "{\"#{text_repetition.to_typed_id}\":\"Texte court\", \"#{integer_repetition.to_typed_id}\":\"42\", \"#{region_repetition.to_typed_id}\":\"53\"}"] }
 
     it { expect(example_value).to eq(expected_value) }
   end
 
   describe '#to_assignable_attributes' do
     subject(:to_assignable_attributes) { described_class.build(type_de_champ).to_assignable_attributes(champ, value) }
-    let(:type_de_champ_child) { champ.rows.first.first.type_de_champ }
 
     context 'when the value is nil' do
       let(:value) { nil }
@@ -63,15 +64,16 @@ RSpec.describe TypesDeChamp::PrefillRepetitionTypeDeChamp, type: :model, vcr: {
     end
 
     context 'when the value is an array with some wrong keys' do
-      let(:value) { ["{\"#{type_de_champ_child.libelle}\":\"value\"}", "{\"blabla\":\"value2\"}"] }
+      let(:value) { ["{\"#{text_repetition.to_typed_id}\":\"value\", \"blabla\":\"value2\"}", "{\"#{integer_repetition.to_typed_id}\":\"value3\"}", "{\"blabla\":\"false\"}"] }
 
-      it { is_expected.to match([[{ id: type_de_champ_child.champ.first.id, value: "value" }]]) }
+      it { is_expected.to match([[{ id: text_repetition.champ.first.id, value: "value" }], [{ id: integer_repetition.champ.second.id, value: "value3" }]]) }
     end
 
-    context 'when the value is an array with right keys' do
-      let(:value) { ["{\"#{type_de_champ_child.libelle}\":\"value\"}", "{\"#{type_de_champ_child.libelle}\":\"value2\"}"] }
 
-      it { is_expected.to match([[{ id: type_de_champ_child.champ.first.id, value: "value" }], [{ id: type_de_champ_child.champ.second.id, value: "value2" }]]) }
+    context 'when the value is an array with right keys' do
+      let(:value) { ["{\"#{text_repetition.to_typed_id}\":\"value\"}", "{\"#{text_repetition.to_typed_id}\":\"value2\"}"] }
+
+      it { is_expected.to match([[{ id: text_repetition.champ.first.id, value: "value" }], [{ id: text_repetition.champ.second.id, value: "value2" }]]) }
     end
   end
 end

From 1de936e1d6068a813c7f40ee0ac868b60743a3d0 Mon Sep 17 00:00:00 2001
From: Colin Darie <colin@darie.eu>
Date: Thu, 9 Feb 2023 12:43:03 +0100
Subject: [PATCH 050/202] fix(procedures/all): table layout issue

---
 app/views/administrateurs/procedures/_detail.html.haml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/views/administrateurs/procedures/_detail.html.haml b/app/views/administrateurs/procedures/_detail.html.haml
index f25a90fd1..a02396a9e 100644
--- a/app/views/administrateurs/procedures/_detail.html.haml
+++ b/app/views/administrateurs/procedures/_detail.html.haml
@@ -16,7 +16,7 @@
 
 - if show_detail
   %tr.procedure{ id: "procedure_detail_#{procedure.id}" }
-    %td.fr-highlight--beige-gris-galet{ colspan: '6' }
+    %td.fr-highlight--beige-gris-galet{ colspan: '7' }
       .fr-container
         .fr-grid-row
           .fr-col-6

From 4b3d403d7e42c6ab2f249a73ff7d90fcbbdd4956 Mon Sep 17 00:00:00 2001
From: Damien Le Thiec <damien.lethiec@gmail.com>
Date: Wed, 15 Feb 2023 17:14:29 +0100
Subject: [PATCH 051/202] fix spec

---
 .../prefill_departement_type_de_champ_spec.rb             | 7 +++++--
 .../prefill_repetition_type_de_champ_spec.rb              | 1 -
 spec/system/users/dossier_prefill_get_spec.rb             | 8 ++++----
 spec/system/users/dossier_prefill_post_spec.rb            | 4 ++--
 4 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/spec/models/types_de_champ/prefill_departement_type_de_champ_spec.rb b/spec/models/types_de_champ/prefill_departement_type_de_champ_spec.rb
index f43a07393..a453a9e03 100644
--- a/spec/models/types_de_champ/prefill_departement_type_de_champ_spec.rb
+++ b/spec/models/types_de_champ/prefill_departement_type_de_champ_spec.rb
@@ -1,7 +1,8 @@
 # frozen_string_literal: true
 
 RSpec.describe TypesDeChamp::PrefillDepartementTypeDeChamp, type: :model do
-  let(:type_de_champ) { build(:type_de_champ_departements) }
+  let(:procedure) { create(:procedure) }
+  let(:type_de_champ) { build(:type_de_champ_departements, procedure: procedure) }
   let(:memory_store) { ActiveSupport::Cache.lookup_store(:memory_store) }
 
   before do
@@ -17,10 +18,12 @@ RSpec.describe TypesDeChamp::PrefillDepartementTypeDeChamp, type: :model do
 
   describe '#possible_values', vcr: { cassette_name: 'api_geo_departements' } do
     let(:expected_values) {
-      APIGeoService.departements.sort_by { |departement| departement[:code] }.map { |departement| "#{departement[:code]} (#{departement[:name]})" }
+      "Un <a href=\"https://fr.wikipedia.org/wiki/Num%C3%A9rotation_des_d%C3%A9partements_fran%C3%A7ais\" target=\"_blank\">numéro de département</a><br><a title=\"Toutes les valeurs possibles — Nouvel onglet\" target=\"_blank\" rel=\"noopener noreferrer\" href=\"/procedures/#{procedure.path}/prefill_type_de_champs/#{type_de_champ.id}\">Voir toutes les valeurs possibles</a>"
     }
     subject(:possible_values) { described_class.new(type_de_champ).possible_values }
 
+    before { type_de_champ.reload }
+
     it { expect(possible_values).to match(expected_values) }
   end
 end
diff --git a/spec/models/types_de_champ/prefill_repetition_type_de_champ_spec.rb b/spec/models/types_de_champ/prefill_repetition_type_de_champ_spec.rb
index c351a1321..df0a88402 100644
--- a/spec/models/types_de_champ/prefill_repetition_type_de_champ_spec.rb
+++ b/spec/models/types_de_champ/prefill_repetition_type_de_champ_spec.rb
@@ -69,7 +69,6 @@ RSpec.describe TypesDeChamp::PrefillRepetitionTypeDeChamp, type: :model, vcr: {
       it { is_expected.to match([[{ id: text_repetition.champ.first.id, value: "value" }], [{ id: integer_repetition.champ.second.id, value: "value3" }]]) }
     end
 
-
     context 'when the value is an array with right keys' do
       let(:value) { ["{\"#{text_repetition.to_typed_id}\":\"value\"}", "{\"#{text_repetition.to_typed_id}\":\"value2\"}"] }
 
diff --git a/spec/system/users/dossier_prefill_get_spec.rb b/spec/system/users/dossier_prefill_get_spec.rb
index 03a6b67a4..c876d09aa 100644
--- a/spec/system/users/dossier_prefill_get_spec.rb
+++ b/spec/system/users/dossier_prefill_get_spec.rb
@@ -31,8 +31,8 @@ describe 'Prefilling a dossier (with a GET request):' do
           "champ_#{type_de_champ_phone.to_typed_id}" => phone_value,
           "champ_#{type_de_champ_repetition.to_typed_id}" => [
             "{
-              \"#{sub_type_de_champs_repetition.first.libelle}\": \"#{text_repetition_value}\",
-              \"#{sub_type_de_champs_repetition.second.libelle}\": \"#{integer_repetition_value}\"
+              \"#{sub_type_de_champs_repetition.first.to_typed_id}\": \"#{text_repetition_value}\",
+              \"#{sub_type_de_champs_repetition.second.to_typed_id}\": \"#{integer_repetition_value}\"
             }"
           ],
           "champ_#{type_de_champ_datetime.to_typed_id}" => datetime_value
@@ -51,8 +51,8 @@ describe 'Prefilling a dossier (with a GET request):' do
         "champ_#{type_de_champ_phone.to_typed_id}" => phone_value,
         "champ_#{type_de_champ_repetition.to_typed_id}" => [
           "{
-            \"#{sub_type_de_champs_repetition.first.libelle}\": \"#{text_repetition_value}\",
-            \"#{sub_type_de_champs_repetition.second.libelle}\": \"#{integer_repetition_value}\"
+            \"#{sub_type_de_champs_repetition.first.to_typed_id}\": \"#{text_repetition_value}\",
+            \"#{sub_type_de_champs_repetition.second.to_typed_id}\": \"#{integer_repetition_value}\"
           }"
         ],
         "champ_#{type_de_champ_datetime.to_typed_id}" => datetime_value
diff --git a/spec/system/users/dossier_prefill_post_spec.rb b/spec/system/users/dossier_prefill_post_spec.rb
index 639da167f..d67c93a48 100644
--- a/spec/system/users/dossier_prefill_post_spec.rb
+++ b/spec/system/users/dossier_prefill_post_spec.rb
@@ -106,8 +106,8 @@ describe 'Prefilling a dossier (with a POST request):' do
         "champ_#{type_de_champ_phone.to_typed_id}" => phone_value,
         "champ_#{type_de_champ_repetition.to_typed_id}" => [
           "{
-            \"#{sub_type_de_champs_repetition.first.libelle}\": \"#{text_repetition_value}\",
-            \"#{sub_type_de_champs_repetition.second.libelle}\": \"#{integer_repetition_value}\"
+            \"#{sub_type_de_champs_repetition.first.to_typed_id}\": \"#{text_repetition_value}\",
+            \"#{sub_type_de_champs_repetition.second.to_typed_id}\": \"#{integer_repetition_value}\"
           }"
         ],
         "champ_#{type_de_champ_datetime.to_typed_id}" => datetime_value

From 4876d583b673aa65fb214069e1e02ba0ef9fe3f2 Mon Sep 17 00:00:00 2001
From: Damien Le Thiec <damien.lethiec@gmail.com>
Date: Wed, 15 Feb 2023 17:39:19 +0100
Subject: [PATCH 052/202] Merge branch 'main' into feature/prefill_repetible

---
 app/graphql/types/geo_area_type.rb            |   2 +-
 app/jobs/migrations/normalize_geo_area_job.rb |  11 ++
 app/models/champs/carte_champ.rb              |  13 +-
 app/models/champs/epci_champ.rb               |  22 +++
 app/models/dossier.rb                         |   9 +-
 app/models/geo_area.rb                        |  32 ++--
 app/models/prefill_description.rb             |  36 +++--
 app/models/prefill_params.rb                  |  15 +-
 app/models/type_de_champ.rb                   |   3 +-
 .../prefill_epci_type_de_champ.rb             |  25 +++
 .../prefill_repetition_type_de_champ.rb       |   2 -
 .../types_de_champ/prefill_type_de_champ.rb   |   6 +-
 app/serializers/champ_serializer.rb           |   2 +-
 app/serializers/geo_area_serializer.rb        |   2 +-
 app/services/geojson_service.rb               |  60 +++++++
 .../procedures/_detail.html.haml              |   2 +-
 .../administrateurs/procedures/all.html.haml  |   2 +-
 config/locales/en.yml                         |  13 +-
 config/locales/fr.yml                         |  13 +-
 .../20230215100231_normalize_geometries.rake  |  19 +++
 spec/models/champs/carte_champ_spec.rb        |   2 +-
 spec/models/champs/epci_champ_spec.rb         | 149 +++++++++++++++++-
 spec/models/dossier_spec.rb                   |   4 +-
 spec/models/geo_area_spec.rb                  |   6 +-
 spec/models/prefill_description_spec.rb       |  61 +++++++
 spec/models/prefill_params_spec.rb            |  18 ++-
 spec/models/type_de_champ_spec.rb             |   1 +
 .../prefill_epci_type_de_champ_spec.rb        |  94 +++++++++++
 .../prefill_type_de_champ_spec.rb             |   6 +
 .../shared_examples_for_prefilled_dossier.rb  |   1 +
 .../administrateurs/procedure_cloning_spec.rb |  15 ++
 spec/system/users/dossier_prefill_get_spec.rb |  23 ++-
 .../system/users/dossier_prefill_post_spec.rb |  20 ++-
 33 files changed, 613 insertions(+), 76 deletions(-)
 create mode 100644 app/jobs/migrations/normalize_geo_area_job.rb
 create mode 100644 app/models/types_de_champ/prefill_epci_type_de_champ.rb
 create mode 100644 lib/tasks/deployment/20230215100231_normalize_geometries.rake
 create mode 100644 spec/models/types_de_champ/prefill_epci_type_de_champ_spec.rb

diff --git a/app/graphql/types/geo_area_type.rb b/app/graphql/types/geo_area_type.rb
index 5827b3576..32bc7a26e 100644
--- a/app/graphql/types/geo_area_type.rb
+++ b/app/graphql/types/geo_area_type.rb
@@ -12,7 +12,7 @@ module Types
 
     global_id_field :id
     field :source, GeoAreaSource, null: false
-    field :geometry, Types::GeoJSON, null: false, method: :safe_geometry
+    field :geometry, Types::GeoJSON, null: false
     field :description, String, null: true
 
     definition_methods do
diff --git a/app/jobs/migrations/normalize_geo_area_job.rb b/app/jobs/migrations/normalize_geo_area_job.rb
new file mode 100644
index 000000000..e5f8e7d1d
--- /dev/null
+++ b/app/jobs/migrations/normalize_geo_area_job.rb
@@ -0,0 +1,11 @@
+class Migrations::NormalizeGeoAreaJob < ApplicationJob
+  def perform(ids)
+    GeoArea.where(id: ids).find_each do |geo_area|
+      geojson = RGeo::GeoJSON.decode(geo_area.geometry.to_json, geo_factory: RGeo::Geographic.simple_mercator_factory)
+      geometry = RGeo::GeoJSON.encode(geojson)
+      geo_area.update_column(:geometry, geometry)
+    rescue RGeo::Error::InvalidGeometry
+      geo_area.destroy
+    end
+  end
+end
diff --git a/app/models/champs/carte_champ.rb b/app/models/champs/carte_champ.rb
index 8d86789fc..208b72dfb 100644
--- a/app/models/champs/carte_champ.rb
+++ b/app/models/champs/carte_champ.rb
@@ -64,21 +64,14 @@ class Champs::CarteChamp < Champ
   end
 
   def bounding_box
-    factory = RGeo::Geographic.simple_mercator_factory
-    bounding_box = RGeo::Cartesian::BoundingBox.new(factory)
-
     if geo_areas.present?
-      geo_areas.filter_map(&:rgeo_geometry).each do |geometry|
-        bounding_box.add(geometry)
-      end
+      GeojsonService.bbox(type: 'FeatureCollection', features: geo_areas.map(&:to_feature))
     elsif dossier.present?
       point = dossier.geo_position
-      bounding_box.add(factory.point(point[:lon], point[:lat]))
+      GeojsonService.bbox(type: 'Feature', geometry: { type: 'Point', coordinates: [point[:lon], point[:lat]] })
     else
-      bounding_box.add(factory.point(DEFAULT_LON, DEFAULT_LAT))
+      GeojsonService.bbox(type: 'Feature', geometry: { type: 'Point', coordinates: [DEFAULT_LON, DEFAULT_LAT] })
     end
-
-    [bounding_box.max_point, bounding_box.min_point].compact.flat_map(&:coordinates)
   end
 
   def to_feature_collection
diff --git a/app/models/champs/epci_champ.rb b/app/models/champs/epci_champ.rb
index ce48da5a5..45803bd8b 100644
--- a/app/models/champs/epci_champ.rb
+++ b/app/models/champs/epci_champ.rb
@@ -24,6 +24,10 @@ class Champs::EpciChamp < Champs::TextChamp
   store_accessor :value_json, :code_departement
   before_validation :on_departement_change
 
+  validate :code_departement_in_departement_codes, unless: -> { code_departement.nil? }
+  validate :external_id_in_departement_epci_codes, unless: -> { code_departement.nil? || external_id.nil? }
+  validate :value_in_departement_epci_names, unless: -> { code_departement.nil? || external_id.nil? || value.nil? }
+
   def for_export
     [value, code, "#{code_departement} – #{departement_name}"]
   end
@@ -74,4 +78,22 @@ class Champs::EpciChamp < Champs::TextChamp
       self.value = nil
     end
   end
+
+  def code_departement_in_departement_codes
+    return if code_departement.in?(APIGeoService.departements.pluck(:code))
+
+    errors.add(:code_departement, :not_in_departement_codes)
+  end
+
+  def external_id_in_departement_epci_codes
+    return if external_id.in?(APIGeoService.epcis(code_departement).pluck(:code))
+
+    errors.add(:external_id, :not_in_departement_epci_codes)
+  end
+
+  def value_in_departement_epci_names
+    return if value.in?(APIGeoService.epcis(code_departement).pluck(:name))
+
+    errors.add(:value, :not_in_departement_epci_names)
+  end
 end
diff --git a/app/models/dossier.rb b/app/models/dossier.rb
index db8893a17..31eb93b03 100644
--- a/app/models/dossier.rb
+++ b/app/models/dossier.rb
@@ -1312,14 +1312,7 @@ class Dossier < ApplicationRecord
   end
 
   def bounding_box
-    factory = RGeo::Geographic.simple_mercator_factory
-    bounding_box = RGeo::Cartesian::BoundingBox.new(factory)
-
-    geo_areas.filter_map(&:rgeo_geometry).each do |geometry|
-      bounding_box.add(geometry)
-    end
-
-    [bounding_box.max_point, bounding_box.min_point].compact.flat_map(&:coordinates)
+    GeojsonService.bbox(type: 'FeatureCollection', features: geo_areas.map(&:to_feature))
   end
 
   def log_dossier_operation(author, operation, subject = nil)
diff --git a/app/models/geo_area.rb b/app/models/geo_area.rb
index 024b20d4d..57040c80d 100644
--- a/app/models/geo_area.rb
+++ b/app/models/geo_area.rb
@@ -52,11 +52,12 @@ class GeoArea < ApplicationRecord
   scope :cadastres, -> { where(source: sources.fetch(:cadastre)) }
 
   validates :geometry, geo_json: true, allow_blank: false
+  before_validation :normalize_geometry
 
   def to_feature
     {
       type: 'Feature',
-      geometry: safe_geometry,
+      geometry: geometry.deep_symbolize_keys,
       properties: cadastre_properties.merge(
         source: source,
         area: area,
@@ -96,16 +97,6 @@ class GeoArea < ApplicationRecord
     end
   end
 
-  def safe_geometry
-    RGeo::GeoJSON.encode(rgeo_geometry)
-  end
-
-  def rgeo_geometry
-    RGeo::GeoJSON.decode(geometry.to_json, geo_factory: RGeo::Geographic.simple_mercator_factory)
-  rescue RGeo::Error::InvalidGeometry
-    nil
-  end
-
   def area
     if polygon?
       GeojsonService.area(geometry.deep_symbolize_keys).round(1)
@@ -120,7 +111,7 @@ class GeoArea < ApplicationRecord
 
   def location
     if point?
-      Geo::Coord.new(*rgeo_geometry.coordinates.reverse).to_s
+      Geo::Coord.new(*geometry['coordinates'].reverse).to_s
     end
   end
 
@@ -238,4 +229,21 @@ class GeoArea < ApplicationRecord
       properties['id']
     end
   end
+
+  private
+
+  def normalize_geometry
+    if geometry.present?
+      normalized_geometry = rgeo_geometry
+      if normalized_geometry.present?
+        self.geometry = RGeo::GeoJSON.encode(normalized_geometry)
+      end
+    end
+  end
+
+  def rgeo_geometry
+    RGeo::GeoJSON.decode(geometry.to_json, geo_factory: RGeo::Geographic.simple_mercator_factory)
+  rescue RGeo::Error::InvalidGeometry
+    nil
+  end
 end
diff --git a/app/models/prefill_description.rb b/app/models/prefill_description.rb
index e85e30977..090e02fb8 100644
--- a/app/models/prefill_description.rb
+++ b/app/models/prefill_description.rb
@@ -45,17 +45,33 @@ class PrefillDescription < SimpleDelegator
 
   private
 
-  def prefilled_champs_for_link
-    prefilled_champs.map { |type_de_champ| ["champ_#{type_de_champ.to_typed_id}", type_de_champ.example_value] }.to_h
-  end
-
-  def prefilled_champs_for_query
-    prefilled_champs.map do |type_de_champ|
-      "\"champ_#{type_de_champ.to_typed_id}\": #{type_de_champ.formatted_example_value}"
-    end.join(', ')
-  end
-
   def active_fillable_public_types_de_champ
     active_revision.types_de_champ_public.fillable
   end
+
+  def prefilled_champs_for_link
+    prefilled_champs_as_params.map(&:to_a).to_h
+  end
+
+  def prefilled_champs_for_query
+    prefilled_champs_as_params.map(&:to_s).join(', ')
+  end
+
+  def prefilled_champs_as_params
+    prefilled_champs.map { |type_de_champ| Param.new(type_de_champ.to_typed_id, type_de_champ.example_value) }
+  end
+
+  Param = Struct.new(:key, :value) do
+    def to_a
+      ["champ_#{key}", value]
+    end
+
+    def to_s
+      if value.is_a?(Array)
+        "\"champ_#{key}\": #{value}"
+      else
+        "\"champ_#{key}\": \"#{value}\""
+      end
+    end
+  end
 end
diff --git a/app/models/prefill_params.rb b/app/models/prefill_params.rb
index 6d1ad72d8..26308d322 100644
--- a/app/models/prefill_params.rb
+++ b/app/models/prefill_params.rb
@@ -41,7 +41,8 @@ class PrefillParams
       TypeDeChamp.type_champs.fetch(:checkbox),
       TypeDeChamp.type_champs.fetch(:pays),
       TypeDeChamp.type_champs.fetch(:regions),
-      TypeDeChamp.type_champs.fetch(:departements)
+      TypeDeChamp.type_champs.fetch(:departements),
+      TypeDeChamp.type_champs.fetch(:epci)
     ]
 
     attr_reader :champ, :value
@@ -55,12 +56,6 @@ class PrefillParams
       champ.prefillable? && valid?
     end
 
-    def champ_attributes
-      TypesDeChamp::PrefillTypeDeChamp
-        .build(champ.type_de_champ)
-        .to_assignable_attributes(champ, value)
-    end
-
     private
 
     def valid?
@@ -69,5 +64,11 @@ class PrefillParams
       champ.assign_attributes(champ_attributes)
       champ.valid?(:prefill)
     end
+
+    def champ_attributes
+      TypesDeChamp::PrefillTypeDeChamp
+        .build(champ.type_de_champ)
+        .to_assignable_attributes(value)
+    end
   end
 end
diff --git a/app/models/type_de_champ.rb b/app/models/type_de_champ.rb
index 7386be9ad..058ab7f69 100644
--- a/app/models/type_de_champ.rb
+++ b/app/models/type_de_champ.rb
@@ -271,7 +271,8 @@ class TypeDeChamp < ApplicationRecord
       TypeDeChamp.type_champs.fetch(:drop_down_list),
       TypeDeChamp.type_champs.fetch(:regions),
       TypeDeChamp.type_champs.fetch(:repetition),
-      TypeDeChamp.type_champs.fetch(:departements)
+      TypeDeChamp.type_champs.fetch(:departements),
+      TypeDeChamp.type_champs.fetch(:epci)
     ])
   end
 
diff --git a/app/models/types_de_champ/prefill_epci_type_de_champ.rb b/app/models/types_de_champ/prefill_epci_type_de_champ.rb
new file mode 100644
index 000000000..aae3b1918
--- /dev/null
+++ b/app/models/types_de_champ/prefill_epci_type_de_champ.rb
@@ -0,0 +1,25 @@
+class TypesDeChamp::PrefillEpciTypeDeChamp < TypesDeChamp::PrefillTypeDeChamp
+  def possible_values
+    departements.map do |departement|
+      "#{departement[:code]} (#{departement[:name]}) : https://geo.api.gouv.fr/epcis?codeDepartement=#{departement[:code]}"
+    end
+  end
+
+  def example_value
+    departement_code = departements.pick(:code)
+    epci_code = APIGeoService.epcis(departement_code).pick(:code)
+    [departement_code, epci_code]
+  end
+
+  def to_assignable_attributes(champ, value)
+    return { id: champ.id, code_departement: nil, value: nil } if value.blank? || !value.is_a?(Array)
+    return { id: champ.id, code_departement: value.first, value: nil } if value.one?
+    { id: champ.id, code_departement: value.first, value: value.second }
+  end
+
+  private
+
+  def departements
+    @departements ||= APIGeoService.departements.sort_by { |departement| departement[:code] }
+  end
+end
diff --git a/app/models/types_de_champ/prefill_repetition_type_de_champ.rb b/app/models/types_de_champ/prefill_repetition_type_de_champ.rb
index 35a7dd883..240ca6f6f 100644
--- a/app/models/types_de_champ/prefill_repetition_type_de_champ.rb
+++ b/app/models/types_de_champ/prefill_repetition_type_de_champ.rb
@@ -13,8 +13,6 @@ class TypesDeChamp::PrefillRepetitionTypeDeChamp < TypesDeChamp::PrefillTypeDeCh
     [row_values_format, row_values_format].map { |row| row.to_s.gsub("=>", ":") }
   end
 
-  alias_method :formatted_example_value, :example_value
-
   def to_assignable_attributes(champ, value)
     return [] unless value.is_a?(Array)
 
diff --git a/app/models/types_de_champ/prefill_type_de_champ.rb b/app/models/types_de_champ/prefill_type_de_champ.rb
index e0136927a..e389315fa 100644
--- a/app/models/types_de_champ/prefill_type_de_champ.rb
+++ b/app/models/types_de_champ/prefill_type_de_champ.rb
@@ -16,6 +16,8 @@ class TypesDeChamp::PrefillTypeDeChamp < SimpleDelegator
       TypesDeChamp::PrefillRepetitionTypeDeChamp.new(type_de_champ)
     when TypeDeChamp.type_champs.fetch(:departements)
       TypesDeChamp::PrefillDepartementTypeDeChamp.new(type_de_champ)
+    when TypeDeChamp.type_champs.fetch(:epci)
+      TypesDeChamp::PrefillEpciTypeDeChamp.new(type_de_champ)
     else
       new(type_de_champ)
     end
@@ -46,10 +48,6 @@ class TypesDeChamp::PrefillTypeDeChamp < SimpleDelegator
     I18n.t("views.prefill_descriptions.edit.examples.#{type_champ}")
   end
 
-  def formatted_example_value
-    "\"#{example_value}\"" if example_value.present?
-  end
-
   def to_assignable_attributes(champ, value)
     { id: champ.id, value: value }
   end
diff --git a/app/serializers/champ_serializer.rb b/app/serializers/champ_serializer.rb
index 9802a4874..670979c81 100644
--- a/app/serializers/champ_serializer.rb
+++ b/app/serializers/champ_serializer.rb
@@ -13,7 +13,7 @@ class ChampSerializer < ActiveModel::Serializer
   def value
     case object
     when GeoArea
-      object.safe_geometry
+      object.geometry
     else
       object.for_api
     end
diff --git a/app/serializers/geo_area_serializer.rb b/app/serializers/geo_area_serializer.rb
index f0ff85ccb..39fb6cfd3 100644
--- a/app/serializers/geo_area_serializer.rb
+++ b/app/serializers/geo_area_serializer.rb
@@ -12,7 +12,7 @@ class GeoAreaSerializer < ActiveModel::Serializer
   attribute :code_arr, if: :include_cadastre?
 
   def geometry
-    object.safe_geometry
+    object.geometry
   end
 
   def include_cadastre?
diff --git a/app/services/geojson_service.rb b/app/services/geojson_service.rb
index d2a78d884..154387193 100644
--- a/app/services/geojson_service.rb
+++ b/app/services/geojson_service.rb
@@ -45,6 +45,66 @@ class GeojsonService
     radians * EQUATORIAL_RADIUS
   end
 
+  def self.bbox(geojson)
+    result = [-Float::INFINITY, -Float::INFINITY, Float::INFINITY, Float::INFINITY]
+
+    self.coord_each(geojson) do |coord|
+      if result[3] > coord[1]
+        result[3] = coord[1]
+      end
+      if result[2] > coord[0]
+        result[2] = coord[0]
+      end
+      if result[1] < coord[1]
+        result[1] = coord[1]
+      end
+      if result[0] < coord[0]
+        result[0] = coord[0]
+      end
+    end
+
+    result
+  end
+
+  def self.coord_each(geojson)
+    geometries = if geojson.fetch(:type) == "FeatureCollection"
+      geojson.fetch(:features).map { _1.fetch(:geometry) }
+    else
+      [geojson.fetch(:geometry)]
+    end.compact
+
+    geometries.each do |geometry|
+      geometries = if geometry.fetch(:type) == "GeometryCollection"
+        geometry.fetch(:geometries)
+      else
+        [geometry]
+      end.compact
+
+      geometries.each do |geometry|
+        case geometry.fetch(:type)
+        when "Point"
+          yield geometry.fetch(:coordinates).map(&:to_f)
+        when "LineString", "MultiPoint"
+          geometry.fetch(:coordinates).each { yield _1.map(&:to_f) }
+        when "Polygon", "MultiLineString"
+          geometry.fetch(:coordinates).each do |shapes|
+            shapes.each { yield _1.map(&:to_f) }
+          end
+        when "MultiPolygon"
+          geometry.fetch(:coordinates).each do |polygons|
+            polygons.each do |shapes|
+              shapes.each { yield _1.map(&:to_f) }
+            end
+          end
+        when "GeometryCollection"
+          geometry.fetch(:geometries).each do |geometry|
+            coord_each(geometry) { yield _1 }
+          end
+        end
+      end
+    end
+  end
+
   def self.calculate_area(geom)
     total = 0
     case geom[:type]
diff --git a/app/views/administrateurs/procedures/_detail.html.haml b/app/views/administrateurs/procedures/_detail.html.haml
index f25a90fd1..a02396a9e 100644
--- a/app/views/administrateurs/procedures/_detail.html.haml
+++ b/app/views/administrateurs/procedures/_detail.html.haml
@@ -16,7 +16,7 @@
 
 - if show_detail
   %tr.procedure{ id: "procedure_detail_#{procedure.id}" }
-    %td.fr-highlight--beige-gris-galet{ colspan: '6' }
+    %td.fr-highlight--beige-gris-galet{ colspan: '7' }
       .fr-container
         .fr-grid-row
           .fr-col-6
diff --git a/app/views/administrateurs/procedures/all.html.haml b/app/views/administrateurs/procedures/all.html.haml
index 1ac68b3be..56ad5e129 100644
--- a/app/views/administrateurs/procedures/all.html.haml
+++ b/app/views/administrateurs/procedures/all.html.haml
@@ -11,7 +11,7 @@
       = f.search_field 'libelle', size: 30, class: 'fr-input'
     .actions
       .link.fr-mx-1w= link_to 'Voir les administrateurs', administrateurs_admin_procedures_path(@filter.params), class: 'fr-btn fr-btn--secondary'
-      .link.fr-mx-1w= link_to 'Exporter les résultats', all_admin_procedures_path(@filter.params.merge(format: :xlsx)), class: 'fr-btn fr-btn--secondary'
+      .link.fr-mx-1w{ "data-turbo": "false" }= link_to 'Exporter les résultats', all_admin_procedures_path(@filter.params.merge(format: :xlsx)), class: 'fr-btn fr-btn--secondary'
   .fr-table.fr-table--bordered
     %table#all-demarches
       %caption
diff --git a/config/locales/en.yml b/config/locales/en.yml
index 81f6e249e..ad1ab9573 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -128,14 +128,15 @@ en:
           iban_html: An Iban number
           yes_no_html: '"true" for Yes, "false" pour No'
           checkbox_html: '"true" to check, "false" to uncheck'
-          pays_html: An <a href="https://en.wikipedia.org/wiki/ISO_3166-2" target="_blank">ISO 3166-2 country code</a>
+          pays_html: An <a href="https://en.wikipedia.org/wiki/ISO_3166-2" target="_blank" rel="noopener noreferrer">ISO 3166-2 country code</a>
           departements_html: A <a href="https://fr.wikipedia.org/wiki/Num%C3%A9rotation_des_d%C3%A9partements_fran%C3%A7ais" target="_blank">department number</a>
-          regions_html: An <a href="https://fr.wikipedia.org/wiki/R%C3%A9gion_fran%C3%A7aise" target="_blank">INSEE region code</a>
           drop_down_list_html: A choice among those selected when the procedure was created
           date_html: ISO8601 date
           datetime_html: ISO8601 datetime
           drop_down_list_other_html: Any value
           repetition_html: A array of hashes with possible values for each field of the repetition.
+          regions_html: An <a href="https://fr.wikipedia.org/wiki/R%C3%A9gion_fran%C3%A7aise" target="_blank" rel="noopener noreferrer">INSEE region code</a>
+          epci_html: An array of the department code and the <a href="https://geo.api.gouv.fr/epcis" target="_blank" rel="noopener noreferrer">EPCI one</a>.
         examples:
           title: Example
           text: Short text
@@ -484,6 +485,14 @@ en:
               not_in_departement_names: "must be a valid department name"
             external_id:
               not_in_departement_codes: "must be a valid department code"
+        "champs/epci_champ":
+          attributes:
+            code_departement:
+              not_in_departement_codes: "must be a valid department code"
+            external_id:
+              not_in_departement_epci_codes: "must be a valid EPCI code of the matching department"
+            value:
+              not_in_departement_epci_names: "must be a valid EPCI name of the matching department"
   errors:
     format: "Field « %{attribute} » %{message}"
     messages:
diff --git a/config/locales/fr.yml b/config/locales/fr.yml
index ed844d242..a1cc70287 100644
--- a/config/locales/fr.yml
+++ b/config/locales/fr.yml
@@ -119,14 +119,15 @@ fr:
           iban_html: Un numéro Iban
           yes_no_html: '"true" pour Oui, "false" pour Non'
           checkbox_html: '"true" pour coché, "false" pour décoché'
-          pays_html: Un <a href="https://en.wikipedia.org/wiki/ISO_3166-2" target="_blank">code pays ISO 3166-2</a>
+          pays_html: Un <a href="https://en.wikipedia.org/wiki/ISO_3166-2" target="_blank" rel="noopener noreferrer">code pays ISO 3166-2</a>
           departements_html: Un <a href="https://fr.wikipedia.org/wiki/Num%C3%A9rotation_des_d%C3%A9partements_fran%C3%A7ais" target="_blank">numéro de département</a>
-          regions_html: Un <a href="https://fr.wikipedia.org/wiki/R%C3%A9gion_fran%C3%A7aise" target="_blank">code INSEE de région</a>
           drop_down_list_html: Un choix parmi ceux sélectionnés à la création de la procédure
           datetime_html: Datetime au format ISO8601
           date_html: Date au format ISO8601
           drop_down_list_other_html: Toute valeur
           repetition_html: Un tableau de dictionnaires avec les valeurs possibles pour chaque champ de la répétition.
+          regions_html: Un <a href="https://fr.wikipedia.org/wiki/R%C3%A9gion_fran%C3%A7aise" target="_blank" rel="noopener noreferrer">code INSEE de région</a>
+          epci_html: Un tableau contenant le code de département et <a href="https://geo.api.gouv.fr/epcis" target="_blank" rel="noopener noreferrer">celui de l'EPCI</a>.
         examples:
           title: Exemple
           text: Texte court
@@ -479,6 +480,14 @@ fr:
               not_in_departement_names: "doit être un nom de département valide"
             external_id:
               not_in_departement_codes: "doit être un code de département valide"
+        "champs/epci_champ":
+          attributes:
+            code_departement:
+              not_in_departement_codes: "doit être un code de département valide"
+            external_id:
+              not_in_departement_epci_codes: "doit être un code d'EPCI du département correspondant"
+            value:
+              not_in_departement_epci_names: "doit être un nom d'EPCI du département correspondant"
   errors:
     format: "Le champ « %{attribute} » %{message}"
     messages:
diff --git a/lib/tasks/deployment/20230215100231_normalize_geometries.rake b/lib/tasks/deployment/20230215100231_normalize_geometries.rake
new file mode 100644
index 000000000..275e37169
--- /dev/null
+++ b/lib/tasks/deployment/20230215100231_normalize_geometries.rake
@@ -0,0 +1,19 @@
+namespace :after_party do
+  desc 'Deployment task: normalize_geometries'
+  task normalize_geometries: :environment do
+    puts "Running deploy task 'normalize_geometries'"
+
+    progress = ProgressReport.new(GeoArea.count)
+    GeoArea.in_batches(of: 100) do |geo_areas|
+      ids = geo_areas.ids
+      Migrations::NormalizeGeoAreaJob.perform_later(ids)
+      progress.inc(ids.size)
+    end
+    progress.finish
+
+    # Update task as completed.  If you remove the line below, the task will
+    # run with every deploy (or every time you call after_party:run).
+    AfterParty::TaskRecord
+      .create version: AfterParty::TaskRecorder.new(__FILE__).timestamp
+  end
+end
diff --git a/spec/models/champs/carte_champ_spec.rb b/spec/models/champs/carte_champ_spec.rb
index b006ad092..c7e4e5c99 100644
--- a/spec/models/champs/carte_champ_spec.rb
+++ b/spec/models/champs/carte_champ_spec.rb
@@ -1,7 +1,7 @@
 describe Champs::CarteChamp do
   let(:champ) { Champs::CarteChamp.new(geo_areas: geo_areas, type_de_champ: create(:type_de_champ_carte)) }
   let(:value) { '' }
-  let(:coordinates) { [[2.3859214782714844, 48.87442541960633], [2.3850631713867183, 48.87273183590832], [2.3809432983398438, 48.87081237174292], [2.3859214782714844, 48.87442541960633]] }
+  let(:coordinates) { [[[2.3859214782714844, 48.87442541960633], [2.3850631713867183, 48.87273183590832], [2.3809432983398438, 48.87081237174292], [2.3859214782714844, 48.87442541960633]]] }
   let(:geo_json) do
     {
       "type" => 'Polygon',
diff --git a/spec/models/champs/epci_champ_spec.rb b/spec/models/champs/epci_champ_spec.rb
index be06ed379..1b5a56dd4 100644
--- a/spec/models/champs/epci_champ_spec.rb
+++ b/spec/models/champs/epci_champ_spec.rb
@@ -6,9 +6,156 @@ describe Champs::EpciChamp, type: :model do
     Rails.cache.clear
   end
 
-  let(:champ) { described_class.new }
+  describe 'validations' do
+    describe 'code_departement', vcr: { cassette_name: 'api_geo_departements' } do
+      subject { build(:champ_epci, code_departement: code_departement) }
+
+      context 'when nil' do
+        let(:code_departement) { nil }
+
+        it { is_expected.to be_valid }
+      end
+
+      context 'when empty' do
+        let(:code_departement) { '' }
+
+        it { is_expected.not_to be_valid }
+      end
+
+      context 'when included in the departement codes' do
+        let(:code_departement) { "01" }
+
+        it { is_expected.to be_valid }
+      end
+
+      context 'when not included in the departement codes' do
+        let(:code_departement) { "totoro" }
+
+        it { is_expected.not_to be_valid }
+      end
+    end
+
+    describe 'external_id' do
+      let(:champ) { build(:champ_epci, code_departement: code_departement, external_id: nil) }
+
+      subject { champ }
+
+      before do
+        VCR.insert_cassette('api_geo_departements')
+        VCR.insert_cassette('api_geo_epcis')
+
+        champ.save!
+        champ.update_columns(external_id: external_id)
+      end
+
+      after do
+        VCR.eject_cassette('api_geo_departements')
+        VCR.eject_cassette('api_geo_epcis')
+      end
+
+      context 'when code_departement is nil' do
+        let(:code_departement) { nil }
+        let(:external_id) { nil }
+
+        it { is_expected.to be_valid }
+      end
+
+      context 'when code_departement is not nil and valid' do
+        let(:code_departement) { "01" }
+
+        context 'when external_id is nil' do
+          let(:external_id) { nil }
+
+          it { is_expected.to be_valid }
+        end
+
+        context 'when external_id is empty' do
+          let(:external_id) { '' }
+
+          it { is_expected.not_to be_valid }
+        end
+
+        context 'when external_id is included in the epci codes of the departement' do
+          let(:external_id) { '200042935' }
+
+          it { is_expected.to be_valid }
+        end
+
+        context 'when external_id is not included in the epci codes of the departement' do
+          let(:external_id) { 'totoro' }
+
+          it { is_expected.not_to be_valid }
+        end
+      end
+    end
+
+    describe 'value' do
+      let(:champ) { build(:champ_epci, code_departement: code_departement, external_id: nil, value: nil) }
+
+      subject { champ }
+
+      before do
+        VCR.insert_cassette('api_geo_departements')
+        VCR.insert_cassette('api_geo_epcis')
+
+        champ.save!
+        champ.update_columns(external_id: external_id, value: value)
+      end
+
+      after do
+        VCR.eject_cassette('api_geo_departements')
+        VCR.eject_cassette('api_geo_epcis')
+      end
+
+      context 'when code_departement is nil' do
+        let(:code_departement) { nil }
+        let(:external_id) { nil }
+        let(:value) { nil }
+
+        it { is_expected.to be_valid }
+      end
+
+      context 'when external_id is nil' do
+        let(:code_departement) { '01' }
+        let(:external_id) { nil }
+        let(:value) { nil }
+
+        it { is_expected.to be_valid }
+      end
+
+      context 'when code_departement and external_id are not nil and valid' do
+        let(:code_departement) { '01' }
+        let(:external_id) { '200042935' }
+
+        context 'when value is nil' do
+          let(:value) { nil }
+
+          it { is_expected.to be_valid }
+        end
+
+        context 'when value is empty' do
+          let(:value) { '' }
+
+          it { is_expected.not_to be_valid }
+        end
+
+        context 'when value is in departement epci names' do
+          let(:value) { 'CA Haut - Bugey Agglomération' }
+
+          it { is_expected.to be_valid }
+        end
+
+        context 'when value is not in departement epci names' do
+          let(:value) { 'totoro' }
+
+          it { is_expected.not_to be_valid }
+        end
+      end
+    end
+  end
 
   describe 'value', vcr: { cassette_name: 'api_geo_epcis' } do
+    let(:champ) { described_class.new }
     it 'with departement and code' do
       champ.code_departement = '01'
       champ.value = '200042935'
diff --git a/spec/models/dossier_spec.rb b/spec/models/dossier_spec.rb
index f4d94a27b..cdc43d0f0 100644
--- a/spec/models/dossier_spec.rb
+++ b/spec/models/dossier_spec.rb
@@ -1516,8 +1516,8 @@ describe Dossier do
           {
             type: 'Feature',
             geometry: {
-              'coordinates' => [[[2.428439855575562, 46.538476837725796], [2.4284291267395024, 46.53842148758162], [2.4282521009445195, 46.53841410755813], [2.42824137210846, 46.53847314771794], [2.428284287452698, 46.53847314771794], [2.428364753723145, 46.538487907747864], [2.4284291267395024, 46.538491597754714], [2.428439855575562, 46.538476837725796]]],
-              'type' => 'Polygon'
+              coordinates: [[[2.428439855575562, 46.538476837725796], [2.4284291267395024, 46.53842148758162], [2.4282521009445195, 46.53841410755813], [2.42824137210846, 46.53847314771794], [2.428284287452698, 46.53847314771794], [2.428364753723145, 46.538487907747864], [2.4284291267395024, 46.538491597754714], [2.428439855575562, 46.538476837725796]]],
+              type: 'Polygon'
             },
             properties: {
               area: 103.6,
diff --git a/spec/models/geo_area_spec.rb b/spec/models/geo_area_spec.rb
index 0a746f363..0cd51a7c6 100644
--- a/spec/models/geo_area_spec.rb
+++ b/spec/models/geo_area_spec.rb
@@ -23,7 +23,7 @@ RSpec.describe GeoArea, type: :model do
     it { expect(geo_area.location).to eq("46°32'19\"N 2°25'42\"E") }
   end
 
-  describe '#rgeo_geometry' do
+  describe '#geometry' do
     let(:geo_area) { build(:geo_area, :polygon, champ: nil) }
     let(:polygon) do
       {
@@ -47,9 +47,9 @@ RSpec.describe GeoArea, type: :model do
 
     context 'polygon_with_extra_coordinate' do
       let(:geo_area) { build(:geo_area, :polygon_with_extra_coordinate, champ: nil) }
+      before { geo_area.valid? }
 
-      it { expect(geo_area.geometry).not_to eq(polygon) }
-      it { expect(geo_area.safe_geometry).to eq(polygon) }
+      it { expect(geo_area.geometry).to eq(polygon) }
     end
   end
 
diff --git a/spec/models/prefill_description_spec.rb b/spec/models/prefill_description_spec.rb
index d93b0c68a..063eb2db3 100644
--- a/spec/models/prefill_description_spec.rb
+++ b/spec/models/prefill_description_spec.rb
@@ -105,6 +105,34 @@ RSpec.describe PrefillDescription, type: :model do
         )
       )
     end
+
+    context 'when the type de champ can have multiple values' do
+      let(:type_de_champ) { TypesDeChamp::PrefillTypeDeChamp.build(create(:type_de_champ_epci, procedure: procedure)) }
+
+      let(:memory_store) { ActiveSupport::Cache.lookup_store(:memory_store) }
+
+      before do
+        allow(Rails).to receive(:cache).and_return(memory_store)
+        Rails.cache.clear
+
+        VCR.insert_cassette('api_geo_departements')
+        VCR.insert_cassette('api_geo_epcis')
+      end
+
+      after do
+        VCR.eject_cassette('api_geo_departements')
+        VCR.eject_cassette('api_geo_epcis')
+      end
+
+      it 'builds the URL with array parameter' do
+        expect(prefill_description.prefill_link).to eq(
+          commencer_url(
+            path: procedure.path,
+            "champ_#{type_de_champ.to_typed_id}": type_de_champ.example_value
+          )
+        )
+      end
+    end
   end
 
   describe '#prefill_query', vcr: { cassette_name: 'api_geo_regions' } do
@@ -121,10 +149,43 @@ RSpec.describe PrefillDescription, type: :model do
              --data '{"champ_#{type_de_champ.to_typed_id}": "#{I18n.t("views.prefill_descriptions.edit.examples.#{type_de_champ.type_champ}")}", "champ_#{type_de_champ_repetition.to_typed_id}": #{TypesDeChamp::PrefillTypeDeChamp.build(type_de_champ_repetition).example_value}}'
       TEXT
     end
+
     before { prefill_description.update(selected_type_de_champ_ids: [type_de_champ.id, type_de_champ_repetition.id]) }
 
+    let(:memory_store) { ActiveSupport::Cache.lookup_store(:memory_store) }
+
+    before do
+      allow(Rails).to receive(:cache).and_return(memory_store)
+      Rails.cache.clear
+
+      VCR.insert_cassette('api_geo_departements')
+      VCR.insert_cassette('api_geo_epcis')
+
+      prefill_description.update(selected_type_de_champ_ids: [type_de_champ.id])
+    end
+
+    after do
+      VCR.eject_cassette('api_geo_departements')
+      VCR.eject_cassette('api_geo_epcis')
+    end
+
     it "builds the query to create a new prefilled dossier" do
       expect(prefill_description.prefill_query).to eq(expected_query)
     end
+
+    context 'when the type de champ can have multiple values' do
+      let(:type_de_champ) { TypesDeChamp::PrefillTypeDeChamp.build(create(:type_de_champ_epci, procedure: procedure)) }
+      let(:expected_query) do
+        <<~TEXT
+          curl --request POST '#{api_public_v1_dossiers_url(procedure)}' \\
+               --header 'Content-Type: application/json' \\
+               --data '{"champ_#{type_de_champ.to_typed_id}": #{type_de_champ.example_value}}'
+        TEXT
+      end
+
+      it 'builds the query with array parameter' do
+        expect(prefill_description.prefill_query).to eq(expected_query)
+      end
+    end
   end
 end
diff --git a/spec/models/prefill_params_spec.rb b/spec/models/prefill_params_spec.rb
index ab76397a0..1842b9900 100644
--- a/spec/models/prefill_params_spec.rb
+++ b/spec/models/prefill_params_spec.rb
@@ -12,6 +12,16 @@ RSpec.describe PrefillParams do
     before do
       allow(Rails).to receive(:cache).and_return(memory_store)
       Rails.cache.clear
+
+      VCR.insert_cassette('api_geo_regions')
+      VCR.insert_cassette('api_geo_departements')
+      VCR.insert_cassette('api_geo_epcis')
+    end
+
+    after do
+      VCR.eject_cassette('api_geo_regions')
+      VCR.eject_cassette('api_geo_departements')
+      VCR.eject_cassette('api_geo_epcis')
     end
 
     context "when the stable ids match the TypeDeChamp of the corresponding procedure" do
@@ -76,7 +86,7 @@ RSpec.describe PrefillParams do
 
         let(:params) { { "champ_#{type_de_champ.to_typed_id}" => value } }
 
-        it "builds an array of hash(id, value) matching the given params" do
+        it "builds an array of hash matching the given params" do
           expect(prefill_params_array).to match([{ id: champ.id }.merge(attributes(champ, value))])
         end
       end
@@ -90,7 +100,7 @@ RSpec.describe PrefillParams do
 
         let(:params) { { "champ_#{type_de_champ.to_typed_id}" => value } }
 
-        it "builds an array of hash(id, value) matching the given params" do
+        it "builds an array of hash matching the given params" do
           expect(prefill_params_array).to match([{ id: champ.id }.merge(attributes(champ, value))])
         end
       end
@@ -127,6 +137,7 @@ RSpec.describe PrefillParams do
     it_behaves_like "a champ public value that is authorized", :drop_down_list, "value"
     it_behaves_like "a champ public value that is authorized", :regions, "03"
     it_behaves_like "a champ public value that is authorized", :departements, "03"
+    it_behaves_like "a champ public value that is authorized", :epci, ['01', '200042935']
 
     context "when the public type de champ is authorized (repetition)" do
       let(:types_de_champ_public) { [{ type: :repetition, children: [{ type: :text }] }] }
@@ -159,7 +170,8 @@ RSpec.describe PrefillParams do
     it_behaves_like "a champ private value that is authorized", :checkbox, "false"
     it_behaves_like "a champ private value that is authorized", :drop_down_list, "value"
     it_behaves_like "a champ private value that is authorized", :regions, "93"
-    it_behaves_like "a champ public value that is authorized", :departements, "03"
+    it_behaves_like "a champ private value that is authorized", :departements, "03"
+    it_behaves_like "a champ private value that is authorized", :epci, ['01', '200042935']
 
     context "when the private type de champ is authorized (repetition)" do
       let(:types_de_champ_private) { [{ type: :repetition, children: [{ type: :text }] }] }
diff --git a/spec/models/type_de_champ_spec.rb b/spec/models/type_de_champ_spec.rb
index 79c5d9ecc..f2cb0754b 100644
--- a/spec/models/type_de_champ_spec.rb
+++ b/spec/models/type_de_champ_spec.rb
@@ -252,6 +252,7 @@ describe TypeDeChamp do
     it_behaves_like "a prefillable type de champ", :type_de_champ_regions
     it_behaves_like "a prefillable type de champ", :type_de_champ_repetition
     it_behaves_like "a prefillable type de champ", :type_de_champ_departements
+    it_behaves_like "a prefillable type de champ", :type_de_champ_epci
 
     it_behaves_like "a non-prefillable type de champ", :type_de_champ_number
     it_behaves_like "a non-prefillable type de champ", :type_de_champ_communes
diff --git a/spec/models/types_de_champ/prefill_epci_type_de_champ_spec.rb b/spec/models/types_de_champ/prefill_epci_type_de_champ_spec.rb
new file mode 100644
index 000000000..ef59b9df3
--- /dev/null
+++ b/spec/models/types_de_champ/prefill_epci_type_de_champ_spec.rb
@@ -0,0 +1,94 @@
+# frozen_string_literal: true
+
+RSpec.describe TypesDeChamp::PrefillEpciTypeDeChamp do
+  let(:type_de_champ) { build(:type_de_champ_epci) }
+  let(:memory_store) { ActiveSupport::Cache.lookup_store(:memory_store) }
+
+  before do
+    allow(Rails).to receive(:cache).and_return(memory_store)
+    Rails.cache.clear
+  end
+
+  describe 'ancestors' do
+    subject { described_class.new(type_de_champ) }
+
+    it { is_expected.to be_kind_of(TypesDeChamp::PrefillEpciTypeDeChamp) }
+  end
+
+  describe '#possible_values' do
+    let(:expected_values) do
+      departements.map { |departement| "#{departement[:code]} (#{departement[:name]}) : https://geo.api.gouv.fr/epcis?codeDepartement=#{departement[:code]}" }
+    end
+    subject(:possible_values) { described_class.new(type_de_champ).possible_values }
+
+    before do
+      VCR.insert_cassette('api_geo_departements')
+      VCR.insert_cassette('api_geo_epcis')
+    end
+
+    after do
+      VCR.eject_cassette('api_geo_departements')
+      VCR.eject_cassette('api_geo_epcis')
+    end
+
+    it { expect(possible_values).to match(expected_values) }
+  end
+
+  describe '#example_value' do
+    let(:departement_code) { departements.pick(:code) }
+    let(:epci_code) { APIGeoService.epcis(departement_code).pick(:code) }
+    subject(:example_value) { described_class.new(type_de_champ).example_value }
+
+    before do
+      VCR.insert_cassette('api_geo_departements')
+      VCR.insert_cassette('api_geo_epcis')
+    end
+
+    after do
+      VCR.eject_cassette('api_geo_departements')
+      VCR.eject_cassette('api_geo_epcis')
+    end
+
+    it { is_expected.to eq([departement_code, epci_code]) }
+  end
+
+  describe '#to_assignable_attributes' do
+    subject(:to_assignable_attributes) { described_class.build(type_de_champ).to_assignable_attributes(champ, value) }
+
+    context 'when the value is nil' do
+      let(:value) { nil }
+      it { is_expected.to match({ code_departement: nil, value: nil }) }
+    end
+
+    context 'when the value is empty' do
+      let(:value) { '' }
+      it { is_expected.to match({ code_departement: nil, value: nil }) }
+    end
+
+    context 'when the value is a string' do
+      let(:value) { 'hello' }
+      it { is_expected.to match({ code_departement: nil, value: nil }) }
+    end
+
+    context 'when the value is an array of one element' do
+      let(:value) { ['01'] }
+      it { is_expected.to match({ code_departement: '01', value: nil }) }
+    end
+
+    context 'when the value is an array of two elements' do
+      let(:value) { ['01', '200042935'] }
+      it { is_expected.to match({ code_departement: '01', value: '200042935' }) }
+    end
+
+    context 'when the value is an array of three or more elements' do
+      let(:value) { ['01', '200042935', 'hello'] }
+      it { is_expected.to match({ code_departement: '01', value: '200042935' }) }
+    end
+  end
+
+  private
+
+  def departements
+    APIGeoService.departements.sort_by { |departement| departement[:code] }
+  end
+end
diff --git a/spec/models/types_de_champ/prefill_type_de_champ_spec.rb b/spec/models/types_de_champ/prefill_type_de_champ_spec.rb
index b9b32a50d..a4b1655e5 100644
--- a/spec/models/types_de_champ/prefill_type_de_champ_spec.rb
+++ b/spec/models/types_de_champ/prefill_type_de_champ_spec.rb
@@ -37,6 +37,12 @@ RSpec.describe TypesDeChamp::PrefillTypeDeChamp, type: :model do
       it { expect(built).to be_kind_of(TypesDeChamp::PrefillDepartementTypeDeChamp) }
     end
 
+    context 'when the type de champ is a epci' do
+      let(:type_de_champ) { build(:type_de_champ_epci) }
+
+      it { expect(built).to be_kind_of(TypesDeChamp::PrefillEpciTypeDeChamp) }
+    end
+
     context 'when any other type de champ' do
       let(:type_de_champ) { build(:type_de_champ_date) }
 
diff --git a/spec/support/shared_examples_for_prefilled_dossier.rb b/spec/support/shared_examples_for_prefilled_dossier.rb
index 11805c31d..4698f788f 100644
--- a/spec/support/shared_examples_for_prefilled_dossier.rb
+++ b/spec/support/shared_examples_for_prefilled_dossier.rb
@@ -22,5 +22,6 @@ shared_examples "the user has got a prefilled dossier, owned by themselves" do
     expect(page).to have_field(text_repetition_libelle, with: text_repetition_value)
     expect(page).to have_field(integer_repetition_libelle, with: integer_repetition_value)
     expect(page).to have_field(type_de_champ_datetime.libelle, with: datetime_value)
+    expect(page).to have_field(type_de_champ_epci.libelle, with: epci_value.last)
   end
 end
diff --git a/spec/system/administrateurs/procedure_cloning_spec.rb b/spec/system/administrateurs/procedure_cloning_spec.rb
index dc6dfafe4..a53545f09 100644
--- a/spec/system/administrateurs/procedure_cloning_spec.rb
+++ b/spec/system/administrateurs/procedure_cloning_spec.rb
@@ -14,7 +14,22 @@ describe 'As an administrateur I wanna clone a procedure', js: true do
       published_at: Time.zone.now)
     login_as administrateur.user, scope: :user
   end
+  context 'Visit all admin procedures' do
+    let(:download_dir) { Rails.root.join('tmp/capybara') }
+    let(:download_file_pattern) { download_dir.join('*.xlsx') }
 
+    scenario do
+      Dir[download_file_pattern].map { File.delete(_1) }
+      visit all_admin_procedures_path
+
+      click_on "Exporter les résultats"
+      Timeout.timeout(Capybara.default_max_wait_time,
+                      Timeout::Error,
+                     "File download timeout! can't download procedure/all.xlsx") do
+        sleep 0.1 until !Dir[download_file_pattern].empty?
+      end
+    end
+  end
   context 'Cloning a procedure owned by the current admin' do
     scenario do
       visit admin_procedures_path
diff --git a/spec/system/users/dossier_prefill_get_spec.rb b/spec/system/users/dossier_prefill_get_spec.rb
index c876d09aa..b93cb40c5 100644
--- a/spec/system/users/dossier_prefill_get_spec.rb
+++ b/spec/system/users/dossier_prefill_get_spec.rb
@@ -1,4 +1,6 @@
 describe 'Prefilling a dossier (with a GET request):' do
+  let(:memory_store) { ActiveSupport::Cache.lookup_store(:memory_store) }
+
   let(:password) { 'my-s3cure-p4ssword' }
 
   let(:procedure) { create(:procedure, :published, opendata: true) }
@@ -16,6 +18,21 @@ describe 'Prefilling a dossier (with a GET request):' do
   let(:integer_repetition_libelle) { sub_type_de_champs_repetition.second.libelle }
   let(:text_repetition_value) { "First repetition text" }
   let(:integer_repetition_value) { "42" }
+  let(:type_de_champ_epci) { create(:type_de_champ_epci, procedure: procedure) }
+  let(:epci_value) { ['01', '200029999'] }
+
+  before do
+    allow(Rails).to receive(:cache).and_return(memory_store)
+    Rails.cache.clear
+
+    VCR.insert_cassette('api_geo_departements')
+    VCR.insert_cassette('api_geo_epcis')
+  end
+
+  after do
+    VCR.eject_cassette('api_geo_departements')
+    VCR.eject_cassette('api_geo_epcis')
+  end
 
   context 'when authenticated' do
     it_behaves_like "the user has got a prefilled dossier, owned by themselves" do
@@ -35,7 +52,8 @@ describe 'Prefilling a dossier (with a GET request):' do
               \"#{sub_type_de_champs_repetition.second.to_typed_id}\": \"#{integer_repetition_value}\"
             }"
           ],
-          "champ_#{type_de_champ_datetime.to_typed_id}" => datetime_value
+          "champ_#{type_de_champ_datetime.to_typed_id}" => datetime_value,
+          "champ_#{type_de_champ_epci.to_typed_id}" => epci_value
         )
 
         click_on "Poursuivre mon dossier prérempli"
@@ -55,7 +73,8 @@ describe 'Prefilling a dossier (with a GET request):' do
             \"#{sub_type_de_champs_repetition.second.to_typed_id}\": \"#{integer_repetition_value}\"
           }"
         ],
-        "champ_#{type_de_champ_datetime.to_typed_id}" => datetime_value
+        "champ_#{type_de_champ_datetime.to_typed_id}" => datetime_value,
+        "champ_#{type_de_champ_epci.to_typed_id}" => epci_value
       )
     end
 
diff --git a/spec/system/users/dossier_prefill_post_spec.rb b/spec/system/users/dossier_prefill_post_spec.rb
index d67c93a48..78c4037a1 100644
--- a/spec/system/users/dossier_prefill_post_spec.rb
+++ b/spec/system/users/dossier_prefill_post_spec.rb
@@ -1,4 +1,6 @@
 describe 'Prefilling a dossier (with a POST request):' do
+  let(:memory_store) { ActiveSupport::Cache.lookup_store(:memory_store) }
+
   let(:password) { 'my-s3cure-p4ssword' }
 
   let(:procedure) { create(:procedure, :published) }
@@ -16,6 +18,21 @@ describe 'Prefilling a dossier (with a POST request):' do
   let(:integer_repetition_libelle) { sub_type_de_champs_repetition.second.libelle }
   let(:text_repetition_value) { "First repetition text" }
   let(:integer_repetition_value) { "42" }
+  let(:type_de_champ_epci) { create(:type_de_champ_epci, procedure: procedure) }
+  let(:epci_value) { ['01', '200029999'] }
+
+  before do
+    allow(Rails).to receive(:cache).and_return(memory_store)
+    Rails.cache.clear
+
+    VCR.insert_cassette('api_geo_departements')
+    VCR.insert_cassette('api_geo_epcis')
+  end
+
+  after do
+    VCR.eject_cassette('api_geo_departements')
+    VCR.eject_cassette('api_geo_epcis')
+  end
 
   scenario "the user get the URL of a prefilled orphan brouillon dossier" do
     dossier_url = create_and_prefill_dossier_with_post_request
@@ -110,7 +127,8 @@ describe 'Prefilling a dossier (with a POST request):' do
             \"#{sub_type_de_champs_repetition.second.to_typed_id}\": \"#{integer_repetition_value}\"
           }"
         ],
-        "champ_#{type_de_champ_datetime.to_typed_id}" => datetime_value
+        "champ_#{type_de_champ_datetime.to_typed_id}" => datetime_value,
+        "champ_#{type_de_champ_epci.to_typed_id}" => epci_value
       }.to_json
     JSON.parse(session.response.body)["dossier_url"].gsub("http://www.example.com", "")
   end

From 96b9ec3f42655a541dcaea17e3cc1a9aca8c3d31 Mon Sep 17 00:00:00 2001
From: Damien Le Thiec <damien.lethiec@gmail.com>
Date: Wed, 15 Feb 2023 18:13:16 +0100
Subject: [PATCH 053/202] First fix tests

---
 app/models/prefill_params.rb                          | 11 ++++++-----
 .../prefill_repetition_type_de_champ_spec.rb          |  2 +-
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/app/models/prefill_params.rb b/app/models/prefill_params.rb
index 2065ad630..52f8ce1e6 100644
--- a/app/models/prefill_params.rb
+++ b/app/models/prefill_params.rb
@@ -56,6 +56,12 @@ class PrefillParams
       champ.prefillable? && valid?
     end
 
+    def champ_attributes
+      TypesDeChamp::PrefillTypeDeChamp
+        .build(champ.type_de_champ)
+        .to_assignable_attributes(champ, value)
+    end
+
     private
 
     def valid?
@@ -65,10 +71,5 @@ class PrefillParams
       champ.valid?(:prefill)
     end
 
-    def champ_attributes
-      TypesDeChamp::PrefillTypeDeChamp
-        .build(champ.type_de_champ)
-        .to_assignable_attributes(champ, value)
-    end
   end
 end
diff --git a/spec/models/types_de_champ/prefill_repetition_type_de_champ_spec.rb b/spec/models/types_de_champ/prefill_repetition_type_de_champ_spec.rb
index df0a88402..6397953a6 100644
--- a/spec/models/types_de_champ/prefill_repetition_type_de_champ_spec.rb
+++ b/spec/models/types_de_champ/prefill_repetition_type_de_champ_spec.rb
@@ -24,7 +24,7 @@ RSpec.describe TypesDeChamp::PrefillRepetitionTypeDeChamp, type: :model, vcr: {
   describe '#possible_values' do
     subject(:possible_values) { described_class.new(type_de_champ).possible_values }
     let(:expected_value) {
-      "Un tableau de dictionnaires avec les valeurs possibles pour chaque champ de la répétition.</br><ul><li>#{text_repetition.to_typed_id}: Un texte court<br></li><li>#{integer_repetition.to_typed_id}: Un nombre entier<br></li><li>#{region_repetition.to_typed_id}: Un <a href=\"https://fr.wikipedia.org/wiki/R%C3%A9gion_fran%C3%A7aise\" target=\"_blank\">code INSEE de région</a><br><a title=\"Toutes les valeurs possibles — Nouvel onglet\" target=\"_blank\" rel=\"noopener noreferrer\" href=\"/procedures/#{procedure.path}/prefill_type_de_champs/#{region_repetition.id}\">Voir toutes les valeurs possibles</a></li></ul>"
+      "Un tableau de dictionnaires avec les valeurs possibles pour chaque champ de la répétition.</br><ul><li>#{text_repetition.to_typed_id}: Un texte court<br></li><li>#{integer_repetition.to_typed_id}: Un nombre entier<br></li><li>#{region_repetition.to_typed_id}: Un <a href=\"https://fr.wikipedia.org/wiki/R%C3%A9gion_fran%C3%A7aise\" target=\"_blank\" rel=\"noopener noreferrer\">code INSEE de région</a><br><a title=\"Toutes les valeurs possibles — Nouvel onglet\" target=\"_blank\" rel=\"noopener noreferrer\" href=\"/procedures/#{procedure.path}/prefill_type_de_champs/#{region_repetition.id}\">Voir toutes les valeurs possibles</a></li></ul>"
     }
 
     it {

From 74c6d45b74a1628ecd358887f2d6c7b1584206c2 Mon Sep 17 00:00:00 2001
From: Paul Chavard <pro@paul.chavard.net>
Date: Wed, 15 Feb 2023 17:44:49 +0100
Subject: [PATCH 054/202] feat(graphql): add tracing support for managers

---
 app/controllers/api/v2/graphql_controller.rb | 36 +++++++++++++++++---
 1 file changed, 31 insertions(+), 5 deletions(-)

diff --git a/app/controllers/api/v2/graphql_controller.rb b/app/controllers/api/v2/graphql_controller.rb
index 52c453051..d18a641ec 100644
--- a/app/controllers/api/v2/graphql_controller.rb
+++ b/app/controllers/api/v2/graphql_controller.rb
@@ -1,10 +1,6 @@
 class API::V2::GraphqlController < API::V2::BaseController
   def execute
-    result = API::V2::Schema.execute(query,
-      variables: variables,
-      context: context,
-      operation_name: params[:operationName])
-
+    result = tracing? ? instrumented { perform_query } : perform_query
     render json: result
   rescue GraphQL::ParseError, JSON::ParserError => exception
     handle_parse_error(exception)
@@ -18,6 +14,13 @@ class API::V2::GraphqlController < API::V2::BaseController
 
   private
 
+  def perform_query
+    API::V2::Schema.execute(query,
+      variables: variables,
+      context: context,
+      operation_name: params[:operationName])
+  end
+
   def append_info_to_payload(payload)
     super
 
@@ -124,4 +127,27 @@ class API::V2::GraphqlController < API::V2::BaseController
       data: nil
     }, status: 500
   end
+
+  def tracing?
+    params[:tracing].present? && (Rails.env.development? || manager?)
+  end
+
+  def manager?
+    administrateur_signed_in? && AdministrateursProcedure.exists?(administrateur: current_administrateur, manager: true)
+  end
+
+  def instrumented
+    events = []
+    ActiveSupport::Notifications.subscribed(-> (_name, start, finish, _id, payload) { events << { start: Time.zone.at(start), duration: (finish - start) * 1000, sql: payload[:sql] } }, "sql.active_record", monotonic: true) do
+      result = yield
+      result.merge(extensions: {
+        tracing: {
+          startTime: events.first[:start],
+          endTime: events.last[:start],
+          duration: events.sum { _1[:duration] },
+          events: events.sort_by { _1[:duration] }.reverse
+        }
+      })
+    end
+  end
 end

From 0fe027f408ee9c0968353965ffb4486e7ee9f3e7 Mon Sep 17 00:00:00 2001
From: Martin <martin@sharypic.com>
Date: Tue, 7 Feb 2023 17:00:39 +0100
Subject: [PATCH 055/202] a11y(main_menu): utilise aria-current=true plutot que
 avec page

---
 app/views/administrateurs/procedures/_main_menu.html.haml | 2 +-
 app/views/layouts/_header.haml                            | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/app/views/administrateurs/procedures/_main_menu.html.haml b/app/views/administrateurs/procedures/_main_menu.html.haml
index 9d3d28ef9..89f3de634 100644
--- a/app/views/administrateurs/procedures/_main_menu.html.haml
+++ b/app/views/administrateurs/procedures/_main_menu.html.haml
@@ -1,6 +1,6 @@
 .fr-container
   %nav#header-navigation.fr-nav{ role: 'navigation', 'aria-label': 'Menu principal administrateur' }
     %ul.fr-nav__list
-      %li.fr-nav__item= link_to 'Mes démarches', admin_procedures_path, class:'fr-nav__link', 'aria-current': current_page?(admin_procedures_path) ? 'page' : nil
+      %li.fr-nav__item= link_to 'Mes démarches', admin_procedures_path, class:'fr-nav__link', 'aria-current': current_page?(controller: 'procedures', action: :index) ? 'true' : nil
       - if Rails.application.config.ds_zonage_enabled
         %li.fr-nav__item= link_to 'Toutes les démarches', all_admin_procedures_path(zone_ids: current_administrateur.zones), class:'fr-nav__link', 'aria-current': current_page?(all_admin_procedures_path) ? 'page' : nil
diff --git a/app/views/layouts/_header.haml b/app/views/layouts/_header.haml
index 41c23b0e5..c447fad9e 100644
--- a/app/views/layouts/_header.haml
+++ b/app/views/layouts/_header.haml
@@ -87,18 +87,18 @@
             - if current_instructeur.procedures.any?
               - current_url = request.path_info
               %li.fr-nav__item
-                = active_link_to t('utils.procedure'), instructeur_procedures_path, active: ['dossiers','procedures'].include?(controller_name), class: 'fr-nav__link'
+                = active_link_to t('utils.procedure'), instructeur_procedures_path, active: ['dossiers','procedures'].include?(controller_name), class: 'fr-nav__link', aria: { current: current_url == instructeur_procedures_path ? 'page' : true }
             - if current_instructeur.user.expert && current_expert.avis_summary[:total] > 0
               = render partial: 'layouts/header/avis_tab', locals: { current_expert: current_expert }
 
           - if is_expert_context
             - if current_expert.user.instructeur && current_instructeur.procedures.any?
-              %li.fr-nav__item= active_link_to t('utils.procedure'), instructeur_procedures_path, active: ['dossiers','procedures'].include?(controller_name), class: 'fr-nav__link'
+              %li.fr-nav__item= active_link_to t('utils.procedure'), instructeur_procedures_path, active: ['dossiers','procedures'].include?(controller_name), class: 'fr-nav__link', aria: { current: true }
             - if current_expert.avis_summary[:total] > 0
               = render partial: 'layouts/header/avis_tab', locals: { current_expert: current_expert }
 
           - if is_user_context
-            %li.fr-nav__item= active_link_to t('.files'), dossiers_path, active: :inclusive, class: 'fr-nav__link'
+            %li.fr-nav__item= active_link_to t('.files'), dossiers_path, active: :inclusive, class: 'fr-nav__link', aria: { current: true }
             - if current_user.expert && current_expert.avis_summary[:total] > 0
               = render partial: 'layouts/header/avis_tab', locals: { current_expert: current_expert }
 

From ade9811d101a4ce35ac549f89d0c3ae8c3a1ee98 Mon Sep 17 00:00:00 2001
From: Paul Chavard <pro@paul.chavard.net>
Date: Wed, 15 Feb 2023 19:07:54 +0100
Subject: [PATCH 056/202] Revert "Merge pull request #8635 from
 tchak/graphql-with-traces"

This reverts commit 76520ec77d64286f44e9a0532fe6fbe98d097062, reversing
changes made to 2c729ff396980ae898dea3a7878ca1a09fe828a5.
---
 app/controllers/api/v2/graphql_controller.rb | 36 +++-----------------
 1 file changed, 5 insertions(+), 31 deletions(-)

diff --git a/app/controllers/api/v2/graphql_controller.rb b/app/controllers/api/v2/graphql_controller.rb
index d18a641ec..52c453051 100644
--- a/app/controllers/api/v2/graphql_controller.rb
+++ b/app/controllers/api/v2/graphql_controller.rb
@@ -1,6 +1,10 @@
 class API::V2::GraphqlController < API::V2::BaseController
   def execute
-    result = tracing? ? instrumented { perform_query } : perform_query
+    result = API::V2::Schema.execute(query,
+      variables: variables,
+      context: context,
+      operation_name: params[:operationName])
+
     render json: result
   rescue GraphQL::ParseError, JSON::ParserError => exception
     handle_parse_error(exception)
@@ -14,13 +18,6 @@ class API::V2::GraphqlController < API::V2::BaseController
 
   private
 
-  def perform_query
-    API::V2::Schema.execute(query,
-      variables: variables,
-      context: context,
-      operation_name: params[:operationName])
-  end
-
   def append_info_to_payload(payload)
     super
 
@@ -127,27 +124,4 @@ class API::V2::GraphqlController < API::V2::BaseController
       data: nil
     }, status: 500
   end
-
-  def tracing?
-    params[:tracing].present? && (Rails.env.development? || manager?)
-  end
-
-  def manager?
-    administrateur_signed_in? && AdministrateursProcedure.exists?(administrateur: current_administrateur, manager: true)
-  end
-
-  def instrumented
-    events = []
-    ActiveSupport::Notifications.subscribed(-> (_name, start, finish, _id, payload) { events << { start: Time.zone.at(start), duration: (finish - start) * 1000, sql: payload[:sql] } }, "sql.active_record", monotonic: true) do
-      result = yield
-      result.merge(extensions: {
-        tracing: {
-          startTime: events.first[:start],
-          endTime: events.last[:start],
-          duration: events.sum { _1[:duration] },
-          events: events.sort_by { _1[:duration] }.reverse
-        }
-      })
-    end
-  end
 end

From cbf072961c7a725324c2e6cc85915ece2578140d Mon Sep 17 00:00:00 2001
From: Eric Leroy-Terquem <eric.leroyterquem@beta.gouv.fr>
Date: Tue, 14 Feb 2023 11:17:52 +0100
Subject: [PATCH 057/202] feat(groupe instructeur mailer): add emailing to
 removed instructeurs

---
 .../groupe_instructeurs_controller.rb         |  4 +++
 .../groupe_instructeurs_controller.rb         |  4 +++
 ...oupe_instructeur_supprimer_instructeurs.rb |  4 +++
 app/mailers/groupe_instructeur_mailer.rb      | 10 +++++++
 .../remove_instructeur.html.haml              |  6 +---
 .../remove_instructeurs.html.haml             |  2 +-
 .../groupe_instructeurs/en.yml                |  4 ++-
 .../groupe_instructeurs/fr.yml                |  4 ++-
 .../groupe_instructeurs_controller_spec.rb    | 13 ++++++++-
 .../mailers/groupe_instructeur_mailer_spec.rb | 29 ++++++++++++++++---
 .../groupe_instructeur_mailer_preview.rb      |  8 +++++
 11 files changed, 75 insertions(+), 13 deletions(-)

diff --git a/app/controllers/administrateurs/groupe_instructeurs_controller.rb b/app/controllers/administrateurs/groupe_instructeurs_controller.rb
index 63390b1f1..35e89221f 100644
--- a/app/controllers/administrateurs/groupe_instructeurs_controller.rb
+++ b/app/controllers/administrateurs/groupe_instructeurs_controller.rb
@@ -147,6 +147,10 @@ module Administrateurs
 
         if groupe_instructeur.remove(instructeur)
           flash[:notice] = if procedure.routing_enabled?
+            GroupeInstructeurMailer
+              .remove_instructeur(groupe_instructeur, [instructeur], current_administrateur.email)
+              .deliver_later
+
             GroupeInstructeurMailer
               .remove_instructeurs(groupe_instructeur, [instructeur], current_administrateur.email)
               .deliver_later
diff --git a/app/controllers/instructeurs/groupe_instructeurs_controller.rb b/app/controllers/instructeurs/groupe_instructeurs_controller.rb
index 6eb25e131..20519c8af 100644
--- a/app/controllers/instructeurs/groupe_instructeurs_controller.rb
+++ b/app/controllers/instructeurs/groupe_instructeurs_controller.rb
@@ -34,6 +34,10 @@ module Instructeurs
         instructeur = Instructeur.find(instructeur_id)
         if groupe_instructeur.remove(instructeur)
           flash[:notice] = "L’instructeur « #{instructeur.email} » a été retiré du groupe."
+          GroupeInstructeurMailer
+            .remove_instructeur(groupe_instructeur, [instructeur], current_administrateur.email)
+            .deliver_later
+
           GroupeInstructeurMailer
             .remove_instructeurs(groupe_instructeur, [instructeur], current_user.email)
             .deliver_later
diff --git a/app/graphql/mutations/groupe_instructeur_supprimer_instructeurs.rb b/app/graphql/mutations/groupe_instructeur_supprimer_instructeurs.rb
index 864f0c3c3..f8c14542a 100644
--- a/app/graphql/mutations/groupe_instructeur_supprimer_instructeurs.rb
+++ b/app/graphql/mutations/groupe_instructeur_supprimer_instructeurs.rb
@@ -16,6 +16,10 @@ module Mutations
       groupe_instructeur.reload
 
       if groupe_instructeur.procedure.routing_enabled? && instructeurs.present?
+        GroupeInstructeurMailer
+          .remove_instructeur(groupe_instructeur, instructeurs, current_administrateur.email)
+          .deliver_later
+
         GroupeInstructeurMailer
           .remove_instructeurs(groupe_instructeur, instructeurs, current_administrateur.email)
           .deliver_later
diff --git a/app/mailers/groupe_instructeur_mailer.rb b/app/mailers/groupe_instructeur_mailer.rb
index cb2865bb8..9674faae2 100644
--- a/app/mailers/groupe_instructeur_mailer.rb
+++ b/app/mailers/groupe_instructeur_mailer.rb
@@ -11,4 +11,14 @@ class GroupeInstructeurMailer < ApplicationMailer
     emails = @group.instructeurs.map(&:email)
     mail(bcc: emails, subject: subject)
   end
+
+  def remove_instructeur(group, removed_instructeurs, current_instructeur_email)
+    removed_instructeur_emails = removed_instructeurs.map(&:email)
+    @group = group
+    @current_instructeur_email = current_instructeur_email
+
+    subject = "Retrait du groupe \"#{group.label}\""
+
+    mail(bcc: removed_instructeur_emails, subject: subject)
+  end
 end
diff --git a/app/views/groupe_instructeur_mailer/remove_instructeur.html.haml b/app/views/groupe_instructeur_mailer/remove_instructeur.html.haml
index 9e7770919..d541c0fd9 100644
--- a/app/views/groupe_instructeur_mailer/remove_instructeur.html.haml
+++ b/app/views/groupe_instructeur_mailer/remove_instructeur.html.haml
@@ -2,10 +2,6 @@
   Bonjour,
 
 %p
-  = t('administrateurs.groupe_instructeurs.remove_instructeur.email_body', count: 1, emails: @email, groupe: @group.label, email: @current_instructeur_email, procedure: @group.procedure.libelle)
-
-%p
-  Cliquez sur le lien ci-dessous pour voir la liste des instructeurs de ce groupe :
-  = link_to(@group.label, admin_procedure_groupe_instructeur_url(@group.procedure, @group))
+  = t('administrateurs.groupe_instructeurs.remove_instructeur.email_body', groupe: @group.label, email: @current_instructeur_email, procedure: @group.procedure.libelle)
 
 = render partial: "layouts/mailers/signature"
diff --git a/app/views/groupe_instructeur_mailer/remove_instructeurs.html.haml b/app/views/groupe_instructeur_mailer/remove_instructeurs.html.haml
index d5a73e165..1d3b218da 100644
--- a/app/views/groupe_instructeur_mailer/remove_instructeurs.html.haml
+++ b/app/views/groupe_instructeur_mailer/remove_instructeurs.html.haml
@@ -2,7 +2,7 @@
   Bonjour,
 
 %p
-  = t('administrateurs.groupe_instructeurs.remove_instructeur.email_body', count: @removed_instructeur_emails.size, emails: @removed_instructeur_emails.join(', '), groupe: @group.label, email: @current_instructeur_email, procedure: @group.procedure.libelle)
+  = t('administrateurs.groupe_instructeurs.remove_instructeurs.email_body', count: @removed_instructeur_emails.size, emails: @removed_instructeur_emails.join(', '), groupe: @group.label, email: @current_instructeur_email, procedure: @group.procedure.libelle)
 
 %p
   Cliquez sur le lien ci-dessous pour voir la liste des instructeurs de ce groupe :
diff --git a/config/locales/views/administrateurs/groupe_instructeurs/en.yml b/config/locales/views/administrateurs/groupe_instructeurs/en.yml
index 208cd053f..7564938d2 100644
--- a/config/locales/views/administrateurs/groupe_instructeurs/en.yml
+++ b/config/locales/views/administrateurs/groupe_instructeurs/en.yml
@@ -19,10 +19,12 @@ en:
         email_body:
           one: "The instructor %{emails} was assigned to the group « %{groupe} » by « %{email} », in charge of procedure « %{procedure} »."
           other: "The instructors %{emails} were assigned to the group « %{groupe} » by « %{email} », in charge of procedure « %{procedure} »."
-      remove_instructeur:
+      remove_instructeurs:
         email_body:
           one: "The instructor %{emails} was removed from the group « %{groupe} » by « %{email} », in charge of procedure « %{procedure} »."
           other: "The instructors %{emails} were removed from the group « %{groupe} » by « %{email} », in charge of procedure « %{procedure} »."
+      remove_instructeur:
+        email_body: "You were removed from the group « %{groupe} » by « %{email} », in charge of procedure « %{procedure} »."
       reaffecter_dossiers:
         existing_groupe:
           one: "%{count} group exist"
diff --git a/config/locales/views/administrateurs/groupe_instructeurs/fr.yml b/config/locales/views/administrateurs/groupe_instructeurs/fr.yml
index dc26ca649..f5f978ecf 100644
--- a/config/locales/views/administrateurs/groupe_instructeurs/fr.yml
+++ b/config/locales/views/administrateurs/groupe_instructeurs/fr.yml
@@ -25,10 +25,12 @@ fr:
         email_body:
           one: "L’instructeur %{emails} a été affecté au groupe « %{groupe} » par « %{email} », en charge de la démarche « %{procedure} »."
           other: "Les instructeurs %{emails} ont été affectés au groupe « %{groupe} » par « %{email} », en charge de la démarche « %{procedure} »."
-      remove_instructeur:
+      remove_instructeurs:
         email_body:
           one: "L’instructeur %{emails} a été retiré du groupe « %{groupe} » par « %{email} », en charge de la démarche « %{procedure} »."
           other: "Les instructeurs %{emails} ont été retirés du groupe « %{groupe} » par « %{email} », en charge de la démarche « %{procedure} »."
+      remove_instructeur:
+        email_body: "Vous avez été retiré du groupe « %{groupe} » par « %{email} », en charge de la démarche « %{procedure} »."
       reaffecter_dossiers:
         existing_groupe:
           one: "%{count} groupe existe"
diff --git a/spec/controllers/administrateurs/groupe_instructeurs_controller_spec.rb b/spec/controllers/administrateurs/groupe_instructeurs_controller_spec.rb
index 90e3a193f..3835696d2 100644
--- a/spec/controllers/administrateurs/groupe_instructeurs_controller_spec.rb
+++ b/spec/controllers/administrateurs/groupe_instructeurs_controller_spec.rb
@@ -320,11 +320,22 @@ describe Administrateurs::GroupeInstructeursController, type: :controller do
     end
 
     context 'when there are many instructeurs' do
-      before { remove_instructeur(admin.instructeur) }
+      before do
+        allow(GroupeInstructeurMailer).to receive(:remove_instructeur)
+          .and_return(double(deliver_later: true))
+        remove_instructeur(admin.instructeur)
+      end
 
       it { expect(gi_1_1.instructeurs).to include(instructeur) }
       it { expect(gi_1_1.reload.instructeurs.count).to eq(1) }
       it { expect(response).to redirect_to(admin_procedure_groupe_instructeur_path(procedure, gi_1_1)) }
+      it "calls GroupeInstructeurMailer with the right groupe and instructeur" do
+        expect(GroupeInstructeurMailer).to have_received(:remove_instructeur).with(
+          gi_1_1,
+          [admin.instructeur],
+          admin.email
+        )
+      end
     end
 
     context 'when there is only one instructeur' do
diff --git a/spec/mailers/groupe_instructeur_mailer_spec.rb b/spec/mailers/groupe_instructeur_mailer_spec.rb
index 9157f03ef..94b8b06ff 100644
--- a/spec/mailers/groupe_instructeur_mailer_spec.rb
+++ b/spec/mailers/groupe_instructeur_mailer_spec.rb
@@ -7,15 +7,36 @@ RSpec.describe GroupeInstructeurMailer, type: :mailer do
       gi.instructeurs << instructeurs_to_remove
       gi
     end
-    let(:instructeur_1) { create(:instructeur, email: 'int3@g') }
-    let(:instructeur_2) { create(:instructeur, email: 'int4@g') }
+    let(:instructeur_3) { create(:instructeur, email: 'int3@g') }
+    let(:instructeur_4) { create(:instructeur, email: 'int4@g') }
 
-    let(:instructeurs_to_remove) { [instructeur_1, instructeur_2] }
+    let(:instructeurs_to_remove) { [instructeur_3, instructeur_4] }
     let(:current_instructeur_email) { 'toto@email.com' }
 
     subject { described_class.remove_instructeurs(groupe_instructeur, instructeurs_to_remove, current_instructeur_email) }
 
     it { expect(subject.body).to include('Les instructeurs int3@g, int4@g ont été retirés du groupe') }
-    it { expect(subject.bcc).to match_array(['int1@g', 'int2@g', 'int3@g', 'int4@g']) }
+    it { expect(subject.bcc).to include('int1@g', 'int2@g') }
+  end
+
+  describe '#remove_instructeur' do
+    let(:groupe_instructeur) do
+      gi = GroupeInstructeur.create(label: 'gi1', procedure: create(:procedure))
+      gi.instructeurs << create(:instructeur, email: 'int1@g')
+      gi.instructeurs << create(:instructeur, email: 'int2@g')
+      gi.instructeurs << instructeurs_to_remove
+      gi
+    end
+    let(:instructeur_3) { create(:instructeur, email: 'int3@g') }
+    let(:instructeur_4) { create(:instructeur, email: 'int4@g') }
+
+    let(:instructeurs_to_remove) { [instructeur_3, instructeur_4] }
+    let(:current_instructeur_email) { 'toto@email.com' }
+
+    subject { described_class.remove_instructeur(groupe_instructeur, instructeurs_to_remove, current_instructeur_email) }
+
+    it { expect(subject.body).to include('ous avez été retiré du groupe « gi1 » par « toto@email.com »') }
+    it { expect(subject.bcc).to match_array(['int3@g', 'int4@g']) }
+    it { expect(subject.bcc).not_to match_array(['int1@g', 'int2@g']) }
   end
 end
diff --git a/spec/mailers/previews/groupe_instructeur_mailer_preview.rb b/spec/mailers/previews/groupe_instructeur_mailer_preview.rb
index 1b6c006a1..5a5f7ca30 100644
--- a/spec/mailers/previews/groupe_instructeur_mailer_preview.rb
+++ b/spec/mailers/previews/groupe_instructeur_mailer_preview.rb
@@ -6,4 +6,12 @@ class GroupeInstructeurMailerPreview < ActionMailer::Preview
     instructeurs = Instructeur.limit(2)
     GroupeInstructeurMailer.remove_instructeurs(groupe, instructeurs, current_instructeur_email)
   end
+
+  def remove_instructeur
+    procedure = Procedure.new(id: 1, libelle: 'une superbe procedure')
+    groupe = GroupeInstructeur.new(id: 1, label: 'Val-De-Marne', procedure:)
+    current_instructeur_email = 'admin@dgfip.com'
+    instructeurs = Instructeur.limit(2)
+    GroupeInstructeurMailer.remove_instructeur(groupe, instructeurs, current_instructeur_email)
+  end
 end

From 5be58c8223c7398fb62466b1b57f9547d332581b Mon Sep 17 00:00:00 2001
From: Eric Leroy-Terquem <eric.leroyterquem@beta.gouv.fr>
Date: Tue, 14 Feb 2023 15:19:58 +0100
Subject: [PATCH 058/202] refactor(groupe instructeur mailer): rename mailer
 methods

---
 .../administrateurs/groupe_instructeurs_controller.rb |  4 ++--
 .../instructeurs/groupe_instructeurs_controller.rb    |  4 ++--
 .../groupe_instructeur_supprimer_instructeurs.rb      |  4 ++--
 app/mailers/groupe_instructeur_mailer.rb              |  6 +++---
 .../notify_group_when_instructeurs_removed.html.haml  | 11 +++++++++++
 .../notify_removed_instructeurs.html.haml             |  7 +++++++
 .../remove_instructeur.html.haml                      |  7 -------
 .../remove_instructeurs.html.haml                     | 11 -----------
 .../views/administrateurs/groupe_instructeurs/en.yml  |  4 ++--
 .../views/administrateurs/groupe_instructeurs/fr.yml  |  4 ++--
 .../groupe_instructeurs_controller_spec.rb            |  4 ++--
 spec/mailers/groupe_instructeur_mailer_spec.rb        |  8 ++++----
 .../previews/groupe_instructeur_mailer_preview.rb     |  2 +-
 13 files changed, 38 insertions(+), 38 deletions(-)
 create mode 100644 app/views/groupe_instructeur_mailer/notify_group_when_instructeurs_removed.html.haml
 create mode 100644 app/views/groupe_instructeur_mailer/notify_removed_instructeurs.html.haml
 delete mode 100644 app/views/groupe_instructeur_mailer/remove_instructeur.html.haml
 delete mode 100644 app/views/groupe_instructeur_mailer/remove_instructeurs.html.haml

diff --git a/app/controllers/administrateurs/groupe_instructeurs_controller.rb b/app/controllers/administrateurs/groupe_instructeurs_controller.rb
index 35e89221f..1842174d8 100644
--- a/app/controllers/administrateurs/groupe_instructeurs_controller.rb
+++ b/app/controllers/administrateurs/groupe_instructeurs_controller.rb
@@ -148,11 +148,11 @@ module Administrateurs
         if groupe_instructeur.remove(instructeur)
           flash[:notice] = if procedure.routing_enabled?
             GroupeInstructeurMailer
-              .remove_instructeur(groupe_instructeur, [instructeur], current_administrateur.email)
+              .notify_removed_instructeurs(groupe_instructeur, [instructeur], current_administrateur.email)
               .deliver_later
 
             GroupeInstructeurMailer
-              .remove_instructeurs(groupe_instructeur, [instructeur], current_administrateur.email)
+              .notify_group_when_instructeurs_removed(groupe_instructeur, [instructeur], current_administrateur.email)
               .deliver_later
 
             "L’instructeur « #{instructeur.email} » a été retiré du groupe."
diff --git a/app/controllers/instructeurs/groupe_instructeurs_controller.rb b/app/controllers/instructeurs/groupe_instructeurs_controller.rb
index 20519c8af..cfa180c22 100644
--- a/app/controllers/instructeurs/groupe_instructeurs_controller.rb
+++ b/app/controllers/instructeurs/groupe_instructeurs_controller.rb
@@ -35,11 +35,11 @@ module Instructeurs
         if groupe_instructeur.remove(instructeur)
           flash[:notice] = "L’instructeur « #{instructeur.email} » a été retiré du groupe."
           GroupeInstructeurMailer
-            .remove_instructeur(groupe_instructeur, [instructeur], current_administrateur.email)
+            .notify_removed_instructeurs(groupe_instructeur, [instructeur], current_user.email)
             .deliver_later
 
           GroupeInstructeurMailer
-            .remove_instructeurs(groupe_instructeur, [instructeur], current_user.email)
+            .notify_group_when_instructeurs_removed(groupe_instructeur, [instructeur], current_user.email)
             .deliver_later
         else
           flash[:alert] = "L’instructeur « #{instructeur.email} » n’est pas dans le groupe."
diff --git a/app/graphql/mutations/groupe_instructeur_supprimer_instructeurs.rb b/app/graphql/mutations/groupe_instructeur_supprimer_instructeurs.rb
index f8c14542a..ba41a870b 100644
--- a/app/graphql/mutations/groupe_instructeur_supprimer_instructeurs.rb
+++ b/app/graphql/mutations/groupe_instructeur_supprimer_instructeurs.rb
@@ -17,11 +17,11 @@ module Mutations
 
       if groupe_instructeur.procedure.routing_enabled? && instructeurs.present?
         GroupeInstructeurMailer
-          .remove_instructeur(groupe_instructeur, instructeurs, current_administrateur.email)
+          .notify_removed_instructeurs(groupe_instructeur, instructeurs, current_administrateur.email)
           .deliver_later
 
         GroupeInstructeurMailer
-          .remove_instructeurs(groupe_instructeur, instructeurs, current_administrateur.email)
+          .notify_group_when_instructeurs_removed(groupe_instructeur, instructeurs, current_administrateur.email)
           .deliver_later
       end
 
diff --git a/app/mailers/groupe_instructeur_mailer.rb b/app/mailers/groupe_instructeur_mailer.rb
index 9674faae2..821b41c03 100644
--- a/app/mailers/groupe_instructeur_mailer.rb
+++ b/app/mailers/groupe_instructeur_mailer.rb
@@ -1,7 +1,7 @@
 class GroupeInstructeurMailer < ApplicationMailer
   layout 'mailers/layout'
 
-  def remove_instructeurs(group, removed_instructeurs, current_instructeur_email)
+  def notify_group_when_instructeurs_removed(group, removed_instructeurs, current_instructeur_email)
     @removed_instructeur_emails = removed_instructeurs.map(&:email)
     @group = group
     @current_instructeur_email = current_instructeur_email
@@ -12,12 +12,12 @@ class GroupeInstructeurMailer < ApplicationMailer
     mail(bcc: emails, subject: subject)
   end
 
-  def remove_instructeur(group, removed_instructeurs, current_instructeur_email)
+  def notify_removed_instructeurs(group, removed_instructeurs, current_instructeur_email)
     removed_instructeur_emails = removed_instructeurs.map(&:email)
     @group = group
     @current_instructeur_email = current_instructeur_email
 
-    subject = "Retrait du groupe \"#{group.label}\""
+    subject = "Vous avez été retiré du groupe \"#{group.label}\" de la démarche \"#{group.procedure.libelle}\""
 
     mail(bcc: removed_instructeur_emails, subject: subject)
   end
diff --git a/app/views/groupe_instructeur_mailer/notify_group_when_instructeurs_removed.html.haml b/app/views/groupe_instructeur_mailer/notify_group_when_instructeurs_removed.html.haml
new file mode 100644
index 000000000..50ba415ef
--- /dev/null
+++ b/app/views/groupe_instructeur_mailer/notify_group_when_instructeurs_removed.html.haml
@@ -0,0 +1,11 @@
+%p
+  Bonjour,
+
+%p
+  = t('administrateurs.groupe_instructeurs.notify_group_when_instructeurs_removed.email_body', count: @removed_instructeur_emails.size, emails: @removed_instructeur_emails.join(', '), groupe: @group.label, email: @current_instructeur_email, procedure: @group.procedure.libelle)
+
+%p
+  Cliquez sur le lien ci-dessous pour voir la liste des instructeurs de ce groupe :
+  = link_to(@group.label, admin_procedure_groupe_instructeur_url(@group.procedure, @group))
+
+= render partial: "layouts/mailers/signature"
diff --git a/app/views/groupe_instructeur_mailer/notify_removed_instructeurs.html.haml b/app/views/groupe_instructeur_mailer/notify_removed_instructeurs.html.haml
new file mode 100644
index 000000000..0ed0e9e49
--- /dev/null
+++ b/app/views/groupe_instructeur_mailer/notify_removed_instructeurs.html.haml
@@ -0,0 +1,7 @@
+%p
+  Bonjour,
+
+%p
+  = t('administrateurs.groupe_instructeurs.notify_removed_instructeurs.email_body', groupe: @group.label, email: @current_instructeur_email, procedure: @group.procedure.libelle)
+
+= render partial: "layouts/mailers/signature"
diff --git a/app/views/groupe_instructeur_mailer/remove_instructeur.html.haml b/app/views/groupe_instructeur_mailer/remove_instructeur.html.haml
deleted file mode 100644
index d541c0fd9..000000000
--- a/app/views/groupe_instructeur_mailer/remove_instructeur.html.haml
+++ /dev/null
@@ -1,7 +0,0 @@
-%p
-  Bonjour,
-
-%p
-  = t('administrateurs.groupe_instructeurs.remove_instructeur.email_body', groupe: @group.label, email: @current_instructeur_email, procedure: @group.procedure.libelle)
-
-= render partial: "layouts/mailers/signature"
diff --git a/app/views/groupe_instructeur_mailer/remove_instructeurs.html.haml b/app/views/groupe_instructeur_mailer/remove_instructeurs.html.haml
deleted file mode 100644
index 1d3b218da..000000000
--- a/app/views/groupe_instructeur_mailer/remove_instructeurs.html.haml
+++ /dev/null
@@ -1,11 +0,0 @@
-%p
-  Bonjour,
-
-%p
-  = t('administrateurs.groupe_instructeurs.remove_instructeurs.email_body', count: @removed_instructeur_emails.size, emails: @removed_instructeur_emails.join(', '), groupe: @group.label, email: @current_instructeur_email, procedure: @group.procedure.libelle)
-
-%p
-  Cliquez sur le lien ci-dessous pour voir la liste des instructeurs de ce groupe :
-  = link_to(@group.label, admin_procedure_groupe_instructeur_url(@group.procedure, @group))
-
-= render partial: "layouts/mailers/signature"
diff --git a/config/locales/views/administrateurs/groupe_instructeurs/en.yml b/config/locales/views/administrateurs/groupe_instructeurs/en.yml
index 7564938d2..49974b871 100644
--- a/config/locales/views/administrateurs/groupe_instructeurs/en.yml
+++ b/config/locales/views/administrateurs/groupe_instructeurs/en.yml
@@ -19,11 +19,11 @@ en:
         email_body:
           one: "The instructor %{emails} was assigned to the group « %{groupe} » by « %{email} », in charge of procedure « %{procedure} »."
           other: "The instructors %{emails} were assigned to the group « %{groupe} » by « %{email} », in charge of procedure « %{procedure} »."
-      remove_instructeurs:
+      notify_group_when_instructeurs_removed:
         email_body:
           one: "The instructor %{emails} was removed from the group « %{groupe} » by « %{email} », in charge of procedure « %{procedure} »."
           other: "The instructors %{emails} were removed from the group « %{groupe} » by « %{email} », in charge of procedure « %{procedure} »."
-      remove_instructeur:
+      notify_removed_instructeurs:
         email_body: "You were removed from the group « %{groupe} » by « %{email} », in charge of procedure « %{procedure} »."
       reaffecter_dossiers:
         existing_groupe:
diff --git a/config/locales/views/administrateurs/groupe_instructeurs/fr.yml b/config/locales/views/administrateurs/groupe_instructeurs/fr.yml
index f5f978ecf..07fa50d4e 100644
--- a/config/locales/views/administrateurs/groupe_instructeurs/fr.yml
+++ b/config/locales/views/administrateurs/groupe_instructeurs/fr.yml
@@ -25,11 +25,11 @@ fr:
         email_body:
           one: "L’instructeur %{emails} a été affecté au groupe « %{groupe} » par « %{email} », en charge de la démarche « %{procedure} »."
           other: "Les instructeurs %{emails} ont été affectés au groupe « %{groupe} » par « %{email} », en charge de la démarche « %{procedure} »."
-      remove_instructeurs:
+      notify_group_when_instructeurs_removed:
         email_body:
           one: "L’instructeur %{emails} a été retiré du groupe « %{groupe} » par « %{email} », en charge de la démarche « %{procedure} »."
           other: "Les instructeurs %{emails} ont été retirés du groupe « %{groupe} » par « %{email} », en charge de la démarche « %{procedure} »."
-      remove_instructeur:
+      notify_removed_instructeurs:
         email_body: "Vous avez été retiré du groupe « %{groupe} » par « %{email} », en charge de la démarche « %{procedure} »."
       reaffecter_dossiers:
         existing_groupe:
diff --git a/spec/controllers/administrateurs/groupe_instructeurs_controller_spec.rb b/spec/controllers/administrateurs/groupe_instructeurs_controller_spec.rb
index 3835696d2..6a585d51f 100644
--- a/spec/controllers/administrateurs/groupe_instructeurs_controller_spec.rb
+++ b/spec/controllers/administrateurs/groupe_instructeurs_controller_spec.rb
@@ -321,7 +321,7 @@ describe Administrateurs::GroupeInstructeursController, type: :controller do
 
     context 'when there are many instructeurs' do
       before do
-        allow(GroupeInstructeurMailer).to receive(:remove_instructeur)
+        allow(GroupeInstructeurMailer).to receive(:notify_removed_instructeurs)
           .and_return(double(deliver_later: true))
         remove_instructeur(admin.instructeur)
       end
@@ -330,7 +330,7 @@ describe Administrateurs::GroupeInstructeursController, type: :controller do
       it { expect(gi_1_1.reload.instructeurs.count).to eq(1) }
       it { expect(response).to redirect_to(admin_procedure_groupe_instructeur_path(procedure, gi_1_1)) }
       it "calls GroupeInstructeurMailer with the right groupe and instructeur" do
-        expect(GroupeInstructeurMailer).to have_received(:remove_instructeur).with(
+        expect(GroupeInstructeurMailer).to have_received(:notify_removed_instructeurs).with(
           gi_1_1,
           [admin.instructeur],
           admin.email
diff --git a/spec/mailers/groupe_instructeur_mailer_spec.rb b/spec/mailers/groupe_instructeur_mailer_spec.rb
index 94b8b06ff..424620b04 100644
--- a/spec/mailers/groupe_instructeur_mailer_spec.rb
+++ b/spec/mailers/groupe_instructeur_mailer_spec.rb
@@ -1,5 +1,5 @@
 RSpec.describe GroupeInstructeurMailer, type: :mailer do
-  describe '#remove_instructeurs' do
+  describe '#notify_group_when_instructeurs_removed' do
     let(:groupe_instructeur) do
       gi = GroupeInstructeur.create(label: 'gi1', procedure: create(:procedure))
       gi.instructeurs << create(:instructeur, email: 'int1@g')
@@ -13,13 +13,13 @@ RSpec.describe GroupeInstructeurMailer, type: :mailer do
     let(:instructeurs_to_remove) { [instructeur_3, instructeur_4] }
     let(:current_instructeur_email) { 'toto@email.com' }
 
-    subject { described_class.remove_instructeurs(groupe_instructeur, instructeurs_to_remove, current_instructeur_email) }
+    subject { described_class.notify_group_when_instructeurs_removed(groupe_instructeur, instructeurs_to_remove, current_instructeur_email) }
 
     it { expect(subject.body).to include('Les instructeurs int3@g, int4@g ont été retirés du groupe') }
     it { expect(subject.bcc).to include('int1@g', 'int2@g') }
   end
 
-  describe '#remove_instructeur' do
+  describe '#notify_removed_instructeurs' do
     let(:groupe_instructeur) do
       gi = GroupeInstructeur.create(label: 'gi1', procedure: create(:procedure))
       gi.instructeurs << create(:instructeur, email: 'int1@g')
@@ -33,7 +33,7 @@ RSpec.describe GroupeInstructeurMailer, type: :mailer do
     let(:instructeurs_to_remove) { [instructeur_3, instructeur_4] }
     let(:current_instructeur_email) { 'toto@email.com' }
 
-    subject { described_class.remove_instructeur(groupe_instructeur, instructeurs_to_remove, current_instructeur_email) }
+    subject { described_class.notify_removed_instructeurs(groupe_instructeur, instructeurs_to_remove, current_instructeur_email) }
 
     it { expect(subject.body).to include('ous avez été retiré du groupe « gi1 » par « toto@email.com »') }
     it { expect(subject.bcc).to match_array(['int3@g', 'int4@g']) }
diff --git a/spec/mailers/previews/groupe_instructeur_mailer_preview.rb b/spec/mailers/previews/groupe_instructeur_mailer_preview.rb
index 5a5f7ca30..a099a206a 100644
--- a/spec/mailers/previews/groupe_instructeur_mailer_preview.rb
+++ b/spec/mailers/previews/groupe_instructeur_mailer_preview.rb
@@ -4,7 +4,7 @@ class GroupeInstructeurMailerPreview < ActionMailer::Preview
     groupe = GroupeInstructeur.new(id: 1, label: 'Val-De-Marne', procedure:)
     current_instructeur_email = 'admin@dgfip.com'
     instructeurs = Instructeur.limit(2)
-    GroupeInstructeurMailer.remove_instructeurs(groupe, instructeurs, current_instructeur_email)
+    GroupeInstructeurMailer.notify_group_when_instructeurs_removed(groupe, instructeurs, current_instructeur_email)
   end
 
   def remove_instructeur

From a46faf8cdf07f6a376427f5016cae12399f74919 Mon Sep 17 00:00:00 2001
From: Eric Leroy-Terquem <eric.leroyterquem@beta.gouv.fr>
Date: Wed, 15 Feb 2023 11:57:35 +0100
Subject: [PATCH 059/202] feat(groupe instructeur mailer): make two kind of
 notifications for removed instructeur

---
 .../groupe_instructeurs_controller.rb         | 17 ++++----
 .../groupe_instructeurs_controller.rb         |  2 +-
 ...oupe_instructeur_supprimer_instructeurs.rb |  4 --
 app/mailers/groupe_instructeur_mailer.rb      | 13 ++++---
 .../notify_removed_instructeur.html.haml      |  8 ++++
 .../notify_removed_instructeurs.html.haml     |  7 ----
 .../groupe_instructeurs/en.yml                |  7 +++-
 .../groupe_instructeurs/fr.yml                |  7 +++-
 .../groupe_instructeurs_controller_spec.rb    |  6 +--
 .../mailers/groupe_instructeur_mailer_spec.rb | 39 +++++++++++++------
 10 files changed, 66 insertions(+), 44 deletions(-)
 create mode 100644 app/views/groupe_instructeur_mailer/notify_removed_instructeur.html.haml
 delete mode 100644 app/views/groupe_instructeur_mailer/notify_removed_instructeurs.html.haml

diff --git a/app/controllers/administrateurs/groupe_instructeurs_controller.rb b/app/controllers/administrateurs/groupe_instructeurs_controller.rb
index 1842174d8..6ac2e3205 100644
--- a/app/controllers/administrateurs/groupe_instructeurs_controller.rb
+++ b/app/controllers/administrateurs/groupe_instructeurs_controller.rb
@@ -146,19 +146,18 @@ module Administrateurs
         instructeur = groupe_instructeur.instructeurs.find_by(id: instructeur_id)
 
         if groupe_instructeur.remove(instructeur)
-          flash[:notice] = if procedure.routing_enabled?
-            GroupeInstructeurMailer
-              .notify_removed_instructeurs(groupe_instructeur, [instructeur], current_administrateur.email)
-              .deliver_later
-
-            GroupeInstructeurMailer
-              .notify_group_when_instructeurs_removed(groupe_instructeur, [instructeur], current_administrateur.email)
-              .deliver_later
-
+          flash[:notice] = if instructeur.in?(procedure.instructeurs)
             "L’instructeur « #{instructeur.email} » a été retiré du groupe."
           else
             "L’instructeur a bien été désaffecté de la démarche"
           end
+          GroupeInstructeurMailer
+            .notify_removed_instructeur(groupe_instructeur, instructeur, current_administrateur.email)
+            .deliver_later
+
+          GroupeInstructeurMailer
+            .notify_group_when_instructeurs_removed(groupe_instructeur, [instructeur], current_administrateur.email)
+            .deliver_later
         else
           flash[:alert] = if procedure.routing_enabled?
             if instructeur.present?
diff --git a/app/controllers/instructeurs/groupe_instructeurs_controller.rb b/app/controllers/instructeurs/groupe_instructeurs_controller.rb
index cfa180c22..631b37afc 100644
--- a/app/controllers/instructeurs/groupe_instructeurs_controller.rb
+++ b/app/controllers/instructeurs/groupe_instructeurs_controller.rb
@@ -35,7 +35,7 @@ module Instructeurs
         if groupe_instructeur.remove(instructeur)
           flash[:notice] = "L’instructeur « #{instructeur.email} » a été retiré du groupe."
           GroupeInstructeurMailer
-            .notify_removed_instructeurs(groupe_instructeur, [instructeur], current_user.email)
+            .notify_removed_instructeur(groupe_instructeur, instructeur, current_user.email)
             .deliver_later
 
           GroupeInstructeurMailer
diff --git a/app/graphql/mutations/groupe_instructeur_supprimer_instructeurs.rb b/app/graphql/mutations/groupe_instructeur_supprimer_instructeurs.rb
index ba41a870b..0c1b1617d 100644
--- a/app/graphql/mutations/groupe_instructeur_supprimer_instructeurs.rb
+++ b/app/graphql/mutations/groupe_instructeur_supprimer_instructeurs.rb
@@ -16,10 +16,6 @@ module Mutations
       groupe_instructeur.reload
 
       if groupe_instructeur.procedure.routing_enabled? && instructeurs.present?
-        GroupeInstructeurMailer
-          .notify_removed_instructeurs(groupe_instructeur, instructeurs, current_administrateur.email)
-          .deliver_later
-
         GroupeInstructeurMailer
           .notify_group_when_instructeurs_removed(groupe_instructeur, instructeurs, current_administrateur.email)
           .deliver_later
diff --git a/app/mailers/groupe_instructeur_mailer.rb b/app/mailers/groupe_instructeur_mailer.rb
index 821b41c03..fa438399d 100644
--- a/app/mailers/groupe_instructeur_mailer.rb
+++ b/app/mailers/groupe_instructeur_mailer.rb
@@ -12,13 +12,16 @@ class GroupeInstructeurMailer < ApplicationMailer
     mail(bcc: emails, subject: subject)
   end
 
-  def notify_removed_instructeurs(group, removed_instructeurs, current_instructeur_email)
-    removed_instructeur_emails = removed_instructeurs.map(&:email)
+  def notify_removed_instructeur(group, removed_instructeur, current_instructeur_email)
     @group = group
     @current_instructeur_email = current_instructeur_email
+    @still_assigned_to_procedure = removed_instructeur.in?(group.procedure.instructeurs)
+    subject = if @still_assigned_to_procedure
+      "Vous avez été retiré du groupe \"#{group.label}\" de la démarche \"#{group.procedure.libelle}\""
+    else
+      "Vous avez été désaffecté de la démarche \"#{group.procedure.libelle}\""
+    end
 
-    subject = "Vous avez été retiré du groupe \"#{group.label}\" de la démarche \"#{group.procedure.libelle}\""
-
-    mail(bcc: removed_instructeur_emails, subject: subject)
+    mail(to: removed_instructeur.email, subject: subject)
   end
 end
diff --git a/app/views/groupe_instructeur_mailer/notify_removed_instructeur.html.haml b/app/views/groupe_instructeur_mailer/notify_removed_instructeur.html.haml
new file mode 100644
index 000000000..e093dadcd
--- /dev/null
+++ b/app/views/groupe_instructeur_mailer/notify_removed_instructeur.html.haml
@@ -0,0 +1,8 @@
+%p
+  Bonjour,
+
+%p
+  - assignment_state = @still_assigned_to_procedure ? 'assigned' : 'unassigned'
+  = t("administrateurs.groupe_instructeurs.notify_removed_instructeur.#{assignment_state}.email_body", groupe: @group.label, email: @current_instructeur_email, procedure: @group.procedure.libelle)
+
+= render partial: "layouts/mailers/signature"
diff --git a/app/views/groupe_instructeur_mailer/notify_removed_instructeurs.html.haml b/app/views/groupe_instructeur_mailer/notify_removed_instructeurs.html.haml
deleted file mode 100644
index 0ed0e9e49..000000000
--- a/app/views/groupe_instructeur_mailer/notify_removed_instructeurs.html.haml
+++ /dev/null
@@ -1,7 +0,0 @@
-%p
-  Bonjour,
-
-%p
-  = t('administrateurs.groupe_instructeurs.notify_removed_instructeurs.email_body', groupe: @group.label, email: @current_instructeur_email, procedure: @group.procedure.libelle)
-
-= render partial: "layouts/mailers/signature"
diff --git a/config/locales/views/administrateurs/groupe_instructeurs/en.yml b/config/locales/views/administrateurs/groupe_instructeurs/en.yml
index 49974b871..49b54a6db 100644
--- a/config/locales/views/administrateurs/groupe_instructeurs/en.yml
+++ b/config/locales/views/administrateurs/groupe_instructeurs/en.yml
@@ -23,8 +23,11 @@ en:
         email_body:
           one: "The instructor %{emails} was removed from the group « %{groupe} » by « %{email} », in charge of procedure « %{procedure} »."
           other: "The instructors %{emails} were removed from the group « %{groupe} » by « %{email} », in charge of procedure « %{procedure} »."
-      notify_removed_instructeurs:
-        email_body: "You were removed from the group « %{groupe} » by « %{email} », in charge of procedure « %{procedure} »."
+      notify_removed_instructeur:
+        unassigned:
+          email_body: "You were unassigned from the procedure « %{procedure} » by « %{email} »."
+        assigned:
+          email_body: "You were removed from the group « %{groupe} » by « %{email} », in charge of procedure « %{procedure} »."
       reaffecter_dossiers:
         existing_groupe:
           one: "%{count} group exist"
diff --git a/config/locales/views/administrateurs/groupe_instructeurs/fr.yml b/config/locales/views/administrateurs/groupe_instructeurs/fr.yml
index 07fa50d4e..7ebd44c7d 100644
--- a/config/locales/views/administrateurs/groupe_instructeurs/fr.yml
+++ b/config/locales/views/administrateurs/groupe_instructeurs/fr.yml
@@ -29,8 +29,11 @@ fr:
         email_body:
           one: "L’instructeur %{emails} a été retiré du groupe « %{groupe} » par « %{email} », en charge de la démarche « %{procedure} »."
           other: "Les instructeurs %{emails} ont été retirés du groupe « %{groupe} » par « %{email} », en charge de la démarche « %{procedure} »."
-      notify_removed_instructeurs:
-        email_body: "Vous avez été retiré du groupe « %{groupe} » par « %{email} », en charge de la démarche « %{procedure} »."
+      notify_removed_instructeur:
+        assigned:
+          email_body: "Vous avez été retiré du groupe « %{groupe} » par « %{email} », en charge de la démarche « %{procedure} »."
+        unassigned:
+          email_body: "Vous avez été désaffecté de la démarche « %{procedure} » par « %{email} »."
       reaffecter_dossiers:
         existing_groupe:
           one: "%{count} groupe existe"
diff --git a/spec/controllers/administrateurs/groupe_instructeurs_controller_spec.rb b/spec/controllers/administrateurs/groupe_instructeurs_controller_spec.rb
index 6a585d51f..384a24756 100644
--- a/spec/controllers/administrateurs/groupe_instructeurs_controller_spec.rb
+++ b/spec/controllers/administrateurs/groupe_instructeurs_controller_spec.rb
@@ -321,7 +321,7 @@ describe Administrateurs::GroupeInstructeursController, type: :controller do
 
     context 'when there are many instructeurs' do
       before do
-        allow(GroupeInstructeurMailer).to receive(:notify_removed_instructeurs)
+        allow(GroupeInstructeurMailer).to receive(:notify_removed_instructeur)
           .and_return(double(deliver_later: true))
         remove_instructeur(admin.instructeur)
       end
@@ -330,9 +330,9 @@ describe Administrateurs::GroupeInstructeursController, type: :controller do
       it { expect(gi_1_1.reload.instructeurs.count).to eq(1) }
       it { expect(response).to redirect_to(admin_procedure_groupe_instructeur_path(procedure, gi_1_1)) }
       it "calls GroupeInstructeurMailer with the right groupe and instructeur" do
-        expect(GroupeInstructeurMailer).to have_received(:notify_removed_instructeurs).with(
+        expect(GroupeInstructeurMailer).to have_received(:notify_removed_instructeur).with(
           gi_1_1,
-          [admin.instructeur],
+          admin.instructeur,
           admin.email
         )
       end
diff --git a/spec/mailers/groupe_instructeur_mailer_spec.rb b/spec/mailers/groupe_instructeur_mailer_spec.rb
index 424620b04..6cf1ed75e 100644
--- a/spec/mailers/groupe_instructeur_mailer_spec.rb
+++ b/spec/mailers/groupe_instructeur_mailer_spec.rb
@@ -15,28 +15,45 @@ RSpec.describe GroupeInstructeurMailer, type: :mailer do
 
     subject { described_class.notify_group_when_instructeurs_removed(groupe_instructeur, instructeurs_to_remove, current_instructeur_email) }
 
+    before { instructeurs_to_remove.each { groupe_instructeur.remove(_1) } }
+
     it { expect(subject.body).to include('Les instructeurs int3@g, int4@g ont été retirés du groupe') }
-    it { expect(subject.bcc).to include('int1@g', 'int2@g') }
+    it { expect(subject.bcc).to match_array(['int1@g', 'int2@g']) }
   end
 
-  describe '#notify_removed_instructeurs' do
+  describe '#notify_removed_instructeur' do
+    let(:procedure) { create(:procedure) }
     let(:groupe_instructeur) do
-      gi = GroupeInstructeur.create(label: 'gi1', procedure: create(:procedure))
+      gi = GroupeInstructeur.create(label: 'gi1', procedure: procedure)
       gi.instructeurs << create(:instructeur, email: 'int1@g')
       gi.instructeurs << create(:instructeur, email: 'int2@g')
-      gi.instructeurs << instructeurs_to_remove
+      gi.instructeurs << instructeur_to_remove
       gi
     end
-    let(:instructeur_3) { create(:instructeur, email: 'int3@g') }
-    let(:instructeur_4) { create(:instructeur, email: 'int4@g') }
+    let(:instructeur_to_remove) { create(:instructeur, email: 'int3@g') }
 
-    let(:instructeurs_to_remove) { [instructeur_3, instructeur_4] }
     let(:current_instructeur_email) { 'toto@email.com' }
 
-    subject { described_class.notify_removed_instructeurs(groupe_instructeur, instructeurs_to_remove, current_instructeur_email) }
+    subject { described_class.notify_removed_instructeur(groupe_instructeur, instructeur_to_remove, current_instructeur_email) }
 
-    it { expect(subject.body).to include('ous avez été retiré du groupe « gi1 » par « toto@email.com »') }
-    it { expect(subject.bcc).to match_array(['int3@g', 'int4@g']) }
-    it { expect(subject.bcc).not_to match_array(['int1@g', 'int2@g']) }
+    before { groupe_instructeur.remove(instructeur_to_remove) }
+
+    context 'when instructeur is fully removed form procedure' do
+      it { expect(subject.body).to include('Vous avez été désaffecté de la démarche') }
+      it { expect(subject.to).to include('int3@g') }
+      it { expect(subject.to).not_to include('int1@g', 'int2@g') }
+    end
+
+    context 'when instructeur is removed from one group but still affected to procedure' do
+      let!(:groupe_instructeur_2) do
+        gi2 = GroupeInstructeur.create(label: 'gi2', procedure: procedure)
+        gi2.instructeurs << instructeur_to_remove
+        gi2
+      end
+
+      it { expect(subject.body).to include('Vous avez été retiré du groupe « gi1 » par « toto@email.com »') }
+      it { expect(subject.to).to include('int3@g') }
+      it { expect(subject.to).not_to include('int1@g', 'int2@g') }
+    end
   end
 end

From 4926fbff19e08b93bdcb7a0959b044bb73926b05 Mon Sep 17 00:00:00 2001
From: Eric Leroy-Terquem <eric.leroyterquem@beta.gouv.fr>
Date: Wed, 15 Feb 2023 13:59:10 +0100
Subject: [PATCH 060/202] fix(groupe instructeur mailer): fix mailers preview

---
 .../mailers/previews/groupe_instructeur_mailer_preview.rb | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/spec/mailers/previews/groupe_instructeur_mailer_preview.rb b/spec/mailers/previews/groupe_instructeur_mailer_preview.rb
index a099a206a..4eab9b7d7 100644
--- a/spec/mailers/previews/groupe_instructeur_mailer_preview.rb
+++ b/spec/mailers/previews/groupe_instructeur_mailer_preview.rb
@@ -1,5 +1,5 @@
 class GroupeInstructeurMailerPreview < ActionMailer::Preview
-  def remove_instructeurs
+  def notify_group_when_instructeurs_removed
     procedure = Procedure.new(id: 1, libelle: 'une superbe procedure')
     groupe = GroupeInstructeur.new(id: 1, label: 'Val-De-Marne', procedure:)
     current_instructeur_email = 'admin@dgfip.com'
@@ -7,11 +7,11 @@ class GroupeInstructeurMailerPreview < ActionMailer::Preview
     GroupeInstructeurMailer.notify_group_when_instructeurs_removed(groupe, instructeurs, current_instructeur_email)
   end
 
-  def remove_instructeur
+  def notify_removed_instructeur
     procedure = Procedure.new(id: 1, libelle: 'une superbe procedure')
     groupe = GroupeInstructeur.new(id: 1, label: 'Val-De-Marne', procedure:)
     current_instructeur_email = 'admin@dgfip.com'
-    instructeurs = Instructeur.limit(2)
-    GroupeInstructeurMailer.remove_instructeur(groupe, instructeurs, current_instructeur_email)
+    instructeur = Instructeur.last
+    GroupeInstructeurMailer.notify_removed_instructeur(groupe, instructeur, current_instructeur_email)
   end
 end

From cbe2dc9c2de7c69fcb3c9f6a711137aae986235c Mon Sep 17 00:00:00 2001
From: sebastiencarceles <sebastien.carceles@gmail.com>
Date: Mon, 23 Jan 2023 14:28:39 +0100
Subject: [PATCH 061/202] let the multiple drop down list be prefillable

---
 app/models/type_de_champ.rb        | 3 ++-
 spec/models/prefill_params_spec.rb | 6 ++++--
 spec/models/type_de_champ_spec.rb  | 4 ++--
 3 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/app/models/type_de_champ.rb b/app/models/type_de_champ.rb
index 0d9692fdc..354711ef2 100644
--- a/app/models/type_de_champ.rb
+++ b/app/models/type_de_champ.rb
@@ -262,13 +262,14 @@ class TypeDeChamp < ApplicationRecord
       TypeDeChamp.type_champs.fetch(:iban),
       TypeDeChamp.type_champs.fetch(:civilite),
       TypeDeChamp.type_champs.fetch(:pays),
+      TypeDeChamp.type_champs.fetch(:regions),
       TypeDeChamp.type_champs.fetch(:date),
       TypeDeChamp.type_champs.fetch(:datetime),
       TypeDeChamp.type_champs.fetch(:yes_no),
       TypeDeChamp.type_champs.fetch(:checkbox),
       TypeDeChamp.type_champs.fetch(:drop_down_list),
-      TypeDeChamp.type_champs.fetch(:regions),
       TypeDeChamp.type_champs.fetch(:departements),
+      TypeDeChamp.type_champs.fetch(:multiple_drop_down_list),
       TypeDeChamp.type_champs.fetch(:epci)
     ])
   end
diff --git a/spec/models/prefill_params_spec.rb b/spec/models/prefill_params_spec.rb
index b7e03b27b..ed3cfa001 100644
--- a/spec/models/prefill_params_spec.rb
+++ b/spec/models/prefill_params_spec.rb
@@ -128,6 +128,7 @@ RSpec.describe PrefillParams do
     it_behaves_like "a champ public value that is authorized", :iban, "value"
     it_behaves_like "a champ public value that is authorized", :civilite, "M."
     it_behaves_like "a champ public value that is authorized", :pays, "FR"
+    it_behaves_like "a champ public value that is authorized", :regions, "03"
     it_behaves_like "a champ public value that is authorized", :date, "2022-12-22"
     it_behaves_like "a champ public value that is authorized", :datetime, "2022-12-22T10:30"
     it_behaves_like "a champ public value that is authorized", :yes_no, "true"
@@ -135,8 +136,8 @@ RSpec.describe PrefillParams do
     it_behaves_like "a champ public value that is authorized", :checkbox, "true"
     it_behaves_like "a champ public value that is authorized", :checkbox, "false"
     it_behaves_like "a champ public value that is authorized", :drop_down_list, "value"
-    it_behaves_like "a champ public value that is authorized", :regions, "03"
     it_behaves_like "a champ public value that is authorized", :departements, "03"
+    it_behaves_like "a champ public value that is authorized", :multiple_drop_down_list, ["val1", "val2"]
     it_behaves_like "a champ public value that is authorized", :epci, ['01', '200042935']
 
     it_behaves_like "a champ private value that is authorized", :text, "value"
@@ -148,6 +149,7 @@ RSpec.describe PrefillParams do
     it_behaves_like "a champ private value that is authorized", :iban, "value"
     it_behaves_like "a champ private value that is authorized", :civilite, "M."
     it_behaves_like "a champ private value that is authorized", :pays, "FR"
+    it_behaves_like "a champ private value that is authorized", :regions, "93"
     it_behaves_like "a champ private value that is authorized", :date, "2022-12-22"
     it_behaves_like "a champ private value that is authorized", :datetime, "2022-12-22T10:30"
     it_behaves_like "a champ private value that is authorized", :yes_no, "true"
@@ -157,6 +159,7 @@ RSpec.describe PrefillParams do
     it_behaves_like "a champ private value that is authorized", :drop_down_list, "value"
     it_behaves_like "a champ private value that is authorized", :regions, "93"
     it_behaves_like "a champ private value that is authorized", :departements, "03"
+    it_behaves_like "a champ private value that is authorized", :multiple_drop_down_list, ["val1", "val2"]
     it_behaves_like "a champ private value that is authorized", :epci, ['01', '200042935']
 
     it_behaves_like "a champ public value that is unauthorized", :decimal_number, "non decimal string"
@@ -169,7 +172,6 @@ RSpec.describe PrefillParams do
     it_behaves_like "a champ public value that is unauthorized", :date, "value"
     it_behaves_like "a champ public value that is unauthorized", :datetime, "value"
     it_behaves_like "a champ public value that is unauthorized", :datetime, "12-22-2022T10:30"
-    it_behaves_like "a champ public value that is unauthorized", :multiple_drop_down_list, "value"
     it_behaves_like "a champ public value that is unauthorized", :linked_drop_down_list, "value"
     it_behaves_like "a champ public value that is unauthorized", :header_section, "value"
     it_behaves_like "a champ public value that is unauthorized", :explication, "value"
diff --git a/spec/models/type_de_champ_spec.rb b/spec/models/type_de_champ_spec.rb
index cbd34f501..785cf9e8f 100644
--- a/spec/models/type_de_champ_spec.rb
+++ b/spec/models/type_de_champ_spec.rb
@@ -246,18 +246,18 @@ describe TypeDeChamp do
     it_behaves_like "a prefillable type de champ", :type_de_champ_datetime
     it_behaves_like "a prefillable type de champ", :type_de_champ_civilite
     it_behaves_like "a prefillable type de champ", :type_de_champ_pays
+    it_behaves_like "a prefillable type de champ", :type_de_champ_regions
     it_behaves_like "a prefillable type de champ", :type_de_champ_yes_no
     it_behaves_like "a prefillable type de champ", :type_de_champ_checkbox
     it_behaves_like "a prefillable type de champ", :type_de_champ_drop_down_list
-    it_behaves_like "a prefillable type de champ", :type_de_champ_regions
     it_behaves_like "a prefillable type de champ", :type_de_champ_departements
+    it_behaves_like "a prefillable type de champ", :type_de_champ_multiple_drop_down_list
     it_behaves_like "a prefillable type de champ", :type_de_champ_epci
 
     it_behaves_like "a non-prefillable type de champ", :type_de_champ_number
     it_behaves_like "a non-prefillable type de champ", :type_de_champ_communes
     it_behaves_like "a non-prefillable type de champ", :type_de_champ_dossier_link
     it_behaves_like "a non-prefillable type de champ", :type_de_champ_titre_identite
-    it_behaves_like "a non-prefillable type de champ", :type_de_champ_multiple_drop_down_list
     it_behaves_like "a non-prefillable type de champ", :type_de_champ_linked_drop_down_list
     it_behaves_like "a non-prefillable type de champ", :type_de_champ_header_section
     it_behaves_like "a non-prefillable type de champ", :type_de_champ_explication

From d648ac31c2d25b7d18b2421c6e87583a263b908b Mon Sep 17 00:00:00 2001
From: sebastiencarceles <sebastien.carceles@gmail.com>
Date: Mon, 23 Jan 2023 14:14:44 +0100
Subject: [PATCH 062/202] add prefill decorator for multiple drop down list

---
 ...l_multiple_drop_down_list_type_de_champ.rb |  8 +++++
 .../types_de_champ/prefill_type_de_champ.rb   |  2 ++
 ...tiple_drop_down_list_type_de_champ_spec.rb | 32 +++++++++++++++++++
 .../prefill_type_de_champ_spec.rb             |  6 ++++
 4 files changed, 48 insertions(+)
 create mode 100644 app/models/types_de_champ/prefill_multiple_drop_down_list_type_de_champ.rb
 create mode 100644 spec/models/types_de_champ/prefill_multiple_drop_down_list_type_de_champ_spec.rb

diff --git a/app/models/types_de_champ/prefill_multiple_drop_down_list_type_de_champ.rb b/app/models/types_de_champ/prefill_multiple_drop_down_list_type_de_champ.rb
new file mode 100644
index 000000000..11992f53d
--- /dev/null
+++ b/app/models/types_de_champ/prefill_multiple_drop_down_list_type_de_champ.rb
@@ -0,0 +1,8 @@
+class TypesDeChamp::PrefillMultipleDropDownListTypeDeChamp < TypesDeChamp::PrefillDropDownListTypeDeChamp
+  def example_value
+    return nil if possible_values.empty?
+    return possible_values.first if possible_values.one?
+
+    [possible_values.first, possible_values.second]
+  end
+end
diff --git a/app/models/types_de_champ/prefill_type_de_champ.rb b/app/models/types_de_champ/prefill_type_de_champ.rb
index a385ea653..1dc57e46f 100644
--- a/app/models/types_de_champ/prefill_type_de_champ.rb
+++ b/app/models/types_de_champ/prefill_type_de_champ.rb
@@ -5,6 +5,8 @@ class TypesDeChamp::PrefillTypeDeChamp < SimpleDelegator
     case type_de_champ.type_champ
     when TypeDeChamp.type_champs.fetch(:drop_down_list)
       TypesDeChamp::PrefillDropDownListTypeDeChamp.new(type_de_champ)
+    when TypeDeChamp.type_champs.fetch(:multiple_drop_down_list)
+      TypesDeChamp::PrefillMultipleDropDownListTypeDeChamp.new(type_de_champ)
     when TypeDeChamp.type_champs.fetch(:pays)
       TypesDeChamp::PrefillPaysTypeDeChamp.new(type_de_champ)
     when TypeDeChamp.type_champs.fetch(:regions)
diff --git a/spec/models/types_de_champ/prefill_multiple_drop_down_list_type_de_champ_spec.rb b/spec/models/types_de_champ/prefill_multiple_drop_down_list_type_de_champ_spec.rb
new file mode 100644
index 000000000..d44fd1274
--- /dev/null
+++ b/spec/models/types_de_champ/prefill_multiple_drop_down_list_type_de_champ_spec.rb
@@ -0,0 +1,32 @@
+# frozen_string_literal: true
+
+RSpec.describe TypesDeChamp::PrefillMultipleDropDownListTypeDeChamp do
+  describe 'ancestors' do
+    subject { described_class.new(build(:type_de_champ_multiple_drop_down_list)) }
+
+    it { is_expected.to be_kind_of(TypesDeChamp::PrefillDropDownListTypeDeChamp) }
+  end
+
+  describe '#example_value' do
+    let(:type_de_champ) { build(:type_de_champ_multiple_drop_down_list, drop_down_list_value: drop_down_list_value) }
+    subject(:example_value) { described_class.new(type_de_champ).example_value }
+
+    context 'when the multiple drop down list has no option' do
+      let(:drop_down_list_value) { "" }
+
+      it { expect(example_value).to eq(nil) }
+    end
+
+    context 'when the multiple drop down list only has one option' do
+      let(:drop_down_list_value) { "value" }
+
+      it { expect(example_value).to eq("value") }
+    end
+
+    context 'when the multiple drop down list has two options or more' do
+      let(:drop_down_list_value) {  "value1\r\nvalue2\r\nvalue3" }
+
+      it { expect(example_value).to eq(["value1", "value2"]) }
+    end
+  end
+end
diff --git a/spec/models/types_de_champ/prefill_type_de_champ_spec.rb b/spec/models/types_de_champ/prefill_type_de_champ_spec.rb
index 7477b3789..3f892f907 100644
--- a/spec/models/types_de_champ/prefill_type_de_champ_spec.rb
+++ b/spec/models/types_de_champ/prefill_type_de_champ_spec.rb
@@ -10,6 +10,12 @@ RSpec.describe TypesDeChamp::PrefillTypeDeChamp, type: :model do
       it { expect(built).to be_kind_of(TypesDeChamp::PrefillDropDownListTypeDeChamp) }
     end
 
+    context 'when the type de champ is a multiple_drop_down_list' do
+      let(:type_de_champ) { build(:type_de_champ_multiple_drop_down_list) }
+
+      it { expect(built).to be_kind_of(TypesDeChamp::PrefillMultipleDropDownListTypeDeChamp) }
+    end
+
     context 'when the type de champ is a pays' do
       let(:type_de_champ) { build(:type_de_champ_pays) }
 

From d5ffd61ab65b3be8deb98dc39de5ca3bf36b421c Mon Sep 17 00:00:00 2001
From: sebastiencarceles <sebastien.carceles@gmail.com>
Date: Tue, 24 Jan 2023 15:10:25 +0100
Subject: [PATCH 063/202] validate values inclusion

---
 .../champs/multiple_drop_down_list_champ.rb   |  9 +++++
 app/models/prefill_params.rb                  |  1 +
 config/locales/en.yml                         |  4 ++
 config/locales/fr.yml                         |  4 ++
 .../instructeurs/dossiers_controller_spec.rb  |  6 +--
 spec/factories/champ.rb                       |  2 +-
 spec/models/champ_spec.rb                     |  6 +--
 .../multiple_drop_down_list_champ_spec.rb     | 38 +++++++++++++++++++
 spec/models/prefill_params_spec.rb            |  1 +
 9 files changed, 64 insertions(+), 7 deletions(-)
 create mode 100644 spec/models/champs/multiple_drop_down_list_champ_spec.rb

diff --git a/app/models/champs/multiple_drop_down_list_champ.rb b/app/models/champs/multiple_drop_down_list_champ.rb
index 365332e30..29ce06dcf 100644
--- a/app/models/champs/multiple_drop_down_list_champ.rb
+++ b/app/models/champs/multiple_drop_down_list_champ.rb
@@ -23,6 +23,8 @@
 class Champs::MultipleDropDownListChamp < Champ
   before_save :format_before_save
 
+  validate :values_are_in_options, if: -> { value.present? }
+
   def options?
     drop_down_list_options?
   end
@@ -90,4 +92,11 @@ class Champs::MultipleDropDownListChamp < Champ
       end
     end
   end
+
+  def values_are_in_options
+    return if (json = JSON.parse(value) - ['']).empty?
+    return if json.filter { |val| enabled_non_empty_options.exclude?(val) }.empty?
+
+    errors.add(:value, :not_in_options)
+  end
 end
diff --git a/app/models/prefill_params.rb b/app/models/prefill_params.rb
index f0841039a..4af3e8532 100644
--- a/app/models/prefill_params.rb
+++ b/app/models/prefill_params.rb
@@ -42,6 +42,7 @@ class PrefillParams
       TypeDeChamp.type_champs.fetch(:pays),
       TypeDeChamp.type_champs.fetch(:regions),
       TypeDeChamp.type_champs.fetch(:departements),
+      TypeDeChamp.type_champs.fetch(:multiple_drop_down_list),
       TypeDeChamp.type_champs.fetch(:epci)
     ]
 
diff --git a/config/locales/en.yml b/config/locales/en.yml
index fad29d059..e39221915 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -471,6 +471,10 @@ en:
           attributes:
             value:
               not_in_options: "must be in the given options"
+        "champs/multiple_drop_down_list_champ":
+          attributes:
+            value:
+              not_in_options: "must be in the given options"
         "champs/region_champ":
           attributes:
             value:
diff --git a/config/locales/fr.yml b/config/locales/fr.yml
index b1492cc79..ef2e6ab19 100644
--- a/config/locales/fr.yml
+++ b/config/locales/fr.yml
@@ -466,6 +466,10 @@ fr:
           attributes:
             value:
               not_in_options: "doit être dans les options proposées"
+        "champs/multiple_drop_down_list_champ":
+          attributes:
+            value:
+              not_in_options: "doit être dans les options proposées"
         "champs/region_champ":
           attributes:
             value:
diff --git a/spec/controllers/instructeurs/dossiers_controller_spec.rb b/spec/controllers/instructeurs/dossiers_controller_spec.rb
index 990b3a29c..b6e1af036 100644
--- a/spec/controllers/instructeurs/dossiers_controller_spec.rb
+++ b/spec/controllers/instructeurs/dossiers_controller_spec.rb
@@ -792,7 +792,7 @@ describe Instructeurs::DossiersController, type: :controller do
             champs_private_attributes: {
               '0': {
                 id: champ_multiple_drop_down_list.id,
-                value: ['', 'un', 'deux']
+                value: ['', 'val1', 'val2']
               },
               '1': {
                 id: champ_datetime.id,
@@ -813,7 +813,7 @@ describe Instructeurs::DossiersController, type: :controller do
       end
 
       it {
-        expect(champ_multiple_drop_down_list.value).to eq('["un", "deux"]')
+        expect(champ_multiple_drop_down_list.value).to eq('["val1", "val2"]')
         expect(champ_linked_drop_down_list.primary_value).to eq('primary')
         expect(champ_linked_drop_down_list.secondary_value).to eq('secondary')
         expect(champ_datetime.value).to eq('2019-12-21T13:17:00+01:00')
@@ -839,7 +839,7 @@ describe Instructeurs::DossiersController, type: :controller do
             champs_public_attributes: {
               '0': {
                 id: champ_multiple_drop_down_list.id,
-                value: ['', 'un', 'deux']
+                value: ['', 'val1', 'val2']
               }
             }
           }
diff --git a/spec/factories/champ.rb b/spec/factories/champ.rb
index 253247a8e..d1f4448f8 100644
--- a/spec/factories/champ.rb
+++ b/spec/factories/champ.rb
@@ -97,7 +97,7 @@ FactoryBot.define do
 
     factory :champ_multiple_drop_down_list, class: 'Champs::MultipleDropDownListChamp' do
       type_de_champ { association :type_de_champ_multiple_drop_down_list, procedure: dossier.procedure }
-      value { '["choix 1", "choix 2"]' }
+      value { '["val1", "val2"]' }
     end
 
     factory :champ_linked_drop_down_list, class: 'Champs::LinkedDropDownListChamp' do
diff --git a/spec/models/champ_spec.rb b/spec/models/champ_spec.rb
index bec9c3097..7cad128a7 100644
--- a/spec/models/champ_spec.rb
+++ b/spec/models/champ_spec.rb
@@ -117,7 +117,7 @@ describe Champ do
     # when using the old form, and the ChampsService Class
     # TODO: to remove
     context 'when the value is already deserialized' do
-      let(:value) { '["1", "2"]' }
+      let(:value) { '["val1", "val2"]' }
 
       it { expect(champ.value).to eq(value) }
 
@@ -133,9 +133,9 @@ describe Champ do
     # GOTCHA
     context 'when the value is not already deserialized' do
       context 'when a choice is selected' do
-        let(:value) { '["", "1", "2"]' }
+        let(:value) { '["", "val1", "val2"]' }
 
-        it { expect(champ.value).to eq('["1", "2"]') }
+        it { expect(champ.value).to eq('["val1", "val2"]') }
       end
 
       context 'when all choices are removed' do
diff --git a/spec/models/champs/multiple_drop_down_list_champ_spec.rb b/spec/models/champs/multiple_drop_down_list_champ_spec.rb
new file mode 100644
index 000000000..08a78c77c
--- /dev/null
+++ b/spec/models/champs/multiple_drop_down_list_champ_spec.rb
@@ -0,0 +1,38 @@
+describe Champs::MultipleDropDownListChamp do
+  describe 'validations' do
+    describe 'inclusion' do
+      let(:type_de_champ) { build(:type_de_champ_multiple_drop_down_list, drop_down_list_value: "val1\r\nval2\r\nval3") }
+      subject { build(:champ_multiple_drop_down_list, type_de_champ:, value:) }
+
+      context 'when the value is nil' do
+        let(:value) { nil }
+
+        it { is_expected.to be_valid }
+      end
+
+      context 'when the value is an empty string' do
+        let(:value) { '' }
+
+        it { is_expected.to be_valid }
+      end
+
+      context 'when the value is an empty array' do
+        let(:value) { [] }
+
+        it { is_expected.to be_valid }
+      end
+
+      context 'when the value is included in the option list' do
+        let(:value) { ["val3", "val1"] }
+
+        it { is_expected.to be_valid }
+      end
+
+      context 'when the value is not included in the option list' do
+        let(:value) { ["totoro", "val1"] }
+
+        it { is_expected.not_to be_valid }
+      end
+    end
+  end
+end
diff --git a/spec/models/prefill_params_spec.rb b/spec/models/prefill_params_spec.rb
index ed3cfa001..bf9378ae0 100644
--- a/spec/models/prefill_params_spec.rb
+++ b/spec/models/prefill_params_spec.rb
@@ -189,6 +189,7 @@ RSpec.describe PrefillParams do
     it_behaves_like "a champ public value that is unauthorized", :siret, "value"
     it_behaves_like "a champ public value that is unauthorized", :rna, "value"
     it_behaves_like "a champ public value that is unauthorized", :annuaire_education, "value"
+    it_behaves_like "a champ public value that is unauthorized", :multiple_drop_down_list, ["value"]
   end
 
   private

From a3ca79076ea7908ff45826f89a884cccdbc383b9 Mon Sep 17 00:00:00 2001
From: sebastiencarceles <sebastien.carceles@gmail.com>
Date: Tue, 24 Jan 2023 11:44:02 +0100
Subject: [PATCH 064/202] cover the use case with feature specs

---
 .../shared_examples_for_prefilled_dossier.rb  |  3 ++
 spec/system/users/dossier_prefill_get_spec.rb | 36 ++++++++++---------
 .../system/users/dossier_prefill_post_spec.rb |  8 +++++
 3 files changed, 31 insertions(+), 16 deletions(-)

diff --git a/spec/support/shared_examples_for_prefilled_dossier.rb b/spec/support/shared_examples_for_prefilled_dossier.rb
index 5ed67c49c..5cd01bd2e 100644
--- a/spec/support/shared_examples_for_prefilled_dossier.rb
+++ b/spec/support/shared_examples_for_prefilled_dossier.rb
@@ -19,6 +19,9 @@ shared_examples "the user has got a prefilled dossier, owned by themselves" do
     expect(page).to have_field(type_de_champ_phone.libelle, with: phone_value)
     expect(page).to have_css('label', text: type_de_champ_phone.libelle)
     expect(page).to have_field(type_de_champ_datetime.libelle, with: datetime_value)
+    expect(page).to have_css('label', text: type_de_champ_multiple_drop_down_list.libelle)
+    expect(page).to have_content(multiple_drop_down_list_values.first)
+    expect(page).to have_content(multiple_drop_down_list_values.last)
     expect(page).to have_field(type_de_champ_epci.libelle, with: epci_value.last)
   end
 end
diff --git a/spec/system/users/dossier_prefill_get_spec.rb b/spec/system/users/dossier_prefill_get_spec.rb
index 41fc21403..2e0523bfd 100644
--- a/spec/system/users/dossier_prefill_get_spec.rb
+++ b/spec/system/users/dossier_prefill_get_spec.rb
@@ -9,12 +9,30 @@ describe 'Prefilling a dossier (with a GET request):' do
   let(:type_de_champ_text) { create(:type_de_champ_text, procedure: procedure) }
   let(:type_de_champ_phone) { create(:type_de_champ_phone, procedure: procedure) }
   let(:type_de_champ_datetime) { create(:type_de_champ_datetime, procedure: procedure) }
+  let(:type_de_champ_multiple_drop_down_list) { create(:type_de_champ_multiple_drop_down_list, procedure: procedure) }
   let(:type_de_champ_epci) { create(:type_de_champ_epci, procedure: procedure) }
   let(:text_value) { "My Neighbor Totoro is the best movie ever" }
   let(:phone_value) { "invalid phone value" }
   let(:datetime_value) { "2023-02-01T10:32" }
+  let(:multiple_drop_down_list_values) {
+    [
+      type_de_champ_multiple_drop_down_list.drop_down_list_enabled_non_empty_options.first,
+      type_de_champ_multiple_drop_down_list.drop_down_list_enabled_non_empty_options.last
+    ]
+  }
   let(:epci_value) { ['01', '200029999'] }
 
+  let(:entry_path) {
+    commencer_path(
+      path: procedure.path,
+      "champ_#{type_de_champ_text.to_typed_id}" => text_value,
+      "champ_#{type_de_champ_phone.to_typed_id}" => phone_value,
+      "champ_#{type_de_champ_datetime.to_typed_id}" => datetime_value,
+      "champ_#{type_de_champ_multiple_drop_down_list.to_typed_id}" => multiple_drop_down_list_values,
+      "champ_#{type_de_champ_epci.to_typed_id}" => epci_value
+    )
+  }
+
   before do
     allow(Rails).to receive(:cache).and_return(memory_store)
     Rails.cache.clear
@@ -36,13 +54,7 @@ describe 'Prefilling a dossier (with a GET request):' do
         visit "/users/sign_in"
         sign_in_with user.email, password
 
-        visit commencer_path(
-          path: procedure.path,
-          "champ_#{type_de_champ_text.to_typed_id}" => text_value,
-          "champ_#{type_de_champ_phone.to_typed_id}" => phone_value,
-          "champ_#{type_de_champ_datetime.to_typed_id}" => datetime_value,
-          "champ_#{type_de_champ_epci.to_typed_id}" => epci_value
-        )
+        visit entry_path
 
         click_on "Poursuivre mon dossier prérempli"
       end
@@ -50,15 +62,7 @@ describe 'Prefilling a dossier (with a GET request):' do
   end
 
   context 'when unauthenticated' do
-    before do
-      visit commencer_path(
-        path: procedure.path,
-        "champ_#{type_de_champ_text.to_typed_id}" => text_value,
-        "champ_#{type_de_champ_phone.to_typed_id}" => phone_value,
-        "champ_#{type_de_champ_datetime.to_typed_id}" => datetime_value,
-        "champ_#{type_de_champ_epci.to_typed_id}" => epci_value
-      )
-    end
+    before { visit entry_path }
 
     context 'when the user signs in with email and password' do
       it_behaves_like "the user has got a prefilled dossier, owned by themselves" do
diff --git a/spec/system/users/dossier_prefill_post_spec.rb b/spec/system/users/dossier_prefill_post_spec.rb
index c0eaa03fe..454919e67 100644
--- a/spec/system/users/dossier_prefill_post_spec.rb
+++ b/spec/system/users/dossier_prefill_post_spec.rb
@@ -9,10 +9,17 @@ describe 'Prefilling a dossier (with a POST request):' do
   let(:type_de_champ_text) { create(:type_de_champ_text, procedure: procedure) }
   let(:type_de_champ_phone) { create(:type_de_champ_phone, procedure: procedure) }
   let(:type_de_champ_datetime) { create(:type_de_champ_datetime, procedure: procedure) }
+  let(:type_de_champ_multiple_drop_down_list) { create(:type_de_champ_multiple_drop_down_list, procedure: procedure) }
   let(:type_de_champ_epci) { create(:type_de_champ_epci, procedure: procedure) }
   let(:text_value) { "My Neighbor Totoro is the best movie ever" }
   let(:phone_value) { "invalid phone value" }
   let(:datetime_value) { "2023-02-01T10:32" }
+  let(:multiple_drop_down_list_values) {
+    [
+      type_de_champ_multiple_drop_down_list.drop_down_list_enabled_non_empty_options.first,
+      type_de_champ_multiple_drop_down_list.drop_down_list_enabled_non_empty_options.last
+    ]
+  }
   let(:epci_value) { ['01', '200029999'] }
 
   before do
@@ -116,6 +123,7 @@ describe 'Prefilling a dossier (with a POST request):' do
         "champ_#{type_de_champ_text.to_typed_id}" => text_value,
         "champ_#{type_de_champ_phone.to_typed_id}" => phone_value,
         "champ_#{type_de_champ_datetime.to_typed_id}" => datetime_value,
+        "champ_#{type_de_champ_multiple_drop_down_list.to_typed_id}" => multiple_drop_down_list_values,
         "champ_#{type_de_champ_epci.to_typed_id}" => epci_value
       }.to_json
     JSON.parse(session.response.body)["dossier_url"].gsub("http://www.example.com", "")

From e344b97d51927c84f17a2ce819e9b6e7258f8301 Mon Sep 17 00:00:00 2001
From: sebastiencarceles <sebastien.carceles@gmail.com>
Date: Thu, 26 Jan 2023 10:51:54 +0100
Subject: [PATCH 065/202] review: readability

---
 app/models/champs/multiple_drop_down_list_champ.rb | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/app/models/champs/multiple_drop_down_list_champ.rb b/app/models/champs/multiple_drop_down_list_champ.rb
index 29ce06dcf..4f14f197b 100644
--- a/app/models/champs/multiple_drop_down_list_champ.rb
+++ b/app/models/champs/multiple_drop_down_list_champ.rb
@@ -94,8 +94,9 @@ class Champs::MultipleDropDownListChamp < Champ
   end
 
   def values_are_in_options
-    return if (json = JSON.parse(value) - ['']).empty?
-    return if json.filter { |val| enabled_non_empty_options.exclude?(val) }.empty?
+    json = JSON.parse(value).reject(&:blank?)
+    return if json.empty?
+    return if (json - enabled_non_empty_options).empty?
 
     errors.add(:value, :not_in_options)
   end

From 8c67df71305315d28d55e93c11d928e9ba95ec30 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=A9bastien=20Carceles?=
 <sebastien.carceles@beta.gouv.fr>
Date: Wed, 15 Feb 2023 12:17:28 +0100
Subject: [PATCH 066/202] review: use selected options

Co-authored-by: Paul Chavard <paul.chavard@beta.gouv.fr>
---
 app/models/champs/multiple_drop_down_list_champ.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/models/champs/multiple_drop_down_list_champ.rb b/app/models/champs/multiple_drop_down_list_champ.rb
index 4f14f197b..4e041fd0b 100644
--- a/app/models/champs/multiple_drop_down_list_champ.rb
+++ b/app/models/champs/multiple_drop_down_list_champ.rb
@@ -94,7 +94,7 @@ class Champs::MultipleDropDownListChamp < Champ
   end
 
   def values_are_in_options
-    json = JSON.parse(value).reject(&:blank?)
+    json = selected_options.reject(&:blank?)
     return if json.empty?
     return if (json - enabled_non_empty_options).empty?
 

From c0ad7853cb41fe0430083daf40824aafd3b43e2c Mon Sep 17 00:00:00 2001
From: Paul Chavard <pro@paul.chavard.net>
Date: Thu, 9 Feb 2023 14:39:33 +0100
Subject: [PATCH 067/202] fix(administrateur): procedure page n+1

---
 .../administrateurs/procedures_controller.rb  | 46 +++++++++++++++++--
 .../concerns/tags_substitution_concern.rb     |  4 +-
 app/models/procedure.rb                       | 15 +++---
 app/models/procedure_revision.rb              | 23 +++++++---
 app/validators/tags_validator.rb              | 22 ++++-----
 spec/models/type_de_champ_spec.rb             |  2 +-
 6 files changed, 83 insertions(+), 29 deletions(-)

diff --git a/app/controllers/administrateurs/procedures_controller.rb b/app/controllers/administrateurs/procedures_controller.rb
index c206b3724..e81a3a42c 100644
--- a/app/controllers/administrateurs/procedures_controller.rb
+++ b/app/controllers/administrateurs/procedures_controller.rb
@@ -96,8 +96,20 @@ module Administrateurs
       @procedure = current_administrateur
         .procedures
         .includes(
-          published_revision: :types_de_champ,
-          draft_revision: :types_de_champ
+          published_revision: {
+            types_de_champ: [],
+            revision_types_de_champ: { type_de_champ: { piece_justificative_template_attachment: :blob } }
+          },
+          draft_revision: {
+            types_de_champ: [],
+            revision_types_de_champ: { type_de_champ: { piece_justificative_template_attachment: :blob } }
+          },
+          attestation_template: [],
+          initiated_mail: [],
+          received_mail: [],
+          closed_mail: [],
+          refused_mail: [],
+          without_continuation_mail: []
         )
         .find(params[:id])
 
@@ -332,7 +344,35 @@ module Administrateurs
     end
 
     def champs
-      @procedure = Procedure.includes(draft_revision: { revision_types_de_champ_public: :type_de_champ }).find(@procedure.id)
+      @procedure = Procedure.includes(draft_revision: {
+        revision_types_de_champ: {
+          type_de_champ: { piece_justificative_template_attachment: :blob, revision: [], procedure: [] },
+          revision: [],
+          procedure: []
+        },
+        revision_types_de_champ_public: {
+          type_de_champ: { piece_justificative_template_attachment: :blob, revision: [], procedure: [] },
+          revision: [],
+          procedure: []
+        },
+        procedure: []
+      }).find(@procedure.id)
+    end
+
+    def annotations
+      @procedure = Procedure.includes(draft_revision: {
+        revision_types_de_champ: {
+          type_de_champ: { piece_justificative_template_attachment: :blob, revision: [], procedure: [] },
+          revision: [],
+          procedure: []
+        },
+        revision_types_de_champ_private: {
+          type_de_champ: { piece_justificative_template_attachment: :blob, revision: [], procedure: [] },
+          revision: [],
+          procedure: []
+        },
+        procedure: []
+      }).find(@procedure.id)
     end
 
     def detail
diff --git a/app/models/concerns/tags_substitution_concern.rb b/app/models/concerns/tags_substitution_concern.rb
index 972882f5b..86f5f1100 100644
--- a/app/models/concerns/tags_substitution_concern.rb
+++ b/app/models/concerns/tags_substitution_concern.rb
@@ -270,12 +270,12 @@ module TagsSubstitutionConcern
   end
 
   def champ_public_tags(dossier: nil)
-    types_de_champ = (dossier || procedure.active_revision).types_de_champ_public.not_condition
+    types_de_champ = (dossier || procedure.active_revision).types_de_champ_public.filter { !_1.condition? }
     types_de_champ_tags(types_de_champ, Dossier::SOUMIS)
   end
 
   def champ_private_tags(dossier: nil)
-    types_de_champ = (dossier || procedure.active_revision).types_de_champ_private.not_condition
+    types_de_champ = (dossier || procedure.active_revision).types_de_champ_private.filter { !_1.condition? }
     types_de_champ_tags(types_de_champ, Dossier::INSTRUCTION_COMMENCEE)
   end
 
diff --git a/app/models/procedure.rb b/app/models/procedure.rb
index b6ef52750..8e8515bd6 100644
--- a/app/models/procedure.rb
+++ b/app/models/procedure.rb
@@ -173,12 +173,15 @@ class Procedure < ApplicationRecord
     types_de_champ_for_tags.private_only
   end
 
-  def revision_ids_with_pending_dossiers
-    dossiers
-      .where.not(revision_id: [draft_revision_id, published_revision_id].compact)
-      .state_en_construction_ou_instruction
-      .distinct(:revision_id)
-      .pluck(:revision_id)
+  def revisions_with_pending_dossiers
+    @revisions_with_pending_dossiers ||= begin
+      ids = dossiers
+        .where.not(revision_id: [draft_revision_id, published_revision_id].compact)
+        .state_en_construction_ou_instruction
+        .distinct(:revision_id)
+        .pluck(:revision_id)
+      ProcedureRevision.includes(revision_types_de_champ: [:type_de_champ]).where(id: ids)
+    end
   end
 
   has_many :administrateurs_procedures, dependent: :delete_all
diff --git a/app/models/procedure_revision.rb b/app/models/procedure_revision.rb
index 7e94d0595..ff3e587b5 100644
--- a/app/models/procedure_revision.rb
+++ b/app/models/procedure_revision.rb
@@ -132,7 +132,7 @@ class ProcedureRevision < ApplicationRecord
   end
 
   def draft?
-    procedure.draft_revision == self
+    procedure.draft_revision_id == id
   end
 
   def locked?
@@ -172,11 +172,22 @@ class ProcedureRevision < ApplicationRecord
   end
 
   def children_of(tdc)
-    parent_coordinate_id = revision_types_de_champ.where(type_de_champ: tdc).select(:id)
+    if revision_types_de_champ.loaded?
+      parent_coordinate_id = revision_types_de_champ
+        .filter { _1.type_de_champ_id == tdc.id }
+        .map(&:id)
 
-    types_de_champ
-      .where(procedure_revision_types_de_champ: { parent_id: parent_coordinate_id })
-      .order("procedure_revision_types_de_champ.position")
+      revision_types_de_champ
+        .filter { _1.parent_id.in?(parent_coordinate_id) }
+        .sort_by(&:position)
+        .map(&:type_de_champ)
+    else
+      parent_coordinate_id = revision_types_de_champ.where(type_de_champ: tdc).select(:id)
+
+      types_de_champ
+        .where(procedure_revision_types_de_champ: { parent_id: parent_coordinate_id })
+        .order("procedure_revision_types_de_champ.position")
+    end
   end
 
   def remove_children_of(tdc)
@@ -380,7 +391,7 @@ class ProcedureRevision < ApplicationRecord
 
     public_tdcs
       .map.with_index
-      .filter_map { |tdc, i| tdc.condition.present? ? [tdc, i] : nil }
+      .filter_map { |tdc, i| tdc.condition? ? [tdc, i] : nil }
       .map { |tdc, i| [tdc, tdc.condition.errors(public_tdcs.take(i))] }
       .filter { |_tdc, errors| errors.present? }
       .each { |tdc, message| errors.add(:condition, message, type_de_champ: tdc) }
diff --git a/app/validators/tags_validator.rb b/app/validators/tags_validator.rb
index b8f3520aa..4b55c5cf9 100644
--- a/app/validators/tags_validator.rb
+++ b/app/validators/tags_validator.rb
@@ -7,18 +7,18 @@ class TagsValidator < ActiveModel::EachValidator
       tag if stable_id.nil?
     end
 
-    invalid_for_draft_revision = invalid_tags_for_revision(record, attribute, tags, procedure.draft_revision_id)
+    invalid_for_draft_revision = invalid_tags_for_revision(record, attribute, tags, procedure.draft_revision)
 
     invalid_for_published_revision = if procedure.published_revision_id.present?
-      invalid_tags_for_revision(record, attribute, tags, procedure.published_revision_id)
+      invalid_tags_for_revision(record, attribute, tags, procedure.published_revision)
     else
       []
     end
 
     invalid_for_previous_revision = procedure
-      .revision_ids_with_pending_dossiers
-      .flat_map do |revision_id|
-        invalid_tags_for_revision(record, attribute, tags, revision_id)
+      .revisions_with_pending_dossiers
+      .flat_map do |revision|
+        invalid_tags_for_revision(record, attribute, tags, revision)
       end.uniq
 
     # champ is added in draft revision but not yet published
@@ -48,12 +48,12 @@ class TagsValidator < ActiveModel::EachValidator
     end
   end
 
-  def invalid_tags_for_revision(record, attribute, tags, revision_id)
-    revision_stable_ids = TypeDeChamp
-      .joins(:revision_types_de_champ)
-      .where(procedure_revision_types_de_champ: { revision_id: revision_id, parent_id: nil })
-      .distinct(:stable_id)
-      .pluck(:stable_id)
+  def invalid_tags_for_revision(record, attribute, tags, revision)
+    revision_stable_ids = revision
+      .revision_types_de_champ
+      .filter { !_1.child? }
+      .map(&:stable_id)
+      .uniq
 
     tags.filter_map do |(tag, stable_id)|
       if stable_id.present? && !stable_id.in?(revision_stable_ids)
diff --git a/spec/models/type_de_champ_spec.rb b/spec/models/type_de_champ_spec.rb
index 785cf9e8f..d7f5c5502 100644
--- a/spec/models/type_de_champ_spec.rb
+++ b/spec/models/type_de_champ_spec.rb
@@ -95,7 +95,7 @@ describe TypeDeChamp do
         let(:target_type_champ) { TypeDeChamp.type_champs.fetch(:text) }
 
         it 'removes the children types de champ' do
-          expect(procedure.draft_revision.children_of(tdc)).to be_empty
+          expect(procedure.draft_revision.reload.children_of(tdc)).to be_empty
         end
       end
     end

From 0e5deda86c16b2caeb553d4d387742f6868e8fb1 Mon Sep 17 00:00:00 2001
From: Julie Salha <julie.salha@gmail.com>
Date: Tue, 14 Feb 2023 13:11:00 +0100
Subject: [PATCH 068/202] add scrolling functionnality for description
 procedure

---
 app/assets/stylesheets/procedure_context.scss |  2 +-
 .../shared/_procedure_description.html.haml   |  2 +-
 config/locales/en.yml                         | 20 +++----------------
 config/locales/fr.yml                         | 20 +++----------------
 4 files changed, 8 insertions(+), 36 deletions(-)

diff --git a/app/assets/stylesheets/procedure_context.scss b/app/assets/stylesheets/procedure_context.scss
index ee5a96010..e2f220fd3 100644
--- a/app/assets/stylesheets/procedure_context.scss
+++ b/app/assets/stylesheets/procedure_context.scss
@@ -100,7 +100,7 @@ $procedure-description-line-height: 22px;
       // If the text exceeds the max-height,
       // truncate it and displays the "Read more" button.
       &.read-more-enabled {
-        overflow: hidden;
+        overflow: auto;
         border-bottom: 1px solid $border-grey;
 
         + .read-more-button {
diff --git a/app/views/shared/_procedure_description.html.haml b/app/views/shared/_procedure_description.html.haml
index e10d4607f..6500210d7 100644
--- a/app/views/shared/_procedure_description.html.haml
+++ b/app/views/shared/_procedure_description.html.haml
@@ -22,6 +22,6 @@
     %p Vous pouvez déposer vos dossiers jusqu’au #{procedure_auto_archive_datetime(procedure)}.
 
 .procedure-description
-  .procedure-description-body.read-more-enabled.read-more-collapsed
+  .procedure-description-body.read-more-enabled.read-more-collapsed{ tabindex: "0", role: "region", "aria-label": t('views.users.dossiers.identite.description') }
     = h string_to_html(procedure.description, allow_a: true)
   = button_tag "Afficher la description complète", class: 'button read-more-button'
diff --git a/config/locales/en.yml b/config/locales/en.yml
index e39221915..dcd81f16a 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -68,6 +68,7 @@ en:
         are_you_new: First time on %{app_name}?
     my_account: My account
     header:
+      label_modal: "Burger menu"
       close_modal: 'Close'
       back: "Back"
       back_title: "Revenir sur le site de mon administration"
@@ -92,13 +93,11 @@ en:
         existing_dossiers: You already have files for this procedure
         show_dossiers: View my current files
         prefilled_draft: "You have a prefilled file"
-        prefilled_draft_detail_html: "You are ready to continue a prefilled file for the \"%{procedure}\" procedure, started <strong>%{time_ago} ago</strong>."
-        prefill_dossier_detail_html: "You are ready to continue a prefilled file for the \"%{procedure}\" procedure."
+        prefilled_draft_detail_html: "You prefilled a file for the \"%{procedure}\" procedure <strong>%{time_ago} ago</strong>"
         already_draft: "You already started to fill a file"
         already_draft_detail_html: "You started to fill a file for the \"%{procedure}\" procedure <strong>%{time_ago} ago</strong>"
         already_not_draft: "You already submitted a file"
         already_not_draft_detail_html: "You submitted a file for the \"%{procedure}\" procedure <strong>%{time_ago} ago</strong>."
-        go_to_prefilled_file: 'Continue to fill my prefilled file'
         continue_file: "Continue to fill my file"
         start_new_file: "Start a new file"
         show_my_submitted_file: 'Show my submitted file'
@@ -146,7 +145,6 @@ en:
           iban: FR7611315000011234567890138
           yes_no: "true"
           pays: "FR"
-          departements: "56"
           regions: "53"
           date: "2023-02-01"
           datetime: "2023-02-01T10:30"
@@ -265,6 +263,7 @@ en:
           identity_data: Identity data
           all_required: All fields are required.
           civility: Civility
+          description: Description of the procedure
           first_name: First Name
           last_name: Last Name
           birthdate: Date de naissance
@@ -397,19 +396,6 @@ en:
         zone: This procedure is run by
       champs:
         value: Value
-      default_mail_attributes: &default_mail_attributes
-        hints:
-          subject: The generated subject will be truncated if it exceeds 100 characters.
-      mails/closed_mail:
-        << : *default_mail_attributes
-      mails/initiated_mail:
-        << : *default_mail_attributes
-      mails/received_mail:
-        << : *default_mail_attributes
-      mails/refused_mail:
-        << : *default_mail_attributes
-      mails/without_continuation_mail:
-        << : *default_mail_attributes
 
     errors:
       messages:
diff --git a/config/locales/fr.yml b/config/locales/fr.yml
index ef2e6ab19..1fb1e9fa1 100644
--- a/config/locales/fr.yml
+++ b/config/locales/fr.yml
@@ -59,6 +59,7 @@ fr:
         are_you_new: Vous êtes nouveau sur %{app_name} ?
     my_account: Mon compte
     header:
+      label_modal: "Menu en-tête de page"
       close_modal: 'Fermer'
       back: "Revenir en arrière"
       back_title: "Revenir sur le site de mon administration"
@@ -83,13 +84,11 @@ fr:
         existing_dossiers: Vous avez déjà des dossiers pour cette démarche
         show_dossiers: Voir mes dossiers en cours
         prefilled_draft: "Vous avez un dossier prérempli"
-        prefilled_draft_detail_html: "Vous êtes prêt·e à poursuivre un dossier prérempli sur la démarche « %{procedure} », commencé il y a <strong>%{time_ago}</strong>."
-        prefill_dossier_detail_html: "Vous êtes prêt·e à poursuivre un dossier prérempli sur la démarche « %{procedure} »."
+        prefilled_draft_detail_html: "Il y a <strong>%{time_ago}</strong>, vous avez prérempli un dossier sur la démarche « %{procedure} »."
         already_draft: "Vous avez déjà commencé à remplir un dossier"
         already_draft_detail_html: "Il y a <strong>%{time_ago}</strong>, vous avez commencé à remplir un dossier sur la démarche « %{procedure} »."
         already_not_draft: "Vous avez déjà déposé un dossier"
         already_not_draft_detail_html: "Il y a <strong>%{time_ago}</strong>, vous avez déposé un dossier sur la démarche « %{procedure} »."
-        go_to_prefilled_file: 'Poursuivre mon dossier prérempli'
         continue_file: 'Continuer à remplir mon dossier'
         start_new_file: 'Commencer un nouveau dossier'
         show_my_submitted_file: 'Voir mon dossier déposé'
@@ -138,7 +137,6 @@ fr:
           yes_no: "true"
           civilite: "M."
           pays: "FR"
-          departements: "56"
           regions: "53"
           date: "2023-02-01"
           datetime: "2023-02-01T10:30"
@@ -261,6 +259,7 @@ fr:
           identity_data: Données d’identité
           all_required: Tous les champs sont obligatoires.
           civility: Civilité
+          description: Description de la procédure
           first_name: Prénom
           last_name: Nom
           birthdate: Date de naissance
@@ -394,19 +393,6 @@ fr:
         zone: La démarche est mise en œuvre par
       champs:
         value: Valeur du champ
-      default_mail_attributes: &default_mail_attributes
-        hints:
-          subject: "L’objet généré sera tronqué s’il dépasse 100 caractères."
-      mails/closed_mail:
-        << : *default_mail_attributes
-      mails/initiated_mail:
-        << : *default_mail_attributes
-      mails/received_mail:
-        << : *default_mail_attributes
-      mails/refused_mail:
-        << : *default_mail_attributes
-      mails/without_continuation_mail:
-        << : *default_mail_attributes
 
     errors:
       messages:

From a38c6077a59c211b48d611f50bf0b47d89ebe245 Mon Sep 17 00:00:00 2001
From: Julie Salha <julie.salha@gmail.com>
Date: Tue, 14 Feb 2023 13:22:51 +0100
Subject: [PATCH 069/202] fix PR translations

---
 config/locales/en.yml | 19 +++++++++++++++++--
 config/locales/fr.yml | 19 +++++++++++++++++--
 2 files changed, 34 insertions(+), 4 deletions(-)

diff --git a/config/locales/en.yml b/config/locales/en.yml
index dcd81f16a..05d56ed0d 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -68,7 +68,6 @@ en:
         are_you_new: First time on %{app_name}?
     my_account: My account
     header:
-      label_modal: "Burger menu"
       close_modal: 'Close'
       back: "Back"
       back_title: "Revenir sur le site de mon administration"
@@ -93,11 +92,13 @@ en:
         existing_dossiers: You already have files for this procedure
         show_dossiers: View my current files
         prefilled_draft: "You have a prefilled file"
-        prefilled_draft_detail_html: "You prefilled a file for the \"%{procedure}\" procedure <strong>%{time_ago} ago</strong>"
+        prefilled_draft_detail_html: "You are ready to continue a prefilled file for the \"%{procedure}\" procedure, started <strong>%{time_ago} ago</strong>."
+        prefill_dossier_detail_html: "You are ready to continue a prefilled file for the \"%{procedure}\" procedure."
         already_draft: "You already started to fill a file"
         already_draft_detail_html: "You started to fill a file for the \"%{procedure}\" procedure <strong>%{time_ago} ago</strong>"
         already_not_draft: "You already submitted a file"
         already_not_draft_detail_html: "You submitted a file for the \"%{procedure}\" procedure <strong>%{time_ago} ago</strong>."
+        go_to_prefilled_file: 'Continue to fill my prefilled file'
         continue_file: "Continue to fill my file"
         start_new_file: "Start a new file"
         show_my_submitted_file: 'Show my submitted file'
@@ -145,6 +146,7 @@ en:
           iban: FR7611315000011234567890138
           yes_no: "true"
           pays: "FR"
+          departements: "56"
           regions: "53"
           date: "2023-02-01"
           datetime: "2023-02-01T10:30"
@@ -396,6 +398,19 @@ en:
         zone: This procedure is run by
       champs:
         value: Value
+      default_mail_attributes: &default_mail_attributes
+        hints:
+          subject: The generated subject will be truncated if it exceeds 100 characters.
+      mails/closed_mail:
+        << : *default_mail_attributes
+      mails/initiated_mail:
+        << : *default_mail_attributes
+      mails/received_mail:
+        << : *default_mail_attributes
+      mails/refused_mail:
+        << : *default_mail_attributes
+      mails/without_continuation_mail:
+        << : *default_mail_attributes
 
     errors:
       messages:
diff --git a/config/locales/fr.yml b/config/locales/fr.yml
index 1fb1e9fa1..8825332ff 100644
--- a/config/locales/fr.yml
+++ b/config/locales/fr.yml
@@ -59,7 +59,6 @@ fr:
         are_you_new: Vous êtes nouveau sur %{app_name} ?
     my_account: Mon compte
     header:
-      label_modal: "Menu en-tête de page"
       close_modal: 'Fermer'
       back: "Revenir en arrière"
       back_title: "Revenir sur le site de mon administration"
@@ -84,11 +83,13 @@ fr:
         existing_dossiers: Vous avez déjà des dossiers pour cette démarche
         show_dossiers: Voir mes dossiers en cours
         prefilled_draft: "Vous avez un dossier prérempli"
-        prefilled_draft_detail_html: "Il y a <strong>%{time_ago}</strong>, vous avez prérempli un dossier sur la démarche « %{procedure} »."
+        prefilled_draft_detail_html: "Vous êtes prêt·e à poursuivre un dossier prérempli sur la démarche « %{procedure} », commencé il y a <strong>%{time_ago}</strong>."
+        prefill_dossier_detail_html: "Vous êtes prêt·e à poursuivre un dossier prérempli sur la démarche « %{procedure} »."
         already_draft: "Vous avez déjà commencé à remplir un dossier"
         already_draft_detail_html: "Il y a <strong>%{time_ago}</strong>, vous avez commencé à remplir un dossier sur la démarche « %{procedure} »."
         already_not_draft: "Vous avez déjà déposé un dossier"
         already_not_draft_detail_html: "Il y a <strong>%{time_ago}</strong>, vous avez déposé un dossier sur la démarche « %{procedure} »."
+        go_to_prefilled_file: 'Poursuivre mon dossier prérempli'
         continue_file: 'Continuer à remplir mon dossier'
         start_new_file: 'Commencer un nouveau dossier'
         show_my_submitted_file: 'Voir mon dossier déposé'
@@ -137,6 +138,7 @@ fr:
           yes_no: "true"
           civilite: "M."
           pays: "FR"
+          departements: "56"
           regions: "53"
           date: "2023-02-01"
           datetime: "2023-02-01T10:30"
@@ -393,6 +395,19 @@ fr:
         zone: La démarche est mise en œuvre par
       champs:
         value: Valeur du champ
+      default_mail_attributes: &default_mail_attributes
+        hints:
+          subject: "L’objet généré sera tronqué s’il dépasse 100 caractères."
+      mails/closed_mail:
+        << : *default_mail_attributes
+      mails/initiated_mail:
+        << : *default_mail_attributes
+      mails/received_mail:
+        << : *default_mail_attributes
+      mails/refused_mail:
+        << : *default_mail_attributes
+      mails/without_continuation_mail:
+        << : *default_mail_attributes
 
     errors:
       messages:

From ca12e3f58c4a36ae772ee761ea2927bd29006995 Mon Sep 17 00:00:00 2001
From: Julie Salha <49035942+julieSalha@users.noreply.github.com>
Date: Wed, 15 Feb 2023 11:32:03 +0100
Subject: [PATCH 070/202] Update french translation description

Co-authored-by: Colin Darie <colin@darie.eu>
---
 config/locales/fr.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/config/locales/fr.yml b/config/locales/fr.yml
index 8825332ff..4e22a7f01 100644
--- a/config/locales/fr.yml
+++ b/config/locales/fr.yml
@@ -261,7 +261,7 @@ fr:
           identity_data: Données d’identité
           all_required: Tous les champs sont obligatoires.
           civility: Civilité
-          description: Description de la procédure
+          description: Description de la démarche
           first_name: Prénom
           last_name: Nom
           birthdate: Date de naissance

From 0427c28103ad263fb722a70fa2709629c54759a9 Mon Sep 17 00:00:00 2001
From: Martin <martin@sharypic.com>
Date: Thu, 16 Feb 2023 14:09:05 +0100
Subject: [PATCH 071/202] correctif(db.active_storage_attachements): ajoute un
 fk non validable a priori pour eviter les problemes d'attachments sans blob

---
 ...22_fix_active_storage_attachment_missing_fk_on_blob_id.rb | 5 +++++
 db/schema.rb                                                 | 2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)
 create mode 100644 db/migrate/20230216130722_fix_active_storage_attachment_missing_fk_on_blob_id.rb

diff --git a/db/migrate/20230216130722_fix_active_storage_attachment_missing_fk_on_blob_id.rb b/db/migrate/20230216130722_fix_active_storage_attachment_missing_fk_on_blob_id.rb
new file mode 100644
index 000000000..51b697797
--- /dev/null
+++ b/db/migrate/20230216130722_fix_active_storage_attachment_missing_fk_on_blob_id.rb
@@ -0,0 +1,5 @@
+class FixActiveStorageAttachmentMissingFkOnBlobId < ActiveRecord::Migration[6.1]
+  def change
+    add_foreign_key :active_storage_attachments, :active_storage_blobs, column: :blob_id, validate: false
+  end
+end
diff --git a/db/schema.rb b/db/schema.rb
index 59abcc837..7ab997120 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -10,7 +10,7 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema.define(version: 2023_02_07_105539) do
+ActiveRecord::Schema.define(version: 2023_02_16_130722) do
 
   # These are extensions that must be enabled in order to support this database
   enable_extension "pgcrypto"

From 437be2c901fa971b93ffbeb9d693fe896eca3dc8 Mon Sep 17 00:00:00 2001
From: Martin <martin@sharypic.com>
Date: Thu, 16 Feb 2023 14:09:05 +0100
Subject: [PATCH 072/202] correctif(data): supprime les attachment sans blob

---
 .../20230216135218_reclean_attachments.rake   | 21 +++++++++++++++++++
 1 file changed, 21 insertions(+)
 create mode 100644 lib/tasks/deployment/20230216135218_reclean_attachments.rake

diff --git a/lib/tasks/deployment/20230216135218_reclean_attachments.rake b/lib/tasks/deployment/20230216135218_reclean_attachments.rake
new file mode 100644
index 000000000..cfc5eb52f
--- /dev/null
+++ b/lib/tasks/deployment/20230216135218_reclean_attachments.rake
@@ -0,0 +1,21 @@
+namespace :after_party do
+  desc 'Deployment task: reclean_attachments'
+  task reclean_attachments: :environment do
+    puts "Running deploy task 'reclean_attachments'"
+
+    invalid_attachments = ActiveStorage::Attachment.where.missing(:blob)
+    invalid_attachments_count = invalid_attachments.size
+
+    if invalid_attachments.any?
+      invalid_attachments.destroy_all
+      puts "#{invalid_attachments_count} with blob that doesn't exist have been destroyed"
+    else
+      puts "No attachments with blob that doesn't exist found"
+    end
+
+    # Update task as completed.  If you remove the line below, the task will
+    # run with every deploy (or every time you call after_party:run).
+    AfterParty::TaskRecord
+      .create version: AfterParty::TaskRecorder.new(__FILE__).timestamp
+  end
+end

From 514835af1c46bc6721fd20b9f30c5a55f0bbeb6c Mon Sep 17 00:00:00 2001
From: Martin <martin@sharypic.com>
Date: Thu, 16 Feb 2023 15:43:35 +0100
Subject: [PATCH 073/202] correctif(db): force active_storage_attachments.blob
 fk on active_storage_blobs

---
 ...558_validate_foreign_key_between_attachments_and_blobs.rb | 5 +++++
 db/schema.rb                                                 | 2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)
 create mode 100644 db/migrate/20230216141558_validate_foreign_key_between_attachments_and_blobs.rb

diff --git a/db/migrate/20230216141558_validate_foreign_key_between_attachments_and_blobs.rb b/db/migrate/20230216141558_validate_foreign_key_between_attachments_and_blobs.rb
new file mode 100644
index 000000000..ba383c80a
--- /dev/null
+++ b/db/migrate/20230216141558_validate_foreign_key_between_attachments_and_blobs.rb
@@ -0,0 +1,5 @@
+class ValidateForeignKeyBetweenAttachmentsAndBlobs < ActiveRecord::Migration[6.1]
+  def up
+    validate_foreign_key :active_storage_attachments, :active_storage_blobs, column: :blob_id
+  end
+end
diff --git a/db/schema.rb b/db/schema.rb
index 59abcc837..14d0f9498 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -10,7 +10,7 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema.define(version: 2023_02_07_105539) do
+ActiveRecord::Schema.define(version: 2023_02_16_141558) do
 
   # These are extensions that must be enabled in order to support this database
   enable_extension "pgcrypto"

From 1f930dfe2336294f2eda1ea40d45a837d5fd7055 Mon Sep 17 00:00:00 2001
From: Colin Darie <colin@darie.eu>
Date: Tue, 7 Feb 2023 18:06:38 +0100
Subject: [PATCH 074/202] feat(user): can show password when editing password

---
 app/components/dsfr/input_component.rb        |  4 ++++
 .../input_component/input_component.html.haml |  4 ++--
 app/views/devise/passwords/edit.html.haml     | 23 +++++++++++--------
 config/locales/en.yml                         |  4 ++++
 config/locales/fr.yml                         |  4 ++++
 5 files changed, 28 insertions(+), 11 deletions(-)

diff --git a/app/components/dsfr/input_component.rb b/app/components/dsfr/input_component.rb
index aa724a775..42113167b 100644
--- a/app/components/dsfr/input_component.rb
+++ b/app/components/dsfr/input_component.rb
@@ -89,6 +89,10 @@ class Dsfr::InputComponent < ApplicationComponent
     @input_type == :email_field
   end
 
+  def show_password_id
+    dom_id(object, "#{@attribute}_show_password")
+  end
+
   private
 
   def hint?
diff --git a/app/components/dsfr/input_component/input_component.html.haml b/app/components/dsfr/input_component/input_component.html.haml
index a56c7fff8..8fc5324a3 100644
--- a/app/components/dsfr/input_component/input_component.html.haml
+++ b/app/components/dsfr/input_component/input_component.html.haml
@@ -23,8 +23,8 @@
 
   - if password?
     .fr-password__checkbox.fr-checkbox-group.fr-checkbox-group--sm
-      %input#show_password{ "aria-label" => t('.show_password.aria_label'), type: "checkbox" }/
-      %label.fr--password__checkbox.fr-label{ for: "show_password" }= t('.show_password.label')
+      %input{ id: show_password_id, "aria-label" => t('.show_password.aria_label'), type: "checkbox" }/
+      %label.fr--password__checkbox.fr-label{ for: show_password_id }= t('.show_password.label')
 
   - if email?
     .suspect-email.hidden{ data: { "email-input-target": 'ariaRegion'}, aria: { live: 'off' } }
diff --git a/app/views/devise/passwords/edit.html.haml b/app/views/devise/passwords/edit.html.haml
index 46d33dd55..e30dbf1d9 100644
--- a/app/views/devise/passwords/edit.html.haml
+++ b/app/views/devise/passwords/edit.html.haml
@@ -7,16 +7,21 @@
   .one-column-centered
     = devise_error_messages!
 
-    = form_for(resource, as: resource_name, url: password_path(resource_name), html: { method: :patch, class: 'form' }) do |f|
-
-      %h1 Changement de mot de passe
-
+    = form_for(resource, as: resource_name, url: password_path(resource_name), html: { method: :patch, class: '' }) do |f|
       = f.hidden_field :reset_password_token
 
-      = f.label 'Nouveau mot de passe'
-      = render 'password_complexity/field', { form: f, test_complexity: populated_resource.validate_password_complexity? }
 
-      = f.label 'Confirmez le nouveau mot de passe'
-      = f.password_field :password_confirmation, autocomplete: 'off'
+      %fieldset.fr-mb-0.fr-fieldset{ aria: { labelledby: 'edit-password-legend' } }
+        %legend.fr-fieldset__legend#edit-password-legend
+          %h1.fr-h2= I18n.t('views.users.passwords.edit.subtitle')
 
-      = f.submit 'Changer le mot de passe', class: 'button large primary expand', id: "submit-password", data: { disable_with: "Envoi…" }
+        .fr-fieldset__element
+          = render Dsfr::InputComponent.new(form: f, attribute: :password, input_type: :password_field,
+            opts: { autofocus: 'true', autocomplete: 'new-password', data: { controller: populated_resource.validate_password_complexity? ? 'turbo-input' : false, turbo_input_url_value: show_password_complexity_path }})
+
+          = render 'password_complexity/field', { form: f, test_complexity: populated_resource.validate_password_complexity? }
+
+        .fr-fieldset__element
+          = render Dsfr::InputComponent.new(form: f, attribute: :password_confirmation, input_type: :password_field, opts: { autocomplete: 'new-password' })
+
+      = f.submit t('views.users.passwords.edit.submit'), id: 'submit-password', class: "fr-btn fr-btn--lg fr-mt-2w", data: { disable_with: t('views.users.passwords.edit.submit_loading') }
diff --git a/config/locales/en.yml b/config/locales/en.yml
index 05d56ed0d..f2f481aee 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -351,6 +351,10 @@ en:
           connect_with_agent_connect: Visit our dedicated page
           subtitle: "Sign in with my account"
       passwords:
+        edit:
+          subtitle: Change password
+          submit: Change password
+          submit_loading: Sending…
         reset_link_sent:
           got_it: Got it!
           open_your_mailbox: Now open your mailbox.
diff --git a/config/locales/fr.yml b/config/locales/fr.yml
index 4e22a7f01..efd7db901 100644
--- a/config/locales/fr.yml
+++ b/config/locales/fr.yml
@@ -347,6 +347,10 @@ fr:
           connect_with_agent_connect: Accédez à notre page dédiée
           subtitle: "Se connecter avec son compte"
       passwords:
+        edit:
+          subtitle: Changement de mot de passe
+          submit: Changer le mot de passe
+          submit_loading: Envoi…
         reset_link_sent:
           email_sent_html: "Nous vous avons envoyé un email à l’adresse <strong>%{email}</strong>."
           click_link_to_reset_password: "Cliquez sur le lien contenu dans l’email pour changer votre mot de passe."

From 4f7839039d048e357eb9e7a94443c36d5e41ce83 Mon Sep 17 00:00:00 2001
From: Colin Darie <colin@darie.eu>
Date: Thu, 9 Feb 2023 19:06:44 +0100
Subject: [PATCH 075/202] refactor(password-complexity): as component for
 better form integration

---
 .../stylesheets/password_complexity.scss      |  2 -
 .../password_complexity_component.rb          | 53 +++++++++++++++++++
 .../password_complexity_component.en.yml      | 10 ++++
 .../password_complexity_component.fr.yml      | 10 ++++
 .../password_complexity_component.html.haml   |  6 +++
 app/views/devise/passwords/edit.html.haml     | 33 ++++++------
 app/views/password_complexity/_bar.html.haml  |  1 -
 .../password_complexity/_field.html.haml      |  9 ----
 .../password_complexity/_label.html.haml      | 16 ------
 .../show.turbo_stream.haml                    |  5 +-
 .../password_complexity_controller_spec.rb    |  3 +-
 11 files changed, 101 insertions(+), 47 deletions(-)
 create mode 100644 app/components/password_complexity_component.rb
 create mode 100644 app/components/password_complexity_component/password_complexity_component.en.yml
 create mode 100644 app/components/password_complexity_component/password_complexity_component.fr.yml
 create mode 100644 app/components/password_complexity_component/password_complexity_component.html.haml
 delete mode 100644 app/views/password_complexity/_bar.html.haml
 delete mode 100644 app/views/password_complexity/_field.html.haml
 delete mode 100644 app/views/password_complexity/_label.html.haml

diff --git a/app/assets/stylesheets/password_complexity.scss b/app/assets/stylesheets/password_complexity.scss
index 24fc2ef77..ee521b0b3 100644
--- a/app/assets/stylesheets/password_complexity.scss
+++ b/app/assets/stylesheets/password_complexity.scss
@@ -9,12 +9,10 @@ $complexity-color-3: #FFD000;
 $complexity-color-4: $green;
 
 .password-complexity {
-  margin-top: -24px;
   width: 100%;
   height: 12px;
   background: $complexity-bg;
   display: block;
-  margin-bottom: $default-spacer;
   text-align: center;
   border-radius: 8px;
 
diff --git a/app/components/password_complexity_component.rb b/app/components/password_complexity_component.rb
new file mode 100644
index 000000000..32efd3908
--- /dev/null
+++ b/app/components/password_complexity_component.rb
@@ -0,0 +1,53 @@
+class PasswordComplexityComponent < ApplicationComponent
+  def initialize(length: nil, min_length: nil, score: nil, min_complexity: nil)
+    @length = length
+    @min_length = min_length
+    @score = score
+    @min_complexity = min_complexity
+  end
+
+  private
+
+  def filled?
+    !@length.nil? || !@score.nil?
+  end
+
+  def alert_classes
+    class_names(
+      "fr-alert": true,
+      "fr-alert--sm": true,
+      "fr-alert--info": !success?,
+      "fr-alert--success": success?
+    )
+  end
+
+  def success?
+    return false if !filled?
+
+    @length >= @min_length && @score >= @min_complexity
+  end
+
+  def complexity_classes
+    [
+      "password-complexity fr-mt-2w fr-mb-1w",
+      filled? ? "complexity-#{@length < @min_length ? @score / 2 : @score}" : nil
+    ]
+  end
+
+  def title
+    return t(".title.empty") if !filled?
+
+    return t(".title.too_short", min_length: @min_length) if @length < @min_length
+
+    case @score
+    when 0..1
+      return t(".title.weakest")
+    when 2...@min_complexity
+      return t(".title.weak")
+    when @min_complexity...4
+      return t(".title.passable")
+    else
+      return t(".title.strong")
+    end
+  end
+end
diff --git a/app/components/password_complexity_component/password_complexity_component.en.yml b/app/components/password_complexity_component/password_complexity_component.en.yml
new file mode 100644
index 000000000..d5930cd58
--- /dev/null
+++ b/app/components/password_complexity_component/password_complexity_component.en.yml
@@ -0,0 +1,10 @@
+---
+en:
+  title:
+    empty: Enter a password.
+    too_short: Password must be at least %{min_length} characters long.
+    passable: Password is acceptable. You can validate… or improve your password.
+    strong: Congratulations! Password is strong and secure enough.
+    weak: Vulnerable password.
+    weakest: Very vulnerable password.
+  hint: A short sentence with punctuation can be a very secure password.
diff --git a/app/components/password_complexity_component/password_complexity_component.fr.yml b/app/components/password_complexity_component/password_complexity_component.fr.yml
new file mode 100644
index 000000000..225a5775c
--- /dev/null
+++ b/app/components/password_complexity_component/password_complexity_component.fr.yml
@@ -0,0 +1,10 @@
+---
+fr:
+  title:
+    empty: Inscrivez un mot de passe.
+    too_short: Le mot de passe doit faire au moins %{min_length} caractères.
+    passable: Mot de passe acceptable. Vous pouvez valider… ou améliorer votre mot de passe.
+    strong: Félicitations ! Mot de passe suffisamment fort et sécurisé.
+    weak: Mot de passe vulnérable.
+    weakest: Mot de passe très vulnérable.
+  hint: Une courte phrase avec ponctuation peut être un mot de passe très sécurisé.
diff --git a/app/components/password_complexity_component/password_complexity_component.html.haml b/app/components/password_complexity_component/password_complexity_component.html.haml
new file mode 100644
index 000000000..bfa7d5620
--- /dev/null
+++ b/app/components/password_complexity_component/password_complexity_component.html.haml
@@ -0,0 +1,6 @@
+%div{ class: complexity_classes }
+
+%div{ class: alert_classes }
+  %h3.fr-alert__title= title
+  - if !success?
+    %p= t(".hint")
diff --git a/app/views/devise/passwords/edit.html.haml b/app/views/devise/passwords/edit.html.haml
index e30dbf1d9..2ebfb3ee8 100644
--- a/app/views/devise/passwords/edit.html.haml
+++ b/app/views/devise/passwords/edit.html.haml
@@ -3,25 +3,28 @@
 - content_for :footer do
   = render partial: 'root/footer'
 
-.container.devise-container
-  .one-column-centered
-    = devise_error_messages!
+.fr-container.fr-my-5w
+  .fr-grid-row.fr-grid-row--center
+    .fr-col-lg-6
+      = devise_error_messages!
 
-    = form_for(resource, as: resource_name, url: password_path(resource_name), html: { method: :patch, class: '' }) do |f|
-      = f.hidden_field :reset_password_token
+      = form_for(resource, as: resource_name, url: password_path(resource_name), html: { method: :patch, class: '' }) do |f|
+        = f.hidden_field :reset_password_token
 
 
-      %fieldset.fr-mb-0.fr-fieldset{ aria: { labelledby: 'edit-password-legend' } }
-        %legend.fr-fieldset__legend#edit-password-legend
-          %h1.fr-h2= I18n.t('views.users.passwords.edit.subtitle')
+        %fieldset.fr-mb-0.fr-fieldset{ aria: { labelledby: 'edit-password-legend' } }
+          %legend.fr-fieldset__legend#edit-password-legend
+            %h1.fr-h2= I18n.t('views.users.passwords.edit.subtitle')
 
-        .fr-fieldset__element
-          = render Dsfr::InputComponent.new(form: f, attribute: :password, input_type: :password_field,
-            opts: { autofocus: 'true', autocomplete: 'new-password', data: { controller: populated_resource.validate_password_complexity? ? 'turbo-input' : false, turbo_input_url_value: show_password_complexity_path }})
+          .fr-fieldset__element
+            = render Dsfr::InputComponent.new(form: f, attribute: :password, input_type: :password_field,
+              opts: { autofocus: 'true', autocomplete: 'new-password', data: { controller: populated_resource.validate_password_complexity? ? 'turbo-input' : false, turbo_input_url_value: show_password_complexity_path }})
 
-          = render 'password_complexity/field', { form: f, test_complexity: populated_resource.validate_password_complexity? }
+            - if populated_resource.validate_password_complexity?
+              #password_complexity
+                = render PasswordComplexityComponent.new
 
-        .fr-fieldset__element
-          = render Dsfr::InputComponent.new(form: f, attribute: :password_confirmation, input_type: :password_field, opts: { autocomplete: 'new-password' })
+          .fr-fieldset__element
+            = render Dsfr::InputComponent.new(form: f, attribute: :password_confirmation, input_type: :password_field, opts: { autocomplete: 'new-password' })
 
-      = f.submit t('views.users.passwords.edit.submit'), id: 'submit-password', class: "fr-btn fr-btn--lg fr-mt-2w", data: { disable_with: t('views.users.passwords.edit.submit_loading') }
+        = f.submit t('views.users.passwords.edit.submit'), id: 'submit-password', class: "fr-btn fr-btn--lg fr-mt-2w", data: { disable_with: t('views.users.passwords.edit.submit_loading') }
diff --git a/app/views/password_complexity/_bar.html.haml b/app/views/password_complexity/_bar.html.haml
deleted file mode 100644
index a9b8c8262..000000000
--- a/app/views/password_complexity/_bar.html.haml
+++ /dev/null
@@ -1 +0,0 @@
-#complexity-bar.password-complexity{ class: "complexity-#{@length < @min_length ? @score/2 : @score}" }
diff --git a/app/views/password_complexity/_field.html.haml b/app/views/password_complexity/_field.html.haml
deleted file mode 100644
index 2e031f574..000000000
--- a/app/views/password_complexity/_field.html.haml
+++ /dev/null
@@ -1,9 +0,0 @@
-= form.password_field :password, autofocus: true, autocomplete: 'off', placeholder: 'Mot de passe', data: { controller: test_complexity ? 'turbo-input' : false, turbo_input_url_value: show_password_complexity_path }
-
-- if test_complexity
-  #complexity-bar.password-complexity
-
-  .explication
-    #complexity-label{ style: 'font-weight: bold' }
-      Inscrivez un mot de passe.
-    Une courte phrase avec ponctuation peut être un mot de passe très sécurisé.
diff --git a/app/views/password_complexity/_label.html.haml b/app/views/password_complexity/_label.html.haml
deleted file mode 100644
index 2e9bda1d0..000000000
--- a/app/views/password_complexity/_label.html.haml
+++ /dev/null
@@ -1,16 +0,0 @@
-#complexity-label{ style: 'font-weight: bold' }
-  - if @length > 0
-    - if @length < @min_length
-      Le mot de passe doit faire au moins #{@min_length} caractères.
-    - else
-      - case @score
-        - when 0..1
-          Mot de passe très vulnérable.
-        - when 2...@min_complexity
-          Mot de passe vulnérable.
-        - when @min_complexity...4
-          Mot de passe acceptable. Vous pouvez valider...<br> ou améliorer votre mot de passe.
-        - else
-          Félicitations ! Mot de passe suffisamment fort et sécurisé.
-  - else
-    Inscrivez un mot de passe.
diff --git a/app/views/password_complexity/show.turbo_stream.haml b/app/views/password_complexity/show.turbo_stream.haml
index 3fd3648f6..461ad5b12 100644
--- a/app/views/password_complexity/show.turbo_stream.haml
+++ b/app/views/password_complexity/show.turbo_stream.haml
@@ -1,5 +1,6 @@
-= turbo_stream.replace 'complexity-label', partial: 'label'
-= turbo_stream.replace 'complexity-bar', partial: 'bar'
+= turbo_stream.update 'password_complexity' do
+  = render PasswordComplexityComponent.new(length: @length, min_length: @min_length, score: @score, min_complexity: @min_complexity)
+
 - if @score < @min_complexity || @length < @min_length
   = turbo_stream.disable 'submit-password'
 - else
diff --git a/spec/controllers/password_complexity_controller_spec.rb b/spec/controllers/password_complexity_controller_spec.rb
index b04985806..6d03cab40 100644
--- a/spec/controllers/password_complexity_controller_spec.rb
+++ b/spec/controllers/password_complexity_controller_spec.rb
@@ -27,8 +27,7 @@ describe PasswordComplexityController, type: :controller do
 
       it 'renders Javascript that updates the password complexity meter' do
         subject
-        expect(response.body).to include('complexity-label')
-        expect(response.body).to include('complexity-bar')
+        expect(response.body).to include('Mot de passe vulnérable')
       end
     end
   end

From 31c99e935a560764bc5746e879bcd75ff05e4119 Mon Sep 17 00:00:00 2001
From: Colin Darie <colin@darie.eu>
Date: Wed, 15 Feb 2023 10:16:01 +0100
Subject: [PATCH 076/202] refactor(admin): migrate password form to DSFR
 components

---
 app/components/dsfr/input_component.rb        |  2 +-
 .../administrateurs/activate/new.html.haml    | 33 +++++++++++--------
 config/locales/en.yml                         |  5 +++
 config/locales/fr.yml                         |  4 +++
 4 files changed, 29 insertions(+), 15 deletions(-)

diff --git a/app/components/dsfr/input_component.rb b/app/components/dsfr/input_component.rb
index 42113167b..99ad02172 100644
--- a/app/components/dsfr/input_component.rb
+++ b/app/components/dsfr/input_component.rb
@@ -6,7 +6,7 @@ class Dsfr::InputComponent < ApplicationComponent
   # it uses aria-describedby on input and link it to yielded content
   renders_one :describedby
 
-  def initialize(form:, attribute:, input_type:, opts: {}, required: true)
+  def initialize(form:, attribute:, input_type: :text_field, opts: {}, required: true)
     @form = form
     @attribute = attribute
     @input_type = input_type
diff --git a/app/views/administrateurs/activate/new.html.haml b/app/views/administrateurs/activate/new.html.haml
index 5d17e6aa8..b826ddffe 100644
--- a/app/views/administrateurs/activate/new.html.haml
+++ b/app/views/administrateurs/activate/new.html.haml
@@ -1,21 +1,26 @@
-- content_for(:title, "Choix du mot de passe")
+- content_for(:title, t('.title'))
 
 - content_for :footer do
   = render partial: "root/footer"
 
-.container.devise-container
-  .one-column-centered
-    = form_for @administrateur, url: { controller: 'administrateurs/activate', action: :create }, html: { class: "form" } do |f|
-      %br
-      %h1
-        Choix du mot de passe
+.fr-container.fr-my-5w
+  .fr-grid-row.fr-grid-row--center
+    .fr-col-lg-6
+      = form_for @administrateur, url: { controller: 'administrateurs/activate', action: :create } do |f|
+        = f.hidden_field :reset_password_token, value: @token
 
-      = f.hidden_field :reset_password_token, value: @token
-      = f.label :email, "Email"
-      = f.text_field :email, disabled: true
+        %fieldset.fr-mb-0.fr-fieldset{ aria: { labelledby: 'edit-password-legend' } }
+          %legend.fr-fieldset__legend#edit-password-legend
+            %h1.fr-h2= t('.title')
 
-      = f.label :password do
-        Mot de passe
-      = render 'password_complexity/field', { form: f, test_complexity: true }
+          .fr-fieldset__element
+            = render Dsfr::InputComponent.new(form: f, attribute: :email, opts: { disabled: true })
 
-      = f.submit 'Continuer', class: 'button large primary expand', id: "submit-password", data: { disable_with: "Envoi..." }
+          .fr-fieldset__element
+            = render Dsfr::InputComponent.new(form: f, attribute: :password, input_type: :password_field,
+              opts: { autofocus: 'true', autocomplete: 'new-password', data: { controller: 'turbo-input', turbo_input_url_value: show_password_complexity_path }})
+
+            #password_complexity
+              = render PasswordComplexityComponent.new
+
+        = f.submit t('.continue'), id: 'submit-password', class: "fr-btn fr-btn--lg fr-mt-2w", data: { disable_with: t('views.users.passwords.edit.submit_loading') }
diff --git a/config/locales/en.yml b/config/locales/en.yml
index f2f481aee..6410dadb8 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -580,6 +580,11 @@ en:
     deleted:
       one: Deleted
       other: Deleted
+  administrateurs:
+    activate:
+      new:
+        title: Pick a password
+        continue: Continue
   users:
     dossiers:
       test_procedure: "This file is submitted on a test procedure. Any modification of the procedure by the administrator (addition of a field, publication of the procedure, etc.) will result in the removal of the file."
diff --git a/config/locales/fr.yml b/config/locales/fr.yml
index efd7db901..70c52acfc 100644
--- a/config/locales/fr.yml
+++ b/config/locales/fr.yml
@@ -629,6 +629,10 @@ fr:
         to_follow: à suivre
         total: dossiers
   administrateurs:
+    activate:
+      new:
+        title: Choix du mot de passe
+        continue: Continuer
     index:
       restored: La démarche %{procedure_id} a été restaurée
     dropdown_actions:

From c968aa63d3a8290aa6122ddab0ff8d747bdcd204 Mon Sep 17 00:00:00 2001
From: Colin Darie <colin@darie.eu>
Date: Wed, 15 Feb 2023 11:33:42 +0100
Subject: [PATCH 077/202] fix(a11y/password form): describedby rel with input
 and password rules

---
 app/components/dsfr/input_component.rb        | 22 ++++++++++---------
 .../input_component/input_component.html.haml |  6 ++---
 app/views/devise/_password_rules.html.haml    |  3 +++
 app/views/devise/passwords/edit.html.haml     | 13 ++++++-----
 app/views/users/registrations/new.html.haml   |  6 ++---
 5 files changed, 28 insertions(+), 22 deletions(-)
 create mode 100644 app/views/devise/_password_rules.html.haml

diff --git a/app/components/dsfr/input_component.rb b/app/components/dsfr/input_component.rb
index 99ad02172..271762470 100644
--- a/app/components/dsfr/input_component.rb
+++ b/app/components/dsfr/input_component.rb
@@ -40,19 +40,21 @@ class Dsfr::InputComponent < ApplicationComponent
                                          'fr-mb-0': true,
                                          'fr-input--error': errors_on_attribute?))
 
-    if errors_on_attribute? || describedby
-      @opts = @opts.deep_merge(aria: {
-        describedby: error_message_id,
-                                       invalid: errors_on_attribute?
+    if errors_on_attribute? || describedby?
+      @opts.deep_merge!(aria: {
+        describedby: describedby_id,
+        invalid: errors_on_attribute?
       })
     end
+
     if @required
       @opts[:required] = true
     end
+
     if email?
-      @opts = @opts.deep_merge(data: {
+      @opts.deep_merge!(data: {
         action: "blur->email-input#checkEmail",
-                                       'email-input-target': 'input'
+        'email-input-target': 'input'
       })
     end
     @opts
@@ -63,14 +65,14 @@ class Dsfr::InputComponent < ApplicationComponent
     errors.has_key?(attribute_or_rich_body)
   end
 
-  def error_message_id
-    dom_id(object, @attribute)
-  end
-
   def error_messages
     errors.full_messages_for(attribute_or_rich_body)
   end
 
+  def describedby_id
+    dom_id(object, "#{@attribute}-messages")
+  end
+
   # i18n lookups
   def label
     object.class.human_attribute_name(@attribute)
diff --git a/app/components/dsfr/input_component/input_component.html.haml b/app/components/dsfr/input_component/input_component.html.haml
index 8fc5324a3..4e52ec670 100644
--- a/app/components/dsfr/input_component/input_component.html.haml
+++ b/app/components/dsfr/input_component/input_component.html.haml
@@ -7,13 +7,13 @@
         - if hint?
           %span.fr-hint-text= hint
 
-  = @form.send(@input_type, @attribute, input_opts)
+  = @form.public_send(@input_type, @attribute, input_opts)
 
   - if errors_on_attribute?
     - if error_messages.size == 1
-      %p.fr-error-text{ id: error_message_id }= error_messages.first
+      %p.fr-error-text{ id: describedby_id }= error_messages.first
     - else
-      .fr-error-text{ id: error_message_id }
+      .fr-error-text{ id: describedby_id }
         %ul.list-style-type-none.fr-pl-0
           - error_messages.map do |error_message|
             %li= error_message
diff --git a/app/views/devise/_password_rules.html.haml b/app/views/devise/_password_rules.html.haml
new file mode 100644
index 000000000..2d4083d2f
--- /dev/null
+++ b/app/views/devise/_password_rules.html.haml
@@ -0,0 +1,3 @@
+.fr-messages-group{ "aria-live" => "off", id: id }
+  %p.fr-message= t('views.registrations.new.password_message')
+  %p.fr-message.fr-message--info= t('views.registrations.new.password_placeholder', min_length: PASSWORD_MIN_LENGTH)
diff --git a/app/views/devise/passwords/edit.html.haml b/app/views/devise/passwords/edit.html.haml
index 2ebfb3ee8..62103f214 100644
--- a/app/views/devise/passwords/edit.html.haml
+++ b/app/views/devise/passwords/edit.html.haml
@@ -18,11 +18,14 @@
 
           .fr-fieldset__element
             = render Dsfr::InputComponent.new(form: f, attribute: :password, input_type: :password_field,
-              opts: { autofocus: 'true', autocomplete: 'new-password', data: { controller: populated_resource.validate_password_complexity? ? 'turbo-input' : false, turbo_input_url_value: show_password_complexity_path }})
-
-            - if populated_resource.validate_password_complexity?
-              #password_complexity
-                = render PasswordComplexityComponent.new
+              opts: { autofocus: 'true', autocomplete: 'new-password', minlength: PASSWORD_MIN_LENGTH, data: { controller: populated_resource.validate_password_complexity? ? 'turbo-input' : false, turbo_input_url_value: show_password_complexity_path }}) do |c|
+              - c.describedby do
+                - if populated_resource.validate_password_complexity?
+                  %div{ id: c.describedby_id }
+                    #password_complexity
+                      = render PasswordComplexityComponent.new
+                - else
+                  = render partial: "devise/password_rules", locals: { id: c.describedby_id }
 
           .fr-fieldset__element
             = render Dsfr::InputComponent.new(form: f, attribute: :password_confirmation, input_type: :password_field, opts: { autocomplete: 'new-password' })
diff --git a/app/views/users/registrations/new.html.haml b/app/views/users/registrations/new.html.haml
index feb6e0870..e86419ad2 100644
--- a/app/views/users/registrations/new.html.haml
+++ b/app/views/users/registrations/new.html.haml
@@ -18,10 +18,8 @@
       .fr-fieldset__element= render Dsfr::InputComponent.new(form: f, attribute: :email, input_type: :email_field, opts: { autocomplete: 'email', autofocus: true })
 
       .fr-fieldset__element
-        = render Dsfr::InputComponent.new(form: f, attribute: :password, input_type: :password_field, opts: { autocomplete: 'new-password', min_length: PASSWORD_MIN_LENGTH }) do |c|
+        = render Dsfr::InputComponent.new(form: f, attribute: :password, input_type: :password_field, opts: { autocomplete: 'new-password', minlength: PASSWORD_MIN_LENGTH }) do |c|
           - c.describedby do
-            #password-input-messages.fr-messages-group{ "aria-live" => "off" }
-              %p#password-input-message.fr-message= t('views.registrations.new.password_message')
-              %p#password-input-message-info.fr-message.fr-message--info= t('views.registrations.new.password_placeholder', min_length: PASSWORD_MIN_LENGTH)
+            = render partial: "devise/password_rules", locals: { id: c.describedby_id }
 
     = f.submit t('views.shared.account.create'), class: "fr-btn fr-btn--lg"

From 6231c75e07f3ae5dc2b5c6910ff5ee9264b41e60 Mon Sep 17 00:00:00 2001
From: Damien Le Thiec <damien.lethiec@gmail.com>
Date: Thu, 16 Feb 2023 16:58:55 +0100
Subject: [PATCH 078/202] Fix tests conflicts

---
 app/models/prefill_params.rb                             | 1 -
 app/models/types_de_champ/prefill_type_de_champ.rb       | 4 ----
 spec/models/prefill_params_spec.rb                       | 6 +++---
 spec/models/types_de_champ/prefill_type_de_champ_spec.rb | 8 --------
 4 files changed, 3 insertions(+), 16 deletions(-)

diff --git a/app/models/prefill_params.rb b/app/models/prefill_params.rb
index 52f8ce1e6..63ff0b25d 100644
--- a/app/models/prefill_params.rb
+++ b/app/models/prefill_params.rb
@@ -70,6 +70,5 @@ class PrefillParams
       champ.assign_attributes(champ_attributes)
       champ.valid?(:prefill)
     end
-
   end
 end
diff --git a/app/models/types_de_champ/prefill_type_de_champ.rb b/app/models/types_de_champ/prefill_type_de_champ.rb
index 6a4e6a047..e389315fa 100644
--- a/app/models/types_de_champ/prefill_type_de_champ.rb
+++ b/app/models/types_de_champ/prefill_type_de_champ.rb
@@ -72,8 +72,4 @@ class TypesDeChamp::PrefillTypeDeChamp < SimpleDelegator
   def description
     @description ||= I18n.t("views.prefill_descriptions.edit.possible_values.#{type_champ}_html", default: nil)&.html_safe # rubocop:disable Rails/OutputSafety
   end
-
-  def transform_value_to_assignable_attributes(value)
-    { value: value }
-  end
 end
diff --git a/spec/models/prefill_params_spec.rb b/spec/models/prefill_params_spec.rb
index 1842b9900..53f15ed17 100644
--- a/spec/models/prefill_params_spec.rb
+++ b/spec/models/prefill_params_spec.rb
@@ -146,7 +146,7 @@ RSpec.describe PrefillParams do
       let(:type_de_champ_child_value) { "value" }
       let(:type_de_champ_child_value2) { "value2" }
 
-      let(:params) { { "champ_#{type_de_champ.to_typed_id}" => ["{\"#{type_de_champ_child.libelle}\":\"#{type_de_champ_child_value}\"}", "{\"#{type_de_champ_child.libelle}\":\"#{type_de_champ_child_value2}\"}"] } }
+      let(:params) { { "champ_#{type_de_champ.to_typed_id}" => ["{\"#{type_de_champ_child.to_typed_id}\":\"#{type_de_champ_child_value}\"}", "{\"#{type_de_champ_child.to_typed_id}\":\"#{type_de_champ_child_value2}\"}"] } }
 
       it "builds an array of hash(id, value) matching the given params" do
         expect(prefill_params_array).to match([{ id: type_de_champ_child.champ.first.id, value: type_de_champ_child_value }, { id: type_de_champ_child.champ.second.id, value: type_de_champ_child_value2 }])
@@ -180,7 +180,7 @@ RSpec.describe PrefillParams do
       let(:type_de_champ_child_value) { "value" }
       let(:type_de_champ_child_value2) { "value2" }
 
-      let(:params) { { "champ_#{type_de_champ.to_typed_id}" => ["{\"#{type_de_champ_child.libelle}\":\"#{type_de_champ_child_value}\"}", "{\"#{type_de_champ_child.libelle}\":\"#{type_de_champ_child_value2}\"}"] } }
+      let(:params) { { "champ_#{type_de_champ.to_typed_id}" => ["{\"#{type_de_champ_child.to_typed_id}\":\"#{type_de_champ_child_value}\"}", "{\"#{type_de_champ_child.to_typed_id}\":\"#{type_de_champ_child_value2}\"}"] } }
 
       it "builds an array of hash(id, value) matching the given params" do
         expect(prefill_params_array).to match([{ id: type_de_champ_child.champ.first.id, value: type_de_champ_child_value }, { id: type_de_champ_child.champ.second.id, value: type_de_champ_child_value2 }])
@@ -227,7 +227,7 @@ RSpec.describe PrefillParams do
       end
     end
 
-    context "when the public type de champ is unauthorized because of wrong value libelle (repetition)" do
+    context "when the public type de champ is unauthorized because of wrong value typed_id (repetition)" do
       let(:types_de_champ_public) { [{ type: :repetition, children: [{ type: :text }] }] }
       let(:type_de_champ) { procedure.published_revision.types_de_champ_public.first }
       let(:type_de_champ_child) { procedure.published_revision.children_of(type_de_champ).first }
diff --git a/spec/models/types_de_champ/prefill_type_de_champ_spec.rb b/spec/models/types_de_champ/prefill_type_de_champ_spec.rb
index 45ea7dce9..a4b1655e5 100644
--- a/spec/models/types_de_champ/prefill_type_de_champ_spec.rb
+++ b/spec/models/types_de_champ/prefill_type_de_champ_spec.rb
@@ -137,12 +137,4 @@ RSpec.describe TypesDeChamp::PrefillTypeDeChamp, type: :model do
 
     it { is_expected.to match({ id: champ.id, value: value }) }
   end
-
-  describe '#transform_value_to_assignable_attributes' do
-    let(:type_de_champ) { build(:type_de_champ_email) }
-    let(:value) { "any@email.org" }
-    subject(:transform_value_to_assignable_attributes) { described_class.build(type_de_champ).transform_value_to_assignable_attributes(value) }
-
-    it { is_expected.to match({ value: value }) }
-  end
 end

From d2452980fe6262e6f75db6f1c40fdef62f17f920 Mon Sep 17 00:00:00 2001
From: Damien Le Thiec <damien.lethiec@gmail.com>
Date: Thu, 16 Feb 2023 17:28:18 +0100
Subject: [PATCH 079/202] Fix merge conflict spec

---
 ...l_multiple_drop_down_list_type_de_champ.rb |   6 +-
 spec/models/prefill_description_spec.rb       | 125 +++++++-----------
 .../prefill_epci_type_de_champ_spec.rb        |  13 +-
 .../prefill_pays_type_de_champ_spec.rb        |   2 +-
 .../prefill_region_type_de_champ_spec.rb      |   2 +-
 5 files changed, 61 insertions(+), 87 deletions(-)

diff --git a/app/models/types_de_champ/prefill_multiple_drop_down_list_type_de_champ.rb b/app/models/types_de_champ/prefill_multiple_drop_down_list_type_de_champ.rb
index 11992f53d..17bea90a4 100644
--- a/app/models/types_de_champ/prefill_multiple_drop_down_list_type_de_champ.rb
+++ b/app/models/types_de_champ/prefill_multiple_drop_down_list_type_de_champ.rb
@@ -1,8 +1,8 @@
 class TypesDeChamp::PrefillMultipleDropDownListTypeDeChamp < TypesDeChamp::PrefillDropDownListTypeDeChamp
   def example_value
-    return nil if possible_values.empty?
-    return possible_values.first if possible_values.one?
+    return nil if all_possible_values.empty?
+    return all_possible_values.first if all_possible_values.one?
 
-    [possible_values.first, possible_values.second]
+    [all_possible_values.first, all_possible_values.second]
   end
 end
diff --git a/spec/models/prefill_description_spec.rb b/spec/models/prefill_description_spec.rb
index 063eb2db3..dc8a62fa4 100644
--- a/spec/models/prefill_description_spec.rb
+++ b/spec/models/prefill_description_spec.rb
@@ -88,70 +88,13 @@ RSpec.describe PrefillDescription, type: :model do
 
   describe '#prefill_link', vcr: { cassette_name: 'api_geo_regions' } do
     let(:procedure) { create(:procedure) }
-    let(:type_de_champ) { create(:type_de_champ_text, procedure: procedure) }
-    let(:type_de_champ_repetition) { build(:type_de_champ_repetition, :with_types_de_champ, :with_region_types_de_champ, procedure: procedure) }
+    let(:type_de_champ_text) { build(:type_de_champ_text, procedure: procedure) }
+    let(:type_de_champ_epci) { build(:type_de_champ_epci, procedure: procedure) }
+    let(:type_de_champ_repetition) { create(:type_de_champ_repetition, :with_types_de_champ, :with_region_types_de_champ, procedure: procedure) }
     let(:prefillable_subchamps) { TypesDeChamp::PrefillRepetitionTypeDeChamp.new(type_de_champ_repetition).send(:prefillable_subchamps) }
     let(:region_repetition) { prefillable_subchamps.third }
     let(:prefill_description) { described_class.new(procedure) }
 
-    before { prefill_description.update(selected_type_de_champ_ids: [type_de_champ.id, type_de_champ_repetition.id]) }
-
-    it "builds the URL to create a new prefilled dossier" do
-      expect(prefill_description.prefill_link).to eq(
-        commencer_url(
-          path: procedure.path,
-          "champ_#{type_de_champ.to_typed_id}" => I18n.t("views.prefill_descriptions.edit.examples.#{type_de_champ.type_champ}"),
-          "champ_#{type_de_champ_repetition.to_typed_id}" => TypesDeChamp::PrefillTypeDeChamp.build(type_de_champ_repetition).example_value
-        )
-      )
-    end
-
-    context 'when the type de champ can have multiple values' do
-      let(:type_de_champ) { TypesDeChamp::PrefillTypeDeChamp.build(create(:type_de_champ_epci, procedure: procedure)) }
-
-      let(:memory_store) { ActiveSupport::Cache.lookup_store(:memory_store) }
-
-      before do
-        allow(Rails).to receive(:cache).and_return(memory_store)
-        Rails.cache.clear
-
-        VCR.insert_cassette('api_geo_departements')
-        VCR.insert_cassette('api_geo_epcis')
-      end
-
-      after do
-        VCR.eject_cassette('api_geo_departements')
-        VCR.eject_cassette('api_geo_epcis')
-      end
-
-      it 'builds the URL with array parameter' do
-        expect(prefill_description.prefill_link).to eq(
-          commencer_url(
-            path: procedure.path,
-            "champ_#{type_de_champ.to_typed_id}": type_de_champ.example_value
-          )
-        )
-      end
-    end
-  end
-
-  describe '#prefill_query', vcr: { cassette_name: 'api_geo_regions' } do
-    let(:procedure) { create(:procedure) }
-    let(:type_de_champ) { create(:type_de_champ_text, procedure: procedure) }
-    let(:type_de_champ_repetition) { build(:type_de_champ_repetition, :with_types_de_champ, :with_region_types_de_champ, procedure: procedure) }
-    let(:prefillable_subchamps) { TypesDeChamp::PrefillRepetitionTypeDeChamp.new(type_de_champ_repetition).send(:prefillable_subchamps) }
-    let(:region_repetition) { prefillable_subchamps.third }
-    let(:prefill_description) { described_class.new(procedure) }
-    let(:expected_query) do
-      <<~TEXT
-        curl --request POST '#{api_public_v1_dossiers_url(procedure)}' \\
-             --header 'Content-Type: application/json' \\
-             --data '{"champ_#{type_de_champ.to_typed_id}": "#{I18n.t("views.prefill_descriptions.edit.examples.#{type_de_champ.type_champ}")}", "champ_#{type_de_champ_repetition.to_typed_id}": #{TypesDeChamp::PrefillTypeDeChamp.build(type_de_champ_repetition).example_value}}'
-      TEXT
-    end
-
-    before { prefill_description.update(selected_type_de_champ_ids: [type_de_champ.id, type_de_champ_repetition.id]) }
-
     let(:memory_store) { ActiveSupport::Cache.lookup_store(:memory_store) }
 
     before do
@@ -161,7 +104,52 @@ RSpec.describe PrefillDescription, type: :model do
       VCR.insert_cassette('api_geo_departements')
       VCR.insert_cassette('api_geo_epcis')
 
-      prefill_description.update(selected_type_de_champ_ids: [type_de_champ.id])
+      prefill_description.update(selected_type_de_champ_ids: [type_de_champ_text.id, type_de_champ_epci.id, type_de_champ_repetition.id])
+    end
+
+    after do
+      VCR.eject_cassette('api_geo_departements')
+      VCR.eject_cassette('api_geo_epcis')
+    end
+
+    it "builds the URL to create a new prefilled dossier" do
+      expect(prefill_description.prefill_link).to eq(
+        commencer_url(
+          path: procedure.path,
+          "champ_#{type_de_champ_text.to_typed_id}" => TypesDeChamp::PrefillTypeDeChamp.build(type_de_champ_text).example_value,
+          "champ_#{type_de_champ_epci.to_typed_id}" => TypesDeChamp::PrefillTypeDeChamp.build(type_de_champ_epci).example_value,
+          "champ_#{type_de_champ_repetition.to_typed_id}" => TypesDeChamp::PrefillTypeDeChamp.build(type_de_champ_repetition).example_value
+        )
+      )
+    end
+  end
+
+  describe '#prefill_query', vcr: { cassette_name: 'api_geo_regions' } do
+    let(:procedure) { create(:procedure) }
+    let(:type_de_champ_text) { create(:type_de_champ_text, procedure: procedure) }
+    let(:type_de_champ_epci) { TypesDeChamp::PrefillTypeDeChamp.build(create(:type_de_champ_epci, procedure: procedure)) }
+    let(:type_de_champ_repetition) { build(:type_de_champ_repetition, :with_types_de_champ, :with_region_types_de_champ, procedure: procedure) }
+    let(:prefillable_subchamps) { TypesDeChamp::PrefillRepetitionTypeDeChamp.new(type_de_champ_repetition).send(:prefillable_subchamps) }
+    let(:region_repetition) { prefillable_subchamps.third }
+    let(:prefill_description) { described_class.new(procedure) }
+    let(:expected_query) do
+      <<~TEXT
+        curl --request POST '#{api_public_v1_dossiers_url(procedure)}' \\
+             --header 'Content-Type: application/json' \\
+             --data '{"champ_#{type_de_champ_text.to_typed_id}": "#{TypesDeChamp::PrefillTypeDeChamp.build(type_de_champ_text).example_value}", "champ_#{type_de_champ_epci.to_typed_id}": #{TypesDeChamp::PrefillTypeDeChamp.build(type_de_champ_epci).example_value}, "champ_#{type_de_champ_repetition.to_typed_id}": #{TypesDeChamp::PrefillTypeDeChamp.build(type_de_champ_repetition).example_value}}'
+      TEXT
+    end
+
+    let(:memory_store) { ActiveSupport::Cache.lookup_store(:memory_store) }
+
+    before do
+      allow(Rails).to receive(:cache).and_return(memory_store)
+      Rails.cache.clear
+
+      VCR.insert_cassette('api_geo_departements')
+      VCR.insert_cassette('api_geo_epcis')
+
+      prefill_description.update(selected_type_de_champ_ids: [type_de_champ_text.id, type_de_champ_epci.id, type_de_champ_repetition.id])
     end
 
     after do
@@ -172,20 +160,5 @@ RSpec.describe PrefillDescription, type: :model do
     it "builds the query to create a new prefilled dossier" do
       expect(prefill_description.prefill_query).to eq(expected_query)
     end
-
-    context 'when the type de champ can have multiple values' do
-      let(:type_de_champ) { TypesDeChamp::PrefillTypeDeChamp.build(create(:type_de_champ_epci, procedure: procedure)) }
-      let(:expected_query) do
-        <<~TEXT
-          curl --request POST '#{api_public_v1_dossiers_url(procedure)}' \\
-               --header 'Content-Type: application/json' \\
-               --data '{"champ_#{type_de_champ.to_typed_id}": #{type_de_champ.example_value}}'
-        TEXT
-      end
-
-      it 'builds the query with array parameter' do
-        expect(prefill_description.prefill_query).to eq(expected_query)
-      end
-    end
   end
 end
diff --git a/spec/models/types_de_champ/prefill_epci_type_de_champ_spec.rb b/spec/models/types_de_champ/prefill_epci_type_de_champ_spec.rb
index ef59b9df3..ae68772f8 100644
--- a/spec/models/types_de_champ/prefill_epci_type_de_champ_spec.rb
+++ b/spec/models/types_de_champ/prefill_epci_type_de_champ_spec.rb
@@ -2,6 +2,7 @@
 
 RSpec.describe TypesDeChamp::PrefillEpciTypeDeChamp do
   let(:type_de_champ) { build(:type_de_champ_epci) }
+  let(:champ) { create(:champ_epci, type_de_champ: type_de_champ) }
   let(:memory_store) { ActiveSupport::Cache.lookup_store(:memory_store) }
 
   before do
@@ -57,32 +58,32 @@ RSpec.describe TypesDeChamp::PrefillEpciTypeDeChamp do
 
     context 'when the value is nil' do
       let(:value) { nil }
-      it { is_expected.to match({ code_departement: nil, value: nil }) }
+      it { is_expected.to match({ code_departement: nil, value: nil, id: champ.id }) }
     end
 
     context 'when the value is empty' do
       let(:value) { '' }
-      it { is_expected.to match({ code_departement: nil, value: nil }) }
+      it { is_expected.to match({ code_departement: nil, value: nil, id: champ.id }) }
     end
 
     context 'when the value is a string' do
       let(:value) { 'hello' }
-      it { is_expected.to match({ code_departement: nil, value: nil }) }
+      it { is_expected.to match({ code_departement: nil, value: nil, id: champ.id }) }
     end
 
     context 'when the value is an array of one element' do
       let(:value) { ['01'] }
-      it { is_expected.to match({ code_departement: '01', value: nil }) }
+      it { is_expected.to match({ code_departement: '01', value: nil, id: champ.id }) }
     end
 
     context 'when the value is an array of two elements' do
       let(:value) { ['01', '200042935'] }
-      it { is_expected.to match({ code_departement: '01', value: '200042935' }) }
+      it { is_expected.to match({ code_departement: '01', value: '200042935', id: champ.id }) }
     end
 
     context 'when the value is an array of three or more elements' do
       let(:value) { ['01', '200042935', 'hello'] }
-      it { is_expected.to match({ code_departement: '01', value: '200042935' }) }
+      it { is_expected.to match({ code_departement: '01', value: '200042935', id: champ.id }) }
     end
   end
 
diff --git a/spec/models/types_de_champ/prefill_pays_type_de_champ_spec.rb b/spec/models/types_de_champ/prefill_pays_type_de_champ_spec.rb
index 7a353da35..36f5aebcb 100644
--- a/spec/models/types_de_champ/prefill_pays_type_de_champ_spec.rb
+++ b/spec/models/types_de_champ/prefill_pays_type_de_champ_spec.rb
@@ -10,7 +10,7 @@ RSpec.describe TypesDeChamp::PrefillPaysTypeDeChamp, type: :model do
   end
 
   describe '#possible_values' do
-    let(:expected_values) { "Un <a href=\"https://en.wikipedia.org/wiki/ISO_3166-2\" target=\"_blank\">code pays ISO 3166-2</a><br><a title=\"Toutes les valeurs possibles — Nouvel onglet\" target=\"_blank\" rel=\"noopener noreferrer\" href=\"/procedures/#{procedure.path}/prefill_type_de_champs/#{type_de_champ.id}\">Voir toutes les valeurs possibles</a>" }
+    let(:expected_values) { "Un <a href=\"https://en.wikipedia.org/wiki/ISO_3166-2\" target=\"_blank\" rel=\"noopener noreferrer\">code pays ISO 3166-2</a><br><a title=\"Toutes les valeurs possibles — Nouvel onglet\" target=\"_blank\" rel=\"noopener noreferrer\" href=\"/procedures/#{procedure.path}/prefill_type_de_champs/#{type_de_champ.id}\">Voir toutes les valeurs possibles</a>" }
     subject(:possible_values) { described_class.new(type_de_champ).possible_values }
 
     before { type_de_champ.reload }
diff --git a/spec/models/types_de_champ/prefill_region_type_de_champ_spec.rb b/spec/models/types_de_champ/prefill_region_type_de_champ_spec.rb
index 31d7b7a86..3a73fedc4 100644
--- a/spec/models/types_de_champ/prefill_region_type_de_champ_spec.rb
+++ b/spec/models/types_de_champ/prefill_region_type_de_champ_spec.rb
@@ -17,7 +17,7 @@ RSpec.describe TypesDeChamp::PrefillRegionTypeDeChamp, type: :model do
   end
 
   describe '#possible_values', vcr: { cassette_name: 'api_geo_regions' } do
-    let(:expected_values) { "Un <a href=\"https://fr.wikipedia.org/wiki/R%C3%A9gion_fran%C3%A7aise\" target=\"_blank\">code INSEE de région</a><br><a title=\"Toutes les valeurs possibles — Nouvel onglet\" target=\"_blank\" rel=\"noopener noreferrer\" href=\"/procedures/#{procedure.path}/prefill_type_de_champs/#{type_de_champ.id}\">Voir toutes les valeurs possibles</a>" }
+    let(:expected_values) { "Un <a href=\"https://fr.wikipedia.org/wiki/R%C3%A9gion_fran%C3%A7aise\" target=\"_blank\" rel=\"noopener noreferrer\">code INSEE de région</a><br><a title=\"Toutes les valeurs possibles — Nouvel onglet\" target=\"_blank\" rel=\"noopener noreferrer\" href=\"/procedures/#{procedure.path}/prefill_type_de_champs/#{type_de_champ.id}\">Voir toutes les valeurs possibles</a>" }
     subject(:possible_values) { described_class.new(type_de_champ).possible_values }
 
     before { type_de_champ.reload }

From b85eeedd6c0fdb8a663f0efb9cb4fb201eed6298 Mon Sep 17 00:00:00 2001
From: sebastiencarceles <sebastien.carceles@gmail.com>
Date: Tue, 14 Feb 2023 09:14:27 +0100
Subject: [PATCH 080/202] remove departements and regions migration specs

---
 ...20230207144243_normalize_regions_spec.rake | 139 ------
 ...208084036_normalize_departements_spec.rake | 409 ------------------
 2 files changed, 548 deletions(-)
 delete mode 100644 spec/lib/tasks/deployment/20230207144243_normalize_regions_spec.rake
 delete mode 100644 spec/lib/tasks/deployment/20230208084036_normalize_departements_spec.rake

diff --git a/spec/lib/tasks/deployment/20230207144243_normalize_regions_spec.rake b/spec/lib/tasks/deployment/20230207144243_normalize_regions_spec.rake
deleted file mode 100644
index 3a049fddc..000000000
--- a/spec/lib/tasks/deployment/20230207144243_normalize_regions_spec.rake
+++ /dev/null
@@ -1,139 +0,0 @@
-describe '20230207144243_normalize_regions', vcr: { cassette_name: 'api_geo_regions' } do
-  let(:champ) { create(:champ_regions) }
-  let(:rake_task) { Rake::Task['after_party:normalize_regions'] }
-  let(:memory_store) { ActiveSupport::Cache.lookup_store(:memory_store) }
-
-  subject(:run_task) { rake_task.invoke }
-
-  before do
-    allow(Rails).to receive(:cache).and_return(memory_store)
-    Rails.cache.clear
-  end
-
-  after { rake_task.reenable }
-
-  shared_examples "a non-changer" do |external_id, value|
-    before { champ.update_columns(external_id:, value:) }
-
-    it { expect { run_task }.not_to change { champ.reload.external_id } }
-
-    it { expect { run_task }.not_to change { champ.reload.value } }
-  end
-
-  shared_examples "an external_id nullifier" do |external_id, value|
-    before { champ.update_columns(external_id:, value:) }
-
-    it { expect { run_task }.to change { champ.reload.external_id }.from(external_id).to(nil) }
-
-    it { expect { run_task }.not_to change { champ.reload.value } }
-  end
-
-  shared_examples "a value nullifier" do |external_id, value|
-    before { champ.update_columns(external_id:, value:) }
-
-    it { expect { run_task }.not_to change { champ.reload.external_id } }
-
-    it { expect { run_task }.to change { champ.reload.value }.from(value).to(nil) }
-  end
-
-  shared_examples "an external_id and value nullifier" do |external_id, value|
-    before { champ.update_columns(external_id:, value:) }
-
-    it { expect { run_task }.to change { champ.reload.external_id }.from(external_id).to(nil) }
-
-    it { expect { run_task }.to change { champ.reload.value }.from(value).to(nil) }
-  end
-
-  shared_examples "an external_id updater" do |external_id, value, expected_external_id|
-    before { champ.update_columns(external_id:, value:) }
-
-    it { expect { run_task }.to change { champ.reload.external_id }.from(external_id).to(expected_external_id) }
-
-    it { expect { run_task }.not_to change { champ.reload.value } }
-  end
-
-  shared_examples "a result checker" do |external_id, value, expected_external_id, expected_value|
-    before do
-      champ.update_columns(external_id:, value:)
-      run_task
-    end
-
-    it { expect(champ.reload.external_id).to eq(expected_external_id) }
-
-    it { expect(champ.reload.value).to eq(expected_value) }
-  end
-
-  shared_examples "a value updater" do |external_id, value, expected_value|
-    before { champ.update_columns(external_id:, value:) }
-
-    it { expect { run_task }.not_to change { champ.reload.external_id } }
-
-    it { expect { run_task }.to change { champ.reload.value }.from(value).to(expected_value) }
-  end
-
-  it_behaves_like "a non-changer", nil, nil
-  it_behaves_like "an external_id nullifier", '', nil
-  it_behaves_like "a value nullifier", nil, ''
-  it_behaves_like "an external_id and value nullifier", '', ''
-  it_behaves_like "an external_id updater", nil, 'Auvergne-Rhône-Alpes', '84'
-  it_behaves_like "an external_id updater", '', 'Auvergne-Rhône-Alpes', '84'
-  it_behaves_like "a value updater", '11', nil, 'Île-de-France'
-
-  # Integrity data check:
-  it_behaves_like "a result checker", "84", "Auvergne-Rhône-Alpes", "84", "Auvergne-Rhône-Alpes"
-  it_behaves_like "a result checker", nil, "Auvergne-Rhône-Alpes", "84", "Auvergne-Rhône-Alpes"
-  it_behaves_like "a result checker", '', "Auvergne-Rhône-Alpes", "84", "Auvergne-Rhône-Alpes"
-  it_behaves_like "a result checker", "27", "Bourgogne-Franche-Comté", "27", "Bourgogne-Franche-Comté"
-  it_behaves_like "a result checker", nil, "Bourgogne-Franche-Comté", "27", "Bourgogne-Franche-Comté"
-  it_behaves_like "a result checker", '', "Bourgogne-Franche-Comté", "27", "Bourgogne-Franche-Comté"
-  it_behaves_like "a result checker", "53", "Bretagne", "53", "Bretagne"
-  it_behaves_like "a result checker", nil, "Bretagne", "53", "Bretagne"
-  it_behaves_like "a result checker", '', "Bretagne", "53", "Bretagne"
-  it_behaves_like "a result checker", "24", "Centre-Val de Loire", "24", "Centre-Val de Loire"
-  it_behaves_like "a result checker", nil, "Centre-Val de Loire", "24", "Centre-Val de Loire"
-  it_behaves_like "a result checker", '', "Centre-Val de Loire", "24", "Centre-Val de Loire"
-  it_behaves_like "a result checker", "94", "Corse", "94", "Corse"
-  it_behaves_like "a result checker", nil, "Corse", "94", "Corse"
-  it_behaves_like "a result checker", '', "Corse", "94", "Corse"
-  it_behaves_like "a result checker", "44", "Grand Est", "44", "Grand Est"
-  it_behaves_like "a result checker", nil, "Grand Est", "44", "Grand Est"
-  it_behaves_like "a result checker", '', "Grand Est", "44", "Grand Est"
-  it_behaves_like "a result checker", "01", "Guadeloupe", "01", "Guadeloupe"
-  it_behaves_like "a result checker", nil, "Guadeloupe", "01", "Guadeloupe"
-  it_behaves_like "a result checker", '', "Guadeloupe", "01", "Guadeloupe"
-  it_behaves_like "a result checker", "03", "Guyane", "03", "Guyane"
-  it_behaves_like "a result checker", nil, "Guyane", "03", "Guyane"
-  it_behaves_like "a result checker", '', "Guyane", "03", "Guyane"
-  it_behaves_like "a result checker", "32", "Hauts-de-France", "32", "Hauts-de-France"
-  it_behaves_like "a result checker", nil, "Hauts-de-France", "32", "Hauts-de-France"
-  it_behaves_like "a result checker", '', "Hauts-de-France", "32", "Hauts-de-France"
-  it_behaves_like "a result checker", "04", "La Réunion", "04", "La Réunion"
-  it_behaves_like "a result checker", nil, "La Réunion", "04", "La Réunion"
-  it_behaves_like "a result checker", '', "La Réunion", "04", "La Réunion"
-  it_behaves_like "a result checker", "02", "Martinique", "02", "Martinique"
-  it_behaves_like "a result checker", nil, "Martinique", "02", "Martinique"
-  it_behaves_like "a result checker", '', "Martinique", "02", "Martinique"
-  it_behaves_like "a result checker", "06", "Mayotte", "06", "Mayotte"
-  it_behaves_like "a result checker", nil, "Mayotte", "06", "Mayotte"
-  it_behaves_like "a result checker", '', "Mayotte", "06", "Mayotte"
-  it_behaves_like "a result checker", "28", "Normandie", "28", "Normandie"
-  it_behaves_like "a result checker", nil, "Normandie", "28", "Normandie"
-  it_behaves_like "a result checker", '', "Normandie", "28", "Normandie"
-  it_behaves_like "a result checker", "75", "Nouvelle-Aquitaine", "75", "Nouvelle-Aquitaine"
-  it_behaves_like "a result checker", nil, "Nouvelle-Aquitaine", "75", "Nouvelle-Aquitaine"
-  it_behaves_like "a result checker", '', "Nouvelle-Aquitaine", "75", "Nouvelle-Aquitaine"
-  it_behaves_like "a result checker", "76", "Occitanie", "76", "Occitanie"
-  it_behaves_like "a result checker", nil, "Occitanie", "76", "Occitanie"
-  it_behaves_like "a result checker", '', "Occitanie", "76", "Occitanie"
-  it_behaves_like "a result checker", "52", "Pays de la Loire", "52", "Pays de la Loire"
-  it_behaves_like "a result checker", nil, "Pays de la Loire", "52", "Pays de la Loire"
-  it_behaves_like "a result checker", '', "Pays de la Loire", "52", "Pays de la Loire"
-  it_behaves_like "a result checker", "93", "Provence-Alpes-Côte d'Azur", "93", "Provence-Alpes-Côte d’Azur"
-  it_behaves_like "a result checker", nil, "Provence-Alpes-Côte d'Azur", "93", "Provence-Alpes-Côte d’Azur"
-  it_behaves_like "a result checker", '', "Provence-Alpes-Côte d'Azur", "93", "Provence-Alpes-Côte d’Azur"
-  it_behaves_like "a result checker", "93", "Provence-Alpes-Côte d’Azur", "93", "Provence-Alpes-Côte d’Azur"
-  it_behaves_like "a result checker", "11", "Île-de-France", "11", "Île-de-France"
-  it_behaves_like "a result checker", "11", nil, "11", "Île-de-France"
-  it_behaves_like "a result checker", nil, "Île-de-France", "11", "Île-de-France"
-  it_behaves_like "a result checker", '', "Île-de-France", "11", "Île-de-France"
-end
diff --git a/spec/lib/tasks/deployment/20230208084036_normalize_departements_spec.rake b/spec/lib/tasks/deployment/20230208084036_normalize_departements_spec.rake
deleted file mode 100644
index 968f37fb3..000000000
--- a/spec/lib/tasks/deployment/20230208084036_normalize_departements_spec.rake
+++ /dev/null
@@ -1,409 +0,0 @@
-# frozen_string_literal: true
-
-RSpec.describe '20230208084036_normalize_departements', vcr: { cassette_name: 'api_geo_departements' } do
-  let(:champ) { create(:champ_departements) }
-  let(:rake_task) { Rake::Task['after_party:normalize_departements'] }
-  let(:memory_store) { ActiveSupport::Cache.lookup_store(:memory_store) }
-
-  subject(:run_task) { perform_enqueued_jobs { rake_task.invoke } }
-
-  before do
-    allow(Rails).to receive(:cache).and_return(memory_store)
-    Rails.cache.clear
-  end
-
-  after { rake_task.reenable }
-
-  shared_examples "a non-changer" do |external_id, value|
-    before { champ.update_columns(external_id:, value:) }
-
-    it { expect { run_task }.not_to change { champ.reload.external_id } }
-
-    it { expect { run_task }.not_to change { champ.reload.value } }
-  end
-
-  shared_examples "an external_id nullifier" do |external_id, value|
-    before { champ.update_columns(external_id:, value:) }
-
-    it { expect { run_task }.to change { champ.reload.external_id }.from(external_id).to(nil) }
-
-    it { expect { run_task }.not_to change { champ.reload.value } }
-  end
-
-  shared_examples "a value nullifier" do |external_id, value|
-    before { champ.update_columns(external_id:, value:) }
-
-    it { expect { run_task }.not_to change { champ.reload.external_id } }
-
-    it { expect { run_task }.to change { champ.reload.value }.from(value).to(nil) }
-  end
-
-  shared_examples "an external_id and value nullifier" do |external_id, value|
-    before { champ.update_columns(external_id:, value:) }
-
-    it { expect { run_task }.to change { champ.reload.external_id }.from(external_id).to(nil) }
-
-    it { expect { run_task }.to change { champ.reload.value }.from(value).to(nil) }
-  end
-
-  shared_examples "an external_id updater" do |external_id, value, expected_external_id|
-    before { champ.update_columns(external_id:, value:) }
-
-    it { expect { run_task }.to change { champ.reload.external_id }.from(external_id).to(expected_external_id) }
-
-    it { expect { run_task }.not_to change { champ.reload.value } }
-  end
-
-  shared_examples "a value updater" do |external_id, value, expected_value|
-    before { champ.update_columns(external_id:, value:) }
-
-    it { expect { run_task }.not_to change { champ.reload.external_id } }
-
-    it { expect { run_task }.to change { champ.reload.value }.from(value).to(expected_value) }
-  end
-
-  shared_examples "an external_id and value updater" do |external_id, value, expected_external_id, expected_value|
-    before { champ.update_columns(external_id:, value:) }
-
-    it { expect { run_task }.to change { champ.reload.external_id }.from(external_id).to(expected_external_id) }
-
-    it { expect { run_task }.to change { champ.reload.value }.from(value).to(expected_value) }
-  end
-
-  shared_examples "a result checker" do |external_id, value, expected_external_id, expected_value|
-    before do
-      champ.update_columns(external_id:, value:)
-      run_task
-    end
-
-    it { expect(champ.reload.external_id).to eq(expected_external_id) }
-
-    it { expect(champ.reload.value).to eq(expected_value) }
-  end
-
-  it_behaves_like "a non-changer", nil, nil
-  it_behaves_like "an external_id nullifier", '', nil
-  it_behaves_like "a value nullifier", nil, ''
-  it_behaves_like "an external_id and value nullifier", '', ''
-  it_behaves_like "an external_id updater", nil, 'Ain', '01'
-  it_behaves_like "an external_id updater", '', 'Ain', '01'
-  it_behaves_like "a value updater", '01', nil, 'Ain'
-  it_behaves_like "a value updater", '01', '', 'Ain'
-  it_behaves_like "an external_id and value updater", nil, '01 - Ain', '01', 'Ain'
-  it_behaves_like "an external_id and value updater", '', '01 - Ain', '01', 'Ain'
-
-  # Integrity data check:
-  it_behaves_like "a result checker", "972", nil, "972", "Martinique"
-  it_behaves_like "a result checker", "92", nil, "92", "Hauts-de-Seine"
-  it_behaves_like "a result checker", "01", nil, "01", "Ain"
-  it_behaves_like "a result checker", "82", nil, "82", "Tarn-et-Garonne"
-  it_behaves_like "a result checker", "01", "01 - Ain", "01", "Ain"
-  it_behaves_like "a result checker", '', "01 - Ain", "01", "Ain"
-  it_behaves_like "a result checker", nil, "01 - Ain", "01", "Ain"
-  it_behaves_like "a result checker", "02", "02 - Aisne", "02", "Aisne"
-  it_behaves_like "a result checker", nil, "02 - Aisne", "02", "Aisne"
-  it_behaves_like "a result checker", '', "02 - Aisne", "02", "Aisne"
-  it_behaves_like "a result checker", "03", "03 - Allier", "03", "Allier"
-  it_behaves_like "a result checker", nil, "03 - Allier", "03", "Allier"
-  it_behaves_like "a result checker", '', "03 - Allier", "03", "Allier"
-  it_behaves_like "a result checker", "04", "04 - Alpes-de-Haute-Provence", "04", "Alpes-de-Haute-Provence"
-  it_behaves_like "a result checker", nil, "04 - Alpes-de-Haute-Provence", "04", "Alpes-de-Haute-Provence"
-  it_behaves_like "a result checker", '', "04 - Alpes-de-Haute-Provence", "04", "Alpes-de-Haute-Provence"
-  it_behaves_like "a result checker", "05", "05 - Hautes-Alpes", "05", "Hautes-Alpes"
-  it_behaves_like "a result checker", nil, "05 - Hautes-Alpes", "05", "Hautes-Alpes"
-  it_behaves_like "a result checker", '', "05 - Hautes-Alpes", "05", "Hautes-Alpes"
-  it_behaves_like "a result checker", nil, "06 - Alpes-Maritimes", "06", "Alpes-Maritimes"
-  it_behaves_like "a result checker", "06", "06 - Alpes-Maritimes", "06", "Alpes-Maritimes"
-  it_behaves_like "a result checker", '', "06 - Alpes-Maritimes", "06", "Alpes-Maritimes"
-  it_behaves_like "a result checker", "07", "07 - Ardèche", "07", "Ardèche"
-  it_behaves_like "a result checker", nil, "07 - Ardèche", "07", "Ardèche"
-  it_behaves_like "a result checker", '', "07 - Ardèche", "07", "Ardèche"
-  it_behaves_like "a result checker", "08", "08 - Ardennes", "08", "Ardennes"
-  it_behaves_like "a result checker", nil, "08 - Ardennes", "08", "Ardennes"
-  it_behaves_like "a result checker", '', "08 - Ardennes", "08", "Ardennes"
-  it_behaves_like "a result checker", "09", "09 - Ariège", "09", "Ariège"
-  it_behaves_like "a result checker", nil, "09 - Ariège", "09", "Ariège"
-  it_behaves_like "a result checker", '', "09 - Ariège", "09", "Ariège"
-  it_behaves_like "a result checker", nil, "10 - Aube", "10", "Aube"
-  it_behaves_like "a result checker", "10", "10 - Aube", "10", "Aube"
-  it_behaves_like "a result checker", '', "10 - Aube", "10", "Aube"
-  it_behaves_like "a result checker", "11", "11 - Aude", "11", "Aude"
-  it_behaves_like "a result checker", nil, "11 - Aude", "11", "Aude"
-  it_behaves_like "a result checker", '', "11 - Aude", "11", "Aude"
-  it_behaves_like "a result checker", "12", "12 - Aveyron", "12", "Aveyron"
-  it_behaves_like "a result checker", nil, "12 - Aveyron", "12", "Aveyron"
-  it_behaves_like "a result checker", '', "12 - Aveyron", "12", "Aveyron"
-  it_behaves_like "a result checker", "13", "13 - Bouches-du-Rhône", "13", "Bouches-du-Rhône"
-  it_behaves_like "a result checker", nil, "13 - Bouches-du-Rhône", "13", "Bouches-du-Rhône"
-  it_behaves_like "a result checker", '', "13 - Bouches-du-Rhône", "13", "Bouches-du-Rhône"
-  it_behaves_like "a result checker", "14", "14 - Calvados", "14", "Calvados"
-  it_behaves_like "a result checker", nil, "14 - Calvados", "14", "Calvados"
-  it_behaves_like "a result checker", '', "14 - Calvados", "14", "Calvados"
-  it_behaves_like "a result checker", "15", "15 - Cantal", "15", "Cantal"
-  it_behaves_like "a result checker", nil, "15 - Cantal", "15", "Cantal"
-  it_behaves_like "a result checker", '', "15 - Cantal", "15", "Cantal"
-  it_behaves_like "a result checker", "16", "16 - Charente", "16", "Charente"
-  it_behaves_like "a result checker", nil, "16 - Charente", "16", "Charente"
-  it_behaves_like "a result checker", '', "16 - Charente", "16", "Charente"
-  it_behaves_like "a result checker", "17", "17 - Charente-Maritime", "17", "Charente-Maritime"
-  it_behaves_like "a result checker", nil, "17 - Charente-Maritime", "17", "Charente-Maritime"
-  it_behaves_like "a result checker", '', "17 - Charente-Maritime", "17", "Charente-Maritime"
-  it_behaves_like "a result checker", "18", "18 - Cher", "18", "Cher"
-  it_behaves_like "a result checker", nil, "18 - Cher", "18", "Cher"
-  it_behaves_like "a result checker", '', "18 - Cher", "18", "Cher"
-  it_behaves_like "a result checker", "19", "19 - Corrèze", "19", "Corrèze"
-  it_behaves_like "a result checker", nil, "19 - Corrèze", "19", "Corrèze"
-  it_behaves_like "a result checker", '', "19 - Corrèze", "19", "Corrèze"
-  it_behaves_like "a result checker", "21", "21 - Côte-d’Or", "21", "Côte-d’Or"
-  it_behaves_like "a result checker", '', "21 - Côte-d’Or", "21", "Côte-d’Or"
-  it_behaves_like "a result checker", nil, "21 - Côte-d’Or", "21", "Côte-d’Or"
-  it_behaves_like "a result checker", "22", "22 - Côtes-d’Armor", "22", "Côtes-d’Armor"
-  it_behaves_like "a result checker", nil, "22 - Côtes-d’Armor", "22", "Côtes-d’Armor"
-  it_behaves_like "a result checker", '', "22 - Côtes-d’Armor", "22", "Côtes-d’Armor"
-  it_behaves_like "a result checker", "23", "23 - Creuse", "23", "Creuse"
-  it_behaves_like "a result checker", nil, "23 - Creuse", "23", "Creuse"
-  it_behaves_like "a result checker", '', "23 - Creuse", "23", "Creuse"
-  it_behaves_like "a result checker", "24", "24 - Dordogne", "24", "Dordogne"
-  it_behaves_like "a result checker", nil, "24 - Dordogne", "24", "Dordogne"
-  it_behaves_like "a result checker", '', "24 - Dordogne", "24", "Dordogne"
-  it_behaves_like "a result checker", "25", "25 - Doubs", "25", "Doubs"
-  it_behaves_like "a result checker", nil, "25 - Doubs", "25", "Doubs"
-  it_behaves_like "a result checker", '', "25 - Doubs", "25", "Doubs"
-  it_behaves_like "a result checker", "26", "26 - Drôme", "26", "Drôme"
-  it_behaves_like "a result checker", nil, "26 - Drôme", "26", "Drôme"
-  it_behaves_like "a result checker", '', "26 - Drôme", "26", "Drôme"
-  it_behaves_like "a result checker", "27", "27 - Eure", "27", "Eure"
-  it_behaves_like "a result checker", nil, "27 - Eure", "27", "Eure"
-  it_behaves_like "a result checker", '', "27 - Eure", "27", "Eure"
-  it_behaves_like "a result checker", "28", "28 - Eure-et-Loir", "28", "Eure-et-Loir"
-  it_behaves_like "a result checker", nil, "28 - Eure-et-Loir", "28", "Eure-et-Loir"
-  it_behaves_like "a result checker", '', "28 - Eure-et-Loir", "28", "Eure-et-Loir"
-  it_behaves_like "a result checker", "29", "29 - Finistère", "29", "Finistère"
-  it_behaves_like "a result checker", nil, "29 - Finistère", "29", "Finistère"
-  it_behaves_like "a result checker", '', "29 - Finistère", "29", "Finistère"
-  it_behaves_like "a result checker", "2A", "2A - Corse-du-Sud", "2A", "Corse-du-Sud"
-  it_behaves_like "a result checker", nil, "2A - Corse-du-Sud", "2A", "Corse-du-Sud"
-  it_behaves_like "a result checker", '', "2A - Corse-du-Sud", "2A", "Corse-du-Sud"
-  it_behaves_like "a result checker", "2B", "2B - Haute-Corse", "2B", "Haute-Corse"
-  it_behaves_like "a result checker", nil, "2B - Haute-Corse", "2B", "Haute-Corse"
-  it_behaves_like "a result checker", '', "2B - Haute-Corse", "2B", "Haute-Corse"
-  it_behaves_like "a result checker", "30", "30 - Gard", "30", "Gard"
-  it_behaves_like "a result checker", nil, "30 - Gard", "30", "Gard"
-  it_behaves_like "a result checker", '', "30 - Gard", "30", "Gard"
-  it_behaves_like "a result checker", "31", "31 - Haute-Garonne", "31", "Haute-Garonne"
-  it_behaves_like "a result checker", nil, "31 - Haute-Garonne", "31", "Haute-Garonne"
-  it_behaves_like "a result checker", '', "31 - Haute-Garonne", "31", "Haute-Garonne"
-  it_behaves_like "a result checker", "32", "32 - Gers", "32", "Gers"
-  it_behaves_like "a result checker", nil, "32 - Gers", "32", "Gers"
-  it_behaves_like "a result checker", '', "32 - Gers", "32", "Gers"
-  it_behaves_like "a result checker", "33", "33 - Gironde", "33", "Gironde"
-  it_behaves_like "a result checker", nil, "33 - Gironde", "33", "Gironde"
-  it_behaves_like "a result checker", '', "33 - Gironde", "33", "Gironde"
-  it_behaves_like "a result checker", "34", "34 - Hérault", "34", "Hérault"
-  it_behaves_like "a result checker", nil, "34 - Hérault", "34", "Hérault"
-  it_behaves_like "a result checker", '', "34 - Hérault", "34", "Hérault"
-  it_behaves_like "a result checker", "35", "35 - Ille-et-Vilaine", "35", "Ille-et-Vilaine"
-  it_behaves_like "a result checker", nil, "35 - Ille-et-Vilaine", "35", "Ille-et-Vilaine"
-  it_behaves_like "a result checker", '', "35 - Ille-et-Vilaine", "35", "Ille-et-Vilaine"
-  it_behaves_like "a result checker", "36", "36 - Indre", "36", "Indre"
-  it_behaves_like "a result checker", nil, "36 - Indre", "36", "Indre"
-  it_behaves_like "a result checker", '', "36 - Indre", "36", "Indre"
-  it_behaves_like "a result checker", "37", "37 - Indre-et-Loire", "37", "Indre-et-Loire"
-  it_behaves_like "a result checker", nil, "37 - Indre-et-Loire", "37", "Indre-et-Loire"
-  it_behaves_like "a result checker", '', "37 - Indre-et-Loire", "37", "Indre-et-Loire"
-  it_behaves_like "a result checker", "38", "38 - Isère", "38", "Isère"
-  it_behaves_like "a result checker", nil, "38 - Isère", "38", "Isère"
-  it_behaves_like "a result checker", '', "38 - Isère", "38", "Isère"
-  it_behaves_like "a result checker", "39", "39 - Jura", "39", "Jura"
-  it_behaves_like "a result checker", nil, "39 - Jura", "39", "Jura"
-  it_behaves_like "a result checker", '', "39 - Jura", "39", "Jura"
-  it_behaves_like "a result checker", "40", "40 - Landes", "40", "Landes"
-  it_behaves_like "a result checker", nil, "40 - Landes", "40", "Landes"
-  it_behaves_like "a result checker", '', "40 - Landes", "40", "Landes"
-  it_behaves_like "a result checker", "41", "41 - Loir-et-Cher", "41", "Loir-et-Cher"
-  it_behaves_like "a result checker", nil, "41 - Loir-et-Cher", "41", "Loir-et-Cher"
-  it_behaves_like "a result checker", '', "41 - Loir-et-Cher", "41", "Loir-et-Cher"
-  it_behaves_like "a result checker", "42", "42 - Loire", "42", "Loire"
-  it_behaves_like "a result checker", nil, "42 - Loire", "42", "Loire"
-  it_behaves_like "a result checker", '', "42 - Loire", "42", "Loire"
-  it_behaves_like "a result checker", "43", "43 - Haute-Loire", "43", "Haute-Loire"
-  it_behaves_like "a result checker", nil, "43 - Haute-Loire", "43", "Haute-Loire"
-  it_behaves_like "a result checker", '', "43 - Haute-Loire", "43", "Haute-Loire"
-  it_behaves_like "a result checker", "44", "44 - Loire-Atlantique", "44", "Loire-Atlantique"
-  it_behaves_like "a result checker", nil, "44 - Loire-Atlantique", "44", "Loire-Atlantique"
-  it_behaves_like "a result checker", '', "44 - Loire-Atlantique", "44", "Loire-Atlantique"
-  it_behaves_like "a result checker", "45", "45 - Loiret", "45", "Loiret"
-  it_behaves_like "a result checker", nil, "45 - Loiret", "45", "Loiret"
-  it_behaves_like "a result checker", '', "45 - Loiret", "45", "Loiret"
-  it_behaves_like "a result checker", "46", "46 - Lot", "46", "Lot"
-  it_behaves_like "a result checker", nil, "46 - Lot", "46", "Lot"
-  it_behaves_like "a result checker", '', "46 - Lot", "46", "Lot"
-  it_behaves_like "a result checker", "47", "47 - Lot-et-Garonne", "47", "Lot-et-Garonne"
-  it_behaves_like "a result checker", nil, "47 - Lot-et-Garonne", "47", "Lot-et-Garonne"
-  it_behaves_like "a result checker", '', "47 - Lot-et-Garonne", "47", "Lot-et-Garonne"
-  it_behaves_like "a result checker", "48", "48 - Lozère", "48", "Lozère"
-  it_behaves_like "a result checker", nil, "48 - Lozère", "48", "Lozère"
-  it_behaves_like "a result checker", '', "48 - Lozère", "48", "Lozère"
-  it_behaves_like "a result checker", "49", "49 - Maine-et-Loire", "49", "Maine-et-Loire"
-  it_behaves_like "a result checker", nil, "49 - Maine-et-Loire", "49", "Maine-et-Loire"
-  it_behaves_like "a result checker", '', "49 - Maine-et-Loire", "49", "Maine-et-Loire"
-  it_behaves_like "a result checker", "50", "50 - Manche", "50", "Manche"
-  it_behaves_like "a result checker", nil, "50 - Manche", "50", "Manche"
-  it_behaves_like "a result checker", '', "50 - Manche", "50", "Manche"
-  it_behaves_like "a result checker", "51", "51 - Marne", "51", "Marne"
-  it_behaves_like "a result checker", '', "51 - Marne", "51", "Marne"
-  it_behaves_like "a result checker", nil, "51 - Marne", "51", "Marne"
-  it_behaves_like "a result checker", "52", "52 - Haute-Marne", "52", "Haute-Marne"
-  it_behaves_like "a result checker", nil, "52 - Haute-Marne", "52", "Haute-Marne"
-  it_behaves_like "a result checker", '', "52 - Haute-Marne", "52", "Haute-Marne"
-  it_behaves_like "a result checker", "53", "53 - Mayenne", "53", "Mayenne"
-  it_behaves_like "a result checker", nil, "53 - Mayenne", "53", "Mayenne"
-  it_behaves_like "a result checker", '', "53 - Mayenne", "53", "Mayenne"
-  it_behaves_like "a result checker", "54", "54 - Meurthe-et-Moselle", "54", "Meurthe-et-Moselle"
-  it_behaves_like "a result checker", '', "54 - Meurthe-et-Moselle", "54", "Meurthe-et-Moselle"
-  it_behaves_like "a result checker", nil, "54 - Meurthe-et-Moselle", "54", "Meurthe-et-Moselle"
-  it_behaves_like "a result checker", nil, "55 - Meuse", "55", "Meuse"
-  it_behaves_like "a result checker", "55", "55 - Meuse", "55", "Meuse"
-  it_behaves_like "a result checker", '', "55 - Meuse", "55", "Meuse"
-  it_behaves_like "a result checker", "56", "56 - Morbihan", "56", "Morbihan"
-  it_behaves_like "a result checker", nil, "56 - Morbihan", "56", "Morbihan"
-  it_behaves_like "a result checker", '', "56 - Morbihan", "56", "Morbihan"
-  it_behaves_like "a result checker", "57", "57 - Moselle", "57", "Moselle"
-  it_behaves_like "a result checker", nil, "57 - Moselle", "57", "Moselle"
-  it_behaves_like "a result checker", '', "57 - Moselle", "57", "Moselle"
-  it_behaves_like "a result checker", "58", "58 - Nièvre", "58", "Nièvre"
-  it_behaves_like "a result checker", nil, "58 - Nièvre", "58", "Nièvre"
-  it_behaves_like "a result checker", '', "58 - Nièvre", "58", "Nièvre"
-  it_behaves_like "a result checker", "59", "59 - Nord", "59", "Nord"
-  it_behaves_like "a result checker", nil, "59 - Nord", "59", "Nord"
-  it_behaves_like "a result checker", '', "59 - Nord", "59", "Nord"
-  it_behaves_like "a result checker", "60", "60 - Oise", "60", "Oise"
-  it_behaves_like "a result checker", nil, "60 - Oise", "60", "Oise"
-  it_behaves_like "a result checker", '', "60 - Oise", "60", "Oise"
-  it_behaves_like "a result checker", "61", "61 - Orne", "61", "Orne"
-  it_behaves_like "a result checker", nil, "61 - Orne", "61", "Orne"
-  it_behaves_like "a result checker", '', "61 - Orne", "61", "Orne"
-  it_behaves_like "a result checker", nil, "62 - Pas-de-Calais", "62", "Pas-de-Calais"
-  it_behaves_like "a result checker", "62", "62 - Pas-de-Calais", "62", "Pas-de-Calais"
-  it_behaves_like "a result checker", '', "62 - Pas-de-Calais", "62", "Pas-de-Calais"
-  it_behaves_like "a result checker", "63", "63 - Puy-de-Dôme", "63", "Puy-de-Dôme"
-  it_behaves_like "a result checker", nil, "63 - Puy-de-Dôme", "63", "Puy-de-Dôme"
-  it_behaves_like "a result checker", '', "63 - Puy-de-Dôme", "63", "Puy-de-Dôme"
-  it_behaves_like "a result checker", "64", "64 - Pyrénées-Atlantiques", "64", "Pyrénées-Atlantiques"
-  it_behaves_like "a result checker", nil, "64 - Pyrénées-Atlantiques", "64", "Pyrénées-Atlantiques"
-  it_behaves_like "a result checker", '', "64 - Pyrénées-Atlantiques", "64", "Pyrénées-Atlantiques"
-  it_behaves_like "a result checker", "65", "65 - Hautes-Pyrénées", "65", "Hautes-Pyrénées"
-  it_behaves_like "a result checker", nil, "65 - Hautes-Pyrénées", "65", "Hautes-Pyrénées"
-  it_behaves_like "a result checker", '', "65 - Hautes-Pyrénées", "65", "Hautes-Pyrénées"
-  it_behaves_like "a result checker", "66", "66 - Pyrénées-Orientales", "66", "Pyrénées-Orientales"
-  it_behaves_like "a result checker", nil, "66 - Pyrénées-Orientales", "66", "Pyrénées-Orientales"
-  it_behaves_like "a result checker", '', "66 - Pyrénées-Orientales", "66", "Pyrénées-Orientales"
-  it_behaves_like "a result checker", "67", "67 - Bas-Rhin", "67", "Bas-Rhin"
-  it_behaves_like "a result checker", nil, "67 - Bas-Rhin", "67", "Bas-Rhin"
-  it_behaves_like "a result checker", '', "67 - Bas-Rhin", "67", "Bas-Rhin"
-  it_behaves_like "a result checker", "68", "68 - Haut-Rhin", "68", "Haut-Rhin"
-  it_behaves_like "a result checker", nil, "68 - Haut-Rhin", "68", "Haut-Rhin"
-  it_behaves_like "a result checker", '', "68 - Haut-Rhin", "68", "Haut-Rhin"
-  it_behaves_like "a result checker", "69", "69 - Rhône", "69", "Rhône"
-  it_behaves_like "a result checker", nil, "69 - Rhône", "69", "Rhône"
-  it_behaves_like "a result checker", '', "69 - Rhône", "69", "Rhône"
-  it_behaves_like "a result checker", "70", "70 - Haute-Saône", "70", "Haute-Saône"
-  it_behaves_like "a result checker", nil, "70 - Haute-Saône", "70", "Haute-Saône"
-  it_behaves_like "a result checker", '', "70 - Haute-Saône", "70", "Haute-Saône"
-  it_behaves_like "a result checker", "71", "71 - Saône-et-Loire", "71", "Saône-et-Loire"
-  it_behaves_like "a result checker", nil, "71 - Saône-et-Loire", "71", "Saône-et-Loire"
-  it_behaves_like "a result checker", '', "71 - Saône-et-Loire", "71", "Saône-et-Loire"
-  it_behaves_like "a result checker", "72", "72 - Sarthe", "72", "Sarthe"
-  it_behaves_like "a result checker", nil, "72 - Sarthe", "72", "Sarthe"
-  it_behaves_like "a result checker", '', "72 - Sarthe", "72", "Sarthe"
-  it_behaves_like "a result checker", "73", "73 - Savoie", "73", "Savoie"
-  it_behaves_like "a result checker", nil, "73 - Savoie", "73", "Savoie"
-  it_behaves_like "a result checker", '', "73 - Savoie", "73", "Savoie"
-  it_behaves_like "a result checker", "74", "74 - Haute-Savoie", "74", "Haute-Savoie"
-  it_behaves_like "a result checker", nil, "74 - Haute-Savoie", "74", "Haute-Savoie"
-  it_behaves_like "a result checker", '', "74 - Haute-Savoie", "74", "Haute-Savoie"
-  it_behaves_like "a result checker", "75", "75 - Paris", "75", "Paris"
-  it_behaves_like "a result checker", nil, "75 - Paris", "75", "Paris"
-  it_behaves_like "a result checker", '', "75 - Paris", "75", "Paris"
-  it_behaves_like "a result checker", "76", "76 - Seine-Maritime", "76", "Seine-Maritime"
-  it_behaves_like "a result checker", nil, "76 - Seine-Maritime", "76", "Seine-Maritime"
-  it_behaves_like "a result checker", '', "76 - Seine-Maritime", "76", "Seine-Maritime"
-  it_behaves_like "a result checker", "77", "77 - Seine-et-Marne", "77", "Seine-et-Marne"
-  it_behaves_like "a result checker", nil, "77 - Seine-et-Marne", "77", "Seine-et-Marne"
-  it_behaves_like "a result checker", '', "77 - Seine-et-Marne", "77", "Seine-et-Marne"
-  it_behaves_like "a result checker", "78", "78 - Yvelines", "78", "Yvelines"
-  it_behaves_like "a result checker", '', "78 - Yvelines", "78", "Yvelines"
-  it_behaves_like "a result checker", nil, "78 - Yvelines", "78", "Yvelines"
-  it_behaves_like "a result checker", "79", "79 - Deux-Sèvres", "79", "Deux-Sèvres"
-  it_behaves_like "a result checker", nil, "79 - Deux-Sèvres", "79", "Deux-Sèvres"
-  it_behaves_like "a result checker", '', "79 - Deux-Sèvres", "79", "Deux-Sèvres"
-  it_behaves_like "a result checker", "80", "80 - Somme", "80", "Somme"
-  it_behaves_like "a result checker", nil, "80 - Somme", "80", "Somme"
-  it_behaves_like "a result checker", '', "80 - Somme", "80", "Somme"
-  it_behaves_like "a result checker", "81", "81 - Tarn", "81", "Tarn"
-  it_behaves_like "a result checker", '', "81 - Tarn", "81", "Tarn"
-  it_behaves_like "a result checker", nil, "81 - Tarn", "81", "Tarn"
-  it_behaves_like "a result checker", "82", "82 - Tarn-et-Garonne", "82", "Tarn-et-Garonne"
-  it_behaves_like "a result checker", nil, "82 - Tarn-et-Garonne", "82", "Tarn-et-Garonne"
-  it_behaves_like "a result checker", '', "82 - Tarn-et-Garonne", "82", "Tarn-et-Garonne"
-  it_behaves_like "a result checker", "83", "83 - Var", "83", "Var"
-  it_behaves_like "a result checker", nil, "83 - Var", "83", "Var"
-  it_behaves_like "a result checker", '', "83 - Var", "83", "Var"
-  it_behaves_like "a result checker", "84", "84 - Vaucluse", "84", "Vaucluse"
-  it_behaves_like "a result checker", nil, "84 - Vaucluse", "84", "Vaucluse"
-  it_behaves_like "a result checker", '', "84 - Vaucluse", "84", "Vaucluse"
-  it_behaves_like "a result checker", nil, "85", "85", "Vendée"
-  it_behaves_like "a result checker", "85", "85 - Vendée", "85", "Vendée"
-  it_behaves_like "a result checker", nil, "85 - Vendée", "85", "Vendée"
-  it_behaves_like "a result checker", '', "85 - Vendée", "85", "Vendée"
-  it_behaves_like "a result checker", "86", "86 - Vienne", "86", "Vienne"
-  it_behaves_like "a result checker", nil, "86 - Vienne", "86", "Vienne"
-  it_behaves_like "a result checker", '', "86 - Vienne", "86", "Vienne"
-  it_behaves_like "a result checker", "87", "87 - Haute-Vienne", "87", "Haute-Vienne"
-  it_behaves_like "a result checker", nil, "87 - Haute-Vienne", "87", "Haute-Vienne"
-  it_behaves_like "a result checker", '', "87 - Haute-Vienne", "87", "Haute-Vienne"
-  it_behaves_like "a result checker", "88", "88 - Vosges", "88", "Vosges"
-  it_behaves_like "a result checker", nil, "88 - Vosges", "88", "Vosges"
-  it_behaves_like "a result checker", '', "88 - Vosges", "88", "Vosges"
-  it_behaves_like "a result checker", "89", "89 - Yonne", "89", "Yonne"
-  it_behaves_like "a result checker", nil, "89 - Yonne", "89", "Yonne"
-  it_behaves_like "a result checker", '', "89 - Yonne", "89", "Yonne"
-  it_behaves_like "a result checker", "90", "90 - Territoire de Belfort", "90", "Territoire de Belfort"
-  it_behaves_like "a result checker", nil, "90 - Territoire de Belfort", "90", "Territoire de Belfort"
-  it_behaves_like "a result checker", '', "90 - Territoire de Belfort", "90", "Territoire de Belfort"
-  it_behaves_like "a result checker", "91", "91 - Essonne", "91", "Essonne"
-  it_behaves_like "a result checker", nil, "91 - Essonne", "91", "Essonne"
-  it_behaves_like "a result checker", '', "91 - Essonne", "91", "Essonne"
-  it_behaves_like "a result checker", "92", "92 - Hauts-de-Seine", "92", "Hauts-de-Seine"
-  it_behaves_like "a result checker", nil, "92 - Hauts-de-Seine", "92", "Hauts-de-Seine"
-  it_behaves_like "a result checker", '', "92 - Hauts-de-Seine", "92", "Hauts-de-Seine"
-  it_behaves_like "a result checker", "93", "93 - Seine-Saint-Denis", "93", "Seine-Saint-Denis"
-  it_behaves_like "a result checker", nil, "93 - Seine-Saint-Denis", "93", "Seine-Saint-Denis"
-  it_behaves_like "a result checker", '', "93 - Seine-Saint-Denis", "93", "Seine-Saint-Denis"
-  it_behaves_like "a result checker", "94", "94 - Val-de-Marne", "94", "Val-de-Marne"
-  it_behaves_like "a result checker", nil, "94 - Val-de-Marne", "94", "Val-de-Marne"
-  it_behaves_like "a result checker", '', "94 - Val-de-Marne", "94", "Val-de-Marne"
-  it_behaves_like "a result checker", "95", "95 - Val-d’Oise", "95", "Val-d’Oise"
-  it_behaves_like "a result checker", '', "95 - Val-d’Oise", "95", "Val-d’Oise"
-  it_behaves_like "a result checker", nil, "95 - Val-d’Oise", "95", "Val-d’Oise"
-  it_behaves_like "a result checker", "971", "971 - Guadeloupe", "971", "Guadeloupe"
-  it_behaves_like "a result checker", nil, "971 - Guadeloupe", "971", "Guadeloupe"
-  it_behaves_like "a result checker", '', "971 - Guadeloupe", "971", "Guadeloupe"
-  it_behaves_like "a result checker", "972", "972 - Martinique", "972", "Martinique"
-  it_behaves_like "a result checker", nil, "972 - Martinique", "972", "Martinique"
-  it_behaves_like "a result checker", '', "972 - Martinique", "972", "Martinique"
-  it_behaves_like "a result checker", "973", "973 - Guyane", "973", "Guyane"
-  it_behaves_like "a result checker", nil, "973 - Guyane", "973", "Guyane"
-  it_behaves_like "a result checker", '', "973 - Guyane", "973", "Guyane"
-  it_behaves_like "a result checker", "974", "974 - La Réunion", "974", "La Réunion"
-  it_behaves_like "a result checker", nil, "974 - La Réunion", "974", "La Réunion"
-  it_behaves_like "a result checker", '', "974 - La Réunion", "974", "La Réunion"
-  it_behaves_like "a result checker", "976", "976 - Mayotte", "976", "Mayotte"
-  it_behaves_like "a result checker", nil, "976 - Mayotte", "976", "Mayotte"
-  it_behaves_like "a result checker", '', "976 - Mayotte", "976", "Mayotte"
-  it_behaves_like "a result checker", "99", "99 - Etranger", "99", "Etranger"
-  it_behaves_like "a result checker", nil, "99 - Etranger", "99", "Etranger"
-  it_behaves_like "a result checker", '', "99 - Etranger", "99", "Etranger"
-  it_behaves_like "a result checker", '', "99 - Étranger", "99", "Etranger"
-  it_behaves_like "a result checker", nil, "99 - Étranger", "99", "Etranger"
-end

From 68de0c656650105b3331b59853389680859d4751 Mon Sep 17 00:00:00 2001
From: Martin <martin@sharypic.com>
Date: Fri, 17 Feb 2023 14:39:59 +0100
Subject: [PATCH 081/202] =?UTF-8?q?correctif(procedures#filtres):=20le=20f?=
 =?UTF-8?q?iltre=20par=20departement=20ne=20fonctionnait=20plus.=20utilise?=
 =?UTF-8?q?=20un=20enum=20sur=20la=20collection=20des=20departements=20pos?=
 =?UTF-8?q?sible=20normalis=C3=A9s?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/models/champ.rb                           |  1 +
 app/models/procedure_presentation.rb          |  6 +++--
 app/models/type_de_champ.rb                   | 10 +++++++
 spec/factories/champ.rb                       |  5 ++--
 .../instructeurs/procedure_filters_spec.rb    | 26 ++++++++++++++++++-
 5 files changed, 43 insertions(+), 5 deletions(-)

diff --git a/app/models/champ.rb b/app/models/champ.rb
index 02e6053e8..4f2f9533f 100644
--- a/app/models/champ.rb
+++ b/app/models/champ.rb
@@ -53,6 +53,7 @@ class Champ < ApplicationRecord
     :repetition?,
     :block?,
     :dossier_link?,
+    :departement?,
     :titre_identite?,
     :header_section?,
     :simple_drop_down_list?,
diff --git a/app/models/procedure_presentation.rb b/app/models/procedure_presentation.rb
index 4f536db34..8ea92b5f0 100644
--- a/app/models/procedure_presentation.rb
+++ b/app/models/procedure_presentation.rb
@@ -89,8 +89,8 @@ class ProcedurePresentation < ApplicationRecord
     end
 
     fields.concat procedure.types_de_champ_for_procedure_presentation
-      .pluck(:libelle, :private, :stable_id)
-      .map { |(libelle, is_private, stable_id)| field_hash(is_private ? TYPE_DE_CHAMP_PRIVATE : TYPE_DE_CHAMP, stable_id.to_s, label: libelle, type: :text) }
+      .pluck(:type_champ, :libelle, :private, :stable_id)
+      .map { |(type_champ, libelle, is_private, stable_id)| field_hash(is_private ? TYPE_DE_CHAMP_PRIVATE : TYPE_DE_CHAMP, stable_id.to_s, label: libelle, type: (type_champ == TypeDeChamp.type_champs.fetch(:departements) ? :enum : :text)) }
 
     fields
   end
@@ -335,6 +335,8 @@ class ProcedurePresentation < ApplicationRecord
           [_1.label, _1.id]
         end
       end
+    else
+      TypeDeChamp.find(field['column']).options_for_select
     end
   end
 
diff --git a/app/models/type_de_champ.rb b/app/models/type_de_champ.rb
index 354711ef2..33c37148a 100644
--- a/app/models/type_de_champ.rb
+++ b/app/models/type_de_champ.rb
@@ -369,6 +369,10 @@ class TypeDeChamp < ApplicationRecord
     type_champ == TypeDeChamp.type_champs.fetch(:pole_emploi)
   end
 
+  def departement?
+    type_champ == TypeDeChamp.type_champs.fetch(:departements)
+  end
+
   def mesri?
     type_champ == TypeDeChamp.type_champs.fetch(:mesri)
   end
@@ -405,6 +409,12 @@ class TypeDeChamp < ApplicationRecord
     self.drop_down_options = parse_drop_down_list_value(value)
   end
 
+  def options_for_select
+    if departement?
+      APIGeoService.departements.map { ["#{_1[:code]} – #{_1[:name]}", _1[:name]] }
+    end
+  end
+
   # historicaly we added a blank ("") option by default to avoid wrong selection
   #   see self.parse_drop_down_list_value
   #   then rails decided to add this blank ("") option when the select is required
diff --git a/spec/factories/champ.rb b/spec/factories/champ.rb
index d1f4448f8..52f740f5b 100644
--- a/spec/factories/champ.rb
+++ b/spec/factories/champ.rb
@@ -117,12 +117,13 @@ FactoryBot.define do
 
     factory :champ_departements, class: 'Champs::DepartementChamp' do
       type_de_champ { association :type_de_champ_departements, procedure: dossier.procedure }
-      value { '01' }
     end
 
     factory :champ_communes, class: 'Champs::CommuneChamp' do
       type_de_champ { association :type_de_champ_communes, procedure: dossier.procedure }
-      value { 'Paris' }
+      value { 'Coye-la-Forêt (60580)' }
+      value_json { { "departement" => "Oise", "code_departement" => "60" } }
+      external_id { { external_id: "60172" } }
     end
 
     factory :champ_epci, class: 'Champs::EpciChamp' do
diff --git a/spec/system/instructeurs/procedure_filters_spec.rb b/spec/system/instructeurs/procedure_filters_spec.rb
index 86430d082..b8bdd10b0 100644
--- a/spec/system/instructeurs/procedure_filters_spec.rb
+++ b/spec/system/instructeurs/procedure_filters_spec.rb
@@ -1,6 +1,6 @@
 describe "procedure filters" do
   let(:instructeur) { create(:instructeur) }
-  let(:procedure) { create(:procedure, :published, :with_type_de_champ, instructeurs: [instructeur]) }
+  let(:procedure) { create(:procedure, :published, :with_type_de_champ, :with_departement, instructeurs: [instructeur]) }
   let!(:type_de_champ) { procedure.active_revision.types_de_champ_public.first }
   let!(:new_unfollow_dossier) { create(:dossier, procedure: procedure, state: Dossier.states.fetch(:en_instruction)) }
   let!(:champ) { Champ.find_by(type_de_champ_id: type_de_champ.id, dossier_id: new_unfollow_dossier.id) }
@@ -94,6 +94,30 @@ describe "procedure filters" do
     click_button "Ajouter le filtre"
   end
 
+  describe 'with a vcr cassette', vcr: { cassette_name: 'api_geo_departements' } do
+    let(:memory_store) { ActiveSupport::Cache.lookup_store(:memory_store) }
+
+    before do
+      allow(Rails).to receive(:cache).and_return(memory_store)
+      Rails.cache.clear
+    end
+
+    scenario "should be able to find by departements with custom enum lookup", js: true do
+      departement_champ = new_unfollow_dossier.champs.find(&:departement?)
+      departement_champ.update!(value: 'Oise', external_id: '60')
+      departement_champ.reload
+      champ_select_value = "#{departement_champ.external_id} – #{departement_champ.value}"
+
+      click_on 'Sélectionner un filtre'
+      select departement_champ.libelle, from: "Colonne"
+      find("select#value", visible: true)
+      select champ_select_value, from: "Valeur"
+      click_button "Ajouter le filtre"
+      find("select#value", visible: false) # w8 for filter to be applied
+      expect(page).to have_link(new_unfollow_dossier.id.to_s)
+    end
+  end
+
   scenario "should be able to add and remove two filters for the same field", js: true do
     add_filter(type_de_champ.libelle, champ.value)
     add_filter(type_de_champ.libelle, champ_2.value)

From b0a757a89d3c7640273f51a377d7bb04779f24e0 Mon Sep 17 00:00:00 2001
From: Martin <martin@sharypic.com>
Date: Fri, 17 Feb 2023 14:41:13 +0100
Subject: [PATCH 082/202] =?UTF-8?q?chore(db):=20supprime=20un=20index=20no?=
 =?UTF-8?q?n=20utilis=C3=A9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ...0230216041517_remove_champs_external_id_index.rb | 13 +++++++++++++
 db/schema.rb                                        |  3 +--
 2 files changed, 14 insertions(+), 2 deletions(-)
 create mode 100644 db/migrate/20230216041517_remove_champs_external_id_index.rb

diff --git a/db/migrate/20230216041517_remove_champs_external_id_index.rb b/db/migrate/20230216041517_remove_champs_external_id_index.rb
new file mode 100644
index 000000000..1e5863b25
--- /dev/null
+++ b/db/migrate/20230216041517_remove_champs_external_id_index.rb
@@ -0,0 +1,13 @@
+class RemoveChampsExternalIdIndex < ActiveRecord::Migration[6.1]
+  include Database::MigrationHelpers
+
+  disable_ddl_transaction!
+
+  def up
+    remove_index :champs, column: :external_id
+  end
+
+  def down
+    add_concurrent_index :champs, :external_id
+  end
+end
diff --git a/db/schema.rb b/db/schema.rb
index 14d0f9498..8719631c4 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -227,13 +227,12 @@ ActiveRecord::Schema.define(version: 2023_02_16_141558) do
     t.datetime "rebased_at"
     t.string "row_id"
     t.string "type"
-    t.integer "type_de_champ_id", null: false
+    t.integer "type_de_champ_id"
     t.datetime "updated_at"
     t.string "value"
     t.jsonb "value_json"
     t.index ["dossier_id"], name: "index_champs_on_dossier_id"
     t.index ["etablissement_id"], name: "index_champs_on_etablissement_id"
-    t.index ["external_id"], name: "index_champs_on_external_id"
     t.index ["parent_id"], name: "index_champs_on_parent_id"
     t.index ["private"], name: "index_champs_on_private"
     t.index ["row_id"], name: "index_champs_on_row_id"

From a89f5d373f016d28643cec7352678a32e954e7b0 Mon Sep 17 00:00:00 2001
From: Martin <martin@sharypic.com>
Date: Mon, 20 Feb 2023 06:40:57 +0100
Subject: [PATCH 083/202] =?UTF-8?q?amelioration(procedures#filtres):=20fil?=
 =?UTF-8?q?tre=20par=20regions=20avec=20un=20enum=20sur=20la=20collection?=
 =?UTF-8?q?=20des=20regions=20normalis=C3=A9s?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/models/champ.rb                           |  1 +
 app/models/procedure_presentation.rb          |  2 +-
 app/models/type_de_champ.rb                   | 13 ++++++++++
 spec/factories/procedure.rb                   |  6 +++++
 .../instructeurs/procedure_filters_spec.rb    | 26 ++++++++++++++++++-
 5 files changed, 46 insertions(+), 2 deletions(-)

diff --git a/app/models/champ.rb b/app/models/champ.rb
index 4f2f9533f..ab8a9e252 100644
--- a/app/models/champ.rb
+++ b/app/models/champ.rb
@@ -54,6 +54,7 @@ class Champ < ApplicationRecord
     :block?,
     :dossier_link?,
     :departement?,
+    :region?,
     :titre_identite?,
     :header_section?,
     :simple_drop_down_list?,
diff --git a/app/models/procedure_presentation.rb b/app/models/procedure_presentation.rb
index 8ea92b5f0..9c2942884 100644
--- a/app/models/procedure_presentation.rb
+++ b/app/models/procedure_presentation.rb
@@ -90,7 +90,7 @@ class ProcedurePresentation < ApplicationRecord
 
     fields.concat procedure.types_de_champ_for_procedure_presentation
       .pluck(:type_champ, :libelle, :private, :stable_id)
-      .map { |(type_champ, libelle, is_private, stable_id)| field_hash(is_private ? TYPE_DE_CHAMP_PRIVATE : TYPE_DE_CHAMP, stable_id.to_s, label: libelle, type: (type_champ == TypeDeChamp.type_champs.fetch(:departements) ? :enum : :text)) }
+      .map { |(type_champ, libelle, is_private, stable_id)| field_hash(is_private ? TYPE_DE_CHAMP_PRIVATE : TYPE_DE_CHAMP, stable_id.to_s, label: libelle, type: (TypeDeChamp.options_for_select?(type_champ) ? :enum : :text)) }
 
     fields
   end
diff --git a/app/models/type_de_champ.rb b/app/models/type_de_champ.rb
index 33c37148a..ca681b213 100644
--- a/app/models/type_de_champ.rb
+++ b/app/models/type_de_champ.rb
@@ -373,6 +373,10 @@ class TypeDeChamp < ApplicationRecord
     type_champ == TypeDeChamp.type_champs.fetch(:departements)
   end
 
+  def region?
+    type_champ == TypeDeChamp.type_champs.fetch(:regions)
+  end
+
   def mesri?
     type_champ == TypeDeChamp.type_champs.fetch(:mesri)
   end
@@ -409,9 +413,18 @@ class TypeDeChamp < ApplicationRecord
     self.drop_down_options = parse_drop_down_list_value(value)
   end
 
+  def self.options_for_select?(type_champs)
+    [
+      TypeDeChamp.type_champs.fetch(:departements),
+      TypeDeChamp.type_champs.fetch(:regions)
+    ].include?(type_champs)
+  end
+
   def options_for_select
     if departement?
       APIGeoService.departements.map { ["#{_1[:code]} – #{_1[:name]}", _1[:name]] }
+    elsif region?
+      APIGeoService.regions.map { [_1[:name], _1[:name]] }
     end
   end
 
diff --git a/spec/factories/procedure.rb b/spec/factories/procedure.rb
index 2d700d783..263af1076 100644
--- a/spec/factories/procedure.rb
+++ b/spec/factories/procedure.rb
@@ -206,6 +206,12 @@ FactoryBot.define do
       end
     end
 
+    trait :with_region do
+      after(:build) do |procedure, _evaluator|
+        build(:type_de_champ_regions, procedure: procedure)
+      end
+    end
+
     trait :with_piece_justificative do
       after(:build) do |procedure, _evaluator|
         build(:type_de_champ_piece_justificative, procedure: procedure)
diff --git a/spec/system/instructeurs/procedure_filters_spec.rb b/spec/system/instructeurs/procedure_filters_spec.rb
index b8bdd10b0..fedfbee29 100644
--- a/spec/system/instructeurs/procedure_filters_spec.rb
+++ b/spec/system/instructeurs/procedure_filters_spec.rb
@@ -1,6 +1,6 @@
 describe "procedure filters" do
   let(:instructeur) { create(:instructeur) }
-  let(:procedure) { create(:procedure, :published, :with_type_de_champ, :with_departement, instructeurs: [instructeur]) }
+  let(:procedure) { create(:procedure, :published, :with_type_de_champ, :with_departement, :with_region, instructeurs: [instructeur]) }
   let!(:type_de_champ) { procedure.active_revision.types_de_champ_public.first }
   let!(:new_unfollow_dossier) { create(:dossier, procedure: procedure, state: Dossier.states.fetch(:en_instruction)) }
   let!(:champ) { Champ.find_by(type_de_champ_id: type_de_champ.id, dossier_id: new_unfollow_dossier.id) }
@@ -118,6 +118,30 @@ describe "procedure filters" do
     end
   end
 
+  describe 'with a vcr cassette', vcr: { cassette_name: 'api_geo_regions' } do
+    let(:memory_store) { ActiveSupport::Cache.lookup_store(:memory_store) }
+
+    before do
+      allow(Rails).to receive(:cache).and_return(memory_store)
+      Rails.cache.clear
+    end
+
+    scenario "should be able to find by departements with custom enum lookup", js: true do
+      region_champ = new_unfollow_dossier.champs.find(&:regions?)
+      region_champ.update!(value: 'Bretagne', external_id: '53')
+      region_champ.reload
+      champ_select_value = "#{region_champ.external_id} – #{region_champ.value}"
+
+      click_on 'Sélectionner un filtre'
+      select region_champ.libelle, from: "Colonne"
+      find("select#value", visible: true)
+      select champ_select_value, from: "Valeur"
+      click_button "Ajouter le filtre"
+      find("select#value", visible: false) # w8 for filter to be applied
+      expect(page).to have_link(new_unfollow_dossier.id.to_s)
+    end
+  end
+
   scenario "should be able to add and remove two filters for the same field", js: true do
     add_filter(type_de_champ.libelle, champ.value)
     add_filter(type_de_champ.libelle, champ_2.value)

From 5e10e680dc1bbf5725a743326ab605ef2177a731 Mon Sep 17 00:00:00 2001
From: Martin <martin@sharypic.com>
Date: Mon, 20 Feb 2023 06:57:41 +0100
Subject: [PATCH 084/202] =?UTF-8?q?chore(spec):=20corrige=20les=20spec=20c?=
 =?UTF-8?q?ass=C3=A9es=20et=20remanie=20un=20peu=20des=20specs=20ecrites?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 spec/factories/champ.rb                       |  3 ++-
 .../instructeurs/procedure_filters_spec.rb    | 20 +++++--------------
 2 files changed, 7 insertions(+), 16 deletions(-)

diff --git a/spec/factories/champ.rb b/spec/factories/champ.rb
index 52f740f5b..ca13c4325 100644
--- a/spec/factories/champ.rb
+++ b/spec/factories/champ.rb
@@ -117,13 +117,14 @@ FactoryBot.define do
 
     factory :champ_departements, class: 'Champs::DepartementChamp' do
       type_de_champ { association :type_de_champ_departements, procedure: dossier.procedure }
+      value { '01' }
     end
 
     factory :champ_communes, class: 'Champs::CommuneChamp' do
       type_de_champ { association :type_de_champ_communes, procedure: dossier.procedure }
       value { 'Coye-la-Forêt (60580)' }
       value_json { { "departement" => "Oise", "code_departement" => "60" } }
-      external_id { { external_id: "60172" } }
+      external_id { "60172" }
     end
 
     factory :champ_epci, class: 'Champs::EpciChamp' do
diff --git a/spec/system/instructeurs/procedure_filters_spec.rb b/spec/system/instructeurs/procedure_filters_spec.rb
index fedfbee29..5bfdc175e 100644
--- a/spec/system/instructeurs/procedure_filters_spec.rb
+++ b/spec/system/instructeurs/procedure_filters_spec.rb
@@ -94,7 +94,7 @@ describe "procedure filters" do
     click_button "Ajouter le filtre"
   end
 
-  describe 'with a vcr cassette', vcr: { cassette_name: 'api_geo_departements' } do
+  describe 'with a vcr cached cassette' do
     let(:memory_store) { ActiveSupport::Cache.lookup_store(:memory_store) }
 
     before do
@@ -102,7 +102,7 @@ describe "procedure filters" do
       Rails.cache.clear
     end
 
-    scenario "should be able to find by departements with custom enum lookup", js: true do
+    scenario "should be able to find by departements with custom enum lookup", js: true, vcr: { cassette_name: 'api_geo_departements' } do
       departement_champ = new_unfollow_dossier.champs.find(&:departement?)
       departement_champ.update!(value: 'Oise', external_id: '60')
       departement_champ.reload
@@ -116,26 +116,16 @@ describe "procedure filters" do
       find("select#value", visible: false) # w8 for filter to be applied
       expect(page).to have_link(new_unfollow_dossier.id.to_s)
     end
-  end
 
-  describe 'with a vcr cassette', vcr: { cassette_name: 'api_geo_regions' } do
-    let(:memory_store) { ActiveSupport::Cache.lookup_store(:memory_store) }
-
-    before do
-      allow(Rails).to receive(:cache).and_return(memory_store)
-      Rails.cache.clear
-    end
-
-    scenario "should be able to find by departements with custom enum lookup", js: true do
-      region_champ = new_unfollow_dossier.champs.find(&:regions?)
+    scenario "should be able to find by region with custom enum lookup", js: true, vcr: { cassette_name: 'api_geo_regions' } do
+      region_champ = new_unfollow_dossier.champs.find(&:region?)
       region_champ.update!(value: 'Bretagne', external_id: '53')
       region_champ.reload
-      champ_select_value = "#{region_champ.external_id} – #{region_champ.value}"
 
       click_on 'Sélectionner un filtre'
       select region_champ.libelle, from: "Colonne"
       find("select#value", visible: true)
-      select champ_select_value, from: "Valeur"
+      select region_champ.value, from: "Valeur"
       click_button "Ajouter le filtre"
       find("select#value", visible: false) # w8 for filter to be applied
       expect(page).to have_link(new_unfollow_dossier.id.to_s)

From 7c86df9d35b3567c0aeaac0511ab31ba14ca49fc Mon Sep 17 00:00:00 2001
From: Eric Leroy-Terquem <eric.leroyterquem@beta.gouv.fr>
Date: Fri, 17 Feb 2023 14:27:03 +0100
Subject: [PATCH 085/202] clean(groupe instructeur mailer): remove unused view

---
 .../add_instructeurs.html.haml                        | 11 -----------
 1 file changed, 11 deletions(-)
 delete mode 100644 app/views/groupe_instructeur_mailer/add_instructeurs.html.haml

diff --git a/app/views/groupe_instructeur_mailer/add_instructeurs.html.haml b/app/views/groupe_instructeur_mailer/add_instructeurs.html.haml
deleted file mode 100644
index ee899f212..000000000
--- a/app/views/groupe_instructeur_mailer/add_instructeurs.html.haml
+++ /dev/null
@@ -1,11 +0,0 @@
-%p
-  Bonjour,
-
-%p
-  = t('administrateurs.groupe_instructeurs.add_instructeur.email_body', count: @new_instructeur_emails.size, emails: @new_instructeur_emails.join(', '), groupe: @group.label, email: @current_instructeur_email, procedure: @group.procedure.libelle)
-
-%p
-  Cliquez sur le lien ci-dessous pour voir la liste des instructeurs de ce groupe :
-  = link_to(@group.label, admin_procedure_groupe_instructeur_url(@group.procedure, @group))
-
-= render partial: "layouts/mailers/signature"

From 343cb5fce6e77c66e5b1cddb3fcb1b455b53a2fc Mon Sep 17 00:00:00 2001
From: Eric Leroy-Terquem <eric.leroyterquem@beta.gouv.fr>
Date: Fri, 17 Feb 2023 15:24:12 +0100
Subject: [PATCH 086/202] feat(groupe instructeur mailer): add emailing to
 added instructeurs

---
 .../groupe_instructeurs_controller.rb         |  4 +++
 .../groupe_instructeurs_controller.rb         |  4 +++
 app/mailers/groupe_instructeur_mailer.rb      | 18 ++++++++++--
 .../notify_added_instructeurs.html.haml       |  8 +++++
 .../groupe_instructeurs/en.yml                |  8 +++--
 .../groupe_instructeurs/fr.yml                |  8 +++--
 .../groupe_instructeurs_controller_spec.rb    | 13 ++++++++-
 .../mailers/groupe_instructeur_mailer_spec.rb | 29 +++++++++++++++++--
 .../groupe_instructeur_mailer_preview.rb      |  8 +++++
 .../instructeurs/instructeur_creation_spec.rb |  2 +-
 10 files changed, 90 insertions(+), 12 deletions(-)
 create mode 100644 app/views/groupe_instructeur_mailer/notify_added_instructeurs.html.haml

diff --git a/app/controllers/administrateurs/groupe_instructeurs_controller.rb b/app/controllers/administrateurs/groupe_instructeurs_controller.rb
index 6ac2e3205..199b53b19 100644
--- a/app/controllers/administrateurs/groupe_instructeurs_controller.rb
+++ b/app/controllers/administrateurs/groupe_instructeurs_controller.rb
@@ -130,6 +130,10 @@ module Administrateurs
         else
           "Les instructeurs ont bien été affectés à la démarche"
         end
+
+        GroupeInstructeurMailer
+          .notify_added_instructeurs(groupe_instructeur, instructeurs, current_administrateur.email)
+          .deliver_later
       end
 
       if procedure.routing_enabled?
diff --git a/app/controllers/instructeurs/groupe_instructeurs_controller.rb b/app/controllers/instructeurs/groupe_instructeurs_controller.rb
index 631b37afc..398cb35ba 100644
--- a/app/controllers/instructeurs/groupe_instructeurs_controller.rb
+++ b/app/controllers/instructeurs/groupe_instructeurs_controller.rb
@@ -22,6 +22,10 @@ module Instructeurs
       else
         groupe_instructeur.add(instructeur)
         flash[:notice] = "L’instructeur « #{instructeur_email} » a été affecté au groupe."
+
+        GroupeInstructeurMailer
+          .notify_added_instructeurs(groupe_instructeur, [instructeur], current_user.email)
+          .deliver_later
       end
 
       redirect_to instructeur_groupe_path(procedure, groupe_instructeur)
diff --git a/app/mailers/groupe_instructeur_mailer.rb b/app/mailers/groupe_instructeur_mailer.rb
index fa438399d..f28fd5ca5 100644
--- a/app/mailers/groupe_instructeur_mailer.rb
+++ b/app/mailers/groupe_instructeur_mailer.rb
@@ -17,11 +17,25 @@ class GroupeInstructeurMailer < ApplicationMailer
     @current_instructeur_email = current_instructeur_email
     @still_assigned_to_procedure = removed_instructeur.in?(group.procedure.instructeurs)
     subject = if @still_assigned_to_procedure
-      "Vous avez été retiré du groupe \"#{group.label}\" de la démarche \"#{group.procedure.libelle}\""
+      "Vous avez été retiré(e) du groupe \"#{group.label}\" de la démarche \"#{group.procedure.libelle}\""
     else
-      "Vous avez été désaffecté de la démarche \"#{group.procedure.libelle}\""
+      "Vous avez été désaffecté(e) de la démarche \"#{group.procedure.libelle}\""
     end
 
     mail(to: removed_instructeur.email, subject: subject)
   end
+
+  def notify_added_instructeurs(group, added_instructeurs, current_instructeur_email)
+    added_instructeur_emails = added_instructeurs.map(&:email)
+    @group = group
+    @current_instructeur_email = current_instructeur_email
+
+    subject = if group.procedure.groupe_instructeurs.many?
+      "Vous avez été ajouté(e) au groupe \"#{group.label}\" de la démarche \"#{group.procedure.libelle}\""
+    else
+      "Vous avez été affecté(e) à la démarche \"#{group.procedure.libelle}\""
+    end
+
+    mail(bcc: added_instructeur_emails, subject: subject)
+  end
 end
diff --git a/app/views/groupe_instructeur_mailer/notify_added_instructeurs.html.haml b/app/views/groupe_instructeur_mailer/notify_added_instructeurs.html.haml
new file mode 100644
index 000000000..5640e8d25
--- /dev/null
+++ b/app/views/groupe_instructeur_mailer/notify_added_instructeurs.html.haml
@@ -0,0 +1,8 @@
+%p
+  Bonjour,
+
+%p
+  - number_of_groups = @group.procedure.groupe_instructeurs.many? ? 'many_groups' : 'one_group'
+  = t("administrateurs.groupe_instructeurs.notify_added_instructeurs.#{number_of_groups}.email_body", groupe: @group.label, email: @current_instructeur_email, procedure: @group.procedure.libelle)
+
+= render partial: "layouts/mailers/signature"
diff --git a/config/locales/views/administrateurs/groupe_instructeurs/en.yml b/config/locales/views/administrateurs/groupe_instructeurs/en.yml
index 49b54a6db..0b7e05743 100644
--- a/config/locales/views/administrateurs/groupe_instructeurs/en.yml
+++ b/config/locales/views/administrateurs/groupe_instructeurs/en.yml
@@ -16,9 +16,6 @@ en:
         assignment:
           one: "The instructor %{emails} was assigned to the group « %{groupe} »."
           other: "The instructors %{emails} were assigned to the group « %{groupe} »."
-        email_body:
-          one: "The instructor %{emails} was assigned to the group « %{groupe} » by « %{email} », in charge of procedure « %{procedure} »."
-          other: "The instructors %{emails} were assigned to the group « %{groupe} » by « %{email} », in charge of procedure « %{procedure} »."
       notify_group_when_instructeurs_removed:
         email_body:
           one: "The instructor %{emails} was removed from the group « %{groupe} » by « %{email} », in charge of procedure « %{procedure} »."
@@ -28,6 +25,11 @@ en:
           email_body: "You were unassigned from the procedure « %{procedure} » by « %{email} »."
         assigned:
           email_body: "You were removed from the group « %{groupe} » by « %{email} », in charge of procedure « %{procedure} »."
+      notify_added_instructeurs:
+        one_group:
+          email_body: "You were assigned to the procedure « %{procedure} » by « %{email} »."
+        many_groups:
+          email_body: "You were assigned to the group « %{groupe} » by « %{email} », in charge of procedure « %{procedure} »."
       reaffecter_dossiers:
         existing_groupe:
           one: "%{count} group exist"
diff --git a/config/locales/views/administrateurs/groupe_instructeurs/fr.yml b/config/locales/views/administrateurs/groupe_instructeurs/fr.yml
index 7ebd44c7d..686b9051d 100644
--- a/config/locales/views/administrateurs/groupe_instructeurs/fr.yml
+++ b/config/locales/views/administrateurs/groupe_instructeurs/fr.yml
@@ -22,9 +22,6 @@ fr:
         assignment:
           one: "L’instructeur %{emails} a été affecté au groupe « %{groupe} »."
           other: "Les instructeurs %{emails} ont été affectés au groupe « %{groupe} »."
-        email_body:
-          one: "L’instructeur %{emails} a été affecté au groupe « %{groupe} » par « %{email} », en charge de la démarche « %{procedure} »."
-          other: "Les instructeurs %{emails} ont été affectés au groupe « %{groupe} » par « %{email} », en charge de la démarche « %{procedure} »."
       notify_group_when_instructeurs_removed:
         email_body:
           one: "L’instructeur %{emails} a été retiré du groupe « %{groupe} » par « %{email} », en charge de la démarche « %{procedure} »."
@@ -34,6 +31,11 @@ fr:
           email_body: "Vous avez été retiré du groupe « %{groupe} » par « %{email} », en charge de la démarche « %{procedure} »."
         unassigned:
           email_body: "Vous avez été désaffecté de la démarche « %{procedure} » par « %{email} »."
+      notify_added_instructeurs:
+        one_group:
+          email_body: "Vous avez été affecté à la démarche « %{procedure} » par « %{email} »."
+        many_groups:
+          email_body: "Vous avez été ajouté au groupe « %{groupe} » par « %{email} », en charge de la démarche « %{procedure} »."
       reaffecter_dossiers:
         existing_groupe:
           one: "%{count} groupe existe"
diff --git a/spec/controllers/administrateurs/groupe_instructeurs_controller_spec.rb b/spec/controllers/administrateurs/groupe_instructeurs_controller_spec.rb
index 384a24756..b3b1f1a2f 100644
--- a/spec/controllers/administrateurs/groupe_instructeurs_controller_spec.rb
+++ b/spec/controllers/administrateurs/groupe_instructeurs_controller_spec.rb
@@ -268,11 +268,22 @@ describe Administrateurs::GroupeInstructeursController, type: :controller do
 
     context 'of a news instructeurs' do
       let(:new_instructeur_emails) { ['new_i1@mail.com', 'new_i2@mail.com'] }
-      before { do_request }
+      before do
+        allow(GroupeInstructeurMailer).to receive(:notify_added_instructeurs)
+          .and_return(double(deliver_later: true))
+        do_request
+      end
       it { expect(gi_1_2.instructeurs.pluck(:email)).to include(*new_instructeur_emails) }
       it { expect(flash.notice).to be_present }
       it { expect(response).to redirect_to(admin_procedure_groupe_instructeur_path(procedure, gi_1_2)) }
       it { expect(procedure.routing_enabled?).to be_truthy }
+      it "calls GroupeInstructeurMailer with the right params" do
+        expect(GroupeInstructeurMailer).to have_received(:notify_added_instructeurs).with(
+          gi_1_2,
+          gi_1_2.instructeurs.last(2),
+          admin.email
+        )
+      end
     end
 
     context 'of an instructeur already in the group' do
diff --git a/spec/mailers/groupe_instructeur_mailer_spec.rb b/spec/mailers/groupe_instructeur_mailer_spec.rb
index 6cf1ed75e..73a1abaa9 100644
--- a/spec/mailers/groupe_instructeur_mailer_spec.rb
+++ b/spec/mailers/groupe_instructeur_mailer_spec.rb
@@ -39,7 +39,7 @@ RSpec.describe GroupeInstructeurMailer, type: :mailer do
     before { groupe_instructeur.remove(instructeur_to_remove) }
 
     context 'when instructeur is fully removed form procedure' do
-      it { expect(subject.body).to include('Vous avez été désaffecté de la démarche') }
+      it { expect(subject.body).to include('Vous avez été désaffecté(e) de la démarche') }
       it { expect(subject.to).to include('int3@g') }
       it { expect(subject.to).not_to include('int1@g', 'int2@g') }
     end
@@ -51,9 +51,34 @@ RSpec.describe GroupeInstructeurMailer, type: :mailer do
         gi2
       end
 
-      it { expect(subject.body).to include('Vous avez été retiré du groupe « gi1 » par « toto@email.com »') }
+      it { expect(subject.body).to include('Vous avez été retiré(e) du groupe « gi1 » par « toto@email.com »') }
       it { expect(subject.to).to include('int3@g') }
       it { expect(subject.to).not_to include('int1@g', 'int2@g') }
     end
   end
+
+  describe '#notify_added_instructeurs' do
+    let(:procedure) { create(:procedure) }
+
+    let(:instructeurs_to_add) { [create(:instructeur, email: 'int3@g'), create(:instructeur, email: 'int4@g')] }
+
+    let(:current_instructeur_email) { 'toto@email.com' }
+
+    subject { described_class.notify_added_instructeurs(procedure.defaut_groupe_instructeur, instructeurs_to_add, current_instructeur_email) }
+
+    before { instructeurs_to_add.each { procedure.defaut_groupe_instructeur.add(_1) } }
+
+    context 'when there is only one group on procedure' do
+      it { expect(subject.body).to include('Vous avez été affecté(e) à la démarche') }
+      it { expect(subject.bcc).to match_array(['int3@g', 'int4@g']) }
+    end
+
+    context 'when there are many groups on procedure' do
+      let!(:groupe_instructeur_2) do
+        GroupeInstructeur.create(label: 'gi2', procedure: procedure)
+      end
+      it { expect(subject.body).to include('Vous avez été ajouté(e) au groupe') }
+      it { expect(subject.bcc).to match_array(['int3@g', 'int4@g']) }
+    end
+  end
 end
diff --git a/spec/mailers/previews/groupe_instructeur_mailer_preview.rb b/spec/mailers/previews/groupe_instructeur_mailer_preview.rb
index 4eab9b7d7..d423b0b25 100644
--- a/spec/mailers/previews/groupe_instructeur_mailer_preview.rb
+++ b/spec/mailers/previews/groupe_instructeur_mailer_preview.rb
@@ -14,4 +14,12 @@ class GroupeInstructeurMailerPreview < ActionMailer::Preview
     instructeur = Instructeur.last
     GroupeInstructeurMailer.notify_removed_instructeur(groupe, instructeur, current_instructeur_email)
   end
+
+  def notify_added_instructeurs
+    procedure = Procedure.new(id: 1, libelle: 'une superbe procedure')
+    groupe = GroupeInstructeur.new(id: 1, label: 'Val-De-Marne', procedure:)
+    current_instructeur_email = 'admin@dgfip.com'
+    instructeurs = Instructeur.limit(2)
+    GroupeInstructeurMailer.notify_added_instructeurs(groupe, instructeurs, current_instructeur_email)
+  end
 end
diff --git a/spec/system/instructeurs/instructeur_creation_spec.rb b/spec/system/instructeurs/instructeur_creation_spec.rb
index b3a78c574..04b2ed243 100644
--- a/spec/system/instructeurs/instructeur_creation_spec.rb
+++ b/spec/system/instructeurs/instructeur_creation_spec.rb
@@ -16,7 +16,7 @@ describe 'As an instructeur', js: true do
   end
 
   scenario 'I can register' do
-    confirmation_email = open_email(instructeur_email)
+    confirmation_email = emails_sent_to(instructeur_email).first
     token_params = confirmation_email.body.match(/token=[^"]+/)
 
     visit "users/activate?#{token_params}"

From 7b12ec3ffe9b2f60785338ce4f14cf9b21424d2f Mon Sep 17 00:00:00 2001
From: Eric Leroy-Terquem <eric.leroyterquem@beta.gouv.fr>
Date: Mon, 20 Feb 2023 15:06:47 +0100
Subject: [PATCH 087/202] refactor(groupe instructeur mailer): move
 translations in dedicated files

---
 .../notify_added_instructeurs.html.haml            |  2 +-
 ...otify_group_when_instructeurs_removed.html.haml |  2 +-
 .../notify_removed_instructeur.html.haml           |  2 +-
 .../administrateurs/groupe_instructeurs/en.yml     | 14 --------------
 .../administrateurs/groupe_instructeurs/fr.yml     | 14 --------------
 .../notify_added_instructeurs/en.yml               |  6 ++++++
 .../notify_added_instructeurs/fr.yml               |  6 ++++++
 .../notify_group_when_instructeurs_removed/en.yml  |  6 ++++++
 .../notify_group_when_instructeurs_removed/fr.yml  |  6 ++++++
 .../notify_removed_instructeur/en.yml              |  6 ++++++
 .../notify_removed_instructeur/fr.yml              |  6 ++++++
 11 files changed, 39 insertions(+), 31 deletions(-)
 create mode 100644 config/locales/views/groupe_instructeur_mailer/notify_added_instructeurs/en.yml
 create mode 100644 config/locales/views/groupe_instructeur_mailer/notify_added_instructeurs/fr.yml
 create mode 100644 config/locales/views/groupe_instructeur_mailer/notify_group_when_instructeurs_removed/en.yml
 create mode 100644 config/locales/views/groupe_instructeur_mailer/notify_group_when_instructeurs_removed/fr.yml
 create mode 100644 config/locales/views/groupe_instructeur_mailer/notify_removed_instructeur/en.yml
 create mode 100644 config/locales/views/groupe_instructeur_mailer/notify_removed_instructeur/fr.yml

diff --git a/app/views/groupe_instructeur_mailer/notify_added_instructeurs.html.haml b/app/views/groupe_instructeur_mailer/notify_added_instructeurs.html.haml
index 5640e8d25..eb1d15d38 100644
--- a/app/views/groupe_instructeur_mailer/notify_added_instructeurs.html.haml
+++ b/app/views/groupe_instructeur_mailer/notify_added_instructeurs.html.haml
@@ -3,6 +3,6 @@
 
 %p
   - number_of_groups = @group.procedure.groupe_instructeurs.many? ? 'many_groups' : 'one_group'
-  = t("administrateurs.groupe_instructeurs.notify_added_instructeurs.#{number_of_groups}.email_body", groupe: @group.label, email: @current_instructeur_email, procedure: @group.procedure.libelle)
+  = t(".email_body.#{number_of_groups}", groupe: @group.label, email: @current_instructeur_email, procedure: @group.procedure.libelle)
 
 = render partial: "layouts/mailers/signature"
diff --git a/app/views/groupe_instructeur_mailer/notify_group_when_instructeurs_removed.html.haml b/app/views/groupe_instructeur_mailer/notify_group_when_instructeurs_removed.html.haml
index 50ba415ef..3d318abb6 100644
--- a/app/views/groupe_instructeur_mailer/notify_group_when_instructeurs_removed.html.haml
+++ b/app/views/groupe_instructeur_mailer/notify_group_when_instructeurs_removed.html.haml
@@ -2,7 +2,7 @@
   Bonjour,
 
 %p
-  = t('administrateurs.groupe_instructeurs.notify_group_when_instructeurs_removed.email_body', count: @removed_instructeur_emails.size, emails: @removed_instructeur_emails.join(', '), groupe: @group.label, email: @current_instructeur_email, procedure: @group.procedure.libelle)
+  = t('.email_body', count: @removed_instructeur_emails.size, emails: @removed_instructeur_emails.join(', '), groupe: @group.label, email: @current_instructeur_email, procedure: @group.procedure.libelle)
 
 %p
   Cliquez sur le lien ci-dessous pour voir la liste des instructeurs de ce groupe :
diff --git a/app/views/groupe_instructeur_mailer/notify_removed_instructeur.html.haml b/app/views/groupe_instructeur_mailer/notify_removed_instructeur.html.haml
index e093dadcd..334c47375 100644
--- a/app/views/groupe_instructeur_mailer/notify_removed_instructeur.html.haml
+++ b/app/views/groupe_instructeur_mailer/notify_removed_instructeur.html.haml
@@ -3,6 +3,6 @@
 
 %p
   - assignment_state = @still_assigned_to_procedure ? 'assigned' : 'unassigned'
-  = t("administrateurs.groupe_instructeurs.notify_removed_instructeur.#{assignment_state}.email_body", groupe: @group.label, email: @current_instructeur_email, procedure: @group.procedure.libelle)
+  = t(".email_body.#{assignment_state}", groupe: @group.label, email: @current_instructeur_email, procedure: @group.procedure.libelle)
 
 = render partial: "layouts/mailers/signature"
diff --git a/config/locales/views/administrateurs/groupe_instructeurs/en.yml b/config/locales/views/administrateurs/groupe_instructeurs/en.yml
index 0b7e05743..18a10f864 100644
--- a/config/locales/views/administrateurs/groupe_instructeurs/en.yml
+++ b/config/locales/views/administrateurs/groupe_instructeurs/en.yml
@@ -16,20 +16,6 @@ en:
         assignment:
           one: "The instructor %{emails} was assigned to the group « %{groupe} »."
           other: "The instructors %{emails} were assigned to the group « %{groupe} »."
-      notify_group_when_instructeurs_removed:
-        email_body:
-          one: "The instructor %{emails} was removed from the group « %{groupe} » by « %{email} », in charge of procedure « %{procedure} »."
-          other: "The instructors %{emails} were removed from the group « %{groupe} » by « %{email} », in charge of procedure « %{procedure} »."
-      notify_removed_instructeur:
-        unassigned:
-          email_body: "You were unassigned from the procedure « %{procedure} » by « %{email} »."
-        assigned:
-          email_body: "You were removed from the group « %{groupe} » by « %{email} », in charge of procedure « %{procedure} »."
-      notify_added_instructeurs:
-        one_group:
-          email_body: "You were assigned to the procedure « %{procedure} » by « %{email} »."
-        many_groups:
-          email_body: "You were assigned to the group « %{groupe} » by « %{email} », in charge of procedure « %{procedure} »."
       reaffecter_dossiers:
         existing_groupe:
           one: "%{count} group exist"
diff --git a/config/locales/views/administrateurs/groupe_instructeurs/fr.yml b/config/locales/views/administrateurs/groupe_instructeurs/fr.yml
index 686b9051d..3d1f3a256 100644
--- a/config/locales/views/administrateurs/groupe_instructeurs/fr.yml
+++ b/config/locales/views/administrateurs/groupe_instructeurs/fr.yml
@@ -22,20 +22,6 @@ fr:
         assignment:
           one: "L’instructeur %{emails} a été affecté au groupe « %{groupe} »."
           other: "Les instructeurs %{emails} ont été affectés au groupe « %{groupe} »."
-      notify_group_when_instructeurs_removed:
-        email_body:
-          one: "L’instructeur %{emails} a été retiré du groupe « %{groupe} » par « %{email} », en charge de la démarche « %{procedure} »."
-          other: "Les instructeurs %{emails} ont été retirés du groupe « %{groupe} » par « %{email} », en charge de la démarche « %{procedure} »."
-      notify_removed_instructeur:
-        assigned:
-          email_body: "Vous avez été retiré du groupe « %{groupe} » par « %{email} », en charge de la démarche « %{procedure} »."
-        unassigned:
-          email_body: "Vous avez été désaffecté de la démarche « %{procedure} » par « %{email} »."
-      notify_added_instructeurs:
-        one_group:
-          email_body: "Vous avez été affecté à la démarche « %{procedure} » par « %{email} »."
-        many_groups:
-          email_body: "Vous avez été ajouté au groupe « %{groupe} » par « %{email} », en charge de la démarche « %{procedure} »."
       reaffecter_dossiers:
         existing_groupe:
           one: "%{count} groupe existe"
diff --git a/config/locales/views/groupe_instructeur_mailer/notify_added_instructeurs/en.yml b/config/locales/views/groupe_instructeur_mailer/notify_added_instructeurs/en.yml
new file mode 100644
index 000000000..92b83a7dd
--- /dev/null
+++ b/config/locales/views/groupe_instructeur_mailer/notify_added_instructeurs/en.yml
@@ -0,0 +1,6 @@
+en:
+  groupe_instructeur_mailer:
+    notify_added_instructeurs:
+      email_body:
+        one_group: "You were assigned to the procedure « %{procedure} » by « %{email} »."
+        many_groups: "You were assigned to the group « %{groupe} » by « %{email} », in charge of procedure « %{procedure} »."
diff --git a/config/locales/views/groupe_instructeur_mailer/notify_added_instructeurs/fr.yml b/config/locales/views/groupe_instructeur_mailer/notify_added_instructeurs/fr.yml
new file mode 100644
index 000000000..73cb5933e
--- /dev/null
+++ b/config/locales/views/groupe_instructeur_mailer/notify_added_instructeurs/fr.yml
@@ -0,0 +1,6 @@
+fr:
+  groupe_instructeur_mailer:
+    notify_added_instructeurs:
+      email_body:
+        one_group: "Vous avez été affecté(e) à la démarche « %{procedure} » par « %{email} »."
+        many_groups: "Vous avez été ajouté(e) au groupe « %{groupe} » par « %{email} », en charge de la démarche « %{procedure} »."
diff --git a/config/locales/views/groupe_instructeur_mailer/notify_group_when_instructeurs_removed/en.yml b/config/locales/views/groupe_instructeur_mailer/notify_group_when_instructeurs_removed/en.yml
new file mode 100644
index 000000000..d5192fdec
--- /dev/null
+++ b/config/locales/views/groupe_instructeur_mailer/notify_group_when_instructeurs_removed/en.yml
@@ -0,0 +1,6 @@
+en:
+  groupe_instructeur_mailer:
+    notify_group_when_instructeurs_removed:
+      email_body:
+        one: "The instructor %{emails} was removed from the group « %{groupe} » by « %{email} », in charge of procedure « %{procedure} »."
+        other: "The instructors %{emails} were removed from the group « %{groupe} » by « %{email} », in charge of procedure « %{procedure} »."
diff --git a/config/locales/views/groupe_instructeur_mailer/notify_group_when_instructeurs_removed/fr.yml b/config/locales/views/groupe_instructeur_mailer/notify_group_when_instructeurs_removed/fr.yml
new file mode 100644
index 000000000..a1e3e00de
--- /dev/null
+++ b/config/locales/views/groupe_instructeur_mailer/notify_group_when_instructeurs_removed/fr.yml
@@ -0,0 +1,6 @@
+fr:
+  groupe_instructeur_mailer:
+    notify_group_when_instructeurs_removed:
+      email_body:
+        one: "L’instructeur %{emails} a été retiré du groupe « %{groupe} » par « %{email} », en charge de la démarche « %{procedure} »."
+        other: "Les instructeurs %{emails} ont été retirés du groupe « %{groupe} » par « %{email} », en charge de la démarche « %{procedure} »."
diff --git a/config/locales/views/groupe_instructeur_mailer/notify_removed_instructeur/en.yml b/config/locales/views/groupe_instructeur_mailer/notify_removed_instructeur/en.yml
new file mode 100644
index 000000000..e786341f3
--- /dev/null
+++ b/config/locales/views/groupe_instructeur_mailer/notify_removed_instructeur/en.yml
@@ -0,0 +1,6 @@
+en:
+  groupe_instructeur_mailer:
+    notify_removed_instructeur:
+      email_body:
+        assigned: "You were removed from the group « %{groupe} » by « %{email} », in charge of procedure « %{procedure} »."
+        unassigned: "You were unassigned from the procedure « %{procedure} » by « %{email} »."
diff --git a/config/locales/views/groupe_instructeur_mailer/notify_removed_instructeur/fr.yml b/config/locales/views/groupe_instructeur_mailer/notify_removed_instructeur/fr.yml
new file mode 100644
index 000000000..5a877e37c
--- /dev/null
+++ b/config/locales/views/groupe_instructeur_mailer/notify_removed_instructeur/fr.yml
@@ -0,0 +1,6 @@
+fr:
+  groupe_instructeur_mailer:
+    notify_removed_instructeur:
+      email_body:
+        assigned: "Vous avez été retiré(e) du groupe « %{groupe} » par « %{email} », en charge de la démarche « %{procedure} »."
+        unassigned: "Vous avez été désaffecté(e) de la démarche « %{procedure} » par « %{email} »."

From daef99109e089dcf8aaf3265e58572587e843345 Mon Sep 17 00:00:00 2001
From: Eric Leroy-Terquem <eric.leroyterquem@beta.gouv.fr>
Date: Mon, 20 Feb 2023 15:59:42 +0100
Subject: [PATCH 088/202] fix(groupe instructeur mailer): add translation for
 Bonjour

---
 .../notify_added_instructeurs.html.haml                        | 3 +--
 .../notify_group_when_instructeurs_removed.html.haml           | 3 +--
 .../notify_removed_instructeur.html.haml                       | 3 +--
 3 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/app/views/groupe_instructeur_mailer/notify_added_instructeurs.html.haml b/app/views/groupe_instructeur_mailer/notify_added_instructeurs.html.haml
index eb1d15d38..7cf65d373 100644
--- a/app/views/groupe_instructeur_mailer/notify_added_instructeurs.html.haml
+++ b/app/views/groupe_instructeur_mailer/notify_added_instructeurs.html.haml
@@ -1,5 +1,4 @@
-%p
-  Bonjour,
+%p= t(:hello, scope: [:views, :shared, :greetings])
 
 %p
   - number_of_groups = @group.procedure.groupe_instructeurs.many? ? 'many_groups' : 'one_group'
diff --git a/app/views/groupe_instructeur_mailer/notify_group_when_instructeurs_removed.html.haml b/app/views/groupe_instructeur_mailer/notify_group_when_instructeurs_removed.html.haml
index 3d318abb6..1c3ccf1e1 100644
--- a/app/views/groupe_instructeur_mailer/notify_group_when_instructeurs_removed.html.haml
+++ b/app/views/groupe_instructeur_mailer/notify_group_when_instructeurs_removed.html.haml
@@ -1,5 +1,4 @@
-%p
-  Bonjour,
+%p= t(:hello, scope: [:views, :shared, :greetings])
 
 %p
   = t('.email_body', count: @removed_instructeur_emails.size, emails: @removed_instructeur_emails.join(', '), groupe: @group.label, email: @current_instructeur_email, procedure: @group.procedure.libelle)
diff --git a/app/views/groupe_instructeur_mailer/notify_removed_instructeur.html.haml b/app/views/groupe_instructeur_mailer/notify_removed_instructeur.html.haml
index 334c47375..9952a1b55 100644
--- a/app/views/groupe_instructeur_mailer/notify_removed_instructeur.html.haml
+++ b/app/views/groupe_instructeur_mailer/notify_removed_instructeur.html.haml
@@ -1,5 +1,4 @@
-%p
-  Bonjour,
+%p= t(:hello, scope: [:views, :shared, :greetings])
 
 %p
   - assignment_state = @still_assigned_to_procedure ? 'assigned' : 'unassigned'

From eca44ce60e1755757af04649ce4b899d37370200 Mon Sep 17 00:00:00 2001
From: Martin <martin@sharypic.com>
Date: Mon, 20 Feb 2023 10:33:47 +0100
Subject: [PATCH 089/202] =?UTF-8?q?correctif(a11y):=20il=20est=20recommand?=
 =?UTF-8?q?=C3=A9=20d'utilser=20un=20boutton=20pour=20la=20suppression=20d?=
 =?UTF-8?q?'un=20element.=20le=20bouton=20etant=20deja=20dans=20un=20form,?=
 =?UTF-8?q?=20nous=20ne=20pouvons=20pas=20utiliser=20le=20button=5Fto.=20E?=
 =?UTF-8?q?xtraction=20d'un=20form=20pour=20soumettre=20la=20suppression?=
 =?UTF-8?q?=20des=20pjs=20par=20des=20input=20pointant=20sur=20ce=20form?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Update app/components/attachment/edit_component/edit_component.html.haml

Co-authored-by: Paul Chavard <github@paul.chavard.net>

Update app/views/shared/dossiers/_edit.html.haml

Co-authored-by: Paul Chavard <github@paul.chavard.net>

amelioration(attachment.destroy): force l'usage de turbo
---
 .../attachment/edit_component/edit_component.html.haml    | 3 ++-
 app/views/shared/dossiers/_edit.html.haml                 | 4 ++++
 spec/components/attachment/edit_component_spec.rb         | 8 ++++++--
 spec/components/attachment/multiple_component_spec.rb     | 4 ++--
 4 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/app/components/attachment/edit_component/edit_component.html.haml b/app/components/attachment/edit_component/edit_component.html.haml
index bc54ef9f4..dda501826 100644
--- a/app/components/attachment/edit_component/edit_component.html.haml
+++ b/app/components/attachment/edit_component/edit_component.html.haml
@@ -3,7 +3,8 @@
     %div{ id: dom_id(attachment, :persisted_row) }
       .flex.flex-gap-2{ class: class_names("attachment-error": attachment.virus_scanner_error?) }
         - if user_can_destroy?
-          = link_to(t('.delete'), destroy_attachment_path, **remove_button_options, class: "fr-btn fr-btn--tertiary fr-btn--sm fr-icon-delete-line", title: t(".delete_file", filename: attachment.filename))
+          = button_tag(name: "action", formaction: destroy_attachment_path, class: "fr-btn fr-btn--tertiary fr-btn--sm fr-icon-delete-line", title: t(".delete_file", filename: attachment.filename), form: dom_id(ActiveStorage::Attachment.new, :delete), data: {turbo: true, 'turbo-method': 'delete'}) do
+            = t('.delete')
         - elsif user_can_replace?
           = button_tag t('.replace'), **replace_button_options, class: "fr-btn fr-btn--tertiary fr-btn--sm", title: t(".replace_file", filename: attachment.filename)
 
diff --git a/app/views/shared/dossiers/_edit.html.haml b/app/views/shared/dossiers/_edit.html.haml
index ed1ba11c7..b659a126d 100644
--- a/app/views/shared/dossiers/_edit.html.haml
+++ b/app/views/shared/dossiers/_edit.html.haml
@@ -10,6 +10,10 @@
   - else
     - form_options = { url: modifier_dossier_url(dossier), method: :patch }
 
+  %div
+    = form_tag('/attachments/:id', method: :delete, data: { 'turbo-method': :delete, turbo: true }, id: dom_id(ActiveStorage::Attachment.new, :delete)) do
+      -# otherwise the closing tag bugs
+
   = form_for dossier, form_options.merge({ html: { id: 'dossier-edit-form', class: 'form', multipart: true, novalidate: 'novalidate' } }) do |f|
 
     %header.mb-6
diff --git a/spec/components/attachment/edit_component_spec.rb b/spec/components/attachment/edit_component_spec.rb
index 40851b3aa..6158b099d 100644
--- a/spec/components/attachment/edit_component_spec.rb
+++ b/spec/components/attachment/edit_component_spec.rb
@@ -103,7 +103,7 @@ RSpec.describe Attachment::EditComponent, type: :component do
       it 'displays the filename, but doesn’t allow to download the file' do
         expect(attachment.watermark_pending?).to be_truthy
         expect(subject).to have_text(filename)
-        expect(subject).to have_link('Supprimer')
+        expect(subject).to have_button('Supprimer')
         expect(subject).to have_no_link(text: filename) # don't match "Delete" link which also include filename in title attribute
         expect(subject).to have_text('Traitement en cours')
       end
@@ -152,8 +152,12 @@ RSpec.describe Attachment::EditComponent, type: :component do
       end
     end
 
-    context 'when the file is scanned and safe' do
+    context 'when the file is scanned, watermarked_at, and viewed as download and safe' do
+      let(:kwargs) { { view_as: :download } }
       let(:virus_scan_result) { ActiveStorage::VirusScanner::SAFE }
+      before do
+        attachment.blob.touch(:watermarked_at)
+      end
 
       it 'allows to download the file' do
         expect(subject).to have_link(filename)
diff --git a/spec/components/attachment/multiple_component_spec.rb b/spec/components/attachment/multiple_component_spec.rb
index 54b8782b4..23f585d55 100644
--- a/spec/components/attachment/multiple_component_spec.rb
+++ b/spec/components/attachment/multiple_component_spec.rb
@@ -47,8 +47,8 @@ RSpec.describe Attachment::MultipleComponent, type: :component do
     end
 
     it 'shows the Delete button by default' do
-      expect(subject).to have_link(title: "Supprimer le fichier #{attached_file.attachments[0].filename}")
-      expect(subject).to have_link(title: "Supprimer le fichier #{attached_file.attachments[1].filename}")
+      expect(subject).to have_button(title: "Supprimer le fichier #{attached_file.attachments[0].filename}")
+      expect(subject).to have_button(title: "Supprimer le fichier #{attached_file.attachments[1].filename}")
     end
 
     it 'renders a form field for uploading a new file' do

From bd92291f8ac1ca768aec0902aa2fe20dada75a4b Mon Sep 17 00:00:00 2001
From: Christophe Robillard <christophe.robillard@beta.gouv.fr>
Date: Fri, 6 Jan 2023 17:47:28 +0100
Subject: [PATCH 090/202] cache dossiers count

---
 app/models/procedure.rb                            | 12 +++++++++++-
 ...and_dossiers_count_computed_at_to_procedures.rb |  6 ++++++
 db/schema.rb                                       |  4 +++-
 spec/models/procedure_spec.rb                      | 14 ++++++++++++++
 4 files changed, 34 insertions(+), 2 deletions(-)
 create mode 100644 db/migrate/20230217094119_add_estimated_dossiers_count_and_dossiers_count_computed_at_to_procedures.rb

diff --git a/app/models/procedure.rb b/app/models/procedure.rb
index 8e8515bd6..1f8d42b72 100644
--- a/app/models/procedure.rb
+++ b/app/models/procedure.rb
@@ -15,10 +15,12 @@
 #  closed_at                                 :datetime
 #  declarative_with_state                    :string
 #  description                               :string
+#  dossiers_count_computed_at                :datetime
 #  duree_conservation_dossiers_dans_ds       :integer
 #  duree_conservation_etendue_par_ds         :boolean          default(FALSE)
 #  encrypted_api_particulier_token           :string
 #  estimated_duration_visible                :boolean          default(TRUE), not null
+#  estimated_dossiers_count                  :integer
 #  euro_flag                                 :boolean          default(FALSE)
 #  experts_require_administrateur_invitation :boolean          default(FALSE)
 #  for_individual                            :boolean          default(FALSE)
@@ -71,6 +73,8 @@ class Procedure < ApplicationRecord
 
   MIN_WEIGHT = 350000
 
+  DOSSIERS_COUNT_EXPIRING = 1.hour
+
   attr_encrypted :api_particulier_token
 
   has_many :revisions, -> { order(:id) }, class_name: 'ProcedureRevision', inverse_of: :procedure
@@ -836,7 +840,13 @@ class Procedure < ApplicationRecord
     self.connection.query(query.to_sql).flatten
   end
 
-  private
+  def compute_dossiers_count
+    now = Time.zone.now
+    if now > (self.dossiers_count_computed_at || self.created_at) + DOSSIERS_COUNT_EXPIRING
+      self.update(estimated_dossiers_count: self.dossiers.visible_by_administration.count,
+                dossiers_count_computed_at: now)
+    end
+  end
 
   def move_new_children_to_new_parent_coordinate(new_draft)
     children = new_draft.revision_types_de_champ
diff --git a/db/migrate/20230217094119_add_estimated_dossiers_count_and_dossiers_count_computed_at_to_procedures.rb b/db/migrate/20230217094119_add_estimated_dossiers_count_and_dossiers_count_computed_at_to_procedures.rb
new file mode 100644
index 000000000..2e33dc484
--- /dev/null
+++ b/db/migrate/20230217094119_add_estimated_dossiers_count_and_dossiers_count_computed_at_to_procedures.rb
@@ -0,0 +1,6 @@
+class AddEstimatedDossiersCountAndDossiersCountComputedAtToProcedures < ActiveRecord::Migration[6.1]
+  def change
+    add_column :procedures, :estimated_dossiers_count, :integer
+    add_column :procedures, :dossiers_count_computed_at, :datetime
+  end
+end
diff --git a/db/schema.rb b/db/schema.rb
index 8719631c4..eda27f5c3 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -10,7 +10,7 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema.define(version: 2023_02_16_141558) do
+ActiveRecord::Schema.define(version: 2023_02_17_094119) do
 
   # These are extensions that must be enabled in order to support this database
   enable_extension "pgcrypto"
@@ -703,12 +703,14 @@ ActiveRecord::Schema.define(version: 2023_02_16_141558) do
     t.string "declarative_with_state"
     t.string "description"
     t.string "direction"
+    t.datetime "dossiers_count_computed_at"
     t.bigint "draft_revision_id"
     t.integer "duree_conservation_dossiers_dans_ds"
     t.boolean "duree_conservation_etendue_par_ds", default: false
     t.boolean "durees_conservation_required", default: true
     t.string "encrypted_api_particulier_token"
     t.boolean "estimated_duration_visible", default: true, null: false
+    t.integer "estimated_dossiers_count"
     t.boolean "euro_flag", default: false
     t.boolean "experts_require_administrateur_invitation", default: false
     t.boolean "for_individual", default: false
diff --git a/spec/models/procedure_spec.rb b/spec/models/procedure_spec.rb
index 4a5508d2a..80159b85d 100644
--- a/spec/models/procedure_spec.rb
+++ b/spec/models/procedure_spec.rb
@@ -9,6 +9,20 @@ describe Procedure do
     it { expect(subject.without_continuation_mail_template).to be_a(Mails::WithoutContinuationMail) }
   end
 
+  describe 'compute_dossiers_count' do
+    let(:procedure) { create(:procedure_with_dossiers, dossiers_count: 2, dossiers_count_computed_at: Time.zone.now - Procedure::DOSSIERS_COUNT_EXPIRING) }
+
+    it 'caches estimated_dossiers_count' do
+      procedure.dossiers.each(&:passer_en_construction!)
+      expect { procedure.compute_dossiers_count }.to change(procedure, :estimated_dossiers_count).from(nil).to(2)
+      expect { create(:dossier, procedure: procedure).passer_en_construction! }.not_to change(procedure, :estimated_dossiers_count)
+
+      Timecop.freeze(Time.zone.now + Procedure::DOSSIERS_COUNT_EXPIRING)
+      expect { procedure.compute_dossiers_count }.to change(procedure, :estimated_dossiers_count).from(2).to(3)
+      Timecop.return
+    end
+  end
+
   describe 'initiated_mail' do
     let(:procedure) { create(:procedure) }
 

From c5acd82e6e815b9102dcc886238b93c445e805a0 Mon Sep 17 00:00:00 2001
From: Christophe Robillard <christophe.robillard@beta.gouv.fr>
Date: Fri, 6 Jan 2023 17:48:00 +0100
Subject: [PATCH 091/202] update dossiers count when passing to construction

---
 app/models/dossier.rb       | 1 +
 spec/models/dossier_spec.rb | 9 +++++++++
 2 files changed, 10 insertions(+)

diff --git a/app/models/dossier.rb b/app/models/dossier.rb
index 31eb93b03..020b5ff38 100644
--- a/app/models/dossier.rb
+++ b/app/models/dossier.rb
@@ -874,6 +874,7 @@ class Dossier < ApplicationRecord
       .passer_en_construction
       .processed_at
     save!
+    procedure.compute_dossiers_count
   end
 
   def after_passer_en_instruction(h)
diff --git a/spec/models/dossier_spec.rb b/spec/models/dossier_spec.rb
index ca87290b1..3442c61d9 100644
--- a/spec/models/dossier_spec.rb
+++ b/spec/models/dossier_spec.rb
@@ -2080,6 +2080,15 @@ describe Dossier do
     end
   end
 
+  describe 'update procedure dossiers count' do
+    let(:dossier) { create(:dossier, :brouillon, :with_individual) }
+
+    it 'update procedure dossiers count when passing to construction' do
+      expect(dossier.procedure).to receive(:compute_dossiers_count)
+      dossier.passer_en_construction!
+    end
+  end
+
   private
 
   def count_for_month(processed_by_month, month)

From 9bab4f9d76a014135dfab819fe565270d1bb9c9b Mon Sep 17 00:00:00 2001
From: Christophe Robillard <christophe.robillard@beta.gouv.fr>
Date: Tue, 3 Jan 2023 14:58:46 +0100
Subject: [PATCH 092/202] display dossiers count for each procedure

---
 app/controllers/administrateurs/procedures_controller.rb | 2 +-
 app/views/administrateurs/procedures/_detail.html.haml   | 3 ++-
 app/views/administrateurs/procedures/all.html.haml       | 1 +
 3 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/app/controllers/administrateurs/procedures_controller.rb b/app/controllers/administrateurs/procedures_controller.rb
index e81a3a42c..3a0baef4f 100644
--- a/app/controllers/administrateurs/procedures_controller.rb
+++ b/app/controllers/administrateurs/procedures_controller.rb
@@ -418,7 +418,7 @@ module Administrateurs
       procedures_result = procedures_result.where('unaccent(libelle) ILIKE unaccent(?)', "%#{filter.libelle}%") if filter.libelle.present?
       procedures_sql = procedures_result.to_sql
 
-      sql = "select id, libelle, published_at, aasm_state, count(administrateurs_procedures.administrateur_id) as admin_count from administrateurs_procedures inner join procedures on procedures.id = administrateurs_procedures.procedure_id where procedures.id in (#{procedures_sql}) group by procedures.id order by published_at desc"
+      sql = "select id, libelle, published_at, aasm_state, estimated_dossiers_count, count(administrateurs_procedures.administrateur_id) as admin_count from administrateurs_procedures inner join procedures on procedures.id = administrateurs_procedures.procedure_id where procedures.id in (#{procedures_sql}) group by procedures.id order by published_at desc"
       ActiveRecord::Base.connection.execute(sql)
     end
 
diff --git a/app/views/administrateurs/procedures/_detail.html.haml b/app/views/administrateurs/procedures/_detail.html.haml
index a02396a9e..2728ece46 100644
--- a/app/views/administrateurs/procedures/_detail.html.haml
+++ b/app/views/administrateurs/procedures/_detail.html.haml
@@ -8,6 +8,7 @@
 
   %td= procedure.libelle
   %td= procedure.id
+  %td= procedure.estimated_dossiers_count
   %td= procedure.administrateurs.count
   %td= t procedure.aasm_state, scope: 'activerecord.attributes.procedure.aasm_state'
   %td= l(procedure.published_at, format: :message_date_without_time)
@@ -16,7 +17,7 @@
 
 - if show_detail
   %tr.procedure{ id: "procedure_detail_#{procedure.id}" }
-    %td.fr-highlight--beige-gris-galet{ colspan: '7' }
+    %td.fr-highlight--beige-gris-galet{ colspan: '8' }
       .fr-container
         .fr-grid-row
           .fr-col-6
diff --git a/app/views/administrateurs/procedures/all.html.haml b/app/views/administrateurs/procedures/all.html.haml
index 56ad5e129..b8049b05e 100644
--- a/app/views/administrateurs/procedures/all.html.haml
+++ b/app/views/administrateurs/procedures/all.html.haml
@@ -41,6 +41,7 @@
           %th{ scope: 'col' }
           %th{ scope: 'col' } Démarche
           %th{ scope: 'col' } №
+          %th{ scope: 'col' } Dossiers
           %th{ scope: 'col' } Administrateurs
           %th{ scope: 'col' } Statut
           %th{ scope: 'col' } Date

From 61d14c2c52c2236d4bfaadd5f3450f0223984ce1 Mon Sep 17 00:00:00 2001
From: Christophe Robillard <christophe.robillard@beta.gouv.fr>
Date: Tue, 3 Jan 2023 15:03:19 +0100
Subject: [PATCH 093/202] compute once dossiers count for each procedure

---
 ...03427_update_procedure_dossiers_count.rake | 20 +++++++++++++++++++
 1 file changed, 20 insertions(+)
 create mode 100644 lib/tasks/deployment/20230223103427_update_procedure_dossiers_count.rake

diff --git a/lib/tasks/deployment/20230223103427_update_procedure_dossiers_count.rake b/lib/tasks/deployment/20230223103427_update_procedure_dossiers_count.rake
new file mode 100644
index 000000000..e99e096bd
--- /dev/null
+++ b/lib/tasks/deployment/20230223103427_update_procedure_dossiers_count.rake
@@ -0,0 +1,20 @@
+namespace :after_party do
+  desc 'Deployment task: update_procedure_dossiers_count'
+  task update_procedure_dossiers_count: :environment do
+    puts "Running deploy task 'update_procedure_dossiers_count'"
+    progress = ProgressReport.new(Procedure.count)
+
+    Procedure.find_each do |p|
+      progress.inc
+      begin
+        p.update_columns(estimated_dossiers_count: p.dossiers.visible_by_administration.count, dossiers_count_computed_at: Time.zone.now)
+      rescue => e
+        Sentry.capture_exception(e, extra: { procedure_id: p.id })
+      end
+    end
+    progress.finish
+
+    AfterParty::TaskRecord
+      .create version: AfterParty::TaskRecorder.new(__FILE__).timestamp
+  end
+end

From e56d51e0f6f7b369c3a01255fd6ba544933cd628 Mon Sep 17 00:00:00 2001
From: Paul Chavard <pro@paul.chavard.net>
Date: Wed, 15 Feb 2023 18:30:02 +0100
Subject: [PATCH 094/202] fix(graphql): fix demarcheUrl

---
 app/graphql/api/v2/stored_query.rb                          | 1 +
 app/graphql/types/demarche_descriptor_type.rb               | 6 +++++-
 .../api/v2/graphql_controller_stored_queries_spec.rb        | 1 +
 spec/services/demarches_publiques_export_service_spec.rb    | 2 +-
 4 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/app/graphql/api/v2/stored_query.rb b/app/graphql/api/v2/stored_query.rb
index a2e39eddf..465eaf2af 100644
--- a/app/graphql/api/v2/stored_query.rb
+++ b/app/graphql/api/v2/stored_query.rb
@@ -288,6 +288,7 @@ class API::V2::StoredQuery
     dateFermeture
     notice { url }
     deliberation { url }
+    demarcheUrl
     cadreJuridiqueUrl
     service @include(if: $includeService) {
       ...ServiceFragment
diff --git a/app/graphql/types/demarche_descriptor_type.rb b/app/graphql/types/demarche_descriptor_type.rb
index d0db6991a..f29c618db 100644
--- a/app/graphql/types/demarche_descriptor_type.rb
+++ b/app/graphql/types/demarche_descriptor_type.rb
@@ -75,7 +75,11 @@ Cela évite l’accès récursif aux dossiers."
     delegate :description, :opendata, :tags, to: :procedure
 
     def demarche_url
-      procedure.lien_demarche
+      if procedure.brouillon?
+        Rails.application.routes.url_helpers.commencer_test_url(path: procedure.path)
+      else
+        Rails.application.routes.url_helpers.commencer_url(path: procedure.path)
+      end
     end
 
     def dpo_url
diff --git a/spec/controllers/api/v2/graphql_controller_stored_queries_spec.rb b/spec/controllers/api/v2/graphql_controller_stored_queries_spec.rb
index 3e065f0de..ae6749376 100644
--- a/spec/controllers/api/v2/graphql_controller_stored_queries_spec.rb
+++ b/spec/controllers/api/v2/graphql_controller_stored_queries_spec.rb
@@ -138,6 +138,7 @@ describe API::V2::GraphqlController do
         it {
           expect(gql_errors).to be_nil
           expect(gql_data[:demarcheDescriptor][:id]).to eq(procedure.to_typed_id)
+          expect(gql_data[:demarcheDescriptor][:demarcheUrl]).to match("commencer/#{procedure.path}")
         }
       end
 
diff --git a/spec/services/demarches_publiques_export_service_spec.rb b/spec/services/demarches_publiques_export_service_spec.rb
index 05e96a208..bec59a795 100644
--- a/spec/services/demarches_publiques_export_service_spec.rb
+++ b/spec/services/demarches_publiques_export_service_spec.rb
@@ -17,7 +17,7 @@ describe DemarchesPubliquesExportService do
           typeOrganisme: "association"
         },
         cadreJuridiqueUrl: "un cadre juridique important",
-        demarcheUrl: nil,
+        demarcheUrl: Rails.application.routes.url_helpers.commencer_url(path: procedure.path),
         dpoUrl: nil,
         noticeUrl: nil,
         siteWebUrl: "https://mon-site.gouv",

From a71e8d9a8115b4af97342d2a22d395c5312b6f1d Mon Sep 17 00:00:00 2001
From: Colin Darie <colin@darie.eu>
Date: Mon, 20 Feb 2023 09:36:27 +0100
Subject: [PATCH 095/202] chore(bundle): setup elastic_apm, disabled by default

---
 Gemfile                |  1 +
 Gemfile.lock           | 17 +++++++++++++++++
 config/elastic_apm.yml |  8 ++++++++
 3 files changed, 26 insertions(+)
 create mode 100644 config/elastic_apm.yml

diff --git a/Gemfile b/Gemfile
index 708603839..3fcb4c749 100644
--- a/Gemfile
+++ b/Gemfile
@@ -27,6 +27,7 @@ gem 'devise-i18n'
 gem 'devise-two-factor'
 gem 'discard'
 gem 'dotenv-rails', require: 'dotenv/rails-now' # dotenv should always be loaded before rails
+gem 'elastic-apm'
 gem 'flipper'
 gem 'flipper-active_record'
 gem 'flipper-ui'
diff --git a/Gemfile.lock b/Gemfile.lock
index 14db486bd..02f1dc484 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -220,6 +220,10 @@ GEM
     dumb_delegator (1.0.0)
     ecma-re-validator (0.3.0)
       regexp_parser (~> 2.0)
+    elastic-apm (4.6.0)
+      concurrent-ruby (~> 1.0)
+      http (>= 3.0)
+      ruby2_keywords
     encryptor (3.0.0)
     erubi (1.12.0)
     et-orbi (1.2.4)
@@ -249,6 +253,9 @@ GEM
     faraday-patron (1.0.0)
     faraday-rack (1.0.0)
     ffi (1.15.5)
+    ffi-compiler (1.0.1)
+      ffi (>= 1.0.0)
+      rake
     flipper (0.26.0)
       concurrent-ruby (< 2)
     flipper-active_record (0.26.0)
@@ -323,9 +330,15 @@ GEM
     highline (2.0.3)
     html_tokenizer (0.0.7)
     htmlentities (4.3.4)
+    http (5.1.1)
+      addressable (~> 2.8)
+      http-cookie (~> 1.0)
+      http-form_data (~> 2.2)
+      llhttp-ffi (~> 0.4.0)
     http-accept (1.7.0)
     http-cookie (1.0.3)
       domain_name (~> 0.5)
+    http-form_data (2.3.0)
     http_accept_language (2.1.1)
     httpclient (2.8.3)
     i18n (1.12.0)
@@ -390,6 +403,9 @@ GEM
     listen (3.4.1)
       rb-fsevent (~> 0.10, >= 0.10.3)
       rb-inotify (~> 0.9, >= 0.9.10)
+    llhttp-ffi (0.4.0)
+      ffi-compiler (~> 1.0)
+      rake (~> 13.0)
     lograge (0.11.2)
       actionpack (>= 4)
       activesupport (>= 4)
@@ -838,6 +854,7 @@ DEPENDENCIES
   devise-two-factor
   discard
   dotenv-rails
+  elastic-apm
   factory_bot
   flipper
   flipper-active_record
diff --git a/config/elastic_apm.yml b/config/elastic_apm.yml
new file mode 100644
index 000000000..2c65bac6b
--- /dev/null
+++ b/config/elastic_apm.yml
@@ -0,0 +1,8 @@
+# Set options ELASTIC_APM_SERVER_URL & ELASTIC_APM_SECRET_TOKEN by env vars instead
+# See https://www.elastic.co/guide/en/apm/agent/ruby/current/configuration.html
+#
+# server_url: ''
+# secret_token: ''
+
+# Enable it with ELASTIC_APM_ENABLED="true"
+enabled: false

From 2052bc78401c887e8bed1e4156bdc8dd11714a5b Mon Sep 17 00:00:00 2001
From: Damien Le Thiec <damien.lethiec@gmail.com>
Date: Tue, 21 Feb 2023 16:00:58 +0100
Subject: [PATCH 096/202] Remove dependency type_de_champ -> procedure

---
 .../prefill_type_de_champs_controller.rb      |  2 +-
 app/models/prefill_description.rb             |  4 +-
 app/models/prefill_params.rb                  | 15 +++++---
 app/models/procedure_revision.rb              |  2 +
 app/models/type_de_champ.rb                   |  8 ----
 .../prefill_repetition_type_de_champ.rb       | 17 +++++----
 .../types_de_champ/prefill_type_de_champ.rb   | 29 ++++++++------
 spec/models/prefill_description_spec.rb       | 14 +++----
 .../prefill_departement_type_de_champ_spec.rb |  4 +-
 .../prefill_epci_type_de_champ_spec.rb        | 11 +++---
 .../prefill_pays_type_de_champ_spec.rb        |  4 +-
 .../prefill_region_type_de_champ_spec.rb      |  4 +-
 .../prefill_repetition_type_de_champ_spec.rb  | 12 +++---
 .../prefill_type_de_champ_spec.rb             | 38 ++++++++++---------
 spec/system/users/dossier_prefill_get_spec.rb |  2 +-
 .../system/users/dossier_prefill_post_spec.rb |  2 +-
 16 files changed, 87 insertions(+), 81 deletions(-)

diff --git a/app/controllers/prefill_type_de_champs_controller.rb b/app/controllers/prefill_type_de_champs_controller.rb
index 82817f324..af541afcf 100644
--- a/app/controllers/prefill_type_de_champs_controller.rb
+++ b/app/controllers/prefill_type_de_champs_controller.rb
@@ -12,6 +12,6 @@ class PrefillTypeDeChampsController < ApplicationController
   end
 
   def set_prefill_type_de_champ
-    @type_de_champ = TypesDeChamp::PrefillTypeDeChamp.build(@procedure.active_revision.types_de_champ.fillable.find(params[:id]))
+    @type_de_champ = TypesDeChamp::PrefillTypeDeChamp.build(@procedure.active_revision.types_de_champ.fillable.find(params[:id]), @procedure.active_revision)
   end
 end
diff --git a/app/models/prefill_description.rb b/app/models/prefill_description.rb
index 090e02fb8..dc5dba767 100644
--- a/app/models/prefill_description.rb
+++ b/app/models/prefill_description.rb
@@ -15,7 +15,7 @@ class PrefillDescription < SimpleDelegator
   end
 
   def types_de_champ
-    TypesDeChamp::PrefillTypeDeChamp.wrap(active_revision.types_de_champ_public.fillable.partition(&:prefillable?).flatten)
+    TypesDeChamp::PrefillTypeDeChamp.wrap(active_revision.types_de_champ_public.fillable.partition(&:prefillable?).flatten, active_revision)
   end
 
   def include?(type_de_champ_id)
@@ -40,7 +40,7 @@ class PrefillDescription < SimpleDelegator
   end
 
   def prefilled_champs
-    @prefilled_champs ||= TypesDeChamp::PrefillTypeDeChamp.wrap(active_fillable_public_types_de_champ.where(id: selected_type_de_champ_ids))
+    @prefilled_champs ||= TypesDeChamp::PrefillTypeDeChamp.wrap(active_fillable_public_types_de_champ.where(id: selected_type_de_champ_ids), active_revision)
   end
 
   private
diff --git a/app/models/prefill_params.rb b/app/models/prefill_params.rb
index a7b5df8f7..d048a3d2d 100644
--- a/app/models/prefill_params.rb
+++ b/app/models/prefill_params.rb
@@ -1,4 +1,6 @@
 class PrefillParams
+  attr_reader :dossier, :params
+
   def initialize(dossier, params)
     @dossier = dossier
     @params = params
@@ -11,15 +13,15 @@ class PrefillParams
   private
 
   def build_prefill_values
-    value_by_stable_id = @params
+    value_by_stable_id = params
       .map { |prefixed_typed_id, value| [stable_id_from_typed_id(prefixed_typed_id), value] }
       .filter { |stable_id, value| stable_id.present? && value.present? }
       .to_h
 
-    @dossier
+    dossier
       .find_champs_by_stable_ids(value_by_stable_id.keys)
       .map { |champ| [champ, value_by_stable_id[champ.stable_id]] }
-      .map { |champ, value| PrefillValue.new(champ:, value:) }
+      .map { |champ, value| PrefillValue.new(champ:, value:, dossier:) }
   end
 
   def stable_id_from_typed_id(prefixed_typed_id)
@@ -46,11 +48,12 @@ class PrefillParams
       TypeDeChamp.type_champs.fetch(:epci)
     ]
 
-    attr_reader :champ, :value
+    attr_reader :champ, :value, :dossier
 
-    def initialize(champ:, value:)
+    def initialize(champ:, value:, dossier:)
       @champ = champ
       @value = value
+      @dossier = dossier
     end
 
     def prefillable?
@@ -59,7 +62,7 @@ class PrefillParams
 
     def champ_attributes
       TypesDeChamp::PrefillTypeDeChamp
-        .build(champ.type_de_champ)
+        .build(champ.type_de_champ, dossier.revision)
         .to_assignable_attributes(champ, value)
     end
 
diff --git a/app/models/procedure_revision.rb b/app/models/procedure_revision.rb
index ff3e587b5..0f1196477 100644
--- a/app/models/procedure_revision.rb
+++ b/app/models/procedure_revision.rb
@@ -32,6 +32,8 @@ class ProcedureRevision < ApplicationRecord
 
   validate :conditions_are_valid?
 
+  delegate :path, to: :procedure, prefix: true
+
   def build_champs_public
     # reload: it can be out of sync in test if some tdcs are added wihtout using add_tdc
     types_de_champ_public.reload.map(&:build_champ)
diff --git a/app/models/type_de_champ.rb b/app/models/type_de_champ.rb
index 899b5b1b1..feb0faaa0 100644
--- a/app/models/type_de_champ.rb
+++ b/app/models/type_de_champ.rb
@@ -128,8 +128,6 @@ class TypeDeChamp < ApplicationRecord
   has_one :procedure, through: :revision
 
   delegate :estimated_fill_duration, :estimated_read_duration, :tags_for_template, :libelle_for_export, to: :dynamic_type
-  delegate :active_revision, to: :procedure, prefix: true
-  delegate :path, to: :procedure
 
   class WithIndifferentAccess
     def self.load(options)
@@ -489,12 +487,6 @@ class TypeDeChamp < ApplicationRecord
     end
   end
 
-  def active_revision_type_de_champ
-    procedure_active_revision.revision_types_de_champ_public.find do |rtc|
-      rtc.type_de_champ_id == id
-    end
-  end
-
   private
 
   DEFAULT_EMPTY = ['']
diff --git a/app/models/types_de_champ/prefill_repetition_type_de_champ.rb b/app/models/types_de_champ/prefill_repetition_type_de_champ.rb
index 240ca6f6f..4a44ffd6a 100644
--- a/app/models/types_de_champ/prefill_repetition_type_de_champ.rb
+++ b/app/models/types_de_champ/prefill_repetition_type_de_champ.rb
@@ -17,7 +17,7 @@ class TypesDeChamp::PrefillRepetitionTypeDeChamp < TypesDeChamp::PrefillTypeDeCh
     return [] unless value.is_a?(Array)
 
     value.map.with_index do |repetition, index|
-      PrefillRepetitionRow.new(champ, repetition, index).to_assignable_attributes
+      PrefillRepetitionRow.new(champ, repetition, index, @revision).to_assignable_attributes
     end.reject(&:blank?)
   end
 
@@ -37,27 +37,28 @@ class TypesDeChamp::PrefillRepetitionTypeDeChamp < TypesDeChamp::PrefillTypeDeCh
   end
 
   def prefillable_subchamps
-    return [] unless active_revision_type_de_champ
-
     @prefillable_subchamps ||=
-      TypesDeChamp::PrefillTypeDeChamp.wrap(active_revision_type_de_champ.revision_types_de_champ.map(&:type_de_champ).filter(&:prefillable?))
+      TypesDeChamp::PrefillTypeDeChamp.wrap(@revision.children_of(self).filter(&:prefillable?), @revision)
   end
 
   class PrefillRepetitionRow
-    def initialize(champ, repetition, index)
+    attr_reader :champ, :repetition, :index, :revision
+
+    def initialize(champ, repetition, index, revision)
       @champ = champ
       @repetition = repetition
       @index = index
+      @revision = revision
     end
 
     def to_assignable_attributes
-      row = @champ.rows[@index] || @champ.add_row(@champ.dossier_revision)
+      row = champ.rows[index] || champ.add_row(champ.dossier_revision)
 
-      JSON.parse(@repetition).map do |key, value|
+      JSON.parse(repetition).map do |key, value|
         subchamp = row.find { |champ| champ.type_de_champ_to_typed_id == key }
         next unless subchamp
 
-        TypesDeChamp::PrefillTypeDeChamp.build(subchamp.type_de_champ).to_assignable_attributes(subchamp, value)
+        TypesDeChamp::PrefillTypeDeChamp.build(subchamp.type_de_champ, revision).to_assignable_attributes(subchamp, value)
       rescue JSON::ParserError # On ignore les valeurs qu'on n'arrive pas à parser
       end.compact
     end
diff --git a/app/models/types_de_champ/prefill_type_de_champ.rb b/app/models/types_de_champ/prefill_type_de_champ.rb
index 25c27e770..43bf2c493 100644
--- a/app/models/types_de_champ/prefill_type_de_champ.rb
+++ b/app/models/types_de_champ/prefill_type_de_champ.rb
@@ -4,29 +4,34 @@ class TypesDeChamp::PrefillTypeDeChamp < SimpleDelegator
 
   POSSIBLE_VALUES_THRESHOLD = 5
 
-  def self.build(type_de_champ)
+  def initialize(type_de_champ, revision)
+    super(type_de_champ)
+    @revision = revision
+  end
+
+  def self.build(type_de_champ, revision)
     case type_de_champ.type_champ
     when TypeDeChamp.type_champs.fetch(:drop_down_list)
-      TypesDeChamp::PrefillDropDownListTypeDeChamp.new(type_de_champ)
+      TypesDeChamp::PrefillDropDownListTypeDeChamp.new(type_de_champ, revision)
     when TypeDeChamp.type_champs.fetch(:multiple_drop_down_list)
-      TypesDeChamp::PrefillMultipleDropDownListTypeDeChamp.new(type_de_champ)
+      TypesDeChamp::PrefillMultipleDropDownListTypeDeChamp.new(type_de_champ, revision)
     when TypeDeChamp.type_champs.fetch(:pays)
-      TypesDeChamp::PrefillPaysTypeDeChamp.new(type_de_champ)
+      TypesDeChamp::PrefillPaysTypeDeChamp.new(type_de_champ, revision)
     when TypeDeChamp.type_champs.fetch(:regions)
-      TypesDeChamp::PrefillRegionTypeDeChamp.new(type_de_champ)
+      TypesDeChamp::PrefillRegionTypeDeChamp.new(type_de_champ, revision)
     when TypeDeChamp.type_champs.fetch(:repetition)
-      TypesDeChamp::PrefillRepetitionTypeDeChamp.new(type_de_champ)
+      TypesDeChamp::PrefillRepetitionTypeDeChamp.new(type_de_champ, revision)
     when TypeDeChamp.type_champs.fetch(:departements)
-      TypesDeChamp::PrefillDepartementTypeDeChamp.new(type_de_champ)
+      TypesDeChamp::PrefillDepartementTypeDeChamp.new(type_de_champ, revision)
     when TypeDeChamp.type_champs.fetch(:epci)
-      TypesDeChamp::PrefillEpciTypeDeChamp.new(type_de_champ)
+      TypesDeChamp::PrefillEpciTypeDeChamp.new(type_de_champ, revision)
     else
-      new(type_de_champ)
+      new(type_de_champ, revision)
     end
   end
 
-  def self.wrap(collection)
-    collection.map { |type_de_champ| build(type_de_champ) }
+  def self.wrap(collection, revision)
+    collection.map { |type_de_champ| build(type_de_champ, revision) }
   end
 
   def possible_values
@@ -61,7 +66,7 @@ class TypesDeChamp::PrefillTypeDeChamp < SimpleDelegator
 
     link_to(
       I18n.t("views.prefill_descriptions.edit.possible_values.link.text"),
-      Rails.application.routes.url_helpers.prefill_type_de_champ_path(path, self),
+      Rails.application.routes.url_helpers.prefill_type_de_champ_path(revision.procedure_path, self),
       title: new_tab_suffix(I18n.t("views.prefill_descriptions.edit.possible_values.link.title")),
       **external_link_attributes
     )
diff --git a/spec/models/prefill_description_spec.rb b/spec/models/prefill_description_spec.rb
index dc8a62fa4..a88015569 100644
--- a/spec/models/prefill_description_spec.rb
+++ b/spec/models/prefill_description_spec.rb
@@ -22,7 +22,7 @@ RSpec.describe PrefillDescription, type: :model do
 
     it { expect(types_de_champ.count).to eq(1) }
 
-    it { expect(types_de_champ.first).to eql(TypesDeChamp::PrefillTypeDeChamp.build(type_de_champ)) }
+    it { expect(types_de_champ.first).to eql(TypesDeChamp::PrefillTypeDeChamp.build(type_de_champ, procedure.active_revision)) }
 
     shared_examples "filters out non fillable types de champ" do |type_de_champ_name|
       context "when the procedure has a #{type_de_champ_name} champ" do
@@ -91,7 +91,7 @@ RSpec.describe PrefillDescription, type: :model do
     let(:type_de_champ_text) { build(:type_de_champ_text, procedure: procedure) }
     let(:type_de_champ_epci) { build(:type_de_champ_epci, procedure: procedure) }
     let(:type_de_champ_repetition) { create(:type_de_champ_repetition, :with_types_de_champ, :with_region_types_de_champ, procedure: procedure) }
-    let(:prefillable_subchamps) { TypesDeChamp::PrefillRepetitionTypeDeChamp.new(type_de_champ_repetition).send(:prefillable_subchamps) }
+    let(:prefillable_subchamps) { TypesDeChamp::PrefillRepetitionTypeDeChamp.new(type_de_champ_repetition, procedure.active_revision).send(:prefillable_subchamps) }
     let(:region_repetition) { prefillable_subchamps.third }
     let(:prefill_description) { described_class.new(procedure) }
 
@@ -116,9 +116,9 @@ RSpec.describe PrefillDescription, type: :model do
       expect(prefill_description.prefill_link).to eq(
         commencer_url(
           path: procedure.path,
-          "champ_#{type_de_champ_text.to_typed_id}" => TypesDeChamp::PrefillTypeDeChamp.build(type_de_champ_text).example_value,
-          "champ_#{type_de_champ_epci.to_typed_id}" => TypesDeChamp::PrefillTypeDeChamp.build(type_de_champ_epci).example_value,
-          "champ_#{type_de_champ_repetition.to_typed_id}" => TypesDeChamp::PrefillTypeDeChamp.build(type_de_champ_repetition).example_value
+          "champ_#{type_de_champ_text.to_typed_id}" => TypesDeChamp::PrefillTypeDeChamp.build(type_de_champ_text, procedure.active_revision).example_value,
+          "champ_#{type_de_champ_epci.to_typed_id}" => TypesDeChamp::PrefillTypeDeChamp.build(type_de_champ_epci, procedure.active_revision).example_value,
+          "champ_#{type_de_champ_repetition.to_typed_id}" => TypesDeChamp::PrefillTypeDeChamp.build(type_de_champ_repetition, procedure.active_revision).example_value
         )
       )
     end
@@ -129,14 +129,14 @@ RSpec.describe PrefillDescription, type: :model do
     let(:type_de_champ_text) { create(:type_de_champ_text, procedure: procedure) }
     let(:type_de_champ_epci) { TypesDeChamp::PrefillTypeDeChamp.build(create(:type_de_champ_epci, procedure: procedure)) }
     let(:type_de_champ_repetition) { build(:type_de_champ_repetition, :with_types_de_champ, :with_region_types_de_champ, procedure: procedure) }
-    let(:prefillable_subchamps) { TypesDeChamp::PrefillRepetitionTypeDeChamp.new(type_de_champ_repetition).send(:prefillable_subchamps) }
+    let(:prefillable_subchamps) { TypesDeChamp::PrefillRepetitionTypeDeChamp.new(type_de_champ_repetition, procedure.active_revision).send(:prefillable_subchamps) }
     let(:region_repetition) { prefillable_subchamps.third }
     let(:prefill_description) { described_class.new(procedure) }
     let(:expected_query) do
       <<~TEXT
         curl --request POST '#{api_public_v1_dossiers_url(procedure)}' \\
              --header 'Content-Type: application/json' \\
-             --data '{"champ_#{type_de_champ_text.to_typed_id}": "#{TypesDeChamp::PrefillTypeDeChamp.build(type_de_champ_text).example_value}", "champ_#{type_de_champ_epci.to_typed_id}": #{TypesDeChamp::PrefillTypeDeChamp.build(type_de_champ_epci).example_value}, "champ_#{type_de_champ_repetition.to_typed_id}": #{TypesDeChamp::PrefillTypeDeChamp.build(type_de_champ_repetition).example_value}}'
+             --data '{"champ_#{type_de_champ_text.to_typed_id}": "#{TypesDeChamp::PrefillTypeDeChamp.build(type_de_champ_text, procedure.active_revision).example_value}", "champ_#{type_de_champ_epci.to_typed_id}": #{TypesDeChamp::PrefillTypeDeChamp.build(type_de_champ_epci, procedure.active_revision).example_value}, "champ_#{type_de_champ_repetition.to_typed_id}": #{TypesDeChamp::PrefillTypeDeChamp.build(type_de_champ_repetition, procedure.active_revision).example_value}}'
       TEXT
     end
 
diff --git a/spec/models/types_de_champ/prefill_departement_type_de_champ_spec.rb b/spec/models/types_de_champ/prefill_departement_type_de_champ_spec.rb
index a453a9e03..65c2dc484 100644
--- a/spec/models/types_de_champ/prefill_departement_type_de_champ_spec.rb
+++ b/spec/models/types_de_champ/prefill_departement_type_de_champ_spec.rb
@@ -11,7 +11,7 @@ RSpec.describe TypesDeChamp::PrefillDepartementTypeDeChamp, type: :model do
   end
 
   describe 'ancestors' do
-    subject { described_class.build(type_de_champ) }
+    subject { described_class.build(type_de_champ, procedure.active_revision) }
 
     it { is_expected.to be_kind_of(TypesDeChamp::PrefillTypeDeChamp) }
   end
@@ -20,7 +20,7 @@ RSpec.describe TypesDeChamp::PrefillDepartementTypeDeChamp, type: :model do
     let(:expected_values) {
       "Un <a href=\"https://fr.wikipedia.org/wiki/Num%C3%A9rotation_des_d%C3%A9partements_fran%C3%A7ais\" target=\"_blank\">numéro de département</a><br><a title=\"Toutes les valeurs possibles — Nouvel onglet\" target=\"_blank\" rel=\"noopener noreferrer\" href=\"/procedures/#{procedure.path}/prefill_type_de_champs/#{type_de_champ.id}\">Voir toutes les valeurs possibles</a>"
     }
-    subject(:possible_values) { described_class.new(type_de_champ).possible_values }
+    subject(:possible_values) { described_class.new(type_de_champ, procedure.active_revision).possible_values }
 
     before { type_de_champ.reload }
 
diff --git a/spec/models/types_de_champ/prefill_epci_type_de_champ_spec.rb b/spec/models/types_de_champ/prefill_epci_type_de_champ_spec.rb
index ae68772f8..25de5514b 100644
--- a/spec/models/types_de_champ/prefill_epci_type_de_champ_spec.rb
+++ b/spec/models/types_de_champ/prefill_epci_type_de_champ_spec.rb
@@ -1,7 +1,8 @@
 # frozen_string_literal: true
 
 RSpec.describe TypesDeChamp::PrefillEpciTypeDeChamp do
-  let(:type_de_champ) { build(:type_de_champ_epci) }
+  let(:procedure) { create(:procedure) }
+  let(:type_de_champ) { build(:type_de_champ_epci, procedure: procedure) }
   let(:champ) { create(:champ_epci, type_de_champ: type_de_champ) }
   let(:memory_store) { ActiveSupport::Cache.lookup_store(:memory_store) }
 
@@ -11,7 +12,7 @@ RSpec.describe TypesDeChamp::PrefillEpciTypeDeChamp do
   end
 
   describe 'ancestors' do
-    subject { described_class.new(type_de_champ) }
+    subject { described_class.new(type_de_champ, procedure.active_revision) }
 
     it { is_expected.to be_kind_of(TypesDeChamp::PrefillEpciTypeDeChamp) }
   end
@@ -20,7 +21,7 @@ RSpec.describe TypesDeChamp::PrefillEpciTypeDeChamp do
     let(:expected_values) do
       departements.map { |departement| "#{departement[:code]} (#{departement[:name]}) : https://geo.api.gouv.fr/epcis?codeDepartement=#{departement[:code]}" }
     end
-    subject(:possible_values) { described_class.new(type_de_champ).possible_values }
+    subject(:possible_values) { described_class.new(type_de_champ, procedure.active_revision).possible_values }
 
     before do
       VCR.insert_cassette('api_geo_departements')
@@ -38,7 +39,7 @@ RSpec.describe TypesDeChamp::PrefillEpciTypeDeChamp do
   describe '#example_value' do
     let(:departement_code) { departements.pick(:code) }
     let(:epci_code) { APIGeoService.epcis(departement_code).pick(:code) }
-    subject(:example_value) { described_class.new(type_de_champ).example_value }
+    subject(:example_value) { described_class.new(type_de_champ, procedure.active_revision).example_value }
 
     before do
       VCR.insert_cassette('api_geo_departements')
@@ -54,7 +55,7 @@ RSpec.describe TypesDeChamp::PrefillEpciTypeDeChamp do
   end
 
   describe '#to_assignable_attributes' do
-    subject(:to_assignable_attributes) { described_class.build(type_de_champ).to_assignable_attributes(champ, value) }
+    subject(:to_assignable_attributes) { described_class.build(type_de_champ, procedure.active_revision).to_assignable_attributes(champ, value) }
 
     context 'when the value is nil' do
       let(:value) { nil }
diff --git a/spec/models/types_de_champ/prefill_pays_type_de_champ_spec.rb b/spec/models/types_de_champ/prefill_pays_type_de_champ_spec.rb
index 36f5aebcb..45014ec22 100644
--- a/spec/models/types_de_champ/prefill_pays_type_de_champ_spec.rb
+++ b/spec/models/types_de_champ/prefill_pays_type_de_champ_spec.rb
@@ -4,14 +4,14 @@ RSpec.describe TypesDeChamp::PrefillPaysTypeDeChamp, type: :model do
   let(:type_de_champ) { build(:type_de_champ_pays, procedure: procedure) }
 
   describe 'ancestors' do
-    subject { described_class.build(type_de_champ) }
+    subject { described_class.build(type_de_champ, procedure.active_revision) }
 
     it { is_expected.to be_kind_of(TypesDeChamp::PrefillTypeDeChamp) }
   end
 
   describe '#possible_values' do
     let(:expected_values) { "Un <a href=\"https://en.wikipedia.org/wiki/ISO_3166-2\" target=\"_blank\" rel=\"noopener noreferrer\">code pays ISO 3166-2</a><br><a title=\"Toutes les valeurs possibles — Nouvel onglet\" target=\"_blank\" rel=\"noopener noreferrer\" href=\"/procedures/#{procedure.path}/prefill_type_de_champs/#{type_de_champ.id}\">Voir toutes les valeurs possibles</a>" }
-    subject(:possible_values) { described_class.new(type_de_champ).possible_values }
+    subject(:possible_values) { described_class.new(type_de_champ, procedure.active_revision).possible_values }
 
     before { type_de_champ.reload }
 
diff --git a/spec/models/types_de_champ/prefill_region_type_de_champ_spec.rb b/spec/models/types_de_champ/prefill_region_type_de_champ_spec.rb
index 3a73fedc4..1f9ddabb3 100644
--- a/spec/models/types_de_champ/prefill_region_type_de_champ_spec.rb
+++ b/spec/models/types_de_champ/prefill_region_type_de_champ_spec.rb
@@ -11,14 +11,14 @@ RSpec.describe TypesDeChamp::PrefillRegionTypeDeChamp, type: :model do
   end
 
   describe 'ancestors' do
-    subject { described_class.build(type_de_champ) }
+    subject { described_class.build(type_de_champ, procedure.active_revision) }
 
     it { is_expected.to be_kind_of(TypesDeChamp::PrefillTypeDeChamp) }
   end
 
   describe '#possible_values', vcr: { cassette_name: 'api_geo_regions' } do
     let(:expected_values) { "Un <a href=\"https://fr.wikipedia.org/wiki/R%C3%A9gion_fran%C3%A7aise\" target=\"_blank\" rel=\"noopener noreferrer\">code INSEE de région</a><br><a title=\"Toutes les valeurs possibles — Nouvel onglet\" target=\"_blank\" rel=\"noopener noreferrer\" href=\"/procedures/#{procedure.path}/prefill_type_de_champs/#{type_de_champ.id}\">Voir toutes les valeurs possibles</a>" }
-    subject(:possible_values) { described_class.new(type_de_champ).possible_values }
+    subject(:possible_values) { described_class.new(type_de_champ, procedure.active_revision).possible_values }
 
     before { type_de_champ.reload }
 
diff --git a/spec/models/types_de_champ/prefill_repetition_type_de_champ_spec.rb b/spec/models/types_de_champ/prefill_repetition_type_de_champ_spec.rb
index 6397953a6..d4b4d1d7a 100644
--- a/spec/models/types_de_champ/prefill_repetition_type_de_champ_spec.rb
+++ b/spec/models/types_de_champ/prefill_repetition_type_de_champ_spec.rb
@@ -1,10 +1,10 @@
 # frozen_string_literal: true
 
 RSpec.describe TypesDeChamp::PrefillRepetitionTypeDeChamp, type: :model, vcr: { cassette_name: 'api_geo_regions' } do
-  let(:procedure) { build(:procedure) }
+  let(:procedure) { create(:procedure) }
   let(:type_de_champ) { build(:type_de_champ_repetition, :with_types_de_champ, :with_region_types_de_champ, procedure: procedure) }
   let(:champ) { create(:champ_repetition, type_de_champ: type_de_champ) }
-  let(:prefillable_subchamps) { TypesDeChamp::PrefillRepetitionTypeDeChamp.new(type_de_champ).send(:prefillable_subchamps) }
+  let(:prefillable_subchamps) { TypesDeChamp::PrefillRepetitionTypeDeChamp.new(type_de_champ, procedure.active_revision).send(:prefillable_subchamps) }
   let(:text_repetition) { prefillable_subchamps.first }
   let(:integer_repetition) { prefillable_subchamps.second }
   let(:region_repetition) { prefillable_subchamps.third }
@@ -16,13 +16,13 @@ RSpec.describe TypesDeChamp::PrefillRepetitionTypeDeChamp, type: :model, vcr: {
   end
 
   describe 'ancestors' do
-    subject { described_class.build(type_de_champ) }
+    subject { described_class.build(type_de_champ, procedure.active_revision) }
 
     it { is_expected.to be_kind_of(TypesDeChamp::PrefillTypeDeChamp) }
   end
 
   describe '#possible_values' do
-    subject(:possible_values) { described_class.new(type_de_champ).possible_values }
+    subject(:possible_values) { described_class.new(type_de_champ, procedure.active_revision).possible_values }
     let(:expected_value) {
       "Un tableau de dictionnaires avec les valeurs possibles pour chaque champ de la répétition.</br><ul><li>#{text_repetition.to_typed_id}: Un texte court<br></li><li>#{integer_repetition.to_typed_id}: Un nombre entier<br></li><li>#{region_repetition.to_typed_id}: Un <a href=\"https://fr.wikipedia.org/wiki/R%C3%A9gion_fran%C3%A7aise\" target=\"_blank\" rel=\"noopener noreferrer\">code INSEE de région</a><br><a title=\"Toutes les valeurs possibles — Nouvel onglet\" target=\"_blank\" rel=\"noopener noreferrer\" href=\"/procedures/#{procedure.path}/prefill_type_de_champs/#{region_repetition.id}\">Voir toutes les valeurs possibles</a></li></ul>"
     }
@@ -33,14 +33,14 @@ RSpec.describe TypesDeChamp::PrefillRepetitionTypeDeChamp, type: :model, vcr: {
   end
 
   describe '#example_value' do
-    subject(:example_value) { described_class.new(type_de_champ).example_value }
+    subject(:example_value) { described_class.new(type_de_champ, procedure.active_revision).example_value }
     let(:expected_value) { ["{\"#{text_repetition.to_typed_id}\":\"Texte court\", \"#{integer_repetition.to_typed_id}\":\"42\", \"#{region_repetition.to_typed_id}\":\"53\"}", "{\"#{text_repetition.to_typed_id}\":\"Texte court\", \"#{integer_repetition.to_typed_id}\":\"42\", \"#{region_repetition.to_typed_id}\":\"53\"}"] }
 
     it { expect(example_value).to eq(expected_value) }
   end
 
   describe '#to_assignable_attributes' do
-    subject(:to_assignable_attributes) { described_class.build(type_de_champ).to_assignable_attributes(champ, value) }
+    subject(:to_assignable_attributes) { described_class.build(type_de_champ, procedure.active_revision).to_assignable_attributes(champ, value) }
 
     context 'when the value is nil' do
       let(:value) { nil }
diff --git a/spec/models/types_de_champ/prefill_type_de_champ_spec.rb b/spec/models/types_de_champ/prefill_type_de_champ_spec.rb
index 770203374..1a6dc0c8a 100644
--- a/spec/models/types_de_champ/prefill_type_de_champ_spec.rb
+++ b/spec/models/types_de_champ/prefill_type_de_champ_spec.rb
@@ -4,60 +4,62 @@ RSpec.describe TypesDeChamp::PrefillTypeDeChamp, type: :model do
   include ActionView::Helpers::UrlHelper
   include ApplicationHelper
 
+  let(:procedure) { create(:procedure) }
+
   describe '.build' do
-    subject(:built) { described_class.build(type_de_champ) }
+    subject(:built) { described_class.build(type_de_champ, procedure.active_revision) }
 
     context 'when the type de champ is a drop_down_list' do
-      let(:type_de_champ) { build(:type_de_champ_drop_down_list) }
+      let(:type_de_champ) { build(:type_de_champ_drop_down_list, procedure: procedure) }
 
       it { expect(built).to be_kind_of(TypesDeChamp::PrefillDropDownListTypeDeChamp) }
     end
 
     context 'when the type de champ is a multiple_drop_down_list' do
-      let(:type_de_champ) { build(:type_de_champ_multiple_drop_down_list) }
+      let(:type_de_champ) { build(:type_de_champ_multiple_drop_down_list, procedure: procedure) }
 
       it { expect(built).to be_kind_of(TypesDeChamp::PrefillMultipleDropDownListTypeDeChamp) }
     end
 
     context 'when the type de champ is a pays' do
-      let(:type_de_champ) { build(:type_de_champ_pays) }
+      let(:type_de_champ) { build(:type_de_champ_pays, procedure: procedure) }
 
       it { expect(built).to be_kind_of(TypesDeChamp::PrefillPaysTypeDeChamp) }
     end
 
     context 'when the type de champ is a regions' do
-      let(:type_de_champ) { build(:type_de_champ_regions) }
+      let(:type_de_champ) { build(:type_de_champ_regions, procedure: procedure) }
 
       it { expect(built).to be_kind_of(TypesDeChamp::PrefillRegionTypeDeChamp) }
     end
 
     context 'when the type de champ is a repetition' do
-      let(:type_de_champ) { build(:type_de_champ_repetition) }
+      let(:type_de_champ) { build(:type_de_champ_repetition, procedure: procedure) }
 
       it { expect(built).to be_kind_of(TypesDeChamp::PrefillRepetitionTypeDeChamp) }
     end
 
     context 'when the type de champ is a departements' do
-      let(:type_de_champ) { build(:type_de_champ_departements) }
+      let(:type_de_champ) { build(:type_de_champ_departements, procedure: procedure) }
 
       it { expect(built).to be_kind_of(TypesDeChamp::PrefillDepartementTypeDeChamp) }
     end
 
     context 'when the type de champ is a epci' do
-      let(:type_de_champ) { build(:type_de_champ_epci) }
+      let(:type_de_champ) { build(:type_de_champ_epci, procedure: procedure) }
 
       it { expect(built).to be_kind_of(TypesDeChamp::PrefillEpciTypeDeChamp) }
     end
 
     context 'when any other type de champ' do
-      let(:type_de_champ) { build(:type_de_champ_date) }
+      let(:type_de_champ) { build(:type_de_champ_date, procedure: procedure) }
 
       it { expect(built).to be_kind_of(TypesDeChamp::PrefillTypeDeChamp) }
     end
   end
 
   describe '.wrap' do
-    subject(:wrapped) { described_class.wrap([build(:type_de_champ_drop_down_list), build(:type_de_champ_email)]) }
+    subject(:wrapped) { described_class.wrap([build(:type_de_champ_drop_down_list, procedure: procedure), build(:type_de_champ_email, procedure: procedure)], procedure.active_revision) }
 
     it 'wraps the collection' do
       expect(wrapped.first).to be_kind_of(TypesDeChamp::PrefillDropDownListTypeDeChamp)
@@ -66,7 +68,7 @@ RSpec.describe TypesDeChamp::PrefillTypeDeChamp, type: :model do
   end
 
   describe '#possible_values' do
-    let(:built) { described_class.build(type_de_champ) }
+    let(:built) { described_class.build(type_de_champ, procedure.active_revision) }
     subject(:possible_values) { built.possible_values }
 
     context 'when the type de champ is prefillable' do
@@ -88,7 +90,7 @@ RSpec.describe TypesDeChamp::PrefillTypeDeChamp, type: :model do
         let(:link_to_all_possible_values) {
           link_to(
             I18n.t("views.prefill_descriptions.edit.possible_values.link.text"),
-            Rails.application.routes.url_helpers.prefill_type_de_champ_path(type_de_champ.path, type_de_champ),
+            Rails.application.routes.url_helpers.prefill_type_de_champ_path(procedure.path, type_de_champ),
             title: new_tab_suffix(I18n.t("views.prefill_descriptions.edit.possible_values.link.title")),
             **external_link_attributes
           )
@@ -113,33 +115,33 @@ RSpec.describe TypesDeChamp::PrefillTypeDeChamp, type: :model do
     end
 
     context 'when the type de champ is not prefillable' do
-      let(:type_de_champ) { build(:type_de_champ_mesri) }
+      let(:type_de_champ) { build(:type_de_champ_mesri, procedure: procedure) }
 
       it { expect(possible_values).to be_empty }
     end
   end
 
   describe '#example_value' do
-    subject(:example_value) { described_class.build(type_de_champ).example_value }
+    subject(:example_value) { described_class.build(type_de_champ, procedure.active_revision).example_value }
 
     context 'when the type de champ is not prefillable' do
-      let(:type_de_champ) { build(:type_de_champ_mesri) }
+      let(:type_de_champ) { build(:type_de_champ_mesri, procedure: procedure) }
 
       it { expect(example_value).to be_nil }
     end
 
     context 'when the type de champ is prefillable' do
-      let(:type_de_champ) { build(:type_de_champ_email) }
+      let(:type_de_champ) { build(:type_de_champ_email, procedure: procedure) }
 
       it { expect(example_value).to eq(I18n.t("views.prefill_descriptions.edit.examples.#{type_de_champ.type_champ}")) }
     end
   end
 
   describe '#to_assignable_attributes' do
-    let(:type_de_champ) { build(:type_de_champ_email) }
+    let(:type_de_champ) { build(:type_de_champ_email, procedure: procedure) }
     let(:champ) { build(:champ, type_de_champ: type_de_champ) }
     let(:value) { "any@email.org" }
-    subject(:to_assignable_attributes) { described_class.build(type_de_champ).to_assignable_attributes(champ, value) }
+    subject(:to_assignable_attributes) { described_class.build(type_de_champ, procedure.active_revision).to_assignable_attributes(champ, value) }
 
     it { is_expected.to match({ id: champ.id, value: value }) }
   end
diff --git a/spec/system/users/dossier_prefill_get_spec.rb b/spec/system/users/dossier_prefill_get_spec.rb
index 83e4b9316..2f7274b8f 100644
--- a/spec/system/users/dossier_prefill_get_spec.rb
+++ b/spec/system/users/dossier_prefill_get_spec.rb
@@ -22,7 +22,7 @@ describe 'Prefilling a dossier (with a GET request):' do
     ]
   }
   let(:epci_value) { ['01', '200029999'] }
-  let(:sub_type_de_champs_repetition) { type_de_champ_repetition.active_revision_type_de_champ.revision_types_de_champ.map(&:type_de_champ) }
+  let(:sub_type_de_champs_repetition) { procedure.active_revision.children_of(type_de_champ_repetition) }
   let(:text_repetition_libelle) { sub_type_de_champs_repetition.first.libelle }
   let(:integer_repetition_libelle) { sub_type_de_champs_repetition.second.libelle }
   let(:text_repetition_value) { "First repetition text" }
diff --git a/spec/system/users/dossier_prefill_post_spec.rb b/spec/system/users/dossier_prefill_post_spec.rb
index 2a5f65ac3..880122515 100644
--- a/spec/system/users/dossier_prefill_post_spec.rb
+++ b/spec/system/users/dossier_prefill_post_spec.rb
@@ -22,7 +22,7 @@ describe 'Prefilling a dossier (with a POST request):' do
     ]
   }
   let(:epci_value) { ['01', '200029999'] }
-  let(:sub_type_de_champs_repetition) { type_de_champ_repetition.active_revision_type_de_champ.revision_types_de_champ.map(&:type_de_champ) }
+  let(:sub_type_de_champs_repetition) { procedure.active_revision.children_of(type_de_champ_repetition) }
   let(:text_repetition_libelle) { sub_type_de_champs_repetition.first.libelle }
   let(:integer_repetition_libelle) { sub_type_de_champs_repetition.second.libelle }
   let(:text_repetition_value) { "First repetition text" }

From 9c0cd8979a54e553b8422f19e5be5e5b0aafe683 Mon Sep 17 00:00:00 2001
From: Paul Chavard <pro@paul.chavard.net>
Date: Tue, 21 Feb 2023 16:06:39 +0100
Subject: [PATCH 097/202] fix(graphql): context should correctly preserve
 demarche authorization state

---
 app/graphql/api/v2/context.rb |  8 ++++----
 spec/graphql/demarche_spec.rb | 25 +++++++++++++++++++++++++
 2 files changed, 29 insertions(+), 4 deletions(-)

diff --git a/app/graphql/api/v2/context.rb b/app/graphql/api/v2/context.rb
index 0b23f1212..294387a61 100644
--- a/app/graphql/api/v2/context.rb
+++ b/app/graphql/api/v2/context.rb
@@ -42,10 +42,10 @@ class API::V2::Context < GraphQL::Query::Context
       return true
     end
 
-    # We are caching authorization logic because it is called for each node
-    # of the requested graph and can be expensive. Context is reset per request so it is safe.
-    self[:authorized] ||= Hash.new do |hash, demarche_id|
-      hash[demarche_id] = if self[:administrateur_id]
+    self[:authorized] ||= {}
+
+    if self[:authorized][demarche.id].nil?
+      self[:authorized][demarche.id] = if self[:administrateur_id]
         demarche.administrateurs.map(&:id).include?(self[:administrateur_id])
       elsif self[:token]
         APIToken.find_and_verify(self[:token], demarche.administrateurs).present?
diff --git a/spec/graphql/demarche_spec.rb b/spec/graphql/demarche_spec.rb
index 29dc4de85..db60988d0 100644
--- a/spec/graphql/demarche_spec.rb
+++ b/spec/graphql/demarche_spec.rb
@@ -8,6 +8,24 @@ RSpec.describe Types::DemarcheType, type: :graphql do
   let(:data) { subject['data'].deep_symbolize_keys }
   let(:errors) { subject['errors'].deep_symbolize_keys }
 
+  describe 'context should correctly preserve demarche authorization state' do
+    let(:query) { DEMARCHE_QUERY }
+    let(:admin) { create(:administrateur) }
+    let(:procedure) { create(:procedure, administrateurs: [admin]) }
+
+    let(:other_admin_procedure) { create(:procedure) }
+    let(:context) { { administrateur_id: admin.id } }
+    let(:variables) { { number: procedure.id } }
+
+    it do
+      result = API::V2::Schema.execute(query, variables: variables, context: context)
+      graphql_context = result.context
+
+      expect(graphql_context.authorized_demarche?(procedure)).to be_truthy
+      expect(graphql_context.authorized_demarche?(other_admin_procedure)).to be_falsey
+    end
+  end
+
   describe 'demarche with clone' do
     let(:procedure) { create(:procedure, types_de_champ_public: [{ type: :yes_no }]) }
     let(:procedure_clone) { procedure.clone(procedure.administrateurs.first, false) }
@@ -23,6 +41,13 @@ RSpec.describe Types::DemarcheType, type: :graphql do
       expect(procedure.draft_revision.types_de_champ_public.first.stable_id).to eq(procedure_clone.draft_revision.types_de_champ_public.first.stable_id)
     }
   end
+  DEMARCHE_QUERY = <<-GRAPHQL
+  query($number: Int!) {
+    demarche(number: $number) {
+      number
+    }
+  }
+  GRAPHQL
 
   DEMARCHE_WITH_CHAMP_DESCRIPTORS_QUERY = <<-GRAPHQL
   query($number: Int!) {

From f6fb1ceca5ebccf6f2b38b8975b54221a63abcda Mon Sep 17 00:00:00 2001
From: Martin <martin@sharypic.com>
Date: Tue, 21 Feb 2023 15:49:13 +0100
Subject: [PATCH 098/202] correctif(attachement_edit): ajoute le cmmposant
 <form> pour supprimer un attachment via le nouveau <button>

---
 app/components/attachment/delete_form_component.rb         | 7 +++++++
 .../administrateurs/attestation_templates/edit.html.haml   | 1 +
 app/views/administrateurs/procedures/edit.html.haml        | 1 +
 app/views/administrateurs/procedures/new.html.haml         | 2 ++
 app/views/experts/avis/instruction.html.haml               | 2 +-
 app/views/experts/shared/avis/_form.html.haml              | 2 +-
 app/views/instructeurs/avis/instruction.html.haml          | 1 +
 app/views/instructeurs/shared/avis/_form.html.haml         | 1 +
 app/views/shared/dossiers/_edit.html.haml                  | 6 +-----
 app/views/shared/dossiers/messages/_form.html.haml         | 1 +
 10 files changed, 17 insertions(+), 7 deletions(-)
 create mode 100644 app/components/attachment/delete_form_component.rb

diff --git a/app/components/attachment/delete_form_component.rb b/app/components/attachment/delete_form_component.rb
new file mode 100644
index 000000000..2be43262e
--- /dev/null
+++ b/app/components/attachment/delete_form_component.rb
@@ -0,0 +1,7 @@
+# Display a form for destroying a file attachment via a button, but since it might already be nested within a form
+# put this component before the actual form containing the editcomponent
+class Attachment::DeleteFormComponent < ApplicationComponent
+  def call
+    form_tag('/attachments/:id', method: :delete, data: { 'turbo-method': :delete, turbo: true }, id: dom_id(ActiveStorage::Attachment.new, :delete)) {}
+  end
+end
diff --git a/app/views/administrateurs/attestation_templates/edit.html.haml b/app/views/administrateurs/attestation_templates/edit.html.haml
index 5fac6a715..4dbeede52 100644
--- a/app/views/administrateurs/attestation_templates/edit.html.haml
+++ b/app/views/administrateurs/attestation_templates/edit.html.haml
@@ -7,6 +7,7 @@
 
 .procedure-form#attestation-template-edit
   .procedure-form__columns.container
+    = render Attachment::DeleteFormComponent.new
     = form_for @attestation_template,
       url: admin_procedure_attestation_template_path(@procedure),
       html: { multipart: true, class: 'form form-ds-fr-white procedure-form__column--form' } do |f|
diff --git a/app/views/administrateurs/procedures/edit.html.haml b/app/views/administrateurs/procedures/edit.html.haml
index a46cdd144..5bbb0508c 100644
--- a/app/views/administrateurs/procedures/edit.html.haml
+++ b/app/views/administrateurs/procedures/edit.html.haml
@@ -6,6 +6,7 @@
                     ['Description']] }
 .procedure-form
   .procedure-form__columns.container
+    = render Attachment::DeleteFormComponent.new
     = form_for @procedure,
       url: url_for({ controller: 'administrateurs/procedures', action: :update, id: @procedure.id }),
       html: { class: 'form procedure-form__column--form',
diff --git a/app/views/administrateurs/procedures/new.html.haml b/app/views/administrateurs/procedures/new.html.haml
index 6fa4ee0c7..43d196bf6 100644
--- a/app/views/administrateurs/procedures/new.html.haml
+++ b/app/views/administrateurs/procedures/new.html.haml
@@ -6,12 +6,14 @@
 
 .procedure-form
   .procedure-form__columns.container
+    = render Attachment::DeleteFormComponent.new
     = form_for @procedure,
       url: url_for({ controller: 'administrateurs/procedures', action: :create, id: @procedure.id }),
       html: { class: 'form procedure-form__column--form', multipart: true } do |f|
 
       %h1.page-title Nouvelle démarche
 
+
       = render partial: 'administrateurs/procedures/informations', locals: { f: f }
 
       .procedure-form__actions.sticky--bottom
diff --git a/app/views/experts/avis/instruction.html.haml b/app/views/experts/avis/instruction.html.haml
index 0075ee54e..0772abd9d 100644
--- a/app/views/experts/avis/instruction.html.haml
+++ b/app/views/experts/avis/instruction.html.haml
@@ -14,7 +14,7 @@
     - if @avis.introduction_file.attached?
       = render Attachment::ShowComponent.new(attachment: @avis.introduction_file.attachment)
     %br/
-
+    = render Attachment::DeleteFormComponent.new
     = form_for @avis, url: expert_avis_path(@avis.procedure, @avis), html: { class: 'form', data: { controller: 'persisted-form', persisted_form_key_value: dom_id(@avis) }, multipart: true } do |f|
       = f.text_area :answer, rows: 3, placeholder: 'Votre avis', required: true
       = render Attachment::EditComponent.new(attached_file: @avis.piece_justificative_file, view_as: :download)
diff --git a/app/views/experts/shared/avis/_form.html.haml b/app/views/experts/shared/avis/_form.html.haml
index 1d6b70ab5..f0bec0090 100644
--- a/app/views/experts/shared/avis/_form.html.haml
+++ b/app/views/experts/shared/avis/_form.html.haml
@@ -2,7 +2,7 @@
   %section.ask-avis
     %h1.tab-title Inviter des personnes à donner leur avis
     %p.avis-notice Les invités pourront consulter le dossier, donner un avis et contribuer au fil de messagerie. Ils ne pourront pas modifier le dossier.
-
+    = render Attachment::DeleteFormComponent.new
     = form_for avis, url: url, html: { class: 'form', multipart: true, data: { controller: 'persisted-form', persisted_form_key_value: dom_id(@avis.dossier, :avis_by_expert) } } do |f|
       = hidden_field_tag  'avis[emails]', nil
       = react_component("ComboMultiple",
diff --git a/app/views/instructeurs/avis/instruction.html.haml b/app/views/instructeurs/avis/instruction.html.haml
index fb9c18335..93deba394 100644
--- a/app/views/instructeurs/avis/instruction.html.haml
+++ b/app/views/instructeurs/avis/instruction.html.haml
@@ -15,6 +15,7 @@
       = render Attachment::ShowComponent.new(attachment: @avis.introduction_file.attachment)
     %br/
 
+    = render Attachment::DeleteFormComponent.new
     = form_for @avis, url: instructeur_avis_path(@avis.procedure, @avis), html: { class: 'form' } do |f|
       = f.text_area :answer, rows: 3, placeholder: 'Votre avis', required: true
       = render Attachment::EditComponent.new(attached_file: @avis.piece_justificative_file)
diff --git a/app/views/instructeurs/shared/avis/_form.html.haml b/app/views/instructeurs/shared/avis/_form.html.haml
index 90248d0f6..99f99c666 100644
--- a/app/views/instructeurs/shared/avis/_form.html.haml
+++ b/app/views/instructeurs/shared/avis/_form.html.haml
@@ -8,6 +8,7 @@
     %p#avis-emails-description.avis-notice
       Entrez les adresses email des experts à qui vous souhaitez demander un avis
 
+  = render Attachment::DeleteFormComponent.new
   = form_for avis, url: url, html: { class: 'form', multipart: true, data: { controller: 'persisted-form', persisted_form_key_value: dom_id(@dossier, :avis_by_instructeur) } } do |f|
     = hidden_field_tag  'avis[emails]', nil
     = react_component("ComboMultiple",
diff --git a/app/views/shared/dossiers/_edit.html.haml b/app/views/shared/dossiers/_edit.html.haml
index b659a126d..0892c575b 100644
--- a/app/views/shared/dossiers/_edit.html.haml
+++ b/app/views/shared/dossiers/_edit.html.haml
@@ -9,11 +9,7 @@
     - form_options = { url: brouillon_dossier_url(dossier), method: :patch, data: { save_on_input: true } }
   - else
     - form_options = { url: modifier_dossier_url(dossier), method: :patch }
-
-  %div
-    = form_tag('/attachments/:id', method: :delete, data: { 'turbo-method': :delete, turbo: true }, id: dom_id(ActiveStorage::Attachment.new, :delete)) do
-      -# otherwise the closing tag bugs
-
+  = render Attachment::DeleteFormComponent.new
   = form_for dossier, form_options.merge({ html: { id: 'dossier-edit-form', class: 'form', multipart: true, novalidate: 'novalidate' } }) do |f|
 
     %header.mb-6
diff --git a/app/views/shared/dossiers/messages/_form.html.haml b/app/views/shared/dossiers/messages/_form.html.haml
index 6d04822bd..2d3845451 100644
--- a/app/views/shared/dossiers/messages/_form.html.haml
+++ b/app/views/shared/dossiers/messages/_form.html.haml
@@ -1,3 +1,4 @@
+= render Attachment::DeleteFormComponent.new
 = form_for(commentaire, url: form_url, html: { class: 'form', multipart: true, data: { controller: 'persisted-form', persisted_form_key_value: @dossier.present? ? dom_id(@dossier) : dom_id(@procedure, :bulk_message) } }) do |f|
   - dossier = commentaire.dossier
   - placeholder = t('views.shared.dossiers.messages.form.write_message_to_administration_placeholder')

From cc2ec995d68e999a5e434fcd79fff46146ebe384 Mon Sep 17 00:00:00 2001
From: Damien Le Thiec <damien.lethiec@gmail.com>
Date: Tue, 21 Feb 2023 17:32:24 +0100
Subject: [PATCH 099/202] Fix tests

---
 spec/models/prefill_description_spec.rb                   | 2 +-
 spec/models/prefill_params_spec.rb                        | 2 +-
 .../prefill_drop_down_list_type_de_champ_spec.rb          | 7 ++++---
 .../prefill_multiple_drop_down_list_type_de_champ_spec.rb | 8 +++++---
 4 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/spec/models/prefill_description_spec.rb b/spec/models/prefill_description_spec.rb
index a88015569..3b15f9c87 100644
--- a/spec/models/prefill_description_spec.rb
+++ b/spec/models/prefill_description_spec.rb
@@ -127,7 +127,7 @@ RSpec.describe PrefillDescription, type: :model do
   describe '#prefill_query', vcr: { cassette_name: 'api_geo_regions' } do
     let(:procedure) { create(:procedure) }
     let(:type_de_champ_text) { create(:type_de_champ_text, procedure: procedure) }
-    let(:type_de_champ_epci) { TypesDeChamp::PrefillTypeDeChamp.build(create(:type_de_champ_epci, procedure: procedure)) }
+    let(:type_de_champ_epci) { TypesDeChamp::PrefillTypeDeChamp.build(create(:type_de_champ_epci, procedure: procedure), procedure.active_revision) }
     let(:type_de_champ_repetition) { build(:type_de_champ_repetition, :with_types_de_champ, :with_region_types_de_champ, procedure: procedure) }
     let(:prefillable_subchamps) { TypesDeChamp::PrefillRepetitionTypeDeChamp.new(type_de_champ_repetition, procedure.active_revision).send(:prefillable_subchamps) }
     let(:region_repetition) { prefillable_subchamps.third }
diff --git a/spec/models/prefill_params_spec.rb b/spec/models/prefill_params_spec.rb
index a74494ae0..5ec73ddde 100644
--- a/spec/models/prefill_params_spec.rb
+++ b/spec/models/prefill_params_spec.rb
@@ -251,7 +251,7 @@ RSpec.describe PrefillParams do
 
   def attributes(champ, value)
     TypesDeChamp::PrefillTypeDeChamp
-      .build(champ.type_de_champ)
+      .build(champ.type_de_champ, procedure.active_revision)
       .to_assignable_attributes(champ, value)
   end
 end
diff --git a/spec/models/types_de_champ/prefill_drop_down_list_type_de_champ_spec.rb b/spec/models/types_de_champ/prefill_drop_down_list_type_de_champ_spec.rb
index 499ce5b3f..f1a4c65da 100644
--- a/spec/models/types_de_champ/prefill_drop_down_list_type_de_champ_spec.rb
+++ b/spec/models/types_de_champ/prefill_drop_down_list_type_de_champ_spec.rb
@@ -3,7 +3,7 @@
 RSpec.describe TypesDeChamp::PrefillDropDownListTypeDeChamp do
   describe '#possible_values' do
     let(:procedure) { create(:procedure) }
-    subject(:possible_values) { described_class.new(type_de_champ).possible_values }
+    subject(:possible_values) { described_class.new(type_de_champ, procedure.active_revision).possible_values }
 
     before { type_de_champ.reload }
 
@@ -25,8 +25,9 @@ RSpec.describe TypesDeChamp::PrefillDropDownListTypeDeChamp do
   end
 
   describe '#example_value' do
-    let(:type_de_champ) { build(:type_de_champ_drop_down_list) }
-    subject(:example_value) { described_class.new(type_de_champ).example_value }
+    let(:procedure) { create(:procedure) }
+    let(:type_de_champ) { build(:type_de_champ_drop_down_list, procedure: procedure) }
+    subject(:example_value) { described_class.new(type_de_champ, procedure.active_revision).example_value }
 
     it { expect(example_value).to eq(type_de_champ.drop_down_list_enabled_non_empty_options.first) }
   end
diff --git a/spec/models/types_de_champ/prefill_multiple_drop_down_list_type_de_champ_spec.rb b/spec/models/types_de_champ/prefill_multiple_drop_down_list_type_de_champ_spec.rb
index d44fd1274..3a825b41e 100644
--- a/spec/models/types_de_champ/prefill_multiple_drop_down_list_type_de_champ_spec.rb
+++ b/spec/models/types_de_champ/prefill_multiple_drop_down_list_type_de_champ_spec.rb
@@ -1,15 +1,17 @@
 # frozen_string_literal: true
 
 RSpec.describe TypesDeChamp::PrefillMultipleDropDownListTypeDeChamp do
+  let(:procedure) { create(:procedure) }
+
   describe 'ancestors' do
-    subject { described_class.new(build(:type_de_champ_multiple_drop_down_list)) }
+    subject { described_class.new(build(:type_de_champ_multiple_drop_down_list, procedure: procedure), procedure.active_revision) }
 
     it { is_expected.to be_kind_of(TypesDeChamp::PrefillDropDownListTypeDeChamp) }
   end
 
   describe '#example_value' do
-    let(:type_de_champ) { build(:type_de_champ_multiple_drop_down_list, drop_down_list_value: drop_down_list_value) }
-    subject(:example_value) { described_class.new(type_de_champ).example_value }
+    let(:type_de_champ) { build(:type_de_champ_multiple_drop_down_list, drop_down_list_value: drop_down_list_value, procedure: procedure) }
+    subject(:example_value) { described_class.new(type_de_champ, procedure.active_revision).example_value }
 
     context 'when the multiple drop down list has no option' do
       let(:drop_down_list_value) { "" }

From 8a3bb0c38e372194aacb60224e92ce0e14ae8f3a Mon Sep 17 00:00:00 2001
From: Colin Darie <colin@darie.eu>
Date: Tue, 21 Feb 2023 12:30:09 +0100
Subject: [PATCH 100/202] fix(instructeurs): combobox layout in "personnes
 impliquees" tab

Closes #8527
---
 .../stylesheets/personnes_impliquees.scss     |  2 +-
 .../dossiers/_envoyer_dossier_block.html.haml | 19 +++++++++----------
 .../_envoyer_dossier_block.html.haml_spec.rb  |  4 ++--
 3 files changed, 12 insertions(+), 13 deletions(-)

diff --git a/app/assets/stylesheets/personnes_impliquees.scss b/app/assets/stylesheets/personnes_impliquees.scss
index 5fb6ae3fc..64e982129 100644
--- a/app/assets/stylesheets/personnes_impliquees.scss
+++ b/app/assets/stylesheets/personnes_impliquees.scss
@@ -10,7 +10,7 @@
   }
 
   [data-react-component-value^="ComboMultiple"] {
-    margin-bottom: $default-fields-spacer;
+    margin-bottom: 0;
 
     [data-reach-combobox-token-list] {
       padding: 0.5 * $default-padding;
diff --git a/app/views/instructeurs/dossiers/_envoyer_dossier_block.html.haml b/app/views/instructeurs/dossiers/_envoyer_dossier_block.html.haml
index 1ab77bf97..b60bf1c32 100644
--- a/app/views/instructeurs/dossiers/_envoyer_dossier_block.html.haml
+++ b/app/views/instructeurs/dossiers/_envoyer_dossier_block.html.haml
@@ -6,14 +6,13 @@
 - else
   %p.tab-paragrah.mb-1
     Le destinataire suivra automatiquement le dossier
-  = form_for dossier, url: send_to_instructeurs_instructeur_dossier_path(dossier.procedure, dossier), method: :post, html: { class: 'form recipients-form' } do |f|
-    .flex.justify-start.align-start
-      = hidden_field_tag :recipients, nil
-      = react_component("ComboMultiple",
-        options: potential_recipients.map{|r| [r.email, r.id]},
-        selected: [], disabled: [],
-        group: '.recipients-form',
-        name: 'recipients',
-        label: 'Emails')
+  = form_for dossier, url: send_to_instructeurs_instructeur_dossier_path(dossier.procedure, dossier), method: :post, html: { class: 'form recipients-form fr-mb-4w' } do |f|
+    = hidden_field_tag :recipients, nil
+    = react_component("ComboMultiple",
+      options: potential_recipients.map{|r| [r.email, r.id]},
+      selected: [], disabled: [],
+      group: '.recipients-form',
+      name: 'recipients',
+      label: 'Emails')
 
-      = f.submit "Envoyer", class: "button large send gap-left"
+    = f.submit "Envoyer", class: "fr-btn fr-mt-2w"
diff --git a/spec/views/instructeur/dossiers/_envoyer_dossier_block.html.haml_spec.rb b/spec/views/instructeur/dossiers/_envoyer_dossier_block.html.haml_spec.rb
index c094c5f16..60d6f44ef 100644
--- a/spec/views/instructeur/dossiers/_envoyer_dossier_block.html.haml_spec.rb
+++ b/spec/views/instructeur/dossiers/_envoyer_dossier_block.html.haml_spec.rb
@@ -14,14 +14,14 @@ describe 'instructeurs/dossiers/envoyer_dossier_block.html.haml', type: :view do
     let(:potential_recipients) { [instructeur] }
 
     it { is_expected.to match(/data-react-props.*#{instructeur.email}/) }
-    it { is_expected.to have_css(".button.send") }
+    it { is_expected.to have_css(".fr-btn") }
   end
 
   context "there is no other instructeur for the procedure" do
     let(:potential_recipients) { [] }
 
     it { is_expected.not_to have_css("select") }
-    it { is_expected.not_to have_css(".button.send") }
+    it { is_expected.not_to have_css(".fr-btn") }
     it { is_expected.to have_content("Vous êtes le seul instructeur assigné sur cette démarche") }
   end
 end

From 3aa7793ed35cf9c8790551d228db65f4e28b7a9c Mon Sep 17 00:00:00 2001
From: Eric Leroy-Terquem <eric.leroyterquem@beta.gouv.fr>
Date: Wed, 18 Jan 2023 16:38:56 +0100
Subject: [PATCH 101/202] fix(groupe_instructeurs): can parse a monocolumn csv
 file

---
 config/initializers/acsv.rb                           |  2 +-
 .../groupe_instructeurs_controller_spec.rb            | 11 +++++++++++
 2 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/config/initializers/acsv.rb b/config/initializers/acsv.rb
index 3a24d2032..d099dbe6a 100644
--- a/config/initializers/acsv.rb
+++ b/config/initializers/acsv.rb
@@ -4,7 +4,7 @@ require 'csv'
 module ACSV
   class CSV < ::CSV
     def self.new_for_ruby3(data, options = {})
-      options[:col_sep] ||= ACSV::Detect.separator(data)
+      options[:col_sep] ||= ACSV::Detect.separator(data) || :auto
       # because of the Separation of positional and keyword arguments in Ruby 3.0
       # (https://www.ruby-lang.org/en/news/2019/12/12/separation-of-positional-and-keyword-arguments-in-ruby-3-0/)
       # instead of
diff --git a/spec/controllers/administrateurs/groupe_instructeurs_controller_spec.rb b/spec/controllers/administrateurs/groupe_instructeurs_controller_spec.rb
index b3b1f1a2f..7c1693b88 100644
--- a/spec/controllers/administrateurs/groupe_instructeurs_controller_spec.rb
+++ b/spec/controllers/administrateurs/groupe_instructeurs_controller_spec.rb
@@ -405,6 +405,17 @@ describe Administrateurs::GroupeInstructeursController, type: :controller do
       it { expect(flash.alert).to eq("Import terminé. Cependant les emails suivants ne sont pas pris en compte: kara") }
     end
 
+    context 'when the csv file has only one column' do
+      let(:csv_file) { fixture_file_upload('spec/fixtures/files/valid-instructeurs-file.csv', 'text/csv') }
+
+      before { subject }
+
+      it { expect { subject }.not_to raise_error }
+      it { expect(response.status).to eq(302) }
+      it { expect(flash.alert).to be_present }
+      it { expect(flash.alert).to eq("Importation impossible, veuillez importer un csv <a href=\"/csv/#{I18n.locale}/import-groupe-test.csv\">suivant ce modèle</a>") }
+    end
+
     context 'when the file content type is application/vnd.ms-excel' do
       let(:csv_file) { fixture_file_upload('spec/fixtures/files/groupe_avec_caracteres_speciaux.csv', "application/vnd.ms-excel") }
 

From 25df48f2553cc23e84f3148ced51d7ed7af92a33 Mon Sep 17 00:00:00 2001
From: Eric Leroy-Terquem <eric.leroyterquem@beta.gouv.fr>
Date: Tue, 10 Jan 2023 14:36:56 +0100
Subject: [PATCH 102/202] feat(groupe_instructeurs): import instructeurs in
 unrouted procedure with a proper CSV

---
 .../groupe_instructeurs_controller.rb         | 55 +++++++++++------
 app/services/instructeurs_import_service.rb   | 51 ++++++++++++----
 .../groupe_instructeurs/_edit.html.haml       |  8 ++-
 .../groupe_instructeurs/en.yml                |  5 +-
 .../groupe_instructeurs/fr.yml                |  7 ++-
 public/csv/import-instructeurs-test.csv       |  5 ++
 .../groupe_instructeurs_controller_spec.rb    | 59 +++++++++++++++++++
 spec/fixtures/files/instructeurs-file.csv     |  5 ++
 .../files/valid-instructeurs-file.csv         |  4 ++
 .../instructeurs_import_service_spec.rb       | 23 +++++++-
 10 files changed, 184 insertions(+), 38 deletions(-)
 create mode 100644 public/csv/import-instructeurs-test.csv
 create mode 100644 spec/fixtures/files/instructeurs-file.csv
 create mode 100644 spec/fixtures/files/valid-instructeurs-file.csv

diff --git a/app/controllers/administrateurs/groupe_instructeurs_controller.rb b/app/controllers/administrateurs/groupe_instructeurs_controller.rb
index 199b53b19..0e4392224 100644
--- a/app/controllers/administrateurs/groupe_instructeurs_controller.rb
+++ b/app/controllers/administrateurs/groupe_instructeurs_controller.rb
@@ -200,33 +200,54 @@ module Administrateurs
 
     def import
       if procedure.publiee_or_close?
-        if !CSV_ACCEPTED_CONTENT_TYPES.include?(group_csv_file.content_type) && !CSV_ACCEPTED_CONTENT_TYPES.include?(marcel_content_type)
+        if !CSV_ACCEPTED_CONTENT_TYPES.include?(csv_file.content_type) && !CSV_ACCEPTED_CONTENT_TYPES.include?(marcel_content_type)
           flash[:alert] = "Importation impossible : veuillez importer un fichier CSV"
 
-        elsif group_csv_file.size > CSV_MAX_SIZE
+        elsif csv_file.size > CSV_MAX_SIZE
           flash[:alert] = "Importation impossible : le poids du fichier est supérieur à #{number_to_human_size(CSV_MAX_SIZE)}"
 
         else
-          file = group_csv_file.read
+          file = csv_file.read
           base_encoding = CharlockHolmes::EncodingDetector.detect(file)
-          groupes_emails = ACSV::CSV.new_for_ruby3(file.encode("UTF-8", base_encoding[:encoding], invalid: :replace, replace: ""), headers: true, header_converters: :downcase)
-            .map { |r| r.to_h.slice('groupe', 'email') }
 
-          groupes_emails_has_keys = groupes_emails.first.has_key?("groupe") && groupes_emails.first.has_key?("email")
+          if params[:group_csv_file]
+            groupes_emails = ACSV::CSV.new_for_ruby3(file.encode("UTF-8", base_encoding[:encoding], invalid: :replace, replace: ""), headers: true, header_converters: :downcase)
+              .map { |r| r.to_h.slice('groupe', 'email') }
 
-          if groupes_emails_has_keys.blank?
-            flash[:alert] = "Importation impossible, veuillez importer un csv #{view_context.link_to('suivant ce modèle', "/csv/#{I18n.locale}/import-groupe-test.csv")}"
-          else
-            add_instructeurs_and_get_errors = InstructeursImportService.import(procedure, groupes_emails)
+            groupes_emails_has_keys = groupes_emails.first.has_key?("groupe") && groupes_emails.first.has_key?("email")
 
-            if add_instructeurs_and_get_errors.empty?
-              flash[:notice] = "La liste des instructeurs a été importée avec succès"
+            if groupes_emails_has_keys.blank?
+              flash[:alert] = "Importation impossible, veuillez importer un csv #{view_context.link_to('suivant ce modèle', "/csv/#{I18n.locale}/import-groupe-test.csv")}"
             else
-              flash[:alert] = "Import terminé. Cependant les emails suivants ne sont pas pris en compte: #{add_instructeurs_and_get_errors.join(', ')}"
+              add_instructeurs_and_get_errors = InstructeursImportService.import_groupes(procedure, groupes_emails)
+
+              if add_instructeurs_and_get_errors.blank?
+                flash[:notice] = "La liste des instructeurs a été importée avec succès"
+              else
+                flash[:alert] = "Import terminé. Cependant les emails suivants ne sont pas pris en compte: #{add_instructeurs_and_get_errors.join(', ')}"
+              end
+            end
+
+          elsif params[:instructeurs_csv_file]
+            instructors_emails = ACSV::CSV.new_for_ruby3(file.encode("UTF-8", base_encoding[:encoding], invalid: :replace, replace: ""), headers: true, header_converters: :downcase)
+              .map(&:to_h)
+
+            instructors_emails_has_key = instructors_emails.first.has_key?("email") && !instructors_emails.first.keys.many?
+
+            if instructors_emails_has_key.blank?
+              flash[:alert] = "Importation impossible, veuillez importer un csv #{view_context.link_to('suivant ce modèle', "/csv/import-instructeurs-test.csv")}"
+            else
+              add_instructeurs_and_get_errors = InstructeursImportService.import_instructeurs(procedure, instructors_emails)
+
+              if add_instructeurs_and_get_errors.blank?
+                flash[:notice] = "La liste des instructeurs a été importée avec succès"
+              else
+                flash[:alert] = "Import terminé. Cependant les emails suivants ne sont pas pris en compte: #{add_instructeurs_and_get_errors.join(', ')}"
+              end
             end
           end
+          redirect_to admin_procedure_groupe_instructeurs_path(procedure)
         end
-        redirect_to admin_procedure_groupe_instructeurs_path(procedure)
       end
     end
 
@@ -298,12 +319,12 @@ module Administrateurs
       (all - assigned).sort
     end
 
-    def group_csv_file
-      params[:group_csv_file]
+    def csv_file
+      params[:group_csv_file] || params[:instructeurs_csv_file]
     end
 
     def marcel_content_type
-      Marcel::MimeType.for(group_csv_file.read, name: group_csv_file.original_filename, declared_type: group_csv_file.content_type)
+      Marcel::MimeType.for(csv_file.read, name: csv_file.original_filename, declared_type: csv_file.content_type)
     end
 
     def instructeurs_self_management_enabled_params
diff --git a/app/services/instructeurs_import_service.rb b/app/services/instructeurs_import_service.rb
index fad1e5922..5638c4cdc 100644
--- a/app/services/instructeurs_import_service.rb
+++ b/app/services/instructeurs_import_service.rb
@@ -1,5 +1,5 @@
 class InstructeursImportService
-  def self.import(procedure, groupes_emails)
+  def self.import_groupes(procedure, groupes_emails)
     created_at = Time.zone.now
     updated_at = Time.zone.now
 
@@ -20,21 +20,30 @@ class InstructeursImportService
 
     target_groupes = procedure.reload.groupe_instructeurs
 
-    target_emails = groupes_emails.map { |groupe_email| groupe_email["email"] }.uniq
-
-    existing_emails = Instructeur.where(user: { email: target_emails }).pluck(:email)
-    missing_emails = target_emails - existing_emails
-    missing_emails.each { |email| create_instructeur(admins, email) }
-
-    target_instructeurs = User.where(email: target_emails).map(&:instructeur)
+    target_instructeurs = find_or_create_instructeurs(admins, groupes_emails)
 
     groupes_emails.each do |groupe_email|
       gi = target_groupes.find { |g| g.label == groupe_email['groupe'] }
-      instructeur = target_instructeurs.find { |i| i.email == groupe_email['email'] }
+      add_instructeur_to_groupe(target_instructeurs, groupe_email, gi)
+    end
 
-      if !gi.instructeurs.include?(instructeur)
-        gi.instructeurs << instructeur
-      end
+    errors
+  end
+
+  def self.import_instructeurs(procedure, emails)
+    admins = procedure.administrateurs
+
+    instructeurs_emails, error_instructeurs_emails = emails
+      .map { |instructeur_email| { "email" => instructeur_email["email"].present? ? instructeur_email["email"].gsub(/[[:space:]]/, '').downcase : nil } }
+      .partition { |instructeur_email| Devise.email_regexp.match?(instructeur_email['email']) }
+
+    errors = error_instructeurs_emails.map { |instructeur_email| instructeur_email['email'] }
+
+    target_instructeurs = find_or_create_instructeurs(admins, instructeurs_emails)
+
+    instructeurs_emails.each do |instructeur_email|
+      gi = procedure.defaut_groupe_instructeur
+      add_instructeur_to_groupe(target_instructeurs, instructeur_email, gi)
     end
 
     errors
@@ -42,6 +51,16 @@ class InstructeursImportService
 
   private
 
+  def self.find_or_create_instructeurs(administrateurs, instructeurs_emails)
+    target_emails = instructeurs_emails.map { |instructeur_email| instructeur_email["email"] }.uniq
+
+    existing_emails = Instructeur.where(user: { email: target_emails }).pluck(:email)
+    missing_emails = target_emails - existing_emails
+    missing_emails.each { |email| create_instructeur(administrateurs, email) }
+
+    User.where(email: target_emails).map(&:instructeur)
+  end
+
   def self.create_instructeur(administrateurs, email)
     user = User.create_or_promote_to_instructeur(
       email,
@@ -51,4 +70,12 @@ class InstructeursImportService
     user.invite!
     user.instructeur
   end
+
+  def self.add_instructeur_to_groupe(target_instructeurs, instructeur_email, gi)
+    instructeur = target_instructeurs.find { |i| i.email == instructeur_email['email'] }
+
+    if !gi.instructeurs.include?(instructeur)
+      gi.instructeurs << instructeur
+    end
+  end
 end
diff --git a/app/views/administrateurs/groupe_instructeurs/_edit.html.haml b/app/views/administrateurs/groupe_instructeurs/_edit.html.haml
index 7a5543d3b..8e19f57d3 100644
--- a/app/views/administrateurs/groupe_instructeurs/_edit.html.haml
+++ b/app/views/administrateurs/groupe_instructeurs/_edit.html.haml
@@ -28,11 +28,13 @@
     = form_tag import_admin_procedure_groupe_instructeurs_path(procedure), method: :post, multipart: true, class: "mt-4 form" do
       = label_tag t('.csv_import.title')
       %p.notice
-        = t('.csv_import.notice_1')
+        = procedure.routing_enabled? ? t('.csv_import.routing_enabled.notice_1') : t('.csv_import.routing_disabled.notice_1')
       %p.notice
         = t('.csv_import.notice_2', csv_max_size: number_to_human_size(csv_max_size))
-      %p.mt-2.mb-2= link_to t('.csv_import.download_exemple'), "/csv/#{I18n.locale}/import-groupe-test.csv"
-      = file_field_tag :group_csv_file, required: true, accept: 'text/csv', size: "1"
+      - sample_file_path = procedure.routing_enabled? ? "/csv/#{I18n.locale}/import-groupe-test.csv" : "/csv/import-instructeurs-test.csv"
+      %p.mt-2.mb-2= link_to t('.csv_import.download_exemple'), sample_file_path
+      - csv_params = procedure.routing_enabled? ? :group_csv_file : :instructeurs_csv_file
+      = file_field_tag csv_params, required: true, accept: 'text/csv', size: "1"
       = submit_tag t('.csv_import.import_file'), class: 'button primary send', data: { disable_with: "Envoi..." }
   - else
     %p.mt-4.form.font-weight-bold.mb-2.text-lg
diff --git a/config/locales/views/administrateurs/groupe_instructeurs/en.yml b/config/locales/views/administrateurs/groupe_instructeurs/en.yml
index 18a10f864..e39c7b6f8 100644
--- a/config/locales/views/administrateurs/groupe_instructeurs/en.yml
+++ b/config/locales/views/administrateurs/groupe_instructeurs/en.yml
@@ -41,7 +41,10 @@ en:
           notice: This group will be a choice from the list "%{routing_criteria_name}"
         csv_import:
           title: CSV Import
-          notice_1: The csv file must have 2 columns (Group, Email) and be separated by commas. The import does not overwrite existing groups and instructors.
+          routing_enabled:
+            notice_1: The csv file must have 2 columns (Group, Email) and be separated by commas. The import does not overwrite existing groups and instructors.
+          routing_disabled:
+            notice_1: The csv file must have 1 column with instructors emails.
           notice_2: The size of the file must be less than %{csv_max_size}.
           download_exemple: Download sample CSV file
           import_file: Import file
diff --git a/config/locales/views/administrateurs/groupe_instructeurs/fr.yml b/config/locales/views/administrateurs/groupe_instructeurs/fr.yml
index 3d1f3a256..6f94ef85f 100644
--- a/config/locales/views/administrateurs/groupe_instructeurs/fr.yml
+++ b/config/locales/views/administrateurs/groupe_instructeurs/fr.yml
@@ -47,8 +47,11 @@ fr:
           notice: Ce groupe sera un choix de la liste "%{routing_criteria_name}"
         csv_import:
           title: Importer par CSV
-          notice_1: Le fichier csv doit comporter 2 colonnes (Groupe, Email) et être séparé par des virgules. Si vous n'avez pas créé de groupe, entrez « défaut » dans la colonne Groupe pour chaque instructeur. L’import n’écrase pas les groupes et les instructeurs existants. La modification du fichier csv ne s’opère que pour l’ajout de nouveaux instructeurs. La suppression d’un instructeur s’opère manuellement en cliquant sur le bouton « retirer ».
-          notice_2: Le poids du fichier doit être inférieur à %{csv_max_size}
+          routing_enabled:
+            notice_1: Le fichier csv doit comporter 2 colonnes (Groupe, Email) et être séparé par des virgules.
+          routing_disabled:
+            notice_1: Le fichier csv doit comporter 1 seule colonne (Email) avec une adresse email d'instructeur par ligne.
+          notice_2: L’import n’écrase pas les groupes et les instructeurs existants. La modification du fichier csv ne s’opère que pour l’ajout de nouveaux instructeurs. La suppression d’un instructeur s’opère manuellement en cliquant sur le bouton « retirer ». Le poids du fichier doit être inférieur à %{csv_max_size}.
           download_exemple: Télécharger l’exemple de fichier CSV
           import_file: Importer le fichier
           import_file_procedure_not_published: L’import d’instructeurs par fichier CSV est disponible une fois la démarche publiée
diff --git a/public/csv/import-instructeurs-test.csv b/public/csv/import-instructeurs-test.csv
new file mode 100644
index 000000000..df7c8ecff
--- /dev/null
+++ b/public/csv/import-instructeurs-test.csv
@@ -0,0 +1,5 @@
+Email
+camilia@gouv.fr
+kara@gouv.fr
+simon@gouv.fr
+pauline@gouv.fr
diff --git a/spec/controllers/administrateurs/groupe_instructeurs_controller_spec.rb b/spec/controllers/administrateurs/groupe_instructeurs_controller_spec.rb
index 7c1693b88..b785ce4c7 100644
--- a/spec/controllers/administrateurs/groupe_instructeurs_controller_spec.rb
+++ b/spec/controllers/administrateurs/groupe_instructeurs_controller_spec.rb
@@ -476,6 +476,65 @@ describe Administrateurs::GroupeInstructeursController, type: :controller do
     end
   end
 
+  describe '#add_instructeurs_via_csv_file' do
+    let(:procedure_non_routee) { create(:procedure, :published, :for_individual, administrateurs: [admin]) }
+
+    subject do
+      post :import, params: { procedure_id: procedure_non_routee.id, instructeurs_csv_file: csv_file }
+    end
+
+    context 'when the csv file is less than 1 mo and content type text/csv' do
+      let(:csv_file) { fixture_file_upload('spec/fixtures/files/instructeurs-file.csv', 'text/csv') }
+
+      before { subject }
+
+      it { expect(response.status).to eq(302) }
+      it { expect(procedure_non_routee.instructeurs.pluck(:email)).to match_array(["kara@beta-gouv.fr", "philippe@mail.com", "lisa@gouv.fr"]) }
+      it { expect(flash.alert).to be_present }
+      it { expect(flash.alert).to eq("Import terminé. Cependant les emails suivants ne sont pas pris en compte: eric") }
+    end
+
+    context 'when the csv file has more than one column' do
+      let(:csv_file) { fixture_file_upload('spec/fixtures/files/groupe-instructeur.csv', 'text/csv') }
+
+      before { subject }
+
+      it { expect(response.status).to eq(302) }
+      it { expect(flash.alert).to be_present }
+      it { expect(flash.alert).to eq("Importation impossible, veuillez importer un csv <a href=\"/csv/import-instructeurs-test.csv\">suivant ce modèle</a>") }
+    end
+
+    context 'when the file content type is application/vnd.ms-excel' do
+      let(:csv_file) { fixture_file_upload('spec/fixtures/files/valid-instructeurs-file.csv', "application/vnd.ms-excel") }
+
+      before { subject }
+      it { expect(procedure_non_routee.instructeurs.pluck(:email)).to match_array(["kara@beta-gouv.fr", "philippe@mail.com", "lisa@gouv.fr"]) }
+      it { expect(flash.notice).to be_present }
+      it { expect(flash.notice).to eq("La liste des instructeurs a été importée avec succès") }
+    end
+
+    context 'when the csv file length is more than 1 mo' do
+      let(:csv_file) { fixture_file_upload('spec/fixtures/files/groupe-instructeur.csv', 'text/csv') }
+
+      before do
+        allow_any_instance_of(ActionDispatch::Http::UploadedFile).to receive(:size).and_return(3.megabytes)
+        subject
+      end
+
+      it { expect(flash.alert).to be_present }
+      it { expect(flash.alert).to eq("Importation impossible : le poids du fichier est supérieur à 1 Mo") }
+    end
+
+    context 'when the file content type is not accepted' do
+      let(:csv_file) { fixture_file_upload('spec/fixtures/files/french-flag.gif', 'image/gif') }
+
+      before { subject }
+
+      it { expect(flash.alert).to be_present }
+      it { expect(flash.alert).to eq("Importation impossible : veuillez importer un fichier CSV") }
+    end
+  end
+
   describe '#export_groupe_instructeurs' do
     let(:procedure) { create(:procedure, :published) }
     let(:gi_1_2) { procedure.groupe_instructeurs.create(label: 'groupe instructeur 1 2') }
diff --git a/spec/fixtures/files/instructeurs-file.csv b/spec/fixtures/files/instructeurs-file.csv
new file mode 100644
index 000000000..6e3f06311
--- /dev/null
+++ b/spec/fixtures/files/instructeurs-file.csv
@@ -0,0 +1,5 @@
+Email
+kara@beta-gouv.fr
+philippe@mail.com
+lisa@gouv.fr
+eric
diff --git a/spec/fixtures/files/valid-instructeurs-file.csv b/spec/fixtures/files/valid-instructeurs-file.csv
new file mode 100644
index 000000000..fb5f0d056
--- /dev/null
+++ b/spec/fixtures/files/valid-instructeurs-file.csv
@@ -0,0 +1,4 @@
+Email
+kara@beta-gouv.fr
+philippe@mail.com
+lisa@gouv.fr
diff --git a/spec/services/instructeurs_import_service_spec.rb b/spec/services/instructeurs_import_service_spec.rb
index 285d3dc98..88f9b616c 100644
--- a/spec/services/instructeurs_import_service_spec.rb
+++ b/spec/services/instructeurs_import_service_spec.rb
@@ -1,5 +1,5 @@
 describe InstructeursImportService do
-  describe '#import' do
+  describe '#import_groupes' do
     let(:procedure) { create(:procedure) }
 
     let(:procedure_groupes) do
@@ -9,7 +9,7 @@ describe InstructeursImportService do
         .to_h
     end
 
-    subject { described_class.import(procedure, lines) }
+    subject { described_class.import_groupes(procedure, lines) }
 
     context 'nominal case' do
       let(:lines) do
@@ -20,7 +20,7 @@ describe InstructeursImportService do
         ]
       end
 
-      it 'imports' do
+      it 'imports groupes' do
         errors = subject
 
         expect(procedure_groupes.keys).to contain_exactly("Auvergne Rhone-Alpes", "Occitanie", "défaut")
@@ -126,4 +126,21 @@ describe InstructeursImportService do
       end
     end
   end
+
+  describe '#import_instructeurs' do
+    let(:procedure_non_routee) { create(:procedure) }
+
+    subject { described_class.import_instructeurs(procedure_non_routee, emails) }
+
+    context 'nominal case' do
+      let(:emails) { [{ "email" => "john@lennon.fr" }, { "email" => "paul@mccartney.uk" }, { "email" => "ringo@starr.uk" }] }
+
+      it 'imports instructeurs' do
+        errors = subject
+        expect(procedure_non_routee.defaut_groupe_instructeur.instructeurs.pluck(:email)).to contain_exactly("john@lennon.fr", "paul@mccartney.uk", "ringo@starr.uk")
+
+        expect(errors).to match_array([])
+      end
+    end
+  end
 end

From d45efa99bcf68661eb9ab7f6d05616e67a4b573c Mon Sep 17 00:00:00 2001
From: Eric Leroy-Terquem <eric.leroyterquem@beta.gouv.fr>
Date: Wed, 18 Jan 2023 17:48:42 +0100
Subject: [PATCH 103/202] refactor(groupe_instructeurs): extract method for
 flash message at import

---
 .../groupe_instructeurs_controller.rb         | 26 +++++++++----------
 1 file changed, 12 insertions(+), 14 deletions(-)

diff --git a/app/controllers/administrateurs/groupe_instructeurs_controller.rb b/app/controllers/administrateurs/groupe_instructeurs_controller.rb
index 0e4392224..b701254eb 100644
--- a/app/controllers/administrateurs/groupe_instructeurs_controller.rb
+++ b/app/controllers/administrateurs/groupe_instructeurs_controller.rb
@@ -219,13 +219,8 @@ module Administrateurs
             if groupes_emails_has_keys.blank?
               flash[:alert] = "Importation impossible, veuillez importer un csv #{view_context.link_to('suivant ce modèle', "/csv/#{I18n.locale}/import-groupe-test.csv")}"
             else
-              add_instructeurs_and_get_errors = InstructeursImportService.import_groupes(procedure, groupes_emails)
-
-              if add_instructeurs_and_get_errors.blank?
-                flash[:notice] = "La liste des instructeurs a été importée avec succès"
-              else
-                flash[:alert] = "Import terminé. Cependant les emails suivants ne sont pas pris en compte: #{add_instructeurs_and_get_errors.join(', ')}"
-              end
+              result = InstructeursImportService.import_groupes(procedure, groupes_emails)
+              flash_message_for_import(result)
             end
 
           elsif params[:instructeurs_csv_file]
@@ -237,13 +232,8 @@ module Administrateurs
             if instructors_emails_has_key.blank?
               flash[:alert] = "Importation impossible, veuillez importer un csv #{view_context.link_to('suivant ce modèle', "/csv/import-instructeurs-test.csv")}"
             else
-              add_instructeurs_and_get_errors = InstructeursImportService.import_instructeurs(procedure, instructors_emails)
-
-              if add_instructeurs_and_get_errors.blank?
-                flash[:notice] = "La liste des instructeurs a été importée avec succès"
-              else
-                flash[:alert] = "Import terminé. Cependant les emails suivants ne sont pas pris en compte: #{add_instructeurs_and_get_errors.join(', ')}"
-              end
+              result = InstructeursImportService.import_instructeurs(procedure, instructors_emails)
+              flash_message_for_import(result)
             end
           end
           redirect_to admin_procedure_groupe_instructeurs_path(procedure)
@@ -334,5 +324,13 @@ module Administrateurs
     def routing_enabled_params
       { routing_enabled: params.require(:routing) == 'enable' }
     end
+
+    def flash_message_for_import(result)
+      if result.blank?
+        flash[:notice] = "La liste des instructeurs a été importée avec succès"
+      else
+        flash[:alert] = "Import terminé. Cependant les emails suivants ne sont pas pris en compte: #{result.join(', ')}"
+      end
+    end
   end
 end

From 7e97825fd267ec32e1b665b3222cd88dfdbeee0d Mon Sep 17 00:00:00 2001
From: Eric Leroy-Terquem <eric.leroyterquem@beta.gouv.fr>
Date: Thu, 16 Feb 2023 15:34:18 +0100
Subject: [PATCH 104/202] refactor(instructeurs import service): use
 groupe_instructeur model methods

---
 app/services/instructeurs_import_service.rb | 71 ++++++---------------
 1 file changed, 20 insertions(+), 51 deletions(-)

diff --git a/app/services/instructeurs_import_service.rb b/app/services/instructeurs_import_service.rb
index 5638c4cdc..a8606040b 100644
--- a/app/services/instructeurs_import_service.rb
+++ b/app/services/instructeurs_import_service.rb
@@ -3,11 +3,9 @@ class InstructeursImportService
     created_at = Time.zone.now
     updated_at = Time.zone.now
 
-    admins = procedure.administrateurs
-
     groupes_emails, error_groupe_emails = groupes_emails
       .map { |groupe_email| { "groupe" => groupe_email["groupe"].present? ? groupe_email["groupe"].strip : nil, "email" => groupe_email["email"].present? ? groupe_email["email"].gsub(/[[:space:]]/, '').downcase : nil } }
-      .partition { |groupe_email| Devise.email_regexp.match?(groupe_email['email']) && groupe_email['groupe'].present? }
+      .partition { |groupe_email| groupe_email['groupe'].present? }
 
     errors = error_groupe_emails.map { |group_email| group_email['email'] }
 
@@ -20,62 +18,33 @@ class InstructeursImportService
 
     target_groupes = procedure.reload.groupe_instructeurs
 
-    target_instructeurs = find_or_create_instructeurs(admins, groupes_emails)
+    defaut_groupe_instructeur = procedure.defaut_groupe_instructeur
 
-    groupes_emails.each do |groupe_email|
-      gi = target_groupes.find { |g| g.label == groupe_email['groupe'] }
-      add_instructeur_to_groupe(target_instructeurs, groupe_email, gi)
+    instructeurs_emails = groupes_emails.map { |instructeur_email| instructeur_email["email"] }.uniq
+
+    instructeurs, invalid_emails = defaut_groupe_instructeur.add_instructeurs(emails: instructeurs_emails)
+
+    if instructeurs.present?
+      groupes_emails.each do |groupe_email|
+        gi = target_groupes.find { |g| g.label == groupe_email['groupe'] }
+        instructeur = Instructeur.where(users: { email: groupe_email['email'] }).first
+
+        gi.add(instructeur)
+      end
     end
-
-    errors
+    errors << invalid_emails
+    errors.flatten
   end
 
   def self.import_instructeurs(procedure, emails)
-    admins = procedure.administrateurs
+    instructeurs_emails = emails.map { |instructeur_email| instructeur_email["email"].present? ? instructeur_email["email"].gsub(/[[:space:]]/, '').downcase : nil }
 
-    instructeurs_emails, error_instructeurs_emails = emails
-      .map { |instructeur_email| { "email" => instructeur_email["email"].present? ? instructeur_email["email"].gsub(/[[:space:]]/, '').downcase : nil } }
-      .partition { |instructeur_email| Devise.email_regexp.match?(instructeur_email['email']) }
+    groupe_instructeur = procedure.defaut_groupe_instructeur
 
-    errors = error_instructeurs_emails.map { |instructeur_email| instructeur_email['email'] }
+    instructeurs, invalid_emails = groupe_instructeur.add_instructeurs(emails: instructeurs_emails)
 
-    target_instructeurs = find_or_create_instructeurs(admins, instructeurs_emails)
+    instructeurs.each { groupe_instructeur.add(_1) } if instructeurs.present?
 
-    instructeurs_emails.each do |instructeur_email|
-      gi = procedure.defaut_groupe_instructeur
-      add_instructeur_to_groupe(target_instructeurs, instructeur_email, gi)
-    end
-
-    errors
-  end
-
-  private
-
-  def self.find_or_create_instructeurs(administrateurs, instructeurs_emails)
-    target_emails = instructeurs_emails.map { |instructeur_email| instructeur_email["email"] }.uniq
-
-    existing_emails = Instructeur.where(user: { email: target_emails }).pluck(:email)
-    missing_emails = target_emails - existing_emails
-    missing_emails.each { |email| create_instructeur(administrateurs, email) }
-
-    User.where(email: target_emails).map(&:instructeur)
-  end
-
-  def self.create_instructeur(administrateurs, email)
-    user = User.create_or_promote_to_instructeur(
-      email,
-      SecureRandom.hex,
-      administrateurs: administrateurs
-    )
-    user.invite!
-    user.instructeur
-  end
-
-  def self.add_instructeur_to_groupe(target_instructeurs, instructeur_email, gi)
-    instructeur = target_instructeurs.find { |i| i.email == instructeur_email['email'] }
-
-    if !gi.instructeurs.include?(instructeur)
-      gi.instructeurs << instructeur
-    end
+    invalid_emails
   end
 end

From d0c432d939a2bfe76580ec9d2cb0a831509c8239 Mon Sep 17 00:00:00 2001
From: Eric Leroy-Terquem <eric.leroyterquem@beta.gouv.fr>
Date: Thu, 16 Feb 2023 16:07:05 +0100
Subject: [PATCH 105/202] refactor(groupe instructeur): move method to
 Instructeur model

---
 .../groupe_instructeurs_controller.rb         |  2 +-
 ...groupe_instructeur_ajouter_instructeurs.rb |  2 +-
 .../mutations/groupe_instructeur_creer.rb     |  2 +-
 app/models/groupe_instructeur.rb              | 19 -------------------
 app/models/instructeur.rb                     | 16 ++++++++++++++++
 app/services/instructeurs_import_service.rb   |  6 ++----
 6 files changed, 21 insertions(+), 26 deletions(-)

diff --git a/app/controllers/administrateurs/groupe_instructeurs_controller.rb b/app/controllers/administrateurs/groupe_instructeurs_controller.rb
index b701254eb..fa15e549a 100644
--- a/app/controllers/administrateurs/groupe_instructeurs_controller.rb
+++ b/app/controllers/administrateurs/groupe_instructeurs_controller.rb
@@ -111,7 +111,7 @@ module Administrateurs
       emails = params['emails'].presence || [].to_json
       emails = JSON.parse(emails).map { EmailSanitizableConcern::EmailSanitizer.sanitize(_1) }
 
-      instructeurs, invalid_emails = groupe_instructeur.add_instructeurs(emails:)
+      instructeurs, invalid_emails = Instructeur.find_or_create_instructeurs(emails:, administrateurs: procedure.administrateurs)
 
       if invalid_emails.present?
         flash[:alert] = t('.wrong_address',
diff --git a/app/graphql/mutations/groupe_instructeur_ajouter_instructeurs.rb b/app/graphql/mutations/groupe_instructeur_ajouter_instructeurs.rb
index c536667ef..9b9d20a3a 100644
--- a/app/graphql/mutations/groupe_instructeur_ajouter_instructeurs.rb
+++ b/app/graphql/mutations/groupe_instructeur_ajouter_instructeurs.rb
@@ -11,7 +11,7 @@ module Mutations
 
     def resolve(groupe_instructeur:, instructeurs:)
       ids, emails = partition_instructeurs_by(instructeurs)
-      instructeurs, invalid_emails = groupe_instructeur.add_instructeurs(ids:, emails:)
+      instructeurs, invalid_emails = Instructeur.find_or_create_instructeurs(ids:, emails:, administrateurs: groupe_instructeur.procedure.administrateurs)
 
       instructeurs.each { groupe_instructeur.add(_1) }
       groupe_instructeur.reload
diff --git a/app/graphql/mutations/groupe_instructeur_creer.rb b/app/graphql/mutations/groupe_instructeur_creer.rb
index d7a0a6331..5880580a4 100644
--- a/app/graphql/mutations/groupe_instructeur_creer.rb
+++ b/app/graphql/mutations/groupe_instructeur_creer.rb
@@ -29,7 +29,7 @@ module Mutations
         result = { groupe_instructeur: }
 
         if emails.present? || ids.present?
-          instructeurs, invalid_emails = groupe_instructeur.add_instructeurs(ids:, emails:)
+          instructeurs, invalid_emails = Instructeur.find_or_create_instructeurs(ids:, emails:, administrateurs: procedure.administrateurs)
 
           instructeurs.each { groupe_instructeur.add(_1) }
           groupe_instructeur.reload
diff --git a/app/models/groupe_instructeur.rb b/app/models/groupe_instructeur.rb
index 30efb9956..f512226bf 100644
--- a/app/models/groupe_instructeur.rb
+++ b/app/models/groupe_instructeur.rb
@@ -51,25 +51,6 @@ class GroupeInstructeur < ApplicationRecord
       .update_all(unfollowed_at: Time.zone.now)
   end
 
-  def add_instructeurs(ids: [], emails: [])
-    instructeurs_to_add, valid_emails, invalid_emails = Instructeur.find_all_by_identifier_with_emails(ids:, emails:)
-    not_found_emails = valid_emails - instructeurs_to_add.map(&:email)
-
-    # Send invitations to users without account
-    if not_found_emails.present?
-      instructeurs_to_add += not_found_emails.map do |email|
-        user = User.create_or_promote_to_instructeur(email, SecureRandom.hex, administrateurs: procedure.administrateurs)
-        user.invite!
-        user.instructeur
-      end
-    end
-
-    # We dont't want to assign a user to a groupe_instructeur if they are already assigned to it
-    instructeurs_to_add -= instructeurs
-
-    [instructeurs_to_add, invalid_emails]
-  end
-
   def can_delete?
     dossiers.empty? && (procedure.groupe_instructeurs.active.many? || (procedure.groupe_instructeurs.active.one? && closed))
   end
diff --git a/app/models/instructeur.rb b/app/models/instructeur.rb
index ac2ee5a29..e68bf3497 100644
--- a/app/models/instructeur.rb
+++ b/app/models/instructeur.rb
@@ -52,6 +52,22 @@ class Instructeur < ApplicationRecord
     find_by(users: { email: email })
   end
 
+  def self.find_or_create_instructeurs(ids: [], emails: [], administrateurs:)
+    instructeurs_to_add, valid_emails, invalid_emails = Instructeur.find_all_by_identifier_with_emails(ids:, emails:)
+    not_found_emails = valid_emails - instructeurs_to_add.map(&:email)
+
+    # Send invitations to users without account
+    if not_found_emails.present?
+      instructeurs_to_add += not_found_emails.map do |email|
+        user = User.create_or_promote_to_instructeur(email, SecureRandom.hex, administrateurs: administrateurs)
+        user.invite!
+        user.instructeur
+      end
+    end
+
+    [instructeurs_to_add, invalid_emails]
+  end
+
   def self.find_all_by_identifier(ids: [], emails: [])
     find_all_by_identifier_with_emails(ids:, emails:).first
   end
diff --git a/app/services/instructeurs_import_service.rb b/app/services/instructeurs_import_service.rb
index a8606040b..c82d635d9 100644
--- a/app/services/instructeurs_import_service.rb
+++ b/app/services/instructeurs_import_service.rb
@@ -18,11 +18,9 @@ class InstructeursImportService
 
     target_groupes = procedure.reload.groupe_instructeurs
 
-    defaut_groupe_instructeur = procedure.defaut_groupe_instructeur
-
     instructeurs_emails = groupes_emails.map { |instructeur_email| instructeur_email["email"] }.uniq
 
-    instructeurs, invalid_emails = defaut_groupe_instructeur.add_instructeurs(emails: instructeurs_emails)
+    instructeurs, invalid_emails = Instructeur.find_or_create_instructeurs(emails: instructeurs_emails, administrateurs: procedure.administrateurs)
 
     if instructeurs.present?
       groupes_emails.each do |groupe_email|
@@ -41,7 +39,7 @@ class InstructeursImportService
 
     groupe_instructeur = procedure.defaut_groupe_instructeur
 
-    instructeurs, invalid_emails = groupe_instructeur.add_instructeurs(emails: instructeurs_emails)
+    instructeurs, invalid_emails = Instructeur.find_or_create_instructeurs(emails: instructeurs_emails, administrateurs: procedure.administrateurs)
 
     instructeurs.each { groupe_instructeur.add(_1) } if instructeurs.present?
 

From fcd0f7c6093c88e1fac0f6d0674ba829095fbca1 Mon Sep 17 00:00:00 2001
From: Paul Chavard <pro@paul.chavard.net>
Date: Tue, 21 Feb 2023 16:37:26 +0100
Subject: [PATCH 106/202] bring back find_or_create_instructeurs

---
 .../groupe_instructeurs_controller.rb         |  2 +-
 ...groupe_instructeur_ajouter_instructeurs.rb |  2 +-
 .../mutations/groupe_instructeur_creer.rb     |  2 +-
 app/models/groupe_instructeur.rb              | 19 +++++++++++++++++++
 app/models/instructeur.rb                     | 16 ----------------
 5 files changed, 22 insertions(+), 19 deletions(-)

diff --git a/app/controllers/administrateurs/groupe_instructeurs_controller.rb b/app/controllers/administrateurs/groupe_instructeurs_controller.rb
index fa15e549a..b701254eb 100644
--- a/app/controllers/administrateurs/groupe_instructeurs_controller.rb
+++ b/app/controllers/administrateurs/groupe_instructeurs_controller.rb
@@ -111,7 +111,7 @@ module Administrateurs
       emails = params['emails'].presence || [].to_json
       emails = JSON.parse(emails).map { EmailSanitizableConcern::EmailSanitizer.sanitize(_1) }
 
-      instructeurs, invalid_emails = Instructeur.find_or_create_instructeurs(emails:, administrateurs: procedure.administrateurs)
+      instructeurs, invalid_emails = groupe_instructeur.add_instructeurs(emails:)
 
       if invalid_emails.present?
         flash[:alert] = t('.wrong_address',
diff --git a/app/graphql/mutations/groupe_instructeur_ajouter_instructeurs.rb b/app/graphql/mutations/groupe_instructeur_ajouter_instructeurs.rb
index 9b9d20a3a..c536667ef 100644
--- a/app/graphql/mutations/groupe_instructeur_ajouter_instructeurs.rb
+++ b/app/graphql/mutations/groupe_instructeur_ajouter_instructeurs.rb
@@ -11,7 +11,7 @@ module Mutations
 
     def resolve(groupe_instructeur:, instructeurs:)
       ids, emails = partition_instructeurs_by(instructeurs)
-      instructeurs, invalid_emails = Instructeur.find_or_create_instructeurs(ids:, emails:, administrateurs: groupe_instructeur.procedure.administrateurs)
+      instructeurs, invalid_emails = groupe_instructeur.add_instructeurs(ids:, emails:)
 
       instructeurs.each { groupe_instructeur.add(_1) }
       groupe_instructeur.reload
diff --git a/app/graphql/mutations/groupe_instructeur_creer.rb b/app/graphql/mutations/groupe_instructeur_creer.rb
index 5880580a4..d7a0a6331 100644
--- a/app/graphql/mutations/groupe_instructeur_creer.rb
+++ b/app/graphql/mutations/groupe_instructeur_creer.rb
@@ -29,7 +29,7 @@ module Mutations
         result = { groupe_instructeur: }
 
         if emails.present? || ids.present?
-          instructeurs, invalid_emails = Instructeur.find_or_create_instructeurs(ids:, emails:, administrateurs: procedure.administrateurs)
+          instructeurs, invalid_emails = groupe_instructeur.add_instructeurs(ids:, emails:)
 
           instructeurs.each { groupe_instructeur.add(_1) }
           groupe_instructeur.reload
diff --git a/app/models/groupe_instructeur.rb b/app/models/groupe_instructeur.rb
index f512226bf..30efb9956 100644
--- a/app/models/groupe_instructeur.rb
+++ b/app/models/groupe_instructeur.rb
@@ -51,6 +51,25 @@ class GroupeInstructeur < ApplicationRecord
       .update_all(unfollowed_at: Time.zone.now)
   end
 
+  def add_instructeurs(ids: [], emails: [])
+    instructeurs_to_add, valid_emails, invalid_emails = Instructeur.find_all_by_identifier_with_emails(ids:, emails:)
+    not_found_emails = valid_emails - instructeurs_to_add.map(&:email)
+
+    # Send invitations to users without account
+    if not_found_emails.present?
+      instructeurs_to_add += not_found_emails.map do |email|
+        user = User.create_or_promote_to_instructeur(email, SecureRandom.hex, administrateurs: procedure.administrateurs)
+        user.invite!
+        user.instructeur
+      end
+    end
+
+    # We dont't want to assign a user to a groupe_instructeur if they are already assigned to it
+    instructeurs_to_add -= instructeurs
+
+    [instructeurs_to_add, invalid_emails]
+  end
+
   def can_delete?
     dossiers.empty? && (procedure.groupe_instructeurs.active.many? || (procedure.groupe_instructeurs.active.one? && closed))
   end
diff --git a/app/models/instructeur.rb b/app/models/instructeur.rb
index e68bf3497..ac2ee5a29 100644
--- a/app/models/instructeur.rb
+++ b/app/models/instructeur.rb
@@ -52,22 +52,6 @@ class Instructeur < ApplicationRecord
     find_by(users: { email: email })
   end
 
-  def self.find_or_create_instructeurs(ids: [], emails: [], administrateurs:)
-    instructeurs_to_add, valid_emails, invalid_emails = Instructeur.find_all_by_identifier_with_emails(ids:, emails:)
-    not_found_emails = valid_emails - instructeurs_to_add.map(&:email)
-
-    # Send invitations to users without account
-    if not_found_emails.present?
-      instructeurs_to_add += not_found_emails.map do |email|
-        user = User.create_or_promote_to_instructeur(email, SecureRandom.hex, administrateurs: administrateurs)
-        user.invite!
-        user.instructeur
-      end
-    end
-
-    [instructeurs_to_add, invalid_emails]
-  end
-
   def self.find_all_by_identifier(ids: [], emails: [])
     find_all_by_identifier_with_emails(ids:, emails:).first
   end

From 302ddb995177b374a138d200dbb5c0725ec73eac Mon Sep 17 00:00:00 2001
From: Paul Chavard <pro@paul.chavard.net>
Date: Tue, 21 Feb 2023 16:46:28 +0100
Subject: [PATCH 107/202] refactor(instructeurs): use add_instructeurs in
 import service

---
 app/services/instructeurs_import_service.rb | 55 ++++++++++++---------
 1 file changed, 31 insertions(+), 24 deletions(-)

diff --git a/app/services/instructeurs_import_service.rb b/app/services/instructeurs_import_service.rb
index c82d635d9..dffd27836 100644
--- a/app/services/instructeurs_import_service.rb
+++ b/app/services/instructeurs_import_service.rb
@@ -1,47 +1,54 @@
 class InstructeursImportService
   def self.import_groupes(procedure, groupes_emails)
-    created_at = Time.zone.now
-    updated_at = Time.zone.now
+    groupes_emails, error_groupe_emails = groupes_emails.partition { _1['groupe'].present? }
 
-    groupes_emails, error_groupe_emails = groupes_emails
-      .map { |groupe_email| { "groupe" => groupe_email["groupe"].present? ? groupe_email["groupe"].strip : nil, "email" => groupe_email["email"].present? ? groupe_email["email"].gsub(/[[:space:]]/, '').downcase : nil } }
-      .partition { |groupe_email| groupe_email['groupe'].present? }
+    groupes_emails = groupes_emails.map do
+      {
+        groupe: _1['groupe'].strip,
+        email: _1['email'].present? ? EmailSanitizableConcern::EmailSanitizer.sanitize(_1['email']) : nil
+      }
+    end
+    errors = error_groupe_emails.map { _1['email'] }.uniq
+    target_labels = groupes_emails.map { _1[:groupe] }.uniq
 
-    errors = error_groupe_emails.map { |group_email| group_email['email'] }
-
-    target_labels = groupes_emails.map { |groupe_email| groupe_email['groupe'] }.uniq
     missing_labels = target_labels - procedure.groupe_instructeurs.pluck(:label)
 
     if missing_labels.present?
-      GroupeInstructeur.insert_all(missing_labels.map { |label| { label: label, procedure_id: procedure.id, created_at: created_at, updated_at: updated_at } })
+      created_at = Time.zone.now
+      GroupeInstructeur.insert_all(missing_labels.map { |label| { procedure_id: procedure.id, label:, created_at:, updated_at: created_at } })
     end
 
-    target_groupes = procedure.reload.groupe_instructeurs
+    emails_in_groupe = groupes_emails
+      .group_by { _1[:groupe] }
+      .transform_values { |groupes_emails| groupes_emails.map { _1[:email] }.uniq }
+    emails_in_groupe.default = []
 
-    instructeurs_emails = groupes_emails.map { |instructeur_email| instructeur_email["email"] }.uniq
+    target_groupes = procedure
+      .groupe_instructeurs
+      .where(label: target_labels)
+      .map { [_1, emails_in_groupe[_1.label]] }
+      .to_h
 
-    instructeurs, invalid_emails = Instructeur.find_or_create_instructeurs(emails: instructeurs_emails, administrateurs: procedure.administrateurs)
-
-    if instructeurs.present?
-      groupes_emails.each do |groupe_email|
-        gi = target_groupes.find { |g| g.label == groupe_email['groupe'] }
-        instructeur = Instructeur.where(users: { email: groupe_email['email'] }).first
-
-        gi.add(instructeur)
-      end
+    target_groupes.each do |groupe_instructeur, emails|
+      instructeurs, invalid_emails = groupe_instructeur.add_instructeurs(emails:)
+      instructeurs.each { groupe_instructeur.add(_1) }
+      errors << invalid_emails
     end
-    errors << invalid_emails
+
     errors.flatten
   end
 
   def self.import_instructeurs(procedure, emails)
-    instructeurs_emails = emails.map { |instructeur_email| instructeur_email["email"].present? ? instructeur_email["email"].gsub(/[[:space:]]/, '').downcase : nil }
+    instructeurs_emails = emails
+      .map { _1["email"] }
+      .compact
+      .map { EmailSanitizableConcern::EmailSanitizer.sanitize(_1) }
 
     groupe_instructeur = procedure.defaut_groupe_instructeur
 
-    instructeurs, invalid_emails = Instructeur.find_or_create_instructeurs(emails: instructeurs_emails, administrateurs: procedure.administrateurs)
+    instructeurs, invalid_emails = groupe_instructeur.add_instructeurs(emails: instructeurs_emails)
 
-    instructeurs.each { groupe_instructeur.add(_1) } if instructeurs.present?
+    instructeurs.each { groupe_instructeur.add(_1) }
 
     invalid_emails
   end

From 3c3629d1519da03f3631a2fa5988e4359827af3c Mon Sep 17 00:00:00 2001
From: Paul Chavard <pro@paul.chavard.net>
Date: Tue, 21 Feb 2023 17:36:34 +0100
Subject: [PATCH 108/202] refactor(instructeurs): add_instructeurs should add

---
 .../administrateurs/groupe_instructeurs_controller.rb      | 2 --
 .../mutations/groupe_instructeur_ajouter_instructeurs.rb   | 3 +--
 app/graphql/mutations/groupe_instructeur_creer.rb          | 3 +--
 app/models/groupe_instructeur.rb                           | 1 +
 app/services/instructeurs_import_service.rb                | 7 ++-----
 5 files changed, 5 insertions(+), 11 deletions(-)

diff --git a/app/controllers/administrateurs/groupe_instructeurs_controller.rb b/app/controllers/administrateurs/groupe_instructeurs_controller.rb
index b701254eb..a410afef8 100644
--- a/app/controllers/administrateurs/groupe_instructeurs_controller.rb
+++ b/app/controllers/administrateurs/groupe_instructeurs_controller.rb
@@ -120,8 +120,6 @@ module Administrateurs
       end
 
       if instructeurs.present?
-        instructeurs.each { groupe_instructeur.add(_1) }
-
         flash[:notice] = if procedure.routing_enabled?
           t('.assignment',
             count: instructeurs.size,
diff --git a/app/graphql/mutations/groupe_instructeur_ajouter_instructeurs.rb b/app/graphql/mutations/groupe_instructeur_ajouter_instructeurs.rb
index c536667ef..a6e6a6c1f 100644
--- a/app/graphql/mutations/groupe_instructeur_ajouter_instructeurs.rb
+++ b/app/graphql/mutations/groupe_instructeur_ajouter_instructeurs.rb
@@ -11,9 +11,8 @@ module Mutations
 
     def resolve(groupe_instructeur:, instructeurs:)
       ids, emails = partition_instructeurs_by(instructeurs)
-      instructeurs, invalid_emails = groupe_instructeur.add_instructeurs(ids:, emails:)
+      _, invalid_emails = groupe_instructeur.add_instructeurs(ids:, emails:)
 
-      instructeurs.each { groupe_instructeur.add(_1) }
       groupe_instructeur.reload
 
       result = { groupe_instructeur: }
diff --git a/app/graphql/mutations/groupe_instructeur_creer.rb b/app/graphql/mutations/groupe_instructeur_creer.rb
index d7a0a6331..465606fe1 100644
--- a/app/graphql/mutations/groupe_instructeur_creer.rb
+++ b/app/graphql/mutations/groupe_instructeur_creer.rb
@@ -29,9 +29,8 @@ module Mutations
         result = { groupe_instructeur: }
 
         if emails.present? || ids.present?
-          instructeurs, invalid_emails = groupe_instructeur.add_instructeurs(ids:, emails:)
+          _, invalid_emails = groupe_instructeur.add_instructeurs(ids:, emails:)
 
-          instructeurs.each { groupe_instructeur.add(_1) }
           groupe_instructeur.reload
 
           if invalid_emails.present?
diff --git a/app/models/groupe_instructeur.rb b/app/models/groupe_instructeur.rb
index 30efb9956..3ea1e9334 100644
--- a/app/models/groupe_instructeur.rb
+++ b/app/models/groupe_instructeur.rb
@@ -66,6 +66,7 @@ class GroupeInstructeur < ApplicationRecord
 
     # We dont't want to assign a user to a groupe_instructeur if they are already assigned to it
     instructeurs_to_add -= instructeurs
+    instructeurs_to_add.each { add(_1) }
 
     [instructeurs_to_add, invalid_emails]
   end
diff --git a/app/services/instructeurs_import_service.rb b/app/services/instructeurs_import_service.rb
index dffd27836..eb471fa5b 100644
--- a/app/services/instructeurs_import_service.rb
+++ b/app/services/instructeurs_import_service.rb
@@ -30,8 +30,7 @@ class InstructeursImportService
       .to_h
 
     target_groupes.each do |groupe_instructeur, emails|
-      instructeurs, invalid_emails = groupe_instructeur.add_instructeurs(emails:)
-      instructeurs.each { groupe_instructeur.add(_1) }
+      _, invalid_emails = groupe_instructeur.add_instructeurs(emails:)
       errors << invalid_emails
     end
 
@@ -46,9 +45,7 @@ class InstructeursImportService
 
     groupe_instructeur = procedure.defaut_groupe_instructeur
 
-    instructeurs, invalid_emails = groupe_instructeur.add_instructeurs(emails: instructeurs_emails)
-
-    instructeurs.each { groupe_instructeur.add(_1) }
+    _, invalid_emails = groupe_instructeur.add_instructeurs(emails: instructeurs_emails)
 
     invalid_emails
   end

From 28c6fd8cfc35f8db3790547c4ecbc8ae21526a9f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=A9bastien=20Carceles?=
 <sebastien.carceles@beta.gouv.fr>
Date: Wed, 22 Feb 2023 10:16:58 +0100
Subject: [PATCH 109/202] Improve EPCI specs (#8634)

* fix nonsense spec

* refactor spec
---
 .../prefill_epci_type_de_champ_spec.rb         | 18 +++++++++++-------
 1 file changed, 11 insertions(+), 7 deletions(-)

diff --git a/spec/models/types_de_champ/prefill_epci_type_de_champ_spec.rb b/spec/models/types_de_champ/prefill_epci_type_de_champ_spec.rb
index 7f2a1eb31..ce197a9a0 100644
--- a/spec/models/types_de_champ/prefill_epci_type_de_champ_spec.rb
+++ b/spec/models/types_de_champ/prefill_epci_type_de_champ_spec.rb
@@ -12,7 +12,7 @@ RSpec.describe TypesDeChamp::PrefillEpciTypeDeChamp do
   describe 'ancestors' do
     subject { described_class.new(type_de_champ) }
 
-    it { is_expected.to be_kind_of(TypesDeChamp::PrefillEpciTypeDeChamp) }
+    it { is_expected.to be_kind_of(TypesDeChamp::PrefillTypeDeChamp) }
   end
 
   describe '#possible_values' do
@@ -55,34 +55,38 @@ RSpec.describe TypesDeChamp::PrefillEpciTypeDeChamp do
   describe '#transform_value_to_assignable_attributes' do
     subject(:transform_value_to_assignable_attributes) { described_class.build(type_de_champ).transform_value_to_assignable_attributes(value) }
 
+    shared_examples "a transformation to" do |code_departement, value|
+      it { is_expected.to match({ code_departement: code_departement, value: value }) }
+    end
+
     context 'when the value is nil' do
       let(:value) { nil }
-      it { is_expected.to match({ code_departement: nil, value: nil }) }
+      it_behaves_like "a transformation to", nil, nil
     end
 
     context 'when the value is empty' do
       let(:value) { '' }
-      it { is_expected.to match({ code_departement: nil, value: nil }) }
+      it_behaves_like "a transformation to", nil, nil
     end
 
     context 'when the value is a string' do
       let(:value) { 'hello' }
-      it { is_expected.to match({ code_departement: nil, value: nil }) }
+      it_behaves_like "a transformation to", nil, nil
     end
 
     context 'when the value is an array of one element' do
       let(:value) { ['01'] }
-      it { is_expected.to match({ code_departement: '01', value: nil }) }
+      it_behaves_like "a transformation to", '01', nil
     end
 
     context 'when the value is an array of two elements' do
       let(:value) { ['01', '200042935'] }
-      it { is_expected.to match({ code_departement: '01', value: '200042935' }) }
+      it_behaves_like "a transformation to", '01', '200042935'
     end
 
     context 'when the value is an array of three or more elements' do
       let(:value) { ['01', '200042935', 'hello'] }
-      it { is_expected.to match({ code_departement: '01', value: '200042935' }) }
+      it_behaves_like "a transformation to", '01', '200042935'
     end
   end
 

From fc6051a4b9b9517b288c5c03e09771b07109fd17 Mon Sep 17 00:00:00 2001
From: Colin Darie <colin@darie.eu>
Date: Wed, 22 Feb 2023 10:11:26 +0100
Subject: [PATCH 110/202] fix(a11y/upload): role=status on progress antivirus &
 watermark

Cf #8555
---
 .../attachment/progress_component/progress_component.html.haml  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/components/attachment/progress_component/progress_component.html.haml b/app/components/attachment/progress_component/progress_component.html.haml
index cf6232821..3bb657619 100644
--- a/app/components/attachment/progress_component/progress_component.html.haml
+++ b/app/components/attachment/progress_component/progress_component.html.haml
@@ -1,2 +1,2 @@
-%p.fr-badge.fr-badge--info.fr-badge--sm.fr-badge--no-icon
+%p.fr-badge.fr-badge--info.fr-badge--sm.fr-badge--no-icon{ role: 'status' }
   = progress_label

From 283804ec7408ea56ea44f9ffa7031fc5c55a79cf Mon Sep 17 00:00:00 2001
From: Colin Darie <colin@darie.eu>
Date: Tue, 21 Feb 2023 18:28:48 +0100
Subject: [PATCH 111/202] ci: enable merge queue (merge group)

---
 .github/workflows/ci.yml | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 30423e65b..2c74df60a 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -1,9 +1,11 @@
 name: Continuous Integration
 on:
   push:
-    branches: 'main'
+    branches: [main]
   pull_request:
-    branches: 'main'
+    branches: [main]
+  merge_group:
+    branches: [main]
 
 jobs:
   linters:

From fbe4fe251aa6f5d76fa0f411849c9d484ec2c81d Mon Sep 17 00:00:00 2001
From: Damien Le Thiec <damien.lethiec@gmail.com>
Date: Wed, 22 Feb 2023 19:32:25 +0100
Subject: [PATCH 112/202] Fix format prefill repetition

---
 app/models/application_record.rb              |  4 +++
 app/models/champ.rb                           |  2 +-
 .../concerns/dossier_prefillable_concern.rb   | 11 +++++++
 app/models/prefill_description.rb             | 28 ++----------------
 .../prefill_repetition_type_de_champ.rb       | 15 ++++++----
 .../_types_de_champs.html.haml                |  2 +-
 .../prefill_type_de_champs/show.html.haml     |  2 +-
 .../api/public/v1/dossiers_controller_spec.rb |  4 +--
 .../prefill_descriptions_controller_spec.rb   | 29 +++++++------------
 .../users/dossiers_controller_spec.rb         |  4 +--
 spec/models/prefill_description_spec.rb       | 16 ++++++----
 spec/models/prefill_params_spec.rb            | 22 +++++++-------
 .../prefill_repetition_type_de_champ_spec.rb  |  8 ++---
 .../integrateurs/procedure_prefilling_spec.rb |  2 +-
 spec/system/users/dossier_prefill_get_spec.rb | 20 ++++++-------
 .../system/users/dossier_prefill_post_spec.rb | 20 ++++++-------
 16 files changed, 91 insertions(+), 98 deletions(-)

diff --git a/app/models/application_record.rb b/app/models/application_record.rb
index 28787d3e9..af8027c43 100644
--- a/app/models/application_record.rb
+++ b/app/models/application_record.rb
@@ -22,4 +22,8 @@ class ApplicationRecord < ActiveRecord::Base
   def to_typed_id
     GraphQL::Schema::UniqueWithinType.encode(self.class.name, id)
   end
+
+  def to_typed_id_for_query
+    to_typed_id.delete("==")
+  end
 end
diff --git a/app/models/champ.rb b/app/models/champ.rb
index 6a8b409b7..8bff87404 100644
--- a/app/models/champ.rb
+++ b/app/models/champ.rb
@@ -72,7 +72,7 @@ class Champ < ApplicationRecord
     :refresh_after_update?,
     to: :type_de_champ
 
-  delegate :to_typed_id, to: :type_de_champ, prefix: true
+  delegate :to_typed_id, :to_typed_id_for_query, to: :type_de_champ, prefix: true
 
   delegate :revision, to: :dossier, prefix: true
 
diff --git a/app/models/concerns/dossier_prefillable_concern.rb b/app/models/concerns/dossier_prefillable_concern.rb
index 3ecbe7a04..981936615 100644
--- a/app/models/concerns/dossier_prefillable_concern.rb
+++ b/app/models/concerns/dossier_prefillable_concern.rb
@@ -13,3 +13,14 @@ module DossierPrefillableConcern
     save(validate: false)
   end
 end
+
+
+# Pour être sûr de bien être alignés, on veut bien les format suivants ?
+
+#     En POST, je prends un hash classique et je lui fais to_json
+#     Pour ton exemple ça donne: "{\"champ_id1\":\"text\",\"champ_id2\":[\"option1\",\"option2\"],\"champ_id3\":[{\"champ_id4\":\"text\",\"champ_id5\":true,\"champ_id6\":42,\"champ_id7\":[\"option1\",\"option2\"]},{\"champ_id4\":\"text2\",\"champ_id6\":32}]}"
+
+#     En GET, je prends un hash et je lui applique to_query
+#     Pour ton exemple, et en escapant les caractères spéciaux: "champ_id1=text&champ_id2[]=option1&champ_id2[]=option2&champ_id3[][champ_id4]=text&champ_id3[][champ_id5]=true&champ_id3[][champ_id6]=42&champ_id3[][champ_id7][]=option1&champ_id3[][champ_id7][]=option2&champ_id3[][champ_id4]=text2&champ_id3[][champ_id6]=32"
+
+#Tu confirmes ? Je préfère checker car c'est un tout petit peu différent de ton exemple
diff --git a/app/models/prefill_description.rb b/app/models/prefill_description.rb
index dc5dba767..a2c66ac92 100644
--- a/app/models/prefill_description.rb
+++ b/app/models/prefill_description.rb
@@ -27,7 +27,7 @@ class PrefillDescription < SimpleDelegator
   end
 
   def prefill_link
-    @prefill_link ||= commencer_url({ path: path }.merge(prefilled_champs_for_link))
+    @prefill_link ||= CGI.unescape(commencer_url({ path: path }.merge(prefilled_champs_as_params)))
   end
 
   def prefill_query
@@ -35,7 +35,7 @@ class PrefillDescription < SimpleDelegator
       <<~TEXT
         curl --request POST '#{api_public_v1_dossiers_url(self)}' \\
              --header 'Content-Type: application/json' \\
-             --data '{#{prefilled_champs_for_query}}'
+             --data '#{prefilled_champs_as_params.to_json}'
       TEXT
   end
 
@@ -49,29 +49,7 @@ class PrefillDescription < SimpleDelegator
     active_revision.types_de_champ_public.fillable
   end
 
-  def prefilled_champs_for_link
-    prefilled_champs_as_params.map(&:to_a).to_h
-  end
-
-  def prefilled_champs_for_query
-    prefilled_champs_as_params.map(&:to_s).join(', ')
-  end
-
   def prefilled_champs_as_params
-    prefilled_champs.map { |type_de_champ| Param.new(type_de_champ.to_typed_id, type_de_champ.example_value) }
-  end
-
-  Param = Struct.new(:key, :value) do
-    def to_a
-      ["champ_#{key}", value]
-    end
-
-    def to_s
-      if value.is_a?(Array)
-        "\"champ_#{key}\": #{value}"
-      else
-        "\"champ_#{key}\": \"#{value}\""
-      end
-    end
+    prefilled_champs.map { |type_de_champ| ["champ_#{type_de_champ.to_typed_id_for_query}", type_de_champ.example_value] }.to_h
   end
 end
diff --git a/app/models/types_de_champ/prefill_repetition_type_de_champ.rb b/app/models/types_de_champ/prefill_repetition_type_de_champ.rb
index 4a44ffd6a..9ad39b903 100644
--- a/app/models/types_de_champ/prefill_repetition_type_de_champ.rb
+++ b/app/models/types_de_champ/prefill_repetition_type_de_champ.rb
@@ -10,7 +10,7 @@ class TypesDeChamp::PrefillRepetitionTypeDeChamp < TypesDeChamp::PrefillTypeDeCh
   end
 
   def example_value
-    [row_values_format, row_values_format].map { |row| row.to_s.gsub("=>", ":") }
+    [row_values_format, row_values_format]
   end
 
   def to_assignable_attributes(champ, value)
@@ -25,14 +25,14 @@ class TypesDeChamp::PrefillRepetitionTypeDeChamp < TypesDeChamp::PrefillTypeDeCh
 
   def subchamps_all_possible_values
     "<ul>" + prefillable_subchamps.map do |prefill_type_de_champ|
-      "<li>#{prefill_type_de_champ.to_typed_id}: #{prefill_type_de_champ.possible_values}</li>"
+      "<li>champ_#{prefill_type_de_champ.to_typed_id_for_query}: #{prefill_type_de_champ.possible_values}</li>"
     end.join + "</ul>"
   end
 
   def row_values_format
     @row_example_value ||=
       prefillable_subchamps.map do |prefill_type_de_champ|
-      [prefill_type_de_champ.to_typed_id, prefill_type_de_champ.example_value.to_s]
+      ["champ_#{prefill_type_de_champ.to_typed_id_for_query}", prefill_type_de_champ.example_value.to_s]
     end.to_h
   end
 
@@ -52,14 +52,17 @@ class TypesDeChamp::PrefillRepetitionTypeDeChamp < TypesDeChamp::PrefillTypeDeCh
     end
 
     def to_assignable_attributes
+      return unless repetition.is_a?(Hash)
+
       row = champ.rows[index] || champ.add_row(champ.dossier_revision)
 
-      JSON.parse(repetition).map do |key, value|
-        subchamp = row.find { |champ| champ.type_de_champ_to_typed_id == key }
+      repetition.map do |key, value|
+        next unless key.is_a?(String) && key.starts_with?("champ_")
+
+        subchamp = row.find { |champ| champ.type_de_champ_to_typed_id_for_query == key.split("_").last }
         next unless subchamp
 
         TypesDeChamp::PrefillTypeDeChamp.build(subchamp.type_de_champ, revision).to_assignable_attributes(subchamp, value)
-      rescue JSON::ParserError # On ignore les valeurs qu'on n'arrive pas à parser
       end.compact
     end
   end
diff --git a/app/views/prefill_descriptions/_types_de_champs.html.haml b/app/views/prefill_descriptions/_types_de_champs.html.haml
index 149313576..49eab0fd0 100644
--- a/app/views/prefill_descriptions/_types_de_champs.html.haml
+++ b/app/views/prefill_descriptions/_types_de_champs.html.haml
@@ -27,7 +27,7 @@
                 %th
                   = t("views.prefill_descriptions.edit.champ_id")
                 %td
-                  = type_de_champ.to_typed_id
+                  = type_de_champ.to_typed_id_for_query
               %tr
                 %th
                   = t("views.prefill_descriptions.edit.champ_type")
diff --git a/app/views/prefill_type_de_champs/show.html.haml b/app/views/prefill_type_de_champs/show.html.haml
index 67b52ec66..342cdc7b3 100644
--- a/app/views/prefill_type_de_champs/show.html.haml
+++ b/app/views/prefill_type_de_champs/show.html.haml
@@ -15,7 +15,7 @@
           %th
             = t("views.prefill_descriptions.edit.champ_id")
           %td
-            = @type_de_champ.to_typed_id
+            = @type_de_champ.to_typed_id_for_query
         %tr
           %th
             = t("views.prefill_descriptions.edit.champ_type")
diff --git a/spec/controllers/api/public/v1/dossiers_controller_spec.rb b/spec/controllers/api/public/v1/dossiers_controller_spec.rb
index ac434fe44..9cb30f7c2 100644
--- a/spec/controllers/api/public/v1/dossiers_controller_spec.rb
+++ b/spec/controllers/api/public/v1/dossiers_controller_spec.rb
@@ -50,8 +50,8 @@ RSpec.describe API::Public::V1::DossiersController, type: :controller do
             let(:params) {
               {
                 id: procedure.id,
-                "champ_#{type_de_champ_1.to_typed_id}" => value_1,
-                "champ_#{type_de_champ_2.to_typed_id}" => value_2
+                "champ_#{type_de_champ_1.to_typed_id_for_query}" => value_1,
+                "champ_#{type_de_champ_2.to_typed_id_for_query}" => value_2
               }
             }
 
diff --git a/spec/controllers/prefill_descriptions_controller_spec.rb b/spec/controllers/prefill_descriptions_controller_spec.rb
index 23318e43d..5521b3ae3 100644
--- a/spec/controllers/prefill_descriptions_controller_spec.rb
+++ b/spec/controllers/prefill_descriptions_controller_spec.rb
@@ -67,24 +67,19 @@ describe PrefillDescriptionsController, type: :controller do
       it { expect(response).to render_template(:update) }
 
       it "includes the prefill URL" do
+        type_de_champ_value = I18n.t("views.prefill_descriptions.edit.examples.#{type_de_champ.type_champ}")
+        type_de_champ_to_add_value = I18n.t("views.prefill_descriptions.edit.examples.#{type_de_champ_to_add.type_champ}")
         expect(response.body).to include(commencer_path(path: procedure.path))
-        expect(response.body).to include(
-          {
-            "champ_#{type_de_champ.to_typed_id}" => I18n.t("views.prefill_descriptions.edit.examples.#{type_de_champ.type_champ}")
-          }.to_query
-        )
-        expect(response.body).to include({
-          "champ_#{type_de_champ_to_add.to_typed_id}" => I18n.t("views.prefill_descriptions.edit.examples.#{type_de_champ_to_add.type_champ}")
-        }.to_query)
+        expect(response.body).to include("champ_#{type_de_champ.to_typed_id_for_query}=#{type_de_champ_value}")
+        expect(response.body).to include("champ_#{type_de_champ_to_add.to_typed_id_for_query}=#{type_de_champ_to_add_value}")
       end
 
       it "includes the prefill query" do
         type_de_champ_value = I18n.t("views.prefill_descriptions.edit.examples.#{type_de_champ.type_champ}")
         type_de_champ_to_add_value = I18n.t("views.prefill_descriptions.edit.examples.#{type_de_champ_to_add.type_champ}")
-
         expect(response.body).to include(api_public_v1_dossiers_path(procedure))
         expect(response.body).to include(
-          "&quot;champ_#{type_de_champ.to_typed_id}&quot;: &quot;#{type_de_champ_value}&quot;, &quot;champ_#{type_de_champ_to_add.to_typed_id}&quot;: &quot;#{type_de_champ_to_add_value}&quot"
+          "&quot;champ_#{type_de_champ.to_typed_id_for_query}&quot;:&quot;#{type_de_champ_value}&quot;,&quot;champ_#{type_de_champ_to_add.to_typed_id_for_query}&quot;:&quot;#{type_de_champ_to_add_value}&quot"
         )
       end
     end
@@ -96,13 +91,11 @@ describe PrefillDescriptionsController, type: :controller do
       it { expect(response).to render_template(:update) }
 
       it "includes the prefill URL" do
+        type_de_champ_value = I18n.t("views.prefill_descriptions.edit.examples.#{type_de_champ.type_champ}")
+        type_de_champ_to_remove_value = I18n.t("views.prefill_descriptions.edit.examples.#{type_de_champ_to_remove.type_champ}")
         expect(response.body).to include(commencer_path(path: procedure.path))
-        expect(response.body).to include({
-          "champ_#{type_de_champ.to_typed_id}" => I18n.t("views.prefill_descriptions.edit.examples.#{type_de_champ.type_champ}")
-        }.to_query)
-        expect(response.body).not_to include({
-          "champ_#{type_de_champ_to_remove.to_typed_id}" => I18n.t("views.prefill_descriptions.edit.examples.#{type_de_champ_to_remove.type_champ}")
-        }.to_query)
+        expect(response.body).to include("champ_#{type_de_champ.to_typed_id_for_query}=#{type_de_champ_value}")
+        expect(response.body).not_to include("champ_#{type_de_champ_to_remove.to_typed_id_for_query}=#{type_de_champ_to_remove_value}")
       end
 
       it "includes the prefill query" do
@@ -111,10 +104,10 @@ describe PrefillDescriptionsController, type: :controller do
 
         expect(response.body).to include(api_public_v1_dossiers_path(procedure))
         expect(response.body).to include(
-          "&quot;champ_#{type_de_champ.to_typed_id}&quot;: &quot;#{type_de_champ_value}&quot;"
+          "&quot;champ_#{type_de_champ.to_typed_id_for_query}&quot;:&quot;#{type_de_champ_value}&quot;"
         )
         expect(response.body).not_to include(
-          "&quot;champ_#{type_de_champ_to_remove.to_typed_id}&quot;: &quot;#{type_de_champ_to_remove_value}&quot;"
+          "&quot;champ_#{type_de_champ_to_remove.to_typed_id_for_query}&quot;:&quot;#{type_de_champ_to_remove_value}&quot;"
         )
       end
     end
diff --git a/spec/controllers/users/dossiers_controller_spec.rb b/spec/controllers/users/dossiers_controller_spec.rb
index 71c773be0..3f760ff38 100644
--- a/spec/controllers/users/dossiers_controller_spec.rb
+++ b/spec/controllers/users/dossiers_controller_spec.rb
@@ -1077,8 +1077,8 @@ describe Users::DossiersController, type: :controller do
             let(:params) {
               {
                 procedure_id: procedure_id,
-                "champ_#{type_de_champ_1.to_typed_id}" => value_1,
-                "champ_#{type_de_champ_2.to_typed_id}" => value_2
+                "champ_#{type_de_champ_1.to_typed_id_for_query}" => value_1,
+                "champ_#{type_de_champ_2.to_typed_id_for_query}" => value_2
               }
             }
 
diff --git a/spec/models/prefill_description_spec.rb b/spec/models/prefill_description_spec.rb
index 3b15f9c87..7a7634873 100644
--- a/spec/models/prefill_description_spec.rb
+++ b/spec/models/prefill_description_spec.rb
@@ -114,11 +114,13 @@ RSpec.describe PrefillDescription, type: :model do
 
     it "builds the URL to create a new prefilled dossier" do
       expect(prefill_description.prefill_link).to eq(
-        commencer_url(
-          path: procedure.path,
-          "champ_#{type_de_champ_text.to_typed_id}" => TypesDeChamp::PrefillTypeDeChamp.build(type_de_champ_text, procedure.active_revision).example_value,
-          "champ_#{type_de_champ_epci.to_typed_id}" => TypesDeChamp::PrefillTypeDeChamp.build(type_de_champ_epci, procedure.active_revision).example_value,
-          "champ_#{type_de_champ_repetition.to_typed_id}" => TypesDeChamp::PrefillTypeDeChamp.build(type_de_champ_repetition, procedure.active_revision).example_value
+        CGI.unescape(
+          commencer_url(
+            path: procedure.path,
+            "champ_#{type_de_champ_text.to_typed_id_for_query}" => TypesDeChamp::PrefillTypeDeChamp.build(type_de_champ_text, procedure.active_revision).example_value,
+            "champ_#{type_de_champ_epci.to_typed_id_for_query}" => TypesDeChamp::PrefillTypeDeChamp.build(type_de_champ_epci, procedure.active_revision).example_value,
+            "champ_#{type_de_champ_repetition.to_typed_id_for_query}" => TypesDeChamp::PrefillTypeDeChamp.build(type_de_champ_repetition, procedure.active_revision).example_value
+          )
         )
       )
     end
@@ -130,13 +132,15 @@ RSpec.describe PrefillDescription, type: :model do
     let(:type_de_champ_epci) { TypesDeChamp::PrefillTypeDeChamp.build(create(:type_de_champ_epci, procedure: procedure), procedure.active_revision) }
     let(:type_de_champ_repetition) { build(:type_de_champ_repetition, :with_types_de_champ, :with_region_types_de_champ, procedure: procedure) }
     let(:prefillable_subchamps) { TypesDeChamp::PrefillRepetitionTypeDeChamp.new(type_de_champ_repetition, procedure.active_revision).send(:prefillable_subchamps) }
+    let(:text_repetition) { prefillable_subchamps.first }
+    let(:integer_repetition) { prefillable_subchamps.second }
     let(:region_repetition) { prefillable_subchamps.third }
     let(:prefill_description) { described_class.new(procedure) }
     let(:expected_query) do
       <<~TEXT
         curl --request POST '#{api_public_v1_dossiers_url(procedure)}' \\
              --header 'Content-Type: application/json' \\
-             --data '{"champ_#{type_de_champ_text.to_typed_id}": "#{TypesDeChamp::PrefillTypeDeChamp.build(type_de_champ_text, procedure.active_revision).example_value}", "champ_#{type_de_champ_epci.to_typed_id}": #{TypesDeChamp::PrefillTypeDeChamp.build(type_de_champ_epci, procedure.active_revision).example_value}, "champ_#{type_de_champ_repetition.to_typed_id}": #{TypesDeChamp::PrefillTypeDeChamp.build(type_de_champ_repetition, procedure.active_revision).example_value}}'
+             --data '{"champ_#{type_de_champ_text.to_typed_id_for_query}":"Texte court","champ_#{type_de_champ_epci.to_typed_id_for_query}":["01","200042935"],"champ_#{type_de_champ_repetition.to_typed_id_for_query}":[{"champ_#{text_repetition.to_typed_id_for_query}":"Texte court","champ_#{integer_repetition.to_typed_id_for_query}":"42","champ_#{region_repetition.to_typed_id_for_query}":"53"},{"champ_#{text_repetition.to_typed_id_for_query}":"Texte court","champ_#{integer_repetition.to_typed_id_for_query}":"42","champ_#{region_repetition.to_typed_id_for_query}":"53"}]}'
       TEXT
     end
 
diff --git a/spec/models/prefill_params_spec.rb b/spec/models/prefill_params_spec.rb
index 5ec73ddde..07ba823a6 100644
--- a/spec/models/prefill_params_spec.rb
+++ b/spec/models/prefill_params_spec.rb
@@ -36,8 +36,8 @@ RSpec.describe PrefillParams do
 
       let(:params) {
         {
-          "champ_#{type_de_champ_1.to_typed_id}" => value_1,
-          "champ_#{type_de_champ_2.to_typed_id}" => value_2
+          "champ_#{type_de_champ_1.to_typed_id_for_query}" => value_1,
+          "champ_#{type_de_champ_2.to_typed_id_for_query}" => value_2
         }
       }
 
@@ -53,7 +53,7 @@ RSpec.describe PrefillParams do
       let(:type_de_champ) { procedure.published_revision.types_de_champ_public.first }
       let(:types_de_champ_public) { [{ type: :text }] }
 
-      let(:params) { { type_de_champ.to_typed_id => "value" } }
+      let(:params) { { type_de_champ.to_typed_id_for_query => "value" } }
 
       it "filters out the champ" do
         expect(prefill_params_array).to match([])
@@ -71,7 +71,7 @@ RSpec.describe PrefillParams do
     context 'when there is no Champ that matches the TypeDeChamp with the given stable id' do
       let!(:type_de_champ) { create(:type_de_champ_text) } # goes to another procedure
 
-      let(:params) { { "champ_#{type_de_champ.to_typed_id}" => "value" } }
+      let(:params) { { "champ_#{type_de_champ.to_typed_id_for_query}" => "value" } }
 
       it "filters out the param" do
         expect(prefill_params_array).to match([])
@@ -84,7 +84,7 @@ RSpec.describe PrefillParams do
         let(:type_de_champ) { procedure.published_revision.types_de_champ_public.first }
         let(:champ) { find_champ_by_stable_id(dossier, type_de_champ.stable_id) }
 
-        let(:params) { { "champ_#{type_de_champ.to_typed_id}" => value } }
+        let(:params) { { "champ_#{type_de_champ.to_typed_id_for_query}" => value } }
 
         it "builds an array of hash matching the given params" do
           expect(prefill_params_array).to match([{ id: champ.id }.merge(attributes(champ, value))])
@@ -98,7 +98,7 @@ RSpec.describe PrefillParams do
         let(:type_de_champ) { procedure.published_revision.types_de_champ_private.first }
         let(:champ) { find_champ_by_stable_id(dossier, type_de_champ.stable_id) }
 
-        let(:params) { { "champ_#{type_de_champ.to_typed_id}" => value } }
+        let(:params) { { "champ_#{type_de_champ.to_typed_id_for_query}" => value } }
 
         it "builds an array of hash matching the given params" do
           expect(prefill_params_array).to match([{ id: champ.id }.merge(attributes(champ, value))])
@@ -110,7 +110,7 @@ RSpec.describe PrefillParams do
       let(:types_de_champ_public) { [{ type: type_de_champ_type }] }
       let(:type_de_champ) { procedure.published_revision.types_de_champ_public.first }
 
-      let(:params) { { "champ_#{type_de_champ.to_typed_id}" => value } }
+      let(:params) { { "champ_#{type_de_champ.to_typed_id_for_query}" => value } }
 
       context "when the type de champ is unauthorized (#{type_de_champ_type})" do
         it "filters out the param" do
@@ -147,7 +147,7 @@ RSpec.describe PrefillParams do
       let(:type_de_champ_child_value) { "value" }
       let(:type_de_champ_child_value2) { "value2" }
 
-      let(:params) { { "champ_#{type_de_champ.to_typed_id}" => ["{\"#{type_de_champ_child.to_typed_id}\":\"#{type_de_champ_child_value}\"}", "{\"#{type_de_champ_child.to_typed_id}\":\"#{type_de_champ_child_value2}\"}"] } }
+      let(:params) { { "champ_#{type_de_champ.to_typed_id_for_query}" => [{"champ_#{type_de_champ_child.to_typed_id_for_query}"=> type_de_champ_child_value}, {"champ_#{type_de_champ_child.to_typed_id_for_query}"=> type_de_champ_child_value2 }] } }
 
       it "builds an array of hash(id, value) matching the given params" do
         expect(prefill_params_array).to match([{ id: type_de_champ_child.champ.first.id, value: type_de_champ_child_value }, { id: type_de_champ_child.champ.second.id, value: type_de_champ_child_value2 }])
@@ -183,7 +183,7 @@ RSpec.describe PrefillParams do
       let(:type_de_champ_child_value) { "value" }
       let(:type_de_champ_child_value2) { "value2" }
 
-      let(:params) { { "champ_#{type_de_champ.to_typed_id}" => ["{\"#{type_de_champ_child.to_typed_id}\":\"#{type_de_champ_child_value}\"}", "{\"#{type_de_champ_child.to_typed_id}\":\"#{type_de_champ_child_value2}\"}"] } }
+      let(:params) { { "champ_#{type_de_champ.to_typed_id_for_query}" => [{"champ_#{type_de_champ_child.to_typed_id_for_query}" => type_de_champ_child_value}, {"champ_#{type_de_champ_child.to_typed_id_for_query}" => type_de_champ_child_value2}] } }
 
       it "builds an array of hash(id, value) matching the given params" do
         expect(prefill_params_array).to match([{ id: type_de_champ_child.champ.first.id, value: type_de_champ_child_value }, { id: type_de_champ_child.champ.second.id, value: type_de_champ_child_value2 }])
@@ -223,7 +223,7 @@ RSpec.describe PrefillParams do
       let(:type_de_champ) { procedure.published_revision.types_de_champ_public.first }
       let(:type_de_champ_child) { procedure.published_revision.children_of(type_de_champ).first }
 
-      let(:params) { { "champ_#{type_de_champ.to_typed_id}" => "value" } }
+      let(:params) { { "champ_#{type_de_champ.to_typed_id_for_query}" => "value" } }
 
       it "builds an array of hash(id, value) matching the given params" do
         expect(prefill_params_array).to match([])
@@ -235,7 +235,7 @@ RSpec.describe PrefillParams do
       let(:type_de_champ) { procedure.published_revision.types_de_champ_public.first }
       let(:type_de_champ_child) { procedure.published_revision.children_of(type_de_champ).first }
 
-      let(:params) { { "champ_#{type_de_champ.to_typed_id}" => ["{\"wrong\":\"value\"}", "{\"wrong\":\"value2\"}"] } }
+      let(:params) { { "champ_#{type_de_champ.to_typed_id_for_query}" => ["{\"wrong\":\"value\"}", "{\"wrong\":\"value2\"}"] } }
 
       it "builds an array of hash(id, value) matching the given params" do
         expect(prefill_params_array).to match([])
diff --git a/spec/models/types_de_champ/prefill_repetition_type_de_champ_spec.rb b/spec/models/types_de_champ/prefill_repetition_type_de_champ_spec.rb
index d4b4d1d7a..c9fcbc547 100644
--- a/spec/models/types_de_champ/prefill_repetition_type_de_champ_spec.rb
+++ b/spec/models/types_de_champ/prefill_repetition_type_de_champ_spec.rb
@@ -24,7 +24,7 @@ RSpec.describe TypesDeChamp::PrefillRepetitionTypeDeChamp, type: :model, vcr: {
   describe '#possible_values' do
     subject(:possible_values) { described_class.new(type_de_champ, procedure.active_revision).possible_values }
     let(:expected_value) {
-      "Un tableau de dictionnaires avec les valeurs possibles pour chaque champ de la répétition.</br><ul><li>#{text_repetition.to_typed_id}: Un texte court<br></li><li>#{integer_repetition.to_typed_id}: Un nombre entier<br></li><li>#{region_repetition.to_typed_id}: Un <a href=\"https://fr.wikipedia.org/wiki/R%C3%A9gion_fran%C3%A7aise\" target=\"_blank\" rel=\"noopener noreferrer\">code INSEE de région</a><br><a title=\"Toutes les valeurs possibles — Nouvel onglet\" target=\"_blank\" rel=\"noopener noreferrer\" href=\"/procedures/#{procedure.path}/prefill_type_de_champs/#{region_repetition.id}\">Voir toutes les valeurs possibles</a></li></ul>"
+      "Un tableau de dictionnaires avec les valeurs possibles pour chaque champ de la répétition.</br><ul><li>champ_#{text_repetition.to_typed_id_for_query}: Un texte court<br></li><li>champ_#{integer_repetition.to_typed_id_for_query}: Un nombre entier<br></li><li>champ_#{region_repetition.to_typed_id_for_query}: Un <a href=\"https://fr.wikipedia.org/wiki/R%C3%A9gion_fran%C3%A7aise\" target=\"_blank\" rel=\"noopener noreferrer\">code INSEE de région</a><br><a title=\"Toutes les valeurs possibles — Nouvel onglet\" target=\"_blank\" rel=\"noopener noreferrer\" href=\"/procedures/#{procedure.path}/prefill_type_de_champs/#{region_repetition.id}\">Voir toutes les valeurs possibles</a></li></ul>"
     }
 
     it {
@@ -34,7 +34,7 @@ RSpec.describe TypesDeChamp::PrefillRepetitionTypeDeChamp, type: :model, vcr: {
 
   describe '#example_value' do
     subject(:example_value) { described_class.new(type_de_champ, procedure.active_revision).example_value }
-    let(:expected_value) { ["{\"#{text_repetition.to_typed_id}\":\"Texte court\", \"#{integer_repetition.to_typed_id}\":\"42\", \"#{region_repetition.to_typed_id}\":\"53\"}", "{\"#{text_repetition.to_typed_id}\":\"Texte court\", \"#{integer_repetition.to_typed_id}\":\"42\", \"#{region_repetition.to_typed_id}\":\"53\"}"] }
+    let(:expected_value) { [{"champ_#{text_repetition.to_typed_id_for_query}" => "Texte court", "champ_#{integer_repetition.to_typed_id_for_query}" => "42", "champ_#{region_repetition.to_typed_id_for_query}" => "53"}, {"champ_#{text_repetition.to_typed_id_for_query}" => "Texte court", "champ_#{integer_repetition.to_typed_id_for_query}" => "42", "champ_#{region_repetition.to_typed_id_for_query}" => "53"}] }
 
     it { expect(example_value).to eq(expected_value) }
   end
@@ -64,13 +64,13 @@ RSpec.describe TypesDeChamp::PrefillRepetitionTypeDeChamp, type: :model, vcr: {
     end
 
     context 'when the value is an array with some wrong keys' do
-      let(:value) { ["{\"#{text_repetition.to_typed_id}\":\"value\", \"blabla\":\"value2\"}", "{\"#{integer_repetition.to_typed_id}\":\"value3\"}", "{\"blabla\":\"false\"}"] }
+      let(:value) { [{"champ_#{text_repetition.to_typed_id_for_query}" => "value", "blabla" => "value2"}, {"champ_#{integer_repetition.to_typed_id_for_query}" => "value3"}, {"blabla" =>"false"}] }
 
       it { is_expected.to match([[{ id: text_repetition.champ.first.id, value: "value" }], [{ id: integer_repetition.champ.second.id, value: "value3" }]]) }
     end
 
     context 'when the value is an array with right keys' do
-      let(:value) { ["{\"#{text_repetition.to_typed_id}\":\"value\"}", "{\"#{text_repetition.to_typed_id}\":\"value2\"}"] }
+      let(:value) { [{"champ_#{text_repetition.to_typed_id_for_query}" =>"value"}, {"champ_#{text_repetition.to_typed_id_for_query}" => "value2"}] }
 
       it { is_expected.to match([[{ id: text_repetition.champ.first.id, value: "value" }], [{ id: text_repetition.champ.second.id, value: "value2" }]]) }
     end
diff --git a/spec/system/integrateurs/procedure_prefilling_spec.rb b/spec/system/integrateurs/procedure_prefilling_spec.rb
index 968f98e5b..370cc483a 100644
--- a/spec/system/integrateurs/procedure_prefilling_spec.rb
+++ b/spec/system/integrateurs/procedure_prefilling_spec.rb
@@ -5,7 +5,7 @@ describe 'As an integrator:', js: true do
   before { visit "/preremplir/#{procedure.path}" }
 
   scenario 'I can read the procedure prefilling (aka public champs)' do
-    expect(page).to have_content(type_de_champ.to_typed_id)
+    expect(page).to have_content(type_de_champ.to_typed_id_for_query)
     expect(page).to have_content(I18n.t("activerecord.attributes.type_de_champ.type_champs.#{type_de_champ.type_champ}"))
     expect(page).to have_content(type_de_champ.libelle)
     expect(page).to have_content(type_de_champ.description)
diff --git a/spec/system/users/dossier_prefill_get_spec.rb b/spec/system/users/dossier_prefill_get_spec.rb
index 2f7274b8f..78a1ef8f4 100644
--- a/spec/system/users/dossier_prefill_get_spec.rb
+++ b/spec/system/users/dossier_prefill_get_spec.rb
@@ -31,16 +31,16 @@ describe 'Prefilling a dossier (with a GET request):' do
   let(:entry_path) {
     commencer_path(
       path: procedure.path,
-      "champ_#{type_de_champ_text.to_typed_id}" => text_value,
-      "champ_#{type_de_champ_phone.to_typed_id}" => phone_value,
-      "champ_#{type_de_champ_datetime.to_typed_id}" => datetime_value,
-      "champ_#{type_de_champ_multiple_drop_down_list.to_typed_id}" => multiple_drop_down_list_values,
-      "champ_#{type_de_champ_epci.to_typed_id}" => epci_value,
-      "champ_#{type_de_champ_repetition.to_typed_id}" => [
-        "{
-          \"#{sub_type_de_champs_repetition.first.to_typed_id}\": \"#{text_repetition_value}\",
-          \"#{sub_type_de_champs_repetition.second.to_typed_id}\": \"#{integer_repetition_value}\"
-        }"
+      "champ_#{type_de_champ_text.to_typed_id_for_query}" => text_value,
+      "champ_#{type_de_champ_phone.to_typed_id_for_query}" => phone_value,
+      "champ_#{type_de_champ_datetime.to_typed_id_for_query}" => datetime_value,
+      "champ_#{type_de_champ_multiple_drop_down_list.to_typed_id_for_query}" => multiple_drop_down_list_values,
+      "champ_#{type_de_champ_epci.to_typed_id_for_query}" => epci_value,
+      "champ_#{type_de_champ_repetition.to_typed_id_for_query}" => [
+        {
+          "champ_#{sub_type_de_champs_repetition.first.to_typed_id_for_query}": text_repetition_value,
+          "champ_#{sub_type_de_champs_repetition.second.to_typed_id_for_query}": integer_repetition_value
+        }
       ]
     )
   }
diff --git a/spec/system/users/dossier_prefill_post_spec.rb b/spec/system/users/dossier_prefill_post_spec.rb
index 880122515..55f90cbfa 100644
--- a/spec/system/users/dossier_prefill_post_spec.rb
+++ b/spec/system/users/dossier_prefill_post_spec.rb
@@ -126,17 +126,17 @@ describe 'Prefilling a dossier (with a POST request):' do
     session.post api_public_v1_dossiers_path(procedure),
       headers: { "Content-Type" => "application/json" },
       params: {
-        "champ_#{type_de_champ_text.to_typed_id}" => text_value,
-        "champ_#{type_de_champ_phone.to_typed_id}" => phone_value,
-        "champ_#{type_de_champ_repetition.to_typed_id}" => [
-          "{
-            \"#{sub_type_de_champs_repetition.first.to_typed_id}\": \"#{text_repetition_value}\",
-            \"#{sub_type_de_champs_repetition.second.to_typed_id}\": \"#{integer_repetition_value}\"
-          }"
+        "champ_#{type_de_champ_text.to_typed_id_for_query}" => text_value,
+        "champ_#{type_de_champ_phone.to_typed_id_for_query}" => phone_value,
+        "champ_#{type_de_champ_repetition.to_typed_id_for_query}" => [
+          {
+            "champ_#{sub_type_de_champs_repetition.first.to_typed_id_for_query}": text_repetition_value,
+            "champ_#{sub_type_de_champs_repetition.second.to_typed_id_for_query}": integer_repetition_value
+          }
         ],
-        "champ_#{type_de_champ_datetime.to_typed_id}" => datetime_value,
-        "champ_#{type_de_champ_multiple_drop_down_list.to_typed_id}" => multiple_drop_down_list_values,
-        "champ_#{type_de_champ_epci.to_typed_id}" => epci_value
+        "champ_#{type_de_champ_datetime.to_typed_id_for_query}" => datetime_value,
+        "champ_#{type_de_champ_multiple_drop_down_list.to_typed_id_for_query}" => multiple_drop_down_list_values,
+        "champ_#{type_de_champ_epci.to_typed_id_for_query}" => epci_value
       }.to_json
     JSON.parse(session.response.body)["dossier_url"].gsub("http://www.example.com", "")
   end

From ca29079c27380300c6ea76431a4dbd4cee97b23f Mon Sep 17 00:00:00 2001
From: Damien Le Thiec <damien.lethiec@gmail.com>
Date: Wed, 22 Feb 2023 19:40:52 +0100
Subject: [PATCH 113/202] Fix rubocop

---
 app/models/concerns/dossier_prefillable_concern.rb    | 11 -----------
 spec/models/prefill_params_spec.rb                    |  4 ++--
 .../prefill_repetition_type_de_champ_spec.rb          |  6 +++---
 3 files changed, 5 insertions(+), 16 deletions(-)

diff --git a/app/models/concerns/dossier_prefillable_concern.rb b/app/models/concerns/dossier_prefillable_concern.rb
index 981936615..3ecbe7a04 100644
--- a/app/models/concerns/dossier_prefillable_concern.rb
+++ b/app/models/concerns/dossier_prefillable_concern.rb
@@ -13,14 +13,3 @@ module DossierPrefillableConcern
     save(validate: false)
   end
 end
-
-
-# Pour être sûr de bien être alignés, on veut bien les format suivants ?
-
-#     En POST, je prends un hash classique et je lui fais to_json
-#     Pour ton exemple ça donne: "{\"champ_id1\":\"text\",\"champ_id2\":[\"option1\",\"option2\"],\"champ_id3\":[{\"champ_id4\":\"text\",\"champ_id5\":true,\"champ_id6\":42,\"champ_id7\":[\"option1\",\"option2\"]},{\"champ_id4\":\"text2\",\"champ_id6\":32}]}"
-
-#     En GET, je prends un hash et je lui applique to_query
-#     Pour ton exemple, et en escapant les caractères spéciaux: "champ_id1=text&champ_id2[]=option1&champ_id2[]=option2&champ_id3[][champ_id4]=text&champ_id3[][champ_id5]=true&champ_id3[][champ_id6]=42&champ_id3[][champ_id7][]=option1&champ_id3[][champ_id7][]=option2&champ_id3[][champ_id4]=text2&champ_id3[][champ_id6]=32"
-
-#Tu confirmes ? Je préfère checker car c'est un tout petit peu différent de ton exemple
diff --git a/spec/models/prefill_params_spec.rb b/spec/models/prefill_params_spec.rb
index 07ba823a6..55c7289e9 100644
--- a/spec/models/prefill_params_spec.rb
+++ b/spec/models/prefill_params_spec.rb
@@ -147,7 +147,7 @@ RSpec.describe PrefillParams do
       let(:type_de_champ_child_value) { "value" }
       let(:type_de_champ_child_value2) { "value2" }
 
-      let(:params) { { "champ_#{type_de_champ.to_typed_id_for_query}" => [{"champ_#{type_de_champ_child.to_typed_id_for_query}"=> type_de_champ_child_value}, {"champ_#{type_de_champ_child.to_typed_id_for_query}"=> type_de_champ_child_value2 }] } }
+      let(:params) { { "champ_#{type_de_champ.to_typed_id_for_query}" => [{ "champ_#{type_de_champ_child.to_typed_id_for_query}" => type_de_champ_child_value }, { "champ_#{type_de_champ_child.to_typed_id_for_query}" => type_de_champ_child_value2 }] } }
 
       it "builds an array of hash(id, value) matching the given params" do
         expect(prefill_params_array).to match([{ id: type_de_champ_child.champ.first.id, value: type_de_champ_child_value }, { id: type_de_champ_child.champ.second.id, value: type_de_champ_child_value2 }])
@@ -183,7 +183,7 @@ RSpec.describe PrefillParams do
       let(:type_de_champ_child_value) { "value" }
       let(:type_de_champ_child_value2) { "value2" }
 
-      let(:params) { { "champ_#{type_de_champ.to_typed_id_for_query}" => [{"champ_#{type_de_champ_child.to_typed_id_for_query}" => type_de_champ_child_value}, {"champ_#{type_de_champ_child.to_typed_id_for_query}" => type_de_champ_child_value2}] } }
+      let(:params) { { "champ_#{type_de_champ.to_typed_id_for_query}" => [{ "champ_#{type_de_champ_child.to_typed_id_for_query}" => type_de_champ_child_value }, { "champ_#{type_de_champ_child.to_typed_id_for_query}" => type_de_champ_child_value2 }] } }
 
       it "builds an array of hash(id, value) matching the given params" do
         expect(prefill_params_array).to match([{ id: type_de_champ_child.champ.first.id, value: type_de_champ_child_value }, { id: type_de_champ_child.champ.second.id, value: type_de_champ_child_value2 }])
diff --git a/spec/models/types_de_champ/prefill_repetition_type_de_champ_spec.rb b/spec/models/types_de_champ/prefill_repetition_type_de_champ_spec.rb
index c9fcbc547..731129a48 100644
--- a/spec/models/types_de_champ/prefill_repetition_type_de_champ_spec.rb
+++ b/spec/models/types_de_champ/prefill_repetition_type_de_champ_spec.rb
@@ -34,7 +34,7 @@ RSpec.describe TypesDeChamp::PrefillRepetitionTypeDeChamp, type: :model, vcr: {
 
   describe '#example_value' do
     subject(:example_value) { described_class.new(type_de_champ, procedure.active_revision).example_value }
-    let(:expected_value) { [{"champ_#{text_repetition.to_typed_id_for_query}" => "Texte court", "champ_#{integer_repetition.to_typed_id_for_query}" => "42", "champ_#{region_repetition.to_typed_id_for_query}" => "53"}, {"champ_#{text_repetition.to_typed_id_for_query}" => "Texte court", "champ_#{integer_repetition.to_typed_id_for_query}" => "42", "champ_#{region_repetition.to_typed_id_for_query}" => "53"}] }
+    let(:expected_value) { [{ "champ_#{text_repetition.to_typed_id_for_query}" => "Texte court", "champ_#{integer_repetition.to_typed_id_for_query}" => "42", "champ_#{region_repetition.to_typed_id_for_query}" => "53" }, { "champ_#{text_repetition.to_typed_id_for_query}" => "Texte court", "champ_#{integer_repetition.to_typed_id_for_query}" => "42", "champ_#{region_repetition.to_typed_id_for_query}" => "53" }] }
 
     it { expect(example_value).to eq(expected_value) }
   end
@@ -64,13 +64,13 @@ RSpec.describe TypesDeChamp::PrefillRepetitionTypeDeChamp, type: :model, vcr: {
     end
 
     context 'when the value is an array with some wrong keys' do
-      let(:value) { [{"champ_#{text_repetition.to_typed_id_for_query}" => "value", "blabla" => "value2"}, {"champ_#{integer_repetition.to_typed_id_for_query}" => "value3"}, {"blabla" =>"false"}] }
+      let(:value) { [{ "champ_#{text_repetition.to_typed_id_for_query}" => "value", "blabla" => "value2" }, { "champ_#{integer_repetition.to_typed_id_for_query}" => "value3" }, { "blabla" => "false" }] }
 
       it { is_expected.to match([[{ id: text_repetition.champ.first.id, value: "value" }], [{ id: integer_repetition.champ.second.id, value: "value3" }]]) }
     end
 
     context 'when the value is an array with right keys' do
-      let(:value) { [{"champ_#{text_repetition.to_typed_id_for_query}" =>"value"}, {"champ_#{text_repetition.to_typed_id_for_query}" => "value2"}] }
+      let(:value) { [{ "champ_#{text_repetition.to_typed_id_for_query}" => "value" }, { "champ_#{text_repetition.to_typed_id_for_query}" => "value2" }] }
 
       it { is_expected.to match([[{ id: text_repetition.champ.first.id, value: "value" }], [{ id: text_repetition.champ.second.id, value: "value2" }]]) }
     end

From 61d2edc42e2ed5da4eca0ef5e86462c171affe54 Mon Sep 17 00:00:00 2001
From: Damien Le Thiec <damien.lethiec@gmail.com>
Date: Wed, 22 Feb 2023 20:05:36 +0100
Subject: [PATCH 114/202] Cache champ attributes

---
 app/models/prefill_params.rb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/models/prefill_params.rb b/app/models/prefill_params.rb
index d048a3d2d..2ed7cfc8b 100644
--- a/app/models/prefill_params.rb
+++ b/app/models/prefill_params.rb
@@ -57,11 +57,11 @@ class PrefillParams
     end
 
     def prefillable?
-      champ.prefillable? && valid?
+      champ.prefillable? && valid? && champ_attributes.present?
     end
 
     def champ_attributes
-      TypesDeChamp::PrefillTypeDeChamp
+      @champ_attributes ||= TypesDeChamp::PrefillTypeDeChamp
         .build(champ.type_de_champ, dossier.revision)
         .to_assignable_attributes(champ, value)
     end

From 127f86e8ae2a20eb8ff2c6e2e82cb416b6a1e9cf Mon Sep 17 00:00:00 2001
From: Eric Leroy-Terquem <eric.leroyterquem@beta.gouv.fr>
Date: Thu, 23 Feb 2023 10:07:09 +0100
Subject: [PATCH 115/202] feat(flash messages): add a helper method to keep
 link when sanitizing

---
 app/helpers/sanitize_with_link_helper.rb    | 6 ++++++
 app/views/layouts/_flash_messages.html.haml | 4 ++--
 2 files changed, 8 insertions(+), 2 deletions(-)
 create mode 100644 app/helpers/sanitize_with_link_helper.rb

diff --git a/app/helpers/sanitize_with_link_helper.rb b/app/helpers/sanitize_with_link_helper.rb
new file mode 100644
index 000000000..64e5436b0
--- /dev/null
+++ b/app/helpers/sanitize_with_link_helper.rb
@@ -0,0 +1,6 @@
+module SanitizeWithLinkHelper
+  def sanitize_with_link(value)
+    tags = Rails.configuration.action_view.sanitized_allowed_tags + ['a']
+    sanitize(value, tags:)
+  end
+end
diff --git a/app/views/layouts/_flash_messages.html.haml b/app/views/layouts/_flash_messages.html.haml
index 7eb9812f7..74e29b68c 100644
--- a/app/views/layouts/_flash_messages.html.haml
+++ b/app/views/layouts/_flash_messages.html.haml
@@ -7,8 +7,8 @@
         - if value.class == Array
           .alert{ class: flash_class(key, sticky: sticky, fixed: fixed), role: flash_role(key) }
             - value.each do |message|
-              = sanitize(message)
+              = sanitize_with_link(message)
               %br
         - else
           .alert{ class: flash_class(key, sticky: sticky, fixed: fixed), role: flash_role(key) }
-            = sanitize(value)
+            = sanitize_with_link(value)

From d516d2a3eb9f08b9084a6c357a73e97c86f49aaf Mon Sep 17 00:00:00 2001
From: Eric Leroy-Terquem <eric.leroyterquem@beta.gouv.fr>
Date: Tue, 21 Feb 2023 10:41:00 +0100
Subject: [PATCH 116/202] feat(groupe instructeur): add a confirm modal before
 import

---
 app/views/administrateurs/groupe_instructeurs/_edit.html.haml   | 2 +-
 config/locales/views/administrateurs/groupe_instructeurs/en.yml | 1 +
 config/locales/views/administrateurs/groupe_instructeurs/fr.yml | 1 +
 3 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/app/views/administrateurs/groupe_instructeurs/_edit.html.haml b/app/views/administrateurs/groupe_instructeurs/_edit.html.haml
index 8e19f57d3..a250482dd 100644
--- a/app/views/administrateurs/groupe_instructeurs/_edit.html.haml
+++ b/app/views/administrateurs/groupe_instructeurs/_edit.html.haml
@@ -35,7 +35,7 @@
       %p.mt-2.mb-2= link_to t('.csv_import.download_exemple'), sample_file_path
       - csv_params = procedure.routing_enabled? ? :group_csv_file : :instructeurs_csv_file
       = file_field_tag csv_params, required: true, accept: 'text/csv', size: "1"
-      = submit_tag t('.csv_import.import_file'), class: 'button primary send', data: { disable_with: "Envoi..." }
+      = submit_tag t('.csv_import.import_file'), class: 'button primary send', data: { disable_with: "Envoi...", confirm: t('.csv_import.import_file_alert') }
   - else
     %p.mt-4.form.font-weight-bold.mb-2.text-lg
       = t('.csv_import.title')
diff --git a/config/locales/views/administrateurs/groupe_instructeurs/en.yml b/config/locales/views/administrateurs/groupe_instructeurs/en.yml
index e39c7b6f8..a232122cc 100644
--- a/config/locales/views/administrateurs/groupe_instructeurs/en.yml
+++ b/config/locales/views/administrateurs/groupe_instructeurs/en.yml
@@ -49,6 +49,7 @@ en:
           download_exemple: Download sample CSV file
           import_file: Import file
           import_file_procedure_not_published: The import of instructors by CSV file is available once the process has been published
+          import_file_alert: Instructors added to the procedure will receive an email. Are you sure you want to continue ?"
         set_up: set up
         button:
           add_group: Add group
diff --git a/config/locales/views/administrateurs/groupe_instructeurs/fr.yml b/config/locales/views/administrateurs/groupe_instructeurs/fr.yml
index 6f94ef85f..4490b862e 100644
--- a/config/locales/views/administrateurs/groupe_instructeurs/fr.yml
+++ b/config/locales/views/administrateurs/groupe_instructeurs/fr.yml
@@ -55,6 +55,7 @@ fr:
           download_exemple: Télécharger l’exemple de fichier CSV
           import_file: Importer le fichier
           import_file_procedure_not_published: L’import d’instructeurs par fichier CSV est disponible une fois la démarche publiée
+          import_file_alert: Tous les instructeurs ajoutés à la procédure vont être notifiés par email. Voulez-vous continuer ?
         view: voir
         set_up: paramétrer
         button:

From a6e01d98ea51ab46093957d62f61bc512e8603c0 Mon Sep 17 00:00:00 2001
From: Eric Leroy-Terquem <eric.leroyterquem@beta.gouv.fr>
Date: Wed, 22 Feb 2023 17:29:07 +0100
Subject: [PATCH 117/202] feat(instructeurs import): notify added instructeurs

---
 .../groupe_instructeurs_controller.rb               |  9 +++++++--
 app/services/instructeurs_import_service.rb         |  4 ++--
 .../groupe_instructeurs_controller_spec.rb          | 13 ++++++++++++-
 3 files changed, 21 insertions(+), 5 deletions(-)

diff --git a/app/controllers/administrateurs/groupe_instructeurs_controller.rb b/app/controllers/administrateurs/groupe_instructeurs_controller.rb
index a410afef8..0a1321ee2 100644
--- a/app/controllers/administrateurs/groupe_instructeurs_controller.rb
+++ b/app/controllers/administrateurs/groupe_instructeurs_controller.rb
@@ -230,8 +230,13 @@ module Administrateurs
             if instructors_emails_has_key.blank?
               flash[:alert] = "Importation impossible, veuillez importer un csv #{view_context.link_to('suivant ce modèle', "/csv/import-instructeurs-test.csv")}"
             else
-              result = InstructeursImportService.import_instructeurs(procedure, instructors_emails)
-              flash_message_for_import(result)
+              added_instructeurs, invalid_emails = InstructeursImportService.import_instructeurs(procedure, instructors_emails)
+
+              GroupeInstructeurMailer
+                .notify_added_instructeurs(groupe_instructeur, added_instructeurs, current_administrateur.email)
+                .deliver_later
+
+              flash_message_for_import(invalid_emails)
             end
           end
           redirect_to admin_procedure_groupe_instructeurs_path(procedure)
diff --git a/app/services/instructeurs_import_service.rb b/app/services/instructeurs_import_service.rb
index eb471fa5b..fdaac0f98 100644
--- a/app/services/instructeurs_import_service.rb
+++ b/app/services/instructeurs_import_service.rb
@@ -45,8 +45,8 @@ class InstructeursImportService
 
     groupe_instructeur = procedure.defaut_groupe_instructeur
 
-    _, invalid_emails = groupe_instructeur.add_instructeurs(emails: instructeurs_emails)
+    instructeurs, invalid_emails = groupe_instructeur.add_instructeurs(emails: instructeurs_emails)
 
-    invalid_emails
+    [instructeurs, invalid_emails]
   end
 end
diff --git a/spec/controllers/administrateurs/groupe_instructeurs_controller_spec.rb b/spec/controllers/administrateurs/groupe_instructeurs_controller_spec.rb
index b785ce4c7..cfbdcd788 100644
--- a/spec/controllers/administrateurs/groupe_instructeurs_controller_spec.rb
+++ b/spec/controllers/administrateurs/groupe_instructeurs_controller_spec.rb
@@ -486,12 +486,23 @@ describe Administrateurs::GroupeInstructeursController, type: :controller do
     context 'when the csv file is less than 1 mo and content type text/csv' do
       let(:csv_file) { fixture_file_upload('spec/fixtures/files/instructeurs-file.csv', 'text/csv') }
 
-      before { subject }
+      before do
+        allow(GroupeInstructeurMailer).to receive(:notify_added_instructeurs)
+          .and_return(double(deliver_later: true))
+        subject
+      end
 
       it { expect(response.status).to eq(302) }
       it { expect(procedure_non_routee.instructeurs.pluck(:email)).to match_array(["kara@beta-gouv.fr", "philippe@mail.com", "lisa@gouv.fr"]) }
       it { expect(flash.alert).to be_present }
       it { expect(flash.alert).to eq("Import terminé. Cependant les emails suivants ne sont pas pris en compte: eric") }
+      it "calls GroupeInstructeurMailer" do
+        expect(GroupeInstructeurMailer).to have_received(:notify_added_instructeurs).with(
+          procedure_non_routee.defaut_groupe_instructeur,
+          any_args,
+          admin.email
+        )
+      end
     end
 
     context 'when the csv file has more than one column' do

From 4ea1d7d33bec796c13ea74af7c233ea1faf32751 Mon Sep 17 00:00:00 2001
From: Eric Leroy-Terquem <eric.leroyterquem@beta.gouv.fr>
Date: Wed, 22 Feb 2023 18:05:20 +0100
Subject: [PATCH 118/202] feat(groupe instructeurs import): notify added
 instructeurs

---
 .../administrateurs/groupe_instructeurs_controller.rb | 11 +++++++++--
 app/services/instructeurs_import_service.rb           |  7 +++++--
 .../groupe_instructeurs_controller_spec.rb            |  7 ++++++-
 spec/services/instructeurs_import_service_spec.rb     |  8 ++++----
 4 files changed, 24 insertions(+), 9 deletions(-)

diff --git a/app/controllers/administrateurs/groupe_instructeurs_controller.rb b/app/controllers/administrateurs/groupe_instructeurs_controller.rb
index 0a1321ee2..07ffe53f8 100644
--- a/app/controllers/administrateurs/groupe_instructeurs_controller.rb
+++ b/app/controllers/administrateurs/groupe_instructeurs_controller.rb
@@ -217,8 +217,15 @@ module Administrateurs
             if groupes_emails_has_keys.blank?
               flash[:alert] = "Importation impossible, veuillez importer un csv #{view_context.link_to('suivant ce modèle', "/csv/#{I18n.locale}/import-groupe-test.csv")}"
             else
-              result = InstructeursImportService.import_groupes(procedure, groupes_emails)
-              flash_message_for_import(result)
+              added_instructeurs_by_group, invalid_emails = InstructeursImportService.import_groupes(procedure, groupes_emails)
+
+              added_instructeurs_by_group.each do |groupe, added_instructeurs|
+                GroupeInstructeurMailer
+                  .notify_added_instructeurs(groupe, added_instructeurs, current_administrateur.email)
+                  .deliver_later
+              end
+
+              flash_message_for_import(invalid_emails)
             end
 
           elsif params[:instructeurs_csv_file]
diff --git a/app/services/instructeurs_import_service.rb b/app/services/instructeurs_import_service.rb
index fdaac0f98..7aa9f4ec3 100644
--- a/app/services/instructeurs_import_service.rb
+++ b/app/services/instructeurs_import_service.rb
@@ -29,12 +29,15 @@ class InstructeursImportService
       .map { [_1, emails_in_groupe[_1.label]] }
       .to_h
 
+    added_instructeurs_by_group = []
+
     target_groupes.each do |groupe_instructeur, emails|
-      _, invalid_emails = groupe_instructeur.add_instructeurs(emails:)
+      added_instructeurs, invalid_emails = groupe_instructeur.add_instructeurs(emails:)
+      added_instructeurs_by_group << [groupe_instructeur, added_instructeurs]
       errors << invalid_emails
     end
 
-    errors.flatten
+    [added_instructeurs_by_group, errors.flatten]
   end
 
   def self.import_instructeurs(procedure, emails)
diff --git a/spec/controllers/administrateurs/groupe_instructeurs_controller_spec.rb b/spec/controllers/administrateurs/groupe_instructeurs_controller_spec.rb
index cfbdcd788..d15f59b35 100644
--- a/spec/controllers/administrateurs/groupe_instructeurs_controller_spec.rb
+++ b/spec/controllers/administrateurs/groupe_instructeurs_controller_spec.rb
@@ -428,11 +428,16 @@ describe Administrateurs::GroupeInstructeursController, type: :controller do
     context 'when the content of csv contains special characters' do
       let(:csv_file) { fixture_file_upload('spec/fixtures/files/groupe_avec_caracteres_speciaux.csv', 'text/csv') }
 
-      before { subject }
+      before do
+        allow(GroupeInstructeurMailer).to receive(:notify_added_instructeurs)
+          .and_return(double(deliver_later: true))
+        subject
+      end
 
       it { expect(procedure.groupe_instructeurs.pluck(:label)).to match_array(["Auvergne-Rhône-Alpes", "Vendée", "défaut"]) }
       it { expect(flash.notice).to be_present }
       it { expect(flash.notice).to eq("La liste des instructeurs a été importée avec succès") }
+      it { expect(GroupeInstructeurMailer).to have_received(:notify_added_instructeurs).twice }
     end
 
     context 'when the csv file length is more than 1 mo' do
diff --git a/spec/services/instructeurs_import_service_spec.rb b/spec/services/instructeurs_import_service_spec.rb
index 88f9b616c..8e2a26bb4 100644
--- a/spec/services/instructeurs_import_service_spec.rb
+++ b/spec/services/instructeurs_import_service_spec.rb
@@ -21,7 +21,7 @@ describe InstructeursImportService do
       end
 
       it 'imports groupes' do
-        errors = subject
+        _, errors = subject
 
         expect(procedure_groupes.keys).to contain_exactly("Auvergne Rhone-Alpes", "Occitanie", "défaut")
         expect(procedure_groupes["Auvergne Rhone-Alpes"]).to contain_exactly("john@lennon.fr")
@@ -63,7 +63,7 @@ describe InstructeursImportService do
       end
 
       it 'ignores or corrects' do
-        errors = subject
+        _, errors = subject
 
         expect(procedure_groupes.keys).to contain_exactly("Occitanie", "défaut")
         expect(procedure_groupes["Occitanie"]).to contain_exactly("paul@mccartney.uk", "ringo@starr.uk")
@@ -117,7 +117,7 @@ describe InstructeursImportService do
       end
 
       it 'ignores instructeur' do
-        errors = subject
+        _, errors = subject
 
         expect(procedure_groupes.keys).to contain_exactly("défaut")
         expect(procedure_groupes["défaut"]).to be_empty
@@ -136,7 +136,7 @@ describe InstructeursImportService do
       let(:emails) { [{ "email" => "john@lennon.fr" }, { "email" => "paul@mccartney.uk" }, { "email" => "ringo@starr.uk" }] }
 
       it 'imports instructeurs' do
-        errors = subject
+        _, errors = subject
         expect(procedure_non_routee.defaut_groupe_instructeur.instructeurs.pluck(:email)).to contain_exactly("john@lennon.fr", "paul@mccartney.uk", "ringo@starr.uk")
 
         expect(errors).to match_array([])

From 17f8475b071b9b570449cb2fac6c35dddccf7166 Mon Sep 17 00:00:00 2001
From: Damien Le Thiec <damien.lethiec@gmail.com>
Date: Thu, 23 Feb 2023 11:00:09 +0100
Subject: [PATCH 119/202] Refacto comparaison typed id

---
 app/models/application_record.rb                       |  8 ++++++++
 app/models/prefill_params.rb                           | 10 +---------
 .../types_de_champ/prefill_repetition_type_de_champ.rb |  2 +-
 3 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/app/models/application_record.rb b/app/models/application_record.rb
index af8027c43..1a770302e 100644
--- a/app/models/application_record.rb
+++ b/app/models/application_record.rb
@@ -19,6 +19,14 @@ class ApplicationRecord < ActiveRecord::Base
     GraphQL::Schema::UniqueWithinType.decode(id)[1]
   end
 
+  def self.stable_id_from_typed_id(prefixed_typed_id)
+    return nil unless prefixed_typed_id.starts_with?("champ_")
+
+    self.id_from_typed_id(prefixed_typed_id.gsub("champ_", "")).to_i
+  rescue
+    nil
+  end
+
   def to_typed_id
     GraphQL::Schema::UniqueWithinType.encode(self.class.name, id)
   end
diff --git a/app/models/prefill_params.rb b/app/models/prefill_params.rb
index 2ed7cfc8b..14099772e 100644
--- a/app/models/prefill_params.rb
+++ b/app/models/prefill_params.rb
@@ -14,7 +14,7 @@ class PrefillParams
 
   def build_prefill_values
     value_by_stable_id = params
-      .map { |prefixed_typed_id, value| [stable_id_from_typed_id(prefixed_typed_id), value] }
+      .map { |prefixed_typed_id, value| [Champ.stable_id_from_typed_id(prefixed_typed_id), value] }
       .filter { |stable_id, value| stable_id.present? && value.present? }
       .to_h
 
@@ -24,14 +24,6 @@ class PrefillParams
       .map { |champ, value| PrefillValue.new(champ:, value:, dossier:) }
   end
 
-  def stable_id_from_typed_id(prefixed_typed_id)
-    return nil unless prefixed_typed_id.starts_with?("champ_")
-
-    Champ.id_from_typed_id(prefixed_typed_id.gsub("champ_", "")).to_i
-  rescue
-    nil
-  end
-
   class PrefillValue
     NEED_VALIDATION_TYPES_DE_CHAMPS = [
       TypeDeChamp.type_champs.fetch(:decimal_number),
diff --git a/app/models/types_de_champ/prefill_repetition_type_de_champ.rb b/app/models/types_de_champ/prefill_repetition_type_de_champ.rb
index 9ad39b903..61e3a15be 100644
--- a/app/models/types_de_champ/prefill_repetition_type_de_champ.rb
+++ b/app/models/types_de_champ/prefill_repetition_type_de_champ.rb
@@ -59,7 +59,7 @@ class TypesDeChamp::PrefillRepetitionTypeDeChamp < TypesDeChamp::PrefillTypeDeCh
       repetition.map do |key, value|
         next unless key.is_a?(String) && key.starts_with?("champ_")
 
-        subchamp = row.find { |champ| champ.type_de_champ_to_typed_id_for_query == key.split("_").last }
+        subchamp = row.find { |champ| champ.stable_id == Champ.stable_id_from_typed_id(key) }
         next unless subchamp
 
         TypesDeChamp::PrefillTypeDeChamp.build(subchamp.type_de_champ, revision).to_assignable_attributes(subchamp, value)

From 4d8b4e078ba3bce5fbd591c4f2661341e23bca92 Mon Sep 17 00:00:00 2001
From: Martin <martin@sharypic.com>
Date: Wed, 22 Feb 2023 05:00:42 +0100
Subject: [PATCH 120/202] amelioration(a11y): extrait un nouveau composant pour
 rendre du texte saisi par un humain accessible

---
 Gemfile                                       |  1 +
 Gemfile.lock                                  |  2 +
 app/components/simple_format_component.rb     | 51 +++++++++++++
 .../simple_format_component.html.haml         |  1 +
 app/lib/redcarpet/bare_renderer.rb            | 21 ++++++
 .../simple_format_component_spec.rb           | 73 +++++++++++++++++++
 6 files changed, 149 insertions(+)
 create mode 100644 app/components/simple_format_component.rb
 create mode 100644 app/components/simple_format_component/simple_format_component.html.haml
 create mode 100644 app/lib/redcarpet/bare_renderer.rb
 create mode 100644 spec/components/simple_format_component_spec.rb

diff --git a/Gemfile b/Gemfile
index 3fcb4c749..214c8c5b0 100644
--- a/Gemfile
+++ b/Gemfile
@@ -70,6 +70,7 @@ gem 'rack-attack'
 gem 'rails'
 gem 'rails-i18n' # Locales par défaut
 gem 'rake-progressbar', require: false
+gem 'redcarpet'
 gem 'rexml' # add missing gem due to ruby3 (https://github.com/Shopify/bootsnap/issues/325)
 gem 'rgeo-geojson'
 gem 'rqrcode'
diff --git a/Gemfile.lock b/Gemfile.lock
index 02f1dc484..2f1796a89 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -573,6 +573,7 @@ GEM
     rb-fsevent (0.10.4)
     rb-inotify (0.10.1)
       ffi (~> 1.0)
+    redcarpet (3.6.0)
     regexp_parser (2.6.0)
     request_store (1.5.0)
       rack (>= 1.4)
@@ -909,6 +910,7 @@ DEPENDENCIES
   rails-erd
   rails-i18n
   rake-progressbar
+  redcarpet
   rexml
   rgeo-geojson
   rqrcode
diff --git a/app/components/simple_format_component.rb b/app/components/simple_format_component.rb
new file mode 100644
index 000000000..19a2d0e35
--- /dev/null
+++ b/app/components/simple_format_component.rb
@@ -0,0 +1,51 @@
+class SimpleFormatComponent < ApplicationComponent
+  # see: https://github.com/vmg/redcarpet#and-its-like-really-simple-to-use
+  REDCARPET_EXTENSIONS = {
+    no_intra_emphasis: false,
+    tables: false,
+    fenced_code_blocks: false,
+    autolink: false,
+    disable_indented_code_blocks: false,
+    strikethrough: false,
+    lax_spacing: false,
+    space_after_headers: false,
+    superscript: false,
+    underline: false,
+    highlight: false,
+    quote: false,
+    footnotes: false
+  }
+
+  # see: https://github.com/vmg/redcarpet#darling-i-packed-you-a-couple-renderers-for-lunch
+  REDCARPET_RENDERER_OPTS = {
+    no_images: true
+  }
+
+  def initialize(text, allow_a: true, class_names_map: {})
+    @text = (text || "").gsub(/\R/, "\n\n") # force double \n otherwise a single one won't split paragraph
+      .split("\n\n")  #
+      .map(&:lstrip)  # this block prevent redcarpet to consider "   text" as block code by lstriping
+      .join("\n\n")   #
+    @allow_a = allow_a
+    @renderer = Redcarpet::Markdown.new(
+      Redcarpet::BareRenderer.new(link_attributes: external_link_attributes, class_names_map: class_names_map),
+      REDCARPET_EXTENSIONS.merge(autolink: @allow_a)
+    )
+  end
+
+  def external_link_attributes
+    { target: '_blank', rel: 'noopener noreferrer' }
+  end
+
+  def tags
+    if @allow_a
+      Rails.configuration.action_view.sanitized_allowed_tags + ['a']
+    else
+      Rails.configuration.action_view.sanitized_allowed_tags
+    end
+  end
+
+  def attributes
+    ['target', 'rel', 'href', 'class']
+  end
+end
diff --git a/app/components/simple_format_component/simple_format_component.html.haml b/app/components/simple_format_component/simple_format_component.html.haml
new file mode 100644
index 000000000..61913e949
--- /dev/null
+++ b/app/components/simple_format_component/simple_format_component.html.haml
@@ -0,0 +1 @@
+= sanitize(@renderer.render(@text), tags:, attributes:)
diff --git a/app/lib/redcarpet/bare_renderer.rb b/app/lib/redcarpet/bare_renderer.rb
new file mode 100644
index 000000000..645570662
--- /dev/null
+++ b/app/lib/redcarpet/bare_renderer.rb
@@ -0,0 +1,21 @@
+module Redcarpet
+  class BareRenderer < Redcarpet::Render::HTML
+    include ActionView::Helpers::TagHelper
+
+    # won't use rubocop tag method because it is missing output buffer
+    # rubocop:disable Rails/ContentTag
+    def list(content, list_type)
+      tag = list_type == :ordered ? :ol : :ul
+      content_tag(tag, content, { class: @options[:class_names_map].fetch(:list) {} }, false)
+    end
+
+    def list_item(content, list_type)
+      content_tag(:li, content.strip.gsub(/<\/?p>/, ''), {}, false)
+    end
+
+    def paragraph(text)
+      content_tag(:p, text, { class: @options[:class_names_map].fetch(:paragraph) {} }, false)
+    end
+    # rubocop:enable Rails/ContentTag
+  end
+end
diff --git a/spec/components/simple_format_component_spec.rb b/spec/components/simple_format_component_spec.rb
new file mode 100644
index 000000000..3cc691718
--- /dev/null
+++ b/spec/components/simple_format_component_spec.rb
@@ -0,0 +1,73 @@
+describe SimpleFormatComponent, type: :component do
+  let(:allow_a) { false }
+  before { render_inline(described_class.new(text, allow_a: allow_a)) }
+
+  context 'one line' do
+    let(:text) do
+      "1er paragraphe"
+    end
+    it { expect(page).to have_selector("p", count: 1, text: text) }
+  end
+
+  context 'one with leading spaces' do
+    let(:text) do
+      <<-TEXT
+      1er paragraphe
+TEXT
+    end
+    it { expect(page).to have_selector("p", count: 1, text: text.strip) }
+  end
+
+  context 'two lines' do
+    let(:text) do
+      <<~TEXT
+        1er paragraphe
+        2eme paragraphe
+      TEXT
+    end
+
+    it { expect(page).to have_selector("p", count: 2) }
+    it { text.split("\n").map(&:strip).map { expect(page).to have_text(_1) } }
+  end
+
+  context 'unordered list items' do
+    let(:text) do
+      <<~TEXT
+        - 1er paragraphe
+        - paragraphe
+      TEXT
+    end
+
+    it { expect(page).to have_selector("ul", count: 1) }
+    it { expect(page).to have_selector("li", count: 2) }
+  end
+
+  context 'ordered list items' do
+    let(:text) do
+      <<~TEXT
+        1. 1er paragraphe
+        2. paragraphe
+      TEXT
+    end
+
+    it { expect(page).to have_selector("ol", count: 1) }
+    it { expect(page).to have_selector("li", count: 2) }
+  end
+
+  context 'auto-link' do
+    let(:text) do
+      <<~TEXT
+        bonjour https://www.demarches-simplifiees.fr
+      TEXT
+    end
+
+    context 'enabled' do
+      let(:allow_a) { true }
+      it { expect(page).to have_selector("a") }
+    end
+
+    context 'disabled' do
+      it { expect(page).not_to have_selector("a") }
+    end
+  end
+end

From 4fd799390b21214bb3d9027aae55f11a1ab7d4b6 Mon Sep 17 00:00:00 2001
From: Martin <martin@sharypic.com>
Date: Wed, 22 Feb 2023 05:59:10 +0100
Subject: [PATCH 121/202] correctif(a11y): #8107 (et d'autres), utilise le
 nouveau composant pour rendre les textes saisies par les admins accessible

---
 .../champ_label_component/champ_label_component.html.haml  | 2 +-
 .../editable_champ_component.html.haml                     | 2 +-
 .../explication_component/explication_component.html.haml  | 2 +-
 .../linked_drop_down_list_component.html.haml              | 2 +-
 app/views/shared/_procedure_description.html.haml          | 2 +-
 app/views/users/_procedure_footer.html.haml                | 7 +++----
 6 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/app/components/editable_champ/champ_label_component/champ_label_component.html.haml b/app/components/editable_champ/champ_label_component/champ_label_component.html.haml
index 1e5f85d2b..3bcd17000 100644
--- a/app/components/editable_champ/champ_label_component/champ_label_component.html.haml
+++ b/app/components/editable_champ/champ_label_component/champ_label_component.html.haml
@@ -7,4 +7,4 @@
     = render EditableChamp::ChampLabelContentComponent.new champ: @champ, seen_at: @seen_at
 
 - if @champ.description.present?
-  .notice{ id: @champ.describedby_id }= string_to_html(@champ.description, allow_a: true)
+  .notice{ id: @champ.describedby_id }= render SimpleFormatComponent.new(@champ.description, allow_a: true)
diff --git a/app/components/editable_champ/editable_champ_component/editable_champ_component.html.haml b/app/components/editable_champ/editable_champ_component/editable_champ_component.html.haml
index 081642438..8129db649 100644
--- a/app/components/editable_champ/editable_champ_component/editable_champ_component.html.haml
+++ b/app/components/editable_champ/editable_champ_component/editable_champ_component.html.haml
@@ -2,7 +2,7 @@
   - if @champ.block?
     %h3.header-subsection= @champ.libelle
     - if @champ.description.present?
-      %p.notice= string_to_html(@champ.description, false, allow_a: true)
+      .notice= render SimpleFormatComponent.new(@champ.description, allow_a: true)
 
   - elsif has_label?(@champ)
     = render EditableChamp::ChampLabelComponent.new form: @form, champ: @champ, seen_at: @seen_at
diff --git a/app/components/editable_champ/explication_component/explication_component.html.haml b/app/components/editable_champ/explication_component/explication_component.html.haml
index 7e4822b3c..885955327 100644
--- a/app/components/editable_champ/explication_component/explication_component.html.haml
+++ b/app/components/editable_champ/explication_component/explication_component.html.haml
@@ -1,7 +1,7 @@
 = render Dsfr::CalloutComponent.new(title: @champ.libelle, extra_class_names: ['fr-mb-2w', 'fr-callout--blue-cumulus']) do |c|
   - c.with_body do
 
-    = string_to_html(@champ.description, allow_a: true)
+    = render SimpleFormatComponent.new(@champ.description, allow_a: true)
 
     - if @champ.collapsible_explanation_enabled? && @champ.collapsible_explanation_text.present?
       %div
diff --git a/app/components/editable_champ/linked_drop_down_list_component/linked_drop_down_list_component.html.haml b/app/components/editable_champ/linked_drop_down_list_component/linked_drop_down_list_component.html.haml
index cf451f3b0..75f82dd03 100644
--- a/app/components/editable_champ/linked_drop_down_list_component/linked_drop_down_list_component.html.haml
+++ b/app/components/editable_champ/linked_drop_down_list_component/linked_drop_down_list_component.html.haml
@@ -8,7 +8,7 @@
     = @form.label :secondary_value, for: "#{@champ.input_id}-secondary" do
       - sanitize((@champ.drop_down_secondary_libelle.presence || "Valeur secondaire dépendant de la première") + (@champ.type_de_champ.mandatory? ? tag.span(' *', class: 'mandatory') : ''))
     - if @champ.drop_down_secondary_description.present?
-      .notice{ id: "#{@champ.describedby_id}-secondary" }= string_to_html(@champ.drop_down_secondary_description, allow_a: true)
+      .notice{ id: "#{@champ.describedby_id}-secondary" }= render SimpleFormatComponent.new(@champ.drop_down_secondary_description, allow_a: true)
     = @form.select :secondary_value,
       @champ.secondary_options[@champ.primary_value],
       {},
diff --git a/app/views/shared/_procedure_description.html.haml b/app/views/shared/_procedure_description.html.haml
index 6500210d7..8e2af15c9 100644
--- a/app/views/shared/_procedure_description.html.haml
+++ b/app/views/shared/_procedure_description.html.haml
@@ -23,5 +23,5 @@
 
 .procedure-description
   .procedure-description-body.read-more-enabled.read-more-collapsed{ tabindex: "0", role: "region", "aria-label": t('views.users.dossiers.identite.description') }
-    = h string_to_html(procedure.description, allow_a: true)
+    = h render SimpleFormatComponent.new(procedure.description, allow_a: true)
   = button_tag "Afficher la description complète", class: 'button read-more-button'
diff --git a/app/views/users/_procedure_footer.html.haml b/app/views/users/_procedure_footer.html.haml
index cda5f0b6d..5ecb8240e 100644
--- a/app/views/users/_procedure_footer.html.haml
+++ b/app/views/users/_procedure_footer.html.haml
@@ -67,10 +67,9 @@
         .fr-footer__content
           %p.fr-footer__content-desc
             = I18n.t('users.procedure_footer.managed_by.header')
-            %span{ lang: :fr }
-              = "#{service.nom},"
-              = "#{service.organisme},"
-              = string_to_html(service.adresse, 'span')
+            %div{ lang: :fr }
+              %p= "#{service.nom}, #{service.organisme},"
+              = render SimpleFormatComponent.new(service.adresse)
           = render partial: "shared/footer_content_list"
 
     .fr-footer__bottom

From c8e9b2f008c5171661c7db01f9b313c132e6929f Mon Sep 17 00:00:00 2001
From: Martin <martin@sharypic.com>
Date: Wed, 22 Feb 2023 09:09:07 +0100
Subject: [PATCH 122/202] correctif(a11y): #8105, pour les callout, utilise un
 div wrappant du contenu html

---
 app/components/dsfr/callout_component.rb           |  1 +
 .../callout_component/callout_component.html.haml  |  5 ++++-
 .../explication_component.html.haml                |  2 +-
 app/views/instructeurs/dossiers/show.html.haml     | 14 +++++++-------
 .../_json_description.html.haml                    |  4 ++--
 .../prefill_descriptions/_prefill_link.html.haml   |  4 ++--
 .../prefill_descriptions/_prefill_query.html.haml  |  4 ++--
 7 files changed, 19 insertions(+), 15 deletions(-)

diff --git a/app/components/dsfr/callout_component.rb b/app/components/dsfr/callout_component.rb
index 6a4e83c57..a84a67c03 100644
--- a/app/components/dsfr/callout_component.rb
+++ b/app/components/dsfr/callout_component.rb
@@ -1,6 +1,7 @@
 # see: https://www.systeme-de-design.gouv.fr/elements-d-interface/composants/mise-en-avant
 class Dsfr::CalloutComponent < ApplicationComponent
   renders_one :body
+  renders_one :html_body
   renders_one :bottom
 
   attr_reader :title, :theme, :icon, :extra_class_names
diff --git a/app/components/dsfr/callout_component/callout_component.html.haml b/app/components/dsfr/callout_component/callout_component.html.haml
index ced897a95..8cb47f83a 100644
--- a/app/components/dsfr/callout_component/callout_component.html.haml
+++ b/app/components/dsfr/callout_component/callout_component.html.haml
@@ -1,5 +1,8 @@
 %div{ class: callout_class }
   - if title.present?
     %h3.fr-callout__title= title
-  %p.fr-callout__text= body
+  - if html_body?
+    .fr-callout__text= html_body
+  - if body?
+    %p.fr-callout__text= body
   = bottom
diff --git a/app/components/editable_champ/explication_component/explication_component.html.haml b/app/components/editable_champ/explication_component/explication_component.html.haml
index 885955327..c40e853cf 100644
--- a/app/components/editable_champ/explication_component/explication_component.html.haml
+++ b/app/components/editable_champ/explication_component/explication_component.html.haml
@@ -1,5 +1,5 @@
 = render Dsfr::CalloutComponent.new(title: @champ.libelle, extra_class_names: ['fr-mb-2w', 'fr-callout--blue-cumulus']) do |c|
-  - c.with_body do
+  - c.with_html_body do
 
     = render SimpleFormatComponent.new(@champ.description, allow_a: true)
 
diff --git a/app/views/instructeurs/dossiers/show.html.haml b/app/views/instructeurs/dossiers/show.html.haml
index 8dd1a8d91..cbb8f7833 100644
--- a/app/views/instructeurs/dossiers/show.html.haml
+++ b/app/views/instructeurs/dossiers/show.html.haml
@@ -6,12 +6,12 @@
 - if @dossier.etablissement&.as_degraded_mode?
   .container
     = render Dsfr::CalloutComponent.new(title: "Données de l’entreprise non vérifiées", theme: :warning, icon: "fr-icon-feedback-fill") do |c|
-      - c.with_body do
-        Les services de l’INSEE sont indisponibles, nous ne pouvons pas
-        vérifier les informations liées à l’établissement de ce dossier.
-        %strong Il n’est pas possible d’accepter ou de refuser un dossier sans cette étape.
-        %br
-        %br
-        Les informations sur l'entreprise arriveront d’ici quelques heures.
+      - c.with_html_body do
+        %p
+          Les services de l’INSEE sont indisponibles, nous ne pouvons pas vérifier les informations liées à l’établissement de ce dossier.
+          %strong
+            Il n’est pas possible d’accepter ou de refuser un dossier sans cette étape.
+        %p
+          Les informations sur l'entreprise arriveront d’ici quelques heures.
 
 = render partial: "shared/dossiers/demande", locals: { dossier: @dossier, demande_seen_at: @demande_seen_at, profile: 'instructeur' }
diff --git a/app/views/prefill_descriptions/_json_description.html.haml b/app/views/prefill_descriptions/_json_description.html.haml
index ea759d362..f153e3aaa 100644
--- a/app/views/prefill_descriptions/_json_description.html.haml
+++ b/app/views/prefill_descriptions/_json_description.html.haml
@@ -1,6 +1,6 @@
 = render Dsfr::CalloutComponent.new(title: t("views.prefill_descriptions.edit.json_description_title"), theme: :success, icon: "fr-icon-layout-grid-fill") do |c|
-  - c.with_body do
-    = t("views.prefill_descriptions.edit.json_description_info")
+  - c.with_html_body do
+    %p= t("views.prefill_descriptions.edit.json_description_info")
     %pre
       %code.code-block
         = prefill_json_description_url(procedure.path)
diff --git a/app/views/prefill_descriptions/_prefill_link.html.haml b/app/views/prefill_descriptions/_prefill_link.html.haml
index 07a0f2811..0e7d097fd 100644
--- a/app/views/prefill_descriptions/_prefill_link.html.haml
+++ b/app/views/prefill_descriptions/_prefill_link.html.haml
@@ -5,8 +5,8 @@
 
   - if prefill_description.prefilled_champs.any?
     = render Dsfr::CalloutComponent.new(title: t("views.prefill_descriptions.edit.prefill_link_title"), theme: theme, icon: icon) do |c|
-      - c.with_body do
-        = body
+      - c.with_html_body do
+        %p= body
         %pre
           %code.code-block
             = prefill_description.prefill_link
diff --git a/app/views/prefill_descriptions/_prefill_query.html.haml b/app/views/prefill_descriptions/_prefill_query.html.haml
index 180ff7e15..a767cb87d 100644
--- a/app/views/prefill_descriptions/_prefill_query.html.haml
+++ b/app/views/prefill_descriptions/_prefill_query.html.haml
@@ -3,8 +3,8 @@
   - if prefill_description.prefilled_champs.any?
 
     = render Dsfr::CalloutComponent.new(title: t("views.prefill_descriptions.edit.prefill_query_title"), theme: :success, icon: "fr-icon-code-box-fill") do |c|
-      - c.with_body do
-        = t("views.prefill_descriptions.edit.prefill_query_info")
+      - c.with_html_body do
+        %p= t("views.prefill_descriptions.edit.prefill_query_info")
         %pre
           %code.code-block
             = prefill_description.prefill_query

From 571268dd77043f43696ea95d49c6a2673624f88e Mon Sep 17 00:00:00 2001
From: Martin <martin@sharypic.com>
Date: Wed, 22 Feb 2023 09:29:40 +0100
Subject: [PATCH 123/202] correctif(a11y): #8168, ajout d'une option pour
 forcer l'usage d'une classe en fonction dy type de balise rendu par
 SimpleFormatComponent

---
 app/views/users/_procedure_footer.html.haml | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/app/views/users/_procedure_footer.html.haml b/app/views/users/_procedure_footer.html.haml
index 5ecb8240e..fa724e444 100644
--- a/app/views/users/_procedure_footer.html.haml
+++ b/app/views/users/_procedure_footer.html.haml
@@ -65,12 +65,13 @@
 
       - if service.present?
         .fr-footer__content
+
           %p.fr-footer__content-desc
             = I18n.t('users.procedure_footer.managed_by.header')
-            %div{ lang: :fr }
-              %p= "#{service.nom}, #{service.organisme},"
-              = render SimpleFormatComponent.new(service.adresse)
-          = render partial: "shared/footer_content_list"
+            %span{ lang: :fr }= "#{service.nom}, #{service.organisme},"
+          %div{ lang: :fr }
+            = render SimpleFormatComponent.new(service.adresse, class_names_map: {paragraph: 'fr-footer__content-desc'})
+            = render partial: "shared/footer_content_list"
 
     .fr-footer__bottom
       = render partial: 'users/general_footer_row', locals: { dossier: dossier }

From a68d89b183b48506de32c603b42eb5ba66b2a390 Mon Sep 17 00:00:00 2001
From: Martin <martin@sharypic.com>
Date: Wed, 22 Feb 2023 11:00:32 +0100
Subject: [PATCH 124/202] correctif(a11y): #8168, dans le footer d'une
 procedure, ne pas afficher pas la list-item horaire/telephone si les deux
 sont vides. Sinon afficher uniquement les informations disponibles

---
 app/views/users/_procedure_footer.html.haml | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

diff --git a/app/views/users/_procedure_footer.html.haml b/app/views/users/_procedure_footer.html.haml
index fa724e444..6f6f4a89f 100644
--- a/app/views/users/_procedure_footer.html.haml
+++ b/app/views/users/_procedure_footer.html.haml
@@ -12,13 +12,16 @@
             - elsif service.present?
               %li
                 = link_to I18n.t('users.procedure_footer.contact.email.link', service_email: service.email), "mailto:#{service.email}", class: 'fr-footer__top-link'
-              %li
-                - horaires = "#{I18n.t('users.procedure_footer.contact.schedule.prefix')}#{formatted_horaires(service.horaires)}"
-                = link_to service.telephone_url, class: 'fr-footer__top-link' do
-                  %p
-                    = I18n.t('users.procedure_footer.contact.phone.link', service_telephone: service.telephone)
-                  %p
-                    = horaires
+              - if service.telephone.present? || service.horaires.present?
+                %li
+                  - horaires = "#{I18n.t('users.procedure_footer.contact.schedule.prefix')}#{formatted_horaires(service.horaires)}"
+                  - if service.telephone.present?
+                    = link_to service.telephone_url, class: 'fr-footer__top-link' do
+                      %p
+                        = I18n.t('users.procedure_footer.contact.phone.link', service_telephone: service.telephone)
+                  - if service.horaires.present?
+                    %p
+                      = horaires
               %li
                 = link_to I18n.t('users.procedure_footer.contact.stats.link'), statistiques_path(procedure.path), class: 'fr-footer__top-link', rel: 'noopener'
 

From fd203f5bb7ceb216917fe6f77fb616c6e7495d3d Mon Sep 17 00:00:00 2001
From: Martin <martin@sharypic.com>
Date: Wed, 22 Feb 2023 11:10:09 +0100
Subject: [PATCH 125/202] correctif(a11y): #8105 format les messages de la
 messageries avec la nouvelle methode pour rendre les textes saisies par les
 admin et les instructeurs

---
 app/components/dossiers/message_component.rb             | 9 ---------
 .../message_component/message_component.html.haml        | 9 ++++++++-
 2 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/app/components/dossiers/message_component.rb b/app/components/dossiers/message_component.rb
index 1dceaf4ff..16244c2a6 100644
--- a/app/components/dossiers/message_component.rb
+++ b/app/components/dossiers/message_component.rb
@@ -55,15 +55,6 @@ class Dossiers::MessageComponent < ApplicationComponent
     l(commentaire.created_at, format: is_current_year ? :message_date : :message_date_with_year)
   end
 
-  def commentaire_body
-    if commentaire.discarded?
-      t('.deleted_body')
-    else
-      body_formatted = commentaire.sent_by_system? ? commentaire.body : simple_format(commentaire.body)
-      sanitize(body_formatted, commentaire.sent_by_system? ? { scrubber: Sanitizers::MailScrubber.new } : {})
-    end
-  end
-
   def highlight?
     commentaire.created_at.present? && @messagerie_seen_at&.<(commentaire.created_at)
   end
diff --git a/app/components/dossiers/message_component/message_component.html.haml b/app/components/dossiers/message_component/message_component.html.haml
index 1a95635cc..2785815a2 100644
--- a/app/components/dossiers/message_component/message_component.html.haml
+++ b/app/components/dossiers/message_component/message_component.html.haml
@@ -8,7 +8,14 @@
       %span.fr-text--xs.fr-text-mention--grey.font-weight-normal= t('.guest')
     %span.date{ class: ["fr-text--xs", "fr-text-mention--grey", "font-weight-normal", highlight_if_unseen_class], data: scroll_to_target }
       = commentaire_date
-  .rich-text= commentaire_body
+  .rich-text
+    - if commentaire.discarded?
+      %p= t('.deleted_body')
+    - elsif commentaire.sent_by_system?
+      = sanitize(commentaire.body, scrubber: Sanitizers::MailScrubber.new)
+    - else
+      = render SimpleFormatComponent.new(commentaire.body, allow_a: false)
+
 
   .message-extras.flex.justify-start
     - if commentaire.soft_deletable?(connected_user)

From 8a44e6a03cb0cdfacc4c1fecffcc503235d2f2de Mon Sep 17 00:00:00 2001
From: Martin <martin@sharypic.com>
Date: Wed, 22 Feb 2023 11:19:24 +0100
Subject: [PATCH 126/202] =?UTF-8?q?correctif(a11y):=20#8179,=20quand=20la?=
 =?UTF-8?q?=20messagerie=20est=20desactiv=C3=A9e.=20supprime=20les=20br=20?=
 =?UTF-8?q?et=20utilise=20le=20nouveau=20mode=20de=20rendu=20pour=20affich?=
 =?UTF-8?q?er=20les=20horaires=20saisies=20par=20l'administration?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../dossiers/messages/_messagerie_disabled.html.haml      | 8 ++++----
 app/views/users/_procedure_footer.html.haml               | 6 +++---
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/app/views/shared/dossiers/messages/_messagerie_disabled.html.haml b/app/views/shared/dossiers/messages/_messagerie_disabled.html.haml
index d840ecda6..73ec38500 100644
--- a/app/views/shared/dossiers/messages/_messagerie_disabled.html.haml
+++ b/app/views/shared/dossiers/messages/_messagerie_disabled.html.haml
@@ -6,11 +6,11 @@
       Pour poser une question sur ce dossier, contactez :
     %p
       = service.nom
-      %br
+    %p
       = service.organisme
-      %br
-      - horaires = "Horaires : #{formatted_horaires(service.horaires)}"
-      = simple_format(horaires)
+
+    - if service.horaires.present?
+      = render SimpleFormatComponent.new("Horaires : #{formatted_horaires(service.horaires)}")
     %p
       = mail_to service.email,
         service.email,
diff --git a/app/views/users/_procedure_footer.html.haml b/app/views/users/_procedure_footer.html.haml
index 6f6f4a89f..03c5166f8 100644
--- a/app/views/users/_procedure_footer.html.haml
+++ b/app/views/users/_procedure_footer.html.haml
@@ -19,9 +19,9 @@
                     = link_to service.telephone_url, class: 'fr-footer__top-link' do
                       %p
                         = I18n.t('users.procedure_footer.contact.phone.link', service_telephone: service.telephone)
-                  - if service.horaires.present?
-                    %p
-                      = horaires
+                      - if service.horaires.present?
+                        %p
+                          = horaires
               %li
                 = link_to I18n.t('users.procedure_footer.contact.stats.link'), statistiques_path(procedure.path), class: 'fr-footer__top-link', rel: 'noopener'
 

From c00c4936b217d8f278a2f06e9d64cc904eba70f9 Mon Sep 17 00:00:00 2001
From: Martin <martin@sharypic.com>
Date: Wed, 22 Feb 2023 11:47:58 +0100
Subject: [PATCH 127/202] correctif(a11y): traite aussi les avis d'expert avec
 la nouvelle methode de rendu des textes saisis par des
 admin/instructeur/expert

---
 app/views/experts/shared/avis/_list.html.haml             | 2 +-
 app/views/instructeurs/shared/avis/_list.html.haml        | 2 +-
 spec/system/instructeurs/expert_spec.rb                   | 2 +-
 spec/views/instructeur/shared/avis/list.html.haml_spec.rb | 4 +++-
 4 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/app/views/experts/shared/avis/_list.html.haml b/app/views/experts/shared/avis/_list.html.haml
index 4834a7fe7..a2436d926 100644
--- a/app/views/experts/shared/avis/_list.html.haml
+++ b/app/views/experts/shared/avis/_list.html.haml
@@ -35,4 +35,4 @@
               - if avis.piece_justificative_file.attached?
                 = render Attachment::ShowComponent.new(attachment: avis.piece_justificative_file.attachment)
               .answer-body
-                = simple_format(avis.answer)
+                = render SimpleFormatComponent.new(avis.answer, allow_a: false)
diff --git a/app/views/instructeurs/shared/avis/_list.html.haml b/app/views/instructeurs/shared/avis/_list.html.haml
index 2ed87cfbe..9d66b8d2d 100644
--- a/app/views/instructeurs/shared/avis/_list.html.haml
+++ b/app/views/instructeurs/shared/avis/_list.html.haml
@@ -51,4 +51,4 @@
               - if avis.piece_justificative_file.attached?
                 = render Attachment::ShowComponent.new(attachment: avis.piece_justificative_file.attachment)
               .answer-body
-                = simple_format(avis.answer)
+                = render SimpleFormatComponent.new(avis.answer, allow_a: false)
diff --git a/spec/system/instructeurs/expert_spec.rb b/spec/system/instructeurs/expert_spec.rb
index 9b4994a44..a2c0f64f8 100644
--- a/spec/system/instructeurs/expert_spec.rb
+++ b/spec/system/instructeurs/expert_spec.rb
@@ -63,7 +63,7 @@ describe 'Inviting an expert:', js: true do
         click_on 'Avis externes'
 
         expect(page).to have_content(answered_avis.expert.email)
-        answered_avis.answer.split("\n").each do |answer_line|
+        answered_avis.answer.split("\n").map { |line| line.gsub("- ", "") }.map do |answer_line|
           expect(page).to have_content(answer_line)
         end
       end
diff --git a/spec/views/instructeur/shared/avis/list.html.haml_spec.rb b/spec/views/instructeur/shared/avis/list.html.haml_spec.rb
index 30dbd6cc0..a92696ffa 100644
--- a/spec/views/instructeur/shared/avis/list.html.haml_spec.rb
+++ b/spec/views/instructeur/shared/avis/list.html.haml_spec.rb
@@ -26,7 +26,9 @@ describe 'instructeurs/shared/avis/_list.html.haml', type: :view do
     let(:avis) { [create(:avis, :with_answer, claimant: instructeur, experts_procedure: experts_procedure)] }
 
     it 'renders the answer formatted with newlines' do
-      expect(subject).to include(simple_format(avis.first.answer))
+      expect(subject).to have_selector(".answer-body p", text: avis.first.answer.split("\n").first)
+      expect(subject).to have_selector(".answer-body ul", count: 1) # avis.answer has two list item
+      expect(subject).to have_selector(".answer-body ul li", count: 2)
     end
   end
 

From a584279020bcba4d596623d7fcee30a2a49868c6 Mon Sep 17 00:00:00 2001
From: Martin <martin@sharypic.com>
Date: Wed, 22 Feb 2023 10:54:22 +0100
Subject: [PATCH 128/202] chore(deadcode): drop deadcode

---
 app/assets/stylesheets/procedure_context.scss | 13 -----
 .../editable_champ/champ_label_component.rb   |  2 -
 .../editable_champ_component.rb               |  2 -
 .../editable_champ/explication_component.rb   |  1 -
 .../linked_drop_down_list_component.rb        |  1 -
 app/helpers/string_to_html_helper.rb          | 15 ------
 spec/helpers/string_to_html_helper_spec.rb    | 49 -------------------
 7 files changed, 83 deletions(-)
 delete mode 100644 app/helpers/string_to_html_helper.rb
 delete mode 100644 spec/helpers/string_to_html_helper_spec.rb

diff --git a/app/assets/stylesheets/procedure_context.scss b/app/assets/stylesheets/procedure_context.scss
index e2f220fd3..109724fab 100644
--- a/app/assets/stylesheets/procedure_context.scss
+++ b/app/assets/stylesheets/procedure_context.scss
@@ -5,8 +5,6 @@ $procedure-context-breakpoint: $two-columns-breakpoint;
 $procedure-description-line-height: 22px;
 
 .procedure-preview {
-  font-size: 24px;
-
   .paperless-logo {
     width: 100%;
     margin-bottom: 60px;
@@ -74,17 +72,6 @@ $procedure-description-line-height: 22px;
     border-bottom: 1px dotted $blue-france-500;
   }
 
-  .procedure-description {
-    font-size: 16px;
-
-    p:not(:last-of-type) {
-      // Space the paragraphs by exactly one line height,
-      // so that the text always is truncated in the middle of a line,
-      // regarless of the number of paragraphs.
-      margin-bottom: 3 * $default-spacer;
-    }
-  }
-
   .read-more-button {
     display: none;
   }
diff --git a/app/components/editable_champ/champ_label_component.rb b/app/components/editable_champ/champ_label_component.rb
index 3f8f8abf9..de0a6fea3 100644
--- a/app/components/editable_champ/champ_label_component.rb
+++ b/app/components/editable_champ/champ_label_component.rb
@@ -1,6 +1,4 @@
 class EditableChamp::ChampLabelComponent < ApplicationComponent
-  include StringToHtmlHelper
-
   def initialize(form:, champ:, seen_at: nil)
     @form, @champ, @seen_at = form, champ, seen_at
   end
diff --git a/app/components/editable_champ/editable_champ_component.rb b/app/components/editable_champ/editable_champ_component.rb
index e74be2967..2b9391104 100644
--- a/app/components/editable_champ/editable_champ_component.rb
+++ b/app/components/editable_champ/editable_champ_component.rb
@@ -1,6 +1,4 @@
 class EditableChamp::EditableChampComponent < ApplicationComponent
-  include StringToHtmlHelper
-
   def initialize(form:, champ:, seen_at: nil)
     @form, @champ, @seen_at = form, champ, seen_at
   end
diff --git a/app/components/editable_champ/explication_component.rb b/app/components/editable_champ/explication_component.rb
index f3173419d..8958b0985 100644
--- a/app/components/editable_champ/explication_component.rb
+++ b/app/components/editable_champ/explication_component.rb
@@ -1,3 +1,2 @@
 class EditableChamp::ExplicationComponent < EditableChamp::EditableChampBaseComponent
-  include StringToHtmlHelper
 end
diff --git a/app/components/editable_champ/linked_drop_down_list_component.rb b/app/components/editable_champ/linked_drop_down_list_component.rb
index e31d49b44..a8d5a89a0 100644
--- a/app/components/editable_champ/linked_drop_down_list_component.rb
+++ b/app/components/editable_champ/linked_drop_down_list_component.rb
@@ -1,3 +1,2 @@
 class EditableChamp::LinkedDropDownListComponent < EditableChamp::EditableChampBaseComponent
-  include StringToHtmlHelper
 end
diff --git a/app/helpers/string_to_html_helper.rb b/app/helpers/string_to_html_helper.rb
deleted file mode 100644
index d41c8300a..000000000
--- a/app/helpers/string_to_html_helper.rb
+++ /dev/null
@@ -1,15 +0,0 @@
-module StringToHtmlHelper
-  def string_to_html(str, wrapper_tag = 'p', allow_a: false)
-    return nil if str.blank?
-    html_formatted = simple_format(str, {}, { wrapper_tag: wrapper_tag })
-    with_links = Anchored::Linker.auto_link(html_formatted, target: '_blank', rel: 'noopener')
-
-    tags = if allow_a
-      Rails.configuration.action_view.sanitized_allowed_tags + ['a']
-    else
-      Rails.configuration.action_view.sanitized_allowed_tags
-    end
-
-    sanitize(with_links, tags:, attributes: ['target', 'rel', 'href'])
-  end
-end
diff --git a/spec/helpers/string_to_html_helper_spec.rb b/spec/helpers/string_to_html_helper_spec.rb
deleted file mode 100644
index 513fdf75c..000000000
--- a/spec/helpers/string_to_html_helper_spec.rb
+++ /dev/null
@@ -1,49 +0,0 @@
-RSpec.describe StringToHtmlHelper, type: :helper do
-  describe "#string_to_html" do
-    let(:allow_a) { false }
-    subject { string_to_html(description, allow_a:) }
-
-    context "with some simple texte" do
-      let(:description) { "1er ligne \n 2ieme ligne" }
-
-      it { is_expected.to eq("<p>1er ligne \n<br> 2ieme ligne</p>") }
-    end
-
-    context "with a link" do
-      context "using an authorized scheme" do
-        let(:description) { "Cliquez sur https://d-s.fr pour continuer." }
-
-        context 'with a tag authorized' do
-          let(:allow_a) { true }
-          it { is_expected.to eq("<p>Cliquez sur <a href=\"https://d-s.fr\" target=\"_blank\" rel=\"noopener\">https://d-s.fr</a> pour continuer.</p>") }
-        end
-
-        context 'without a tag' do
-          it { is_expected.to eq("<p>Cliquez sur https://d-s.fr pour continuer.</p>") }
-        end
-      end
-
-      context "using a non-authorized scheme" do
-        let(:description) { "Cliquez sur file://etc/password pour continuer." }
-        it { is_expected.to eq("<p>Cliquez sur file://etc/password pour continuer.</p>") }
-      end
-
-      context "not actually an URL" do
-        let(:description) { "Pour info: il ne devrait y avoir aucun lien." }
-        it { is_expected.to eq("<p>Pour info: il ne devrait y avoir aucun lien.</p>") }
-      end
-    end
-
-    context "with empty decription" do
-      let(:description) { nil }
-
-      it { is_expected.to eq nil }
-    end
-
-    context "with a bad script" do
-      let(:description) { '<script>bad</script>' }
-
-      it { is_expected.to eq('<p>bad</p>') }
-    end
-  end
-end

From 38fa7a44c3d49ea64a03c854028fc4c5c2d17747 Mon Sep 17 00:00:00 2001
From: Christophe Robillard <christophe.robillard@beta.gouv.fr>
Date: Thu, 23 Feb 2023 15:46:54 +0100
Subject: [PATCH 129/202] publish opendata demarches only if they are publiees
 or closes

---
 app/graphql/types/query_type.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/graphql/types/query_type.rb b/app/graphql/types/query_type.rb
index a070ec088..ff36e4f85 100644
--- a/app/graphql/types/query_type.rb
+++ b/app/graphql/types/query_type.rb
@@ -19,7 +19,7 @@ module Types
     field :demarches_publiques, DemarcheDescriptorType.connection_type, null: false, internal: true
 
     def demarches_publiques
-      Procedure.opendata.includes(draft_revision: :procedure, published_revision: :procedure)
+      Procedure.publiees_ou_closes.opendata.includes(draft_revision: :procedure, published_revision: :procedure)
     end
 
     def demarche_descriptor(demarche:)

From eb3039aeca8d989395f3265d54c9148ed71009f9 Mon Sep 17 00:00:00 2001
From: Paul Chavard <pro@paul.chavard.net>
Date: Thu, 23 Feb 2023 13:13:01 +0100
Subject: [PATCH 130/202] fix(demarche): exclude preview and deleted dossiers
 from stats

---
 .../concerns/procedure_stats_concern.rb       | 20 +++++++++++--------
 app/models/dossier.rb                         |  3 +++
 app/models/traitement.rb                      |  2 +-
 .../concern/procedure_stats_concern_spec.rb   | 10 ++++++----
 4 files changed, 22 insertions(+), 13 deletions(-)

diff --git a/app/models/concerns/procedure_stats_concern.rb b/app/models/concerns/procedure_stats_concern.rb
index 63960833c..74e7a12fa 100644
--- a/app/models/concerns/procedure_stats_concern.rb
+++ b/app/models/concerns/procedure_stats_concern.rb
@@ -22,21 +22,20 @@ module ProcedureStatsConcern
   def stats_dossiers_funnel
     Rails.cache.fetch("#{cache_key_with_version}/stats_dossiers_funnel", expires_in: 12.hours) do
       [
-        ['Démarrés', dossiers.count],
-        ['Déposés', dossiers.state_not_brouillon.count],
-        ['Instruction débutée', dossiers.state_instruction_commencee.count],
-        ['Traités', dossiers.state_termine.count]
+        ['Démarrés', dossiers.visible_by_user_or_administration.count],
+        ['Déposés', dossiers.visible_by_administration.count],
+        ['Instruction débutée', dossiers.visible_by_administration.state_instruction_commencee.count],
+        ['Traités', nb_dossiers_termines]
       ]
     end
   end
 
   def stats_termines_states
-    nb_dossiers_termines = dossiers.state_termine.count
     Rails.cache.fetch("#{cache_key_with_version}/stats_termines_states", expires_in: 12.hours) do
       [
-        ['Acceptés', percentage(dossiers.where(state: :accepte).count, nb_dossiers_termines)],
-        ['Refusés', percentage(dossiers.where(state: :refuse).count, nb_dossiers_termines)],
-        ['Classés sans suite', percentage(dossiers.where(state: :sans_suite).count, nb_dossiers_termines)]
+        ['Acceptés', percentage(dossiers.visible_by_administration.state_accepte.count, nb_dossiers_termines)],
+        ['Refusés', percentage(dossiers.visible_by_administration.state_refuse.count, nb_dossiers_termines)],
+        ['Classés sans suite', percentage(dossiers.visible_by_administration.state_sans_suite.count, nb_dossiers_termines)]
       ]
     end
   end
@@ -45,6 +44,7 @@ module ProcedureStatsConcern
     Rails.cache.fetch("#{cache_key_with_version}/stats_termines_by_week", expires_in: 12.hours) do
       now = Time.zone.now
       chart_data = dossiers.includes(:traitements)
+        .visible_by_administration
         .state_termine
         .where(traitements: { processed_at: (now.beginning_of_week - 6.months)..now.end_of_week })
 
@@ -95,6 +95,10 @@ module ProcedureStatsConcern
 
   private
 
+  def nb_dossiers_termines
+    @nb_dossiers_termines ||= dossiers.visible_by_administration.state_termine.count
+  end
+
   def first_processed_at
     Traitement.for_traitement_time_stats(self).pick(:processed_at)
   end
diff --git a/app/models/dossier.rb b/app/models/dossier.rb
index 020b5ff38..92c2ea403 100644
--- a/app/models/dossier.rb
+++ b/app/models/dossier.rb
@@ -224,6 +224,9 @@ class Dossier < ApplicationRecord
   scope :state_instruction_commencee,          -> { where(state: INSTRUCTION_COMMENCEE) }
   scope :state_termine,                        -> { where(state: TERMINE) }
   scope :state_not_termine,                    -> { where.not(state: TERMINE) }
+  scope :state_accepte,                        -> { where(state: states.fetch(:accepte)) }
+  scope :state_refuse,                         -> { where(state: states.fetch(:refuse)) }
+  scope :state_sans_suite,                     -> { where(state: states.fetch(:sans_suite)) }
 
   scope :archived,                  -> { where(archived: true) }
   scope :not_archived,              -> { where(archived: false) }
diff --git a/app/models/traitement.rb b/app/models/traitement.rb
index a4f882810..459eb3247 100644
--- a/app/models/traitement.rb
+++ b/app/models/traitement.rb
@@ -21,7 +21,7 @@ class Traitement < ApplicationRecord
   scope :for_traitement_time_stats, -> (procedure) do
     includes(:dossier)
       .termine
-      .where(dossier: procedure.dossiers)
+      .where(dossier: procedure.dossiers.visible_by_administration)
       .where.not('dossiers.depose_at' => nil, processed_at: nil)
       .order(:processed_at)
   end
diff --git a/spec/models/concern/procedure_stats_concern_spec.rb b/spec/models/concern/procedure_stats_concern_spec.rb
index 553b1c46c..9ab68e1e8 100644
--- a/spec/models/concern/procedure_stats_concern_spec.rb
+++ b/spec/models/concern/procedure_stats_concern_spec.rb
@@ -7,15 +7,17 @@ describe ProcedureStatsConcern do
     before do
       create_list(:dossier, 2, :brouillon, procedure: procedure)
       create(:dossier, :en_instruction, procedure: procedure)
+      create(:dossier, procedure: procedure, for_procedure_preview: true)
+      create(:dossier, :accepte, procedure: procedure, hidden_by_administration_at: Time.zone.now)
     end
 
     it "returns the funnel stats" do
       expect(stats_dossiers_funnel).to match(
         [
-          ['Démarrés', procedure.dossiers.count],
-          ['Déposés', procedure.dossiers.state_not_brouillon.count],
-          ['Instruction débutée', procedure.dossiers.state_instruction_commencee.count],
-          ['Traités', procedure.dossiers.state_termine.count]
+          ['Démarrés', procedure.dossiers.visible_by_user_or_administration.count],
+          ['Déposés', procedure.dossiers.visible_by_administration.count],
+          ['Instruction débutée', procedure.dossiers.visible_by_administration.state_instruction_commencee.count],
+          ['Traités', procedure.dossiers.visible_by_administration.state_termine.count]
         ]
       )
     end

From 21f47dcb0185d2fd2b6281d0b3c04bd8c3c7b799 Mon Sep 17 00:00:00 2001
From: Paul Chavard <pro@paul.chavard.net>
Date: Thu, 23 Feb 2023 17:14:25 +0100
Subject: [PATCH 131/202] feat(procedure): include deleted dossiers in stats

---
 app/models/concerns/procedure_stats_concern.rb | 12 ++++++++----
 app/models/deleted_dossier.rb                  |  9 +++++++++
 app/models/stat.rb                             |  9 ++++-----
 spec/models/stat_spec.rb                       |  7 +++----
 4 files changed, 24 insertions(+), 13 deletions(-)

diff --git a/app/models/concerns/procedure_stats_concern.rb b/app/models/concerns/procedure_stats_concern.rb
index 74e7a12fa..74f7dacd7 100644
--- a/app/models/concerns/procedure_stats_concern.rb
+++ b/app/models/concerns/procedure_stats_concern.rb
@@ -22,9 +22,9 @@ module ProcedureStatsConcern
   def stats_dossiers_funnel
     Rails.cache.fetch("#{cache_key_with_version}/stats_dossiers_funnel", expires_in: 12.hours) do
       [
-        ['Démarrés', dossiers.visible_by_user_or_administration.count],
-        ['Déposés', dossiers.visible_by_administration.count],
-        ['Instruction débutée', dossiers.visible_by_administration.state_instruction_commencee.count],
+        ['Démarrés', dossiers.visible_by_user_or_administration.count + nb_dossiers_termines_supprimes],
+        ['Déposés', dossiers.visible_by_administration.count + nb_dossiers_termines_supprimes],
+        ['Instruction débutée', dossiers.visible_by_administration.state_instruction_commencee.count + nb_dossiers_termines_supprimes],
         ['Traités', nb_dossiers_termines]
       ]
     end
@@ -96,7 +96,11 @@ module ProcedureStatsConcern
   private
 
   def nb_dossiers_termines
-    @nb_dossiers_termines ||= dossiers.visible_by_administration.state_termine.count
+    @nb_dossiers_termines ||= dossiers.visible_by_administration.state_termine.count + nb_dossiers_termines_supprimes
+  end
+
+  def nb_dossiers_termines_supprimes
+    @nb_dossiers_termines_supprimes ||= deleted_dossiers.state_termine.count
   end
 
   def first_processed_at
diff --git a/app/models/deleted_dossier.rb b/app/models/deleted_dossier.rb
index 61bcd66f6..edb9632ac 100644
--- a/app/models/deleted_dossier.rb
+++ b/app/models/deleted_dossier.rb
@@ -20,6 +20,7 @@ class DeletedDossier < ApplicationRecord
 
   scope :order_by_updated_at, -> (order = :desc) { order(created_at: order) }
   scope :deleted_since,       -> (since) { where('deleted_dossiers.deleted_at >= ?', since) }
+  scope :state_termine,       -> { where(state: [states.fetch(:accepte), states.fetch(:refuse), states.fetch(:sans_suite)]) }
 
   enum reason: {
     user_request:      'user_request',
@@ -30,6 +31,14 @@ class DeletedDossier < ApplicationRecord
     instructeur_request: 'instructeur_request'
   }
 
+  enum state: {
+    en_construction: 'en_construction',
+    en_instruction:  'en_instruction',
+    accepte:         'accepte',
+    refuse:          'refuse',
+    sans_suite:      'sans_suite'
+  }
+
   def self.create_from_dossier(dossier, reason)
     return if !dossier.log_operations?
 
diff --git a/app/models/stat.rb b/app/models/stat.rb
index 097c0c592..d4662a410 100644
--- a/app/models/stat.rb
+++ b/app/models/stat.rb
@@ -63,16 +63,15 @@ class Stat < ApplicationRecord
     def deleted_dossiers_states
       sanitize_and_exec(DeletedDossier, <<-EOF
         SELECT
-          COUNT(*) FILTER ( WHERE state != 'brouillon' ) AS "not_brouillon",
-          COUNT(*) FILTER ( WHERE state != 'brouillon' and deleted_at BETWEEN :one_month_ago AND :now ) AS "dossiers_depose_avant_30_jours",
-          COUNT(*) FILTER ( WHERE state != 'brouillon' and deleted_at BETWEEN :two_months_ago AND :one_month_ago ) AS "dossiers_deposes_entre_60_et_30_jours",
-          COUNT(*) FILTER ( WHERE state = 'brouillon' ) AS "brouillon",
+          COUNT(*) AS "not_brouillon",
+          COUNT(*) FILTER ( WHERE deleted_at BETWEEN :one_month_ago AND :now ) AS "dossiers_depose_avant_30_jours",
+          COUNT(*) FILTER ( WHERE deleted_at BETWEEN :two_months_ago AND :one_month_ago ) AS "dossiers_deposes_entre_60_et_30_jours",
           COUNT(*) FILTER ( WHERE state = 'en_construction' ) AS "en_construction",
           COUNT(*) FILTER ( WHERE state = 'en_instruction' ) AS "en_instruction",
           COUNT(*) FILTER ( WHERE state in ('accepte', 'refuse', 'sans_suite') ) AS "termines"
         FROM deleted_dossiers
       EOF
-      )
+      ).merge('brouillon' => 0)
     end
 
     def last_four_months_serie(associations_with_date_attribute)
diff --git a/spec/models/stat_spec.rb b/spec/models/stat_spec.rb
index 41138d59a..726d67819 100644
--- a/spec/models/stat_spec.rb
+++ b/spec/models/stat_spec.rb
@@ -4,10 +4,9 @@ describe Stat do
   describe '.deleted_dossiers_states' do
     subject { Stat.send(:deleted_dossiers_states) }
     it 'find counts for columns' do
-      create(:deleted_dossier, dossier_id: create(:dossier).id, state: :termine)
+      create(:deleted_dossier, dossier_id: create(:dossier).id, state: :accepte)
       create(:deleted_dossier, dossier_id: create(:dossier).id, state: :en_construction, deleted_at: 1.month.ago)
       create(:deleted_dossier, dossier_id: create(:dossier).id, state: :en_construction, deleted_at: 2.months.ago)
-      create(:deleted_dossier, dossier_id: create(:dossier).id, state: :brouillon, deleted_at: 3.months.ago)
       create(:deleted_dossier, dossier_id: create(:dossier).id, state: :en_construction, deleted_at: 3.months.ago)
       create(:deleted_dossier, dossier_id: create(:dossier).id, state: :en_instruction, deleted_at: 3.months.ago)
       create(:deleted_dossier, dossier_id: create(:dossier).id, state: :accepte, deleted_at: 3.months.ago)
@@ -17,10 +16,10 @@ describe Stat do
       expect(subject["not_brouillon"]).to eq(8)
       expect(subject["dossiers_depose_avant_30_jours"]).to eq(1)
       expect(subject["dossiers_deposes_entre_60_et_30_jours"]).to eq(1)
-      expect(subject["brouillon"]).to eq(1)
+      expect(subject["brouillon"]).to eq(0)
       expect(subject["en_construction"]).to eq(3)
       expect(subject["en_instruction"]).to eq(1)
-      expect(subject["termines"]).to eq(3)
+      expect(subject["termines"]).to eq(4)
     end
   end
 

From bdb15aaa4a4ecc01b135a64920f52cb335f76d9b Mon Sep 17 00:00:00 2001
From: Paul Chavard <pro@paul.chavard.net>
Date: Wed, 22 Feb 2023 17:22:00 +0100
Subject: [PATCH 132/202] feat(apigeo): enable all zones on departements api

---
 .../components/shared/queryClient.ts          | 50 +++++++++++++------
 app/services/api_geo_service.rb               |  2 +-
 spec/fixtures/cassettes/api_geo_all.yml       | 16 +++---
 .../cassettes/api_geo_departements.yml        | 12 ++---
 spec/services/api_geo_service_spec.rb         |  4 +-
 5 files changed, 51 insertions(+), 33 deletions(-)

diff --git a/app/javascript/components/shared/queryClient.ts b/app/javascript/components/shared/queryClient.ts
index 2ab492c4a..d24056928 100644
--- a/app/javascript/components/shared/queryClient.ts
+++ b/app/javascript/components/shared/queryClient.ts
@@ -27,24 +27,42 @@ type QueryKey = readonly [
 
 function buildURL(scope: string, term: string, extra?: string) {
   term = encodeURIComponent(term.replace(/\(|\)/g, ''));
-  if (scope === 'adresse') {
-    return `${api_adresse_url}/search?q=${term}&limit=${API_ADRESSE_QUERY_LIMIT}`;
-  } else if (scope === 'annuaire-education') {
-    return `${api_education_url}/search?dataset=fr-en-annuaire-education&q=${term}&rows=${API_EDUCATION_QUERY_LIMIT}`;
-  } else if (scope === 'communes') {
-    const limit = `limit=${API_GEO_COMMUNES_QUERY_LIMIT}`;
-    const url = extra
-      ? `${api_geo_url}/communes?codeDepartement=${extra}&${limit}&`
-      : `${api_geo_url}/communes?${limit}&`;
-    if (isNumeric(term)) {
-      return `${url}codePostal=${term}`;
+  const params = new URLSearchParams();
+  let path = `${api_geo_url}/${scope}`;
+
+  if (scope == 'adresse') {
+    path = `${api_adresse_url}/search`;
+    params.set('q', term);
+    params.set('limit', `${API_ADRESSE_QUERY_LIMIT}`);
+  } else if (scope == 'annuaire-education') {
+    path = `${api_education_url}/search`;
+    params.set('q', term);
+    params.set('rows', `${API_EDUCATION_QUERY_LIMIT}`);
+    params.set('dataset', 'fr-en-annuaire-education');
+  } else if (scope == 'communes') {
+    if (extra) {
+      params.set('codeDepartement', extra);
     }
-    return `${url}nom=${term}&boost=population`;
-  } else if (isNumeric(term)) {
-    const code = term.padStart(2, '0');
-    return `${api_geo_url}/${scope}?code=${code}&limit=${API_GEO_QUERY_LIMIT}`;
+    if (isNumeric(term)) {
+      params.set('codePostal', term);
+    } else {
+      params.set('nom', term);
+      params.set('boost', 'population');
+    }
+    params.set('limit', `${API_GEO_COMMUNES_QUERY_LIMIT}`);
+  } else {
+    if (isNumeric(term)) {
+      params.set('code', term.padStart(2, '0'));
+    } else {
+      params.set('nom', term);
+    }
+    if (scope == 'departements') {
+      params.set('zone', 'metro,drom,com');
+    }
+    params.set('limit', `${API_GEO_QUERY_LIMIT}`);
   }
-  return `${api_geo_url}/${scope}?nom=${term}&limit=${API_GEO_QUERY_LIMIT}`;
+
+  return `${path}?${params}`;
 }
 
 const defaultQueryFn: QueryFunction<unknown, QueryKey> = async ({
diff --git a/app/services/api_geo_service.rb b/app/services/api_geo_service.rb
index 429e40e81..0a3b1ff04 100644
--- a/app/services/api_geo_service.rb
+++ b/app/services/api_geo_service.rb
@@ -35,7 +35,7 @@ class APIGeoService
     end
 
     def departements
-      [{ code: '99', name: 'Etranger' }] + get_from_api_geo(:departements).sort_by { _1[:code] }
+      [{ code: '99', name: 'Etranger' }] + get_from_api_geo('departements?zone=metro,drom,com').sort_by { _1[:code] }
     end
 
     def departement_name(code)
diff --git a/spec/fixtures/cassettes/api_geo_all.yml b/spec/fixtures/cassettes/api_geo_all.yml
index 6ddbae52e..cd3eca4b0 100644
--- a/spec/fixtures/cassettes/api_geo_all.yml
+++ b/spec/fixtures/cassettes/api_geo_all.yml
@@ -2,7 +2,7 @@
 http_interactions:
 - request:
     method: get
-    uri: https://geo.api.gouv.fr/departements
+    uri: https://geo.api.gouv.fr/departements?zone=metro,drom,com
     body:
       encoding: US-ASCII
       string: ''
@@ -19,25 +19,25 @@ http_interactions:
       Server:
       - nginx/1.10.3 (Ubuntu)
       Date:
-      - Tue, 20 Dec 2022 22:45:29 GMT
+      - Wed, 22 Feb 2023 14:57:34 GMT
       Content-Type:
       - application/json; charset=utf-8
       Content-Length:
-      - '5083'
+      - '5598'
       Vary:
       - Accept-Encoding
       - Origin
       X-Powered-By:
       - Express
       Etag:
-      - W/"13db-vyFtsKQWjHylHAtBtjYjxCAjMHE"
+      - W/"15de-6bFFP56x7MMvD1C1JvzSgcLzQWw"
       Strict-Transport-Security:
       - max-age=15552000
     body:
       encoding: ASCII-8BIT
       string: !binary |-
-        W3sibm9tIjoiQWluIiwiY29kZSI6IjAxIiwiY29kZVJlZ2lvbiI6Ijg0In0seyJub20iOiJBaXNuZSIsImNvZGUiOiIwMiIsImNvZGVSZWdpb24iOiIzMiJ9LHsibm9tIjoiQWxsaWVyIiwiY29kZSI6IjAzIiwiY29kZVJlZ2lvbiI6Ijg0In0seyJub20iOiJBbHBlcy1kZS1IYXV0ZS1Qcm92ZW5jZSIsImNvZGUiOiIwNCIsImNvZGVSZWdpb24iOiI5MyJ9LHsibm9tIjoiSGF1dGVzLUFscGVzIiwiY29kZSI6IjA1IiwiY29kZVJlZ2lvbiI6IjkzIn0seyJub20iOiJBbHBlcy1NYXJpdGltZXMiLCJjb2RlIjoiMDYiLCJjb2RlUmVnaW9uIjoiOTMifSx7Im5vbSI6IkFyZMOoY2hlIiwiY29kZSI6IjA3IiwiY29kZVJlZ2lvbiI6Ijg0In0seyJub20iOiJBcmRlbm5lcyIsImNvZGUiOiIwOCIsImNvZGVSZWdpb24iOiI0NCJ9LHsibm9tIjoiQXJpw6hnZSIsImNvZGUiOiIwOSIsImNvZGVSZWdpb24iOiI3NiJ9LHsibm9tIjoiQXViZSIsImNvZGUiOiIxMCIsImNvZGVSZWdpb24iOiI0NCJ9LHsibm9tIjoiQXVkZSIsImNvZGUiOiIxMSIsImNvZGVSZWdpb24iOiI3NiJ9LHsibm9tIjoiQXZleXJvbiIsImNvZGUiOiIxMiIsImNvZGVSZWdpb24iOiI3NiJ9LHsibm9tIjoiQm91Y2hlcy1kdS1SaMO0bmUiLCJjb2RlIjoiMTMiLCJjb2RlUmVnaW9uIjoiOTMifSx7Im5vbSI6IkNhbHZhZG9zIiwiY29kZSI6IjE0IiwiY29kZVJlZ2lvbiI6IjI4In0seyJub20iOiJDYW50YWwiLCJjb2RlIjoiMTUiLCJjb2RlUmVnaW9uIjoiODQifSx7Im5vbSI6IkNoYXJlbnRlIiwiY29kZSI6IjE2IiwiY29kZVJlZ2lvbiI6Ijc1In0seyJub20iOiJDaGFyZW50ZS1NYXJpdGltZSIsImNvZGUiOiIxNyIsImNvZGVSZWdpb24iOiI3NSJ9LHsibm9tIjoiQ2hlciIsImNvZGUiOiIxOCIsImNvZGVSZWdpb24iOiIyNCJ9LHsibm9tIjoiQ29ycsOoemUiLCJjb2RlIjoiMTkiLCJjb2RlUmVnaW9uIjoiNzUifSx7Im5vbSI6IkPDtHRlLWQnT3IiLCJjb2RlIjoiMjEiLCJjb2RlUmVnaW9uIjoiMjcifSx7Im5vbSI6IkPDtHRlcy1kJ0FybW9yIiwiY29kZSI6IjIyIiwiY29kZVJlZ2lvbiI6IjUzIn0seyJub20iOiJDcmV1c2UiLCJjb2RlIjoiMjMiLCJjb2RlUmVnaW9uIjoiNzUifSx7Im5vbSI6IkRvcmRvZ25lIiwiY29kZSI6IjI0IiwiY29kZVJlZ2lvbiI6Ijc1In0seyJub20iOiJEb3VicyIsImNvZGUiOiIyNSIsImNvZGVSZWdpb24iOiIyNyJ9LHsibm9tIjoiRHLDtG1lIiwiY29kZSI6IjI2IiwiY29kZVJlZ2lvbiI6Ijg0In0seyJub20iOiJFdXJlIiwiY29kZSI6IjI3IiwiY29kZVJlZ2lvbiI6IjI4In0seyJub20iOiJFdXJlLWV0LUxvaXIiLCJjb2RlIjoiMjgiLCJjb2RlUmVnaW9uIjoiMjQifSx7Im5vbSI6IkZpbmlzdMOocmUiLCJjb2RlIjoiMjkiLCJjb2RlUmVnaW9uIjoiNTMifSx7Im5vbSI6IkNvcnNlLWR1LVN1ZCIsImNvZGUiOiIyQSIsImNvZGVSZWdpb24iOiI5NCJ9LHsibm9tIjoiSGF1dGUtQ29yc2UiLCJjb2RlIjoiMkIiLCJjb2RlUmVnaW9uIjoiOTQifSx7Im5vbSI6IkdhcmQiLCJjb2RlIjoiMzAiLCJjb2RlUmVnaW9uIjoiNzYifSx7Im5vbSI6IkhhdXRlLUdhcm9ubmUiLCJjb2RlIjoiMzEiLCJjb2RlUmVnaW9uIjoiNzYifSx7Im5vbSI6IkdlcnMiLCJjb2RlIjoiMzIiLCJjb2RlUmVnaW9uIjoiNzYifSx7Im5vbSI6Ikdpcm9uZGUiLCJjb2RlIjoiMzMiLCJjb2RlUmVnaW9uIjoiNzUifSx7Im5vbSI6IkjDqXJhdWx0IiwiY29kZSI6IjM0IiwiY29kZVJlZ2lvbiI6Ijc2In0seyJub20iOiJJbGxlLWV0LVZpbGFpbmUiLCJjb2RlIjoiMzUiLCJjb2RlUmVnaW9uIjoiNTMifSx7Im5vbSI6IkluZHJlIiwiY29kZSI6IjM2IiwiY29kZVJlZ2lvbiI6IjI0In0seyJub20iOiJJbmRyZS1ldC1Mb2lyZSIsImNvZGUiOiIzNyIsImNvZGVSZWdpb24iOiIyNCJ9LHsibm9tIjoiSXPDqHJlIiwiY29kZSI6IjM4IiwiY29kZVJlZ2lvbiI6Ijg0In0seyJub20iOiJKdXJhIiwiY29kZSI6IjM5IiwiY29kZVJlZ2lvbiI6IjI3In0seyJub20iOiJMYW5kZXMiLCJjb2RlIjoiNDAiLCJjb2RlUmVnaW9uIjoiNzUifSx7Im5vbSI6IkxvaXItZXQtQ2hlciIsImNvZGUiOiI0MSIsImNvZGVSZWdpb24iOiIyNCJ9LHsibm9tIjoiTG9pcmUiLCJjb2RlIjoiNDIiLCJjb2RlUmVnaW9uIjoiODQifSx7Im5vbSI6IkhhdXRlLUxvaXJlIiwiY29kZSI6IjQzIiwiY29kZVJlZ2lvbiI6Ijg0In0seyJub20iOiJMb2lyZS1BdGxhbnRpcXVlIiwiY29kZSI6IjQ0IiwiY29kZVJlZ2lvbiI6IjUyIn0seyJub20iOiJMb2lyZXQiLCJjb2RlIjoiNDUiLCJjb2RlUmVnaW9uIjoiMjQifSx7Im5vbSI6IkxvdCIsImNvZGUiOiI0NiIsImNvZGVSZWdpb24iOiI3NiJ9LHsibm9tIjoiTG90LWV0LUdhcm9ubmUiLCJjb2RlIjoiNDciLCJjb2RlUmVnaW9uIjoiNzUifSx7Im5vbSI6IkxvesOocmUiLCJjb2RlIjoiNDgiLCJjb2RlUmVnaW9uIjoiNzYifSx7Im5vbSI6Ik1haW5lLWV0LUxvaXJlIiwiY29kZSI6IjQ5IiwiY29kZVJlZ2lvbiI6IjUyIn0seyJub20iOiJNYW5jaGUiLCJjb2RlIjoiNTAiLCJjb2RlUmVnaW9uIjoiMjgifSx7Im5vbSI6Ik1hcm5lIiwiY29kZSI6IjUxIiwiY29kZVJlZ2lvbiI6IjQ0In0seyJub20iOiJIYXV0ZS1NYXJuZSIsImNvZGUiOiI1MiIsImNvZGVSZWdpb24iOiI0NCJ9LHsibm9tIjoiTWF5ZW5uZSIsImNvZGUiOiI1MyIsImNvZGVSZWdpb24iOiI1MiJ9LHsibm9tIjoiTWV1cnRoZS1ldC1Nb3NlbGxlIiwiY29kZSI6IjU0IiwiY29kZVJlZ2lvbiI6IjQ0In0seyJub20iOiJNZXVzZSIsImNvZGUiOiI1NSIsImNvZGVSZWdpb24iOiI0NCJ9LHsibm9tIjoiTW9yYmloYW4iLCJjb2RlIjoiNTYiLCJjb2RlUmVnaW9uIjoiNTMifSx7Im5vbSI6Ik1vc2VsbGUiLCJjb2RlIjoiNTciLCJjb2RlUmVnaW9uIjoiNDQifSx7Im5vbSI6Ik5pw6h2cmUiLCJjb2RlIjoiNTgiLCJjb2RlUmVnaW9uIjoiMjcifSx7Im5vbSI6Ik5vcmQiLCJjb2RlIjoiNTkiLCJjb2RlUmVnaW9uIjoiMzIifSx7Im5vbSI6Ik9pc2UiLCJjb2RlIjoiNjAiLCJjb2RlUmVnaW9uIjoiMzIifSx7Im5vbSI6Ik9ybmUiLCJjb2RlIjoiNjEiLCJjb2RlUmVnaW9uIjoiMjgifSx7Im5vbSI6IlBhcy1kZS1DYWxhaXMiLCJjb2RlIjoiNjIiLCJjb2RlUmVnaW9uIjoiMzIifSx7Im5vbSI6IlB1eS1kZS1Ew7RtZSIsImNvZGUiOiI2MyIsImNvZGVSZWdpb24iOiI4NCJ9LHsibm9tIjoiUHlyw6luw6llcy1BdGxhbnRpcXVlcyIsImNvZGUiOiI2NCIsImNvZGVSZWdpb24iOiI3NSJ9LHsibm9tIjoiSGF1dGVzLVB5csOpbsOpZXMiLCJjb2RlIjoiNjUiLCJjb2RlUmVnaW9uIjoiNzYifSx7Im5vbSI6IlB5csOpbsOpZXMtT3JpZW50YWxlcyIsImNvZGUiOiI2NiIsImNvZGVSZWdpb24iOiI3NiJ9LHsibm9tIjoiQmFzLVJoaW4iLCJjb2RlIjoiNjciLCJjb2RlUmVnaW9uIjoiNDQifSx7Im5vbSI6IkhhdXQtUmhpbiIsImNvZGUiOiI2OCIsImNvZGVSZWdpb24iOiI0NCJ9LHsibm9tIjoiUmjDtG5lIiwiY29kZSI6IjY5IiwiY29kZVJlZ2lvbiI6Ijg0In0seyJub20iOiJIYXV0ZS1TYcO0bmUiLCJjb2RlIjoiNzAiLCJjb2RlUmVnaW9uIjoiMjcifSx7Im5vbSI6IlNhw7RuZS1ldC1Mb2lyZSIsImNvZGUiOiI3MSIsImNvZGVSZWdpb24iOiIyNyJ9LHsibm9tIjoiU2FydGhlIiwiY29kZSI6IjcyIiwiY29kZVJlZ2lvbiI6IjUyIn0seyJub20iOiJTYXZvaWUiLCJjb2RlIjoiNzMiLCJjb2RlUmVnaW9uIjoiODQifSx7Im5vbSI6IkhhdXRlLVNhdm9pZSIsImNvZGUiOiI3NCIsImNvZGVSZWdpb24iOiI4NCJ9LHsibm9tIjoiUGFyaXMiLCJjb2RlIjoiNzUiLCJjb2RlUmVnaW9uIjoiMTEifSx7Im5vbSI6IlNlaW5lLU1hcml0aW1lIiwiY29kZSI6Ijc2IiwiY29kZVJlZ2lvbiI6IjI4In0seyJub20iOiJTZWluZS1ldC1NYXJuZSIsImNvZGUiOiI3NyIsImNvZGVSZWdpb24iOiIxMSJ9LHsibm9tIjoiWXZlbGluZXMiLCJjb2RlIjoiNzgiLCJjb2RlUmVnaW9uIjoiMTEifSx7Im5vbSI6IkRldXgtU8OodnJlcyIsImNvZGUiOiI3OSIsImNvZGVSZWdpb24iOiI3NSJ9LHsibm9tIjoiU29tbWUiLCJjb2RlIjoiODAiLCJjb2RlUmVnaW9uIjoiMzIifSx7Im5vbSI6IlRhcm4iLCJjb2RlIjoiODEiLCJjb2RlUmVnaW9uIjoiNzYifSx7Im5vbSI6IlRhcm4tZXQtR2Fyb25uZSIsImNvZGUiOiI4MiIsImNvZGVSZWdpb24iOiI3NiJ9LHsibm9tIjoiVmFyIiwiY29kZSI6IjgzIiwiY29kZVJlZ2lvbiI6IjkzIn0seyJub20iOiJWYXVjbHVzZSIsImNvZGUiOiI4NCIsImNvZGVSZWdpb24iOiI5MyJ9LHsibm9tIjoiVmVuZMOpZSIsImNvZGUiOiI4NSIsImNvZGVSZWdpb24iOiI1MiJ9LHsibm9tIjoiVmllbm5lIiwiY29kZSI6Ijg2IiwiY29kZVJlZ2lvbiI6Ijc1In0seyJub20iOiJIYXV0ZS1WaWVubmUiLCJjb2RlIjoiODciLCJjb2RlUmVnaW9uIjoiNzUifSx7Im5vbSI6IlZvc2dlcyIsImNvZGUiOiI4OCIsImNvZGVSZWdpb24iOiI0NCJ9LHsibm9tIjoiWW9ubmUiLCJjb2RlIjoiODkiLCJjb2RlUmVnaW9uIjoiMjcifSx7Im5vbSI6IlRlcnJpdG9pcmUgZGUgQmVsZm9ydCIsImNvZGUiOiI5MCIsImNvZGVSZWdpb24iOiIyNyJ9LHsibm9tIjoiRXNzb25uZSIsImNvZGUiOiI5MSIsImNvZGVSZWdpb24iOiIxMSJ9LHsibm9tIjoiSGF1dHMtZGUtU2VpbmUiLCJjb2RlIjoiOTIiLCJjb2RlUmVnaW9uIjoiMTEifSx7Im5vbSI6IlNlaW5lLVNhaW50LURlbmlzIiwiY29kZSI6IjkzIiwiY29kZVJlZ2lvbiI6IjExIn0seyJub20iOiJWYWwtZGUtTWFybmUiLCJjb2RlIjoiOTQiLCJjb2RlUmVnaW9uIjoiMTEifSx7Im5vbSI6IlZhbC1kJ09pc2UiLCJjb2RlIjoiOTUiLCJjb2RlUmVnaW9uIjoiMTEifSx7Im5vbSI6Ikd1YWRlbG91cGUiLCJjb2RlIjoiOTcxIiwiY29kZVJlZ2lvbiI6IjAxIn0seyJub20iOiJNYXJ0aW5pcXVlIiwiY29kZSI6Ijk3MiIsImNvZGVSZWdpb24iOiIwMiJ9LHsibm9tIjoiR3V5YW5lIiwiY29kZSI6Ijk3MyIsImNvZGVSZWdpb24iOiIwMyJ9LHsibm9tIjoiTGEgUsOpdW5pb24iLCJjb2RlIjoiOTc0IiwiY29kZVJlZ2lvbiI6IjA0In0seyJub20iOiJNYXlvdHRlIiwiY29kZSI6Ijk3NiIsImNvZGVSZWdpb24iOiIwNiJ9XQ==
-  recorded_at: Tue, 20 Dec 2022 22:45:29 GMT
+        W3sibm9tIjoiQWluIiwiY29kZSI6IjAxIiwiY29kZVJlZ2lvbiI6Ijg0In0seyJub20iOiJBaXNuZSIsImNvZGUiOiIwMiIsImNvZGVSZWdpb24iOiIzMiJ9LHsibm9tIjoiQWxsaWVyIiwiY29kZSI6IjAzIiwiY29kZVJlZ2lvbiI6Ijg0In0seyJub20iOiJBbHBlcy1kZS1IYXV0ZS1Qcm92ZW5jZSIsImNvZGUiOiIwNCIsImNvZGVSZWdpb24iOiI5MyJ9LHsibm9tIjoiSGF1dGVzLUFscGVzIiwiY29kZSI6IjA1IiwiY29kZVJlZ2lvbiI6IjkzIn0seyJub20iOiJBbHBlcy1NYXJpdGltZXMiLCJjb2RlIjoiMDYiLCJjb2RlUmVnaW9uIjoiOTMifSx7Im5vbSI6IkFyZMOoY2hlIiwiY29kZSI6IjA3IiwiY29kZVJlZ2lvbiI6Ijg0In0seyJub20iOiJBcmRlbm5lcyIsImNvZGUiOiIwOCIsImNvZGVSZWdpb24iOiI0NCJ9LHsibm9tIjoiQXJpw6hnZSIsImNvZGUiOiIwOSIsImNvZGVSZWdpb24iOiI3NiJ9LHsibm9tIjoiQXViZSIsImNvZGUiOiIxMCIsImNvZGVSZWdpb24iOiI0NCJ9LHsibm9tIjoiQXVkZSIsImNvZGUiOiIxMSIsImNvZGVSZWdpb24iOiI3NiJ9LHsibm9tIjoiQXZleXJvbiIsImNvZGUiOiIxMiIsImNvZGVSZWdpb24iOiI3NiJ9LHsibm9tIjoiQm91Y2hlcy1kdS1SaMO0bmUiLCJjb2RlIjoiMTMiLCJjb2RlUmVnaW9uIjoiOTMifSx7Im5vbSI6IkNhbHZhZG9zIiwiY29kZSI6IjE0IiwiY29kZVJlZ2lvbiI6IjI4In0seyJub20iOiJDYW50YWwiLCJjb2RlIjoiMTUiLCJjb2RlUmVnaW9uIjoiODQifSx7Im5vbSI6IkNoYXJlbnRlIiwiY29kZSI6IjE2IiwiY29kZVJlZ2lvbiI6Ijc1In0seyJub20iOiJDaGFyZW50ZS1NYXJpdGltZSIsImNvZGUiOiIxNyIsImNvZGVSZWdpb24iOiI3NSJ9LHsibm9tIjoiQ2hlciIsImNvZGUiOiIxOCIsImNvZGVSZWdpb24iOiIyNCJ9LHsibm9tIjoiQ29ycsOoemUiLCJjb2RlIjoiMTkiLCJjb2RlUmVnaW9uIjoiNzUifSx7Im5vbSI6IkPDtHRlLWQnT3IiLCJjb2RlIjoiMjEiLCJjb2RlUmVnaW9uIjoiMjcifSx7Im5vbSI6IkPDtHRlcy1kJ0FybW9yIiwiY29kZSI6IjIyIiwiY29kZVJlZ2lvbiI6IjUzIn0seyJub20iOiJDcmV1c2UiLCJjb2RlIjoiMjMiLCJjb2RlUmVnaW9uIjoiNzUifSx7Im5vbSI6IkRvcmRvZ25lIiwiY29kZSI6IjI0IiwiY29kZVJlZ2lvbiI6Ijc1In0seyJub20iOiJEb3VicyIsImNvZGUiOiIyNSIsImNvZGVSZWdpb24iOiIyNyJ9LHsibm9tIjoiRHLDtG1lIiwiY29kZSI6IjI2IiwiY29kZVJlZ2lvbiI6Ijg0In0seyJub20iOiJFdXJlIiwiY29kZSI6IjI3IiwiY29kZVJlZ2lvbiI6IjI4In0seyJub20iOiJFdXJlLWV0LUxvaXIiLCJjb2RlIjoiMjgiLCJjb2RlUmVnaW9uIjoiMjQifSx7Im5vbSI6IkZpbmlzdMOocmUiLCJjb2RlIjoiMjkiLCJjb2RlUmVnaW9uIjoiNTMifSx7Im5vbSI6IkNvcnNlLWR1LVN1ZCIsImNvZGUiOiIyQSIsImNvZGVSZWdpb24iOiI5NCJ9LHsibm9tIjoiSGF1dGUtQ29yc2UiLCJjb2RlIjoiMkIiLCJjb2RlUmVnaW9uIjoiOTQifSx7Im5vbSI6IkdhcmQiLCJjb2RlIjoiMzAiLCJjb2RlUmVnaW9uIjoiNzYifSx7Im5vbSI6IkhhdXRlLUdhcm9ubmUiLCJjb2RlIjoiMzEiLCJjb2RlUmVnaW9uIjoiNzYifSx7Im5vbSI6IkdlcnMiLCJjb2RlIjoiMzIiLCJjb2RlUmVnaW9uIjoiNzYifSx7Im5vbSI6Ikdpcm9uZGUiLCJjb2RlIjoiMzMiLCJjb2RlUmVnaW9uIjoiNzUifSx7Im5vbSI6IkjDqXJhdWx0IiwiY29kZSI6IjM0IiwiY29kZVJlZ2lvbiI6Ijc2In0seyJub20iOiJJbGxlLWV0LVZpbGFpbmUiLCJjb2RlIjoiMzUiLCJjb2RlUmVnaW9uIjoiNTMifSx7Im5vbSI6IkluZHJlIiwiY29kZSI6IjM2IiwiY29kZVJlZ2lvbiI6IjI0In0seyJub20iOiJJbmRyZS1ldC1Mb2lyZSIsImNvZGUiOiIzNyIsImNvZGVSZWdpb24iOiIyNCJ9LHsibm9tIjoiSXPDqHJlIiwiY29kZSI6IjM4IiwiY29kZVJlZ2lvbiI6Ijg0In0seyJub20iOiJKdXJhIiwiY29kZSI6IjM5IiwiY29kZVJlZ2lvbiI6IjI3In0seyJub20iOiJMYW5kZXMiLCJjb2RlIjoiNDAiLCJjb2RlUmVnaW9uIjoiNzUifSx7Im5vbSI6IkxvaXItZXQtQ2hlciIsImNvZGUiOiI0MSIsImNvZGVSZWdpb24iOiIyNCJ9LHsibm9tIjoiTG9pcmUiLCJjb2RlIjoiNDIiLCJjb2RlUmVnaW9uIjoiODQifSx7Im5vbSI6IkhhdXRlLUxvaXJlIiwiY29kZSI6IjQzIiwiY29kZVJlZ2lvbiI6Ijg0In0seyJub20iOiJMb2lyZS1BdGxhbnRpcXVlIiwiY29kZSI6IjQ0IiwiY29kZVJlZ2lvbiI6IjUyIn0seyJub20iOiJMb2lyZXQiLCJjb2RlIjoiNDUiLCJjb2RlUmVnaW9uIjoiMjQifSx7Im5vbSI6IkxvdCIsImNvZGUiOiI0NiIsImNvZGVSZWdpb24iOiI3NiJ9LHsibm9tIjoiTG90LWV0LUdhcm9ubmUiLCJjb2RlIjoiNDciLCJjb2RlUmVnaW9uIjoiNzUifSx7Im5vbSI6IkxvesOocmUiLCJjb2RlIjoiNDgiLCJjb2RlUmVnaW9uIjoiNzYifSx7Im5vbSI6Ik1haW5lLWV0LUxvaXJlIiwiY29kZSI6IjQ5IiwiY29kZVJlZ2lvbiI6IjUyIn0seyJub20iOiJNYW5jaGUiLCJjb2RlIjoiNTAiLCJjb2RlUmVnaW9uIjoiMjgifSx7Im5vbSI6Ik1hcm5lIiwiY29kZSI6IjUxIiwiY29kZVJlZ2lvbiI6IjQ0In0seyJub20iOiJIYXV0ZS1NYXJuZSIsImNvZGUiOiI1MiIsImNvZGVSZWdpb24iOiI0NCJ9LHsibm9tIjoiTWF5ZW5uZSIsImNvZGUiOiI1MyIsImNvZGVSZWdpb24iOiI1MiJ9LHsibm9tIjoiTWV1cnRoZS1ldC1Nb3NlbGxlIiwiY29kZSI6IjU0IiwiY29kZVJlZ2lvbiI6IjQ0In0seyJub20iOiJNZXVzZSIsImNvZGUiOiI1NSIsImNvZGVSZWdpb24iOiI0NCJ9LHsibm9tIjoiTW9yYmloYW4iLCJjb2RlIjoiNTYiLCJjb2RlUmVnaW9uIjoiNTMifSx7Im5vbSI6Ik1vc2VsbGUiLCJjb2RlIjoiNTciLCJjb2RlUmVnaW9uIjoiNDQifSx7Im5vbSI6Ik5pw6h2cmUiLCJjb2RlIjoiNTgiLCJjb2RlUmVnaW9uIjoiMjcifSx7Im5vbSI6Ik5vcmQiLCJjb2RlIjoiNTkiLCJjb2RlUmVnaW9uIjoiMzIifSx7Im5vbSI6Ik9pc2UiLCJjb2RlIjoiNjAiLCJjb2RlUmVnaW9uIjoiMzIifSx7Im5vbSI6Ik9ybmUiLCJjb2RlIjoiNjEiLCJjb2RlUmVnaW9uIjoiMjgifSx7Im5vbSI6IlBhcy1kZS1DYWxhaXMiLCJjb2RlIjoiNjIiLCJjb2RlUmVnaW9uIjoiMzIifSx7Im5vbSI6IlB1eS1kZS1Ew7RtZSIsImNvZGUiOiI2MyIsImNvZGVSZWdpb24iOiI4NCJ9LHsibm9tIjoiUHlyw6luw6llcy1BdGxhbnRpcXVlcyIsImNvZGUiOiI2NCIsImNvZGVSZWdpb24iOiI3NSJ9LHsibm9tIjoiSGF1dGVzLVB5csOpbsOpZXMiLCJjb2RlIjoiNjUiLCJjb2RlUmVnaW9uIjoiNzYifSx7Im5vbSI6IlB5csOpbsOpZXMtT3JpZW50YWxlcyIsImNvZGUiOiI2NiIsImNvZGVSZWdpb24iOiI3NiJ9LHsibm9tIjoiQmFzLVJoaW4iLCJjb2RlIjoiNjciLCJjb2RlUmVnaW9uIjoiNDQifSx7Im5vbSI6IkhhdXQtUmhpbiIsImNvZGUiOiI2OCIsImNvZGVSZWdpb24iOiI0NCJ9LHsibm9tIjoiUmjDtG5lIiwiY29kZSI6IjY5IiwiY29kZVJlZ2lvbiI6Ijg0In0seyJub20iOiJIYXV0ZS1TYcO0bmUiLCJjb2RlIjoiNzAiLCJjb2RlUmVnaW9uIjoiMjcifSx7Im5vbSI6IlNhw7RuZS1ldC1Mb2lyZSIsImNvZGUiOiI3MSIsImNvZGVSZWdpb24iOiIyNyJ9LHsibm9tIjoiU2FydGhlIiwiY29kZSI6IjcyIiwiY29kZVJlZ2lvbiI6IjUyIn0seyJub20iOiJTYXZvaWUiLCJjb2RlIjoiNzMiLCJjb2RlUmVnaW9uIjoiODQifSx7Im5vbSI6IkhhdXRlLVNhdm9pZSIsImNvZGUiOiI3NCIsImNvZGVSZWdpb24iOiI4NCJ9LHsibm9tIjoiUGFyaXMiLCJjb2RlIjoiNzUiLCJjb2RlUmVnaW9uIjoiMTEifSx7Im5vbSI6IlNlaW5lLU1hcml0aW1lIiwiY29kZSI6Ijc2IiwiY29kZVJlZ2lvbiI6IjI4In0seyJub20iOiJTZWluZS1ldC1NYXJuZSIsImNvZGUiOiI3NyIsImNvZGVSZWdpb24iOiIxMSJ9LHsibm9tIjoiWXZlbGluZXMiLCJjb2RlIjoiNzgiLCJjb2RlUmVnaW9uIjoiMTEifSx7Im5vbSI6IkRldXgtU8OodnJlcyIsImNvZGUiOiI3OSIsImNvZGVSZWdpb24iOiI3NSJ9LHsibm9tIjoiU29tbWUiLCJjb2RlIjoiODAiLCJjb2RlUmVnaW9uIjoiMzIifSx7Im5vbSI6IlRhcm4iLCJjb2RlIjoiODEiLCJjb2RlUmVnaW9uIjoiNzYifSx7Im5vbSI6IlRhcm4tZXQtR2Fyb25uZSIsImNvZGUiOiI4MiIsImNvZGVSZWdpb24iOiI3NiJ9LHsibm9tIjoiVmFyIiwiY29kZSI6IjgzIiwiY29kZVJlZ2lvbiI6IjkzIn0seyJub20iOiJWYXVjbHVzZSIsImNvZGUiOiI4NCIsImNvZGVSZWdpb24iOiI5MyJ9LHsibm9tIjoiVmVuZMOpZSIsImNvZGUiOiI4NSIsImNvZGVSZWdpb24iOiI1MiJ9LHsibm9tIjoiVmllbm5lIiwiY29kZSI6Ijg2IiwiY29kZVJlZ2lvbiI6Ijc1In0seyJub20iOiJIYXV0ZS1WaWVubmUiLCJjb2RlIjoiODciLCJjb2RlUmVnaW9uIjoiNzUifSx7Im5vbSI6IlZvc2dlcyIsImNvZGUiOiI4OCIsImNvZGVSZWdpb24iOiI0NCJ9LHsibm9tIjoiWW9ubmUiLCJjb2RlIjoiODkiLCJjb2RlUmVnaW9uIjoiMjcifSx7Im5vbSI6IlRlcnJpdG9pcmUgZGUgQmVsZm9ydCIsImNvZGUiOiI5MCIsImNvZGVSZWdpb24iOiIyNyJ9LHsibm9tIjoiRXNzb25uZSIsImNvZGUiOiI5MSIsImNvZGVSZWdpb24iOiIxMSJ9LHsibm9tIjoiSGF1dHMtZGUtU2VpbmUiLCJjb2RlIjoiOTIiLCJjb2RlUmVnaW9uIjoiMTEifSx7Im5vbSI6IlNlaW5lLVNhaW50LURlbmlzIiwiY29kZSI6IjkzIiwiY29kZVJlZ2lvbiI6IjExIn0seyJub20iOiJWYWwtZGUtTWFybmUiLCJjb2RlIjoiOTQiLCJjb2RlUmVnaW9uIjoiMTEifSx7Im5vbSI6IlZhbC1kJ09pc2UiLCJjb2RlIjoiOTUiLCJjb2RlUmVnaW9uIjoiMTEifSx7Im5vbSI6Ikd1YWRlbG91cGUiLCJjb2RlIjoiOTcxIiwiY29kZVJlZ2lvbiI6IjAxIn0seyJub20iOiJNYXJ0aW5pcXVlIiwiY29kZSI6Ijk3MiIsImNvZGVSZWdpb24iOiIwMiJ9LHsibm9tIjoiR3V5YW5lIiwiY29kZSI6Ijk3MyIsImNvZGVSZWdpb24iOiIwMyJ9LHsibm9tIjoiTGEgUsOpdW5pb24iLCJjb2RlIjoiOTc0IiwiY29kZVJlZ2lvbiI6IjA0In0seyJub20iOiJNYXlvdHRlIiwiY29kZSI6Ijk3NiIsImNvZGVSZWdpb24iOiIwNiJ9LHsibm9tIjoiU2FpbnQtUGllcnJlLWV0LU1pcXVlbG9uIiwiY29kZSI6Ijk3NSIsImNvZGVSZWdpb24iOiI5NzUifSx7Im5vbSI6IlNhaW50LUJhcnRow6lsZW15IiwiY29kZSI6Ijk3NyIsImNvZGVSZWdpb24iOiI5NzcifSx7Im5vbSI6IlNhaW50LU1hcnRpbiIsImNvZGUiOiI5NzgiLCJjb2RlUmVnaW9uIjoiOTc4In0seyJub20iOiJUZXJyZXMgYXVzdHJhbGVzIGV0IGFudGFyY3RpcXVlcyBmcmFuw6dhaXNlcyIsImNvZGUiOiI5ODQiLCJjb2RlUmVnaW9uIjoiOTg0In0seyJub20iOiJXYWxsaXMgZXQgRnV0dW5hIiwiY29kZSI6Ijk4NiIsImNvZGVSZWdpb24iOiI5ODYifSx7Im5vbSI6IlBvbHluw6lzaWUgZnJhbsOnYWlzZSIsImNvZGUiOiI5ODciLCJjb2RlUmVnaW9uIjoiOTg3In0seyJub20iOiJOb3V2ZWxsZS1DYWzDqWRvbmllIiwiY29kZSI6Ijk4OCIsImNvZGVSZWdpb24iOiI5ODgifSx7Im5vbSI6IsOObGUgZGUgQ2xpcHBlcnRvbiIsImNvZGUiOiI5ODkiLCJjb2RlUmVnaW9uIjoiOTg5In1d
+  recorded_at: Wed, 22 Feb 2023 14:57:34 GMT
 - request:
     method: get
     uri: https://geo.api.gouv.fr/regions
@@ -57,7 +57,7 @@ http_interactions:
       Server:
       - nginx/1.10.3 (Ubuntu)
       Date:
-      - Tue, 20 Dec 2022 22:45:29 GMT
+      - Wed, 22 Feb 2023 14:57:34 GMT
       Content-Type:
       - application/json; charset=utf-8
       Content-Length:
@@ -75,5 +75,5 @@ http_interactions:
       encoding: ASCII-8BIT
       string: !binary |-
         W3sibm9tIjoiw45sZS1kZS1GcmFuY2UiLCJjb2RlIjoiMTEifSx7Im5vbSI6IkNlbnRyZS1WYWwgZGUgTG9pcmUiLCJjb2RlIjoiMjQifSx7Im5vbSI6IkJvdXJnb2duZS1GcmFuY2hlLUNvbXTDqSIsImNvZGUiOiIyNyJ9LHsibm9tIjoiTm9ybWFuZGllIiwiY29kZSI6IjI4In0seyJub20iOiJIYXV0cy1kZS1GcmFuY2UiLCJjb2RlIjoiMzIifSx7Im5vbSI6IkdyYW5kIEVzdCIsImNvZGUiOiI0NCJ9LHsibm9tIjoiUGF5cyBkZSBsYSBMb2lyZSIsImNvZGUiOiI1MiJ9LHsibm9tIjoiQnJldGFnbmUiLCJjb2RlIjoiNTMifSx7Im5vbSI6Ik5vdXZlbGxlLUFxdWl0YWluZSIsImNvZGUiOiI3NSJ9LHsibm9tIjoiT2NjaXRhbmllIiwiY29kZSI6Ijc2In0seyJub20iOiJBdXZlcmduZS1SaMO0bmUtQWxwZXMiLCJjb2RlIjoiODQifSx7Im5vbSI6IlByb3ZlbmNlLUFscGVzLUPDtHRlIGQnQXp1ciIsImNvZGUiOiI5MyJ9LHsibm9tIjoiQ29yc2UiLCJjb2RlIjoiOTQifSx7Im5vbSI6Ikd1YWRlbG91cGUiLCJjb2RlIjoiMDEifSx7Im5vbSI6Ik1hcnRpbmlxdWUiLCJjb2RlIjoiMDIifSx7Im5vbSI6Ikd1eWFuZSIsImNvZGUiOiIwMyJ9LHsibm9tIjoiTGEgUsOpdW5pb24iLCJjb2RlIjoiMDQifSx7Im5vbSI6Ik1heW90dGUiLCJjb2RlIjoiMDYifV0=
-  recorded_at: Tue, 20 Dec 2022 22:45:29 GMT
+  recorded_at: Wed, 22 Feb 2023 14:57:34 GMT
 recorded_with: VCR 6.1.0
diff --git a/spec/fixtures/cassettes/api_geo_departements.yml b/spec/fixtures/cassettes/api_geo_departements.yml
index 9f5f79d6e..79c3de62b 100644
--- a/spec/fixtures/cassettes/api_geo_departements.yml
+++ b/spec/fixtures/cassettes/api_geo_departements.yml
@@ -2,7 +2,7 @@
 http_interactions:
 - request:
     method: get
-    uri: https://geo.api.gouv.fr/departements
+    uri: https://geo.api.gouv.fr/departements?zone=metro,drom,com
     body:
       encoding: US-ASCII
       string: ''
@@ -19,23 +19,23 @@ http_interactions:
       Server:
       - nginx/1.10.3 (Ubuntu)
       Date:
-      - Tue, 20 Dec 2022 11:55:45 GMT
+      - Wed, 22 Feb 2023 14:46:29 GMT
       Content-Type:
       - application/json; charset=utf-8
       Content-Length:
-      - '5083'
+      - '5598'
       Vary:
       - Accept-Encoding
       - Origin
       X-Powered-By:
       - Express
       Etag:
-      - W/"13db-vyFtsKQWjHylHAtBtjYjxCAjMHE"
+      - W/"15de-6bFFP56x7MMvD1C1JvzSgcLzQWw"
       Strict-Transport-Security:
       - max-age=15552000
     body:
       encoding: ASCII-8BIT
       string: !binary |-
-        W3sibm9tIjoiQWluIiwiY29kZSI6IjAxIiwiY29kZVJlZ2lvbiI6Ijg0In0seyJub20iOiJBaXNuZSIsImNvZGUiOiIwMiIsImNvZGVSZWdpb24iOiIzMiJ9LHsibm9tIjoiQWxsaWVyIiwiY29kZSI6IjAzIiwiY29kZVJlZ2lvbiI6Ijg0In0seyJub20iOiJBbHBlcy1kZS1IYXV0ZS1Qcm92ZW5jZSIsImNvZGUiOiIwNCIsImNvZGVSZWdpb24iOiI5MyJ9LHsibm9tIjoiSGF1dGVzLUFscGVzIiwiY29kZSI6IjA1IiwiY29kZVJlZ2lvbiI6IjkzIn0seyJub20iOiJBbHBlcy1NYXJpdGltZXMiLCJjb2RlIjoiMDYiLCJjb2RlUmVnaW9uIjoiOTMifSx7Im5vbSI6IkFyZMOoY2hlIiwiY29kZSI6IjA3IiwiY29kZVJlZ2lvbiI6Ijg0In0seyJub20iOiJBcmRlbm5lcyIsImNvZGUiOiIwOCIsImNvZGVSZWdpb24iOiI0NCJ9LHsibm9tIjoiQXJpw6hnZSIsImNvZGUiOiIwOSIsImNvZGVSZWdpb24iOiI3NiJ9LHsibm9tIjoiQXViZSIsImNvZGUiOiIxMCIsImNvZGVSZWdpb24iOiI0NCJ9LHsibm9tIjoiQXVkZSIsImNvZGUiOiIxMSIsImNvZGVSZWdpb24iOiI3NiJ9LHsibm9tIjoiQXZleXJvbiIsImNvZGUiOiIxMiIsImNvZGVSZWdpb24iOiI3NiJ9LHsibm9tIjoiQm91Y2hlcy1kdS1SaMO0bmUiLCJjb2RlIjoiMTMiLCJjb2RlUmVnaW9uIjoiOTMifSx7Im5vbSI6IkNhbHZhZG9zIiwiY29kZSI6IjE0IiwiY29kZVJlZ2lvbiI6IjI4In0seyJub20iOiJDYW50YWwiLCJjb2RlIjoiMTUiLCJjb2RlUmVnaW9uIjoiODQifSx7Im5vbSI6IkNoYXJlbnRlIiwiY29kZSI6IjE2IiwiY29kZVJlZ2lvbiI6Ijc1In0seyJub20iOiJDaGFyZW50ZS1NYXJpdGltZSIsImNvZGUiOiIxNyIsImNvZGVSZWdpb24iOiI3NSJ9LHsibm9tIjoiQ2hlciIsImNvZGUiOiIxOCIsImNvZGVSZWdpb24iOiIyNCJ9LHsibm9tIjoiQ29ycsOoemUiLCJjb2RlIjoiMTkiLCJjb2RlUmVnaW9uIjoiNzUifSx7Im5vbSI6IkPDtHRlLWQnT3IiLCJjb2RlIjoiMjEiLCJjb2RlUmVnaW9uIjoiMjcifSx7Im5vbSI6IkPDtHRlcy1kJ0FybW9yIiwiY29kZSI6IjIyIiwiY29kZVJlZ2lvbiI6IjUzIn0seyJub20iOiJDcmV1c2UiLCJjb2RlIjoiMjMiLCJjb2RlUmVnaW9uIjoiNzUifSx7Im5vbSI6IkRvcmRvZ25lIiwiY29kZSI6IjI0IiwiY29kZVJlZ2lvbiI6Ijc1In0seyJub20iOiJEb3VicyIsImNvZGUiOiIyNSIsImNvZGVSZWdpb24iOiIyNyJ9LHsibm9tIjoiRHLDtG1lIiwiY29kZSI6IjI2IiwiY29kZVJlZ2lvbiI6Ijg0In0seyJub20iOiJFdXJlIiwiY29kZSI6IjI3IiwiY29kZVJlZ2lvbiI6IjI4In0seyJub20iOiJFdXJlLWV0LUxvaXIiLCJjb2RlIjoiMjgiLCJjb2RlUmVnaW9uIjoiMjQifSx7Im5vbSI6IkZpbmlzdMOocmUiLCJjb2RlIjoiMjkiLCJjb2RlUmVnaW9uIjoiNTMifSx7Im5vbSI6IkNvcnNlLWR1LVN1ZCIsImNvZGUiOiIyQSIsImNvZGVSZWdpb24iOiI5NCJ9LHsibm9tIjoiSGF1dGUtQ29yc2UiLCJjb2RlIjoiMkIiLCJjb2RlUmVnaW9uIjoiOTQifSx7Im5vbSI6IkdhcmQiLCJjb2RlIjoiMzAiLCJjb2RlUmVnaW9uIjoiNzYifSx7Im5vbSI6IkhhdXRlLUdhcm9ubmUiLCJjb2RlIjoiMzEiLCJjb2RlUmVnaW9uIjoiNzYifSx7Im5vbSI6IkdlcnMiLCJjb2RlIjoiMzIiLCJjb2RlUmVnaW9uIjoiNzYifSx7Im5vbSI6Ikdpcm9uZGUiLCJjb2RlIjoiMzMiLCJjb2RlUmVnaW9uIjoiNzUifSx7Im5vbSI6IkjDqXJhdWx0IiwiY29kZSI6IjM0IiwiY29kZVJlZ2lvbiI6Ijc2In0seyJub20iOiJJbGxlLWV0LVZpbGFpbmUiLCJjb2RlIjoiMzUiLCJjb2RlUmVnaW9uIjoiNTMifSx7Im5vbSI6IkluZHJlIiwiY29kZSI6IjM2IiwiY29kZVJlZ2lvbiI6IjI0In0seyJub20iOiJJbmRyZS1ldC1Mb2lyZSIsImNvZGUiOiIzNyIsImNvZGVSZWdpb24iOiIyNCJ9LHsibm9tIjoiSXPDqHJlIiwiY29kZSI6IjM4IiwiY29kZVJlZ2lvbiI6Ijg0In0seyJub20iOiJKdXJhIiwiY29kZSI6IjM5IiwiY29kZVJlZ2lvbiI6IjI3In0seyJub20iOiJMYW5kZXMiLCJjb2RlIjoiNDAiLCJjb2RlUmVnaW9uIjoiNzUifSx7Im5vbSI6IkxvaXItZXQtQ2hlciIsImNvZGUiOiI0MSIsImNvZGVSZWdpb24iOiIyNCJ9LHsibm9tIjoiTG9pcmUiLCJjb2RlIjoiNDIiLCJjb2RlUmVnaW9uIjoiODQifSx7Im5vbSI6IkhhdXRlLUxvaXJlIiwiY29kZSI6IjQzIiwiY29kZVJlZ2lvbiI6Ijg0In0seyJub20iOiJMb2lyZS1BdGxhbnRpcXVlIiwiY29kZSI6IjQ0IiwiY29kZVJlZ2lvbiI6IjUyIn0seyJub20iOiJMb2lyZXQiLCJjb2RlIjoiNDUiLCJjb2RlUmVnaW9uIjoiMjQifSx7Im5vbSI6IkxvdCIsImNvZGUiOiI0NiIsImNvZGVSZWdpb24iOiI3NiJ9LHsibm9tIjoiTG90LWV0LUdhcm9ubmUiLCJjb2RlIjoiNDciLCJjb2RlUmVnaW9uIjoiNzUifSx7Im5vbSI6IkxvesOocmUiLCJjb2RlIjoiNDgiLCJjb2RlUmVnaW9uIjoiNzYifSx7Im5vbSI6Ik1haW5lLWV0LUxvaXJlIiwiY29kZSI6IjQ5IiwiY29kZVJlZ2lvbiI6IjUyIn0seyJub20iOiJNYW5jaGUiLCJjb2RlIjoiNTAiLCJjb2RlUmVnaW9uIjoiMjgifSx7Im5vbSI6Ik1hcm5lIiwiY29kZSI6IjUxIiwiY29kZVJlZ2lvbiI6IjQ0In0seyJub20iOiJIYXV0ZS1NYXJuZSIsImNvZGUiOiI1MiIsImNvZGVSZWdpb24iOiI0NCJ9LHsibm9tIjoiTWF5ZW5uZSIsImNvZGUiOiI1MyIsImNvZGVSZWdpb24iOiI1MiJ9LHsibm9tIjoiTWV1cnRoZS1ldC1Nb3NlbGxlIiwiY29kZSI6IjU0IiwiY29kZVJlZ2lvbiI6IjQ0In0seyJub20iOiJNZXVzZSIsImNvZGUiOiI1NSIsImNvZGVSZWdpb24iOiI0NCJ9LHsibm9tIjoiTW9yYmloYW4iLCJjb2RlIjoiNTYiLCJjb2RlUmVnaW9uIjoiNTMifSx7Im5vbSI6Ik1vc2VsbGUiLCJjb2RlIjoiNTciLCJjb2RlUmVnaW9uIjoiNDQifSx7Im5vbSI6Ik5pw6h2cmUiLCJjb2RlIjoiNTgiLCJjb2RlUmVnaW9uIjoiMjcifSx7Im5vbSI6Ik5vcmQiLCJjb2RlIjoiNTkiLCJjb2RlUmVnaW9uIjoiMzIifSx7Im5vbSI6Ik9pc2UiLCJjb2RlIjoiNjAiLCJjb2RlUmVnaW9uIjoiMzIifSx7Im5vbSI6Ik9ybmUiLCJjb2RlIjoiNjEiLCJjb2RlUmVnaW9uIjoiMjgifSx7Im5vbSI6IlBhcy1kZS1DYWxhaXMiLCJjb2RlIjoiNjIiLCJjb2RlUmVnaW9uIjoiMzIifSx7Im5vbSI6IlB1eS1kZS1Ew7RtZSIsImNvZGUiOiI2MyIsImNvZGVSZWdpb24iOiI4NCJ9LHsibm9tIjoiUHlyw6luw6llcy1BdGxhbnRpcXVlcyIsImNvZGUiOiI2NCIsImNvZGVSZWdpb24iOiI3NSJ9LHsibm9tIjoiSGF1dGVzLVB5csOpbsOpZXMiLCJjb2RlIjoiNjUiLCJjb2RlUmVnaW9uIjoiNzYifSx7Im5vbSI6IlB5csOpbsOpZXMtT3JpZW50YWxlcyIsImNvZGUiOiI2NiIsImNvZGVSZWdpb24iOiI3NiJ9LHsibm9tIjoiQmFzLVJoaW4iLCJjb2RlIjoiNjciLCJjb2RlUmVnaW9uIjoiNDQifSx7Im5vbSI6IkhhdXQtUmhpbiIsImNvZGUiOiI2OCIsImNvZGVSZWdpb24iOiI0NCJ9LHsibm9tIjoiUmjDtG5lIiwiY29kZSI6IjY5IiwiY29kZVJlZ2lvbiI6Ijg0In0seyJub20iOiJIYXV0ZS1TYcO0bmUiLCJjb2RlIjoiNzAiLCJjb2RlUmVnaW9uIjoiMjcifSx7Im5vbSI6IlNhw7RuZS1ldC1Mb2lyZSIsImNvZGUiOiI3MSIsImNvZGVSZWdpb24iOiIyNyJ9LHsibm9tIjoiU2FydGhlIiwiY29kZSI6IjcyIiwiY29kZVJlZ2lvbiI6IjUyIn0seyJub20iOiJTYXZvaWUiLCJjb2RlIjoiNzMiLCJjb2RlUmVnaW9uIjoiODQifSx7Im5vbSI6IkhhdXRlLVNhdm9pZSIsImNvZGUiOiI3NCIsImNvZGVSZWdpb24iOiI4NCJ9LHsibm9tIjoiUGFyaXMiLCJjb2RlIjoiNzUiLCJjb2RlUmVnaW9uIjoiMTEifSx7Im5vbSI6IlNlaW5lLU1hcml0aW1lIiwiY29kZSI6Ijc2IiwiY29kZVJlZ2lvbiI6IjI4In0seyJub20iOiJTZWluZS1ldC1NYXJuZSIsImNvZGUiOiI3NyIsImNvZGVSZWdpb24iOiIxMSJ9LHsibm9tIjoiWXZlbGluZXMiLCJjb2RlIjoiNzgiLCJjb2RlUmVnaW9uIjoiMTEifSx7Im5vbSI6IkRldXgtU8OodnJlcyIsImNvZGUiOiI3OSIsImNvZGVSZWdpb24iOiI3NSJ9LHsibm9tIjoiU29tbWUiLCJjb2RlIjoiODAiLCJjb2RlUmVnaW9uIjoiMzIifSx7Im5vbSI6IlRhcm4iLCJjb2RlIjoiODEiLCJjb2RlUmVnaW9uIjoiNzYifSx7Im5vbSI6IlRhcm4tZXQtR2Fyb25uZSIsImNvZGUiOiI4MiIsImNvZGVSZWdpb24iOiI3NiJ9LHsibm9tIjoiVmFyIiwiY29kZSI6IjgzIiwiY29kZVJlZ2lvbiI6IjkzIn0seyJub20iOiJWYXVjbHVzZSIsImNvZGUiOiI4NCIsImNvZGVSZWdpb24iOiI5MyJ9LHsibm9tIjoiVmVuZMOpZSIsImNvZGUiOiI4NSIsImNvZGVSZWdpb24iOiI1MiJ9LHsibm9tIjoiVmllbm5lIiwiY29kZSI6Ijg2IiwiY29kZVJlZ2lvbiI6Ijc1In0seyJub20iOiJIYXV0ZS1WaWVubmUiLCJjb2RlIjoiODciLCJjb2RlUmVnaW9uIjoiNzUifSx7Im5vbSI6IlZvc2dlcyIsImNvZGUiOiI4OCIsImNvZGVSZWdpb24iOiI0NCJ9LHsibm9tIjoiWW9ubmUiLCJjb2RlIjoiODkiLCJjb2RlUmVnaW9uIjoiMjcifSx7Im5vbSI6IlRlcnJpdG9pcmUgZGUgQmVsZm9ydCIsImNvZGUiOiI5MCIsImNvZGVSZWdpb24iOiIyNyJ9LHsibm9tIjoiRXNzb25uZSIsImNvZGUiOiI5MSIsImNvZGVSZWdpb24iOiIxMSJ9LHsibm9tIjoiSGF1dHMtZGUtU2VpbmUiLCJjb2RlIjoiOTIiLCJjb2RlUmVnaW9uIjoiMTEifSx7Im5vbSI6IlNlaW5lLVNhaW50LURlbmlzIiwiY29kZSI6IjkzIiwiY29kZVJlZ2lvbiI6IjExIn0seyJub20iOiJWYWwtZGUtTWFybmUiLCJjb2RlIjoiOTQiLCJjb2RlUmVnaW9uIjoiMTEifSx7Im5vbSI6IlZhbC1kJ09pc2UiLCJjb2RlIjoiOTUiLCJjb2RlUmVnaW9uIjoiMTEifSx7Im5vbSI6Ikd1YWRlbG91cGUiLCJjb2RlIjoiOTcxIiwiY29kZVJlZ2lvbiI6IjAxIn0seyJub20iOiJNYXJ0aW5pcXVlIiwiY29kZSI6Ijk3MiIsImNvZGVSZWdpb24iOiIwMiJ9LHsibm9tIjoiR3V5YW5lIiwiY29kZSI6Ijk3MyIsImNvZGVSZWdpb24iOiIwMyJ9LHsibm9tIjoiTGEgUsOpdW5pb24iLCJjb2RlIjoiOTc0IiwiY29kZVJlZ2lvbiI6IjA0In0seyJub20iOiJNYXlvdHRlIiwiY29kZSI6Ijk3NiIsImNvZGVSZWdpb24iOiIwNiJ9XQ==
-  recorded_at: Tue, 20 Dec 2022 11:55:45 GMT
+        W3sibm9tIjoiQWluIiwiY29kZSI6IjAxIiwiY29kZVJlZ2lvbiI6Ijg0In0seyJub20iOiJBaXNuZSIsImNvZGUiOiIwMiIsImNvZGVSZWdpb24iOiIzMiJ9LHsibm9tIjoiQWxsaWVyIiwiY29kZSI6IjAzIiwiY29kZVJlZ2lvbiI6Ijg0In0seyJub20iOiJBbHBlcy1kZS1IYXV0ZS1Qcm92ZW5jZSIsImNvZGUiOiIwNCIsImNvZGVSZWdpb24iOiI5MyJ9LHsibm9tIjoiSGF1dGVzLUFscGVzIiwiY29kZSI6IjA1IiwiY29kZVJlZ2lvbiI6IjkzIn0seyJub20iOiJBbHBlcy1NYXJpdGltZXMiLCJjb2RlIjoiMDYiLCJjb2RlUmVnaW9uIjoiOTMifSx7Im5vbSI6IkFyZMOoY2hlIiwiY29kZSI6IjA3IiwiY29kZVJlZ2lvbiI6Ijg0In0seyJub20iOiJBcmRlbm5lcyIsImNvZGUiOiIwOCIsImNvZGVSZWdpb24iOiI0NCJ9LHsibm9tIjoiQXJpw6hnZSIsImNvZGUiOiIwOSIsImNvZGVSZWdpb24iOiI3NiJ9LHsibm9tIjoiQXViZSIsImNvZGUiOiIxMCIsImNvZGVSZWdpb24iOiI0NCJ9LHsibm9tIjoiQXVkZSIsImNvZGUiOiIxMSIsImNvZGVSZWdpb24iOiI3NiJ9LHsibm9tIjoiQXZleXJvbiIsImNvZGUiOiIxMiIsImNvZGVSZWdpb24iOiI3NiJ9LHsibm9tIjoiQm91Y2hlcy1kdS1SaMO0bmUiLCJjb2RlIjoiMTMiLCJjb2RlUmVnaW9uIjoiOTMifSx7Im5vbSI6IkNhbHZhZG9zIiwiY29kZSI6IjE0IiwiY29kZVJlZ2lvbiI6IjI4In0seyJub20iOiJDYW50YWwiLCJjb2RlIjoiMTUiLCJjb2RlUmVnaW9uIjoiODQifSx7Im5vbSI6IkNoYXJlbnRlIiwiY29kZSI6IjE2IiwiY29kZVJlZ2lvbiI6Ijc1In0seyJub20iOiJDaGFyZW50ZS1NYXJpdGltZSIsImNvZGUiOiIxNyIsImNvZGVSZWdpb24iOiI3NSJ9LHsibm9tIjoiQ2hlciIsImNvZGUiOiIxOCIsImNvZGVSZWdpb24iOiIyNCJ9LHsibm9tIjoiQ29ycsOoemUiLCJjb2RlIjoiMTkiLCJjb2RlUmVnaW9uIjoiNzUifSx7Im5vbSI6IkPDtHRlLWQnT3IiLCJjb2RlIjoiMjEiLCJjb2RlUmVnaW9uIjoiMjcifSx7Im5vbSI6IkPDtHRlcy1kJ0FybW9yIiwiY29kZSI6IjIyIiwiY29kZVJlZ2lvbiI6IjUzIn0seyJub20iOiJDcmV1c2UiLCJjb2RlIjoiMjMiLCJjb2RlUmVnaW9uIjoiNzUifSx7Im5vbSI6IkRvcmRvZ25lIiwiY29kZSI6IjI0IiwiY29kZVJlZ2lvbiI6Ijc1In0seyJub20iOiJEb3VicyIsImNvZGUiOiIyNSIsImNvZGVSZWdpb24iOiIyNyJ9LHsibm9tIjoiRHLDtG1lIiwiY29kZSI6IjI2IiwiY29kZVJlZ2lvbiI6Ijg0In0seyJub20iOiJFdXJlIiwiY29kZSI6IjI3IiwiY29kZVJlZ2lvbiI6IjI4In0seyJub20iOiJFdXJlLWV0LUxvaXIiLCJjb2RlIjoiMjgiLCJjb2RlUmVnaW9uIjoiMjQifSx7Im5vbSI6IkZpbmlzdMOocmUiLCJjb2RlIjoiMjkiLCJjb2RlUmVnaW9uIjoiNTMifSx7Im5vbSI6IkNvcnNlLWR1LVN1ZCIsImNvZGUiOiIyQSIsImNvZGVSZWdpb24iOiI5NCJ9LHsibm9tIjoiSGF1dGUtQ29yc2UiLCJjb2RlIjoiMkIiLCJjb2RlUmVnaW9uIjoiOTQifSx7Im5vbSI6IkdhcmQiLCJjb2RlIjoiMzAiLCJjb2RlUmVnaW9uIjoiNzYifSx7Im5vbSI6IkhhdXRlLUdhcm9ubmUiLCJjb2RlIjoiMzEiLCJjb2RlUmVnaW9uIjoiNzYifSx7Im5vbSI6IkdlcnMiLCJjb2RlIjoiMzIiLCJjb2RlUmVnaW9uIjoiNzYifSx7Im5vbSI6Ikdpcm9uZGUiLCJjb2RlIjoiMzMiLCJjb2RlUmVnaW9uIjoiNzUifSx7Im5vbSI6IkjDqXJhdWx0IiwiY29kZSI6IjM0IiwiY29kZVJlZ2lvbiI6Ijc2In0seyJub20iOiJJbGxlLWV0LVZpbGFpbmUiLCJjb2RlIjoiMzUiLCJjb2RlUmVnaW9uIjoiNTMifSx7Im5vbSI6IkluZHJlIiwiY29kZSI6IjM2IiwiY29kZVJlZ2lvbiI6IjI0In0seyJub20iOiJJbmRyZS1ldC1Mb2lyZSIsImNvZGUiOiIzNyIsImNvZGVSZWdpb24iOiIyNCJ9LHsibm9tIjoiSXPDqHJlIiwiY29kZSI6IjM4IiwiY29kZVJlZ2lvbiI6Ijg0In0seyJub20iOiJKdXJhIiwiY29kZSI6IjM5IiwiY29kZVJlZ2lvbiI6IjI3In0seyJub20iOiJMYW5kZXMiLCJjb2RlIjoiNDAiLCJjb2RlUmVnaW9uIjoiNzUifSx7Im5vbSI6IkxvaXItZXQtQ2hlciIsImNvZGUiOiI0MSIsImNvZGVSZWdpb24iOiIyNCJ9LHsibm9tIjoiTG9pcmUiLCJjb2RlIjoiNDIiLCJjb2RlUmVnaW9uIjoiODQifSx7Im5vbSI6IkhhdXRlLUxvaXJlIiwiY29kZSI6IjQzIiwiY29kZVJlZ2lvbiI6Ijg0In0seyJub20iOiJMb2lyZS1BdGxhbnRpcXVlIiwiY29kZSI6IjQ0IiwiY29kZVJlZ2lvbiI6IjUyIn0seyJub20iOiJMb2lyZXQiLCJjb2RlIjoiNDUiLCJjb2RlUmVnaW9uIjoiMjQifSx7Im5vbSI6IkxvdCIsImNvZGUiOiI0NiIsImNvZGVSZWdpb24iOiI3NiJ9LHsibm9tIjoiTG90LWV0LUdhcm9ubmUiLCJjb2RlIjoiNDciLCJjb2RlUmVnaW9uIjoiNzUifSx7Im5vbSI6IkxvesOocmUiLCJjb2RlIjoiNDgiLCJjb2RlUmVnaW9uIjoiNzYifSx7Im5vbSI6Ik1haW5lLWV0LUxvaXJlIiwiY29kZSI6IjQ5IiwiY29kZVJlZ2lvbiI6IjUyIn0seyJub20iOiJNYW5jaGUiLCJjb2RlIjoiNTAiLCJjb2RlUmVnaW9uIjoiMjgifSx7Im5vbSI6Ik1hcm5lIiwiY29kZSI6IjUxIiwiY29kZVJlZ2lvbiI6IjQ0In0seyJub20iOiJIYXV0ZS1NYXJuZSIsImNvZGUiOiI1MiIsImNvZGVSZWdpb24iOiI0NCJ9LHsibm9tIjoiTWF5ZW5uZSIsImNvZGUiOiI1MyIsImNvZGVSZWdpb24iOiI1MiJ9LHsibm9tIjoiTWV1cnRoZS1ldC1Nb3NlbGxlIiwiY29kZSI6IjU0IiwiY29kZVJlZ2lvbiI6IjQ0In0seyJub20iOiJNZXVzZSIsImNvZGUiOiI1NSIsImNvZGVSZWdpb24iOiI0NCJ9LHsibm9tIjoiTW9yYmloYW4iLCJjb2RlIjoiNTYiLCJjb2RlUmVnaW9uIjoiNTMifSx7Im5vbSI6Ik1vc2VsbGUiLCJjb2RlIjoiNTciLCJjb2RlUmVnaW9uIjoiNDQifSx7Im5vbSI6Ik5pw6h2cmUiLCJjb2RlIjoiNTgiLCJjb2RlUmVnaW9uIjoiMjcifSx7Im5vbSI6Ik5vcmQiLCJjb2RlIjoiNTkiLCJjb2RlUmVnaW9uIjoiMzIifSx7Im5vbSI6Ik9pc2UiLCJjb2RlIjoiNjAiLCJjb2RlUmVnaW9uIjoiMzIifSx7Im5vbSI6Ik9ybmUiLCJjb2RlIjoiNjEiLCJjb2RlUmVnaW9uIjoiMjgifSx7Im5vbSI6IlBhcy1kZS1DYWxhaXMiLCJjb2RlIjoiNjIiLCJjb2RlUmVnaW9uIjoiMzIifSx7Im5vbSI6IlB1eS1kZS1Ew7RtZSIsImNvZGUiOiI2MyIsImNvZGVSZWdpb24iOiI4NCJ9LHsibm9tIjoiUHlyw6luw6llcy1BdGxhbnRpcXVlcyIsImNvZGUiOiI2NCIsImNvZGVSZWdpb24iOiI3NSJ9LHsibm9tIjoiSGF1dGVzLVB5csOpbsOpZXMiLCJjb2RlIjoiNjUiLCJjb2RlUmVnaW9uIjoiNzYifSx7Im5vbSI6IlB5csOpbsOpZXMtT3JpZW50YWxlcyIsImNvZGUiOiI2NiIsImNvZGVSZWdpb24iOiI3NiJ9LHsibm9tIjoiQmFzLVJoaW4iLCJjb2RlIjoiNjciLCJjb2RlUmVnaW9uIjoiNDQifSx7Im5vbSI6IkhhdXQtUmhpbiIsImNvZGUiOiI2OCIsImNvZGVSZWdpb24iOiI0NCJ9LHsibm9tIjoiUmjDtG5lIiwiY29kZSI6IjY5IiwiY29kZVJlZ2lvbiI6Ijg0In0seyJub20iOiJIYXV0ZS1TYcO0bmUiLCJjb2RlIjoiNzAiLCJjb2RlUmVnaW9uIjoiMjcifSx7Im5vbSI6IlNhw7RuZS1ldC1Mb2lyZSIsImNvZGUiOiI3MSIsImNvZGVSZWdpb24iOiIyNyJ9LHsibm9tIjoiU2FydGhlIiwiY29kZSI6IjcyIiwiY29kZVJlZ2lvbiI6IjUyIn0seyJub20iOiJTYXZvaWUiLCJjb2RlIjoiNzMiLCJjb2RlUmVnaW9uIjoiODQifSx7Im5vbSI6IkhhdXRlLVNhdm9pZSIsImNvZGUiOiI3NCIsImNvZGVSZWdpb24iOiI4NCJ9LHsibm9tIjoiUGFyaXMiLCJjb2RlIjoiNzUiLCJjb2RlUmVnaW9uIjoiMTEifSx7Im5vbSI6IlNlaW5lLU1hcml0aW1lIiwiY29kZSI6Ijc2IiwiY29kZVJlZ2lvbiI6IjI4In0seyJub20iOiJTZWluZS1ldC1NYXJuZSIsImNvZGUiOiI3NyIsImNvZGVSZWdpb24iOiIxMSJ9LHsibm9tIjoiWXZlbGluZXMiLCJjb2RlIjoiNzgiLCJjb2RlUmVnaW9uIjoiMTEifSx7Im5vbSI6IkRldXgtU8OodnJlcyIsImNvZGUiOiI3OSIsImNvZGVSZWdpb24iOiI3NSJ9LHsibm9tIjoiU29tbWUiLCJjb2RlIjoiODAiLCJjb2RlUmVnaW9uIjoiMzIifSx7Im5vbSI6IlRhcm4iLCJjb2RlIjoiODEiLCJjb2RlUmVnaW9uIjoiNzYifSx7Im5vbSI6IlRhcm4tZXQtR2Fyb25uZSIsImNvZGUiOiI4MiIsImNvZGVSZWdpb24iOiI3NiJ9LHsibm9tIjoiVmFyIiwiY29kZSI6IjgzIiwiY29kZVJlZ2lvbiI6IjkzIn0seyJub20iOiJWYXVjbHVzZSIsImNvZGUiOiI4NCIsImNvZGVSZWdpb24iOiI5MyJ9LHsibm9tIjoiVmVuZMOpZSIsImNvZGUiOiI4NSIsImNvZGVSZWdpb24iOiI1MiJ9LHsibm9tIjoiVmllbm5lIiwiY29kZSI6Ijg2IiwiY29kZVJlZ2lvbiI6Ijc1In0seyJub20iOiJIYXV0ZS1WaWVubmUiLCJjb2RlIjoiODciLCJjb2RlUmVnaW9uIjoiNzUifSx7Im5vbSI6IlZvc2dlcyIsImNvZGUiOiI4OCIsImNvZGVSZWdpb24iOiI0NCJ9LHsibm9tIjoiWW9ubmUiLCJjb2RlIjoiODkiLCJjb2RlUmVnaW9uIjoiMjcifSx7Im5vbSI6IlRlcnJpdG9pcmUgZGUgQmVsZm9ydCIsImNvZGUiOiI5MCIsImNvZGVSZWdpb24iOiIyNyJ9LHsibm9tIjoiRXNzb25uZSIsImNvZGUiOiI5MSIsImNvZGVSZWdpb24iOiIxMSJ9LHsibm9tIjoiSGF1dHMtZGUtU2VpbmUiLCJjb2RlIjoiOTIiLCJjb2RlUmVnaW9uIjoiMTEifSx7Im5vbSI6IlNlaW5lLVNhaW50LURlbmlzIiwiY29kZSI6IjkzIiwiY29kZVJlZ2lvbiI6IjExIn0seyJub20iOiJWYWwtZGUtTWFybmUiLCJjb2RlIjoiOTQiLCJjb2RlUmVnaW9uIjoiMTEifSx7Im5vbSI6IlZhbC1kJ09pc2UiLCJjb2RlIjoiOTUiLCJjb2RlUmVnaW9uIjoiMTEifSx7Im5vbSI6Ikd1YWRlbG91cGUiLCJjb2RlIjoiOTcxIiwiY29kZVJlZ2lvbiI6IjAxIn0seyJub20iOiJNYXJ0aW5pcXVlIiwiY29kZSI6Ijk3MiIsImNvZGVSZWdpb24iOiIwMiJ9LHsibm9tIjoiR3V5YW5lIiwiY29kZSI6Ijk3MyIsImNvZGVSZWdpb24iOiIwMyJ9LHsibm9tIjoiTGEgUsOpdW5pb24iLCJjb2RlIjoiOTc0IiwiY29kZVJlZ2lvbiI6IjA0In0seyJub20iOiJNYXlvdHRlIiwiY29kZSI6Ijk3NiIsImNvZGVSZWdpb24iOiIwNiJ9LHsibm9tIjoiU2FpbnQtUGllcnJlLWV0LU1pcXVlbG9uIiwiY29kZSI6Ijk3NSIsImNvZGVSZWdpb24iOiI5NzUifSx7Im5vbSI6IlNhaW50LUJhcnRow6lsZW15IiwiY29kZSI6Ijk3NyIsImNvZGVSZWdpb24iOiI5NzcifSx7Im5vbSI6IlNhaW50LU1hcnRpbiIsImNvZGUiOiI5NzgiLCJjb2RlUmVnaW9uIjoiOTc4In0seyJub20iOiJUZXJyZXMgYXVzdHJhbGVzIGV0IGFudGFyY3RpcXVlcyBmcmFuw6dhaXNlcyIsImNvZGUiOiI5ODQiLCJjb2RlUmVnaW9uIjoiOTg0In0seyJub20iOiJXYWxsaXMgZXQgRnV0dW5hIiwiY29kZSI6Ijk4NiIsImNvZGVSZWdpb24iOiI5ODYifSx7Im5vbSI6IlBvbHluw6lzaWUgZnJhbsOnYWlzZSIsImNvZGUiOiI5ODciLCJjb2RlUmVnaW9uIjoiOTg3In0seyJub20iOiJOb3V2ZWxsZS1DYWzDqWRvbmllIiwiY29kZSI6Ijk4OCIsImNvZGVSZWdpb24iOiI5ODgifSx7Im5vbSI6IsOObGUgZGUgQ2xpcHBlcnRvbiIsImNvZGUiOiI5ODkiLCJjb2RlUmVnaW9uIjoiOTg5In1d
+  recorded_at: Wed, 22 Feb 2023 14:46:29 GMT
 recorded_with: VCR 6.1.0
diff --git a/spec/services/api_geo_service_spec.rb b/spec/services/api_geo_service_spec.rb
index 6585b6392..3be8cf3c9 100644
--- a/spec/services/api_geo_service_spec.rb
+++ b/spec/services/api_geo_service_spec.rb
@@ -36,10 +36,10 @@ describe APIGeoService do
 
   describe 'departements', vcr: { cassette_name: 'api_geo_departements' } do
     it 'return sorted results' do
-      expect(APIGeoService.departements.size).to eq(102)
+      expect(APIGeoService.departements.size).to eq(110)
       expect(APIGeoService.departements.first).to eq(code: '99', name: 'Etranger')
       expect(APIGeoService.departements.second).to eq(code: '01', name: 'Ain')
-      expect(APIGeoService.departements.last).to eq(code: '976', name: 'Mayotte')
+      expect(APIGeoService.departements.last).to eq(code: '989', name: 'Île de Clipperton')
     end
   end
 

From fc1bb68a3a1541f661dd89f4da4c2a2fa432f392 Mon Sep 17 00:00:00 2001
From: Martin <martin@sharypic.com>
Date: Fri, 24 Feb 2023 09:39:16 +0100
Subject: [PATCH 133/202] correctif(filtres): les filtres par colonne se font
 par stable_id, non pas par id

---
 app/models/procedure_presentation.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/models/procedure_presentation.rb b/app/models/procedure_presentation.rb
index 9c2942884..160f6bdd0 100644
--- a/app/models/procedure_presentation.rb
+++ b/app/models/procedure_presentation.rb
@@ -336,7 +336,7 @@ class ProcedurePresentation < ApplicationRecord
         end
       end
     else
-      TypeDeChamp.find(field['column']).options_for_select
+      TypeDeChamp.find_by(stable_id: field['column']).options_for_select
     end
   end
 

From ff9bb8a3cc9d2e77e194bde095d0c4da49d4d322 Mon Sep 17 00:00:00 2001
From: Martin <martin@sharypic.com>
Date: Fri, 24 Feb 2023 10:19:41 +0100
Subject: [PATCH 134/202] correctif(annotations-privee): ajout du delete form
 component pour supprimer une annotation privee

---
 app/views/shared/dossiers/_edit_annotations.html.haml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/views/shared/dossiers/_edit_annotations.html.haml b/app/views/shared/dossiers/_edit_annotations.html.haml
index ebf3339d3..86f39f735 100644
--- a/app/views/shared/dossiers/_edit_annotations.html.haml
+++ b/app/views/shared/dossiers/_edit_annotations.html.haml
@@ -1,6 +1,7 @@
 .container.dossier-edit
   - if dossier.champs_private.present?
     %section
+      = render Attachment::DeleteFormComponent.new
       = form_for dossier, url: annotations_instructeur_dossier_path(dossier.procedure, dossier), html: { class: 'form', multipart: true } do |f|
         - dossier.champs_private.each do |champ|
           = fields_for champ.input_name, champ do |form|

From 531c5ec0564f17792af41e91f71ebb782242e78b Mon Sep 17 00:00:00 2001
From: Paul Chavard <pro@paul.chavard.net>
Date: Fri, 24 Feb 2023 13:32:46 +0100
Subject: [PATCH 135/202] fix(filter): fix find type de champ by stable_id

---
 app/models/procedure_presentation.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/models/procedure_presentation.rb b/app/models/procedure_presentation.rb
index 160f6bdd0..f29885be5 100644
--- a/app/models/procedure_presentation.rb
+++ b/app/models/procedure_presentation.rb
@@ -336,7 +336,7 @@ class ProcedurePresentation < ApplicationRecord
         end
       end
     else
-      TypeDeChamp.find_by(stable_id: field['column']).options_for_select
+      find_type_de_champ(field['column']).options_for_select
     end
   end
 

From 14d889b31713e22fcc513b175568b725a81d0b04 Mon Sep 17 00:00:00 2001
From: Paul Chavard <pro@paul.chavard.net>
Date: Thu, 23 Feb 2023 18:45:33 +0100
Subject: [PATCH 136/202] fix(procedure): fix translations in changes component

---
 .../revision_changes_component.html.haml               | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/app/components/procedure/revision_changes_component/revision_changes_component.html.haml b/app/components/procedure/revision_changes_component/revision_changes_component.html.haml
index 9a74529fb..6cf97bbe6 100644
--- a/app/components/procedure/revision_changes_component/revision_changes_component.html.haml
+++ b/app/components/procedure/revision_changes_component/revision_changes_component.html.haml
@@ -46,13 +46,13 @@
             = t(".public.enable_mandatory", label: change.label)
             - if !total_dossiers.zero? && !change.can_rebase?
               %strong
-                = t(:breaking_change, count: total_dossiers)
+                = t('.breaking_change', count: total_dossiers)
         - else
           - list.with_item do
             = t(".public.disable_mandatory", label: change.label)
             - if !total_dossiers.zero? && !change.can_rebase?
               %strong
-                = t(:breaking_change, count: total_dossiers)
+                = t('.breaking_change', count: total_dossiers)
       - when :piece_justificative_template
         - list.with_item do
           = t(".#{prefix}.update_piece_justificative_template", label: change.label)
@@ -115,19 +115,19 @@
             = t(".#{prefix}.add_condition", label: change.label, to: change.to)
             - if !total_dossiers.zero? && !change.can_rebase?
               %strong
-                = t(:breaking_change, count: total_dossiers)
+                = t('.breaking_change', count: total_dossiers)
         - elsif change.to.nil?
           - list.with_item do
             = t(".#{prefix}.remove_condition", label: change.label)
             - if !total_dossiers.zero? && !change.can_rebase?
               %strong
-                = t(:breaking_change, count: total_dossiers)
+                = t('.breaking_change', count: total_dossiers)
         - else
           - list.with_item do
             = t(".#{prefix}.update_condition", label: change.label, to: change.to)
             - if !total_dossiers.zero? && !change.can_rebase?
               %strong
-                = t(:breaking_change, count: total_dossiers)
+                = t('.breaking_change', count: total_dossiers)
 
   - if @public_move_changes.present?
     - list.with_item do

From 1d6c2fd7eb1dc222750ad2a76c78f03e7be21502 Mon Sep 17 00:00:00 2001
From: Christophe Robillard <christophe.robillard@beta.gouv.fr>
Date: Fri, 24 Feb 2023 17:27:28 +0100
Subject: [PATCH 137/202] display procedures without zones

---
 .../administrateurs/procedures_controller.rb           |  2 +-
 .../administrateurs/procedures_controller_spec.rb      | 10 ++++++++++
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/app/controllers/administrateurs/procedures_controller.rb b/app/controllers/administrateurs/procedures_controller.rb
index 3a0baef4f..62718fc3d 100644
--- a/app/controllers/administrateurs/procedures_controller.rb
+++ b/app/controllers/administrateurs/procedures_controller.rb
@@ -410,7 +410,7 @@ module Administrateurs
     private
 
     def filter_procedures(filter)
-      procedures_result = Procedure.select(:id).joins(:procedures_zones).distinct.publiees_ou_closes
+      procedures_result = Procedure.select(:id).left_joins(:procedures_zones).distinct.publiees_ou_closes
       procedures_result = procedures_result.where(procedures_zones: { zone_id: filter.zone_ids }) if filter.zone_ids.present?
       procedures_result = procedures_result.where(aasm_state: filter.statuses) if filter.statuses.present?
       procedures_result = procedures_result.where("? = ANY(tags)", filter.tag) if filter.tag.present?
diff --git a/spec/controllers/administrateurs/procedures_controller_spec.rb b/spec/controllers/administrateurs/procedures_controller_spec.rb
index 23a598d84..b1f09c6da 100644
--- a/spec/controllers/administrateurs/procedures_controller_spec.rb
+++ b/spec/controllers/administrateurs/procedures_controller_spec.rb
@@ -132,6 +132,16 @@ describe Administrateurs::ProceduresController, type: :controller do
         expect(assigns(:procedures).any? { |p| p.id == procedure2.id }).to be_truthy
         expect(assigns(:procedures).any? { |p| p.id == procedure1.id }).to be_falsey
       end
+
+      context "without zones" do
+        let!(:procedure) { create(:procedure, :published, zones: []) }
+        subject { get :all }
+
+        it 'displays procedures without zones' do
+          subject
+          expect(assigns(:procedures).any? { |p| p.id == procedure.id }).to be_truthy
+        end
+      end
     end
 
     context 'for specific status' do

From 4e8a6f6b11fb7f3ac57db5873a55772ca002ba66 Mon Sep 17 00:00:00 2001
From: Christophe Robillard <christophe.robillard@beta.gouv.fr>
Date: Fri, 24 Feb 2023 17:45:01 +0100
Subject: [PATCH 138/202] show published_at only if exist

---
 app/views/administrateurs/procedures/_detail.html.haml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/views/administrateurs/procedures/_detail.html.haml b/app/views/administrateurs/procedures/_detail.html.haml
index 2728ece46..2b4e15b4b 100644
--- a/app/views/administrateurs/procedures/_detail.html.haml
+++ b/app/views/administrateurs/procedures/_detail.html.haml
@@ -11,7 +11,7 @@
   %td= procedure.estimated_dossiers_count
   %td= procedure.administrateurs.count
   %td= t procedure.aasm_state, scope: 'activerecord.attributes.procedure.aasm_state'
-  %td= l(procedure.published_at, format: :message_date_without_time)
+  %td= l(procedure.published_at, format: :message_date_without_time) if procedure.published_at
   %td= link_to('Cloner', admin_procedure_clone_path(procedure.id, from_new_from_existing: true), 'data-method' => :put, class: 'fr-btn fr-btn--tertiary fr-btn--sm')
 
 

From 704dbf94db2fe3d48af256b19b348ead41dd4069 Mon Sep 17 00:00:00 2001
From: Christian Lautier <15379878+maatinito@users.noreply.github.com>
Date: Sat, 25 Feb 2023 08:32:21 -1000
Subject: [PATCH 139/202] Fix dossier controller spec

---
 spec/controllers/users/dossiers_controller_spec.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/spec/controllers/users/dossiers_controller_spec.rb b/spec/controllers/users/dossiers_controller_spec.rb
index 57398f090..5e7c57d7e 100644
--- a/spec/controllers/users/dossiers_controller_spec.rb
+++ b/spec/controllers/users/dossiers_controller_spec.rb
@@ -256,7 +256,7 @@ describe Users::DossiersController, type: :controller do
 
       context 'When API-Entreprise is globally down' do
         let(:api_etablissement_status) { 502 }
-        let(:api_current_status_response) { File.read('spec/fixtures/files/api_entreprise/current_status.json').tr('200', '502') }
+        let(:api_current_status_response) { File.read('spec/fixtures/files/api_entreprise/current_status.json').gsub('200', '502') }
 
         it "create an etablissement only with SIRET as degraded mode" do
           dossier.reload

From 83802a507abc98e1b3b3de8b6b159f2c048d299b Mon Sep 17 00:00:00 2001
From: sebastiencarceles <sebastien.carceles@gmail.com>
Date: Thu, 23 Feb 2023 14:35:28 +0100
Subject: [PATCH 140/202] return communes with the APIGeoService

---
 app/services/api_geo_service.rb              | 30 ++++++++++++--
 spec/fixtures/cassettes/api_geo_communes.yml | 41 ++++++++++++++++++++
 spec/services/api_geo_service_spec.rb        | 23 +++++++++++
 3 files changed, 91 insertions(+), 3 deletions(-)
 create mode 100644 spec/fixtures/cassettes/api_geo_communes.yml

diff --git a/app/services/api_geo_service.rb b/app/services/api_geo_service.rb
index 0a3b1ff04..77194815b 100644
--- a/app/services/api_geo_service.rb
+++ b/app/services/api_geo_service.rb
@@ -47,6 +47,25 @@ class APIGeoService
       departements.find { _1[:name] == name }&.dig(:code)
     end
 
+    def communes(departement_code)
+      get_from_api_geo(
+        "communes?codeDepartement=#{departement_code}",
+        additional_keys: { postal_codes: :codesPostaux }
+      ).sort_by { I18n.transliterate(_1[:name]) }
+    end
+
+    def commune_name(departement_code, code)
+      communes(departement_code).find { _1[:code] == code }&.dig(:name)
+    end
+
+    def commune_code(departement_code, name)
+      communes(departement_code).find { _1[:name] == name }&.dig(:code)
+    end
+
+    def commune_postal_codes(departement_code, code)
+      communes(departement_code).find { _1[:code] == code }&.dig(:postal_codes)
+    end
+
     def epcis(departement_code)
       get_from_api_geo("epcis?codeDepartement=#{departement_code}").sort_by { I18n.transliterate(_1[:name]) }
     end
@@ -61,11 +80,16 @@ class APIGeoService
 
     private
 
-    def get_from_api_geo(scope)
+    def get_from_api_geo(scope, additional_keys: {})
       Rails.cache.fetch("api_geo_#{scope}", expires_in: 1.year) do
         response = Typhoeus.get("#{API_GEO_URL}/#{scope}")
-        JSON.parse(response.body).map(&:symbolize_keys)
-          .map { { name: _1[:nom].tr("'", '’'), code: _1[:code] } }
+        JSON.parse(response.body)
+          .map(&:symbolize_keys)
+          .map do |result|
+            data = { name: result[:nom].tr("'", '’'), code: result[:code] }
+            additional_keys.each { |key, value| data = data.merge(key => result[value]) }
+            data
+          end
       end
     end
 
diff --git a/spec/fixtures/cassettes/api_geo_communes.yml b/spec/fixtures/cassettes/api_geo_communes.yml
new file mode 100644
index 000000000..63b76d100
--- /dev/null
+++ b/spec/fixtures/cassettes/api_geo_communes.yml
@@ -0,0 +1,41 @@
+---
+http_interactions:
+- request:
+    method: get
+    uri: https://geo.api.gouv.fr/communes?codeDepartement=01
+    body:
+      encoding: US-ASCII
+      string: ''
+    headers:
+      User-Agent:
+      - demarches-simplifiees.fr
+      Expect:
+      - ''
+  response:
+    status:
+      code: 200
+      message: ''
+    headers:
+      Server:
+      - nginx/1.10.3 (Ubuntu)
+      Date:
+      - Thu, 23 Feb 2023 13:33:37 GMT
+      Content-Type:
+      - application/json; charset=utf-8
+      Content-Length:
+      - '64499'
+      Vary:
+      - Accept-Encoding
+      - Origin
+      X-Powered-By:
+      - Express
+      Etag:
+      - W/"fbf3-p2dPt1CmfK+zLSteTNObEX45Yk8"
+      Strict-Transport-Security:
+      - max-age=15552000
+    body:
+      encoding: ASCII-8BIT
+      string: !binary |-
+        [{"nom":"L'Abergement-Clémenciat","code":"01001","codeDepartement":"01","siren":"210100012","codeEpci":"200069193","codeRegion":"84","codesPostaux":["01400"],"population":779},{"nom":"L'Abergement-de-Varey","code":"01002","codeDepartement":"01","siren":"210100020","codeEpci":"240100883","codeRegion":"84","codesPostaux":["01640"],"population":256},{"nom":"Ambérieu-en-Bugey","code":"01004","codeDepartement":"01","siren":"210100046","codeEpci":"240100883","codeRegion":"84","codesPostaux":["01500"],"population":14134},{"nom":"Ambérieux-en-Dombes","code":"01005","codeDepartement":"01","siren":"210100053","codeEpci":"200042497","codeRegion":"84","codesPostaux":["01330"],"population":1751},{"nom":"Ambléon","code":"01006","codeDepartement":"01","siren":"210100061","codeEpci":"200040350","codeRegion":"84","codesPostaux":["01300"],"population":112},{"nom":"Ambronay","code":"01007","codeDepartement":"01","siren":"210100079","codeEpci":"240100883","codeRegion":"84","codesPostaux":["01500"],"population":2800},{"nom":"Ambutrix","code":"01008","codeDepartement":"01","siren":"210100087","codeEpci":"240100883","codeRegion":"84","codesPostaux":["01500"],"population":762},{"nom":"Andert-et-Condon","code":"01009","codeDepartement":"01","siren":"210100095","codeEpci":"200040350","codeRegion":"84","codesPostaux":["01300"],"population":326},{"nom":"Anglefort","code":"01010","codeDepartement":"01","siren":"210100103","codeEpci":"200070852","codeRegion":"84","codesPostaux":["01350"],"population":1105},{"nom":"Apremont","code":"01011","codeDepartement":"01","siren":"210100111","codeEpci":"200042935","codeRegion":"84","codesPostaux":["01100"],"population":368},{"nom":"Aranc","code":"01012","codeDepartement":"01","siren":"210100129","codeEpci":"200042935","codeRegion":"84","codesPostaux":["01110"],"population":329},{"nom":"Arandas","code":"01013","codeDepartement":"01","siren":"210100137","codeEpci":"240100883","codeRegion":"84","codesPostaux":["01230"],"population":143},{"nom":"Arbent","code":"01014","codeDepartement":"01","siren":"210100145","codeEpci":"200042935","codeRegion":"84","codesPostaux":["01100"],"population":3349},{"nom":"Arboys en Bugey","code":"01015","codeDepartement":"01","siren":"200053668","codeEpci":"200040350","codeRegion":"84","codesPostaux":["01300"],"population":650},{"nom":"Arbigny","code":"01016","codeDepartement":"01","siren":"210100160","codeEpci":"200071371","codeRegion":"84","codesPostaux":["01190"],"population":460},{"nom":"Argis","code":"01017","codeDepartement":"01","siren":"210100178","codeEpci":"240100883","codeRegion":"84","codesPostaux":["01230"],"population":457},{"nom":"Armix","code":"01019","codeDepartement":"01","siren":"210100194","codeEpci":"200040350","codeRegion":"84","codesPostaux":["01510"],"population":27},{"nom":"Ars-sur-Formans","code":"01021","codeDepartement":"01","siren":"210100210","codeEpci":"200042497","codeRegion":"84","codesPostaux":["01480"],"population":1457},{"nom":"Artemare","code":"01022","codeDepartement":"01","siren":"210100228","codeEpci":"200040350","codeRegion":"84","codesPostaux":["01510"],"population":1249},{"nom":"Asnières-sur-Saône","code":"01023","codeDepartement":"01","siren":"210100236","codeEpci":"200071371","codeRegion":"84","codesPostaux":["01570"],"population":76},{"nom":"Attignat","code":"01024","codeDepartement":"01","siren":"210100244","codeEpci":"200071751","codeRegion":"84","codesPostaux":["01340"],"population":3251},{"nom":"Bâgé-Dommartin","code":"01025","codeDepartement":"01","siren":"200077220","codeEpci":"200071371","codeRegion":"84","codesPostaux":["01380"],"population":4065},{"nom":"Bâgé-le-Châtel","code":"01026","codeDepartement":"01","siren":"210100269","codeEpci":"200071371","codeRegion":"84","codesPostaux":["01380"],"population":973},{"nom":"Balan","code":"01027","codeDepartement":"01","siren":"210100277","codeEpci":"240100610","codeRegion":"84","codesPostaux":["01360"],"population":2563},{"nom":"Baneins","code":"01028","codeDepartement":"01","siren":"210100285","codeEpci":"200069193","codeRegion":"84","codesPostaux":["01990"],"population":617},{"nom":"Beaupont","code":"01029","codeDepartement":"01","siren":"210100293","codeEpci":"200071751","codeRegion":"84","codesPostaux":["01270"],"population":685},{"nom":"Beauregard","code":"01030","codeDepartement":"01","siren":"210100301","codeEpci":"200042497","codeRegion":"84","codesPostaux":["01480"],"population":829},{"nom":"Bellignat","code":"01031","codeDepartement":"01","siren":"210100319","codeEpci":"200042935","codeRegion":"84","codesPostaux":["01100"],"population":3652},{"nom":"Béligneux","code":"01032","codeDepartement":"01","siren":"210100327","codeEpci":"240100610","codeRegion":"84","codesPostaux":["01360"],"population":3376},{"nom":"Valserhône","code":"01033","codeDepartement":"01","siren":"200083863","codeEpci":"240100891","codeRegion":"84","codesPostaux":["01200"],"population":16378},{"nom":"Belley","code":"01034","codeDepartement":"01","siren":"210100343","codeEpci":"200040350","codeRegion":"84","codesPostaux":["01300"],"population":9182},{"nom":"Belleydoux","code":"01035","codeDepartement":"01","siren":"210100350","codeEpci":"200042935","codeRegion":"84","codesPostaux":["01130"],"population":310},{"nom":"Valromey-sur-Séran","code":"01036","codeDepartement":"01","siren":"200086411","codeEpci":"200040350","codeRegion":"84","codesPostaux":["01260"],"population":1326},{"nom":"Bénonces","code":"01037","codeDepartement":"01","siren":"210100376","codeEpci":"240100883","codeRegion":"84","codesPostaux":["01470"],"population":308},{"nom":"Bény","code":"01038","codeDepartement":"01","siren":"210100384","codeEpci":"200071751","codeRegion":"84","codesPostaux":["01370"],"population":754},{"nom":"Béon","code":"01039","codeDepartement":"01","siren":"210100392","codeEpci":"200040350","codeRegion":"84","codesPostaux":["01350"],"population":443},{"nom":"Béréziat","code":"01040","codeDepartement":"01","siren":"210100400","codeEpci":"200071751","codeRegion":"84","codesPostaux":["01340"],"population":486},{"nom":"Bettant","code":"01041","codeDepartement":"01","siren":"210100418","codeEpci":"240100883","codeRegion":"84","codesPostaux":["01500"],"population":748},{"nom":"Bey","code":"01042","codeDepartement":"01","siren":"210100426","codeEpci":"200070555","codeRegion":"84","codesPostaux":["01290"],"population":291},{"nom":"Beynost","code":"01043","codeDepartement":"01","siren":"210100434","codeEpci":"240100800","codeRegion":"84","codesPostaux":["01700"],"population":4754},{"nom":"Billiat","code":"01044","codeDepartement":"01","siren":"210100442","codeEpci":"240100891","codeRegion":"84","codesPostaux":["01200"],"population":632},{"nom":"Birieux","code":"01045","codeDepartement":"01","siren":"210100459","codeEpci":"200069193","codeRegion":"84","codesPostaux":["01330"],"population":283},{"nom":"Biziat","code":"01046","codeDepartement":"01","siren":"210100467","codeEpci":"200070555","codeRegion":"84","codesPostaux":["01290"],"population":895},{"nom":"Blyes","code":"01047","codeDepartement":"01","siren":"210100475","codeEpci":"240100883","codeRegion":"84","codesPostaux":["01150"],"population":1182},{"nom":"La Boisse","code":"01049","codeDepartement":"01","siren":"210100491","codeEpci":"240100610","codeRegion":"84","codesPostaux":["01120"],"population":3283},{"nom":"Boissey","code":"01050","codeDepartement":"01","siren":"210100509","codeEpci":"200071371","codeRegion":"84","codesPostaux":["01190","01380"],"population":365},{"nom":"Bolozon","code":"01051","codeDepartement":"01","siren":"210100517","codeEpci":"200042935","codeRegion":"84","codesPostaux":["01450"],"population":91},{"nom":"Bouligneux","code":"01052","codeDepartement":"01","siren":"210100525","codeEpci":"200069193","codeRegion":"84","codesPostaux":["01330"],"population":328},{"nom":"Bourg-en-Bresse","code":"01053","codeDepartement":"01","siren":"210100533","codeEpci":"200071751","codeRegion":"84","codesPostaux":["01000"],"population":41111},{"nom":"Bourg-Saint-Christophe","code":"01054","codeDepartement":"01","siren":"210100541","codeEpci":"240100883","codeRegion":"84","codesPostaux":["01800"],"population":1457},{"nom":"Boyeux-Saint-Jérôme","code":"01056","codeDepartement":"01","siren":"210100566","codeEpci":"200029999","codeRegion":"84","codesPostaux":["01640"],"population":349},{"nom":"Boz","code":"01057","codeDepartement":"01","siren":"210100574","codeEpci":"200071371","codeRegion":"84","codesPostaux":["01190"],"population":519},{"nom":"Brégnier-Cordon","code":"01058","codeDepartement":"01","siren":"210100582","codeEpci":"200040350","codeRegion":"84","codesPostaux":["01300"],"population":828},{"nom":"Brénod","code":"01060","codeDepartement":"01","siren":"210100608","codeEpci":"200042935","codeRegion":"84","codesPostaux":["01110"],"population":493},{"nom":"Brens","code":"01061","codeDepartement":"01","siren":"210100616","codeEpci":"200040350","codeRegion":"84","codesPostaux":["01300"],"population":1144},{"nom":"Bressolles","code":"01062","codeDepartement":"01","siren":"210100624","codeEpci":"240100610","codeRegion":"84","codesPostaux":["01360"],"population":934},{"nom":"Brion","code":"01063","codeDepartement":"01","siren":"210100632","codeEpci":"200042935","codeRegion":"84","codesPostaux":["01460"],"population":533},{"nom":"Briord","code":"01064","codeDepartement":"01","siren":"210100640","codeEpci":"240100883","codeRegion":"84","codesPostaux":["01470"],"population":1070},{"nom":"Buellas","code":"01065","codeDepartement":"01","siren":"210100657","codeEpci":"200071751","codeRegion":"84","codesPostaux":["01310"],"population":1812},{"nom":"La Burbanche","code":"01066","codeDepartement":"01","siren":"210100665","codeEpci":"200040350","codeRegion":"84","codesPostaux":["01510"],"population":89},{"nom":"Ceignes","code":"01067","codeDepartement":"01","siren":"210100673","codeEpci":"200042935","codeRegion":"84","codesPostaux":["01430"],"population":255},{"nom":"Cerdon","code":"01068","codeDepartement":"01","siren":"210100681","codeEpci":"200029999","codeRegion":"84","codesPostaux":["01450"],"population":775},{"nom":"Certines","code":"01069","codeDepartement":"01","siren":"210100699","codeEpci":"200071751","codeRegion":"84","codesPostaux":["01240"],"population":1503},{"nom":"Cessy","code":"01071","codeDepartement":"01","siren":"210100715","codeEpci":"240100750","codeRegion":"84","codesPostaux":["01170"],"population":4808},{"nom":"Ceyzériat","code":"01072","codeDepartement":"01","siren":"210100723","codeEpci":"200071751","codeRegion":"84","codesPostaux":["01250"],"population":3194},{"nom":"Ceyzérieu","code":"01073","codeDepartement":"01","siren":"210100731","codeEpci":"200040350","codeRegion":"84","codesPostaux":["01350"],"population":1000},{"nom":"Chalamont","code":"01074","codeDepartement":"01","siren":"210100749","codeEpci":"200069193","codeRegion":"84","codesPostaux":["01320"],"population":2589},{"nom":"Chaleins","code":"01075","codeDepartement":"01","siren":"210100756","codeEpci":"200070118","codeRegion":"84","codesPostaux":["01480"],"population":1382},{"nom":"Chaley","code":"01076","codeDepartement":"01","siren":"210100764","codeEpci":"240100883","codeRegion":"84","codesPostaux":["01230"],"population":125},{"nom":"Challes-la-Montagne","code":"01077","codeDepartement":"01","siren":"210100772","codeEpci":"200029999","codeRegion":"84","codesPostaux":["01450"],"population":196},{"nom":"Challex","code":"01078","codeDepartement":"01","siren":"210100780","codeEpci":"240100750","codeRegion":"84","codesPostaux":["01630"],"population":1557},{"nom":"Champagne-en-Valromey","code":"01079","codeDepartement":"01","siren":"210100798","codeEpci":"200040350","codeRegion":"84","codesPostaux":["01260"],"population":811},{"nom":"Champdor-Corcelles","code":"01080","codeDepartement":"01","siren":"200056695","codeEpci":"200042935","codeRegion":"84","codesPostaux":["01110"],"population":643},{"nom":"Champfromier","code":"01081","codeDepartement":"01","siren":"210100814","codeEpci":"240100891","codeRegion":"84","codesPostaux":["01410"],"population":735},{"nom":"Chanay","code":"01082","codeDepartement":"01","siren":"210100822","codeEpci":"240100891","codeRegion":"84","codesPostaux":["01420"],"population":628},{"nom":"Chaneins","code":"01083","codeDepartement":"01","siren":"210100830","codeEpci":"200069193","codeRegion":"84","codesPostaux":["01990"],"population":927},{"nom":"Chanoz-Châtenay","code":"01084","codeDepartement":"01","siren":"210100848","codeEpci":"200070555","codeRegion":"84","codesPostaux":["01400"],"population":895},{"nom":"La Chapelle-du-Châtelard","code":"01085","codeDepartement":"01","siren":"210100855","codeEpci":"200069193","codeRegion":"84","codesPostaux":["01240"],"population":400},{"nom":"Charix","code":"01087","codeDepartement":"01","siren":"210100871","codeEpci":"200042935","codeRegion":"84","codesPostaux":["01130"],"population":282},{"nom":"Charnoz-sur-Ain","code":"01088","codeDepartement":"01","siren":"210100889","codeEpci":"240100883","codeRegion":"84","codesPostaux":["01800"],"population":903},{"nom":"Château-Gaillard","code":"01089","codeDepartement":"01","siren":"210100897","codeEpci":"240100883","codeRegion":"84","codesPostaux":["01500"],"population":2253},{"nom":"Châtenay","code":"01090","codeDepartement":"01","siren":"210100905","codeEpci":"200069193","codeRegion":"84","codesPostaux":["01320"],"population":356},{"nom":"Châtillon-la-Palud","code":"01092","codeDepartement":"01","siren":"210100921","codeEpci":"200069193","codeRegion":"84","codesPostaux":["01320"],"population":1604},{"nom":"Châtillon-sur-Chalaronne","code":"01093","codeDepartement":"01","siren":"210100939","codeEpci":"200069193","codeRegion":"84","codesPostaux":["01400"],"population":4931},{"nom":"Chavannes-sur-Reyssouze","code":"01094","codeDepartement":"01","siren":"210100947","codeEpci":"200071371","codeRegion":"84","codesPostaux":["01190"],"population":761},{"nom":"Nivigne et Suran","code":"01095","codeDepartement":"01","siren":"200062537","codeEpci":"200071751","codeRegion":"84","codesPostaux":["01250"],"population":853},{"nom":"Chaveyriat","code":"01096","codeDepartement":"01","siren":"210100962","codeEpci":"200070555","codeRegion":"84","codesPostaux":["01660"],"population":1034},{"nom":"Chazey-Bons","code":"01098","codeDepartement":"01","siren":"200063121","codeEpci":"200040350","codeRegion":"84","codesPostaux":["01300","01510"],"population":1159},{"nom":"Chazey-sur-Ain","code":"01099","codeDepartement":"01","siren":"210100996","codeEpci":"240100883","codeRegion":"84","codesPostaux":["01150"],"population":1566},{"nom":"Cheignieu-la-Balme","code":"01100","codeDepartement":"01","siren":"210101002","codeEpci":"200040350","codeRegion":"84","codesPostaux":["01510"],"population":131},{"nom":"Chevillard","code":"01101","codeDepartement":"01","siren":"210101010","codeEpci":"200042935","codeRegion":"84","codesPostaux":["01430"],"population":152},{"nom":"Chevroux","code":"01102","codeDepartement":"01","siren":"210101028","codeEpci":"200071371","codeRegion":"84","codesPostaux":["01190"],"population":961},{"nom":"Chevry","code":"01103","codeDepartement":"01","siren":"210101036","codeEpci":"240100750","codeRegion":"84","codesPostaux":["01170"],"population":2149},{"nom":"Chézery-Forens","code":"01104","codeDepartement":"01","siren":"210101044","codeEpci":"240100750","codeRegion":"84","codesPostaux":["01200","01410"],"population":461},{"nom":"Civrieux","code":"01105","codeDepartement":"01","siren":"210101051","codeEpci":"200042497","codeRegion":"84","codesPostaux":["01390"],"population":1829},{"nom":"Cize","code":"01106","codeDepartement":"01","siren":"210101069","codeEpci":"200071751","codeRegion":"84","codesPostaux":["01250"],"population":179},{"nom":"Cleyzieu","code":"01107","codeDepartement":"01","siren":"210101077","codeEpci":"240100883","codeRegion":"84","codesPostaux":["01230"],"population":133},{"nom":"Coligny","code":"01108","codeDepartement":"01","siren":"210101085","codeEpci":"200071751","codeRegion":"84","codesPostaux":["01270"],"population":1176},{"nom":"Collonges","code":"01109","codeDepartement":"01","siren":"210101093","codeEpci":"240100750","codeRegion":"84","codesPostaux":["01550"],"population":2226},{"nom":"Colomieu","code":"01110","codeDepartement":"01","siren":"210101101","codeEpci":"200040350","codeRegion":"84","codesPostaux":["01300"],"population":156},{"nom":"Conand","code":"01111","codeDepartement":"01","siren":"210101119","codeEpci":"240100883","codeRegion":"84","codesPostaux":["01230"],"population":132},{"nom":"Condamine","code":"01112","codeDepartement":"01","siren":"210101127","codeEpci":"200042935","codeRegion":"84","codesPostaux":["01430"],"population":450},{"nom":"Condeissiat","code":"01113","codeDepartement":"01","siren":"210101135","codeEpci":"200069193","codeRegion":"84","codesPostaux":["01400"],"population":817},{"nom":"Confort","code":"01114","codeDepartement":"01","siren":"210101143","codeEpci":"240100891","codeRegion":"84","codesPostaux":["01200"],"population":667},{"nom":"Confrançon","code":"01115","codeDepartement":"01","siren":"210101150","codeEpci":"200071751","codeRegion":"84","codesPostaux":["01310"],"population":1333},{"nom":"Contrevoz","code":"01116","codeDepartement":"01","siren":"210101168","codeEpci":"200040350","codeRegion":"84","codesPostaux":["01300"],"population":498},{"nom":"Conzieu","code":"01117","codeDepartement":"01","siren":"210101176","codeEpci":"200040350","codeRegion":"84","codesPostaux":["01300"],"population":151},{"nom":"Corbonod","code":"01118","codeDepartement":"01","siren":"210101184","codeEpci":"200070852","codeRegion":"84","codesPostaux":["01420"],"population":1278},{"nom":"Corlier","code":"01121","codeDepartement":"01","siren":"210101218","codeEpci":"200042935","codeRegion":"84","codesPostaux":["01110"],"population":116},{"nom":"Cormoranche-sur-Saône","code":"01123","codeDepartement":"01","siren":"210101234","codeEpci":"200070555","codeRegion":"84","codesPostaux":["01290"],"population":1162},{"nom":"Cormoz","code":"01124","codeDepartement":"01","siren":"210101242","codeEpci":"200071751","codeRegion":"84","codesPostaux":["01560"],"population":689},{"nom":"Corveissiat","code":"01125","codeDepartement":"01","siren":"210101259","codeEpci":"200071751","codeRegion":"84","codesPostaux":["01250"],"population":612},{"nom":"Courmangoux","code":"01127","codeDepartement":"01","siren":"210101275","codeEpci":"200071751","codeRegion":"84","codesPostaux":["01370"],"population":508},{"nom":"Courtes","code":"01128","codeDepartement":"01","siren":"210101283","codeEpci":"200071751","codeRegion":"84","codesPostaux":["01560"],"population":305},{"nom":"Crans","code":"01129","codeDepartement":"01","siren":"210101291","codeEpci":"200069193","codeRegion":"84","codesPostaux":["01320"],"population":291},{"nom":"Bresse Vallons","code":"01130","codeDepartement":"01","siren":"200086965","codeEpci":"200071751","codeRegion":"84","codesPostaux":["01340"],"population":2363},{"nom":"Cressin-Rochefort","code":"01133","codeDepartement":"01","siren":"210101333","codeEpci":"200040350","codeRegion":"84","codesPostaux":["01350"],"population":394},{"nom":"Crottet","code":"01134","codeDepartement":"01","siren":"210101341","codeEpci":"200070555","codeRegion":"84","codesPostaux":["01290","01750"],"population":1758},{"nom":"Crozet","code":"01135","codeDepartement":"01","siren":"210101358","codeEpci":"240100750","codeRegion":"84","codesPostaux":["01170"],"population":2171},{"nom":"Cruzilles-lès-Mépillat","code":"01136","codeDepartement":"01","siren":"210101366","codeEpci":"200070555","codeRegion":"84","codesPostaux":["01290"],"population":893},{"nom":"Culoz","code":"01138","codeDepartement":"01","siren":"210101382","codeEpci":"200040350","codeRegion":"84","codesPostaux":["01350"],"population":3004},{"nom":"Curciat-Dongalon","code":"01139","codeDepartement":"01","siren":"210101390","codeEpci":"200071751","codeRegion":"84","codesPostaux":["01560"],"population":444},{"nom":"Curtafond","code":"01140","codeDepartement":"01","siren":"210101408","codeEpci":"200071751","codeRegion":"84","codesPostaux":["01310"],"population":767},{"nom":"Cuzieu","code":"01141","codeDepartement":"01","siren":"210101416","codeEpci":"200040350","codeRegion":"84","codesPostaux":["01300"],"population":453},{"nom":"Dagneux","code":"01142","codeDepartement":"01","siren":"210101424","codeEpci":"240100610","codeRegion":"84","codesPostaux":["01120"],"population":4777},{"nom":"Divonne-les-Bains","code":"01143","codeDepartement":"01","siren":"210101432","codeEpci":"240100750","codeRegion":"84","codesPostaux":["01220"],"population":9951},{"nom":"Dompierre-sur-Veyle","code":"01145","codeDepartement":"01","siren":"210101457","codeEpci":"200071751","codeRegion":"84","codesPostaux":["01240"],"population":1179},{"nom":"Dompierre-sur-Chalaronne","code":"01146","codeDepartement":"01","siren":"210101465","codeEpci":"200069193","codeRegion":"84","codesPostaux":["01400"],"population":436},{"nom":"Domsure","code":"01147","codeDepartement":"01","siren":"210101473","codeEpci":"200071751","codeRegion":"84","codesPostaux":["01270"],"population":492},{"nom":"Dortan","code":"01148","codeDepartement":"01","siren":"210101481","codeEpci":"200042935","codeRegion":"84","codesPostaux":["01590"],"population":1879},{"nom":"Douvres","code":"01149","codeDepartement":"01","siren":"210101499","codeEpci":"240100883","codeRegion":"84","codesPostaux":["01500"],"population":1076},{"nom":"Drom","code":"01150","codeDepartement":"01","siren":"210101507","codeEpci":"200071751","codeRegion":"84","codesPostaux":["01250"],"population":214},{"nom":"Druillat","code":"01151","codeDepartement":"01","siren":"210101515","codeEpci":"200071751","codeRegion":"84","codesPostaux":["01160"],"population":1146},{"nom":"Échallon","code":"01152","codeDepartement":"01","siren":"210101523","codeEpci":"200042935","codeRegion":"84","codesPostaux":["01130"],"population":748},{"nom":"Échenevex","code":"01153","codeDepartement":"01","siren":"210101531","codeEpci":"240100750","codeRegion":"84","codesPostaux":["01170"],"population":2115},{"nom":"Évosges","code":"01155","codeDepartement":"01","siren":"210101556","codeEpci":"200042935","codeRegion":"84","codesPostaux":["01230"],"population":143},{"nom":"Faramans","code":"01156","codeDepartement":"01","siren":"210101564","codeEpci":"240100883","codeRegion":"84","codesPostaux":["01800"],"population":815},{"nom":"Fareins","code":"01157","codeDepartement":"01","siren":"210101572","codeEpci":"200042497","codeRegion":"84","codesPostaux":["01480"],"population":2250},{"nom":"Farges","code":"01158","codeDepartement":"01","siren":"210101580","codeEpci":"240100750","codeRegion":"84","codesPostaux":["01550"],"population":1048},{"nom":"Feillens","code":"01159","codeDepartement":"01","siren":"210101598","codeEpci":"200071371","codeRegion":"84","codesPostaux":["01570"],"population":3365},{"nom":"Ferney-Voltaire","code":"01160","codeDepartement":"01","siren":"210101606","codeEpci":"240100750","codeRegion":"84","codesPostaux":["01210"],"population":10026},{"nom":"Flaxieu","code":"01162","codeDepartement":"01","siren":"210101622","codeEpci":"200040350","codeRegion":"84","codesPostaux":["01350"],"population":65},{"nom":"Foissiat","code":"01163","codeDepartement":"01","siren":"210101630","codeEpci":"200071751","codeRegion":"84","codesPostaux":["01340"],"population":2038},{"nom":"Francheleins","code":"01165","codeDepartement":"01","siren":"210101655","codeEpci":"200070118","codeRegion":"84","codesPostaux":["01090"],"population":1594},{"nom":"Frans","code":"01166","codeDepartement":"01","siren":"210101663","codeEpci":"200042497","codeRegion":"84","codesPostaux":["01480"],"population":2423},{"nom":"Garnerans","code":"01167","codeDepartement":"01","siren":"210101671","codeEpci":"200070118","codeRegion":"84","codesPostaux":["01140"],"population":634},{"nom":"Genouilleux","code":"01169","codeDepartement":"01","siren":"210101697","codeEpci":"200070118","codeRegion":"84","codesPostaux":["01090"],"population":641},{"nom":"Béard-Géovreissiat","code":"01170","codeDepartement":"01","siren":"210101705","codeEpci":"200042935","codeRegion":"84","codesPostaux":["01460"],"population":1053},{"nom":"Géovreisset","code":"01171","codeDepartement":"01","siren":"210101713","codeEpci":"200042935","codeRegion":"84","codesPostaux":["01100"],"population":844},{"nom":"Gex","code":"01173","codeDepartement":"01","siren":"210101739","codeEpci":"240100750","codeRegion":"84","codesPostaux":["01170"],"population":13121},{"nom":"Giron","code":"01174","codeDepartement":"01","siren":"210101747","codeEpci":"240100891","codeRegion":"84","codesPostaux":["01130"],"population":178},{"nom":"Gorrevod","code":"01175","codeDepartement":"01","siren":"210101754","codeEpci":"200071371","codeRegion":"84","codesPostaux":["01190"],"population":784},{"nom":"Grand-Corent","code":"01177","codeDepartement":"01","siren":"210101770","codeEpci":"200071751","codeRegion":"84","codesPostaux":["01250"],"population":183},{"nom":"Grièges","code":"01179","codeDepartement":"01","siren":"210101796","codeEpci":"200070555","codeRegion":"84","codesPostaux":["01290"],"population":1881},{"nom":"Grilly","code":"01180","codeDepartement":"01","siren":"210101804","codeEpci":"240100750","codeRegion":"84","codesPostaux":["01220"],"population":839},{"nom":"Groissiat","code":"01181","codeDepartement":"01","siren":"210101812","codeEpci":"200042935","codeRegion":"84","codesPostaux":["01100"],"population":1241},{"nom":"Guéreins","code":"01183","codeDepartement":"01","siren":"210101838","codeEpci":"200070118","codeRegion":"84","codesPostaux":["01090"],"population":1479},{"nom":"Hautecourt-Romanèche","code":"01184","codeDepartement":"01","siren":"210101846","codeEpci":"200071751","codeRegion":"84","codesPostaux":["01250"],"population":763},{"nom":"Plateau d'Hauteville","code":"01185","codeDepartement":"01","siren":"200086122","codeEpci":"200042935","codeRegion":"84","codesPostaux":["01110"],"population":4844},{"nom":"Haut Valromey","code":"01187","codeDepartement":"01","siren":"200053676","codeEpci":"200040350","codeRegion":"84","codesPostaux":["01260"],"population":618},{"nom":"Illiat","code":"01188","codeDepartement":"01","siren":"210101887","codeEpci":"200070118","codeRegion":"84","codesPostaux":["01140"],"population":663},{"nom":"Injoux-Génissiat","code":"01189","codeDepartement":"01","siren":"210101895","codeEpci":"240100891","codeRegion":"84","codesPostaux":["01200"],"population":1115},{"nom":"Innimond","code":"01190","codeDepartement":"01","siren":"210101903","codeEpci":"240100883","codeRegion":"84","codesPostaux":["01680"],"population":87},{"nom":"Izenave","code":"01191","codeDepartement":"01","siren":"210101911","codeEpci":"200042935","codeRegion":"84","codesPostaux":["01430"],"population":154},{"nom":"Izernore","code":"01192","codeDepartement":"01","siren":"210101929","codeEpci":"200042935","codeRegion":"84","codesPostaux":["01580"],"population":2277},{"nom":"Izieu","code":"01193","codeDepartement":"01","siren":"210101937","codeEpci":"200040350","codeRegion":"84","codesPostaux":["01300"],"population":222},{"nom":"Jassans-Riottier","code":"01194","codeDepartement":"01","siren":"210101945","codeEpci":"200040590","codeRegion":"84","codesPostaux":["01480"],"population":6346},{"nom":"Jasseron","code":"01195","codeDepartement":"01","siren":"210101952","codeEpci":"200071751","codeRegion":"84","codesPostaux":["01250"],"population":1783},{"nom":"Jayat","code":"01196","codeDepartement":"01","siren":"210101960","codeEpci":"200071751","codeRegion":"84","codesPostaux":["01340"],"population":1226},{"nom":"Journans","code":"01197","codeDepartement":"01","siren":"210101978","codeEpci":"200071751","codeRegion":"84","codesPostaux":["01250"],"population":351},{"nom":"Joyeux","code":"01198","codeDepartement":"01","siren":"210101986","codeEpci":"240100883","codeRegion":"84","codesPostaux":["01800"],"population":268},{"nom":"Jujurieux","code":"01199","codeDepartement":"01","siren":"210101994","codeEpci":"200029999","codeRegion":"84","codesPostaux":["01640"],"population":2137},{"nom":"Labalme","code":"01200","codeDepartement":"01","siren":"210102000","codeEpci":"200029999","codeRegion":"84","codesPostaux":["01450"],"population":214},{"nom":"Lagnieu","code":"01202","codeDepartement":"01","siren":"210102026","codeEpci":"240100883","codeRegion":"84","codesPostaux":["01150"],"population":7161},{"nom":"Laiz","code":"01203","codeDepartement":"01","siren":"210102034","codeEpci":"200070555","codeRegion":"84","codesPostaux":["01290"],"population":1313},{"nom":"Le Poizat-Lalleyriat","code":"01204","codeDepartement":"01","siren":"200053395","codeEpci":"200042935","codeRegion":"84","codesPostaux":["01130"],"population":735},{"nom":"Lantenay","code":"01206","codeDepartement":"01","siren":"210102067","codeEpci":"200042935","codeRegion":"84","codesPostaux":["01430"],"population":277},{"nom":"Lapeyrouse","code":"01207","codeDepartement":"01","siren":"210102075","codeEpci":"200069193","codeRegion":"84","codesPostaux":["01330"],"population":317},{"nom":"Lavours","code":"01208","codeDepartement":"01","siren":"210102083","codeEpci":"200040350","codeRegion":"84","codesPostaux":["01350"],"population":131},{"nom":"Léaz","code":"01209","codeDepartement":"01","siren":"210102091","codeEpci":"240100750","codeRegion":"84","codesPostaux":["01200"],"population":778},{"nom":"Lélex","code":"01210","codeDepartement":"01","siren":"210102109","codeEpci":"240100750","codeRegion":"84","codesPostaux":["01410"],"population":228},{"nom":"Lent","code":"01211","codeDepartement":"01","siren":"210102117","codeEpci":"200071751","codeRegion":"84","codesPostaux":["01240"],"population":1395},{"nom":"Lescheroux","code":"01212","codeDepartement":"01","siren":"210102125","codeEpci":"200071751","codeRegion":"84","codesPostaux":["01560"],"population":718},{"nom":"Leyment","code":"01213","codeDepartement":"01","siren":"210102133","codeEpci":"240100883","codeRegion":"84","codesPostaux":["01150"],"population":1341},{"nom":"Leyssard","code":"01214","codeDepartement":"01","siren":"210102141","codeEpci":"200042935","codeRegion":"84","codesPostaux":["01450"],"population":158},{"nom":"Surjoux-Lhopital","code":"01215","codeDepartement":"01","siren":"200085306","codeEpci":"240100891","codeRegion":"84","codesPostaux":["01420"],"population":140},{"nom":"Lhuis","code":"01216","codeDepartement":"01","siren":"210102166","codeEpci":"240100883","codeRegion":"84","codesPostaux":["01680"],"population":894},{"nom":"Lompnas","code":"01219","codeDepartement":"01","siren":"210102190","codeEpci":"240100883","codeRegion":"84","codesPostaux":["01680"],"population":164},{"nom":"Loyettes","code":"01224","codeDepartement":"01","siren":"210102240","codeEpci":"240100883","codeRegion":"84","codesPostaux":["01360"],"population":3225},{"nom":"Lurcy","code":"01225","codeDepartement":"01","siren":"210102257","codeEpci":"200070118","codeRegion":"84","codesPostaux":["01090"],"population":372},{"nom":"Magnieu","code":"01227","codeDepartement":"01","siren":"200084978","codeEpci":"200040350","codeRegion":"84","codesPostaux":["01300"],"population":643},{"nom":"Maillat","code":"01228","codeDepartement":"01","siren":"210102281","codeEpci":"200042935","codeRegion":"84","codesPostaux":["01430"],"population":660},{"nom":"Malafretaz","code":"01229","codeDepartement":"01","siren":"210102299","codeEpci":"200071751","codeRegion":"84","codesPostaux":["01340"],"population":1235},{"nom":"Mantenay-Montlin","code":"01230","codeDepartement":"01","siren":"210102307","codeEpci":"200071751","codeRegion":"84","codesPostaux":["01560"],"population":312},{"nom":"Manziat","code":"01231","codeDepartement":"01","siren":"210102315","codeEpci":"200071371","codeRegion":"84","codesPostaux":["01570"],"population":1948},{"nom":"Marboz","code":"01232","codeDepartement":"01","siren":"210102323","codeEpci":"200071751","codeRegion":"84","codesPostaux":["01851"],"population":2276},{"nom":"Marchamp","code":"01233","codeDepartement":"01","siren":"210102331","codeEpci":"240100883","codeRegion":"84","codesPostaux":["01680"],"population":130},{"nom":"Marignieu","code":"01234","codeDepartement":"01","siren":"210102349","codeEpci":"200040350","codeRegion":"84","codesPostaux":["01300"],"population":169},{"nom":"Marlieux","code":"01235","codeDepartement":"01","siren":"210102356","codeEpci":"200069193","codeRegion":"84","codesPostaux":["01240"],"population":1159},{"nom":"Marsonnas","code":"01236","codeDepartement":"01","siren":"210102364","codeEpci":"200071751","codeRegion":"84","codesPostaux":["01340"],"population":1011},{"nom":"Martignat","code":"01237","codeDepartement":"01","siren":"210102372","codeEpci":"200042935","codeRegion":"84","codesPostaux":["01100"],"population":1667},{"nom":"Massieux","code":"01238","codeDepartement":"01","siren":"210102380","codeEpci":"200042497","codeRegion":"84","codesPostaux":["01600"],"population":2670},{"nom":"Massignieu-de-Rives","code":"01239","codeDepartement":"01","siren":"210102398","codeEpci":"200040350","codeRegion":"84","codesPostaux":["01300"],"population":620},{"nom":"Matafelon-Granges","code":"01240","codeDepartement":"01","siren":"210102406","codeEpci":"200042935","codeRegion":"84","codesPostaux":["01580"],"population":627},{"nom":"Meillonnas","code":"01241","codeDepartement":"01","siren":"210102414","codeEpci":"200071751","codeRegion":"84","codesPostaux":["01370"],"population":1356},{"nom":"Mérignat","code":"01242","codeDepartement":"01","siren":"210102422","codeEpci":"200029999","codeRegion":"84","codesPostaux":["01450"],"population":135},{"nom":"Messimy-sur-Saône","code":"01243","codeDepartement":"01","siren":"210102430","codeEpci":"200070118","codeRegion":"84","codesPostaux":["01480"],"population":1253},{"nom":"Meximieux","code":"01244","codeDepartement":"01","siren":"210102448","codeEpci":"240100883","codeRegion":"84","codesPostaux":["01800"],"population":7923},{"nom":"Bohas-Meyriat-Rignat","code":"01245","codeDepartement":"01","siren":"210102455","codeEpci":"200071751","codeRegion":"84","codesPostaux":["01250"],"population":943},{"nom":"Mézériat","code":"01246","codeDepartement":"01","siren":"210102463","codeEpci":"200070555","codeRegion":"84","codesPostaux":["01660"],"population":2217},{"nom":"Mijoux","code":"01247","codeDepartement":"01","siren":"210102471","codeEpci":"240100750","codeRegion":"84","codesPostaux":["01170","01410"],"population":312},{"nom":"Mionnay","code":"01248","codeDepartement":"01","siren":"210102489","codeEpci":"200069193","codeRegion":"84","codesPostaux":["01390"],"population":2197},{"nom":"Miribel","code":"01249","codeDepartement":"01","siren":"210102497","codeEpci":"240100800","codeRegion":"84","codesPostaux":["01700"],"population":10122},{"nom":"Misérieux","code":"01250","codeDepartement":"01","siren":"210102505","codeEpci":"200042497","codeRegion":"84","codesPostaux":["01600"],"population":1974},{"nom":"Mogneneins","code":"01252","codeDepartement":"01","siren":"210102521","codeEpci":"200070118","codeRegion":"84","codesPostaux":["01140"],"population":786},{"nom":"Montagnat","code":"01254","codeDepartement":"01","siren":"210102547","codeEpci":"200071751","codeRegion":"84","codesPostaux":["01250"],"population":2116},{"nom":"Montagnieu","code":"01255","codeDepartement":"01","siren":"210102554","codeEpci":"240100883","codeRegion":"84","codesPostaux":["01470"],"population":647},{"nom":"Montanges","code":"01257","codeDepartement":"01","siren":"210102570","codeEpci":"240100891","codeRegion":"84","codesPostaux":["01200"],"population":351},{"nom":"Montceaux","code":"01258","codeDepartement":"01","siren":"210102588","codeEpci":"200070118","codeRegion":"84","codesPostaux":["01090"],"population":1190},{"nom":"Montcet","code":"01259","codeDepartement":"01","siren":"210102596","codeEpci":"200071751","codeRegion":"84","codesPostaux":["01310"],"population":702},{"nom":"Le Montellier","code":"01260","codeDepartement":"01","siren":"210102604","codeEpci":"240100883","codeRegion":"84","codesPostaux":["01800"],"population":302},{"nom":"Monthieux","code":"01261","codeDepartement":"01","siren":"210102612","codeEpci":"200069193","codeRegion":"84","codesPostaux":["01390"],"population":668},{"nom":"Montluel","code":"01262","codeDepartement":"01","siren":"210102620","codeEpci":"240100610","codeRegion":"84","codesPostaux":["01120"],"population":6886},{"nom":"Montmerle-sur-Saône","code":"01263","codeDepartement":"01","siren":"210102638","codeEpci":"200070118","codeRegion":"84","codesPostaux":["01090"],"population":3772},{"nom":"Montracol","code":"01264","codeDepartement":"01","siren":"210102646","codeEpci":"200071751","codeRegion":"84","codesPostaux":["01310"],"population":1016},{"nom":"Montréal-la-Cluse","code":"01265","codeDepartement":"01","siren":"210102653","codeEpci":"200042935","codeRegion":"84","codesPostaux":["01460"],"population":3456},{"nom":"Montrevel-en-Bresse","code":"01266","codeDepartement":"01","siren":"210102661","codeEpci":"200071751","codeRegion":"84","codesPostaux":["01340"],"population":2576},{"nom":"Nurieux-Volognat","code":"01267","codeDepartement":"01","siren":"210102679","codeEpci":"200042935","codeRegion":"84","codesPostaux":["01460"],"population":1025},{"nom":"Murs-et-Gélignieux","code":"01268","codeDepartement":"01","siren":"210102687","codeEpci":"200040350","codeRegion":"84","codesPostaux":["01300"],"population":246},{"nom":"Nantua","code":"01269","codeDepartement":"01","siren":"210102695","codeEpci":"200042935","codeRegion":"84","codesPostaux":["01130","01460"],"population":3454},{"nom":"Neuville-les-Dames","code":"01272","codeDepartement":"01","siren":"210102729","codeEpci":"200069193","codeRegion":"84","codesPostaux":["01400"],"population":1500},{"nom":"Neuville-sur-Ain","code":"01273","codeDepartement":"01","siren":"210102737","codeEpci":"200029999","codeRegion":"84","codesPostaux":["01160"],"population":1800},{"nom":"Les Neyrolles","code":"01274","codeDepartement":"01","siren":"210102745","codeEpci":"200042935","codeRegion":"84","codesPostaux":["01130"],"population":645},{"nom":"Neyron","code":"01275","codeDepartement":"01","siren":"210102752","codeEpci":"240100800","codeRegion":"84","codesPostaux":["01700"],"population":2569},{"nom":"Niévroz","code":"01276","codeDepartement":"01","siren":"210102760","codeEpci":"240100610","codeRegion":"84","codesPostaux":["01120"],"population":1624},{"nom":"Nivollet-Montgriffon","code":"01277","codeDepartement":"01","siren":"210102778","codeEpci":"240100883","codeRegion":"84","codesPostaux":["01230"],"population":117},{"nom":"Oncieu","code":"01279","codeDepartement":"01","siren":"210102794","codeEpci":"240100883","codeRegion":"84","codesPostaux":["01230"],"population":80},{"nom":"Ordonnaz","code":"01280","codeDepartement":"01","siren":"210102802","codeEpci":"240100883","codeRegion":"84","codesPostaux":["01510"],"population":138},{"nom":"Ornex","code":"01281","codeDepartement":"01","siren":"210102810","codeEpci":"240100750","codeRegion":"84","codesPostaux":["01210"],"population":4483},{"nom":"Outriaz","code":"01282","codeDepartement":"01","siren":"210102828","codeEpci":"200042935","codeRegion":"84","codesPostaux":["01430"],"population":258},{"nom":"Oyonnax","code":"01283","codeDepartement":"01","siren":"210102836","codeEpci":"200042935","codeRegion":"84","codesPostaux":["01100"],"population":22456},{"nom":"Ozan","code":"01284","codeDepartement":"01","siren":"210102844","codeEpci":"200071371","codeRegion":"84","codesPostaux":["01190"],"population":694},{"nom":"Parcieux","code":"01285","codeDepartement":"01","siren":"210102851","codeEpci":"200042497","codeRegion":"84","codesPostaux":["01600"],"population":1229},{"nom":"Parves et Nattages","code":"01286","codeDepartement":"01","siren":"200059913","codeEpci":"200040350","codeRegion":"84","codesPostaux":["01300"],"population":951},{"nom":"Péron","code":"01288","codeDepartement":"01","siren":"210102885","codeEpci":"240100750","codeRegion":"84","codesPostaux":["01630"],"population":2717},{"nom":"Péronnas","code":"01289","codeDepartement":"01","siren":"210102893","codeEpci":"200071751","codeRegion":"84","codesPostaux":["01960"],"population":6520},{"nom":"Pérouges","code":"01290","codeDepartement":"01","siren":"210102901","codeEpci":"240100883","codeRegion":"84","codesPostaux":["01800"],"population":1273},{"nom":"Perrex","code":"01291","codeDepartement":"01","siren":"210102919","codeEpci":"200070555","codeRegion":"84","codesPostaux":["01540"],"population":842},{"nom":"Peyriat","code":"01293","codeDepartement":"01","siren":"210102935","codeEpci":"200042935","codeRegion":"84","codesPostaux":["01430"],"population":148},{"nom":"Peyrieu","code":"01294","codeDepartement":"01","siren":"210102943","codeEpci":"200040350","codeRegion":"84","codesPostaux":["01300"],"population":886},{"nom":"Peyzieux-sur-Saône","code":"01295","codeDepartement":"01","siren":"210102950","codeEpci":"200070118","codeRegion":"84","codesPostaux":["01140"],"population":686},{"nom":"Pirajoux","code":"01296","codeDepartement":"01","siren":"210102968","codeEpci":"200071751","codeRegion":"84","codesPostaux":["01270"],"population":420},{"nom":"Pizay","code":"01297","codeDepartement":"01","siren":"210102976","codeEpci":"240100610","codeRegion":"84","codesPostaux":["01120"],"population":867},{"nom":"Plagne","code":"01298","codeDepartement":"01","siren":"210102984","codeEpci":"240100891","codeRegion":"84","codesPostaux":["01130"],"population":150},{"nom":"Le Plantay","code":"01299","codeDepartement":"01","siren":"210102992","codeEpci":"200069193","codeRegion":"84","codesPostaux":["01330"],"population":584},{"nom":"Polliat","code":"01301","codeDepartement":"01","siren":"210103016","codeEpci":"200071751","codeRegion":"84","codesPostaux":["01310"],"population":2547},{"nom":"Pollieu","code":"01302","codeDepartement":"01","siren":"210103024","codeEpci":"200040350","codeRegion":"84","codesPostaux":["01350"],"population":163},{"nom":"Poncin","code":"01303","codeDepartement":"01","siren":"210103032","codeEpci":"200029999","codeRegion":"84","codesPostaux":["01450"],"population":1699},{"nom":"Pont-d'Ain","code":"01304","codeDepartement":"01","siren":"210103040","codeEpci":"200029999","codeRegion":"84","codesPostaux":["01160"],"population":2924},{"nom":"Pont-de-Vaux","code":"01305","codeDepartement":"01","siren":"210103057","codeEpci":"200071371","codeRegion":"84","codesPostaux":["01190"],"population":2213},{"nom":"Pont-de-Veyle","code":"01306","codeDepartement":"01","siren":"210103065","codeEpci":"200070555","codeRegion":"84","codesPostaux":["01290"],"population":1641},{"nom":"Port","code":"01307","codeDepartement":"01","siren":"210103073","codeEpci":"200042935","codeRegion":"84","codesPostaux":["01460"],"population":836},{"nom":"Pougny","code":"01308","codeDepartement":"01","siren":"210103081","codeEpci":"240100750","codeRegion":"84","codesPostaux":["01550"],"population":807},{"nom":"Pouillat","code":"01309","codeDepartement":"01","siren":"210103099","codeEpci":"200071751","codeRegion":"84","codesPostaux":["01250"],"population":85},{"nom":"Prémeyzel","code":"01310","codeDepartement":"01","siren":"210103107","codeEpci":"200040350","codeRegion":"84","codesPostaux":["01300"],"population":251},{"nom":"Prémillieu","code":"01311","codeDepartement":"01","siren":"210103115","codeEpci":"200042935","codeRegion":"84","codesPostaux":["01110"],"population":44},{"nom":"Prévessin-Moëns","code":"01313","codeDepartement":"01","siren":"210103131","codeEpci":"240100750","codeRegion":"84","codesPostaux":["01280"],"population":8711},{"nom":"Priay","code":"01314","codeDepartement":"01","siren":"210103149","codeEpci":"200029999","codeRegion":"84","codesPostaux":["01160"],"population":1729},{"nom":"Ramasse","code":"01317","codeDepartement":"01","siren":"210103172","codeEpci":"200071751","codeRegion":"84","codesPostaux":["01250"],"population":330},{"nom":"Rancé","code":"01318","codeDepartement":"01","siren":"210103180","codeEpci":"200042497","codeRegion":"84","codesPostaux":["01390"],"population":726},{"nom":"Relevant","code":"01319","codeDepartement":"01","siren":"210103198","codeEpci":"200069193","codeRegion":"84","codesPostaux":["01990"],"population":466},{"nom":"Replonges","code":"01320","codeDepartement":"01","siren":"210103206","codeEpci":"200071371","codeRegion":"84","codesPostaux":["01750"],"population":3791},{"nom":"Revonnas","code":"01321","codeDepartement":"01","siren":"210103214","codeEpci":"200071751","codeRegion":"84","codesPostaux":["01250"],"population":888},{"nom":"Reyrieux","code":"01322","codeDepartement":"01","siren":"210103222","codeEpci":"200042497","codeRegion":"84","codesPostaux":["01600"],"population":4984},{"nom":"Reyssouze","code":"01323","codeDepartement":"01","siren":"210103230","codeEpci":"200071371","codeRegion":"84","codesPostaux":["01190"],"population":989},{"nom":"Rignieux-le-Franc","code":"01325","codeDepartement":"01","siren":"210103255","codeEpci":"240100883","codeRegion":"84","codesPostaux":["01800"],"population":1032},{"nom":"Romans","code":"01328","codeDepartement":"01","siren":"210103289","codeEpci":"200069193","codeRegion":"84","codesPostaux":["01400"],"population":597},{"nom":"Rossillon","code":"01329","codeDepartement":"01","siren":"210103297","codeEpci":"200040350","codeRegion":"84","codesPostaux":["01510"],"population":153},{"nom":"Ruffieu","code":"01330","codeDepartement":"01","siren":"210103305","codeEpci":"200040350","codeRegion":"84","codesPostaux":["01260"],"population":182},{"nom":"Saint-Alban","code":"01331","codeDepartement":"01","siren":"210103313","codeEpci":"200029999","codeRegion":"84","codesPostaux":["01450"],"population":187},{"nom":"Saint-André-de-Bâgé","code":"01332","codeDepartement":"01","siren":"210103321","codeEpci":"200071371","codeRegion":"84","codesPostaux":["01380"],"population":779},{"nom":"Saint-André-de-Corcy","code":"01333","codeDepartement":"01","siren":"210103339","codeEpci":"200069193","codeRegion":"84","codesPostaux":["01390"],"population":3369},{"nom":"Saint-André-d'Huiriat","code":"01334","codeDepartement":"01","siren":"210103347","codeEpci":"200070555","codeRegion":"84","codesPostaux":["01290"],"population":658},{"nom":"Saint-André-le-Bouchoux","code":"01335","codeDepartement":"01","siren":"210103354","codeEpci":"200069193","codeRegion":"84","codesPostaux":["01240"],"population":402},{"nom":"Saint-André-sur-Vieux-Jonc","code":"01336","codeDepartement":"01","siren":"210103362","codeEpci":"200071751","codeRegion":"84","codesPostaux":["01960"],"population":1174},{"nom":"Saint-Bénigne","code":"01337","codeDepartement":"01","siren":"210103370","codeEpci":"200071371","codeRegion":"84","codesPostaux":["01190"],"population":1311},{"nom":"Groslée-Saint-Benoit","code":"01338","codeDepartement":"01","siren":"200060143","codeEpci":"200040350","codeRegion":"84","codesPostaux":["01300"],"population":1227},{"nom":"Saint-Bernard","code":"01339","codeDepartement":"01","siren":"210103396","codeEpci":"200042497","codeRegion":"84","codesPostaux":["01600"],"population":1463},{"nom":"Sainte-Croix","code":"01342","codeDepartement":"01","siren":"210103420","codeEpci":"240100610","codeRegion":"84","codesPostaux":["01120"],"population":554},{"nom":"Saint-Cyr-sur-Menthon","code":"01343","codeDepartement":"01","siren":"210103438","codeEpci":"200070555","codeRegion":"84","codesPostaux":["01380"],"population":1793},{"nom":"Saint-Denis-lès-Bourg","code":"01344","codeDepartement":"01","siren":"210103446","codeEpci":"200071751","codeRegion":"84","codesPostaux":["01000"],"population":5943},{"nom":"Saint-Denis-en-Bugey","code":"01345","codeDepartement":"01","siren":"210103453","codeEpci":"240100883","codeRegion":"84","codesPostaux":["01500"],"population":2266},{"nom":"Saint-Didier-d'Aussiat","code":"01346","codeDepartement":"01","siren":"210103461","codeEpci":"200071751","codeRegion":"84","codesPostaux":["01340"],"population":858},{"nom":"Saint-Didier-de-Formans","code":"01347","codeDepartement":"01","siren":"210103479","codeEpci":"200042497","codeRegion":"84","codesPostaux":["01600"],"population":2035},{"nom":"Saint-Didier-sur-Chalaronne","code":"01348","codeDepartement":"01","siren":"210103487","codeEpci":"200070118","codeRegion":"84","codesPostaux":["01140"],"population":2938},{"nom":"Saint-Éloi","code":"01349","codeDepartement":"01","siren":"210103495","codeEpci":"240100883","codeRegion":"84","codesPostaux":["01800"],"population":503},{"nom":"Saint-Étienne-du-Bois","code":"01350","codeDepartement":"01","siren":"210103503","codeEpci":"200071751","codeRegion":"84","codesPostaux":["01370"],"population":2542},{"nom":"Saint-Étienne-sur-Chalaronne","code":"01351","codeDepartement":"01","siren":"210103511","codeEpci":"200070118","codeRegion":"84","codesPostaux":["01140"],"population":1571},{"nom":"Saint-Étienne-sur-Reyssouze","code":"01352","codeDepartement":"01","siren":"210103529","codeEpci":"200071371","codeRegion":"84","codesPostaux":["01190"],"population":583},{"nom":"Sainte-Euphémie","code":"01353","codeDepartement":"01","siren":"210103537","codeEpci":"200042497","codeRegion":"84","codesPostaux":["01600"],"population":1700},{"nom":"Saint-Genis-Pouilly","code":"01354","codeDepartement":"01","siren":"210103545","codeEpci":"240100750","codeRegion":"84","codesPostaux":["01630"],"population":13943},{"nom":"Saint-Genis-sur-Menthon","code":"01355","codeDepartement":"01","siren":"210103552","codeEpci":"200070555","codeRegion":"84","codesPostaux":["01380"],"population":486},{"nom":"Saint-Georges-sur-Renon","code":"01356","codeDepartement":"01","siren":"210103560","codeEpci":"200069193","codeRegion":"84","codesPostaux":["01400"],"population":208},{"nom":"Saint-Germain-de-Joux","code":"01357","codeDepartement":"01","siren":"210103578","codeEpci":"240100891","codeRegion":"84","codesPostaux":["01130"],"population":502},{"nom":"Saint-Germain-les-Paroisses","code":"01358","codeDepartement":"01","siren":"210103586","codeEpci":"200040350","codeRegion":"84","codesPostaux":["01300"],"population":429},{"nom":"Saint-Germain-sur-Renon","code":"01359","codeDepartement":"01","siren":"210103594","codeEpci":"200069193","codeRegion":"84","codesPostaux":["01240"],"population":246},{"nom":"Saint-Jean-de-Gonville","code":"01360","codeDepartement":"01","siren":"210103602","codeEpci":"240100750","codeRegion":"84","codesPostaux":["01630"],"population":1895},{"nom":"Saint-Jean-de-Niost","code":"01361","codeDepartement":"01","siren":"210103610","codeEpci":"240100883","codeRegion":"84","codesPostaux":["01800"],"population":1577},{"nom":"Saint-Jean-de-Thurigneux","code":"01362","codeDepartement":"01","siren":"210103628","codeEpci":"200042497","codeRegion":"84","codesPostaux":["01390"],"population":786},{"nom":"Saint-Jean-le-Vieux","code":"01363","codeDepartement":"01","siren":"210103636","codeEpci":"200029999","codeRegion":"84","codesPostaux":["01640"],"population":1772},{"nom":"Saint-Jean-sur-Reyssouze","code":"01364","codeDepartement":"01","siren":"210103644","codeEpci":"200071751","codeRegion":"84","codesPostaux":["01560"],"population":756},{"nom":"Saint-Jean-sur-Veyle","code":"01365","codeDepartement":"01","siren":"210103651","codeEpci":"200070555","codeRegion":"84","codesPostaux":["01290"],"population":1162},{"nom":"Sainte-Julie","code":"01366","codeDepartement":"01","siren":"210103669","codeEpci":"240100883","codeRegion":"84","codesPostaux":["01150"],"population":1082},{"nom":"Saint-Julien-sur-Reyssouze","code":"01367","codeDepartement":"01","siren":"210103677","codeEpci":"200071751","codeRegion":"84","codesPostaux":["01560"],"population":746},{"nom":"Saint-Julien-sur-Veyle","code":"01368","codeDepartement":"01","siren":"210103685","codeEpci":"200070555","codeRegion":"84","codesPostaux":["01540"],"population":838},{"nom":"Saint-Just","code":"01369","codeDepartement":"01","siren":"210103693","codeEpci":"200071751","codeRegion":"84","codesPostaux":["01250"],"population":942},{"nom":"Saint-Laurent-sur-Saône","code":"01370","codeDepartement":"01","siren":"210103701","codeEpci":"200070308","codeRegion":"84","codesPostaux":["01750"],"population":1688},{"nom":"Saint-Marcel","code":"01371","codeDepartement":"01","siren":"210103719","codeEpci":"200069193","codeRegion":"84","codesPostaux":["01390"],"population":1242},{"nom":"Saint-Martin-de-Bavel","code":"01372","codeDepartement":"01","siren":"210103727","codeEpci":"200040350","codeRegion":"84","codesPostaux":["01510"],"population":444},{"nom":"Saint-Martin-du-Frêne","code":"01373","codeDepartement":"01","siren":"210103735","codeEpci":"200042935","codeRegion":"84","codesPostaux":["01430"],"population":1023},{"nom":"Saint-Martin-du-Mont","code":"01374","codeDepartement":"01","siren":"210103743","codeEpci":"200071751","codeRegion":"84","codesPostaux":["01160"],"population":1871},{"nom":"Saint-Martin-le-Châtel","code":"01375","codeDepartement":"01","siren":"210103750","codeEpci":"200071751","codeRegion":"84","codesPostaux":["01310"],"population":782},{"nom":"Saint-Maurice-de-Beynost","code":"01376","codeDepartement":"01","siren":"210103768","codeEpci":"240100800","codeRegion":"84","codesPostaux":["01700"],"population":3962},{"nom":"Saint-Maurice-de-Gourdans","code":"01378","codeDepartement":"01","siren":"210103784","codeEpci":"240100883","codeRegion":"84","codesPostaux":["01800"],"population":2645},{"nom":"Saint-Maurice-de-Rémens","code":"01379","codeDepartement":"01","siren":"210103792","codeEpci":"240100883","codeRegion":"84","codesPostaux":["01500"],"population":760},{"nom":"Saint-Nizier-le-Bouchoux","code":"01380","codeDepartement":"01","siren":"210103800","codeEpci":"200071751","codeRegion":"84","codesPostaux":["01560"],"population":632},{"nom":"Saint-Nizier-le-Désert","code":"01381","codeDepartement":"01","siren":"210103818","codeEpci":"200069193","codeRegion":"84","codesPostaux":["01320"],"population":921},{"nom":"Sainte-Olive","code":"01382","codeDepartement":"01","siren":"210103826","codeEpci":"200069193","codeRegion":"84","codesPostaux":["01330"],"population":279},{"nom":"Saint-Paul-de-Varax","code":"01383","codeDepartement":"01","siren":"210103834","codeEpci":"200069193","codeRegion":"84","codesPostaux":["01240"],"population":1562},{"nom":"Saint-Rambert-en-Bugey","code":"01384","codeDepartement":"01","siren":"210103842","codeEpci":"240100883","codeRegion":"84","codesPostaux":["01230"],"population":2188},{"nom":"Saint-Rémy","code":"01385","codeDepartement":"01","siren":"210103859","codeEpci":"200071751","codeRegion":"84","codesPostaux":["01310"],"population":985},{"nom":"Saint-Sorlin-en-Bugey","code":"01386","codeDepartement":"01","siren":"210103867","codeEpci":"240100883","codeRegion":"84","codesPostaux":["01150"],"population":1127},{"nom":"Saint-Sulpice","code":"01387","codeDepartement":"01","siren":"210103875","codeEpci":"200071751","codeRegion":"84","codesPostaux":["01340"],"population":256},{"nom":"Saint-Trivier-de-Courtes","code":"01388","codeDepartement":"01","siren":"210103883","codeEpci":"200071751","codeRegion":"84","codesPostaux":["01560"],"population":1102},{"nom":"Saint-Trivier-sur-Moignans","code":"01389","codeDepartement":"01","siren":"210103891","codeEpci":"200069193","codeRegion":"84","codesPostaux":["01990"],"population":1834},{"nom":"Saint-Vulbas","code":"01390","codeDepartement":"01","siren":"210103909","codeEpci":"240100883","codeRegion":"84","codesPostaux":["01150"],"population":1246},{"nom":"Salavre","code":"01391","codeDepartement":"01","siren":"210103917","codeEpci":"200071751","codeRegion":"84","codesPostaux":["01270"],"population":271},{"nom":"Samognat","code":"01392","codeDepartement":"01","siren":"210103925","codeEpci":"200042935","codeRegion":"84","codesPostaux":["01580"],"population":656},{"nom":"Sandrans","code":"01393","codeDepartement":"01","siren":"210103933","codeEpci":"200069193","codeRegion":"84","codesPostaux":["01400"],"population":544},{"nom":"Sault-Brénaz","code":"01396","codeDepartement":"01","siren":"210103966","codeEpci":"240100883","codeRegion":"84","codesPostaux":["01150"],"population":977},{"nom":"Sauverny","code":"01397","codeDepartement":"01","siren":"210103974","codeEpci":"240100750","codeRegion":"84","codesPostaux":["01220"],"population":978},{"nom":"Savigneux","code":"01398","codeDepartement":"01","siren":"210103982","codeEpci":"200042497","codeRegion":"84","codesPostaux":["01480"],"population":1421},{"nom":"Ségny","code":"01399","codeDepartement":"01","siren":"210103990","codeEpci":"240100750","codeRegion":"84","codesPostaux":["01170"],"population":2107},{"nom":"Seillonnaz","code":"01400","codeDepartement":"01","siren":"210104006","codeEpci":"240100883","codeRegion":"84","codesPostaux":["01470"],"population":139},{"nom":"Sergy","code":"01401","codeDepartement":"01","siren":"210104014","codeEpci":"240100750","codeRegion":"84","codesPostaux":["01630"],"population":2167},{"nom":"Sermoyer","code":"01402","codeDepartement":"01","siren":"210104022","codeEpci":"200071371","codeRegion":"84","codesPostaux":["01190"],"population":652},{"nom":"Serrières-de-Briord","code":"01403","codeDepartement":"01","siren":"210104030","codeEpci":"240100883","codeRegion":"84","codesPostaux":["01470"],"population":1295},{"nom":"Serrières-sur-Ain","code":"01404","codeDepartement":"01","siren":"210104048","codeEpci":"200029999","codeRegion":"84","codesPostaux":["01450"],"population":135},{"nom":"Servas","code":"01405","codeDepartement":"01","siren":"210104055","codeEpci":"200071751","codeRegion":"84","codesPostaux":["01960"],"population":1280},{"nom":"Servignat","code":"01406","codeDepartement":"01","siren":"210104063","codeEpci":"200071751","codeRegion":"84","codesPostaux":["01560"],"population":174},{"nom":"Seyssel","code":"01407","codeDepartement":"01","siren":"210104071","codeEpci":"200070852","codeRegion":"84","codesPostaux":["01420"],"population":1002},{"nom":"Simandre-sur-Suran","code":"01408","codeDepartement":"01","siren":"210104089","codeEpci":"200071751","codeRegion":"84","codesPostaux":["01250"],"population":661},{"nom":"Sonthonnax-la-Montagne","code":"01410","codeDepartement":"01","siren":"210104105","codeEpci":"200042935","codeRegion":"84","codesPostaux":["01580"],"population":300},{"nom":"Souclin","code":"01411","codeDepartement":"01","siren":"210104113","codeEpci":"240100883","codeRegion":"84","codesPostaux":["01150"],"population":273},{"nom":"Sulignat","code":"01412","codeDepartement":"01","siren":"210104121","codeEpci":"200069193","codeRegion":"84","codesPostaux":["01400"],"population":595},{"nom":"Talissieu","code":"01415","codeDepartement":"01","siren":"210104154","codeEpci":"200040350","codeRegion":"84","codesPostaux":["01510"],"population":499},{"nom":"Tenay","code":"01416","codeDepartement":"01","siren":"210104162","codeEpci":"240100883","codeRegion":"84","codesPostaux":["01230"],"population":1014},{"nom":"Thil","code":"01418","codeDepartement":"01","siren":"210104188","codeEpci":"240100800","codeRegion":"84","codesPostaux":["01120"],"population":1087},{"nom":"Thoiry","code":"01419","codeDepartement":"01","siren":"210104196","codeEpci":"240100750","codeRegion":"84","codesPostaux":["01710"],"population":6021},{"nom":"Thoissey","code":"01420","codeDepartement":"01","siren":"210104204","codeEpci":"200070118","codeRegion":"84","codesPostaux":["01140"],"population":1690},{"nom":"Torcieu","code":"01421","codeDepartement":"01","siren":"210104212","codeEpci":"240100883","codeRegion":"84","codesPostaux":["01230"],"population":729},{"nom":"Tossiat","code":"01422","codeDepartement":"01","siren":"210104220","codeEpci":"200071751","codeRegion":"84","codesPostaux":["01250"],"population":1355},{"nom":"Toussieux","code":"01423","codeDepartement":"01","siren":"210104238","codeEpci":"200042497","codeRegion":"84","codesPostaux":["01600"],"population":1124},{"nom":"Tramoyes","code":"01424","codeDepartement":"01","siren":"210104246","codeEpci":"240100800","codeRegion":"84","codesPostaux":["01390"],"population":1776},{"nom":"La Tranclière","code":"01425","codeDepartement":"01","siren":"210104253","codeEpci":"200071751","codeRegion":"84","codesPostaux":["01160"],"population":288},{"nom":"Val-Revermont","code":"01426","codeDepartement":"01","siren":"200057347","codeEpci":"200071751","codeRegion":"84","codesPostaux":["01370"],"population":2538},{"nom":"Trévoux","code":"01427","codeDepartement":"01","siren":"210104279","codeEpci":"200042497","codeRegion":"84","codesPostaux":["01600"],"population":6920},{"nom":"Valeins","code":"01428","codeDepartement":"01","siren":"210104287","codeEpci":"200069193","codeRegion":"84","codesPostaux":["01140"],"population":126},{"nom":"Vandeins","code":"01429","codeDepartement":"01","siren":"210104295","codeEpci":"200071751","codeRegion":"84","codesPostaux":["01660"],"population":707},{"nom":"Varambon","code":"01430","codeDepartement":"01","siren":"210104303","codeEpci":"200029999","codeRegion":"84","codesPostaux":["01160"],"population":619},{"nom":"Vaux-en-Bugey","code":"01431","codeDepartement":"01","siren":"210104311","codeEpci":"240100883","codeRegion":"84","codesPostaux":["01150"],"population":1227},{"nom":"Verjon","code":"01432","codeDepartement":"01","siren":"210104329","codeEpci":"200071751","codeRegion":"84","codesPostaux":["01270"],"population":323},{"nom":"Vernoux","code":"01433","codeDepartement":"01","siren":"210104337","codeEpci":"200071751","codeRegion":"84","codesPostaux":["01560"],"population":313},{"nom":"Versailleux","code":"01434","codeDepartement":"01","siren":"210104345","codeEpci":"200069193","codeRegion":"84","codesPostaux":["01330"],"population":472},{"nom":"Versonnex","code":"01435","codeDepartement":"01","siren":"210104352","codeEpci":"240100750","codeRegion":"84","codesPostaux":["01210"],"population":2157},{"nom":"Vesancy","code":"01436","codeDepartement":"01","siren":"210104360","codeEpci":"240100750","codeRegion":"84","codesPostaux":["01170"],"population":481},{"nom":"Vescours","code":"01437","codeDepartement":"01","siren":"210104378","codeEpci":"200071751","codeRegion":"84","codesPostaux":["01560"],"population":223},{"nom":"Vésines","code":"01439","codeDepartement":"01","siren":"210104394","codeEpci":"200071371","codeRegion":"84","codesPostaux":["01570"],"population":99},{"nom":"Vieu-d'Izenave","code":"01441","codeDepartement":"01","siren":"210104410","codeEpci":"200042935","codeRegion":"84","codesPostaux":["01430"],"population":734},{"nom":"Villars-les-Dombes","code":"01443","codeDepartement":"01","siren":"210104436","codeEpci":"200069193","codeRegion":"84","codesPostaux":["01330"],"population":4978},{"nom":"Villebois","code":"01444","codeDepartement":"01","siren":"210104444","codeEpci":"240100883","codeRegion":"84","codesPostaux":["01150"],"population":1196},{"nom":"Villemotier","code":"01445","codeDepartement":"01","siren":"210104451","codeEpci":"200071751","codeRegion":"84","codesPostaux":["01270"],"population":615},{"nom":"Villeneuve","code":"01446","codeDepartement":"01","siren":"210104469","codeEpci":"200042497","codeRegion":"84","codesPostaux":["01480"],"population":1548},{"nom":"Villereversure","code":"01447","codeDepartement":"01","siren":"210104477","codeEpci":"200071751","codeRegion":"84","codesPostaux":["01250"],"population":1342},{"nom":"Villes","code":"01448","codeDepartement":"01","siren":"210104485","codeEpci":"240100891","codeRegion":"84","codesPostaux":["01200"],"population":389},{"nom":"Villette-sur-Ain","code":"01449","codeDepartement":"01","siren":"210104493","codeEpci":"200069193","codeRegion":"84","codesPostaux":["01320"],"population":759},{"nom":"Villieu-Loyes-Mollon","code":"01450","codeDepartement":"01","siren":"210104501","codeEpci":"240100883","codeRegion":"84","codesPostaux":["01800"],"population":3717},{"nom":"Viriat","code":"01451","codeDepartement":"01","siren":"210104519","codeEpci":"200071751","codeRegion":"84","codesPostaux":["01440"],"population":6595},{"nom":"Virieu-le-Grand","code":"01452","codeDepartement":"01","siren":"210104527","codeEpci":"200040350","codeRegion":"84","codesPostaux":["01510"],"population":1132},{"nom":"Arvière-en-Valromey","code":"01453","codeDepartement":"01","siren":"200086403","codeEpci":"200040350","codeRegion":"84","codesPostaux":["01260"],"population":710},{"nom":"Virignin","code":"01454","codeDepartement":"01","siren":"210104543","codeEpci":"200040350","codeRegion":"84","codesPostaux":["01300"],"population":1112},{"nom":"Vongnes","code":"01456","codeDepartement":"01","siren":"210104568","codeEpci":"200040350","codeRegion":"84","codesPostaux":["01350"],"population":71},{"nom":"Vonnas","code":"01457","codeDepartement":"01","siren":"210104576","codeEpci":"200070555","codeRegion":"84","codesPostaux":["01540"],"population":3181}]
+  recorded_at: Thu, 23 Feb 2023 13:33:37 GMT
+recorded_with: VCR 6.1.0
diff --git a/spec/services/api_geo_service_spec.rb b/spec/services/api_geo_service_spec.rb
index 3be8cf3c9..b880e86b8 100644
--- a/spec/services/api_geo_service_spec.rb
+++ b/spec/services/api_geo_service_spec.rb
@@ -43,6 +43,29 @@ describe APIGeoService do
     end
   end
 
+  describe 'communes', vcr: { cassette_name: 'api_geo_communes' } do
+    it 'return sorted results' do
+      expect(APIGeoService.communes('01').size).to eq(393)
+      expect(APIGeoService.communes('01').first).to eq(code: '01004', name: 'Ambérieu-en-Bugey', postal_codes: ['01500'])
+      expect(APIGeoService.communes('01').last).to eq(code: '01457', name: 'Vonnas', postal_codes: ['01540'])
+    end
+  end
+
+  describe 'commune_name', vcr: { cassette_name: 'api_geo_communes' } do
+    subject { APIGeoService.commune_name('01', '01457') }
+    it { is_expected.to eq('Vonnas') }
+  end
+
+  describe 'commune_code', vcr: { cassette_name: 'api_geo_communes' } do
+    subject { APIGeoService.commune_code('01', 'Vonnas') }
+    it { is_expected.to eq('01457') }
+  end
+
+  describe 'commune_postal_codes', vcr: { cassette_name: 'api_geo_communes' } do
+    subject { APIGeoService.commune_postal_codes('01', '01457') }
+    it { is_expected.to eq(['01540']) }
+  end
+
   describe 'epcis', vcr: { cassette_name: 'api_geo_epcis' } do
     it 'return sorted results' do
       expect(APIGeoService.epcis('01').size).to eq(17)

From 46091cb6b4783a993a3a7a57e22f3e34152f8df4 Mon Sep 17 00:00:00 2001
From: sebastiencarceles <sebastien.carceles@gmail.com>
Date: Thu, 23 Feb 2023 10:23:47 +0100
Subject: [PATCH 141/202] let communes champ be prefillable

---
 app/models/type_de_champ.rb        | 3 ++-
 spec/models/prefill_params_spec.rb | 4 +++-
 spec/models/type_de_champ_spec.rb  | 5 +++--
 3 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/app/models/type_de_champ.rb b/app/models/type_de_champ.rb
index 595ecc145..87745457f 100644
--- a/app/models/type_de_champ.rb
+++ b/app/models/type_de_champ.rb
@@ -263,13 +263,14 @@ class TypeDeChamp < ApplicationRecord
       TypeDeChamp.type_champs.fetch(:civilite),
       TypeDeChamp.type_champs.fetch(:pays),
       TypeDeChamp.type_champs.fetch(:regions),
+      TypeDeChamp.type_champs.fetch(:departements),
+      TypeDeChamp.type_champs.fetch(:communes),
       TypeDeChamp.type_champs.fetch(:date),
       TypeDeChamp.type_champs.fetch(:datetime),
       TypeDeChamp.type_champs.fetch(:yes_no),
       TypeDeChamp.type_champs.fetch(:checkbox),
       TypeDeChamp.type_champs.fetch(:drop_down_list),
       TypeDeChamp.type_champs.fetch(:repetition),
-      TypeDeChamp.type_champs.fetch(:departements),
       TypeDeChamp.type_champs.fetch(:multiple_drop_down_list),
       TypeDeChamp.type_champs.fetch(:epci)
     ])
diff --git a/spec/models/prefill_params_spec.rb b/spec/models/prefill_params_spec.rb
index 55c7289e9..5eaa97071 100644
--- a/spec/models/prefill_params_spec.rb
+++ b/spec/models/prefill_params_spec.rb
@@ -137,6 +137,7 @@ RSpec.describe PrefillParams do
     it_behaves_like "a champ public value that is authorized", :checkbox, "false"
     it_behaves_like "a champ public value that is authorized", :drop_down_list, "value"
     it_behaves_like "a champ public value that is authorized", :departements, "03"
+    it_behaves_like "a champ public value that is authorized", :communes, ['56', '56081']
     it_behaves_like "a champ public value that is authorized", :multiple_drop_down_list, ["val1", "val2"]
     it_behaves_like "a champ public value that is authorized", :epci, ['01', '200042935']
 
@@ -173,6 +174,7 @@ RSpec.describe PrefillParams do
     it_behaves_like "a champ private value that is authorized", :drop_down_list, "value"
     it_behaves_like "a champ private value that is authorized", :regions, "93"
     it_behaves_like "a champ private value that is authorized", :departements, "03"
+    it_behaves_like "a champ private value that is authorized", :communes, ['56', '56081']
     it_behaves_like "a champ private value that is authorized", :multiple_drop_down_list, ["val1", "val2"]
     it_behaves_like "a champ private value that is authorized", :epci, ['01', '200042935']
 
@@ -193,7 +195,6 @@ RSpec.describe PrefillParams do
     it_behaves_like "a champ public value that is unauthorized", :decimal_number, "non decimal string"
     it_behaves_like "a champ public value that is unauthorized", :integer_number, "non integer string"
     it_behaves_like "a champ public value that is unauthorized", :number, "value"
-    it_behaves_like "a champ public value that is unauthorized", :communes, "value"
     it_behaves_like "a champ public value that is unauthorized", :dossier_link, "value"
     it_behaves_like "a champ public value that is unauthorized", :titre_identite, "value"
     it_behaves_like "a champ public value that is unauthorized", :civilite, "value"
@@ -213,6 +214,7 @@ RSpec.describe PrefillParams do
     it_behaves_like "a champ public value that is unauthorized", :pays, "value"
     it_behaves_like "a champ public value that is unauthorized", :regions, "value"
     it_behaves_like "a champ public value that is unauthorized", :departements, "value"
+    it_behaves_like "a champ public value that is unauthorized", :communes, "value"
     it_behaves_like "a champ public value that is unauthorized", :siret, "value"
     it_behaves_like "a champ public value that is unauthorized", :rna, "value"
     it_behaves_like "a champ public value that is unauthorized", :annuaire_education, "value"
diff --git a/spec/models/type_de_champ_spec.rb b/spec/models/type_de_champ_spec.rb
index 073799176..d2225c4c6 100644
--- a/spec/models/type_de_champ_spec.rb
+++ b/spec/models/type_de_champ_spec.rb
@@ -246,16 +246,17 @@ describe TypeDeChamp do
     it_behaves_like "a prefillable type de champ", :type_de_champ_datetime
     it_behaves_like "a prefillable type de champ", :type_de_champ_civilite
     it_behaves_like "a prefillable type de champ", :type_de_champ_pays
+    it_behaves_like "a prefillable type de champ", :type_de_champ_regions
+    it_behaves_like "a prefillable type de champ", :type_de_champ_departements
+    it_behaves_like "a prefillable type de champ", :type_de_champ_communes
     it_behaves_like "a prefillable type de champ", :type_de_champ_yes_no
     it_behaves_like "a prefillable type de champ", :type_de_champ_checkbox
     it_behaves_like "a prefillable type de champ", :type_de_champ_drop_down_list
     it_behaves_like "a prefillable type de champ", :type_de_champ_repetition
-    it_behaves_like "a prefillable type de champ", :type_de_champ_departements
     it_behaves_like "a prefillable type de champ", :type_de_champ_multiple_drop_down_list
     it_behaves_like "a prefillable type de champ", :type_de_champ_epci
 
     it_behaves_like "a non-prefillable type de champ", :type_de_champ_number
-    it_behaves_like "a non-prefillable type de champ", :type_de_champ_communes
     it_behaves_like "a non-prefillable type de champ", :type_de_champ_dossier_link
     it_behaves_like "a non-prefillable type de champ", :type_de_champ_titre_identite
     it_behaves_like "a non-prefillable type de champ", :type_de_champ_linked_drop_down_list

From 40b7ea3af2a95a3974635ee9b8dcd44e8c9bc159 Mon Sep 17 00:00:00 2001
From: sebastiencarceles <sebastien.carceles@gmail.com>
Date: Thu, 23 Feb 2023 10:50:06 +0100
Subject: [PATCH 142/202] transform the input value to assignable attributes

---
 .../prefill_commune_type_de_champ.rb          |  33 ++++++
 .../types_de_champ/prefill_type_de_champ.rb   |   2 +
 spec/models/prefill_params_spec.rb            |   6 +-
 .../prefill_commune_type_de_champ_spec.rb     | 102 ++++++++++++++++++
 .../prefill_type_de_champ_spec.rb             |   6 ++
 5 files changed, 147 insertions(+), 2 deletions(-)
 create mode 100644 app/models/types_de_champ/prefill_commune_type_de_champ.rb
 create mode 100644 spec/models/types_de_champ/prefill_commune_type_de_champ_spec.rb

diff --git a/app/models/types_de_champ/prefill_commune_type_de_champ.rb b/app/models/types_de_champ/prefill_commune_type_de_champ.rb
new file mode 100644
index 000000000..38335498a
--- /dev/null
+++ b/app/models/types_de_champ/prefill_commune_type_de_champ.rb
@@ -0,0 +1,33 @@
+class TypesDeChamp::PrefillCommuneTypeDeChamp < TypesDeChamp::PrefillTypeDeChamp
+  def transform_value_to_assignable_attributes(value)
+    return if value.blank? || !value.is_a?(Array)
+    return if (departement_code = value.first).blank?
+    return if (departement_name = APIGeoService.departement_name(departement_code)).blank?
+    return if !value.one? && (commune_code = value.second).blank?
+    return if !value.one? && (commune_name = APIGeoService.commune_name(departement_code, commune_code)).blank?
+
+    if value.one?
+      departement_attributes(departement_code, departement_name)
+    else
+      departement_and_commune_attributes(departement_code, departement_name, commune_code, commune_name)
+    end
+  end
+
+  private
+
+  def departement_attributes(departement_code, departement_name)
+    {
+      code_departement: departement_code,
+      departement: departement_name
+    }
+  end
+
+  def departement_and_commune_attributes(departement_code, departement_name, commune_code, commune_name)
+    postal_code = APIGeoService.commune_postal_codes(departement_code, commune_code).first
+
+    departement_attributes(departement_code, departement_name).merge(
+      external_id: commune_code,
+      value: "#{commune_name} (#{postal_code})"
+    )
+  end
+end
diff --git a/app/models/types_de_champ/prefill_type_de_champ.rb b/app/models/types_de_champ/prefill_type_de_champ.rb
index 43bf2c493..34dee1206 100644
--- a/app/models/types_de_champ/prefill_type_de_champ.rb
+++ b/app/models/types_de_champ/prefill_type_de_champ.rb
@@ -23,6 +23,8 @@ class TypesDeChamp::PrefillTypeDeChamp < SimpleDelegator
       TypesDeChamp::PrefillRepetitionTypeDeChamp.new(type_de_champ, revision)
     when TypeDeChamp.type_champs.fetch(:departements)
       TypesDeChamp::PrefillDepartementTypeDeChamp.new(type_de_champ, revision)
+    when TypeDeChamp.type_champs.fetch(:communes)
+      TypesDeChamp::PrefillCommuneTypeDeChamp.new(type_de_champ, revision)
     when TypeDeChamp.type_champs.fetch(:epci)
       TypesDeChamp::PrefillEpciTypeDeChamp.new(type_de_champ, revision)
     else
diff --git a/spec/models/prefill_params_spec.rb b/spec/models/prefill_params_spec.rb
index 5eaa97071..3356cf448 100644
--- a/spec/models/prefill_params_spec.rb
+++ b/spec/models/prefill_params_spec.rb
@@ -15,12 +15,14 @@ RSpec.describe PrefillParams do
 
       VCR.insert_cassette('api_geo_regions')
       VCR.insert_cassette('api_geo_departements')
+      VCR.insert_cassette('api_geo_communes')
       VCR.insert_cassette('api_geo_epcis')
     end
 
     after do
       VCR.eject_cassette('api_geo_regions')
       VCR.eject_cassette('api_geo_departements')
+      VCR.eject_cassette('api_geo_communes')
       VCR.eject_cassette('api_geo_epcis')
     end
 
@@ -137,7 +139,7 @@ RSpec.describe PrefillParams do
     it_behaves_like "a champ public value that is authorized", :checkbox, "false"
     it_behaves_like "a champ public value that is authorized", :drop_down_list, "value"
     it_behaves_like "a champ public value that is authorized", :departements, "03"
-    it_behaves_like "a champ public value that is authorized", :communes, ['56', '56081']
+    it_behaves_like "a champ public value that is authorized", :communes, ['01', '01457']
     it_behaves_like "a champ public value that is authorized", :multiple_drop_down_list, ["val1", "val2"]
     it_behaves_like "a champ public value that is authorized", :epci, ['01', '200042935']
 
@@ -174,7 +176,7 @@ RSpec.describe PrefillParams do
     it_behaves_like "a champ private value that is authorized", :drop_down_list, "value"
     it_behaves_like "a champ private value that is authorized", :regions, "93"
     it_behaves_like "a champ private value that is authorized", :departements, "03"
-    it_behaves_like "a champ private value that is authorized", :communes, ['56', '56081']
+    it_behaves_like "a champ private value that is authorized", :communes, ['01', '01457']
     it_behaves_like "a champ private value that is authorized", :multiple_drop_down_list, ["val1", "val2"]
     it_behaves_like "a champ private value that is authorized", :epci, ['01', '200042935']
 
diff --git a/spec/models/types_de_champ/prefill_commune_type_de_champ_spec.rb b/spec/models/types_de_champ/prefill_commune_type_de_champ_spec.rb
new file mode 100644
index 000000000..fb92b1a36
--- /dev/null
+++ b/spec/models/types_de_champ/prefill_commune_type_de_champ_spec.rb
@@ -0,0 +1,102 @@
+# frozen_string_literal: true
+
+RSpec.describe TypesDeChamp::PrefillCommuneTypeDeChamp do
+  let(:type_de_champ) { build(:type_de_champ_communes) }
+  let(:memory_store) { ActiveSupport::Cache.lookup_store(:memory_store) }
+
+  before do
+    allow(Rails).to receive(:cache).and_return(memory_store)
+    Rails.cache.clear
+  end
+
+  describe 'ancestors' do
+    subject { described_class.new(type_de_champ) }
+
+    it { is_expected.to be_kind_of(TypesDeChamp::PrefillTypeDeChamp) }
+  end
+
+  describe '#transform_value_to_assignable_attributes' do
+    subject(:transform_value_to_assignable_attributes) do
+      described_class.build(type_de_champ).transform_value_to_assignable_attributes(value)
+    end
+
+    before do
+      VCR.insert_cassette('api_geo_departements')
+      VCR.insert_cassette('api_geo_communes')
+    end
+
+    after do
+      VCR.eject_cassette('api_geo_departements')
+      VCR.eject_cassette('api_geo_communes')
+    end
+
+    shared_examples "a transformation to" do |expected|
+      it { is_expected.to match(expected) }
+    end
+
+    context 'when the value is nil' do
+      let(:value) { nil }
+      it_behaves_like "a transformation to", nil
+    end
+
+    context 'when the value is empty' do
+      let(:value) { '' }
+      it_behaves_like "a transformation to", nil
+    end
+
+    context 'when the value is a string' do
+      let(:value) { 'hello' }
+      it_behaves_like "a transformation to", nil
+    end
+
+    context 'when the value is an array of one element' do
+      context 'when the first element is a valid departement code' do
+        let(:value) { ['01'] }
+        it_behaves_like "a transformation to", { code_departement: '01', departement: 'Ain' }
+      end
+
+      context 'when the first element is not a valid departement code' do
+        let(:value) { ['totoro'] }
+        it_behaves_like "a transformation to", nil
+      end
+    end
+
+    context 'when the value is an array of two elements' do
+      context 'when the first element is a valid departement code' do
+        context 'when the second element is a valid insee code' do
+          let(:value) { ['01', '01457'] }
+          it_behaves_like "a transformation to", { code_departement: '01', departement: 'Ain', external_id: '01457', value: 'Vonnas (01540)' }
+        end
+
+        context 'when the second element is not a valid insee code' do
+          let(:value) { ['01', 'totoro'] }
+          it_behaves_like "a transformation to", nil
+        end
+      end
+
+      context 'when the first element is not a valid departement code' do
+        let(:value) { ['totoro', '01457'] }
+        it_behaves_like "a transformation to", nil
+      end
+    end
+
+    context 'when the value is an array of three or more elements' do
+      context 'when the first element is a valid departement code' do
+        context 'when the second element is a valid insee code' do
+          let(:value) { ['01', '01457', 'hello'] }
+          it_behaves_like "a transformation to", { code_departement: '01', departement: 'Ain', external_id: '01457', value: 'Vonnas (01540)' }
+        end
+
+        context 'when the second element is not a valid insee code' do
+          let(:value) { ['01', 'totoro', 'hello'] }
+          it_behaves_like "a transformation to", nil
+        end
+      end
+
+      context 'when the first element is not a valid departement code' do
+        let(:value) { ['totoro', '01457', 'hello'] }
+        it_behaves_like "a transformation to", nil
+      end
+    end
+  end
+end
diff --git a/spec/models/types_de_champ/prefill_type_de_champ_spec.rb b/spec/models/types_de_champ/prefill_type_de_champ_spec.rb
index 1a6dc0c8a..844115889 100644
--- a/spec/models/types_de_champ/prefill_type_de_champ_spec.rb
+++ b/spec/models/types_de_champ/prefill_type_de_champ_spec.rb
@@ -45,6 +45,12 @@ RSpec.describe TypesDeChamp::PrefillTypeDeChamp, type: :model do
       it { expect(built).to be_kind_of(TypesDeChamp::PrefillDepartementTypeDeChamp) }
     end
 
+    context 'when the type de champ is a communes' do
+      let(:type_de_champ) { build(:type_de_champ_communes) }
+
+      it { expect(built).to be_kind_of(TypesDeChamp::PrefillCommuneTypeDeChamp) }
+    end
+
     context 'when the type de champ is a epci' do
       let(:type_de_champ) { build(:type_de_champ_epci, procedure: procedure) }
 

From 76c9d1ada561c2f9b8b49a6bae3be86d35748a50 Mon Sep 17 00:00:00 2001
From: sebastiencarceles <sebastien.carceles@gmail.com>
Date: Fri, 24 Feb 2023 10:09:19 +0100
Subject: [PATCH 143/202] add possible values

---
 .../prefill_commune_type_de_champ.rb              | 10 ++++++++++
 config/locales/en.yml                             |  4 ++--
 config/locales/fr.yml                             |  3 ++-
 .../prefill_commune_type_de_champ_spec.rb         | 15 +++++++++++++++
 4 files changed, 29 insertions(+), 3 deletions(-)

diff --git a/app/models/types_de_champ/prefill_commune_type_de_champ.rb b/app/models/types_de_champ/prefill_commune_type_de_champ.rb
index 38335498a..619169da1 100644
--- a/app/models/types_de_champ/prefill_commune_type_de_champ.rb
+++ b/app/models/types_de_champ/prefill_commune_type_de_champ.rb
@@ -1,4 +1,10 @@
 class TypesDeChamp::PrefillCommuneTypeDeChamp < TypesDeChamp::PrefillTypeDeChamp
+  def possible_values
+    departements.map do |departement|
+      "#{departement[:code]} (#{departement[:name]}) : https://geo.api.gouv.fr/communes?codeDepartement=#{departement[:code]}"
+    end
+  end
+
   def transform_value_to_assignable_attributes(value)
     return if value.blank? || !value.is_a?(Array)
     return if (departement_code = value.first).blank?
@@ -30,4 +36,8 @@ class TypesDeChamp::PrefillCommuneTypeDeChamp < TypesDeChamp::PrefillTypeDeChamp
       value: "#{commune_name} (#{postal_code})"
     )
   end
+
+  def departements
+    @departements ||= APIGeoService.departements.sort_by { _1[:code] }
+  end
 end
diff --git a/config/locales/en.yml b/config/locales/en.yml
index 1fcf03a7c..42e1bae25 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -129,14 +129,14 @@ en:
           yes_no_html: '"true" for Yes, "false" pour No'
           checkbox_html: '"true" to check, "false" to uncheck'
           pays_html: An <a href="https://en.wikipedia.org/wiki/ISO_3166-2" target="_blank" rel="noopener noreferrer">ISO 3166-2 country code</a>
+          regions_html: An <a href="https://fr.wikipedia.org/wiki/R%C3%A9gion_fran%C3%A7aise" target="_blank" rel="noopener noreferrer">INSEE region code</a>
           departements_html: A <a href="https://fr.wikipedia.org/wiki/Num%C3%A9rotation_des_d%C3%A9partements_fran%C3%A7ais" target="_blank">department number</a>
+          communes_html: An array of the department code and the <a href="https://geo.api.gouv.fr/communes" target="_blank" rel="noopener noreferrer">INSEE commune code</a>.
           drop_down_list_html: A choice among those selected when the procedure was created
           date_html: ISO8601 date
           datetime_html: ISO8601 datetime
           drop_down_list_other_html: Any value
           repetition_html: A array of hashes with possible values for each field of the repetition.
-          regions_html: An <a href="https://fr.wikipedia.org/wiki/R%C3%A9gion_fran%C3%A7aise" target="_blank" rel="noopener noreferrer">INSEE region code</a>
-          regions_html: An <a href="https://fr.wikipedia.org/wiki/R%C3%A9gion_fran%C3%A7aise" target="_blank" rel="noopener noreferrer">INSEE region code</a>
           epci_html: An array of the department code and the <a href="https://geo.api.gouv.fr/epcis" target="_blank" rel="noopener noreferrer">EPCI one</a>.
         examples:
           title: Example
diff --git a/config/locales/fr.yml b/config/locales/fr.yml
index bc9805b48..7188425cc 100644
--- a/config/locales/fr.yml
+++ b/config/locales/fr.yml
@@ -120,13 +120,14 @@ fr:
           yes_no_html: '"true" pour Oui, "false" pour Non'
           checkbox_html: '"true" pour coché, "false" pour décoché'
           pays_html: Un <a href="https://en.wikipedia.org/wiki/ISO_3166-2" target="_blank" rel="noopener noreferrer">code pays ISO 3166-2</a>
+          regions_html: Un <a href="https://fr.wikipedia.org/wiki/R%C3%A9gion_fran%C3%A7aise" target="_blank" rel="noopener noreferrer">code INSEE de région</a>
           departements_html: Un <a href="https://fr.wikipedia.org/wiki/Num%C3%A9rotation_des_d%C3%A9partements_fran%C3%A7ais" target="_blank">numéro de département</a>
+          communes_html: Un tableau contenant le code de département et <a href="https://geo.api.gouv.fr/communes" target="_blank" rel="noopener noreferrer">le code INSEE de la commune</a>.
           drop_down_list_html: Un choix parmi ceux sélectionnés à la création de la procédure
           datetime_html: Datetime au format ISO8601
           date_html: Date au format ISO8601
           drop_down_list_other_html: Toute valeur
           repetition_html: Un tableau de dictionnaires avec les valeurs possibles pour chaque champ de la répétition.
-          regions_html: Un <a href="https://fr.wikipedia.org/wiki/R%C3%A9gion_fran%C3%A7aise" target="_blank" rel="noopener noreferrer">code INSEE de région</a>
           epci_html: Un tableau contenant le code de département et <a href="https://geo.api.gouv.fr/epcis" target="_blank" rel="noopener noreferrer">celui de l'EPCI</a>.
         examples:
           title: Exemple
diff --git a/spec/models/types_de_champ/prefill_commune_type_de_champ_spec.rb b/spec/models/types_de_champ/prefill_commune_type_de_champ_spec.rb
index fb92b1a36..da0d8bcc7 100644
--- a/spec/models/types_de_champ/prefill_commune_type_de_champ_spec.rb
+++ b/spec/models/types_de_champ/prefill_commune_type_de_champ_spec.rb
@@ -15,6 +15,15 @@ RSpec.describe TypesDeChamp::PrefillCommuneTypeDeChamp do
     it { is_expected.to be_kind_of(TypesDeChamp::PrefillTypeDeChamp) }
   end
 
+  describe '#possible_values', vcr: { cassette_name: 'api_geo_departements' } do
+    let(:expected_values) do
+      departements.map { |departement| "#{departement[:code]} (#{departement[:name]}) : https://geo.api.gouv.fr/communes?codeDepartement=#{departement[:code]}" }
+    end
+    subject(:possible_values) { described_class.new(type_de_champ).possible_values }
+
+    it { expect(possible_values).to match(expected_values) }
+  end
+
   describe '#transform_value_to_assignable_attributes' do
     subject(:transform_value_to_assignable_attributes) do
       described_class.build(type_de_champ).transform_value_to_assignable_attributes(value)
@@ -99,4 +108,10 @@ RSpec.describe TypesDeChamp::PrefillCommuneTypeDeChamp do
       end
     end
   end
+
+  private
+
+  def departements
+    APIGeoService.departements.sort_by { _1[:code] }
+  end
 end

From 68fd34a73278765d0f2d45208605830f46915737 Mon Sep 17 00:00:00 2001
From: Paul Chavard <pro@paul.chavard.net>
Date: Mon, 27 Feb 2023 12:01:12 +0100
Subject: [PATCH 144/202] fix(autocomplete): avoid double escape of query
 params

---
 app/javascript/components/shared/queryClient.ts | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/app/javascript/components/shared/queryClient.ts b/app/javascript/components/shared/queryClient.ts
index d24056928..e356263c1 100644
--- a/app/javascript/components/shared/queryClient.ts
+++ b/app/javascript/components/shared/queryClient.ts
@@ -26,7 +26,7 @@ type QueryKey = readonly [
 ];
 
 function buildURL(scope: string, term: string, extra?: string) {
-  term = encodeURIComponent(term.replace(/\(|\)/g, ''));
+  term = term.replace(/\(|\)/g, '');
   const params = new URLSearchParams();
   let path = `${api_geo_url}/${scope}`;
 
@@ -73,6 +73,11 @@ const defaultQueryFn: QueryFunction<unknown, QueryKey> = async ({
     return matchSorter(await getPays(signal), term, { keys: ['label'] });
   }
 
+  // BAN will error with queries less then 3 chars long
+  if (scope == 'adresse' && term.length < 3) {
+    return [];
+  }
+
   const url = buildURL(scope, term, extra);
   return httpRequest(url, { csrf: false, signal }).json();
 };

From da6ce0f528650b3693141d3e9fb83a54e8b591be Mon Sep 17 00:00:00 2001
From: sebastiencarceles <sebastien.carceles@gmail.com>
Date: Fri, 24 Feb 2023 10:17:18 +0100
Subject: [PATCH 145/202] add example

---
 .../prefill_commune_type_de_champ.rb          | 19 ++++--
 .../prefill_commune_type_de_champ_spec.rb     | 66 ++++++++++---------
 2 files changed, 49 insertions(+), 36 deletions(-)

diff --git a/app/models/types_de_champ/prefill_commune_type_de_champ.rb b/app/models/types_de_champ/prefill_commune_type_de_champ.rb
index 619169da1..49dbb1a11 100644
--- a/app/models/types_de_champ/prefill_commune_type_de_champ.rb
+++ b/app/models/types_de_champ/prefill_commune_type_de_champ.rb
@@ -5,7 +5,13 @@ class TypesDeChamp::PrefillCommuneTypeDeChamp < TypesDeChamp::PrefillTypeDeChamp
     end
   end
 
-  def transform_value_to_assignable_attributes(value)
+  def example_value
+    departement_code = departements.pick(:code)
+    commune_code = APIGeoService.communes(departement_code).pick(:code)
+    [departement_code, commune_code]
+  end
+
+  def to_assignable_attributes(champ, value)
     return if value.blank? || !value.is_a?(Array)
     return if (departement_code = value.first).blank?
     return if (departement_name = APIGeoService.departement_name(departement_code)).blank?
@@ -13,25 +19,26 @@ class TypesDeChamp::PrefillCommuneTypeDeChamp < TypesDeChamp::PrefillTypeDeChamp
     return if !value.one? && (commune_name = APIGeoService.commune_name(departement_code, commune_code)).blank?
 
     if value.one?
-      departement_attributes(departement_code, departement_name)
+      departement_attributes(champ, departement_code, departement_name)
     else
-      departement_and_commune_attributes(departement_code, departement_name, commune_code, commune_name)
+      departement_and_commune_attributes(champ, departement_code, departement_name, commune_code, commune_name)
     end
   end
 
   private
 
-  def departement_attributes(departement_code, departement_name)
+  def departement_attributes(champ, departement_code, departement_name)
     {
+      id: champ.id,
       code_departement: departement_code,
       departement: departement_name
     }
   end
 
-  def departement_and_commune_attributes(departement_code, departement_name, commune_code, commune_name)
+  def departement_and_commune_attributes(champ, departement_code, departement_name, commune_code, commune_name)
     postal_code = APIGeoService.commune_postal_codes(departement_code, commune_code).first
 
-    departement_attributes(departement_code, departement_name).merge(
+    departement_attributes(champ, departement_code, departement_name).merge(
       external_id: commune_code,
       value: "#{commune_name} (#{postal_code})"
     )
diff --git a/spec/models/types_de_champ/prefill_commune_type_de_champ_spec.rb b/spec/models/types_de_champ/prefill_commune_type_de_champ_spec.rb
index da0d8bcc7..aeff12e01 100644
--- a/spec/models/types_de_champ/prefill_commune_type_de_champ_spec.rb
+++ b/spec/models/types_de_champ/prefill_commune_type_de_champ_spec.rb
@@ -1,7 +1,8 @@
 # frozen_string_literal: true
 
 RSpec.describe TypesDeChamp::PrefillCommuneTypeDeChamp do
-  let(:type_de_champ) { build(:type_de_champ_communes) }
+  let(:procedure) { create(:procedure) }
+  let(:type_de_champ) { build(:type_de_champ_communes, procedure: procedure) }
   let(:memory_store) { ActiveSupport::Cache.lookup_store(:memory_store) }
 
   before do
@@ -9,64 +10,69 @@ RSpec.describe TypesDeChamp::PrefillCommuneTypeDeChamp do
     Rails.cache.clear
   end
 
+  before do
+    VCR.insert_cassette('api_geo_departements')
+    VCR.insert_cassette('api_geo_communes')
+  end
+
+  after do
+    VCR.eject_cassette('api_geo_departements')
+    VCR.eject_cassette('api_geo_communes')
+  end
+
   describe 'ancestors' do
-    subject { described_class.new(type_de_champ) }
+    subject { described_class.new(type_de_champ, procedure.active_revision) }
 
     it { is_expected.to be_kind_of(TypesDeChamp::PrefillTypeDeChamp) }
   end
 
-  describe '#possible_values', vcr: { cassette_name: 'api_geo_departements' } do
+  describe '#possible_values' do
     let(:expected_values) do
       departements.map { |departement| "#{departement[:code]} (#{departement[:name]}) : https://geo.api.gouv.fr/communes?codeDepartement=#{departement[:code]}" }
     end
-    subject(:possible_values) { described_class.new(type_de_champ).possible_values }
+    subject(:possible_values) { described_class.new(type_de_champ, procedure.active_revision).possible_values }
 
     it { expect(possible_values).to match(expected_values) }
   end
 
-  describe '#transform_value_to_assignable_attributes' do
-    subject(:transform_value_to_assignable_attributes) do
-      described_class.build(type_de_champ).transform_value_to_assignable_attributes(value)
-    end
+  describe '#example_value' do
+    let(:departement_code) { departements.pick(:code) }
+    let(:commune_code) { APIGeoService.communes(departement_code).pick(:code) }
+    subject(:example_value) { described_class.new(type_de_champ, procedure.active_revision).example_value }
 
-    before do
-      VCR.insert_cassette('api_geo_departements')
-      VCR.insert_cassette('api_geo_communes')
-    end
+    it { is_expected.to eq([departement_code, commune_code]) }
+  end
 
-    after do
-      VCR.eject_cassette('api_geo_departements')
-      VCR.eject_cassette('api_geo_communes')
-    end
-
-    shared_examples "a transformation to" do |expected|
-      it { is_expected.to match(expected) }
+  describe '#to_assignable_attributes' do
+    let(:champ) { create(:champ_communes, type_de_champ: type_de_champ) }
+    subject(:to_assignable_attributes) do
+      described_class.build(type_de_champ, procedure.active_revision).to_assignable_attributes(champ, value)
     end
 
     context 'when the value is nil' do
       let(:value) { nil }
-      it_behaves_like "a transformation to", nil
+      it { is_expected.to match(nil) }
     end
 
     context 'when the value is empty' do
       let(:value) { '' }
-      it_behaves_like "a transformation to", nil
+      it { is_expected.to match(nil) }
     end
 
     context 'when the value is a string' do
       let(:value) { 'hello' }
-      it_behaves_like "a transformation to", nil
+      it { is_expected.to match(nil) }
     end
 
     context 'when the value is an array of one element' do
       context 'when the first element is a valid departement code' do
         let(:value) { ['01'] }
-        it_behaves_like "a transformation to", { code_departement: '01', departement: 'Ain' }
+        it { is_expected.to match({ id: champ.id, code_departement: '01', departement: 'Ain' }) }
       end
 
       context 'when the first element is not a valid departement code' do
         let(:value) { ['totoro'] }
-        it_behaves_like "a transformation to", nil
+        it { is_expected.to match(nil) }
       end
     end
 
@@ -74,18 +80,18 @@ RSpec.describe TypesDeChamp::PrefillCommuneTypeDeChamp do
       context 'when the first element is a valid departement code' do
         context 'when the second element is a valid insee code' do
           let(:value) { ['01', '01457'] }
-          it_behaves_like "a transformation to", { code_departement: '01', departement: 'Ain', external_id: '01457', value: 'Vonnas (01540)' }
+          it { is_expected.to match({ id: champ.id, code_departement: '01', departement: 'Ain', external_id: '01457', value: 'Vonnas (01540)' }) }
         end
 
         context 'when the second element is not a valid insee code' do
           let(:value) { ['01', 'totoro'] }
-          it_behaves_like "a transformation to", nil
+          it { is_expected.to match(nil) }
         end
       end
 
       context 'when the first element is not a valid departement code' do
         let(:value) { ['totoro', '01457'] }
-        it_behaves_like "a transformation to", nil
+        it { is_expected.to match(nil) }
       end
     end
 
@@ -93,18 +99,18 @@ RSpec.describe TypesDeChamp::PrefillCommuneTypeDeChamp do
       context 'when the first element is a valid departement code' do
         context 'when the second element is a valid insee code' do
           let(:value) { ['01', '01457', 'hello'] }
-          it_behaves_like "a transformation to", { code_departement: '01', departement: 'Ain', external_id: '01457', value: 'Vonnas (01540)' }
+          it { is_expected.to match({ id: champ.id, code_departement: '01', departement: 'Ain', external_id: '01457', value: 'Vonnas (01540)' }) }
         end
 
         context 'when the second element is not a valid insee code' do
           let(:value) { ['01', 'totoro', 'hello'] }
-          it_behaves_like "a transformation to", nil
+          it { is_expected.to match(nil) }
         end
       end
 
       context 'when the first element is not a valid departement code' do
         let(:value) { ['totoro', '01457', 'hello'] }
-        it_behaves_like "a transformation to", nil
+        it { is_expected.to match(nil) }
       end
     end
   end

From bd1bed940c3afde16754a13d510158dc62e575b1 Mon Sep 17 00:00:00 2001
From: sebastiencarceles <sebastien.carceles@gmail.com>
Date: Fri, 24 Feb 2023 10:49:11 +0100
Subject: [PATCH 146/202] feature spec cover

---
 spec/support/shared_examples_for_prefilled_dossier.rb | 1 +
 spec/system/users/dossier_prefill_get_spec.rb         | 5 +++++
 spec/system/users/dossier_prefill_post_spec.rb        | 7 ++++++-
 3 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/spec/support/shared_examples_for_prefilled_dossier.rb b/spec/support/shared_examples_for_prefilled_dossier.rb
index 8a1b07a7e..239506e59 100644
--- a/spec/support/shared_examples_for_prefilled_dossier.rb
+++ b/spec/support/shared_examples_for_prefilled_dossier.rb
@@ -26,5 +26,6 @@ shared_examples "the user has got a prefilled dossier, owned by themselves" do
     expect(page).to have_content(multiple_drop_down_list_values.first)
     expect(page).to have_content(multiple_drop_down_list_values.last)
     expect(page).to have_field(type_de_champ_epci.libelle, with: epci_value.last)
+    expect(page).to have_selector("input[value='Vonnas (01540)']")
   end
 end
diff --git a/spec/system/users/dossier_prefill_get_spec.rb b/spec/system/users/dossier_prefill_get_spec.rb
index 78a1ef8f4..eedf28cec 100644
--- a/spec/system/users/dossier_prefill_get_spec.rb
+++ b/spec/system/users/dossier_prefill_get_spec.rb
@@ -11,6 +11,7 @@ describe 'Prefilling a dossier (with a GET request):' do
   let(:type_de_champ_datetime) { create(:type_de_champ_datetime, procedure: procedure) }
   let(:type_de_champ_multiple_drop_down_list) { create(:type_de_champ_multiple_drop_down_list, procedure: procedure) }
   let(:type_de_champ_epci) { create(:type_de_champ_epci, procedure: procedure) }
+  let(:type_de_champ_commune) { create(:type_de_champ_communes, procedure: procedure) }
   let(:type_de_champ_repetition) { create(:type_de_champ_repetition, :with_types_de_champ, procedure: procedure) }
   let(:text_value) { "My Neighbor Totoro is the best movie ever" }
   let(:phone_value) { "invalid phone value" }
@@ -22,6 +23,7 @@ describe 'Prefilling a dossier (with a GET request):' do
     ]
   }
   let(:epci_value) { ['01', '200029999'] }
+  let(:commune_value) { ['01', '01457'] } # Vonnas (01540)
   let(:sub_type_de_champs_repetition) { procedure.active_revision.children_of(type_de_champ_repetition) }
   let(:text_repetition_libelle) { sub_type_de_champs_repetition.first.libelle }
   let(:integer_repetition_libelle) { sub_type_de_champs_repetition.second.libelle }
@@ -36,6 +38,7 @@ describe 'Prefilling a dossier (with a GET request):' do
       "champ_#{type_de_champ_datetime.to_typed_id_for_query}" => datetime_value,
       "champ_#{type_de_champ_multiple_drop_down_list.to_typed_id_for_query}" => multiple_drop_down_list_values,
       "champ_#{type_de_champ_epci.to_typed_id_for_query}" => epci_value,
+      "champ_#{type_de_champ_commune.to_typed_id_for_query}" => commune_value,
       "champ_#{type_de_champ_repetition.to_typed_id_for_query}" => [
         {
           "champ_#{sub_type_de_champs_repetition.first.to_typed_id_for_query}": text_repetition_value,
@@ -50,11 +53,13 @@ describe 'Prefilling a dossier (with a GET request):' do
     Rails.cache.clear
 
     VCR.insert_cassette('api_geo_departements')
+    VCR.insert_cassette('api_geo_communes')
     VCR.insert_cassette('api_geo_epcis')
   end
 
   after do
     VCR.eject_cassette('api_geo_departements')
+    VCR.eject_cassette('api_geo_communes')
     VCR.eject_cassette('api_geo_epcis')
   end
 
diff --git a/spec/system/users/dossier_prefill_post_spec.rb b/spec/system/users/dossier_prefill_post_spec.rb
index 55f90cbfa..5fc2119e8 100644
--- a/spec/system/users/dossier_prefill_post_spec.rb
+++ b/spec/system/users/dossier_prefill_post_spec.rb
@@ -12,6 +12,7 @@ describe 'Prefilling a dossier (with a POST request):' do
   let(:type_de_champ_multiple_drop_down_list) { create(:type_de_champ_multiple_drop_down_list, procedure: procedure) }
   let(:type_de_champ_epci) { create(:type_de_champ_epci, procedure: procedure) }
   let(:type_de_champ_repetition) { create(:type_de_champ_repetition, :with_types_de_champ, procedure: procedure) }
+  let(:type_de_champ_commune) { create(:type_de_champ_communes, procedure: procedure) }
   let(:text_value) { "My Neighbor Totoro is the best movie ever" }
   let(:phone_value) { "invalid phone value" }
   let(:datetime_value) { "2023-02-01T10:32" }
@@ -22,6 +23,7 @@ describe 'Prefilling a dossier (with a POST request):' do
     ]
   }
   let(:epci_value) { ['01', '200029999'] }
+  let(:commune_value) { ['01', '01457'] } # Vonnas (01540)
   let(:sub_type_de_champs_repetition) { procedure.active_revision.children_of(type_de_champ_repetition) }
   let(:text_repetition_libelle) { sub_type_de_champs_repetition.first.libelle }
   let(:integer_repetition_libelle) { sub_type_de_champs_repetition.second.libelle }
@@ -33,11 +35,13 @@ describe 'Prefilling a dossier (with a POST request):' do
     Rails.cache.clear
 
     VCR.insert_cassette('api_geo_departements')
+    VCR.insert_cassette('api_geo_communes')
     VCR.insert_cassette('api_geo_epcis')
   end
 
   after do
     VCR.eject_cassette('api_geo_departements')
+    VCR.eject_cassette('api_geo_communes')
     VCR.eject_cassette('api_geo_epcis')
   end
 
@@ -136,7 +140,8 @@ describe 'Prefilling a dossier (with a POST request):' do
         ],
         "champ_#{type_de_champ_datetime.to_typed_id_for_query}" => datetime_value,
         "champ_#{type_de_champ_multiple_drop_down_list.to_typed_id_for_query}" => multiple_drop_down_list_values,
-        "champ_#{type_de_champ_epci.to_typed_id_for_query}" => epci_value
+        "champ_#{type_de_champ_epci.to_typed_id_for_query}" => epci_value,
+        "champ_#{type_de_champ_commune.to_typed_id_for_query}" => commune_value
       }.to_json
     JSON.parse(session.response.body)["dossier_url"].gsub("http://www.example.com", "")
   end

From 5876dab0960d58c77df4ce452c14c7b1563cf295 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=A9bastien=20Carceles?= <sebastien.carceles@gmail.com>
Date: Mon, 9 Jan 2023 15:29:18 +0100
Subject: [PATCH 147/202] siret champ can fetch it's own etablissement

---
 app/models/champs/siret_champ.rb              |  2 +
 ...t_champ_etablissement_fetchable_concern.rb | 34 +++++++
 ...mp_etablissement_fetchable_concern_spec.rb | 94 +++++++++++++++++++
 3 files changed, 130 insertions(+)
 create mode 100644 app/models/concerns/siret_champ_etablissement_fetchable_concern.rb
 create mode 100644 spec/models/concern/siret_champ_etablissement_fetchable_concern_spec.rb

diff --git a/app/models/champs/siret_champ.rb b/app/models/champs/siret_champ.rb
index 97c816fbf..0901c3227 100644
--- a/app/models/champs/siret_champ.rb
+++ b/app/models/champs/siret_champ.rb
@@ -21,6 +21,8 @@
 #  type_de_champ_id               :integer
 #
 class Champs::SiretChamp < Champ
+  include SiretChampEtablissementFetchableConcern
+
   def search_terms
     etablissement.present? ? etablissement.search_terms : [value]
   end
diff --git a/app/models/concerns/siret_champ_etablissement_fetchable_concern.rb b/app/models/concerns/siret_champ_etablissement_fetchable_concern.rb
new file mode 100644
index 000000000..8d53f0a4c
--- /dev/null
+++ b/app/models/concerns/siret_champ_etablissement_fetchable_concern.rb
@@ -0,0 +1,34 @@
+module SiretChampEtablissementFetchableConcern
+  extend ActiveSupport::Concern
+
+  def fetch_etablissement!(siret, user)
+    return clear if siret.empty?
+    return clear(error: :invalid) unless Siret.new(siret: siret).valid? # i18n-tasks-use t('errors.messages.invalid_siret')
+    return clear(error: :not_found) unless (etablissement = APIEntrepriseService.create_etablissement(self, siret, user.id)) # i18n-tasks-use t('errors.messages.siret_not_found')
+
+    return update_etablissement!(etablissement)
+  rescue => error
+    if error.try(:network_error?) && !APIEntrepriseService.api_up?
+      # TODO: notify ops
+      etablissement = APIEntrepriseService.create_etablissement_as_degraded_mode(self, siret, user.id)
+      return update_etablissement!(etablissement, error: :api_entreprise_down)
+    else
+      Sentry.capture_exception(error, extra: { dossier_id: dossier_id, siret: siret })
+      return clear(error: :network_error) # i18n-tasks-use t('errors.messages.siret_network_error')
+    end
+  end
+
+  private
+
+  def update_etablissement!(etablissement, error: nil)
+    update!(value: etablissement.siret, etablissement: etablissement)
+    error.presence || etablissement.siret
+  end
+
+  def clear(error: nil)
+    etablissement_to_destroy = etablissement
+    update!(value: '', etablissement: nil)
+    etablissement_to_destroy&.destroy
+    error.presence
+  end
+end
diff --git a/spec/models/concern/siret_champ_etablissement_fetchable_concern_spec.rb b/spec/models/concern/siret_champ_etablissement_fetchable_concern_spec.rb
new file mode 100644
index 000000000..77b754dac
--- /dev/null
+++ b/spec/models/concern/siret_champ_etablissement_fetchable_concern_spec.rb
@@ -0,0 +1,94 @@
+RSpec.describe SiretChampEtablissementFetchableConcern do
+  describe '.fetch_etablissement!' do
+    let(:api_etablissement_status) { 200 }
+    let(:api_etablissement_body) { File.read('spec/fixtures/files/api_entreprise/etablissements.json') }
+    let(:token_expired) { false }
+    let!(:champ) { create(:champ_siret) }
+
+    before do
+      stub_request(:get, /https:\/\/entreprise.api.gouv.fr\/v2\/etablissements\/#{siret}/)
+        .to_return(status: api_etablissement_status, body: api_etablissement_body)
+      allow_any_instance_of(APIEntrepriseToken).to receive(:roles)
+        .and_return(["attestations_fiscales", "attestations_sociales", "bilans_entreprise_bdf"])
+      allow_any_instance_of(APIEntrepriseToken).to receive(:expired?).and_return(token_expired)
+    end
+
+    subject(:fetch_etablissement!) { champ.fetch_etablissement!(siret, build_stubbed(:user)) }
+
+    shared_examples 'an error occured' do |error|
+      it { expect { fetch_etablissement! }.to change { champ.reload.value }.to('') }
+
+      it { expect { fetch_etablissement! }.to change { champ.reload.etablissement }.to(nil) }
+
+      it { expect { fetch_etablissement! }.to change { Etablissement.count }.by(-1) }
+
+      it { expect(fetch_etablissement!).to eq(error) }
+    end
+
+    context 'when the SIRET is empty' do
+      let(:siret) { '' }
+
+      it_behaves_like 'an error occured', nil
+    end
+
+    context 'when the SIRET is invalid' do
+      let(:siret) { '1234' }
+
+      it_behaves_like 'an error occured', :invalid
+    end
+
+    context 'when the API is unavailable due to network error' do
+      let(:siret) { '82161143100015' }
+      let(:api_etablissement_status) { 503 }
+
+      before { expect(APIEntrepriseService).to receive(:api_up?).and_return(true) }
+
+      it_behaves_like 'an error occured', :network_error
+
+      it 'sends the error to Sentry' do
+        expect(Sentry).to receive(:capture_exception)
+        fetch_etablissement!
+      end
+    end
+
+    context 'when the API is unavailable due to an api maintenance or pb' do
+      let(:siret) { '82161143100015' }
+      let(:api_etablissement_status) { 502 }
+
+      before { expect(APIEntrepriseService).to receive(:api_up?).and_return(false) }
+
+      it { expect { fetch_etablissement! }.to change { champ.reload.value }.to(siret) }
+
+      it { expect { fetch_etablissement! }.to change { champ.reload.etablissement } }
+
+      it { expect { fetch_etablissement! }.to change { champ.reload.etablissement.as_degraded_mode? }.to(true) }
+
+      it { expect { fetch_etablissement! }.to change { Etablissement.count }.by(1) }
+
+      it { expect(fetch_etablissement!).to eq(:api_entreprise_down) }
+    end
+
+    context 'when the SIRET is valid but unknown' do
+      let(:siret) { '00000000000000' }
+      let(:api_etablissement_status) { 404 }
+
+      it_behaves_like 'an error occured', :not_found
+    end
+
+    context 'when the SIRET informations are retrieved successfully' do
+      let(:siret) { '41816609600051' }
+      let(:api_etablissement_status) { 200 }
+      let(:api_etablissement_body) { File.read('spec/fixtures/files/api_entreprise/etablissements.json') }
+
+      it { expect { fetch_etablissement! }.to change { champ.reload.value }.to(siret) }
+
+      it { expect { fetch_etablissement! }.to change { champ.reload.etablissement.siret }.to(siret) }
+
+      it { expect { fetch_etablissement! }.to change { champ.reload.etablissement.naf }.to("6202A") }
+
+      it { expect { fetch_etablissement! }.to change { Etablissement.count }.by(1) }
+
+      it { expect(fetch_etablissement!).to eq(siret) }
+    end
+  end
+end

From 88136daf140ff4ca59a17787fe613bca700fc1f8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=A9bastien=20Carceles?= <sebastien.carceles@gmail.com>
Date: Mon, 9 Jan 2023 16:22:13 +0100
Subject: [PATCH 148/202] refactor siret controller to use that new ability

---
 app/controllers/champs/siret_controller.rb    | 57 +------------------
 app/views/champs/siret/show.turbo_stream.haml |  2 +-
 2 files changed, 2 insertions(+), 57 deletions(-)

diff --git a/app/controllers/champs/siret_controller.rb b/app/controllers/champs/siret_controller.rb
index 2ef8aefd5..f8112bf6b 100644
--- a/app/controllers/champs/siret_controller.rb
+++ b/app/controllers/champs/siret_controller.rb
@@ -3,61 +3,6 @@ class Champs::SiretController < ApplicationController
 
   def show
     @champ = policy_scope(Champ).find(params[:champ_id])
-    @siret = read_param_value(@champ.input_name, 'value')
-    @etablissement = @champ.etablissement
-
-    if @siret.empty?
-      return clear_siret_and_etablissement
-    end
-
-    if !Siret.new(siret: @siret).valid?
-      # i18n-tasks-use t('errors.messages.invalid_siret')
-      return siret_error(:invalid)
-    end
-
-    begin
-      etablissement = find_etablissement_with_siret
-    rescue => error
-      if error.try(:network_error?) && !APIEntrepriseService.api_up?
-        # TODO: notify ops
-        etablissement = APIEntrepriseService.create_etablissement_as_degraded_mode(@champ, @siret, current_user.id)
-
-        if !@champ.nil?
-          @champ.update!(value: etablissement.siret, etablissement: etablissement)
-        end
-
-        @siret = :api_entreprise_down
-        return
-      else
-        Sentry.capture_exception(error, extra: { dossier_id: @champ.dossier_id, siret: @siret })
-        # i18n-tasks-use t('errors.messages.siret_network_error')
-        return siret_error(:network_error)
-      end
-    end
-    if etablissement.nil?
-      # i18n-tasks-use t('errors.messages.siret_not_found')
-      return siret_error(:not_found)
-    end
-
-    @etablissement = etablissement
-    if !@champ.nil?
-      @champ.update!(value: etablissement.siret, etablissement: etablissement)
-    end
-  end
-
-  private
-
-  def find_etablissement_with_siret
-    APIEntrepriseService.create_etablissement(@champ, @siret, current_user.id)
-  end
-
-  def clear_siret_and_etablissement
-    @champ.update!(value: '')
-    @etablissement&.destroy
-  end
-
-  def siret_error(error)
-    clear_siret_and_etablissement
-    @siret = error
+    @siret = @champ.fetch_etablissement!(read_param_value(@champ.input_name, 'value'), current_user)
   end
 end
diff --git a/app/views/champs/siret/show.turbo_stream.haml b/app/views/champs/siret/show.turbo_stream.haml
index be1c3a1c8..2e56df6aa 100644
--- a/app/views/champs/siret/show.turbo_stream.haml
+++ b/app/views/champs/siret/show.turbo_stream.haml
@@ -1 +1 @@
-= turbo_stream.update dom_id(@champ, :siret_info), partial: 'shared/champs/siret/etablissement', locals: { siret: @siret, etablissement: @etablissement }
+= turbo_stream.update dom_id(@champ, :siret_info), partial: 'shared/champs/siret/etablissement', locals: { siret: @siret, etablissement: @champ.etablissement }

From 3eb76d8a43bcad3ad3710e2e283657fb157754c0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=A9bastien=20Carceles?= <sebastien.carceles@gmail.com>
Date: Wed, 11 Jan 2023 10:45:54 +0100
Subject: [PATCH 149/202] allow siret prefilling

---
 app/models/type_de_champ.rb        | 3 ++-
 config/locales/en.yml              | 2 ++
 config/locales/fr.yml              | 2 ++
 spec/models/prefill_params_spec.rb | 1 -
 spec/models/type_de_champ_spec.rb  | 2 +-
 5 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/app/models/type_de_champ.rb b/app/models/type_de_champ.rb
index 87745457f..d0342260e 100644
--- a/app/models/type_de_champ.rb
+++ b/app/models/type_de_champ.rb
@@ -272,7 +272,8 @@ class TypeDeChamp < ApplicationRecord
       TypeDeChamp.type_champs.fetch(:drop_down_list),
       TypeDeChamp.type_champs.fetch(:repetition),
       TypeDeChamp.type_champs.fetch(:multiple_drop_down_list),
-      TypeDeChamp.type_champs.fetch(:epci)
+      TypeDeChamp.type_champs.fetch(:epci),
+      TypeDeChamp.type_champs.fetch(:siret)
     ])
   end
 
diff --git a/config/locales/en.yml b/config/locales/en.yml
index 42e1bae25..be8827d22 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -136,6 +136,7 @@ en:
           date_html: ISO8601 date
           datetime_html: ISO8601 datetime
           drop_down_list_other_html: Any value
+          siret_html: A SIRET number
           repetition_html: A array of hashes with possible values for each field of the repetition.
           epci_html: An array of the department code and the <a href="https://geo.api.gouv.fr/epcis" target="_blank" rel="noopener noreferrer">EPCI one</a>.
         examples:
@@ -154,6 +155,7 @@ en:
           date: "2023-02-01"
           datetime: "2023-02-01T10:30"
           checkbox: "true"
+          siret: 828212345600023
         prefill_link_title: Prefill link (GET)
         prefill_link_info: Use the button to copy the link, then remplace the values with your data.
         prefill_link_too_long: Warning, the prefill link is too long and may not work on all browsers.
diff --git a/config/locales/fr.yml b/config/locales/fr.yml
index 7188425cc..46355b052 100644
--- a/config/locales/fr.yml
+++ b/config/locales/fr.yml
@@ -127,6 +127,7 @@ fr:
           datetime_html: Datetime au format ISO8601
           date_html: Date au format ISO8601
           drop_down_list_other_html: Toute valeur
+          siret_html: Un numéro de SIRET
           repetition_html: Un tableau de dictionnaires avec les valeurs possibles pour chaque champ de la répétition.
           epci_html: Un tableau contenant le code de département et <a href="https://geo.api.gouv.fr/epcis" target="_blank" rel="noopener noreferrer">celui de l'EPCI</a>.
         examples:
@@ -146,6 +147,7 @@ fr:
           date: "2023-02-01"
           datetime: "2023-02-01T10:30"
           checkbox: "true"
+          siret: 82812345600023
         prefill_link_title: Lien de préremplissage (GET)
         prefill_link_info: Copiez le lien grâce au bouton ci-dessous et remplacez les valeurs par les données dont vous disposez.
         prefill_link_too_long: Attention, ce lien de préremplissage est trop long et risque de ne pas fonctionner sur certains navigateurs.
diff --git a/spec/models/prefill_params_spec.rb b/spec/models/prefill_params_spec.rb
index 3356cf448..232883a1c 100644
--- a/spec/models/prefill_params_spec.rb
+++ b/spec/models/prefill_params_spec.rb
@@ -217,7 +217,6 @@ RSpec.describe PrefillParams do
     it_behaves_like "a champ public value that is unauthorized", :regions, "value"
     it_behaves_like "a champ public value that is unauthorized", :departements, "value"
     it_behaves_like "a champ public value that is unauthorized", :communes, "value"
-    it_behaves_like "a champ public value that is unauthorized", :siret, "value"
     it_behaves_like "a champ public value that is unauthorized", :rna, "value"
     it_behaves_like "a champ public value that is unauthorized", :annuaire_education, "value"
     it_behaves_like "a champ public value that is unauthorized", :multiple_drop_down_list, ["value"]
diff --git a/spec/models/type_de_champ_spec.rb b/spec/models/type_de_champ_spec.rb
index d2225c4c6..3b0707ecf 100644
--- a/spec/models/type_de_champ_spec.rb
+++ b/spec/models/type_de_champ_spec.rb
@@ -255,6 +255,7 @@ describe TypeDeChamp do
     it_behaves_like "a prefillable type de champ", :type_de_champ_repetition
     it_behaves_like "a prefillable type de champ", :type_de_champ_multiple_drop_down_list
     it_behaves_like "a prefillable type de champ", :type_de_champ_epci
+    it_behaves_like "a prefillable type de champ", :type_de_champ_siret
 
     it_behaves_like "a non-prefillable type de champ", :type_de_champ_number
     it_behaves_like "a non-prefillable type de champ", :type_de_champ_dossier_link
@@ -269,7 +270,6 @@ describe TypeDeChamp do
     it_behaves_like "a non-prefillable type de champ", :type_de_champ_mesri
     it_behaves_like "a non-prefillable type de champ", :type_de_champ_carte
     it_behaves_like "a non-prefillable type de champ", :type_de_champ_address
-    it_behaves_like "a non-prefillable type de champ", :type_de_champ_siret
     it_behaves_like "a non-prefillable type de champ", :type_de_champ_rna
     it_behaves_like "a non-prefillable type de champ", :type_de_champ_annuaire_education
   end

From df2eaa95425b39d2047d5af3cd73ec078e3ab821 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=A9bastien=20Carceles?= <sebastien.carceles@gmail.com>
Date: Wed, 11 Jan 2023 15:04:45 +0100
Subject: [PATCH 150/202] don't clean the siret champ value

Cleaning the value is useless, when fetching the etablissement,
as the value will be re-written by the dossier update, when the user
fills in the dossier.
---
 ...t_champ_etablissement_fetchable_concern.rb |  2 +-
 .../champs/siret_controller_spec.rb           | 24 +++++++------------
 ...mp_etablissement_fetchable_concern_spec.rb |  2 --
 3 files changed, 9 insertions(+), 19 deletions(-)

diff --git a/app/models/concerns/siret_champ_etablissement_fetchable_concern.rb b/app/models/concerns/siret_champ_etablissement_fetchable_concern.rb
index 8d53f0a4c..3beb7b652 100644
--- a/app/models/concerns/siret_champ_etablissement_fetchable_concern.rb
+++ b/app/models/concerns/siret_champ_etablissement_fetchable_concern.rb
@@ -27,7 +27,7 @@ module SiretChampEtablissementFetchableConcern
 
   def clear(error: nil)
     etablissement_to_destroy = etablissement
-    update!(value: '', etablissement: nil)
+    update!(etablissement: nil)
     etablissement_to_destroy&.destroy
     error.presence
   end
diff --git a/spec/controllers/champs/siret_controller_spec.rb b/spec/controllers/champs/siret_controller_spec.rb
index daee4b3da..36dcca443 100644
--- a/spec/controllers/champs/siret_controller_spec.rb
+++ b/spec/controllers/champs/siret_controller_spec.rb
@@ -39,10 +39,8 @@ describe Champs::SiretController, type: :controller do
       context 'when the SIRET is empty' do
         subject! { get :show, params: params, format: :turbo_stream }
 
-        it 'clears the etablissement and SIRET on the model' do
-          champ.reload
-          expect(champ.etablissement).to be_nil
-          expect(champ.value).to be_empty
+        it 'clears the etablissement on the model' do
+          expect(champ.reload.etablissement).to be_nil
         end
 
         it 'clears any information or error message' do
@@ -55,10 +53,8 @@ describe Champs::SiretController, type: :controller do
 
         subject! { get :show, params: params, format: :turbo_stream }
 
-        it 'clears the etablissement and SIRET on the model' do
-          champ.reload
-          expect(champ.etablissement).to be_nil
-          expect(champ.value).to be_empty
+        it 'clears the etablissement on the model' do
+          expect(champ.reload.etablissement).to be_nil
         end
 
         it 'displays a “SIRET is invalid” error message' do
@@ -76,10 +72,8 @@ describe Champs::SiretController, type: :controller do
 
         subject! { get :show, params: params, format: :turbo_stream }
 
-        it 'clears the etablissement and SIRET on the model' do
-          champ.reload
-          expect(champ.etablissement).to be_nil
-          expect(champ.value).to be_empty
+        it 'clears the etablissement on the model' do
+          expect(champ.reload.etablissement).to be_nil
         end
 
         it 'displays a “API is unavailable” error message' do
@@ -115,10 +109,8 @@ describe Champs::SiretController, type: :controller do
 
         subject! { get :show, params: params, format: :turbo_stream }
 
-        it 'clears the etablissement and SIRET on the model' do
-          champ.reload
-          expect(champ.etablissement).to be_nil
-          expect(champ.value).to be_empty
+        it 'clears the etablissement on the model' do
+          expect(champ.reload.etablissement).to be_nil
         end
 
         it 'displays a “SIRET not found” error message' do
diff --git a/spec/models/concern/siret_champ_etablissement_fetchable_concern_spec.rb b/spec/models/concern/siret_champ_etablissement_fetchable_concern_spec.rb
index 77b754dac..c916bc7b9 100644
--- a/spec/models/concern/siret_champ_etablissement_fetchable_concern_spec.rb
+++ b/spec/models/concern/siret_champ_etablissement_fetchable_concern_spec.rb
@@ -16,8 +16,6 @@ RSpec.describe SiretChampEtablissementFetchableConcern do
     subject(:fetch_etablissement!) { champ.fetch_etablissement!(siret, build_stubbed(:user)) }
 
     shared_examples 'an error occured' do |error|
-      it { expect { fetch_etablissement! }.to change { champ.reload.value }.to('') }
-
       it { expect { fetch_etablissement! }.to change { champ.reload.etablissement }.to(nil) }
 
       it { expect { fetch_etablissement! }.to change { Etablissement.count }.by(-1) }

From b6c74b0e83321772387aaefcb7d252314918f2cc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=A9bastien=20Carceles?= <sebastien.carceles@gmail.com>
Date: Wed, 11 Jan 2023 15:07:16 +0100
Subject: [PATCH 151/202] fetch etablissement when editing the dossier

---
 .../siret_component/siret_component.html.haml              | 2 +-
 app/javascript/controllers/turbo_input_controller.tsx      | 7 ++++++-
 spec/models/concern/dossier_prefillable_concern_spec.rb    | 5 ++++-
 3 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/app/components/editable_champ/siret_component/siret_component.html.haml b/app/components/editable_champ/siret_component/siret_component.html.haml
index 0bcdcdb47..1970d85cc 100644
--- a/app/components/editable_champ/siret_component/siret_component.html.haml
+++ b/app/components/editable_champ/siret_component/siret_component.html.haml
@@ -2,7 +2,7 @@
   id: @champ.input_id,
   aria: { describedby: @champ.describedby_id },
   placeholder: t(".placeholder"),
-  data: { controller: 'turbo-input', turbo_input_url_value: champs_siret_path(@champ.id) },
+  data: { controller: 'turbo-input', turbo_input_load_on_connect_value: @champ.prefilled? && @champ.value.present? && @champ.etablissement.blank?, turbo_input_url_value: champs_siret_path(@champ.id) },
   required: @champ.required?,
   pattern: "[0-9]{14}",
   title: t(".title"),
diff --git a/app/javascript/controllers/turbo_input_controller.tsx b/app/javascript/controllers/turbo_input_controller.tsx
index d194a7f3c..e2ad35db3 100644
--- a/app/javascript/controllers/turbo_input_controller.tsx
+++ b/app/javascript/controllers/turbo_input_controller.tsx
@@ -4,13 +4,18 @@ import { ApplicationController } from './application_controller';
 
 export class TurboInputController extends ApplicationController {
   static values = {
-    url: String
+    url: String,
+    loadOnConnect: { type: Boolean, default: false }
   };
 
   declare readonly urlValue: string;
+  declare readonly loadOnConnectValue: boolean;
 
   connect(): void {
     this.on('input', () => this.debounce(this.load, 200));
+    if (this.loadOnConnectValue) {
+      this.load();
+    }
   }
 
   private load(): void {
diff --git a/spec/models/concern/dossier_prefillable_concern_spec.rb b/spec/models/concern/dossier_prefillable_concern_spec.rb
index 3ab8f73e9..32a52cad8 100644
--- a/spec/models/concern/dossier_prefillable_concern_spec.rb
+++ b/spec/models/concern/dossier_prefillable_concern_spec.rb
@@ -6,7 +6,10 @@ RSpec.describe DossierPrefillableConcern do
     let(:dossier) { create(:dossier, :brouillon, procedure: procedure) }
     let(:types_de_champ_public) { [] }
 
-    subject(:fill) { dossier.prefill!(values); dossier.reload }
+    subject(:fill) do
+      dossier.prefill!(values)
+      dossier.reload
+    end
 
     shared_examples 'a dossier marked as prefilled' do
       it 'marks the dossier as prefilled' do

From 2ad4e4c01f02c3f17449580a82a8b2040e3d8bdd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=A9bastien=20Carceles?= <sebastien.carceles@gmail.com>
Date: Sat, 14 Jan 2023 10:13:26 +0100
Subject: [PATCH 152/202] refacto: better error management

---
 app/controllers/champs/siret_controller.rb    |  7 +++-
 ...t_champ_etablissement_fetchable_concern.rb | 32 +++++++++++--------
 ...mp_etablissement_fetchable_concern_spec.rb | 18 ++++++++---
 3 files changed, 38 insertions(+), 19 deletions(-)

diff --git a/app/controllers/champs/siret_controller.rb b/app/controllers/champs/siret_controller.rb
index f8112bf6b..23e4ab2ee 100644
--- a/app/controllers/champs/siret_controller.rb
+++ b/app/controllers/champs/siret_controller.rb
@@ -3,6 +3,11 @@ class Champs::SiretController < ApplicationController
 
   def show
     @champ = policy_scope(Champ).find(params[:champ_id])
-    @siret = @champ.fetch_etablissement!(read_param_value(@champ.input_name, 'value'), current_user)
+
+    if @champ.fetch_etablissement!(read_param_value(@champ.input_name, 'value'), current_user)
+      @siret = @champ.etablissement.siret
+    else
+      @siret = @champ.etablissement_fetch_error_key
+    end
   end
 end
diff --git a/app/models/concerns/siret_champ_etablissement_fetchable_concern.rb b/app/models/concerns/siret_champ_etablissement_fetchable_concern.rb
index 3beb7b652..cdc629372 100644
--- a/app/models/concerns/siret_champ_etablissement_fetchable_concern.rb
+++ b/app/models/concerns/siret_champ_etablissement_fetchable_concern.rb
@@ -1,34 +1,38 @@
 module SiretChampEtablissementFetchableConcern
   extend ActiveSupport::Concern
 
-  def fetch_etablissement!(siret, user)
-    return clear if siret.empty?
-    return clear(error: :invalid) unless Siret.new(siret: siret).valid? # i18n-tasks-use t('errors.messages.invalid_siret')
-    return clear(error: :not_found) unless (etablissement = APIEntrepriseService.create_etablissement(self, siret, user.id)) # i18n-tasks-use t('errors.messages.siret_not_found')
+  attr_reader :etablissement_fetch_error_key
 
-    return update_etablissement!(etablissement)
+  def fetch_etablissement!(siret, user)
+    return clear_etablissement!(:empty) if siret.empty?
+    return clear_etablissement!(:invalid) unless Siret.new(siret: siret).valid? # i18n-tasks-use t('errors.messages.invalid_siret')
+    return clear_etablissement!(:not_found) unless (etablissement = APIEntrepriseService.create_etablissement(self, siret, user&.id)) # i18n-tasks-use t('errors.messages.siret_not_found')
+
+    update!(value: siret, etablissement: etablissement)
   rescue => error
     if error.try(:network_error?) && !APIEntrepriseService.api_up?
       # TODO: notify ops
-      etablissement = APIEntrepriseService.create_etablissement_as_degraded_mode(self, siret, user.id)
-      return update_etablissement!(etablissement, error: :api_entreprise_down)
+      update!(
+        value: siret,
+        etablissement: APIEntrepriseService.create_etablissement_as_degraded_mode(self, siret, user.id)
+      )
+      @etablissement_fetch_error_key = :api_entreprise_down
+      false
     else
       Sentry.capture_exception(error, extra: { dossier_id: dossier_id, siret: siret })
-      return clear(error: :network_error) # i18n-tasks-use t('errors.messages.siret_network_error')
+      clear_etablissement!(:network_error) # i18n-tasks-use t('errors.messages.siret_network_error')
     end
   end
 
   private
 
-  def update_etablissement!(etablissement, error: nil)
-    update!(value: etablissement.siret, etablissement: etablissement)
-    error.presence || etablissement.siret
-  end
+  def clear_etablissement!(error_key)
+    @etablissement_fetch_error_key = error_key
 
-  def clear(error: nil)
     etablissement_to_destroy = etablissement
     update!(etablissement: nil)
     etablissement_to_destroy&.destroy
-    error.presence
+
+    false
   end
 end
diff --git a/spec/models/concern/siret_champ_etablissement_fetchable_concern_spec.rb b/spec/models/concern/siret_champ_etablissement_fetchable_concern_spec.rb
index c916bc7b9..a69ef2a3b 100644
--- a/spec/models/concern/siret_champ_etablissement_fetchable_concern_spec.rb
+++ b/spec/models/concern/siret_champ_etablissement_fetchable_concern_spec.rb
@@ -20,13 +20,18 @@ RSpec.describe SiretChampEtablissementFetchableConcern do
 
       it { expect { fetch_etablissement! }.to change { Etablissement.count }.by(-1) }
 
-      it { expect(fetch_etablissement!).to eq(error) }
+      it { expect(fetch_etablissement!).to eq(false) }
+
+      it 'populates the etablissement_fetch_error_key' do
+        fetch_etablissement!
+        expect(champ.etablissement_fetch_error_key).to eq(error)
+      end
     end
 
     context 'when the SIRET is empty' do
       let(:siret) { '' }
 
-      it_behaves_like 'an error occured', nil
+      it_behaves_like 'an error occured', :empty
     end
 
     context 'when the SIRET is invalid' do
@@ -63,7 +68,12 @@ RSpec.describe SiretChampEtablissementFetchableConcern do
 
       it { expect { fetch_etablissement! }.to change { Etablissement.count }.by(1) }
 
-      it { expect(fetch_etablissement!).to eq(:api_entreprise_down) }
+      it { expect(fetch_etablissement!).to eq(false) }
+
+      it 'populates the etablissement_fetch_error_key' do
+        fetch_etablissement!
+        expect(champ.etablissement_fetch_error_key).to eq(:api_entreprise_down)
+      end
     end
 
     context 'when the SIRET is valid but unknown' do
@@ -86,7 +96,7 @@ RSpec.describe SiretChampEtablissementFetchableConcern do
 
       it { expect { fetch_etablissement! }.to change { Etablissement.count }.by(1) }
 
-      it { expect(fetch_etablissement!).to eq(siret) }
+      it { expect(fetch_etablissement!).to eq(true) }
     end
   end
 end

From 30eef3e128f0bae45424616ff1fb728587ce9b30 Mon Sep 17 00:00:00 2001
From: sebastiencarceles <sebastien.carceles@gmail.com>
Date: Mon, 16 Jan 2023 15:14:53 +0100
Subject: [PATCH 153/202] review: detailled error message

---
 ...iret_champ_etablissement_fetchable_concern.rb | 10 +++++++++-
 .../shared/champs/siret/_etablissement.html.haml |  7 +++++--
 config/locales/en.yml                            |  5 +++--
 config/locales/fr.yml                            |  5 +++--
 spec/controllers/champs/siret_controller_spec.rb | 16 +++++++++++++++-
 ...champ_etablissement_fetchable_concern_spec.rb | 10 ++++++++--
 6 files changed, 43 insertions(+), 10 deletions(-)

diff --git a/app/models/concerns/siret_champ_etablissement_fetchable_concern.rb b/app/models/concerns/siret_champ_etablissement_fetchable_concern.rb
index cdc629372..6a36176b6 100644
--- a/app/models/concerns/siret_champ_etablissement_fetchable_concern.rb
+++ b/app/models/concerns/siret_champ_etablissement_fetchable_concern.rb
@@ -5,7 +5,8 @@ module SiretChampEtablissementFetchableConcern
 
   def fetch_etablissement!(siret, user)
     return clear_etablissement!(:empty) if siret.empty?
-    return clear_etablissement!(:invalid) unless Siret.new(siret: siret).valid? # i18n-tasks-use t('errors.messages.invalid_siret')
+    return clear_etablissement!(:invalid_length) if invalid_because?(siret, :length) # i18n-tasks-use t('errors.messages.invalid_siret_length')
+    return clear_etablissement!(:invalid_checksum) if invalid_because?(siret, :checksum) # i18n-tasks-use t('errors.messages.invalid_siret_checksum')
     return clear_etablissement!(:not_found) unless (etablissement = APIEntrepriseService.create_etablissement(self, siret, user&.id)) # i18n-tasks-use t('errors.messages.siret_not_found')
 
     update!(value: siret, etablissement: etablissement)
@@ -35,4 +36,11 @@ module SiretChampEtablissementFetchableConcern
 
     false
   end
+
+  def invalid_because?(siret, criteria)
+    validatable_siret = Siret.new(siret: siret)
+    return false if validatable_siret.valid?
+
+    validatable_siret.errors.details[:siret].any? && validatable_siret.errors.details[:siret].first[:error] == criteria
+  end
 end
diff --git a/app/views/shared/champs/siret/_etablissement.html.haml b/app/views/shared/champs/siret/_etablissement.html.haml
index e93adaa15..71c9ec5f3 100644
--- a/app/views/shared/champs/siret/_etablissement.html.haml
+++ b/app/views/shared/champs/siret/_etablissement.html.haml
@@ -1,6 +1,9 @@
 - case siret
-- when :invalid
-  Le numéro de SIRET doit comporter exactement 14 chiffres.
+- when :invalid_length
+  = t('errors.messages.invalid_siret_length')
+
+- when :invalid_checksum
+  = t('errors.messages.invalid_siret_checksum')
 
 - when :not_found
   Nous n’avons pas trouvé d’établissement correspondant à ce numéro de SIRET.
diff --git a/config/locales/en.yml b/config/locales/en.yml
index be8827d22..b0be49749 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -155,7 +155,7 @@ en:
           date: "2023-02-01"
           datetime: "2023-02-01T10:30"
           checkbox: "true"
-          siret: 828212345600023
+          siret: 13002526500013
         prefill_link_title: Prefill link (GET)
         prefill_link_info: Use the button to copy the link, then remplace the values with your data.
         prefill_link_too_long: Warning, the prefill link is too long and may not work on all browsers.
@@ -511,7 +511,8 @@ en:
       dossier_not_found: "The file does not exist or you do not have access to it."
       # # dossier_map_not_activated: "The file does not have access to the map."
       targeted_user_link_expired: "This invitation link or the file is no longer available."
-      invalid_siret: "The SIRET is incorrect"
+      invalid_siret_length: "The SIRET number must contain exactly 14 numbers."
+      invalid_siret_checksum: "The SIRET number is invalid."
       procedure_not_found: "The procedure does not exist"
       siret_unknown: 'Sorry, we did not find any establishment registered under this SIRET number.'
       siret_network_error: 'Désolé, la récupération des informations SIRET est temporairement indisponible. Veuillez réessayer dans quelques instants.'
diff --git a/config/locales/fr.yml b/config/locales/fr.yml
index 46355b052..8d22ce686 100644
--- a/config/locales/fr.yml
+++ b/config/locales/fr.yml
@@ -147,7 +147,7 @@ fr:
           date: "2023-02-01"
           datetime: "2023-02-01T10:30"
           checkbox: "true"
-          siret: 82812345600023
+          siret: 13002526500013
         prefill_link_title: Lien de préremplissage (GET)
         prefill_link_info: Copiez le lien grâce au bouton ci-dessous et remplacez les valeurs par les données dont vous disposez.
         prefill_link_too_long: Attention, ce lien de préremplissage est trop long et risque de ne pas fonctionner sur certains navigateurs.
@@ -507,7 +507,8 @@ fr:
       dossier_not_found: "Le dossier n’existe pas ou vous n’y avez pas accès."
       # dossier_map_not_activated: "Le dossier n’a pas accès à la cartographie."
       targeted_user_link_expired: "Ce lien d’invitation n’est plus valable ou le dossier n’est plus accessible."
-      invalid_siret: "Le siret est incorrect"
+      invalid_siret_length: "Le numéro de SIRET doit comporter exactement 14 chiffres."
+      invalid_siret_checksum: "Le format du numéro de SIRET est invalide."
       procedure_not_found: "La démarche n’existe pas"
       siret_unknown: 'Désolé, nous n’avons pas trouvé d’établissement enregistré correspondant à ce numéro SIRET.'
       siret_network_error: 'Désolé, la récupération des informations SIRET est temporairement indisponible. Veuillez réessayer dans quelques instants.'
diff --git a/spec/controllers/champs/siret_controller_spec.rb b/spec/controllers/champs/siret_controller_spec.rb
index 36dcca443..81a9b6dbd 100644
--- a/spec/controllers/champs/siret_controller_spec.rb
+++ b/spec/controllers/champs/siret_controller_spec.rb
@@ -48,7 +48,7 @@ describe Champs::SiretController, type: :controller do
         end
       end
 
-      context 'when the SIRET is invalid' do
+      context "when the SIRET is invalid because of it's length" do
         let(:siret) { '1234' }
 
         subject! { get :show, params: params, format: :turbo_stream }
@@ -62,6 +62,20 @@ describe Champs::SiretController, type: :controller do
         end
       end
 
+      context "when the SIRET is invalid because of it's checksum" do
+        let(:siret) { '82812345600023' }
+
+        subject! { get :show, params: params, format: :turbo_stream }
+
+        it 'clears the etablissement on the model' do
+          expect(champ.reload.etablissement).to be_nil
+        end
+
+        it 'displays a “SIRET is invalid” error message' do
+          expect(response.body).to include('Le format du numéro de SIRET est invalide.')
+        end
+      end
+
       context 'when the API is unavailable due to network error' do
         let(:siret) { '82161143100015' }
         let(:api_etablissement_status) { 503 }
diff --git a/spec/models/concern/siret_champ_etablissement_fetchable_concern_spec.rb b/spec/models/concern/siret_champ_etablissement_fetchable_concern_spec.rb
index a69ef2a3b..19151c31a 100644
--- a/spec/models/concern/siret_champ_etablissement_fetchable_concern_spec.rb
+++ b/spec/models/concern/siret_champ_etablissement_fetchable_concern_spec.rb
@@ -34,10 +34,16 @@ RSpec.describe SiretChampEtablissementFetchableConcern do
       it_behaves_like 'an error occured', :empty
     end
 
-    context 'when the SIRET is invalid' do
+    context "when the SIRET is invalid because of it's length" do
       let(:siret) { '1234' }
 
-      it_behaves_like 'an error occured', :invalid
+      it_behaves_like 'an error occured', :invalid_length
+    end
+
+    context "when the SIRET is invalid because of it's checksum" do
+      let(:siret) { '82812345600023' }
+
+      it_behaves_like 'an error occured', :invalid_checksum
     end
 
     context 'when the API is unavailable due to network error' do

From 5dce401a14ebec4ffdb445e5b14a649dc0a23dbc Mon Sep 17 00:00:00 2001
From: sebastiencarceles <sebastien.carceles@gmail.com>
Date: Mon, 16 Jan 2023 15:30:15 +0100
Subject: [PATCH 154/202] review: add missing spec

---
 spec/models/prefill_params_spec.rb | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/spec/models/prefill_params_spec.rb b/spec/models/prefill_params_spec.rb
index 232883a1c..af016b47b 100644
--- a/spec/models/prefill_params_spec.rb
+++ b/spec/models/prefill_params_spec.rb
@@ -142,6 +142,7 @@ RSpec.describe PrefillParams do
     it_behaves_like "a champ public value that is authorized", :communes, ['01', '01457']
     it_behaves_like "a champ public value that is authorized", :multiple_drop_down_list, ["val1", "val2"]
     it_behaves_like "a champ public value that is authorized", :epci, ['01', '200042935']
+    it_behaves_like "a champ public value that is authorized", :siret, "13002526500013"
 
     context "when the public type de champ is authorized (repetition)" do
       let(:types_de_champ_public) { [{ type: :repetition, children: [{ type: :text }] }] }
@@ -175,6 +176,7 @@ RSpec.describe PrefillParams do
     it_behaves_like "a champ private value that is authorized", :checkbox, "false"
     it_behaves_like "a champ private value that is authorized", :drop_down_list, "value"
     it_behaves_like "a champ private value that is authorized", :regions, "93"
+    it_behaves_like "a champ private value that is authorized", :siret, "13002526500013"
     it_behaves_like "a champ private value that is authorized", :departements, "03"
     it_behaves_like "a champ private value that is authorized", :communes, ['01', '01457']
     it_behaves_like "a champ private value that is authorized", :multiple_drop_down_list, ["val1", "val2"]

From 498e5d7487f03cae0853bbeb04adbe3c67dcd1e3 Mon Sep 17 00:00:00 2001
From: sebastiencarceles <sebastien.carceles@gmail.com>
Date: Wed, 25 Jan 2023 12:05:00 +0100
Subject: [PATCH 155/202] cover use case with a feature spec

---
 spec/support/shared_examples_for_prefilled_dossier.rb | 7 ++-----
 spec/system/users/dossier_prefill_get_spec.rb         | 9 ++++++++-
 spec/system/users/dossier_prefill_post_spec.rb        | 9 ++++++++-
 3 files changed, 18 insertions(+), 7 deletions(-)

diff --git a/spec/support/shared_examples_for_prefilled_dossier.rb b/spec/support/shared_examples_for_prefilled_dossier.rb
index 239506e59..d2db50bc9 100644
--- a/spec/support/shared_examples_for_prefilled_dossier.rb
+++ b/spec/support/shared_examples_for_prefilled_dossier.rb
@@ -1,13 +1,9 @@
 shared_examples "the user has got a prefilled dossier, owned by themselves" do
   scenario "the user has got a prefilled dossier, owned by themselves" do
-    siret = '41816609600051'
-    stub_request(:get, /https:\/\/entreprise.api.gouv.fr\/v2\/etablissements\/#{siret}/)
-      .to_return(status: 200, body: File.read('spec/fixtures/files/api_entreprise/etablissements.json'))
-
     expect(dossier.user).to eq(user)
 
     expect(page).to have_current_path siret_dossier_path(procedure.dossiers.last)
-    fill_in 'Numéro SIRET', with: siret
+    fill_in 'Numéro SIRET', with: siret_value
     click_on 'Valider'
 
     expect(page).to have_current_path(etablissement_dossier_path(dossier))
@@ -18,6 +14,7 @@ shared_examples "the user has got a prefilled dossier, owned by themselves" do
     expect(page).to have_field(type_de_champ_text.libelle, with: text_value)
     expect(page).to have_field(type_de_champ_phone.libelle, with: phone_value)
     expect(page).to have_css('label', text: type_de_champ_phone.libelle)
+    expect(page).to have_field(type_de_champ_siret.libelle, with: siret_value)
     expect(page).to have_css('h3', text: type_de_champ_repetition.libelle)
     expect(page).to have_field(text_repetition_libelle, with: text_repetition_value)
     expect(page).to have_field(integer_repetition_libelle, with: integer_repetition_value)
diff --git a/spec/system/users/dossier_prefill_get_spec.rb b/spec/system/users/dossier_prefill_get_spec.rb
index eedf28cec..21b40fa1f 100644
--- a/spec/system/users/dossier_prefill_get_spec.rb
+++ b/spec/system/users/dossier_prefill_get_spec.rb
@@ -1,4 +1,4 @@
-describe 'Prefilling a dossier (with a GET request):' do
+describe 'Prefilling a dossier (with a GET request):', js: true do
   let(:memory_store) { ActiveSupport::Cache.lookup_store(:memory_store) }
 
   let(:password) { 'my-s3cure-p4ssword' }
@@ -8,13 +8,16 @@ describe 'Prefilling a dossier (with a GET request):' do
 
   let(:type_de_champ_text) { create(:type_de_champ_text, procedure: procedure) }
   let(:type_de_champ_phone) { create(:type_de_champ_phone, procedure: procedure) }
+  let(:type_de_champ_siret) { create(:type_de_champ_siret, procedure: procedure) }
   let(:type_de_champ_datetime) { create(:type_de_champ_datetime, procedure: procedure) }
   let(:type_de_champ_multiple_drop_down_list) { create(:type_de_champ_multiple_drop_down_list, procedure: procedure) }
   let(:type_de_champ_epci) { create(:type_de_champ_epci, procedure: procedure) }
   let(:type_de_champ_commune) { create(:type_de_champ_communes, procedure: procedure) }
   let(:type_de_champ_repetition) { create(:type_de_champ_repetition, :with_types_de_champ, procedure: procedure) }
+
   let(:text_value) { "My Neighbor Totoro is the best movie ever" }
   let(:phone_value) { "invalid phone value" }
+  let(:siret_value) { '41816609600051' }
   let(:datetime_value) { "2023-02-01T10:32" }
   let(:multiple_drop_down_list_values) {
     [
@@ -39,6 +42,7 @@ describe 'Prefilling a dossier (with a GET request):' do
       "champ_#{type_de_champ_multiple_drop_down_list.to_typed_id_for_query}" => multiple_drop_down_list_values,
       "champ_#{type_de_champ_epci.to_typed_id_for_query}" => epci_value,
       "champ_#{type_de_champ_commune.to_typed_id_for_query}" => commune_value,
+      "champ_#{type_de_champ_siret.to_typed_id_for_query}" => siret_value,
       "champ_#{type_de_champ_repetition.to_typed_id_for_query}" => [
         {
           "champ_#{sub_type_de_champs_repetition.first.to_typed_id_for_query}": text_repetition_value,
@@ -52,6 +56,9 @@ describe 'Prefilling a dossier (with a GET request):' do
     allow(Rails).to receive(:cache).and_return(memory_store)
     Rails.cache.clear
 
+    stub_request(:get, /https:\/\/entreprise.api.gouv.fr\/v2\/etablissements\//)
+      .to_return(status: 200, body: File.read('spec/fixtures/files/api_entreprise/etablissements.json'))
+
     VCR.insert_cassette('api_geo_departements')
     VCR.insert_cassette('api_geo_communes')
     VCR.insert_cassette('api_geo_epcis')
diff --git a/spec/system/users/dossier_prefill_post_spec.rb b/spec/system/users/dossier_prefill_post_spec.rb
index 5fc2119e8..eebb5462d 100644
--- a/spec/system/users/dossier_prefill_post_spec.rb
+++ b/spec/system/users/dossier_prefill_post_spec.rb
@@ -1,4 +1,4 @@
-describe 'Prefilling a dossier (with a POST request):' do
+describe 'Prefilling a dossier (with a POST request):', js: true do
   let(:memory_store) { ActiveSupport::Cache.lookup_store(:memory_store) }
 
   let(:password) { 'my-s3cure-p4ssword' }
@@ -8,13 +8,16 @@ describe 'Prefilling a dossier (with a POST request):' do
 
   let(:type_de_champ_text) { create(:type_de_champ_text, procedure: procedure) }
   let(:type_de_champ_phone) { create(:type_de_champ_phone, procedure: procedure) }
+  let(:type_de_champ_siret) { create(:type_de_champ_siret, procedure: procedure) }
   let(:type_de_champ_datetime) { create(:type_de_champ_datetime, procedure: procedure) }
   let(:type_de_champ_multiple_drop_down_list) { create(:type_de_champ_multiple_drop_down_list, procedure: procedure) }
   let(:type_de_champ_epci) { create(:type_de_champ_epci, procedure: procedure) }
   let(:type_de_champ_repetition) { create(:type_de_champ_repetition, :with_types_de_champ, procedure: procedure) }
   let(:type_de_champ_commune) { create(:type_de_champ_communes, procedure: procedure) }
+
   let(:text_value) { "My Neighbor Totoro is the best movie ever" }
   let(:phone_value) { "invalid phone value" }
+  let(:siret_value) { '41816609600051' }
   let(:datetime_value) { "2023-02-01T10:32" }
   let(:multiple_drop_down_list_values) {
     [
@@ -34,6 +37,9 @@ describe 'Prefilling a dossier (with a POST request):' do
     allow(Rails).to receive(:cache).and_return(memory_store)
     Rails.cache.clear
 
+    stub_request(:get, /https:\/\/entreprise.api.gouv.fr\/v2\/etablissements\/#{siret_value}/)
+      .to_return(status: 200, body: File.read('spec/fixtures/files/api_entreprise/etablissements.json'))
+
     VCR.insert_cassette('api_geo_departements')
     VCR.insert_cassette('api_geo_communes')
     VCR.insert_cassette('api_geo_epcis')
@@ -132,6 +138,7 @@ describe 'Prefilling a dossier (with a POST request):' do
       params: {
         "champ_#{type_de_champ_text.to_typed_id_for_query}" => text_value,
         "champ_#{type_de_champ_phone.to_typed_id_for_query}" => phone_value,
+        "champ_#{type_de_champ_siret.to_typed_id_for_query}" => siret_value,
         "champ_#{type_de_champ_repetition.to_typed_id_for_query}" => [
           {
             "champ_#{sub_type_de_champs_repetition.first.to_typed_id_for_query}": text_repetition_value,

From becf4da70a487b7673f5768d867632773bfd2983 Mon Sep 17 00:00:00 2001
From: sebastiencarceles <sebastien.carceles@gmail.com>
Date: Thu, 2 Feb 2023 09:59:59 +0100
Subject: [PATCH 156/202] fix raison social fetch

---
 app/services/api_entreprise_service.rb                   | 3 +++
 spec/controllers/champs/siret_controller_spec.rb         | 2 ++
 spec/controllers/users/dossiers_controller_spec.rb       | 2 ++
 .../siret_champ_etablissement_fetchable_concern_spec.rb  | 7 +++++++
 spec/services/api_entreprise_service_spec.rb             | 9 +++++++++
 spec/system/users/dossier_prefill_get_spec.rb            | 3 +++
 spec/system/users/dossier_prefill_post_spec.rb           | 3 +++
 7 files changed, 29 insertions(+)

diff --git a/app/services/api_entreprise_service.rb b/app/services/api_entreprise_service.rb
index 8eb5f4ed8..5f429d629 100644
--- a/app/services/api_entreprise_service.rb
+++ b/app/services/api_entreprise_service.rb
@@ -15,6 +15,9 @@ class APIEntrepriseService
       etablissement_params = APIEntreprise::EtablissementAdapter.new(siret, procedure_id).to_params
       return nil if etablissement_params.empty?
 
+      entreprise_params = APIEntreprise::EntrepriseAdapter.new(siret, procedure_id).to_params
+      etablissement_params.merge!(entreprise_params) if entreprise_params.any?
+
       etablissement = dossier_or_champ.build_etablissement(etablissement_params)
       etablissement.save!
 
diff --git a/spec/controllers/champs/siret_controller_spec.rb b/spec/controllers/champs/siret_controller_spec.rb
index 81a9b6dbd..2b1f5f42a 100644
--- a/spec/controllers/champs/siret_controller_spec.rb
+++ b/spec/controllers/champs/siret_controller_spec.rb
@@ -31,6 +31,8 @@ describe Champs::SiretController, type: :controller do
         sign_in user
         stub_request(:get, /https:\/\/entreprise.api.gouv.fr\/v2\/etablissements\/#{siret}/)
           .to_return(status: api_etablissement_status, body: api_etablissement_body)
+        stub_request(:get, /https:\/\/entreprise.api.gouv.fr\/v2\/entreprises\/#{siret[0..8]}/)
+          .to_return(status: 200, body: File.read('spec/fixtures/files/api_entreprise/entreprises.json'))
         allow_any_instance_of(APIEntrepriseToken).to receive(:roles)
           .and_return(["attestations_fiscales", "attestations_sociales", "bilans_entreprise_bdf"])
         allow_any_instance_of(APIEntrepriseToken).to receive(:expired?).and_return(token_expired)
diff --git a/spec/controllers/users/dossiers_controller_spec.rb b/spec/controllers/users/dossiers_controller_spec.rb
index 3f760ff38..57398f090 100644
--- a/spec/controllers/users/dossiers_controller_spec.rb
+++ b/spec/controllers/users/dossiers_controller_spec.rb
@@ -196,6 +196,8 @@ describe Users::DossiersController, type: :controller do
       sign_in(user)
       stub_request(:get, /https:\/\/entreprise.api.gouv.fr\/v2\/etablissements\/#{siret}/)
         .to_return(status: api_etablissement_status, body: api_etablissement_body)
+      stub_request(:get, /https:\/\/entreprise.api.gouv.fr\/v2\/entreprises\/#{siren}/)
+        .to_return(body: File.read('spec/fixtures/files/api_entreprise/entreprises.json'), status: 200)
       allow_any_instance_of(APIEntrepriseToken).to receive(:roles)
         .and_return(["attestations_fiscales", "attestations_sociales", "bilans_entreprise_bdf"])
       allow_any_instance_of(APIEntrepriseToken).to receive(:expired?).and_return(token_expired)
diff --git a/spec/models/concern/siret_champ_etablissement_fetchable_concern_spec.rb b/spec/models/concern/siret_champ_etablissement_fetchable_concern_spec.rb
index 19151c31a..6a2c11120 100644
--- a/spec/models/concern/siret_champ_etablissement_fetchable_concern_spec.rb
+++ b/spec/models/concern/siret_champ_etablissement_fetchable_concern_spec.rb
@@ -8,6 +8,8 @@ RSpec.describe SiretChampEtablissementFetchableConcern do
     before do
       stub_request(:get, /https:\/\/entreprise.api.gouv.fr\/v2\/etablissements\/#{siret}/)
         .to_return(status: api_etablissement_status, body: api_etablissement_body)
+      stub_request(:get, /https:\/\/entreprise.api.gouv.fr\/v2\/entreprises\/#{siret[0..8]}/)
+        .to_return(body: File.read('spec/fixtures/files/api_entreprise/entreprises.json'), status: 200)
       allow_any_instance_of(APIEntrepriseToken).to receive(:roles)
         .and_return(["attestations_fiscales", "attestations_sociales", "bilans_entreprise_bdf"])
       allow_any_instance_of(APIEntrepriseToken).to receive(:expired?).and_return(token_expired)
@@ -103,6 +105,11 @@ RSpec.describe SiretChampEtablissementFetchableConcern do
       it { expect { fetch_etablissement! }.to change { Etablissement.count }.by(1) }
 
       it { expect(fetch_etablissement!).to eq(true) }
+
+      it "fetches the entreprise raison sociale" do
+        fetch_etablissement!
+        expect(champ.reload.etablissement.entreprise_raison_sociale).to eq("OCTO-TECHNOLOGY")
+      end
     end
   end
 end
diff --git a/spec/services/api_entreprise_service_spec.rb b/spec/services/api_entreprise_service_spec.rb
index 93ec39539..fd7cc7ada 100644
--- a/spec/services/api_entreprise_service_spec.rb
+++ b/spec/services/api_entreprise_service_spec.rb
@@ -15,11 +15,16 @@ describe APIEntrepriseService do
     before do
       stub_request(:get, /https:\/\/entreprise.api.gouv.fr\/v2\/etablissements\/#{siret}/)
         .to_return(body: etablissements_body, status: etablissements_status)
+      stub_request(:get, /https:\/\/entreprise.api.gouv.fr\/v2\/entreprises\/#{siret[0..8]}/)
+        .to_return(body: entreprises_body, status: entreprises_status)
     end
 
     let(:siret) { '41816609600051' }
+    let(:raison_sociale) { "OCTO-TECHNOLOGY" }
     let(:etablissements_status) { 200 }
     let(:etablissements_body) { File.read('spec/fixtures/files/api_entreprise/etablissements.json') }
+    let(:entreprises_status) { 200 }
+    let(:entreprises_body) { File.read('spec/fixtures/files/api_entreprise/entreprises.json') }
     let(:valid_token) { "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJzdWIiOiIxMjM0NTY3ODkwIiwibmFtZSI6IkpvaG4gRG9lIiwiaWF0IjoxNTE2MjM5MDIyfQ.SflKxwRJSMeKKF2QT4fwpMeJf36POk6yJV_adQssw5c" }
     let(:procedure) { create(:procedure, api_entreprise_token: valid_token) }
     let(:dossier) { create(:dossier, procedure: procedure) }
@@ -35,6 +40,10 @@ describe APIEntrepriseService do
         expect(subject[:siret]).to eq(siret)
       end
 
+      it 'should fetch entreprise params' do
+        expect(subject[:entreprise_raison_sociale]).to eq(raison_sociale)
+      end
+
       it_behaves_like 'schedule fetch of all etablissement params'
     end
 
diff --git a/spec/system/users/dossier_prefill_get_spec.rb b/spec/system/users/dossier_prefill_get_spec.rb
index 21b40fa1f..ada1cf6bc 100644
--- a/spec/system/users/dossier_prefill_get_spec.rb
+++ b/spec/system/users/dossier_prefill_get_spec.rb
@@ -59,6 +59,9 @@ describe 'Prefilling a dossier (with a GET request):', js: true do
     stub_request(:get, /https:\/\/entreprise.api.gouv.fr\/v2\/etablissements\//)
       .to_return(status: 200, body: File.read('spec/fixtures/files/api_entreprise/etablissements.json'))
 
+    stub_request(:get, /https:\/\/entreprise.api.gouv.fr\/v2\/entreprises\/#{siret_value[0..8]}/)
+      .to_return(status: 200, body: File.read('spec/fixtures/files/api_entreprise/entreprises.json'))
+
     VCR.insert_cassette('api_geo_departements')
     VCR.insert_cassette('api_geo_communes')
     VCR.insert_cassette('api_geo_epcis')
diff --git a/spec/system/users/dossier_prefill_post_spec.rb b/spec/system/users/dossier_prefill_post_spec.rb
index eebb5462d..a9b4eae82 100644
--- a/spec/system/users/dossier_prefill_post_spec.rb
+++ b/spec/system/users/dossier_prefill_post_spec.rb
@@ -40,6 +40,9 @@ describe 'Prefilling a dossier (with a POST request):', js: true do
     stub_request(:get, /https:\/\/entreprise.api.gouv.fr\/v2\/etablissements\/#{siret_value}/)
       .to_return(status: 200, body: File.read('spec/fixtures/files/api_entreprise/etablissements.json'))
 
+    stub_request(:get, /https:\/\/entreprise.api.gouv.fr\/v2\/entreprises\/#{siret_value[0..8]}/)
+      .to_return(status: 200, body: File.read('spec/fixtures/files/api_entreprise/entreprises.json'))
+
     VCR.insert_cassette('api_geo_departements')
     VCR.insert_cassette('api_geo_communes')
     VCR.insert_cassette('api_geo_epcis')

From 7d65a34bc6ce4a665f6fa7f397475175b5e55950 Mon Sep 17 00:00:00 2001
From: sebastiencarceles <sebastien.carceles@gmail.com>
Date: Fri, 13 Jan 2023 13:47:17 +0100
Subject: [PATCH 157/202] rna champ can fetch it's own association

---
 app/models/champs/rna_champ.rb                |  2 +
 ...rna_champ_association_fetchable_concern.rb | 16 ++++
 ...hamp_association_fetchable_concern_spec.rb | 90 +++++++++++++++++++
 3 files changed, 108 insertions(+)
 create mode 100644 app/models/concerns/rna_champ_association_fetchable_concern.rb
 create mode 100644 spec/models/concern/rna_champ_association_fetchable_concern_spec.rb

diff --git a/app/models/champs/rna_champ.rb b/app/models/champs/rna_champ.rb
index bd1f08096..781e21014 100644
--- a/app/models/champs/rna_champ.rb
+++ b/app/models/champs/rna_champ.rb
@@ -21,6 +21,8 @@
 #  row_id                         :string
 #
 class Champs::RNAChamp < Champ
+  include RNAChampAssociationFetchableConcern
+
   validates :value, allow_blank: true, format: {
     with: /\AW[0-9]{9}\z/, message: I18n.t(:not_a_rna, scope: 'activerecord.errors.messages')
   }, if: -> { validation_context != :brouillon }
diff --git a/app/models/concerns/rna_champ_association_fetchable_concern.rb b/app/models/concerns/rna_champ_association_fetchable_concern.rb
new file mode 100644
index 000000000..f6ffbadac
--- /dev/null
+++ b/app/models/concerns/rna_champ_association_fetchable_concern.rb
@@ -0,0 +1,16 @@
+module RNAChampAssociationFetchableConcern
+  extend ActiveSupport::Concern
+
+  def fetch_association!(rna)
+    data = APIEntreprise::RNAAdapter.new(rna, procedure_id).to_params
+    update!(data: data, value: rna)
+    nil
+  rescue APIEntreprise::API::Error, ActiveRecord::RecordInvalid => error
+    update(data: nil, value: nil)
+    if error.try(:network_error?) && !APIEntrepriseService.api_up?
+      :network_error
+    else
+      nil
+    end
+  end
+end
diff --git a/spec/models/concern/rna_champ_association_fetchable_concern_spec.rb b/spec/models/concern/rna_champ_association_fetchable_concern_spec.rb
new file mode 100644
index 000000000..74c7a5fa6
--- /dev/null
+++ b/spec/models/concern/rna_champ_association_fetchable_concern_spec.rb
@@ -0,0 +1,90 @@
+RSpec.describe RNAChampAssociationFetchableConcern do
+  describe '.fetch_association!' do
+    let!(:champ) { create(:champ_rna, data: "not nil data") }
+
+    before do
+      stub_request(:get, /https:\/\/entreprise.api.gouv.fr\/v2\/associations\//)
+        .to_return(body: body, status: status)
+      allow_any_instance_of(APIEntrepriseToken).to receive(:expired?).and_return(false)
+    end
+
+    subject(:fetch_association!) { champ.fetch_association!(rna) }
+
+    shared_examples "an association fetcher" do |expected_result, expected_value, expected_data|
+      it { expect(fetch_association!).to eq(expected_result) }
+
+      it { expect { fetch_association! }.to change { champ.reload.value }.to(expected_value) }
+
+      it { expect { fetch_association! }.to change { champ.reload.data }.to(expected_data) }
+    end
+
+    context 'when the RNA is empty' do
+      let(:rna) { '' }
+      let(:status) { 422 }
+      let(:body) { '' }
+
+      it_behaves_like "an association fetcher", nil, '', {}
+    end
+
+    context 'when the RNA is invalid' do
+      let(:rna) { '1234' }
+      let(:status) { 422 }
+      let(:body) { '' }
+
+      it_behaves_like "an association fetcher", nil, nil, nil
+    end
+
+    context 'when the RNA is unknow' do
+      let(:rna) { 'W111111111' }
+      let(:status) { 404 }
+      let(:body) { '' }
+
+      it_behaves_like "an association fetcher", nil, 'W111111111', {}
+    end
+
+    context 'when the API is unavailable due to network error' do
+      let(:rna) { 'W595001988' }
+      let(:status) { 503 }
+      let(:body) { File.read('spec/fixtures/files/api_entreprise/associations.json') }
+
+      before { expect(APIEntrepriseService).to receive(:api_up?).and_return(false) }
+
+      it_behaves_like "an association fetcher", :network_error, nil, nil
+    end
+
+    context 'when the RNA informations are retrieved successfully' do
+      let(:rna) { 'W595001988' }
+      let(:status) { 200 }
+      let(:body) { File.read('spec/fixtures/files/api_entreprise/associations.json') }
+
+      it_behaves_like "an association fetcher", nil, 'W595001988', {
+        "association_id" => "W595001988",
+        "association_titre" => "UN SUR QUATRE",
+        "association_objet" => "valoriser, transmettre et partager auprès des publics les plus larges possibles, les bienfaits de l'immigration, la richesse de la diversité et la curiosité de l'autre autrement",
+        "association_siret" => nil,
+        "association_date_creation" => "2014-01-23",
+        "association_date_declaration" => "2014-01-24",
+        "association_date_publication" => "2014-02-08",
+        "association_date_dissolution" => "0001-01-01",
+        "association_adresse_siege" => {
+          "complement" => "",
+          "numero_voie" => "61",
+          "type_voie" => "RUE",
+          "libelle_voie" => "des Noyers",
+          "distribution" => "_",
+          "code_insee" => "93063",
+          "code_postal" => "93230",
+          "commune" => "Romainville"
+        },
+        "association_code_civilite_dirigeant" => "PM",
+        "association_civilite_dirigeant" => "Monsieur le Président",
+        "association_code_etat" => "A",
+        "association_etat" => "Active",
+        "association_code_groupement" => "S",
+        "association_groupement" => "simple",
+        "association_mise_a_jour" => 1392295833,
+        "association_rna" => "W595001988"
+      }
+    end
+  end
+end

From 396ebbcf2b0bc6b37f7cb5157ac19c3eb32d0efb Mon Sep 17 00:00:00 2001
From: sebastiencarceles <sebastien.carceles@gmail.com>
Date: Fri, 13 Jan 2023 14:22:43 +0100
Subject: [PATCH 158/202] refactor rna controller to use that new ability

---
 app/controllers/champs/rna_controller.rb | 9 +--------
 1 file changed, 1 insertion(+), 8 deletions(-)

diff --git a/app/controllers/champs/rna_controller.rb b/app/controllers/champs/rna_controller.rb
index a18d7d2d0..e3feb7ba0 100644
--- a/app/controllers/champs/rna_controller.rb
+++ b/app/controllers/champs/rna_controller.rb
@@ -4,13 +4,6 @@ class Champs::RNAController < ApplicationController
   def show
     @champ = policy_scope(Champ).find(params[:champ_id])
     @rna = read_param_value(@champ.input_name, 'value')
-    @network_error = false
-    begin
-      data = APIEntreprise::RNAAdapter.new(@rna, @champ.procedure_id).to_params
-      @champ.update!(data: data, value: @rna)
-    rescue APIEntreprise::API::Error, ActiveRecord::RecordInvalid => error
-      @network_error = true if error.try(:network_error?) && !APIEntrepriseService.api_up?
-      @champ.update(data: nil, value: nil)
-    end
+    @network_error = @champ.fetch_association!(@rna).present?
   end
 end

From 7e55aca107310052f5bbe6e88c4bd897efa21f91 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=A9bastien=20Carceles?= <sebastien.carceles@gmail.com>
Date: Thu, 12 Jan 2023 12:37:57 +0100
Subject: [PATCH 159/202] allow rna prefill

---
 app/models/type_de_champ.rb        | 3 ++-
 config/locales/en.yml              | 4 +++-
 config/locales/fr.yml              | 4 +++-
 spec/models/prefill_params_spec.rb | 3 ++-
 spec/models/type_de_champ_spec.rb  | 2 +-
 5 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/app/models/type_de_champ.rb b/app/models/type_de_champ.rb
index d0342260e..61ff5b2e0 100644
--- a/app/models/type_de_champ.rb
+++ b/app/models/type_de_champ.rb
@@ -273,7 +273,8 @@ class TypeDeChamp < ApplicationRecord
       TypeDeChamp.type_champs.fetch(:repetition),
       TypeDeChamp.type_champs.fetch(:multiple_drop_down_list),
       TypeDeChamp.type_champs.fetch(:epci),
-      TypeDeChamp.type_champs.fetch(:siret)
+      TypeDeChamp.type_champs.fetch(:siret),
+      TypeDeChamp.type_champs.fetch(:rna)
     ])
   end
 
diff --git a/config/locales/en.yml b/config/locales/en.yml
index b0be49749..60081cd85 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -137,6 +137,7 @@ en:
           datetime_html: ISO8601 datetime
           drop_down_list_other_html: Any value
           siret_html: A SIRET number
+          rna_html: A RNA number
           repetition_html: A array of hashes with possible values for each field of the repetition.
           epci_html: An array of the department code and the <a href="https://geo.api.gouv.fr/epcis" target="_blank" rel="noopener noreferrer">EPCI one</a>.
         examples:
@@ -155,7 +156,8 @@ en:
           date: "2023-02-01"
           datetime: "2023-02-01T10:30"
           checkbox: "true"
-          siret: 13002526500013
+          rna: "W503726238"
+          siret: "13002526500013"
         prefill_link_title: Prefill link (GET)
         prefill_link_info: Use the button to copy the link, then remplace the values with your data.
         prefill_link_too_long: Warning, the prefill link is too long and may not work on all browsers.
diff --git a/config/locales/fr.yml b/config/locales/fr.yml
index 8d22ce686..72ab955aa 100644
--- a/config/locales/fr.yml
+++ b/config/locales/fr.yml
@@ -127,6 +127,7 @@ fr:
           datetime_html: Datetime au format ISO8601
           date_html: Date au format ISO8601
           drop_down_list_other_html: Toute valeur
+          rna_html: Un numéro RNA
           siret_html: Un numéro de SIRET
           repetition_html: Un tableau de dictionnaires avec les valeurs possibles pour chaque champ de la répétition.
           epci_html: Un tableau contenant le code de département et <a href="https://geo.api.gouv.fr/epcis" target="_blank" rel="noopener noreferrer">celui de l'EPCI</a>.
@@ -147,7 +148,8 @@ fr:
           date: "2023-02-01"
           datetime: "2023-02-01T10:30"
           checkbox: "true"
-          siret: 13002526500013
+          rna: "W503726238"
+          siret: "13002526500013"
         prefill_link_title: Lien de préremplissage (GET)
         prefill_link_info: Copiez le lien grâce au bouton ci-dessous et remplacez les valeurs par les données dont vous disposez.
         prefill_link_too_long: Attention, ce lien de préremplissage est trop long et risque de ne pas fonctionner sur certains navigateurs.
diff --git a/spec/models/prefill_params_spec.rb b/spec/models/prefill_params_spec.rb
index af016b47b..a245d91cf 100644
--- a/spec/models/prefill_params_spec.rb
+++ b/spec/models/prefill_params_spec.rb
@@ -143,6 +143,7 @@ RSpec.describe PrefillParams do
     it_behaves_like "a champ public value that is authorized", :multiple_drop_down_list, ["val1", "val2"]
     it_behaves_like "a champ public value that is authorized", :epci, ['01', '200042935']
     it_behaves_like "a champ public value that is authorized", :siret, "13002526500013"
+    it_behaves_like "a champ public value that is authorized", :rna, "value"
 
     context "when the public type de champ is authorized (repetition)" do
       let(:types_de_champ_public) { [{ type: :repetition, children: [{ type: :text }] }] }
@@ -176,6 +177,7 @@ RSpec.describe PrefillParams do
     it_behaves_like "a champ private value that is authorized", :checkbox, "false"
     it_behaves_like "a champ private value that is authorized", :drop_down_list, "value"
     it_behaves_like "a champ private value that is authorized", :regions, "93"
+    it_behaves_like "a champ private value that is authorized", :rna, "value"
     it_behaves_like "a champ private value that is authorized", :siret, "13002526500013"
     it_behaves_like "a champ private value that is authorized", :departements, "03"
     it_behaves_like "a champ private value that is authorized", :communes, ['01', '01457']
@@ -219,7 +221,6 @@ RSpec.describe PrefillParams do
     it_behaves_like "a champ public value that is unauthorized", :regions, "value"
     it_behaves_like "a champ public value that is unauthorized", :departements, "value"
     it_behaves_like "a champ public value that is unauthorized", :communes, "value"
-    it_behaves_like "a champ public value that is unauthorized", :rna, "value"
     it_behaves_like "a champ public value that is unauthorized", :annuaire_education, "value"
     it_behaves_like "a champ public value that is unauthorized", :multiple_drop_down_list, ["value"]
 
diff --git a/spec/models/type_de_champ_spec.rb b/spec/models/type_de_champ_spec.rb
index 3b0707ecf..9aa8b3ae0 100644
--- a/spec/models/type_de_champ_spec.rb
+++ b/spec/models/type_de_champ_spec.rb
@@ -256,6 +256,7 @@ describe TypeDeChamp do
     it_behaves_like "a prefillable type de champ", :type_de_champ_multiple_drop_down_list
     it_behaves_like "a prefillable type de champ", :type_de_champ_epci
     it_behaves_like "a prefillable type de champ", :type_de_champ_siret
+    it_behaves_like "a prefillable type de champ", :type_de_champ_rna
 
     it_behaves_like "a non-prefillable type de champ", :type_de_champ_number
     it_behaves_like "a non-prefillable type de champ", :type_de_champ_dossier_link
@@ -270,7 +271,6 @@ describe TypeDeChamp do
     it_behaves_like "a non-prefillable type de champ", :type_de_champ_mesri
     it_behaves_like "a non-prefillable type de champ", :type_de_champ_carte
     it_behaves_like "a non-prefillable type de champ", :type_de_champ_address
-    it_behaves_like "a non-prefillable type de champ", :type_de_champ_rna
     it_behaves_like "a non-prefillable type de champ", :type_de_champ_annuaire_education
   end
 end

From 33fa40eda24c559ccf7fe19de9a74db6be062c80 Mon Sep 17 00:00:00 2001
From: sebastiencarceles <sebastien.carceles@gmail.com>
Date: Fri, 13 Jan 2023 14:52:16 +0100
Subject: [PATCH 160/202] don't clean the rna champ value

Cleaning the value is useless, when fetching the association,
as the value will be re-written by the dossier update, when the user
fills in the dossier.

Furthermore we need the value to persist when prefilling the champ.
---
 .../rna_champ_association_fetchable_concern.rb |  4 +++-
 spec/controllers/champs/rna_controller_spec.rb | 18 ++++++------------
 ...champ_association_fetchable_concern_spec.rb |  8 ++++----
 3 files changed, 13 insertions(+), 17 deletions(-)

diff --git a/app/models/concerns/rna_champ_association_fetchable_concern.rb b/app/models/concerns/rna_champ_association_fetchable_concern.rb
index f6ffbadac..d0ad229f6 100644
--- a/app/models/concerns/rna_champ_association_fetchable_concern.rb
+++ b/app/models/concerns/rna_champ_association_fetchable_concern.rb
@@ -6,7 +6,9 @@ module RNAChampAssociationFetchableConcern
     update!(data: data, value: rna)
     nil
   rescue APIEntreprise::API::Error, ActiveRecord::RecordInvalid => error
-    update(data: nil, value: nil)
+    self.data = nil
+    self.value = rna
+    save(validate: false)
     if error.try(:network_error?) && !APIEntrepriseService.api_up?
       :network_error
     else
diff --git a/spec/controllers/champs/rna_controller_spec.rb b/spec/controllers/champs/rna_controller_spec.rb
index 6354769f2..0a96b0c78 100644
--- a/spec/controllers/champs/rna_controller_spec.rb
+++ b/spec/controllers/champs/rna_controller_spec.rb
@@ -37,10 +37,8 @@ describe Champs::RNAController, type: :controller do
 
         subject! { get :show, params: params, format: :turbo_stream }
 
-        it 'clears the data and value on the model' do
-          champ.reload
-          expect(champ.data).to eq({})
-          expect(champ.value).to eq("")
+        it 'clears the data on the model' do
+          expect(champ.reload.data).to eq({})
         end
 
         it 'clears any information or error message' do
@@ -55,10 +53,8 @@ describe Champs::RNAController, type: :controller do
 
         subject! { get :show, params: params, format: :turbo_stream }
 
-        it 'clears the data and value on the model' do
-          champ.reload
-          expect(champ.data).to be_nil
-          expect(champ.value).to be_nil
+        it 'clears the data on the model' do
+          expect(champ.reload.data).to be_nil
         end
 
         it 'displays a “RNA is invalid” error message' do
@@ -94,10 +90,8 @@ describe Champs::RNAController, type: :controller do
 
         subject! { get :show, params: params, format: :turbo_stream }
 
-        it 'clears the data and value on the model' do
-          champ.reload
-          expect(champ.data).to be_nil
-          expect(champ.value).to be_nil
+        it 'clears the data on the model' do
+          expect(champ.reload.data).to be_nil
         end
 
         it 'displays a “API is unavailable” error message' do
diff --git a/spec/models/concern/rna_champ_association_fetchable_concern_spec.rb b/spec/models/concern/rna_champ_association_fetchable_concern_spec.rb
index 74c7a5fa6..8a20a9621 100644
--- a/spec/models/concern/rna_champ_association_fetchable_concern_spec.rb
+++ b/spec/models/concern/rna_champ_association_fetchable_concern_spec.rb
@@ -10,10 +10,10 @@ RSpec.describe RNAChampAssociationFetchableConcern do
 
     subject(:fetch_association!) { champ.fetch_association!(rna) }
 
-    shared_examples "an association fetcher" do |expected_result, expected_value, expected_data|
+    shared_examples "an association fetcher" do |expected_result, _expected_value, expected_data|
       it { expect(fetch_association!).to eq(expected_result) }
 
-      it { expect { fetch_association! }.to change { champ.reload.value }.to(expected_value) }
+      it { expect { fetch_association! }.to change { champ.reload.value }.to(rna) }
 
       it { expect { fetch_association! }.to change { champ.reload.data }.to(expected_data) }
     end
@@ -31,7 +31,7 @@ RSpec.describe RNAChampAssociationFetchableConcern do
       let(:status) { 422 }
       let(:body) { '' }
 
-      it_behaves_like "an association fetcher", nil, nil, nil
+      it_behaves_like "an association fetcher", nil, '1234', nil
     end
 
     context 'when the RNA is unknow' do
@@ -49,7 +49,7 @@ RSpec.describe RNAChampAssociationFetchableConcern do
 
       before { expect(APIEntrepriseService).to receive(:api_up?).and_return(false) }
 
-      it_behaves_like "an association fetcher", :network_error, nil, nil
+      it_behaves_like "an association fetcher", :network_error, 'W595001988', nil
     end
 
     context 'when the RNA informations are retrieved successfully' do

From e89c8385a4e26ffed11f9bfc6e44479bf9b92556 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=A9bastien=20Carceles?= <sebastien.carceles@gmail.com>
Date: Thu, 12 Jan 2023 12:45:36 +0100
Subject: [PATCH 161/202] fetch association data when editing the dossier

---
 .../editable_champ/rna_component/rna_component.html.haml        | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/components/editable_champ/rna_component/rna_component.html.haml b/app/components/editable_champ/rna_component/rna_component.html.haml
index c16edb4bf..bc15b299a 100644
--- a/app/components/editable_champ/rna_component/rna_component.html.haml
+++ b/app/components/editable_champ/rna_component/rna_component.html.haml
@@ -2,7 +2,7 @@
   id: @champ.input_id,
   aria: { describedby: @champ.describedby_id },
   placeholder: t(".placeholder"),
-  data: { controller: 'turbo-input', turbo_input_url_value: champs_rna_path(@champ.id) },
+  data: { controller: 'turbo-input', turbo_input_load_on_connect_value: @champ.prefilled? && @champ.value.present? && @champ.data.blank?, turbo_input_url_value: champs_rna_path(@champ.id) },
   required: @champ.required?,
   pattern: "W[0-9]{9}",
   title: t(".title"),

From 39545671f3d75381b901ffb76fb726ac7dcc0ddc Mon Sep 17 00:00:00 2001
From: sebastiencarceles <sebastien.carceles@gmail.com>
Date: Sat, 14 Jan 2023 11:53:55 +0100
Subject: [PATCH 162/202] refacto: better error management

---
 .../rna_component/rna_component.html.haml     |  2 +-
 app/controllers/champs/rna_controller.rb      |  3 +-
 ...rna_champ_association_fetchable_concern.rb | 31 ++++++++++++-------
 app/views/champs/rna/show.turbo_stream.haml   |  2 +-
 .../shared/champs/rna/_association.html.haml  | 15 ++++++---
 .../controllers/champs/rna_controller_spec.rb |  6 ++--
 ...hamp_association_fetchable_concern_spec.rb | 25 +++++++++------
 7 files changed, 51 insertions(+), 33 deletions(-)

diff --git a/app/components/editable_champ/rna_component/rna_component.html.haml b/app/components/editable_champ/rna_component/rna_component.html.haml
index bc15b299a..ed6790383 100644
--- a/app/components/editable_champ/rna_component/rna_component.html.haml
+++ b/app/components/editable_champ/rna_component/rna_component.html.haml
@@ -9,4 +9,4 @@
   class: "width-33-desktop",
   maxlength: 10
 .rna-info{ id: dom_id(@champ, :rna_info) }
-  = render 'shared/champs/rna/association', champ: @champ, network_error: false, rna: @champ.value
+  = render 'shared/champs/rna/association', champ: @champ, error: nil
diff --git a/app/controllers/champs/rna_controller.rb b/app/controllers/champs/rna_controller.rb
index e3feb7ba0..530240c8b 100644
--- a/app/controllers/champs/rna_controller.rb
+++ b/app/controllers/champs/rna_controller.rb
@@ -3,7 +3,6 @@ class Champs::RNAController < ApplicationController
 
   def show
     @champ = policy_scope(Champ).find(params[:champ_id])
-    @rna = read_param_value(@champ.input_name, 'value')
-    @network_error = @champ.fetch_association!(@rna).present?
+    @error = @champ.association_fetch_error_key unless @champ.fetch_association!(read_param_value(@champ.input_name, 'value'))
   end
 end
diff --git a/app/models/concerns/rna_champ_association_fetchable_concern.rb b/app/models/concerns/rna_champ_association_fetchable_concern.rb
index d0ad229f6..87e74ddbd 100644
--- a/app/models/concerns/rna_champ_association_fetchable_concern.rb
+++ b/app/models/concerns/rna_champ_association_fetchable_concern.rb
@@ -1,18 +1,27 @@
 module RNAChampAssociationFetchableConcern
   extend ActiveSupport::Concern
 
+  attr_reader :association_fetch_error_key
+
   def fetch_association!(rna)
-    data = APIEntreprise::RNAAdapter.new(rna, procedure_id).to_params
-    update!(data: data, value: rna)
-    nil
-  rescue APIEntreprise::API::Error, ActiveRecord::RecordInvalid => error
-    self.data = nil
     self.value = rna
-    save(validate: false)
-    if error.try(:network_error?) && !APIEntrepriseService.api_up?
-      :network_error
-    else
-      nil
-    end
+
+    return clear_association!(:empty) if rna.empty?
+    return clear_association!(:invalid) unless valid?
+    return clear_association!(:not_found) if (data = APIEntreprise::RNAAdapter.new(rna, procedure_id).to_params).blank?
+
+    update!(data: data)
+  rescue APIEntreprise::API::Error => error
+    error_key = :network_error if error.try(:network_error?) && !APIEntrepriseService.api_up?
+    clear_association!(error_key)
+  end
+
+  private
+
+  def clear_association!(error)
+    @association_fetch_error_key = error
+    self.data = nil
+    save!(context: :brouillon)
+    false
   end
 end
diff --git a/app/views/champs/rna/show.turbo_stream.haml b/app/views/champs/rna/show.turbo_stream.haml
index e87d3b7e1..88b4c73aa 100644
--- a/app/views/champs/rna/show.turbo_stream.haml
+++ b/app/views/champs/rna/show.turbo_stream.haml
@@ -1 +1 @@
-= turbo_stream.update dom_id(@champ, :rna_info), partial: 'shared/champs/rna/association', locals: { champ: @champ, network_error: @network_error, rna: @rna }
+= turbo_stream.update dom_id(@champ, :rna_info), partial: 'shared/champs/rna/association', locals: { champ: @champ, error: @error }
diff --git a/app/views/shared/champs/rna/_association.html.haml b/app/views/shared/champs/rna/_association.html.haml
index bda49c3d9..572a21402 100644
--- a/app/views/shared/champs/rna/_association.html.haml
+++ b/app/views/shared/champs/rna/_association.html.haml
@@ -1,6 +1,11 @@
-- if network_error
-  %p.pt-1= t('.network_error')
-- elsif @rna.present? && champ.data.blank?
+- case error
+- when :invalid
+  %p.pt-1
+    Le numéro RNA doit commencer par un W majuscule suivi de 9 chiffres
+- when :not_found
   %p.pt-1= t('.not_found')
-- elsif champ.value.present?
-  %p.pt-1= t('.data_fetched', title: champ.title)
+- when :network_error
+  %p.pt-1= t('.network_error')
+- else
+  - if champ.value.present?
+    %p.pt-1= t('.data_fetched', title: champ.title)
diff --git a/spec/controllers/champs/rna_controller_spec.rb b/spec/controllers/champs/rna_controller_spec.rb
index 0a96b0c78..0f845ce4f 100644
--- a/spec/controllers/champs/rna_controller_spec.rb
+++ b/spec/controllers/champs/rna_controller_spec.rb
@@ -38,7 +38,7 @@ describe Champs::RNAController, type: :controller do
         subject! { get :show, params: params, format: :turbo_stream }
 
         it 'clears the data on the model' do
-          expect(champ.reload.data).to eq({})
+          expect(champ.reload.data).to be_nil
         end
 
         it 'clears any information or error message' do
@@ -58,7 +58,7 @@ describe Champs::RNAController, type: :controller do
         end
 
         it 'displays a “RNA is invalid” error message' do
-          expect(response.body).to include("Aucun établissement trouvé")
+          expect(response.body).to include("Le numéro RNA doit commencer par un W majuscule suivi de 9 chiffres")
         end
       end
 
@@ -71,7 +71,7 @@ describe Champs::RNAController, type: :controller do
 
         it 'clears the data on the model' do
           champ.reload
-          expect(champ.data).to eq({})
+          expect(champ.data).to be_nil
         end
 
         it 'displays a “RNA is invalid” error message' do
diff --git a/spec/models/concern/rna_champ_association_fetchable_concern_spec.rb b/spec/models/concern/rna_champ_association_fetchable_concern_spec.rb
index 8a20a9621..75eddd05f 100644
--- a/spec/models/concern/rna_champ_association_fetchable_concern_spec.rb
+++ b/spec/models/concern/rna_champ_association_fetchable_concern_spec.rb
@@ -1,6 +1,6 @@
 RSpec.describe RNAChampAssociationFetchableConcern do
   describe '.fetch_association!' do
-    let!(:champ) { create(:champ_rna, data: "not nil data") }
+    let!(:champ) { create(:champ_rna, data: "not nil data", value: 'W173847273') }
 
     before do
       stub_request(:get, /https:\/\/entreprise.api.gouv.fr\/v2\/associations\//)
@@ -10,12 +10,17 @@ RSpec.describe RNAChampAssociationFetchableConcern do
 
     subject(:fetch_association!) { champ.fetch_association!(rna) }
 
-    shared_examples "an association fetcher" do |expected_result, _expected_value, expected_data|
-      it { expect(fetch_association!).to eq(expected_result) }
-
-      it { expect { fetch_association! }.to change { champ.reload.value }.to(rna) }
+    shared_examples "an association fetcher" do |expected_result, expected_error, expected_value, expected_data|
+      it { expect { fetch_association! }.to change { champ.reload.value }.to(expected_value) }
 
       it { expect { fetch_association! }.to change { champ.reload.data }.to(expected_data) }
+
+      it { expect(fetch_association!).to eq(expected_result) }
+
+      it 'populates the association_fetch_error_key when an error occurs' do
+        fetch_association!
+        expect(champ.association_fetch_error_key).to eq(expected_error)
+      end
     end
 
     context 'when the RNA is empty' do
@@ -23,7 +28,7 @@ RSpec.describe RNAChampAssociationFetchableConcern do
       let(:status) { 422 }
       let(:body) { '' }
 
-      it_behaves_like "an association fetcher", nil, '', {}
+      it_behaves_like "an association fetcher", false, :empty, '', nil
     end
 
     context 'when the RNA is invalid' do
@@ -31,7 +36,7 @@ RSpec.describe RNAChampAssociationFetchableConcern do
       let(:status) { 422 }
       let(:body) { '' }
 
-      it_behaves_like "an association fetcher", nil, '1234', nil
+      it_behaves_like "an association fetcher", false, :invalid, '1234', nil
     end
 
     context 'when the RNA is unknow' do
@@ -39,7 +44,7 @@ RSpec.describe RNAChampAssociationFetchableConcern do
       let(:status) { 404 }
       let(:body) { '' }
 
-      it_behaves_like "an association fetcher", nil, 'W111111111', {}
+      it_behaves_like "an association fetcher", false, :not_found, 'W111111111', nil
     end
 
     context 'when the API is unavailable due to network error' do
@@ -49,7 +54,7 @@ RSpec.describe RNAChampAssociationFetchableConcern do
 
       before { expect(APIEntrepriseService).to receive(:api_up?).and_return(false) }
 
-      it_behaves_like "an association fetcher", :network_error, 'W595001988', nil
+      it_behaves_like "an association fetcher", false, :network_error, 'W595001988', nil
     end
 
     context 'when the RNA informations are retrieved successfully' do
@@ -57,7 +62,7 @@ RSpec.describe RNAChampAssociationFetchableConcern do
       let(:status) { 200 }
       let(:body) { File.read('spec/fixtures/files/api_entreprise/associations.json') }
 
-      it_behaves_like "an association fetcher", nil, 'W595001988', {
+      it_behaves_like "an association fetcher", true, nil, 'W595001988', {
         "association_id" => "W595001988",
         "association_titre" => "UN SUR QUATRE",
         "association_objet" => "valoriser, transmettre et partager auprès des publics les plus larges possibles, les bienfaits de l'immigration, la richesse de la diversité et la curiosité de l'autre autrement",

From 0e3126cf83fa8109ec83ac096924cca4202fbe38 Mon Sep 17 00:00:00 2001
From: sebastiencarceles <sebastien.carceles@gmail.com>
Date: Mon, 16 Jan 2023 15:47:22 +0100
Subject: [PATCH 163/202] review: readability

---
 app/controllers/champs/rna_controller.rb | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/app/controllers/champs/rna_controller.rb b/app/controllers/champs/rna_controller.rb
index 530240c8b..a8f49f7bd 100644
--- a/app/controllers/champs/rna_controller.rb
+++ b/app/controllers/champs/rna_controller.rb
@@ -3,6 +3,10 @@ class Champs::RNAController < ApplicationController
 
   def show
     @champ = policy_scope(Champ).find(params[:champ_id])
-    @error = @champ.association_fetch_error_key unless @champ.fetch_association!(read_param_value(@champ.input_name, 'value'))
+    rna = read_param_value(@champ.input_name, 'value')
+
+    unless @champ.fetch_association!(rna)
+      @error = @champ.association_fetch_error_key
+    end
   end
 end

From efd5464bd54dc28ac606b8cbfeaa782e9e669537 Mon Sep 17 00:00:00 2001
From: sebastiencarceles <sebastien.carceles@gmail.com>
Date: Thu, 26 Jan 2023 10:33:08 +0100
Subject: [PATCH 164/202] cover use case with feature spec

---
 spec/support/shared_examples_for_prefilled_dossier.rb | 1 +
 spec/system/users/dossier_prefill_get_spec.rb         | 6 ++++++
 spec/system/users/dossier_prefill_post_spec.rb        | 6 ++++++
 3 files changed, 13 insertions(+)

diff --git a/spec/support/shared_examples_for_prefilled_dossier.rb b/spec/support/shared_examples_for_prefilled_dossier.rb
index d2db50bc9..ccd617370 100644
--- a/spec/support/shared_examples_for_prefilled_dossier.rb
+++ b/spec/support/shared_examples_for_prefilled_dossier.rb
@@ -14,6 +14,7 @@ shared_examples "the user has got a prefilled dossier, owned by themselves" do
     expect(page).to have_field(type_de_champ_text.libelle, with: text_value)
     expect(page).to have_field(type_de_champ_phone.libelle, with: phone_value)
     expect(page).to have_css('label', text: type_de_champ_phone.libelle)
+    expect(page).to have_field(type_de_champ_rna.libelle, with: rna_value)
     expect(page).to have_field(type_de_champ_siret.libelle, with: siret_value)
     expect(page).to have_css('h3', text: type_de_champ_repetition.libelle)
     expect(page).to have_field(text_repetition_libelle, with: text_repetition_value)
diff --git a/spec/system/users/dossier_prefill_get_spec.rb b/spec/system/users/dossier_prefill_get_spec.rb
index ada1cf6bc..86c9f55e6 100644
--- a/spec/system/users/dossier_prefill_get_spec.rb
+++ b/spec/system/users/dossier_prefill_get_spec.rb
@@ -8,6 +8,7 @@ describe 'Prefilling a dossier (with a GET request):', js: true do
 
   let(:type_de_champ_text) { create(:type_de_champ_text, procedure: procedure) }
   let(:type_de_champ_phone) { create(:type_de_champ_phone, procedure: procedure) }
+  let(:type_de_champ_rna) { create(:type_de_champ_rna, procedure: procedure) }
   let(:type_de_champ_siret) { create(:type_de_champ_siret, procedure: procedure) }
   let(:type_de_champ_datetime) { create(:type_de_champ_datetime, procedure: procedure) }
   let(:type_de_champ_multiple_drop_down_list) { create(:type_de_champ_multiple_drop_down_list, procedure: procedure) }
@@ -17,6 +18,7 @@ describe 'Prefilling a dossier (with a GET request):', js: true do
 
   let(:text_value) { "My Neighbor Totoro is the best movie ever" }
   let(:phone_value) { "invalid phone value" }
+  let(:rna_value) { 'W595001988' }
   let(:siret_value) { '41816609600051' }
   let(:datetime_value) { "2023-02-01T10:32" }
   let(:multiple_drop_down_list_values) {
@@ -43,6 +45,7 @@ describe 'Prefilling a dossier (with a GET request):', js: true do
       "champ_#{type_de_champ_epci.to_typed_id_for_query}" => epci_value,
       "champ_#{type_de_champ_commune.to_typed_id_for_query}" => commune_value,
       "champ_#{type_de_champ_siret.to_typed_id_for_query}" => siret_value,
+      "champ_#{type_de_champ_rna.to_typed_id_for_query}" => rna_value,
       "champ_#{type_de_champ_repetition.to_typed_id_for_query}" => [
         {
           "champ_#{sub_type_de_champs_repetition.first.to_typed_id_for_query}": text_repetition_value,
@@ -62,6 +65,9 @@ describe 'Prefilling a dossier (with a GET request):', js: true do
     stub_request(:get, /https:\/\/entreprise.api.gouv.fr\/v2\/entreprises\/#{siret_value[0..8]}/)
       .to_return(status: 200, body: File.read('spec/fixtures/files/api_entreprise/entreprises.json'))
 
+    stub_request(:get, /https:\/\/entreprise.api.gouv.fr\/v2\/associations\//)
+      .to_return(status: 200, body: File.read('spec/fixtures/files/api_entreprise/associations.json'))
+
     VCR.insert_cassette('api_geo_departements')
     VCR.insert_cassette('api_geo_communes')
     VCR.insert_cassette('api_geo_epcis')
diff --git a/spec/system/users/dossier_prefill_post_spec.rb b/spec/system/users/dossier_prefill_post_spec.rb
index a9b4eae82..2166f9749 100644
--- a/spec/system/users/dossier_prefill_post_spec.rb
+++ b/spec/system/users/dossier_prefill_post_spec.rb
@@ -8,6 +8,7 @@ describe 'Prefilling a dossier (with a POST request):', js: true do
 
   let(:type_de_champ_text) { create(:type_de_champ_text, procedure: procedure) }
   let(:type_de_champ_phone) { create(:type_de_champ_phone, procedure: procedure) }
+  let(:type_de_champ_rna) { create(:type_de_champ_rna, procedure: procedure) }
   let(:type_de_champ_siret) { create(:type_de_champ_siret, procedure: procedure) }
   let(:type_de_champ_datetime) { create(:type_de_champ_datetime, procedure: procedure) }
   let(:type_de_champ_multiple_drop_down_list) { create(:type_de_champ_multiple_drop_down_list, procedure: procedure) }
@@ -17,6 +18,7 @@ describe 'Prefilling a dossier (with a POST request):', js: true do
 
   let(:text_value) { "My Neighbor Totoro is the best movie ever" }
   let(:phone_value) { "invalid phone value" }
+  let(:rna_value) { 'W595001988' }
   let(:siret_value) { '41816609600051' }
   let(:datetime_value) { "2023-02-01T10:32" }
   let(:multiple_drop_down_list_values) {
@@ -43,6 +45,9 @@ describe 'Prefilling a dossier (with a POST request):', js: true do
     stub_request(:get, /https:\/\/entreprise.api.gouv.fr\/v2\/entreprises\/#{siret_value[0..8]}/)
       .to_return(status: 200, body: File.read('spec/fixtures/files/api_entreprise/entreprises.json'))
 
+      stub_request(:get, /https:\/\/entreprise.api.gouv.fr\/v2\/associations\//)
+      .to_return(status: 200, body: File.read('spec/fixtures/files/api_entreprise/associations.json'))
+
     VCR.insert_cassette('api_geo_departements')
     VCR.insert_cassette('api_geo_communes')
     VCR.insert_cassette('api_geo_epcis')
@@ -141,6 +146,7 @@ describe 'Prefilling a dossier (with a POST request):', js: true do
       params: {
         "champ_#{type_de_champ_text.to_typed_id_for_query}" => text_value,
         "champ_#{type_de_champ_phone.to_typed_id_for_query}" => phone_value,
+        "champ_#{type_de_champ_rna.to_typed_id_for_query}" => rna_value,
         "champ_#{type_de_champ_siret.to_typed_id_for_query}" => siret_value,
         "champ_#{type_de_champ_repetition.to_typed_id_for_query}" => [
           {

From 1caf56d943c20d9ab30ecb753b870a829e6e9883 Mon Sep 17 00:00:00 2001
From: sebastiencarceles <sebastien.carceles@gmail.com>
Date: Mon, 27 Feb 2023 14:48:46 +0100
Subject: [PATCH 165/202] fix lint

---
 spec/system/users/dossier_prefill_post_spec.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/spec/system/users/dossier_prefill_post_spec.rb b/spec/system/users/dossier_prefill_post_spec.rb
index 2166f9749..71ff2db90 100644
--- a/spec/system/users/dossier_prefill_post_spec.rb
+++ b/spec/system/users/dossier_prefill_post_spec.rb
@@ -45,7 +45,7 @@ describe 'Prefilling a dossier (with a POST request):', js: true do
     stub_request(:get, /https:\/\/entreprise.api.gouv.fr\/v2\/entreprises\/#{siret_value[0..8]}/)
       .to_return(status: 200, body: File.read('spec/fixtures/files/api_entreprise/entreprises.json'))
 
-      stub_request(:get, /https:\/\/entreprise.api.gouv.fr\/v2\/associations\//)
+    stub_request(:get, /https:\/\/entreprise.api.gouv.fr\/v2\/associations\//)
       .to_return(status: 200, body: File.read('spec/fixtures/files/api_entreprise/associations.json'))
 
     VCR.insert_cassette('api_geo_departements')

From 13229158bd8e7987f0997293a20dfcc647ba9f8e Mon Sep 17 00:00:00 2001
From: sebastiencarceles <sebastien.carceles@gmail.com>
Date: Wed, 22 Feb 2023 15:00:27 +0100
Subject: [PATCH 166/202] let dossier link champ be prefillable

---
 app/models/type_de_champ.rb        | 1 +
 spec/models/prefill_params_spec.rb | 4 +++-
 spec/models/type_de_champ_spec.rb  | 2 +-
 3 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/app/models/type_de_champ.rb b/app/models/type_de_champ.rb
index 61ff5b2e0..b1ca9b3c5 100644
--- a/app/models/type_de_champ.rb
+++ b/app/models/type_de_champ.rb
@@ -273,6 +273,7 @@ class TypeDeChamp < ApplicationRecord
       TypeDeChamp.type_champs.fetch(:repetition),
       TypeDeChamp.type_champs.fetch(:multiple_drop_down_list),
       TypeDeChamp.type_champs.fetch(:epci),
+      TypeDeChamp.type_champs.fetch(:dossier_link),
       TypeDeChamp.type_champs.fetch(:siret),
       TypeDeChamp.type_champs.fetch(:rna)
     ])
diff --git a/spec/models/prefill_params_spec.rb b/spec/models/prefill_params_spec.rb
index a245d91cf..4db13de43 100644
--- a/spec/models/prefill_params_spec.rb
+++ b/spec/models/prefill_params_spec.rb
@@ -141,6 +141,7 @@ RSpec.describe PrefillParams do
     it_behaves_like "a champ public value that is authorized", :departements, "03"
     it_behaves_like "a champ public value that is authorized", :communes, ['01', '01457']
     it_behaves_like "a champ public value that is authorized", :multiple_drop_down_list, ["val1", "val2"]
+    it_behaves_like "a champ public value that is authorized", :dossier_link, "1"
     it_behaves_like "a champ public value that is authorized", :epci, ['01', '200042935']
     it_behaves_like "a champ public value that is authorized", :siret, "13002526500013"
     it_behaves_like "a champ public value that is authorized", :rna, "value"
@@ -182,6 +183,7 @@ RSpec.describe PrefillParams do
     it_behaves_like "a champ private value that is authorized", :departements, "03"
     it_behaves_like "a champ private value that is authorized", :communes, ['01', '01457']
     it_behaves_like "a champ private value that is authorized", :multiple_drop_down_list, ["val1", "val2"]
+    it_behaves_like "a champ private value that is authorized", :dossier_link, "1"
     it_behaves_like "a champ private value that is authorized", :epci, ['01', '200042935']
 
     context "when the private type de champ is authorized (repetition)" do
@@ -201,7 +203,7 @@ RSpec.describe PrefillParams do
     it_behaves_like "a champ public value that is unauthorized", :decimal_number, "non decimal string"
     it_behaves_like "a champ public value that is unauthorized", :integer_number, "non integer string"
     it_behaves_like "a champ public value that is unauthorized", :number, "value"
-    it_behaves_like "a champ public value that is unauthorized", :dossier_link, "value"
+    # TODO: SEB    it_behaves_like "a champ public value that is unauthorized", :dossier_link, "value"
     it_behaves_like "a champ public value that is unauthorized", :titre_identite, "value"
     it_behaves_like "a champ public value that is unauthorized", :civilite, "value"
     it_behaves_like "a champ public value that is unauthorized", :date, "value"
diff --git a/spec/models/type_de_champ_spec.rb b/spec/models/type_de_champ_spec.rb
index 9aa8b3ae0..de448e143 100644
--- a/spec/models/type_de_champ_spec.rb
+++ b/spec/models/type_de_champ_spec.rb
@@ -255,11 +255,11 @@ describe TypeDeChamp do
     it_behaves_like "a prefillable type de champ", :type_de_champ_repetition
     it_behaves_like "a prefillable type de champ", :type_de_champ_multiple_drop_down_list
     it_behaves_like "a prefillable type de champ", :type_de_champ_epci
+    it_behaves_like "a prefillable type de champ", :type_de_champ_dossier_link
     it_behaves_like "a prefillable type de champ", :type_de_champ_siret
     it_behaves_like "a prefillable type de champ", :type_de_champ_rna
 
     it_behaves_like "a non-prefillable type de champ", :type_de_champ_number
-    it_behaves_like "a non-prefillable type de champ", :type_de_champ_dossier_link
     it_behaves_like "a non-prefillable type de champ", :type_de_champ_titre_identite
     it_behaves_like "a non-prefillable type de champ", :type_de_champ_linked_drop_down_list
     it_behaves_like "a non-prefillable type de champ", :type_de_champ_header_section

From 0aacaee2c23961162207f233566f6776a63df9cf Mon Sep 17 00:00:00 2001
From: sebastiencarceles <sebastien.carceles@gmail.com>
Date: Wed, 22 Feb 2023 15:09:55 +0100
Subject: [PATCH 167/202] add possible and example values

---
 config/locales/en.yml | 2 ++
 config/locales/fr.yml | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/config/locales/en.yml b/config/locales/en.yml
index 60081cd85..032a1d88a 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -140,6 +140,7 @@ en:
           rna_html: A RNA number
           repetition_html: A array of hashes with possible values for each field of the repetition.
           epci_html: An array of the department code and the <a href="https://geo.api.gouv.fr/epcis" target="_blank" rel="noopener noreferrer">EPCI one</a>.
+          dossier_link_html: The file ID, as integer.
         examples:
           title: Example
           text: Short text
@@ -156,6 +157,7 @@ en:
           date: "2023-02-01"
           datetime: "2023-02-01T10:30"
           checkbox: "true"
+          dossier_link: 42
           rna: "W503726238"
           siret: "13002526500013"
         prefill_link_title: Prefill link (GET)
diff --git a/config/locales/fr.yml b/config/locales/fr.yml
index 72ab955aa..4baae6f7c 100644
--- a/config/locales/fr.yml
+++ b/config/locales/fr.yml
@@ -131,6 +131,7 @@ fr:
           siret_html: Un numéro de SIRET
           repetition_html: Un tableau de dictionnaires avec les valeurs possibles pour chaque champ de la répétition.
           epci_html: Un tableau contenant le code de département et <a href="https://geo.api.gouv.fr/epcis" target="_blank" rel="noopener noreferrer">celui de l'EPCI</a>.
+          dossier_link_html: L'identifiant du dossier, sous forme de nombre entier.
         examples:
           title: Exemple
           text: Texte court
@@ -148,6 +149,7 @@ fr:
           date: "2023-02-01"
           datetime: "2023-02-01T10:30"
           checkbox: "true"
+          dossier_link: 42
           rna: "W503726238"
           siret: "13002526500013"
         prefill_link_title: Lien de préremplissage (GET)

From 35f4874b6906ea851a8c36d541cd0068e94b78a8 Mon Sep 17 00:00:00 2001
From: sebastiencarceles <sebastien.carceles@gmail.com>
Date: Wed, 22 Feb 2023 15:56:31 +0100
Subject: [PATCH 168/202] allow integers only

---
 app/models/champs/dossier_link_champ.rb       |  9 +++++
 app/models/prefill_params.rb                  |  3 +-
 config/locales/en.yml                         |  4 ++
 config/locales/fr.yml                         |  4 ++
 spec/models/champs/dossier_link_champ_spec.rb | 37 +++++++++++++++++++
 spec/models/prefill_params_spec.rb            |  2 +-
 6 files changed, 57 insertions(+), 2 deletions(-)
 create mode 100644 spec/models/champs/dossier_link_champ_spec.rb

diff --git a/app/models/champs/dossier_link_champ.rb b/app/models/champs/dossier_link_champ.rb
index a16936e7a..00c7f8869 100644
--- a/app/models/champs/dossier_link_champ.rb
+++ b/app/models/champs/dossier_link_champ.rb
@@ -21,4 +21,13 @@
 #  type_de_champ_id               :integer
 #
 class Champs::DossierLinkChamp < Champ
+  validate :value_integerable, if: -> { value.present? }, on: :prefill
+
+  private
+
+  def value_integerable
+    Integer(value)
+  rescue ArgumentError
+    errors.add(:value, :not_integerable)
+  end
 end
diff --git a/app/models/prefill_params.rb b/app/models/prefill_params.rb
index 14099772e..0623c763f 100644
--- a/app/models/prefill_params.rb
+++ b/app/models/prefill_params.rb
@@ -37,7 +37,8 @@ class PrefillParams
       TypeDeChamp.type_champs.fetch(:regions),
       TypeDeChamp.type_champs.fetch(:departements),
       TypeDeChamp.type_champs.fetch(:multiple_drop_down_list),
-      TypeDeChamp.type_champs.fetch(:epci)
+      TypeDeChamp.type_champs.fetch(:epci),
+      TypeDeChamp.type_champs.fetch(:dossier_link)
     ]
 
     attr_reader :champ, :value, :dossier
diff --git a/config/locales/en.yml b/config/locales/en.yml
index 032a1d88a..0aecfb7e4 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -509,6 +509,10 @@ en:
               not_in_departement_epci_codes: "must be a valid EPCI code of the matching department"
             value:
               not_in_departement_epci_names: "must be a valid EPCI name of the matching department"
+        "champs/dossier_link_champ":
+          attributes:
+            value:
+              not_integerable: "must be an integer"
   errors:
     format: "Field « %{attribute} » %{message}"
     messages:
diff --git a/config/locales/fr.yml b/config/locales/fr.yml
index 4baae6f7c..841bc551e 100644
--- a/config/locales/fr.yml
+++ b/config/locales/fr.yml
@@ -504,6 +504,10 @@ fr:
               not_in_departement_epci_codes: "doit être un code d'EPCI du département correspondant"
             value:
               not_in_departement_epci_names: "doit être un nom d'EPCI du département correspondant"
+        "champs/dossier_link_champ":
+          attributes:
+            value:
+              not_integerable: "doit être un entier"
   errors:
     format: "Le champ « %{attribute} » %{message}"
     messages:
diff --git a/spec/models/champs/dossier_link_champ_spec.rb b/spec/models/champs/dossier_link_champ_spec.rb
new file mode 100644
index 000000000..ca69d37a9
--- /dev/null
+++ b/spec/models/champs/dossier_link_champ_spec.rb
@@ -0,0 +1,37 @@
+describe Champs::DossierLinkChamp, type: :model do
+  describe 'prefilling validations' do
+    describe 'value' do
+      subject { build(:champ_dossier_link, value: value).valid?(:prefill) }
+
+      context 'when nil' do
+        let(:value) { nil }
+
+        it { expect(subject).to eq(true) }
+      end
+
+      context 'when empty' do
+        let(:value) { '' }
+
+        it { expect(subject).to eq(true) }
+      end
+
+      context 'when an integer' do
+        let(:value) { 42 }
+
+        it { expect(subject).to eq(true) }
+      end
+
+      context 'when a string representing an integer' do
+        let(:value) { "42" }
+
+        it { expect(subject).to eq(true) }
+      end
+
+      context 'when it can be casted as integer' do
+        let(:value) { 'totoro' }
+
+        it { expect(subject).to eq(false) }
+      end
+    end
+  end
+end
diff --git a/spec/models/prefill_params_spec.rb b/spec/models/prefill_params_spec.rb
index 4db13de43..12876fd52 100644
--- a/spec/models/prefill_params_spec.rb
+++ b/spec/models/prefill_params_spec.rb
@@ -203,7 +203,7 @@ RSpec.describe PrefillParams do
     it_behaves_like "a champ public value that is unauthorized", :decimal_number, "non decimal string"
     it_behaves_like "a champ public value that is unauthorized", :integer_number, "non integer string"
     it_behaves_like "a champ public value that is unauthorized", :number, "value"
-    # TODO: SEB    it_behaves_like "a champ public value that is unauthorized", :dossier_link, "value"
+    it_behaves_like "a champ public value that is unauthorized", :dossier_link, "value"
     it_behaves_like "a champ public value that is unauthorized", :titre_identite, "value"
     it_behaves_like "a champ public value that is unauthorized", :civilite, "value"
     it_behaves_like "a champ public value that is unauthorized", :date, "value"

From 8f12467168d88766c359549a46f60d6d5db26436 Mon Sep 17 00:00:00 2001
From: sebastiencarceles <sebastien.carceles@gmail.com>
Date: Wed, 22 Feb 2023 16:05:44 +0100
Subject: [PATCH 169/202] feature spec cover

---
 spec/support/shared_examples_for_prefilled_dossier.rb | 1 +
 spec/system/users/dossier_prefill_get_spec.rb         | 3 +++
 spec/system/users/dossier_prefill_post_spec.rb        | 3 +++
 3 files changed, 7 insertions(+)

diff --git a/spec/support/shared_examples_for_prefilled_dossier.rb b/spec/support/shared_examples_for_prefilled_dossier.rb
index ccd617370..3a85cac6f 100644
--- a/spec/support/shared_examples_for_prefilled_dossier.rb
+++ b/spec/support/shared_examples_for_prefilled_dossier.rb
@@ -24,6 +24,7 @@ shared_examples "the user has got a prefilled dossier, owned by themselves" do
     expect(page).to have_content(multiple_drop_down_list_values.first)
     expect(page).to have_content(multiple_drop_down_list_values.last)
     expect(page).to have_field(type_de_champ_epci.libelle, with: epci_value.last)
+    expect(page).to have_field(type_de_champ_dossier_link.libelle, with: dossier_link_value)
     expect(page).to have_selector("input[value='Vonnas (01540)']")
   end
 end
diff --git a/spec/system/users/dossier_prefill_get_spec.rb b/spec/system/users/dossier_prefill_get_spec.rb
index 86c9f55e6..9dbd69b46 100644
--- a/spec/system/users/dossier_prefill_get_spec.rb
+++ b/spec/system/users/dossier_prefill_get_spec.rb
@@ -13,6 +13,7 @@ describe 'Prefilling a dossier (with a GET request):', js: true do
   let(:type_de_champ_datetime) { create(:type_de_champ_datetime, procedure: procedure) }
   let(:type_de_champ_multiple_drop_down_list) { create(:type_de_champ_multiple_drop_down_list, procedure: procedure) }
   let(:type_de_champ_epci) { create(:type_de_champ_epci, procedure: procedure) }
+  let(:type_de_champ_dossier_link) { create(:type_de_champ_dossier_link, procedure: procedure) }
   let(:type_de_champ_commune) { create(:type_de_champ_communes, procedure: procedure) }
   let(:type_de_champ_repetition) { create(:type_de_champ_repetition, :with_types_de_champ, procedure: procedure) }
 
@@ -28,6 +29,7 @@ describe 'Prefilling a dossier (with a GET request):', js: true do
     ]
   }
   let(:epci_value) { ['01', '200029999'] }
+  let(:dossier_link_value) { '42' }
   let(:commune_value) { ['01', '01457'] } # Vonnas (01540)
   let(:sub_type_de_champs_repetition) { procedure.active_revision.children_of(type_de_champ_repetition) }
   let(:text_repetition_libelle) { sub_type_de_champs_repetition.first.libelle }
@@ -43,6 +45,7 @@ describe 'Prefilling a dossier (with a GET request):', js: true do
       "champ_#{type_de_champ_datetime.to_typed_id_for_query}" => datetime_value,
       "champ_#{type_de_champ_multiple_drop_down_list.to_typed_id_for_query}" => multiple_drop_down_list_values,
       "champ_#{type_de_champ_epci.to_typed_id_for_query}" => epci_value,
+      "champ_#{type_de_champ_dossier_link.to_typed_id_for_query}" => dossier_link_value,
       "champ_#{type_de_champ_commune.to_typed_id_for_query}" => commune_value,
       "champ_#{type_de_champ_siret.to_typed_id_for_query}" => siret_value,
       "champ_#{type_de_champ_rna.to_typed_id_for_query}" => rna_value,
diff --git a/spec/system/users/dossier_prefill_post_spec.rb b/spec/system/users/dossier_prefill_post_spec.rb
index 71ff2db90..b9e3d6a9c 100644
--- a/spec/system/users/dossier_prefill_post_spec.rb
+++ b/spec/system/users/dossier_prefill_post_spec.rb
@@ -13,6 +13,7 @@ describe 'Prefilling a dossier (with a POST request):', js: true do
   let(:type_de_champ_datetime) { create(:type_de_champ_datetime, procedure: procedure) }
   let(:type_de_champ_multiple_drop_down_list) { create(:type_de_champ_multiple_drop_down_list, procedure: procedure) }
   let(:type_de_champ_epci) { create(:type_de_champ_epci, procedure: procedure) }
+  let(:type_de_champ_dossier_link) { create(:type_de_champ_dossier_link, procedure: procedure) }
   let(:type_de_champ_repetition) { create(:type_de_champ_repetition, :with_types_de_champ, procedure: procedure) }
   let(:type_de_champ_commune) { create(:type_de_champ_communes, procedure: procedure) }
 
@@ -34,6 +35,7 @@ describe 'Prefilling a dossier (with a POST request):', js: true do
   let(:integer_repetition_libelle) { sub_type_de_champs_repetition.second.libelle }
   let(:text_repetition_value) { "First repetition text" }
   let(:integer_repetition_value) { "42" }
+  let(:dossier_link_value) { '42' }
 
   before do
     allow(Rails).to receive(:cache).and_return(memory_store)
@@ -157,6 +159,7 @@ describe 'Prefilling a dossier (with a POST request):', js: true do
         "champ_#{type_de_champ_datetime.to_typed_id_for_query}" => datetime_value,
         "champ_#{type_de_champ_multiple_drop_down_list.to_typed_id_for_query}" => multiple_drop_down_list_values,
         "champ_#{type_de_champ_epci.to_typed_id_for_query}" => epci_value,
+        "champ_#{type_de_champ_dossier_link.to_typed_id_for_query}" => dossier_link_value,
         "champ_#{type_de_champ_commune.to_typed_id_for_query}" => commune_value
       }.to_json
     JSON.parse(session.response.body)["dossier_url"].gsub("http://www.example.com", "")

From 11fb3a5ca8b9bd9392ca01b6cd5d9654aaac41e4 Mon Sep 17 00:00:00 2001
From: Colin Darie <colin@darie.eu>
Date: Tue, 21 Feb 2023 19:15:39 +0100
Subject: [PATCH 170/202] fix(i18n): translate contextual procedure help
 dropdown

Cf #8665
---
 app/assets/stylesheets/help_dropdown.scss           |  2 +-
 .../shared/help/_help_dropdown_dossier.html.haml    |  3 ++-
 .../shared/help/_help_dropdown_procedure.html.haml  |  2 +-
 .../help/dropdown_items/_email_item.html.haml       | 13 +++++--------
 .../help/dropdown_items/_messagerie_item.html.haml  |  3 ++-
 .../help/dropdown_items/_service_item.html.haml     |  2 +-
 config/locales/en.yml                               |  5 +++++
 config/locales/fr.yml                               |  5 +++++
 8 files changed, 22 insertions(+), 13 deletions(-)

diff --git a/app/assets/stylesheets/help_dropdown.scss b/app/assets/stylesheets/help_dropdown.scss
index 3e3fd1725..c3925f011 100644
--- a/app/assets/stylesheets/help_dropdown.scss
+++ b/app/assets/stylesheets/help_dropdown.scss
@@ -3,7 +3,7 @@
 
 .help-dropdown {
   .dropdown-content {
-    width: 340px;
+    width: 360px;
   }
 
   .dropdown-description {
diff --git a/app/views/shared/help/_help_dropdown_dossier.html.haml b/app/views/shared/help/_help_dropdown_dossier.html.haml
index 7b58386af..f14542c8a 100644
--- a/app/views/shared/help/_help_dropdown_dossier.html.haml
+++ b/app/views/shared/help/_help_dropdown_dossier.html.haml
@@ -1,7 +1,8 @@
 = render Dropdown::MenuComponent.new(wrapper: :span, wrapper_options: { class: ['help-dropdown']}, menu_options: { id: "help-menu" }) do |menu|
   - menu.with_button_inner_html do
     = t('help')
-  - title = dossier.brouillon? ? "Besoin d’aide pour remplir votre dossier ?" : "Une question sur votre dossier ?"
+
+  - title = dossier.brouillon? ? t("help_dropdown.help_brouillon_title") : t("help_dropdown.help_filled_dossier")
 
   - if dossier.messagerie_available?
     - menu.with_item do
diff --git a/app/views/shared/help/_help_dropdown_procedure.html.haml b/app/views/shared/help/_help_dropdown_procedure.html.haml
index 80b939161..dc4ddc14e 100644
--- a/app/views/shared/help/_help_dropdown_procedure.html.haml
+++ b/app/views/shared/help/_help_dropdown_procedure.html.haml
@@ -4,6 +4,6 @@
 
   - if procedure.service.present?
     - menu.with_item do
-      = render partial: 'shared/help/dropdown_items/service_item', locals: { service: procedure.service, title: "Une question sur cette démarche ?" }
+      = render partial: 'shared/help/dropdown_items/service_item', locals: { service: procedure.service, title: t('help_dropdown.procedure_title') }
   - menu.with_item do
     = render partial: 'shared/help/dropdown_items/faq_item'
diff --git a/app/views/shared/help/dropdown_items/_email_item.html.haml b/app/views/shared/help/dropdown_items/_email_item.html.haml
index 3eecc2f5e..dae504d16 100644
--- a/app/views/shared/help/dropdown_items/_email_item.html.haml
+++ b/app/views/shared/help/dropdown_items/_email_item.html.haml
@@ -1,8 +1,5 @@
-%li{ role: 'none' }
-  = mail_to CONTACT_EMAIL, role: 'menuitem' do
-    %span.icon.mail
-    .dropdown-description
-      %span.help-dropdown-title
-        = t('help_dropdown.technical_contact_title')
-      %p
-        = t('help_dropdown.technical_contact_description', contact_email: CONTACT_EMAIL)
+= mail_to CONTACT_EMAIL, role: 'menuitem' do
+  %span.fr-icon-mail-fill.fr-text-action-high--blue-france{ "aria-hidden": "true" }
+  .dropdown-description.fr-text--sm
+    %span.help-dropdown-title= t('help_dropdown.technical_contact_title')
+    %p.fr-text--sm= t('help_dropdown.technical_contact_description', contact_email: CONTACT_EMAIL)
diff --git a/app/views/shared/help/dropdown_items/_messagerie_item.html.haml b/app/views/shared/help/dropdown_items/_messagerie_item.html.haml
index 87244e6af..5e95e3f32 100644
--- a/app/views/shared/help/dropdown_items/_messagerie_item.html.haml
+++ b/app/views/shared/help/dropdown_items/_messagerie_item.html.haml
@@ -1,5 +1,6 @@
 = link_to messagerie_dossier_path(dossier), role: 'menuitem' do
   %span.icon.mail
   .dropdown-description
+  .dropdown-description.fr-text--sm
     %span.help-dropdown-title= title
-    %p Envoyez directement un message à l’instructeur.
+    %p.fr-text--sm= t('help_dropdown.contact_instructeur')
diff --git a/app/views/shared/help/dropdown_items/_service_item.html.haml b/app/views/shared/help/dropdown_items/_service_item.html.haml
index 3aae66c04..a50a19b23 100644
--- a/app/views/shared/help/dropdown_items/_service_item.html.haml
+++ b/app/views/shared/help/dropdown_items/_service_item.html.haml
@@ -2,7 +2,7 @@
 .dropdown-description
   %span.help-dropdown-title= title
   .help-dropdown-service-action
-    %p Contactez directement l’administration :
+    %p= t('help_dropdown.contact_administration')
     %p.help-dropdown-service-item
       %span.icon.small.mail
       = link_to service.email, "mailto:#{service.email}", role: 'menuitem'
diff --git a/config/locales/en.yml b/config/locales/en.yml
index 0aecfb7e4..cf62414f4 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -35,10 +35,15 @@ en:
   help: 'Help'
   help_dropdown:
     general_title: "Online help"
+    procedure_title: "Do you have a question about this procedure?"
     problem_title: A problem with the website ?
     problem_description: Find your answer in the online help.
     technical_contact_title: Technical contact
     technical_contact_description: Send us a message to %{contact_email}.
+    contact_administration: "Contact the administration directly:"
+    help_brouillon_title: "Need help filling out your file?"
+    help_filled_dossier: "A question about your file?"
+    contact_instructeur: Send a message directly to the instructor.
   utils:
     'yes': Yes
     'no': No
diff --git a/config/locales/fr.yml b/config/locales/fr.yml
index 841bc551e..0159d31a2 100644
--- a/config/locales/fr.yml
+++ b/config/locales/fr.yml
@@ -25,10 +25,15 @@ fr:
   help: 'Aide'
   help_dropdown:
     general_title: "Aide en ligne"
+    procedure_title: "Une question sur cette démarche ?"
     problem_title: Un problème avec le site ?
     problem_description: Trouvez votre réponse dans l’aide en ligne.
     technical_contact_title: Contact technique
     technical_contact_description: Envoyez nous un message à %{contact_email}.
+    contact_administration: "Contactez directement l’administration :"
+    help_brouillon_title: "Besoin d’aide pour remplir votre dossier ?"
+    help_filled_dossier: "Une question sur votre dossier ?"
+    contact_instructeur: Envoyez directement un message à l’instructeur.
   utils:
     'yes': Oui
     'no': Non

From 7a67345d4979a0b86356548d4b073b0d6b0adbe0 Mon Sep 17 00:00:00 2001
From: Colin Darie <colin@darie.eu>
Date: Tue, 21 Feb 2023 19:29:17 +0100
Subject: [PATCH 171/202] refactor(help_dropdown): fix font sizes & use dsfr
 icons

---
 app/assets/stylesheets/help_dropdown.scss      | 15 ---------------
 .../help/dropdown_items/_faq_item.html.haml    |  7 +++----
 .../dropdown_items/_messagerie_item.html.haml  |  3 +--
 .../dropdown_items/_service_item.html.haml     | 18 +++++++++---------
 4 files changed, 13 insertions(+), 30 deletions(-)

diff --git a/app/assets/stylesheets/help_dropdown.scss b/app/assets/stylesheets/help_dropdown.scss
index c3925f011..5c1e2e4df 100644
--- a/app/assets/stylesheets/help_dropdown.scss
+++ b/app/assets/stylesheets/help_dropdown.scss
@@ -5,14 +5,9 @@
   .dropdown-content {
     width: 360px;
   }
-
-  .dropdown-description {
-    font-size: 14px;
-  }
 }
 
 .help-dropdown-title {
-  font-size: 16px;
   color: $blue-france-500;
 }
 
@@ -37,15 +32,5 @@
 .help-dropdown-service-item {
   margin-top: $default-spacer;
   line-height: 18px;
-
-  .icon {
-    vertical-align: middle;
-    margin-right: 5px;
-
-    &.clock {
-      filter: contrast(0) brightness(120%);
-      vertical-align: -4px;
-    }
-  }
 }
 
diff --git a/app/views/shared/help/dropdown_items/_faq_item.html.haml b/app/views/shared/help/dropdown_items/_faq_item.html.haml
index cea9ceaa4..e4a4e60ef 100644
--- a/app/views/shared/help/dropdown_items/_faq_item.html.haml
+++ b/app/views/shared/help/dropdown_items/_faq_item.html.haml
@@ -1,7 +1,6 @@
 = link_to t("links.common.faq.url"), title: new_tab_suffix(t('help_dropdown.general_title')), **external_link_attributes, role: 'menuitem' do
-  %span.icon.help
-  .dropdown-description
+  %span.fr-icon-question-fill.fr-text-action-high--blue-france{ "aria-hidden": "true" }
+  .dropdown-description.fr-text--sm
     %span.help-dropdown-title
       = t('help_dropdown.problem_title')
-    %p
-      = t('help_dropdown.problem_description')
+    %p.fr-text--sm= t('help_dropdown.problem_description')
diff --git a/app/views/shared/help/dropdown_items/_messagerie_item.html.haml b/app/views/shared/help/dropdown_items/_messagerie_item.html.haml
index 5e95e3f32..0316831bc 100644
--- a/app/views/shared/help/dropdown_items/_messagerie_item.html.haml
+++ b/app/views/shared/help/dropdown_items/_messagerie_item.html.haml
@@ -1,6 +1,5 @@
 = link_to messagerie_dossier_path(dossier), role: 'menuitem' do
-  %span.icon.mail
-  .dropdown-description
+  %span.fr-icon-mail-fill.fr-text-action-high--blue-france{ "aria-hidden": "true" }
   .dropdown-description.fr-text--sm
     %span.help-dropdown-title= title
     %p.fr-text--sm= t('help_dropdown.contact_instructeur')
diff --git a/app/views/shared/help/dropdown_items/_service_item.html.haml b/app/views/shared/help/dropdown_items/_service_item.html.haml
index a50a19b23..208601f51 100644
--- a/app/views/shared/help/dropdown_items/_service_item.html.haml
+++ b/app/views/shared/help/dropdown_items/_service_item.html.haml
@@ -1,14 +1,14 @@
-%span.icon.person
-.dropdown-description
+%span.fr-icon-user-fill.fr-text-action-high--blue-france{ "aria-hidden": "true" }
+.dropdown-description.fr-text--sm
   %span.help-dropdown-title= title
   .help-dropdown-service-action
-    %p= t('help_dropdown.contact_administration')
-    %p.help-dropdown-service-item
-      %span.icon.small.mail
+    %p.fr-text--sm= t('help_dropdown.contact_administration')
+    %p.fr-text--sm.help-dropdown-service-item
+      %span.fr-icon-mail-fill.fr-icon--sm{ "aria-hidden": "true" }
       = link_to service.email, "mailto:#{service.email}", role: 'menuitem'
-    %p.help-dropdown-service-item
-      %span.icon.small.phone
+    %p.fr-text--sm
+      %span.fr-icon-phone-fill.fr-icon--sm{ "aria-hidden": "true" }
       = link_to service.telephone, service.telephone_url, role: 'menuitem'
-    %p.help-dropdown-service-item
-      %span.icon.small.clock
+    %p.fr-text--sm
+      %span.fr-icon-time-fill.fr-icon--sm{ "aria-hidden": "true" }
       = service.horaires

From a931bea7124b1b7b13e6a2717e325c5215219618 Mon Sep 17 00:00:00 2001
From: Colin Darie <colin@darie.eu>
Date: Wed, 22 Feb 2023 16:49:47 +0100
Subject: [PATCH 172/202] feat(a11y/i18n): translate skiplinks

---
 app/views/layouts/_skiplinks.html.haml | 4 ++--
 config/locales/en.yml                  | 3 +++
 config/locales/fr.yml                  | 3 +++
 3 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/app/views/layouts/_skiplinks.html.haml b/app/views/layouts/_skiplinks.html.haml
index b7ad3fb9c..ccd0f3f18 100644
--- a/app/views/layouts/_skiplinks.html.haml
+++ b/app/views/layouts/_skiplinks.html.haml
@@ -1,5 +1,5 @@
 .fr-skiplinks
-  %nav.fr-container{ role: "navigation", 'aria-label': "Accès rapide" }
+  %nav.fr-container{ role: "navigation", 'aria-label': t("skiplinks.quick") }
     %ul.fr-skiplinks__list
       %li
-        %a.fr-link{ href: "#contenu" } Contenu
+        %a.fr-link{ href: "#contenu" }= t('skiplinks.content')
diff --git a/config/locales/en.yml b/config/locales/en.yml
index cf62414f4..936f34209 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -64,6 +64,9 @@ en:
     commentaire:
       send_message_to_instructeur: "Send a message to the instructor"
       reply_in_mailbox: "Reply in mailbox"
+  skiplinks:
+    quick: Quick access
+    content: Content
   layouts:
     commencer:
       no_procedure:
diff --git a/config/locales/fr.yml b/config/locales/fr.yml
index 0159d31a2..218632afc 100644
--- a/config/locales/fr.yml
+++ b/config/locales/fr.yml
@@ -55,6 +55,9 @@ fr:
     commentaire:
       send_message_to_instructeur: "Envoyer un message à l’instructeur"
       reply_in_mailbox: "Répondre dans la messagerie"
+  skiplinks:
+    quick: Accès rapide
+    content: Contenu
   layouts:
     commencer:
       no_procedure:

From 8a340b6f748d2e8b178322eceb6e977bcc543323 Mon Sep 17 00:00:00 2001
From: Colin Darie <colin@darie.eu>
Date: Wed, 22 Feb 2023 16:51:58 +0100
Subject: [PATCH 173/202] fix(upload): missing i18n key

---
 app/components/attachment/edit_component/edit_component.en.yml  | 1 +
 app/components/attachment/edit_component/edit_component.fr.yml  | 1 +
 .../attachment/edit_component/edit_component.html.haml          | 2 +-
 3 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/app/components/attachment/edit_component/edit_component.en.yml b/app/components/attachment/edit_component/edit_component.en.yml
index 7e2a20625..b5ae8544f 100644
--- a/app/components/attachment/edit_component/edit_component.en.yml
+++ b/app/components/attachment/edit_component/edit_component.en.yml
@@ -7,6 +7,7 @@ en:
   delete_file: Delete file %{filename}
   replace: Replace
   replace_file: Replace file %{filename}
+  open_file: Open file %{filename}
   errors:
     uploading: "An error occurred while sending the file."
     virus_infected: "Virus detected, please send another file."
diff --git a/app/components/attachment/edit_component/edit_component.fr.yml b/app/components/attachment/edit_component/edit_component.fr.yml
index 19ba08a3a..d4e5b6811 100644
--- a/app/components/attachment/edit_component/edit_component.fr.yml
+++ b/app/components/attachment/edit_component/edit_component.fr.yml
@@ -7,6 +7,7 @@ fr:
   delete_file: Supprimer le fichier %{filename}
   replace: Remplacer
   replace_file: Remplacer le fichier %{filename}
+  open_file: Ouvrir le fichier %{filename}
   errors:
     uploading: "Une erreur s’est produite pendant l’envoi du fichier."
     virus_infected: "Virus détecté, merci d’envoyer un autre fichier."
diff --git a/app/components/attachment/edit_component/edit_component.html.haml b/app/components/attachment/edit_component/edit_component.html.haml
index dda501826..ea1fd3261 100644
--- a/app/components/attachment/edit_component/edit_component.html.haml
+++ b/app/components/attachment/edit_component/edit_component.html.haml
@@ -12,7 +12,7 @@
           = render Dsfr::DownloadComponent.new(attachment:)
         - else
           .fr-py-1v
-            %span.attachment-filename.fr-mr-1w= link_to_if(viewable?, attachment.filename.to_s, helpers.url_for(attachment.blob), title: "Ouvrir le fichier #{attachment.filename.to_s}", **helpers.external_link_attributes)
+            %span.attachment-filename.fr-mr-1w= link_to_if(viewable?, attachment.filename.to_s, helpers.url_for(attachment.blob), title: t(".open_file", filename: attachment.filename), **helpers.external_link_attributes)
 
           = render Attachment::ProgressComponent.new(attachment: attachment)
 

From 4d1a5f230cafe5f1f409deeb0b4b7cb39bf336c4 Mon Sep 17 00:00:00 2001
From: Colin Darie <colin@darie.eu>
Date: Wed, 22 Feb 2023 17:08:36 +0100
Subject: [PATCH 174/202] feat(a11y/i18n): inject user locale to chat / crisp

---
 app/controllers/application_controller.rb | 2 ++
 app/javascript/shared/track/crisp.ts      | 9 ++++++++-
 app/javascript/shared/utils.ts            | 1 +
 3 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
index f9ee04f23..9f880407a 100644
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@@ -337,6 +337,8 @@ class ApplicationController < ActionController::Base
       extract_locale_from_accept_language_header ||
       I18n.default_locale
 
+    gon.locale = locale
+
     I18n.with_locale(locale, &action)
   end
 
diff --git a/app/javascript/shared/track/crisp.ts b/app/javascript/shared/track/crisp.ts
index 49cdeca6c..42c716153 100644
--- a/app/javascript/shared/track/crisp.ts
+++ b/app/javascript/shared/track/crisp.ts
@@ -1,11 +1,15 @@
 import { getConfig } from '@utils';
 const {
-  crisp: { key, enabled, administrateur }
+  crisp: { key, enabled, administrateur },
+  locale
 } = getConfig();
 
 declare const window: Window &
   typeof globalThis & {
     CRISP_WEBSITE_ID?: string | null;
+    CRISP_RUNTIME_CONFIG?: {
+      locale: string;
+    };
     $crisp: (
       | [cmd: string, key: string, value: unknown]
       | [key: string, value: unknown]
@@ -15,6 +19,9 @@ declare const window: Window &
 if (enabled) {
   window.$crisp = [];
   window.CRISP_WEBSITE_ID = key;
+  window.CRISP_RUNTIME_CONFIG = {
+    locale: locale
+  };
 
   const script = document.createElement('script');
   const firstScript = document.getElementsByTagName('script')[0];
diff --git a/app/javascript/shared/utils.ts b/app/javascript/shared/utils.ts
index ca1b0eae3..34d83333f 100644
--- a/app/javascript/shared/utils.ts
+++ b/app/javascript/shared/utils.ts
@@ -16,6 +16,7 @@ const Gon = z
         api_education_url: z.string().optional()
       })
       .default({}),
+    locale: z.string().default('fr'),
     matomo: z
       .object({
         cookieDomain: z.string().optional(),

From 3de089d6c7b76969633c48502efd21280c68577c Mon Sep 17 00:00:00 2001
From: Colin Darie <colin@darie.eu>
Date: Mon, 20 Feb 2023 16:45:00 +0100
Subject: [PATCH 175/202] fix(conditional): dynamic title counters using css

Closes #8086
---
 app/assets/stylesheets/sections.scss          | 11 ++++++++
 .../header_section_component.html.haml        |  4 +--
 app/models/champs/header_section_champ.rb     |  8 ------
 app/models/dossier.rb                         |  4 +++
 .../shared/dossiers/_champ_row.html.haml      |  3 +--
 app/views/shared/dossiers/_champs.html.haml   |  2 +-
 app/views/shared/dossiers/_edit.html.haml     |  2 +-
 spec/models/dossier_spec.rb                   | 27 +++++++++++++++++++
 8 files changed, 47 insertions(+), 14 deletions(-)
 create mode 100644 app/assets/stylesheets/sections.scss

diff --git a/app/assets/stylesheets/sections.scss b/app/assets/stylesheets/sections.scss
new file mode 100644
index 000000000..fde56d976
--- /dev/null
+++ b/app/assets/stylesheets/sections.scss
@@ -0,0 +1,11 @@
+.counter-start-header-section {
+  counter-reset: headerSectionCounter;
+}
+
+.header-section {
+  counter-increment: headerSectionCounter;
+
+  &.header-section-counter::before {
+    content: counter(headerSectionCounter) ". ";
+  }
+}
diff --git a/app/components/editable_champ/header_section_component/header_section_component.html.haml b/app/components/editable_champ/header_section_component/header_section_component.html.haml
index deac95425..aec7d22bd 100644
--- a/app/components/editable_champ/header_section_component/header_section_component.html.haml
+++ b/app/components/editable_champ/header_section_component/header_section_component.html.haml
@@ -1,2 +1,2 @@
-%h2.header-section
-  = @champ.libelle_with_section_index
+%h2.header-section{ class: @champ.dossier.auto_numbering_section_headers_for?(@champ) ? "header-section-counter" : nil }
+  = @champ.libelle
diff --git a/app/models/champs/header_section_champ.rb b/app/models/champs/header_section_champ.rb
index a397a73e4..4185db524 100644
--- a/app/models/champs/header_section_champ.rb
+++ b/app/models/champs/header_section_champ.rb
@@ -25,14 +25,6 @@ class Champs::HeaderSectionChamp < Champ
     # The user cannot enter any information here so it doesn’t make much sense to search
   end
 
-  def libelle_with_section_index
-    if sections&.none?(&:libelle_with_section_index?)
-      "#{section_index}. #{libelle}"
-    else
-      libelle
-    end
-  end
-
   def libelle_with_section_index?
     libelle =~ /^\d/
   end
diff --git a/app/models/dossier.rb b/app/models/dossier.rb
index 92c2ea403..fa11b0177 100644
--- a/app/models/dossier.rb
+++ b/app/models/dossier.rb
@@ -1291,6 +1291,10 @@ class Dossier < ApplicationRecord
     false
   end
 
+  def auto_numbering_section_headers_for?(champ)
+    sections_for(champ)&.none?(&:libelle_with_section_index?)
+  end
+
   private
 
   def create_missing_traitemets
diff --git a/app/views/shared/dossiers/_champ_row.html.haml b/app/views/shared/dossiers/_champ_row.html.haml
index 5ee4b6547..ea12edae6 100644
--- a/app/views/shared/dossiers/_champ_row.html.haml
+++ b/app/views/shared/dossiers/_champ_row.html.haml
@@ -10,8 +10,7 @@
   - else
     %tr
       - if c.type_champ == TypeDeChamp.type_champs.fetch(:header_section)
-        %th.header-section{ colspan: 3 }
-          = c.libelle
+        %th.header-section{ colspan: 3, class: c.dossier.auto_numbering_section_headers_for?(c) ? "header-section-counter" : nil }= c.libelle
       - else
         %td.libelle{ class: repetition ? 'padded' : '' }
           = "#{c.libelle} :"
diff --git a/app/views/shared/dossiers/_champs.html.haml b/app/views/shared/dossiers/_champs.html.haml
index fb7c6f2a2..4eba2463f 100644
--- a/app/views/shared/dossiers/_champs.html.haml
+++ b/app/views/shared/dossiers/_champs.html.haml
@@ -1,4 +1,4 @@
-%table.table.vertical.dossier-champs{ role: :presentation }
+%table.table.vertical.dossier-champs.counter-start-header-section{ role: :presentation }
   %tbody
     - if dossier.show_groupe_instructeur_details?
       %td.libelle= dossier.procedure.routing_criteria_name
diff --git a/app/views/shared/dossiers/_edit.html.haml b/app/views/shared/dossiers/_edit.html.haml
index 0892c575b..0c8991525 100644
--- a/app/views/shared/dossiers/_edit.html.haml
+++ b/app/views/shared/dossiers/_edit.html.haml
@@ -2,7 +2,7 @@
   - content_for(:notice_info) do
     = render partial: "shared/dossiers/france_connect_informations_notice", locals: { user_information: dossier.france_connect_information }
 
-.dossier-edit.container
+.dossier-edit.container.counter-start-header-section
   = render partial: "shared/dossiers/submit_is_over", locals: { dossier: dossier }
 
   - if dossier.brouillon?
diff --git a/spec/models/dossier_spec.rb b/spec/models/dossier_spec.rb
index 5dc4d8f28..354fa0aa4 100644
--- a/spec/models/dossier_spec.rb
+++ b/spec/models/dossier_spec.rb
@@ -2089,6 +2089,33 @@ describe Dossier do
     end
   end
 
+  describe '#auto_numbering_section_headers_for?' do
+    let(:public_libelle) { "Infos" }
+    let(:private_libelle) { "Infos Private" }
+    let(:types_de_champ_public) { [{ type: :header_section, libelle: public_libelle }, { type: :header_section, libelle: "Details" }] }
+    let(:types_de_champ_private) { [{ type: :header_section, libelle: private_libelle }, { type: :header_section, libelle: "Details Private" }] }
+
+    let(:procedure) { create(:procedure, :for_individual, types_de_champ_public:, types_de_champ_private:) }
+    let(:dossier) { create(:dossier, procedure: procedure) }
+
+    context "with no section having number" do
+      it { expect(dossier.auto_numbering_section_headers_for?(dossier.champs_public[1])).to eq(true) }
+      it { expect(dossier.auto_numbering_section_headers_for?(dossier.champs_private[1])).to eq(true) }
+    end
+
+    context "with public section having number" do
+      let(:public_libelle) { "1 - infos" }
+      it { expect(dossier.auto_numbering_section_headers_for?(dossier.champs_public[1])).to eq(false) }
+      it { expect(dossier.auto_numbering_section_headers_for?(dossier.champs_private[1])).to eq(true) }
+    end
+
+    context "with private section having number" do
+      let(:private_libelle) { "1 - infos private" }
+      it { expect(dossier.auto_numbering_section_headers_for?(dossier.champs_public[1])).to eq(true) }
+      it { expect(dossier.auto_numbering_section_headers_for?(dossier.champs_private[1])).to eq(false) }
+    end
+  end
+
   private
 
   def count_for_month(processed_by_month, month)

From d7880f7e58ac48936fabc21e8ebd99aec2258030 Mon Sep 17 00:00:00 2001
From: Colin Darie <colin@darie.eu>
Date: Mon, 20 Feb 2023 18:48:20 +0100
Subject: [PATCH 176/202] feat(dossier/pdf): header sections numbering

---
 app/models/dossier.rb             | 12 +++++++++
 app/views/dossiers/show.pdf.prawn |  8 +++++-
 spec/models/dossier_spec.rb       | 41 +++++++++++++++++++++++++++++++
 3 files changed, 60 insertions(+), 1 deletion(-)

diff --git a/app/models/dossier.rb b/app/models/dossier.rb
index fa11b0177..16c16618c 100644
--- a/app/models/dossier.rb
+++ b/app/models/dossier.rb
@@ -1295,6 +1295,18 @@ class Dossier < ApplicationRecord
     sections_for(champ)&.none?(&:libelle_with_section_index?)
   end
 
+  def index_for_section_header(champ)
+    champs = champ.private? ? champs_private : champs_public
+
+    index = 1
+    champs.each do |c|
+      return index if c.stable_id == champ.stable_id
+      next unless c.visible?
+
+      index += 1 if c.type_de_champ.header_section?
+    end
+  end
+
   private
 
   def create_missing_traitemets
diff --git a/app/views/dossiers/show.pdf.prawn b/app/views/dossiers/show.pdf.prawn
index 741aa31b7..c9a517305 100644
--- a/app/views/dossiers/show.pdf.prawn
+++ b/app/views/dossiers/show.pdf.prawn
@@ -141,7 +141,13 @@ def add_single_champ(pdf, champ)
   when 'Champs::PieceJustificativeChamp', 'Champs::TitreIdentiteChamp'
     return
   when 'Champs::HeaderSectionChamp'
-    add_section_title(pdf, tdc.libelle)
+    libelle = if @dossier.auto_numbering_section_headers_for?(champ)
+      "#{@dossier.index_for_section_header(champ)}. #{champ.libelle}"
+    else
+      champ.libelle
+    end
+
+    add_section_title(pdf, libelle)
   when 'Champs::ExplicationChamp'
     format_in_2_lines(pdf, tdc.libelle, strip_tags(tdc.description))
   when 'Champs::CarteChamp'
diff --git a/spec/models/dossier_spec.rb b/spec/models/dossier_spec.rb
index 354fa0aa4..799f03a6f 100644
--- a/spec/models/dossier_spec.rb
+++ b/spec/models/dossier_spec.rb
@@ -2116,6 +2116,47 @@ describe Dossier do
     end
   end
 
+  describe '#index_for_section_header' do
+    include Logic
+    let(:number_stable_id) { 99 }
+    let(:types_de_champ) {
+  [
+    { type: :header_section, libelle: "Infos" }, { type: :integer_number, stable_id: number_stable_id },
+    { type: :header_section, libelle: "Details", condition: ds_eq(champ_value(99), constant(5)) }, { type: :header_section, libelle: "Conclusion" }
+  ]
+}
+
+    let(:procedure) { create(:procedure, :for_individual, types_de_champ_public: types_de_champ) }
+    let(:dossier) { create(:dossier, procedure: procedure) }
+
+    let(:headers) { dossier.champs_public.select { _1.header_section? } }
+
+    let(:number_value) { nil }
+
+    before do
+      dossier.champs_public.find { _1.stable_id == number_stable_id }.update(value: number_value)
+      dossier.reload
+    end
+
+    context "when there are invisible sections" do
+      it "index accordingly header sections" do
+         expect(dossier.index_for_section_header(headers[0])).to eq(1)
+         expect(headers[1]).not_to be_visible
+         expect(dossier.index_for_section_header(headers[2])).to eq(2)
+       end
+    end
+
+    context "when all headers are visible" do
+      let(:number_value) { 5 }
+      it "index accordingly header sections" do
+        expect(dossier.index_for_section_header(headers[0])).to eq(1)
+        expect(headers[1]).to be_visible
+        expect(dossier.index_for_section_header(headers[1])).to eq(2)
+        expect(dossier.index_for_section_header(headers[2])).to eq(3)
+      end
+    end
+  end
+
   private
 
   def count_for_month(processed_by_month, month)

From 1981bfc88e2a12b6013d2d76b399fe8a4e169105 Mon Sep 17 00:00:00 2001
From: Colin Darie <colin@darie.eu>
Date: Tue, 21 Feb 2023 11:08:18 +0100
Subject: [PATCH 177/202] feat(tdc): strip libelle so header section titles
 always start with something

---
 app/models/type_de_champ.rb       | 5 +++++
 spec/models/type_de_champ_spec.rb | 5 +++++
 2 files changed, 10 insertions(+)

diff --git a/app/models/type_de_champ.rb b/app/models/type_de_champ.rb
index b1ca9b3c5..35da0363d 100644
--- a/app/models/type_de_champ.rb
+++ b/app/models/type_de_champ.rb
@@ -192,6 +192,7 @@ class TypeDeChamp < ApplicationRecord
   validates :type_champ, presence: true, allow_blank: false, allow_nil: false
 
   before_validation :check_mandatory
+  before_validation :normalize_libelle
   before_save :remove_piece_justificative_template, if: -> { type_champ_changed? }
   before_validation :remove_drop_down_list, if: -> { type_champ_changed? }
   before_save :remove_block, if: -> { type_champ_changed? }
@@ -554,4 +555,8 @@ class TypeDeChamp < ApplicationRecord
         .remove_children_of(self)
     end
   end
+
+  def normalize_libelle
+    self.libelle&.strip!
+  end
 end
diff --git a/spec/models/type_de_champ_spec.rb b/spec/models/type_de_champ_spec.rb
index de448e143..d8f9a82d5 100644
--- a/spec/models/type_de_champ_spec.rb
+++ b/spec/models/type_de_champ_spec.rb
@@ -273,4 +273,9 @@ describe TypeDeChamp do
     it_behaves_like "a non-prefillable type de champ", :type_de_champ_address
     it_behaves_like "a non-prefillable type de champ", :type_de_champ_annuaire_education
   end
+
+  describe '#normalize_libelle' do
+    it { expect(create(:type_de_champ, :header_section, libelle: " 2.3 Test").libelle).to eq("2.3 Test") }
+    it { expect(create(:type_de_champ, libelle: " fix me ").libelle).to eq("fix me") }
+  end
 end

From ce175aed008610448da874969347472aefdae88c Mon Sep 17 00:00:00 2001
From: Colin Darie <colin@darie.eu>
Date: Tue, 21 Feb 2023 11:17:08 +0100
Subject: [PATCH 178/202] chore(type_de_champ): normalize (strip) all libelles

---
 ...221100840_strip_type_de_champ_libelle.rake | 22 +++++++++++++++++++
 1 file changed, 22 insertions(+)
 create mode 100644 lib/tasks/deployment/20230221100840_strip_type_de_champ_libelle.rake

diff --git a/lib/tasks/deployment/20230221100840_strip_type_de_champ_libelle.rake b/lib/tasks/deployment/20230221100840_strip_type_de_champ_libelle.rake
new file mode 100644
index 000000000..e668e3592
--- /dev/null
+++ b/lib/tasks/deployment/20230221100840_strip_type_de_champ_libelle.rake
@@ -0,0 +1,22 @@
+namespace :after_party do
+  desc 'Deployment task: strip_type_de_champ_libelle'
+  task strip_type_de_champ_libelle: :environment do
+    puts "Running deploy task 'strip_type_de_champ_libelle'"
+
+    # ~ 152K records matched
+    tdcs = TypeDeChamp.where("libelle LIKE ?", ' %').or(TypeDeChamp.where("libelle LIKE ?", '% '))
+    progress = ProgressReport.new(tdcs.count)
+
+    tdcs.find_each do |tdc|
+      tdc.save!
+      progress.inc
+    end
+
+    progress.finish
+
+    # Update task as completed.  If you remove the line below, the task will
+    # run with every deploy (or every time you call after_party:run).
+    AfterParty::TaskRecord
+      .create version: AfterParty::TaskRecorder.new(__FILE__).timestamp
+  end
+end

From 8156e1cc01c0a5e65dd050ad822b7fe790448e16 Mon Sep 17 00:00:00 2001
From: Colin Darie <colin@darie.eu>
Date: Tue, 21 Feb 2023 11:36:32 +0100
Subject: [PATCH 179/202] feat(admin): notice about auto numbering of header
 section

---
 app/assets/stylesheets/procedure_champs_editor.scss           | 3 ++-
 .../champ_component/champ_component.html.haml                 | 4 ++++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/app/assets/stylesheets/procedure_champs_editor.scss b/app/assets/stylesheets/procedure_champs_editor.scss
index bb2e6fe1e..c4e20f0dc 100644
--- a/app/assets/stylesheets/procedure_champs_editor.scss
+++ b/app/assets/stylesheets/procedure_champs_editor.scss
@@ -89,7 +89,8 @@
         color: $light-grey;
       }
 
-      .conditionnel {
+      .conditionnel,
+      p {
         color: $white;
       }
     }
diff --git a/app/components/types_de_champ_editor/champ_component/champ_component.html.haml b/app/components/types_de_champ_editor/champ_component/champ_component.html.haml
index d9e1260aa..972beea77 100644
--- a/app/components/types_de_champ_editor/champ_component/champ_component.html.haml
+++ b/app/components/types_de_champ_editor/champ_component/champ_component.html.haml
@@ -29,6 +29,10 @@
                   = form.check_box :mandatory, class: 'small-margin small', id: dom_id(type_de_champ, :mandatory)
                   = form.label :mandatory, "Champ obligatoire", for: dom_id(type_de_champ, :mandatory)
             = form.text_field :libelle, class: 'small-margin small width-100', id: dom_id(type_de_champ, :libelle), data: input_autofocus
+          - if type_de_champ.header_section?
+            %p
+              %small Nous numérotons automatiquement les titres lorsqu’aucun de vos titres ne commence par un chiffre.
+
           - if !type_de_champ.header_section? && !type_de_champ.titre_identite?
             .cell.mt-1
               = form.label :description, "Description du champ (optionnel)", for: dom_id(type_de_champ, :description)

From ae93d3927e860d1c88afa9531709a9f2afc6c770 Mon Sep 17 00:00:00 2001
From: Colin Darie <colin@darie.eu>
Date: Tue, 21 Feb 2023 11:42:30 +0100
Subject: [PATCH 180/202] refactor(dossier): extract sections logic in a
 concern

---
 .../concerns/dossier_sections_concern.rb      | 35 ++++++++++
 app/models/dossier.rb                         | 33 +--------
 .../concern/dossier_sections_concern_spec.rb  | 69 +++++++++++++++++++
 spec/models/dossier_spec.rb                   | 68 ------------------
 4 files changed, 106 insertions(+), 99 deletions(-)
 create mode 100644 app/models/concerns/dossier_sections_concern.rb
 create mode 100644 spec/models/concern/dossier_sections_concern_spec.rb

diff --git a/app/models/concerns/dossier_sections_concern.rb b/app/models/concerns/dossier_sections_concern.rb
new file mode 100644
index 000000000..bd8166efe
--- /dev/null
+++ b/app/models/concerns/dossier_sections_concern.rb
@@ -0,0 +1,35 @@
+module DossierSectionsConcern
+  extend ActiveSupport::Concern
+
+  included do
+    def sections_for(champ)
+      @sections = Hash.new do |hash, parent|
+        case parent
+        when :public
+          hash[parent] = champs_public.filter(&:header_section?)
+        when :private
+          hash[parent] = champs_private.filter(&:header_section?)
+        else
+          hash[parent] = parent.champs.filter(&:header_section?)
+        end
+      end
+      @sections[champ.parent || (champ.public? ? :public : :private)]
+    end
+
+    def auto_numbering_section_headers_for?(champ)
+      sections_for(champ)&.none?(&:libelle_with_section_index?)
+    end
+
+    def index_for_section_header(champ)
+      champs = champ.private? ? champs_private : champs_public
+
+      index = 1
+      champs.each do |c|
+        return index if c.stable_id == champ.stable_id
+        next unless c.visible?
+
+        index += 1 if c.type_de_champ.header_section?
+      end
+    end
+  end
+end
diff --git a/app/models/dossier.rb b/app/models/dossier.rb
index 16c16618c..d2a446f9d 100644
--- a/app/models/dossier.rb
+++ b/app/models/dossier.rb
@@ -48,8 +48,9 @@
 class Dossier < ApplicationRecord
   self.ignored_columns = [:en_construction_conservation_extension]
   include DossierFilteringConcern
-  include DossierRebaseConcern
   include DossierPrefillableConcern
+  include DossierRebaseConcern
+  include DossierSectionsConcern
 
   enum state: {
     brouillon:       'brouillon',
@@ -1237,20 +1238,6 @@ class Dossier < ApplicationRecord
     termine_expired_to_delete.find_each(&:purge_discarded)
   end
 
-  def sections_for(champ)
-    @sections = Hash.new do |hash, parent|
-      case parent
-      when :public
-        hash[parent] = champs_public.filter(&:header_section?)
-      when :private
-        hash[parent] = champs_private.filter(&:header_section?)
-      else
-        hash[parent] = parent.champs.filter(&:header_section?)
-      end
-    end
-    @sections[champ.parent || (champ.public? ? :public : :private)]
-  end
-
   def clone
     dossier_attributes = [:autorisation_donnees, :user_id, :revision_id, :groupe_instructeur_id]
     relationships = [:individual, :etablissement]
@@ -1291,22 +1278,6 @@ class Dossier < ApplicationRecord
     false
   end
 
-  def auto_numbering_section_headers_for?(champ)
-    sections_for(champ)&.none?(&:libelle_with_section_index?)
-  end
-
-  def index_for_section_header(champ)
-    champs = champ.private? ? champs_private : champs_public
-
-    index = 1
-    champs.each do |c|
-      return index if c.stable_id == champ.stable_id
-      next unless c.visible?
-
-      index += 1 if c.type_de_champ.header_section?
-    end
-  end
-
   private
 
   def create_missing_traitemets
diff --git a/spec/models/concern/dossier_sections_concern_spec.rb b/spec/models/concern/dossier_sections_concern_spec.rb
new file mode 100644
index 000000000..c4c329f10
--- /dev/null
+++ b/spec/models/concern/dossier_sections_concern_spec.rb
@@ -0,0 +1,69 @@
+describe DossierSectionsConcern do
+  describe '#auto_numbering_section_headers_for?' do
+    let(:public_libelle) { "Infos" }
+    let(:private_libelle) { "Infos Private" }
+    let(:types_de_champ_public) { [{ type: :header_section, libelle: public_libelle }, { type: :header_section, libelle: "Details" }] }
+    let(:types_de_champ_private) { [{ type: :header_section, libelle: private_libelle }, { type: :header_section, libelle: "Details Private" }] }
+
+    let(:procedure) { create(:procedure, :for_individual, types_de_champ_public:, types_de_champ_private:) }
+    let(:dossier) { create(:dossier, procedure: procedure) }
+
+    context "with no section having number" do
+      it { expect(dossier.auto_numbering_section_headers_for?(dossier.champs_public[1])).to eq(true) }
+      it { expect(dossier.auto_numbering_section_headers_for?(dossier.champs_private[1])).to eq(true) }
+    end
+
+    context "with public section having number" do
+      let(:public_libelle) { "1 - infos" }
+      it { expect(dossier.auto_numbering_section_headers_for?(dossier.champs_public[1])).to eq(false) }
+      it { expect(dossier.auto_numbering_section_headers_for?(dossier.champs_private[1])).to eq(true) }
+    end
+
+    context "with private section having number" do
+      let(:private_libelle) { "1 - infos private" }
+      it { expect(dossier.auto_numbering_section_headers_for?(dossier.champs_public[1])).to eq(true) }
+      it { expect(dossier.auto_numbering_section_headers_for?(dossier.champs_private[1])).to eq(false) }
+    end
+  end
+
+  describe '#index_for_section_header' do
+    include Logic
+    let(:number_stable_id) { 99 }
+    let(:types_de_champ) {
+  [
+    { type: :header_section, libelle: "Infos" }, { type: :integer_number, stable_id: number_stable_id },
+    { type: :header_section, libelle: "Details", condition: ds_eq(champ_value(99), constant(5)) }, { type: :header_section, libelle: "Conclusion" }
+  ]
+}
+
+    let(:procedure) { create(:procedure, :for_individual, types_de_champ_public: types_de_champ) }
+    let(:dossier) { create(:dossier, procedure: procedure) }
+
+    let(:headers) { dossier.champs_public.filter(&:header_section?) }
+
+    let(:number_value) { nil }
+
+    before do
+      dossier.champs_public.find { _1.stable_id == number_stable_id }.update(value: number_value)
+      dossier.reload
+    end
+
+    context "when there are invisible sections" do
+      it "index accordingly header sections" do
+         expect(dossier.index_for_section_header(headers[0])).to eq(1)
+         expect(headers[1]).not_to be_visible
+         expect(dossier.index_for_section_header(headers[2])).to eq(2)
+       end
+    end
+
+    context "when all headers are visible" do
+      let(:number_value) { 5 }
+      it "index accordingly header sections" do
+        expect(dossier.index_for_section_header(headers[0])).to eq(1)
+        expect(headers[1]).to be_visible
+        expect(dossier.index_for_section_header(headers[1])).to eq(2)
+        expect(dossier.index_for_section_header(headers[2])).to eq(3)
+      end
+    end
+  end
+end
diff --git a/spec/models/dossier_spec.rb b/spec/models/dossier_spec.rb
index 799f03a6f..5dc4d8f28 100644
--- a/spec/models/dossier_spec.rb
+++ b/spec/models/dossier_spec.rb
@@ -2089,74 +2089,6 @@ describe Dossier do
     end
   end
 
-  describe '#auto_numbering_section_headers_for?' do
-    let(:public_libelle) { "Infos" }
-    let(:private_libelle) { "Infos Private" }
-    let(:types_de_champ_public) { [{ type: :header_section, libelle: public_libelle }, { type: :header_section, libelle: "Details" }] }
-    let(:types_de_champ_private) { [{ type: :header_section, libelle: private_libelle }, { type: :header_section, libelle: "Details Private" }] }
-
-    let(:procedure) { create(:procedure, :for_individual, types_de_champ_public:, types_de_champ_private:) }
-    let(:dossier) { create(:dossier, procedure: procedure) }
-
-    context "with no section having number" do
-      it { expect(dossier.auto_numbering_section_headers_for?(dossier.champs_public[1])).to eq(true) }
-      it { expect(dossier.auto_numbering_section_headers_for?(dossier.champs_private[1])).to eq(true) }
-    end
-
-    context "with public section having number" do
-      let(:public_libelle) { "1 - infos" }
-      it { expect(dossier.auto_numbering_section_headers_for?(dossier.champs_public[1])).to eq(false) }
-      it { expect(dossier.auto_numbering_section_headers_for?(dossier.champs_private[1])).to eq(true) }
-    end
-
-    context "with private section having number" do
-      let(:private_libelle) { "1 - infos private" }
-      it { expect(dossier.auto_numbering_section_headers_for?(dossier.champs_public[1])).to eq(true) }
-      it { expect(dossier.auto_numbering_section_headers_for?(dossier.champs_private[1])).to eq(false) }
-    end
-  end
-
-  describe '#index_for_section_header' do
-    include Logic
-    let(:number_stable_id) { 99 }
-    let(:types_de_champ) {
-  [
-    { type: :header_section, libelle: "Infos" }, { type: :integer_number, stable_id: number_stable_id },
-    { type: :header_section, libelle: "Details", condition: ds_eq(champ_value(99), constant(5)) }, { type: :header_section, libelle: "Conclusion" }
-  ]
-}
-
-    let(:procedure) { create(:procedure, :for_individual, types_de_champ_public: types_de_champ) }
-    let(:dossier) { create(:dossier, procedure: procedure) }
-
-    let(:headers) { dossier.champs_public.select { _1.header_section? } }
-
-    let(:number_value) { nil }
-
-    before do
-      dossier.champs_public.find { _1.stable_id == number_stable_id }.update(value: number_value)
-      dossier.reload
-    end
-
-    context "when there are invisible sections" do
-      it "index accordingly header sections" do
-         expect(dossier.index_for_section_header(headers[0])).to eq(1)
-         expect(headers[1]).not_to be_visible
-         expect(dossier.index_for_section_header(headers[2])).to eq(2)
-       end
-    end
-
-    context "when all headers are visible" do
-      let(:number_value) { 5 }
-      it "index accordingly header sections" do
-        expect(dossier.index_for_section_header(headers[0])).to eq(1)
-        expect(headers[1]).to be_visible
-        expect(dossier.index_for_section_header(headers[1])).to eq(2)
-        expect(dossier.index_for_section_header(headers[2])).to eq(3)
-      end
-    end
-  end
-
   private
 
   def count_for_month(processed_by_month, month)

From 396f545cf2adfcaa502b614b1ad63100f8c210ff Mon Sep 17 00:00:00 2001
From: Colin Darie <colin@darie.eu>
Date: Mon, 27 Feb 2023 18:41:02 +0100
Subject: [PATCH 181/202] fix(comboadress): provide a valid empty response

---
 app/javascript/components/shared/queryClient.ts | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/app/javascript/components/shared/queryClient.ts b/app/javascript/components/shared/queryClient.ts
index e356263c1..af7a90116 100644
--- a/app/javascript/components/shared/queryClient.ts
+++ b/app/javascript/components/shared/queryClient.ts
@@ -75,7 +75,12 @@ const defaultQueryFn: QueryFunction<unknown, QueryKey> = async ({
 
   // BAN will error with queries less then 3 chars long
   if (scope == 'adresse' && term.length < 3) {
-    return [];
+    return {
+      type: 'FeatureCollection',
+      version: 'draft',
+      features: [],
+      query: term
+    };
   }
 
   const url = buildURL(scope, term, extra);

From 2ae2d99e93362d4f5cb89a74e4914776222cd6b6 Mon Sep 17 00:00:00 2001
From: sebastiencarceles <sebastien.carceles@gmail.com>
Date: Tue, 28 Feb 2023 08:36:43 +0100
Subject: [PATCH 182/202] fix communes: all possible values

---
 app/models/types_de_champ/prefill_commune_type_de_champ.rb  | 2 +-
 app/views/prefill_type_de_champs/show.html.haml             | 2 +-
 .../types_de_champ/prefill_commune_type_de_champ_spec.rb    | 6 +++---
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/app/models/types_de_champ/prefill_commune_type_de_champ.rb b/app/models/types_de_champ/prefill_commune_type_de_champ.rb
index 49dbb1a11..03f5acdee 100644
--- a/app/models/types_de_champ/prefill_commune_type_de_champ.rb
+++ b/app/models/types_de_champ/prefill_commune_type_de_champ.rb
@@ -1,5 +1,5 @@
 class TypesDeChamp::PrefillCommuneTypeDeChamp < TypesDeChamp::PrefillTypeDeChamp
-  def possible_values
+  def all_possible_values
     departements.map do |departement|
       "#{departement[:code]} (#{departement[:name]}) : https://geo.api.gouv.fr/communes?codeDepartement=#{departement[:code]}"
     end
diff --git a/app/views/prefill_type_de_champs/show.html.haml b/app/views/prefill_type_de_champs/show.html.haml
index 342cdc7b3..08eb4c6ae 100644
--- a/app/views/prefill_type_de_champs/show.html.haml
+++ b/app/views/prefill_type_de_champs/show.html.haml
@@ -27,7 +27,7 @@
           %td
             .fr-grid-row.fr-grid-row--gutters.fr-py-5w
               - @type_de_champ.all_possible_values.each do |possible_value|
-                .fr-col-lg-3.fr-col-md-4.fr-col-sm-6.fr-col-12
+                .fr-col-md-4.fr-col-sm-6.fr-col-12
                   = possible_value
         %tr
           %th
diff --git a/spec/models/types_de_champ/prefill_commune_type_de_champ_spec.rb b/spec/models/types_de_champ/prefill_commune_type_de_champ_spec.rb
index aeff12e01..3e058d743 100644
--- a/spec/models/types_de_champ/prefill_commune_type_de_champ_spec.rb
+++ b/spec/models/types_de_champ/prefill_commune_type_de_champ_spec.rb
@@ -26,13 +26,13 @@ RSpec.describe TypesDeChamp::PrefillCommuneTypeDeChamp do
     it { is_expected.to be_kind_of(TypesDeChamp::PrefillTypeDeChamp) }
   end
 
-  describe '#possible_values' do
+  describe '#all_possible_values' do
     let(:expected_values) do
       departements.map { |departement| "#{departement[:code]} (#{departement[:name]}) : https://geo.api.gouv.fr/communes?codeDepartement=#{departement[:code]}" }
     end
-    subject(:possible_values) { described_class.new(type_de_champ, procedure.active_revision).possible_values }
+    subject(:all_possible_values) { described_class.new(type_de_champ, procedure.active_revision).all_possible_values }
 
-    it { expect(possible_values).to match(expected_values) }
+    it { expect(all_possible_values).to match(expected_values) }
   end
 
   describe '#example_value' do

From a08bb1bddc5b4e16c15c492018cb97668cff6b62 Mon Sep 17 00:00:00 2001
From: sebastiencarceles <sebastien.carceles@gmail.com>
Date: Tue, 28 Feb 2023 08:37:52 +0100
Subject: [PATCH 183/202] fix epci: all possible values

---
 app/models/types_de_champ/prefill_epci_type_de_champ.rb     | 2 +-
 .../types_de_champ/prefill_epci_type_de_champ_spec.rb       | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/app/models/types_de_champ/prefill_epci_type_de_champ.rb b/app/models/types_de_champ/prefill_epci_type_de_champ.rb
index aae3b1918..f50c2e35b 100644
--- a/app/models/types_de_champ/prefill_epci_type_de_champ.rb
+++ b/app/models/types_de_champ/prefill_epci_type_de_champ.rb
@@ -1,5 +1,5 @@
 class TypesDeChamp::PrefillEpciTypeDeChamp < TypesDeChamp::PrefillTypeDeChamp
-  def possible_values
+  def all_possible_values
     departements.map do |departement|
       "#{departement[:code]} (#{departement[:name]}) : https://geo.api.gouv.fr/epcis?codeDepartement=#{departement[:code]}"
     end
diff --git a/spec/models/types_de_champ/prefill_epci_type_de_champ_spec.rb b/spec/models/types_de_champ/prefill_epci_type_de_champ_spec.rb
index a49c231f3..20432a36a 100644
--- a/spec/models/types_de_champ/prefill_epci_type_de_champ_spec.rb
+++ b/spec/models/types_de_champ/prefill_epci_type_de_champ_spec.rb
@@ -17,11 +17,11 @@ RSpec.describe TypesDeChamp::PrefillEpciTypeDeChamp do
     it { is_expected.to be_kind_of(TypesDeChamp::PrefillTypeDeChamp) }
   end
 
-  describe '#possible_values' do
+  describe '#all_possible_values' do
     let(:expected_values) do
       departements.map { |departement| "#{departement[:code]} (#{departement[:name]}) : https://geo.api.gouv.fr/epcis?codeDepartement=#{departement[:code]}" }
     end
-    subject(:possible_values) { described_class.new(type_de_champ, procedure.active_revision).possible_values }
+    subject(:all_possible_values) { described_class.new(type_de_champ, procedure.active_revision).all_possible_values }
 
     before do
       VCR.insert_cassette('api_geo_departements')
@@ -33,7 +33,7 @@ RSpec.describe TypesDeChamp::PrefillEpciTypeDeChamp do
       VCR.eject_cassette('api_geo_epcis')
     end
 
-    it { expect(possible_values).to match(expected_values) }
+    it { expect(all_possible_values).to match(expected_values) }
   end
 
   describe '#example_value' do

From 7676043ebcc50d4563fa4c3f3ebd9bea600dfaa0 Mon Sep 17 00:00:00 2001
From: kleph <kleph@kleph.eu>
Date: Thu, 23 Feb 2023 18:25:30 +0100
Subject: [PATCH 184/202] chore(env): add ELASTIC_APM_* environment variable to
 env.example.optional file

---
 config/env.example.optional | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/config/env.example.optional b/config/env.example.optional
index 63d32c047..a3f47d43f 100644
--- a/config/env.example.optional
+++ b/config/env.example.optional
@@ -168,3 +168,10 @@ SIB_WEBHOOK_URL=""
 
 # ServicesPublics+ tracking url shown to user when dossier is terminated.
 SERVICES_PUBLICS_PLUS_URL=""
+
+# Elasticsearch APM
+# send application logs to elasticsearch APM component via elastic-apm gem
+# see https://www.elastic.co/guide/en/apm/agent/ruby/current/configuration.html for more configuration options and vars
+ELASTIC_APM_ENABLED=""	# disabled by default, set to "true" to enable
+ELASTIC_APM_SERVER_URL="http://192.168.0.1:8200" # elasticsearch APM endpoint URL
+

From 71f1e785ab712ff7d5d6edf1cff7f3a82f291d0d Mon Sep 17 00:00:00 2001
From: sebastiencarceles <sebastien.carceles@gmail.com>
Date: Mon, 13 Feb 2023 11:10:14 +0100
Subject: [PATCH 185/202] let annuaire education champ be prefillable

---
 app/models/type_de_champ.rb        | 1 +
 spec/models/prefill_params_spec.rb | 4 +++-
 spec/models/type_de_champ_spec.rb  | 2 +-
 3 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/app/models/type_de_champ.rb b/app/models/type_de_champ.rb
index 35da0363d..9fd75e087 100644
--- a/app/models/type_de_champ.rb
+++ b/app/models/type_de_champ.rb
@@ -274,6 +274,7 @@ class TypeDeChamp < ApplicationRecord
       TypeDeChamp.type_champs.fetch(:repetition),
       TypeDeChamp.type_champs.fetch(:multiple_drop_down_list),
       TypeDeChamp.type_champs.fetch(:epci),
+      TypeDeChamp.type_champs.fetch(:annuaire_education),
       TypeDeChamp.type_champs.fetch(:dossier_link),
       TypeDeChamp.type_champs.fetch(:siret),
       TypeDeChamp.type_champs.fetch(:rna)
diff --git a/spec/models/prefill_params_spec.rb b/spec/models/prefill_params_spec.rb
index 12876fd52..872cdb5f0 100644
--- a/spec/models/prefill_params_spec.rb
+++ b/spec/models/prefill_params_spec.rb
@@ -140,6 +140,7 @@ RSpec.describe PrefillParams do
     it_behaves_like "a champ public value that is authorized", :drop_down_list, "value"
     it_behaves_like "a champ public value that is authorized", :departements, "03"
     it_behaves_like "a champ public value that is authorized", :communes, ['01', '01457']
+    it_behaves_like "a champ public value that is authorized", :annuaire_education, "0050009H"
     it_behaves_like "a champ public value that is authorized", :multiple_drop_down_list, ["val1", "val2"]
     it_behaves_like "a champ public value that is authorized", :dossier_link, "1"
     it_behaves_like "a champ public value that is authorized", :epci, ['01', '200042935']
@@ -182,6 +183,7 @@ RSpec.describe PrefillParams do
     it_behaves_like "a champ private value that is authorized", :siret, "13002526500013"
     it_behaves_like "a champ private value that is authorized", :departements, "03"
     it_behaves_like "a champ private value that is authorized", :communes, ['01', '01457']
+    it_behaves_like "a champ private value that is authorized", :annuaire_education, "0050009H"
     it_behaves_like "a champ private value that is authorized", :multiple_drop_down_list, ["val1", "val2"]
     it_behaves_like "a champ private value that is authorized", :dossier_link, "1"
     it_behaves_like "a champ private value that is authorized", :epci, ['01', '200042935']
@@ -223,7 +225,7 @@ RSpec.describe PrefillParams do
     it_behaves_like "a champ public value that is unauthorized", :regions, "value"
     it_behaves_like "a champ public value that is unauthorized", :departements, "value"
     it_behaves_like "a champ public value that is unauthorized", :communes, "value"
-    it_behaves_like "a champ public value that is unauthorized", :annuaire_education, "value"
+    # TODO: SEB validation it_behaves_like "a champ public value that is unauthorized", :annuaire_education, "value"
     it_behaves_like "a champ public value that is unauthorized", :multiple_drop_down_list, ["value"]
 
     context "when the public type de champ is unauthorized because of wrong value format (repetition)" do
diff --git a/spec/models/type_de_champ_spec.rb b/spec/models/type_de_champ_spec.rb
index d8f9a82d5..d6d364759 100644
--- a/spec/models/type_de_champ_spec.rb
+++ b/spec/models/type_de_champ_spec.rb
@@ -253,6 +253,7 @@ describe TypeDeChamp do
     it_behaves_like "a prefillable type de champ", :type_de_champ_checkbox
     it_behaves_like "a prefillable type de champ", :type_de_champ_drop_down_list
     it_behaves_like "a prefillable type de champ", :type_de_champ_repetition
+    it_behaves_like "a prefillable type de champ", :type_de_champ_annuaire_education
     it_behaves_like "a prefillable type de champ", :type_de_champ_multiple_drop_down_list
     it_behaves_like "a prefillable type de champ", :type_de_champ_epci
     it_behaves_like "a prefillable type de champ", :type_de_champ_dossier_link
@@ -271,7 +272,6 @@ describe TypeDeChamp do
     it_behaves_like "a non-prefillable type de champ", :type_de_champ_mesri
     it_behaves_like "a non-prefillable type de champ", :type_de_champ_carte
     it_behaves_like "a non-prefillable type de champ", :type_de_champ_address
-    it_behaves_like "a non-prefillable type de champ", :type_de_champ_annuaire_education
   end
 
   describe '#normalize_libelle' do

From 4f4f4baffdd18b38b68478f75a7b7f841ad30e2e Mon Sep 17 00:00:00 2001
From: sebastiencarceles <sebastien.carceles@gmail.com>
Date: Wed, 15 Feb 2023 10:42:48 +0100
Subject: [PATCH 186/202] add possible and example values

---
 config/locales/en.yml | 4 +++-
 config/locales/fr.yml | 4 +++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/config/locales/en.yml b/config/locales/en.yml
index 936f34209..6b42db237 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -148,7 +148,8 @@ en:
           rna_html: A RNA number
           repetition_html: A array of hashes with possible values for each field of the repetition.
           epci_html: An array of the department code and the <a href="https://geo.api.gouv.fr/epcis" target="_blank" rel="noopener noreferrer">EPCI one</a>.
-          dossier_link_html: The file ID, as integer.
+          annuaire_education_html: An educational institution code, as defined by the <a href="https://api.gouv.fr/les-api/api-annuaire-education" target="_blank" rel="noopener noreferrer">Éducation Nationale</a> directory
+          dossier_link_html: The file ID, as integer
         examples:
           title: Example
           text: Short text
@@ -165,6 +166,7 @@ en:
           date: "2023-02-01"
           datetime: "2023-02-01T10:30"
           checkbox: "true"
+          annuaire_education: "0561383Z"
           dossier_link: 42
           rna: "W503726238"
           siret: "13002526500013"
diff --git a/config/locales/fr.yml b/config/locales/fr.yml
index 218632afc..f333df668 100644
--- a/config/locales/fr.yml
+++ b/config/locales/fr.yml
@@ -139,7 +139,8 @@ fr:
           siret_html: Un numéro de SIRET
           repetition_html: Un tableau de dictionnaires avec les valeurs possibles pour chaque champ de la répétition.
           epci_html: Un tableau contenant le code de département et <a href="https://geo.api.gouv.fr/epcis" target="_blank" rel="noopener noreferrer">celui de l'EPCI</a>.
-          dossier_link_html: L'identifiant du dossier, sous forme de nombre entier.
+          annuaire_education_html: Un code d'établissement scolaire, tel que défini par <a href="https://api.gouv.fr/les-api/api-annuaire-education" target="_blank" rel="noopener noreferrer">l'Annuaire de l'Éducation Nationale</a>
+          dossier_link_html: L'identifiant du dossier, sous forme de nombre entier
         examples:
           title: Exemple
           text: Texte court
@@ -157,6 +158,7 @@ fr:
           date: "2023-02-01"
           datetime: "2023-02-01T10:30"
           checkbox: "true"
+          annuaire_education: "0561383Z"
           dossier_link: 42
           rna: "W503726238"
           siret: "13002526500013"

From c339f609c07d4be2299211cab43ac04ad71b3925 Mon Sep 17 00:00:00 2001
From: Paul Chavard <pro@paul.chavard.net>
Date: Tue, 28 Feb 2023 14:05:11 +0100
Subject: [PATCH 187/202] fix(demarches): improuve turbo refresh on demarches
 page

---
 .../controllers/turbo_controller.ts           | 20 +++++++++++++++----
 .../procedures/administrateurs.html.haml      |  6 +++---
 .../administrateurs/procedures/all.html.haml  |  6 +++---
 app/views/layouts/all.html.haml               |  8 ++++----
 4 files changed, 26 insertions(+), 14 deletions(-)

diff --git a/app/javascript/controllers/turbo_controller.ts b/app/javascript/controllers/turbo_controller.ts
index bfd1b0027..1c55528b2 100644
--- a/app/javascript/controllers/turbo_controller.ts
+++ b/app/javascript/controllers/turbo_controller.ts
@@ -9,6 +9,10 @@ type StreamRenderEvent = CustomEvent<{
   render(streamElement: StreamElement): void;
 }>;
 
+type FrameRenderEvent = CustomEvent<{
+  render(currentElement: Element, newElement: Element): void;
+}>;
+
 export class TurboController extends ApplicationController {
   static targets = ['spinner'];
 
@@ -29,7 +33,7 @@ export class TurboController extends ApplicationController {
 
   connect() {
     this.#actions = new Actions({
-      element: document.documentElement,
+      element: document.body,
       schema: { forceAttribute: 'data-turbo-force', hiddenClassName: 'hidden' },
       debug: false
     });
@@ -46,14 +50,22 @@ export class TurboController extends ApplicationController {
     // prevent scroll on turbo form submits
     this.onGlobal('turbo:render', () => this.preventScrollIfNeeded());
 
-    // reset state preserved for actions between pages
-    this.onGlobal('turbo:load', () => this.actions.reset());
-
     // see: https://turbo.hotwired.dev/handbook/streams#custom-actions
     this.onGlobal('turbo:before-stream-render', (event: StreamRenderEvent) => {
       event.detail.render = (streamElement: StreamElement) =>
         this.actions.applyActions([parseTurboStream(streamElement)]);
     });
+
+    // see: https://turbo.hotwired.dev/handbook/frames#custom-rendering
+    this.onGlobal('turbo:before-frame-render', (event: FrameRenderEvent) => {
+      event.detail.render = (currentElement, newElement) => {
+        // There is a bug in morphdom when it comes to mutate a custom element. It will miserably
+        // crash. We mutate its content instead.
+        const fragment = document.createDocumentFragment();
+        fragment.append(...newElement.childNodes);
+        this.actions.update({ targets: [currentElement], fragment });
+      };
+    });
   }
 
   private startSpinner() {
diff --git a/app/views/administrateurs/procedures/administrateurs.html.haml b/app/views/administrateurs/procedures/administrateurs.html.haml
index c3051c65a..de7daa525 100644
--- a/app/views/administrateurs/procedures/administrateurs.html.haml
+++ b/app/views/administrateurs/procedures/administrateurs.html.haml
@@ -2,13 +2,13 @@
   .main-filter-header.fr-my-3w
     = form_with(url: administrateurs_admin_procedures_path, method: :get, data: { turbo_frame: 'procedures' }, html: { role: 'search' }) do |f|
       - @filter.zone_ids&.each do |zone_id|
-        = hidden_field_tag 'zone_ids[]', zone_id
+        = hidden_field_tag 'zone_ids[]', zone_id, id: "zone_#{zone_id}"
       - @filter.statuses&.each do |status|
-        = hidden_field_tag 'statuses[]', status
+        = hidden_field_tag 'statuses[]', status, id: "status_#{status}"
       = hidden_field_tag 'from_publication_date', @filter.from_publication_date if @filter.from_publication_date.present?
 
       = f.label 'email', 'Recercher des administrateurs par email', class: 'fr-label'
-      = f.search_field 'email', size: 40, class: 'fr-input'
+      = f.search_field 'email', size: 40, class: 'fr-input', data: { turbo_force: true }
     .actions= link_to 'Voir la liste des démarches', all_admin_procedures_path(@filter.params), class: 'fr-btn fr-btn--secondary'
   .fr-table.fr-table--bordered
     %table#all-admins
diff --git a/app/views/administrateurs/procedures/all.html.haml b/app/views/administrateurs/procedures/all.html.haml
index b8049b05e..5552cf704 100644
--- a/app/views/administrateurs/procedures/all.html.haml
+++ b/app/views/administrateurs/procedures/all.html.haml
@@ -2,13 +2,13 @@
   .main-filter-header.fr-my-3w
     = form_with(url: all_admin_procedures_path, method: :get, data: { turbo_frame: 'procedures' }, html: { role: 'search', class: 'search' }) do |f|
       - @filter.zone_ids&.each do |zone_id|
-        = hidden_field_tag 'zone_ids[]', zone_id
+        = hidden_field_tag 'zone_ids[]', zone_id, id: "zone_#{zone_id}"
       - @filter.statuses&.each do |status|
-        = hidden_field_tag 'statuses[]', status
+        = hidden_field_tag 'statuses[]', status, id: "status_#{status}"
       = hidden_field_tag 'from_publication_date', @filter.from_publication_date if @filter.from_publication_date.present?
 
       = f.label :libelle, 'Rechercher des démarches par libellé', class: 'fr-label'
-      = f.search_field 'libelle', size: 30, class: 'fr-input'
+      = f.search_field 'libelle', size: 30, class: 'fr-input', data: { turbo_force: true }
     .actions
       .link.fr-mx-1w= link_to 'Voir les administrateurs', administrateurs_admin_procedures_path(@filter.params), class: 'fr-btn fr-btn--secondary'
       .link.fr-mx-1w{ "data-turbo": "false" }= link_to 'Exporter les résultats', all_admin_procedures_path(@filter.params.merge(format: :xlsx)), class: 'fr-btn fr-btn--secondary'
diff --git a/app/views/layouts/all.html.haml b/app/views/layouts/all.html.haml
index 7a752fa19..1bc899b74 100644
--- a/app/views/layouts/all.html.haml
+++ b/app/views/layouts/all.html.haml
@@ -10,7 +10,7 @@
             %p Ce tableau de bord permet de consulter les informations sur les démarches simplifiées pour toutes les zones. Filtrez par zone et statut. Consultez la liste des démarches et cliquez sur une démarche pour voir la zone et quels sont les administrateurs.
 
     .fr-container--fluid{ data: { turbo: 'true' } }
-      .fr-grid-row.fr-grid-row--gutters
+      %turbo-frame#procedures.fr-grid-row.fr-grid-row--gutters{ 'data-turbo-action': 'advance' }
         .fr-col-3
           = form_with(url: all_admin_procedures_path, method: :get, data: { controller: 'autosubmit', turbo_frame: 'procedures' }) do |f|
 
@@ -20,7 +20,7 @@
                   %span.fr-icon-filter-fill.fr-icon--sm.fr-mr-1w{ 'aria-hidden': 'true' }
                   Filtrer
                 .reinit
-                  = link_to all_admin_procedures_path(zone_ids: current_administrateur.zones) do
+                  = link_to all_admin_procedures_path(zone_ids: current_administrateur.zones), { data: { turbo: 'false' } } do
                     %span.fr-icon-arrow-go-back-line Réinitialiser
               %ul
                 %li.fr-py-2w.fr-pl-2w{ 'data-controller': "expand" }
@@ -71,11 +71,11 @@
                       Tags
                   .fr-ml-1w.hidden{ 'data-expand-target': 'content' }
                     %div
-                      = f.search_field :tag, placeholder: 'Choisissez un tag', list: 'tags_list', class: 'fr-input', data: { no_autosubmit: 'input' }
+                      = f.search_field :tag, placeholder: 'Choisissez un tag', list: 'tags_list', class: 'fr-input', data: { no_autosubmit: 'input', turbo_force: true }
                       %datalist#tags_list
                         - Procedure.tags.each do |tag|
                           %option{ value: tag }
 
-        %turbo-frame#procedures.fr-col-9{ 'data-turbo-action': 'advance' }
+        .fr-col-9
           = yield(:results)
 = render template: 'layouts/application'

From d7bfb9dc181130fb506de1193f0874a9cb301268 Mon Sep 17 00:00:00 2001
From: sebastiencarceles <sebastien.carceles@gmail.com>
Date: Wed, 15 Feb 2023 15:25:15 +0100
Subject: [PATCH 188/202] enrich value from education api

---
 ...refill_annuaire_education_type_de_champ.rb | 16 ++++++
 .../types_de_champ/prefill_type_de_champ.rb   |  2 +
 .../annuaire_education_empty.json             | 14 +++++
 .../annuaire_education_adapter_spec.rb        |  9 +++
 ...l_annuaire_education_type_de_champ_spec.rb | 56 +++++++++++++++++++
 .../prefill_type_de_champ_spec.rb             |  6 ++
 6 files changed, 103 insertions(+)
 create mode 100644 app/models/types_de_champ/prefill_annuaire_education_type_de_champ.rb
 create mode 100644 spec/fixtures/files/api_education/annuaire_education_empty.json
 create mode 100644 spec/models/types_de_champ/prefill_annuaire_education_type_de_champ_spec.rb

diff --git a/app/models/types_de_champ/prefill_annuaire_education_type_de_champ.rb b/app/models/types_de_champ/prefill_annuaire_education_type_de_champ.rb
new file mode 100644
index 000000000..afd256e05
--- /dev/null
+++ b/app/models/types_de_champ/prefill_annuaire_education_type_de_champ.rb
@@ -0,0 +1,16 @@
+# frozen_string_literal: true
+
+class TypesDeChamp::PrefillAnnuaireEducationTypeDeChamp < TypesDeChamp::PrefillTypeDeChamp
+  def to_assignable_attributes(champ, value)
+    return nil if value.blank?
+    return nil unless (data = APIEducation::AnnuaireEducationAdapter.new(value.presence).to_params)
+
+    {
+      id: champ.id,
+      external_id: data['identifiant_de_l_etablissement'],
+      value: "#{data['nom_etablissement']}, #{data['nom_commune']} (#{data['identifiant_de_l_etablissement']})"
+    }
+  rescue APIEducation::AnnuaireEducationAdapter::InvalidSchemaError
+    nil
+  end
+end
diff --git a/app/models/types_de_champ/prefill_type_de_champ.rb b/app/models/types_de_champ/prefill_type_de_champ.rb
index 34dee1206..0dbadbb3c 100644
--- a/app/models/types_de_champ/prefill_type_de_champ.rb
+++ b/app/models/types_de_champ/prefill_type_de_champ.rb
@@ -27,6 +27,8 @@ class TypesDeChamp::PrefillTypeDeChamp < SimpleDelegator
       TypesDeChamp::PrefillCommuneTypeDeChamp.new(type_de_champ, revision)
     when TypeDeChamp.type_champs.fetch(:epci)
       TypesDeChamp::PrefillEpciTypeDeChamp.new(type_de_champ, revision)
+    when TypeDeChamp.type_champs.fetch(:annuaire_education)
+      TypesDeChamp::PrefillAnnuaireEducationTypeDeChamp.new(type_de_champ, revision)
     else
       new(type_de_champ, revision)
     end
diff --git a/spec/fixtures/files/api_education/annuaire_education_empty.json b/spec/fixtures/files/api_education/annuaire_education_empty.json
new file mode 100644
index 000000000..34e44e091
--- /dev/null
+++ b/spec/fixtures/files/api_education/annuaire_education_empty.json
@@ -0,0 +1,14 @@
+{
+  "nhits": 0,
+  "parameters": {
+    "dataset": "fr-en-annuaire-education",
+    "rows": 1,
+    "start": 0,
+    "refine": {
+      "identifiant_de_l_etablissement": "0341247"
+    },
+    "format": "json",
+    "timezone": "UTC"
+  },
+  "records": []
+}
diff --git a/spec/lib/api_education/annuaire_education_adapter_spec.rb b/spec/lib/api_education/annuaire_education_adapter_spec.rb
index 2b29c9b7e..eff7bd789 100644
--- a/spec/lib/api_education/annuaire_education_adapter_spec.rb
+++ b/spec/lib/api_education/annuaire_education_adapter_spec.rb
@@ -38,4 +38,13 @@ describe APIEducation::AnnuaireEducationAdapter do
       expect { subject }.to raise_exception(APIEducation::AnnuaireEducationAdapter::InvalidSchemaError)
     end
   end
+
+  context "when responds with empty schema" do
+    let(:body) { File.read('spec/fixtures/files/api_education/annuaire_education_empty.json') }
+    let(:status) { 200 }
+
+    it '#to_params returns nil' do
+      expect(subject).to eq(nil)
+    end
+  end
 end
diff --git a/spec/models/types_de_champ/prefill_annuaire_education_type_de_champ_spec.rb b/spec/models/types_de_champ/prefill_annuaire_education_type_de_champ_spec.rb
new file mode 100644
index 000000000..e7bba2828
--- /dev/null
+++ b/spec/models/types_de_champ/prefill_annuaire_education_type_de_champ_spec.rb
@@ -0,0 +1,56 @@
+# frozen_string_literal: true
+
+RSpec.describe TypesDeChamp::PrefillAnnuaireEducationTypeDeChamp do
+  let(:procedure) { create(:procedure) }
+  let(:type_de_champ) { build(:type_de_champ_annuaire_education, procedure: procedure) }
+
+  describe 'ancestors' do
+    subject { described_class.new(type_de_champ, procedure.active_revision) }
+
+    it { is_expected.to be_kind_of(TypesDeChamp::PrefillTypeDeChamp) }
+  end
+
+  describe '#to_assignable_attributes' do
+    let(:champ) { create(:champ_annuaire_education, type_de_champ: type_de_champ) }
+    subject { described_class.build(type_de_champ, procedure.active_revision).to_assignable_attributes(champ, value) }
+
+    context 'when the value is nil' do
+      let(:value) { nil }
+
+      it { is_expected.to eq(nil) }
+    end
+
+    context 'when the value is empty' do
+      let(:value) { '' }
+
+      it { is_expected.to eq(nil) }
+    end
+
+    context 'when the value is present' do
+      let(:value) { '0050009H' }
+
+      before do
+        stub_request(:get, /https:\/\/data.education.gouv.fr\/api\/records\/1.0/)
+          .to_return(body: body, status: 200)
+      end
+
+      context 'when the annuaire education api responds with a valid schema' do
+        let(:body) { File.read('spec/fixtures/files/api_education/annuaire_education.json') }
+
+        it { is_expected.to match({ id: champ.id, external_id: '0050009H', value: 'Lycée professionnel Sévigné, Gap (0050009H)' }) }
+      end
+
+      context "when the annuaire education api responds with invalid schema" do
+        let(:body) { File.read('spec/fixtures/files/api_education/annuaire_education_invalid.json') }
+
+        it { is_expected.to eq(nil) }
+      end
+
+      context 'when the annuaire education api responds with empty schema' do
+        let(:body) { File.read('spec/fixtures/files/api_education/annuaire_education_empty.json') }
+
+        it { is_expected.to eq(nil) }
+      end
+    end
+  end
+end
diff --git a/spec/models/types_de_champ/prefill_type_de_champ_spec.rb b/spec/models/types_de_champ/prefill_type_de_champ_spec.rb
index 844115889..1d8e135e5 100644
--- a/spec/models/types_de_champ/prefill_type_de_champ_spec.rb
+++ b/spec/models/types_de_champ/prefill_type_de_champ_spec.rb
@@ -57,6 +57,12 @@ RSpec.describe TypesDeChamp::PrefillTypeDeChamp, type: :model do
       it { expect(built).to be_kind_of(TypesDeChamp::PrefillEpciTypeDeChamp) }
     end
 
+    context 'when the type de champ is an annuaire_education' do
+      let(:type_de_champ) { build(:type_de_champ_annuaire_education) }
+
+      it { expect(built).to be_kind_of(TypesDeChamp::PrefillAnnuaireEducationTypeDeChamp) }
+    end
+
     context 'when any other type de champ' do
       let(:type_de_champ) { build(:type_de_champ_date, procedure: procedure) }
 

From 447ea1b9a8c9df174c73c78e02ca75109f9a5b19 Mon Sep 17 00:00:00 2001
From: sebastiencarceles <sebastien.carceles@gmail.com>
Date: Thu, 16 Feb 2023 14:11:36 +0100
Subject: [PATCH 189/202] don't prefill with an incorrect value

---
 spec/models/prefill_params_spec.rb | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/spec/models/prefill_params_spec.rb b/spec/models/prefill_params_spec.rb
index 872cdb5f0..4764a1255 100644
--- a/spec/models/prefill_params_spec.rb
+++ b/spec/models/prefill_params_spec.rb
@@ -6,6 +6,7 @@ RSpec.describe PrefillParams do
     let(:dossier) { create(:dossier, :brouillon, procedure: procedure) }
     let(:types_de_champ_public) { [] }
     let(:types_de_champ_private) { [] }
+    let(:api_annuaire_education_body) { File.read('spec/fixtures/files/api_education/annuaire_education.json') }
 
     subject(:prefill_params_array) { described_class.new(dossier, params).to_a }
 
@@ -17,6 +18,11 @@ RSpec.describe PrefillParams do
       VCR.insert_cassette('api_geo_departements')
       VCR.insert_cassette('api_geo_communes')
       VCR.insert_cassette('api_geo_epcis')
+
+      stub_request(:get, /https:\/\/data.education.gouv.fr\/api\/records\/1.0/).to_return(
+        body: api_annuaire_education_body,
+        status: 200
+      )
     end
 
     after do
@@ -225,7 +231,6 @@ RSpec.describe PrefillParams do
     it_behaves_like "a champ public value that is unauthorized", :regions, "value"
     it_behaves_like "a champ public value that is unauthorized", :departements, "value"
     it_behaves_like "a champ public value that is unauthorized", :communes, "value"
-    # TODO: SEB validation it_behaves_like "a champ public value that is unauthorized", :annuaire_education, "value"
     it_behaves_like "a champ public value that is unauthorized", :multiple_drop_down_list, ["value"]
 
     context "when the public type de champ is unauthorized because of wrong value format (repetition)" do
@@ -251,6 +256,12 @@ RSpec.describe PrefillParams do
         expect(prefill_params_array).to match([])
       end
     end
+
+    context "when the annuaire education can't find the school for the given value" do
+      let(:api_annuaire_education_body) { File.read('spec/fixtures/files/api_education/annuaire_education_empty.json') }
+
+      it_behaves_like "a champ public value that is unauthorized", :annuaire_education, "value"
+    end
   end
 
   private

From 8b25503f7e0109e9b6f1949ff6b45f59fad35531 Mon Sep 17 00:00:00 2001
From: sebastiencarceles <sebastien.carceles@gmail.com>
Date: Thu, 16 Feb 2023 14:26:05 +0100
Subject: [PATCH 190/202] feature spec cover

---
 spec/support/shared_examples_for_prefilled_dossier.rb | 1 +
 spec/system/users/dossier_prefill_get_spec.rb         | 8 +++++++-
 spec/system/users/dossier_prefill_post_spec.rb        | 8 +++++++-
 3 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/spec/support/shared_examples_for_prefilled_dossier.rb b/spec/support/shared_examples_for_prefilled_dossier.rb
index 3a85cac6f..a13538e4c 100644
--- a/spec/support/shared_examples_for_prefilled_dossier.rb
+++ b/spec/support/shared_examples_for_prefilled_dossier.rb
@@ -26,5 +26,6 @@ shared_examples "the user has got a prefilled dossier, owned by themselves" do
     expect(page).to have_field(type_de_champ_epci.libelle, with: epci_value.last)
     expect(page).to have_field(type_de_champ_dossier_link.libelle, with: dossier_link_value)
     expect(page).to have_selector("input[value='Vonnas (01540)']")
+    expect(page).to have_content(annuaire_education_value.last)
   end
 end
diff --git a/spec/system/users/dossier_prefill_get_spec.rb b/spec/system/users/dossier_prefill_get_spec.rb
index 9dbd69b46..3fe04c9f0 100644
--- a/spec/system/users/dossier_prefill_get_spec.rb
+++ b/spec/system/users/dossier_prefill_get_spec.rb
@@ -13,6 +13,7 @@ describe 'Prefilling a dossier (with a GET request):', js: true do
   let(:type_de_champ_datetime) { create(:type_de_champ_datetime, procedure: procedure) }
   let(:type_de_champ_multiple_drop_down_list) { create(:type_de_champ_multiple_drop_down_list, procedure: procedure) }
   let(:type_de_champ_epci) { create(:type_de_champ_epci, procedure: procedure) }
+  let(:type_de_champ_annuaire_education) { create(:type_de_champ_annuaire_education, procedure: procedure) }
   let(:type_de_champ_dossier_link) { create(:type_de_champ_dossier_link, procedure: procedure) }
   let(:type_de_champ_commune) { create(:type_de_champ_communes, procedure: procedure) }
   let(:type_de_champ_repetition) { create(:type_de_champ_repetition, :with_types_de_champ, procedure: procedure) }
@@ -36,6 +37,7 @@ describe 'Prefilling a dossier (with a GET request):', js: true do
   let(:integer_repetition_libelle) { sub_type_de_champs_repetition.second.libelle }
   let(:text_repetition_value) { "First repetition text" }
   let(:integer_repetition_value) { "42" }
+  let(:annuaire_education_value) { '0050009H' }
 
   let(:entry_path) {
     commencer_path(
@@ -54,7 +56,8 @@ describe 'Prefilling a dossier (with a GET request):', js: true do
           "champ_#{sub_type_de_champs_repetition.first.to_typed_id_for_query}": text_repetition_value,
           "champ_#{sub_type_de_champs_repetition.second.to_typed_id_for_query}": integer_repetition_value
         }
-      ]
+      ],
+      "champ_#{type_de_champ_annuaire_education.to_typed_id_for_query}" => annuaire_education_value
     )
   }
 
@@ -71,6 +74,9 @@ describe 'Prefilling a dossier (with a GET request):', js: true do
     stub_request(:get, /https:\/\/entreprise.api.gouv.fr\/v2\/associations\//)
       .to_return(status: 200, body: File.read('spec/fixtures/files/api_entreprise/associations.json'))
 
+    stub_request(:get, /https:\/\/data.education.gouv.fr\/api\/records\/1.0/)
+      .to_return(status: 200, body: File.read('spec/fixtures/files/api_education/annuaire_education.json'))
+
     VCR.insert_cassette('api_geo_departements')
     VCR.insert_cassette('api_geo_communes')
     VCR.insert_cassette('api_geo_epcis')
diff --git a/spec/system/users/dossier_prefill_post_spec.rb b/spec/system/users/dossier_prefill_post_spec.rb
index b9e3d6a9c..9c2c21d1e 100644
--- a/spec/system/users/dossier_prefill_post_spec.rb
+++ b/spec/system/users/dossier_prefill_post_spec.rb
@@ -13,6 +13,7 @@ describe 'Prefilling a dossier (with a POST request):', js: true do
   let(:type_de_champ_datetime) { create(:type_de_champ_datetime, procedure: procedure) }
   let(:type_de_champ_multiple_drop_down_list) { create(:type_de_champ_multiple_drop_down_list, procedure: procedure) }
   let(:type_de_champ_epci) { create(:type_de_champ_epci, procedure: procedure) }
+  let(:type_de_champ_annuaire_education) { create(:type_de_champ_annuaire_education, procedure: procedure) }
   let(:type_de_champ_dossier_link) { create(:type_de_champ_dossier_link, procedure: procedure) }
   let(:type_de_champ_repetition) { create(:type_de_champ_repetition, :with_types_de_champ, procedure: procedure) }
   let(:type_de_champ_commune) { create(:type_de_champ_communes, procedure: procedure) }
@@ -36,6 +37,7 @@ describe 'Prefilling a dossier (with a POST request):', js: true do
   let(:text_repetition_value) { "First repetition text" }
   let(:integer_repetition_value) { "42" }
   let(:dossier_link_value) { '42' }
+  let(:annuaire_education_value) { '0050009H' }
 
   before do
     allow(Rails).to receive(:cache).and_return(memory_store)
@@ -50,6 +52,9 @@ describe 'Prefilling a dossier (with a POST request):', js: true do
     stub_request(:get, /https:\/\/entreprise.api.gouv.fr\/v2\/associations\//)
       .to_return(status: 200, body: File.read('spec/fixtures/files/api_entreprise/associations.json'))
 
+    stub_request(:get, /https:\/\/data.education.gouv.fr\/api\/records\/1.0/)
+      .to_return(status: 200, body: File.read('spec/fixtures/files/api_education/annuaire_education.json'))
+
     VCR.insert_cassette('api_geo_departements')
     VCR.insert_cassette('api_geo_communes')
     VCR.insert_cassette('api_geo_epcis')
@@ -160,7 +165,8 @@ describe 'Prefilling a dossier (with a POST request):', js: true do
         "champ_#{type_de_champ_multiple_drop_down_list.to_typed_id_for_query}" => multiple_drop_down_list_values,
         "champ_#{type_de_champ_epci.to_typed_id_for_query}" => epci_value,
         "champ_#{type_de_champ_dossier_link.to_typed_id_for_query}" => dossier_link_value,
-        "champ_#{type_de_champ_commune.to_typed_id_for_query}" => commune_value
+        "champ_#{type_de_champ_commune.to_typed_id_for_query}" => commune_value,
+        "champ_#{type_de_champ_annuaire_education.to_typed_id_for_query}" => annuaire_education_value
       }.to_json
     JSON.parse(session.response.body)["dossier_url"].gsub("http://www.example.com", "")
   end

From f52554b5a3f7ee2fb96e29e15a2a0c8f98312267 Mon Sep 17 00:00:00 2001
From: sebastiencarceles <sebastien.carceles@gmail.com>
Date: Tue, 28 Feb 2023 13:55:52 +0100
Subject: [PATCH 191/202] review: update value with async fetch

1 - spec cover the job which fetches external data

2 - refactor the job with guard clauses

3 - delegate update operation to the champ itself

4 - annuaire education: override the update operation
to let the value be populated by the fetched data

5 - prefilling: don't fetch data synchronously
---
 app/jobs/champ_fetch_external_data_job.rb     | 10 ++--
 app/models/champ.rb                           |  4 ++
 app/models/champs/annuaire_education_champ.rb | 11 ++++
 ...refill_annuaire_education_type_de_champ.rb |  7 +--
 .../champ_fetch_external_data_job_spec.rb     | 55 +++++++++++++++++++
 spec/models/champ_spec.rb                     |  8 +++
 .../champs/annuaire_education_champ_spec.rb   | 42 ++++++++++++++
 spec/models/prefill_params_spec.rb            | 12 ----
 ...l_annuaire_education_type_de_champ_spec.rb | 26 +--------
 spec/system/users/dossier_prefill_get_spec.rb |  3 -
 .../system/users/dossier_prefill_post_spec.rb |  3 -
 11 files changed, 127 insertions(+), 54 deletions(-)
 create mode 100644 spec/jobs/champ_fetch_external_data_job_spec.rb
 create mode 100644 spec/models/champs/annuaire_education_champ_spec.rb

diff --git a/app/jobs/champ_fetch_external_data_job.rb b/app/jobs/champ_fetch_external_data_job.rb
index 366586dda..790052863 100644
--- a/app/jobs/champ_fetch_external_data_job.rb
+++ b/app/jobs/champ_fetch_external_data_job.rb
@@ -1,11 +1,9 @@
 class ChampFetchExternalDataJob < ApplicationJob
   def perform(champ, external_id)
-    if champ.external_id == external_id && champ.data.nil?
-      data = champ.fetch_external_data
+    return if champ.external_id != external_id
+    return if champ.data.present?
+    return if (data = champ.fetch_external_data).blank?
 
-      if data.present?
-        champ.update!(data: data)
-      end
-    end
+    champ.update_with_external_data!(data: data)
   end
 end
diff --git a/app/models/champ.rb b/app/models/champ.rb
index c82a3db8f..cadb9e395 100644
--- a/app/models/champ.rb
+++ b/app/models/champ.rb
@@ -217,6 +217,10 @@ class Champ < ApplicationRecord
     raise NotImplemented.new(:fetch_external_data)
   end
 
+  def update_with_external_data!(data:)
+    update!(data: data)
+  end
+
   def clone
     champ_attributes = [:parent_id, :private, :row_id, :type, :type_de_champ_id]
     value_attributes = private? ? [] : [:value, :value_json, :data, :external_id]
diff --git a/app/models/champs/annuaire_education_champ.rb b/app/models/champs/annuaire_education_champ.rb
index ffd064d1f..46a3ee389 100644
--- a/app/models/champs/annuaire_education_champ.rb
+++ b/app/models/champs/annuaire_education_champ.rb
@@ -28,4 +28,15 @@ class Champs::AnnuaireEducationChamp < Champs::TextChamp
   def fetch_external_data
     APIEducation::AnnuaireEducationAdapter.new(external_id).to_params
   end
+
+  def update_with_external_data!(data:)
+    if data&.is_a?(Hash) && data['nom_etablissement'].present? && data['nom_commune'].present? && data['identifiant_de_l_etablissement'].present?
+      update!(
+        data: data,
+        value: "#{data['nom_etablissement']}, #{data['nom_commune']} (#{data['identifiant_de_l_etablissement']})"
+      )
+    else
+      update!(data: data)
+    end
+  end
 end
diff --git a/app/models/types_de_champ/prefill_annuaire_education_type_de_champ.rb b/app/models/types_de_champ/prefill_annuaire_education_type_de_champ.rb
index afd256e05..7790458d9 100644
--- a/app/models/types_de_champ/prefill_annuaire_education_type_de_champ.rb
+++ b/app/models/types_de_champ/prefill_annuaire_education_type_de_champ.rb
@@ -3,14 +3,11 @@
 class TypesDeChamp::PrefillAnnuaireEducationTypeDeChamp < TypesDeChamp::PrefillTypeDeChamp
   def to_assignable_attributes(champ, value)
     return nil if value.blank?
-    return nil unless (data = APIEducation::AnnuaireEducationAdapter.new(value.presence).to_params)
 
     {
       id: champ.id,
-      external_id: data['identifiant_de_l_etablissement'],
-      value: "#{data['nom_etablissement']}, #{data['nom_commune']} (#{data['identifiant_de_l_etablissement']})"
+      external_id: value,
+      value: value
     }
-  rescue APIEducation::AnnuaireEducationAdapter::InvalidSchemaError
-    nil
   end
 end
diff --git a/spec/jobs/champ_fetch_external_data_job_spec.rb b/spec/jobs/champ_fetch_external_data_job_spec.rb
new file mode 100644
index 000000000..6f5277727
--- /dev/null
+++ b/spec/jobs/champ_fetch_external_data_job_spec.rb
@@ -0,0 +1,55 @@
+# frozen_string_literal: true
+
+require 'rails_helper'
+
+RSpec.describe ChampFetchExternalDataJob, type: :job do
+  let(:champ) { Struct.new(:external_id, :data).new(champ_external_id, data) }
+  let(:external_id) { "an ID" }
+  let(:champ_external_id) { "an ID" }
+  let(:data) { nil }
+  let(:fetched_data) { nil }
+
+  subject(:perform_job) { described_class.perform_now(champ, external_id) }
+
+  before do
+    allow(champ).to receive(:fetch_external_data).and_return(fetched_data)
+    allow(champ).to receive(:update_with_external_data!)
+  end
+
+  shared_examples "a champ non-updater" do
+    it 'does not update the champ' do
+      perform_job
+      expect(champ).not_to have_received(:update_with_external_data!)
+    end
+  end
+
+  context 'when external_id matches the champ external_id and the champ data is nil' do
+    it 'fetches external data' do
+      perform_job
+      expect(champ).to have_received(:fetch_external_data)
+    end
+
+    context 'when the fetched data is present' do
+      let(:fetched_data) { "data" }
+
+      it 'updates the champ' do
+        perform_job
+        expect(champ).to have_received(:update_with_external_data!).with(data: fetched_data)
+      end
+    end
+
+    context 'when the fetched data is blank' do
+      it_behaves_like "a champ non-updater"
+    end
+  end
+
+  context 'when external_id does not match the champ external_id' do
+    let(:champ_external_id) { "something else" }
+    it_behaves_like "a champ non-updater"
+  end
+
+  context 'when the champ data is present' do
+    let(:data) { "present" }
+    it_behaves_like "a champ non-updater"
+  end
+end
diff --git a/spec/models/champ_spec.rb b/spec/models/champ_spec.rb
index 2d63881f7..e20c55417 100644
--- a/spec/models/champ_spec.rb
+++ b/spec/models/champ_spec.rb
@@ -602,4 +602,12 @@ describe Champ do
       end
     end
   end
+
+  describe '#update_with_external_data!' do
+    let(:champ) { create(:champ_siret) }
+    let(:data) { "data" }
+    subject { champ.update_with_external_data!(data: data) }
+
+    it { expect { subject }.to change { champ.reload.data }.to(data) }
+  end
 end
diff --git a/spec/models/champs/annuaire_education_champ_spec.rb b/spec/models/champs/annuaire_education_champ_spec.rb
new file mode 100644
index 000000000..8c8f58be5
--- /dev/null
+++ b/spec/models/champs/annuaire_education_champ_spec.rb
@@ -0,0 +1,42 @@
+# frozen_string_literal: true
+
+require 'rails_helper'
+
+RSpec.describe Champs::AnnuaireEducationChamp do
+  describe '#update_with_external_data!' do
+    let(:champ) { create(:champ_annuaire_education, data: "any data") }
+    subject { champ.update_with_external_data!(data: data) }
+
+    shared_examples "a data updater (without updating the value)" do |data|
+      it { expect { subject }.to change { champ.reload.data }.to(data) }
+      it { expect { subject }.not_to change { champ.reload.value } }
+    end
+
+    context 'when data is nil' do
+      let(:data) { nil }
+      it_behaves_like "a data updater (without updating the value)", nil
+    end
+
+    context 'when data is empty' do
+      let(:data) { '' }
+      it_behaves_like "a data updater (without updating the value)", ''
+    end
+
+    context 'when data is inconsistent' do
+      let(:data) { { 'yo' => 'lo' } }
+      it_behaves_like "a data updater (without updating the value)", { 'yo' => 'lo' }
+    end
+
+    context 'when data is consistent' do
+      let(:data) {
+        {
+          'nom_etablissement': "karrigel an ankou",
+          'nom_commune' => 'kumun',
+          'identifiant_de_l_etablissement' => '666667'
+        }.with_indifferent_access
+      }
+      it { expect { subject }.to change { champ.reload.data }.to(data) }
+      it { expect { subject }.to change { champ.reload.value }.to('karrigel an ankou, kumun (666667)') }
+    end
+  end
+end
diff --git a/spec/models/prefill_params_spec.rb b/spec/models/prefill_params_spec.rb
index 4764a1255..ccea47657 100644
--- a/spec/models/prefill_params_spec.rb
+++ b/spec/models/prefill_params_spec.rb
@@ -6,7 +6,6 @@ RSpec.describe PrefillParams do
     let(:dossier) { create(:dossier, :brouillon, procedure: procedure) }
     let(:types_de_champ_public) { [] }
     let(:types_de_champ_private) { [] }
-    let(:api_annuaire_education_body) { File.read('spec/fixtures/files/api_education/annuaire_education.json') }
 
     subject(:prefill_params_array) { described_class.new(dossier, params).to_a }
 
@@ -18,11 +17,6 @@ RSpec.describe PrefillParams do
       VCR.insert_cassette('api_geo_departements')
       VCR.insert_cassette('api_geo_communes')
       VCR.insert_cassette('api_geo_epcis')
-
-      stub_request(:get, /https:\/\/data.education.gouv.fr\/api\/records\/1.0/).to_return(
-        body: api_annuaire_education_body,
-        status: 200
-      )
     end
 
     after do
@@ -256,12 +250,6 @@ RSpec.describe PrefillParams do
         expect(prefill_params_array).to match([])
       end
     end
-
-    context "when the annuaire education can't find the school for the given value" do
-      let(:api_annuaire_education_body) { File.read('spec/fixtures/files/api_education/annuaire_education_empty.json') }
-
-      it_behaves_like "a champ public value that is unauthorized", :annuaire_education, "value"
-    end
   end
 
   private
diff --git a/spec/models/types_de_champ/prefill_annuaire_education_type_de_champ_spec.rb b/spec/models/types_de_champ/prefill_annuaire_education_type_de_champ_spec.rb
index e7bba2828..e79629698 100644
--- a/spec/models/types_de_champ/prefill_annuaire_education_type_de_champ_spec.rb
+++ b/spec/models/types_de_champ/prefill_annuaire_education_type_de_champ_spec.rb
@@ -16,41 +16,17 @@ RSpec.describe TypesDeChamp::PrefillAnnuaireEducationTypeDeChamp do
 
     context 'when the value is nil' do
       let(:value) { nil }
-
       it { is_expected.to eq(nil) }
     end
 
     context 'when the value is empty' do
       let(:value) { '' }
-
       it { is_expected.to eq(nil) }
     end
 
     context 'when the value is present' do
       let(:value) { '0050009H' }
-
-      before do
-        stub_request(:get, /https:\/\/data.education.gouv.fr\/api\/records\/1.0/)
-          .to_return(body: body, status: 200)
-      end
-
-      context 'when the annuaire education api responds with a valid schema' do
-        let(:body) { File.read('spec/fixtures/files/api_education/annuaire_education.json') }
-
-        it { is_expected.to match({ id: champ.id, external_id: '0050009H', value: 'Lycée professionnel Sévigné, Gap (0050009H)' }) }
-      end
-
-      context "when the annuaire education api responds with invalid schema" do
-        let(:body) { File.read('spec/fixtures/files/api_education/annuaire_education_invalid.json') }
-
-        it { is_expected.to eq(nil) }
-      end
-
-      context 'when the annuaire education api responds with empty schema' do
-        let(:body) { File.read('spec/fixtures/files/api_education/annuaire_education_empty.json') }
-
-        it { is_expected.to eq(nil) }
-      end
+      it { is_expected.to match({ id: champ.id, external_id: '0050009H', value: '0050009H' }) }
     end
   end
 end
diff --git a/spec/system/users/dossier_prefill_get_spec.rb b/spec/system/users/dossier_prefill_get_spec.rb
index 3fe04c9f0..206ea1f87 100644
--- a/spec/system/users/dossier_prefill_get_spec.rb
+++ b/spec/system/users/dossier_prefill_get_spec.rb
@@ -74,9 +74,6 @@ describe 'Prefilling a dossier (with a GET request):', js: true do
     stub_request(:get, /https:\/\/entreprise.api.gouv.fr\/v2\/associations\//)
       .to_return(status: 200, body: File.read('spec/fixtures/files/api_entreprise/associations.json'))
 
-    stub_request(:get, /https:\/\/data.education.gouv.fr\/api\/records\/1.0/)
-      .to_return(status: 200, body: File.read('spec/fixtures/files/api_education/annuaire_education.json'))
-
     VCR.insert_cassette('api_geo_departements')
     VCR.insert_cassette('api_geo_communes')
     VCR.insert_cassette('api_geo_epcis')
diff --git a/spec/system/users/dossier_prefill_post_spec.rb b/spec/system/users/dossier_prefill_post_spec.rb
index 9c2c21d1e..ee31b2641 100644
--- a/spec/system/users/dossier_prefill_post_spec.rb
+++ b/spec/system/users/dossier_prefill_post_spec.rb
@@ -52,9 +52,6 @@ describe 'Prefilling a dossier (with a POST request):', js: true do
     stub_request(:get, /https:\/\/entreprise.api.gouv.fr\/v2\/associations\//)
       .to_return(status: 200, body: File.read('spec/fixtures/files/api_entreprise/associations.json'))
 
-    stub_request(:get, /https:\/\/data.education.gouv.fr\/api\/records\/1.0/)
-      .to_return(status: 200, body: File.read('spec/fixtures/files/api_education/annuaire_education.json'))
-
     VCR.insert_cassette('api_geo_departements')
     VCR.insert_cassette('api_geo_communes')
     VCR.insert_cassette('api_geo_epcis')

From 294a5135ce03bc83816c8cb7bc5ac244622304b8 Mon Sep 17 00:00:00 2001
From: Paul Chavard <pro@paul.chavard.net>
Date: Thu, 23 Feb 2023 21:55:03 +0100
Subject: [PATCH 192/202] feat(public/api): add dossier state api

---
 .../api/public/v1/dossiers_controller.rb      | 35 ++++++++--
 config/routes.rb                              |  2 +-
 .../api/public/v1/dossiers_controller_spec.rb | 68 +++++++++++++++++++
 3 files changed, 99 insertions(+), 6 deletions(-)

diff --git a/app/controllers/api/public/v1/dossiers_controller.rb b/app/controllers/api/public/v1/dossiers_controller.rb
index 2e770d6ce..718036d6e 100644
--- a/app/controllers/api/public/v1/dossiers_controller.rb
+++ b/app/controllers/api/public/v1/dossiers_controller.rb
@@ -11,18 +11,43 @@ class API::Public::V1::DossiersController < API::Public::V1::BaseController
     dossier.build_default_individual
     if dossier.save
       dossier.prefill!(PrefillParams.new(dossier, params.to_unsafe_h).to_a)
-      render json: {
-        dossier_url: commencer_url(@procedure.path, prefill_token: dossier.prefill_token),
-        dossier_id: dossier.to_typed_id,
-        dossier_number: dossier.id
-      }, status: :created
+      render json: serialize_dossier(dossier), status: :created
     else
       render_bad_request(dossier.errors.full_messages.to_sentence)
     end
   end
 
+  def index
+    prefill_token = Array.wrap(params.fetch(:prefill_token, [])).flat_map { _1.split(',') }
+    dossiers = @procedure.dossiers.visible_by_user.prefilled.order(:created_at).where(prefill_token:)
+    if dossiers.present?
+      render json: dossiers.map { serialize_dossier(_1) }
+    else
+      render json: []
+    end
+  end
+
   private
 
+  def serialize_dossier(dossier)
+    if dossier.orphan?
+      {
+        dossier_url: commencer_url(@procedure.path, prefill_token: dossier.prefill_token),
+        state: :prefilled
+      }
+    else
+      {
+        state: dossier.state,
+        submitted_at: dossier.depose_at&.iso8601,
+        processed_at: dossier.processed_at&.iso8601
+      }
+    end.merge(
+      dossier_id: dossier.to_typed_id,
+      dossier_number: dossier.id,
+      dossier_prefill_token: dossier.prefill_token
+    ).compact
+  end
+
   def retrieve_procedure
     @procedure = Procedure.publiees_ou_brouillons.find_by(id: params[:id])
     render_not_found("procedure", params[:id]) if @procedure.blank?
diff --git a/config/routes.rb b/config/routes.rb
index e295e8179..ff4055da3 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -274,7 +274,7 @@ Rails.application.routes.draw do
       namespace :v1 do
         resources :demarches, only: [] do
           member do
-            resources :dossiers, only: :create
+            resources :dossiers, only: [:create, :index]
             resources :stats, only: :index
           end
         end
diff --git a/spec/controllers/api/public/v1/dossiers_controller_spec.rb b/spec/controllers/api/public/v1/dossiers_controller_spec.rb
index 9cb30f7c2..09f85b55e 100644
--- a/spec/controllers/api/public/v1/dossiers_controller_spec.rb
+++ b/spec/controllers/api/public/v1/dossiers_controller_spec.rb
@@ -130,6 +130,74 @@ RSpec.describe API::Public::V1::DossiersController, type: :controller do
     end
   end
 
+  describe '#index' do
+    let(:procedure) { dossier.procedure }
+    let(:dossier) { create(:dossier, prefilled: true, user: nil) }
+    let(:prefill_token) { dossier.prefill_token }
+    let(:params) { { id: procedure.id, prefill_token: } }
+
+    subject(:create_request) do
+      request.headers["Content-Type"] = "application/json"
+      get :index, params:
+    end
+
+    let(:body) { JSON.parse(response.body).map(&:deep_symbolize_keys) }
+
+    before { create_request }
+
+    context 'not found' do
+      let(:prefill_token) { 'invalid_token' }
+      it 'should respond with and empty array' do
+        expect(response).to have_http_status(:ok)
+        expect(body).to eq([])
+      end
+    end
+
+    context 'when dossier prefilled' do
+      it 'should respond with dossier state' do
+        expect(response).to have_http_status(:ok)
+        expect(body.first[:state]).to eq('prefilled')
+      end
+    end
+
+    context 'when dossier brouillon' do
+      let(:dossier) { create(:dossier, prefilled: true) }
+      it 'should respond with dossier state' do
+        expect(response).to have_http_status(:ok)
+        expect(body.first[:state]).to eq('brouillon')
+      end
+    end
+
+    context 'when dossier en_construction' do
+      let(:dossier) { create(:dossier, :en_construction, prefilled: true) }
+      it 'should respond with dossier state' do
+        expect(response).to have_http_status(:ok)
+        expect(body.first[:state]).to eq('en_construction')
+        expect(body.first[:submitted_at]).to eq(dossier.depose_at.iso8601)
+      end
+    end
+
+    context 'with multiple tokens' do
+      let(:dossier) { create(:dossier, prefilled: true, user: nil) }
+      let(:other_dossier) { create(:dossier, prefilled: true, user: nil, procedure:) }
+      let(:prefill_token) { [dossier.prefill_token, other_dossier.prefill_token] }
+
+      it 'should respond with dossiers state' do
+        expect(response).to have_http_status(:ok)
+        expect(body.map { _1[:dossier_number] }).to match_array([dossier.id, other_dossier.id])
+      end
+
+      context 'comma separated tokens' do
+        let(:prefill_token) { [dossier.prefill_token, other_dossier.prefill_token].join(',') }
+
+        it 'should respond with dossiers state' do
+          expect(response).to have_http_status(:ok)
+          expect(body.map { _1[:dossier_number] }).to match_array([dossier.id, other_dossier.id])
+        end
+      end
+    end
+  end
+
   private
 
   def find_champ_by_stable_id(dossier, stable_id)

From 97f0df0598a6647f19c32afa5c4d64e73fcaeb76 Mon Sep 17 00:00:00 2001
From: Paul Chavard <pro@paul.chavard.net>
Date: Thu, 16 Feb 2023 09:59:35 +0100
Subject: [PATCH 193/202] refactor(progress): move progress bar markup to haml

---
 .../shared/activestorage/progress-bar.ts      | 26 +++++++++++++++----
 app/views/layouts/_progress_bar.html.haml     |  5 ++++
 app/views/layouts/application.html.haml       |  1 +
 3 files changed, 27 insertions(+), 5 deletions(-)
 create mode 100644 app/views/layouts/_progress_bar.html.haml

diff --git a/app/javascript/shared/activestorage/progress-bar.ts b/app/javascript/shared/activestorage/progress-bar.ts
index 7541ffae4..3370d790d 100644
--- a/app/javascript/shared/activestorage/progress-bar.ts
+++ b/app/javascript/shared/activestorage/progress-bar.ts
@@ -1,3 +1,5 @@
+import invariant from 'tiny-invariant';
+
 const PENDING_CLASS = 'direct-upload--pending';
 const ERROR_CLASS = 'direct-upload--error';
 const COMPLETE_CLASS = 'direct-upload--complete';
@@ -18,7 +20,7 @@ export default class ProgressBar {
   static init(input: HTMLInputElement, id: string, file: File) {
     clearErrors(input);
     const html = this.render(id, file.name);
-    input.insertAdjacentHTML('beforebegin', html);
+    input.before(html);
   }
 
   static start(id: string) {
@@ -53,10 +55,24 @@ export default class ProgressBar {
   }
 
   static render(id: string, filename: string) {
-    return `<div id="direct-upload-${id}" class="direct-upload ${PENDING_CLASS}" data-direct-upload-id="${id}">
-      <div role="progressbar" aria-valuemin="0" aria-valuemax="100" class="direct-upload__progress" style="width: 0%"></div>
-      <span class="direct-upload__filename">${filename}</span>
-    </div>`;
+    const template = document.querySelector<HTMLTemplateElement>(
+      '#progress-bar-template'
+    );
+    invariant(template, 'Missing progress-bar-template');
+    const fragment = template.content.cloneNode(true) as DocumentFragment;
+    const container = fragment.querySelector<HTMLDivElement>('.direct-upload');
+    invariant(container, 'Missing .direct-upload element in template');
+    const slot = container.querySelector<HTMLSlotElement>(
+      'slot[name="filename"]'
+    );
+    invariant(slot, 'Missing "filename" slot in template');
+
+    container.id = `direct-upload-${id}`;
+    container.dataset.directUploadId = id;
+    container.classList.add(PENDING_CLASS);
+    slot.replaceWith(document.createTextNode(filename));
+
+    return container;
   }
 
   id: string;
diff --git a/app/views/layouts/_progress_bar.html.haml b/app/views/layouts/_progress_bar.html.haml
new file mode 100644
index 000000000..600ab2b0b
--- /dev/null
+++ b/app/views/layouts/_progress_bar.html.haml
@@ -0,0 +1,5 @@
+%template#progress-bar-template
+  .direct-upload
+    .direct-upload__progress{ role: "progressbar", 'aria-valuemin': "0", 'aria-valuemax': "100", style: "width: 0%" }
+    %span.direct-upload__filename
+      %slot{ name: "filename" }
diff --git a/app/views/layouts/application.html.haml b/app/views/layouts/application.html.haml
index 6a49c6418..5cc4da21d 100644
--- a/app/views/layouts/application.html.haml
+++ b/app/views/layouts/application.html.haml
@@ -59,3 +59,4 @@
       - if Rails.env.development?
         = vite_typescript_tag 'axe-core'
       = yield :charts_js
+    = render partial: "layouts/progress_bar"

From af31e097fb1db9e7a7283c745bc4b3bd6529e146 Mon Sep 17 00:00:00 2001
From: Julie Salha <49035942+julieSalha@users.noreply.github.com>
Date: Thu, 16 Feb 2023 16:18:12 +0100
Subject: [PATCH 194/202] Add a11y attributes progressbar
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Peux-tu également prévoir une traduction pour l'attribut aria-label stp ? ("File upload").
N'hésite pas si tu as des questions.
---
 app/views/layouts/_progress_bar.html.haml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/views/layouts/_progress_bar.html.haml b/app/views/layouts/_progress_bar.html.haml
index 600ab2b0b..4ca638ffb 100644
--- a/app/views/layouts/_progress_bar.html.haml
+++ b/app/views/layouts/_progress_bar.html.haml
@@ -1,5 +1,5 @@
 %template#progress-bar-template
   .direct-upload
-    .direct-upload__progress{ role: "progressbar", 'aria-valuemin': "0", 'aria-valuemax': "100", style: "width: 0%" }
+    .direct-upload__progress{ role: "progressbar", 'aria-label': "Chargement de fichier", tabindex: "0", 'aria-valuemin': "0", 'aria-valuemax': "100", max: "100", style: "width: 0%" }
     %span.direct-upload__filename
       %slot{ name: "filename" }

From 47a8d33d85dbd360dbf9f4a48abdf2ed8e775586 Mon Sep 17 00:00:00 2001
From: Paul Chavard <github@paul.chavard.net>
Date: Tue, 21 Feb 2023 09:35:55 +0100
Subject: [PATCH 195/202] refactor(progress_bar): should be a component

---
 app/components/attachment/progress_bar_component.rb            | 2 ++
 .../progress_bar_component/progress_bar_component.en.yml       | 3 +++
 .../progress_bar_component/progress_bar_component.fr.yml       | 3 +++
 .../progress_bar_component/progress_bar_component.html.haml}   | 2 +-
 app/views/layouts/application.html.haml                        | 2 +-
 5 files changed, 10 insertions(+), 2 deletions(-)
 create mode 100644 app/components/attachment/progress_bar_component.rb
 create mode 100644 app/components/attachment/progress_bar_component/progress_bar_component.en.yml
 create mode 100644 app/components/attachment/progress_bar_component/progress_bar_component.fr.yml
 rename app/{views/layouts/_progress_bar.html.haml => components/attachment/progress_bar_component/progress_bar_component.html.haml} (59%)

diff --git a/app/components/attachment/progress_bar_component.rb b/app/components/attachment/progress_bar_component.rb
new file mode 100644
index 000000000..8e4605246
--- /dev/null
+++ b/app/components/attachment/progress_bar_component.rb
@@ -0,0 +1,2 @@
+class Attachment::ProgressBarComponent < ApplicationComponent
+end
diff --git a/app/components/attachment/progress_bar_component/progress_bar_component.en.yml b/app/components/attachment/progress_bar_component/progress_bar_component.en.yml
new file mode 100644
index 000000000..2aad5a17c
--- /dev/null
+++ b/app/components/attachment/progress_bar_component/progress_bar_component.en.yml
@@ -0,0 +1,3 @@
+---
+en:
+  loading: Loading
diff --git a/app/components/attachment/progress_bar_component/progress_bar_component.fr.yml b/app/components/attachment/progress_bar_component/progress_bar_component.fr.yml
new file mode 100644
index 000000000..3d31a7529
--- /dev/null
+++ b/app/components/attachment/progress_bar_component/progress_bar_component.fr.yml
@@ -0,0 +1,3 @@
+---
+fr:
+  loading: Chargement de fichier
diff --git a/app/views/layouts/_progress_bar.html.haml b/app/components/attachment/progress_bar_component/progress_bar_component.html.haml
similarity index 59%
rename from app/views/layouts/_progress_bar.html.haml
rename to app/components/attachment/progress_bar_component/progress_bar_component.html.haml
index 4ca638ffb..6675df0a5 100644
--- a/app/views/layouts/_progress_bar.html.haml
+++ b/app/components/attachment/progress_bar_component/progress_bar_component.html.haml
@@ -1,5 +1,5 @@
 %template#progress-bar-template
   .direct-upload
-    .direct-upload__progress{ role: "progressbar", 'aria-label': "Chargement de fichier", tabindex: "0", 'aria-valuemin': "0", 'aria-valuemax': "100", max: "100", style: "width: 0%" }
+    .direct-upload__progress{ role: "progressbar", 'aria-label': t(".loading"), tabindex: "0", 'aria-valuemin': "0", 'aria-valuemax': "100", max: "100", style: "width: 0%" }
     %span.direct-upload__filename
       %slot{ name: "filename" }
diff --git a/app/views/layouts/application.html.haml b/app/views/layouts/application.html.haml
index 5cc4da21d..74b523894 100644
--- a/app/views/layouts/application.html.haml
+++ b/app/views/layouts/application.html.haml
@@ -59,4 +59,4 @@
       - if Rails.env.development?
         = vite_typescript_tag 'axe-core'
       = yield :charts_js
-    = render partial: "layouts/progress_bar"
+    = render Attachment::ProgressBarComponent.new

From c05cc4a42db7487f8c679bbf2624c58d81f5d862 Mon Sep 17 00:00:00 2001
From: Colin Darie <colin@darie.eu>
Date: Tue, 28 Feb 2023 17:49:39 +0100
Subject: [PATCH 196/202] fix(annotations-privees): auto counter was not
 properly enabled

---
 app/views/shared/dossiers/_edit_annotations.html.haml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/views/shared/dossiers/_edit_annotations.html.haml b/app/views/shared/dossiers/_edit_annotations.html.haml
index 86f39f735..654644e0c 100644
--- a/app/views/shared/dossiers/_edit_annotations.html.haml
+++ b/app/views/shared/dossiers/_edit_annotations.html.haml
@@ -1,6 +1,6 @@
 .container.dossier-edit
   - if dossier.champs_private.present?
-    %section
+    %section.counter-start-header-section
       = render Attachment::DeleteFormComponent.new
       = form_for dossier, url: annotations_instructeur_dossier_path(dossier.procedure, dossier), html: { class: 'form', multipart: true } do |f|
         - dossier.champs_private.each do |champ|

From f31241e0677fc1a854ad3c37b44602f98365eb56 Mon Sep 17 00:00:00 2001
From: Paul Chavard <pro@paul.chavard.net>
Date: Tue, 28 Feb 2023 18:09:13 +0100
Subject: [PATCH 197/202] fix(graphql): fix etablissement as_degraded_mode?

---
 app/graphql/types/champs/siret_champ_type.rb | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/app/graphql/types/champs/siret_champ_type.rb b/app/graphql/types/champs/siret_champ_type.rb
index 045ac9a45..cf7f143b3 100644
--- a/app/graphql/types/champs/siret_champ_type.rb
+++ b/app/graphql/types/champs/siret_champ_type.rb
@@ -6,7 +6,10 @@ module Types::Champs
 
     def etablissement
       if object.etablissement_id.present?
-        Loaders::Record.for(Etablissement).load(object.etablissement_id)
+        Loaders::Record.for(Etablissement).load(object.etablissement_id).then do |etablissement|
+          return nil if etablissement.as_degraded_mode?
+          etablissement
+        end
       end
     end
   end

From 6dd7e867d23278f8cf8de9d01c48077a730ae9f7 Mon Sep 17 00:00:00 2001
From: Colin Darie <colin@darie.eu>
Date: Wed, 22 Feb 2023 11:47:39 +0100
Subject: [PATCH 198/202] feat(a11y/combosearch): add screen reader
 instructions

Cf #8643
---
 app/javascript/components/ComboSearch.tsx | 21 +++++++++++++++++++--
 1 file changed, 19 insertions(+), 2 deletions(-)

diff --git a/app/javascript/components/ComboSearch.tsx b/app/javascript/components/ComboSearch.tsx
index fe4687da1..d262f1534 100644
--- a/app/javascript/components/ComboSearch.tsx
+++ b/app/javascript/components/ComboSearch.tsx
@@ -1,4 +1,9 @@
-import React, { useState, useRef, ChangeEventHandler } from 'react';
+import React, {
+  useState,
+  useRef,
+  useId,
+  ChangeEventHandler
+} from 'react';
 import { useDebounce } from 'use-debounce';
 import { useQuery } from 'react-query';
 import {
@@ -127,6 +132,12 @@ function ComboSearch<Result>({
     }
   };
 
+  const a11yInstructions =
+    'utilisez les flèches haut et bas pour naviguer et la touche Entrée pour choisir.\
+    Sur un appareil tactile, explorez par toucher ou avec des gestes.';
+
+  const initInstrId = useId();
+
   return (
     <Combobox onSelect={handleOnSelect}>
       <ComboboxInput
@@ -136,7 +147,7 @@ function ComboSearch<Result>({
         value={value ?? ''}
         autocomplete={false}
         id={id}
-        aria-describedby={describedby}
+        aria-describedby={describedby ?? initInstrId}
       />
       {isSuccess && (
         <ComboboxPopover className="shadow-popup">
@@ -156,6 +167,12 @@ function ComboSearch<Result>({
           )}
         </ComboboxPopover>
       )}
+      {!describedby && (
+        <span id={initInstrId} className="hidden">
+          Quand les résultats de l’autocomplete sont disponibles,{' '}
+          {a11yInstructions}
+        </span>
+      )}
     </Combobox>
   );
 }

From 07579c9a580a04e348dd47f787d60f587d26293a Mon Sep 17 00:00:00 2001
From: Colin Darie <colin@darie.eu>
Date: Wed, 22 Feb 2023 11:48:50 +0100
Subject: [PATCH 199/202] feat(a11y/combosearch): announce results to screen
 readers

From http://haltersweb.github.io/Accessibility/autocomplete.html

Closes #8643
---
 app/javascript/components/ComboSearch.tsx | 24 +++++++++++++++++++++++
 1 file changed, 24 insertions(+)

diff --git a/app/javascript/components/ComboSearch.tsx b/app/javascript/components/ComboSearch.tsx
index d262f1534..514851f1a 100644
--- a/app/javascript/components/ComboSearch.tsx
+++ b/app/javascript/components/ComboSearch.tsx
@@ -1,5 +1,6 @@
 import React, {
   useState,
+  useEffect,
   useRef,
   useId,
   ChangeEventHandler
@@ -132,10 +133,30 @@ function ComboSearch<Result>({
     }
   };
 
+  const [announceLive, setAnnounceLive] = useState('');
+
   const a11yInstructions =
     'utilisez les flèches haut et bas pour naviguer et la touche Entrée pour choisir.\
     Sur un appareil tactile, explorez par toucher ou avec des gestes.';
 
+  const announceTimeout = useRef<ReturnType<typeof setTimeout>>();
+
+  useEffect(() => {
+    if (isSuccess && results.length > 0) {
+      setAnnounceLive(
+        `${results.length} résultats disponibles, ${a11yInstructions}`
+      );
+
+      announceTimeout.current = setTimeout(() => {
+        setAnnounceLive('');
+      }, 4000);
+    } else {
+      setAnnounceLive('Aucun résultat trouvé.');
+    }
+
+    return () => clearTimeout(announceTimeout.current);
+  }, [results.length, isSuccess]);
+
   const initInstrId = useId();
 
   return (
@@ -173,6 +194,9 @@ function ComboSearch<Result>({
           {a11yInstructions}
         </span>
       )}
+      <div aria-live="assertive" className="sr-only">
+        {announceLive}
+      </div>
     </Combobox>
   );
 }

From acffd45a2215921a6f1c054f997ce40596259ab8 Mon Sep 17 00:00:00 2001
From: Colin Darie <colin@darie.eu>
Date: Wed, 22 Feb 2023 11:49:26 +0100
Subject: [PATCH 200/202] feat(a11y/combosearch): add aria-ownws props

However it may be redundant due to aria-controls presence.

Cf #8643
---
 app/javascript/components/ComboSearch.tsx | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/app/javascript/components/ComboSearch.tsx b/app/javascript/components/ComboSearch.tsx
index 514851f1a..aa1caad09 100644
--- a/app/javascript/components/ComboSearch.tsx
+++ b/app/javascript/components/ComboSearch.tsx
@@ -158,6 +158,7 @@ function ComboSearch<Result>({
   }, [results.length, isSuccess]);
 
   const initInstrId = useId();
+  const resultsId = useId();
 
   return (
     <Combobox onSelect={handleOnSelect}>
@@ -169,9 +170,10 @@ function ComboSearch<Result>({
         autocomplete={false}
         id={id}
         aria-describedby={describedby ?? initInstrId}
+        aria-owns={resultsId}
       />
       {isSuccess && (
-        <ComboboxPopover className="shadow-popup">
+        <ComboboxPopover id={resultsId} className="shadow-popup">
           {results.length > 0 ? (
             <ComboboxList>
               {results.map((result, index) => {

From 71d43e959138aebf0f70fd652fcf40ffb0fe564e Mon Sep 17 00:00:00 2001
From: Colin Darie <colin@darie.eu>
Date: Wed, 22 Feb 2023 18:32:42 +0100
Subject: [PATCH 201/202] feat(a11y/combosearch): translatations for screen
 reader

---
 .../editable_champ/address_component.rb       |  3 +-
 .../address_component.html.haml               |  7 ++-
 .../editable_champ/combo_search_component.rb  | 17 +++++++
 .../combo_search_component.html.haml          |  4 ++
 app/javascript/components/ComboSearch.tsx     | 48 ++++++++++++-------
 config/i18n-tasks.yml                         |  2 +
 config/locales/en.yml                         |  6 +++
 config/locales/fr.yml                         |  6 +++
 8 files changed, 74 insertions(+), 19 deletions(-)
 create mode 100644 app/components/editable_champ/combo_search_component.rb
 create mode 100644 app/components/editable_champ/combo_search_component/combo_search_component.html.haml

diff --git a/app/components/editable_champ/address_component.rb b/app/components/editable_champ/address_component.rb
index 0b1db8bff..35ff5aeeb 100644
--- a/app/components/editable_champ/address_component.rb
+++ b/app/components/editable_champ/address_component.rb
@@ -1,3 +1,2 @@
-class EditableChamp::AddressComponent < EditableChamp::EditableChampBaseComponent
-  include ApplicationHelper
+class EditableChamp::AddressComponent < EditableChamp::ComboSearchComponent
 end
diff --git a/app/components/editable_champ/address_component/address_component.html.haml b/app/components/editable_champ/address_component/address_component.html.haml
index da4fa6092..ef480948d 100644
--- a/app/components/editable_champ/address_component/address_component.html.haml
+++ b/app/components/editable_champ/address_component/address_component.html.haml
@@ -1,6 +1,11 @@
+- render_parent
+
 = @form.hidden_field :value
 = @form.hidden_field :external_id
+
 = react_component("ComboAdresseSearch",
   required: @champ.required?,
   id: @champ.input_id,
-  describedby: @champ.describedby_id)
+  describedby: @champ.describedby_id,
+  **react_combo_props,
+)
diff --git a/app/components/editable_champ/combo_search_component.rb b/app/components/editable_champ/combo_search_component.rb
new file mode 100644
index 000000000..bbad7a600
--- /dev/null
+++ b/app/components/editable_champ/combo_search_component.rb
@@ -0,0 +1,17 @@
+class EditableChamp::ComboSearchComponent < EditableChamp::EditableChampBaseComponent
+  include ApplicationHelper
+
+  def announce_template_id
+    @announce_template_id ||= dom_id(@champ, "aria-announce-template")
+  end
+
+  # NOTE: because this template is called by `render_parent` from a child template,
+  # as of ViewComponent 2.x translations virtual paths are not properly propagated
+  # and we can't use the usual component namespacing. Instead we use global translations.
+  def react_combo_props
+    {
+      screenReaderInstructions: t("combo_search_component.screen_reader_instructions"),
+      announceTemplateId: announce_template_id
+    }
+  end
+end
diff --git a/app/components/editable_champ/combo_search_component/combo_search_component.html.haml b/app/components/editable_champ/combo_search_component/combo_search_component.html.haml
new file mode 100644
index 000000000..9b2e14a56
--- /dev/null
+++ b/app/components/editable_champ/combo_search_component/combo_search_component.html.haml
@@ -0,0 +1,4 @@
+%template{ id: announce_template_id }
+  %slot{ "name": "0" }= t("combo_search_component.result_slot_html", count: 0)
+  %slot{ "name": "1" }= t("combo_search_component.result_slot_html", count: 1)
+  %slot{ "name": "many" }= t("combo_search_component.result_slot_html", count: 2)
diff --git a/app/javascript/components/ComboSearch.tsx b/app/javascript/components/ComboSearch.tsx
index aa1caad09..23cb597cf 100644
--- a/app/javascript/components/ComboSearch.tsx
+++ b/app/javascript/components/ComboSearch.tsx
@@ -38,6 +38,8 @@ export type ComboSearchProps<Result> = {
   className?: string;
   placeholder?: string;
   debounceDelay?: number;
+  screenReaderInstructions: string;
+  announceTemplateId: string;
 };
 
 type QueryKey = readonly [
@@ -57,6 +59,8 @@ function ComboSearch<Result>({
   transformResults = (_, results) => results as Result[],
   id,
   describedby,
+  screenReaderInstructions,
+  announceTemplateId,
   debounceDelay = 0,
   ...props
 }: ComboSearchProps<Result>) {
@@ -134,28 +138,41 @@ function ComboSearch<Result>({
   };
 
   const [announceLive, setAnnounceLive] = useState('');
-
-  const a11yInstructions =
-    'utilisez les flèches haut et bas pour naviguer et la touche Entrée pour choisir.\
-    Sur un appareil tactile, explorez par toucher ou avec des gestes.';
-
   const announceTimeout = useRef<ReturnType<typeof setTimeout>>();
+  const announceTemplate = document.querySelector<HTMLTemplateElement>(
+    `#${announceTemplateId}`
+  );
+  invariant(announceTemplate, `Missing #${announceTemplateId}`);
+
+  const announceFragment = useRef(
+    announceTemplate.content.cloneNode(true) as DocumentFragment
+  ).current;
 
   useEffect(() => {
-    if (isSuccess && results.length > 0) {
-      setAnnounceLive(
-        `${results.length} résultats disponibles, ${a11yInstructions}`
+    if (isSuccess) {
+      const slot = announceFragment.querySelector<HTMLSlotElement>(
+        'slot[name="' + (results.length <= 1 ? results.length : 'many') + '"]'
       );
 
-      announceTimeout.current = setTimeout(() => {
-        setAnnounceLive('');
-      }, 4000);
-    } else {
-      setAnnounceLive('Aucun résultat trouvé.');
+      if (!slot) {
+        return;
+      }
+
+      const countSlot =
+        slot.querySelector<HTMLSlotElement>('slot[name="count"]');
+      if (countSlot) {
+        countSlot.replaceWith(String(results.length));
+      }
+
+      setAnnounceLive(slot.textContent ?? '');
     }
 
+    announceTimeout.current = setTimeout(() => {
+      setAnnounceLive('');
+    }, 3000);
+
     return () => clearTimeout(announceTimeout.current);
-  }, [results.length, isSuccess]);
+  }, [announceFragment, results.length, isSuccess]);
 
   const initInstrId = useId();
   const resultsId = useId();
@@ -192,8 +209,7 @@ function ComboSearch<Result>({
       )}
       {!describedby && (
         <span id={initInstrId} className="hidden">
-          Quand les résultats de l’autocomplete sont disponibles,{' '}
-          {a11yInstructions}
+          {screenReaderInstructions}
         </span>
       )}
       <div aria-live="assertive" className="sr-only">
diff --git a/config/i18n-tasks.yml b/config/i18n-tasks.yml
index 82bd9ca2a..c127bad30 100644
--- a/config/i18n-tasks.yml
+++ b/config/i18n-tasks.yml
@@ -110,6 +110,8 @@ ignore_unused:
 - 'instructeurs.dossiers.filterable_state.*'
 - 'views.prefill_descriptions.edit.possible_values.*'
 - 'helpers.page_entries_info.*'
+- 'combo_search_component.result_slot_html.*'
+- 'combo_search_component.screen_reader_instructions'
 # - '{devise,kaminari,will_paginate}.*'
 # - 'simple_form.{yes,no}'
 # - 'simple_form.{placeholders,hints,labels}.*'
diff --git a/config/locales/en.yml b/config/locales/en.yml
index 6b42db237..b01f24963 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -67,6 +67,12 @@ en:
   skiplinks:
     quick: Quick access
     content: Content
+  combo_search_component:
+    screen_reader_instructions: "When autocomplete results are available, use the up and down arrows to navigate through the list of results. Press Enter to select a result. Press Escape to close the results list."
+    result_slot_html:
+      zero: No result
+      one: 1 result
+      other: <slot name="count"></slot> results
   layouts:
     commencer:
       no_procedure:
diff --git a/config/locales/fr.yml b/config/locales/fr.yml
index f333df668..50521590e 100644
--- a/config/locales/fr.yml
+++ b/config/locales/fr.yml
@@ -58,6 +58,12 @@ fr:
   skiplinks:
     quick: Accès rapide
     content: Contenu
+  combo_search_component:
+    screen_reader_instructions: "Quand les résultats de l’autocomplete sont disponibles, utilisez les flèches haut et bas pour naviguer dans la liste des résultats. Appuyez sur Entrée pour sélectionner un résultat. Appuyez sur Echap pour fermer la liste des résultats."
+    result_slot_html:
+      zero: Aucun résultat
+      one: 1 résultat
+      other: <slot name="count"></slot> résultats
   layouts:
     commencer:
       no_procedure:

From 3f15647b8eea753400e1c8e1ece5547d02b6b966 Mon Sep 17 00:00:00 2001
From: Colin Darie <colin@darie.eu>
Date: Mon, 27 Feb 2023 11:59:38 +0100
Subject: [PATCH 202/202] refactor(a11y/combosearch): every combo with screen
 reader better support

---
 .../editable_champ/annuaire_education_component.rb   |  3 +--
 .../annuaire_education_component.html.haml           |  5 ++++-
 app/components/editable_champ/carte_component.rb     |  6 ++++++
 .../carte_component/carte_component.html.haml        |  9 ++++++++-
 app/components/editable_champ/communes_component.rb  |  3 +--
 .../communes_component/communes_component.html.haml  |  4 +++-
 app/javascript/components/ComboSearch.tsx            |  2 +-
 .../components/MapEditor/components/AddressInput.tsx |  9 ++++++++-
 app/javascript/components/MapEditor/index.tsx        | 12 ++++++++++--
 9 files changed, 42 insertions(+), 11 deletions(-)

diff --git a/app/components/editable_champ/annuaire_education_component.rb b/app/components/editable_champ/annuaire_education_component.rb
index 2dd780eb1..f5e394a0e 100644
--- a/app/components/editable_champ/annuaire_education_component.rb
+++ b/app/components/editable_champ/annuaire_education_component.rb
@@ -1,3 +1,2 @@
-class EditableChamp::AnnuaireEducationComponent < EditableChamp::EditableChampBaseComponent
-  include ApplicationHelper
+class EditableChamp::AnnuaireEducationComponent < EditableChamp::ComboSearchComponent
 end
diff --git a/app/components/editable_champ/annuaire_education_component/annuaire_education_component.html.haml b/app/components/editable_champ/annuaire_education_component/annuaire_education_component.html.haml
index 1a60a1278..0dcfe97d0 100644
--- a/app/components/editable_champ/annuaire_education_component/annuaire_education_component.html.haml
+++ b/app/components/editable_champ/annuaire_education_component/annuaire_education_component.html.haml
@@ -1,6 +1,9 @@
+- render_parent
+
 = @form.hidden_field :value
 = @form.hidden_field :external_id
 = react_component("ComboAnnuaireEducationSearch",
   required: @champ.required?,
   id: @champ.input_id,
-  describedby: @champ.describedby_id)
+  describedby: @champ.describedby_id,
+  **react_combo_props)
diff --git a/app/components/editable_champ/carte_component.rb b/app/components/editable_champ/carte_component.rb
index 737ffdf87..d4417ebb1 100644
--- a/app/components/editable_champ/carte_component.rb
+++ b/app/components/editable_champ/carte_component.rb
@@ -1,3 +1,9 @@
 class EditableChamp::CarteComponent < EditableChamp::EditableChampBaseComponent
   include ApplicationHelper
+
+  def initialize(**args)
+    super(**args)
+
+    @autocomplete_component = EditableChamp::ComboSearchComponent.new(**args)
+  end
 end
diff --git a/app/components/editable_champ/carte_component/carte_component.html.haml b/app/components/editable_champ/carte_component/carte_component.html.haml
index eb3096b26..ce5df6c7e 100644
--- a/app/components/editable_champ/carte_component/carte_component.html.haml
+++ b/app/components/editable_champ/carte_component/carte_component.html.haml
@@ -1,4 +1,11 @@
-= react_component("MapEditor", featureCollection: @champ.to_feature_collection, url: champs_carte_features_path(@champ), options: @champ.render_options)
+= render @autocomplete_component
+
+= react_component("MapEditor",
+  featureCollection: @champ.to_feature_collection,
+  url: champs_carte_features_path(@champ),
+  options: @champ.render_options,
+  autocompleteAnnounceTemplateId: @autocomplete_component.announce_template_id,
+  autocompleteScreenReaderInstructions: t("combo_search_component.screen_reader_instructions"))
 
 .geo-areas{ id: dom_id(@champ, :geo_areas) }
   = render partial: 'shared/champs/carte/geo_areas', locals: { champ: @champ, editing: true }
diff --git a/app/components/editable_champ/communes_component.rb b/app/components/editable_champ/communes_component.rb
index cc5bfee0b..a586a994b 100644
--- a/app/components/editable_champ/communes_component.rb
+++ b/app/components/editable_champ/communes_component.rb
@@ -1,3 +1,2 @@
-class EditableChamp::CommunesComponent < EditableChamp::EditableChampBaseComponent
-  include ApplicationHelper
+class EditableChamp::CommunesComponent < EditableChamp::ComboSearchComponent
 end
diff --git a/app/components/editable_champ/communes_component/communes_component.html.haml b/app/components/editable_champ/communes_component/communes_component.html.haml
index ba2f155a0..8723e541b 100644
--- a/app/components/editable_champ/communes_component/communes_component.html.haml
+++ b/app/components/editable_champ/communes_component/communes_component.html.haml
@@ -1,3 +1,4 @@
+- render_parent
 = @form.hidden_field :value
 = @form.hidden_field :external_id
 = @form.hidden_field :departement
@@ -7,4 +8,5 @@
   id: @champ.input_id,
   classNameDepartement: "width-33-desktop width-100-mobile",
   className: "width-66-desktop width-100-mobile",
-  describedby: @champ.describedby_id)
+  describedby: @champ.describedby_id,
+  **react_combo_props)
diff --git a/app/javascript/components/ComboSearch.tsx b/app/javascript/components/ComboSearch.tsx
index 23cb597cf..2115d6be6 100644
--- a/app/javascript/components/ComboSearch.tsx
+++ b/app/javascript/components/ComboSearch.tsx
@@ -24,7 +24,7 @@ type TransformResult<Result> = (
   result: Result
 ) => [key: string, value: string, label?: string];
 
-export type ComboSearchProps<Result> = {
+export type ComboSearchProps<Result = unknown> = {
   onChange?: (value: string | null, result?: Result) => void;
   value?: string;
   scope: string;
diff --git a/app/javascript/components/MapEditor/components/AddressInput.tsx b/app/javascript/components/MapEditor/components/AddressInput.tsx
index f1745d97a..51b559852 100644
--- a/app/javascript/components/MapEditor/components/AddressInput.tsx
+++ b/app/javascript/components/MapEditor/components/AddressInput.tsx
@@ -2,8 +2,14 @@ import React from 'react';
 import { fire } from '@utils';
 
 import ComboAdresseSearch from '../../ComboAdresseSearch';
+import { ComboSearchProps } from '~/components/ComboSearch';
 
-export function AddressInput() {
+export function AddressInput(
+  comboProps: Pick<
+    ComboSearchProps,
+    'screenReaderInstructions' | 'announceTemplateId'
+  >
+) {
   return (
     <div
       style={{
@@ -17,6 +23,7 @@ export function AddressInput() {
         onChange={(_, feature) => {
           fire(document, 'map:zoom', { feature });
         }}
+        {...comboProps}
       />
     </div>
   );
diff --git a/app/javascript/components/MapEditor/index.tsx b/app/javascript/components/MapEditor/index.tsx
index d5acd5710..7de243a35 100644
--- a/app/javascript/components/MapEditor/index.tsx
+++ b/app/javascript/components/MapEditor/index.tsx
@@ -12,15 +12,20 @@ import { AddressInput } from './components/AddressInput';
 import { PointInput } from './components/PointInput';
 import { ImportFileInput } from './components/ImportFileInput';
 import { FlashMessage } from '../shared/FlashMessage';
+import { ComboSearchProps } from '../ComboSearch';
 
 export default function MapEditor({
   featureCollection: initialFeatureCollection,
   url,
-  options
+  options,
+  autocompleteAnnounceTemplateId,
+  autocompleteScreenReaderInstructions
 }: {
   featureCollection: FeatureCollection;
   url: string;
   options: { layers: string[] };
+  autocompleteAnnounceTemplateId: ComboSearchProps['announceTemplateId'];
+  autocompleteScreenReaderInstructions: ComboSearchProps['screenReaderInstructions'];
 }) {
   const [cadastreEnabled, setCadastreEnabled] = useState(false);
 
@@ -46,7 +51,10 @@ export default function MapEditor({
       {error && <FlashMessage message={error} level="alert" fixed={true} />}
 
       <ImportFileInput featureCollection={featureCollection} {...actions} />
-      <AddressInput />
+      <AddressInput
+        screenReaderInstructions={autocompleteScreenReaderInstructions}
+        announceTemplateId={autocompleteAnnounceTemplateId}
+      />
 
       <MapLibre layers={options.layers}>
         <DrawLayer