Addresses error where author aggregation in GraphQL response sometime…

…s returns nil when creator has multiple nameIdentifiers
datacite · Jul 1, 2022 · 1c289f1 · 1c289f1
1 parent 8f309b8
commit 1c289f1
Show file tree

Hide file tree

Showing 3 changed files with 170 additions and 12 deletions.
diff --git a/app/controllers/concerns/facetable.rb b/app/controllers/concerns/facetable.rb
@@ -411,6 +411,10 @@ def facet_by_authors(arr)
       arr.map { |hsh|
         orcid_id = %r{\A(?:(http|https)://(orcid.org)/)(.+)\z}.match?(hsh["key"]) && hsh["key"]
 
+        if orcid_id.nil?
+          next
+        end
+
         # The aggregation query should only return 1 hit, so hence the index
         # into first element
         creators = hsh.dig("authors", "hits", "hits")[0].dig("_source", "creators")

diff --git a/app/graphql/types/base_connection.rb b/app/graphql/types/base_connection.rb
@@ -198,29 +198,33 @@ def facet_by_language(arr)
   end
 
   def facet_by_authors(arr)
-    arr.map do |hsh|
-      orcid_id = hsh["key"]
+    arr.map { |hsh|
+      orcid_id = %r{\A(?:(http|https)://(orcid.org)/)(.+)\z}.match?(hsh["key"]) && hsh["key"]
 
+      if orcid_id.nil?
+        next
+      end
+
       # The aggregation query should only return 1 hit, so hence the index
       # into first element
       creators = hsh.dig("authors", "hits", "hits")[0].dig("_source", "creators")
 
       # Filter through creators to find creator that matches the key
       matched_creator = creators.select do |creator|
         if creator.key?("nameIdentifiers")
-          creator["nameIdentifiers"].each do |ni|
-            break ni["nameIdentifier"] == orcid_id
-          end
+          creator["nameIdentifiers"].any? { |ni| ni["nameIdentifier"] == orcid_id }
         end
       end
 
-      title = matched_creator[0]["name"]
+      if matched_creator.any?
+        title = matched_creator[0]["name"]
 
-      {
-        "id" => orcid_id,
-        "title" => title,
-        "count" => hsh["doc_count"],
-      }
-    end
+        {
+          "id" => orcid_id,
+          "title" => title,
+          "count" => hsh["doc_count"],
+        }
+      end
+    }.compact
   end
 end
diff --git a/spec/graphql/types/work_type_spec.rb b/spec/graphql/types/work_type_spec.rb
@@ -1051,4 +1051,154 @@
       )
     end
   end
+
+  describe "get author aggregations when creators have multiple nameIdentifiers", elasticsearch: true do
+    let!(:work_one) do
+      create(
+        :doi,
+        aasm_state: "findable",
+        creators: [
+          {
+            "name" => "Garza, Kristian",
+            "nameType" => "Personal",
+            "nameIdentifiers" => [
+              {
+                "nameIdentifier" => "https://orcid.org/0000-0003-3484-6875",
+                "nameIdentifierScheme" => "ORCID",
+                "schemeUri" => "https://orcid.org",
+              },
+              {
+                "nameIdentifier" => "http://id.loc.gov/authorities/names/n90722093",
+                "nameIdentifierScheme" => "LCNAF",
+                "schemeUri" => "http://id.loc.gov/authorities/names",
+              },
+            ],
+          },
+          {
+            "familyName" => "Ross",
+            "givenName" => "Cody",
+            "name" => "Ross, Cody",
+            "nameIdentifiers" => [
+              {
+                "nameIdentifier" => "http://id.loc.gov/authorities/names/no90016802",
+                "nameIdentifierScheme" => "LCNAF",
+                "schemeUri" => "http://id.loc.gov/authorities/names",
+              },
+              {
+                "nameIdentifier" => "https://orcid.org/0000-0002-4684-9769",
+                "nameIdentifierScheme" => "ORCID",
+                "schemeUri" => "https://orcid.org",
+              },
+            ],
+          },
+          {
+            "name" => "Cody Ross",
+            "nameType" => "Personal",
+          },
+        ],
+      )
+    end
+
+    let!(:work_two) do
+      create(
+        :doi,
+        aasm_state: "findable",
+        creators: [
+          {
+            "name" => "Garza, Kristian",
+            "nameType" => "Personal",
+            "nameIdentifiers" => [
+              {
+                "nameIdentifier" => "http://id.loc.gov/authorities/names/n90722093",
+                "nameIdentifierScheme" => "LCNAF",
+                "schemeUri" => "http://id.loc.gov/authorities/names",
+              },
+              {
+                "nameIdentifier" => "https://orcid.org/0000-0003-3484-6875",
+                "nameIdentifierScheme" => "ORCID",
+                "schemeUri" => "https://orcid.org",
+              },
+            ],
+          },
+          {
+            "familyName" => "Ross",
+            "givenName" => "Cody",
+            "name" => "Ross, Cody",
+            "nameIdentifiers" => [
+              {
+                "nameIdentifier" => "https://orcid.org/0000-0002-4684-9769",
+                "nameIdentifierScheme" => "ORCID",
+                "schemeUri" => "https://orcid.org",
+              },
+            ],
+          },
+          {
+            "name" => "Cody Ross",
+            "nameType" => "Personal",
+          },
+          {
+            "name" => "Department of Psychoceramics, University of Cambridge",
+            "nameIdentifiers" => [
+              {
+                "nameIdentifier" => "https://ror.org/013meh722",
+                "nameIdentifierScheme" => "ROR",
+                "schemeUri" => "https://ror.org",
+              },
+            ],
+            "nameType" => "Organizational",
+          },
+        ],
+      )
+    end
+
+    before do
+      Doi.import
+      sleep 2
+    end
+
+    let(:query_works) do
+      'query {
+        works(query:"") {
+          authors {
+            count
+            id
+            title
+          }
+          nodes {
+            creators {
+              id
+              name
+              givenName
+              familyName
+              affiliation {
+                id
+                name
+              }
+            }
+          }
+        }
+      }'
+    end
+
+    it "returns author aggregation that is an array of authors with ORCID nameIdentifiers" do
+      response = LupoSchema.execute(query_works).as_json
+
+      expect(response.dig("data", "works", "authors").count).to eq(2)
+
+      expect(response.dig("data", "works", "authors")).to eq(
+        [
+          {
+            "count" => 2,
+            "id" => "https://orcid.org/0000-0002-4684-9769",
+            "title" => "Ross, Cody"
+          },
+          {
+            "count" => 2,
+            "id" => "https://orcid.org/0000-0003-3484-6875",
+            "title" => "Garza, Kristian"
+          },
+        ]
+      )
+    end
+  end
 end