Merge pull request #82 from trenoncourt/develop

merge develop into master

Author: trenoncourt

README.md

@@ -129,6 +129,13 @@ AQ settings can be overriden in attribute too
 - Filtering: [/products?**nameContains=frame&color=red,black**](/products?nameContains=frame&color=red,black) 
 - Paging: [/products?**page=2&pagesize=10**](/products?page=2&pagesize=10) 
 
+## And / Or management
+
+- In a single filter, properties are managed with **OR**, eg `prop1=a,b,c`
+- If you want single filter with **AND** you need to add the same filter, eg `prop1=a&prop1=b&prop1=c`
+- If multiple filters are provided, there are managed with **AND**, eg `prop1=a&prop2=a&prop3Contains=b`
+- If you want multiple filters with **OR**, you must provide all filters before the *=*, eg `prop1StartsWith,prop2:i,prop3Contains:i=a,b,c`
+
 ## Selection
 
 - Select all properties of level zero without relations: [/products?**select=_**](/products?**select=_)

src/AutoQueryable/AutoQueryable.csproj

@@ -2,7 +2,7 @@
   <PropertyGroup>
     <Description>AutoQueryable add auto querying functionality like OData with best url practices to Asp.Net Core.</Description>
     <AssemblyTitle>AutoQueryable add auto querying functionality like OData with best url practices to Asp.Net Core.</AssemblyTitle>
-    <Version>2.0.5-beta</Version>
+    <Version>2.0.11-beta</Version>
     <Authors>Thibaut Renoncourt, Nils Goovaerts</Authors>
     <TargetFramework>netstandard1.3</TargetFramework>
     <AssemblyName>AutoQueryable</AssemblyName>

src/AutoQueryable/Core/Models/AutoQueryHandler.cs

@@ -49,10 +49,11 @@ public dynamic GetAutoQuery<T>(IQueryable<T> query) where T : class
 
             GetClauses<T>();
             var criterias = _profile.IsClauseAllowed(ClauseType.Filter) ? GetCriterias<T>().ToList() : null;
-            
-            var queryResult = QueryBuilder.Build(ClauseValueManager, _criteriaFilterManager, query, criterias, _profile);
 
-            TotalCountQuery = QueryBuilder.TotalCountQuery;
+            query = QueryBuilder.AddCriterias(query, criterias, _criteriaFilterManager);
+            TotalCountQuery = query;
+            var queryResult = QueryBuilder.Build(ClauseValueManager, query, _profile);
+
 
             return queryResult;
         }
@@ -111,18 +112,50 @@ public IEnumerable<Criteria> GetCriterias<T>() where T : class
             foreach (var qPart in _queryStringAccessor.QueryStringParts.Where(q => !q.IsHandled))
             {
                 var q = WebUtility.UrlDecode(qPart.Value);
-                var criteria = GetCriteria<T>(q);
-
-                if (criteria != null)
+                
+                int subIndex = q.IndexOf('=');
+                if (subIndex == -1)
+                {
+                    subIndex = q.IndexOf('>');
+                }
+                if (subIndex == -1)
+                {
+                    subIndex = q.IndexOf('<');
+                }
+                List<string> orEntries = q.Substring(0, subIndex).Split(new[] {','}, StringSplitOptions.RemoveEmptyEntries).Select(s => s + q.Substring(subIndex, q.Length - subIndex)).ToList();
+                if (orEntries.Count <= 1)
+                {
+                    var criteria = GetCriteria<T>(orEntries[0].Trim());
+                    if (criteria != null)
+                    {
+                        yield return criteria;
+                    }
+                    continue;
+                }
+                
+                List<Criteria> criterias = new List<Criteria>();
+                for (int i = 0; i < orEntries.Count; i++)
                 {
-                    yield return criteria;
+                    var criteria = GetCriteria<T>(orEntries[i].Trim());
+                    if (i > 0)
+                    {
+                        criteria.Or = true;
+                    }
+                    if (criteria != null)
+                    {
+                        criterias.Add(criteria);
+                    }
                 }
+                if (criterias.Count == 0) continue;
+                yield return new Criteria
+                {
+                    Criterias = criterias
+                };
             }
         }
 
         private Criteria GetCriteria<T>(string q) where T : class
         {
-
             var filter = _criteriaFilterManager.FindFilter(q);
             if (filter == null)
             {

src/AutoQueryable/Core/Models/Criteria.cs

@@ -8,5 +8,7 @@ public class Criteria
         public List<string> ColumnPath { get; set; } 
         public IQueryableFilter Filter { get; set; }
         public string[] Values { get; set; }
+        public bool Or { get; set; }
+        public List<Criteria> Criterias { get; set; }
     }
 }

src/AutoQueryable/Extensions/TypeBuilderExtension.cs

@@ -9,7 +9,7 @@ public static class TypeBuilderExtension
         private static void AddProperty(this TypeBuilder typeBuilder, string propName, PropertyAttributes attributes, Type propertyType) {
             const MethodAttributes getSetAttr = MethodAttributes.Public | MethodAttributes.HideBySig | MethodAttributes.SpecialName;
 
-            var field = typeBuilder.DefineField(propName, propertyType, FieldAttributes.Private);
+            var field = typeBuilder.DefineField("_" + propName, propertyType, FieldAttributes.Private);
 
             var property = typeBuilder.DefineProperty(propName, attributes, propertyType, new Type[] { });
 

src/AutoQueryable/Helpers/QueryBuilder.cs

@@ -16,17 +16,21 @@ namespace AutoQueryable.Helpers
 {
     public static class QueryBuilder
     {
-        public static IQueryable<dynamic> TotalCountQuery { get; private set; }
-
-        public static dynamic Build<T>(IClauseValueManager clauseValueManager, ICriteriaFilterManager criteriaFilterManager, IQueryable<T> query, ICollection<Criteria> criterias, IAutoQueryableProfile profile) where T : class
+        public static IQueryable<T> AddCriterias<T>(IQueryable<T> query, ICollection<Criteria> criterias, ICriteriaFilterManager criteriaFilterManager) where T : class
         {
             if (criterias != null && criterias.Any())
             {
-                query = _addCriterias(criteriaFilterManager, query, criterias);
+                return _addCriterias(criteriaFilterManager, query, criterias);
             }
+
+            return query;
+        }
+
+        public static dynamic Build<T>(IClauseValueManager clauseValueManager, IQueryable<T> query, IAutoQueryableProfile profile) where T : class
+        {
+            var totalCountQuery = query;
             query = _addOrderBy(query, clauseValueManager.OrderBy, profile);
 
-            TotalCountQuery = query;
             if(clauseValueManager.First)
             {
                 return query.FirstOrDefault();
@@ -55,7 +59,7 @@ public static dynamic Build<T>(IClauseValueManager clauseValueManager, ICriteria
                 }
             }
 
-            return queryProjection.HandleWrapping(clauseValueManager);
+            return queryProjection.HandleWrapping(clauseValueManager, totalCountQuery);
         }
 
         private static IQueryable<T> _handlePaging<T>(IClauseValueManager clauseValueManager, IQueryable<T> query, IAutoQueryableProfile profile) where T : class
@@ -96,7 +100,7 @@ private static IQueryable<T> _handlePaging<T>(IClauseValueManager clauseValueMan
             return query;
         }
 
-        public static dynamic HandleWrapping<TEntity>(this IQueryable<TEntity> query, IClauseValueManager clauseValueManager) where TEntity : class
+        public static dynamic HandleWrapping<TEntity>(this IQueryable<TEntity> query, IClauseValueManager clauseValueManager, IQueryable<TEntity> totalCountQuery) where TEntity : class
         {
             if(!clauseValueManager.WrapWith.Any() || clauseValueManager.First)
             {
@@ -114,7 +118,7 @@ public static dynamic HandleWrapping<TEntity>(this IQueryable<TEntity> query, IC
                 }
                 else if (wrapperPart == WrapperAlias.TotalCount)
                 {
-                    wrapper.Add(WrapperAlias.TotalCount, TotalCountQuery.Count());
+                    wrapper.Add(WrapperAlias.TotalCount, totalCountQuery.Count());
                 }
             }
 
@@ -207,9 +211,37 @@ private static IQueryable<T> _addCriterias<T>(ICriteriaFilterManager criteriaFil
             Expression whereExpression = null;
             foreach (var c in criterias)
             {
-                var expression = BuildWhereExpression(criteriaFilterManager, parentEntity, c, c.ColumnPath.ToArray());
+                if (c.Criterias != null && c.Criterias.Count > 0)
+                {
+                    if (c.Criterias.Count == 1)
+                    {
+                        var expression = BuildWhereExpression(criteriaFilterManager, parentEntity, c.Criterias.First(), c.Criterias.First().ColumnPath.ToArray());
+                        whereExpression = whereExpression == null ? expression : Expression.AndAlso(whereExpression, expression);
+                    }
 
-                whereExpression = whereExpression == null ? expression : Expression.AndAlso(whereExpression, expression);
+                    List<Expression> expressions = new List<Expression>();
+                    foreach (var criteria in c.Criterias)
+                    {
+                        expressions.Add(BuildWhereExpression(criteriaFilterManager, parentEntity, criteria, criteria.ColumnPath.ToArray()));
+                    }
+                    Expression currentExpression = null;
+                    foreach (var expression in expressions)
+                    {
+                        if (currentExpression == null)
+                        {
+                            currentExpression = expression;
+                            continue;
+                        }
+                        currentExpression = Expression.OrElse(expression, currentExpression);
+                    }
+
+                    whereExpression = whereExpression == null ? currentExpression : Expression.AndAlso(whereExpression, currentExpression); // TODO
+                }
+                else
+                {
+                    var expression = BuildWhereExpression(criteriaFilterManager, parentEntity, c, c.ColumnPath.ToArray());
+                    whereExpression = whereExpression == null ? expression : Expression.AndAlso(whereExpression, expression);
+                }
             }
 
             return source.Where(Expression.Lambda<Func<T, bool>>(whereExpression, parentEntity));
@@ -237,15 +269,29 @@ private static IQueryable<T> _addOrderBy<T>(IQueryable<T> source, Dictionary<str
             {
                 PropertyName = v.Name
             });
+            var i = 0;
             foreach (var column in columns)
             {
                 var desc = orderClause.FirstOrDefault(o => string.Equals(o.Key, column.PropertyName, StringComparison.OrdinalIgnoreCase)).Value;
+                string method;
                 if(desc){
-                    source = source.Call(QueryableMethods.OrderByDescending, column.PropertyName);
-                }else
+                    method = QueryableMethods.OrderByDescending;
+                    if (i > 0)
+                    {
+                        method = QueryableMethods.ThenByDescending;
+                    }
+                }
+                else
                 {
-                    source = source.Call(QueryableMethods.OrderBy, column.PropertyName);
+                    method = QueryableMethods.OrderBy;
+                    if (i > 0)
+                    {
+                        method = QueryableMethods.ThenBy;
+                    }
                 }
+
+                source = source.Call(method, column.PropertyName);
+                i++;
             }
             return source;
         }

src/AutoQueryable/Models/Constants/QueryableMethods.cs

@@ -3,6 +3,8 @@
     public static class QueryableMethods
     {
         public const string OrderBy = "OrderBy";
+        public const string ThenBy = "ThenBy";
         public const string OrderByDescending = "OrderByDescending";
+        public const string ThenByDescending = "ThenByDescending";
     }
 }