From 816f14d5408794aead14a3ca562f6848600537ef Mon Sep 17 00:00:00 2001
From: Christian <15379878+maatinito@users.noreply.github.com>
Date: Mon, 2 May 2022 11:25:12 -1000
Subject: [PATCH 1/3] Fix 'external opinion' english label

---
 config/locales/en.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/config/locales/en.yml b/config/locales/en.yml
index bf6db58e3..ee9040130 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -145,7 +145,7 @@ en:
           total: total
           request: Request
           private_annotations: Private annotations
-          external_opinion: External opininon
+          external_opinion: External opinion
           messaging: Messaging
           involved_persons: Involved persons
         tab_explainations:

From 4b9ffe026bf5aeb22bff2500e3cd94ceb035979d Mon Sep 17 00:00:00 2001
From: simon lehericey <mail@simon.lehericey.net>
Date: Mon, 2 May 2022 16:24:39 +0200
Subject: [PATCH 2/3] fix(manager): brouillon is not deleted

---
 app/views/manager/dossiers/show.html.erb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/views/manager/dossiers/show.html.erb b/app/views/manager/dossiers/show.html.erb
index 423182570..8d3f108b7 100644
--- a/app/views/manager/dossiers/show.html.erb
+++ b/app/views/manager/dossiers/show.html.erb
@@ -22,7 +22,7 @@ as well as a link to its edit page.
 <header class="main-content__header" role="banner">
   <h1 class="main-content__page-title">
     <%= content_for(:title) %>
-    <% if dossier.hidden_for_administration? %>
+    <% if dossier.hidden_for_administration? && !dossier.brouillon? %>
       (Supprimé)
     <% end %>
   </h1>

From ea361643be3449d078531b4591f546327d061473 Mon Sep 17 00:00:00 2001
From: simon lehericey <mail@simon.lehericey.net>
Date: Thu, 28 Apr 2022 14:25:49 +0200
Subject: [PATCH 3/3] types_de_champ -> types_de_champs_public

---
 app/graphql/types/revision_type.rb            |  2 +-
 app/helpers/procedure_helper.rb               |  2 +-
 app/models/champ.rb                           |  2 +-
 app/models/concerns/dossier_rebase_concern.rb |  2 +-
 .../concerns/tags_substitution_concern.rb     |  2 +-
 app/models/dossier.rb                         |  2 +-
 app/models/procedure.rb                       | 12 +--
 app/models/procedure_revision.rb              | 24 ++---
 .../procedure_revision_type_de_champ.rb       |  2 +-
 app/services/pieces_justificatives_service.rb |  2 +-
 config/initializers/inflections.rb            |  1 +
 spec/factories/procedure.rb                   |  2 +-
 spec/factories/procedure_revision.rb          |  4 +-
 spec/factories/type_de_champ.rb               |  2 +-
 ...ocedure_presentation_and_revisions_spec.rb |  6 +-
 spec/models/procedure_revision_spec.rb        | 88 +++++++++----------
 spec/models/procedure_spec.rb                 |  8 +-
 .../services/procedure_export_service_spec.rb |  4 +-
 18 files changed, 84 insertions(+), 83 deletions(-)

diff --git a/app/graphql/types/revision_type.rb b/app/graphql/types/revision_type.rb
index 372dbebb2..eb8a09b5c 100644
--- a/app/graphql/types/revision_type.rb
+++ b/app/graphql/types/revision_type.rb
@@ -8,7 +8,7 @@ module Types
     field :annotation_descriptors, [Types::ChampDescriptorType], null: false
 
     def champ_descriptors
-      Loaders::Association.for(object.class, :types_de_champ).load(object)
+      Loaders::Association.for(object.class, :types_de_champ_public).load(object)
     end
 
     def annotation_descriptors
diff --git a/app/helpers/procedure_helper.rb b/app/helpers/procedure_helper.rb
index 118169430..684299b30 100644
--- a/app/helpers/procedure_helper.rb
+++ b/app/helpers/procedure_helper.rb
@@ -34,7 +34,7 @@ module ProcedureHelper
     {
       isAnnotation: false,
       typeDeChampsTypes: TypeDeChamp.type_de_champ_types_for(procedure, current_user),
-      typeDeChamps: (procedure.draft_revision ? procedure.draft_revision : procedure).types_de_champ.as_json_for_editor,
+      typeDeChamps: (procedure.draft_revision ? procedure.draft_revision : procedure).types_de_champ_public.as_json_for_editor,
       baseUrl: admin_procedure_types_de_champ_path(procedure),
       directUploadUrl: rails_direct_uploads_url,
       continuerUrl: admin_procedure_path(procedure)
diff --git a/app/models/champ.rb b/app/models/champ.rb
index e2cd3886d..a4ead1f60 100644
--- a/app/models/champ.rb
+++ b/app/models/champ.rb
@@ -56,7 +56,7 @@ class Champ < ApplicationRecord
   scope :public_only, -> { where(private: false) }
   scope :private_only, -> { where(private: true) }
   scope :ordered, -> { includes(:type_de_champ).order(:row, 'types_de_champ.order_place') }
-  scope :public_ordered, -> { public_only.joins(dossier: { revision: :revision_types_de_champ }).where('procedure_revision_types_de_champ.type_de_champ_id = champs.type_de_champ_id').order(:position) }
+  scope :public_ordered, -> { public_only.joins(dossier: { revision: :revision_types_de_champ_public }).where('procedure_revision_types_de_champ.type_de_champ_id = champs.type_de_champ_id').order(:position) }
   # we need to do private champs order as manual join to avoid conflicting join names
   scope :private_ordered, -> do
     private_only.joins('
diff --git a/app/models/concerns/dossier_rebase_concern.rb b/app/models/concerns/dossier_rebase_concern.rb
index bdfb04186..ad612bc8a 100644
--- a/app/models/concerns/dossier_rebase_concern.rb
+++ b/app/models/concerns/dossier_rebase_concern.rb
@@ -141,7 +141,7 @@ module DossierRebaseConcern
 
   def flattened_all_types_de_champ(published: false)
     revision = published ? procedure.published_revision : self.revision
-    types_de_champ = revision.types_de_champ + revision.types_de_champ_private
+    types_de_champ = revision.types_de_champ_public + revision.types_de_champ_private
     (types_de_champ + types_de_champ.filter(&:repetition?).flat_map(&:types_de_champ))
       .index_by(&:stable_id)
   end
diff --git a/app/models/concerns/tags_substitution_concern.rb b/app/models/concerns/tags_substitution_concern.rb
index a59add323..c92b4e843 100644
--- a/app/models/concerns/tags_substitution_concern.rb
+++ b/app/models/concerns/tags_substitution_concern.rb
@@ -197,7 +197,7 @@ module TagsSubstitutionConcern
   end
 
   def champ_public_tags(dossier: nil)
-    types_de_champ = (dossier || procedure.active_revision).types_de_champ
+    types_de_champ = dossier&.types_de_champ || procedure.active_revision.types_de_champ_public
     types_de_champ_tags(types_de_champ, Dossier::SOUMIS)
   end
 
diff --git a/app/models/dossier.rb b/app/models/dossier.rb
index 34c36b010..8891b14ce 100644
--- a/app/models/dossier.rb
+++ b/app/models/dossier.rb
@@ -134,7 +134,7 @@ class Dossier < ApplicationRecord
 
   has_one :attestation_template, through: :revision
   has_one :procedure, through: :revision
-  has_many :types_de_champ, through: :revision
+  has_many :types_de_champ, through: :revision, source: :types_de_champ_public
   has_many :types_de_champ_private, through: :revision
 
   belongs_to :transfer, class_name: 'DossierTransfer', foreign_key: 'dossier_transfer_id', optional: true, inverse_of: :dossiers
diff --git a/app/models/procedure.rb b/app/models/procedure.rb
index fad4b088a..6123e571b 100644
--- a/app/models/procedure.rb
+++ b/app/models/procedure.rb
@@ -73,9 +73,9 @@ class Procedure < ApplicationRecord
   belongs_to :published_revision, class_name: 'ProcedureRevision', optional: true
   has_many :deleted_dossiers, dependent: :destroy
 
-  has_many :published_types_de_champ, through: :published_revision, source: :types_de_champ
+  has_many :published_types_de_champ, through: :published_revision, source: :types_de_champ_public
   has_many :published_types_de_champ_private, through: :published_revision, source: :types_de_champ_private
-  has_many :draft_types_de_champ, through: :draft_revision, source: :types_de_champ
+  has_many :draft_types_de_champ, through: :draft_revision, source: :types_de_champ_public
   has_many :draft_types_de_champ_private, through: :draft_revision, source: :types_de_champ_private
   has_one :draft_attestation_template, through: :draft_revision, source: :attestation_template
   has_one :published_attestation_template, through: :published_revision, source: :attestation_template
@@ -220,11 +220,11 @@ class Procedure < ApplicationRecord
       :module_api_carto,
       published_revision: [
         :types_de_champ_private,
-        :types_de_champ
+        :types_de_champ_public
       ],
       draft_revision: [
         :types_de_champ_private,
-        :types_de_champ
+        :types_de_champ_public
       ]
     )
   }
@@ -444,7 +444,7 @@ class Procedure < ApplicationRecord
     populate_champ_stable_ids
     include_list = {
       draft_revision: {
-        revision_types_de_champ: {
+        revision_types_de_champ_public: {
           type_de_champ: :types_de_champ
         },
         revision_types_de_champ_private: {
@@ -714,7 +714,7 @@ class Procedure < ApplicationRecord
 
   def create_new_revision
     draft_revision
-      .deep_clone(include: [:revision_types_de_champ, :revision_types_de_champ_private])
+      .deep_clone(include: [:revision_types_de_champ_public, :revision_types_de_champ_private])
       .tap(&:save!)
   end
 
diff --git a/app/models/procedure_revision.rb b/app/models/procedure_revision.rb
index 942ee2ea7..7e7b72928 100644
--- a/app/models/procedure_revision.rb
+++ b/app/models/procedure_revision.rb
@@ -18,9 +18,9 @@ class ProcedureRevision < ApplicationRecord
 
   has_many :dossiers, inverse_of: :revision, foreign_key: :revision_id
 
-  has_many :revision_types_de_champ, -> { root.public_only.ordered }, class_name: 'ProcedureRevisionTypeDeChamp', foreign_key: :revision_id, dependent: :destroy, inverse_of: :revision
+  has_many :revision_types_de_champ_public, -> { root.public_only.ordered }, class_name: 'ProcedureRevisionTypeDeChamp', foreign_key: :revision_id, dependent: :destroy, inverse_of: :revision
   has_many :revision_types_de_champ_private, -> { root.private_only.ordered }, class_name: 'ProcedureRevisionTypeDeChamp', foreign_key: :revision_id, dependent: :destroy, inverse_of: :revision
-  has_many :types_de_champ, through: :revision_types_de_champ, source: :type_de_champ
+  has_many :types_de_champ_public, through: :revision_types_de_champ_public, source: :type_de_champ
   has_many :types_de_champ_private, through: :revision_types_de_champ_private, source: :type_de_champ
 
   has_many :owned_types_de_champ, class_name: 'TypeDeChamp', foreign_key: :revision_id, dependent: :destroy, inverse_of: :revision
@@ -30,7 +30,7 @@ class ProcedureRevision < ApplicationRecord
   scope :ordered, -> { order(:created_at) }
 
   def build_champs
-    types_de_champ.map(&:build_champ)
+    types_de_champ_public.map(&:build_champ)
   end
 
   def build_champs_private
@@ -49,7 +49,7 @@ class ProcedureRevision < ApplicationRecord
     elsif params[:private]
       types_de_champ_private.create(params)
     else
-      types_de_champ.create(params)
+      types_de_champ_public.create(params)
     end
   end
 
@@ -81,8 +81,8 @@ class ProcedureRevision < ApplicationRecord
         revision_types_de_champ_private.find_by!(type_de_champ_id: id).update!(position: position)
       end
     else
-      move_type_de_champ_hash(types_de_champ.to_a, type_de_champ, position).each do |(id, position)|
-        revision_types_de_champ.find_by!(type_de_champ_id: id).update!(position: position)
+      move_type_de_champ_hash(types_de_champ_public.to_a, type_de_champ, position).each do |(id, position)|
+        revision_types_de_champ_public.find_by!(type_de_champ_id: id).update!(position: position)
       end
     end
   end
@@ -97,7 +97,7 @@ class ProcedureRevision < ApplicationRecord
     elsif type_de_champ.private?
       types_de_champ_private.delete(type_de_champ)
     else
-      types_de_champ.delete(type_de_champ)
+      types_de_champ_public.delete(type_de_champ)
     end
   end
 
@@ -110,14 +110,14 @@ class ProcedureRevision < ApplicationRecord
   end
 
   def different_from?(revision)
-    types_de_champ != revision.types_de_champ ||
+    types_de_champ_public != revision.types_de_champ_public ||
       types_de_champ_private != revision.types_de_champ_private ||
       attestation_template != revision.attestation_template
   end
 
   def compare(revision)
     changes = []
-    changes += compare_types_de_champ(types_de_champ, revision.types_de_champ)
+    changes += compare_types_de_champ(types_de_champ_public, revision.types_de_champ_public)
     changes += compare_types_de_champ(types_de_champ_private, revision.types_de_champ_private)
     changes += compare_attestation_template(attestation_template, revision.attestation_template)
     changes
@@ -378,7 +378,7 @@ class ProcedureRevision < ApplicationRecord
   end
 
   def revise_type_de_champ(type_de_champ)
-    types_de_champ_association = type_de_champ.private? ? :revision_types_de_champ_private : :revision_types_de_champ
+    types_de_champ_association = type_de_champ.private? ? :revision_types_de_champ_private : :revision_types_de_champ_public
     association = send(types_de_champ_association).find_by!(type_de_champ: type_de_champ)
     cloned_type_de_champ = type_de_champ.deep_clone(include: [:types_de_champ]) do |original, kopy|
       PiecesJustificativesService.clone_attachments(original, kopy)
@@ -390,13 +390,13 @@ class ProcedureRevision < ApplicationRecord
   end
 
   def find_type_de_champ_by_id(id)
-    types_de_champ.find_by(stable_id: id) ||
+    types_de_champ_public.find_by(stable_id: id) ||
       types_de_champ_private.find_by(stable_id: id) ||
       types_de_champ_in_repetition.find_by!(stable_id: id)
   end
 
   def types_de_champ_in_repetition
-    parent_ids = types_de_champ.repetition.ids + types_de_champ_private.repetition.ids
+    parent_ids = types_de_champ_public.repetition.ids + types_de_champ_private.repetition.ids
     TypeDeChamp.where(parent_id: parent_ids)
   end
 
diff --git a/app/models/procedure_revision_type_de_champ.rb b/app/models/procedure_revision_type_de_champ.rb
index ab26a544d..5007c6a69 100644
--- a/app/models/procedure_revision_type_de_champ.rb
+++ b/app/models/procedure_revision_type_de_champ.rb
@@ -32,7 +32,7 @@ class ProcedureRevisionTypeDeChamp < ApplicationRecord
 
   def set_position
     self.position ||= begin
-      types_de_champ = (private? ? revision.revision_types_de_champ_private : revision.revision_types_de_champ).filter(&:persisted?)
+      types_de_champ = (private? ? revision.revision_types_de_champ_private : revision.revision_types_de_champ_public).filter(&:persisted?)
 
       if types_de_champ.present?
         types_de_champ.last.position + 1
diff --git a/app/services/pieces_justificatives_service.rb b/app/services/pieces_justificatives_service.rb
index aec2c0378..1e0642e82 100644
--- a/app/services/pieces_justificatives_service.rb
+++ b/app/services/pieces_justificatives_service.rb
@@ -28,7 +28,7 @@ class PiecesJustificativesService
   end
 
   def self.serialize_types_de_champ_as_type_pj(revision)
-    tdcs = revision.types_de_champ.filter { |type_champ| type_champ.old_pj.present? }
+    tdcs = revision.types_de_champ_public.filter { |type_champ| type_champ.old_pj.present? }
     tdcs.map.with_index do |type_champ, order_place|
       description = type_champ.description
       if /^(?<original_description>.*?)(?:[\r\n]+)Récupérer le formulaire vierge pour mon dossier : (?<lien_demarche>http.*)$/m =~ description
diff --git a/config/initializers/inflections.rb b/config/initializers/inflections.rb
index c1ecd861e..dc982817a 100644
--- a/config/initializers/inflections.rb
+++ b/config/initializers/inflections.rb
@@ -18,6 +18,7 @@ ActiveSupport::Inflector.inflections(:en) do |inflect|
   inflect.irregular 'type_de_champ_private', 'types_de_champ_private'
   inflect.irregular 'procedure_revision_type_de_champ', 'procedure_revision_types_de_champ'
   inflect.irregular 'revision_type_de_champ', 'revision_types_de_champ'
+  inflect.irregular 'revision_type_de_champ_public', 'revision_types_de_champ_public'
   inflect.irregular 'revision_type_de_champ_private', 'revision_types_de_champ_private'
   inflect.irregular 'assign_to', 'assign_tos'
   inflect.uncountable(['avis', 'pays'])
diff --git a/spec/factories/procedure.rb b/spec/factories/procedure.rb
index 05734d249..8f7268493 100644
--- a/spec/factories/procedure.rb
+++ b/spec/factories/procedure.rb
@@ -333,7 +333,7 @@ end
 
 def add_types_de_champs(types_de_champ, to: nil, scope: :public)
   revision = to
-  association_name = scope == :private ? :revision_types_de_champ_private : :revision_types_de_champ
+  association_name = scope == :private ? :revision_types_de_champ_private : :revision_types_de_champ_public
 
   types_de_champ.each do |type_de_champ|
     type_de_champ.revision = revision
diff --git a/spec/factories/procedure_revision.rb b/spec/factories/procedure_revision.rb
index d2887aa9f..fd8152339 100644
--- a/spec/factories/procedure_revision.rb
+++ b/spec/factories/procedure_revision.rb
@@ -10,8 +10,8 @@ FactoryBot.define do
 
         revision.procedure = original.procedure
         revision.attestation_template_id = original.attestation_template_id
-        original.revision_types_de_champ.each do |r_tdc|
-          revision.revision_types_de_champ << build(:procedure_revision_type_de_champ, from_original: r_tdc)
+        original.revision_types_de_champ_public.each do |r_tdc|
+          revision.revision_types_de_champ_public << build(:procedure_revision_type_de_champ, from_original: r_tdc)
         end
         original.revision_types_de_champ_private.each do |r_tdc|
           revision.revision_types_de_champ_private << build(:procedure_revision_type_de_champ, from_original: r_tdc)
diff --git a/spec/factories/type_de_champ.rb b/spec/factories/type_de_champ.rb
index 49ca747eb..ffc15ff21 100644
--- a/spec/factories/type_de_champ.rb
+++ b/spec/factories/type_de_champ.rb
@@ -25,7 +25,7 @@ FactoryBot.define do
         if type_de_champ.private?
           type_de_champ.revision.types_de_champ_private << type_de_champ
         else
-          type_de_champ.revision.types_de_champ << type_de_champ
+          type_de_champ.revision.types_de_champ_public << type_de_champ
         end
       elsif evaluator.parent
         type_de_champ.revision = evaluator.parent.revision
diff --git a/spec/models/procedure_presentation_and_revisions_spec.rb b/spec/models/procedure_presentation_and_revisions_spec.rb
index b16607bd5..473725711 100644
--- a/spec/models/procedure_presentation_and_revisions_spec.rb
+++ b/spec/models/procedure_presentation_and_revisions_spec.rb
@@ -48,7 +48,7 @@ describe ProcedurePresentation do
         it { is_expected.to match(['libelle 2', 'libelle 1']) }
 
         context 'and finally, when this tdc is removed' do
-          let!(:previous_tdc2) { procedure.published_revision.types_de_champ.find_by(libelle: 'libelle 2') }
+          let!(:previous_tdc2) { procedure.published_revision.types_de_champ_public.find_by(libelle: 'libelle 2') }
 
           before do
             procedure.draft_revision.remove_type_de_champ(previous_tdc2.stable_id)
@@ -61,7 +61,7 @@ describe ProcedurePresentation do
       end
 
       context 'when there is another published revision with a renamed tdc' do
-        let!(:previous_tdc) { procedure.published_revision.types_de_champ.first }
+        let!(:previous_tdc) { procedure.published_revision.types_de_champ_public.first }
         let!(:changed_tdc) { { type_champ: :number, libelle: 'changed libelle 1' } }
 
         before do
@@ -75,7 +75,7 @@ describe ProcedurePresentation do
       end
 
       context 'when there is another published which removes a previous tdc' do
-        let!(:previous_tdc) { procedure.published_revision.types_de_champ.first }
+        let!(:previous_tdc) { procedure.published_revision.types_de_champ_public.first }
 
         before do
           type_de_champ = procedure.draft_revision.remove_type_de_champ(previous_tdc.id)
diff --git a/spec/models/procedure_revision_spec.rb b/spec/models/procedure_revision_spec.rb
index c989f951a..1ae640e55 100644
--- a/spec/models/procedure_revision_spec.rb
+++ b/spec/models/procedure_revision_spec.rb
@@ -1,26 +1,26 @@
 describe ProcedureRevision do
   let(:procedure) { create(:procedure, :with_type_de_champ, :with_type_de_champ_private, :with_repetition) }
   let(:revision) { procedure.active_revision }
-  let(:type_de_champ) { revision.types_de_champ.first }
+  let(:type_de_champ) { revision.types_de_champ_public.first }
   let(:type_de_champ_private) { revision.types_de_champ_private.first }
   let(:type_de_champ_repetition) do
-    type_de_champ = revision.types_de_champ.repetition.first
+    type_de_champ = revision.types_de_champ_public.repetition.first
     type_de_champ.update(stable_id: 3333)
     type_de_champ
   end
 
   describe '#add_type_de_champ' do
     it 'type_de_champ' do
-      expect(revision.types_de_champ.size).to eq(2)
+      expect(revision.types_de_champ_public.size).to eq(2)
       new_type_de_champ = revision.add_type_de_champ({
         type_champ: TypeDeChamp.type_champs.fetch(:text),
         libelle: "Un champ text"
       })
       revision.reload
-      expect(revision.types_de_champ.size).to eq(3)
-      expect(revision.types_de_champ.last).to eq(new_type_de_champ)
-      expect(revision.revision_types_de_champ.last.position).to eq(2)
-      expect(revision.revision_types_de_champ.last.type_de_champ).to eq(new_type_de_champ)
+      expect(revision.types_de_champ_public.size).to eq(3)
+      expect(revision.types_de_champ_public.last).to eq(new_type_de_champ)
+      expect(revision.revision_types_de_champ_public.last.position).to eq(2)
+      expect(revision.revision_types_de_champ_public.last.type_de_champ).to eq(new_type_de_champ)
     end
 
     it 'type_de_champ_private' do
@@ -47,24 +47,24 @@ describe ProcedureRevision do
 
   describe '#move_type_de_champ' do
     let(:procedure) { create(:procedure, :with_type_de_champ, types_de_champ_count: 4) }
-    let(:last_type_de_champ) { revision.types_de_champ.last }
+    let(:last_type_de_champ) { revision.types_de_champ_public.last }
 
     it 'move down' do
-      expect(revision.types_de_champ.index(type_de_champ)).to eq(0)
+      expect(revision.types_de_champ_public.index(type_de_champ)).to eq(0)
       type_de_champ.update(order_place: nil)
       revision.move_type_de_champ(type_de_champ.stable_id, 2)
       revision.reload
-      expect(revision.types_de_champ.index(type_de_champ)).to eq(2)
+      expect(revision.types_de_champ_public.index(type_de_champ)).to eq(2)
       expect(revision.procedure.types_de_champ.index(type_de_champ)).to eq(2)
       expect(revision.procedure.types_de_champ_for_procedure_presentation.not_repetition.index(type_de_champ)).to eq(2)
     end
 
     it 'move up' do
-      expect(revision.types_de_champ.index(last_type_de_champ)).to eq(3)
+      expect(revision.types_de_champ_public.index(last_type_de_champ)).to eq(3)
       last_type_de_champ.update(order_place: nil)
       revision.move_type_de_champ(last_type_de_champ.stable_id, 0)
       revision.reload
-      expect(revision.types_de_champ.index(last_type_de_champ)).to eq(0)
+      expect(revision.types_de_champ_public.index(last_type_de_champ)).to eq(0)
       expect(revision.procedure.types_de_champ.index(last_type_de_champ)).to eq(0)
       expect(revision.procedure.types_de_champ_for_procedure_presentation.not_repetition.index(last_type_de_champ)).to eq(0)
     end
@@ -106,10 +106,10 @@ describe ProcedureRevision do
 
   describe '#remove_type_de_champ' do
     it 'type_de_champ' do
-      expect(revision.types_de_champ.size).to eq(2)
+      expect(revision.types_de_champ_public.size).to eq(2)
       revision.remove_type_de_champ(type_de_champ.stable_id)
       procedure.reload
-      expect(revision.types_de_champ.size).to eq(1)
+      expect(revision.types_de_champ_public.size).to eq(1)
     end
 
     it 'type_de_champ_private' do
@@ -120,11 +120,11 @@ describe ProcedureRevision do
 
     it 'type_de_champ_repetition' do
       expect(type_de_champ_repetition.types_de_champ.size).to eq(1)
-      expect(revision.types_de_champ.size).to eq(2)
+      expect(revision.types_de_champ_public.size).to eq(2)
       revision.remove_type_de_champ(type_de_champ_repetition.types_de_champ.first.stable_id)
       type_de_champ_repetition.reload
       expect(type_de_champ_repetition.types_de_champ.size).to eq(0)
-      expect(revision.types_de_champ.size).to eq(2)
+      expect(revision.types_de_champ_public.size).to eq(2)
     end
   end
 
@@ -140,35 +140,35 @@ describe ProcedureRevision do
     end
 
     it 'should have types_de_champ' do
-      expect(new_revision.types_de_champ.count).to eq(2)
+      expect(new_revision.types_de_champ_public.count).to eq(2)
       expect(new_revision.types_de_champ_private.count).to eq(1)
-      expect(new_revision.types_de_champ).to eq(revision.types_de_champ)
+      expect(new_revision.types_de_champ_public).to eq(revision.types_de_champ_public)
       expect(new_revision.types_de_champ_private).to eq(revision.types_de_champ_private)
 
-      expect(new_revision.revision_types_de_champ.count).to eq(2)
+      expect(new_revision.revision_types_de_champ_public.count).to eq(2)
       expect(new_revision.revision_types_de_champ_private.count).to eq(1)
-      expect(new_revision.revision_types_de_champ.count).to eq(revision.revision_types_de_champ.count)
+      expect(new_revision.revision_types_de_champ_public.count).to eq(revision.revision_types_de_champ_public.count)
       expect(new_revision.revision_types_de_champ_private.count).to eq(revision.revision_types_de_champ_private.count)
-      expect(new_revision.revision_types_de_champ).not_to eq(revision.revision_types_de_champ)
+      expect(new_revision.revision_types_de_champ_public).not_to eq(revision.revision_types_de_champ_public)
       expect(new_revision.revision_types_de_champ_private).not_to eq(revision.revision_types_de_champ_private)
     end
 
     describe '#compare' do
-      let(:type_de_champ_first) { revision.types_de_champ.first }
-      let(:type_de_champ_second) { revision.types_de_champ.second }
+      let(:type_de_champ_first) { revision.types_de_champ_public.first }
+      let(:type_de_champ_second) { revision.types_de_champ_public.second }
 
       it 'type_de_champ' do
-        expect(new_revision.types_de_champ.size).to eq(2)
+        expect(new_revision.types_de_champ_public.size).to eq(2)
         new_type_de_champ = new_revision.add_type_de_champ({
           type_champ: TypeDeChamp.type_champs.fetch(:text),
           libelle: "Un champ text"
         })
         revision.reload
-        expect(new_revision.types_de_champ.size).to eq(3)
-        expect(new_revision.types_de_champ.last).to eq(new_type_de_champ)
-        expect(new_revision.revision_types_de_champ.last.position).to eq(2)
-        expect(new_revision.revision_types_de_champ.last.type_de_champ).to eq(new_type_de_champ)
-        expect(new_revision.revision_types_de_champ.last.type_de_champ.revision).to eq(new_revision)
+        expect(new_revision.types_de_champ_public.size).to eq(3)
+        expect(new_revision.types_de_champ_public.last).to eq(new_type_de_champ)
+        expect(new_revision.revision_types_de_champ_public.last.position).to eq(2)
+        expect(new_revision.revision_types_de_champ_public.last.type_de_champ).to eq(new_type_de_champ)
+        expect(new_revision.revision_types_de_champ_public.last.type_de_champ.revision).to eq(new_revision)
         expect(procedure.active_revision.different_from?(new_revision)).to be_truthy
         expect(procedure.active_revision.compare(new_revision)).to eq([
           {
@@ -180,7 +180,7 @@ describe ProcedureRevision do
           }
         ])
 
-        new_revision.find_or_clone_type_de_champ(new_revision.types_de_champ.first.stable_id).update(libelle: 'modifier le libelle')
+        new_revision.find_or_clone_type_de_champ(new_revision.types_de_champ_public.first.stable_id).update(libelle: 'modifier le libelle')
         expect(procedure.active_revision.compare(new_revision.reload)).to eq([
           {
             model: :type_de_champ,
@@ -200,9 +200,9 @@ describe ProcedureRevision do
             stable_id: new_type_de_champ.stable_id
           }
         ])
-        expect(new_revision.types_de_champ.first.revision).to eq(new_revision)
+        expect(new_revision.types_de_champ_public.first.revision).to eq(new_revision)
 
-        new_revision.move_type_de_champ(new_revision.types_de_champ.second.stable_id, 2)
+        new_revision.move_type_de_champ(new_revision.types_de_champ_public.second.stable_id, 2)
         expect(procedure.active_revision.compare(new_revision.reload)).to eq([
           {
             model: :type_de_champ,
@@ -231,9 +231,9 @@ describe ProcedureRevision do
             stable_id: type_de_champ_second.stable_id
           }
         ])
-        expect(new_revision.types_de_champ.last.revision).to eq(revision)
+        expect(new_revision.types_de_champ_public.last.revision).to eq(revision)
 
-        new_revision.remove_type_de_champ(new_revision.types_de_champ.first.stable_id)
+        new_revision.remove_type_de_champ(new_revision.types_de_champ_public.first.stable_id)
         expect(procedure.active_revision.compare(new_revision.reload)).to eq([
           {
             model: :type_de_champ,
@@ -251,8 +251,8 @@ describe ProcedureRevision do
           }
         ])
 
-        new_revision.find_or_clone_type_de_champ(new_revision.types_de_champ.last.stable_id).update(description: 'une description')
-        new_revision.find_or_clone_type_de_champ(new_revision.types_de_champ.last.stable_id).update(mandatory: true)
+        new_revision.find_or_clone_type_de_champ(new_revision.types_de_champ_public.last.stable_id).update(description: 'une description')
+        new_revision.find_or_clone_type_de_champ(new_revision.types_de_champ_public.last.stable_id).update(mandatory: true)
         expect(procedure.active_revision.compare(new_revision.reload)).to eq([
           {
             model: :type_de_champ,
@@ -290,8 +290,8 @@ describe ProcedureRevision do
           }
         ])
 
-        new_revision.find_or_clone_type_de_champ(new_revision.types_de_champ.last.types_de_champ.first.stable_id).update(type_champ: :drop_down_list)
-        new_revision.find_or_clone_type_de_champ(new_revision.types_de_champ.last.types_de_champ.first.stable_id).update(drop_down_options: ['one', 'two'])
+        new_revision.find_or_clone_type_de_champ(new_revision.types_de_champ_public.last.types_de_champ.first.stable_id).update(type_champ: :drop_down_list)
+        new_revision.find_or_clone_type_de_champ(new_revision.types_de_champ_public.last.types_de_champ.first.stable_id).update(drop_down_options: ['one', 'two'])
         expect(procedure.active_revision.compare(new_revision.reload)).to eq([
           {
             model: :type_de_champ,
@@ -335,7 +335,7 @@ describe ProcedureRevision do
             private: false,
             from: "text",
             to: "drop_down_list",
-            stable_id: new_revision.types_de_champ.last.types_de_champ.first.stable_id
+            stable_id: new_revision.types_de_champ_public.last.types_de_champ.first.stable_id
           },
           {
             model: :type_de_champ,
@@ -345,12 +345,12 @@ describe ProcedureRevision do
             private: false,
             from: [],
             to: ["one", "two"],
-            stable_id: new_revision.types_de_champ.last.types_de_champ.first.stable_id
+            stable_id: new_revision.types_de_champ_public.last.types_de_champ.first.stable_id
           }
         ])
 
-        new_revision.find_or_clone_type_de_champ(new_revision.types_de_champ.last.types_de_champ.first.stable_id).update(type_champ: :carte)
-        new_revision.find_or_clone_type_de_champ(new_revision.types_de_champ.last.types_de_champ.first.stable_id).update(options: { cadastres: true, znieff: true })
+        new_revision.find_or_clone_type_de_champ(new_revision.types_de_champ_public.last.types_de_champ.first.stable_id).update(type_champ: :carte)
+        new_revision.find_or_clone_type_de_champ(new_revision.types_de_champ_public.last.types_de_champ.first.stable_id).update(options: { cadastres: true, znieff: true })
         expect(procedure.active_revision.compare(new_revision.reload)).to eq([
           {
             model: :type_de_champ,
@@ -394,7 +394,7 @@ describe ProcedureRevision do
             private: false,
             from: "text",
             to: "carte",
-            stable_id: new_revision.types_de_champ.last.types_de_champ.first.stable_id
+            stable_id: new_revision.types_de_champ_public.last.types_de_champ.first.stable_id
           },
           {
             model: :type_de_champ,
@@ -404,7 +404,7 @@ describe ProcedureRevision do
             private: false,
             from: [],
             to: [:cadastres, :znieff],
-            stable_id: new_revision.types_de_champ.last.types_de_champ.first.stable_id
+            stable_id: new_revision.types_de_champ_public.last.types_de_champ.first.stable_id
           }
         ])
       end
diff --git a/spec/models/procedure_spec.rb b/spec/models/procedure_spec.rb
index 758791972..f49e0e08b 100644
--- a/spec/models/procedure_spec.rb
+++ b/spec/models/procedure_spec.rb
@@ -822,15 +822,15 @@ describe Procedure do
       subject
       expect(procedure.published_revision).to be_present
       expect(procedure.published_revision.published_at).to eq(publication_date)
-      expect(procedure.published_revision.types_de_champ.first.libelle).to eq('libelle 1')
+      expect(procedure.published_revision.types_de_champ_public.first.libelle).to eq('libelle 1')
     end
 
     it 'creates a new draft revision' do
       expect { subject }.to change(ProcedureRevision, :count).by(1)
       expect(procedure.draft_revision).to be_present
-      expect(procedure.draft_revision.revision_types_de_champ).to be_present
-      expect(procedure.draft_revision.types_de_champ).to be_present
-      expect(procedure.draft_revision.types_de_champ.first.libelle).to eq('libelle 1')
+      expect(procedure.draft_revision.revision_types_de_champ_public).to be_present
+      expect(procedure.draft_revision.types_de_champ_public).to be_present
+      expect(procedure.draft_revision.types_de_champ_public.first.libelle).to eq('libelle 1')
     end
 
     context 'when the procedure has dossiers' do
diff --git a/spec/services/procedure_export_service_spec.rb b/spec/services/procedure_export_service_spec.rb
index d8211a8b2..078c4d02c 100644
--- a/spec/services/procedure_export_service_spec.rb
+++ b/spec/services/procedure_export_service_spec.rb
@@ -18,8 +18,8 @@ describe ProcedureExportService do
 
     before do
       # change one tdc place to check if the header is ordered
-      tdc_first = procedure.active_revision.revision_types_de_champ.first
-      tdc_last = procedure.active_revision.revision_types_de_champ.last
+      tdc_first = procedure.active_revision.revision_types_de_champ_public.first
+      tdc_last = procedure.active_revision.revision_types_de_champ_public.last
 
       tdc_first.update(position: tdc_last.position + 1)
       procedure.reload