Merge pull request #89 from jehhynes/master

Deterministic sorting,  Dapper dynamic OverallCount

Author: programcsharp

Griddly.Mvc/Results/DapperResult.cs

@@ -118,7 +118,7 @@ public override long GetCount()
 
             return _overallCount.Value;
         }
-        
+
         protected string BuildSortClause(SortField[] sortFields)
         {
             if (sortFields != null && sortFields.Length > 0)
@@ -142,13 +142,8 @@ protected virtual IList<T> ExecuteQuery(string sql)
             {
                 IEnumerable<T> result = _map(_getConnection(), _getTransaction != null ? _getTransaction() : null, sql, _param);
 
-                if (_hasOverallCount)
-                {
-                    IHasOverallCount overallCount = result as IHasOverallCount;
-
-                    if (overallCount != null)
-                        _overallCount = overallCount.OverallCount;
-                }
+                if (result is IHasOverallCount overallCount)
+                    _overallCount = overallCount.OverallCount;
 
                 IList<T> results = result.ToList();
 
@@ -167,16 +162,29 @@ protected IEnumerable<T> DefaultMap(IDbConnection cn, IDbTransaction tx, string
         {
             IEnumerable<T> result = cn.Query<T>(sql, param, tx);
 
-            if (_hasOverallCount)
+            var firstRow = result.FirstOrDefault();
+            long? overallCount = null;
+
+            if (firstRow == null)
+            {
+                overallCount = 0;
+            }
+            else if (_hasOverallCount && firstRow is IHasOverallCount iHasOverallCount)
+            {
+                overallCount = iHasOverallCount.OverallCount;
+            }
+            else if (_sql.IndexOf("OverallCount", StringComparison.InvariantCultureIgnoreCase) != -1 
+                && firstRow is IDictionary<string, object> dapperRow)
+            {
+                overallCount = Convert.ToInt64(dapperRow["OverallCount"]);
+            }
+
+            if (overallCount != null)
             {
-                IHasOverallCount firstRow = result.FirstOrDefault() as IHasOverallCount;
                 ListPage<T> lp = new ListPage<T>();
 
-                if (firstRow != null)
-                {
-                    lp.OverallCount = firstRow.OverallCount;
-                    lp.AddRange(result);
-                }
+                lp.OverallCount = overallCount.Value;
+                lp.AddRange(result);
 
                 result = lp;
             }

Griddly.Mvc/Results/QueryableResult.cs

@@ -12,17 +12,24 @@ public class QueryableResult<T> : GriddlyResult<T>
     {
         IQueryable<T> _result;
         Func<IQueryable<T>, IQueryable<T>> _massage = null;
+        string _finalSortField;
 
-        public QueryableResult(IQueryable<T> result, string viewName = null, Func<IQueryable<T>, IQueryable<T>> massage = null)
+        static readonly bool _typeHasId = typeof(T).GetProperty("Id") != null;
+
+        public QueryableResult(IQueryable<T> result, string viewName = null, Func<IQueryable<T>, IQueryable<T>> massage = null, string finalSortField = null)
             : base(viewName)
         {
             _result = result;
             _massage = massage;
+            _finalSortField = finalSortField;
+
+            if (_finalSortField == null && _typeHasId)
+                _finalSortField = "Id";
         }
 
         public override IEnumerable<T> GetAll(SortField[] sortFields)
         {
-            IQueryable<T> sortedQuery = ApplySortFields(_result, sortFields);
+            IQueryable<T> sortedQuery = ApplySortFields(_result, sortFields, _finalSortField);
 
             if (_massage != null)
                 sortedQuery = _massage(sortedQuery);
@@ -32,7 +39,7 @@ public override IEnumerable<T> GetAll(SortField[] sortFields)
 
         public override IList<T> GetPage(int pageNumber, int pageSize, SortField[] sortFields)
         {
-            IQueryable<T> sortedQuery = ApplySortFields(_result, sortFields);
+            IQueryable<T> sortedQuery = ApplySortFields(_result, sortFields, _finalSortField);
 
             if (_massage != null)
                 sortedQuery = _massage(sortedQuery);
@@ -102,7 +109,7 @@ internal void PopulateSummaryValue(GriddlyColumn c)
 
         public override IEnumerable<P> GetAllForProperty<P>(string propertyName, SortField[] sortFields)
         {
-            return ApplySortFields(_result, sortFields)
+            return ApplySortFields(_result, sortFields, _finalSortField)
                 .Select<P>(propertyName, null);
         }
 
@@ -111,7 +118,7 @@ public override long GetCount()
             return _result.Count();
         }
 
-        protected static IQueryable<T> ApplySortFields(IQueryable<T> source, SortField[] sortFields)
+        protected static IQueryable<T> ApplySortFields(IQueryable<T> source, SortField[] sortFields, string finalSortField)
         {
             IOrderedQueryable<T> sortedQuery = null;
 
@@ -138,6 +145,14 @@ protected static IQueryable<T> ApplySortFields(IQueryable<T> source, SortField[]
                 }
             }
 
+            if (finalSortField != null)
+            {
+                if (sortedQuery == null)
+                    sortedQuery = OrderByDescending(source, finalSortField);
+                else
+                    sortedQuery = ThenByDescending(sortedQuery, finalSortField);
+            }
+
             return sortedQuery ?? source;
         }