Open-Harbor/dotnet-dynamic-linq
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

refactoring with names that make more sense.

Browse Source
This commit is contained in:
David Lebée 2018-03-14 18:26:30 -05:00
parent b5331a7837
commit d6265c3b8d
4 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
PoweredSoft.DynamicLinq.Test/HelpersTests.cs
View File

@ -80,9 +80,9 @@ namespace PoweredSoft.DynamicLinq.Test
// the query. // the query.
var query = authors.AsQueryable(); var query = authors.AsQueryable();
var allExpression = QueryableHelpers.CreateFilterExpression<Author>("Posts.Title", ConditionOperators.Equal, "Match", QueryConvertStrategy.ConvertConstantToComparedPropertyOrField, QueryCollectionHandling.All); var allExpression = QueryableHelpers.CreateConditionExpression<Author>("Posts.Title", ConditionOperators.Equal, "Match", QueryConvertStrategy.ConvertConstantToComparedPropertyOrField, QueryCollectionHandling.All);
var anyExpression = QueryableHelpers.CreateFilterExpression<Author>("Posts.Title", ConditionOperators.Equal, "Match", QueryConvertStrategy.ConvertConstantToComparedPropertyOrField, QueryCollectionHandling.Any); var anyExpression = QueryableHelpers.CreateConditionExpression<Author>("Posts.Title", ConditionOperators.Equal, "Match", QueryConvertStrategy.ConvertConstantToComparedPropertyOrField, QueryCollectionHandling.Any);
var anyExpression2 = QueryableHelpers.CreateFilterExpression<Author>("Posts.Comments.Email", ConditionOperators.Equal, "John.doe@me.com", QueryConvertStrategy.ConvertConstantToComparedPropertyOrField, QueryCollectionHandling.Any); var anyExpression2 = QueryableHelpers.CreateConditionExpression<Author>("Posts.Comments.Email", ConditionOperators.Equal, "John.doe@me.com", QueryConvertStrategy.ConvertConstantToComparedPropertyOrField, QueryCollectionHandling.Any);
Assert.AreEqual(1, query.Count(allExpression)); Assert.AreEqual(1, query.Count(allExpression));
Assert.AreEqual(2, query.Count(anyExpression)); Assert.AreEqual(2, query.Count(anyExpression));
Assert.AreEqual(1, query.Count(anyExpression2)); Assert.AreEqual(1, query.Count(anyExpression2));

2
PoweredSoft.DynamicLinq/Fluent/OrderBy/OrderByBuilder.cs
View File

@ -21,7 +21,7 @@ namespace PoweredSoft.DynamicLinq.Fluent
Sorts.ForEach(sort => Sorts.ForEach(sort =>
{ {
query = QueryableHelpers.CreateSortExpression(query, sort.Path, sort.sortDirection, sort.AppendSort); query = QueryableHelpers.CreateOrderByExpression(query, sort.Path, sort.sortDirection, sort.AppendSort);
}); });
return query; return query;

2
PoweredSoft.DynamicLinq/Fluent/WhereBuilder/WhereBuilder.cs
View File

@ -70,7 +70,7 @@ namespace PoweredSoft.DynamicLinq.Fluent
protected virtual Expression<Func<T, bool>> BuildFilterExpression(ParameterExpression parameter, WhereBuilderCondition filter) protected virtual Expression<Func<T, bool>> BuildFilterExpression(ParameterExpression parameter, WhereBuilderCondition filter)
{ {
var ret = QueryableHelpers.CreateFilterExpression<T>( var ret = QueryableHelpers.CreateConditionExpression<T>(
filter.Path, filter.Path,
filter.ConditionOperator, filter.ConditionOperator,
filter.Value, filter.Value,

14
PoweredSoft.DynamicLinq/Helpers/QueryableHelpers.cs
View File

@ -270,7 +270,7 @@ namespace PoweredSoft.DynamicLinq.Helpers
throw new NotSupportedException($"{convertStrategy} supplied is not recognized"); throw new NotSupportedException($"{convertStrategy} supplied is not recognized");
} }
public static IQueryable<T> CreateSortExpression<T>(IQueryable<T> query, string sortPath, QuerySortDirection sortDirection, bool appendSort = true) public static IQueryable<T> CreateOrderByExpression<T>(IQueryable<T> query, string sortPath, QuerySortDirection sortDirection, bool appendSort = true)
{ {
var parameter = Expression.Parameter(typeof(T), "t"); var parameter = Expression.Parameter(typeof(T), "t");
var member = QueryableHelpers.ResolvePathForExpression(parameter, sortPath); var member = QueryableHelpers.ResolvePathForExpression(parameter, sortPath);
@ -306,7 +306,7 @@ namespace PoweredSoft.DynamicLinq.Helpers
*/ */
internal static Expression InternalCreateFilterExpression(int recursionStep, Type type, ParameterExpression parameter, Expression current, List<string> parts, internal static Expression InternalCreateConditionExpression(int recursionStep, Type type, ParameterExpression parameter, Expression current, List<string> parts,
ConditionOperators condition, object value, QueryConvertStrategy convertStrategy, QueryCollectionHandling collectionHandling, bool nullChecking, StringComparison? stringComparison) ConditionOperators condition, object value, QueryConvertStrategy convertStrategy, QueryCollectionHandling collectionHandling, bool nullChecking, StringComparison? stringComparison)
{ {
var partStr = parts.First(); var partStr = parts.First();
@ -346,7 +346,7 @@ namespace PoweredSoft.DynamicLinq.Helpers
{ {
var listGenericArgumentType = memberExpression.Type.GetGenericArguments().First(); var listGenericArgumentType = memberExpression.Type.GetGenericArguments().First();
var innerParameter = Expression.Parameter(listGenericArgumentType, $"t{++recursionStep}"); var innerParameter = Expression.Parameter(listGenericArgumentType, $"t{++recursionStep}");
var innerLambda = InternalCreateFilterExpression(recursionStep, listGenericArgumentType, innerParameter, innerParameter, parts.Skip(1).ToList(), condition, value, convertStrategy, collectionHandling, nullChecking, stringComparison); var innerLambda = InternalCreateConditionExpression(recursionStep, listGenericArgumentType, innerParameter, innerParameter, parts.Skip(1).ToList(), condition, value, convertStrategy, collectionHandling, nullChecking, stringComparison);
// the collection method. // the collection method.
var collectionMethod = GetCollectionMethod(collectionHandling); var collectionMethod = GetCollectionMethod(collectionHandling);
@ -365,12 +365,12 @@ namespace PoweredSoft.DynamicLinq.Helpers
{ {
if (nullCheckExpression != null) if (nullCheckExpression != null)
{ {
var pathExpr = InternalCreateFilterExpression(recursionStep, type, parameter, memberExpression, parts.Skip(1).ToList(), condition, value, convertStrategy, collectionHandling, nullChecking, stringComparison); var pathExpr = InternalCreateConditionExpression(recursionStep, type, parameter, memberExpression, parts.Skip(1).ToList(), condition, value, convertStrategy, collectionHandling, nullChecking, stringComparison);
var nullCheckResult = Expression.AndAlso(nullCheckExpression, pathExpr); var nullCheckResult = Expression.AndAlso(nullCheckExpression, pathExpr);
return nullCheckResult; return nullCheckResult;
} }
return InternalCreateFilterExpression(recursionStep, type, parameter, memberExpression, parts.Skip(1).ToList(), condition, value, convertStrategy, collectionHandling, nullChecking, stringComparison); return InternalCreateConditionExpression(recursionStep, type, parameter, memberExpression, parts.Skip(1).ToList(), condition, value, convertStrategy, collectionHandling, nullChecking, stringComparison);
} }
} }
@ -422,7 +422,7 @@ namespace PoweredSoft.DynamicLinq.Helpers
public static Expression<Func<T, bool>> CreateFilterExpression<T>(string path, public static Expression<Func<T, bool>> CreateConditionExpression<T>(string path,
ConditionOperators condition, ConditionOperators condition,
object value, object value,
QueryConvertStrategy convertStrategy, QueryConvertStrategy convertStrategy,
@ -435,7 +435,7 @@ namespace PoweredSoft.DynamicLinq.Helpers
parameter = Expression.Parameter(typeof(T), "t"); parameter = Expression.Parameter(typeof(T), "t");
var parts = path.Split('.').ToList(); var parts = path.Split('.').ToList();
var result = InternalCreateFilterExpression(1, typeof(T), parameter, parameter, parts, condition, value, convertStrategy, collectionHandling, nullChecking, stringComparision); var result = InternalCreateConditionExpression(1, typeof(T), parameter, parameter, parts, condition, value, convertStrategy, collectionHandling, nullChecking, stringComparision);
var ret = result as Expression<Func<T, bool>>; var ret = result as Expression<Func<T, bool>>;
return ret; return ret;
} }