refactor getmultiple; tests

Luticate2.Utils/DataAccess/LuEfCrudDataAccess.cs

@@ -25,7 +25,7 @@ namespace Luticate2.Utils.DataAccess
 
         protected abstract TDboRead GetDboFromModel(TModel model);
 
-        public Func<TDboRead, T> GetIdFunc<T>()
+        protected Func<TDboRead, T> GetIdFunc<T>()
         {
             var param = Expression.Parameter(typeof(TDboRead), "x");
             var exp = Expression.Property(param, "Id");
@@ -129,14 +129,18 @@ namespace Luticate2.Utils.DataAccess
         }
 
 
-        public LuResult<LuPaginatedDbo<TDboRead>> GetMultiple<TKey>(Func<IQueryable<TModel>> orderBy,
+        public LuResult<LuPaginatedDbo<TDboRead>> GetMultiple(Func<DbSet<TModel>, IQueryable<TModel>> orderBy,
             Expression<Func<TModel, bool>> predicate, int page = 0, int perPage = int.MaxValue,
-            params Expression<Func<TModel, TKey>>[] otherOrderBy)
+            params Func<DbSet<TModel>, IQueryable<TModel>>[] otherOrderBy)
         {
             return Execute(() =>
             {
                 var count = Table.Count(predicate);
-                var ordered = orderBy();
+                var ordered = orderBy(Table);
+                foreach (var func in otherOrderBy)
+                {
+                    ordered = func(Table);
+                }
                 var data = ordered.Where(predicate).Skip(page * perPage).Take(perPage).Select(GetDboFromModel).ToList();
                 var result = new LuPaginatedDbo<TDboRead>
                 {
@@ -147,22 +151,27 @@ namespace Luticate2.Utils.DataAccess
             });
         }
 
-        public LuResult<LuPaginatedDbo<TDboRead>> GetMultiple<TKey>(Expression<Func<TModel, TKey>> orderBy,
-            Expression<Func<TModel, bool>> predicate, int page = 0, int perPage = int.MaxValue)
+        public LuResult<LuPaginatedDbo<TDboRead>> GetMultiple(Expression<Func<TModel, object>> orderBy,
+            Expression<Func<TModel, bool>> predicate, int page = 0, int perPage = int.MaxValue,
+            params Expression<Func<TModel, object>>[] otherOrderBy)
         {
-            return GetMultiple<TKey>(() => Table.OrderBy(orderBy), predicate, page, perPage);
+            return GetMultiple(table => table.OrderBy(orderBy), predicate, page, perPage,
+                otherOrderBy.Select<Expression<Func<TModel, object>>, Func<DbSet<TModel>,
+                    IQueryable<TModel>>>(expression => (t => t.OrderBy(expression))).ToArray());
         }
 
-        public LuResult<LuPaginatedDbo<TDboRead>> GetMultiple<TKey>(Expression<Func<TModel, TKey>> orderBy,
-            int page = 0, int perPage = int.MaxValue, params Expression<Func<TModel, TKey>>[] otherOrderBy)
+        public LuResult<LuPaginatedDbo<TDboRead>> GetMultiple(Func<DbSet<TModel>, IQueryable<TModel>> orderBy,
+            int page = 0, int perPage = int.MaxValue, params Func<DbSet<TModel>, IQueryable<TModel>>[] otherOrderBy)
         {
-            return GetMultiple(() => Table.OrderBy(orderBy), x => true, page, perPage, otherOrderBy);
+            return GetMultiple(orderBy, x => true, page, perPage, otherOrderBy);
         }
 
-        public LuResult<LuPaginatedDbo<TDboRead>> GetMultiple<TKey>(Expression<Func<TModel, TKey>> orderBy,
-            int page = 0, int perPage = int.MaxValue)
+        public LuResult<LuPaginatedDbo<TDboRead>> GetMultiple(Expression<Func<TModel, object>> orderBy,
+            int page = 0, int perPage = int.MaxValue, params Expression<Func<TModel, object>>[] otherOrderBy)
         {
-            return GetMultiple(orderBy, x => true, page, perPage);
+            return GetMultiple(table => table.OrderBy(orderBy), x => true, page, perPage,
+                otherOrderBy.Select<Expression<Func<TModel, object>>, Func<DbSet<TModel>,
+                    IQueryable<TModel>>>(expression => (t => t.OrderBy(expression))).ToArray());
         }
 
 

Test/Utils/EfCrubDataAccess/LuEfCreateDataAccessTest.cs

@@ -1,7 +1,9 @@
 using System;
 using System.Collections.Generic;
+using System.Diagnostics;
 using System.Linq;
 using Luticate2.Utils.Dbo;
+using Microsoft.AspNetCore.Mvc.Controllers;
 using Test.Utils.DataAccess;
 using Test.Utils.Dbo.PkBigSerial;
 using Test.Utils.Dbo.PkGuid;
@@ -115,6 +117,30 @@ namespace Test.Utils.EfCrubDataAccess
             });
         }
 
+        [Fact]
+        public void TestAddMultiple4()
+        {
+            Tests.TestRealDb(context =>
+            {
+                var dbos = new List<PkBigSerialAddDbo>
+                {
+                    new PkBigSerialAddDbo
+                    {
+                        SomeInt = 42,
+                        SomeText = "42"
+                    },
+                    new PkBigSerialAddDbo
+                    {
+                        SomeInt = 21,
+                        SomeText = "42"
+                    }
+                };
+                var service = new LuUtilsPkBigSerialDataAccess(context);
+                var res = service.Add(dbos, enumerable => enumerable.Select(dbo => dbo.CreatedAt));
+                Assert.Equal(LuStatus.DbError, res.Status);
+            });
+        }
+
 
         [Fact]
         public void TestAddSingle1()
@@ -523,5 +549,188 @@ namespace Test.Utils.EfCrubDataAccess
                 Assert.Equal(LuStatus.NotFound, get.Status);
             });
         }
+
+        [Fact]
+        public void TestGetMultiple1()
+        {
+            Tests.TestRealDb(context =>
+            {
+                var dbos = new List<PkGuidAddDbo>
+                {
+                    new PkGuidAddDbo
+                    {
+                        SomeInt = 42,
+                        SomeText = "442"
+                    },
+                    new PkGuidAddDbo
+                    {
+                        SomeInt = 42,
+                        SomeText = "42"
+                    },
+                    new PkGuidAddDbo
+                    {
+                        SomeInt = 24,
+                        SomeText = "24"
+                    }
+                };
+                var service = new LuUtilsPkGuidDataAccess(context);
+                var res = service.AddGuid(dbos);
+                Assert.Equal(LuStatus.Success, res.Status);
+
+                var get = service.GetMultiple(table => table.OrderBy(guid => guid.some_int),
+                    guid => guid.some_int == 42, 0, int.MaxValue, set => set.OrderBy(guid => guid.some_text));
+
+                Assert.Equal(LuStatus.Success, get.Status);
+                Assert.Equal(2, get.Data.Count);
+                Assert.Equal(2, get.Data.Data.Count);
+
+                var dbo = get.Data.Data[0];
+                Assert.Equal(42, dbo.SomeInt);
+                Assert.Equal("42", dbo.SomeText);
+
+                dbo = get.Data.Data[1];
+                Assert.Equal(42, dbo.SomeInt);
+                Assert.Equal("442", dbo.SomeText);
+            });
+        }
+
+        [Fact]
+        public void TestGetMultiple2()
+        {
+            Tests.TestRealDb(context =>
+            {
+                var dbos = new List<PkGuidAddDbo>
+                {
+                    new PkGuidAddDbo
+                    {
+                        SomeInt = 42,
+                        SomeText = "442"
+                    },
+                    new PkGuidAddDbo
+                    {
+                        SomeInt = 42,
+                        SomeText = "42"
+                    },
+                    new PkGuidAddDbo
+                    {
+                        SomeInt = 24,
+                        SomeText = "24"
+                    }
+                };
+                var service = new LuUtilsPkGuidDataAccess(context);
+                var res = service.AddGuid(dbos);
+                Assert.Equal(LuStatus.Success, res.Status);
+
+                var get = service.GetMultiple(guid => guid.some_int, guid => guid.some_int == 42, 0, int.MaxValue,
+                    guid => guid.some_text);
+
+                Assert.Equal(LuStatus.Success, get.Status);
+                Assert.Equal(2, get.Data.Count);
+                Assert.Equal(2, get.Data.Data.Count);
+
+                var dbo = get.Data.Data[0];
+                Assert.Equal(42, dbo.SomeInt);
+                Assert.Equal("42", dbo.SomeText);
+
+                dbo = get.Data.Data[1];
+                Assert.Equal(42, dbo.SomeInt);
+                Assert.Equal("442", dbo.SomeText);
+            });
+        }
+
+        [Fact]
+        public void TestGetMultiple3()
+        {
+            Tests.TestRealDb(context =>
+            {
+                var dbos = new List<PkGuidAddDbo>
+                {
+                    new PkGuidAddDbo
+                    {
+                        SomeInt = 42,
+                        SomeText = "442"
+                    },
+                    new PkGuidAddDbo
+                    {
+                        SomeInt = 42,
+                        SomeText = "42"
+                    },
+                    new PkGuidAddDbo
+                    {
+                        SomeInt = 24,
+                        SomeText = "24"
+                    }
+                };
+                var service = new LuUtilsPkGuidDataAccess(context);
+                var res = service.AddGuid(dbos);
+                Assert.Equal(LuStatus.Success, res.Status);
+
+                var get = service.GetMultiple(table => table.OrderBy(guid => guid.some_int), 0, int.MaxValue,
+                    set => set.OrderBy(guid => guid.some_text));
+
+                Assert.Equal(LuStatus.Success, get.Status);
+                Assert.Equal(3, get.Data.Count);
+                Assert.Equal(3, get.Data.Data.Count);
+
+                var dbo = get.Data.Data[0];
+                Assert.Equal(24, dbo.SomeInt);
+                Assert.Equal("24", dbo.SomeText);
+
+                dbo = get.Data.Data[1];
+                Assert.Equal(42, dbo.SomeInt);
+                Assert.Equal("42", dbo.SomeText);
+
+                dbo = get.Data.Data[2];
+                Assert.Equal(42, dbo.SomeInt);
+                Assert.Equal("442", dbo.SomeText);
+            });
+        }
+
+        [Fact]
+        public void TestGetMultiple4()
+        {
+            Tests.TestRealDb(context =>
+            {
+                var dbos = new List<PkGuidAddDbo>
+                {
+                    new PkGuidAddDbo
+                    {
+                        SomeInt = 42,
+                        SomeText = "442"
+                    },
+                    new PkGuidAddDbo
+                    {
+                        SomeInt = 42,
+                        SomeText = "42"
+                    },
+                    new PkGuidAddDbo
+                    {
+                        SomeInt = 24,
+                        SomeText = "24"
+                    }
+                };
+                var service = new LuUtilsPkGuidDataAccess(context);
+                var res = service.AddGuid(dbos);
+                Assert.Equal(LuStatus.Success, res.Status);
+
+                var get = service.GetMultiple(guid => guid.some_int, 0, int.MaxValue, guid => guid.some_text);
+
+                Assert.Equal(LuStatus.Success, get.Status);
+                Assert.Equal(3, get.Data.Count);
+                Assert.Equal(3, get.Data.Data.Count);
+
+                var dbo = get.Data.Data[0];
+                Assert.Equal(24, dbo.SomeInt);
+                Assert.Equal("24", dbo.SomeText);
+
+                dbo = get.Data.Data[1];
+                Assert.Equal(42, dbo.SomeInt);
+                Assert.Equal("42", dbo.SomeText);
+
+                dbo = get.Data.Data[2];
+                Assert.Equal(42, dbo.SomeInt);
+                Assert.Equal("442", dbo.SomeText);
+            });
+        }
     }
 }