more specific text types in graphql

app/graphql/types/audiovisual_connection_type.rb

@@ -6,6 +6,9 @@ class AudiovisualConnectionType < BaseConnection
 
   field :total_count, Integer, null: false, cache: true
   field :years, [FacetType], null: true, cache: true
+  field :registration_agencies, [FacetType], null: true, cache: true
+  field :repositories, [FacetType], null: true, cache: true
+  field :affiliations, [FacetType], null: true, cache: true
 
   def total_count
     args = prepare_args(object.arguments)
@@ -20,6 +23,27 @@ def years
     res.results.total.positive? ? facet_by_year(res.response.aggregations.years.buckets) : []
   end
 
+  def registration_agencies
+    args = prepare_args(object.arguments)
+
+    res = response(args)
+    res.results.total.positive? ? facet_by_software(res.response.aggregations.registration_agencies.buckets) : []
+  end
+
+  def repositories
+    args = prepare_args(object.arguments)
+
+    res = response(args)
+    res.results.total.positive? ? facet_by_client(res.response.aggregations.clients.buckets) : []
+  end
+
+  def affiliations
+    args = prepare_args(object.arguments)
+
+    res = response(args)
+    res.results.total.positive? ? facet_by_affiliation(res.response.aggregations.affiliations.buckets) : []
+  end
+
   def response(**args)
     Doi.query(args[:query],
               ids: args[:ids], 

app/graphql/types/base_connection.rb

@@ -56,4 +56,30 @@ def facet_by_software(arr)
         "count" => hsh["doc_count"] }
     end
   end
+
+  def facet_by_affiliation(arr)
+    # generate hash with id and name for each affiliation in facet
+    return [] if arr.blank?
+
+    ids = arr.map { |hsh| "\"#{hsh["key"]}\"" }.join(" ")
+    affiliations = Organization.query(ids, size: 1000)[:data] || []
+
+    arr.map do |hsh|
+      { "id" => hsh["key"],
+        "title" => affiliations.find { |a| a["id"] == hsh["key"] }.to_h["name"] || hsh["key"],
+        "count" => hsh["doc_count"] }
+    end
+  end
+
+  def facet_by_client(arr)
+    # generate hash with id and name for each client in facet
+    ids = arr.map { |hsh| hsh["key"] }.join(",")
+    clients = Client.find_by_id(ids).records.pluck(:symbol, :name).to_h
+
+    arr.map do |hsh|
+      { "id" => hsh["key"],
+        "title" => clients[hsh["key"].upcase],
+        "count" => hsh["doc_count"] }
+    end
+  end
 end

app/graphql/types/book_chapter_connection_type.rb

@@ -0,0 +1,69 @@
+# frozen_string_literal: true
+
+class BookChapterConnectionType < BaseConnection
+  edge_type(BookChapterEdgeType)
+  field_class GraphQL::Cache::Field
+
+  field :total_count, Integer, null: false, cache: true
+  field :years, [FacetType], null: true, cache: true
+  field :registration_agencies, [FacetType], null: true, cache: true
+  field :repositories, [FacetType], null: true, cache: true
+  field :affiliations, [FacetType], null: true, cache: true
+
+  def total_count
+    args = prepare_args(object.arguments)
+
+    response(args).results.total  
+  end
+
+  def years
+    args = prepare_args(object.arguments)
+
+    res = response(args)
+    res.results.total.positive? ? facet_by_year(res.response.aggregations.years.buckets) : []
+  end
+
+  def registration_agencies
+    args = prepare_args(object.arguments)
+
+    res = response(args)
+    res.results.total.positive? ? facet_by_software(res.response.aggregations.registration_agencies.buckets) : []
+  end
+
+  def repositories
+    args = prepare_args(object.arguments)
+
+    res = response(args)
+    res.results.total.positive? ? facet_by_client(res.response.aggregations.clients.buckets) : []
+  end
+
+  def affiliations
+    args = prepare_args(object.arguments)
+
+    res = response(args)
+    res.results.total.positive? ? facet_by_affiliation(res.response.aggregations.affiliations.buckets) : []
+  end
+
+  def response(**args)
+    Doi.query(args[:query],
+              ids: args[:ids],
+              user_id: args[:user_id], 
+              client_id: args[:repository_id], 
+              provider_id: args[:member_id],
+              funder_id: args[:funder_id], 
+              affiliation_id: args[:affiliation_id],
+              re3data_id: args[:re3data_id], 
+              year: args[:year], 
+              resource_type_id: "Text",
+              resource_type: "BookChapter",
+              has_person: args[:has_person],
+              has_funder: args[:has_funder], 
+              has_organization: args[:has_organization], 
+              has_citations: args[:has_citations],
+              has_parts: args[:has_parts],
+              has_versions: args[:has_versions],  
+              has_views: args[:has_views], 
+              has_downloads: args[:has_downloads], 
+              page: { number: 1, size: 0 })
+  end
+end

app/graphql/types/book_chapter_edge_type.rb

@@ -0,0 +1,5 @@
+# frozen_string_literal: true
+
+class BookChapterEdgeType < GraphQL::Types::Relay::BaseEdge
+  node_type(BookChapterType)
+end

app/graphql/types/book_chapter_type.rb

@@ -0,0 +1,9 @@
+# frozen_string_literal: true
+
+class BookChapterType < BaseObject
+  implements DoiItem
+
+  def type
+    "BookChapter"
+  end
+end

app/graphql/types/thesis_connection_type.rb → app/graphql/types/book_connection_type.rb

@@ -1,11 +1,14 @@
 # frozen_string_literal: true
 
-class ThesisConnectionType < BaseConnection
-  edge_type(ThesisEdgeType)
+class BookConnectionType < BaseConnection
+  edge_type(BookEdgeType)
   field_class GraphQL::Cache::Field
 
   field :total_count, Integer, null: false, cache: true
   field :years, [FacetType], null: true, cache: true
+  field :registration_agencies, [FacetType], null: true, cache: true
+  field :repositories, [FacetType], null: true, cache: true
+  field :affiliations, [FacetType], null: true, cache: true
 
   def total_count
     args = prepare_args(object.arguments)
@@ -20,6 +23,27 @@ def years
     res.results.total.positive? ? facet_by_year(res.response.aggregations.years.buckets) : []
   end
 
+  def registration_agencies
+    args = prepare_args(object.arguments)
+
+    res = response(args)
+    res.results.total.positive? ? facet_by_software(res.response.aggregations.registration_agencies.buckets) : []
+  end
+
+  def repositories
+    args = prepare_args(object.arguments)
+
+    res = response(args)
+    res.results.total.positive? ? facet_by_client(res.response.aggregations.clients.buckets) : []
+  end
+
+  def affiliations
+    args = prepare_args(object.arguments)
+
+    res = response(args)
+    res.results.total.positive? ? facet_by_affiliation(res.response.aggregations.affiliations.buckets) : []
+  end
+
   def response(**args)
     Doi.query(args[:query],
               ids: args[:ids],
@@ -31,7 +55,7 @@ def response(**args)
               re3data_id: args[:re3data_id], 
               year: args[:year], 
               resource_type_id: "Text",
-              resource_type: "Thesis",
+              resource_type: "Book",
               has_person: args[:has_person],
               has_funder: args[:has_funder], 
               has_organization: args[:has_organization], 

app/graphql/types/book_edge_type.rb

@@ -0,0 +1,5 @@
+# frozen_string_literal: true
+
+class BookEdgeType < GraphQL::Types::Relay::BaseEdge
+  node_type(BookType)
+end

app/graphql/types/book_type.rb

@@ -0,0 +1,9 @@
+# frozen_string_literal: true
+
+class BookType < BaseObject
+  implements DoiItem
+
+  def type
+    "Book"
+  end
+end

app/graphql/types/collection_connection_type.rb

@@ -6,6 +6,8 @@ class CollectionConnectionType < BaseConnection
 
   field :total_count, Integer, null: false, cache: true
   field :years, [FacetType], null: true, cache: true
+  field :repositories, [FacetType], null: true, cache: true
+  field :affiliations, [FacetType], null: true, cache: true
 
   def total_count
     args = prepare_args(object.arguments)
@@ -20,6 +22,27 @@ def years
     res.results.total.positive? ? facet_by_year(res.response.aggregations.years.buckets) : []
   end
 
+  def registration_agencies
+    args = prepare_args(object.arguments)
+
+    res = response(args)
+    res.results.total.positive? ? facet_by_software(res.response.aggregations.registration_agencies.buckets) : []
+  end
+
+  def repositories
+    args = prepare_args(object.arguments)
+
+    res = response(args)
+    res.results.total.positive? ? facet_by_client(res.response.aggregations.clients.buckets) : []
+  end
+
+  def affiliations
+    args = prepare_args(object.arguments)
+
+    res = response(args)
+    res.results.total.positive? ? facet_by_affiliation(res.response.aggregations.affiliations.buckets) : []
+  end
+
   def response(**args)
     Doi.query(args[:query],
               ids: args[:ids], 

app/graphql/types/conference_paper_connection_type.rb

@@ -0,0 +1,69 @@
+# frozen_string_literal: true
+
+class ConferencePaperConnectionType < BaseConnection
+  edge_type(ConferencePaperEdgeType)
+  field_class GraphQL::Cache::Field
+
+  field :total_count, Integer, null: false, cache: true
+  field :years, [FacetType], null: true, cache: true
+  field :registration_agencies, [FacetType], null: true, cache: true
+  field :repositories, [FacetType], null: true, cache: true
+  field :affiliations, [FacetType], null: true, cache: true
+
+  def total_count
+    args = prepare_args(object.arguments)
+
+    response(args).results.total  
+  end
+
+  def years
+    args = prepare_args(object.arguments)
+
+    res = response(args)
+    res.results.total.positive? ? facet_by_year(res.response.aggregations.years.buckets) : []
+  end
+
+  def registration_agencies
+    args = prepare_args(object.arguments)
+
+    res = response(args)
+    res.results.total.positive? ? facet_by_software(res.response.aggregations.registration_agencies.buckets) : []
+  end
+
+  def repositories
+    args = prepare_args(object.arguments)
+
+    res = response(args)
+    res.results.total.positive? ? facet_by_client(res.response.aggregations.clients.buckets) : []
+  end
+
+  def affiliations
+    args = prepare_args(object.arguments)
+
+    res = response(args)
+    res.results.total.positive? ? facet_by_affiliation(res.response.aggregations.affiliations.buckets) : []
+  end
+
+  def response(**args)
+    Doi.query(args[:query],
+              ids: args[:ids],
+              user_id: args[:user_id], 
+              client_id: args[:repository_id], 
+              provider_id: args[:member_id],
+              funder_id: args[:funder_id], 
+              affiliation_id: args[:affiliation_id],
+              re3data_id: args[:re3data_id], 
+              year: args[:year], 
+              resource_type_id: "Text",
+              resource_type: "\"Conference paper\"",
+              has_person: args[:has_person],
+              has_funder: args[:has_funder], 
+              has_organization: args[:has_organization], 
+              has_citations: args[:has_citations],
+              has_parts: args[:has_parts],
+              has_versions: args[:has_versions],  
+              has_views: args[:has_views], 
+              has_downloads: args[:has_downloads], 
+              page: { number: 1, size: 0 })
+  end
+end

app/graphql/types/conference_paper_edge_type.rb

@@ -0,0 +1,5 @@
+# frozen_string_literal: true
+
+class ConferencePaperEdgeType < GraphQL::Types::Relay::BaseEdge
+  node_type(ConferencePaperType)
+end

app/graphql/types/conference_paper_type.rb

@@ -0,0 +1,9 @@
+# frozen_string_literal: true
+
+class ConferencePaperType < BaseObject
+  implements DoiItem
+
+  def type
+    "ConferencePaper"
+  end
+end

app/graphql/types/data_paper_connection_type.rb

@@ -6,6 +6,9 @@ class DataPaperConnectionType < BaseConnection
 
   field :total_count, Integer, null: false, cache: true
   field :years, [FacetType], null: true, cache: true
+  field :registration_agencies, [FacetType], null: true, cache: true
+  field :repositories, [FacetType], null: true, cache: true
+  field :affiliations, [FacetType], null: true, cache: true
 
   def total_count
     args = prepare_args(object.arguments)
@@ -20,6 +23,27 @@ def years
     res.results.total.positive? ? facet_by_year(res.response.aggregations.years.buckets) : []
   end
 
+  def registration_agencies
+    args = prepare_args(object.arguments)
+
+    res = response(args)
+    res.results.total.positive? ? facet_by_software(res.response.aggregations.registration_agencies.buckets) : []
+  end
+
+  def repositories
+    args = prepare_args(object.arguments)
+
+    res = response(args)
+    res.results.total.positive? ? facet_by_client(res.response.aggregations.clients.buckets) : []
+  end
+
+  def affiliations
+    args = prepare_args(object.arguments)
+
+    res = response(args)
+    res.results.total.positive? ? facet_by_affiliation(res.response.aggregations.affiliations.buckets) : []
+  end
+
   def response(**args)
     Doi.query(args[:query],
               ids: args[:ids],