refactor; tests; luorderbydbo; modelbinder

Luticate2.Auth/Controllers/LuticateExtensions.cs

@@ -1,7 +1,9 @@
 using Luticate2.Auth.Business;
 using Luticate2.Auth.DataAccess;
 using Luticate2.Auth.Middlewares;
+using Luticate2.Utils.Dbo.OrderBy;
 using Microsoft.AspNetCore.Builder;
+using Microsoft.AspNetCore.Mvc;
 using Microsoft.Extensions.DependencyInjection;
 
 namespace Luticate2.Auth.Controllers
@@ -25,6 +27,8 @@ namespace Luticate2.Auth.Controllers
         {
 //            builder.AddApplicationPart(typeof(LuController).GetTypeInfo().Assembly)
 //                .AddControllersAsServices();
+            builder.Services.Configure<MvcOptions>(
+                options => options.ModelBinderProviders.Insert(0, new LuOrderByBinderProvider()));
             return builder;
         }
 

Luticate2.Utils/Business/LuCrudBusiness.cs

@@ -5,15 +5,15 @@ using Luticate2.Utils.Interfaces;
 
 namespace Luticate2.Utils.Business
 {
-    public abstract class LuCrudBusiness<TDataAccess, TDboCreate, TDboRead, TDboUpdate> : LuBusiness, ILuCrudInterface<TDboCreate, TDboRead, TDboUpdate>
-        where TDataAccess : ILuCrudInterface<TDboCreate, TDboRead, TDboUpdate>
+    public abstract class LuCrudBusiness<TNextCrud, TDboCreate, TDboRead, TDboUpdate> : LuBusiness, ILuCrudInterface<TDboCreate, TDboRead, TDboUpdate>
+        where TNextCrud : ILuCrudInterface<TDboCreate, TDboRead, TDboUpdate>
         where TDboCreate : class
         where TDboRead : class
         where TDboUpdate : class
     {
-        protected readonly TDataAccess Db;
+        protected readonly TNextCrud Db;
 
-        protected LuCrudBusiness(TDataAccess db)
+        protected LuCrudBusiness(TNextCrud db)
         {
             Db = db;
         }

Luticate2.Utils/Dbo/Filter/LuFilterDbo.cs

@@ -0,0 +1,7 @@
+namespace Luticate2.Utils.Dbo.Filter
+{
+    public class LuFilterDbo
+    {
+
+    }
+}

Luticate2.Utils/Dbo/OrderBy/LuOrderByBinder.cs

@@ -0,0 +1,79 @@
+using System.Collections.Generic;
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Mvc.ModelBinding;
+
+namespace Luticate2.Utils.Dbo.OrderBy
+{
+    public class LuOrderByBinder : IModelBinder
+    {
+        public static LuResult<LuOrderByDbo> FromString(string data)
+        {
+            data = data.Trim();
+            var dbo = new LuOrderByDbo {Fields = new List<LuOrderByFieldDbo>()};
+            if (data != "")
+            {
+                var fields = data.Split(',');
+                foreach (var field in fields)
+                {
+                    if (field == "")
+                    {
+                        return LuResult<LuOrderByDbo>.Error(LuStatus.InputError,
+                            string.Format("LuOrderByBinder: {0}", data), "Empty order by field");
+                    }
+                    var value = new LuOrderByFieldDbo();
+                    var split = field.Split(':');
+                    if (split.Length > 2 || split.Length == 0)
+                    {
+                        return LuResult<LuOrderByDbo>.Error(LuStatus.InputError,
+                            string.Format("LuOrderByBinder: {0}", data), "Invalid field syntax");
+                    }
+                    value.Name = split[0];
+                    var order = split.Length == 2 ? split[1].ToLower() : "asc";
+                    if (order == "asc")
+                    {
+                        value.Asc = true;
+                    }
+                    else if (order == "desc")
+                    {
+                        value.Asc = false;
+                    }
+                    else
+                    {
+                        return LuResult<LuOrderByDbo>.Error(LuStatus.InputError,
+                            string.Format("LuOrderByBinder: {0}", data), "Empty order by field order");
+                    }
+                    dbo.Fields.Add(value);
+                }
+            }
+            return LuResult<LuOrderByDbo>.Ok(dbo);
+        }
+
+        public Task BindModelAsync(ModelBindingContext bindingContext)
+        {
+            var messageTypeResult = bindingContext.ValueProvider.GetValue(bindingContext.ModelName);
+            var data = messageTypeResult.FirstValue;
+            var res = FromString(data);
+            if (res)
+            {
+                bindingContext.Result = ModelBindingResult.Success(res.Data);
+            }
+            else
+            {
+                bindingContext.Result = ModelBindingResult.Failed();
+            }
+            return Task.FromResult(0);
+        }
+    }
+
+    public class LuOrderByBinderProvider : IModelBinderProvider
+    {
+        public IModelBinder GetBinder(ModelBinderProviderContext context)
+        {
+            if (context.Metadata.ModelType == typeof(LuOrderByDbo))
+            {
+                return new LuOrderByBinder();
+            }
+            return null;
+        }
+    }
+}

Luticate2.Utils/Dbo/OrderBy/LuOrderByDbo.cs

@@ -0,0 +1,9 @@
+using System.Collections.Generic;
+
+namespace Luticate2.Utils.Dbo.OrderBy
+{
+    public class LuOrderByDbo
+    {
+        public IList<LuOrderByFieldDbo> Fields { get; set; }
+    }
+}

Luticate2.Utils/Dbo/OrderBy/LuOrderByFieldDbo.cs

@@ -0,0 +1,9 @@
+namespace Luticate2.Utils.Dbo.OrderBy
+{
+    public class LuOrderByFieldDbo
+    {
+        public string Name { get; set; }
+
+        public bool Asc { get; set; }
+    }
+}

Test/Utils/Binders/LuOrderByBinderTest.cs

@@ -0,0 +1,123 @@
+using System.Linq;
+using Luticate2.Utils.Dbo;
+using Luticate2.Utils.Dbo.OrderBy;
+using Xunit;
+
+namespace Test.Utils.Binders
+{
+    public class LuOrderByBinderTest
+    {
+        [Fact]
+        public void Test1()
+        {
+            var res = LuOrderByBinder.FromString("");
+            Assert.NotNull(res);
+            Assert.Equal(LuStatus.Success, res.Status);
+            var dbo = res.Data;
+            Assert.NotNull(dbo);
+            Assert.NotNull(dbo.Fields);
+            Assert.Equal(0, dbo.Fields.Count);
+        }
+
+        [Fact]
+        public void Test2()
+        {
+            var res = LuOrderByBinder.FromString("test");
+            Assert.NotNull(res);
+            Assert.Equal(LuStatus.Success, res.Status);
+            var dbo = res.Data;
+            Assert.NotNull(dbo);
+            Assert.NotNull(dbo.Fields);
+            Assert.Equal(1, dbo.Fields.Count);
+
+            var field = dbo.Fields[0];
+            Assert.NotNull(field);
+            Assert.True(field.Asc);
+            Assert.Equal("test", field.Name);
+        }
+
+        [Fact]
+        public void Test3()
+        {
+            var res = LuOrderByBinder.FromString("test,test2");
+            Assert.NotNull(res);
+            Assert.Equal(LuStatus.Success, res.Status);
+            var dbo = res.Data;
+            Assert.NotNull(dbo);
+            Assert.NotNull(dbo.Fields);
+            Assert.Equal(2, dbo.Fields.Count);
+
+            var field = dbo.Fields[0];
+            Assert.NotNull(field);
+            Assert.True(field.Asc);
+            Assert.Equal("test", field.Name);
+
+            field = dbo.Fields[1];
+            Assert.NotNull(field);
+            Assert.True(field.Asc);
+            Assert.Equal("test2", field.Name);
+        }
+
+        [Fact]
+        public void Test4()
+        {
+            var res = LuOrderByBinder.FromString("test:DESC,test2:ASC");
+            Assert.NotNull(res);
+            Assert.Equal(LuStatus.Success, res.Status);
+            var dbo = res.Data;
+            Assert.NotNull(dbo);
+            Assert.NotNull(dbo.Fields);
+            Assert.Equal(2, dbo.Fields.Count);
+
+            var field = dbo.Fields[0];
+            Assert.NotNull(field);
+            Assert.False(field.Asc);
+            Assert.Equal("test", field.Name);
+
+            field = dbo.Fields[1];
+            Assert.NotNull(field);
+            Assert.True(field.Asc);
+            Assert.Equal("test2", field.Name);
+        }
+
+        [Fact]
+        public void Test5()
+        {
+            var res = LuOrderByBinder.FromString(",test2:ASC");
+            Assert.NotNull(res);
+            Assert.Equal(LuStatus.InputError, res.Status);
+        }
+
+        [Fact]
+        public void Test6()
+        {
+            var res = LuOrderByBinder.FromString("test2:ASC,");
+            Assert.NotNull(res);
+            Assert.Equal(LuStatus.InputError, res.Status);
+        }
+
+        [Fact]
+        public void Test7()
+        {
+            var res = LuOrderByBinder.FromString(",");
+            Assert.NotNull(res);
+            Assert.Equal(LuStatus.InputError, res.Status);
+        }
+
+        [Fact]
+        public void Test8()
+        {
+            var res = LuOrderByBinder.FromString("test:firstOrder");
+            Assert.NotNull(res);
+            Assert.Equal(LuStatus.InputError, res.Status);
+        }
+
+        [Fact]
+        public void Test9()
+        {
+            var res = LuOrderByBinder.FromString("test:42:ASC");
+            Assert.NotNull(res);
+            Assert.Equal(LuStatus.InputError, res.Status);
+        }
+    }
+}

Test/Utils/Tests.cs

@@ -1,18 +1,16 @@
 using System;
-using Castle.Core.Resource;
 using Test.Utils.DataAccess;
 
 namespace Test.Utils
 {
     public class Tests
     {
-        public const string CONNECTION_STRING =
+        public const string ConnectionString =
             "User ID=dev;Password=dev;Host=localhost;Port=5432;Database=luticate2_utils;Pooling=true;";
 
         public static LuUtilsDbContext GetDataBaseContext()
         {
-            return
-                new LuUtilsDbContext(CONNECTION_STRING);
+            return new LuUtilsDbContext(ConnectionString);
         }
 
         public static void TestRealDb(Action<LuUtilsDbContext> func)

WebTest/Controllers/PkGuidController.cs

@@ -1,4 +1,5 @@
 using Luticate2.Utils.Controllers;
+using Luticate2.Utils.Dbo.OrderBy;
 using Microsoft.AspNetCore.Mvc;
 using Test.Utils.Dbo.PkGuid;
 using WebTest.Business;
@@ -20,10 +21,11 @@ namespace WebTest.Controllers
             return Handle(_busines.GetSingleById(id));
         }
 
-//        [Route("[controller]")]
-//        public PkGuidDbo Get()
-//        {
+        [Route("[controller]")]
+        public PkGuidDbo Get(LuOrderByDbo orderBy)
+        {
+            return new PkGuidDbo();
 //            return Handle(_busines.GetMultiple());
-//        }
+        }
     }
 }

WebTest/Startup.cs

@@ -8,7 +8,6 @@ using Microsoft.Extensions.Logging;
 using Test.Utils;
 using Test.Utils.DataAccess;
 using WebTest.Business;
-using WebTest.Controllers;
 
 namespace WebTest
 {
@@ -43,11 +42,10 @@ namespace WebTest
 
             services.AddSingleton<PkGuidBusiness>();
             services.AddSingleton<LuUtilsPkGuidDataAccess>();
-            services.AddDbContext<LuUtilsDbContext>(options => options.UseNpgsql(Tests.CONNECTION_STRING));
+            services.AddDbContext<LuUtilsDbContext>(options => options.UseNpgsql(Tests.ConnectionString));
 
             services.AddMvc()
                 .AddLuticate();
-
         }
 
         // This method gets called by the runtime. Use this method to configure the HTTP request pipeline