Added extension methods to add luticate services

Luticate2.Auth.ConsoleSample/Program.cs

@@ -2,6 +2,7 @@
 using Luticate2.Auth.Auth.Business;
 using Luticate2.Auth.Auth.DataAccess;
 using Luticate2.Auth.ConsoleSample.Commands;
+using Luticate2.Auth.Utils.Business.Converters;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.Extensions.DependencyInjection;
 using NClap.Metadata;
@@ -24,45 +25,16 @@ namespace Luticate2.Auth.ConsoleSample
     class Program
     {
         public static IServiceProvider ServiceProvider;
-
-//        protected static void AddILuExpressionConverter<TTypeFrom, TTypeTo, TTypeImpl>(IServiceCollection services)
-//            where TTypeImpl : class, ILuExpressionConverter<TTypeFrom, TTypeTo>
-//        {
-//            services.AddSingleton<ILuExpressionConverter<TTypeFrom, TTypeTo>, TTypeImpl>();
-//            services.TryAddSingleton<ILuExpressionConverter<TTypeFrom>, TTypeImpl>();
-//        }
         
         static void Main(string[] args)
         {
             IServiceCollection services = new ServiceCollection();
+
+            services.AddLuObjectConverterDescriptors();
+            services.AddLuObjectConverters();
             
             services.AddScoped<LuGroupsBusiness>();
 
-
-//            services.AddSingleton<ILuDboModelExpressionConverter<TestDbo1, TestModel1>, LuDMECTest1>();
-//            AddILuExpressionConverter<LuGroupDbo, LuGroups, LuDMECGroupsToModel>(services);
-//            AddILuExpressionConverter<string, string, LuExpressionConverterIdentity<string>>(services);
-//            AddILuExpressionConverter<Guid, Guid, LuExpressionConverterIdentity<Guid>>(services);
-//            AddILuExpressionConverter<bool, bool, LuExpressionConverterIdentity<bool>>(services);
-
-
-//            services.AddSingleton<ILuFieldsExpressions<LuObjectsMetadataDbo, LuObjectsMetadata>, LuFieldsExpressionsLuMetadataDboLuMetadata>();
-//            services.AddSingleton<ILuFieldsExpressions<LuGroupDbo, LuGroups>, LuFieldsExpressionsLuGroupDboLuGroups>();
-//
-//            services.AddSingleton<ILuFieldsExpressions<string, string>, LuFieldsExpressionsString>();
-//            services.AddSingleton<ILuFieldsExpressions<int, int>, LuFieldsExpressions<int, int>>();
-//            services.AddSingleton<ILuFieldsExpressions<Guid, Guid>, LuFieldsExpressions<Guid, Guid>>();
-//
-//            services.AddSingleton<ILuFieldsExpressions<DateTime, DateTime>, LuFieldsExpressions<DateTime, DateTime>>();
-//            services.AddSingleton<ILuFieldsExpressions<DateTimeOffset, DateTimeOffset>, LuFieldsExpressions<DateTimeOffset, DateTimeOffset>>();
-//            services.AddSingleton<ILuFieldsExpressions<DateTime, DateTimeOffset>, LuFieldsExpressions<DateTime, DateTimeOffset>>();
-//            services.AddSingleton<ILuFieldsExpressions<DateTimeOffset, DateTime>, LuFieldsExpressions<DateTimeOffset, DateTime>>();
-//
-//            services.AddSingleton<ILuFieldsExpressions<DateTime?, DateTime?>, LuFieldsExpressions<DateTime?, DateTime?>>();
-//            services.AddSingleton<ILuFieldsExpressions<DateTimeOffset?, DateTimeOffset?>, LuFieldsExpressions<DateTimeOffset?, DateTimeOffset?>>();
-//            services.AddSingleton<ILuFieldsExpressions<DateTime?, DateTimeOffset?>, LuFieldsExpressions<DateTime?, DateTimeOffset?>>();
-//            services.AddSingleton<ILuFieldsExpressions<DateTimeOffset?, DateTime?>, LuFieldsExpressions<DateTimeOffset?, DateTime?>>();
-
             services.AddDbContext<Luticate2DbContext>(options =>
             {
                 options.UseNpgsql(@"Host=localhost;Database=luticate2;Username=dev;Password=dev");

Luticate2.Auth.Tests/Business/ExpressionConverter/ExpressionConverterTests.cs

@@ -4,7 +4,6 @@ using System.Linq;
 using System.Linq.Expressions;
 using Luticate2.Auth.Utils.Business.Converters;
 using Luticate2.Auth.Utils.Business.ExpressionConverter;
-using Luticate2.Auth.Utils.Business.ObjectConverterDescriptor;
 using Luticate2.Auth.Utils.Interfaces;
 using Microsoft.Extensions.DependencyInjection;
 using Xunit;
@@ -16,13 +15,8 @@ namespace Luticate2.Auth.Tests.Business.ExpressionConverter
 
         protected IServiceProvider GetServiceProvider()
         {
-            var typeILuObjectConverterDescriptor = typeof(ILuObjectConverterDescriptor<,>);
-            var typeILuObjectConverterDescriptorEnumerable =
-                typeILuObjectConverterDescriptor.MakeGenericType(typeof(Enumerable), typeof(Enumerable));
-
             var services = new ServiceCollection();
-            services.AddSingleton<ILuObjectConverterDescriptorIdentity, LuObjectConverterDescriptorIdentity>();
-            services.AddSingleton(typeILuObjectConverterDescriptorEnumerable, typeof(LuObjectConverterDescriptorEnumerable));
+            services.AddLuObjectConverterDescriptors();
             services.AddSingleton<ILuObjectConverterDescriptor<TestDbo1, TestModel1>, LuOcdTest1>();
             services.AddSingleton<ILuObjectConverterDescriptor<TestDbo2, TestModel2>, LuOcdTest2>();
 

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

@@ -1,12 +1,9 @@
 using System;
 using System.Collections.Generic;
-using System.Collections.ObjectModel;
 using System.Linq;
 using System.Linq.Expressions;
 using Luticate2.Auth.Utils.Business.Converters;
 using Luticate2.Auth.Utils.Business.Fields;
-using Luticate2.Auth.Utils.Business.ObjectConverter;
-using Luticate2.Auth.Utils.Business.ObjectConverterDescriptor;
 using Luticate2.Auth.Utils.Dbo;
 using Luticate2.Auth.Utils.Dbo.Fields;
 using Luticate2.Auth.Utils.Dbo.Result;
@@ -20,44 +17,14 @@ namespace Luticate2.Auth.Tests.Business.ObjectConverter
     {
         protected IServiceProvider GetServiceProvider()
         {
-            var typeILuObjectConverterDescriptor = typeof(ILuObjectConverterDescriptor<,>);
-            var typeILuObjectConverterDescriptorEnumerable =
-                typeILuObjectConverterDescriptor.MakeGenericType(typeof(Enumerable), typeof(Enumerable));
-
-            var typeILuObjectConverter = typeof(ILuObjectConverter<,>);
-            var listTypes = new []
-            {
-                typeof(IEnumerable<>),
-                typeof(ICollection<>),
-                typeof(Collection<>),
-                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)}
-            };
-
             var services = new ServiceCollection();
-            services.AddSingleton<ILuObjectConverterDescriptorIdentity, LuObjectConverterDescriptorIdentity>();
-            services.AddSingleton(typeILuObjectConverterDescriptorEnumerable, typeof(LuObjectConverterDescriptorEnumerable));
+            services.AddLuObjectConverterDescriptors();
             services.AddSingleton<ILuObjectConverterDescriptor<TestDbo1, TestModel1>, LuOcdTest1>();
             services.AddSingleton<ILuObjectConverterDescriptor<TestDbo2, TestModel2>, LuOcdTest2>();
 
-            services.AddSingleton<ILuObjectConverterIdentity, LuObjectConverterIdentity>();
-            foreach (var typeFrom in listTypes)
-            {
-                foreach (var typeTo in listTypes)
-                {
-                    services.AddSingleton(typeILuObjectConverter.MakeGenericType(typeFrom, typeTo), listImplemType[typeTo]);
-                }
-            }
-            services.AddSingleton<ILuObjectConverter<TestModel1, TestDbo1>, LuObjectConverterPoco<TestModel1, TestDbo1>>();
-            services.AddSingleton<ILuObjectConverter<TestModel2, TestDbo2>, LuObjectConverterPoco<TestModel2, TestDbo2>>();
+            services.AddLuObjectConverters();
+            services.AddLuObjectConverterPoco<TestModel1, TestDbo1>();
+            services.AddLuObjectConverterPoco<TestModel2, TestDbo2>();
 
             var serviceProvider = services.BuildServiceProvider();
             return serviceProvider;

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

@@ -39,6 +39,8 @@ namespace Luticate2.Auth.Tests.Business.ObjectConverter
         public TestDbo2 Parent { get; set; }
 
         public TestDbo1 Unused { get; set; }
+
+        public int? OptionalInt { get; set; }
     }
 
     public class TestModel1
@@ -61,6 +63,8 @@ namespace Luticate2.Auth.Tests.Business.ObjectConverter
         public TestModel1 test_model1 { get; set; }
 
         public TestModel2 parent { get; set; }
+
+        public int? optional_int { get; set; }
     }
 
     public class LuOcdTest1 : LuObjectConverterDescriptor<TestDbo1, TestModel1>
@@ -86,6 +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);
             AddNullMemberConverter<TestDbo1>(x => x.Unused);
         }
     }

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

@@ -0,0 +1,59 @@
+using System;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Linq;
+using Luticate2.Auth.Utils.Business.ObjectConverter;
+using Luticate2.Auth.Utils.Business.ObjectConverterDescriptor;
+using Luticate2.Auth.Utils.Interfaces;
+using Microsoft.Extensions.DependencyInjection;
+
+namespace Luticate2.Auth.Utils.Business.Converters
+{
+    public static class LuConvertersExtensions
+    {
+        public static void AddLuObjectConverterDescriptors(this IServiceCollection services)
+        {
+            var typeILuObjectConverterDescriptor = typeof(ILuObjectConverterDescriptor<,>);
+            var typeILuObjectConverterDescriptorEnumerable =
+                typeILuObjectConverterDescriptor.MakeGenericType(typeof(Enumerable), typeof(Enumerable));
+
+            services.AddSingleton<ILuObjectConverterDescriptorIdentity, LuObjectConverterDescriptorIdentity>();
+            services.AddSingleton(typeILuObjectConverterDescriptorEnumerable, typeof(LuObjectConverterDescriptorEnumerable));
+        }
+
+        public static void AddLuObjectConverters(this IServiceCollection services)
+        {
+            var typeILuObjectConverter = typeof(ILuObjectConverter<,>);
+            var listTypes = new []
+            {
+                typeof(IEnumerable<>),
+                typeof(ICollection<>),
+                typeof(Collection<>),
+                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.AddSingleton<ILuObjectConverterIdentity, LuObjectConverterIdentity>();
+            foreach (var typeFrom in listTypes)
+            {
+                foreach (var typeTo in listTypes)
+                {
+                    services.AddSingleton(typeILuObjectConverter.MakeGenericType(typeFrom, typeTo), listImplemType[typeTo]);
+                }
+            }
+        }
+
+        public static void AddLuObjectConverterPoco<TTypeFrom, TTypeTo>(this IServiceCollection services)
+        {
+            services.AddSingleton<ILuObjectConverter<TTypeFrom, TTypeTo>, LuObjectConverterPoco<TTypeFrom, TTypeTo>>();
+        }
+    }
+}

Luticate2.Auth/Utils/Business/ExpressionConverter/LuExpressionConverterVisitor.cs

@@ -2,7 +2,6 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Linq.Expressions;
-using Luticate2.Auth.Utils.Business.Converters;
 using Luticate2.Auth.Utils.Dbo;
 using Luticate2.Auth.Utils.Dbo.Result;
 using Luticate2.Auth.Utils.Exceptions;

Luticate2.Auth/Utils/Business/ExpressionConverter/LuExpressionParamReplaceVisitor.cs

@@ -1,6 +1,5 @@
 using System.Collections.Generic;
 using System.Linq.Expressions;
-using Luticate2.Auth.Utils.Business.Converters;
 using Luticate2.Auth.Utils.Dbo;
 using Luticate2.Auth.Utils.Dbo.Result;
 using Luticate2.Auth.Utils.Exceptions;