switched to transient dbcontext

Luticate2.Utils/DataAccess/LuEfCrudDataAccess.cs

@@ -21,7 +21,7 @@ namespace Luticate2.Utils.DataAccess
         where TDboUpdate : class
         where TDbContext : DbContext
     {
-        protected LuEfCrudDataAccess(TDbContext db, DbSet<TModel> table) : base(db, table)
+        protected LuEfCrudDataAccess(IServiceProvider serviceProvider) : base(serviceProvider)
         {
         }
 
@@ -66,19 +66,19 @@ namespace Luticate2.Utils.DataAccess
             return id;
         }
 
-        protected virtual IQueryable<TModel> GetGetQueryable()
+        protected virtual IQueryable<TModel> GetGetQueryable(DbContext db, DbSet<TModel> table)
         {
-            return Table;
+            return table;
         }
 
-        protected virtual IQueryable<TModel> GetEditQueryable()
+        protected virtual IQueryable<TModel> GetEditQueryable(DbContext db, DbSet<TModel> table)
         {
-            return Table;
+            return table;
         }
 
-        protected virtual IQueryable<TModel> GetDeleteQueryable()
+        protected virtual IQueryable<TModel> GetDeleteQueryable(DbContext db, DbSet<TModel> table)
         {
-            return Table;
+            return table;
         }
 
         protected Func<TDboRead, T> GetIdFunc<T>()
@@ -97,9 +97,9 @@ namespace Luticate2.Utils.DataAccess
             return LuResult<T>.Error(LuStatus.NotFound, typeof(TModel).Name + ": Value not found", "");
         }
 
-        protected IQueryable<TModel> GetFilterQuery(LuFilterDbo filter)
+        protected IQueryable<TModel> GetFilterQuery(LuFilterDbo filter, DbContext db, DbSet<TModel> table)
         {
-            return GetGetQueryable().Where(GetFilterExpression(filter));
+            return GetGetQueryable(db, table).Where(GetFilterExpression(filter));
         }
 
 
@@ -107,14 +107,14 @@ namespace Luticate2.Utils.DataAccess
 
         public LuResult<T> Add<T>(IEnumerable<TDboCreate> objs, Func<IEnumerable<TDboRead>, T> returnFunc)
         {
-            return Execute(() =>
+            return Execute((db, table) =>
             {
                 var models = objs.Select(GetModelFromTCreate).ToList();
-                Table.AddRange(models);
-                Db.SaveChanges();
+                table.AddRange(models);
+                db.SaveChanges();
                 foreach (var model in models)
                 {
-                    Db.Entry(model).State = EntityState.Detached;
+                    db.Entry(model).State = EntityState.Detached;
                 }
                 var dbos = models.Select(GetDboFromModel).ToList();
                 var res = returnFunc(dbos);
@@ -155,9 +155,9 @@ namespace Luticate2.Utils.DataAccess
 
         public LuResult<TDboRead> GetSingle(Expression<Func<TModel, bool>> predicate)
         {
-            return Execute(() =>
+            return Execute((db, table) =>
             {
-                var model = GetGetQueryable().AsNoTracking().FirstOrDefault(predicate);
+                var model = GetGetQueryable(db, table).AsNoTracking().FirstOrDefault(predicate);
                 if (model == default(TModel))
                 {
                     return GetNotFoundResult<TDboRead>();
@@ -187,9 +187,9 @@ namespace Luticate2.Utils.DataAccess
             Expression<Func<TModel, bool>> predicate, int page = 0, int perPage = int.MaxValue,
             params Func<IOrderedQueryable<TModel>, IOrderedQueryable<TModel>>[] otherOrderBy)
         {
-            return Execute(() =>
+            return Execute((db, table) =>
             {
-                var queryable = GetGetQueryable();
+                var queryable = GetGetQueryable(db, table);
                 var count = queryable.Count(predicate);
                 var ordered = orderBy(queryable);
                 foreach (var func in otherOrderBy)
@@ -227,11 +227,12 @@ namespace Luticate2.Utils.DataAccess
             return GetMultiple(orderBy, x => true, page, perPage, otherOrderBy);
         }
 
-        public LuResult<LuPaginatedDbo<TDboRead>> GetMultiple(LuOrderByDbo orderBy, IQueryable<TModel> queryable,
+        public LuResult<LuPaginatedDbo<TDboRead>> GetMultiple(LuOrderByDbo orderBy, Func<TDbContext, DbSet<TModel>, IQueryable<TModel>> getQueryable,
             int page = 0, int perPage = int.MaxValue)
         {
-            return Execute(() =>
+            return Execute((db, table) =>
             {
+                var queryable = getQueryable(db, table);
                 var count = queryable.Count();
                 IOrderedQueryable<TModel> ordered = null;
                 foreach (var field in orderBy.Fields)
@@ -265,12 +266,12 @@ namespace Luticate2.Utils.DataAccess
         public LuResult<LuPaginatedDbo<TDboRead>> GetMultiple(LuOrderByDbo orderBy, LuFilterDbo filter,
             int page = 0, int perPage = int.MaxValue)
         {
-            return GetMultiple(orderBy, GetFilterQuery(filter), page, perPage);
+            return GetMultiple(orderBy, (db, table) => GetFilterQuery(filter, db, table), page, perPage);
         }
 
         public LuResult<LuPaginatedDbo<TDboRead>> GetMultiple(LuOrderByDbo orderBy, int page = 0, int perPage = int.MaxValue)
         {
-            return GetMultiple(orderBy, GetGetQueryable(), page, perPage);
+            return GetMultiple(orderBy, GetGetQueryable, page, perPage);
         }
 
 
@@ -278,17 +279,17 @@ namespace Luticate2.Utils.DataAccess
         public LuResult<T> Edit<T>(Expression<Func<TModel, bool>> predicate, Action<TModel> update,
             Func<IEnumerable<TDboRead>, T> returnFunc)
         {
-            return Execute(() =>
+            return Execute((db, table) =>
             {
-                var models = GetEditQueryable().Where(predicate).AsNoTracking();
+                var models = GetEditQueryable(db, table).Where(predicate).AsNoTracking();
                 var editedDbos = new List<TDboRead>();
                 foreach (var model in models)
                 {
                     update(model);
                     editedDbos.Add(GetDboFromModel(model));
-                    Db.Entry(model).State = EntityState.Modified;
+                    db.Entry(model).State = EntityState.Modified;
                 }
-                Db.SaveChanges();
+                db.SaveChanges();
                 var res = returnFunc(editedDbos);
                 return LuResult<T>.Ok(res);
             });
@@ -355,11 +356,11 @@ namespace Luticate2.Utils.DataAccess
         public LuResult<T> Delete<T>(Expression<Func<TModel, bool>> predicate,
             Func<IEnumerable<TDboRead>, T> returnFunc)
         {
-            return Execute(() =>
+            return Execute((db, table) =>
             {
-                var models = GetDeleteQueryable().Where(predicate).AsNoTracking().ToList();
-                Table.RemoveRange(models);
-                Db.SaveChanges();
+                var models = GetDeleteQueryable(db, table).Where(predicate).AsNoTracking().ToList();
+                table.RemoveRange(models);
+                db.SaveChanges();
                 var dbos = models.Select(GetDboFromModel);
                 return LuResult<T>.Ok(returnFunc(dbos));
             });

Luticate2.Utils/DataAccess/LuEfDataAccess.cs

@@ -10,21 +10,24 @@ namespace Luticate2.Utils.DataAccess
         where TModel : class
         where TDbContext : DbContext
     {
-        protected readonly TDbContext Db;
+        private readonly IServiceProvider _serviceProvider;
 
-        protected readonly DbSet<TModel> Table;
-
-        protected LuEfDataAccess(TDbContext db, DbSet<TModel> table)
+        protected LuEfDataAccess(IServiceProvider serviceProvider)
         {
-            Db = db;
-            Table = table;
+            _serviceProvider = serviceProvider;
         }
 
-        public LuResult<T> Execute<T>(Func<LuResult<T>> func)
+        protected abstract DbSet<TModel> GetTable(TDbContext db);
+
+        public LuResult<T> Execute<T>(Func<TDbContext, DbSet<TModel>, LuResult<T>> func)
         {
             try
             {
-                return func();
+                using (var db = (TDbContext)_serviceProvider.GetService(typeof(TDbContext)))
+                {
+                    var table = GetTable(db);
+                    return func(db, table);
+                }
             }
             catch (Exception e)
             {

TestUtils/DataAccess/LuUtilsPkBigSerialDataAccess.cs

@@ -2,6 +2,7 @@
 using System.Linq.Expressions;
 using Luticate2.Utils.DataAccess;
 using Luticate2.Utils.Dbo.Filter;
+using Microsoft.EntityFrameworkCore;
 using TestUtils.DataAccess.Models;
 using TestUtils.Dbo.PkBigSerial;
 
@@ -9,10 +10,15 @@ namespace TestUtils.DataAccess
 {
     public class LuUtilsPkBigSerialDataAccess : LuEfCrudDataAccess<pk_bigserial, PkBigSerialAddDbo, PkBigSerialDbo, PkBigSerialAddDbo, LuUtilsDbContext, long>
     {
-        public LuUtilsPkBigSerialDataAccess(LuUtilsDbContext db) : base(db, db.pk_bigserial)
+        public LuUtilsPkBigSerialDataAccess(IServiceProvider serviceProvider) : base(serviceProvider)
         {
         }
 
+        protected override DbSet<pk_bigserial> GetTable(LuUtilsDbContext db)
+        {
+            return db.pk_bigserial;
+        }
+
         protected override pk_bigserial GetModelFromTCreate(PkBigSerialAddDbo obj)
         {
             return GetModelFromTUpdate(obj, new pk_bigserial());

TestUtils/DataAccess/LuUtilsPkGuidDataAccess.cs

@@ -4,6 +4,7 @@ using System.Linq.Expressions;
 using Luticate2.Utils.DataAccess;
 using Luticate2.Utils.Dbo.Filter;
 using Luticate2.Utils.Dbo.Result;
+using Microsoft.EntityFrameworkCore;
 using TestUtils.DataAccess.Models;
 using TestUtils.Dbo.PkGuid;
 
@@ -11,10 +12,15 @@ namespace TestUtils.DataAccess
 {
     public class LuUtilsPkGuidDataAccess : LuEfCrudDataAccess<pk_guid, PkGuidAddDbo, PkGuidDbo, PkGuidAddDbo, LuUtilsDbContext, string>
     {
-        public LuUtilsPkGuidDataAccess(LuUtilsDbContext db) : base(db, db.pk_guid)
+        public LuUtilsPkGuidDataAccess(IServiceProvider serviceProvider) : base(serviceProvider)
         {
         }
 
+        protected override DbSet<pk_guid> GetTable(LuUtilsDbContext db)
+        {
+            return db.pk_guid;
+        }
+
         protected override pk_guid GetModelFromTCreate(PkGuidAddDbo obj)
         {
             return GetModelFromTUpdate(obj, new pk_guid());
@@ -45,7 +51,7 @@ namespace TestUtils.DataAccess
 
         public LuResult<bool> SomeTextExists(string someText)
         {
-            return Execute(() => LuResult<bool>.Ok(Table.Any(guid => guid.some_text == someText)));
+            return Execute((db, table) => LuResult<bool>.Ok(table.Any(guid => guid.some_text == someText)));
         }
     }
 }

TestUtils/Tests.cs

@@ -1,4 +1,6 @@
 using System;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.Extensions.DependencyInjection;
 using TestUtils.DataAccess;
 
 namespace TestUtils
@@ -8,17 +10,17 @@ namespace TestUtils
         public const string ConnectionString =
             "User ID=dev;Password=dev;Host=localhost;Port=5432;Database=luticate2_utils;Pooling=true;";
 
-        public static LuUtilsDbContext GetDataBaseContext()
+        public static void TestRealDb(Action<IServiceProvider> func)
         {
-            return new LuUtilsDbContext(ConnectionString);
-        }
-
-        public static void TestRealDb(Action<LuUtilsDbContext> func)
-        {
-            var dbContext = GetDataBaseContext();
-            dbContext.Database.BeginTransaction();
-            func(dbContext);
-            dbContext.Database.RollbackTransaction();
+            IServiceCollection serviceCollection = new ServiceCollection();
+            serviceCollection.AddDbContext<LuUtilsDbContext>(builder => builder.UseNpgsql(ConnectionString),
+                ServiceLifetime.Transient);
+            var serviceProvider = serviceCollection.BuildServiceProvider();
+            var dbContext = (LuUtilsDbContext)serviceProvider.GetService(typeof(LuUtilsDbContext));
+            func(serviceProvider);
+            dbContext.pk_bigserial.RemoveRange(dbContext.pk_bigserial);
+            dbContext.pk_guid.RemoveRange(dbContext.pk_guid);
+            dbContext.SaveChanges();
         }
     }
 }

WebApiUtils/Startup.cs

@@ -39,8 +39,8 @@ namespace WebApiUtils
 
             services.AddLuticateUtils(options => options.Version = "dev");
 
-            services.AddTransient<PkGuidBusiness>();
-            services.AddTransient<LuUtilsPkGuidDataAccess>();
+            services.AddSingleton<PkGuidBusiness>();
+            services.AddSingleton<LuUtilsPkGuidDataAccess>();
             services.AddDbContext<LuUtilsDbContext>(options =>
             {
                 options.UseNpgsql(Configuration.GetConnectionString("default"));
@@ -48,7 +48,7 @@ namespace WebApiUtils
                     .AddEntityFrameworkNpgsqlLuticate()
                     .AddEntityFrameworkNpgsql()
                     .BuildServiceProvider());
-            });
+            }, ServiceLifetime.Transient);
 
             services.AddMvc()
                 .AddLuticateUtils();