Skip to content

Merge 0-4-0 into master #91

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
csantero merged 16 commits into from
May 19, 2015
Merged

Merge 0-4-0 into master #91

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
033df32
Merge pull request #92 from csantero/filter
csantero Mar 15, 2015
1be6db3
allow specifying model manager to fluent config
Mar 15, 2015
0a26101
add model manager method to determine whether type is registered
Mar 16, 2015
44fa79b
extract key-name determination facility
Mar 19, 2015
0f5f9cd
make DbContextExtensions public
Mar 20, 2015
d60024e
rethrow HttpResponseException
Mar 20, 2015
6f2e16b
return more useful exception message for pagination errors
Apr 13, 2015
775330c
use related key instead of href
Apr 14, 2015
740c0ce
Properly serialize null values
Apr 14, 2015
a9f8c53
support deserialization of linkage objects
Apr 16, 2015
9fbe305
search parent classes for object sets
Apr 16, 2015
7b01416
ensure materialized updates create empty collection property values
Apr 16, 2015
94608cd
add some tests for EF materializer
Apr 29, 2015
30929b5
make Merge protected
May 6, 2015
0038034
make metadata manager protected
May 6, 2015
b73859e
Simplify IMaterializer
May 6, 2015
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
Prev Previous commit
Next Next commit
return more useful exception message for pagination errors
  • Loading branch information
Chris Santero committed Apr 13, 2015
commit 6f2e16b8b82f8932c729ece343aad3773e220fb7
8 changes: 4 additions & 4 deletions JSONAPI.Tests/ActionFilters/DefaultPaginationTransformerTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -120,7 +120,7 @@ public void ApplyPagination_returns_400_if_page_number_is_negative()
{
GetArray("http://api.example.com/dummies?page[number]=-4&page[size]=4");
};
action.ShouldThrow<HttpResponseException>().And.Response.StatusCode.Should().Be(HttpStatusCode.BadRequest);
action.ShouldThrow<QueryableTransformException>().And.Message.Should().Be("page.number must be not be negative.");
}

[TestMethod]
Expand All @@ -130,7 +130,7 @@ public void ApplyPagination_returns_400_if_page_size_is_negative()
{
GetArray("http://api.example.com/dummies?page[number]=0&page[size]=-4");
};
action.ShouldThrow<HttpResponseException>().And.Response.StatusCode.Should().Be(HttpStatusCode.BadRequest);
action.ShouldThrow<QueryableTransformException>().And.Message.Should().Be("page.size must be not be negative.");
}

[TestMethod]
Expand All @@ -140,7 +140,7 @@ public void ApplyPagination_returns_400_if_page_number_specified_but_not_size()
{
GetArray("http://api.example.com/dummies?page[number]=0");
};
action.ShouldThrow<HttpResponseException>().And.Response.StatusCode.Should().Be(HttpStatusCode.BadRequest);
action.ShouldThrow<QueryableTransformException>().And.Message.Should().Be("In order for paging to work properly, if either page.number or page.size is set, both must be.");
}

[TestMethod]
Expand All @@ -150,7 +150,7 @@ public void ApplyPagination_returns_400_if_page_size_specified_but_not_number()
{
GetArray("http://api.example.com/dummies?page[size]=0");
};
action.ShouldThrow<HttpResponseException>().And.Response.StatusCode.Should().Be(HttpStatusCode.BadRequest);
action.ShouldThrow<QueryableTransformException>().And.Message.Should().Be("In order for paging to work properly, if either page.number or page.size is set, both must be.");
}

[TestMethod]
Expand Down
22 changes: 17 additions & 5 deletions JSONAPI/ActionFilters/DefaultPaginationTransformer.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,23 +43,35 @@ public IQueryable<T> ApplyPagination<T>(IQueryable<T> query, HttpRequestMessage
if (kvp.Key == _pageNumberQueryParam)
{
hasPageNumberParam = true;
if (!int.TryParse(kvp.Value, out pageNumber)) throw new HttpResponseException(HttpStatusCode.BadRequest);
if (!int.TryParse(kvp.Value, out pageNumber))
throw new QueryableTransformException(
String.Format("{0} must be a positive integer.", _pageNumberQueryParam));

}
else if (kvp.Key == _pageSizeQueryParam)
{
hasPageSizeParam = true;
if (!int.TryParse(kvp.Value, out pageSize)) throw new HttpResponseException(HttpStatusCode.BadRequest);
if (!int.TryParse(kvp.Value, out pageSize))
throw new QueryableTransformException(
String.Format("{0} must be a positive integer.", _pageSizeQueryParam));
}
}

if (!hasPageNumberParam && !hasPageSizeParam)
return query;

if ((hasPageNumberParam && !hasPageSizeParam) || (!hasPageNumberParam && hasPageSizeParam))
throw new HttpResponseException(HttpStatusCode.BadRequest);
throw new QueryableTransformException(
String.Format("In order for paging to work properly, if either {0} or {1} is set, both must be.",
_pageNumberQueryParam, _pageSizeQueryParam));

if (pageNumber < 0)
throw new QueryableTransformException(
String.Format("{0} must be not be negative.", _pageNumberQueryParam));

if (pageNumber < 0 || pageSize < 0)
throw new HttpResponseException(HttpStatusCode.BadRequest);
if (pageSize < 0)
throw new QueryableTransformException(
String.Format("{0} must be not be negative.", _pageSizeQueryParam));

if (_maxPageSize != null && pageSize > _maxPageSize.Value)
pageSize = _maxPageSize.Value;
Expand Down