From afe288ac88866212863cdad02f35a3e096abc07c Mon Sep 17 00:00:00 2001
From: Ogoun <ogoun@users.noreply.github.com>
Date: Fri, 6 Mar 2020 17:52:04 +0300
Subject: [PATCH] fix settings binding to instance

---
 ZeroLevel.EventServer/EventRepository.cs         | 5 +----
 ZeroLevel.SqLite/{Model => }/SqLiteDupStorage.cs | 3 +--
 ZeroLevel.SqLite/SqLiteUserRepository.cs         | 2 --
 ZeroLevel/Services/Config/BaseConfiguration.cs   | 8 ++++++--
 4 files changed, 8 insertions(+), 10 deletions(-)
 rename ZeroLevel.SqLite/{Model => }/SqLiteDupStorage.cs (99%)

diff --git a/ZeroLevel.EventServer/EventRepository.cs b/ZeroLevel.EventServer/EventRepository.cs
index 5e0c1c6..a69f8f8 100644
--- a/ZeroLevel.EventServer/EventRepository.cs
+++ b/ZeroLevel.EventServer/EventRepository.cs
@@ -1,7 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Data.SQLite;
-using System.Text;
+using System.Data.SQLite;
 using System.Threading;
 using ZeroLevel.SqLite;
 
diff --git a/ZeroLevel.SqLite/Model/SqLiteDupStorage.cs b/ZeroLevel.SqLite/SqLiteDupStorage.cs
similarity index 99%
rename from ZeroLevel.SqLite/Model/SqLiteDupStorage.cs
rename to ZeroLevel.SqLite/SqLiteDupStorage.cs
index fae8287..84d83ea 100644
--- a/ZeroLevel.SqLite/Model/SqLiteDupStorage.cs
+++ b/ZeroLevel.SqLite/SqLiteDupStorage.cs
@@ -1,13 +1,12 @@
 using System;
 using System.Collections.Generic;
 using System.Data.SQLite;
-using System.IO;
 using System.Linq;
 using System.Security.Cryptography;
 using System.Text;
 using System.Threading;
 
-namespace ZeroLevel.SqLite.Model
+namespace ZeroLevel.SqLite
 {
     /// <summary>
     /// Хранит данные указанное число дней, и позволяет выполнить проверку наличия данных, для отбрасывания дубликатов
diff --git a/ZeroLevel.SqLite/SqLiteUserRepository.cs b/ZeroLevel.SqLite/SqLiteUserRepository.cs
index 68fac3d..168a3a4 100644
--- a/ZeroLevel.SqLite/SqLiteUserRepository.cs
+++ b/ZeroLevel.SqLite/SqLiteUserRepository.cs
@@ -1,10 +1,8 @@
 using System;
 using System.Collections.Generic;
 using System.Data.SQLite;
-using System.IO;
 using System.Threading;
 using ZeroLevel.Models;
-using ZeroLevel.Services.FileSystem;
 
 namespace ZeroLevel.SqLite
 {
diff --git a/ZeroLevel/Services/Config/BaseConfiguration.cs b/ZeroLevel/Services/Config/BaseConfiguration.cs
index 990de06..2d37eef 100644
--- a/ZeroLevel/Services/Config/BaseConfiguration.cs
+++ b/ZeroLevel/Services/Config/BaseConfiguration.cs
@@ -524,7 +524,9 @@ namespace ZeroLevel.Services.Config
                             }
                             else
                             {
-                                member.Setter(instance, First(member.Name));
+                                var item = First(member.Name);
+                                var itemType = member.ClrType;
+                                member.Setter(instance, StringToTypeConverter.TryConvert(item, itemType));
                             }
                             break;
                         default:    // array, or first
@@ -569,7 +571,9 @@ namespace ZeroLevel.Services.Config
                             }
                             else
                             {
-                                member.Setter(instance, First(member.Name));
+                                var item = First(member.Name);
+                                var itemType = member.ClrType;
+                                member.Setter(instance, StringToTypeConverter.TryConvert(item, itemType));
                             }
                             break;
                     }