remove System.Linq.Dynamic.Core

neozhu · Jan 22, 2025 · f70e382 · f70e382
1 parent 536404e
commit f70e382
Show file tree

Hide file tree

Showing 3 changed files with 62 additions and 2 deletions.
diff --git a/src/Application/Application.csproj b/src/Application/Application.csproj
@@ -21,7 +21,6 @@
         <PackageReference Include="Microsoft.Extensions.Localization.Abstractions" Version="9.0.1" />
         <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
         <PackageReference Include="Riok.Mapperly" Version="4.1.1" />
-        <PackageReference Include="System.Linq.Dynamic.Core" Version="1.5.1" />
         <PackageReference Include="Hangfire.Core" Version="1.8.17" />
         <PackageReference Include="ZiggyCreatures.FusionCache" Version="2.0.0" />
            <PackageReference Include="ActualLab.Fusion" Version="9.8.17" />

diff --git a/src/Application/Common/Extensions/QueryableExtensions.cs b/src/Application/Common/Extensions/QueryableExtensions.cs
@@ -95,4 +95,66 @@ public static IQueryable<T> WhereContainsKeyword<T>(this IQueryable<T> source, s
         var lambda = Expression.Lambda<Func<T, bool>>(predicate, parameter);
         return source.Where(lambda);
     }
+
+
+
+    #region OrderBy
+    public static IOrderedQueryable<T> OrderBy<T>(this IQueryable<T> source, string orderByProperty)
+    {
+        var parts = orderByProperty.Split(' ', StringSplitOptions.RemoveEmptyEntries);
+        string property = parts[0];
+        string direction = parts.Length > 1 && parts[1].Equals("Descending", StringComparison.OrdinalIgnoreCase)
+            ? "OrderByDescending"
+            : "OrderBy";
+
+        return ApplyOrder(source, property, direction);
+    }
+
+    public static IOrderedQueryable<T> OrderByDescending<T>(this IQueryable<T> source, string orderByProperty)
+    {
+        return ApplyOrder(source, orderByProperty, "OrderByDescending");
+    }
+
+    public static IOrderedQueryable<T> ThenBy<T>(this IOrderedQueryable<T> source, string orderByProperty)
+    {
+        return ApplyOrder(source, orderByProperty, "ThenBy");
+    }
+
+    public static IOrderedQueryable<T> ThenByDescending<T>(this IOrderedQueryable<T> source, string orderByProperty)
+    {
+        return ApplyOrder(source, orderByProperty, "ThenByDescending");
+    }
+
+    private static IOrderedQueryable<T> ApplyOrder<T>(IQueryable<T> source, string property, string methodName)
+    {
+        var type = typeof(T);
+        var propertyInfo = type.GetProperty(property, BindingFlags.Public | BindingFlags.Instance | BindingFlags.IgnoreCase);
+        if (propertyInfo == null)
+        {
+            throw new ArgumentException($"Property '{property}' does not exist on type '{type.Name}'.");
+        }
+
+        var parameter = Expression.Parameter(type, "x");
+        var propertyAccess = Expression.MakeMemberAccess(parameter, propertyInfo);
+        var orderByExpression = Expression.Lambda(propertyAccess, parameter);
+
+        var resultExpression = Expression.Call(
+            typeof(Queryable),
+            methodName,
+            new[] { type, propertyInfo.PropertyType },
+            source.Expression,
+            Expression.Quote(orderByExpression));
+
+        return (IOrderedQueryable<T>)source.Provider.CreateQuery<T>(resultExpression);
+    }
+
+    public static IOrderedQueryable<T> OrderBy<T>(this IQueryable<T> source, string orderBy, string sortDirection)
+    {
+        return sortDirection.Equals("Descending", StringComparison.OrdinalIgnoreCase)
+            ? source.OrderByDescending(orderBy)
+            : source.OrderBy(orderBy);
+    }
+    #endregion
+
+
 }
diff --git a/src/Application/_Imports.cs b/src/Application/_Imports.cs
@@ -1,7 +1,6 @@
 global using System.ComponentModel;
 global using System.Data;
 global using System.Globalization;
-global using System.Linq.Dynamic.Core;
 global using System.Linq.Expressions;
 global using System.Reflection;
 global using System.Text.Json;