GiftShop/GiftShopBusinessLogic/BusinessLogics/BackUpLogic.cs

@@ -1,104 +0,0 @@
-using GiftShopContracts.BindingModels;
-using GiftShopContracts.BusinessLogicsContracts;
-using GiftShopContracts.StoragesContracts;
-using GiftShopDataModels;
-using Microsoft.Extensions.Logging;
-using System.IO.Compression;
-using System.Reflection;
-using System.Runtime.Serialization.Json;
-
-namespace GiftShopBusinessLogic.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(BackUpSaveBinidngModel 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);
-		}
-	}
-}

GiftShop/GiftShopBusinessLogic/BusinessLogics/ClientLogic.cs

@@ -106,7 +106,7 @@ namespace GiftShopBusinessLogic.BusinessLogics
 			{
 				throw new ArgumentException("Неправильно введенный email", nameof(model.Email));
 			}
-			if (!Regex.IsMatch(model.Password, @"^((\w+\d+\W+)|(\w+\W+\d+)|(\d+\w+\W+)|(\d+\W+\w+)|(\W+\w+\d+)|(\W+\d+\w+))[\w\d\W]*$") || model.Password.Length < 10 || model.Password.Length > 50)
+			if (model.Password.Length < 10 || model.Password.Length > 50)
 			{
 				throw new ArgumentException("Неправильно введенный пароль", nameof(model.Password));
 			}

GiftShop/GiftShopBusinessLogic/GiftShopBusinessLogic.csproj

@@ -9,12 +9,8 @@
   <ItemGroup>
     <PackageReference Include="DocumentFormat.OpenXml" Version="2.20.0" />
     <PackageReference Include="MailKit" Version="4.0.0" />
-    <PackageReference Include="Microsoft.Extensions.Logging" Version="7.0.0" />
     <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="7.0.0" />
-    <PackageReference Include="MigraDoc.DocumentObjectModel.Core" Version="1.0.0" />
+    <PackageReference Include="PdfSharp.MigraDoc.Standard" Version="1.51.15" />
-    <PackageReference Include="MigraDoc.Rendering.Core" Version="1.0.0" />
-    <PackageReference Include="NLog" Version="5.2.0" />
-    <PackageReference Include="NLog.Extensions.Logging" Version="5.3.0" />
   </ItemGroup>
 
   <ItemGroup>

GiftShop/GiftShopContracts/Attributes/ColumnAttribute.cs

@@ -1,26 +0,0 @@
-namespace GiftShopContracts.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; }
-	}
-
-}

GiftShop/GiftShopContracts/Attributes/GridViewAutoSize.cs

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

GiftShop/GiftShopContracts/BindingModels/BackUpSaveBinidngModel.cs

@@ -1,8 +0,0 @@
-namespace GiftShopContracts.BindingModels
-{
-	public class BackUpSaveBinidngModel
-	{
-		public string FolderName { get; set; } = string.Empty;
-	}
-
-}

GiftShop/GiftShopContracts/BindingModels/MessageInfoBindingModel.cs

@@ -15,7 +15,5 @@ namespace GiftShopContracts.BindingModels
 		public string Body { get; set; } = string.Empty;
 		
 		public DateTime DateDelivery { get; set; }
-
-		public int Id => throw new NotImplementedException();
 	}
 }

GiftShop/GiftShopContracts/BusinessLogicsContracts/IBackUpLogic.cs

@@ -1,9 +0,0 @@
-using GiftShopContracts.BindingModels;
-
-namespace GiftShopContracts.BusinessLogicsContracts
-{
-	public interface IBackUpLogic
-	{
-		void CreateBackUp(BackUpSaveBinidngModel model);
-	}
-}

GiftShop/GiftShopContracts/DI/DependencyManager.cs

@@ -1,68 +0,0 @@
-using Microsoft.Extensions.Logging;
-
-namespace GiftShopContracts.DI
-{
-	/// <summary>
-	/// Менеджер для работы с зависимостями
-	/// </summary>
-	public class DependencyManager
-	{
-		private readonly IDependencyContainer _dependencyManager;
-		private static DependencyManager? _manager;
-		private static readonly object _locjObject = new();
-		private DependencyManager()
-		{
-			_dependencyManager = new ServiceDependencyContainer();
-		}
-		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>();
-	}
-
-}

GiftShop/GiftShopContracts/DI/IDependencyContainer.cs

@@ -1,36 +0,0 @@
-using Microsoft.Extensions.Logging;
-
-namespace GiftShopContracts.DI
-{
-	/// <summary>
-	/// Интерфейс установки зависмости между элементами
-	/// </summary>
-	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>();
-	}
-
-}

GiftShop/GiftShopContracts/DI/IImplementationExtension.cs

@@ -1,14 +0,0 @@
-namespace GiftShopContracts.DI
-{
-	/// <summary>
-	/// Интерфейс для регистрации зависимостей в модулях
-	/// </summary>
-	public interface IImplementationExtension
-	{
-		public int Priority { get; }
-		/// <summary>
-		/// Регистрация сервисов
-		/// </summary>
-		public void RegisterServices();
-	}
-}

GiftShop/GiftShopContracts/DI/ServiceDependencyContainer.cs

@@ -1,59 +0,0 @@
-using Microsoft.Extensions.DependencyInjection;
-using Microsoft.Extensions.Logging;
-
-namespace GiftShopContracts.DI
-{
-	public class ServiceDependencyContainer : IDependencyContainer
-	{
-		private ServiceProvider? _serviceProvider;
-		private readonly ServiceCollection _serviceCollection;
-
-		public ServiceDependencyContainer()
-		{
-			_serviceCollection = new ServiceCollection();
-		}
-
-		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>()!;
-		}
-	}
-}

GiftShop/GiftShopContracts/DI/ServiceProviderLoader.cs

@@ -1,62 +0,0 @@
-using System.Reflection;
-
-namespace GiftShopContracts.DI
-{
-	/// <summary>
-	/// Загрузчик данных
-	/// </summary>
-	public static partial 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";
-		}
-	}
-
-}

GiftShop/GiftShopContracts/DI/UnityDependencyContainer.cs

@@ -1,38 +0,0 @@
-using Microsoft.Extensions.Logging;
-using Unity;
-using Unity.Microsoft.Logging;
-
-namespace GiftShopContracts.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);
-		}
-	}
-}

GiftShop/GiftShopContracts/GiftShopContracts.csproj

@@ -6,17 +6,6 @@
     <Nullable>enable</Nullable>
   </PropertyGroup>
 
-  <ItemGroup>
-    <PackageReference Include="Microsoft.Extensions.Logging" Version="7.0.0" />
-    <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="7.0.0" />
-    <PackageReference Include="MigraDoc.DocumentObjectModel.Core" Version="1.0.0" />
-    <PackageReference Include="MigraDoc.Rendering.Core" Version="1.0.0" />
-    <PackageReference Include="NLog" Version="5.2.0" />
-    <PackageReference Include="NLog.Extensions.Logging" Version="5.3.0" />
-    <PackageReference Include="Unity" Version="5.11.10" />
-    <PackageReference Include="Unity.Microsoft.Logging" Version="5.11.1" />
-  </ItemGroup>
-
   <ItemGroup>
     <ProjectReference Include="..\GiftShopDataModels\GiftShopDataModels.csproj" />
   </ItemGroup>

GiftShop/GiftShopContracts/StoragesContracts/IBackUpInfo.cs

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

GiftShop/GiftShopContracts/ViewModels/ClientViewModel.cs

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

GiftShop/GiftShopContracts/ViewModels/ComponentViewModel.cs

@@ -1,18 +1,17 @@
-using GiftShopContracts.Attributes;
+using GiftShopDataModels.Models;
-using GiftShopDataModels.Models;
 using System.ComponentModel;
 
 namespace GiftShopContracts.ViewModels
 {
     public class ComponentViewModel : IComponentModel
     {
-		[Column(visible: false)]
         public int Id { get; set; }
 
-		[Column("Название компонента", gridViewAutoSize: GridViewAutoSize.Fill, isUseAutoSize: true)]
+        [DisplayName("Название компонента")]
         public string ComponentName { get; set; } = string.Empty;
 
-		[Column("Цена", width: 80)]
+        [DisplayName("Цена")]
+
         public double Cost { get; set; }
     }
 }

GiftShop/GiftShopContracts/ViewModels/GiftViewModel.cs

@@ -1,21 +1,19 @@
-using GiftShopContracts.Attributes;
+using GiftShopDataModels.Models;
-using GiftShopDataModels.Models;
 using System.ComponentModel;
 
 namespace GiftShopContracts.ViewModels
 {
     public class GiftViewModel : IGiftModel
     {
-		[Column(visible: false)]
         public int Id { get; set; }
 
-		[Column("Название изделия", gridViewAutoSize: GridViewAutoSize.Fill, isUseAutoSize: true)]
+        [DisplayName("Название изделия")]
         public string GiftName { get; set; } = string.Empty;
 
-		[Column("Цена", width: 100)]
+        [DisplayName("Цена")]
+
         public double Price { get; set; }
 
-		[Column(visible: false)]
         public Dictionary<int, (IComponentModel, int)> GiftComponents { get; set; } = new();
     }
 }

GiftShop/GiftShopContracts/ViewModels/ImplementerViewModel.cs

@@ -1,24 +1,22 @@
-using GiftShopContracts.Attributes;
+using GiftShopDataModels.Models;
-using GiftShopDataModels.Models;
 using System.ComponentModel;
 
 namespace GiftShopContracts.ViewModels
 {
 	public class ImplementerViewModel : IImplementerModel
 	{
-		[Column(visible: false)]
 		public int Id { get; set; }
 
-		[Column("ФИО исполнителя", gridViewAutoSize: GridViewAutoSize.Fill, isUseAutoSize: true)]
+		[DisplayName("ФИО исполнителя")]
 		public string ImplementerFIO { get; set; } = string.Empty;
 
-		[Column("Пароль", width: 150)]
+		[DisplayName("Пароль")]
 		public string Password { get; set; } = string.Empty;
 
-		[Column("Стаж работы", gridViewAutoSize: GridViewAutoSize.AllCells, isUseAutoSize: true)]
+		[DisplayName("Стаж работы")]
 		public int WorkExperience { get; set; }
 
-		[Column("Квалификация", gridViewAutoSize: GridViewAutoSize.AllCells, isUseAutoSize: true)]
+		[DisplayName("Квалификация")]
 		public int Qualification { get; set; }
 	}
 }

GiftShop/GiftShopContracts/ViewModels/MessageInfoViewModel.cs

@@ -1,30 +1,24 @@
-using GiftShopContracts.Attributes;
+using GiftShopDataModels.Models;
-using GiftShopDataModels.Models;
 using System.ComponentModel;
 
 namespace GiftShopContracts.ViewModels
 {
 	public class MessageInfoViewModel : IMessageInfoModel
 	{
-		[Column(visible: false)]
 		public string MessageId { get; set; } = string.Empty;
 
-		[Column(visible: false)]
 		public int? ClientId { get; set; }
 
-		[Column("Имя отправителя", gridViewAutoSize: GridViewAutoSize.DisplayedCells, isUseAutoSize: true)]
+		[DisplayName("Имя отправителя")]
 		public string SenderName { get; set; } = string.Empty;
 
-		[Column("Дата отправления", width: 100)]
+		[DisplayName("Дата отправления")]
 		public DateTime DateDelivery { get; set; }
 
-		[Column("Тема", width: 150)]
+		[DisplayName("Тема")]
 		public string Subject { get; set; } = string.Empty;
 
-		[Column("Содержание", gridViewAutoSize: GridViewAutoSize.Fill, isUseAutoSize: true)]
+		[DisplayName("Содержание")]
 		public string Body { get; set; } = string.Empty;
-
-		[Column(visible: false)]
-		public int Id => throw new NotImplementedException();
 	}
 }

GiftShop/GiftShopContracts/ViewModels/OrderViewModel.cs

@@ -1,5 +1,4 @@
-using GiftShopContracts.Attributes;
+using GiftShopDataModels.Enums;
-using GiftShopDataModels.Enums;
 using GiftShopDataModels.Models;
 using System.ComponentModel;
 
@@ -7,40 +6,37 @@ namespace GiftShopContracts.ViewModels
 {
     public class OrderViewModel : IOrderModel
 	{
-		[Column(visible: false)]
+		[DisplayName("Номер")]
-		public int GiftId { get; set; }
-
-		[Column(visible: false)]
-		public int ClientId { get; set; }
-
-		[Column(visible: false)]
-		public int? ImplementerId { get; set; }
-
-		[Column("Номер", gridViewAutoSize: GridViewAutoSize.AllCells, isUseAutoSize: true)]
 		public int Id { get; set; }
 
-		[Column("ФИО исполнителя", gridViewAutoSize: GridViewAutoSize.Fill, isUseAutoSize: true)]
+        public int GiftId { get; set; }
-		public string ImplementerFIO { get; set; } = string.Empty;
 
-		[Column("Название изделия", gridViewAutoSize: GridViewAutoSize.AllCells, isUseAutoSize: true)]
+		public int ClientId { get; set; }
+
+		public int? ImplementerId { get; set; }
+
+		[DisplayName("Изделие")]
         public string GiftName { get; set; } = string.Empty;
 
-		[Column("ФИО клиента", gridViewAutoSize: GridViewAutoSize.Fill, isUseAutoSize: true)]
+		[DisplayName("ФИО исполнителя")]
+		public string ImplementerFIO { get; set; } = string.Empty;
+
+		[DisplayName("Клиент")]
 		public string ClientFIO { get; set; } = string.Empty;
 
-		[Column("Количество", gridViewAutoSize: GridViewAutoSize.AllCells, isUseAutoSize: true)]
+		[DisplayName("Количество")]
         public int Count { get; set; }
 
-		[Column("Сумма", gridViewAutoSize: GridViewAutoSize.AllCells, isUseAutoSize: true)]
+        [DisplayName("Сумма")]
         public double Sum { get; set; }
 
-		[Column("Статус", gridViewAutoSize: GridViewAutoSize.AllCells, isUseAutoSize: true)]
+        [DisplayName("Статус")]
         public OrderStatus Status { get; set; } = OrderStatus.Неизвестен;
 
-		[Column("Дата создания", width: 100)]
+        [DisplayName("Дата создания")]
         public DateTime DateCreate { get; set; } = DateTime.Now;
 
-		[Column("Дата выполнения", width: 100)]
+        [DisplayName("Дата выполнения")]
         public DateTime? DateImplement { get; set; }
     }
 }

GiftShop/GiftShopDataModels/Models/IMessageInfoModel.cs

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

GiftShop/GiftShopDatabaseImplement/DatabaseImplementationExtension.cs

@@ -1,23 +0,0 @@
-using GiftShopContracts.DI;
-using GiftShopContracts.StoragesContracts;
-using GiftShopDatabaseImplement.Implements;
-
-namespace GiftShopDatabaseImplement
-{
-	public class DatabaseImplementationExtension : 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<IGiftStorage, GiftStorage>();
-			DependencyManager.Instance.RegisterType<IBackUpInfo, BackUpInfo>();
-		}
-
-	}
-}

GiftShop/GiftShopDatabaseImplement/GiftShopDatabaseImplement.csproj

@@ -20,8 +20,4 @@
     <ProjectReference Include="..\GiftShopDataModels\GiftShopDataModels.csproj" />
   </ItemGroup>
 
-	<Target Name="PostBuild" AfterTargets="PostBuildEvent">
-		<Exec Command="copy /Y &quot;$(TargetDir)*.dll&quot; &quot;$(SolutionDir)ImplementationExtensions\*.dll&quot;" />
-	</Target>
-
 </Project>

GiftShop/GiftShopDatabaseImplement/Implements/BackUpInfo.cs

@@ -1,29 +0,0 @@
-using GiftShopContracts.StoragesContracts;
-
-namespace GiftShopDatabaseImplement.Implements
-{
-	public class BackUpInfo : IBackUpInfo
-	{
-		public List<T>? GetList<T>() where T : class, new()
-		{
-			using var context = new GiftShopDatabase();
-			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;
-		}
-	}
-
-}

GiftShop/GiftShopDatabaseImplement/Models/Client.cs

@@ -3,23 +3,17 @@ using GiftShopContracts.ViewModels;
 using GiftShopDataModels.Models;
 using System.ComponentModel.DataAnnotations.Schema;
 using System.ComponentModel.DataAnnotations;
-using System.Runtime.Serialization;
 
 namespace GiftShopDatabaseImplement.Models
 {
-	[DataContract]
 	public class Client : IClientModel
 	{
-		[DataMember]
 		public int Id { get; private set; }
 		[Required]
-		[DataMember]
 		public string ClientFIO { get; set; } = string.Empty;
 		[Required]
-		[DataMember]
 		public string Email { get; set; } = string.Empty;
 		[Required]
-		[DataMember]
 		public string Password { get; set; } = string.Empty;
 
 		[ForeignKey("ClientId")]

GiftShop/GiftShopDatabaseImplement/Models/Component.cs

@@ -3,22 +3,17 @@ using System.ComponentModel.DataAnnotations.Schema;
 using System.ComponentModel.DataAnnotations;
 using GiftShopContracts.ViewModels;
 using GiftShopContracts.BindingModels;
-using System.Runtime.Serialization;
 
 namespace GiftShopDatabaseImplement.Models
 {
-	[DataContract]
     public class Component : IComponentModel
     {
-		[DataMember]
         public int Id { get; private set; }
         
         [Required]
-		[DataMember]
         public string ComponentName { get; private set; } = string.Empty;
         
         [Required]
-		[DataMember]
         public double Cost { get; set; }
         
         [ForeignKey("ComponentId")]

GiftShop/GiftShopDatabaseImplement/Models/Gift.cs

@@ -3,28 +3,22 @@ using System.ComponentModel.DataAnnotations.Schema;
 using System.ComponentModel.DataAnnotations;
 using GiftShopContracts.BindingModels;
 using GiftShopContracts.ViewModels;
-using System.Runtime.Serialization;
 
 namespace GiftShopDatabaseImplement.Models
 {
-	[DataContract]
     public class Gift : IGiftModel
     {
-		[DataMember]
         public int Id { get; set; }
         
         [Required]
-		[DataMember]
         public string GiftName { get; set; } = string.Empty;
         
         [Required]
-		[DataMember]
         public double Price { get; set; }
         
         private Dictionary<int, (IComponentModel, int)>? _giftComponents = null;
         
         [NotMapped]
-		[DataMember]
         public Dictionary<int, (IComponentModel, int)> GiftComponents
         {
             get

GiftShop/GiftShopDatabaseImplement/Models/Implementer.cs

@@ -3,30 +3,23 @@ using GiftShopContracts.ViewModels;
 using GiftShopDataModels.Models;
 using System.ComponentModel.DataAnnotations.Schema;
 using System.ComponentModel.DataAnnotations;
-using System.Runtime.Serialization;
 
 namespace GiftShopDatabaseImplement.Models
 {
-	[DataContract]
 	public class Implementer : IImplementerModel
 	{
 		[Required]
-		[DataMember]
 		public string ImplementerFIO { get; private set; } = string.Empty;
 
 		[Required]
-		[DataMember]
 		public string Password { get; private set; } = string.Empty;
 
 		[Required]
-		[DataMember]
 		public int WorkExperience { get; private set; }
 
 		[Required]
-		[DataMember]
 		public int Qualification { get; private set; }
 
-		[DataMember]
 		public int Id { get; private set; }
 
 		[ForeignKey("ImplementerId")]

GiftShop/GiftShopDatabaseImplement/Models/Message.cs

@@ -2,40 +2,25 @@
 using GiftShopContracts.ViewModels;
 using GiftShopDataModels.Models;
 using System.ComponentModel.DataAnnotations;
-using System.Runtime.Serialization;
 
 namespace GiftShopDatabaseImplement.Models
 {
-	[DataContract]
 	public class Message : IMessageInfoModel
 	{
 		[Key]
-		[DataMember]
 		public string MessageId { get; private set; } = string.Empty;
 
-		[DataMember]
 		public int? ClientId { get; private set; }
 
-		[Required]
-		[DataMember]
 		public string SenderName { get; private set; } = string.Empty;
 
-		[Required]
-		[DataMember]
 		public DateTime DateDelivery { get; private set; } = DateTime.Now;
 
-		[Required]
-		[DataMember]
 		public string Subject { get; private set; } = string.Empty;
 
-		[Required]
-		[DataMember]
 		public string Body { get; private set; } = string.Empty;
 
 		public Client? Client { get; private set; }
-
-		public int Id => throw new NotImplementedException();
-
 		public static Message? Create(MessageInfoBindingModel model)
 		{
 			if (model == null)

GiftShop/GiftShopDatabaseImplement/Models/Order.cs

@@ -3,46 +3,34 @@ using GiftShopContracts.ViewModels;
 using GiftShopDataModels.Enums;
 using GiftShopDataModels.Models;
 using System.ComponentModel.DataAnnotations;
-using System.Runtime.Serialization;
 
 namespace GiftShopDatabaseImplement.Models
 {
-	[DataContract]
     public class Order : IOrderModel
     {
-		[DataMember]
         public int Id { get; private set; }
 
-		[DataMember]
         public int GiftId { get; private set; }
 
 		[Required]
-		[DataMember]
 		public int ClientId { get; set; }
 
-		[DataMember]
 		public int? ImplementerId { get; private set; }
 
-		[DataMember]
 		public string GiftName { get; private set; } = string.Empty;
 
-		[DataMember]
         [Required]
         public int Count { get; private set; }
 
-		[DataMember]
         [Required]
         public double Sum { get; private set; }
 
-		[DataMember]
         [Required]
         public OrderStatus Status { get; private set; } = OrderStatus.Неизвестен;
 
-		[DataMember]
         [Required]
         public DateTime DateCreate { get; private set; } = DateTime.Now;
 
-		[DataMember]
         public DateTime? DateImplement { get; private set; }
 
         public virtual Gift Gift { get; set; }

GiftShop/GiftShopFileImplement/FileImplementationExtension.cs

@@ -1,22 +0,0 @@
-using GiftShopContracts.DI;
-using GiftShopContracts.StoragesContracts;
-using GiftShopFileImplement.Implements;
-using System;
-namespace GiftShopFileImplement
-{
-	public class FileImplementationExtension : IImplementationExtension
-	{
-		public int Priority => 1;
-
-		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<IGiftStorage, GiftStorage>();
-			DependencyManager.Instance.RegisterType<IBackUpInfo, BackUpInfo>();
-		}
-	}
-}

GiftShop/GiftShopFileImplement/GiftShopFileImplement.csproj

@@ -6,18 +6,9 @@
     <Nullable>enable</Nullable>
   </PropertyGroup>
 
-  <ItemGroup>
-    <PackageReference Include="MigraDoc.DocumentObjectModel.Core" Version="1.0.0" />
-    <PackageReference Include="MigraDoc.Rendering.Core" Version="1.0.0" />
-  </ItemGroup>
-
   <ItemGroup>
     <ProjectReference Include="..\GiftShopContracts\GiftShopContracts.csproj" />
     <ProjectReference Include="..\GiftShopDataModels\GiftShopDataModels.csproj" />
   </ItemGroup>
 
-	<Target Name="PostBuild" AfterTargets="PostBuildEvent">
-		<Exec Command="copy /Y &quot;$(TargetDir)*.dll&quot; &quot;$(SolutionDir)ImplementationExtensions\*.dll&quot;" />
-	</Target>
-
 </Project>

GiftShop/GiftShopFileImplement/Implements/BackUpInfo.cs

@@ -1,32 +0,0 @@
-using GiftShopContracts.StoragesContracts;
-
-namespace GiftShopFileImplement.Implements
-{
-	public class BackUpInfo : IBackUpInfo
-	{
-		public List<T>? GetList<T>() where T : class, new()
-		{
-			var source = DataFileSingleton.GetInstance();
-
-			return (List<T>?)source.GetType().GetProperties()
-				.FirstOrDefault(x => x.PropertyType.IsGenericType && x.PropertyType.GetGenericArguments()[0] == typeof(T))
-				?.GetValue(source);
-		}
-
-		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;
-		}
-	}
-}

GiftShop/GiftShopFileImplement/Models/Client.cs

@@ -1,24 +1,18 @@
 using GiftShopContracts.BindingModels;
 using GiftShopContracts.ViewModels;
 using GiftShopDataModels.Models;
-using System.Runtime.Serialization;
 using System.Xml.Linq;
 
 namespace GiftShopFileImplement.Models
 {
-	[DataContract]
     public class Client : IClientModel
     {
-		[DataMember]
         public int Id { get; private set; }
         
-		[DataMember]
         public string ClientFIO { get; private set; } = string.Empty;
         
-		[DataMember]
         public string Email { get; set; } = string.Empty;
         
-		[DataMember]
         public string Password { get; set; } = string.Empty;
         
         public static Client? Create(ClientBindingModel model)

GiftShop/GiftShopFileImplement/Models/Component.cs

@@ -1,21 +1,16 @@
 using GiftShopContracts.BindingModels;
 using GiftShopContracts.ViewModels;
 using GiftShopDataModels.Models;
-using System.Runtime.Serialization;
 using System.Xml.Linq;
 
 namespace GiftShopFileImplement.Models
 {
-	[DataContract]
+    internal class Component : IComponentModel
-	public class Component : IComponentModel
     {
-		[DataMember]
         public int Id { get; private set; }
         
-		[DataMember]
         public string ComponentName { get; private set; } = string.Empty;
 
-		[DataMember]
         public double Cost { get; set; }
 
         public static Component? Create(ComponentBindingModel model) 

GiftShop/GiftShopFileImplement/Models/Gift.cs

@@ -1,28 +1,22 @@
 using GiftShopContracts.BindingModels;
 using GiftShopContracts.ViewModels;
 using GiftShopDataModels.Models;
-using System.Runtime.Serialization;
 using System.Xml.Linq;
 
 namespace GiftShopFileImplement.Models
 {
-	[DataContract]
+    internal class Gift : IGiftModel
-	public class Gift : IGiftModel
     {
-		[DataMember]
         public int Id { get; private set; }
 
-		[DataMember]
         public string GiftName { get; private set; } = string.Empty;
 
-		[DataMember]
         public double Price { get; private set; }
 
         public Dictionary<int, int> Components { get; private set; } = new();
 
         private Dictionary<int, (IComponentModel, int)>? _giftComponents = null;
 
-		[DataMember]
         public Dictionary<int, (IComponentModel, int)> GiftComponents 
         {
             get 

GiftShop/GiftShopFileImplement/Models/Implementer.cs

@@ -1,27 +1,20 @@
 using GiftShopContracts.BindingModels;
 using GiftShopContracts.ViewModels;
 using GiftShopDataModels.Models;
-using System.Runtime.Serialization;
 using System.Xml.Linq;
 
 namespace GiftShopFileImplement.Models
 {
-	[DataContract]
 	public class Implementer : IImplementerModel
 	{
-		[DataMember]
 		public string ImplementerFIO { get; private set; } = string.Empty;
 
-		[DataMember]
 		public string Password { get; private set; } = string.Empty;
 
-		[DataMember]
 		public int WorkExperience { get; private set; }
 
-		[DataMember]
 		public int Qualification { get; private set; }
 
-		[DataMember]
 		public int Id { get; private set; }
 
 		public static Implementer? Create(XElement element)

GiftShop/GiftShopFileImplement/Models/Message.cs

@@ -1,30 +1,22 @@
 using GiftShopContracts.BindingModels;
 using GiftShopContracts.ViewModels;
 using GiftShopDataModels.Models;
-using System.Runtime.Serialization;
 using System.Xml.Linq;
 
 namespace GiftShopFileImplement.Models
 {
-	[DataContract]
 	public class Message : IMessageInfoModel
 	{
-		[DataMember]
 		public string MessageId { get; private set; } = string.Empty;
 
-		[DataMember]
 		public int? ClientId { get; private set; }
 
-		[DataMember]
 		public string SenderName { get; private set; } = string.Empty;
 
-		[DataMember]
 		public DateTime DateDelivery { get; private set; } = DateTime.Now;
 
-		[DataMember]
 		public string Subject { get; private set; } = string.Empty;
 
-		[DataMember]
 		public string Body { get; private set; } = string.Empty;
 		public static Message? Create(MessageInfoBindingModel model)
 		{
@@ -78,6 +70,5 @@ namespace GiftShopFileImplement.Models
 			new XAttribute("SenderName", SenderName),
 			new XAttribute("DateDelivery", DateDelivery)
 			);
-		public int Id => throw new NotImplementedException();
 	}
 }

GiftShop/GiftShopFileImplement/Models/Order.cs

@@ -2,42 +2,30 @@
 using GiftShopContracts.ViewModels;
 using GiftShopDataModels.Enums;
 using GiftShopDataModels.Models;
-using System.Runtime.Serialization;
 using System.Xml.Linq;
 
 namespace GiftShopFileImplement.Models
 {
-	[DataContract]
+    internal class Order : IOrderModel
-	public class Order : IOrderModel
     {
-		[DataMember]
         public int GiftId { get; private set; }
 
-		[DataMember]
 		public int? ImplementerId { get; set; }
 
-		[DataMember]
 		public int ClientId { get; private set; }
 
-		[DataMember]
 		public string GiftName { get; private set; } = string.Empty;
 
-		[DataMember]
 		public int Count { get; private set; }
 
-		[DataMember]
         public double Sum { get; private set; }
 
-		[DataMember]
         public OrderStatus Status { get; private set; } = OrderStatus.Неизвестен;
 
-		[DataMember]
         public DateTime DateCreate { get; private set; } = DateTime.Now;
 
-		[DataMember]
         public DateTime? DateImplement { get; private set; }
 
-		[DataMember]
         public int Id { get; private set; }
 
         public static Order? Create(OrderBindingModel? model)
@@ -71,22 +59,18 @@ namespace GiftShopFileImplement.Models
 			{
 				Id = Convert.ToInt32(element.Attribute("Id")!.Value),
 				GiftId = Convert.ToInt32(element.Element("GiftId")!.Value),
-				ClientId = Convert.ToInt32(element.Element("ClientId")!.Value),
+				GiftName = element.Element("GiftName")!.Value,
 				Count = Convert.ToInt32(element.Element("Count")!.Value),
 				Sum = Convert.ToDouble(element.Element("Sum")!.Value),
-				Status = (OrderStatus)Convert.ToInt32(element.Element("Status")!.Value),
+				ImplementerId = Convert.ToInt32(element.Element("ImplementerId")!.Value),
-				DateCreate = DateTime.ParseExact(element.Element("DateCreate")!.Value, "G", null),
+				ClientId = Convert.ToInt32(element.Element("ClientId")!.Value),
+				Status = (OrderStatus)Enum.Parse(typeof(OrderStatus), element.Element("Status")!.Value),
+				DateCreate = DateTime.ParseExact(element.Element("DateCreate")!.Value, "G", null)
 			};
 
             DateTime.TryParse(element.Element("DateImplement")!.Value, out DateTime dateImpl);
             order.DateImplement = dateImpl;
 
-			if (!Enum.TryParse(element.Element("Status")!.Value, out OrderStatus status))
-			{
-				return null;
-			}
-			order.Status = status;
-
             return order;
         }
 

GiftShop/GiftShopListImplement/GiftShopListImplement.csproj

@@ -8,12 +8,7 @@
 
   <ItemGroup>
     <ProjectReference Include="..\GiftShopContracts\GiftShopContracts.csproj" />
-    <ProjectReference Include="..\GiftShopDatabaseImplement\GiftShopDatabaseImplement.csproj" />
     <ProjectReference Include="..\GiftShopDataModels\GiftShopDataModels.csproj" />
   </ItemGroup>
 
-  <Target Name="PostBuild" AfterTargets="PostBuildEvent">
-    <Exec Command="copy /Y &quot;$(TargetDir)*.dll&quot; &quot;$(SolutionDir)ImplementationExtensions\*.dll&quot;" />
-  </Target>
-
 </Project>

GiftShop/GiftShopListImplement/Implements/BackUpInfo.cs

@@ -1,17 +0,0 @@
-using GiftShopContracts.StoragesContracts;
-
-namespace GiftShopListImplement.Implements
-{
-	public class BackUpInfo : IBackUpInfo
-	{
-		public List<T>? GetList<T>() where T : class, new()
-		{
-			throw new NotImplementedException();
-		}
-
-		public Type? GetTypeByModelInterface(string modelInterfaceName)
-		{
-			throw new NotImplementedException();
-		}
-	}
-}

GiftShop/GiftShopListImplement/ListImplementationExtension.cs

@@ -1,23 +0,0 @@
-using GiftShopContracts.DI;
-using GiftShopContracts.StoragesContracts;
-using GiftShopListImplement.Implements;
-
-namespace GiftShopListImplement
-{
-	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<IGiftStorage, GiftStorage>();
-			DependencyManager.Instance.RegisterType<IBackUpInfo, BackUpInfo>();
-		}
-	}
-
-}

GiftShop/GiftShopListImplement/Models/Message.cs

@@ -44,7 +44,5 @@ namespace GiftShopListImplement.Models
 			ClientId = ClientId,
 			MessageId = MessageId
 		};
-
-		public int Id => throw new NotImplementedException();
 	}
 }

GiftShop/GiftShopView/DataGridViewExtension.cs

@@ -1,47 +0,0 @@
-using GiftShopContracts.Attributes;
-
-namespace GiftShopView
-{
-	public 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;
-					}
-				}
-			}
-		}
-	}
-}

GiftShop/GiftShopView/FormClients.cs

@@ -26,9 +26,14 @@ namespace GiftShopView
         {
             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)
             {

GiftShop/GiftShopView/FormComponents.cs

@@ -1,6 +1,5 @@
 using GiftShopContracts.BindingModels;
 using GiftShopContracts.BusinessLogicsContracts;
-using GiftShopContracts.DI;
 using Microsoft.Extensions.Logging;
 
 namespace GiftShopView
@@ -27,7 +26,14 @@ namespace GiftShopView
         {
             try
             {
-				dataGridView.FillandConfigGrid(_logic.ReadList(null));
+                var list = _logic.ReadList(null);
+                if (list != null)
+                {
+                    dataGridView.DataSource = list;
+                    dataGridView.Columns["Id"].Visible = false;
+                    dataGridView.Columns["ComponentName"].AutoSizeMode =
+                   DataGridViewAutoSizeColumnMode.Fill;
+                }
                 _logger.LogInformation("Загрузка компонентов");
             }
             catch (Exception ex)
@@ -40,25 +46,34 @@ namespace GiftShopView
 
         private void ButtonAdd_Click(object sender, EventArgs e)
         {
-			var form = DependencyManager.Instance.Resolve<FormComponent>();
+            var service =
+           Program.ServiceProvider?.GetService(typeof(FormComponent));
+            if (service is FormComponent form)
+            {
                 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>();
+                var service =
-				form.Id = Convert.ToInt32(dataGridView.SelectedRows[0].Cells["Id"].Value);
+               Program.ServiceProvider?.GetService(typeof(FormComponent));
+                if (service is FormComponent form)
+                {
+                    form.Id =
+                   Convert.ToInt32(dataGridView.SelectedRows[0].Cells["Id"].Value);
                     if (form.ShowDialog() == DialogResult.OK)
                     {
                         LoadData();
                     }
                 }
             }
+        }
 
         private void ButtonDel_Click(object sender, EventArgs e)
         {

GiftShop/GiftShopView/FormGift.cs

@@ -1,6 +1,5 @@
 using GiftShopContracts.BindingModels;
 using GiftShopContracts.BusinessLogicsContracts;
-using GiftShopContracts.DI;
 using GiftShopContracts.SearchModels;
 using GiftShopDataModels.Models;
 using Microsoft.Extensions.Logging;
@@ -80,8 +79,9 @@ namespace GiftShopView
 
         private void ButtonAdd_Click(object sender, EventArgs e)
         {
-			var form = DependencyManager.Instance.Resolve<FormGiftComponent>();
+            var service = Program.ServiceProvider?.GetService(typeof(FormGiftComponent));
-
+            if (service is FormGiftComponent form)
+            {
                 if (form.ShowDialog() == DialogResult.OK)
                 {
                     if (form.ComponentModel == null)
@@ -100,14 +100,18 @@ namespace GiftShopView
                     LoadData();
                 }
             }
+        }
 
         private void ButtonUpd_Click(object sender, EventArgs e)
         {
             if (dataGridView.SelectedRows.Count == 1)
             {
-				var form = DependencyManager.Instance.Resolve<FormGiftComponent>();
+                var service =
-
+               Program.ServiceProvider?.GetService(typeof(FormGiftComponent));
-				int id = Convert.ToInt32(dataGridView.SelectedRows[0].Cells[0].Value);
+                if (service is FormGiftComponent form)
+                {
+                    int id =
+                   Convert.ToInt32(dataGridView.SelectedRows[0].Cells[0].Value);
                     form.Id = id;
                     form.Count = _giftComponents[id].Item2;
                     if (form.ShowDialog() == DialogResult.OK)
@@ -120,7 +124,7 @@ namespace GiftShopView
                         _giftComponents[form.Id] = (form.ComponentModel, form.Count);
                         LoadData();
                     }
-
+                }
             }
         }
 

GiftShop/GiftShopView/FormGifts.cs

@@ -1,6 +1,5 @@
 using GiftShopContracts.BindingModels;
 using GiftShopContracts.BusinessLogicsContracts;
-using GiftShopContracts.DI;
 using Microsoft.Extensions.Logging;
 
 namespace GiftShopView
@@ -27,7 +26,14 @@ namespace GiftShopView
         {
             try
             {
-				dataGridView.FillandConfigGrid(_logic.ReadList(null));
+                var list = _logic.ReadList(null);
+                if (list != null)
+                {
+                    dataGridView.DataSource = list;
+                    dataGridView.Columns["Id"].Visible = false;
+                    dataGridView.Columns["GiftName"].AutoSizeMode = DataGridViewAutoSizeColumnMode.Fill;
+                    dataGridView.Columns["GiftComponents"].Visible = false;
+                }
                 _logger.LogInformation("Загрузка изделий");
 
             }
@@ -40,26 +46,29 @@ namespace GiftShopView
 
         private void ButtonAdd_Click(object sender, EventArgs e)
         {
-			var form = DependencyManager.Instance.Resolve<FormGift>();
+            var service = Program.ServiceProvider?.GetService(typeof(FormGift));
-
+            if (service is FormGift form)
+            {
                 if (form.ShowDialog() == DialogResult.OK)
                 {
                     LoadData();
                 }
             }
+        }
 
         private void ButtonUpd_Click(object sender, EventArgs e)
         {
             if (dataGridView.SelectedRows.Count == 1)
             {
-				var form = DependencyManager.Instance.Resolve<FormGift>();
+                var service = Program.ServiceProvider?.GetService(typeof(FormGift));
-
+                if (service is FormGift form)
+                {
                     form.Id = Convert.ToInt32(dataGridView.SelectedRows[0].Cells["Id"].Value);
                     if (form.ShowDialog() == DialogResult.OK)
                     {
                         LoadData();
                     }
-
+                }
             }
         }
 

GiftShop/GiftShopView/FormImplementers.cs

@@ -1,6 +1,5 @@
 using GiftShopContracts.BindingModels;
 using GiftShopContracts.BusinessLogicsContracts;
-using GiftShopContracts.DI;
 using Microsoft.Extensions.Logging;
 
 namespace GiftShopView
@@ -18,25 +17,30 @@ namespace GiftShopView
 
 		private void AddButton_Click(object sender, EventArgs e)
 		{
-			var form = DependencyManager.Instance.Resolve<FormImplementer>();
+			var service = Program.ServiceProvider?.GetService(typeof(FormImplementer));
 
+			if (service is FormImplementer form)
+			{
 				if (form.ShowDialog() == DialogResult.OK)
 				{
 					LoadData();
 				}
 			}
+		}
 
 		private void ChangeButton_Click(object sender, EventArgs e)
 		{
 			if (DataGridView.SelectedRows.Count == 1)
 			{
-				var form = DependencyManager.Instance.Resolve<FormImplementer>();
+				var service = Program.ServiceProvider?.GetService(typeof(FormImplementer));
+				if (service is FormImplementer form)
+				{
 					form.Id = Convert.ToInt32(DataGridView.SelectedRows[0].Cells["Id"].Value);
 					if (form.ShowDialog() == DialogResult.OK)
 					{
 						LoadData();
 					}
-
+				}
 			}
 		}
 
@@ -85,7 +89,15 @@ namespace GiftShopView
 		{
 			try
 			{
-				DataGridView.FillandConfigGrid(_logic.ReadList(null));
+				var list = _logic.ReadList(null);
+
+				if (list != null)
+				{
+					DataGridView.DataSource = list;
+					DataGridView.Columns["Id"].Visible = false;
+					DataGridView.Columns["ImplementerFIO"].AutoSizeMode = DataGridViewAutoSizeColumnMode.Fill;
+				}
+
 				_logger.LogInformation("Загрузка исполнителей");
 			}
 

GiftShop/GiftShopView/FormMails.cs

@@ -19,7 +19,14 @@ namespace GiftShopView
         {
             try
             {
-				dataGridView.FillandConfigGrid(_logic.ReadList(null));
+                var list = _logic.ReadList(null);
+                if (list != null)
+                {
+                    dataGridView.DataSource = list;
+                    dataGridView.Columns["ClientId"].Visible = false;
+                    dataGridView.Columns["MessageId"].Visible = false;
+                    dataGridView.Columns["Body"].AutoSizeMode = DataGridViewAutoSizeColumnMode.Fill;
+                }
                 _logger.LogInformation("Загрузка писем");
             }
             catch (Exception ex)

GiftShop/GiftShopView/FormMain.Designer.cs

@@ -39,12 +39,11 @@
 			компонентыПоИзделиямToolStripMenuItem = new ToolStripMenuItem();
 			списокЗаказовToolStripMenuItem = new ToolStripMenuItem();
 			запускРаботToolStripMenuItem = new ToolStripMenuItem();
-			письмаToolStripMenuItem = new ToolStripMenuItem();
 			dataGridView = new DataGridView();
 			buttonCreateOrder = new Button();
 			buttonIssuedOrder = new Button();
 			buttonRef = new Button();
-			создатьБекапToolStripMenuItem = new ToolStripMenuItem();
+			письмаToolStripMenuItem = new ToolStripMenuItem();
 			menuStrip.SuspendLayout();
 			((System.ComponentModel.ISupportInitialize)dataGridView).BeginInit();
 			SuspendLayout();
@@ -52,7 +51,7 @@
 			// menuStrip
 			// 
 			menuStrip.ImageScalingSize = new Size(20, 20);
-			menuStrip.Items.AddRange(new ToolStripItem[] { справочникиToolStripMenuItem, отчётыToolStripMenuItem, запускРаботToolStripMenuItem, письмаToolStripMenuItem, создатьБекапToolStripMenuItem });
+			menuStrip.Items.AddRange(new ToolStripItem[] { справочникиToolStripMenuItem, отчётыToolStripMenuItem, запускРаботToolStripMenuItem, письмаToolStripMenuItem });
 			menuStrip.Location = new Point(0, 0);
 			menuStrip.Name = "menuStrip";
 			menuStrip.Size = new Size(1367, 28);
@@ -69,28 +68,28 @@
 			// компонентыToolStripMenuItem
 			// 
 			компонентыToolStripMenuItem.Name = "компонентыToolStripMenuItem";
-			компонентыToolStripMenuItem.Size = new Size(224, 26);
+			компонентыToolStripMenuItem.Size = new Size(185, 26);
 			компонентыToolStripMenuItem.Text = "Компоненты";
 			компонентыToolStripMenuItem.Click += КомпонентыToolStripMenuItem_Click;
 			// 
 			// изделияToolStripMenuItem
 			// 
 			изделияToolStripMenuItem.Name = "изделияToolStripMenuItem";
-			изделияToolStripMenuItem.Size = new Size(224, 26);
+			изделияToolStripMenuItem.Size = new Size(185, 26);
 			изделияToolStripMenuItem.Text = "Изделия";
 			изделияToolStripMenuItem.Click += ИзделияToolStripMenuItem_Click;
 			// 
 			// клиентыToolStripMenuItem
 			// 
 			клиентыToolStripMenuItem.Name = "клиентыToolStripMenuItem";
-			клиентыToolStripMenuItem.Size = new Size(224, 26);
+			клиентыToolStripMenuItem.Size = new Size(185, 26);
 			клиентыToolStripMenuItem.Text = "Клиенты";
 			клиентыToolStripMenuItem.Click += ClientsToolStripMenuItem_Click;
 			// 
 			// исполнителиToolStripMenuItem
 			// 
 			исполнителиToolStripMenuItem.Name = "исполнителиToolStripMenuItem";
-			исполнителиToolStripMenuItem.Size = new Size(224, 26);
+			исполнителиToolStripMenuItem.Size = new Size(185, 26);
 			исполнителиToolStripMenuItem.Text = "Исполнители";
 			исполнителиToolStripMenuItem.Click += исполнителиToolStripMenuItem_Click;
 			// 
@@ -129,13 +128,6 @@
 			запускРаботToolStripMenuItem.Text = "Запуск работ";
 			запускРаботToolStripMenuItem.Click += запускРаботToolStripMenuItem_Click;
 			// 
-			// письмаToolStripMenuItem
-			// 
-			письмаToolStripMenuItem.Name = "письмаToolStripMenuItem";
-			письмаToolStripMenuItem.Size = new Size(77, 24);
-			письмаToolStripMenuItem.Text = "Письма";
-			письмаToolStripMenuItem.Click += письмаToolStripMenuItem_Click;
-			// 
 			// dataGridView
 			// 
 			dataGridView.BackgroundColor = SystemColors.ControlLightLight;
@@ -177,12 +169,12 @@
 			buttonRef.UseVisualStyleBackColor = true;
 			buttonRef.Click += ButtonRef_Click;
 			// 
-			// создатьБекапToolStripMenuItem
+			// письмаToolStripMenuItem
 			// 
-			создатьБекапToolStripMenuItem.Name = "создатьБекапToolStripMenuItem";
+			письмаToolStripMenuItem.Name = "письмаToolStripMenuItem";
-			создатьБекапToolStripMenuItem.Size = new Size(123, 24);
+			письмаToolStripMenuItem.Size = new Size(77, 24);
-			создатьБекапToolStripMenuItem.Text = "Создать бекап";
+			письмаToolStripMenuItem.Text = "Письма";
-			создатьБекапToolStripMenuItem.Click += создатьБекапToolStripMenuItem_Click;
+			письмаToolStripMenuItem.Click += письмаToolStripMenuItem_Click;
 			// 
 			// FormMain
 			// 
@@ -223,6 +215,5 @@
 		private ToolStripMenuItem исполнителиToolStripMenuItem;
 		private ToolStripMenuItem запускРаботToolStripMenuItem;
 		private ToolStripMenuItem письмаToolStripMenuItem;
-		private ToolStripMenuItem создатьБекапToolStripMenuItem;
 	}
 }

GiftShop/GiftShopView/FormMain.cs

@@ -1,6 +1,5 @@
 using GiftShopContracts.BindingModels;
 using GiftShopContracts.BusinessLogicsContracts;
-using GiftShopContracts.DI;
 using GiftShopDataModels.Enums;
 using Microsoft.Extensions.Logging;
 
@@ -16,16 +15,13 @@ namespace GiftShopView
 
 		private readonly IWorkProcess _workProcess;
 
-		private readonly IBackUpLogic _backUpLogic;
+		public FormMain(ILogger<FormMain> logger, IOrderLogic orderLogic, IReportLogic reportLogic, IWorkProcess workProcess)
-
-		public FormMain(ILogger<FormMain> logger, IOrderLogic orderLogic, IReportLogic reportLogic, IWorkProcess workProcess, IBackUpLogic backUpLogic)
 		{
 			InitializeComponent();
 			_logger = logger;
 			_orderLogic = orderLogic;
 			_reportLogic = reportLogic;
 			_workProcess = workProcess;
-			_backUpLogic = backUpLogic;
 		}
 
 		private void FormMain_Load(object sender, EventArgs e)
@@ -38,7 +34,15 @@ namespace GiftShopView
 			_logger.LogInformation("Загрузка заказов");
 			try
 			{
-				dataGridView.FillandConfigGrid(_orderLogic.ReadList(null));
+				var list = _orderLogic.ReadList(null);
+				if (list != null)
+				{
+					dataGridView.DataSource = list;
+					dataGridView.Columns["GiftId"].Visible = false;
+					dataGridView.Columns["GiftName"].AutoSizeMode = DataGridViewAutoSizeColumnMode.Fill;
+					dataGridView.Columns["ClientId"].Visible = false;
+					dataGridView.Columns["ImplementerId"].Visible = false;
+				}
 				_logger.LogInformation("Загрузка заказов");
 			}
 			catch (Exception ex)
@@ -50,21 +54,31 @@ namespace GiftShopView
 
 		private void КомпонентыToolStripMenuItem_Click(object sender, EventArgs e)
 		{
-			var form = DependencyManager.Instance.Resolve<FormComponents>();
+			var service = Program.ServiceProvider?.GetService(typeof(FormComponents));
+			if (service is FormComponents form)
+			{
 				form.ShowDialog();
 			}
+		}
 
 		private void ИзделияToolStripMenuItem_Click(object sender, EventArgs e)
 		{
-			var form = DependencyManager.Instance.Resolve<FormGifts>();
+			var service = Program.ServiceProvider?.GetService(typeof(FormGifts));
+			if (service is FormGifts form)
+			{
 				form.ShowDialog();
 			}
+		}
+
 		private void ButtonCreateOrder_Click(object sender, EventArgs e)
 		{
-			var form = DependencyManager.Instance.Resolve<FormCreateOrder>();
+			var service = Program.ServiceProvider?.GetService(typeof(FormCreateOrder));
+			if (service is FormCreateOrder form)
+			{
 				form.ShowDialog();
 				LoadData();
 			}
+		}
 
 		private void ButtonIssuedOrder_Click(object sender, EventArgs e)
 		{
@@ -121,65 +135,56 @@ namespace GiftShopView
 
 		private void ComponentGiftsToolStripMenuItem_Click(object sender, EventArgs e)
 		{
-			var form = DependencyManager.Instance.Resolve<FormReportGiftComponents>();
+			var service = Program.ServiceProvider?.GetService(typeof(FormReportGiftComponents));
+
+			if (service is FormReportGiftComponents form)
+			{
 				form.ShowDialog();
 			}
+		}
 
 		private void OrdersToolStripMenuItem_Click(object sender, EventArgs e)
 		{
-			var form = DependencyManager.Instance.Resolve<FormReportOrders>();
+			var service = Program.ServiceProvider?.GetService(typeof(FormReportOrders));
+
+			if (service is FormReportOrders form)
+			{
 				form.ShowDialog();
 			}
+		}
 
 		private void ClientsToolStripMenuItem_Click(object sender, EventArgs e)
 		{
-			var form = DependencyManager.Instance.Resolve<FormClients>();
+			var service = Program.ServiceProvider?.GetService(typeof(FormClients));
+			if (service is FormClients form)
+			{
 				form.ShowDialog();
 			}
+		}
 
 		private void исполнителиToolStripMenuItem_Click(object sender, EventArgs e)
 		{
-			var form = DependencyManager.Instance.Resolve<FormImplementers>();
+			var service = Program.ServiceProvider?.GetService(typeof(FormImplementers));
+			if (service is FormImplementers form)
+			{
 				form.ShowDialog();
 			}
+		}
 
 		private void запускРаботToolStripMenuItem_Click(object sender, EventArgs e)
 		{
-
+			_workProcess.DoWork((Program.ServiceProvider?
-			_workProcess.DoWork(DependencyManager.Instance.Resolve<IImplementerLogic>(), _orderLogic);
+				.GetService(typeof(IImplementerLogic)) as IImplementerLogic)!, _orderLogic);
 			MessageBox.Show("Процесс обработки запущен", "Сообщение", MessageBoxButtons.OK, MessageBoxIcon.Information);
-
 		}
 
 		private void письмаToolStripMenuItem_Click(object sender, EventArgs e)
 		{
-			var form = DependencyManager.Instance.Resolve<FormMails>();
+			var service = Program.ServiceProvider?.GetService(typeof(FormMails));
+			if (service is FormMails form)
+			{
 				form.ShowDialog();
 			}
-
-		private void создатьБекапToolStripMenuItem_Click(object sender, EventArgs e)
-		{
-			try
-			{
-				if (_backUpLogic != null)
-				{
-					var fbd = new FolderBrowserDialog();
-					if (fbd.ShowDialog() == DialogResult.OK)
-					{
-						_backUpLogic.CreateBackUp(new BackUpSaveBinidngModel
-						{
-							FolderName = fbd.SelectedPath
-						});
-						MessageBox.Show("Бекап создан", "Сообщение",
-					   MessageBoxButtons.OK, MessageBoxIcon.Information);
-					}
-				}
-			}
-			catch (Exception ex)
-			{
-				MessageBox.Show(ex.Message, "Ошибка", MessageBoxButtons.OK,
-			   MessageBoxIcon.Error);
-			}
 		}
 	}
 }

GiftShop/GiftShopView/GiftShopView.csproj

@@ -26,7 +26,7 @@
     <PackageReference Include="Microsoft.Extensions.Configuration" Version="7.0.0" />
     <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="7.0.0" />
     <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="7.0.0" />
-    <PackageReference Include="NLog.Extensions.Logging" Version="5.3.0" />
+    <PackageReference Include="NLog.Extensions.Logging" Version="5.2.2" />
     <PackageReference Include="ReportViewerCore.WinForms" Version="15.1.17" />
   </ItemGroup>
 

GiftShop/GiftShopView/Program.cs

@@ -9,21 +9,23 @@ using Microsoft.Extensions.Logging;
 using NLog.Extensions.Logging;
 using GiftShopBusinessLogic.MailWorker;
 using GiftShopContracts.BindingModels;
-using GiftShopContracts.DI;
 
 namespace GiftShopView
 {
     internal static class Program
     {
+        private static ServiceProvider? _serviceProvider;
+        public static ServiceProvider? ServiceProvider => _serviceProvider;
         [STAThread]
         static void Main()
         {
             ApplicationConfiguration.Initialize();
             var services = new ServiceCollection();
-			InitDependency();
+            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,52 +40,55 @@ namespace GiftShopView
 			}
 			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()
+        private static void ConfigureServices(ServiceCollection services)
         {
-			DependencyManager.InitDependency();
+            services.AddLogging(option =>
-			DependencyManager.Instance.AddLogging(option =>
             {
                 option.SetMinimumLevel(LogLevel.Information);
                 option.AddNLog("nlog.config");
             });
-			DependencyManager.Instance.RegisterType<IComponentLogic, ComponentLogic>();
+            services.AddTransient<IComponentStorage, ComponentStorage>();
-			DependencyManager.Instance.RegisterType<IOrderLogic, OrderLogic>();
+            services.AddTransient<IOrderStorage, OrderStorage>();
-			DependencyManager.Instance.RegisterType<IGiftLogic, GiftLogic>();
+            services.AddTransient<IGiftStorage, GiftStorage>();
-			DependencyManager.Instance.RegisterType<IReportLogic, ReportLogic>();
+            services.AddTransient<IClientStorage, ClientStorage>();
-			DependencyManager.Instance.RegisterType<IClientLogic, ClientLogic>();
+			services.AddTransient<IImplementerStorage, ImplementerStorage>();
-			DependencyManager.Instance.RegisterType<IImplementerLogic, ImplementerLogic>();
+			services.AddTransient<IMessageInfoStorage, MessageInfoStorage>();
-			DependencyManager.Instance.RegisterType<IMessageInfoLogic, MessageInfoLogic>();
 
-			DependencyManager.Instance.RegisterType<AbstractSaveToExcel, SaveToExcel>();
+			services.AddTransient<IClientLogic, ClientLogic>();
-			DependencyManager.Instance.RegisterType<AbstractSaveToWord, SaveToWord>();
+            services.AddTransient<IComponentLogic, ComponentLogic>();
-			DependencyManager.Instance.RegisterType<AbstractSaveToPdf, SaveToPdf>();
+            services.AddTransient<IOrderLogic, OrderLogic>();
+            services.AddTransient<IGiftLogic, GiftLogic>();
+            services.AddTransient<IReportLogic, ReportLogic>();
+			services.AddTransient<IImplementerLogic, ImplementerLogic>();
+			services.AddTransient<IMessageInfoLogic, MessageInfoLogic>();
+			services.AddTransient<IWorkProcess, WorkModeling>();
 
-			DependencyManager.Instance.RegisterType<IWorkProcess, WorkModeling>();
+			services.AddTransient<AbstractSaveToExcel, SaveToExcel>();
-			DependencyManager.Instance.RegisterType<AbstractMailWorker, MailKitWorker>(true);
+            services.AddTransient<AbstractSaveToWord, SaveToWord>();
+            services.AddTransient<AbstractSaveToPdf, SaveToPdf>();
+			services.AddSingleton<AbstractMailWorker, MailKitWorker>();
 
-			DependencyManager.Instance.RegisterType<IBackUpLogic, BackUpLogic>();
+			services.AddTransient<FormMain>();
-			
+            services.AddTransient<FormComponent>();
-			DependencyManager.Instance.RegisterType<FormMain>();
+            services.AddTransient<FormComponents>();
-			DependencyManager.Instance.RegisterType<FormComponent>();
+            services.AddTransient<FormCreateOrder>();
-			DependencyManager.Instance.RegisterType<FormComponents>();
+            services.AddTransient<FormGift>();
-			DependencyManager.Instance.RegisterType<FormCreateOrder>();
+            services.AddTransient<FormGiftComponent>();
-			DependencyManager.Instance.RegisterType<FormGift>();
+            services.AddTransient<FormGifts>();
-			DependencyManager.Instance.RegisterType<FormGiftComponent>();
+            services.AddTransient<FormReportOrders>();
-			DependencyManager.Instance.RegisterType<FormGifts>();
+            services.AddTransient<FormReportGiftComponents>();
-			DependencyManager.Instance.RegisterType<FormReportGiftComponents>();
+            services.AddTransient<FormClients>();
-			DependencyManager.Instance.RegisterType<FormReportOrders>();
+			services.AddTransient<FormImplementer>();
-			DependencyManager.Instance.RegisterType<FormClients>();
+			services.AddTransient<FormImplementers>();
-			DependencyManager.Instance.RegisterType<FormImplementer>();
+			services.AddTransient<FormMails>();
-			DependencyManager.Instance.RegisterType<FormImplementers>();
-			DependencyManager.Instance.RegisterType<FormMails>();
 		}
 
-		private static void MailCheck(object obj) => DependencyManager.Instance.Resolve<AbstractMailWorker>()?.MailCheck();
+		private static void MailCheck(object obj) => ServiceProvider?.GetService<AbstractMailWorker>()?.MailCheck();
 	}
 }