Merge pull request #411 from MITLibraries/DISCO-221_facet_display_order

Updates returned order of aggregations

Author: JPrevost

Gemfile.lock

@@ -145,7 +145,7 @@ GEM
     method_source (1.0.0)
     mimemagic (0.3.5)
     mini_mime (1.0.2)
-    mini_portile2 (2.4.0)
+    mini_portile2 (2.5.0)
     minitest (5.14.2)
     mitlibraries-theme (0.4.0)
       rails (~> 5)
@@ -155,8 +155,9 @@ GEM
     multi_json (1.14.1)
     multipart-post (2.1.1)
     nio4r (2.5.4)
-    nokogiri (1.10.10)
-      mini_portile2 (~> 2.4.0)
+    nokogiri (1.11.1)
+      mini_portile2 (~> 2.5.0)
+      racc (~> 1.4)
     orm_adapter (0.5.0)
     parallel (1.20.1)
     parser (2.7.2.0)
@@ -165,6 +166,7 @@ GEM
     public_suffix (4.0.6)
     puma (5.1.0)
       nio4r (~> 2.0)
+    racc (1.5.2)
     rack (2.2.3)
     rack-attack (6.3.1)
       rack (>= 1.0, < 3)

app/views/api/v1/search/_aggregations.json.jbuilder

@@ -1,21 +1,26 @@
 json.aggregations do
-  json.language @results['aggregations']['languages']['buckets'] do |x|
+  json.source @results['aggregations']['source']['buckets'] do |x|
     json.name x['key']
     json.count x['doc_count']
   end
 
-  if @results['aggregations']['collections']
-    json.collection @results['aggregations']['collections']['buckets'] do |x|
-      json.name x['key']
-      json.count x['doc_count']
-    end
+  json.content_format @results['aggregations']['content_format']['buckets'] do |x|
+    json.name x['key']
+    json.count x['doc_count']
   end
 
   json.content_type @results['aggregations']['content_type']['buckets'] do |x|
     json.name x['key']
     json.count x['doc_count']
   end
 
+  if @results['aggregations']['collections']
+    json.collection @results['aggregations']['collections']['buckets'] do |x|
+      json.name x['key']
+      json.count x['doc_count']
+    end
+  end
+
   json.contributor @results['aggregations']['contributors']['contributor_names']['buckets'] do |x|
     json.name x['key']
     json.count x['doc_count']
@@ -26,7 +31,7 @@ json.aggregations do
     json.count x['doc_count']
   end
 
-  json.content_format @results['aggregations']['content_format']['buckets'] do |x|
+  json.language @results['aggregations']['languages']['buckets'] do |x|
     json.name x['key']
     json.count x['doc_count']
   end
@@ -35,9 +40,4 @@ json.aggregations do
     json.name x['key']
     json.count x['doc_count']
   end
-
-  json.source @results['aggregations']['source']['buckets'] do |x|
-    json.name x['key']
-    json.count x['doc_count']
-  end
 end