fix has_member #635

datacite · Sep 19, 2020 · d1cb8c0 · d1cb8c0
1 parent 78ee576
commit d1cb8c0
Show file tree

Hide file tree

Showing 8 changed files with 219 additions and 57 deletions.
diff --git a/app/graphql/schema.graphql b/app/graphql/schema.graphql
diff --git a/app/graphql/types/funder_type.rb b/app/graphql/types/funder_type.rb
@@ -20,12 +20,13 @@ class FunderType < BaseObject
     argument :affiliation_id, String, required: false
     argument :organization_id, String, required: false
     argument :registration_agency, String, required: false
-    argument :has_person, Boolean, required: false
     argument :license, String, required: false
     argument :resource_type, String, required: false
     argument :language, String, required: false
+    argument :has_person, Boolean, required: false
     argument :has_organization, Boolean, required: false
     argument :has_affiliation, Boolean, required: false
+    argument :has_member, Boolean, required: false
     argument :has_citations, Int, required: false
     argument :has_parts, Int, required: false
     argument :has_versions, Int, required: false
@@ -46,12 +47,13 @@ class FunderType < BaseObject
     argument :affiliation_id, String, required: false
     argument :organization_id, String, required: false
     argument :registration_agency, String, required: false
-    argument :has_person, Boolean, required: false
     argument :license, String, required: false
     argument :resource_type, String, required: false
     argument :language, String, required: false
+    argument :has_person, Boolean, required: false
     argument :has_organization, Boolean, required: false
     argument :has_affiliation, Boolean, required: false
+    argument :has_member, Boolean, required: false
     argument :has_citations, Int, required: false
     argument :has_parts, Int, required: false
     argument :has_versions, Int, required: false
@@ -72,12 +74,13 @@ class FunderType < BaseObject
     argument :affiliation_id, String, required: false
     argument :organization_id, String, required: false
     argument :registration_agency, String, required: false
-    argument :has_person, Boolean, required: false
     argument :license, String, required: false
     argument :resource_type, String, required: false
     argument :language, String, required: false
+    argument :has_person, Boolean, required: false
     argument :has_organization, Boolean, required: false
     argument :has_affiliation, Boolean, required: false
+    argument :has_member, Boolean, required: false
     argument :has_citations, Int, required: false
     argument :has_parts, Int, required: false
     argument :has_versions, Int, required: false
@@ -101,6 +104,10 @@ class FunderType < BaseObject
     argument :resource_type, String, required: false
     argument :license, String, required: false
     argument :language, String, required: false
+    argument :has_person, Boolean, required: false
+    argument :has_organization, Boolean, required: false
+    argument :has_affiliation, Boolean, required: false
+    argument :has_member, Boolean, required: false
     argument :has_citations, Int, required: false
     argument :has_parts, Int, required: false
     argument :has_versions, Int, required: false
@@ -123,11 +130,12 @@ class FunderType < BaseObject
     argument :registration_agency, String, required: false
     argument :resource_type_id, String, required: false
     argument :resource_type, String, required: false
-    argument :has_person, Boolean, required: false
     argument :license, String, required: false
     argument :language, String, required: false
+    argument :has_person, Boolean, required: false
     argument :has_organization, Boolean, required: false
     argument :has_affiliation, Boolean, required: false
+    argument :has_member, Boolean, required: false
     argument :has_citations, Int, required: false
     argument :has_parts, Int, required: false
     argument :has_versions, Int, required: false
@@ -187,6 +195,6 @@ def citation_count
   end
 
   def response(**args)
-    Doi.gql_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], organization_id: args[:organization_id], resource_type_id: args[:resource_type_id], resource_type: args[:resource_type], agency: args[:registration_agency], language: args[:language], license: args[:license], has_person: args[:has_person], has_organization: args[:has_organization], has_affiliation: args[:has_affiliation], 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], field_of_science: args[:field_of_science], published: args[:published], state: "findable", page: { cursor: args[:after].present? ? Base64.urlsafe_decode64(args[:after]) : [], size: args[:first] })
+    Doi.gql_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], organization_id: args[:organization_id], resource_type_id: args[:resource_type_id], resource_type: args[:resource_type], agency: args[:registration_agency], language: args[:language], license: args[:license], has_person: args[:has_person], has_organization: args[:has_organization], has_affiliation: args[:has_affiliation], has_member: args[:has_member], 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], field_of_science: args[:field_of_science], published: args[:published], state: "findable", page: { cursor: args[:after].present? ? Base64.urlsafe_decode64(args[:after]) : [], size: args[:first] })
   end
 end
diff --git a/app/graphql/types/organization_type.rb b/app/graphql/types/organization_type.rb
@@ -39,6 +39,11 @@ class OrganizationType < BaseObject
     argument :license, String, required: false
     argument :resource_type, String, required: false
     argument :language, String, required: false
+    argument :has_person, Boolean, required: false
+    argument :has_funder, Boolean, required: false
+    argument :has_organization, Boolean, required: false
+    argument :has_affiliation, Boolean, required: false
+    argument :has_member, Boolean, required: false
     argument :has_citations, Int, required: false
     argument :has_parts, Int, required: false
     argument :has_versions, Int, required: false
@@ -61,6 +66,11 @@ class OrganizationType < BaseObject
     argument :license, String, required: false
     argument :resource_type, String, required: false
     argument :language, String, required: false
+    argument :has_person, Boolean, required: false
+    argument :has_funder, Boolean, required: false
+    argument :has_organization, Boolean, required: false
+    argument :has_affiliation, Boolean, required: false
+    argument :has_member, Boolean, required: false
     argument :has_citations, Int, required: false
     argument :has_parts, Int, required: false
     argument :has_versions, Int, required: false
@@ -83,6 +93,11 @@ class OrganizationType < BaseObject
     argument :resource_type, String, required: false
     argument :license, String, required: false
     argument :language, String, required: false
+    argument :has_person, Boolean, required: false
+    argument :has_funder, Boolean, required: false
+    argument :has_organization, Boolean, required: false
+    argument :has_affiliation, Boolean, required: false
+    argument :has_member, Boolean, required: false
     argument :has_citations, Int, required: false
     argument :has_parts, Int, required: false
     argument :has_versions, Int, required: false
@@ -105,6 +120,11 @@ class OrganizationType < BaseObject
     argument :resource_type, String, required: false
     argument :license, String, required: false
     argument :language, String, required: false
+    argument :has_person, Boolean, required: false
+    argument :has_funder, Boolean, required: false
+    argument :has_organization, Boolean, required: false
+    argument :has_affiliation, Boolean, required: false
+    argument :has_member, Boolean, required: false
     argument :has_citations, Int, required: false
     argument :has_parts, Int, required: false
     argument :has_versions, Int, required: false
@@ -127,6 +147,11 @@ class OrganizationType < BaseObject
     argument :resource_type, String, required: false
     argument :license, String, required: false
     argument :language, String, required: false
+    argument :has_person, Boolean, required: false
+    argument :has_funder, Boolean, required: false
+    argument :has_organization, Boolean, required: false
+    argument :has_affiliation, Boolean, required: false
+    argument :has_member, Boolean, required: false
     argument :has_citations, Int, required: false
     argument :has_parts, Int, required: false
     argument :has_versions, Int, required: false