add support for order

Author: SamSaffron

lib/personas/tools/researcher.rb

@@ -39,6 +39,8 @@ def filter_description
               - groups (group:group1,group2).
               - status (status:open, status:closed, status:archived, status:noreplies, status:single_user)
               - keywords (keywords:keyword1,keyword2) - specific words to search for in posts
+              - max_results (max_results:10) the maximum number of results to return (optional)
+              - order (order:latest, order:oldest, order:latest_topic, order:oldest_topic) - the order of the results (optional)
 
               If multiple tags or categories are specified, they are treated as OR conditions.
 

lib/utils/research/filter.rb

@@ -163,17 +163,51 @@ def self.word_to_date(str)
           end
         end
 
+        register_filter(/\Amax_results:(\d+)\z/i) do |relation, limit_str, filter|
+          filter.limit_by_user!(limit_str.to_i)
+          relation
+        end
+
+        register_filter(/\Aorder:latest\z/i) do |relation, order_str, filter|
+          filter.set_order!(:latest_post)
+          relation
+        end
+
+        register_filter(/\Aorder:oldest\z/i) do |relation, order_str, filter|
+          filter.set_order!(:oldest_post)
+          relation
+        end
+
+        register_filter(/\Aorder:latest_topic\z/i) do |relation, order_str, filter|
+          filter.set_order!(:latest_topic)
+          relation
+        end
+
+        register_filter(/\Aorder:oldest_topic\z/i) do |relation, order_str, filter|
+          filter.set_order!(:oldest_topic)
+          relation
+        end
+
         def initialize(term, guardian: nil, limit: nil, offset: nil)
           @term = term.to_s
           @guardian = guardian || Guardian.new
           @limit = limit
           @offset = offset
           @filters = []
           @valid = true
+          @order = :latest_post
 
           @term = process_filters(@term)
         end
 
+        def set_order!(order)
+          @order = order
+        end
+
+        def limit_by_user!(limit)
+          @limit = limit if limit.to_i < @limit.to_i || @limit.nil?
+        end
+
         def search
           filtered = Post.secured(@guardian).joins(:topic).merge(Topic.secured(@guardian))
 
@@ -184,6 +218,16 @@ def search
           filtered = filtered.limit(@limit) if @limit.to_i > 0
           filtered = filtered.offset(@offset) if @offset.to_i > 0
 
+          if @order == :latest_post
+            filtered = filtered.order("posts.created_at DESC")
+          elsif @order == :oldest_post
+            filtered = filtered.order("posts.created_at ASC")
+          elsif @order == :latest_topic
+            filtered = filtered.order("topics.created_at DESC, posts.post_number DESC")
+          elsif @order == :oldest_topic
+            filtered = filtered.order("topics.created_at ASC, posts.post_number ASC")
+          end
+
           filtered
         end
 
@@ -199,13 +243,6 @@ def process_filters(term)
             .map do |(word, _)|
               next if word.blank?
 
-              # Check for order:xxx syntax
-              if word =~ /\Aorder:(\w+)\z/i
-                @order = $1.downcase.to_sym
-                next nil
-              end
-
-              # Check registered filters
               found = false
               self.class.registered_filters.each do |matcher, block|
                 if word =~ matcher

spec/lib/utils/research/filter_spec.rb

@@ -92,6 +92,11 @@
       end
     end
 
+    it "can limit number of results" do
+      filter = described_class.new("category:Feedback max_results:1", limit: 5)
+      expect(filter.search.pluck(:id).length).to eq(1)
+    end
+
     describe "full text keyword searching" do
       before_all { SearchIndexer.enable }
       fab!(:post_with_apples) do