Merge pull request #385 from griffithlab/fix-user-event-sorting

Share sorting clause code between controllers.

app/controllers/concerns/with_sorting.rb

@@ -0,0 +1,13 @@
+module WithSorting
+  extend ActiveSupport::Concern
+
+  def sort_direction(field_name)
+    if params["sorting"].blank?
+      'DESC'
+    elsif params["sorting"][field_name].present? && params["sorting"][field_name].upcase == 'DESC'
+      'DESC'
+    else
+      'ASC'
+    end
+  end
+end

app/controllers/events_controller.rb

@@ -1,24 +1,14 @@
 class EventsController < ApplicationController
+  include WithSorting
+
   actions_without_auth :index
 
   def index
     events = Event.includes(:originating_user, :subject)
       .page(params[:page])
       .per(params[:count])
-      .order("events.created_at #{sort_clause}")
+      .order("events.created_at #{sort_direction('timestamp')}")
 
     render json: EventsPresenter.new(events)
   end
-
-
-  private
-  def sort_clause
-    if params["sorting"].blank?
-      'DESC'
-    elsif params["sorting"]["timestamp"].present? && params["sorting"]["timestamp"].upcase == 'DESC'
-      'DESC'
-    else
-      'ASC'
-    end
-  end
 end

app/controllers/users_controller.rb

@@ -1,5 +1,6 @@
 class UsersController < ApplicationController
   include WithSoftDeletion
+  include WithSorting
 
   actions_without_auth :events, :show, :index, :username_suggestions, :username_status
 
@@ -17,7 +18,7 @@ def events
       .includes(:subject)
       .page(params[:page])
       .per(params[:count])
-      .order('created_at DESC')
+      .order("events.created_at #{sort_direction('timestamp')}")
 
     render json: EventsPresenter.new(events)
   end