Merge pull request #81 from csantero/type-property

Add type property and key primary data at `data`

Author: csantero

JSONAPI.EntityFramework.Tests.TestWebApp/Controllers/SearchController.cs

@@ -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);
+        }
+    }
+}

JSONAPI.EntityFramework.Tests.TestWebApp/JSONAPI.EntityFramework.Tests.TestWebApp.csproj

@@ -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" />

JSONAPI.EntityFramework.Tests/Acceptance/Fixtures/Heterogeneous/Responses/GetSearchResultsResponse.json

@@ -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"
+            }
+        }
+    ]
+}

JSONAPI.EntityFramework.Tests/Acceptance/Fixtures/Posts/Requests/PostRequest.json

@@ -1,6 +1,7 @@
 {
-    "posts": [
+    "data": [
         {
+            "type": "posts",
             "id": "205",
             "title": "Added post",
             "content": "Added post content",

JSONAPI.EntityFramework.Tests/Acceptance/Fixtures/Posts/Requests/PutWithArrayRelationshipValueRequest.json

@@ -1,6 +1,7 @@
 {
-    "posts": [
+    "data": [
         {
+            "type": "posts",
             "id": "202",
             "links": {
                 "tags": ["301"]

JSONAPI.EntityFramework.Tests/Acceptance/Fixtures/Posts/Requests/PutWithAttributeUpdateRequest.json

@@ -1,6 +1,7 @@
 {
-    "posts": [
+    "data": [
         {
+            "type": "posts",
             "id": "202",
             "title": "New post title"
         }

JSONAPI.EntityFramework.Tests/Acceptance/Fixtures/Posts/Requests/PutWithMissingToManyIdsRequest.json

@@ -1,6 +1,7 @@
 {
-    "posts": [
+    "data": [
         {
+            "type": "posts",
             "id": "202",
             "links": {
                 "tags": {

JSONAPI.EntityFramework.Tests/Acceptance/Fixtures/Posts/Requests/PutWithMissingToManyTypeRequest.json

@@ -1,6 +1,7 @@
 {
-    "posts": [
+    "data": [
         {
+            "type": "posts",
             "id": "202",
             "links": {
                 "tags": {

JSONAPI.EntityFramework.Tests/Acceptance/Fixtures/Posts/Requests/PutWithMissingToOneIdRequest.json

@@ -1,6 +1,7 @@
 {
-    "posts": [
+    "data": [
         {
+            "type": "posts",
             "id": "202",
             "links": {
                 "author": {

JSONAPI.EntityFramework.Tests/Acceptance/Fixtures/Posts/Requests/PutWithMissingToOneTypeRequest.json

@@ -1,6 +1,7 @@
 {
-    "posts": [
+    "data": [
         {
+            "type": "posts",
             "id": "202",
             "links": {
                 "author": {