Skip to content
This repository was archived by the owner on Aug 25, 2025. It is now read-only.

FIND-13264: Filter by enumerated properties #51

Merged
merged 1 commit into from
Oct 22, 2024
Merged

FIND-13264: Filter by enumerated properties #51

Show file tree
Hide file tree
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
65 changes: 65 additions & 0 deletions APIs/src/EpiServer.ContentGraph/Api/Filters/AndFilter.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@ public AndFilter(Expression<Func<T, int>> fieldSelector, NumericFilterOperators
And(fieldSelector, filterOperators);
}
#endregion
#region Base type
public AndFilter<T> And(Expression<Func<T, string>> fieldSelector, IFilterOperator filterOperator)
{
fieldSelector.ValidateNotNullArgument("fieldSelector");
Expand All @@ -61,6 +62,12 @@ public AndFilter<T> And(Expression<Func<T, double?>> fieldSelector, IFilterOpera
And(fieldSelector.GetFieldPath(), filterOperator);
return this;
}
public AndFilter<T> And(Expression<Func<T, float?>> fieldSelector, IFilterOperator filterOperator)
{
fieldSelector.ValidateNotNullArgument("fieldSelector");
And(fieldSelector.GetFieldPath(), filterOperator);
return this;
}
public AndFilter<T> And(Expression<Func<T, int>> fieldSelector, IFilterOperator filterOperator)
{
fieldSelector.ValidateNotNullArgument("fieldSelector");
Expand All @@ -73,6 +80,64 @@ public AndFilter<T> And(Expression<Func<T, bool>> fieldSelector, IFilterOperator
And(fieldSelector.GetFieldPath(), filterOperator);
return this;
}
#endregion
#region Enumerable
public AndFilter<T> And(Expression<Func<T, IEnumerable<string>>> fieldSelector, IFilterOperator filterOperator)
{
fieldSelector.ValidateNotNullArgument("fieldSelector");
And(fieldSelector.GetFieldPath(), filterOperator);
return this;
}
public AndFilter(Expression<Func<T, IEnumerable<string>>> fieldSelector, StringFilterOperators filterOperators)
{
And(fieldSelector, filterOperators);
}
public AndFilter<T> And(Expression<Func<T, IEnumerable<bool>>> fieldSelector, IFilterOperator filterOperator)
{
fieldSelector.ValidateNotNullArgument("fieldSelector");
And(fieldSelector.GetFieldPath(), filterOperator);
return this;
}
public AndFilter<T> And(Expression<Func<T, IEnumerable<int>>> fieldSelector, IFilterOperator filterOperator)
{
fieldSelector.ValidateNotNullArgument("fieldSelector");
And(fieldSelector.GetFieldPath(), filterOperator);
return this;
}
public AndFilter<T> And(Expression<Func<T, IEnumerable<double>>> fieldSelector, IFilterOperator filterOperator)
{
fieldSelector.ValidateNotNullArgument("fieldSelector");
And(fieldSelector.GetFieldPath(), filterOperator);
return this;
}
public AndFilter<T> And(Expression<Func<T, IEnumerable<long>>> fieldSelector, IFilterOperator filterOperator)
{
fieldSelector.ValidateNotNullArgument("fieldSelector");
And(fieldSelector.GetFieldPath(), filterOperator);
return this;
}
public AndFilter<T> And(Expression<Func<T, IEnumerable<float>>> fieldSelector, IFilterOperator filterOperator)
{
fieldSelector.ValidateNotNullArgument("fieldSelector");
And(fieldSelector.GetFieldPath(), filterOperator);
return this;
}
public AndFilter<T> And(Expression<Func<T, IEnumerable<DateTime>>> fieldSelector, IFilterOperator filterOperator)
{
fieldSelector.ValidateNotNullArgument("fieldSelector");
And(fieldSelector.GetFieldPath(), filterOperator);
return this;
}
public AndFilter<T> And<TField>(Expression<Func<T, IEnumerable<TField>>> rootSelector,
Expression<Func<TField, object>> fieldSelector,
IFilterOperator filterOperator)
{
rootSelector.ValidateNotNullArgument("rootSelector");
fieldSelector.ValidateNotNullArgument("fieldSelector");
And($"{rootSelector.GetFieldPath()}.{fieldSelector.GetFieldPath()}", filterOperator);
return this;
}
#endregion
private AndFilter<T> And(Expression<Func<T, Filter>> fieldSelector)
{
fieldSelector.ValidateNotNullArgument("fieldSelector");
Expand Down
63 changes: 63 additions & 0 deletions APIs/src/EpiServer.ContentGraph/Api/Filters/NotFilter.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,12 @@ public NotFilter<T> Not(Expression<Func<T, double?>> fieldSelector, IFilterOpera
Not(fieldSelector.GetFieldPath(), filterOperator);
return this;
}
public NotFilter<T> Not(Expression<Func<T, float?>> fieldSelector, IFilterOperator filterOperator)
{
fieldSelector.ValidateNotNullArgument("fieldSelector");
Not(fieldSelector.GetFieldPath(), filterOperator);
return this;
}
public NotFilter<T> Not(Expression<Func<T, DateTime?>> fieldSelector, IFilterOperator filterOperator)
{
fieldSelector.ValidateNotNullArgument("fieldSelector");
Expand Down Expand Up @@ -85,6 +91,63 @@ public NotFilter<T> Not(params Expression<Func<T, Filter>>[] fieldSelectors)
}
return this;
}
#region Enumerable
public NotFilter<T> Not(Expression<Func<T, IEnumerable<string>>> fieldSelector, IFilterOperator filterOperator)
{
fieldSelector.ValidateNotNullArgument("fieldSelector");
Not(fieldSelector.GetFieldPath(), filterOperator);
return this;
}
public NotFilter(Expression<Func<T, IEnumerable<string>>> fieldSelector, StringFilterOperators filterOperators)
{
Not(fieldSelector, filterOperators);
}
public NotFilter<T> Not(Expression<Func<T, IEnumerable<bool>>> fieldSelector, IFilterOperator filterOperator)
{
fieldSelector.ValidateNotNullArgument("fieldSelector");
Not(fieldSelector.GetFieldPath(), filterOperator);
return this;
}
public NotFilter<T> Not(Expression<Func<T, IEnumerable<int>>> fieldSelector, IFilterOperator filterOperator)
{
fieldSelector.ValidateNotNullArgument("fieldSelector");
Not(fieldSelector.GetFieldPath(), filterOperator);
return this;
}
public NotFilter<T> Not(Expression<Func<T, IEnumerable<double>>> fieldSelector, IFilterOperator filterOperator)
{
fieldSelector.ValidateNotNullArgument("fieldSelector");
Not(fieldSelector.GetFieldPath(), filterOperator);
return this;
}
public NotFilter<T> Not(Expression<Func<T, IEnumerable<long>>> fieldSelector, IFilterOperator filterOperator)
{
fieldSelector.ValidateNotNullArgument("fieldSelector");
Not(fieldSelector.GetFieldPath(), filterOperator);
return this;
}
public NotFilter<T> Not(Expression<Func<T, IEnumerable<float>>> fieldSelector, IFilterOperator filterOperator)
{
fieldSelector.ValidateNotNullArgument("fieldSelector");
Not(fieldSelector.GetFieldPath(), filterOperator);
return this;
}
public NotFilter<T> Not(Expression<Func<T, IEnumerable<DateTime>>> fieldSelector, IFilterOperator filterOperator)
{
fieldSelector.ValidateNotNullArgument("fieldSelector");
Not(fieldSelector.GetFieldPath(), filterOperator);
return this;
}
public NotFilter<T> Not<TField>(Expression<Func<T, IEnumerable<TField>>> rootSelector,
Expression<Func<TField, object>> fieldSelector,
IFilterOperator filterOperator)
{
rootSelector.ValidateNotNullArgument("rootSelector");
fieldSelector.ValidateNotNullArgument("fieldSelector");
Not($"{rootSelector.GetFieldPath()}.{fieldSelector.GetFieldPath()}", filterOperator);
return this;
}
#endregion
}

public class NotFilter : Filter
Expand Down
24 changes: 0 additions & 24 deletions APIs/src/EpiServer.ContentGraph/Api/Filters/NumericFilterOperators.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,14 +71,6 @@ public NumericFilterOperators InRange(int? from, int? to)
}
return this;
}
public NumericFilterOperators InRanges(params (int? from, int? to)[] ranges)
{
foreach (var range in ranges)
{
InRange(range.from, range.to);
}
return this;
}

public NumericFilterOperators Eq(float value)
{
Expand Down Expand Up @@ -164,21 +156,5 @@ public NumericFilterOperators InRange(double? from, double? to)
}
return this;
}
public NumericFilterOperators InRanges(params (float? from, float? to)[] ranges)
{
foreach (var range in ranges)
{
InRange(range.from, range.to);
}
return this;
}
public NumericFilterOperators InRanges(params (double? from, double? to)[] ranges)
{
foreach (var range in ranges)
{
InRange(range.from, range.to);
}
return this;
}
}
}
63 changes: 63 additions & 0 deletions APIs/src/EpiServer.ContentGraph/Api/Filters/OrFilter.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,12 @@ public OrFilter<T> Or(Expression<Func<T, long?>> fieldSelector, IFilterOperator
Or(fieldSelector.GetFieldPath(), filterOperator);
return this;
}
public OrFilter<T> Not(Expression<Func<T, float?>> fieldSelector, IFilterOperator filterOperator)
{
fieldSelector.ValidateNotNullArgument("fieldSelector");
Or(fieldSelector.GetFieldPath(), filterOperator);
return this;
}
public OrFilter<T> Or(Expression<Func<T, double?>> fieldSelector, IFilterOperator filterOperator)
{
fieldSelector.ValidateNotNullArgument("fieldSelector");
Expand Down Expand Up @@ -92,6 +98,63 @@ public OrFilter<T> Or(params Expression<Func<T, Filter>>[] fieldSelectors)
}
return this;
}
#region Enumerable
public OrFilter<T> Or(Expression<Func<T, IEnumerable<string>>> fieldSelector, IFilterOperator filterOperator)
{
fieldSelector.ValidateNotNullArgument("fieldSelector");
Or(fieldSelector.GetFieldPath(), filterOperator);
return this;
}
public OrFilter(Expression<Func<T, IEnumerable<string>>> fieldSelector, StringFilterOperators filterOperators)
{
Or(fieldSelector, filterOperators);
}
public OrFilter<T> Or(Expression<Func<T, IEnumerable<bool>>> fieldSelector, IFilterOperator filterOperator)
{
fieldSelector.ValidateNotNullArgument("fieldSelector");
Or(fieldSelector.GetFieldPath(), filterOperator);
return this;
}
public OrFilter<T> Or(Expression<Func<T, IEnumerable<int>>> fieldSelector, IFilterOperator filterOperator)
{
fieldSelector.ValidateNotNullArgument("fieldSelector");
Or(fieldSelector.GetFieldPath(), filterOperator);
return this;
}
public OrFilter<T> Or(Expression<Func<T, IEnumerable<double>>> fieldSelector, IFilterOperator filterOperator)
{
fieldSelector.ValidateNotNullArgument("fieldSelector");
Or(fieldSelector.GetFieldPath(), filterOperator);
return this;
}
public OrFilter<T> Or(Expression<Func<T, IEnumerable<long>>> fieldSelector, IFilterOperator filterOperator)
{
fieldSelector.ValidateNotNullArgument("fieldSelector");
Or(fieldSelector.GetFieldPath(), filterOperator);
return this;
}
public OrFilter<T> Or(Expression<Func<T, IEnumerable<float>>> fieldSelector, IFilterOperator filterOperator)
{
fieldSelector.ValidateNotNullArgument("fieldSelector");
Or(fieldSelector.GetFieldPath(), filterOperator);
return this;
}
public OrFilter<T> Or(Expression<Func<T, IEnumerable<DateTime>>> fieldSelector, IFilterOperator filterOperator)
{
fieldSelector.ValidateNotNullArgument("fieldSelector");
Or(fieldSelector.GetFieldPath(), filterOperator);
return this;
}
public OrFilter<T> Or<TField>(Expression<Func<T, IEnumerable<TField>>> rootSelector,
Expression<Func<TField, object>> fieldSelector,
IFilterOperator filterOperator)
{
rootSelector.ValidateNotNullArgument("rootSelector");
fieldSelector.ValidateNotNullArgument("fieldSelector");
Or($"{rootSelector.GetFieldPath()}.{fieldSelector.GetFieldPath()}", filterOperator);
return this;
}
#endregion
}

public class OrFilter : Filter
Expand Down
Loading
Loading