Addressing review comments

1 files changed, 9 insertions, 90 deletions

diff --git a/app/models/concerns/relative_positioning.rb b/app/models/concerns/relative_positioning.rb
index 4cb7048acda..2fb711dabc3 100644
--- a/app/models/concerns/relative_positioning.rb
+++ b/app/models/concerns/relative_positioning.rb
@@ -4,10 +4,6 @@ module RelativePositioning
   MIN_POSITION = 0
   MAX_POSITION = Gitlab::Database::MAX_INT_VALUE
 
-  included do
-    after_save :save_positionable_neighbours
-  end
-
   def min_relative_position
     self.class.in_projects(project.id).minimum(:relative_position)
   end
@@ -16,92 +12,24 @@ module RelativePositioning
     self.class.in_projects(project.id).maximum(:relative_position)
   end
 
-  def prev_relative_position
-    prev_pos = nil
-
-    if self.relative_position
-      prev_pos = self.class.
-        in_projects(project.id).
-        where('relative_position < ?', self.relative_position).
-        maximum(:relative_position)
-    end
-
-    prev_pos || MIN_POSITION
-  end
-
-  def next_relative_position
-    next_pos = nil
-
-    if self.relative_position
-      next_pos = self.class.
-        in_projects(project.id).
-        where('relative_position > ?', self.relative_position).
-        minimum(:relative_position)
-    end
-
-    next_pos || MAX_POSITION
-  end
-
   def move_between(before, after)
-    return move_after(before) if before && !after
-    return move_before(after) if after && !before
+    return move_to_end unless after
+    return move_to_top unless before
 
     pos_before = before.relative_position
     pos_after = after.relative_position
 
-    if pos_before && pos_after
-      if pos_before == pos_after
-        self.relative_position = pos_before
-        before.move_before(self)
-        after.move_after(self)
-
-        @positionable_neighbours = [before, after]
-      else
-        self.relative_position = position_between(pos_before, pos_after)
-      end
-    elsif pos_before
-      self.move_after(before)
-      after.move_after(self)
-
-      @positionable_neighbours = [after]
-    elsif pos_after
-      self.move_before(after)
-      before.move_before(self)
-
-      @positionable_neighbours = [before]
-    else
-      move_to_end
-      before.move_before(self)
-      after.move_after(self)
-
-      @positionable_neighbours = [before, after]
-    end
-  end
-
-  def move_before(after)
-    pos_after = after.relative_position
-
-    if pos_after
-      self.relative_position = position_between(MIN_POSITION, pos_after)
+    if pos_after && (pos_before == pos_after)
+      self.relative_position = pos_before
+      before.decrement! :relative_position
+      after.increment! :relative_position
     else
-      move_to_end
-      after.move_after(self)
-
-      @positionable_neighbours = [after]
+      self.relative_position = position_between(pos_before, pos_after)
     end
   end
 
-  def move_after(before)
-    pos_before = before.relative_position
-
-    if pos_before
-      self.relative_position = position_between(pos_before, MAX_POSITION)
-    else
-      move_to_end
-      before.move_before(self)
-
-      @positionable_neighbours = [before]
-    end
+  def move_to_top
+    self.relative_position = position_between(MIN_POSITION, min_relative_position)
   end
 
   def move_to_end
@@ -129,13 +57,4 @@ module RelativePositioning
 
     rand(pos_before.next..pos_after.pred)
   end
-
-  def save_positionable_neighbours
-    return unless @positionable_neighbours
-
-    status = @positionable_neighbours.all?(&:save)
-    @positionable_neighbours = nil
-
-    status
-  end
 end