tech(clean): avoid useless indirection, cleanup some code complexity,…

… rubocopify

app/models/procedure_revision.rb

@@ -38,31 +38,18 @@ def add_type_de_champ(params)
     parent_coordinate, _ = coordinate_and_tdc(parent_stable_id)
     parent_id = parent_coordinate&.id
 
-    siblings = if parent_coordinate
-      parent_coordinate.revision_types_de_champ
-    elsif params['private'] || params[:private]
-      revision_types_de_champ_private
-    else
-      revision_types_de_champ_public
-    end
-
-
     after_stable_id = params.delete(:after_stable_id)
     after_coordinate, _ = coordinate_and_tdc(after_stable_id)
 
-    if siblings.to_a.empty? # first element of the list, starts at 0
-      position = 0.0
-    elsif after_coordinate # middle of the list, between two items
-      position = after_coordinate.position + 1
-    else # last element of the list, end with last position + 1
-      position = siblings.to_a.last.position + 1.0
-    end
+    siblings = siblings_for(parent_coordinate:, private_tdc: params[:private] || params['private'])
 
     tdc = TypeDeChamp.new(params)
     if tdc.save
+      position = next_position_for(after_coordinate:, siblings:)
       h = { type_de_champ: tdc, parent_id: parent_id, position: position }
-      incr_coordinates_above(siblings, position)
-      coordinate = revision_types_de_champ.create!(h)
+
+      siblings.where("position >= ?", position).update_all("position = position + 1")
+      revision_types_de_champ.create!(h)
     end
 
     # they are not aware of the addition
@@ -88,11 +75,12 @@ def find_and_ensure_exclusive_use(stable_id)
   # []
   def move_type_de_champ(stable_id, position)
     coordinate, _ = coordinate_and_tdc(stable_id)
+    siblings = coordinate.siblings
 
     if position > coordinate.position
-      decr_siblings_between(coordinate, position)
+      siblings.where(position: coordinate.position..position).update_all("position = position - 1")
     else
-      inc_siblings_between(coordinate, position)
+      siblings.where(position: position..coordinate.position).update_all("position = position + 1")
     end
     coordinate.update_column(:position, position)
 
@@ -113,12 +101,12 @@ 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
 
-    decr_siblings_above(coordinate.siblings, coordinate.position)
-
     coordinate
   end
 
@@ -264,24 +252,26 @@ def children_types_de_champ_as_json(tdcs_as_json, parent_tdcs)
     end
   end
 
-  def incr_coordinates_above(siblings, position)
-    siblings.where("position >= ?", position).update_all("position = position + 1")
-  end
-
-  def decr_siblings_above(coordinate)
-    coordinate.siblings.where("position >= ?", coordinate.position).update_all("position = position - 1")
-  end
-
-  def decr_siblings_between(coordinate, position)
-    coordinate.siblings.where(position: coordinate.position..position).update_all("position = position - 1")
+  def siblings_for(parent_coordinate: nil, private_tdc: false)
+    if parent_coordinate
+      parent_coordinate.revision_types_de_champ
+    elsif private_tdc
+      revision_types_de_champ_private
+    else
+      revision_types_de_champ_public
+    end
   end
 
-  def inc_siblings_between(coordinate, position)
-    coordinate.siblings.where(position: position..coordinate.position).update_all("position = position + 1")
+  def next_position_for(siblings:, after_coordinate: nil)
+    if siblings.to_a.empty? # first element of the list, starts at 0
+      0
+    elsif after_coordinate # middle of the list, between two items
+      after_coordinate.position + 1
+    else # last element of the list, end with last position + 1
+      siblings.to_a.last.position + 1
+    end
   end
 
-
-
   def compare_revision_types_de_champ(from_coordinates, to_coordinates)
     if from_coordinates == to_coordinates
       []

spec/models/procedure_revision_spec.rb

@@ -28,7 +28,7 @@
       it 'public' do
         expect { subject }.to change { draft.types_de_champ_public.size }.from(2).to(3)
         expect(draft.types_de_champ_public.last).to eq(subject)
-        expect(draft.revision_types_de_champ_public.map(&:position)).to eq([0,1,2])
+        expect(draft.revision_types_de_champ_public.map(&:position)).to eq([0, 1, 2])
 
         expect(last_coordinate.position).to eq(2)
         expect(last_coordinate.type_de_champ).to eq(subject)
@@ -41,7 +41,7 @@
       it 'private' do
         expect { subject }.to change { draft.types_de_champ_private.count }.from(1).to(2)
         expect(draft.types_de_champ_private.last).to eq(subject)
-        expect(draft.revision_types_de_champ_private.map(&:position)).to eq([0,1])
+        expect(draft.revision_types_de_champ_private.map(&:position)).to eq([0, 1])
         expect(last_coordinate.position).to eq(1)
       end
     end
@@ -52,7 +52,7 @@
       it do
         expect { subject }.to change { draft.reload.types_de_champ.count }.from(4).to(5)
         expect(draft.children_of(type_de_champ_repetition).last).to eq(subject)
-        expect(draft.children_of(type_de_champ_repetition).map(&:revision_type_de_champ).map(&:position)).to eq([0,1])
+        expect(draft.children_of(type_de_champ_repetition).map(&:revision_type_de_champ).map(&:position)).to eq([0, 1])
 
         expect(last_coordinate.position).to eq(1)
 
@@ -81,7 +81,7 @@
           expect(draft.revision_types_de_champ_public.map(&:libelle)).to eq(['l1', 'l2'])
           subject
           expect(draft.revision_types_de_champ_public.reload.map(&:libelle)).to eq(['l1', 'in the middle', 'l2'])
-          expect(draft.revision_types_de_champ_public.map(&:position)).to eq([0,1,2])
+          expect(draft.revision_types_de_champ_public.map(&:position)).to eq([0, 1, 2])
         end
       end
 
@@ -106,7 +106,7 @@
         stable_id_before = draft.revision_types_de_champ_public.map(&:stable_id)
         draft.move_type_de_champ(type_de_champ_public.stable_id, 2)
         draft.reload
-        expect(draft.revision_types_de_champ_public.map(&:position)).to eq([0,1,2,3])
+        expect(draft.revision_types_de_champ_public.map(&:position)).to eq([0, 1, 2, 3])
         expect(draft.types_de_champ_public.index(type_de_champ_public)).to eq(2)
         expect(draft.procedure.types_de_champ_for_procedure_presentation.not_repetition.index(type_de_champ_public)).to eq(2)
       end
@@ -115,7 +115,7 @@
         expect(draft.types_de_champ_public.index(last_type_de_champ)).to eq(3)
         draft.move_type_de_champ(last_type_de_champ.stable_id, 0)
         draft.reload
-        expect(draft.revision_types_de_champ_public.map(&:position)).to eq([0,1,2,3])
+        expect(draft.revision_types_de_champ_public.map(&:position)).to eq([0, 1, 2, 3])
         expect(draft.types_de_champ_public.index(last_type_de_champ)).to eq(0)
         expect(draft.procedure.types_de_champ_for_procedure_presentation.not_repetition.index(last_type_de_champ)).to eq(0)
       end