explicitly use custom graphql connections. #511

datacite · May 26, 2020 · 58a3f18 · 58a3f18
1 parent d03e790
commit 58a3f18
Show file tree

Hide file tree

Showing 13 changed files with 502 additions and 6,044 deletions.
diff --git a/app/graphql/schema.graphql b/app/graphql/schema.graphql
diff --git a/app/graphql/types/data_catalog_type.rb b/app/graphql/types/data_catalog_type.rb
@@ -27,7 +27,7 @@ class DataCatalogType < BaseObject
   field :download_count, Integer, null: true, description: "The number of downloads according to the Counter Code of Practice."
   field :citation_count, Integer, null: true, description: "The number of citations."
 
-  field :datasets, DatasetConnectionWithTotalType, null: true, description: "Funded datasets", connection: true do
+  field :datasets, DatasetConnectionWithTotalType, null: true, description: "Funded datasets" do
     argument :query, String, required: false
     argument :user_id, String, required: false
     argument :repository_id, String, required: false
@@ -37,8 +37,8 @@ class DataCatalogType < BaseObject
     argument :has_versions, Int, required: false
     argument :has_views, Int, required: false
     argument :has_downloads, Int, required: false
-    argument :first, Int, required: false, default_value: 25, as: :size
-    argument :after, String, required: false, as: :cursor
+    argument :first, Int, required: false, default_value: 25
+    argument :after, String, required: false
   end
 
   def identifier

diff --git a/app/graphql/types/doi_item.rb b/app/graphql/types/doi_item.rb
@@ -52,7 +52,7 @@ module DoiItem
   field :views_over_time, [YearMonthTotalType], null: true, description: "Views by month"
   field :downloads_over_time, [YearMonthTotalType], null: true, description: "Downloads by month"
 
-  field :references, WorkConnectionWithTotalType, null: true, connection: true, max_page_size: 100, description: "References for this DOI" do
+  field :references, WorkConnectionWithTotalType, null: true, max_page_size: 100, description: "References for this DOI" do
     argument :query, String, required: false
     argument :ids, [String], required: false
     argument :user_id, String, required: false
@@ -72,7 +72,7 @@ module DoiItem
     argument :after, String, required: false
   end
 
-  field :citations, WorkConnectionWithTotalType, null: true, connection: true, max_page_size: 100, description: "Citations for this DOI." do
+  field :citations, WorkConnectionWithTotalType, null: true, max_page_size: 100, description: "Citations for this DOI." do
     argument :query, String, required: false
     argument :ids, [String], required: false
     argument :user_id, String, required: false
@@ -88,11 +88,11 @@ module DoiItem
     argument :has_versions, Int, required: false
     argument :has_views, Int, required: false
     argument :has_downloads, Int, required: false
-    argument :first, Int, required: false, default_value: 25, as: :size
-    argument :after, String, required: false, as: :cursor
+    argument :first, Int, required: false, default_value: 25
+    argument :after, String, required: false
   end
 
-  field :parts, WorkConnectionWithTotalType, null: true, connection: true, max_page_size: 100, description: "Parts of this DOI." do
+  field :parts, WorkConnectionWithTotalType, null: true, max_page_size: 100, description: "Parts of this DOI." do
     argument :query, String, required: false
     argument :ids, [String], required: false
     argument :user_id, String, required: false
@@ -108,11 +108,11 @@ module DoiItem
     argument :has_versions, Int, required: false
     argument :has_views, Int, required: false
     argument :has_downloads, Int, required: false
-    argument :first, Int, required: false, default_value: 25, as: :size
-    argument :after, String, required: false, as: :cursor
+    argument :first, Int, required: false, default_value: 25
+    argument :after, String, required: false
   end
 
-  field :part_of, WorkConnectionWithTotalType, null: true, connection: true, max_page_size: 100, description: "The DOI is a part of this DOI." do
+  field :part_of, WorkConnectionWithTotalType, null: true, max_page_size: 100, description: "The DOI is a part of this DOI." do
     argument :query, String, required: false
     argument :ids, [String], required: false
     argument :user_id, String, required: false
@@ -128,11 +128,11 @@ module DoiItem
     argument :has_versions, Int, required: false
     argument :has_views, Int, required: false
     argument :has_downloads, Int, required: false
-    argument :first, Int, required: false, default_value: 25, as: :size
-    argument :after, String, required: false, as: :cursor
+    argument :first, Int, required: false, default_value: 25
+    argument :after, String, required: false
   end
 
-  field :versions, WorkConnectionWithTotalType, null: true, connection: true, max_page_size: 100, description: "Versions of this DOI." do
+  field :versions, WorkConnectionWithTotalType, null: true, max_page_size: 100, description: "Versions of this DOI." do
     argument :query, String, required: false
     argument :ids, [String], required: false
     argument :user_id, String, required: false
@@ -148,11 +148,11 @@ module DoiItem
     argument :has_versions, Int, required: false
     argument :has_views, Int, required: false
     argument :has_downloads, Int, required: false
-    argument :first, Int, required: false, default_value: 25, as: :size
-    argument :after, String, required: false, as: :cursor
+    argument :first, Int, required: false, default_value: 25
+    argument :after, String, required: false
   end
 
-  field :version_of, WorkConnectionWithTotalType, null: true, connection: true, max_page_size: 100, description: "The DOI is a version of this DOI." do
+  field :version_of, WorkConnectionWithTotalType, null: true, max_page_size: 100, description: "The DOI is a version of this DOI." do
     argument :query, String, required: false
     argument :ids, [String], required: false
     argument :user_id, String, required: false
@@ -168,8 +168,8 @@ module DoiItem
     argument :has_versions, Int, required: false
     argument :has_views, Int, required: false
     argument :has_downloads, Int, required: false
-    argument :first, Int, required: false, default_value: 25, as: :size
-    argument :after, String, required: false, as: :cursor
+    argument :first, Int, required: false, default_value: 25
+    argument :after, String, required: false
   end
 
   def type
@@ -235,39 +235,39 @@ def formatted_citation(style: nil, locale: nil)
 
   def references(**args)
     args[:ids] = object.reference_ids
-    response(args)
+    ElasticsearchModelResponseConnection.new(response(args), context: self.context, first: args[:first], after: args[:after])
   end
 
   def citations(**args)
     args[:ids] = object.citation_ids
-    response(args)
+    ElasticsearchModelResponseConnection.new(response(args), context: self.context, first: args[:first], after: args[:after])
   end
 
   def parts(**args)
     args[:ids] = object.part_ids
-    response(args)
+    ElasticsearchModelResponseConnection.new(response(args), context: self.context, first: args[:first], after: args[:after])
   end
 
   def part_of(**args)
     args[:ids] = object.part_of_ids
-    response(args)
+    ElasticsearchModelResponseConnection.new(response(args), context: self.context, first: args[:first], after: args[:after])
   end
 
   def versions(**args)
     args[:ids] = object.version_ids
-    response(args)
+    ElasticsearchModelResponseConnection.new(response(args), context: self.context, first: args[:first], after: args[:after])
   end
 
   def version_of(**args)
     args[:ids] = object.version_of_ids
-    response(args)
+    ElasticsearchModelResponseConnection.new(response(args), context: self.context, first: args[:first], after: args[:after])
   end
 
   def response(**args)
     # make sure no dois are returnded if there are no :ids
     args[:ids] = "999" if args[:ids].blank?
 
-    Doi.query(args[:query], ids: args[:ids], funder_id: args[:funder_id], user_id: args[:user_id], client_id: args[:repository_id], provider_id: args[:member_id], affiliation_id: args[:affiliation_id], 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], state: "findable", page: { cursor: args[:cursor].present? ? Base64.urlsafe_decode64(args[:cursor]) : nil, size: args[:size] })
+    Doi.query(args[:query], ids: args[:ids], funder_id: args[:funder_id], user_id: args[:user_id], client_id: args[:repository_id], provider_id: args[:member_id], affiliation_id: args[:affiliation_id], 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], state: "findable", page: { cursor: args[:after].present? ? Base64.urlsafe_decode64(args[:after]) : nil, size: args[:first] })
   end
 
   def doi_link(url)

diff --git a/app/graphql/types/funder_type.rb b/app/graphql/types/funder_type.rb
@@ -10,7 +10,7 @@ class FunderType < BaseObject
   field :download_count, Integer, null: true, description: "The number of downloads according to the Counter Code of Practice."
   field :citation_count, Integer, null: true, description: "The number of citations."
 
-  field :datasets, DatasetConnectionWithTotalType, null: true, description: "Funded datasets", connection: true do
+  field :datasets, DatasetConnectionWithTotalType, null: true, description: "Funded datasets" do
     argument :query, String, required: false
     argument :ids, [String], required: false
     argument :user_id, String, required: false
@@ -23,11 +23,11 @@ class FunderType < BaseObject
     argument :has_versions, Int, required: false
     argument :has_views, Int, required: false
     argument :has_downloads, Int, required: false
-    argument :first, Int, required: false, default_value: 25, as: :size
-    argument :after, String, required: false, as: :cursor
+    argument :first, Int, required: false, default_value: 25
+    argument :after, String, required: false
   end
 
-  field :publications, PublicationConnectionWithTotalType, null: true, description: "Funded publications", connection: true do
+  field :publications, PublicationConnectionWithTotalType, null: true, description: "Funded publications" do
     argument :query, String, required: false
     argument :ids, [String], required: false
     argument :user_id, String, required: false
@@ -40,11 +40,11 @@ class FunderType < BaseObject
     argument :has_versions, Int, required: false
     argument :has_views, Int, required: false
     argument :has_downloads, Int, required: false
-    argument :first, Int, required: false, default_value: 25, as: :size
-    argument :after, String, required: false, as: :cursor
+    argument :first, Int, required: false, default_value: 25
+    argument :after, String, required: false
   end
 
-  field :softwares, SoftwareConnectionWithTotalType, null: true, description: "Funded software", connection: true do
+  field :softwares, SoftwareConnectionWithTotalType, null: true, description: "Funded software" do
     argument :query, String, required: false
     argument :ids, [String], required: false
     argument :user_id, String, required: false
@@ -57,11 +57,11 @@ class FunderType < BaseObject
     argument :has_versions, Int, required: false
     argument :has_views, Int, required: false
     argument :has_downloads, Int, required: false
-    argument :first, Int, required: false, default_value: 25, as: :size
-    argument :after, String, required: false, as: :cursor
+    argument :first, Int, required: false, default_value: 25
+    argument :after, String, required: false
   end
 
-  field :works, WorkConnectionWithTotalType, null: true, description: "Funded works", connection: true do
+  field :works, WorkConnectionWithTotalType, null: true, description: "Funded works" do
     argument :query, String, required: false
     argument :ids, [String], required: false
     argument :user_id, String, required: false
@@ -76,8 +76,8 @@ class FunderType < BaseObject
     argument :has_versions, Int, required: false
     argument :has_views, Int, required: false
     argument :has_downloads, Int, required: false
-    argument :first, Int, required: false, default_value: 25, as: :size
-    argument :after, String, required: false, as: :cursor
+    argument :first, Int, required: false, default_value: 25
+    argument :after, String, required: false
   end
 
   def address
@@ -87,21 +87,21 @@ def address
 
   def publications(**args)
     args[:resource_type_id] = "Text"
-    response(args)
+    ElasticsearchModelResponseConnection.new(response(args), context: self.context, first: args[:first], after: args[:after])
   end
 
   def datasets(**args)
     args[:resource_type_id] = "Dataset"
-    response(args)
+    ElasticsearchModelResponseConnection.new(response(args), context: self.context, first: args[:first], after: args[:after])
   end
 
   def softwares(**args)
     args[:resource_type_id] = "Software"
-    response(args)
+    ElasticsearchModelResponseConnection.new(response(args), context: self.context, first: args[:first], after: args[:after])
   end
 
   def works(**args)
-    response(args)
+    ElasticsearchModelResponseConnection.new(response(args), context: self.context, first: args[:first], after: args[:after])
   end
 
   def view_count
@@ -123,6 +123,6 @@ def citation_count
   end
 
   def response(**args)
-    Doi.query(args[:query], ids: args[:ids], funder_id: object.id, user_id: args[:user_id], client_id: args[:repository_id], provider_id: args[:member_id], affiliation_id: args[:affiliation_id], resource_type_id: args[:resource_type_id], has_person: args[:has_person], 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], state: "findable", page: { cursor: args[:cursor].present? ? Base64.urlsafe_decode64(args[:cursor]) : nil, size: args[:size] })
+    Doi.query(args[:query], ids: args[:ids], funder_id: object.id, user_id: args[:user_id], client_id: args[:repository_id], provider_id: args[:member_id], affiliation_id: args[:affiliation_id], resource_type_id: args[:resource_type_id], has_person: args[:has_person], 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], state: "findable", page: { cursor: args[:after].present? ? Base64.urlsafe_decode64(args[:after]) : nil, size: args[:first] })
   end
 end
diff --git a/app/graphql/types/organization_type.rb b/app/graphql/types/organization_type.rb
@@ -12,7 +12,7 @@ class OrganizationType < BaseObject
   field :download_count, Integer, null: true, description: "The number of downloads according to the Counter Code of Practice."
   field :citation_count, Integer, null: true, description: "The number of citations."
 
-  field :datasets, DatasetConnectionWithTotalType, null: true, description: "Datasets from this organization", connection: true do
+  field :datasets, DatasetConnectionWithTotalType, null: true, description: "Datasets from this organization" do
     argument :query, String, required: false
     argument :ids, [String], required: false
     argument :user_id, String, required: false
@@ -24,11 +24,11 @@ class OrganizationType < BaseObject
     argument :has_versions, Int, required: false
     argument :has_views, Int, required: false
     argument :has_downloads, Int, required: false
-    argument :first, Int, required: false, default_value: 25, as: :size
-    argument :after, String, required: false, as: :cursor
+    argument :first, Int, required: false, default_value: 25
+    argument :after, String, required: false
   end
 
-  field :publications, PublicationConnectionWithTotalType, null: true, description: "Publications from this organization", connection: true do
+  field :publications, PublicationConnectionWithTotalType, null: true, description: "Publications from this organization" do
     argument :query, String, required: false
     argument :ids, [String], required: false
     argument :user_id, String, required: false
@@ -40,11 +40,11 @@ class OrganizationType < BaseObject
     argument :has_versions, Int, required: false
     argument :has_views, Int, required: false
     argument :has_downloads, Int, required: false
-    argument :first, Int, required: false, default_value: 25, as: :size
-    argument :after, String, required: false, as: :cursor
+    argument :first, Int, required: false, default_value: 25
+    argument :after, String, required: false
   end
 
-  field :softwares, SoftwareConnectionWithTotalType, null: true, description: "Software from this organization", connection: true do
+  field :softwares, SoftwareConnectionWithTotalType, null: true, description: "Software from this organization" do
     argument :query, String, required: false
     argument :ids, [String], required: false
     argument :user_id, String, required: false
@@ -56,11 +56,11 @@ class OrganizationType < BaseObject
     argument :has_versions, Int, required: false
     argument :has_views, Int, required: false
     argument :has_downloads, Int, required: false
-    argument :first, Int, required: false, default_value: 25, as: :size
-    argument :after, String, required: false, as: :cursor
+    argument :first, Int, required: false, default_value: 25
+    argument :after, String, required: false
   end
 
-  field :works, WorkConnectionWithTotalType, null: true, description: "Works from this organization", connection: true do
+  field :works, WorkConnectionWithTotalType, null: true, description: "Works from this organization" do
     argument :query, String, required: false
     argument :ids, [String], required: false
     argument :user_id, String, required: false
@@ -72,8 +72,8 @@ class OrganizationType < BaseObject
     argument :has_versions, Int, required: false
     argument :has_views, Int, required: false
     argument :has_downloads, Int, required: false
-    argument :first, Int, required: false, default_value: 25, as: :size
-    argument :after, String, required: false, as: :cursor
+    argument :first, Int, required: false, default_value: 2
+    argument :after, String, required: false
   end
 
   def alternate_name
@@ -95,21 +95,21 @@ def address
 
   def publications(**args)
     args[:resource_type_id] = "Text"
-    response(args)
+    ElasticsearchModelResponseConnection.new(response(args), context: self.context, first: args[:first], after: args[:after])
   end
 
   def datasets(**args)
     args[:resource_type_id] = "Dataset"
-    response(args)
+    ElasticsearchModelResponseConnection.new(response(args), context: self.context, first: args[:first], after: args[:after])
   end
 
   def softwares(**args)
     args[:resource_type_id] = "Software"
-    response(args)
+    ElasticsearchModelResponseConnection.new(response(args), context: self.context, first: args[:first], after: args[:after])
   end
 
   def works(**args)
-    response(args)
+    ElasticsearchModelResponseConnection.new(response(args), context: self.context, first: args[:first], after: args[:after])
   end
 
   def view_count
@@ -131,6 +131,6 @@ def citation_count
   end
 
   def response(**args)
-    Doi.query(args[:query], ids: args[:ids], affiliation_id: object.id, user_id: args[:user_id], client_id: args[:repository_id], provider_id: args[:member_id], funder_id: args[:funder_id], resource_type_id: args[:resource_type_id], has_person: args[:has_person], has_funder: args[:has_funder], 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], state: "findable", page: { cursor: args[:cursor].present? ? Base64.urlsafe_decode64(args[:cursor]) : nil, size: args[:size] })
+    Doi.query(args[:query], ids: args[:ids], affiliation_id: object.id, user_id: args[:user_id], client_id: args[:repository_id], provider_id: args[:member_id], funder_id: args[:funder_id], resource_type_id: args[:resource_type_id], has_person: args[:has_person], has_funder: args[:has_funder], 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], state: "findable", page: { cursor: args[:after].present? ? Base64.urlsafe_decode64(args[:after]) : nil, size: args[:first] })
   end
 end