Support region name filter and aggs for search

Author: longhotsummer

lib/steno/elasticsearch.rb

@@ -75,7 +75,10 @@ def define_mapping!
       })
     end
 
-    def search(q, from=0, size=10)
+    def search(q, from=0, size=10, region_name=nil)
+      filters = {}
+      filters = {term: {region_name: region_name}} if region_name
+
       @es.search(index: @ix, body: {
         query: {
           multi_match: {
@@ -84,9 +87,18 @@ def search(q, from=0, size=10)
             fields: ['title', 'content'],
           }
         },
-        fields: ['frbr_uri', 'repealed', 'published_on', 'title', 'url', 'region_name'],
+        fields: ['frbr_uri', 'repealed', 'published_on', 'title', 'url', 'region_name', 'region'],
+        from: from,
+        size: size,
+        sort: {'_score' => {order: 'desc'}},
+        # filter after searching so filtering doesn't impact aggs
+        post_filter: filters,
+        # count by region name
+        aggs: {region_names: {terms: {field: 'region_name'}}},
         highlight: {
           order: "score",
+          pre_tags: ['<mark>'],
+          post_tags: ['</mark>'],
           fields: {
             content: {
               fragment_size: 80,
@@ -96,14 +108,7 @@ def search(q, from=0, size=10)
               number_of_fragments: 0, # entire field
             }
           },
-          pre_tags: ['<mark>'],
-          post_tags: ['</mark>'],
         },
-        from: from,
-        size: size,
-        sort: {
-          '_score' => {order: 'desc'}
-        }
       })
     end
   end

steno_app.rb

@@ -235,7 +235,7 @@ class StenoApp < Sinatra::Base
       }.to_json
     end
 
-    results = Steno::Search.searcher.search(params[:q])
+    results = Steno::Search.searcher.search(params[:q], 0, 10, params[:region_name])
 
     return results.to_json
   end