review: validate prefilled champs only

app/models/champ.rb

@@ -5,6 +5,7 @@
 #  id                             :integer          not null, primary key
 #  data                           :jsonb
 #  fetch_external_data_exceptions :string           is an Array
+#  prefilled                      :boolean          default(FALSE)
 #  private                        :boolean          default(FALSE), not null
 #  rebased_at                     :datetime
 #  row                            :integer
@@ -79,6 +80,7 @@ class Champ < ApplicationRecord
   scope :public_ordered, -> { public_only.ordered }
   scope :private_ordered, -> { private_only.ordered }
   scope :root, -> { where(parent_id: nil) }
+  scope :prefilled, -> { where(prefilled: true) }
 
   before_create :set_dossier_id, if: :needs_dossier_id?
   before_validation :set_dossier_id, if: :needs_dossier_id?

app/models/champs/address_champ.rb

@@ -5,6 +5,7 @@
 #  id                             :integer          not null, primary key
 #  data                           :jsonb
 #  fetch_external_data_exceptions :string           is an Array
+#  prefilled                      :boolean          default(FALSE)
 #  private                        :boolean          default(FALSE), not null
 #  rebased_at                     :datetime
 #  row                            :integer

app/models/champs/annuaire_education_champ.rb

@@ -5,6 +5,7 @@
 #  id                             :integer          not null, primary key
 #  data                           :jsonb
 #  fetch_external_data_exceptions :string           is an Array
+#  prefilled                      :boolean          default(FALSE)
 #  private                        :boolean          default(FALSE), not null
 #  rebased_at                     :datetime
 #  row                            :integer

app/models/champs/carte_champ.rb

@@ -5,6 +5,7 @@
 #  id                             :integer          not null, primary key
 #  data                           :jsonb
 #  fetch_external_data_exceptions :string           is an Array
+#  prefilled                      :boolean          default(FALSE)
 #  private                        :boolean          default(FALSE), not null
 #  rebased_at                     :datetime
 #  row                            :integer

app/models/champs/checkbox_champ.rb

@@ -5,6 +5,7 @@
 #  id                             :integer          not null, primary key
 #  data                           :jsonb
 #  fetch_external_data_exceptions :string           is an Array
+#  prefilled                      :boolean          default(FALSE)
 #  private                        :boolean          default(FALSE), not null
 #  rebased_at                     :datetime
 #  row                            :integer

app/models/champs/civilite_champ.rb

@@ -5,6 +5,7 @@
 #  id                             :integer          not null, primary key
 #  data                           :jsonb
 #  fetch_external_data_exceptions :string           is an Array
+#  prefilled                      :boolean          default(FALSE)
 #  private                        :boolean          default(FALSE), not null
 #  rebased_at                     :datetime
 #  row                            :integer

app/models/champs/cnaf_champ.rb

@@ -5,6 +5,7 @@
 #  id                             :integer          not null, primary key
 #  data                           :jsonb
 #  fetch_external_data_exceptions :string           is an Array
+#  prefilled                      :boolean          default(FALSE)
 #  private                        :boolean          default(FALSE), not null
 #  rebased_at                     :datetime
 #  row                            :integer

app/models/champs/commune_champ.rb

@@ -5,6 +5,7 @@
 #  id                             :integer          not null, primary key
 #  data                           :jsonb
 #  fetch_external_data_exceptions :string           is an Array
+#  prefilled                      :boolean          default(FALSE)
 #  private                        :boolean          default(FALSE), not null
 #  rebased_at                     :datetime
 #  row                            :integer

app/models/champs/date_champ.rb

@@ -5,6 +5,7 @@
 #  id                             :integer          not null, primary key
 #  data                           :jsonb
 #  fetch_external_data_exceptions :string           is an Array
+#  prefilled                      :boolean          default(FALSE)
 #  private                        :boolean          default(FALSE), not null
 #  rebased_at                     :datetime
 #  row                            :integer

app/models/champs/datetime_champ.rb

@@ -5,6 +5,7 @@
 #  id                             :integer          not null, primary key
 #  data                           :jsonb
 #  fetch_external_data_exceptions :string           is an Array
+#  prefilled                      :boolean          default(FALSE)
 #  private                        :boolean          default(FALSE), not null
 #  rebased_at                     :datetime
 #  row                            :integer

app/models/champs/decimal_number_champ.rb

@@ -5,6 +5,7 @@
 #  id                             :integer          not null, primary key
 #  data                           :jsonb
 #  fetch_external_data_exceptions :string           is an Array
+#  prefilled                      :boolean          default(FALSE)
 #  private                        :boolean          default(FALSE), not null
 #  rebased_at                     :datetime
 #  row                            :integer

app/models/champs/departement_champ.rb

@@ -5,6 +5,7 @@
 #  id                             :integer          not null, primary key
 #  data                           :jsonb
 #  fetch_external_data_exceptions :string           is an Array
+#  prefilled                      :boolean          default(FALSE)
 #  private                        :boolean          default(FALSE), not null
 #  rebased_at                     :datetime
 #  row                            :integer

app/models/champs/dgfip_champ.rb

@@ -5,6 +5,7 @@
 #  id                             :integer          not null, primary key
 #  data                           :jsonb
 #  fetch_external_data_exceptions :string           is an Array
+#  prefilled                      :boolean          default(FALSE)
 #  private                        :boolean          default(FALSE), not null
 #  rebased_at                     :datetime
 #  row                            :integer

app/models/champs/dossier_link_champ.rb

@@ -5,6 +5,7 @@
 #  id                             :integer          not null, primary key
 #  data                           :jsonb
 #  fetch_external_data_exceptions :string           is an Array
+#  prefilled                      :boolean          default(FALSE)
 #  private                        :boolean          default(FALSE), not null
 #  rebased_at                     :datetime
 #  row                            :integer

app/models/champs/drop_down_list_champ.rb

@@ -5,6 +5,7 @@
 #  id                             :integer          not null, primary key
 #  data                           :jsonb
 #  fetch_external_data_exceptions :string           is an Array
+#  prefilled                      :boolean          default(FALSE)
 #  private                        :boolean          default(FALSE), not null
 #  rebased_at                     :datetime
 #  row                            :integer

app/models/champs/email_champ.rb

@@ -5,6 +5,7 @@
 #  id                             :integer          not null, primary key
 #  data                           :jsonb
 #  fetch_external_data_exceptions :string           is an Array
+#  prefilled                      :boolean          default(FALSE)
 #  private                        :boolean          default(FALSE), not null
 #  rebased_at                     :datetime
 #  row                            :integer

app/models/champs/explication_champ.rb

@@ -5,6 +5,7 @@
 #  id                             :integer          not null, primary key
 #  data                           :jsonb
 #  fetch_external_data_exceptions :string           is an Array
+#  prefilled                      :boolean          default(FALSE)
 #  private                        :boolean          default(FALSE), not null
 #  rebased_at                     :datetime
 #  row                            :integer

app/models/champs/header_section_champ.rb

@@ -5,6 +5,7 @@
 #  id                             :integer          not null, primary key
 #  data                           :jsonb
 #  fetch_external_data_exceptions :string           is an Array
+#  prefilled                      :boolean          default(FALSE)
 #  private                        :boolean          default(FALSE), not null
 #  rebased_at                     :datetime
 #  row                            :integer

app/models/champs/iban_champ.rb

@@ -5,6 +5,7 @@
 #  id                             :integer          not null, primary key
 #  data                           :jsonb
 #  fetch_external_data_exceptions :string           is an Array
+#  prefilled                      :boolean          default(FALSE)
 #  private                        :boolean          default(FALSE), not null
 #  rebased_at                     :datetime
 #  row                            :integer

app/models/champs/integer_number_champ.rb

@@ -5,6 +5,7 @@
 #  id                             :integer          not null, primary key
 #  data                           :jsonb
 #  fetch_external_data_exceptions :string           is an Array
+#  prefilled                      :boolean          default(FALSE)
 #  private                        :boolean          default(FALSE), not null
 #  rebased_at                     :datetime
 #  row                            :integer

app/models/champs/linked_drop_down_list_champ.rb

@@ -5,6 +5,7 @@
 #  id                             :integer          not null, primary key
 #  data                           :jsonb
 #  fetch_external_data_exceptions :string           is an Array
+#  prefilled                      :boolean          default(FALSE)
 #  private                        :boolean          default(FALSE), not null
 #  rebased_at                     :datetime
 #  row                            :integer

app/models/champs/mesri_champ.rb

@@ -5,6 +5,7 @@
 #  id                             :integer          not null, primary key
 #  data                           :jsonb
 #  fetch_external_data_exceptions :string           is an Array
+#  prefilled                      :boolean          default(FALSE)
 #  private                        :boolean          default(FALSE), not null
 #  rebased_at                     :datetime
 #  row                            :integer

app/models/champs/multiple_drop_down_list_champ.rb

@@ -5,6 +5,7 @@
 #  id                             :integer          not null, primary key
 #  data                           :jsonb
 #  fetch_external_data_exceptions :string           is an Array
+#  prefilled                      :boolean          default(FALSE)
 #  private                        :boolean          default(FALSE), not null
 #  rebased_at                     :datetime
 #  row                            :integer

app/models/champs/number_champ.rb

@@ -5,6 +5,7 @@
 #  id                             :integer          not null, primary key
 #  data                           :jsonb
 #  fetch_external_data_exceptions :string           is an Array
+#  prefilled                      :boolean          default(FALSE)
 #  private                        :boolean          default(FALSE), not null
 #  rebased_at                     :datetime
 #  row                            :integer

app/models/champs/pays_champ.rb

@@ -5,6 +5,7 @@
 #  id                             :integer          not null, primary key
 #  data                           :jsonb
 #  fetch_external_data_exceptions :string           is an Array
+#  prefilled                      :boolean          default(FALSE)
 #  private                        :boolean          default(FALSE), not null
 #  rebased_at                     :datetime
 #  row                            :integer

app/models/champs/phone_champ.rb

@@ -5,6 +5,7 @@
 #  id                             :integer          not null, primary key
 #  data                           :jsonb
 #  fetch_external_data_exceptions :string           is an Array
+#  prefilled                      :boolean          default(FALSE)
 #  private                        :boolean          default(FALSE), not null
 #  rebased_at                     :datetime
 #  row                            :integer

app/models/champs/piece_justificative_champ.rb

@@ -5,6 +5,7 @@
 #  id                             :integer          not null, primary key
 #  data                           :jsonb
 #  fetch_external_data_exceptions :string           is an Array
+#  prefilled                      :boolean          default(FALSE)
 #  private                        :boolean          default(FALSE), not null
 #  rebased_at                     :datetime
 #  row                            :integer

app/models/champs/pole_emploi_champ.rb

@@ -5,6 +5,7 @@
 #  id                             :integer          not null, primary key
 #  data                           :jsonb
 #  fetch_external_data_exceptions :string           is an Array
+#  prefilled                      :boolean          default(FALSE)
 #  private                        :boolean          default(FALSE), not null
 #  rebased_at                     :datetime
 #  row                            :integer

app/models/champs/region_champ.rb

@@ -5,6 +5,7 @@
 #  id                             :integer          not null, primary key
 #  data                           :jsonb
 #  fetch_external_data_exceptions :string           is an Array
+#  prefilled                      :boolean          default(FALSE)
 #  private                        :boolean          default(FALSE), not null
 #  rebased_at                     :datetime
 #  row                            :integer

app/models/champs/repetition_champ.rb

@@ -5,6 +5,7 @@
 #  id                             :integer          not null, primary key
 #  data                           :jsonb
 #  fetch_external_data_exceptions :string           is an Array
+#  prefilled                      :boolean          default(FALSE)
 #  private                        :boolean          default(FALSE), not null
 #  rebased_at                     :datetime
 #  row                            :integer

app/models/champs/rna_champ.rb

@@ -5,6 +5,7 @@
 #  id                             :integer          not null, primary key
 #  data                           :jsonb
 #  fetch_external_data_exceptions :string           is an Array
+#  prefilled                      :boolean          default(FALSE)
 #  private                        :boolean          default(FALSE), not null
 #  rebased_at                     :datetime
 #  row                            :integer

app/models/champs/siret_champ.rb

@@ -5,6 +5,7 @@
 #  id                             :integer          not null, primary key
 #  data                           :jsonb
 #  fetch_external_data_exceptions :string           is an Array
+#  prefilled                      :boolean          default(FALSE)
 #  private                        :boolean          default(FALSE), not null
 #  rebased_at                     :datetime
 #  row                            :integer

app/models/champs/text_champ.rb

@@ -5,6 +5,7 @@
 #  id                             :integer          not null, primary key
 #  data                           :jsonb
 #  fetch_external_data_exceptions :string           is an Array
+#  prefilled                      :boolean          default(FALSE)
 #  private                        :boolean          default(FALSE), not null
 #  rebased_at                     :datetime
 #  row                            :integer

app/models/champs/textarea_champ.rb

@@ -5,6 +5,7 @@
 #  id                             :integer          not null, primary key
 #  data                           :jsonb
 #  fetch_external_data_exceptions :string           is an Array
+#  prefilled                      :boolean          default(FALSE)
 #  private                        :boolean          default(FALSE), not null
 #  rebased_at                     :datetime
 #  row                            :integer

app/models/champs/titre_identite_champ.rb

@@ -5,6 +5,7 @@
 #  id                             :integer          not null, primary key
 #  data                           :jsonb
 #  fetch_external_data_exceptions :string           is an Array
+#  prefilled                      :boolean          default(FALSE)
 #  private                        :boolean          default(FALSE), not null
 #  rebased_at                     :datetime
 #  row                            :integer

app/models/champs/yes_no_champ.rb

@@ -5,6 +5,7 @@
 #  id                             :integer          not null, primary key
 #  data                           :jsonb
 #  fetch_external_data_exceptions :string           is an Array
+#  prefilled                      :boolean          default(FALSE)
 #  private                        :boolean          default(FALSE), not null
 #  rebased_at                     :datetime
 #  row                            :integer

app/models/concerns/dossier_prefillable_concern.rb

@@ -6,7 +6,7 @@ module DossierPrefillableConcern
   def prefill!(champs_public_attributes)
     return unless champs_public_attributes.any?
 
-    assign_attributes(champs_public_attributes: champs_public_attributes)
+    assign_attributes(champs_public_attributes: champs_public_attributes.map { |h| h.merge(prefilled: true) })
     save(validate: false)
   end
 end

app/models/dossier.rb

@@ -83,6 +83,7 @@ class Dossier < ApplicationRecord
   has_many :champs_public, -> { root.public_ordered }, class_name: 'Champ', inverse_of: false, dependent: :destroy
   has_many :champs_private, -> { root.private_ordered }, class_name: 'Champ', inverse_of: false, dependent: :destroy
   has_many :champs_public_all, -> { public_only }, class_name: 'Champ', inverse_of: false
+  has_many :prefilled_champs_public, -> { root.public_only.prefilled }, class_name: 'Champ', inverse_of: false, dependent: :destroy
   has_many :commentaires, inverse_of: :dossier, dependent: :destroy
   has_many :invites, dependent: :destroy
   has_many :follows, -> { active }, inverse_of: :dossier
@@ -434,7 +435,7 @@ class Dossier < ApplicationRecord
   validates :individual, presence: true, if: -> { revision.procedure.for_individual? }
   validates :groupe_instructeur, presence: true, if: -> { !brouillon? }
 
-  validates_associated :champs_public, on: :prefilling
+  validates_associated :prefilled_champs_public, on: :prefilling
 
   def types_de_champ_public
     types_de_champ

db/migrate/20221201103802_add_prefilled_to_champs.rb

@@ -0,0 +1,5 @@
+class AddPrefilledToChamps < ActiveRecord::Migration[6.1]
+  def change
+    add_column :champs, :prefilled, :boolean, default: false
+  end
+end

db/schema.rb

@@ -220,6 +220,7 @@ ActiveRecord::Schema.define(version: 2022_12_05_144624) do
     t.string "external_id"
     t.string "fetch_external_data_exceptions", array: true
     t.bigint "parent_id"
+    t.boolean "prefilled", default: false
     t.boolean "private", default: false, null: false
     t.datetime "rebased_at"
     t.integer "row"

spec/models/concern/dossier_prefillable_concern_spec.rb

@@ -28,10 +28,13 @@ RSpec.describe DossierPrefillableConcern do
 
         let(:values) { [{ id: champ_id_1, value: value_1 }, { id: champ_id_2, value: value_2 }] }
 
-        it "updates the champs with the new values" do
+        it "updates the champs with the new values and mark them as prefilled" do
           fill
+
           expect(dossier.champs_public.first.value).to eq(value_1)
+          expect(dossier.champs_public.first.prefilled).to eq(true)
           expect(dossier.champs_public.last.value).to eq(value_2)
+          expect(dossier.champs_public.last.prefilled).to eq(true)
         end
       end
 
@@ -45,6 +48,10 @@ RSpec.describe DossierPrefillableConcern do
         it "still updates the champ" do
           expect { fill }.to change { dossier.champs_public.first.value }.from(nil).to(value)
         end
+
+        it "still marks it as prefilled" do
+          expect { fill }.to change { dossier.champs_public.first.prefilled }.from(false).to(true)
+        end
       end
     end
   end