Skip to content

Add type property and key primary data at data #81

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 3 commits into from
Feb 26, 2015
Merged

Add type property and key primary data at data #81

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
008b961
include `type` key in resource objects
Feb 25, 2015
ff593da
use `data` key for primary data
Feb 25, 2015
9f76960
add test for getting heterogeneous collections
Feb 25, 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
26 changes: 26 additions & 0 deletions JSONAPI.EntityFramework.Tests.TestWebApp/Controllers/SearchController.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
using System.Collections.Generic;
using System.Data.Entity;
using System.Linq;
using System.Threading.Tasks;
using System.Web.Http;
using JSONAPI.EntityFramework.Tests.TestWebApp.Models;

namespace JSONAPI.EntityFramework.Tests.TestWebApp.Controllers
{
public class SearchController : ApiController
{
private readonly TestDbContext _dbContext;

public SearchController(TestDbContext dbContext)
{
_dbContext = dbContext;
}

public async Task<IEnumerable<object>> Get(string s)
{
IEnumerable<object> posts = await _dbContext.Posts.Where(p => p.Title.Contains(s)).ToArrayAsync();
IEnumerable<object> comments = await _dbContext.Comments.Where(p => p.Text.Contains(s)).ToArrayAsync();
return posts.Concat(comments);
}
}
}
1 change: 1 addition & 0 deletions JSONAPI.EntityFramework.Tests.TestWebApp/JSONAPI.EntityFramework.Tests.TestWebApp.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -115,6 +115,7 @@
<Content Include="Web.config" />
</ItemGroup>
<ItemGroup>
<Compile Include="Controllers\SearchController.cs" />
<Compile Include="Controllers\CommentsController.cs" />
<Compile Include="Controllers\UserGroupsController.cs" />
<Compile Include="Controllers\UsersController.cs" />
Expand Down
26 changes: 26 additions & 0 deletions ...Framework.Tests/Acceptance/Fixtures/Heterogeneous/Responses/GetSearchResultsResponse.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
{
"data": [
{
"type": "posts",
"id": "201",
"title": "Post 1",
"content": "Post 1 content",
"created": "2015-01-31T14:00:00+00:00",
"links": {
"author": "401",
"comments": [ "101", "102", "103" ],
"tags": [ "301", "302" ]
}
},
{
"type": "comments",
"id": "101",
"text": "Comment 1",
"created": "2015-01-31T14:30:00+00:00",
"links": {
"author": "403",
"post": "201"
}
}
]
}
3 changes: 2 additions & 1 deletion JSONAPI.EntityFramework.Tests/Acceptance/Fixtures/Posts/Requests/PostRequest.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
{
"posts": [
"data": [
{
"type": "posts",
"id": "205",
"title": "Added post",
"content": "Added post content",
Expand Down
3 changes: 2 additions & 1 deletion ...mework.Tests/Acceptance/Fixtures/Posts/Requests/PutWithArrayRelationshipValueRequest.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
{
"posts": [
"data": [
{
"type": "posts",
"id": "202",
"links": {
"tags": ["301"]
Expand Down
3 changes: 2 additions & 1 deletion ...tityFramework.Tests/Acceptance/Fixtures/Posts/Requests/PutWithAttributeUpdateRequest.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
{
"posts": [
"data": [
{
"type": "posts",
"id": "202",
"title": "New post title"
}
Expand Down
3 changes: 2 additions & 1 deletion ...ityFramework.Tests/Acceptance/Fixtures/Posts/Requests/PutWithMissingToManyIdsRequest.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
{
"posts": [
"data": [
{
"type": "posts",
"id": "202",
"links": {
"tags": {
Expand Down
3 changes: 2 additions & 1 deletion ...tyFramework.Tests/Acceptance/Fixtures/Posts/Requests/PutWithMissingToManyTypeRequest.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
{
"posts": [
"data": [
{
"type": "posts",
"id": "202",
"links": {
"tags": {
Expand Down
3 changes: 2 additions & 1 deletion ...ntityFramework.Tests/Acceptance/Fixtures/Posts/Requests/PutWithMissingToOneIdRequest.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
{
"posts": [
"data": [
{
"type": "posts",
"id": "202",
"links": {
"author": {
Expand Down
3 changes: 2 additions & 1 deletion ...ityFramework.Tests/Acceptance/Fixtures/Posts/Requests/PutWithMissingToOneTypeRequest.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
{
"posts": [
"data": [
{
"type": "posts",
"id": "202",
"links": {
"author": {
Expand Down
3 changes: 2 additions & 1 deletion ...tityFramework.Tests/Acceptance/Fixtures/Posts/Requests/PutWithNullToOneUpdateRequest.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
{
"posts": [
"data": [
{
"type": "posts",
"id": "202",
"links": {
"author": null
Expand Down
3 changes: 2 additions & 1 deletion ...ework.Tests/Acceptance/Fixtures/Posts/Requests/PutWithStringRelationshipValueRequest.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
{
"posts": [
"data": [
{
"type": "posts",
"id": "202",
"links": {
"author": "301"
Expand Down
3 changes: 2 additions & 1 deletion ...amework.Tests/Acceptance/Fixtures/Posts/Requests/PutWithToManyEmptyDataUpdateRequest.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
{
"posts": [
"data": [
{
"type": "posts",
"id": "202",
"links": {
"tags": {
Expand Down
3 changes: 2 additions & 1 deletion ...k.Tests/Acceptance/Fixtures/Posts/Requests/PutWithToManyHomogeneousDataUpdateRequest.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
{
"posts": [
"data": [
{
"type": "posts",
"id": "202",
"links": {
"tags": {
Expand Down
3 changes: 2 additions & 1 deletion ....EntityFramework.Tests/Acceptance/Fixtures/Posts/Requests/PutWithToManyUpdateRequest.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
{
"posts": [
"data": [
{
"type": "posts",
"id": "202",
"links": {
"tags": {
Expand Down
3 changes: 2 additions & 1 deletion ...I.EntityFramework.Tests/Acceptance/Fixtures/Posts/Requests/PutWithToOneUpdateRequest.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
{
"posts": [
"data": [
{
"type": "posts",
"id": "202",
"links": {
"author": {
Expand Down
6 changes: 5 additions & 1 deletion JSONAPI.EntityFramework.Tests/Acceptance/Fixtures/Posts/Responses/GetAllResponse.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
{
"posts": [
"data": [
{
"type": "posts",
"id": "201",
"title": "Post 1",
"content": "Post 1 content",
Expand All @@ -12,6 +13,7 @@
}
},
{
"type": "posts",
"id": "202",
"title": "Post 2",
"content": "Post 2 content",
Expand All @@ -23,6 +25,7 @@
}
},
{
"type": "posts",
"id": "203",
"title": "Post 3",
"content": "Post 3 content",
Expand All @@ -34,6 +37,7 @@
}
},
{
"type": "posts",
"id": "204",
"title": "Post 4",
"content": "Post 4 content",
Expand Down
3 changes: 2 additions & 1 deletion JSONAPI.EntityFramework.Tests/Acceptance/Fixtures/Posts/Responses/GetByIdResponse.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
{
"posts": [
"data": [
{
"type": "posts",
"id": "202",
"title": "Post 2",
"content": "Post 2 content",
Expand Down
3 changes: 2 additions & 1 deletion JSONAPI.EntityFramework.Tests/Acceptance/Fixtures/Posts/Responses/GetWithFilterResponse.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
{
"posts": [
"data": [
{
"type": "posts",
"id": "204",
"title": "Post 4",
"content": "Post 4 content",
Expand Down
3 changes: 2 additions & 1 deletion JSONAPI.EntityFramework.Tests/Acceptance/Fixtures/Posts/Responses/PostResponse.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
{
"posts": [
"data": [
{
"type": "posts",
"id": "205",
"title": "Added post",
"content": "Added post content",
Expand Down
3 changes: 2 additions & 1 deletion ...tyFramework.Tests/Acceptance/Fixtures/Posts/Responses/PutWithAttributeUpdateResponse.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
{
"posts": [
"data": [
{
"type": "posts",
"id": "202",
"title": "New post title",
"content": "Post 2 content",
Expand Down
3 changes: 2 additions & 1 deletion ...tyFramework.Tests/Acceptance/Fixtures/Posts/Responses/PutWithNullToOneUpdateResponse.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
{
"posts": [
"data": [
{
"type": "posts",
"id": "202",
"title": "Post 2",
"content": "Post 2 content",
Expand Down
3 changes: 2 additions & 1 deletion ...ework.Tests/Acceptance/Fixtures/Posts/Responses/PutWithToManyEmptyDataUpdateResponse.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
{
"posts": [
"data": [
{
"type": "posts",
"id": "202",
"title": "Post 2",
"content": "Post 2 content",
Expand Down
3 changes: 2 additions & 1 deletion ...Tests/Acceptance/Fixtures/Posts/Responses/PutWithToManyHomogeneousDataUpdateResponse.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
{
"posts": [
"data": [
{
"type": "posts",
"id": "202",
"title": "Post 2",
"content": "Post 2 content",
Expand Down
3 changes: 2 additions & 1 deletion ...ntityFramework.Tests/Acceptance/Fixtures/Posts/Responses/PutWithToManyUpdateResponse.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
{
"posts": [
"data": [
{
"type": "posts",
"id": "202",
"title": "Post 2",
"content": "Post 2 content",
Expand Down
3 changes: 2 additions & 1 deletion ...EntityFramework.Tests/Acceptance/Fixtures/Posts/Responses/PutWithToOneUpdateResponse.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
{
"posts": [
"data": [
{
"type": "posts",
"id": "202",
"title": "Post 2",
"content": "Post 2 content",
Expand Down
12 changes: 11 additions & 1 deletion ...tityFramework.Tests/Acceptance/Fixtures/Sorting/Responses/GetSortedAscendingResponse.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
{
"users": [
"data": [
{
"type": "users",
"id": "401",
"firstName": "Alice",
"lastName": "Smith",
Expand All @@ -11,6 +12,7 @@
}
},
{
"type": "users",
"id": "402",
"firstName": "Bob",
"lastName": "Jones",
Expand All @@ -21,6 +23,7 @@
}
},
{
"type": "users",
"id": "403",
"firstName": "Charlie",
"lastName": "Michaels",
Expand All @@ -31,6 +34,7 @@
}
},
{
"type": "users",
"id": "409",
"firstName": "Charlie",
"lastName": "Burns",
Expand All @@ -41,6 +45,7 @@
}
},
{
"type": "users",
"id": "406",
"firstName": "Ed",
"lastName": "Burns",
Expand All @@ -51,6 +56,7 @@
}
},
{
"type": "users",
"id": "405",
"firstName": "Michelle",
"lastName": "Johnson",
Expand All @@ -61,6 +67,7 @@
}
},
{
"type": "users",
"id": "408",
"firstName": "Pat",
"lastName": "Morgan",
Expand All @@ -71,6 +78,7 @@
}
},
{
"type": "users",
"id": "404",
"firstName": "Richard",
"lastName": "Smith",
Expand All @@ -81,6 +89,7 @@
}
},
{
"type": "users",
"id": "410",
"firstName": "Sally",
"lastName": "Burns",
Expand All @@ -91,6 +100,7 @@
}
},
{
"type": "users",
"id": "407",
"firstName": "Thomas",
"lastName": "Potter",
Expand Down
Loading