Basic write to DB working

Luticate2.Auth.Tests/DataAccess/Crud/LuEfCrudTests.cs

@@ -1,5 +1,6 @@
 using System;
 using System.Collections.Generic;
+using System.Linq;
 using System.Linq.Expressions;
 using Luticate2.Auth.Tests.DataAccess.Crud.Models;
 using Luticate2.Auth.Utils.Business.Converters;
@@ -17,7 +18,7 @@ using Xunit;
 
 namespace Luticate2.Auth.Tests.DataAccess.Crud
 {
-    public class LuEfCrudTests
+    public class LuEfCrudTests : IDisposable
     {
         public class TableSimple1Dbo
         {
@@ -50,6 +51,20 @@ namespace Luticate2.Auth.Tests.DataAccess.Crud
             }
         }
 
+        public class TableSimple1ModelDescriptor : LuObjectConverterDescriptor<table_simple_1, TableSimple1Dbo>
+        {
+            public TableSimple1ModelDescriptor()
+            {
+                AddStaticMemberConverter(model => model.id, dbo => dbo.Id);
+                AddStaticMemberConverter(model => model.name, dbo => dbo.Name);
+                AddStaticMemberConverter(model => model.priority, dbo => dbo.Priority);
+                AddStaticMemberConverter(model => model.comment, dbo => dbo.Comment);
+                AddStaticMemberConverter(model => model.optional_int, dbo => dbo.OptionalInt);
+                AddStaticMemberConverter(model => model.created_at, dbo => dbo.CreatedAt);
+                AddStaticMemberConverter(model => model.updated_at, dbo => dbo.UpdatedAt);
+            }
+        }
+
         public class TableSimple1DataAccess : LuEfCrudDataAccess<TableSimple1Dbo, table_simple_1, luticate2_unit_testsContext>
         {
             public TableSimple1DataAccess(IServiceProvider serviceProvider) : base(serviceProvider)
@@ -57,14 +72,30 @@ namespace Luticate2.Auth.Tests.DataAccess.Crud
             }
         }
 
-        protected IServiceProvider GetServiceProvider()
+        public IServiceProvider ServiceProvider { get; set; }
+
+        public luticate2_unit_testsContext Luticate2UnitTestsContext { get; set; }
+
+        public LuEfCrudTests()
         {
             var services = new ServiceCollection();
             services.AddLuObjectConverterDescriptors();
+            // DB read
             services.AddSingleton<ILuObjectConverterDescriptor<TableSimple1Dbo, table_simple_1>, TableSimple1DboDescriptor>();
+            // DB write
+            services.AddSingleton<ILuObjectConverterDescriptor<table_simple_1, TableSimple1Dbo>, TableSimple1ModelDescriptor>();
 
             services.AddLuObjectConverters();
-            services.AddLuObjectConverterPoco<table_simple_1, TableSimple1Dbo>(); // DB read
+            // DB read
+            services.AddLuObjectConverterPoco<table_simple_1, TableSimple1Dbo>();
+            // DB write
+            services.AddLuObjectConverterPoco<TableSimple1Dbo, table_simple_1>();
+
+
+            services.AddSingleton<ILuConvertersTypeConverter>(new LuConvertersTypeConverter(new Dictionary<Type, Type>
+            {
+                {typeof(TableSimple1Dbo), typeof(table_simple_1)} // DB read
+            }));
 
             services.AddDbContext<luticate2_unit_testsContext>(options =>
             {
@@ -75,21 +106,47 @@ namespace Luticate2.Auth.Tests.DataAccess.Crud
             }, ServiceLifetime.Transient);
 
             services.AddSingleton<TableSimple1DataAccess>();
-            services.AddSingleton<ILuConvertersTypeConverter>(new LuConvertersTypeConverter(new Dictionary<Type, Type>
-            {
-                {typeof(TableSimple1Dbo), typeof(table_simple_1)} // DB read
-            }));
 
-            var serviceProvider = services.BuildServiceProvider();
-            return serviceProvider;
+            ServiceProvider = services.BuildServiceProvider();
+            Luticate2UnitTestsContext = ServiceProvider.GetService<luticate2_unit_testsContext>();
+            Luticate2UnitTestsContext.table_simple_1.RemoveRange(Luticate2UnitTestsContext.table_simple_1);
+            Luticate2UnitTestsContext.SaveChanges();
+        }
+
+        public void Dispose()
+        {
+            Luticate2UnitTestsContext.table_simple_1.RemoveRange(Luticate2UnitTestsContext.table_simple_1);
+            Luticate2UnitTestsContext.SaveChanges();
+        }
+
+        protected void AddTableSimple1DataSet1()
+        {
+            Luticate2UnitTestsContext.table_simple_1.AddRange(new table_simple_1
+            {
+                name = "test2",
+                priority = 24,
+                comment = null,
+                optional_int = 1,
+                created_at = DateTime.Now,
+                updated_at = null
+            }, new table_simple_1
+            {
+                name = "test1",
+                priority = 42,
+                comment = null,
+                optional_int = null,
+                created_at = DateTime.Now,
+                updated_at = null
+            });
+            Luticate2UnitTestsContext.SaveChanges();
         }
 
         [Fact]
         public void TestSimpleReadFilter1()
         {
-            var serviceProvider = GetServiceProvider();
+            AddTableSimple1DataSet1();
 
-            var crudDataAccess = serviceProvider.GetRequiredService<TableSimple1DataAccess>();
+            var crudDataAccess = ServiceProvider.GetRequiredService<TableSimple1DataAccess>();
 
             var result = crudDataAccess.Read(LuPartialFieldsParser.Parse("*").Data, new LuPaginatedParamsDbo
             {
@@ -123,9 +180,9 @@ namespace Luticate2.Auth.Tests.DataAccess.Crud
         [Fact]
         public void TestSimpleReadOrderBy1()
         {
-            var serviceProvider = GetServiceProvider();
+            AddTableSimple1DataSet1();
 
-            var crudDataAccess = serviceProvider.GetRequiredService<TableSimple1DataAccess>();
+            var crudDataAccess = ServiceProvider.GetRequiredService<TableSimple1DataAccess>();
 
             var result = crudDataAccess.Read(LuPartialFieldsParser.Parse("*").Data, new LuPaginatedParamsDbo
             {
@@ -173,11 +230,11 @@ namespace Luticate2.Auth.Tests.DataAccess.Crud
         [Fact]
         public void TestSimpleReadOrderBy2()
         {
-            var serviceProvider = GetServiceProvider();
+            AddTableSimple1DataSet1();
 
-            var crudDataAccess = serviceProvider.GetRequiredService<TableSimple1DataAccess>();
+            var crudDataAccess = ServiceProvider.GetRequiredService<TableSimple1DataAccess>();
 
-            var partialRespone = new LuPartialFieldsDbo
+            var partialResponse = new LuPartialFieldsDbo
             {
                 Fields = new List<LuFieldDbo>
                 {
@@ -212,7 +269,7 @@ namespace Luticate2.Auth.Tests.DataAccess.Crud
                 PerPage = 10
             };
 
-            var result = crudDataAccess.Read(partialRespone, paginationParams);
+            var result = crudDataAccess.Read(partialResponse, paginationParams);
             Assert.NotNull(result);
             Assert.Equal(LuStatus.Success.ToInt(), result.Status);
             var items = result.Data;
@@ -235,5 +292,156 @@ namespace Luticate2.Auth.Tests.DataAccess.Crud
             Assert.Null(item.Comment);
             Assert.Equal(1, item.OptionalInt);
         }
+
+        [Fact]
+        public void TestSimpleCreate1()
+        {
+            var crudDataAccess = ServiceProvider.GetRequiredService<TableSimple1DataAccess>();
+
+            var partialInput = new LuPartialFieldsDbo
+            {
+                Fields = new List<LuFieldDbo>
+                {
+                    new LuFieldDbo
+                    {
+                        Parts = new List<string>
+                        {
+                            "*"
+                        }
+                    }
+                }
+            };
+
+            var partialResponse = new LuPartialFieldsDbo
+            {
+                Fields = new List<LuFieldDbo>
+                {
+                    new LuFieldDbo
+                    {
+                        Parts = new List<string>
+                        {
+                            "*"
+                        }
+                    }
+                }
+            };
+
+            var objects = new List<TableSimple1Dbo>
+            {
+                new TableSimple1Dbo
+                {
+                    Name = "test2",
+                    Priority = 24,
+                    Comment = null,
+                    OptionalInt = 1,
+                    CreatedAt = DateTime.Now,
+                    UpdatedAt = null
+                }, new TableSimple1Dbo
+                {
+                    Name = "test1",
+                    Priority = 42,
+                    Comment = null,
+                    OptionalInt = null,
+                    CreatedAt = DateTime.Now,
+                    UpdatedAt = null
+                }
+            };
+
+            var result = crudDataAccess.Create(partialResponse, partialInput, objects);
+
+            Assert.NotNull(result);
+            Assert.Equal(LuStatus.Success.ToInt(), result.Status);
+            var items = result.Data;
+            Assert.NotNull(items);
+            Assert.Equal(objects.Count, items.Count);
+
+            foreach (var o in items.Zip(objects, (added, origin) => new { Added = added, Origin = origin }))
+            {
+                Assert.NotNull(o.Added);
+                Assert.Equal(o.Origin.Name, o.Added.Name);
+                Assert.Equal(o.Origin.Priority, o.Added.Priority);
+                Assert.Equal(o.Origin.Comment, o.Added.Comment);
+                Assert.Equal(o.Origin.OptionalInt, o.Added.OptionalInt);
+            }
+        }
+
+        [Fact]
+        public void TestSimpleCreate2()
+        {
+            var crudDataAccess = ServiceProvider.GetRequiredService<TableSimple1DataAccess>();
+
+            var partialInput = new LuPartialFieldsDbo
+            {
+                Fields = new List<LuFieldDbo>
+                {
+                    new LuFieldDbo
+                    {
+                        Parts = new List<string>
+                        {
+                            "*"
+                        }
+                    }
+                }
+            };
+
+            var partialResponse = new LuPartialFieldsDbo
+            {
+                Fields = new List<LuFieldDbo>
+                {
+                    new LuFieldDbo
+                    {
+                        Parts = new List<string>
+                        {
+                            "id"
+                        }
+                    },
+                    new LuFieldDbo
+                    {
+                        Parts = new List<string>
+                        {
+                            "name"
+                        }
+                    }
+                }
+            };
+
+            var objects = new List<TableSimple1Dbo>
+            {
+                new TableSimple1Dbo
+                {
+                    Name = "test2",
+                    Priority = 24,
+                    Comment = null,
+                    OptionalInt = 1,
+                    CreatedAt = DateTime.Now,
+                    UpdatedAt = null
+                }, new TableSimple1Dbo
+                {
+                    Name = "test1",
+                    Priority = 42,
+                    Comment = null,
+                    OptionalInt = null,
+                    CreatedAt = DateTime.Now,
+                    UpdatedAt = null
+                }
+            };
+
+            var result = crudDataAccess.Create(partialResponse, partialInput, objects);
+
+            Assert.NotNull(result);
+            Assert.Equal(LuStatus.Success.ToInt(), result.Status);
+            var items = result.Data;
+            Assert.NotNull(items);
+            Assert.Equal(objects.Count, items.Count);
+
+            foreach (var o in items.Zip(objects, (added, origin) => new { Added = added, Origin = origin }))
+            {
+                Assert.NotNull(o.Added);
+                Assert.Equal(o.Origin.Name, o.Added.Name);
+                Assert.Equal(0, o.Added.Priority);
+                Assert.Null(o.Added.Comment);
+                Assert.Null(o.Added.OptionalInt);
+            }
+        }
     }
 }

Luticate2.Auth/Auth/Business/LuGroupsBusiness.cs

@@ -28,56 +28,5 @@ namespace Luticate2.Auth.Auth.Business
 
             return LuResult<IQueryable<LuGroups>>.Ok(included);
         }
-
-//        protected override LuResult<IQueryable<LuGroups>> Filter(LuFilterDbo filter, IQueryable<LuGroups> queryable)
-//        {
-//            return LuResult<IQueryable<LuGroups>>.Ok(queryable.Where(groups => groups.LuGroupsObjects.Any(objects => objects.Priority == 0)));
-//        }
-
-        public override LuResult<IList<LuGroupDbo>> Create(LuPartialFieldsDbo partialResponse,
-            LuPartialFieldsDbo partialInput, IEnumerable<LuGroupDbo> dbos)
-        {
-            var addedDbos = new List<LuGroupDbo>();
-            var addedModels = new List<LuGroups>();
-            var createResult = Execute((context, set) =>
-            {
-                foreach (var dbo in dbos)
-                {
-                    var addResult = ConvertDboToModel(partialInput, dbo);
-                    if (!addResult)
-                    {
-                        return addResult.To<bool>();
-                    }
-
-                    var model = addResult.Data;
-                    model.IdNavigation = new LuObjectsMetadata();
-                    set.Add(model);
-                    addedModels.Add(model);
-                }
-
-                context.SaveChanges();
-
-                return LuResult<bool>.Ok(true);
-            });
-
-            if (!createResult)
-            {
-                return createResult.To<IList<LuGroupDbo>>();
-            }
-
-            var ids = addedModels.Select(x => x.Id);
-
-            foreach (var addedModel in addedModels)
-            {
-                var convertResult = ConvertModelToDbo(partialResponse, addedModel);
-                if (!convertResult)
-                {
-                    return convertResult.To<IList<LuGroupDbo>>();
-                }
-                addedDbos.Add(convertResult.Data);
-            }
-
-            return LuResult<IList<LuGroupDbo>>.Ok(addedDbos);
-        }
     }
 }

Luticate2.Auth/Utils/DataAccess/Crud/LuEfCrudDataAccess.cs

@@ -40,45 +40,26 @@ namespace Luticate2.Auth.Utils.DataAccess.Crud
             };
         }
 
-        protected virtual LuResult<TModel> ConvertDboToModel(LuPartialFieldsDbo partialInput, TDbo dbo)
+        protected virtual LuResult<TTypeTo> Convert<TTypeTo>(LuPartialFieldsDbo partialInput, object dbo, LuConvertersOptions options) where TTypeTo : class
         {
-            var copier = ServiceProvider.GetService<ILuObjectConverter<TDbo, TModel>>();
-            if (copier == null)
+            var typeTo = dbo.GetType();
+            var converterType = typeof(ILuObjectConverter<,>);
+            var gConverterType = converterType.MakeGenericType(typeTo, typeof(TTypeTo));
+            var converter = (ILuObjectConverter) ServiceProvider.GetService(gConverterType);
+            if (converter == null)
             {
-                return LuResult<TModel>.Error(LuStatus.InternalError.ToInt(),
-                    $"Could not get service: {nameof(ILuObjectConverter)}<{typeof(TDbo).Name}, {typeof(TModel).Name}>");
+                return LuResult<TTypeTo>.Error(LuStatus.InternalError.ToInt(),
+                    $"Could not get service: {nameof(ILuObjectConverter)}<{typeof(TDbo).Name}, {typeof(TTypeTo).Name}>");
             }
 
-            var options = GetOptions();
-            var dstObjResult = options.Allocator.GetInstance(typeof(TModel));
-            if (!dstObjResult)
-            {
-                return dstObjResult.To<TModel>();
-            }
-            var dstObj = dstObjResult.Data;
-            var result = copier.Convert(dbo, dstObj, new LuFieldDbo(), partialInput, GetOptions());
-            return result.Select(o => o as TModel);
-        }
-
-        protected virtual LuResult<TDbo> ConvertModelToDbo(LuPartialFieldsDbo partialResponse, TModel model)
-        {
-            var copier = ServiceProvider.GetService<ILuObjectConverter<TModel, TDbo>>();
-            if (copier == null)
-            {
-                return LuResult<TDbo>.Error(LuStatus.InternalError.ToInt(),
-                    $"Could not get service: {nameof(ILuObjectConverter)}<{typeof(TModel).Name}, {typeof(TDbo).Name}>");
-            }
-
-            var options = GetOptions();
-            var dstObjResult = options.Allocator.GetInstance(typeof(TDbo));
+            var dstObjResult = options.Allocator.GetInstance(typeof(TTypeTo));
             if (!dstObjResult)
             {
-                return dstObjResult.To<TDbo>();
+                return dstObjResult.To<TTypeTo>();
             }
             var dstObj = dstObjResult.Data;
-
-            var result = copier.Convert(model, dstObj, new LuFieldDbo(), partialResponse, GetOptions());
-            return result.Select(o => o as TDbo);
+            var result = converter.Convert(dbo, dstObj, new LuFieldDbo(), partialInput, options);
+            return result.Select(o => o as TTypeTo);
         }
 
         protected virtual LuResult<T> HandleError<T>(Exception e)
@@ -107,26 +88,24 @@ namespace Luticate2.Auth.Utils.DataAccess.Crud
             return LuResult<IQueryable<TModel>>.Ok(queryable);
         }
 
-        protected virtual LuResult<IQueryable<TModel>> Filter(LuFilterDbo filter, IQueryable<TModel> queryable)
+        protected virtual LuResult<IQueryable<TModel>> Filter(LuFilterDbo filter, IQueryable<TModel> queryable, LuConvertersOptions options)
         {
             if (filter.Expression == null)
             {
                 return LuResult<IQueryable<TModel>>.Ok(queryable);
             }
 
-            var lambdaDbo = (Expression<Func<TDbo, bool>>) filter.Expression;
+            var lambdaDbo = filter.Expression as Expression<Func<TDbo, bool>>;
 
-            var options = GetOptions();
             var converter = new LuExpressionConverterVisitor(options, ServiceProvider);
             var lambdaModel = converter.Visit(lambdaDbo) as Expression<Func<TModel, bool>>;// TODO Handle errors
             return LuResult<IQueryable<TModel>>.Ok(queryable.Where(lambdaModel));
         }
 
-        protected virtual LuResult<IQueryable<TModel>> OrderByField(LuOrderByFieldDbo orderByField, IQueryable<TModel> queryable)
+        protected virtual LuResult<IQueryable<TModel>> OrderByField(LuOrderByFieldDbo orderByField, IQueryable<TModel> queryable, LuConvertersOptions options)
         {
-            var lambdaDbo = (Expression<Func<TDbo, object>>) orderByField.Expression;
+            var lambdaDbo = orderByField.Expression as Expression<Func<TDbo, object>>;
 
-            var options = GetOptions();
             var converter = new LuExpressionConverterVisitor(options, ServiceProvider);
             var lambdaModelNoConvert = converter.Visit(lambdaDbo) as LambdaExpression;// TODO Handle errors
             var lambdaModel = Expression.Lambda<Func<TModel, object>>(lambdaModelNoConvert.Body, lambdaModelNoConvert.Parameters);
@@ -159,12 +138,12 @@ namespace Luticate2.Auth.Utils.DataAccess.Crud
             return LuResult<IQueryable<TModel>>.Ok(ordered);
         }
 
-        protected virtual LuResult<IQueryable<TModel>> OrderBy(LuOrderByDbo orderBy, IQueryable<TModel> queryable)
+        protected virtual LuResult<IQueryable<TModel>> OrderBy(LuOrderByDbo orderBy, IQueryable<TModel> queryable, LuConvertersOptions options)
         {
             var ordered = queryable;
             foreach (var field in orderBy.OrderByFields)
             {
-                var orderedResult = OrderByField(field, ordered);
+                var orderedResult = OrderByField(field, ordered, options);
                 if (!orderedResult)
                 {
                     return orderedResult.To<IQueryable<TModel>>();
@@ -182,15 +161,55 @@ namespace Luticate2.Auth.Utils.DataAccess.Crud
             return LuResult<IQueryable<TModel>>.Ok(paginated);
         }
 
-        public virtual LuResult<IList<TDbo>> Create(LuPartialFieldsDbo partialResponse, LuPartialFieldsDbo partialInput, IEnumerable<TDbo> dbos)
+        public virtual LuResult<IList<TDbo>> Create(LuPartialFieldsDbo partialResponse, LuPartialFieldsDbo partialInput, IEnumerable<object> dbos)
         {
-            throw new NotImplementedException();
+            var options = GetOptions();
+            var addedDbos = new List<TDbo>();
+            var addedModels = new List<TModel>();
+            var createResult = Execute((context, set) =>
+            {
+                foreach (var dbo in dbos)
+                {
+                    var convertResult = Convert<TModel>(partialInput, dbo, options);
+                    if (!convertResult)
+                    {
+                        return convertResult.To<bool>();
+                    }
+
+                    var model = convertResult.Data;
+                    set.Add(model);
+                    addedModels.Add(model);
+                }
+
+                context.SaveChanges();
+
+                return LuResult<bool>.Ok(true);
+            });
+
+            if (!createResult)
+            {
+                return createResult.To<IList<TDbo>>();
+            }
+
+            foreach (var addedModel in addedModels)
+            {
+                var convertResult = Convert<TDbo>(partialResponse, addedModel, options);
+                if (!convertResult)
+                {
+                    return convertResult.To<IList<TDbo>>();
+                }
+                addedDbos.Add(convertResult.Data);
+            }
+
+            return LuResult<IList<TDbo>>.Ok(addedDbos);
         }
 
         public virtual LuResult<LuPaginatedDbo<TDbo>> Read(LuPartialFieldsDbo partialResponse, LuPaginatedParamsDbo paginationParams)
         {
             var result = Execute((context, set) =>
             {
+                var options = GetOptions();
+
                 var includeResult = Include(partialResponse, set);
                 if (!includeResult)
                 {
@@ -198,14 +217,14 @@ namespace Luticate2.Auth.Utils.DataAccess.Crud
                 }
                 var included = includeResult.Data;
 
-                var orderByResult = OrderBy(paginationParams.OrderBy, included);
+                var orderByResult = OrderBy(paginationParams.OrderBy, included, options);
                 if (!orderByResult)
                 {
                     return orderByResult.To<LuPaginatedDbo<TDbo>>();
                 }
                 var ordered = orderByResult.Data;
                 
-                var filteredResult = Filter(paginationParams.Filter, ordered);
+                var filteredResult = Filter(paginationParams.Filter, ordered, options);
                 if (!filteredResult)
                 {
                     return filteredResult.To<LuPaginatedDbo<TDbo>>();
@@ -223,7 +242,7 @@ namespace Luticate2.Auth.Utils.DataAccess.Crud
                 var dboList = new List<TDbo>();
                 foreach (var model in paginated)
                 {
-                    var dboResult = ConvertModelToDbo(partialResponse, model);
+                    var dboResult = Convert<TDbo>(partialResponse, model, options);
                     if (!dboResult)
                     {
                         return dboResult.To<LuPaginatedDbo<TDbo>>();

Luticate2.Auth/Utils/Interfaces/ILuCrud.cs

@@ -7,7 +7,7 @@ namespace Luticate2.Auth.Utils.Interfaces
 {
     public interface ILuCrud<TDbo>
     {
-        LuResult<IList<TDbo>> Create(LuPartialFieldsDbo partialResponse, LuPartialFieldsDbo partialInput, IEnumerable<TDbo> dbos);
+        LuResult<IList<TDbo>> Create(LuPartialFieldsDbo partialResponse, LuPartialFieldsDbo partialInput, IEnumerable<object> dbos);
         
         LuResult<LuPaginatedDbo<TDbo>> Read(LuPartialFieldsDbo partialResponse, LuPaginatedParamsDbo paginationParams);