wip

Chris Santero · Chris Santero · commit feb6d29fa23a · 2015-06-24T17:22:06.000-04:00
diff --git a/JSONAPI.Tests/ActionFilters/FallbackPayloadBuilderAttributeTests.cs b/JSONAPI.Tests/ActionFilters/FallbackPayloadBuilderAttributeTests.cs
@@ -5,6 +5,7 @@
 using System.Net.Http.Headers;
 using System.Threading;
 using System.Threading.Tasks;
+using System.Web.Http;
 using System.Web.Http.Controllers;
 using System.Web.Http.Filters;
 using FluentAssertions;
@@ -266,5 +267,33 @@ public async Task OnActionExecutedAsync_creates_IErrorPayload_if_fallbackPayload
             ((ObjectContent)actionExecutedContext.Response.Content).Value.Should().BeSameAs(mockResult.Object);
             actionExecutedContext.Response.StatusCode.Should().Be(HttpStatusCode.BadRequest);
         }
+
+        [TestMethod]
+        public async Task OnActionExecutedAsync_creates_IErrorPayload_for_HttpError()
+        {
+            // Arrange
+            var httpError = new HttpError("Some error");
+            var actionExecutedContext = GetActionExecutedContext(httpError);
+            var cancellationTokenSource = new CancellationTokenSource();
+            var mockFallbackPayloadBuilder = new Mock<IFallbackPayloadBuilder>(MockBehavior.Strict);
+
+            var mockError = new Mock<IError>(MockBehavior.Strict);
+            mockError.Setup(e => e.Status).Returns(HttpStatusCode.OK);
+            var mockResult = new Mock<IErrorPayload>(MockBehavior.Strict);
+            mockResult.Setup(r => r.Errors).Returns(new[] { mockError.Object });
+
+            var mockErrorPayloadBuilder = new Mock<IErrorPayloadBuilder>(MockBehavior.Strict);
+            mockErrorPayloadBuilder.Setup(b => b.BuildFromHttpError(httpError, HttpStatusCode.OK)).Returns(mockResult.Object);
+            var mockErrorPayloadSerializer = new Mock<IErrorPayloadSerializer>(MockBehavior.Strict);
+            
+            // Act
+            var attribute = new FallbackPayloadBuilderAttribute(mockFallbackPayloadBuilder.Object, mockErrorPayloadBuilder.Object, mockErrorPayloadSerializer.Object);
+            var task = attribute.OnActionExecutedAsync(actionExecutedContext, cancellationTokenSource.Token);
+            task.Wait();
+
+            // Assert
+            ((ObjectContent)actionExecutedContext.Response.Content).Value.Should().BeSameAs(mockResult.Object);
+            actionExecutedContext.Response.StatusCode.Should().Be(HttpStatusCode.OK);
+        }
     }
 }
diff --git a/JSONAPI.Tests/JSONAPI.Tests.csproj b/JSONAPI.Tests/JSONAPI.Tests.csproj
@@ -90,7 +90,6 @@
     <Compile Include="Core\ResourceTypeRegistryTests.cs" />
     <Compile Include="Extensions\TypeExtensionsTests.cs" />
     <Compile Include="Http\PascalizedControllerSelectorTests.cs" />
-    <Compile Include="Json\ErrorSerializerTests.cs" />
     <Compile Include="Json\JsonApiFormatterTests.cs" />
     <Compile Include="Json\LinkTemplateTests.cs" />
     <Compile Include="Models\Author.cs" />
diff --git a/JSONAPI.Tests/Json/ErrorSerializerTests.cs b/JSONAPI.Tests/Json/ErrorSerializerTests.cs
diff --git a/JSONAPI.Tests/Json/JsonApiFormatterTests.cs b/JSONAPI.Tests/Json/JsonApiFormatterTests.cs
@@ -14,7 +14,6 @@
 using System.Diagnostics;
 using JSONAPI.Payload;
 using Moq;
-using IErrorSerializer = JSONAPI.Json.IErrorSerializer;
 
 namespace JSONAPI.Tests.Json
 {
diff --git a/JSONAPI/ActionFilters/FallbackPayloadBuilderAttribute.cs b/JSONAPI/ActionFilters/FallbackPayloadBuilderAttribute.cs
@@ -4,6 +4,7 @@
 using System.Net.Http;
 using System.Threading;
 using System.Threading.Tasks;
+using System.Web.Http;
 using System.Web.Http.Filters;
 using JSONAPI.Json;
 using JSONAPI.Payload;
@@ -59,25 +60,33 @@ public override async Task OnActionExecutedAsync(HttpActionExecutedContext actio
                         return;
                     }
 
-                    var payloadValue = objectContent.Value;
+                    object payloadValue;
                     if (actionExecutedContext.Exception != null)
                     {
                         payloadValue = _errorPayloadBuilder.BuildFromException(actionExecutedContext.Exception);
                     }
                     else
                     {
-                        try
+                        var httpError = objectContent.Value as HttpError;
+                        if (httpError != null)
                         {
-                            payloadValue =
-                                await _fallbackPayloadBuilder.BuildPayload(payloadValue, actionExecutedContext.Request, cancellationToken);
+                            payloadValue = _errorPayloadBuilder.BuildFromHttpError(httpError, actionExecutedContext.Response.StatusCode);
                         }
-                        catch (JsonApiException ex)
+                        else
                         {
-                            payloadValue = _errorPayloadBuilder.BuildFromException(ex);
-                        }
-                        catch (Exception ex)
-                        {
-                            payloadValue = _errorPayloadBuilder.BuildFromException(ex);
+                            try
+                            {
+                                payloadValue =
+                                    await _fallbackPayloadBuilder.BuildPayload(objectContent.Value, actionExecutedContext.Request, cancellationToken);
+                            }
+                            catch (JsonApiException ex)
+                            {
+                                payloadValue = _errorPayloadBuilder.BuildFromException(ex);
+                            }
+                            catch (Exception ex)
+                            {
+                                payloadValue = _errorPayloadBuilder.BuildFromException(ex);
+                            }
                         }
                     }
 
diff --git a/JSONAPI/JSONAPI.csproj b/JSONAPI/JSONAPI.csproj
@@ -121,10 +121,8 @@
     <Compile Include="Payload\ILinkSerializer.cs" />
     <Compile Include="Payload\IMetadata.cs" />
     <Compile Include="Payload\ILink.cs" />
-    <Compile Include="Json\ErrorSerializer.cs" />
     <Compile Include="Json\GuidErrorIdProvider.cs" />
     <Compile Include="Json\IErrorIdProvider.cs" />
-    <Compile Include="Json\IErrorSerializer.cs" />
     <Compile Include="Json\JsonApiFormatter.cs" />
     <Compile Include="Json\JsonHelpers.cs" />
     <Compile Include="Json\RelationAggregator.cs" />
diff --git a/JSONAPI/Json/ErrorSerializer.cs b/JSONAPI/Json/ErrorSerializer.cs
diff --git a/JSONAPI/Json/IErrorSerializer.cs b/JSONAPI/Json/IErrorSerializer.cs
diff --git a/JSONAPI/Payload/Builders/ErrorPayloadBuilder.cs b/JSONAPI/Payload/Builders/ErrorPayloadBuilder.cs
@@ -1,5 +1,6 @@
 &#65279;using System;
 using System.Net;
+using System.Web.Http;
 
 namespace JSONAPI.Payload.Builders
 {
@@ -19,6 +20,20 @@ public IErrorPayload BuildFromException(Exception exception)
             return new ErrorPayload(new [] { error }, topLevelMetadata);
         }
 
+        public IErrorPayload BuildFromHttpError(HttpError httpError, HttpStatusCode statusCode)
+        {
+            var error = new Error
+            {
+                Id = Guid.NewGuid().ToString(),
+                Title = "The FallbackPayloadBuilderAttribute encountered an HttpError after the controller action completed.",
+                Detail = httpError.Message,
+                Status = statusCode
+            };
+
+            var topLevelMetadata = GetTopLevelMetadata();
+            return new ErrorPayload(new[] { (IError)error }, topLevelMetadata);
+        }
+
         /// <summary>
         /// Builds an error object for a given exception.
         /// </summary>
diff --git a/JSONAPI/Payload/Builders/IErrorPayloadBuilder.cs b/JSONAPI/Payload/Builders/IErrorPayloadBuilder.cs
@@ -1,4 +1,6 @@
 &#65279;using System;
+using System.Net;
+using System.Web.Http;
 
 namespace JSONAPI.Payload.Builders
 {
@@ -13,5 +15,13 @@ public interface IErrorPayloadBuilder
         /// <param name="exception"></param>
         /// <returns></returns>
         IErrorPayload BuildFromException(Exception exception);
+
+        /// <summary>
+        /// Builds an error payload based on an HttpError
+        /// </summary>
+        /// <param name="httpError"></param>
+        /// <param name="statusCode"></param>
+        /// <returns></returns>
+        IErrorPayload BuildFromHttpError(HttpError httpError, HttpStatusCode statusCode);
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -14,7 +14,6 @@`
`14`	`14`	`using System.Diagnostics;`
`15`	`15`	`using JSONAPI.Payload;`
`16`	`16`	`using Moq;`
`17`		`-using IErrorSerializer = JSONAPI.Json.IErrorSerializer;`
`18`	`17`
`19`	`18`	`namespace JSONAPI.Tests.Json`
`20`	`19`	`{`
Original file line number	Diff line number	Diff line change
`@@ -4,6 +4,7 @@`
`4`	`4`	`using System.Net.Http;`
`5`	`5`	`using System.Threading;`
`6`	`6`	`using System.Threading.Tasks;`
	`7`	`+using System.Web.Http;`
`7`	`8`	`using System.Web.Http.Filters;`
`8`	`9`	`using JSONAPI.Json;`
`9`	`10`	`using JSONAPI.Payload;`
`@@ -59,25 +60,33 @@ public override async Task OnActionExecutedAsync(HttpActionExecutedContext actio`
`59`	`60`	`return;`
`60`	`61`	`}`
`61`	`62`
`62`		`- var payloadValue = objectContent.Value;`
	`63`	`+ object payloadValue;`
`63`	`64`	`if (actionExecutedContext.Exception != null)`
`64`	`65`	`{`
`65`	`66`	`payloadValue = _errorPayloadBuilder.BuildFromException(actionExecutedContext.Exception);`
`66`	`67`	`}`
`67`	`68`	`else`
`68`	`69`	`{`
`69`		`- try`
	`70`	`+ var httpError = objectContent.Value as HttpError;`
	`71`	`+ if (httpError != null)`
`70`	`72`	`{`
`71`		`- payloadValue =`
`72`		`- await _fallbackPayloadBuilder.BuildPayload(payloadValue, actionExecutedContext.Request, cancellationToken);`
	`73`	`+ payloadValue = _errorPayloadBuilder.BuildFromHttpError(httpError, actionExecutedContext.Response.StatusCode);`
`73`	`74`	`}`
`74`		`- catch (JsonApiException ex)`
	`75`	`+ else`
`75`	`76`	`{`
`76`		`- payloadValue = _errorPayloadBuilder.BuildFromException(ex);`
`77`		`- }`
`78`		`- catch (Exception ex)`
`79`		`- {`
`80`		`- payloadValue = _errorPayloadBuilder.BuildFromException(ex);`
	`77`	`+ try`
	`78`	`+ {`
	`79`	`+ payloadValue =`
	`80`	`+ await _fallbackPayloadBuilder.BuildPayload(objectContent.Value, actionExecutedContext.Request, cancellationToken);`
	`81`	`+ }`
	`82`	`+ catch (JsonApiException ex)`
	`83`	`+ {`
	`84`	`+ payloadValue = _errorPayloadBuilder.BuildFromException(ex);`
	`85`	`+ }`
	`86`	`+ catch (Exception ex)`
	`87`	`+ {`
	`88`	`+ payloadValue = _errorPayloadBuilder.BuildFromException(ex);`
	`89`	`+ }`
`81`	`90`	`}`
`82`	`91`	`}`
`83`	`92`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,6 @@`
`1`	`1`	`using System;`
	`2`	`+using System.Net;`
	`3`	`+using System.Web.Http;`
`2`	`4`
`3`	`5`	`namespace JSONAPI.Payload.Builders`
`4`	`6`	`{`
`@@ -13,5 +15,13 @@ public interface IErrorPayloadBuilder`
`13`	`15`	`/// <param name="exception"></param>`
`14`	`16`	`/// <returns></returns>`
`15`	`17`	`IErrorPayload BuildFromException(Exception exception);`
	`18`	`+`
	`19`	`+ /// <summary>`
	`20`	`+ /// Builds an error payload based on an HttpError`
	`21`	`+ /// </summary>`
	`22`	`+ /// <param name="httpError"></param>`
	`23`	`+ /// <param name="statusCode"></param>`
	`24`	`+ /// <returns></returns>`
	`25`	`+ IErrorPayload BuildFromHttpError(HttpError httpError, HttpStatusCode statusCode);`
`16`	`26`	`}`
`17`	`27`	`}`