.gitignore

@@ -398,4 +398,3 @@ FodyWeavers.xsd
 # JetBrains Rider
 *.sln.iml
 
-*.dll

BlacksmithWorkshop/BlacksmithWorkshop/BlacksmithWorkshopView.csproj

@@ -27,7 +27,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="7.0.5">
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="7.0.4">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>

BlacksmithWorkshop/BlacksmithWorkshop/DataGridViewExtension.cs

@@ -1,45 +0,0 @@
-using BlacksmithWorkshopContracts.Attributes;
-
-namespace BlacksmithWorkshopView
-{
-	internal static class DataGridViewExtension
-	{
-		public static void FillandConfigGrid<T>(this DataGridView grid, List<T>? data)
-		{
-			if (data == null)
-			{
-				return;
-			}
-			grid.DataSource = data;
-			var type = typeof(T);
-			var properties = type.GetProperties();
-			foreach (DataGridViewColumn column in grid.Columns)
-			{
-				var property = properties.FirstOrDefault(x => x.Name == column.Name);
-				if (property == null)
-				{
-					throw new InvalidOperationException($"В типе {type.Name} не найдено свойство с именем { column.Name }");
-			    }
-				var attribute = property.GetCustomAttributes(typeof(ColumnAttribute), true)?.SingleOrDefault();
-				if (attribute == null)
-				{
-					throw new InvalidOperationException($"Не найден атрибут типа ColumnAttribute для свойства { property.Name }");
-			    }
-				// ищем нужный нам атрибут
-				if (attribute is ColumnAttribute columnAttr)
-				{
-					column.HeaderText = columnAttr.Title;
-					column.Visible = columnAttr.Visible;
-					if (columnAttr.IsUseAutoSize)
-					{
-						column.AutoSizeMode = (DataGridViewAutoSizeColumnMode)Enum.Parse(typeof(DataGridViewAutoSizeColumnMode), columnAttr.GridViewAutoSize.ToString());
-					}
-					else
-					{
-						column.Width = columnAttr.Width;
-					}
-				}
-			}
-		}
-	}
-}

BlacksmithWorkshop/BlacksmithWorkshop/FormClients.cs

@@ -22,7 +22,13 @@ namespace BlacksmithWorkshopView
         {
             try
             {
-                dataGridView.FillandConfigGrid(_logic.ReadList(null));
+                var list = _logic.ReadList(null);
+                if (list != null)
+                {
+                    dataGridView.DataSource = list;
+                    dataGridView.Columns["Id"].Visible = false;
+                    dataGridView.Columns["ClientFIO"].AutoSizeMode = DataGridViewAutoSizeColumnMode.Fill;
+                }
                 _logger.LogInformation("Загрузка клиентов");
             }
             catch (Exception ex)

BlacksmithWorkshop/BlacksmithWorkshop/FormComponents.cs

@@ -1,6 +1,5 @@
 using BlacksmithWorkshopContracts.BindingModels;
 using BlacksmithWorkshopContracts.BusinessLogicContracts;
-using BlacksmithWorkshopContracts.DI;
 using Microsoft.Extensions.Logging;
 
 namespace BlacksmithWorkshopView
@@ -40,21 +39,27 @@ namespace BlacksmithWorkshopView
         }
         private void ButtonAdd_Click(object sender, EventArgs e)
         {
-            var form = DependencyManager.Instance.Resolve<FormComponent>();
-            if (form.ShowDialog() == DialogResult.OK)
+            var service = Program.ServiceProvider?.GetService(typeof(FormComponent));
+            if (service is FormComponent form)
             {
-                LoadData();
+                if (form.ShowDialog() == DialogResult.OK)
+                {
+                    LoadData();
+                }
             }
         }
         private void ButtonUpd_Click(object sender, EventArgs e)
         {
             if (dataGridView.SelectedRows.Count == 1)
             {
-				var form = DependencyManager.Instance.Resolve<FormComponent>();
-                form.Id = Convert.ToInt32(dataGridView.SelectedRows[0].Cells["Id"].Value);
-                if (form.ShowDialog() == DialogResult.OK)
+                var service = Program.ServiceProvider?.GetService(typeof(FormComponent));
+                if (service is FormComponent form)
                 {
-                    LoadData();
+                    form.Id = Convert.ToInt32(dataGridView.SelectedRows[0].Cells["Id"].Value);
+                    if (form.ShowDialog() == DialogResult.OK)
+                    {
+                        LoadData();
+                    }
                 }
             }
         }

BlacksmithWorkshop/BlacksmithWorkshop/FormImplementers.cs

@@ -1,6 +1,5 @@
 using BlacksmithWorkshopContracts.BindingModels;
 using BlacksmithWorkshopContracts.BusinessLogicsContracts;
-using BlacksmithWorkshopContracts.DI;
 using Microsoft.Extensions.Logging;
 
 namespace BlacksmithWorkshopView
@@ -40,21 +39,27 @@ namespace BlacksmithWorkshopView
 		}
 		private void ButtonAdd_Click(object sender, EventArgs e)
 		{
-			var form = DependencyManager.Instance.Resolve<FormImplementer>();
-			if (form.ShowDialog() == DialogResult.OK)
+			var service = Program.ServiceProvider?.GetService(typeof(FormImplementer));
+			if (service is FormImplementer form)
 			{
-				LoadData();
+				if (form.ShowDialog() == DialogResult.OK)
+				{
+					LoadData();
+				}
 			}
 		}
 		private void ButtonUpd_Click(object sender, EventArgs e)
 		{
 			if (dataGridView.SelectedRows.Count == 1)
 			{
-				var form = DependencyManager.Instance.Resolve<FormImplementer>();
-				form.Id = Convert.ToInt32(dataGridView.SelectedRows[0].Cells["Id"].Value);
-				if (form.ShowDialog() == DialogResult.OK)
+				var service = Program.ServiceProvider?.GetService(typeof(FormImplementer));
+				if (service is FormImplementer form)
 				{
-					LoadData();
+					form.Id = Convert.ToInt32(dataGridView.SelectedRows[0].Cells["Id"].Value);
+					if (form.ShowDialog() == DialogResult.OK)
+					{
+						LoadData();
+					}
 				}
 			}
 		}

BlacksmithWorkshop/BlacksmithWorkshop/FormMain.cs

@@ -1,7 +1,6 @@
 using BlacksmithWorkshopContracts.BindingModels;
 using BlacksmithWorkshopContracts.BusinessLogicContracts;
 using BlacksmithWorkshopContracts.BusinessLogicsContracts;
-using BlacksmithWorkshopContracts.DI;
 using Microsoft.Extensions.Logging;
 
 namespace BlacksmithWorkshopView
@@ -50,19 +49,28 @@ namespace BlacksmithWorkshopView
         }
         private void ComponentsToolStripMenuItem_Click(object sender, EventArgs e)
         {
-			var form = DependencyManager.Instance.Resolve<FormComponents>();
-            form.ShowDialog();
+            var service = Program.ServiceProvider?.GetService(typeof(FormComponents));
+            if (service is FormComponents form)
+            {
+                form.ShowDialog();
+            }
         }
         private void ManufacturesToolStripMenuItem_Click(object sender, EventArgs e)
         {
-			var form = DependencyManager.Instance.Resolve<FormManufactures>();
-            form.ShowDialog();
+            var service = Program.ServiceProvider?.GetService(typeof(FormManufactures));
+            if (service is FormManufactures form)
+            {
+                form.ShowDialog();
+            }
         }
         private void ButtonCreateOrder_Click(object sender, EventArgs e)
         {
-			var form = DependencyManager.Instance.Resolve<FormCreateOrder>();
-            form.ShowDialog();
-            LoadData();
+            var service = Program.ServiceProvider?.GetService(typeof(FormCreateOrder));
+            if (service is FormCreateOrder form)
+            {
+                form.ShowDialog();
+                LoadData();
+            }
         }
         private void ButtonTakeOrderInWork_Click(object sender, EventArgs e)
         {
@@ -158,27 +166,39 @@ namespace BlacksmithWorkshopView
         }
         private void ReportManufactureComponentsToolStripMenuItem_Click(object sender, EventArgs e)
         {
-			var form = DependencyManager.Instance.Resolve<FormReportManufactureComponents>();
-            form.ShowDialog();
-            LoadData();
+            var service = Program.ServiceProvider?.GetService(typeof(FormReportManufactureComponents));
+            if (service is FormReportManufactureComponents form)
+            {
+                form.ShowDialog();
+                LoadData();
+            }
         }
         private void ReportOrdersToolStripMenuItem_Click(object sender, EventArgs e)
         {
-			var form = DependencyManager.Instance.Resolve<FormReportOrders>();
-            form.ShowDialog();
-            LoadData();
+            var service = Program.ServiceProvider?.GetService(typeof(FormReportOrders));
+            if (service is FormReportOrders form)
+            {
+                form.ShowDialog();
+                LoadData();
+            }
         }
         private void ClientsToolStripMenuItem_Click(object sender, EventArgs e)
         {
-			var form = DependencyManager.Instance.Resolve<FormClients>();
-            form.ShowDialog();
-            LoadData();
+            var service = Program.ServiceProvider?.GetService(typeof(FormClients));
+            if (service is FormClients form)
+            {
+                form.ShowDialog();
+                LoadData();
+            }
         }
 		private void ImplementersToolStripMenuItem_Click(object sender, EventArgs e)
 		{
-			var form = DependencyManager.Instance.Resolve<FormImplementers>();
-            form.ShowDialog();
-            LoadData();
+            var service = Program.ServiceProvider?.GetService(typeof(FormImplementers));
+            if (service is FormImplementers form)
+            {
+                form.ShowDialog();
+                LoadData();
+            }
 		}
 		private void DoWorkToolStripMenuItem_Click(object sender, EventArgs e)
 		{
@@ -187,9 +207,12 @@ namespace BlacksmithWorkshopView
 
 		private void MailsToolStripMenuItem_Click(object sender, EventArgs e)
 		{
-			var form = DependencyManager.Instance.Resolve<FormMails>();
-			form.ShowDialog();
-			LoadData();
+			var service = Program.ServiceProvider?.GetService(typeof(FormMails));
+			if (service is FormMails form)
+			{
+				form.ShowDialog();
+				LoadData();
+			}
 		}
 	}
 }

BlacksmithWorkshop/BlacksmithWorkshop/FormManufacture.cs

@@ -1,6 +1,5 @@
 using BlacksmithWorkshopContracts.BindingModels;
 using BlacksmithWorkshopContracts.BusinessLogicContracts;
-using BlacksmithWorkshopContracts.DI;
 using BlacksmithWorkshopContracts.SearchModels;
 using BlacksmithWorkshopDataModels.Models;
 using Microsoft.Extensions.Logging;
@@ -71,45 +70,51 @@ namespace BlacksmithWorkshopView
         }
         private void ButtonAdd_Click(object sender, EventArgs e)
         {
-			var form = DependencyManager.Instance.Resolve<FormManufactureComponent>();
-            if (form.ShowDialog() == DialogResult.OK)
+            var service = Program.ServiceProvider?.GetService(typeof(FormManufactureComponent));
+            if (service is FormManufactureComponent form)
             {
-                if (form.ComponentModel == null)
-                {
-                    return;
-                }
-                _logger.LogInformation("Добавление нового компонента: { ComponentName} - { Count}", form.ComponentModel.ComponentName, form.Count);
-                if (_manufactureComponents.ContainsKey(form.Id))
-                {
-                    _manufactureComponents[form.Id] = (form.ComponentModel, form.Count);
-                }
-                else
-                {
-                    _manufactureComponents.Add(form.Id, (form.ComponentModel, form.Count));
-                }
-                LoadData();
-            }
-        }
-        private void ButtonUpd_Click(object sender, EventArgs e)
-        {
-            if (dataGridView.SelectedRows.Count == 1)
-            {
-				var form = DependencyManager.Instance.Resolve<FormManufactureComponent>();
-                int id = Convert.ToInt32(dataGridView.SelectedRows[0].Cells[0].Value);
-                form.Id = id;
-                form.Count = _manufactureComponents[id].Item2;
                 if (form.ShowDialog() == DialogResult.OK)
                 {
                     if (form.ComponentModel == null)
                     {
                         return;
                     }
-                    _logger.LogInformation("Изменение компонента:{ ComponentName}- { Count}", form.ComponentModel.ComponentName, form.Count);
-                    _manufactureComponents[form.Id] = (form.ComponentModel, form.Count);
+                    _logger.LogInformation("Добавление нового компонента: { ComponentName} - { Count}", form.ComponentModel.ComponentName, form.Count);
+                    if (_manufactureComponents.ContainsKey(form.Id))
+                    {
+                        _manufactureComponents[form.Id] = (form.ComponentModel, form.Count);
+                    }
+                    else
+                    {
+                        _manufactureComponents.Add(form.Id, (form.ComponentModel, form.Count));
+                    }
                     LoadData();
                 }
             }
         }
+        private void ButtonUpd_Click(object sender, EventArgs e)
+        {
+            if (dataGridView.SelectedRows.Count == 1)
+            {
+                var service = Program.ServiceProvider?.GetService(typeof(FormManufactureComponent));
+                if (service is FormManufactureComponent form)
+                {
+                    int id = Convert.ToInt32(dataGridView.SelectedRows[0].Cells[0].Value);
+                    form.Id = id;
+                    form.Count = _manufactureComponents[id].Item2;
+                    if (form.ShowDialog() == DialogResult.OK)
+                    {
+                        if (form.ComponentModel == null)
+                        {
+                            return;
+                        }
+                        _logger.LogInformation("Изменение компонента:{ ComponentName}- { Count}", form.ComponentModel.ComponentName, form.Count);
+                        _manufactureComponents[form.Id] = (form.ComponentModel, form.Count);
+                        LoadData();
+                    }
+                }
+            }
+        }
         private void ButtonDel_Click(object sender, EventArgs e)
         {
             if (dataGridView.SelectedRows.Count == 1)

BlacksmithWorkshop/BlacksmithWorkshop/FormManufactures.cs

@@ -1,6 +1,5 @@
 using BlacksmithWorkshopContracts.BindingModels;
 using BlacksmithWorkshopContracts.BusinessLogicContracts;
-using BlacksmithWorkshopContracts.DI;
 using Microsoft.Extensions.Logging;
 
 namespace BlacksmithWorkshopView
@@ -41,21 +40,27 @@ namespace BlacksmithWorkshopView
         }
         private void ButtonAdd_Click(object sender, EventArgs e)
         {
-			var form = DependencyManager.Instance.Resolve<FormManufacture>();
-            if (form.ShowDialog() == DialogResult.OK)
+            var service = Program.ServiceProvider?.GetService(typeof(FormManufacture));
+            if (service is FormManufacture form)
             {
-                LoadData();
+                if (form.ShowDialog() == DialogResult.OK)
+                {
+                    LoadData();
+                }
             }
         }
         private void ButtonUpd_Click(object sender, EventArgs e)
         {
             if (dataGridView.SelectedRows.Count == 1)
             {
-				var form = DependencyManager.Instance.Resolve<FormManufacture>();
-                form.Id = Convert.ToInt32(dataGridView.SelectedRows[0].Cells["Id"].Value);
-                if (form.ShowDialog() == DialogResult.OK)
+                var service = Program.ServiceProvider?.GetService(typeof(FormManufacture));
+                if (service is FormManufacture form)
                 {
-                    LoadData();
+                    form.Id = Convert.ToInt32(dataGridView.SelectedRows[0].Cells["Id"].Value);
+                    if (form.ShowDialog() == DialogResult.OK)
+                    {
+                        LoadData();
+                    }
                 }
             }
         }

BlacksmithWorkshop/BlacksmithWorkshop/Program.cs

@@ -6,7 +6,9 @@ using BlacksmithWorkShopBusinessLogic.BusinessLogics;
 using BlacksmithWorkshopContracts.BindingModels;
 using BlacksmithWorkshopContracts.BusinessLogicContracts;
 using BlacksmithWorkshopContracts.BusinessLogicsContracts;
-using BlacksmithWorkshopContracts.DI;
+using BlacksmithWorkshopContracts.StoragesContracts;
+using BlacksmithWorkshopDatabaseImplement.Implements;
+using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Logging;
 using NLog.Extensions.Logging;
 
@@ -14,16 +16,20 @@ namespace BlacksmithWorkshopView
 {
     internal static class Program
     {
+        private static ServiceProvider? _serviceProvider;
+        public static ServiceProvider? ServiceProvider => _serviceProvider;
         [STAThread]
         static void Main()
         {
             // To customize application configuration such as set high DPI settings or default font,
             // see https://aka.ms/applicationconfiguration.
             ApplicationConfiguration.Initialize();
-			InitDependency();
+            var services = new ServiceCollection();
+            ConfigureServices(services);
+            _serviceProvider = services.BuildServiceProvider();
 			try
 			{
-				var mailSender = DependencyManager.Instance.Resolve<AbstractMailWorker>();
+				var mailSender = _serviceProvider.GetService<AbstractMailWorker>();
 				mailSender?.MailConfig(new MailConfigBindingModel
 				{
 					MailLogin = System.Configuration.ConfigurationManager.AppSettings["MailLogin"] ?? string.Empty,
@@ -38,47 +44,50 @@ namespace BlacksmithWorkshopView
 			}
 			catch (Exception ex)
 			{
-				var logger = DependencyManager.Instance.Resolve<ILogger>();
+				var logger = _serviceProvider.GetService<ILogger>();
 				logger?.LogError(ex, "Îøèáêà ðàáîòû ñ ïî÷òîé");
 			}
-			Application.Run(DependencyManager.Instance.Resolve<FormMain>());
+			Application.Run(_serviceProvider.GetRequiredService<FormMain>());
         }
-		private static void InitDependency()
-		{
-			DependencyManager.InitDependency();
-			DependencyManager.Instance.AddLogging(option =>
-			{
-				option.SetMinimumLevel(LogLevel.Information);
-				option.AddNLog("nlog.config");
-			});
-			DependencyManager.Instance.RegisterType<IComponentLogic, ComponentLogic>();
-			DependencyManager.Instance.RegisterType<IOrderLogic, OrderLogic>();
-			DependencyManager.Instance.RegisterType<IManufactureLogic, ManufactureLogic>();
-			DependencyManager.Instance.RegisterType<IReportLogic, ReportLogic>();
-			DependencyManager.Instance.RegisterType<IClientLogic, ClientLogic>();
-			DependencyManager.Instance.RegisterType<IImplementerLogic, ImplementerLogic>();
-			DependencyManager.Instance.RegisterType<IMessageInfoLogic, MessageInfoLogic>();
-			DependencyManager.Instance.RegisterType<AbstractSaveToExcel, SaveToExcel>();
-			DependencyManager.Instance.RegisterType<AbstractSaveToWord, SaveToWord>();
-			DependencyManager.Instance.RegisterType<AbstractSaveToPdf, SaveToPdf>();
-			DependencyManager.Instance.RegisterType<IWorkProcess, WorkModeling>();
-			DependencyManager.Instance.RegisterType<AbstractMailWorker, MailKitWorker>(true);
-			DependencyManager.Instance.RegisterType<IBackupLogic, BackupLogic>();
-			DependencyManager.Instance.RegisterType<FormMain>();
-			DependencyManager.Instance.RegisterType<FormComponent>();
-			DependencyManager.Instance.RegisterType<FormComponents>();
-			DependencyManager.Instance.RegisterType<FormCreateOrder>();
-			DependencyManager.Instance.RegisterType<FormManufacture>();
-			DependencyManager.Instance.RegisterType<FormManufactureComponent>();
-			DependencyManager.Instance.RegisterType<FormManufactures>();
-			DependencyManager.Instance.RegisterType<FormReportManufactureComponents>();
-			DependencyManager.Instance.RegisterType<FormReportOrders>();
-			DependencyManager.Instance.RegisterType<FormClients>();
-			DependencyManager.Instance.RegisterType<FormImplementer>();
-			DependencyManager.Instance.RegisterType<FormImplementers>();
-			DependencyManager.Instance.RegisterType<FormMails>();
+        private static void ConfigureServices(ServiceCollection services)
+        {
+            services.AddLogging(option =>
+            {
+                option.SetMinimumLevel(LogLevel.Information);
+                option.AddNLog("nlog.config");
+            });
+            services.AddTransient<IComponentStorage, ComponentStorage>();
+            services.AddTransient<IOrderStorage, OrderStorage>();
+            services.AddTransient<IManufactureStorage, ManufactureStorage>();
+            services.AddTransient<IClientStorage, ClientStorage>();
+			services.AddTransient<IImplementerStorage, ImplementerStorage>();
+			services.AddTransient<IMessageInfoStorage, MessageInfoStorage>();
+			services.AddTransient<IComponentLogic, ComponentLogic>();
+            services.AddTransient<IOrderLogic, OrderLogic>();
+            services.AddTransient<IManufactureLogic, ManufactureLogic>();
+            services.AddTransient<IClientLogic, ClientLogic>();
+            services.AddTransient<IReportLogic, ReportLogic>();
+			services.AddTransient<IImplementerLogic, ImplementerLogic>();
+			services.AddTransient<IWorkProcess, WorkModeling>();
+			services.AddTransient<IMessageInfoLogic, MessageInfoLogic>();
+			services.AddSingleton<AbstractMailWorker, MailKitWorker>();
+			services.AddTransient<AbstractSaveToWord, SaveToWord>();
+            services.AddTransient<AbstractSaveToExcel, SaveToExcel>();
+            services.AddTransient<AbstractSaveToPdf, SaveToPdf>();
+            services.AddTransient<FormMain>();
+            services.AddTransient<FormComponent>();
+            services.AddTransient<FormComponents>();
+            services.AddTransient<FormCreateOrder>();
+            services.AddTransient<FormManufacture>();
+            services.AddTransient<FormManufactureComponent>();
+            services.AddTransient<FormManufactures>();
+            services.AddTransient<FormReportManufactureComponents>();
+            services.AddTransient<FormReportOrders>();
+            services.AddTransient<FormClients>();
+			services.AddTransient<FormImplementer>();
+			services.AddTransient<FormImplementers>();
+            services.AddTransient<FormMails>();
 		}
-
-		private static void MailCheck(object obj) => DependencyManager.Instance.Resolve<AbstractMailWorker>()?.MailCheck();
+		private static void MailCheck(object obj) => ServiceProvider?.GetService<AbstractMailWorker>()?.MailCheck();
 	}
 }

BlacksmithWorkshop/BlacksmithWorkshopBusinessLogic/BusinessLogics/BackupLogic.cs

@@ -1,97 +0,0 @@
-using BlacksmithWorkshopContracts.BindingModels;
-using BlacksmithWorkshopContracts.BusinessLogicsContracts;
-using BlacksmithWorkshopContracts.StoragesContracts;
-using BlacksmithWorkshopDataModels;
-using Microsoft.Extensions.Logging;
-using System.IO.Compression;
-using System.Reflection;
-using System.Runtime.Serialization.Json;
-
-namespace BlacksmithWorkshopBusinessLogic.BusinessLogics
-{
-	public class BackupLogic : IBackupLogic
-	{
-		private readonly ILogger _logger;
-		private readonly IBackupInfo _BackupInfo;
-		public BackupLogic(ILogger<BackupLogic> logger, IBackupInfo BackupInfo)
-		{
-			_logger = logger;
-			_BackupInfo = BackupInfo;
-		}
-		public void CreateBackup(BackupSaveBindingModel model)
-		{
-			if (_BackupInfo == null)
-			{
-				return;
-			}
-			try
-			{
-				_logger.LogDebug("Clear folder");
-				// зачистка папки и удаление старого архива
-				var dirInfo = new DirectoryInfo(model.FolderName);
-				if (dirInfo.Exists)
-				{
-					foreach (var file in dirInfo.GetFiles())
-					{
-						file.Delete();
-					}
-				}
-				_logger.LogDebug("Delete archive");
-				string fileName = $"{model.FolderName}.zip";
-				if (File.Exists(fileName))
-				{
-					File.Delete(fileName);
-				}
-				//берем метод для сохранения
-				_logger.LogDebug("Get assembly");
-				var typeIId = typeof(IId);
-				var assembly = typeIId.Assembly;
-				if (assembly == null)
-				{
-					throw new ArgumentNullException("Сборка не найдена",
-				   nameof(assembly));
-				}
-				var types = assembly.GetTypes();
-				var method = GetType().GetMethod("SaveToFile", BindingFlags.NonPublic | BindingFlags.Instance);
-				_logger.LogDebug("Find {count} types", types.Length);
-				foreach (var type in types)
-				{
-					if (type.IsInterface && type.GetInterface(typeIId.Name) != null)
-					{
-						var modelType =
-					   _BackupInfo.GetTypeByModelInterface(type.Name);
-						if (modelType == null)
-						{
-							throw new InvalidOperationException($"Не найден класс - модель для { type.Name }");
-					    }
-						_logger.LogDebug("Call SaveToFile method for {name} type", type.Name);
-						// вызываем метод на выполнение
-						method?.MakeGenericMethod(modelType).Invoke(this, new
-						object[] { model.FolderName });
-					}
-				}
-				_logger.LogDebug("Create zip and remove folder");
-				// архивируем
-				ZipFile.CreateFromDirectory(model.FolderName, fileName);
-				// удаляем папку
-				dirInfo.Delete(true);
-			}
-			catch (Exception)
-			{
-				throw;
-			}
-		}
-		private void SaveToFile<T>(string folderName) where T : class, new()
-		{
-			var records = _BackupInfo.GetList<T>();
-			if (records == null)
-			{
-				_logger.LogWarning("{type} type get null list", typeof(T).Name);
-				return;
-			}
-			var jsonFormatter = new DataContractJsonSerializer(typeof(List<T>));
-			using var fs = new FileStream(string.Format("{0}/{1}.json", folderName, typeof(T).Name), FileMode.OpenOrCreate);
-			jsonFormatter.WriteObject(fs, records);
-		}
-	}
-}

BlacksmithWorkshop/BlacksmithWorkshopContracts/Attributes/ColumnAttribute.cs

@@ -1,20 +0,0 @@
-namespace BlacksmithWorkshopContracts.Attributes
-{
-	[AttributeUsage(AttributeTargets.Property)]
-	public class ColumnAttribute : Attribute
-	{
-		public ColumnAttribute(string title = "", bool visible = true, int width = 0, GridViewAutoSize gridViewAutoSize = GridViewAutoSize.None, bool isUseAutoSize = false)
-		{
-			Title = title;
-			Visible = visible;
-			Width = width;
-			GridViewAutoSize = gridViewAutoSize;
-			IsUseAutoSize = isUseAutoSize;
-		}
-		public string Title { get; private set; }
-		public bool Visible { get; private set; }
-		public int Width { get; private set; }
-		public GridViewAutoSize GridViewAutoSize { get; private set; }
-		public bool IsUseAutoSize { get; private set; }
-	}
-}

BlacksmithWorkshop/BlacksmithWorkshopContracts/Attributes/GridViewAutoSize.cs

@@ -1,14 +0,0 @@
-namespace BlacksmithWorkshopContracts.Attributes
-{
-	public enum GridViewAutoSize
-	{
-		NotSet = 0,
-		None = 1,
-		ColumnHeader = 2,
-		AllCellsExceptHeader = 4,
-		AllCells = 6,
-		DisplayedCellsExceptHeader = 8,
-		DisplayedCells = 10,
-		Fill = 16
-	}
-}

BlacksmithWorkshop/BlacksmithWorkshopContracts/BindingModels/BackupSaveBindingModel.cs

@@ -1,7 +0,0 @@
-namespace BlacksmithWorkshopContracts.BindingModels
-{
-	public class BackupSaveBindingModel
-	{
-		public string FolderName { get; set; } = string.Empty;
-	}
-}

BlacksmithWorkshop/BlacksmithWorkshopContracts/BindingModels/MessageInfoBindingModel.cs

@@ -4,7 +4,6 @@ namespace BlacksmithWorkshopContracts.BindingModels
 {
 	public class MessageInfoBindingModel : IMessageInfoModel
 	{
-		public int Id { get; set; }
 		public string MessageId { get; set; } = string.Empty;
 		public int? ClientId { get; set; }
 		public string SenderName { get; set; } = string.Empty;

BlacksmithWorkshop/BlacksmithWorkshopContracts/BlacksmithWorkshopContracts.csproj

@@ -6,12 +6,6 @@
     <Nullable>enable</Nullable>
   </PropertyGroup>
 
-  <ItemGroup>
-    <PackageReference Include="Microsoft.Extensions.Logging" Version="7.0.0" />
-    <PackageReference Include="Unity" Version="5.11.10" />
-    <PackageReference Include="Unity.Microsoft.Logging" Version="5.11.1" />
-  </ItemGroup>
-
   <ItemGroup>
     <ProjectReference Include="..\BlacksmithWorkshopDataModels\BlacksmithWorkshopDataModels.csproj" />
   </ItemGroup>

BlacksmithWorkshop/BlacksmithWorkshopContracts/BusinessLogicsContracts/IBackupLogic.cs

@@ -1,9 +0,0 @@
-using BlacksmithWorkshopContracts.BindingModels;
-
-namespace BlacksmithWorkshopContracts.BusinessLogicsContracts
-{
-	public interface IBackupLogic
-	{
-		void CreateBackup(BackupSaveBindingModel model);
-	}
-}

BlacksmithWorkshop/BlacksmithWorkshopContracts/DI/DependencyManager.cs

@@ -1,69 +0,0 @@
-using ConfectioneryContracts.DI;
-using Microsoft.Extensions.Logging;
-
-namespace BlacksmithWorkshopContracts.DI
-{
-	/// <summary>
-	/// Менеджер для работы с зависимостями
-	/// </summary>
-	public class DependencyManager
-	{
-		private readonly IDependencyContainer _dependencyManager;
-		private static DependencyManager? _manager;
-		private static readonly object _locjObject = new();
-		private DependencyManager()
-		{
-			_dependencyManager = new UnityDependencyContainer();
-		}
-		public static DependencyManager Instance
-		{
-			get
-			{
-				if (_manager == null) 
-				{ 
-					lock (_locjObject) 
-					{ 
-						_manager = new DependencyManager(); 
-					} 
-				}
-				return _manager;
-			}
-		}
-		/// <summary>
-		/// Иницализация библиотек, в которых идут установки зависомстей
-		/// </summary>
-		public static void InitDependency()
-		{
-			var ext = ServiceProviderLoader.GetImplementationExtensions();
-			if (ext == null)
-			{
-				throw new ArgumentNullException("Отсутствуют компоненты для загрузки зависимостей по модулям");
-			}
-			// регистрируем зависимости
-			ext.RegisterServices();
-		}
-		/// <summary>
-		/// Регистрация логгера
-		/// </summary>
-		/// <param name="configure"></param>
-		public void AddLogging(Action<ILoggingBuilder> configure) => _dependencyManager.AddLogging(configure);
-		/// <summary>
-		/// Добавление зависимости
-		/// </summary>
-		/// <typeparam name="T"></typeparam>
-		/// <typeparam name="U"></typeparam>
-		public void RegisterType<T, U>(bool isSingle = false) where U : class, T where T : class => _dependencyManager.RegisterType<T, U>(isSingle);
-		/// <summary>
-		/// Добавление зависимости
-		/// </summary>
-		/// <typeparam name="T"></typeparam>
-		/// <typeparam name="U"></typeparam>
-		public void RegisterType<T>(bool isSingle = false) where T : class => _dependencyManager.RegisterType<T>(isSingle);
-		/// <summary>
-		/// Получение класса со всеми зависмостями
-		/// </summary>
-		/// <typeparam name="T"></typeparam>
-		/// <returns></returns>
-		public T Resolve<T>() => _dependencyManager.Resolve<T>();
-	}
-}

BlacksmithWorkshop/BlacksmithWorkshopContracts/DI/IDependencyContainer.cs

@@ -1,32 +0,0 @@
-using Microsoft.Extensions.Logging;
-
-namespace BlacksmithWorkshopContracts.DI
-{
-	public interface IDependencyContainer
-	{
-		/// <summary>
-		/// Регистрация логгера
-		/// </summary>
-		/// <param name="configure"></param>
-		void AddLogging(Action<ILoggingBuilder> configure);
-		/// <summary>
-		/// Добавление зависимости
-		/// </summary>
-		/// <typeparam name="T"></typeparam>
-		/// <typeparam name="U"></typeparam>
-		/// <param name="isSingle"></param>
-		void RegisterType<T, U>(bool isSingle) where U : class, T where T : class;
-		/// <summary>
-		/// Добавление зависимости
-		/// </summary>
-		/// <typeparam name="T"></typeparam>
-		/// <param name="isSingle"></param>
-		void RegisterType<T>(bool isSingle) where T : class;
-		/// <summary>
-		/// Получение класса со всеми зависмостями
-		/// </summary>
-		/// <typeparam name="T"></typeparam>
-		/// <returns></returns>
-		T Resolve<T>();
-	}
-}

BlacksmithWorkshop/BlacksmithWorkshopContracts/DI/IIpmlementationExtention.cs

@@ -1,11 +0,0 @@
-namespace BlacksmithWorkshopContracts.DI
-{
-	public interface IImplementationExtension
-	{
-		public int Priority { get; }
-		/// <summary>
-		/// Регистрация сервисов
-		/// </summary>
-		public void RegisterServices();
-	}
-}

BlacksmithWorkshop/BlacksmithWorkshopContracts/DI/ServiceDependencyContainer.cs

@@ -1,51 +0,0 @@
-using Microsoft.Extensions.DependencyInjection;
-using Microsoft.Extensions.Logging;
-
-namespace BlacksmithWorkshopContracts.DI
-{
-	public class ServiceDependencyContainer : IDependencyContainer
-	{
-		private ServiceProvider? _serviceProvider;
-		private readonly ServiceCollection _serviceCollection;
-		public ServiceDependencyContainer()
-		{
-			_serviceCollection = new();
-		}
-		public void AddLogging(Action<ILoggingBuilder> configure)
-		{
-			_serviceCollection.AddLogging(configure);
-		}
-		public void RegisterType<T, U>(bool isSingle) where U : class, T where T : class
-		{
-			if (isSingle)
-			{
-				_serviceCollection.AddSingleton<T, U>();
-			}
-			else
-			{
-				_serviceCollection.AddTransient<T, U>();
-			}
-			_serviceProvider = null;
-		}
-		public void RegisterType<T>(bool isSingle) where T : class
-		{
-			if (isSingle)
-			{
-				_serviceCollection.AddSingleton<T>();
-			}
-			else
-			{
-				_serviceCollection.AddTransient<T>();
-			}
-			_serviceProvider = null;
-		}
-		public T Resolve<T>()
-		{
-			if (_serviceProvider == null)
-			{
-				_serviceProvider = _serviceCollection.BuildServiceProvider();
-			}
-			return _serviceProvider.GetService<T>()!;
-		}
-	}
-}

BlacksmithWorkshop/BlacksmithWorkshopContracts/DI/ServiceProviderLoader.cs

@@ -1,53 +0,0 @@
-using System.Reflection;
-
-namespace BlacksmithWorkshopContracts.DI
-{
-	public class ServiceProviderLoader
-	{
-		/// <summary>
-		/// Загрузка всех классов-реализаций IImplementationExtension
-		/// </summary>
-		/// <returns></returns>
-		public static IImplementationExtension? GetImplementationExtensions()
-		{
-			IImplementationExtension? source = null;
-			var files = Directory.GetFiles(TryGetImplementationExtensionsFolder(), "*.dll", SearchOption.AllDirectories);
-			foreach (var file in files.Distinct())
-			{
-				Assembly asm = Assembly.LoadFrom(file);
-				foreach (var t in asm.GetExportedTypes())
-				{
-					if (t.IsClass && typeof(IImplementationExtension).IsAssignableFrom(t))
-					{
-						if (source == null)
-						{
-							source = (IImplementationExtension)Activator.CreateInstance(t)!;
-						}
-						else
-						{
-							var newSource = (IImplementationExtension)Activator.CreateInstance(t)!;
-							if (newSource.Priority > source.Priority)
-							{
-								source = newSource;
-							}
-						}
-					}
-				}
-			}
-			return source;
-		}
-		private static string TryGetImplementationExtensionsFolder()
-		{
-			var directory = new
-			DirectoryInfo(Directory.GetCurrentDirectory());
-			while (directory != null &&
-			!directory.GetDirectories("ImplementationExtensions",
-			SearchOption.AllDirectories).Any(x => x.Name == "ImplementationExtensions"))
-			{
-				directory = directory.Parent;
-			}
-			return $"{directory?.FullName}\\ImplementationExtensions";
-		}
-
-	}
-}

BlacksmithWorkshop/BlacksmithWorkshopContracts/DI/UnityDependencyContainer.cs

@@ -1,33 +0,0 @@
-using BlacksmithWorkshopContracts.DI;
-using Microsoft.Extensions.Logging;
-using Unity;
-using Unity.Microsoft.Logging;
-
-namespace ConfectioneryContracts.DI
-{
-	public class UnityDependencyContainer : IDependencyContainer
-	{
-		private readonly IUnityContainer _container;
-		public UnityDependencyContainer()
-		{
-			_container = new UnityContainer();
-		}
-		public void AddLogging(Action<ILoggingBuilder> configure)
-		{
-			var factory = LoggerFactory.Create(configure);
-			_container.AddExtension(new LoggingExtension(factory));
-		}
-		public void RegisterType<T>(bool isSingle) where T : class
-		{
-			_container.RegisterType<T>(isSingle ? TypeLifetime.Singleton : TypeLifetime.Transient);
-		}
-		public T Resolve<T>()
-		{
-			return _container.Resolve<T>();
-		}
-		void IDependencyContainer.RegisterType<T, U>(bool isSingle)
-		{
-			_container.RegisterType<T, U>(isSingle ? TypeLifetime.Singleton : TypeLifetime.Transient);
-		}
-	}
-}

BlacksmithWorkshop/BlacksmithWorkshopContracts/StoragesContracts/IBackupInfo.cs

@@ -1,8 +0,0 @@
-namespace BlacksmithWorkshopContracts.StoragesContracts
-{
-	public interface IBackupInfo
-	{
-		List<T>? GetList<T>() where T : class, new();
-		Type? GetTypeByModelInterface(string modelInterfaceName);
-	}
-}

BlacksmithWorkshop/BlacksmithWorkshopContracts/ViewModels/ClientViewModel.cs

@@ -1,17 +1,16 @@
-using BlacksmithWorkshopContracts.Attributes;
-using BlacksmithWorkshopDataModels.Models;
+using BlacksmithWorkshopDataModels.Models;
+using System.ComponentModel;
 
 namespace BlacksmithWorkshopContracts.ViewModels
 {
     public class ClientViewModel : IClientModel
     {
-        [Column(visible: false)]
         public int Id { get; set; }
-        [Column(title: "ФИО клиента", width: 150)]
+        [DisplayName("ФИО клиента")]
         public string ClientFIO { get; set; } = string.Empty;
-        [Column(title: "Логин (эл. почта)", gridViewAutoSize: GridViewAutoSize.Fill, isUseAutoSize: true)]
+        [DisplayName("Логин (эл. почта)")]
         public string Email { get; set; } = string.Empty;
-		[Column(title: "Пароль", width: 150)]
-		public string Password { get; set; } = string.Empty;
+        [DisplayName("Пароль")]
+        public string Password { get; set; } = string.Empty;
     }
 }

BlacksmithWorkshop/BlacksmithWorkshopContracts/ViewModels/MessageInfoViewModel.cs

@@ -5,7 +5,6 @@ namespace BlacksmithWorkshopContracts.ViewModels
 {
 	public class MessageInfoViewModel : IMessageInfoModel
 	{
-		public int Id { get; set; }
 		public string MessageId { get; set; } = string.Empty;
 		public int? ClientId { get; set; }
 		[DisplayName("Отправитель")]

BlacksmithWorkshop/BlacksmithWorkshopDataModels/Models/IMessageInfoModel.cs

@@ -1,6 +1,6 @@
 namespace BlacksmithWorkshopDataModels.Models
 {
-	public interface IMessageInfoModel : IId
+	public interface IMessageInfoModel
 	{
 		string MessageId { get; }
 		int? ClientId { get; }

BlacksmithWorkshop/BlacksmithWorkshopDatebaseImplement/DatabaseImplementationExtention.cs

@@ -1,21 +0,0 @@
-using BlacksmithWorkshopContracts.DI;
-using BlacksmithWorkshopContracts.StoragesContracts;
-using BlacksmithWorkshopDatabaseImplement.Implements;
-
-namespace BlacksmithWorkshopDatabaseImplement
-{
-	public class DatabaseImplementationExtention : IImplementationExtension
-	{
-		public int Priority => 2;
-		public void RegisterServices()
-		{
-			DependencyManager.Instance.RegisterType<IClientStorage, ClientStorage>();
-			DependencyManager.Instance.RegisterType<IComponentStorage, ComponentStorage>();
-			DependencyManager.Instance.RegisterType<IImplementerStorage, ImplementerStorage>();
-			DependencyManager.Instance.RegisterType<IMessageInfoStorage, MessageInfoStorage>();
-			DependencyManager.Instance.RegisterType<IOrderStorage, OrderStorage>();
-			DependencyManager.Instance.RegisterType<IManufactureStorage, ManufactureStorage>();
-			DependencyManager.Instance.RegisterType<IBackupInfo, BackupInfo>();
-		}
-	}
-}

BlacksmithWorkshop/BlacksmithWorkshopDatebaseImplement/Implements/BackupInfo.cs

@@ -1,28 +0,0 @@
-using BlacksmithWorkshopContracts.StoragesContracts;
-
-namespace BlacksmithWorkshopDatabaseImplement.Implements
-{
-	public class BackupInfo : IBackupInfo
-	{
-		public List<T>? GetList<T>() where T : class, new()
-		{
-			using var context = new BlacksmithWorkshopDatabase();
-			return context.Set<T>().ToList();
-		}
-		public Type? GetTypeByModelInterface(string modelInterfaceName)
-		{
-			var assembly = typeof(BackupInfo).Assembly;
-			var types = assembly.GetTypes();
-			foreach (var type in types)
-			{
-				if (type.IsClass &&
-				type.GetInterface(modelInterfaceName) != null)
-				{
-					return type;
-				}
-			}
-			return null;
-		}
-
-	}
-}

BlacksmithWorkshop/BlacksmithWorkshopDatebaseImplement/Models/MessageInfo.cs

@@ -44,7 +44,5 @@ namespace BlacksmithWorkshopDatabaseImplement.Models
 			SenderName = SenderName,
 			DateDelivery = DateDelivery,
 		};
-
-		public int Id => throw new NotImplementedException();
 	}
 }

BlacksmithWorkshop/BlacksmithWorkshopListImplement/BlacksmithWorkshopListImplement.csproj

@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
     <TargetFramework>net6.0</TargetFramework>
@@ -11,8 +11,4 @@
     <ProjectReference Include="..\BlacksmithWorkshopDataModels\BlacksmithWorkshopDataModels.csproj" />
   </ItemGroup>
 
-  <Target Name="PostBuild" AfterTargets="PostBuildEvent">
-    <Exec Command="copy /Y $(targetDir)*.dll $(solutionDir)ImplementationExtensions\*.dll" />
-  </Target>
-
 </Project>

BlacksmithWorkshop/BlacksmithWorkshopListImplement/Implements/BackupInfo.cs

@@ -1,22 +0,0 @@
-using BlacksmithWorkshopContracts.StoragesContracts;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace BlacksmithWorkshopListImplement.Implements
-{
-	internal class BackupInfo : IBackupInfo
-	{
-		public List<T>? GetList<T>() where T : class, new()
-		{
-			throw new NotImplementedException();
-		}
-
-		public Type? GetTypeByModelInterface(string modelInterfaceName)
-		{
-			throw new NotImplementedException();
-		}
-	}
-}

BlacksmithWorkshop/BlacksmithWorkshopListImplement/Implements/MessageInfoStorage.cs

@@ -1,30 +0,0 @@
-using BlacksmithWorkshopContracts.BindingModels;
-using BlacksmithWorkshopContracts.SearchModels;
-using BlacksmithWorkshopContracts.StoragesContracts;
-using BlacksmithWorkshopContracts.ViewModels;
-
-namespace BlacksmithWorkshopListImplement.Implements
-{
-	public class MessageInfoStorage : IMessageInfoStorage
-	{
-		public MessageInfoViewModel? GetElement(MessageInfoSearchModel model)
-		{
-			throw new NotImplementedException();
-		}
-
-		public List<MessageInfoViewModel> GetFilteredList(MessageInfoSearchModel model)
-		{
-			throw new NotImplementedException();
-		}
-
-		public List<MessageInfoViewModel> GetFullList()
-		{
-			throw new NotImplementedException();
-		}
-
-		public MessageInfoViewModel? Insert(MessageInfoBindingModel model)
-		{
-			throw new NotImplementedException();
-		}
-	}
-}

BlacksmithWorkshop/BlacksmithWorkshopListImplement/ListImplementationExtension.cs

@@ -1,21 +0,0 @@
-using BlacksmithWorkshopContracts.DI;
-using BlacksmithWorkshopContracts.StoragesContracts;
-using BlacksmithWorkshopListImplement.Implements;
-
-namespace BlacksmithWorkshopListImplement
-{
-	public class ListImplementationExtension : IImplementationExtension
-	{
-		public int Priority => 0;
-		public void RegisterServices()
-		{
-			DependencyManager.Instance.RegisterType<IClientStorage, ClientStorage>();
-			DependencyManager.Instance.RegisterType<IComponentStorage, ComponentStorage>();
-			DependencyManager.Instance.RegisterType<IImplementerStorage, ImplementerStorage>();
-			DependencyManager.Instance.RegisterType<IMessageInfoStorage, MessageInfoStorage>();
-			DependencyManager.Instance.RegisterType<IOrderStorage, OrderStorage>();
-			DependencyManager.Instance.RegisterType<IManufactureStorage, ManufactureStorage>();
-			DependencyManager.Instance.RegisterType<IBackupInfo, BackupInfo>();
-		}
-	}
-}