Adds ability to set ordering of search

skttl · Apr 17, 2024 · 987e0c8 · 987e0c8
1 parent 3a81d93
commit 987e0c8
Show file tree

Hide file tree

Showing 4 changed files with 42 additions and 3 deletions.
diff --git a/src/Our.Umbraco.FullTextSearch/Interfaces/ISearch.cs b/src/Our.Umbraco.FullTextSearch/Interfaces/ISearch.cs
@@ -1,4 +1,5 @@
-using Our.Umbraco.FullTextSearch.Models;
+using Examine.Search;
+using Our.Umbraco.FullTextSearch.Models;
 using System.Collections.Generic;
 
 namespace Our.Umbraco.FullTextSearch.Interfaces
@@ -27,6 +28,8 @@ public interface ISearch
         string CustomQuery { get; set; }
         string Searcher { get; set; }
         string Index { get; set; }
+        SortableField[] OrderByFields { get; set; }
+        OrderDirection OrderDirection { get; set; }
 
         Search SetIndex(string index);
         Search SetSearcher(string searcher);

diff --git a/src/Our.Umbraco.FullTextSearch/Models/OrderDirection.cs b/src/Our.Umbraco.FullTextSearch/Models/OrderDirection.cs
@@ -0,0 +1,7 @@
+namespace Our.Umbraco.FullTextSearch.Models;
+
+public enum OrderDirection
+{
+    Ascending,
+    Descending
+}
diff --git a/src/Our.Umbraco.FullTextSearch/Models/Search.cs b/src/Our.Umbraco.FullTextSearch/Models/Search.cs
@@ -1,4 +1,5 @@
-using Lucene.Net.QueryParsers.Classic;
+using Examine.Search;
+using Lucene.Net.QueryParsers.Classic;
 using Our.Umbraco.FullTextSearch.Interfaces;
 using System.Collections.Generic;
 using System.Linq;
@@ -53,6 +54,9 @@ public Search(string searchTerm)
 
         public ICollection<string> SearchTermSplit => new List<string> { QueryParser.Escape(SearchTerm) };
 
+        public SortableField[] OrderByFields { get; set; }
+        public OrderDirection OrderDirection { get; set; } = OrderDirection.Descending;
+
         public Search SetSearchType(SearchType searchType)
         {
             SearchType = searchType;
@@ -324,5 +328,12 @@ public Search SetCustomQuery(string customQuery)
             CustomQuery = customQuery;
             return this;
         }
+
+        public Search OrderBy(SortableField[] orderBy, OrderDirection direction = OrderDirection.Ascending)
+        {
+            OrderByFields = orderBy;
+            OrderDirection = direction;
+            return this;
+        }
     }
 }
diff --git a/src/Our.Umbraco.FullTextSearch/Services/SearchService.cs b/src/Our.Umbraco.FullTextSearch/Services/SearchService.cs
@@ -189,7 +189,25 @@ private ISearchResults GetResults()
             if (searcher != null)
             {
                 _logger.LogDebug("Trying to search for {query}", query.ToString());
-                return searcher.CreateQuery().NativeQuery(query.ToString()).Execute(new Examine.Search.QueryOptions(_search.PageLength * (_currentPage - 1), _search.PageLength));
+
+                var searchQuery = searcher.CreateQuery().NativeQuery(query.ToString());
+                var queryOptions = new Examine.Search.QueryOptions(_search.PageLength * (_currentPage - 1), _search.PageLength);
+
+                if (_search.OrderByFields?.Length > 0)
+                {
+                    if (_search.OrderDirection is OrderDirection.Descending)
+                    {
+                        return searchQuery.OrderByDescending(_search.OrderByFields).Execute(queryOptions);
+                    }
+                    else
+                    {
+                        return searchQuery.OrderBy(_search.OrderByFields).Execute(queryOptions);
+                    }
+                }
+                else
+                {
+                    return searchQuery.Execute(queryOptions);
+                }
             }
 
             return null;