net 451 support

Refactoring
trenoncourt · Dec 18, 2016 · 2226226 · 2226226
1 parent 13a68a6
commit 2226226
Show file tree

Hide file tree

Showing 11 changed files with 175 additions and 105 deletions.
diff --git a/build.bat b/build.bat
@@ -5,5 +5,6 @@ dotnet restore
 dotnet build
 
 dotnet pack ".\src\AutoQueryable" -c Release -o ".\bin\NuGetPackages"
+dotnet pack ".\src\AutoQueryable.AspNet.Filter" -c Release -o ".\bin\NuGetPackages"
 
 pause
diff --git a/src/AutoQueryable.AspNet.Filter/Filters/AutoQueryableFilter.cs b/src/AutoQueryable.AspNet.Filter/Filters/AutoQueryableFilter.cs
@@ -0,0 +1,32 @@
+using System;
+using System.Linq;
+using System.Net.Http;
+using System.Net.Http.Formatting;
+using System.Web.Http.Filters;
+using AutoQueryable.Extensions;
+using AutoQueryable.Models;
+
+namespace AutoQueryable.AspNet.Filter.Filters
+{
+    public class AutoQueryableFilter : ActionFilterAttribute
+    {
+        public string[] UnselectableProperties { get; set; }
+
+
+        public override void OnActionExecuted(HttpActionExecutedContext context)
+        {
+            var content = context.Response.Content as ObjectContent;
+            if (content != null)
+            {
+                IQueryable<object> query = content.Value as IQueryable<object>;
+                if (query == null) throw new Exception("Unable to retreive value of IQueryable from context result.");
+                Type entityType = query.GetType().GenericTypeArguments[0];
+
+                string queryString = context.Request.RequestUri.Query;
+                // Work on generic type directly, for dto projection
+                var result = query.AutoQueryable(queryString, new AutoQueryableProfile {UnselectableProperties = UnselectableProperties});
+                context.Response.Content = new ObjectContent(result.GetType(), result, new JsonMediaTypeFormatter());
+            }
+        }
+    }
+}
diff --git a/src/AutoQueryable.AspNet.Filter/project.json b/src/AutoQueryable.AspNet.Filter/project.json
@@ -5,6 +5,12 @@
   },
 
   "frameworks": {
-    "net451": {}
+    "net451": {
+      "dependencies": {
+        "Microsoft.AspNet.WebApi.Core": "5.2.3",
+        "AutoQueryable": "0.11.0"
+
+      }
+    }
   }
 }
diff --git a/src/AutoQueryable.AspNetCore.Filter/Attributes/AutoQueryableAttribute.cs b/src/AutoQueryable.AspNetCore.Filter/Attributes/AutoQueryableAttribute.cs
@@ -0,0 +1,33 @@
+using System;
+using AutoQueryable.AspNetCore.Filter.Filters;
+using AutoQueryable.Models;
+using Microsoft.AspNetCore.Mvc.Filters;
+
+namespace AutoQueryable.AspNetCore.Filter.Attributes
+{
+    [AttributeUsage(AttributeTargets.Method)]
+    public class AutoQueryableAttribute : Attribute, IFilterFactory, IOrderedFilter
+    {
+        public string[] UnselectableProperties { get; set; }
+
+        /// <inheritdoc />
+        public bool IsReusable { get; set; }
+
+        /// <inheritdoc />
+        public int Order { get; set; }
+
+        public IFilterMetadata CreateInstance(IServiceProvider serviceProvider)
+        {
+            if (serviceProvider == null)
+            {
+                throw new ArgumentNullException(nameof(serviceProvider));
+            }
+            var profile = new AutoQueryableProfile
+            {
+                UnselectableProperties = UnselectableProperties
+            };
+
+            return new AutoQueryableFilter(profile);
+        }
+    }
+}
diff --git a/src/AutoQueryable.AspNetCore.Filter/Filters/AutoQueryableFilter.cs b/src/AutoQueryable.AspNetCore.Filter/Filters/AutoQueryableFilter.cs
@@ -0,0 +1,32 @@
+using System;
+using AutoQueryable.Helpers;
+using AutoQueryable.Models;
+using Microsoft.AspNetCore.Mvc;
+using Microsoft.AspNetCore.Mvc.Filters;
+
+namespace AutoQueryable.AspNetCore.Filter.Filters
+{
+    public class AutoQueryableFilter : ActionFilterAttribute, IActionFilter
+    {
+        private readonly AutoQueryableProfile _autoQueryableProfile;
+
+        public AutoQueryableFilter(AutoQueryableProfile autoQueryableProfile)
+        {
+            _autoQueryableProfile = autoQueryableProfile;
+        }
+        public virtual void OnActionExecuting(ActionExecutingContext context)
+        {
+        }
+
+        public virtual void OnActionExecuted(ActionExecutedContext context)
+        {
+            dynamic query = ((ObjectResult)context.Result).Value;
+            if (query == null) throw new Exception("Unable to retreive value of IQueryable from context result.");
+            Type entityType = query.GetType().GenericTypeArguments[0];
+
+            string queryString = context.HttpContext.Request.QueryString.HasValue ? context.HttpContext.Request.QueryString.Value : null;
+            // Work on generic type directly, for dto projection
+            context.Result = new OkObjectResult(QueryableHelper.GetAutoQuery(queryString, entityType, query, _autoQueryableProfile));
+        }
+    }
+}
diff --git a/src/AutoQueryable.AspNetCore.Filter/project.json b/src/AutoQueryable.AspNetCore.Filter/project.json
@@ -1,8 +1,11 @@
 {
-  "version": "1.0.0-*",
+  "version": "0.0.1",
 
   "dependencies": {
-    "NETStandard.Library": "1.6.0"
+    "NETStandard.Library": "1.6.1",
+    "Microsoft.AspNetCore.Mvc.Abstractions": "1.1.0",
+    "Microsoft.AspNetCore.Mvc.Core": "1.1.0",
+    "AutoQueryable": "*"
   },
 
   "frameworks": {

diff --git a/src/AutoQueryable/Attributes/AutoQueryableAttribute.cs b/src/AutoQueryable/Attributes/AutoQueryableAttribute.cs
@@ -1,33 +1,33 @@
-using System;
-using AutoQueryable.Filters;
-using AutoQueryable.Models;
-using Microsoft.AspNetCore.Mvc.Filters;
+//using System;
+//using AutoQueryable.Filters;
+//using AutoQueryable.Models;
+//using Microsoft.AspNetCore.Mvc.Filters;
 
-namespace AutoQueryable.Attributes
-{
-    [AttributeUsage(AttributeTargets.Method)]
-    public class AutoQueryableAttribute : Attribute, IFilterFactory, IOrderedFilter
-    {
-        public string[] UnselectableProperties { get; set; }
+//namespace AutoQueryable.Attributes
+//{
+//    [AttributeUsage(AttributeTargets.Method)]
+//    public class AutoQueryableAttribute : Attribute, IFilterFactory, IOrderedFilter
+//    {
+//        public string[] UnselectableProperties { get; set; }
 
-        /// <inheritdoc />
-        public bool IsReusable { get; set; }
+//        /// <inheritdoc />
+//        public bool IsReusable { get; set; }
 
-        /// <inheritdoc />
-        public int Order { get; set; }
+//        /// <inheritdoc />
+//        public int Order { get; set; }
 
-        public IFilterMetadata CreateInstance(IServiceProvider serviceProvider)
-        {
-            if (serviceProvider == null)
-            {
-                throw new ArgumentNullException(nameof(serviceProvider));
-            }
-            var profile = new AutoQueryableProfile
-            {
-                UnselectableProperties = UnselectableProperties
-            };
+//        public IFilterMetadata CreateInstance(IServiceProvider serviceProvider)
+//        {
+//            if (serviceProvider == null)
+//            {
+//                throw new ArgumentNullException(nameof(serviceProvider));
+//            }
+//            var profile = new AutoQueryableProfile
+//            {
+//                UnselectableProperties = UnselectableProperties
+//            };
 
-            return new AutoQueryableFilter(profile);
-        }
-    }
-}
+//            return new AutoQueryableFilter(profile);
+//        }
+//    }
+//}
diff --git a/src/AutoQueryable/Extensions/ConditionExtension.cs b/src/AutoQueryable/Extensions/ConditionExtension.cs
@@ -1,7 +1,4 @@
 using System;
-using System.Collections.Generic;
-using System.Data.Common;
-using System.Linq;
 using System.Linq.Expressions;
 using System.Reflection;
 using AutoQueryable.Models;
@@ -10,34 +7,6 @@ namespace AutoQueryable.Extensions
 {
     public static class ConditionExtension
     {
-        public static string ToSqlCondition(this ConditionType condition, string key, IEnumerable<DbParameter> parameters)
-        {
-            switch (condition)
-            {
-                case ConditionType.Equal:
-                    return "(" + string.Join(" OR ", parameters.Select(p => key + " = @" + p.ParameterName)) + ")";
-                case ConditionType.NotEqual:
-                    return "(" + string.Join(" OR ", parameters.Select(p => key + " <> @" + p.ParameterName)) + ")";
-                case ConditionType.Less:
-                    return "(" + string.Join(" OR ", parameters.Select(p => key + " < @" + p.ParameterName)) + ")";
-                case ConditionType.LessEqual:
-                    return "(" + string.Join(" OR ", parameters.Select(p => key + " <= @" + p.ParameterName)) + ")";
-                case ConditionType.Greater:
-                    return "(" + string.Join(" OR ", parameters.Select(p => key + " > @" + p.ParameterName)) + ")";
-                case ConditionType.GreaterEqual:
-                    return "(" + string.Join(" OR ", parameters.Select(p => key + " >= @" + p.ParameterName)) + ")";
-                case ConditionType.Contains:
-                case ConditionType.StartsWith:
-                case ConditionType.EndsWith:
-                    return "(" + string.Join(" OR ", parameters.Select(p => key + " LIKE @" + p.ParameterName)) + ")";
-                case ConditionType.Between:
-                    return key + " IN (" + string.Join(", ", parameters.Select(p => "@" + p.ParameterName)) + ")";
-                default:
-                    // TODO log
-                    return "";
-            }
-        }
-
         public static Expression ToBinaryExpression(this ConditionType condition, Expression left, Expression right)
         {
             switch (condition)

diff --git a/src/AutoQueryable/Filters/AutoQueryableFilter.cs b/src/AutoQueryable/Filters/AutoQueryableFilter.cs
@@ -1,32 +1,32 @@
-using System;
-using AutoQueryable.Helpers;
-using AutoQueryable.Models;
-using Microsoft.AspNetCore.Mvc;
-using Microsoft.AspNetCore.Mvc.Filters;
+//using System;
+//using AutoQueryable.Helpers;
+//using AutoQueryable.Models;
+//using Microsoft.AspNetCore.Mvc;
+//using Microsoft.AspNetCore.Mvc.Filters;
 
-namespace AutoQueryable.Filters
-{
-    public class AutoQueryableFilter : IActionFilter
-    {
-        private readonly AutoQueryableProfile _autoQueryableProfile;
+//namespace AutoQueryable.Filters
+//{
+//    public class AutoQueryableFilter : IActionFilter
+//    {
+//        private readonly AutoQueryableProfile _autoQueryableProfile;
 
-        public AutoQueryableFilter(AutoQueryableProfile autoQueryableProfile)
-        {
-            _autoQueryableProfile = autoQueryableProfile;
-        }
-        public virtual void OnActionExecuting(ActionExecutingContext context)
-        {
-        }
+//        public AutoQueryableFilter(AutoQueryableProfile autoQueryableProfile)
+//        {
+//            _autoQueryableProfile = autoQueryableProfile;
+//        }
+//        public virtual void OnActionExecuting(ActionExecutingContext context)
+//        {
+//        }
 
-        public virtual void OnActionExecuted(ActionExecutedContext context)
-        {
-            dynamic query = ((ObjectResult)context.Result).Value;
-            if (query == null) throw new Exception("Unable to retreive value of IQueryable from context result.");
-            Type entityType = query.GetType().GenericTypeArguments[0];
+//        public virtual void OnActionExecuted(ActionExecutedContext context)
+//        {
+//            dynamic query = ((ObjectResult)context.Result).Value;
+//            if (query == null) throw new Exception("Unable to retreive value of IQueryable from context result.");
+//            Type entityType = query.GetType().GenericTypeArguments[0];
 
-            string queryString = context.HttpContext.Request.QueryString.HasValue ? context.HttpContext.Request.QueryString.Value : null;
-            // Work on generic type directly, for dto projection
-            context.Result = new OkObjectResult(QueryableHelper.GetAutoQuery(queryString, entityType, query, _autoQueryableProfile));
-        }
-    }
-}
+//            string queryString = context.HttpContext.Request.QueryString.HasValue ? context.HttpContext.Request.QueryString.Value : null;
+//            // Work on generic type directly, for dto projection
+//            context.Result = new OkObjectResult(QueryableHelper.GetAutoQuery(queryString, entityType, query, _autoQueryableProfile));
+//        }
+//    }
+//}
diff --git a/src/AutoQueryable/Models/Criteria.cs b/src/AutoQueryable/Models/Criteria.cs
@@ -1,6 +1,3 @@
-using System.Collections.Generic;
-using System.Data.Common;
-
 namespace AutoQueryable.Models
 {
     public class Criteria

diff --git a/src/AutoQueryable/project.json b/src/AutoQueryable/project.json
@@ -1,24 +1,24 @@
 {
-  "version": "0.10.0",
+  "version": "0.11.0",
 
   "dependencies": {
-    "Microsoft.AspNetCore.Mvc.Abstractions": "1.1.0",
-    "Microsoft.AspNetCore.Mvc.Core": "1.1.0",
-    "NETStandard.Library": "1.6.1",
-    "System.Data.SqlClient": "4.3.0"
   },
 
   "frameworks": {
     "netstandard1.6": {
       "dependencies": {
         "System.Reflection.Emit": "4.3.0",
-        "System.Linq.Queryable": "4.3.0"
+        "System.Linq.Queryable": "4.3.0",
+        "Microsoft.CSharp": "4.3.0",
+        "System.Reflection.TypeExtensions": "4.3.0",
+        "NETStandard.Library": "1.6.1"
       }
     },
     "net451": {
-      "dependencies": {
+      "frameworkAssemblies": {
         "System.Reflection.Emit": "4.0.0.0",
-        "System.Linq.Queryable": "4.0.0.0"
+        "System.Linq.Queryable": "4.0.0.0",
+        "Microsoft.CSharp": "4.0.0.0"
       }
     }
   },
@@ -32,8 +32,5 @@
 
   "title": "AutoQueryable add auto querying functionality like OData with best url practices to Asp.Net Core.",
   "description": "AutoQueryable add auto querying functionality like OData with best url practices to Asp.Net Core.",
-  "authors": [ "Thibaut Renoncourt" ],
-  "buildOptions": {
-    "define": [ "NET46" ]
-  }
+  "authors": [ "Thibaut Renoncourt" ]
 }