Renamed the query options SortingPropertiesMapping to SortingProperties

Author: johelvisguzman

src/DotNetToolkit.Repository.AdoNet/Internal/QueryBuilder.cs

@@ -398,7 +398,7 @@ string EnsureTableAlias(string prefix)
 
                 if (string.IsNullOrEmpty(defaultSelect))
                 {
-                    var sorting = options.SortingPropertiesMapping.ToDictionary(x => x.Key, x => x.Value);
+                    var sorting = options.SortingProperties.ToDictionary(x => x.Key, x => x.Value);
 
                     if (!sorting.Any())
                     {

src/DotNetToolkit.Repository/Extensions/QueryableExtensions.cs

@@ -45,7 +45,7 @@ public static IOrderedQueryable<T> ApplySortingOptions<T>([NotNull] this IQuerya
             var sorting = new Dictionary<string, SortOrder>();
 
             if (options != null)
-                sorting = options.SortingPropertiesMapping.ToDictionary(x => x.Key, x => x.Value);
+                sorting = options.SortingProperties.ToDictionary(x => x.Key, x => x.Value);
 
             // Sorts on the composite key by default if no sorting is provided
             if (!sorting.Any())

test/DotNetToolkit.Repository.Test/Tests/QueryOptionsTests.cs

@@ -53,39 +53,39 @@ public void SortBy()
         {
             var options = new QueryOptions<Customer>();
 
-            Assert.Empty(((IQueryOptions<Customer>)options).SortingPropertiesMapping);
+            Assert.Empty(((IQueryOptions<Customer>)options).SortingProperties);
 
             options = options.OrderBy(x => x.Id);
 
-            Assert.Equal(1, ((IQueryOptions<Customer>)options).SortingPropertiesMapping.Count);
-            Assert.Equal("Id", ((IQueryOptions<Customer>)options).SortingPropertiesMapping.ElementAt(0).Key);
-            Assert.Equal(SortOrder.Ascending, ((IQueryOptions<Customer>)options).SortingPropertiesMapping.ElementAt(0).Value);
+            Assert.Equal(1, ((IQueryOptions<Customer>)options).SortingProperties.Count);
+            Assert.Equal("Id", ((IQueryOptions<Customer>)options).SortingProperties.ElementAt(0).Key);
+            Assert.Equal(SortOrder.Ascending, ((IQueryOptions<Customer>)options).SortingProperties.ElementAt(0).Value);
 
             options = options.OrderBy("Id");
 
-            Assert.Equal(1, ((IQueryOptions<Customer>)options).SortingPropertiesMapping.Count);
-            Assert.Equal("Id", ((IQueryOptions<Customer>)options).SortingPropertiesMapping.ElementAt(0).Key);
-            Assert.Equal(SortOrder.Ascending, ((IQueryOptions<Customer>)options).SortingPropertiesMapping.ElementAt(0).Value);
+            Assert.Equal(1, ((IQueryOptions<Customer>)options).SortingProperties.Count);
+            Assert.Equal("Id", ((IQueryOptions<Customer>)options).SortingProperties.ElementAt(0).Key);
+            Assert.Equal(SortOrder.Ascending, ((IQueryOptions<Customer>)options).SortingProperties.ElementAt(0).Value);
         }
 
         [Fact]
         public void SortByDescending()
         {
             var options = new QueryOptions<Customer>();
 
-            Assert.Empty(((IQueryOptions<Customer>)options).SortingPropertiesMapping);
+            Assert.Empty(((IQueryOptions<Customer>)options).SortingProperties);
 
             options = options.OrderByDescending(x => x.Id);
 
-            Assert.Equal(1, ((IQueryOptions<Customer>)options).SortingPropertiesMapping.Count);
-            Assert.Equal("Id", ((IQueryOptions<Customer>)options).SortingPropertiesMapping.ElementAt(0).Key);
-            Assert.Equal(SortOrder.Descending, ((IQueryOptions<Customer>)options).SortingPropertiesMapping.ElementAt(0).Value);
+            Assert.Equal(1, ((IQueryOptions<Customer>)options).SortingProperties.Count);
+            Assert.Equal("Id", ((IQueryOptions<Customer>)options).SortingProperties.ElementAt(0).Key);
+            Assert.Equal(SortOrder.Descending, ((IQueryOptions<Customer>)options).SortingProperties.ElementAt(0).Value);
 
             options = options.OrderByDescending("Id");
 
-            Assert.Equal(1, ((IQueryOptions<Customer>)options).SortingPropertiesMapping.Count);
-            Assert.Equal("Id", ((IQueryOptions<Customer>)options).SortingPropertiesMapping.ElementAt(0).Key);
-            Assert.Equal(SortOrder.Descending, ((IQueryOptions<Customer>)options).SortingPropertiesMapping.ElementAt(0).Value);
+            Assert.Equal(1, ((IQueryOptions<Customer>)options).SortingProperties.Count);
+            Assert.Equal("Id", ((IQueryOptions<Customer>)options).SortingProperties.ElementAt(0).Key);
+            Assert.Equal(SortOrder.Descending, ((IQueryOptions<Customer>)options).SortingProperties.ElementAt(0).Value);
         }
 
         [Fact]
@@ -95,21 +95,21 @@ public void SortThenBy()
 
             options = options.OrderBy(x => x.Id).OrderBy(x => x.Name);
 
-            Assert.Equal(2, ((IQueryOptions<Customer>)options).SortingPropertiesMapping.Count);
-            Assert.Equal("Name", ((IQueryOptions<Customer>)options).SortingPropertiesMapping.ElementAt(1).Key);
-            Assert.Equal(SortOrder.Ascending, ((IQueryOptions<Customer>)options).SortingPropertiesMapping.ElementAt(1).Value);
+            Assert.Equal(2, ((IQueryOptions<Customer>)options).SortingProperties.Count);
+            Assert.Equal("Name", ((IQueryOptions<Customer>)options).SortingProperties.ElementAt(1).Key);
+            Assert.Equal(SortOrder.Ascending, ((IQueryOptions<Customer>)options).SortingProperties.ElementAt(1).Value);
 
             options = options.OrderBy("Id").OrderBy("Name");
 
-            Assert.Equal(2, ((IQueryOptions<Customer>)options).SortingPropertiesMapping.Count);
-            Assert.Equal("Name", ((IQueryOptions<Customer>)options).SortingPropertiesMapping.ElementAt(1).Key);
-            Assert.Equal(SortOrder.Ascending, ((IQueryOptions<Customer>)options).SortingPropertiesMapping.ElementAt(1).Value);
+            Assert.Equal(2, ((IQueryOptions<Customer>)options).SortingProperties.Count);
+            Assert.Equal("Name", ((IQueryOptions<Customer>)options).SortingProperties.ElementAt(1).Key);
+            Assert.Equal(SortOrder.Ascending, ((IQueryOptions<Customer>)options).SortingProperties.ElementAt(1).Value);
 
             options = new QueryOptions<Customer>().OrderBy("Name").OrderByDescending("Name");
 
-            Assert.Equal(1, ((IQueryOptions<Customer>)options).SortingPropertiesMapping.Count);
-            Assert.Equal("Name", ((IQueryOptions<Customer>)options).SortingPropertiesMapping.ElementAt(0).Key);
-            Assert.Equal(SortOrder.Descending, ((IQueryOptions<Customer>)options).SortingPropertiesMapping.ElementAt(0).Value);
+            Assert.Equal(1, ((IQueryOptions<Customer>)options).SortingProperties.Count);
+            Assert.Equal("Name", ((IQueryOptions<Customer>)options).SortingProperties.ElementAt(0).Key);
+            Assert.Equal(SortOrder.Descending, ((IQueryOptions<Customer>)options).SortingProperties.ElementAt(0).Value);
         }
 
         [Fact]
@@ -119,21 +119,21 @@ public void SortThenByDescending()
 
             options = options.OrderByDescending(x => x.Id).OrderByDescending(x => x.Name);
 
-            Assert.Equal(2, ((IQueryOptions<Customer>)options).SortingPropertiesMapping.Count);
-            Assert.Equal("Name", ((IQueryOptions<Customer>)options).SortingPropertiesMapping.ElementAt(1).Key);
-            Assert.Equal(SortOrder.Descending, ((IQueryOptions<Customer>)options).SortingPropertiesMapping.ElementAt(1).Value);
+            Assert.Equal(2, ((IQueryOptions<Customer>)options).SortingProperties.Count);
+            Assert.Equal("Name", ((IQueryOptions<Customer>)options).SortingProperties.ElementAt(1).Key);
+            Assert.Equal(SortOrder.Descending, ((IQueryOptions<Customer>)options).SortingProperties.ElementAt(1).Value);
 
             options = options.OrderByDescending("Id").OrderByDescending("Name");
 
-            Assert.Equal(2, ((IQueryOptions<Customer>)options).SortingPropertiesMapping.Count);
-            Assert.Equal("Name", ((IQueryOptions<Customer>)options).SortingPropertiesMapping.ElementAt(1).Key);
-            Assert.Equal(SortOrder.Descending, ((IQueryOptions<Customer>)options).SortingPropertiesMapping.ElementAt(1).Value);
+            Assert.Equal(2, ((IQueryOptions<Customer>)options).SortingProperties.Count);
+            Assert.Equal("Name", ((IQueryOptions<Customer>)options).SortingProperties.ElementAt(1).Key);
+            Assert.Equal(SortOrder.Descending, ((IQueryOptions<Customer>)options).SortingProperties.ElementAt(1).Value);
 
             options = new QueryOptions<Customer>().OrderByDescending("Name").OrderBy("Name");
 
-            Assert.Equal(1, ((IQueryOptions<Customer>)options).SortingPropertiesMapping.Count);
-            Assert.Equal("Name", ((IQueryOptions<Customer>)options).SortingPropertiesMapping.ElementAt(0).Key);
-            Assert.Equal(SortOrder.Ascending, ((IQueryOptions<Customer>)options).SortingPropertiesMapping.ElementAt(0).Value);
+            Assert.Equal(1, ((IQueryOptions<Customer>)options).SortingProperties.Count);
+            Assert.Equal("Name", ((IQueryOptions<Customer>)options).SortingProperties.ElementAt(0).Key);
+            Assert.Equal(SortOrder.Ascending, ((IQueryOptions<Customer>)options).SortingProperties.ElementAt(0).Value);
         }
 
         [Fact]