feat(personnalisation): display chosen champ values on the dossiers list

Author: kara22

app/controllers/users/dossiers_controller.rb

@@ -55,6 +55,7 @@ def index
       Skylight.instrument(title: list_title) do
         @dossiers.load
       end
+      load_personnalisation_data(@dossiers)
       @corbeille_count = current_user.dossiers.hidden_by_user.or(current_user.dossiers.hidden_by_expired).count
       @pending_transfers_count = current_user.dossier_transfers_received_pending.count
       @show_simple_list = params[:search].blank? && !@filter.active? && @total_count <= SIMPLE_LIST_THRESHOLD
@@ -691,6 +692,29 @@ def commentaire_params
       params.require(:commentaire).permit(:body, piece_jointe: [])
     end
 
+    def load_personnalisation_data(dossiers)
+      @personnalisations_by_procedure_id = {}
+      @champs_by_dossier_id = {}
+      return if !feature_enabled?(:dossiers_list_personnalisation)
+
+      @personnalisations_by_procedure_id = current_user.dossiers_list_personnalisations
+        .where(procedure_id: dossiers.map { _1.procedure.id }.uniq)
+        .index_by(&:procedure_id)
+      return if @personnalisations_by_procedure_id.empty?
+
+      stable_ids = @personnalisations_by_procedure_id.values
+        .flat_map(&:displayed_columns)
+        .filter(&:champ_column?)
+        .map(&:stable_id)
+        .uniq
+      return if stable_ids.empty?
+
+      Champ.where(dossier_id: dossiers.map(&:id), stable_id: stable_ids, stream: Champ::MAIN_STREAM)
+        .find_each do |champ|
+          (@champs_by_dossier_id[champ.dossier_id] ||= {})[champ.stable_id] = champ
+        end
+    end
+
     def personnalisation_available?
       feature_enabled?(:dossiers_list_personnalisation) &&
         current_user.dossiers.visible_by_user.count > SIMPLE_LIST_THRESHOLD

app/models/concerns/columns_concern.rb

@@ -281,7 +281,7 @@ def moral_columns
   end
 
   def types_de_champ_columns
-    all_revisions_types_de_champ.flat_map { _1.columns(procedure_id: id) }
+    all_revisions_types_de_champ.filter(&:dynamic_type).flat_map { _1.columns(procedure_id: id) }
   end
 
   def dossier_col(**args) = Columns::DossierColumn.new(**(args.merge(procedure_id: id)))

app/views/users/dossiers/_dossier_card_content.html.erb

@@ -76,6 +76,13 @@
         </p>
       <% end %>
     <% end %>
+
+    <% if local_assigns[:personnalisation].present? %>
+      <%= render Users::DossierCardChampsComponent.new(
+        columns: personnalisation.displayed_columns,
+        champs_by_stable_id: local_assigns[:champs_by_stable_id] || {}
+      ) %>
+    <% end %>
   </div>
 
   <div class="badge_info text-right fr-hidden unhidden-md">

app/views/users/dossiers/_dossiers_list.html.erb

@@ -1,7 +1,12 @@
 <% if dossiers.present? %>
   <% dossiers.each do |dossier| %>
     <div class="card" id="dossier_<%= dossier.id %>">
-      <%= render partial: 'dossier_card_content', locals: { dossier: dossier, linkable: @statut != "dossiers-supprimes" } %>
+      <%= render partial: 'dossier_card_content', locals: {
+        dossier: dossier,
+        linkable: @statut != "dossiers-supprimes",
+        personnalisation: @personnalisations_by_procedure_id&.[](dossier.procedure.id),
+        champs_by_stable_id: @champs_by_dossier_id&.[](dossier.id) || {}
+      } %>
 
       <% if dossier.procedure.close? %>
         <%= render Dsfr::AlertComponent.new(state: :info, size: :sm, extra_class_names: "fr-mb-2w") do |c| %>

spec/controllers/users/dossiers_controller_spec.rb

@@ -2769,6 +2769,67 @@
     end
   end
 
+  describe 'GET #index with personnalisation values' do
+    render_views
+
+    let(:user) { create(:user) }
+    let(:procedure) { create(:procedure, :published, types_de_champ_public: [{ type: :text, libelle: 'Titre' }]) }
+    let(:column) { procedure.personnalisable_columns.first }
+
+    before do
+      Flipper.enable(:dossiers_list_personnalisation, user)
+      create(:dossiers_list_personnalisation, user:, procedure:, displayed_columns: [column])
+      sign_in(user)
+    end
+
+    def query_count
+      count = 0
+      callback = -> (*) { count += 1 }
+      ActiveSupport::Notifications.subscribed(callback, 'sql.active_record') { get :index }
+      count
+    end
+
+    it 'does not issue more queries as more dossiers are added (no N+1)' do
+      create_list(:dossier, 6, :en_construction, user:, procedure:, populate_champs: true)
+      baseline = query_count
+
+      create_list(:dossier, 6, :en_construction, user:, procedure:, populate_champs: true)
+      expect(query_count).to be <= baseline + 3
+    end
+  end
+
+  describe 'GET #index with personnalisation values – multi-procedure N+1 guard' do
+    render_views
+
+    let(:user) { create(:user) }
+    let(:procedure1) { create(:procedure, :published, types_de_champ_public: [{ type: :text, libelle: 'Titre' }]) }
+    let(:procedure2) { create(:procedure, :published, types_de_champ_public: [{ type: :text, libelle: 'Intitulé' }]) }
+
+    before do
+      Flipper.enable(:dossiers_list_personnalisation, user)
+      create(:dossiers_list_personnalisation, user:, procedure: procedure1, displayed_columns: [procedure1.personnalisable_columns.first])
+      create(:dossiers_list_personnalisation, user:, procedure: procedure2, displayed_columns: [procedure2.personnalisable_columns.first])
+      sign_in(user)
+    end
+
+    def query_count
+      count = 0
+      callback = -> (*) { count += 1 }
+      ActiveSupport::Notifications.subscribed(callback, 'sql.active_record') { get :index }
+      count
+    end
+
+    it 'does not issue more queries per dossier with multiple procedures (no N+1 on Column.find)' do
+      create_list(:dossier, 3, :en_construction, user:, procedure: procedure1, populate_champs: true)
+      create_list(:dossier, 3, :en_construction, user:, procedure: procedure2, populate_champs: true)
+      baseline = query_count
+
+      create_list(:dossier, 3, :en_construction, user:, procedure: procedure1, populate_champs: true)
+      create_list(:dossier, 3, :en_construction, user:, procedure: procedure2, populate_champs: true)
+      expect(query_count).to be <= baseline + 3
+    end
+  end
+
   private
 
   def find_champ_by_stable_id(dossier, stable_id)

spec/models/procedure_spec.rb

@@ -2388,6 +2388,26 @@
     end
   end
 
+  describe '#columns' do
+    it 'does not raise and skips champs with unknown type_champ (legacy value)' do
+      procedure = create(:procedure, :published, types_de_champ_public: [
+        { type: :text, libelle: 'Champ valide' },
+        { type: :text, libelle: 'Champ legacy' },
+      ])
+      valid_tdc = procedure.published_revision.types_de_champ_public.find { _1.libelle == 'Champ valide' }
+      legacy_tdc_id = procedure.published_revision.types_de_champ_public.find { _1.libelle == 'Champ legacy' }.id
+      TypeDeChamp.where(id: legacy_tdc_id).update_all(type_champ: 'titre_identite')
+      expect(TypeDeChamp.find(legacy_tdc_id).dynamic_type).to be_nil
+      procedure.reload
+      Current.procedure_columns = nil
+
+      expect { procedure.columns }.not_to raise_error
+      expect(procedure.columns.map(&:label)).not_to include('Champ legacy')
+      h_id = { procedure_id: procedure.id, column_id: "type_de_champ/#{valid_tdc.stable_id}" }
+      expect { procedure.find_column(h_id:) }.not_to raise_error
+    end
+  end
+
   private
 
   def create_dossier_with_pj_of_size(size, procedure)