Skip to content

Like filter #45

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.

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

Merged
merged 4 commits into from
Mar 2, 2017
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 1 addition & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -285,6 +285,7 @@ identifier):
?filter[attribute]=gt:value
?filter[attribute]=le:value
?filter[attribute]=ge:value
?filter[attribute]=like:value
```

### Sorting
Expand Down
8 changes: 7 additions & 1 deletion src/JsonApiDotNetCore/Extensions/IQueryableExtensions.cs
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@ public static IQueryable<TSource> Filter<TSource>(this IQueryable<TSource> sourc
// {1}
var right = Expression.Constant(convertedValue, property.PropertyType);

var body = Expression.Equal(left, right);
Expression body;
switch (filterQuery.FilterOperation)
{
case FilterOperations.eq:
Expand All @@ -109,6 +109,12 @@ public static IQueryable<TSource> Filter<TSource>(this IQueryable<TSource> sourc
// {model.Id <= 1}
body = Expression.GreaterThanOrEqual(left, right);
break;
case FilterOperations.like:
// {model.Id <= 1}
body = Expression.Call(left, "Contains", null, right);
break;
default:
throw new JsonApiException("500", $"Unknown filter operation {filterQuery.FilterOperation}");
}

var lambda = Expression.Lambda<Func<TSource, bool>>(body, parameter);
Expand Down
3 changes: 2 additions & 1 deletion src/JsonApiDotNetCore/Internal/Query/FilterOperations.cs
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ public enum FilterOperations
lt = 1,
gt = 2,
le = 3,
ge = 4
ge = 4,
like = 5
}
}
19 changes: 11 additions & 8 deletions src/JsonApiDotNetCore/Internal/Query/QuerySet.cs
Original file line number Diff line number Diff line change
Expand Up @@ -83,26 +83,29 @@ private FilterQuery ParseFilterOperation(AttrAttribute attribute, string value)
if(value.Length < 3)
return new FilterQuery(attribute, value, FilterOperations.eq);

var prefix = value.Substring(0, 3);
var operation = value.Split(':');

if(prefix[2] != ':')
if(operation.Length == 1)
return new FilterQuery(attribute, value, FilterOperations.eq);

// remove prefix from value
value = value.Substring(3, value.Length - 3);
var prefix = operation[0];
value = operation[1];

switch(prefix)
{
case "eq:":
case "eq":
return new FilterQuery(attribute, value, FilterOperations.eq);
case "lt:":
case "lt":
return new FilterQuery(attribute, value, FilterOperations.lt);
case "gt:":
case "gt":
return new FilterQuery(attribute, value, FilterOperations.gt);
case "le:":
case "le":
return new FilterQuery(attribute, value, FilterOperations.le);
case "ge:":
case "ge":
return new FilterQuery(attribute, value, FilterOperations.ge);
case "like":
return new FilterQuery(attribute, value, FilterOperations.like);
}

throw new JsonApiException("400", $"Invalid filter prefix '{prefix}'");
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -124,6 +124,36 @@ public async Task Can_Filter_TodoItems()
Assert.Equal(todoItem.Ordinal, todoItemResult.Ordinal);
}

[Fact]
public async Task Can_Filter_TodoItems_Using_Like_Operator()
{
// Arrange
var todoItem = _todoItemFaker.Generate();
todoItem.Ordinal = 999999;
_context.TodoItems.Add(todoItem);
_context.SaveChanges();
var substring = todoItem.Description.Substring(1, todoItem.Description.Length - 2);

var httpMethod = new HttpMethod("GET");
var route = $"/api/v1/todo-items?filter[description]=like:{substring}";

var description = new RequestProperties("Filter TodoItems Where Attribute Like", new Dictionary<string, string> {
{ "?filter[...]=", "Filter on attribute" }
});

// Act
var response = await _fixture.MakeRequest<TodoItem>(description, httpMethod, route);
var body = await response.Content.ReadAsStringAsync();
var deserializedBody = JsonApiDeSerializer.DeserializeList<TodoItem>(body, _jsonApiContext);

// Assert
Assert.Equal(HttpStatusCode.OK, response.StatusCode);
Assert.NotEmpty(deserializedBody);

foreach (var todoItemResult in deserializedBody)
Assert.Contains(substring, todoItem.Description);
}

[Fact]
public async Task Can_Sort_TodoItems_By_Ordinal_Ascending()
{
Expand Down