simplify graphql facet code

datacite · Jul 5, 2020 · 543176d · 543176d
1 parent f9c8058
commit 543176d
Show file tree

Hide file tree

Showing 29 changed files with 183 additions and 183 deletions.
diff --git a/app/graphql/types/audiovisual_connection_with_total_type.rb b/app/graphql/types/audiovisual_connection_with_total_type.rb
@@ -17,26 +17,26 @@ def total_count
   end
 
   def published
-    object.total_count.positive? ? facet_by_range(object.aggregations.published.buckets) : []
+    facet_by_range(object.aggregations.published.buckets)
   end
 
   def registration_agencies
-    object.total_count.positive? ? facet_by_registration_agency(object.aggregations.registration_agencies.buckets) : []
+    facet_by_registration_agency(object.aggregations.registration_agencies.buckets)
   end
 
   def repositories
-    object.total_count.positive? ? facet_by_combined_key(object.aggregations.clients.buckets) : []
+    facet_by_combined_key(object.aggregations.clients.buckets)
   end
 
   def affiliations
-    object.total_count.positive? ? facet_by_combined_key(object.aggregations.affiliations.buckets) : []
+    facet_by_combined_key(object.aggregations.affiliations.buckets)
   end
 
   def licenses
-    object.total_count.positive? ? facet_by_license(object.aggregations.licenses.buckets) : []
+    facet_by_license(object.aggregations.licenses.buckets)
   end
 
   def languages
-    object.total_count.positive? ? facet_by_language(object.aggregations.languages.buckets) : []
+    facet_by_language(object.aggregations.languages.buckets)
   end
 end
diff --git a/app/graphql/types/book_chapter_connection_with_total_type.rb b/app/graphql/types/book_chapter_connection_with_total_type.rb
@@ -17,26 +17,26 @@ def total_count
   end
 
   def published
-    object.total_count.positive? ? facet_by_range(object.aggregations.published.buckets) : []
+    facet_by_range(object.aggregations.published.buckets)
   end
 
   def registration_agencies
-    object.total_count.positive? ? facet_by_registration_agency(object.aggregations.registration_agencies.buckets) : []
+    facet_by_registration_agency(object.aggregations.registration_agencies.buckets)
   end
 
   def repositories
-    object.total_count.positive? ? facet_by_combined_key(object.aggregations.clients.buckets) : []
+    facet_by_combined_key(object.aggregations.clients.buckets)
   end
 
   def affiliations
-    object.total_count.positive? ? facet_by_combined_key(object.aggregations.affiliations.buckets) : []
+    facet_by_combined_key(object.aggregations.affiliations.buckets)
   end
 
   def licenses
-    object.total_count.positive? ? facet_by_license(object.aggregations.licenses.buckets) : []
+    facet_by_license(object.aggregations.licenses.buckets)
   end
 
   def languages
-    object.total_count.positive? ? facet_by_language(object.aggregations.languages.buckets) : []
+    facet_by_language(object.aggregations.languages.buckets)
   end
 end
diff --git a/app/graphql/types/book_connection_with_total_type.rb b/app/graphql/types/book_connection_with_total_type.rb
@@ -17,26 +17,26 @@ def total_count
   end
 
   def published
-    object.total_count.positive? ? facet_by_range(object.aggregations.published.buckets) : []
+    facet_by_range(object.aggregations.published.buckets)
   end
 
   def registration_agencies
-    object.total_count.positive? ? facet_by_registration_agency(object.aggregations.registration_agencies.buckets) : []
+    facet_by_registration_agency(object.aggregations.registration_agencies.buckets)
   end
 
   def repositories
-    object.total_count.positive? ? facet_by_combined_key(object.aggregations.clients.buckets) : []
+    facet_by_combined_key(object.aggregations.clients.buckets)
   end
 
   def affiliations
-    object.total_count.positive? ? facet_by_combined_key(object.aggregations.affiliations.buckets) : []
+    facet_by_combined_key(object.aggregations.affiliations.buckets)
   end
 
   def licenses
-    object.total_count.positive? ? facet_by_license(object.aggregations.licenses.buckets) : []
+    facet_by_license(object.aggregations.licenses.buckets)
   end
 
   def languages
-    object.total_count.positive? ? facet_by_language(object.aggregations.languages.buckets) : []
+    facet_by_language(object.aggregations.languages.buckets)
   end
 end
diff --git a/app/graphql/types/collection_connection_with_total_type.rb b/app/graphql/types/collection_connection_with_total_type.rb
@@ -16,26 +16,26 @@ def total_count
   end
 
   def published
-    object.total_count.positive? ? facet_by_range(object.aggregations.published.buckets) : []
+    facet_by_range(object.aggregations.published.buckets)
   end
 
   def registration_agencies
-    object.total_count.positive? ? facet_by_registration_agency(object.aggregations.registration_agencies.buckets) : []
+    facet_by_registration_agency(object.aggregations.registration_agencies.buckets)
   end
 
   def repositories
-    object.total_count.positive? ? facet_by_combined_key(object.aggregations.clients.buckets) : []
+    facet_by_combined_key(object.aggregations.clients.buckets)
   end
 
   def affiliations
-    object.total_count.positive? ? facet_by_combined_key(object.aggregations.affiliations.buckets) : []
+    facet_by_combined_key(object.aggregations.affiliations.buckets)
   end
 
   def licenses
-    object.total_count.positive? ? facet_by_license(object.aggregations.licenses.buckets) : []
+    facet_by_license(object.aggregations.licenses.buckets)
   end
 
   def languages
-    object.total_count.positive? ? facet_by_language(object.aggregations.languages.buckets) : []
+    facet_by_language(object.aggregations.languages.buckets)
   end
 end
diff --git a/app/graphql/types/conference_paper_connection_with_total_type.rb b/app/graphql/types/conference_paper_connection_with_total_type.rb
@@ -18,30 +18,30 @@ def total_count
   end
 
   def published
-    object.total_count.positive? ? facet_by_range(object.aggregations.published.buckets) : []
+    facet_by_range(object.aggregations.published.buckets)
   end
 
   def registration_agencies
-    object.total_count.positive? ? facet_by_registration_agency(object.aggregations.registration_agencies.buckets) : []
+    facet_by_registration_agency(object.aggregations.registration_agencies.buckets)
   end
 
   def repositories
-    object.total_count.positive? ? facet_by_combined_key(object.aggregations.clients.buckets) : []
+    facet_by_combined_key(object.aggregations.clients.buckets)
   end
 
   def affiliations
-    object.total_count.positive? ? facet_by_combined_key(object.aggregations.affiliations.buckets) : []
+    facet_by_combined_key(object.aggregations.affiliations.buckets)
   end
 
   def fields_of_science
-    object.total_count.positive? ? facet_by_fos(object.aggregations.fields_of_science.subject.buckets) : []
+    facet_by_fos(object.aggregations.fields_of_science.subject.buckets)
   end
 
   def licenses
-    object.total_count.positive? ? facet_by_license(object.aggregations.licenses.buckets) : []
+    facet_by_license(object.aggregations.licenses.buckets)
   end
 
   def languages
-    object.total_count.positive? ? facet_by_language(object.aggregations.languages.buckets) : []
+    facet_by_language(object.aggregations.languages.buckets)
   end
 end
diff --git a/app/graphql/types/data_paper_connection_with_total_type.rb b/app/graphql/types/data_paper_connection_with_total_type.rb
@@ -17,26 +17,26 @@ def total_count
   end
 
   def published
-    object.total_count.positive? ? facet_by_range(object.aggregations.published.buckets) : []
+    facet_by_range(object.aggregations.published.buckets)
   end
 
   def registration_agencies
-    object.total_count.positive? ? facet_by_registration_agency(object.aggregations.registration_agencies.buckets) : []
+    facet_by_registration_agency(object.aggregations.registration_agencies.buckets)
   end
 
   def repositories
-    object.total_count.positive? ? facet_by_combined_key(object.aggregations.clients.buckets) : []
+    facet_by_combined_key(object.aggregations.clients.buckets)
   end
 
   def affiliations
-    object.total_count.positive? ? facet_by_combined_key(object.aggregations.affiliations.buckets) : []
+    facet_by_combined_key(object.aggregations.affiliations.buckets)
   end
 
   def licenses
-    object.total_count.positive? ? facet_by_license(object.aggregations.licenses.buckets) : []
+    facet_by_license(object.aggregations.licenses.buckets)
   end
 
   def languages
-    object.total_count.positive? ? facet_by_language(object.aggregations.languages.buckets) : []
+    facet_by_language(object.aggregations.languages.buckets)
   end
 end
diff --git a/app/graphql/types/dataset_connection_with_total_type.rb b/app/graphql/types/dataset_connection_with_total_type.rb
@@ -25,23 +25,31 @@ def total_count
   end
 
   def published
-    object.total_count.positive? ? facet_by_range(object.aggregations.published.buckets) : []
+    facet_by_range(object.aggregations.published.buckets)
   end
 
   def registration_agencies
-    object.total_count.positive? ? facet_by_registration_agency(object.aggregations.registration_agencies.buckets) : []
+    facet_by_registration_agency(object.aggregations.registration_agencies.buckets)
   end
 
   def repositories
-    object.total_count.positive? ? facet_by_combined_key(object.aggregations.clients.buckets) : []
+    facet_by_combined_key(object.aggregations.clients.buckets)
   end
 
   def affiliations
-    object.total_count.positive? ? facet_by_combined_key(object.aggregations.affiliations.buckets) : []
+    facet_by_combined_key(object.aggregations.affiliations.buckets)
   end
 
   def licenses
-    object.total_count.positive? ? facet_by_license(object.aggregations.licenses.buckets) : []
+    facet_by_license(object.aggregations.licenses.buckets)
+  end
+
+  def fields_of_science
+    facet_by_fos(object.aggregations.fields_of_science.subject.buckets)
+  end
+
+  def languages
+    facet_by_language(object.aggregations.languages.buckets)
   end
 
   def dataset_connection_count
@@ -67,12 +75,4 @@ def funder_connection_count
   def organization_connection_count
     @organization_connection_count ||= Event.query(nil, citation_type: "Dataset-Organization", page: { number: 1, size: 0 }).results.total
   end
-
-  def fields_of_science
-    object.total_count.positive? ? facet_by_fos(object.aggregations.fields_of_science.subject.buckets) : []
-  end
-
-  def languages
-    object.total_count.positive? ? facet_by_language(object.aggregations.languages.buckets) : []
-  end
 end
diff --git a/app/graphql/types/dissertation_connection_with_total_type.rb b/app/graphql/types/dissertation_connection_with_total_type.rb
@@ -18,30 +18,30 @@ def total_count
   end
 
   def published
-    object.total_count.positive? ? facet_by_range(object.aggregations.published.buckets) : []
+    facet_by_range(object.aggregations.published.buckets)
   end
 
   def registration_agencies
-    object.total_count.positive? ? facet_by_registration_agency(object.aggregations.registration_agencies.buckets) : []
+    facet_by_registration_agency(object.aggregations.registration_agencies.buckets)
   end
 
   def repositories
-    object.total_count.positive? ? facet_by_combined_key(object.aggregations.clients.buckets) : []
+    facet_by_combined_key(object.aggregations.clients.buckets)
   end
 
   def affiliations
-    object.total_count.positive? ? facet_by_combined_key(object.aggregations.affiliations.buckets) : []
+    facet_by_combined_key(object.aggregations.affiliations.buckets)
   end
 
   def fields_of_science
-    object.total_count.positive? ? facet_by_fos(object.aggregations.fields_of_science.subject.buckets) : []
+    facet_by_fos(object.aggregations.fields_of_science.subject.buckets)
   end
 
   def licenses
-    object.total_count.positive? ? facet_by_license(object.aggregations.licenses.buckets) : []
+    facet_by_license(object.aggregations.licenses.buckets)
   end
 
   def languages
-    object.total_count.positive? ? facet_by_language(object.aggregations.languages.buckets) : []
+    facet_by_language(object.aggregations.languages.buckets)
   end
 end
diff --git a/app/graphql/types/event_connection_with_total_type.rb b/app/graphql/types/event_connection_with_total_type.rb
@@ -17,26 +17,26 @@ def total_count
   end
 
   def published
-    object.total_count.positive? ? facet_by_year(object.aggregations.published.buckets) : []
+    facet_by_year(object.aggregations.published.buckets)
   end
 
   def registration_agencies
-    object.total_count.positive? ? facet_by_registration_agency(object.aggregations.registration_agencies.buckets) : []
+    facet_by_registration_agency(object.aggregations.registration_agencies.buckets)
   end
 
   def repositories
-    object.total_count.positive? ? facet_by_combined_key(object.aggregations.clients.buckets) : []
+    facet_by_combined_key(object.aggregations.clients.buckets)
   end
 
   def affiliations
-    object.total_count.positive? ? facet_by_combined_key(object.aggregations.affiliations.buckets) : []
+    facet_by_combined_key(object.aggregations.affiliations.buckets)
   end
 
   def licenses
-    object.total_count.positive? ? facet_by_license(object.aggregations.licenses.buckets) : []
+    facet_by_license(object.aggregations.licenses.buckets)
   end
 
   def languages
-    object.total_count.positive? ? facet_by_language(object.aggregations.languages.buckets) : []
+    facet_by_language(object.aggregations.languages.buckets)
   end
 end
diff --git a/app/graphql/types/image_connection_with_total_type.rb b/app/graphql/types/image_connection_with_total_type.rb
@@ -17,26 +17,26 @@ def total_count
   end
 
   def published
-    object.total_count.positive? ? facet_by_year(object.aggregations.published.buckets) : []
+    facet_by_year(object.aggregations.published.buckets)
   end
 
   def registration_agencies
-    object.total_count.positive? ? facet_by_registration_agency(object.aggregations.registration_agencies.buckets) : []
+    facet_by_registration_agency(object.aggregations.registration_agencies.buckets)
   end
 
   def repositories
-    object.total_count.positive? ? facet_by_combined_key(object.aggregations.clients.buckets) : []
+    facet_by_combined_key(object.aggregations.clients.buckets)
   end
 
   def affiliations
-    object.total_count.positive? ? facet_by_combined_key(object.aggregations.affiliations.buckets) : []
+    facet_by_combined_key(object.aggregations.affiliations.buckets)
   end
 
   def licenses
-    object.total_count.positive? ? facet_by_license(object.aggregations.licenses.buckets) : []
+    facet_by_license(object.aggregations.licenses.buckets)
   end
 
   def languages
-    object.total_count.positive? ? facet_by_language(object.aggregations.languages.buckets) : []
+    facet_by_language(object.aggregations.languages.buckets)
   end
 end
diff --git a/app/graphql/types/instrument_connection_with_total_type.rb b/app/graphql/types/instrument_connection_with_total_type.rb
@@ -16,22 +16,22 @@ def total_count
   end
 
   def published
-    object.total_count.positive? ? facet_by_range(object.aggregations.published.buckets) : []
+    facet_by_range(object.aggregations.published.buckets)
   end
 
   def registration_agencies
-    object.total_count.positive? ? facet_by_registration_agency(object.aggregations.registration_agencies.buckets) : []
+    facet_by_registration_agency(object.aggregations.registration_agencies.buckets)
   end
 
   def repositories
-    object.total_count.positive? ? facet_by_combined_key(object.aggregations.clients.buckets) : []
+    facet_by_combined_key(object.aggregations.clients.buckets)
   end
 
   def affiliations
-    object.total_count.positive? ? facet_by_combined_key(object.aggregations.affiliations.buckets) : []
+    facet_by_combined_key(object.aggregations.affiliations.buckets)
   end
 
   def licenses
-    object.total_count.positive? ? facet_by_license(object.aggregations.licenses.buckets) : []
+    facet_by_license(object.aggregations.licenses.buckets)
   end
 end