Add MapQueryableResult

Author: programcsharp

Build/CommonAssemblyInfo.cs

@@ -15,6 +15,6 @@
 //
 // You can specify all the values or you can default the Revision and Build Numbers
 // by using the '*' as shown below:
-[assembly: AssemblyVersion("1.5.14")]
-[assembly: AssemblyFileVersion("1.5.14")]
+[assembly: AssemblyVersion("1.5.15")]
+[assembly: AssemblyFileVersion("1.5.15")]
 //[assembly: AssemblyInformationalVersion("1.4.5-editlyalpha2")]

Griddly.Mvc/Griddly.Mvc.csproj

@@ -113,6 +113,7 @@
     <Compile Include="Results\DapperResult.cs" />
     <Compile Include="Results\DapperSql2008Result.cs" />
     <Compile Include="Results\DapperSql2012Result.cs" />
+    <Compile Include="Results\MapQueryableResult.cs" />
     <Compile Include="Results\QueryableResult.cs" />
     <Compile Include="SelectListItemGroup.cs" />
     <Compile Include="SortField.cs" />

Griddly.Mvc/Results/MapQueryableResult.cs

@@ -0,0 +1,48 @@
+using Griddly.Mvc.Linq.Dynamic;
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using System.Collections.Specialized;
+using System.Linq;
+using System.Linq.Expressions;
+using System.Reflection;
+using System.Web.Helpers;
+using System.Web.Mvc;
+
+namespace Griddly.Mvc.Results
+{
+    public class MapQueryableResult<TIn, TOut> : GriddlyResult<TOut>
+    {
+        QueryableResult<TIn> _result;
+
+        Func<IEnumerable<TIn>, IQueryable<TOut>> _map = null;
+
+        public MapQueryableResult(IQueryable<TIn> result, Func<IEnumerable<TIn>, IQueryable<TOut>> map, string viewName = null, Func<IQueryable<TIn>, IQueryable<TIn>> massage = null)
+            : base(viewName)
+        {
+            _result = new QueryableResult<TIn>(result, massage: massage);
+            _map = map;
+        }
+
+        public override IEnumerable<TOut> GetAll(SortField[] sortFields)
+        {
+            return _map(_result.GetAll(sortFields));
+        }
+
+        public override IList<TOut> GetPage(int pageNumber, int pageSize, SortField[] sortFields)
+        {
+            return _map(_result.GetPage(pageNumber, pageSize, sortFields)).ToList();
+        }
+
+        public override void PopulateSummaryValues(GriddlySettings<TOut> settings)
+        {
+            foreach (GriddlyColumn c in settings.Columns.Where(x => x.SummaryFunction != null))
+                _result.PopulateSummaryValue(c);
+        }
+
+        public override long GetCount()
+        {
+            return _result.GetCount();
+        }
+    }
+}

Griddly.Mvc/Results/QueryableResult.cs

@@ -1,13 +1,10 @@
-using Griddly.Mvc.Linq.Dynamic;
-using System;
-using System.Collections;
+using System;
 using System.Collections.Generic;
-using System.Collections.Specialized;
 using System.Linq;
 using System.Linq.Expressions;
 using System.Reflection;
 using System.Web.Helpers;
-using System.Web.Mvc;
+using Griddly.Mvc.Linq.Dynamic;
 
 namespace Griddly.Mvc.Results
 {
@@ -76,20 +73,23 @@ public override void PopulateSummaryValues(GriddlySettings<T> settings)
 
             // TODO: figure out how to get this in one query
             foreach (GriddlyColumn c in settings.Columns.Where(x => x.SummaryFunction != null))
+                PopulateSummaryValue(c);
+        }
+
+        internal void PopulateSummaryValue(GriddlyColumn c)
+        {
+            switch (c.SummaryFunction.Value)
             {
-                switch (c.SummaryFunction.Value)
-                {
-                    case SummaryAggregateFunction.Sum:
-                    case SummaryAggregateFunction.Average:
-                    case SummaryAggregateFunction.Min:
-                    case SummaryAggregateFunction.Max:
-                        c.SummaryValue = _result.Aggregate(c.SummaryFunction.Value.ToString(), c.ExpressionString);
+                case SummaryAggregateFunction.Sum:
+                case SummaryAggregateFunction.Average:
+                case SummaryAggregateFunction.Min:
+                case SummaryAggregateFunction.Max:
+                    c.SummaryValue = _result.Aggregate(c.SummaryFunction.Value.ToString(), c.ExpressionString);
 
-                        break;
+                    break;
 
-                    default:
-                        throw new InvalidOperationException(string.Format("Unknown summary function {0} for column {1}.", c.SummaryFunction, c.ExpressionString));
-                }
+                default:
+                    throw new InvalidOperationException(string.Format("Unknown summary function {0} for column {1}.", c.SummaryFunction, c.ExpressionString));
             }
         }