poc(spec): renumber only at one point

demarches-simplifiees · Jan 18, 2024 · 88bbd6f · 88bbd6f
1 parent 832fc2b
commit 88bbd6f
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 4 deletions.
diff --git a/app/models/procedure_revision.rb b/app/models/procedure_revision.rb
@@ -72,7 +72,6 @@ def find_and_ensure_exclusive_use(stable_id)
     end
   end
 
-  # []
   def move_type_de_champ(stable_id, position)
     coordinate, _ = coordinate_and_tdc(stable_id)
     siblings = coordinate.siblings
@@ -89,6 +88,12 @@ def move_type_de_champ(stable_id, position)
     coordinate
   end
 
+  def renumber(siblings)
+    siblings.to_a.compact.each.with_index do |sibling, position|
+      sibling.update_column(:position, position)
+    end
+  end
+
   def remove_type_de_champ(stable_id)
     coordinate, tdc = coordinate_and_tdc(stable_id)
 
@@ -101,12 +106,11 @@ def remove_type_de_champ(stable_id)
     children.each(&:destroy_if_orphan)
     tdc.destroy_if_orphan
 
-    coordinate.siblings.where("position >= ?", coordinate.position).update_all("position = position - 1")
-
     # they are not aware of the removal
     types_de_champ_public.reset
     types_de_champ_private.reset
 
+    coordinate.siblings.where("position >= ?", coordinate.position).update_all(position: "position - 1")
     coordinate
   end
 

diff --git a/spec/models/dossier_spec.rb b/spec/models/dossier_spec.rb
@@ -1931,7 +1931,8 @@
           procedure.publish!
           dossier
           procedure.draft_revision.remove_type_de_champ(text_type_de_champ.stable_id)
-          procedure.draft_revision.add_type_de_champ(type_champ: TypeDeChamp.type_champs.fetch(:text), libelle: 'New text field')
+          coordinate = procedure.draft_revision.add_type_de_champ(type_champ: TypeDeChamp.type_champs.fetch(:text), libelle: 'New text field')
+          procedure.draft_revision.renumber(coordinate.revision_type_de_champ.siblings)
           procedure.draft_revision.find_and_ensure_exclusive_use(yes_no_type_de_champ.stable_id).update(libelle: 'Updated yes/no')
           procedure.draft_revision.find_and_ensure_exclusive_use(commune_type_de_champ.stable_id).update(libelle: 'Commune de naissance')
           procedure.draft_revision.find_and_ensure_exclusive_use(repetition_type_de_champ.stable_id).update(libelle: 'Repetition')