Fix behaviour on status code requests.

Author: marabooy

src/Microsoft.AspNetCore.OData/EnableQueryAttribute.cs

@@ -140,7 +140,7 @@ public override void OnActionExecuting(ActionExecutingContext context)
                 {
                     elementType = TypeHelper.GetImplementedIEnumerableType(returnType);
                 }
-                else if(TypeHelper.IsGenericType(returnType) && returnType.GetGenericTypeDefinition() == typeof(Task<>))
+                else if (TypeHelper.IsGenericType(returnType) && returnType.GetGenericTypeDefinition() == typeof(Task<>))
                 {
                     elementType = returnType.GetGenericArguments().First();
                 }
@@ -228,46 +228,44 @@ public override void OnActionExecuted(ActionExecutedContext actionExecutedContex
             {
                 // actionExecutedContext.Result might also indicate a status code that has not yet
                 // been applied to the result; make sure it's also successful.
-                StatusCodeResult statusCodeResult = actionExecutedContext.Result as StatusCodeResult;
-                if (statusCodeResult == null || IsSuccessStatusCode(statusCodeResult.StatusCode))
+                ObjectResult responseContent = actionExecutedContext.Result as ObjectResult;
+
+                if (responseContent != null && (responseContent.StatusCode == null || IsSuccessStatusCode(responseContent.StatusCode.Value)))
                 {
-                    ObjectResult responseContent = actionExecutedContext.Result as ObjectResult;
-                    if (responseContent != null)
+
+                    //throw Error.Argument("actionExecutedContext", SRResources.QueryingRequiresObjectContent,
+                    //    actionExecutedContext.Result.GetType().FullName);
+
+                    // Get collection from SingleResult.
+                    IQueryable singleResultCollection = null;
+                    SingleResult singleResult = responseContent.Value as SingleResult;
+                    if (singleResult != null)
+                    {
+                        // This could be a SingleResult, which has the property Queryable.
+                        // But it could be a SingleResult() or SingleResult<T>. Sort by number of parameters
+                        // on the property and get the one with the most parameters.
+                        PropertyInfo propInfo = responseContent.Value.GetType().GetProperties()
+                            .OrderBy(p => p.GetIndexParameters().Count())
+                            .Where(p => p.Name.Equals("Queryable"))
+                            .LastOrDefault();
+
+                        singleResultCollection = propInfo.GetValue(singleResult) as IQueryable;
+                    }
+
+                    // Execution the action.
+                    object queryResult = OnActionExecuted(
+                        responseContent.Value,
+                        singleResultCollection,
+                        new WebApiActionDescriptor(actionDescriptor as ControllerActionDescriptor),
+                        new WebApiRequestMessage(request),
+                        (elementClrType) => GetModel(elementClrType, request, actionDescriptor),
+                        (queryContext) => CreateAndValidateQueryOptions(request, queryContext),
+                        (statusCode) => actionExecutedContext.Result = new StatusCodeResult((int)statusCode),
+                        (statusCode, message, exception) => actionExecutedContext.Result = CreateBadRequestResult(message, exception));
+
+                    if (queryResult != null)
                     {
-                        //throw Error.Argument("actionExecutedContext", SRResources.QueryingRequiresObjectContent,
-                        //    actionExecutedContext.Result.GetType().FullName);
-
-                        // Get collection from SingleResult.
-                        IQueryable singleResultCollection = null;
-                        SingleResult singleResult = responseContent.Value as SingleResult;
-                        if (singleResult != null)
-                        {
-                            // This could be a SingleResult, which has the property Queryable.
-                            // But it could be a SingleResult() or SingleResult<T>. Sort by number of parameters
-                            // on the property and get the one with the most parameters.
-                            PropertyInfo propInfo = responseContent.Value.GetType().GetProperties()
-                                .OrderBy(p => p.GetIndexParameters().Count())
-                                .Where(p => p.Name.Equals("Queryable"))
-                                .LastOrDefault();
-
-                            singleResultCollection = propInfo.GetValue(singleResult) as IQueryable;
-                        }
-
-                        // Execution the action.
-                        object queryResult = OnActionExecuted(
-                            responseContent.Value,
-                            singleResultCollection,
-                            new WebApiActionDescriptor(actionDescriptor as ControllerActionDescriptor),
-                            new WebApiRequestMessage(request),
-                            (elementClrType) => GetModel(elementClrType, request, actionDescriptor),
-                            (queryContext) => CreateAndValidateQueryOptions(request, queryContext),
-                            (statusCode) => actionExecutedContext.Result = new StatusCodeResult((int)statusCode),
-                            (statusCode, message, exception) => actionExecutedContext.Result = CreateBadRequestResult(message, exception));
-
-                        if (queryResult != null)
-                        {
-                            responseContent.Value = queryResult;
-                        }
+                        responseContent.Value = queryResult;
                     }
                 }
             }

test/UnitTest/Microsoft.AspNet.OData.Test.Shared/Query/EnableQueryAttributeTest.cs

@@ -2,12 +2,25 @@
 // Licensed under the MIT License.  See License.txt in the project root for license information.
 
 #if NETCORE
+using System;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
+using System.Linq;
+using Microsoft.AspNet.OData.Extensions;
 using Microsoft.AspNet.OData.Query;
+using Microsoft.AspNet.OData.Routing;
+using Microsoft.AspNet.OData.Test.Abstraction;
 using Microsoft.AspNet.OData.Test.Common;
 using Microsoft.AspNet.OData.Test.Common.Models;
 using Microsoft.AspNet.OData.Test.Query.Controllers;
+using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Mvc;
+using Microsoft.AspNetCore.Mvc.Abstractions;
+using Microsoft.AspNetCore.Mvc.Filters;
+using Microsoft.AspNetCore.Routing;
+using Microsoft.Extensions.DependencyInjection;
+using Microsoft.OData;
+using Microsoft.OData.Edm;
 using Xunit;
 #else
 using System;
@@ -254,8 +267,70 @@ public void OnActionExecuted_Throws_Null_Context()
         {
             ExceptionAssert.ThrowsArgumentNull(() => new EnableQueryAttribute().OnActionExecuted(null), "actionExecutedContext");
         }
-
 #if NETCORE // Following functionality is only supported in NetCore.
+        [Fact]
+        public void OnActionExecuted_HandlesStatusCodesCorrectly()
+        {
+            // Arrange
+            HttpContext httpContext = new DefaultHttpContext();
+            httpContext.Request.Method = "Get";
+            ActionDescriptor actionDescriptor = new ActionDescriptor();
+            ActionContext actionContext = new ActionContext(httpContext, new RouteData(), actionDescriptor);
+
+            ActionExecutedContext context = new ActionExecutedContext(actionContext, new List<IFilterMetadata>(), "someController");
+            context.Result = new ObjectResult(new { Error = "Error", Message = "Message" }) { StatusCode = 500 };
+
+            EnableQueryAttribute attribute = new EnableQueryAttribute();
+
+            // Act and Assert
+            ExceptionAssert.DoesNotThrow(() => attribute.OnActionExecuted(context));
+        }
+
+        [Fact]
+        public void OnActionExecuted_HandlesRequestsNormally()
+        {
+            // Arrange
+            var routeName = "odata";
+            IEdmModel model = new CustomersModelWithInheritance().Model;
+            var configuration = RoutingConfigurationFactory.Create();
+
+            configuration.Filter();
+
+            var request = RequestFactory.CreateFromModel(model, "http://localhost/odata/Customers?$filter=Id eq 1", routeName, new ODataPath());
+
+            IServiceProvider serviceProvider = GetServiceProvider(configuration, model, routeName);
+            request.ODataFeature().RequestContainer = serviceProvider;
+            HttpContext httpContext = request.HttpContext;
+            httpContext.RequestServices = serviceProvider;
+
+            ActionDescriptor actionDescriptor = ControllerDescriptorFactory
+                                                .Create(configuration, "CustomersController", typeof(CustomersController))
+                                                .First(descriptor => descriptor.ActionName.StartsWith("Get", StringComparison.OrdinalIgnoreCase));
+            ActionContext actionContext = new ActionContext(httpContext, new RouteData(), actionDescriptor);
+
+            ActionExecutedContext context = new ActionExecutedContext(actionContext, new List<IFilterMetadata>(), new CustomersController());
+            context.Result = new ObjectResult(new List<Customer>()) { StatusCode = 200 };
+
+            EnableQueryAttribute attribute = new EnableQueryAttribute();
+
+            // Act and Assert
+            ExceptionAssert.DoesNotThrow(() => attribute.OnActionExecuted(context));
+
+            Assert.NotNull(context.Result as ObjectResult);
+        }
+
+        private IServiceProvider GetServiceProvider(IRouteBuilder builder, IEdmModel model, string routeName)
+        {
+            IPerRouteContainer perRouteContainer = builder.ServiceProvider.GetRequiredService<IPerRouteContainer>();
+
+            // Create an service provider for this route. Add the default services to the custom configuration actions.
+            Action<IContainerBuilder> builderAction = ODataRouteBuilderExtensions.ConfigureDefaultServices(builder, b =>
+            {
+                b.AddService(Microsoft.OData.ServiceLifetime.Singleton, sp => model);
+            });
+            return perRouteContainer.CreateODataRootContainer(routeName, builderAction);
+        }
+
         [Fact]
         public void OnActionExecuting_Throws_Null_Context()
         {