Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

SpecificationBuilderExtensions allow collection filtering #919

Closed
wants to merge 1 commit into from
Closed

SpecificationBuilderExtensions allow collection filtering #919

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
61 changes: 48 additions & 13 deletions src/Core/Application/Common/Specification/SpecificationBuilderExtensions.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
using System.Linq.Expressions;
using System.Collections;
using System.Linq.Expressions;
using System.Reflection;
using System.Text.Json;

Expand Down Expand Up @@ -123,21 +124,21 @@ public static IOrderedSpecificationBuilder<T> AdvancedFilter<T>(
{
var parameter = Expression.Parameter(typeof(T));

Expression binaryExpresioFilter;
Expression binaryExpressionFilter;

if (!string.IsNullOrEmpty(filter.Logic))
{
if (filter.Filters is null) throw new CustomException("The Filters attribute is required when declaring a logic");
binaryExpresioFilter = CreateFilterExpression(filter.Logic, filter.Filters, parameter);
binaryExpressionFilter = CreateFilterExpression(filter.Logic, filter.Filters, parameter);
}
else
{
var filterValid = GetValidFilter(filter);
binaryExpresioFilter = CreateFilterExpression(filterValid.Field!, filterValid.Operator!, filterValid.Value, parameter);
binaryExpressionFilter = CreateFilterExpression(filterValid.Field!, filterValid.Operator!, filterValid.Value, parameter);
}

((List<WhereExpressionInfo<T>>)specificationBuilder.Specification.WhereExpressions)
.Add(new WhereExpressionInfo<T>(Expression.Lambda<Func<T, bool>>(binaryExpresioFilter, parameter)));
.Add(new WhereExpressionInfo<T>(Expression.Lambda<Func<T, bool>>(binaryExpressionFilter, parameter)));
}

return new OrderedSpecificationBuilder<T>(specificationBuilder.Specification);
Expand Down Expand Up @@ -172,14 +173,48 @@ private static Expression CreateFilterExpression(
}

private static Expression CreateFilterExpression(
string field,
string filterOperator,
object? value,
ParameterExpression parameter)
string field,
string filterOperator,
object? value,
ParameterExpression parameter)
{
var propertyExpresion = GetPropertyExpression(field, parameter);
var valueExpresion = GeValuetExpression(field, value, propertyExpresion.Type);
return CreateFilterExpression(propertyExpresion, valueExpresion, filterOperator);
Expression binaryExpression = parameter;

for (int i = 0; i < field.Split('.').Length; i++)
{
string member = field.Split('.')[i];

if (binaryExpression.Type.IsGenericType && binaryExpression.Type.GetGenericTypeDefinition().GetInterfaces().Contains(typeof(IEnumerable)))
{
Type collectionType = binaryExpression.Type.GetGenericArguments()[0];
var childParamExp = Expression.Parameter(collectionType);
var childExpression = CreateFilterExpression(string.Join(".", field.Split('.').Skip(i)), filterOperator, value, childParamExp);

binaryExpression = Expression.Call(
typeof(Enumerable),
"Any",
new[] { collectionType },
binaryExpression,
Expression.Lambda(
typeof(Func<,>).MakeGenericType(collectionType, typeof(bool)),
childExpression,
childParamExp));

break;
}
else
{
binaryExpression = Expression.PropertyOrField(binaryExpression, member);

if (i == field.Split('.').Length - 1)
{
var valueExpression = GeValueExpression(field, value, binaryExpression.Type);
return CreateFilterExpression(binaryExpression, valueExpression, filterOperator);
}
}
}

return binaryExpression;
}

private static Expression CreateFilterExpression(
Expand Down Expand Up @@ -235,7 +270,7 @@ private static MemberExpression GetPropertyExpression(
private static string GetStringFromJsonElement(object value)
=> ((JsonElement)value).GetString()!;

private static ConstantExpression GeValuetExpression(
private static ConstantExpression GeValueExpression(
string field,
object? value,
Type propertyType)
Expand Down