Merge pull request #8322 from tchak/feat-prefill-private-annotations

feat(prefill): allow to prefill private annotations

app/models/concerns/dossier_prefillable_concern.rb

@@ -3,10 +3,10 @@
 module DossierPrefillableConcern
   extend ActiveSupport::Concern
 
-  def prefill!(champs_public_attributes)
+  def prefill!(champs_attributes)
-    return if champs_public_attributes.empty?
+    return if champs_attributes.empty?
 
-    assign_attributes(champs_public_attributes: champs_public_attributes.map { |h| h.merge(prefilled: true) })
+    assign_attributes(champs_attributes: champs_attributes.map { |h| h.merge(prefilled: true) })
     save(validate: false)
   end
 end

app/models/dossier.rb

@@ -153,6 +153,7 @@ class Dossier < ApplicationRecord
   has_many :transfer_logs, class_name: 'DossierTransferLog', dependent: :destroy
   has_many :cloned_dossiers, class_name: 'Dossier', foreign_key: 'parent_dossier_id', dependent: :nullify, inverse_of: :parent_dossier
 
+  accepts_nested_attributes_for :champs
   accepts_nested_attributes_for :champs_public
   accepts_nested_attributes_for :champs_private
   accepts_nested_attributes_for :champs_public_all
@@ -1240,7 +1241,7 @@ class Dossier < ApplicationRecord
   def find_champs_by_stable_ids(stable_ids)
     return [] if stable_ids.compact.empty?
 
-    champs_public.joins(:type_de_champ).where(types_de_champ: { stable_id: stable_ids })
+    champs.joins(:type_de_champ).where(types_de_champ: { stable_id: stable_ids })
   end
 
   def skip_user_notification_email?

spec/models/concern/dossier_prefillable_concern_spec.rb

@@ -2,10 +2,11 @@
 
 RSpec.describe DossierPrefillableConcern do
   describe '.prefill!' do
-    let(:procedure) { create(:procedure, :published) }
+    let(:procedure) { create(:procedure, :published, types_de_champ_public:) }
     let(:dossier) { create(:dossier, :brouillon, procedure: procedure) }
+    let(:types_de_champ_public) { [] }
 
-    subject(:fill) { dossier.prefill!(values) }
+    subject(:fill) { dossier.prefill!(values); dossier.reload }
 
     context 'when champs_public_attributes is empty' do
       let(:values) { [] }
@@ -18,11 +19,12 @@ RSpec.describe DossierPrefillableConcern do
 
     context 'when champs_public_attributes has values' do
       context 'when the champs are valid' do
-        let!(:type_de_champ_1) { create(:type_de_champ_text, procedure: procedure) }
+        let(:types_de_champ_public) { [{ type: :text }, { type: :phone }] }
+        let(:type_de_champ_1) { procedure.published_revision.types_de_champ_public.first }
         let(:value_1) { "any value" }
         let(:champ_id_1) { find_champ_by_stable_id(dossier, type_de_champ_1.stable_id).id }
 
-        let!(:type_de_champ_2) { create(:type_de_champ_phone, procedure: procedure) }
+        let(:type_de_champ_2) { procedure.published_revision.types_de_champ_public.second }
         let(:value_2) { "33612345678" }
         let(:champ_id_2) { find_champ_by_stable_id(dossier, type_de_champ_2.stable_id).id }
 
@@ -39,9 +41,10 @@ RSpec.describe DossierPrefillableConcern do
       end
 
       context 'when a champ is invalid' do
-        let!(:type_de_champ) { create(:type_de_champ_phone, procedure: procedure) }
+        let(:types_de_champ_public) { [{ type: :phone }] }
+        let(:type_de_champ_1) { procedure.published_revision.types_de_champ_public.first }
         let(:value) { "a non phone value" }
-        let(:champ_id) { find_champ_by_stable_id(dossier, type_de_champ.stable_id).id }
+        let(:champ_id) { find_champ_by_stable_id(dossier, type_de_champ_1.stable_id).id }
 
         let(:values) { [{ id: champ_id, value: value }] }
 
@@ -59,6 +62,6 @@ RSpec.describe DossierPrefillableConcern do
   private
 
   def find_champ_by_stable_id(dossier, stable_id)
-    dossier.champs_public.joins(:type_de_champ).find_by(types_de_champ: { stable_id: stable_id })
+    dossier.champs.joins(:type_de_champ).find_by(types_de_champ: { stable_id: stable_id })
   end
 end

spec/models/prefill_params_spec.rb

@@ -1,16 +1,19 @@
 RSpec.describe PrefillParams do
   describe "#to_a" do
-    let(:procedure) { create(:procedure, :published) }
+    let(:procedure) { create(:procedure, :published, types_de_champ_public:, types_de_champ_private:) }
     let(:dossier) { create(:dossier, :brouillon, procedure: procedure) }
+    let(:types_de_champ_public) { [] }
+    let(:types_de_champ_private) { [] }
 
     subject(:prefill_params_array) { described_class.new(dossier, params).to_a }
 
     context "when the stable ids match the TypeDeChamp of the corresponding procedure" do
-      let!(:type_de_champ_1) { create(:type_de_champ_text, procedure: procedure) }
+      let(:types_de_champ_public) { [{ type: :text }, { type: :textarea }] }
+      let(:type_de_champ_1) { procedure.published_revision.types_de_champ_public.first }
       let(:value_1) { "any value" }
       let(:champ_id_1) { find_champ_by_stable_id(dossier, type_de_champ_1.stable_id).id }
 
-      let!(:type_de_champ_2) { create(:type_de_champ_textarea, procedure: procedure) }
+      let(:type_de_champ_2) { procedure.published_revision.types_de_champ_public.second }
       let(:value_2) { "another value" }
       let(:champ_id_2) { find_champ_by_stable_id(dossier, type_de_champ_2.stable_id).id }
 
@@ -30,7 +33,8 @@ RSpec.describe PrefillParams do
     end
 
     context "when the typed id is not prefixed by 'champ_'" do
-      let!(:type_de_champ) { create(:type_de_champ_text, procedure: procedure) }
+      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" } }
 
@@ -57,9 +61,10 @@ RSpec.describe PrefillParams do
       end
     end
 
-    shared_examples "a champ public value that is authorized" do |type_de_champ_name, value|
+    shared_examples "a champ public value that is authorized" do |type_de_champ_type, value|
-      context "when the type de champ is authorized (#{type_de_champ_name})" do
+      context "when the type de champ is authorized (#{type_de_champ_type})" do
-        let!(:type_de_champ) { create(type_de_champ_name, procedure: procedure) }
+        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(:params) { { "champ_#{type_de_champ.to_typed_id}" => value } }
@@ -70,62 +75,86 @@ RSpec.describe PrefillParams do
       end
     end
 
-    shared_examples "a champ public value that is unauthorized" do |type_de_champ_name, value|
+    shared_examples "a champ private value that is authorized" do |type_de_champ_type, value|
-      let!(:type_de_champ) { create(type_de_champ_name, procedure: procedure) }
+      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(:params) { { "champ_#{type_de_champ.to_typed_id}" => value } }
 
-      context 'when the type de champ is unauthorized (type_de_champ_name)' do
+        it "builds an array of hash(id, value) matching the given params" do
+          expect(prefill_params_array).to match([{ id: champ_id, value: value }])
+        end
+      end
+    end
+
+    shared_examples "a champ public value that is unauthorized" do |type_de_champ_type, value|
+      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 } }
+
+      context "when the type de champ is unauthorized (#{type_de_champ_type})" do
         it "filters out the param" do
           expect(prefill_params_array).to match([])
         end
       end
     end
 
-    it_behaves_like "a champ public value that is authorized", :type_de_champ_text, "value"
+    it_behaves_like "a champ public value that is authorized", :text, "value"
-    it_behaves_like "a champ public value that is authorized", :type_de_champ_textarea, "value"
+    it_behaves_like "a champ public value that is authorized", :textarea, "value"
-    it_behaves_like "a champ public value that is authorized", :type_de_champ_decimal_number, "3.14"
+    it_behaves_like "a champ public value that is authorized", :decimal_number, "3.14"
-    it_behaves_like "a champ public value that is authorized", :type_de_champ_integer_number, "42"
+    it_behaves_like "a champ public value that is authorized", :integer_number, "42"
-    it_behaves_like "a champ public value that is authorized", :type_de_champ_email, "value"
+    it_behaves_like "a champ public value that is authorized", :email, "value"
-    it_behaves_like "a champ public value that is authorized", :type_de_champ_phone, "value"
+    it_behaves_like "a champ public value that is authorized", :phone, "value"
-    it_behaves_like "a champ public value that is authorized", :type_de_champ_iban, "value"
+    it_behaves_like "a champ public value that is authorized", :iban, "value"
-    it_behaves_like "a champ public value that is authorized", :type_de_champ_civilite, "M."
+    it_behaves_like "a champ public value that is authorized", :civilite, "M."
 
-    it_behaves_like "a champ public value that is unauthorized", :type_de_champ_decimal_number, "non decimal string"
+    it_behaves_like "a champ private value that is authorized", :text, "value"
-    it_behaves_like "a champ public value that is unauthorized", :type_de_champ_integer_number, "non integer string"
+    it_behaves_like "a champ private value that is authorized", :textarea, "value"
-    it_behaves_like "a champ public value that is unauthorized", :type_de_champ_number, "value"
+    it_behaves_like "a champ private value that is authorized", :decimal_number, "3.14"
-    it_behaves_like "a champ public value that is unauthorized", :type_de_champ_communes, "value"
+    it_behaves_like "a champ private value that is authorized", :integer_number, "42"
-    it_behaves_like "a champ public value that is unauthorized", :type_de_champ_dossier_link, "value"
+    it_behaves_like "a champ private value that is authorized", :email, "value"
-    it_behaves_like "a champ public value that is unauthorized", :type_de_champ_titre_identite, "value"
+    it_behaves_like "a champ private value that is authorized", :phone, "value"
-    it_behaves_like "a champ public value that is unauthorized", :type_de_champ_checkbox, "value"
+    it_behaves_like "a champ private value that is authorized", :iban, "value"
-    it_behaves_like "a champ public value that is unauthorized", :type_de_champ_civilite, "value"
+    it_behaves_like "a champ private value that is authorized", :civilite, "M."
-    it_behaves_like "a champ public value that is unauthorized", :type_de_champ_yes_no, "value"
+
-    it_behaves_like "a champ public value that is unauthorized", :type_de_champ_date, "value"
+    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", :type_de_champ_datetime, "value"
+    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", :type_de_champ_drop_down_list, "value"
+    it_behaves_like "a champ public value that is unauthorized", :number, "value"
-    it_behaves_like "a champ public value that is unauthorized", :type_de_champ_multiple_drop_down_list, "value"
+    it_behaves_like "a champ public value that is unauthorized", :communes, "value"
-    it_behaves_like "a champ public value that is unauthorized", :type_de_champ_linked_drop_down_list, "value"
+    it_behaves_like "a champ public value that is unauthorized", :dossier_link, "value"
-    it_behaves_like "a champ public value that is unauthorized", :type_de_champ_header_section, "value"
+    it_behaves_like "a champ public value that is unauthorized", :titre_identite, "value"
-    it_behaves_like "a champ public value that is unauthorized", :type_de_champ_explication, "value"
+    it_behaves_like "a champ public value that is unauthorized", :checkbox, "value"
-    it_behaves_like "a champ public value that is unauthorized", :type_de_champ_piece_justificative, "value"
+    it_behaves_like "a champ public value that is unauthorized", :civilite, "value"
-    it_behaves_like "a champ public value that is unauthorized", :type_de_champ_repetition, "value"
+    it_behaves_like "a champ public value that is unauthorized", :yes_no, "value"
-    it_behaves_like "a champ public value that is unauthorized", :type_de_champ_cnaf, "value"
+    it_behaves_like "a champ public value that is unauthorized", :date, "value"
-    it_behaves_like "a champ public value that is unauthorized", :type_de_champ_dgfip, "value"
+    it_behaves_like "a champ public value that is unauthorized", :datetime, "value"
-    it_behaves_like "a champ public value that is unauthorized", :type_de_champ_pole_emploi, "value"
+    it_behaves_like "a champ public value that is unauthorized", :drop_down_list, "value"
-    it_behaves_like "a champ public value that is unauthorized", :type_de_champ_mesri, "value"
+    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", :type_de_champ_carte, "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", :type_de_champ_address, "value"
+    it_behaves_like "a champ public value that is unauthorized", :header_section, "value"
-    it_behaves_like "a champ public value that is unauthorized", :type_de_champ_pays, "value"
+    it_behaves_like "a champ public value that is unauthorized", :explication, "value"
-    it_behaves_like "a champ public value that is unauthorized", :type_de_champ_regions, "value"
+    it_behaves_like "a champ public value that is unauthorized", :piece_justificative, "value"
-    it_behaves_like "a champ public value that is unauthorized", :type_de_champ_departements, "value"
+    it_behaves_like "a champ public value that is unauthorized", :repetition, "value"
-    it_behaves_like "a champ public value that is unauthorized", :type_de_champ_siret, "value"
+    it_behaves_like "a champ public value that is unauthorized", :cnaf, "value"
-    it_behaves_like "a champ public value that is unauthorized", :type_de_champ_rna, "value"
+    it_behaves_like "a champ public value that is unauthorized", :dgfip, "value"
-    it_behaves_like "a champ public value that is unauthorized", :type_de_champ_annuaire_education, "value"
+    it_behaves_like "a champ public value that is unauthorized", :pole_emploi, "value"
+    it_behaves_like "a champ public value that is unauthorized", :mesri, "value"
+    it_behaves_like "a champ public value that is unauthorized", :carte, "value"
+    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"
+    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"
   end
 
   private
 
   def find_champ_by_stable_id(dossier, stable_id)
-    dossier.champs_public.joins(:type_de_champ).find_by(types_de_champ: { stable_id: stable_id })
+    dossier.champs.joins(:type_de_champ).find_by(types_de_champ: { stable_id: stable_id })
   end
 end