using Configure method for LuUtilsOptions; added transactions to LuEfDataAccess; updated readme; tests

Luticate2.Auth/Controllers/LuAuthExtensions.cs

@@ -1,7 +1,9 @@
-using Luticate2.Auth.Business;
+using System;
+using Luticate2.Auth.Business;
 using Luticate2.Auth.DataAccess;
 using Luticate2.Auth.Middlewares;
 using Luticate2.Utils.Controllers;
+using Luticate2.Utils.Dbo.Basic;
 using Microsoft.AspNetCore.Builder;
 using Microsoft.AspNetCore.Http;
 using Microsoft.Extensions.DependencyInjection;
@@ -10,7 +12,7 @@ namespace Luticate2.Auth.Controllers
 {
     public static class LuAuthExtensions
     {
-        public static IServiceCollection AddLuticateAuth(this IServiceCollection services, LuUtilsExtensions.LuOptionsDelegate optionsDelegate)
+        public static IServiceCollection AddLuticateAuth(this IServiceCollection services, Action<LuUtilsOptionsDbo> optionsDelegate)
         {
             services.AddLuticateUtils(optionsDelegate);
 

Luticate2.Auth/Controllers/LuGroupsController.cs

@@ -1,6 +1,8 @@
 using Luticate2.Auth.Business;
 using Luticate2.Utils.Controllers;
+using Luticate2.Utils.Dbo.Basic;
 using Microsoft.AspNetCore.Mvc;
+using Microsoft.Extensions.Options;
 
 namespace Luticate2.Auth.Controllers
 {
@@ -9,7 +11,7 @@ namespace Luticate2.Auth.Controllers
     {
         private readonly LuGroupsBusiness _luGroupsBusiness;
 
-        public LuGroupsController(LuGroupsBusiness luGroupsBusiness)
+        public LuGroupsController(LuGroupsBusiness luGroupsBusiness, IOptions<LuUtilsOptionsDbo> luUtilsOptionsDbo) : base(luUtilsOptionsDbo)
         {
             _luGroupsBusiness = luGroupsBusiness;
         }

Luticate2.Auth/Controllers/LuUsersController.cs

@@ -1,11 +1,17 @@
 using Luticate2.Utils.Controllers;
+using Luticate2.Utils.Dbo.Basic;
 using Microsoft.AspNetCore.Mvc;
+using Microsoft.Extensions.Options;
 
 namespace Luticate2.Auth.Controllers
 {
     [Route("luticate/users")]
     public class LuUsersController : LuController
     {
+        public LuUsersController(IOptions<LuUtilsOptionsDbo> luUtilsOptionsDbo) : base(luUtilsOptionsDbo)
+        {
+        }
+
         public string Get()
         {
             return "users";

Luticate2.Auth/project.json

@@ -4,7 +4,7 @@
         "debugType": "portable"
     },
     "dependencies": {
-        "Luticate2.Utils": "0.1.*"
+        "Luticate2.Utils": "0.2.*"
     },
     "frameworks": {
         "netcoreapp1.0": {

Luticate2.Utils/Controllers/LuController.cs

@@ -2,14 +2,20 @@
 using Luticate2.Utils.Dbo.Basic;
 using Luticate2.Utils.Dbo.Result;
 using Microsoft.AspNetCore.Mvc;
+using Microsoft.Extensions.Options;
 
 namespace Luticate2.Utils.Controllers
 {
     public abstract class LuController : Controller
     {
-
+        protected readonly LuUtilsOptionsDbo LuUtilsOptionsDbo;
         protected IDictionary<object, object> LuItems => HttpContext.GetLuItems();
 
+        protected LuController(IOptions<LuUtilsOptionsDbo> luUtilsOptionsDbo)
+        {
+            LuUtilsOptionsDbo = luUtilsOptionsDbo.Value;
+        }
+
         protected virtual LuApiWrapperDbo<T> Handle<T>(LuResult<T> result)
         {
             if (result)
@@ -19,7 +25,7 @@ namespace Luticate2.Utils.Controllers
                     code = 200,
                     data = result.Data,
                     message = null,
-                    version = LuUtilsExtensions.Options.Version
+                    version = LuUtilsOptionsDbo.Version
                 };
             }
             throw new LuResultException(result.To<object>());

Luticate2.Utils/Controllers/LuCrudController.cs

@@ -5,6 +5,7 @@ using Luticate2.Utils.Dbo.OrderBy;
 using Luticate2.Utils.Dbo.PaginatedRequest;
 using Luticate2.Utils.Interfaces;
 using Microsoft.AspNetCore.Mvc;
+using Microsoft.Extensions.Options;
 
 namespace Luticate2.Utils.Controllers
 {
@@ -16,7 +17,7 @@ namespace Luticate2.Utils.Controllers
     {
         protected readonly TBusiness Busines;
 
-        protected LuCrudController(TBusiness busines)
+        protected LuCrudController(TBusiness busines, IOptions<LuUtilsOptionsDbo> luUtilsOptionsDbo) : base(luUtilsOptionsDbo)
         {
             Busines = busines;
         }

Luticate2.Utils/Controllers/LuUtilsExtensions.cs

@@ -1,5 +1,7 @@
-using System.Collections.Generic;
+using System;
+using System.Collections.Generic;
 using Luticate2.Utils.Business;
+using Luticate2.Utils.DataAccess;
 using Luticate2.Utils.DataAccess.Npgsql;
 using Luticate2.Utils.Dbo.Basic;
 using Luticate2.Utils.Dbo.Filter;
@@ -20,11 +22,7 @@ namespace Luticate2.Utils.Controllers
 {
     public static class LuUtilsExtensions
     {
-        public delegate void LuOptionsDelegate(LuOptionsDbo options);
-
-        public static LuOptionsDbo Options { get; private set; }
-
-        public static IServiceCollection AddLuticateUtils(this IServiceCollection services, LuOptionsDelegate optionsDelegate)
+        public static IServiceCollection AddLuticateUtils(this IServiceCollection services, Action<LuUtilsOptionsDbo> optionsDelegate)
         {
             var settings = new JsonSerializerSettings();
             settings.ContractResolver = new SignalRContractResolver();
@@ -39,10 +37,10 @@ namespace Luticate2.Utils.Controllers
                 options.Hubs.EnableDetailedErrors = true;
             });
 
+            services.AddScoped<LuEfTransactionScope>();
             services.AddSingleton<LuHubConnectionTracker>();
             services.AddSingleton<LuNotificationsBusiness>();
-            Options = new LuOptionsDbo();
-            optionsDelegate(Options);
+            services.Configure(optionsDelegate);
             return services;
         }
 

Luticate2.Utils/DataAccess/LuEfDataAccess.cs

@@ -1,8 +1,10 @@
 using System;
 using System.Collections.Generic;
+using System.Data;
 using System.Linq.Expressions;
 using Luticate2.Utils.Dbo.Result;
 using Microsoft.EntityFrameworkCore;
+using Microsoft.Extensions.DependencyInjection;
 
 namespace Luticate2.Utils.DataAccess
 {
@@ -12,6 +14,8 @@ namespace Luticate2.Utils.DataAccess
     {
         private readonly IServiceProvider _serviceProvider;
 
+        protected LuEfTransactionScope TransactionScope => _serviceProvider.GetService<LuEfTransactionScope>();
+
         protected LuEfDataAccess(IServiceProvider serviceProvider)
         {
             _serviceProvider = serviceProvider;
@@ -23,11 +27,15 @@ namespace Luticate2.Utils.DataAccess
         {
             try
             {
-                using (var db = (TDbContext)_serviceProvider.GetService(typeof(TDbContext)))
+                var transactedDb = TransactionScope.GetTransactedDbContext<TDbContext>();
+                if (transactedDb == null)
                 {
-                    var table = GetTable(db);
-                    return func(db, table);
+                    using (var db = _serviceProvider.GetService<TDbContext>())
+                    {
+                        return func(db, GetTable(db));
+                    }
                 }
+                return func(transactedDb, GetTable(transactedDb));
             }
             catch (Exception e)
             {
@@ -47,5 +55,26 @@ namespace Luticate2.Utils.DataAccess
             return Expression.Lambda<Func<TModel, bool>>(totalExp, param);
         }
 
+        public bool BeginTransaction(TDbContext context, IsolationLevel? level = null)
+        {
+            return TransactionScope.BeginTransaction(context, level);
+        }
+
+        public void CommitTransaction(bool transact)
+        {
+            if (transact)
+            {
+                TransactionScope.CommitTransaction<TDbContext>();
+            }
+        }
+
+        public void RollbackTransaction(bool transact)
+        {
+            if (transact)
+            {
+                TransactionScope.RollbackTransaction<TDbContext>();
+            }
+        }
+
     }
 }

Luticate2.Utils/DataAccess/LuEfTransactionScope.cs

@@ -0,0 +1,89 @@
+using System;
+using System.Collections.Generic;
+using System.Data;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.Extensions.DependencyInjection;
+
+namespace Luticate2.Utils.DataAccess
+{
+    public class LuEfTransactionScope
+    {
+        protected IDictionary<Type, DbContext> Contexts;
+
+        private readonly IServiceProvider _serviceProvider;
+
+        public LuEfTransactionScope(IServiceProvider serviceProvider)
+        {
+            _serviceProvider = serviceProvider;
+            Contexts = new Dictionary<Type, DbContext>();
+        }
+
+        public TDbContext GetTransactedDbContext<TDbContext>()
+            where TDbContext : DbContext
+        {
+            if (Contexts.ContainsKey(typeof(TDbContext)))
+            {
+                return (TDbContext) Contexts[typeof(TDbContext)];
+            }
+            return null;
+        }
+
+        public bool BeginTransaction<TDbContext>(TDbContext dbContext, IsolationLevel? level = null)
+            where TDbContext : DbContext
+        {
+            if (dbContext == null)
+            {
+                dbContext = GetTransactedDbContext<TDbContext>();
+                if (dbContext == null)
+                {
+                    dbContext = _serviceProvider.GetService<TDbContext>();
+                }
+            }
+            if (!Contexts.Contains(new KeyValuePair<Type, DbContext>(typeof(TDbContext), dbContext)))
+            {
+                Contexts.Add(typeof(TDbContext), dbContext);
+            }
+
+            if (dbContext.Database.CurrentTransaction != null)
+            {
+                return false;
+            }
+
+            if (level == null)
+            {
+                dbContext.Database.BeginTransaction();
+            }
+            else
+            {
+                dbContext.Database.BeginTransaction(level.Value);
+            }
+            return true;
+        }
+
+        public void CommitTransaction<TDbContext>()
+            where TDbContext : DbContext
+        {
+            try
+            {
+                GetTransactedDbContext<TDbContext>().Database.CommitTransaction();
+            }
+            finally
+            {
+                Contexts.Remove(typeof(TDbContext));
+            }
+        }
+
+        public void RollbackTransaction<TDbContext>()
+            where TDbContext : DbContext
+        {
+            try
+            {
+                GetTransactedDbContext<TDbContext>().Database.RollbackTransaction();
+            }
+            finally
+            {
+                Contexts.Remove(typeof(TDbContext));
+            }
+        }
+    }
+}

Luticate2.Utils/Dbo/Basic/LuOptionsDbo.cs → Luticate2.Utils/Dbo/Basic/LuUtilsOptionsDbo.cs

@@ -1,6 +1,6 @@
 namespace Luticate2.Utils.Dbo.Basic
 {
-    public class LuOptionsDbo
+    public class LuUtilsOptionsDbo
     {
         public string Version { get; set; }
     }

Luticate2.Utils/Middlewares/LuExceptionMiddleware.cs

@@ -4,6 +4,7 @@ using Luticate2.Utils.Controllers;
 using Luticate2.Utils.Dbo.Basic;
 using Microsoft.AspNetCore.Http;
 using Microsoft.Extensions.Logging;
+using Microsoft.Extensions.Options;
 using Newtonsoft.Json;
 
 namespace Luticate2.Utils.Middlewares
@@ -12,11 +13,13 @@ namespace Luticate2.Utils.Middlewares
     {
         private readonly RequestDelegate _next;
         private readonly ILogger<LuExceptionMiddleware> _logger;
+        private readonly LuUtilsOptionsDbo _luUtilsOptionsDbo;
 
-        public LuExceptionMiddleware(RequestDelegate next, ILogger<LuExceptionMiddleware> logger)
+        public LuExceptionMiddleware(RequestDelegate next, ILogger<LuExceptionMiddleware> logger, IOptions<LuUtilsOptionsDbo> luUtilsOptionsDbo)
         {
             _next = next;
             _logger = logger;
+            _luUtilsOptionsDbo = luUtilsOptionsDbo.Value;
         }
 
         public async Task Invoke(HttpContext context)
@@ -36,7 +39,7 @@ namespace Luticate2.Utils.Middlewares
                     code = e.Result.GetHttpCode(),
                     data = null,
                     message = e.Result.PublicDetails ?? e.Result.GetHttpString(),
-                    version = LuUtilsExtensions.Options.Version
+                    version = _luUtilsOptionsDbo.Version
                 })).ConfigureAwait(false);
             }
             catch (Exception e)
@@ -50,7 +53,7 @@ namespace Luticate2.Utils.Middlewares
                     code = 500,
                     data = null,
                     message = "Internal Error",
-                    version = LuUtilsExtensions.Options.Version
+                    version = _luUtilsOptionsDbo.Version
                 })).ConfigureAwait(false);
             }
         }

Luticate2.Utils/README.md

@@ -48,7 +48,8 @@ public void ConfigureServices(IServiceCollection services)
     services.AddLuticateUtils(options => options.Version = "dev");
 
     // ...
-
+    
+    //The data access classes using YourDbContext need to be added as scoped
     services.AddDbContext<YourDbContext>(options => // Replace YourDbContext with your own database context
     {
         options.UseNpgsql(Configuration.GetConnectionString("default"));
@@ -56,7 +57,7 @@ public void ConfigureServices(IServiceCollection services)
             .AddEntityFrameworkNpgsqlLuticate() // MUST be before AddEntityFrameworkNpgsql()
             .AddEntityFrameworkNpgsql()
             .BuildServiceProvider());
-    });
+    }, ServiceLifetime.Transient);
 
     services.AddMvc()
         .AddLuticateUtils();

TestUtils/DataAccess/LuUtilsPkGuidDataAccess.cs

@@ -1,4 +1,5 @@
 using System;
+using System.Collections.Generic;
 using System.Linq;
 using System.Linq.Expressions;
 using Luticate2.Utils.DataAccess;
@@ -58,5 +59,44 @@ namespace TestUtils.DataAccess
         {
             return Execute((db, table) => LuResult<bool>.Ok(table.Any(guid => guid.some_text == someText)));
         }
+
+        public override LuResult<T> Add<T>(IEnumerable<PkGuidAddDbo> objs, Func<IEnumerable<PkGuidDbo>, T> returnFunc)
+        {
+            IList<pk_guid> models = new List<pk_guid>();
+            var addRes = Execute((db, table) =>
+            {
+                var transact = BeginTransaction(db);
+                foreach (var dbo in objs)
+                {
+                    var quoteRequest = GetModelFromTCreate(dbo);
+                    models.Add(quoteRequest);
+                    table.Add(quoteRequest);
+                }
+                db.SaveChanges();
+                foreach (var model in models)
+                {
+                    db.Entry(model).State = EntityState.Detached;
+                }
+                foreach (var pkGuid in models)
+                {
+                    if (pkGuid.some_int == 2424)
+                    {
+                        throw new Exception("Test unexpected db error");
+                    }
+                    if (pkGuid.some_int == 4242)
+                    {
+                        RollbackTransaction(transact);
+                        return LuResult<T>.Error(LuStatus.DbError, "Some expected error", "");
+                    }
+                }
+                CommitTransaction(transact);
+                return LuResult<T>.Ok(default(T));
+            });
+            if (!addRes)
+            {
+                return addRes;
+            }
+            return GetMultiple(models, returnFunc);
+        }
     }
 }

TestUtils/EfCrudDataAccess/LuEfCreateDataAccessTest.cs

@@ -15,7 +15,7 @@ namespace TestUtils.EfCrudDataAccess
         [Fact]
         public void TestAddMultiple1()
         {
-            Tests.TestRealDb(context =>
+            Tests.TestRealDb<LuUtilsPkBigSerialDataAccess>(service =>
             {
                 var dbos = new List<PkBigSerialAddDbo>
                 {
@@ -30,7 +30,6 @@ namespace TestUtils.EfCrudDataAccess
                         SomeText = "24"
                     }
                 };
-                var service = new LuUtilsPkBigSerialDataAccess(context);
                 var res = service.Add(dbos, enumerable => enumerable);
                 Assert.Equal(LuStatus.Success, res.Status);
                 foreach (var dbo in dbos.Zip(res.Data, (dbo, serialDbo) => new KeyValuePair<PkBigSerialAddDbo, PkBigSerialDbo>(dbo, serialDbo)))
@@ -54,7 +53,7 @@ namespace TestUtils.EfCrudDataAccess
         [Fact]
         public void TestAddMultiple2()
         {
-            Tests.TestRealDb(context =>
+            Tests.TestRealDb<LuUtilsPkBigSerialDataAccess>(service =>
             {
                 var dbos = new List<PkBigSerialAddDbo>
                 {
@@ -69,7 +68,6 @@ namespace TestUtils.EfCrudDataAccess
                         SomeText = "24"
                     }
                 };
-                var service = new LuUtilsPkBigSerialDataAccess(context);
                 var res = service.Add(dbos, enumerable => enumerable.Select(dbo => dbo.Id));
                 Assert.Equal(LuStatus.Success, res.Status);
                 foreach (var dbo in dbos.Zip(res.Data, (dbo, serialDbo) => new KeyValuePair<PkBigSerialAddDbo, long>(dbo, serialDbo)))
@@ -91,7 +89,7 @@ namespace TestUtils.EfCrudDataAccess
         [Fact]
         public void TestAddMultiple3()
         {
-            Tests.TestRealDb(context =>
+            Tests.TestRealDb<LuUtilsPkBigSerialDataAccess>(service =>
             {
                 var dbos = new List<PkBigSerialAddDbo>
                 {
@@ -106,7 +104,6 @@ namespace TestUtils.EfCrudDataAccess
                         SomeText = "24"
                     }
                 };
-                var service = new LuUtilsPkBigSerialDataAccess(context);
                 var res = service.Add(dbos, enumerable => enumerable.Select(dbo => dbo.CreatedAt));
                 Assert.Equal(LuStatus.Success, res.Status);
                 foreach (var dbo in res.Data)
@@ -119,7 +116,7 @@ namespace TestUtils.EfCrudDataAccess
         [Fact]
         public void TestAddMultiple4()
         {
-            Tests.TestRealDb(context =>
+            Tests.TestRealDb<LuUtilsPkBigSerialDataAccess>(service =>
             {
                 var dbos = new List<PkBigSerialAddDbo>
                 {
@@ -134,7 +131,6 @@ namespace TestUtils.EfCrudDataAccess
                         SomeText = "42"
                     }
                 };
-                var service = new LuUtilsPkBigSerialDataAccess(context);
                 var res = service.Add(dbos, enumerable => enumerable.Select(dbo => dbo.CreatedAt));
                 Assert.Equal(LuStatus.DbError, res.Status);
             });
@@ -144,9 +140,8 @@ namespace TestUtils.EfCrudDataAccess
         [Fact]
         public void TestAddSingle1()
         {
-            Tests.TestRealDb(context =>
+            Tests.TestRealDb<LuUtilsPkBigSerialDataAccess>(service =>
             {
-                var service = new LuUtilsPkBigSerialDataAccess(context);
                 var res = service.Add(new PkBigSerialAddDbo
                 {
                     SomeInt = 42,
@@ -168,9 +163,8 @@ namespace TestUtils.EfCrudDataAccess
         [Fact]
         public void TestAddSingle2()
         {
-            Tests.TestRealDb(context =>
+            Tests.TestRealDb<LuUtilsPkBigSerialDataAccess>(service =>
             {
-                var service = new LuUtilsPkBigSerialDataAccess(context);
                 var res = service.Add(new PkBigSerialAddDbo
                 {
                     SomeInt = 42,
@@ -190,9 +184,8 @@ namespace TestUtils.EfCrudDataAccess
         [Fact]
         public void TestAddSingle3()
         {
-            Tests.TestRealDb(context =>
+            Tests.TestRealDb<LuUtilsPkBigSerialDataAccess>(service =>
             {
-                var service = new LuUtilsPkBigSerialDataAccess(context);
                 var res = service.Add(new PkBigSerialAddDbo
                 {
                     SomeInt = 42,
@@ -206,7 +199,7 @@ namespace TestUtils.EfCrudDataAccess
         [Fact]
         public void TestAddGuidMultiple1()
         {
-            Tests.TestRealDb(context =>
+            Tests.TestRealDb<LuUtilsPkGuidDataAccess>(service =>
             {
                 var dbos = new List<PkGuidAddDbo>
                 {
@@ -221,7 +214,6 @@ namespace TestUtils.EfCrudDataAccess
                         SomeText = "24"
                     }
                 };
-                var service = new LuUtilsPkGuidDataAccess(context);
                 var res = service.AddId(dbos);
                 Assert.Equal(LuStatus.Success, res.Status);
                 foreach (var dbo in dbos.Zip(res.Data, (dbo, serialDbo) => new KeyValuePair<PkGuidAddDbo, string>(dbo, serialDbo)))
@@ -244,9 +236,8 @@ namespace TestUtils.EfCrudDataAccess
         [Fact]
         public void TestAddGuidSingle1()
         {
-            Tests.TestRealDb(context =>
+            Tests.TestRealDb<LuUtilsPkGuidDataAccess>(service =>
             {
-                var service = new LuUtilsPkGuidDataAccess(context);
                 var res = service.AddId(new PkGuidAddDbo
                 {
                     SomeInt = 42,
@@ -266,7 +257,7 @@ namespace TestUtils.EfCrudDataAccess
         [Fact]
         public void TestAddIdMultiple1()
         {
-            Tests.TestRealDb(context =>
+            Tests.TestRealDb<LuUtilsPkBigSerialDataAccess>(service =>
             {
                 var dbos = new List<PkBigSerialAddDbo>
                 {
@@ -281,7 +272,6 @@ namespace TestUtils.EfCrudDataAccess
                         SomeText = "24"
                     }
                 };
-                var service = new LuUtilsPkBigSerialDataAccess(context);
                 var res = service.AddId(dbos);
                 Assert.Equal(LuStatus.Success, res.Status);
                 foreach (var dbo in dbos.Zip(res.Data, (dbo, serialDbo) => new KeyValuePair<PkBigSerialAddDbo, long>(dbo, serialDbo)))
@@ -304,9 +294,8 @@ namespace TestUtils.EfCrudDataAccess
         [Fact]
         public void TestAddIdSingle1()
         {
-            Tests.TestRealDb(context =>
+            Tests.TestRealDb<LuUtilsPkBigSerialDataAccess>(service =>
             {
-                var service = new LuUtilsPkBigSerialDataAccess(context);
                 var res = service.AddId(new PkBigSerialAddDbo
                 {
                     SomeInt = 42,
@@ -326,7 +315,7 @@ namespace TestUtils.EfCrudDataAccess
         [Fact]
         public void TestAddDboMultiple1()
         {
-            Tests.TestRealDb(context =>
+            Tests.TestRealDb<LuUtilsPkBigSerialDataAccess>(service =>
             {
                 var dbos = new List<PkBigSerialAddDbo>
                 {
@@ -341,7 +330,6 @@ namespace TestUtils.EfCrudDataAccess
                         SomeText = "24"
                     }
                 };
-                var service = new LuUtilsPkBigSerialDataAccess(context);
                 var res = service.AddDbo(dbos);
                 Assert.Equal(LuStatus.Success, res.Status);
                 foreach (var dbo in dbos.Zip(res.Data, (dbo, serialDbo) => new KeyValuePair<PkBigSerialAddDbo, PkBigSerialDbo>(dbo, serialDbo)))
@@ -364,9 +352,8 @@ namespace TestUtils.EfCrudDataAccess
         [Fact]
         public void TestAddDboSingle1()
         {
-            Tests.TestRealDb(context =>
+            Tests.TestRealDb<LuUtilsPkBigSerialDataAccess>(service =>
             {
-                var service = new LuUtilsPkBigSerialDataAccess(context);
                 var res = service.AddDbo(new PkBigSerialAddDbo
                 {
                     SomeInt = 42,
@@ -387,10 +374,8 @@ namespace TestUtils.EfCrudDataAccess
         [Fact]
         public void TestAddDboSingleFk1()
         {
-            Tests.TestRealDb(context =>
+            Tests.TestRealDb<LuUtilsPkGuidDataAccess, LuUtilsFkPkGuidDataAccess>((pkGuidDataAccess, fkPkGuidDataAccess) =>
             {
-                var pkGuidDataAccess = new LuUtilsPkGuidDataAccess(context);
-                var fkPkGuidDataAccess = new LuUtilsFkPkGuidDataAccess(context);
                 var pkGuidDbo = pkGuidDataAccess.AddDbo(new PkGuidAddDbo
                 {
                     SomeInt = 42,

TestUtils/EfCrudDataAccess/LuEfDeleteDataAccessTest.cs

@@ -13,7 +13,7 @@ namespace TestUtils.EfCrudDataAccess
         [Fact]
         public void TestDeleteMultiple1()
         {
-            Tests.TestRealDb(context =>
+            Tests.TestRealDb<LuUtilsPkGuidDataAccess>(service =>
             {
                 var dbos = new List<PkGuidAddDbo>
                 {
@@ -33,7 +33,6 @@ namespace TestUtils.EfCrudDataAccess
                         SomeText = "24"
                     }
                 };
-                var service = new LuUtilsPkGuidDataAccess(context);
                 var res = service.AddId(dbos);
                 Assert.Equal(LuStatus.Success, res.Status);
 
@@ -64,7 +63,7 @@ namespace TestUtils.EfCrudDataAccess
         [Fact]
         public void TestDeleteMultiple2()
         {
-            Tests.TestRealDb(context =>
+            Tests.TestRealDb<LuUtilsPkGuidDataAccess>(service =>
             {
                 var dbos = new List<PkGuidAddDbo>
                 {
@@ -84,7 +83,6 @@ namespace TestUtils.EfCrudDataAccess
                         SomeText = "24"
                     }
                 };
-                var service = new LuUtilsPkGuidDataAccess(context);
                 var res = service.AddId(dbos);
                 Assert.Equal(LuStatus.Success, res.Status);
 
@@ -107,7 +105,7 @@ namespace TestUtils.EfCrudDataAccess
         [Fact]
         public void TestDeleteMultiple3()
         {
-            Tests.TestRealDb(context =>
+            Tests.TestRealDb<LuUtilsPkGuidDataAccess>(service =>
             {
                 var dbos = new List<PkGuidAddDbo>
                 {
@@ -127,7 +125,6 @@ namespace TestUtils.EfCrudDataAccess
                         SomeText = "24"
                     }
                 };
-                var service = new LuUtilsPkGuidDataAccess(context);
                 var res = service.AddId(dbos);
                 Assert.Equal(LuStatus.Success, res.Status);
 
@@ -150,7 +147,7 @@ namespace TestUtils.EfCrudDataAccess
         [Fact]
         public void TestDeleteMultiple4()
         {
-            Tests.TestRealDb(context =>
+            Tests.TestRealDb<LuUtilsPkBigSerialDataAccess>(service =>
             {
                 var dbos = new List<PkBigSerialAddDbo>
                 {
@@ -170,7 +167,6 @@ namespace TestUtils.EfCrudDataAccess
                         SomeText = "24"
                     }
                 };
-                var service = new LuUtilsPkBigSerialDataAccess(context);
                 var res = service.AddId(dbos);
                 Assert.Equal(LuStatus.Success, res.Status);
 
@@ -193,7 +189,7 @@ namespace TestUtils.EfCrudDataAccess
         [Fact]
         public void TestDeleteMultiple5()
         {
-            Tests.TestRealDb(context =>
+            Tests.TestRealDb<LuUtilsPkGuidDataAccess>(service =>
             {
                 var dbos = new List<PkGuidAddDbo>
                 {
@@ -213,7 +209,6 @@ namespace TestUtils.EfCrudDataAccess
                         SomeText = "24"
                     }
                 };
-                var service = new LuUtilsPkGuidDataAccess(context);
                 var res = service.AddId(dbos);
                 Assert.Equal(LuStatus.Success, res.Status);
 
@@ -244,7 +239,7 @@ namespace TestUtils.EfCrudDataAccess
         [Fact]
         public void TestDeleteSingle1()
         {
-            Tests.TestRealDb(context =>
+            Tests.TestRealDb<LuUtilsPkGuidDataAccess>(service =>
             {
                 var dbos = new List<PkGuidAddDbo>
                 {
@@ -264,7 +259,6 @@ namespace TestUtils.EfCrudDataAccess
                         SomeText = "24"
                     }
                 };
-                var service = new LuUtilsPkGuidDataAccess(context);
                 var res = service.AddId(dbos);
                 Assert.Equal(LuStatus.Success, res.Status);
 
@@ -291,7 +285,7 @@ namespace TestUtils.EfCrudDataAccess
         [Fact]
         public void TestDeleteSingle2()
         {
-            Tests.TestRealDb(context =>
+            Tests.TestRealDb<LuUtilsPkGuidDataAccess>(service =>
             {
                 var dbos = new List<PkGuidAddDbo>
                 {
@@ -311,7 +305,6 @@ namespace TestUtils.EfCrudDataAccess
                         SomeText = "24"
                     }
                 };
-                var service = new LuUtilsPkGuidDataAccess(context);
                 var res = service.AddId(dbos);
                 Assert.Equal(LuStatus.Success, res.Status);
 
@@ -336,7 +329,7 @@ namespace TestUtils.EfCrudDataAccess
         [Fact]
         public void TestDeleteSingle3()
         {
-            Tests.TestRealDb(context =>
+            Tests.TestRealDb<LuUtilsPkGuidDataAccess>(service =>
             {
                 var dbos = new List<PkGuidAddDbo>
                 {
@@ -356,7 +349,6 @@ namespace TestUtils.EfCrudDataAccess
                         SomeText = "24"
                     }
                 };
-                var service = new LuUtilsPkGuidDataAccess(context);
                 var res = service.AddId(dbos);
                 Assert.Equal(LuStatus.Success, res.Status);
 
@@ -381,7 +373,7 @@ namespace TestUtils.EfCrudDataAccess
         [Fact]
         public void TestDeleteSingle4()
         {
-            Tests.TestRealDb(context =>
+            Tests.TestRealDb<LuUtilsPkBigSerialDataAccess>(service =>
             {
                 var dbos = new List<PkBigSerialAddDbo>
                 {
@@ -401,7 +393,6 @@ namespace TestUtils.EfCrudDataAccess
                         SomeText = "24"
                     }
                 };
-                var service = new LuUtilsPkBigSerialDataAccess(context);
                 var res = service.AddId(dbos);
                 Assert.Equal(LuStatus.Success, res.Status);
 
@@ -428,7 +419,7 @@ namespace TestUtils.EfCrudDataAccess
         [Fact]
         public void TestDeleteSingle5()
         {
-            Tests.TestRealDb(context =>
+            Tests.TestRealDb<LuUtilsPkBigSerialDataAccess>(service =>
             {
                 var dbos = new List<PkBigSerialAddDbo>
                 {
@@ -448,7 +439,6 @@ namespace TestUtils.EfCrudDataAccess
                         SomeText = "24"
                     }
                 };
-                var service = new LuUtilsPkBigSerialDataAccess(context);
                 var res = service.AddId(dbos);
                 Assert.Equal(LuStatus.Success, res.Status);
 
@@ -473,7 +463,7 @@ namespace TestUtils.EfCrudDataAccess
         [Fact]
         public void TestDeleteSingle6()
         {
-            Tests.TestRealDb(context =>
+            Tests.TestRealDb<LuUtilsPkBigSerialDataAccess>(service =>
             {
                 var dbos = new List<PkBigSerialAddDbo>
                 {
@@ -493,7 +483,6 @@ namespace TestUtils.EfCrudDataAccess
                         SomeText = "24"
                     }
                 };
-                var service = new LuUtilsPkBigSerialDataAccess(context);
                 var res = service.AddId(dbos);
                 Assert.Equal(LuStatus.Success, res.Status);
 

TestUtils/EfCrudDataAccess/LuEfReadDataAccessTest.cs

@@ -16,9 +16,8 @@ namespace TestUtils.EfCrudDataAccess
         [Fact]
         public void TestGetSingle1()
         {
-            Tests.TestRealDb(context =>
+            Tests.TestRealDb<LuUtilsPkBigSerialDataAccess>(service =>
             {
-                var service = new LuUtilsPkBigSerialDataAccess(context);
                 var res = service.AddDbo(new PkBigSerialAddDbo
                 {
                     SomeInt = 42,
@@ -38,9 +37,8 @@ namespace TestUtils.EfCrudDataAccess
         [Fact]
         public void TestGetSingle2()
         {
-            Tests.TestRealDb(context =>
+            Tests.TestRealDb<LuUtilsPkBigSerialDataAccess>(service =>
             {
-                var service = new LuUtilsPkBigSerialDataAccess(context);
                 var res = service.AddDbo(new PkBigSerialAddDbo
                 {
                     SomeInt = 42,
@@ -58,9 +56,8 @@ namespace TestUtils.EfCrudDataAccess
         [Fact]
         public void TestGetSingleByKeys1()
         {
-            Tests.TestRealDb(context =>
+            Tests.TestRealDb<LuUtilsPkBigSerialDataAccess>(service =>
             {
-                var service = new LuUtilsPkBigSerialDataAccess(context);
                 var res = service.AddDbo(new PkBigSerialAddDbo
                 {
                     SomeInt = 42,
@@ -80,9 +77,8 @@ namespace TestUtils.EfCrudDataAccess
         [Fact]
         public void TestGetSingleByKeys2()
         {
-            Tests.TestRealDb(context =>
+            Tests.TestRealDb<LuUtilsPkBigSerialDataAccess>(service =>
             {
-                var service = new LuUtilsPkBigSerialDataAccess(context);
                 var res = service.AddDbo(new PkBigSerialAddDbo
                 {
                     SomeInt = 42,
@@ -99,9 +95,8 @@ namespace TestUtils.EfCrudDataAccess
         [Fact]
         public void TestGetSingleById1()
         {
-            Tests.TestRealDb(context =>
+            Tests.TestRealDb<LuUtilsPkBigSerialDataAccess>(service =>
             {
-                var service = new LuUtilsPkBigSerialDataAccess(context);
                 var res = service.AddId(new PkBigSerialAddDbo
                 {
                     SomeInt = 42,
@@ -121,9 +116,8 @@ namespace TestUtils.EfCrudDataAccess
         [Fact]
         public void TestGetSingleById2()
         {
-            Tests.TestRealDb(context =>
+            Tests.TestRealDb<LuUtilsPkBigSerialDataAccess>(service =>
             {
-                var service = new LuUtilsPkBigSerialDataAccess(context);
                 var res = service.AddId(new PkBigSerialAddDbo
                 {
                     SomeInt = 42,
@@ -140,9 +134,8 @@ namespace TestUtils.EfCrudDataAccess
         [Fact]
         public void TestGetSingleById3()
         {
-            Tests.TestRealDb(context =>
+            Tests.TestRealDb<LuUtilsPkGuidDataAccess>(service =>
             {
-                var service = new LuUtilsPkGuidDataAccess(context);
                 var res = service.AddId(new PkGuidAddDbo
                 {
                     SomeInt = 42,
@@ -162,9 +155,8 @@ namespace TestUtils.EfCrudDataAccess
         [Fact]
         public void TestGetSingleById4()
         {
-            Tests.TestRealDb(context =>
+            Tests.TestRealDb<LuUtilsPkGuidDataAccess>(service =>
             {
-                var service = new LuUtilsPkGuidDataAccess(context);
                 var res = service.AddId(new PkGuidAddDbo
                 {
                     SomeInt = 42,
@@ -181,7 +173,7 @@ namespace TestUtils.EfCrudDataAccess
         [Fact]
         public void TestGetMultiple1()
         {
-            Tests.TestRealDb(context =>
+            Tests.TestRealDb<LuUtilsPkGuidDataAccess>(service =>
             {
                 var dbos = new List<PkGuidAddDbo>
                 {
@@ -201,7 +193,6 @@ namespace TestUtils.EfCrudDataAccess
                         SomeText = "24"
                     }
                 };
-                var service = new LuUtilsPkGuidDataAccess(context);
                 var res = service.AddId(dbos);
                 Assert.Equal(LuStatus.Success, res.Status);
 
@@ -224,7 +215,7 @@ namespace TestUtils.EfCrudDataAccess
         [Fact]
         public void TestGetMultiple2()
         {
-            Tests.TestRealDb(context =>
+            Tests.TestRealDb<LuUtilsPkGuidDataAccess>(service =>
             {
                 var dbos = new List<PkGuidAddDbo>
                 {
@@ -244,7 +235,6 @@ namespace TestUtils.EfCrudDataAccess
                         SomeText = "24"
                     }
                 };
-                var service = new LuUtilsPkGuidDataAccess(context);
                 var res = service.AddId(dbos);
                 Assert.Equal(LuStatus.Success, res.Status);
 
@@ -267,7 +257,7 @@ namespace TestUtils.EfCrudDataAccess
         [Fact]
         public void TestGetMultiple3()
         {
-            Tests.TestRealDb(context =>
+            Tests.TestRealDb<LuUtilsPkGuidDataAccess>(service =>
             {
                 var dbos = new List<PkGuidAddDbo>
                 {
@@ -287,7 +277,6 @@ namespace TestUtils.EfCrudDataAccess
                         SomeText = "24"
                     }
                 };
-                var service = new LuUtilsPkGuidDataAccess(context);
                 var res = service.AddId(dbos);
                 Assert.Equal(LuStatus.Success, res.Status);
 
@@ -314,7 +303,7 @@ namespace TestUtils.EfCrudDataAccess
         [Fact]
         public void TestGetMultiple4()
         {
-            Tests.TestRealDb(context =>
+            Tests.TestRealDb<LuUtilsPkGuidDataAccess>(service =>
             {
                 var dbos = new List<PkGuidAddDbo>
                 {
@@ -334,7 +323,6 @@ namespace TestUtils.EfCrudDataAccess
                         SomeText = "24"
                     }
                 };
-                var service = new LuUtilsPkGuidDataAccess(context);
                 var res = service.AddId(dbos);
                 Assert.Equal(LuStatus.Success, res.Status);
 
@@ -360,7 +348,7 @@ namespace TestUtils.EfCrudDataAccess
         [Fact]
         public void TestGetMultiple5()
         {
-            Tests.TestRealDb(context =>
+            Tests.TestRealDb<LuUtilsPkGuidDataAccess>(service =>
             {
                 var dbos = new List<PkGuidAddDbo>
                 {
@@ -380,7 +368,6 @@ namespace TestUtils.EfCrudDataAccess
                         SomeText = "24"
                     }
                 };
-                var service = new LuUtilsPkGuidDataAccess(context);
                 var res = service.AddId(dbos);
                 Assert.Equal(LuStatus.Success, res.Status);
 
@@ -409,7 +396,7 @@ namespace TestUtils.EfCrudDataAccess
         [Fact]
         public void TestGetMultiple6()
         {
-            Tests.TestRealDb(context =>
+            Tests.TestRealDb<LuUtilsPkGuidDataAccess>(service =>
             {
                 var dbos = new List<PkGuidAddDbo>
                 {
@@ -429,7 +416,6 @@ namespace TestUtils.EfCrudDataAccess
                         SomeText = "24"
                     }
                 };
-                var service = new LuUtilsPkGuidDataAccess(context);
                 var res = service.AddId(dbos);
                 Assert.Equal(LuStatus.Success, res.Status);
 

TestUtils/EfCrudDataAccess/LuEfTransactionScopeTest.cs

@@ -0,0 +1,35 @@
+using System;
+using Luticate2.Utils.Dbo.Result;
+using Microsoft.Extensions.DependencyInjection;
+using TestUtils.DataAccess;
+using TestUtils.Dbo.PkGuid;
+using Xunit;
+
+namespace TestUtils.EfCrudDataAccess
+{
+    public class LuEfTransactionScopeTest
+    {
+        [Fact]
+        public void TestAddDboSingle1()
+        {
+            var serviceProvider = Tests.BuildServiceProvider();
+            var service = serviceProvider.GetService<LuUtilsPkGuidDataAccess>();
+            var transact = service.BeginTransaction(null);
+            var res = service.AddDbo(new PkGuidAddDbo
+            {
+                SomeInt = 42,
+                SomeText = "Test."
+            });
+            Assert.Equal(LuStatus.Success, res.Status);
+            Assert.NotEqual(new Guid().ToString(), res.Data.Id);
+
+            var get = service.GetSingleById(res.Data.Id);
+            Assert.Equal(LuStatus.Success, get.Status);
+
+            service.RollbackTransaction(transact);
+
+            get = service.GetSingleById(res.Data.Id);
+            Assert.Equal(LuStatus.NotFound, get.Status);
+        }
+    }
+}

TestUtils/EfCrudDataAccess/LuEfUpdateDataAccessTest.cs

@@ -14,7 +14,7 @@ namespace TestUtils.EfCrudDataAccess
         [Fact]
         public void TestEditMultiple1()
         {
-            Tests.TestRealDb(context =>
+            Tests.TestRealDb<LuUtilsPkGuidDataAccess>(service =>
             {
                 var dbos = new List<PkGuidAddDbo>
                 {
@@ -34,7 +34,6 @@ namespace TestUtils.EfCrudDataAccess
                         SomeText = "24"
                     }
                 };
-                var service = new LuUtilsPkGuidDataAccess(context);
                 var res = service.AddId(dbos);
                 Assert.Equal(LuStatus.Success, res.Status);
 
@@ -57,7 +56,7 @@ namespace TestUtils.EfCrudDataAccess
         [Fact]
         public void TestEditMultiple2()
         {
-            Tests.TestRealDb(context =>
+            Tests.TestRealDb<LuUtilsPkGuidDataAccess>(service =>
             {
                 var dbos = new List<PkGuidAddDbo>
                 {
@@ -77,7 +76,6 @@ namespace TestUtils.EfCrudDataAccess
                         SomeText = "24"
                     }
                 };
-                var service = new LuUtilsPkGuidDataAccess(context);
                 var res = service.AddId(dbos);
                 Assert.Equal(LuStatus.Success, res.Status);
 
@@ -98,7 +96,7 @@ namespace TestUtils.EfCrudDataAccess
         [Fact]
         public void TestEditMultiple3()
         {
-            Tests.TestRealDb(context =>
+            Tests.TestRealDb<LuUtilsPkGuidDataAccess>(service =>
             {
                 var dbos = new List<PkGuidAddDbo>
                 {
@@ -118,7 +116,6 @@ namespace TestUtils.EfCrudDataAccess
                         SomeText = "24"
                     }
                 };
-                var service = new LuUtilsPkGuidDataAccess(context);
                 var res = service.AddId(dbos);
                 Assert.Equal(LuStatus.Success, res.Status);
 
@@ -139,7 +136,7 @@ namespace TestUtils.EfCrudDataAccess
         [Fact]
         public void TestEditMultiple4()
         {
-            Tests.TestRealDb(context =>
+            Tests.TestRealDb<LuUtilsPkBigSerialDataAccess>(service =>
             {
                 var dbos = new List<PkBigSerialAddDbo>
                 {
@@ -159,7 +156,6 @@ namespace TestUtils.EfCrudDataAccess
                         SomeText = "24"
                     }
                 };
-                var service = new LuUtilsPkBigSerialDataAccess(context);
                 var res = service.AddId(dbos);
                 Assert.Equal(LuStatus.Success, res.Status);
 
@@ -180,7 +176,7 @@ namespace TestUtils.EfCrudDataAccess
         [Fact]
         public void TestEditMultiple5()
         {
-            Tests.TestRealDb(context =>
+            Tests.TestRealDb<LuUtilsPkGuidDataAccess>(service =>
             {
                 var dbos = new List<PkGuidAddDbo>
                 {
@@ -200,7 +196,6 @@ namespace TestUtils.EfCrudDataAccess
                         SomeText = "24"
                     }
                 };
-                var service = new LuUtilsPkGuidDataAccess(context);
                 var res = service.AddId(dbos);
                 Assert.Equal(LuStatus.Success, res.Status);
 
@@ -223,7 +218,7 @@ namespace TestUtils.EfCrudDataAccess
         [Fact]
         public void TestEditSingle1()
         {
-            Tests.TestRealDb(context =>
+            Tests.TestRealDb<LuUtilsPkBigSerialDataAccess>(service =>
             {
                 var dbos = new List<PkBigSerialAddDbo>
                 {
@@ -243,7 +238,6 @@ namespace TestUtils.EfCrudDataAccess
                         SomeText = "24"
                     }
                 };
-                var service = new LuUtilsPkBigSerialDataAccess(context);
                 var res = service.AddId(dbos);
                 Assert.Equal(LuStatus.Success, res.Status);
                 var ids = res.Data.ToList();
@@ -276,7 +270,7 @@ namespace TestUtils.EfCrudDataAccess
         [Fact]
         public void TestEditSingle2()
         {
-            Tests.TestRealDb(context =>
+            Tests.TestRealDb<LuUtilsPkBigSerialDataAccess>(service =>
             {
                 var dbos = new List<PkBigSerialAddDbo>
                 {
@@ -296,7 +290,6 @@ namespace TestUtils.EfCrudDataAccess
                         SomeText = "24"
                     }
                 };
-                var service = new LuUtilsPkBigSerialDataAccess(context);
                 var res = service.AddId(dbos);
                 Assert.Equal(LuStatus.Success, res.Status);
                 var ids = res.Data.ToList();
@@ -326,7 +319,7 @@ namespace TestUtils.EfCrudDataAccess
         [Fact]
         public void TestEditSingle3()
         {
-            Tests.TestRealDb(context =>
+            Tests.TestRealDb<LuUtilsPkBigSerialDataAccess>(service =>
             {
                 var dbos = new List<PkBigSerialAddDbo>
                 {
@@ -346,7 +339,6 @@ namespace TestUtils.EfCrudDataAccess
                         SomeText = "24"
                     }
                 };
-                var service = new LuUtilsPkBigSerialDataAccess(context);
                 var res = service.AddId(dbos);
                 Assert.Equal(LuStatus.Success, res.Status);
                 var ids = res.Data.ToList();
@@ -378,7 +370,7 @@ namespace TestUtils.EfCrudDataAccess
         [Fact]
         public void TestEditSingle4()
         {
-            Tests.TestRealDb(context =>
+            Tests.TestRealDb<LuUtilsPkGuidDataAccess>(service =>
             {
                 var dbos = new List<PkGuidAddDbo>
                 {
@@ -398,7 +390,6 @@ namespace TestUtils.EfCrudDataAccess
                         SomeText = "24"
                     }
                 };
-                var service = new LuUtilsPkGuidDataAccess(context);
                 var res = service.AddId(dbos);
                 Assert.Equal(LuStatus.Success, res.Status);
                 var ids = res.Data.ToList();
@@ -430,7 +421,7 @@ namespace TestUtils.EfCrudDataAccess
         [Fact]
         public void TestEditSingle5()
         {
-            Tests.TestRealDb(context =>
+            Tests.TestRealDb<LuUtilsPkGuidDataAccess>(service =>
             {
                 var dbos = new List<PkGuidAddDbo>
                 {
@@ -450,7 +441,6 @@ namespace TestUtils.EfCrudDataAccess
                         SomeText = "24"
                     }
                 };
-                var service = new LuUtilsPkGuidDataAccess(context);
                 var res = service.AddId(dbos);
                 Assert.Equal(LuStatus.Success, res.Status);
                 var ids = res.Data.ToList();
@@ -480,7 +470,7 @@ namespace TestUtils.EfCrudDataAccess
         [Fact]
         public void TestEditSingle6()
         {
-            Tests.TestRealDb(context =>
+            Tests.TestRealDb<LuUtilsPkGuidDataAccess>(service =>
             {
                 var dbos = new List<PkGuidAddDbo>
                 {
@@ -500,7 +490,6 @@ namespace TestUtils.EfCrudDataAccess
                         SomeText = "24"
                     }
                 };
-                var service = new LuUtilsPkGuidDataAccess(context);
                 var res = service.AddId(dbos);
                 Assert.Equal(LuStatus.Success, res.Status);
                 var ids = res.Data.ToList();
@@ -532,7 +521,7 @@ namespace TestUtils.EfCrudDataAccess
         [Fact]
         public void TestEditSingle7()
         {
-            Tests.TestRealDb(context =>
+            Tests.TestRealDb<LuUtilsPkBigSerialDataAccess>(service =>
             {
                 var dbos = new List<PkBigSerialAddDbo>
                 {
@@ -552,7 +541,6 @@ namespace TestUtils.EfCrudDataAccess
                         SomeText = "24"
                     }
                 };
-                var service = new LuUtilsPkBigSerialDataAccess(context);
                 var res = service.AddId(dbos);
                 Assert.Equal(LuStatus.Success, res.Status);
                 var ids = res.Data.ToList();
@@ -586,7 +574,7 @@ namespace TestUtils.EfCrudDataAccess
         [Fact]
         public void TestEditSingle8()
         {
-            Tests.TestRealDb(context =>
+            Tests.TestRealDb<LuUtilsPkBigSerialDataAccess>(service =>
             {
                 var dbos = new List<PkBigSerialAddDbo>
                 {
@@ -606,7 +594,6 @@ namespace TestUtils.EfCrudDataAccess
                         SomeText = "24"
                     }
                 };
-                var service = new LuUtilsPkBigSerialDataAccess(context);
                 var res = service.AddId(dbos);
                 Assert.Equal(LuStatus.Success, res.Status);
                 var ids = res.Data.ToList();
@@ -638,7 +625,7 @@ namespace TestUtils.EfCrudDataAccess
         [Fact]
         public void TestEditSingle9()
         {
-            Tests.TestRealDb(context =>
+            Tests.TestRealDb<LuUtilsPkBigSerialDataAccess>(service =>
             {
                 var dbos = new List<PkBigSerialAddDbo>
                 {
@@ -658,7 +645,6 @@ namespace TestUtils.EfCrudDataAccess
                         SomeText = "24"
                     }
                 };
-                var service = new LuUtilsPkBigSerialDataAccess(context);
                 var res = service.AddId(dbos);
                 Assert.Equal(LuStatus.Success, res.Status);
                 var ids = res.Data.ToList();
@@ -692,7 +678,7 @@ namespace TestUtils.EfCrudDataAccess
         [Fact]
         public void TestEditSingle10()
         {
-            Tests.TestRealDb(context =>
+            Tests.TestRealDb<LuUtilsPkGuidDataAccess>(service =>
             {
                 var dbos = new List<PkGuidAddDbo>
                 {
@@ -712,7 +698,6 @@ namespace TestUtils.EfCrudDataAccess
                         SomeText = "24"
                     }
                 };
-                var service = new LuUtilsPkGuidDataAccess(context);
                 var res = service.AddId(dbos);
                 Assert.Equal(LuStatus.Success, res.Status);
                 var ids = res.Data.ToList();
@@ -746,7 +731,7 @@ namespace TestUtils.EfCrudDataAccess
         [Fact]
         public void TestEditSingle11()
         {
-            Tests.TestRealDb(context =>
+            Tests.TestRealDb<LuUtilsPkGuidDataAccess>(service =>
             {
                 var dbos = new List<PkGuidAddDbo>
                 {
@@ -766,7 +751,6 @@ namespace TestUtils.EfCrudDataAccess
                         SomeText = "24"
                     }
                 };
-                var service = new LuUtilsPkGuidDataAccess(context);
                 var res = service.AddId(dbos);
                 Assert.Equal(LuStatus.Success, res.Status);
                 var ids = res.Data.ToList();
@@ -798,7 +782,7 @@ namespace TestUtils.EfCrudDataAccess
         [Fact]
         public void TestEditSingle12()
         {
-            Tests.TestRealDb(context =>
+            Tests.TestRealDb<LuUtilsPkGuidDataAccess>(service =>
             {
                 var dbos = new List<PkGuidAddDbo>
                 {
@@ -818,7 +802,6 @@ namespace TestUtils.EfCrudDataAccess
                         SomeText = "24"
                     }
                 };
-                var service = new LuUtilsPkGuidDataAccess(context);
                 var res = service.AddId(dbos);
                 Assert.Equal(LuStatus.Success, res.Status);
                 var ids = res.Data.ToList();

TestUtils/Tests.cs

@@ -1,5 +1,5 @@
 using System;
-using System.Linq;
+using Luticate2.Utils.DataAccess;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.Extensions.DependencyInjection;
 using TestUtils.DataAccess;
@@ -11,26 +11,47 @@ namespace TestUtils
         public const string ConnectionString =
             "User ID=dev;Password=dev;Host=localhost;Port=5432;Database=luticate2_utils;Pooling=true;";
 
-        public static void TestRealDb(Action<IServiceProvider> func)
+        public static IServiceProvider BuildServiceProvider()
         {
             IServiceCollection serviceCollection = new ServiceCollection();
+            serviceCollection.AddScoped<LuEfTransactionScope>();
+            serviceCollection.AddTransient<LuUtilsPkBigSerialDataAccess>();
+            serviceCollection.AddTransient<LuUtilsPkGuidDataAccess>();
+            serviceCollection.AddTransient<LuUtilsFkPkGuidDataAccess>();
             serviceCollection.AddDbContext<LuUtilsDbContext>(builder => builder.UseNpgsql(ConnectionString),
                 ServiceLifetime.Transient);
-            var serviceProvider = serviceCollection.BuildServiceProvider();
+            return serviceCollection.BuildServiceProvider();
+        }
+
+        protected static void _TestRealDb(Action<IServiceProvider> func)
+        {
+            var serviceProvider = BuildServiceProvider();
+            var transactionScope = serviceProvider.GetService<LuEfTransactionScope>();
+            transactionScope.BeginTransaction<LuUtilsDbContext>(null);
             try
             {
                 func(serviceProvider);
             }
             finally
             {
-                var dbContext = (LuUtilsDbContext)serviceProvider.GetService(typeof(LuUtilsDbContext));
-                dbContext.pk_bigserial.RemoveRange(dbContext.pk_bigserial);
-                dbContext.pk_guid.RemoveRange(dbContext.pk_guid);
-                dbContext.fk_pk_guids.RemoveRange(dbContext.fk_pk_guids);
-
-                dbContext.SaveChanges();
-                dbContext.Dispose();
+                transactionScope.RollbackTransaction<LuUtilsDbContext>();
             }
         }
+
+        public static void TestRealDb<TDataAccess>(Action<TDataAccess> func)
+        {
+            _TestRealDb(provider =>
+            {
+                func(provider.GetService<TDataAccess>());
+            });
+        }
+
+        public static void TestRealDb<TDataAccess, TDataAccess2>(Action<TDataAccess, TDataAccess2> func)
+        {
+            _TestRealDb(provider =>
+            {
+                func(provider.GetService<TDataAccess>(), provider.GetService<TDataAccess2>());
+            });
+        }
     }
 }

WebApiUtils/Controllers/PkGuidController.cs

@@ -1,4 +1,6 @@
 using Luticate2.Utils.Controllers;
+using Luticate2.Utils.Dbo.Basic;
+using Microsoft.Extensions.Options;
 using TestUtils.Dbo.PkGuid;
 using WebApiUtils.Business;
 
@@ -6,7 +8,7 @@ namespace WebApiUtils.Controllers
 {
     public class PkGuidController : LuCrudController<PkGuidBusiness, PkGuidAddDbo, PkGuidDbo, PkGuidAddDbo, string>
     {
-        public PkGuidController(PkGuidBusiness busines) : base(busines)
+        public PkGuidController(PkGuidBusiness busines, IOptions<LuUtilsOptionsDbo> luUtilsOptionsDbo) : base(busines, luUtilsOptionsDbo)
         {
         }
     }

WebApiUtils/Startup.cs

@@ -39,8 +39,8 @@ namespace WebApiUtils
 
             services.AddLuticateUtils(options => options.Version = "dev");
 
-            services.AddSingleton<PkGuidBusiness>();
-            services.AddSingleton<LuUtilsPkGuidDataAccess>();
+            services.AddScoped<PkGuidBusiness>();
+            services.AddScoped<LuUtilsPkGuidDataAccess>();
             services.AddDbContext<LuUtilsDbContext>(options =>
             {
                 options.UseNpgsql(Configuration.GetConnectionString("default"));

WebApiUtils/appsettings.Development.json

@@ -9,6 +9,6 @@
         }
     },
     "ConnectionStrings": {
-        "default":  "User ID=dev;Password=dev;Host=localhost;Port=5432;Database=luticate2_utils;Pooling=true;"
+        "default":  "User ID=dev;Password=dev;Host=localhost;Port=5432;Database=luticate2_utils;Pooling=true;ApplicationName=WebApiUtilsDev"
     }
 }

WebApiUtils/appsettings.json

@@ -10,6 +10,6 @@
         }
     },
     "ConnectionStrings": {
-        "default":  "User ID=POSTGRES_USER;Password=POSTGRES_PASSWORD;Host=POSTGRES_HOST;Port=5432;Database=POSTGRES_DB;Pooling=true;"
+        "default":  "User ID=POSTGRES_USER;Password=POSTGRES_PASSWORD;Host=POSTGRES_HOST;Port=5432;Database=POSTGRES_DB;Pooling=true;ApplicationName=WebApiUtils"
     }
 }