Added dstObject in ILuObjectConverter

Luticate2.Auth.Tests/Business/ObjectConverter/ObjectConverterTests.cs

@@ -30,7 +30,7 @@ namespace Luticate2.Auth.Tests.Business.ObjectConverter
             return serviceProvider;
         }
 
-        protected ILuObjectConverterOptions GetConverterOptions()
+        protected ILuObjectConverterOptions GetConverterOptions(IServiceProvider serviceProvider)
         {
             var options = new LuConvertersOptions
             {
@@ -42,7 +42,7 @@ namespace Luticate2.Auth.Tests.Business.ObjectConverter
                     {typeof(TestModel1), typeof(TestDbo1)},
                     {typeof(TestModel2), typeof(TestDbo2)}
                 }),
-                Allocator = new LuConvertersAllocator()
+                Allocator = serviceProvider.GetService<ILuConvertersAllocator>()
             };
             return options;
         }
@@ -61,7 +61,8 @@ namespace Luticate2.Auth.Tests.Business.ObjectConverter
                         name = "bla",
                         parent = null,
                         test_model1 = null,
-                        test_model1_id = Guid.Empty
+                        test_model1_id = Guid.Empty,
+                        optional_int = 42
                     }
                 }
             };
@@ -73,7 +74,7 @@ namespace Luticate2.Auth.Tests.Business.ObjectConverter
             var serviceProvider = GetServiceProvider();
             var converter = serviceProvider.GetService<ILuObjectConverter<TestModel1, TestDbo1>>();
             var model = GetBasicModel();
-            var result = converter.Convert(model, new LuFieldDbo(), LuPartialFieldsParser.Parse("*").Data, GetConverterOptions());
+            var result = converter.Convert(model, new TestDbo1(), new LuFieldDbo(), LuPartialFieldsParser.Parse("*").Data, GetConverterOptions(serviceProvider));
             Assert.Equal(LuStatus.Success.ToInt(), result.Status);
             var dbo = result.Data as TestDbo1;
             Assert.NotNull(dbo);
@@ -86,6 +87,7 @@ namespace Luticate2.Auth.Tests.Business.ObjectConverter
                 Assert.Equal(e.Model.id, e.Dbo.Id);
                 Assert.Equal(e.Model.name, e.Dbo.Name);
                 Assert.Equal(e.Model.name + " " + e.Model.name, e.Dbo.NameVirtual);
+                Assert.Equal(e.Model.optional_int, e.Dbo.NotOptionalInt);
                 Assert.Null(e.Dbo.Parent);
                 Assert.Null(e.Dbo.TestDbo1);
             }
@@ -97,7 +99,7 @@ namespace Luticate2.Auth.Tests.Business.ObjectConverter
             var serviceProvider = GetServiceProvider();
             var converter = serviceProvider.GetService<ILuObjectConverter<TestModel1, TestDbo1>>();
             var model = GetBasicModel();
-            var result = converter.Convert(model, new LuFieldDbo(), LuPartialFieldsParser.Parse("Id").Data, GetConverterOptions());
+            var result = converter.Convert(model, new TestDbo1(), new LuFieldDbo(), LuPartialFieldsParser.Parse("Id").Data, GetConverterOptions(serviceProvider));
             Assert.Equal(LuStatus.Success.ToInt(), result.Status);
             var dbo = result.Data as TestDbo1;
             Assert.NotNull(dbo);
@@ -112,7 +114,7 @@ namespace Luticate2.Auth.Tests.Business.ObjectConverter
             var serviceProvider = GetServiceProvider();
             var converter = serviceProvider.GetService<ILuObjectConverter<TestModel1, TestDbo1>>();
             var model = GetBasicModel();
-            var result = converter.Convert(model, new LuFieldDbo(), LuPartialFieldsParser.Parse("id").Data, GetConverterOptions());
+            var result = converter.Convert(model, new TestDbo1(), new LuFieldDbo(), LuPartialFieldsParser.Parse("id").Data, GetConverterOptions(serviceProvider));
             Assert.Equal(LuStatus.Success.ToInt(), result.Status);
             var dbo = result.Data as TestDbo1;
             Assert.NotNull(dbo);
@@ -127,7 +129,7 @@ namespace Luticate2.Auth.Tests.Business.ObjectConverter
             var serviceProvider = GetServiceProvider();
             var converter = serviceProvider.GetService<ILuObjectConverter<TestModel1, TestDbo1>>();
             var model = GetBasicModel();
-            var result = converter.Convert(model, new LuFieldDbo(), LuPartialFieldsParser.Parse("Id, TestDbo2s(Id, Name)").Data, GetConverterOptions());
+            var result = converter.Convert(model, new TestDbo1(), new LuFieldDbo(), LuPartialFieldsParser.Parse("Id, TestDbo2s(Id, Name)").Data, GetConverterOptions(serviceProvider));
             Assert.Equal(LuStatus.Success.ToInt(), result.Status);
             var dbo = result.Data as TestDbo1;
             Assert.NotNull(dbo);

Luticate2.Auth.Tests/Business/ObjectConverter/Objects.cs

@@ -40,7 +40,7 @@ namespace Luticate2.Auth.Tests.Business.ObjectConverter
 
         public TestDbo1 Unused { get; set; }
 
-        public int? OptionalInt { get; set; }
+        public int NotOptionalInt { get; set; }
     }
 
     public class TestModel1
@@ -90,7 +90,7 @@ namespace Luticate2.Auth.Tests.Business.ObjectConverter
             AddStaticMemberConverter(x => x.NameVirtual, y => y.name + " " + y.name);
             AddStaticMemberConverter(x => x.TestDbo1, y => y.test_model1);
             AddStaticMemberConverter(x => x.Parent, y => y.parent);
-            AddStaticMemberConverter(x => x.OptionalInt, y => y.optional_int);
+            AddStaticMemberConverter(x => x.NotOptionalInt, y => y.optional_int ?? -1);
             AddNullMemberConverter<TestDbo1>(x => x.Unused);
         }
     }

Luticate2.Auth/Utils/Business/Converters/LuConvertersAllocator.cs

@@ -16,7 +16,7 @@ namespace Luticate2.Auth.Utils.Business.Converters
             {typeof(List<>), typeof(List<>)}
         };
 
-        public object GetInstance(Type type)
+        public virtual object GetInstance(Type type)
         {
             if (type.IsGenericType)
             {
@@ -28,6 +28,12 @@ namespace Luticate2.Auth.Utils.Business.Converters
                     return Activator.CreateInstance(glistType);
                 }
             }
+
+            if (type == typeof(string) || type.IsPrimitive)
+            {
+                return null;
+            }
+
             return Activator.CreateInstance(type);
         }
     }

Luticate2.Auth/Utils/Business/Converters/LuConvertersExtensions.cs

@@ -1,4 +1,3 @@
-using System;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Linq;
@@ -6,6 +5,7 @@ using Luticate2.Auth.Utils.Business.ObjectConverter;
 using Luticate2.Auth.Utils.Business.ObjectConverterDescriptor;
 using Luticate2.Auth.Utils.Interfaces;
 using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.DependencyInjection.Extensions;
 
 namespace Luticate2.Auth.Utils.Business.Converters
 {
@@ -32,21 +32,14 @@ namespace Luticate2.Auth.Utils.Business.Converters
                 typeof(IList<>),
                 typeof(List<>)
             };
-            var listImplemType = new Dictionary<Type, Type>
-            {
-                {typeof(IEnumerable<>), typeof(LuObjectConverterList)},
-                {typeof(ICollection<>), typeof(LuObjectConverterCollection)},
-                {typeof(Collection<>), typeof(LuObjectConverterCollection)},
-                {typeof(IList<>), typeof(LuObjectConverterList)},
-                {typeof(List<>), typeof(LuObjectConverterList)}
-            };
 
+            services.TryAddSingleton<ILuConvertersAllocator, LuConvertersAllocator>();
             services.AddSingleton<ILuObjectConverterIdentity, LuObjectConverterIdentity>();
             foreach (var typeFrom in listTypes)
             {
                 foreach (var typeTo in listTypes)
                 {
-                    services.AddSingleton(typeILuObjectConverter.MakeGenericType(typeFrom, typeTo), listImplemType[typeTo]);
+                    services.AddSingleton(typeILuObjectConverter.MakeGenericType(typeFrom, typeTo), typeof(LuObjectConverterLists));
                 }
             }
         }

Luticate2.Auth/Utils/Business/Crud/LuEfCrudBusiness.cs

@@ -20,15 +20,20 @@ namespace Luticate2.Auth.Utils.Business.Crud
         where TDbo : class, new()
     {
         protected IServiceProvider ServiceProvider { get; }
+        protected ILuConvertersAllocator ConvertersAllocator { get; }
 
         public LuEfCrudBusiness(IServiceProvider serviceProvider)
         {
             ServiceProvider = serviceProvider;
+            ConvertersAllocator = ServiceProvider.GetRequiredService<ILuConvertersAllocator>();
         }
 
         protected virtual ILuObjectConverterOptions GetOptions()
         {
-            return new LuConvertersOptions();// TODO
+            return new LuConvertersOptions
+            {
+                Allocator = ConvertersAllocator
+            };// TODO
         }
 
         protected virtual LuResult<TModel> ConvertDboToModel(LuPartialFieldsDbo partialInput, TDbo dbo)
@@ -39,7 +44,10 @@ namespace Luticate2.Auth.Utils.Business.Crud
                 return LuResult<TModel>.Error(LuStatus.InternalError.ToInt(),
                     $"Could not get service: {nameof(ILuObjectConverter)}<{typeof(TDbo).Name}, {typeof(TModel).Name}>");
             }
-            var result = copier.Convert(dbo, new LuFieldDbo(), partialInput, GetOptions());
+
+            var options = GetOptions();
+            var dstObj = options.Allocator.GetInstance(typeof(TModel));
+            var result = copier.Convert(dbo, dstObj, new LuFieldDbo(), partialInput, GetOptions());
             return result.Select(o => o as TModel);
         }
 
@@ -51,7 +59,10 @@ namespace Luticate2.Auth.Utils.Business.Crud
                 return LuResult<TDbo>.Error(LuStatus.InternalError.ToInt(),
                     $"Could not get service: {nameof(ILuObjectConverter)}<{typeof(TModel).Name}, {typeof(TDbo).Name}>");
             }
-            var result = copier.Convert(model, new LuFieldDbo(), partialResponse, GetOptions());
+
+            var options = GetOptions();
+            var dstObj = options.Allocator.GetInstance(typeof(TDbo));
+            var result = copier.Convert(model, dstObj, new LuFieldDbo(), partialResponse, GetOptions());
             return result.Select(o => o as TDbo);
         }
 
@@ -89,7 +100,7 @@ namespace Luticate2.Auth.Utils.Business.Crud
             {
                 Parameters = new Dictionary<ParameterExpression, Expression>(), // TODO
                 TypeConverter = null, // TODO
-                Allocator = null // TODO
+                Allocator = ConvertersAllocator
             };
             var converter = new LuExpressionConverterVisitor(options, ServiceProvider);
             var lamdbaModel = converter.Visit(lamdbaDbo) as Expression<Func<TModel, bool>>;// TODO Handle errors

Luticate2.Auth/Utils/Business/ObjectConverter/LuObjectConverterIdentity.cs

@@ -6,9 +6,9 @@ namespace Luticate2.Auth.Utils.Business.ObjectConverter
 {
     public class LuObjectConverterIdentity : ILuObjectConverterIdentity
     {
-        public LuResult<object> Convert(object srcObj, LuFieldDbo path, LuPartialFieldsDbo fields, ILuObjectConverterOptions options)
+        public LuResult<object> Convert(object srcObj, object dstObj, LuFieldDbo path, LuPartialFieldsDbo fields, ILuObjectConverterOptions options)
         {
-            // TODO Handle path
+            // TODO Handle path and dstObj
             return LuResult<object>.Ok(srcObj);
         }
     }

Luticate2.Auth/Utils/Business/ObjectConverter/LuObjectConverterLists.cs

@@ -1,7 +1,6 @@
 using System;
 using System.Collections;
 using System.Collections.Generic;
-using System.Collections.ObjectModel;
 using Luticate2.Auth.Utils.Dbo;
 using Luticate2.Auth.Utils.Dbo.Fields;
 using Luticate2.Auth.Utils.Dbo.Result;
@@ -9,7 +8,7 @@ using Luticate2.Auth.Utils.Interfaces;
 
 namespace Luticate2.Auth.Utils.Business.ObjectConverter
 {
-    public abstract class LuObjectConverterLists : ILuObjectConverter
+    public class LuObjectConverterLists : ILuObjectConverter
     {
         protected IServiceProvider ServiceProvider { get; }
 
@@ -18,26 +17,21 @@ namespace Luticate2.Auth.Utils.Business.ObjectConverter
             ServiceProvider = serviceProvider;
         }
 
-        protected abstract Type GetListType();
-
-        public LuResult<object> Convert(object srcObj, LuFieldDbo path, LuPartialFieldsDbo fields, ILuObjectConverterOptions options)
+        public LuResult<object> Convert(object srcObj, object dstObj, LuFieldDbo path, LuPartialFieldsDbo fields, ILuObjectConverterOptions options)
         {
             if (srcObj is IEnumerable enumerable)
             {
-                var listType = GetListType();
-                var listTypeTo = options.TypeConverter.ConvertType(srcObj.GetType().GetGenericArguments()[0]);
-                var glistType = listType.MakeGenericType(listTypeTo);
-                var collection = options.Allocator.GetInstance(glistType);
-                foreach (var obj in enumerable)
+                foreach (var subSrcObj in enumerable)
                 {
                     object convertedObj = null;
-                    if (obj != null)
+                    if (subSrcObj != null)
                     {
-                        var typeFrom = obj.GetType();
+                        var typeFrom = subSrcObj.GetType();
                         var typeTo = options.TypeConverter.ConvertType(typeFrom);
                         // TODO Handle converter == null
                         var converter = LuObjectConverterUtils.GetObjectConverter(ServiceProvider, typeFrom, typeTo);
-                        var convertResult = converter.Convert(obj, path, fields, options);
+                        var subDstObj = options.Allocator.GetInstance(typeTo);
+                        var convertResult = converter.Convert(subSrcObj, subDstObj, path, fields, options);
                         if (!convertResult)
                         {
                             return convertResult;
@@ -46,11 +40,11 @@ namespace Luticate2.Auth.Utils.Business.ObjectConverter
                         convertedObj = convertResult.Data;
                     }
 
-                    var methodInfo = collection.GetType().GetMethod(nameof(ICollection<object>.Add));
-                    methodInfo.Invoke(collection, new []{convertedObj});
+                    var methodInfo = dstObj.GetType().GetMethod(nameof(ICollection<object>.Add));
+                    methodInfo.Invoke(dstObj, new []{convertedObj});
                 }
 
-                return LuResult<object>.Ok(collection);
+                return LuResult<object>.Ok(dstObj);
             }
             else
             {
@@ -58,28 +52,4 @@ namespace Luticate2.Auth.Utils.Business.ObjectConverter
             }
         }
     }
-
-    public class LuObjectConverterList : LuObjectConverterLists
-    {
-        public LuObjectConverterList(IServiceProvider serviceProvider) : base(serviceProvider)
-        {
-        }
-
-        protected override Type GetListType()
-        {
-            return typeof(List<>);
-        }
-    }
-
-    public class LuObjectConverterCollection : LuObjectConverterLists
-    {
-        public LuObjectConverterCollection(IServiceProvider serviceProvider) : base(serviceProvider)
-        {
-        }
-
-        protected override Type GetListType()
-        {
-            return typeof(Collection<>);
-        }
-    }
 }

Luticate2.Auth/Utils/Business/ObjectConverter/LuObjectConverterPoco.cs

@@ -17,7 +17,7 @@ namespace Luticate2.Auth.Utils.Business.ObjectConverter
             ServiceProvider = serviceProvider;
         }
 
-        public LuResult<object> Convert(object srcObj, LuFieldDbo path, LuPartialFieldsDbo fields, ILuObjectConverterOptions options)
+        public LuResult<object> Convert(object srcObj, object dstObj, LuFieldDbo path, LuPartialFieldsDbo fields, ILuObjectConverterOptions options)
         {
             if (srcObj == null)
             {
@@ -26,26 +26,26 @@ namespace Luticate2.Auth.Utils.Business.ObjectConverter
             // TODO Handle descriptor == null
             var descriptor = ServiceProvider.GetService<ILuObjectConverterDescriptor<TTypeTo, TTypeFrom>>();
             var typeTo = typeof(TTypeTo);
-            var dstObj = options.Allocator.GetInstance(typeTo);
+//            var dstObj = options.Allocator.GetInstance(typeTo);
 
             foreach (var memberInfo in typeTo.GetProperties())
             {
-                // TODO check if field is included in fields
                 var memberPath = LuFieldDbo.Make(path).Add(memberInfo.Name);
                 if (!fields.Fields.IsIncluded(memberPath))
                 {
                     continue;
                 }
                 // TODO Handle srcPropExpression == null
-                var srcPropExpression = descriptor.GetMemberValueExpression(memberInfo, options.DescriptorOptions);
-                var srcPropDelegate = srcPropExpression.Compile();
-                var srcProp = srcPropDelegate.DynamicInvoke(srcObj);
-                var srcType = srcProp != null ? srcProp.GetType() : srcPropExpression.ReturnType;
-                var dstType = memberInfo.GetUnderlyingType();
+                var subSrcPropExpression = descriptor.GetMemberValueExpression(memberInfo, options.DescriptorOptions);
+                var subSrcPropDelegate = subSrcPropExpression.Compile();
+                var subSrcProp = subSrcPropDelegate.DynamicInvoke(srcObj);
+                var subSrcType = subSrcProp != null ? subSrcProp.GetType() : subSrcPropExpression.ReturnType;
+                var subDstType = memberInfo.GetUnderlyingType();
 
                 // TODO Handle objectConverter == null
-                var objectConverter = LuObjectConverterUtils.GetObjectConverter(ServiceProvider, srcType, dstType);
-                var dstPropResult = objectConverter.Convert(srcProp, memberPath, fields, options);
+                var objectConverter = LuObjectConverterUtils.GetObjectConverter(ServiceProvider, subSrcType, subDstType);
+                var subDstObj = options.Allocator.GetInstance(subDstType);
+                var dstPropResult = objectConverter.Convert(subSrcProp, subDstObj, memberPath, fields, options);
                 if (!dstPropResult)
                 {
                     return dstPropResult;

Luticate2.Auth/Utils/Interfaces/ILuObjectConverter.cs

@@ -14,8 +14,7 @@ namespace Luticate2.Auth.Utils.Interfaces
 
     public interface ILuObjectConverter
     {
-        // TODO add dstObject
-        LuResult<object> Convert(object srcObj, LuFieldDbo path, LuPartialFieldsDbo fields, ILuObjectConverterOptions options);
+        LuResult<object> Convert(object srcObj, object dstObj, LuFieldDbo path, LuPartialFieldsDbo fields, ILuObjectConverterOptions options);
     }
 
     public interface ILuObjectConverter<TTypeFrom, TTypeTo> : ILuObjectConverter