Use nested type for publication author. Modify publication author sea…

…rch queries.
CSCfi · Mar 19, 2024 · 9ae78d1 · 9ae78d1
1 parent 54e2e50
commit 9ae78d1
Show file tree

Hide file tree

Showing 2 changed files with 37 additions and 9 deletions.
diff --git a/aspnetcore/src/ElasticService/ElasticSearchQueryGenerators/PublicationQueryGenerator.cs b/aspnetcore/src/ElasticService/ElasticSearchQueryGenerators/PublicationQueryGenerator.cs
@@ -48,18 +48,45 @@ private static IEnumerable<Func<QueryContainerDescriptor<Publication>, QueryCont
                     .Query(parameters.AuthorsText)));
         }
 
-        if (!string.IsNullOrWhiteSpace(parameters.AuthorFirstNames))
+        if (!string.IsNullOrWhiteSpace(parameters.AuthorFirstNames) && string.IsNullOrWhiteSpace(parameters.AuthorLastName))
         {
-            subQueries.Add(t => 
-                t.Match(query => query.Field(f => f.Authors.Suffix(nameof(Author.FirstNames)))
-                    .Query(parameters.AuthorFirstNames)));
+            // Only first names
+            subQueries.Add(
+                q => q.Nested(
+                    query => query
+                        .Path(p => p.Authors)
+                        .Query(
+                            q => q.Match(m => m
+                                .Field(f => f.Authors.Suffix(nameof(Author.FirstNames)))
+                                .Query(parameters.AuthorFirstNames)))));
         }
-
-        if (!string.IsNullOrWhiteSpace(parameters.AuthorLastName))
+        else if (string.IsNullOrWhiteSpace(parameters.AuthorFirstNames) && !string.IsNullOrWhiteSpace(parameters.AuthorLastName))
         {
-            subQueries.Add(t => 
-                t.Match(query => query.Field(f => f.Authors.Suffix(nameof(Author.LastName)))
-                    .Query(parameters.AuthorLastName)));
+            // Only last name
+            subQueries.Add(
+                q => q.Nested(
+                    query => query
+                        .Path(p => p.Authors)
+                        .Query(
+                            q => q.Match(m => m
+                                .Field(f => f.Authors.Suffix(nameof(Author.LastName)))
+                                .Query(parameters.AuthorLastName)))));
+        }
+        else if (!string.IsNullOrWhiteSpace(parameters.AuthorFirstNames) && !string.IsNullOrWhiteSpace(parameters.AuthorLastName))
+        {
+            // Both first names and last name
+            subQueries.Add(
+                q => q.Nested(
+                    query => query
+                        .Path(p => p.Authors)
+                        .Query(
+                            q => q.Bool(b => b
+                                .Must(mu => mu
+                                    .Match(m => m
+                                        .Field(f => f.Authors.Suffix(nameof(Author.FirstNames))).Query(parameters.AuthorFirstNames)
+                                    ), mu => mu
+                                    .Match(m => m
+                                        .Field(f => f.Authors.Suffix(nameof(Author.LastName))).Query(parameters.AuthorLastName)))))));
         }
 
         if (!string.IsNullOrWhiteSpace(parameters.ConferenceName))

diff --git a/aspnetcore/src/Service.Models/Publication/Publication.cs b/aspnetcore/src/Service.Models/Publication/Publication.cs
@@ -42,6 +42,7 @@ public class Publication
     /// <summary>
     /// Tekijät
     /// </summary>
+    [Nested]
     public List<Author>? Authors { get; set; }
 
     /// <summary>