query fixes

skttl · Apr 18, 2024 · 422fd8a · 422fd8a
1 parent 3380a4a
commit 422fd8a
Showing 1 changed file with 5 additions and 3 deletions.
diff --git a/src/Our.Umbraco.FullTextSearch/Services/SearchService.cs b/src/Our.Umbraco.FullTextSearch/Services/SearchService.cs
@@ -88,6 +88,7 @@ private ISearchResults GetResults()
 
             if (_search.SearchTerm.IsNullOrWhiteSpace() == false)
             {
+                query.Append("(");
                 switch (_search.SearchType)
                 {
                     case SearchType.MultiRelevance:
@@ -124,22 +125,23 @@ private ISearchResults GetResults()
                         query.Append(QueryAllPropertiesAnd(_search.SearchTermSplit, 1.0));
                         break;
                 }
+                query.Append(")");
                 queryParts.Add(query.ToString());
             }
 
             if (_search.RootNodeIds.Any())
             {
                 var rootNodeGroup = string.Join(" OR ", _search.RootNodeIds.Select(x =>
                     $"{_options.FullTextPathField}:{x}"));
-                queryParts.Add(rootNodeGroup);
+                queryParts.Add($"({rootNodeGroup})");
             }
 
             var allowedContentTypes = _search.AllowedContentTypes.Where(t => !string.IsNullOrWhiteSpace(t)).ToList();
             if (allowedContentTypes.Any())
             {
                 var contentTypeGroup = string.Join(" OR ", allowedContentTypes.Select(x =>
                     $"__NodeTypeAlias:{x}"));
-                queryParts.Add(contentTypeGroup);
+                queryParts.Add($"({contentTypeGroup})");
             }
 
 
@@ -186,7 +188,7 @@ private ISearchResults GetResults()
             }
 
             query.Clear();
-            query.Append(string.Join(" AND ", queryParts.Select(x => $"({x})")));
+            query.Append(string.Join(" AND ", queryParts));
 
             if (searcher != null)
             {