feat: general improvements and minor bugs

Author: ReneSchwarzer

src/WebExpress.WebIndex.Test/Queries/UnitTestQuery.cs

@@ -21,10 +21,7 @@ public void DefaultQuery()
 
             // validation
             Assert.Empty(q.Filters);
-            Assert.Null(q.OrderBy);
-            Assert.Null(q.OrderByDescending);
-            Assert.Null(q.ThenBy);
-            Assert.Null(q.ThenByDescending);
+            Assert.Empty(q.OrderBys);
             Assert.Null(q.Skip);
             Assert.Null(q.Take);
         }
@@ -396,8 +393,9 @@ public void OrderByAsc()
                 .OrderByAsc(key);
 
             // validation
-            Assert.Equal(key, q.OrderBy);
-            Assert.Null(q.OrderByDescending);
+            Assert.Equal(key, q.OrderBys.First().KeySelector);
+            Assert.False(q.OrderBys.First().Descending);
+            Assert.Single(q.OrderBys);
         }
 
         /// <summary>
@@ -415,8 +413,8 @@ public void OrderByDesc()
                 .OrderByDesc(key);
 
             // validation
-            Assert.Equal(key, q.OrderByDescending);
-            Assert.Null(q.OrderBy);
+            Assert.Equal(key, q.OrderBys.FirstOrDefault().KeySelector);
+            Assert.True(q.OrderBys.FirstOrDefault().Descending);
         }
 
         /// <summary>
@@ -434,8 +432,8 @@ public void ThenByAsc()
                 .ThenByAsc(key);
 
             // validation
-            Assert.Equal(key, q.ThenBy);
-            Assert.Null(q.ThenByDescending);
+            Assert.Equal(key, q.OrderBys.Last().KeySelector);
+            Assert.False(q.OrderBys.Last().Descending);
         }
 
         /// <summary>
@@ -453,8 +451,8 @@ public void ThenByDesc()
                 .ThenByDesc(key);
 
             // validation
-            Assert.Equal(key, q.ThenByDescending);
-            Assert.Null(q.ThenBy);
+            Assert.Equal(key, q.OrderBys.Last().KeySelector);
+            Assert.True(q.OrderBys.Last().Descending);
         }
 
         /// <summary>
@@ -498,9 +496,9 @@ public void Apply()
             // arrange
             var data = new List<IndexItem>
             {
-                new IndexItem { Name = "Charlie", Value = 30 },
-                new IndexItem { Name = "Alpha",   Value = 10 },
-                new IndexItem { Name = "Bravo",   Value = 20 }
+                new() { Name = "Charlie", Value = 30 },
+                new() { Name = "Alpha",   Value = 10 },
+                new() { Name = "Bravo",   Value = 20 }
             }.AsQueryable();
 
             var query = new Query<IndexItem>()

src/WebExpress.WebIndex/Queries/IQuery.cs

@@ -29,28 +29,9 @@ public interface IQuery<TIndexItem>
         IEnumerable<Expression<Func<TIndexItem, bool>>> Filters { get; }
 
         /// <summary>
-        /// Returns the expression used to specify the property or value by which to order 
-        /// index items.
+        /// Returns the collection of sorting criteria applied to the query.
         /// </summary>
-        Expression<Func<TIndexItem, object>> OrderBy { get; }
-
-        /// <summary>
-        /// Returns the expression used to specify the property or value by which to sort items 
-        /// in descending order.
-        /// </summary>
-        Expression<Func<TIndexItem, object>> OrderByDescending { get; }
-
-        /// <summary>
-        /// Returns the expression used to specify an additional sorting criterion for the query 
-        /// after the primary ordering has been applied.
-        /// </summary>
-        Expression<Func<TIndexItem, object>> ThenBy { get; }
-
-        /// <summary>
-        /// Returns the expression used to specify a secondary descending sort order for the 
-        /// index items.
-        /// </summary>
-        Expression<Func<TIndexItem, object>> ThenByDescending { get; }
+        public IReadOnlyList<(Expression<Func<TIndexItem, object>> KeySelector, bool Descending)> OrderBys { get; }
 
         /// <summary>
         /// Returns the number of items to skip before starting to return results.