Merge pull request #131 from CSCfi/publication-search-by-orcidid

Fix publication search by author ORCID ID
CSCfi · Apr 11, 2024 · e75c635 · e75c635
2 parents efaee4c + 34c2106
commit e75c635
Showing 1 changed file with 12 additions and 7 deletions.
diff --git a/aspnetcore/src/ElasticService/ElasticSearchQueryGenerators/PublicationQueryGenerator.cs b/aspnetcore/src/ElasticService/ElasticSearchQueryGenerators/PublicationQueryGenerator.cs
@@ -89,6 +89,18 @@ private static IEnumerable<Func<QueryContainerDescriptor<Publication>, QueryCont
                                         .Field(f => f.Authors.Suffix(nameof(Author.LastName))).Query(parameters.AuthorLastName)))))));
         }
 
+        if (!string.IsNullOrWhiteSpace(parameters.AuthorOrcId))
+        {
+            subQueries.Add(
+                q => q.Nested(
+                    query => query
+                        .Path(p => p.Authors)
+                        .Query(
+                            q => q.Match(m => m
+                                .Field(f => f.Authors.Suffix(nameof(Author.Orcid)))
+                                .Query(parameters.AuthorOrcId)))));
+        }
+
         if (!string.IsNullOrWhiteSpace(parameters.ConferenceName))
         {
             subQueries.Add(t => 
@@ -224,13 +236,6 @@ private static IEnumerable<Func<QueryContainerDescriptor<Publication>, QueryCont
                     .Value(parameters.OrganizationUnitId))); 
         }
 
-        if (parameters.AuthorOrcId is not null)
-        {
-            filters.Add(t =>
-                t.Term(s => s.Field(f => f.Authors.Suffix(nameof(Author.Orcid)))
-                    .Value(parameters.AuthorOrcId)));
-        }
-
         // Searching with type code requires exact match.
         if (!string.IsNullOrWhiteSpace(parameters.TypeCode))
         {