Skip to content

FIxes #277, Added changes for fix and fixed tests #278

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

Merged
merged 5 commits into from
May 7, 2018
Merged

FIxes #277, Added changes for fix and fixed tests #278

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
c317436
added changes for fix and fixed tests
May 7, 2018
d98952c
fixes #277
May 7, 2018
7614b50
bump package version
jaredcnance May 7, 2018
11b3ccd
validation fix
May 7, 2018
030f188
Merge branch 'fix277' of github.com:fxa109/JsonApiDotNetCore into fix277
May 7, 2018
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
2 changes: 1 addition & 1 deletion src/JsonApiDotNetCore/Services/QueryComposer.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ public string Compose(IJsonApiContext jsonApiContext)
private string ComposeSingleFilter(FilterQuery query)
{
var result = "&filter";
result += QueryConstants.OPEN_BRACKET + query.Attribute + QueryConstants.CLOSE_BRACKET + query.Operation + query.Value;
result += QueryConstants.OPEN_BRACKET + query.Attribute + QueryConstants.CLOSE_BRACKET + "=" + query.Operation + ":" + query.Value;
return result;
}
}
Expand Down
29 changes: 25 additions & 4 deletions test/UnitTests/Services/QueryComposerTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,10 @@ public QueryComposerTests()
}

[Fact]
public void Can_Compose_FilterStringForUrl()
public void Can_ComposeEqual_FilterStringForUrl()
{
// arrange
var filter = new FilterQuery("attribute", "value", "=");
var filter = new FilterQuery("attribute", "value", "eq");
var querySet = new QuerySet();
List<FilterQuery> filters = new List<FilterQuery>();
filters.Add(filter);
Expand All @@ -34,7 +34,28 @@ public void Can_Compose_FilterStringForUrl()
// act
var filterString = queryComposer.Compose(_jsonApiContext.Object);
// assert
Assert.Equal("&filter[attribute]=value", filterString);
Assert.Equal("&filter[attribute]=eq:value", filterString);
}

[Fact]
public void Can_ComposeLessThan_FilterStringForUrl()
{
// arrange
var filter = new FilterQuery("attribute", "value", "le");
var querySet = new QuerySet();
List<FilterQuery> filters = new List<FilterQuery>();
filters.Add(filter);
querySet.Filters = filters;

_jsonApiContext
.Setup(m => m.QuerySet)
.Returns(querySet);

var queryComposer = new QueryComposer();
// act
var filterString = queryComposer.Compose(_jsonApiContext.Object);
// assert
Assert.Equal("&filter[attribute]=le:value", filterString);
}

[Fact]
Expand All @@ -54,4 +75,4 @@ public void NoFilter_Compose_EmptyStringReturned()
Assert.Equal("", filterString);
}
}
}
}