Refactor sorting in project

2 files changed, 16 insertions, 19 deletions

diff --git a/app/models/concerns/issuable.rb b/app/models/concerns/issuable.rb
index fb038a3cc3f..9bc0dfb3574 100644
--- a/app/models/concerns/issuable.rb
+++ b/app/models/concerns/issuable.rb
@@ -54,15 +54,7 @@ module Issuable
     end
 
     def sort(method)
-      case method.to_s
-      when 'newest' then reorder("#{table_name}.created_at DESC")
-      when 'oldest' then reorder("#{table_name}.created_at ASC")
-      when 'recently_updated' then reorder("#{table_name}.updated_at DESC")
-      when 'last_updated' then reorder("#{table_name}.updated_at ASC")
-      when 'milestone_due_soon' then joins(:milestone).reorder("milestones.due_date ASC")
-      when 'milestone_due_later' then joins(:milestone).reorder("milestones.due_date DESC")
-      else reorder("#{table_name}.created_at DESC")
-      end
+      order_by(method)
     end
   end
 
diff --git a/app/models/concerns/sortable.rb b/app/models/concerns/sortable.rb
index dc46b2e5463..c894dbda6ef 100644
--- a/app/models/concerns/sortable.rb
+++ b/app/models/concerns/sortable.rb
@@ -9,21 +9,26 @@ module Sortable
     # By default all models should be ordered
     # by created_at field starting from newest
     default_scope { order(created_at: :desc, id: :desc) }
-    scope :order_name, -> { reorder(name: :asc) }
-    scope :order_recent, -> { reorder(created_at: :desc, id: :desc) }
-    scope :order_oldest, -> { reorder(created_at: :asc, id: :asc) }
-    scope :order_recent_updated, -> { reorder(updated_at: :desc, id: :desc) }
-    scope :order_oldest_updated, -> { reorder(updated_at: :asc, id: :asc) }
+
+    scope :order_name_asc, -> { reorder(name: :asc) }
+    scope :order_created_desc, -> { reorder(created_at: :desc, id: :desc) }
+    scope :order_created_asc, -> { reorder(created_at: :asc, id: :asc) }
+    scope :order_updated_desc, -> { reorder(updated_at: :desc, id: :desc) }
+    scope :order_updated_asc, -> { reorder(updated_at: :asc, id: :asc) }
+    scope :order_milestone_due_desc, -> { joins(:milestone).reorder('milestones.due_date DESC, milestones.id DESC') }
+    scope :order_milestone_due_asc, -> { joins(:milestone).reorder('milestones.due_date ASC, milestones.id ASC') }
   end
 
   module ClassMethods
     def order_by(method)
       case method.to_s
-      when 'name' then order_name_asc
-      when 'recent' then order_recent
-      when 'oldest' then order_oldest
-      when 'recent_updated' then order_recent_updated
-      when 'oldest_updated' then order_oldest_updated
+      when 'name_asc' then order_name_asc
+      when 'updated_asc' then order_updated_asc
+      when 'updated_desc' then order_updated_desc
+      when 'created_asc' then order_created_asc
+      when 'created_desc' then order_created_desc
+      when 'milestone_due_asc' then order_milestone_due_asc
+      when 'milestone_due_desc' then order_milestone_due_desc
       else
         all
       end