feat: Add support for ascending and descending options in sort (#8542)

app/finders/conversation_finder.rb

@@ -3,13 +3,21 @@ class ConversationFinder
 
   DEFAULT_STATUS = 'open'.freeze
   SORT_OPTIONS = {
-    latest: 'latest',
-    sort_on_created_at: 'sort_on_created_at',
-    last_user_message_at: 'last_user_message_at',
-    sort_on_priority: 'sort_on_priority',
-    sort_on_waiting_since: 'sort_on_waiting_since'
-  }.with_indifferent_access
+    'last_activity_at_asc' => %w[sort_on_last_activity_at asc],
+    'last_activity_at_desc' => %w[sort_on_last_activity_at desc],
+    'created_at_asc' => %w[sort_on_created_at asc],
+    'created_at_desc' => %w[sort_on_created_at desc],
+    'priority_asc' => %w[sort_on_priority asc],
+    'priority_desc' => %w[sort_on_priority desc],
+    'waiting_since_asc' => %w[sort_on_waiting_since asc],
+    'waiting_since_desc' => %w[sort_on_waiting_since desc],
 
+    # To be removed in v3.5.0
+    'latest' => %w[sort_on_last_activity_at desc],
+    'sort_on_created_at' => %w[sort_on_created_at asc],
+    'sort_on_priority' => %w[sort_on_priority desc],
+    'sort_on_waiting_since' => %w[sort_on_waiting_since asc]
+  }.with_indifferent_access
   # assumptions
   # inbox_id if not given, take from all conversations, else specific to inbox
   # assignee_type if not given, take 'all'
@@ -159,7 +167,8 @@ class ConversationFinder
     @conversations = @conversations.includes(
       :taggings, :inbox, { assignee: { avatar_attachment: [:blob] } }, { contact: { avatar_attachment: [:blob] } }, :team, :contact_inbox
     )
-    sort_by = SORT_OPTIONS[params[:sort_by]] || SORT_OPTIONS['latest']
-    @conversations.send(sort_by).page(current_page).per(ENV.fetch('CONVERSATION_RESULTS_PER_PAGE', '25').to_i)
+
+    sort_by, sort_order = SORT_OPTIONS[params[:sort_by]] || SORT_OPTIONS['last_activity_at_desc']
+    @conversations.send(sort_by, sort_order).page(current_page).per(ENV.fetch('CONVERSATION_RESULTS_PER_PAGE', '25').to_i)
   end
 end

app/models/concerns/sort_handler.rb

@@ -1,41 +1,37 @@
 module SortHandler
   extend ActiveSupport::Concern
 
-  included do
-    def self.latest
-      order(last_activity_at: :desc)
+  class_methods do
+    def sort_on_last_activity_at(sort_direction = :desc)
+      order(last_activity_at: sort_direction)
     end
 
-    def self.sort_on_created_at
-      order(created_at: :asc)
+    def sort_on_created_at(sort_direction = :asc)
+      order(created_at: sort_direction)
     end
 
-    def self.last_messaged_conversations
+    def sort_on_priority(sort_direction = :desc)
+      order(generate_sql_query("priority #{sort_direction.to_s.upcase} NULLS LAST, last_activity_at DESC"))
+    end
+
+    def sort_on_waiting_since(sort_direction = :asc)
+      order(generate_sql_query("waiting_since #{sort_direction.to_s.upcase} NULLS LAST, created_at ASC"))
+    end
+
+    def last_messaged_conversations
       Message.except(:order).select(
         'DISTINCT ON (conversation_id) conversation_id, id, created_at, message_type'
       ).order('conversation_id, created_at DESC')
     end
 
-    def self.sort_on_last_user_message_at
-      order(
-        'grouped_conversations.message_type', 'grouped_conversations.created_at ASC'
-      )
+    def sort_on_last_user_message_at
+      order('grouped_conversations.message_type', 'grouped_conversations.created_at ASC')
     end
 
-    def self.sort_on_priority
-      order(
-        Arel::Nodes::SqlLiteral.new(
-          sanitize_sql_for_order('CASE WHEN priority IS NULL THEN 0 ELSE priority END DESC, last_activity_at DESC')
-        )
-      )
-    end
+    private
 
-    def self.sort_on_waiting_since
-      order(
-        Arel::Nodes::SqlLiteral.new(
-          sanitize_sql_for_order('CASE WHEN waiting_since IS NULL THEN now() ELSE waiting_since END ASC, created_at ASC')
-        )
-      )
+    def generate_sql_query(query)
+      Arel::Nodes::SqlLiteral.new(sanitize_sql_for_order(query))
     end
   end
 end

app/services/conversations/filter_service.rb

@@ -64,6 +64,6 @@ class Conversations::FilterService < FilterService
   end
 
   def conversations
-    @conversations.latest.page(current_page)
+    @conversations.sort_on_last_activity_at.page(current_page)
   end
 end