added sql error check (ability to move business in db); tests

Luticate2.Utils/DataAccess/LuEfCrudDataAccess.cs

@@ -114,9 +114,9 @@ namespace Luticate2.Utils.DataAccess
 
 
 
-        protected virtual LuResult<T> _Add<T>(TDboCreate obj, TDbContext db, DbSet<TModel> table)
+        protected virtual LuResult<TModel> _Add(TDboCreate dbo, TDbContext db, DbSet<TModel> table)
         {
-            return LuResult<T>.Ok(default(T));
+            return LuResult<TModel>.Ok(GetModelFromTCreate(dbo));
         }
 
         public virtual LuResult<T> Add<T>(IEnumerable<TDboCreate> objs, Func<IEnumerable<TDboRead>, T> returnFunc)
@@ -127,14 +127,14 @@ namespace Luticate2.Utils.DataAccess
                 var transact = BeginTransaction(db);
                 foreach (var dbo in objs)
                 {
-                    var model = GetModelFromTCreate(dbo);
-                    table.Add(model);
-                    models.Add(model);
-                    var res = _Add<T>(dbo, db, table);
+                    var res = _Add(dbo, db, table);
                     if (!res)
                     {
-                        return res;
+                        RollbackTransaction(transact);
+                        return res.To<T>();
                     }
+                    table.Add(res.Data);
+                    models.Add(res.Data);
                 }
                 db.SaveChanges();
                 foreach (var model in models)
@@ -376,9 +376,10 @@ namespace Luticate2.Utils.DataAccess
 //            return EditSingleById(id, update, read => read);
 //        }
 
-        protected virtual LuResult<T> _EditSingleById<T>(TId id, TModel model, TDboUpdate obj, TDbContext db, DbSet<TModel> table)
+        protected virtual LuResult<bool> _EditSingleById(TId id, TModel model, TDboUpdate update, TDbContext db, DbSet<TModel> table)
         {
-            return LuResult<T>.Ok(default(T));
+            EditModelFromTUpdate(update, model);
+            return LuResult<bool>.Ok(true);
         }
 
         public virtual LuResult<T> EditSingleById<T>(TId id, TDboUpdate update, Func<TDboRead, T> returnFunc)
@@ -392,12 +393,11 @@ namespace Luticate2.Utils.DataAccess
             var editRes = Execute((db, table) =>
             {
                 var model = GetEditQueryable(db, table).FirstOrDefault(GetExpression(new KeyValuePair<string, object>("id", guid)));
-                EditModelFromTUpdate(update, model);
-                var res = _EditSingleById<T>(id, model, update, db, table);
+                var res = _EditSingleById(id, model, update, db, table);
                 if (!res)
                 {
                     RollbackTransaction(transact);
-                    return res;
+                    return res.To<T>();
                 }
                 db.Entry(model).State = EntityState.Modified;
                 db.SaveChanges();

Luticate2.Utils/DataAccess/LuEfDataAccess.cs

@@ -23,6 +23,11 @@ namespace Luticate2.Utils.DataAccess
 
         protected abstract DbSet<TModel> GetTable(TDbContext db);
 
+        protected virtual LuResult<T> HandleError<T>(Exception e)
+        {
+            return null;
+        }
+
         public virtual LuResult<T> Execute<T>(Func<TDbContext, DbSet<TModel>, LuResult<T>> func)
         {
             try
@@ -39,6 +44,11 @@ namespace Luticate2.Utils.DataAccess
             }
             catch (Exception e)
             {
+                var err = HandleError<T>(e);
+                if (null != err)
+                {
+                    return err;
+                }
                 return LuResult<T>.Error(LuStatus.DbError, e);
             }
         }

Luticate2.Utils/Utils/LuCoreUtilsExtensions.cs

@@ -6,6 +6,11 @@ namespace Luticate2.Utils.Utils
 {
     public static class LuCoreUtilsExtensions
     {
+        public static bool HasProperty(this Type type, string name)
+        {
+            return type.GetProperty(name) != null;
+        }
+
         public static string ToSnakeCase(this string str)
         {
             if (str == null)
@@ -15,14 +20,44 @@ namespace Luticate2.Utils.Utils
             return string.Concat(str.Select((x, i) => i > 0 && char.IsUpper(x) ? "_" + x.ToString() : x.ToString())).ToLower();
         }
 
+        public static T ToEnum<T>(this string model)
+        {
+            return (T) Enum.Parse(typeof(T), model);
+        }
+
         public static Guid? ToGuid(this string str)
         {
             return str == null ? (Guid?)null : new Guid(str);
         }
 
-        public static bool HasProperty(this Type type, string name)
+        public static string ToDbo(this Guid model)
         {
-            return type.GetProperty(name) != null;
+            return model.ToString();
+        }
+
+        public static string ToDbo(this Guid? model)
+        {
+            return model?.ToDbo();
+        }
+
+        public static DateTime ToDbo(this DateTime model)
+        {
+            return model.ToLocalTime().ToUniversalTime();
+        }
+
+        public static DateTime? ToDbo(this DateTime? model)
+        {
+            return model?.ToDbo();
+        }
+
+        public static DateTime ToModel(this DateTime model)
+        {
+            return model.ToUniversalTime();
+        }
+
+        public static DateTime? ToModel(this DateTime? model)
+        {
+            return model?.ToModel();
         }
     }
 }

TestUtils/DataAccess/LuUtilsFkPkGuidDataAccess.cs

@@ -1,6 +1,7 @@
 using System;
 using System.Linq;
 using Luticate2.Utils.DataAccess;
+using Luticate2.Utils.Utils;
 using Microsoft.EntityFrameworkCore;
 using TestUtils.DataAccess.Models;
 using TestUtils.Dbo.FkPkGuid;
@@ -31,18 +32,12 @@ namespace TestUtils.DataAccess
         protected override void EditModelFromTUpdate(FkPkGuidAddDbo obj, fk_pk_guids model)
         {
             model.name = obj.Name;
-            model.pk_guid_id = obj.PkGuidId == null ? (Guid?) null : new Guid(obj.PkGuidId);
+            model.pk_guid_id = obj.PkGuidId.ToGuid();
         }
 
         protected override FkPkGuidDbo GetDboFromModel(fk_pk_guids model)
         {
-            return new FkPkGuidDbo
-            {
-                Id = model.id.ToString(),
-                Name = model.name,
-                PkGuid = model.fk_pk_guid == null ? null : LuUtilsPkGuidDataAccess.GetDboFromModelStatic(model.fk_pk_guid),
-                PkGuidId = model.pk_guid_id?.ToString()
-            };
+            return model.ToDbo();
         }
     }
 }

TestUtils/DataAccess/LuUtilsPkBigSerialDataAccess.cs

@@ -32,13 +32,7 @@ namespace TestUtils.DataAccess
 
         protected override PkBigSerialDbo GetDboFromModel(pk_bigserial model)
         {
-            return new PkBigSerialDbo
-            {
-                CreatedAt = model.created_at,
-                Id = model.id,
-                SomeInt = model.some_int,
-                SomeText = model.some_text
-            };
+            return model.ToDbo();
         }
 
         protected override Expression<Func<pk_bigserial, bool>> GetFilterExpression(LuFilterDbo filter)

TestUtils/DataAccess/LuUtilsPkGuidDataAccess.cs

@@ -1,11 +1,10 @@
 using System;
-using System.Collections.Generic;
-using System.Linq;
 using System.Linq.Expressions;
 using Luticate2.Utils.DataAccess;
 using Luticate2.Utils.Dbo.Filter;
 using Luticate2.Utils.Dbo.Result;
 using Microsoft.EntityFrameworkCore;
+using Npgsql;
 using TestUtils.DataAccess.Models;
 using TestUtils.Dbo.PkGuid;
 
@@ -27,27 +26,39 @@ namespace TestUtils.DataAccess
             return GetModelFromTUpdate(obj, new pk_guid());
         }
 
-        protected override void EditModelFromTUpdate(PkGuidAddDbo obj, pk_guid model)
+        protected override LuResult<T> HandleError<T>(Exception e)
         {
-            model.some_int = obj.SomeInt;
-            model.some_text = obj.SomeText;
+            if (e is DbUpdateException)
+            {
+                var pge = e.InnerException as PostgresException;
+                if (pge != null)
+                {
+                    if (pge.ConstraintName == "pk_guid_some_text_key")
+                    {
+                        return LuResult<T>.Error(LuStatus.InputError, e, "someText already exists");
+                    }
+                    if (pge.ConstraintName == "pkguid_some_text_check_insert")
+                    {
+                        return LuResult<T>.Error(LuStatus.InputError, e, "someText can not end with '_edited'");
+                    }
+                    if (pge.ConstraintName == "pkguid_some_text_check_update")
+                    {
+                        return LuResult<T>.Error(LuStatus.InputError, e, "someText must end with '_edited'");
+                    }
+                }
+            }
+            return null;
         }
 
-        public static PkGuidDbo GetDboFromModelStatic(pk_guid model)
+        protected override void EditModelFromTUpdate(PkGuidAddDbo obj, pk_guid model)
         {
-            return new PkGuidDbo
-            {
-                CreatedAt = model.created_at,
-                UpdatedAt = model.updated_at,
-                Id = model.id.ToString(),
-                SomeInt = model.some_int,
-                SomeText = model.some_text
-            };
+            model.some_int = obj.SomeInt;
+            model.some_text = obj.SomeText;
         }
 
         protected override PkGuidDbo GetDboFromModel(pk_guid model)
         {
-            return GetDboFromModelStatic(model);
+            return model.ToDbo();
         }
 
         protected override Expression<Func<pk_guid, bool>> GetFilterExpression(LuFilterDbo filter)
@@ -55,48 +66,17 @@ namespace TestUtils.DataAccess
             return model => LuUtilsDbContext.lu_texts_match(filter.Query, model.some_text + " " + model.some_int.ToString());
         }
 
-        public LuResult<bool> SomeTextExists(string someText)
-        {
-            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)
+        protected override LuResult<pk_guid> _Add(PkGuidAddDbo dbo, LuUtilsDbContext db, DbSet<pk_guid> table)
         {
-            IList<pk_guid> models = new List<pk_guid>();
-            var addRes = Execute((db, table) =>
+            if (dbo.SomeInt == 2424)
             {
-                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)
+                throw new Exception("Test unexpected db error");
+            }
+            if (dbo.SomeInt == 4242)
             {
-                return addRes;
+                return LuResult<pk_guid>.Error(LuStatus.DbError, "Some expected error", "");
             }
-            return GetMultiple(models, returnFunc);
+            return LuResult<pk_guid>.Ok(GetModelFromTCreate(dbo));
         }
     }
 }

TestUtils/DataAccess/ModelsToDbo.cs

@@ -0,0 +1,57 @@
+using Luticate2.Utils.Utils;
+using TestUtils.DataAccess.Models;
+using TestUtils.Dbo.FkPkGuid;
+using TestUtils.Dbo.PkBigSerial;
+using TestUtils.Dbo.PkGuid;
+
+namespace TestUtils.DataAccess
+{
+    public static class ModelsToDbo
+    {
+        public static PkGuidDbo ToDbo(this pk_guid model)
+        {
+            if (model == null)
+            {
+                return null;
+            }
+            return new PkGuidDbo
+            {
+                CreatedAt = model.created_at,
+                UpdatedAt = model.updated_at,
+                Id = model.id.ToString(),
+                SomeInt = model.some_int,
+                SomeText = model.some_text
+            };
+        }
+
+        public static FkPkGuidDbo ToDbo(this fk_pk_guids model)
+        {
+            if (model == null)
+            {
+                return null;
+            }
+            return new FkPkGuidDbo
+            {
+                Id = model.id.ToString(),
+                Name = model.name,
+                PkGuid = model.fk_pk_guid.ToDbo(),
+                PkGuidId = model.pk_guid_id.ToDbo()
+            };
+        }
+
+        public static PkBigSerialDbo ToDbo(this pk_bigserial model)
+        {
+            if (model == null)
+            {
+                return null;
+            }
+            return new PkBigSerialDbo
+            {
+                CreatedAt = model.created_at,
+                Id = model.id,
+                SomeInt = model.some_int,
+                SomeText = model.some_text
+            };
+        }
+    }
+}

TestUtils/EfCrudDataAccess/LuEfUpdateDataAccessTest.cs

@@ -702,11 +702,12 @@ namespace TestUtils.EfCrudDataAccess
                 var ids = res.Data.ToList();
 
                 dbos[0].SomeInt = -1;
+                dbos[0].SomeText += "_edited";
 
                 var edit = service.EditSingleById(ids[0], dbos[0], d => d);
                 Assert.Equal(LuStatus.Success, edit.Status);
                 Assert.Equal(-1, edit.Data.SomeInt);
-                Assert.Equal("442", edit.Data.SomeText);
+                Assert.Equal("442_edited", edit.Data.SomeText);
 
                 var get = service.GetMultiple(guid => guid.some_text);
                 Assert.Equal(LuStatus.Success, get.Status);
@@ -723,7 +724,7 @@ namespace TestUtils.EfCrudDataAccess
 
                 dbo = get.Data.Data[2];
                 Assert.Equal(-1, dbo.SomeInt);
-                Assert.Equal("442", dbo.SomeText);
+                Assert.Equal("442_edited", dbo.SomeText);
             });
         }
 
@@ -755,6 +756,7 @@ namespace TestUtils.EfCrudDataAccess
                 var ids = res.Data.ToList();
 
                 dbos[0].SomeInt = -1;
+                dbos[0].SomeText += "_edited";
 
                 var edit = service.EditSingleByIdId(ids[0], dbos[0]);
                 Assert.Equal(LuStatus.Success, edit.Status);
@@ -774,7 +776,7 @@ namespace TestUtils.EfCrudDataAccess
 
                 dbo = get.Data.Data[2];
                 Assert.Equal(-1, dbo.SomeInt);
-                Assert.Equal("442", dbo.SomeText);
+                Assert.Equal("442_edited", dbo.SomeText);
             });
         }
 
@@ -806,11 +808,12 @@ namespace TestUtils.EfCrudDataAccess
                 var ids = res.Data.ToList();
 
                 dbos[0].SomeInt = -1;
+                dbos[0].SomeText += "_edited";
 
                 var edit = service.EditSingleByIdDbo(ids[0], dbos[0]);
                 Assert.Equal(LuStatus.Success, edit.Status);
                 Assert.Equal(-1, edit.Data.SomeInt);
-                Assert.Equal("442", edit.Data.SomeText);
+                Assert.Equal("442_edited", edit.Data.SomeText);
 
                 var get = service.GetMultiple(guid => guid.some_text);
                 Assert.Equal(LuStatus.Success, get.Status);
@@ -827,7 +830,7 @@ namespace TestUtils.EfCrudDataAccess
 
                 dbo = get.Data.Data[2];
                 Assert.Equal(-1, dbo.SomeInt);
-                Assert.Equal("442", dbo.SomeText);
+                Assert.Equal("442_edited", dbo.SomeText);
             });
         }
     }

WebApiUtils/Business/PkGuidBusiness.cs

@@ -1,5 +1,4 @@
 using Luticate2.Utils.Business;
-using Luticate2.Utils.Dbo.Result;
 using TestUtils.DataAccess;
 using TestUtils.Dbo.PkGuid;
 
@@ -7,56 +6,9 @@ namespace WebApiUtils.Business
 {
     public class PkGuidBusiness : LuCrudBusiness<LuUtilsPkGuidDataAccess, PkGuidAddDbo, PkGuidDbo, PkGuidAddDbo, string>
     {
-        private readonly LuUtilsPkGuidDataAccess _dataAccess;
-
         public PkGuidBusiness(LuUtilsPkGuidDataAccess dataAccess, LuNotificationsBusiness notificationsBusiness) : base(dataAccess, notificationsBusiness)
         {
-            _dataAccess = dataAccess;
             EntityType = "pkguid";
         }
-
-        public LuResult<bool> SomeTextExists(string someText)
-        {
-            return _dataAccess.SomeTextExists(someText);
-        }
-
-        protected override LuResult<PkGuidAddDbo> CheckAdd(PkGuidAddDbo obj)
-        {
-            var res = SomeTextExists(obj.SomeText);
-            if (!res)
-            {
-                return res.To<PkGuidAddDbo>();
-            }
-            if (res.Data)
-            {
-                return LuResult<PkGuidAddDbo>.Error(LuStatus.InputError, "someText already exists", "");
-            }
-            if (obj.SomeText.EndsWith("_edited"))
-            {
-                return LuResult<PkGuidAddDbo>.Error(LuStatus.InputError, "someText can not end with '_edited'", "");
-            }
-            return LuResult<PkGuidAddDbo>.Ok(obj);
-        }
-
-        protected override LuResult<PkGuidAddDbo> CheckEdit(PkGuidDbo dbo, PkGuidAddDbo update)
-        {
-            if (dbo.SomeText != update.SomeText)
-            {
-                var res = SomeTextExists(update.SomeText);
-                if (!res)
-                {
-                    return res.To<PkGuidAddDbo>();
-                }
-                if (res.Data)
-                {
-                    return LuResult<PkGuidAddDbo>.Error(LuStatus.InputError, "someText already exists", "");
-                }
-            }
-            if (!update.SomeText.EndsWith("_edited"))
-            {
-                return LuResult<PkGuidAddDbo>.Error(LuStatus.InputError, "someText must end with '_edited'", "");
-            }
-            return LuResult<PkGuidAddDbo>.Ok(update);
-        }
     }
 }