don't crash when requesting related resource for non-existent relationship

Chris Santero · Chris Santero · commit bc083dfc9fb3 · 2015-07-01T23:05:25.000-04:00
diff --git a/JSONAPI.EntityFramework.Tests/Acceptance/FetchingResourcesTests.cs b/JSONAPI.EntityFramework.Tests/Acceptance/FetchingResourcesTests.cs
@@ -150,5 +150,23 @@ await AssertResponseContent(response,
                     HttpStatusCode.NotFound, true);
             }
         }
+
+        [TestMethod]
+        [DeploymentItem(@"Acceptance\Data\Comment.csv", @"Acceptance\Data")]
+        [DeploymentItem(@"Acceptance\Data\Post.csv", @"Acceptance\Data")]
+        [DeploymentItem(@"Acceptance\Data\PostTagLink.csv", @"Acceptance\Data")]
+        [DeploymentItem(@"Acceptance\Data\Tag.csv", @"Acceptance\Data")]
+        [DeploymentItem(@"Acceptance\Data\User.csv", @"Acceptance\Data")]
+        public async Task Get_related_resource_for_relationship_that_doesnt_exist()
+        {
+            using (var effortConnection = GetEffortConnection())
+            {
+                var response = await SubmitGet(effortConnection, "posts/201/bananas");
+
+                await AssertResponseContent(response,
+                    @"Acceptance\Fixtures\FetchingResources\Get_related_resource_for_relationship_that_doesnt_exist.json",
+                    HttpStatusCode.NotFound, true);
+            }
+        }
     }
 }
diff --git a/JSONAPI.EntityFramework.Tests/Acceptance/Fixtures/FetchingResources/Get_related_resource_for_relationship_that_doesnt_exist.json b/JSONAPI.EntityFramework.Tests/Acceptance/Fixtures/FetchingResources/Get_related_resource_for_relationship_that_doesnt_exist.json
@@ -0,0 +1,10 @@
+&#65279;{
+    "errors": [
+        {
+            "id": "{{SOME_GUID}}",
+            "status": "404",
+            "title": "Resource not found",
+            "detail": "No relationship `bananas` exists for the resource with type `posts` and id `201`."
+        }
+    ]
+}
diff --git a/JSONAPI.EntityFramework.Tests/JSONAPI.EntityFramework.Tests.csproj b/JSONAPI.EntityFramework.Tests/JSONAPI.EntityFramework.Tests.csproj
@@ -206,6 +206,7 @@
     <EmbeddedResource Include="Acceptance\Fixtures\FetchingResources\Get_resource_by_id_that_doesnt_exist.json" />
     <EmbeddedResource Include="Acceptance\Fixtures\FetchingResources\Get_related_to_one_for_resource_that_doesnt_exist.json" />
     <EmbeddedResource Include="Acceptance\Fixtures\FetchingResources\Get_related_to_many_for_resource_that_doesnt_exist.json" />
+    <EmbeddedResource Include="Acceptance\Fixtures\FetchingResources\Get_related_resource_for_relationship_that_doesnt_exist.json" />
     <None Include="App.Config">
       <SubType>Designer</SubType>
     </None>
diff --git a/JSONAPI.EntityFramework/Http/EntityFrameworkDocumentMaterializer.cs b/JSONAPI.EntityFramework/Http/EntityFrameworkDocumentMaterializer.cs
@@ -79,6 +79,9 @@ public virtual async Task<IJsonApiDocument> GetRelated(string id, string relatio
         {
             var registration = _resourceTypeRegistry.GetRegistrationForType(typeof (T));
             var relationship = (ResourceTypeRelationship) registration.GetFieldByName(relationshipKey);
+            if (relationship == null)
+                throw JsonApiException.CreateForNotFound(string.Format("No relationship `{0}` exists for the resource with type `{1}` and id `{2}`.",
+                    relationshipKey, registration.ResourceTypeName, id));
 
             if (relationship.IsToMany)
             {

Original file line number	Diff line number	Diff line change
`@@ -150,5 +150,23 @@ await AssertResponseContent(response,`
`150`	`150`	`HttpStatusCode.NotFound, true);`
`151`	`151`	`}`
`152`	`152`	`}`
	`153`	`+`
	`154`	`+ [TestMethod]`
	`155`	`+ [DeploymentItem(@"Acceptance\Data\Comment.csv", @"Acceptance\Data")]`
	`156`	`+ [DeploymentItem(@"Acceptance\Data\Post.csv", @"Acceptance\Data")]`
	`157`	`+ [DeploymentItem(@"Acceptance\Data\PostTagLink.csv", @"Acceptance\Data")]`
	`158`	`+ [DeploymentItem(@"Acceptance\Data\Tag.csv", @"Acceptance\Data")]`
	`159`	`+ [DeploymentItem(@"Acceptance\Data\User.csv", @"Acceptance\Data")]`
	`160`	`+ public async Task Get_related_resource_for_relationship_that_doesnt_exist()`
	`161`	`+ {`
	`162`	`+ using (var effortConnection = GetEffortConnection())`
	`163`	`+ {`
	`164`	`+ var response = await SubmitGet(effortConnection, "posts/201/bananas");`
	`165`	`+`
	`166`	`+ await AssertResponseContent(response,`
	`167`	`+ @"Acceptance\Fixtures\FetchingResources\Get_related_resource_for_relationship_that_doesnt_exist.json",`
	`168`	`+ HttpStatusCode.NotFound, true);`
	`169`	`+ }`
	`170`	`+ }`
`153`	`171`	`}`
`154`	`172`	`}`
Original file line number	Diff line number	Diff line change
`@@ -79,6 +79,9 @@ public virtual async Task<IJsonApiDocument> GetRelated(string id, string relatio`
`79`	`79`	`{`
`80`	`80`	`var registration = _resourceTypeRegistry.GetRegistrationForType(typeof (T));`
`81`	`81`	`var relationship = (ResourceTypeRelationship) registration.GetFieldByName(relationshipKey);`
	`82`	`+ if (relationship == null)`
	`83`	+ throw JsonApiException.CreateForNotFound(string.Format("No relationship `{0}` exists for the resource with type `{1}` and id `{2}`.",
	`84`	`+ relationshipKey, registration.ResourceTypeName, id));`
`82`	`85`
`83`	`86`	`if (relationship.IsToMany)`
`84`	`87`	`{`