Merge pull request #6215 from betagouv/main

2021-05-19-02

app/services/dossier_projection_service.rb

@@ -33,7 +33,7 @@ class DossierProjectionService
             types_de_champ: { stable_id: fields.map { |f| f[COLUMN] } },
             dossier_id: dossiers_ids
           )
-          .select(:dossier_id, :value, :type_de_champ_id, :stable_id, :type) # we cannot pluck :value, as we need the champ.to_s method
+          .select(:dossier_id, :value, :type_de_champ_id, :stable_id, :type, :data) # we cannot pluck :value, as we need the champ.to_s method
           .group_by(&:stable_id) # the champs are redispatched to their respective fields
           .map do |stable_id, champs|
             field = fields.find { |f| f[COLUMN] == stable_id.to_s }

spec/factories/procedure.rb

@@ -193,6 +193,12 @@ FactoryBot.define do
       end
     end
 
+    trait :with_address do
+      after(:build) do |procedure, _evaluator|
+        build(:type_de_champ_address, procedure: procedure)
+      end
+    end
+
     trait :with_explication do
       after(:build) do |procedure, _evaluator|
         build(:type_de_champ_explication, procedure: procedure)

spec/services/dossier_projection_service_spec.rb

@@ -173,6 +173,17 @@ describe DossierProjectionService do
 
         it { is_expected.to eq('Oui') }
       end
+
+      context 'for type_de_champ table and value to.s which needs data field' do
+        let(:table) { 'type_de_champ' }
+        let(:procedure) { create(:procedure, :with_address) }
+        let(:dossier) { create(:dossier, procedure: procedure) }
+        let(:column) { dossier.procedure.types_de_champ.first.stable_id.to_s }
+
+        before { dossier.champs.first.update(data: { 'label' => '18 a la bonne rue', 'departement' => 'd' }) }
+
+        it { is_expected.to eq('18 a la bonne rue') }
+      end
     end
   end
 end