WIP

app/controllers/api/public/v1/dossiers_controller.rb

@@ -7,7 +7,7 @@ def create
       state: Dossier.states.fetch(:brouillon),
       prefilled: true
     )
-    dossier.build_default_individual
+    dossier.build_default_values
     if dossier.save
       dossier.prefill!(PrefillChamps.new(dossier, params.to_unsafe_h).to_a, PrefillIdentity.new(dossier, params.to_unsafe_h).to_h)
       render json: serialize_dossier(dossier), status: :created

app/controllers/api/v1/dossiers_controller.rb

@@ -16,6 +16,7 @@ def index
 
   def show
     dossier = @dossiers.for_api.find(params[:id])
+    DossierPreloader.load_one(dossier)
 
     render json: { dossier: DossierSerializer.new(dossier).as_json }
   rescue ActiveRecord::RecordNotFound

app/controllers/champs/repetition_controller.rb

@@ -1,13 +1,12 @@
 class Champs::RepetitionController < Champs::ChampController
   def add
-    row = @champ.add_row(@champ.dossier.revision)
-    @first_champ_id = row.map(&:focusable_input_id).compact.first
-    @row_id = row.first&.row_id
+    @row_id = @champ.add_row(updated_by: current_user.email)
+    @first_champ_id = @champ.focusable_input_id
     @row_number = @row_id.nil? ? 0 : @champ.row_ids.find_index(@row_id) + 1
   end
 
   def remove
-    @champ.remove_row(params[:row_id])
+    @champ.remove_row(params[:row_id], updated_by: current_user.email)
     @to_remove = "safe-row-selector-#{params[:row_id]}"
     @to_focus = @champ.focusable_input_id || helpers.dom_id(@champ, :create_repetition)
   end

app/controllers/users/commencer_controller.rb

@@ -116,7 +116,7 @@ def build_prefilled_dossier
         state: Dossier.states.fetch(:brouillon),
         prefilled: true
       )
-      @prefilled_dossier.build_default_individual
+      @prefilled_dossier.build_default_values
       if @prefilled_dossier.save
         @prefilled_dossier.prefill!(PrefillChamps.new(@prefilled_dossier, params.to_unsafe_h).to_a, PrefillIdentity.new(@prefilled_dossier, params.to_unsafe_h).to_h)
       end

app/controllers/users/dossiers_controller.rb

@@ -391,7 +391,7 @@ def new
         user: current_user,
         state: Dossier.states.fetch(:brouillon)
       )
-      dossier.build_default_individual
+      dossier.build_default_values
       dossier.save!
       DossierMailer.with(dossier:).notify_new_draft.deliver_later
 

app/graphql/mutations/dossier_modifier_annotation_ajouter_ligne.rb

@@ -14,7 +14,7 @@ def resolve(dossier:, annotation_id:, instructeur:)
         return { errors: ["L’annotation \"#{annotation_id}\" n’existe pas"] }
       end
 
-      annotation.add_row(dossier.revision)
+      annotation.add_row(updated_by: instructeur.email)
 
       { annotation:, errors: nil }
     end

app/graphql/types/dossier_type.rb

@@ -168,7 +168,7 @@ def champs(id: nil)
           .for(object, private: false)
           .load(ApplicationRecord.id_from_typed_id(id))
       else
-        object.champs_for_revision(scope: :public, root: true).filter(&:visible?)
+        object.project_champs_public.filter(&:visible?)
       end
     end
 
@@ -178,7 +178,7 @@ def annotations(id: nil)
           .for(object, private: true)
           .load(ApplicationRecord.id_from_typed_id(id))
       else
-        object.champs_for_revision(scope: :private, root: true).filter(&:visible?)
+        object.project_champs_private.filter(&:visible?)
       end
     end
 

app/models/attestation_template.rb

@@ -85,13 +85,13 @@ def attestation_for(dossier)
   end
 
   def unspecified_champs_for_dossier(dossier)
-    champs_by_stable_id = dossier.champs_for_revision(root: true).index_by { "tdc#{_1.stable_id}" }
+    champs_by_stable_id = dossier.revision.types_de_champ.index_by { "tdc#{_1.stable_id}" }
 
     used_tags.filter_map do |used_tag|
-      corresponding_champ = champs_by_stable_id[used_tag]
+      corresponding_type_de_champ = champs_by_stable_id[used_tag]
 
-      if corresponding_champ && corresponding_champ.blank?
-        corresponding_champ
+      if corresponding_type_de_champ && dossier.project_champ(corresponding_type_de_champ, nil).blank?
+        corresponding_type_de_champ
       end
     end
   end

app/models/champ.rb

@@ -1,18 +1,18 @@
 class Champ < ApplicationRecord
+  self.ignored_columns += [:parent_id]
+
   include ChampConditionalConcern
   include ChampsValidateConcern
 
   self.ignored_columns += [:type_de_champ_id]
 
   belongs_to :dossier, inverse_of: false, touch: true, optional: false
-  belongs_to :parent, class_name: 'Champ', optional: true
   has_many_attached :piece_justificative_file
 
   # We declare champ specific relationships (Champs::CarteChamp, Champs::SiretChamp and Champs::RepetitionChamp)
   # here because otherwise we can't easily use includes in our queries.
   has_many :geo_areas, -> { order(:created_at) }, dependent: :destroy, inverse_of: :champ
   belongs_to :etablissement, optional: true, dependent: :destroy
-  has_many :champs, foreign_key: :parent_id, inverse_of: :parent
 
   delegate :procedure, to: :dossier
 
@@ -81,18 +81,18 @@ def type_de_champ
   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?
   before_save :cleanup_if_empty
   before_save :normalize
   after_update_commit :fetch_external_data_later
 
+  store_accessor :value_json, :row_deleted_at
+
   def public?
     !private?
   end
 
   def child?
-    parent_id.present?
+    row_id.present? && !repetition?
   end
 
   # used for the `required` html attribute
@@ -229,7 +229,7 @@ def update_with_external_data!(data:)
   end
 
   def clone(fork = false)
-    champ_attributes = [:parent_id, :private, :row_id, :type, :stable_id, :stream]
+    champ_attributes = [:private, :row_id, :type, :stable_id, :stream]
     value_attributes = fork || !private? ? [:value, :value_json, :data, :external_id] : []
     relationships = fork || !private? ? [:etablissement, :geo_areas] : []
 
@@ -262,14 +262,6 @@ def html_id
     "champ-#{public_id}"
   end
 
-  def needs_dossier_id?
-    !dossier_id && parent_id
-  end
-
-  def set_dossier_id
-    self.dossier_id = parent.dossier_id
-  end
-
   def cleanup_if_empty
     if fetch_external_data? && persisted? && external_id_changed?
       self.data = nil

app/models/champs/repetition_champ.rb

@@ -1,41 +1,28 @@
 class Champs::RepetitionChamp < Champ
-  accepts_nested_attributes_for :champs
+  delegate :libelle_for_export, to: :type_de_champ
 
   def rows
-    dossier
-      .champs_for_revision(scope: type_de_champ)
-      .group_by(&:row_id)
-      .sort
-      .map(&:second)
+    dossier.project_rows_for(type_de_champ)
   end
 
   def row_ids
-    rows.map { _1.first.row_id }
+    dossier.repetition_row_ids(type_de_champ)
   end
 
-  def add_row(revision)
-    added_champs = []
-    transaction do
-      row_id = ULID.generate
-      revision.children_of(type_de_champ).each do |type_de_champ|
-        added_champs << type_de_champ.build_champ(row_id:)
-      end
-      self.champs << added_champs
-    end
-    added_champs
+  def add_row(updated_by:)
+    dossier.repetition_add_row(type_de_champ, updated_by:)
   end
 
-  def remove_row(row_id)
-    dossier.champs.where(row_id:).destroy_all
-    dossier.champs.reload
+  def remove_row(row_id, updated_by:)
+    dossier.repetition_remove_row(type_de_champ, row_id, updated_by:)
   end
 
   def focusable_input_id
     rows.last&.first&.focusable_input_id
   end
 
   def blank?
-    champs.empty?
+    row_ids.empty?
   end
 
   def search_terms

app/models/concerns/champs_validate_concern.rb

@@ -14,9 +14,9 @@ def valid_champ_value?
     def validate_champ_value?
       case validation_context
       when :champs_public_value
-        public? && visible?
+        public? && in_dossier_revision? && visible?
       when :champs_private_value
-        private? && visible?
+        private? && in_dossier_revision? && visible?
       else
         false
       end
@@ -25,5 +25,9 @@ def validate_champ_value?
     def validate_champ_value_or_prefill?
       validate_champ_value? || validation_context == :prefill
     end
+
+    def in_dossier_revision?
+      dossier.revision.types_de_champ.any? { _1.stable_id = stable_id }
+    end
   end
 end