Лаб7 - фикс

FoodOrders/AbstractFoodOrdersBusinessLogic/BusinessLogics/BackUpLogic.cs

@@ -1,102 +0,0 @@
-using AbstractFoodOrdersContracts.BindingModels;
-using AbstractFoodOrdersContracts.BusinessLogicsContracts;
-using AbstractFoodOrdersContracts.StoragesContracts;
-using AbstractFoodOrdersDataModels;
-using Microsoft.Extensions.Logging;
-using System;
-using System.Collections.Generic;
-using System.IO.Compression;
-using System.Linq;
-using System.Reflection;
-using System.Runtime.Serialization.Json;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace AbstractFoodOrdersBusinessLogic.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);
-		}
-	}
-}

FoodOrders/AbstractFoodOrdersContracts/AbstractFoodOrdersContracts.csproj

@@ -9,8 +9,6 @@
   <ItemGroup>
     <PackageReference Include="Microsoft.Extensions.Logging" Version="7.0.0" />
     <PackageReference Include="NLog.Extensions.Logging" Version="5.2.2" />
-    <PackageReference Include="Unity" Version="5.11.10" />
-    <PackageReference Include="Unity.Microsoft.Logging" Version="5.11.1" />
   </ItemGroup>
 
   <ItemGroup>

FoodOrders/AbstractFoodOrdersContracts/Attributes/ColumnAttribute.cs

@@ -1,28 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace AbstractFoodOrdersContracts.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; }
-	}
-}

FoodOrders/AbstractFoodOrdersContracts/Attributes/GridViewAutoSize.cs

@@ -1,20 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace AbstractFoodOrdersContracts.Attributes
-{
-	public enum GridViewAutoSize
-	{
-		NotSet = 0,
-		None = 1,
-		ColumnHeader = 2,
-		AllCellsExceptHeader = 4,
-		AllCells = 6,
-		DisplayedCellsExceptHeader = 8,
-		DisplayedCells = 10,
-		Fill = 16
-	}
-}

FoodOrders/AbstractFoodOrdersContracts/BindingModels/BackUpSaveBinidngModel.cs

@@ -1,13 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace AbstractFoodOrdersContracts.BindingModels
-{
-	public class BackUpSaveBinidngModel
-	{
-		public string FolderName { get; set; } = string.Empty;
-	}
-}

FoodOrders/AbstractFoodOrdersContracts/BindingModels/MessageInfoBindingModel.cs

@@ -15,6 +15,5 @@ namespace AbstractFoodOrdersContracts.BindingModels
 		public DateTime DateDelivery { get; set; }
 		public string Subject { get; set; } = string.Empty;
 		public string Body { get; set; } = string.Empty;
-		public int Id { get; set; }
 	}
 }

FoodOrders/AbstractFoodOrdersContracts/BusinessLogicsContracts/IBackUpLogic.cs

@@ -1,14 +0,0 @@
-using AbstractFoodOrdersContracts.BindingModels;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace AbstractFoodOrdersContracts.BusinessLogicsContracts
-{
-	public interface IBackUpLogic
-	{
-		void CreateBackUp(BackUpSaveBinidngModel model);
-	}
-}

FoodOrders/AbstractFoodOrdersContracts/DI/DependencyManager.cs

@@ -1,60 +0,0 @@
-using Microsoft.Extensions.Logging;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace AbstractFoodOrdersContracts.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;
-			}
-		}
-
-		public static void InitDependency()
-		{
-			var ext = ServiceProviderLoader.GetImplementationExtensions();
-			if (ext == null)
-			{
-				throw new ArgumentNullException("Отсутствуют компоненты для загрузки зависимостей по модулям");
-			}
-			ext.RegisterServices();
-		}
-
-		public void AddLogging(Action<ILoggingBuilder> configure) => _dependencyManager.AddLogging(configure);
-
-		public void RegisterType<T, U>(bool isSingle = false) where U : class, T where T : class => _dependencyManager.RegisterType<T, U>(isSingle);
-
-		public void RegisterType<T>(bool isSingle = false) where T : class => _dependencyManager.RegisterType<T>(isSingle);
-
-		public T Resolve<T>() => _dependencyManager.Resolve<T>();
-	}
-
-}

FoodOrders/AbstractFoodOrdersContracts/DI/IDependencyContainer.cs

@@ -1,41 +0,0 @@
-using Microsoft.Extensions.Logging;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace AbstractFoodOrdersContracts.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>();
-	}
-}

FoodOrders/AbstractFoodOrdersContracts/DI/IImplementationExtension.cs

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

FoodOrders/AbstractFoodOrdersContracts/DI/ServiceDependencyContainer.cs

@@ -1,62 +0,0 @@
-using Microsoft.Extensions.DependencyInjection;
-using Microsoft.Extensions.Logging;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace AbstractFoodOrdersContracts.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>()!;
-		}
-	}
-}

FoodOrders/AbstractFoodOrdersContracts/DI/ServiceProviderLoader.cs

@@ -1,66 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Reflection;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace AbstractFoodOrdersContracts.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";
-		}
-	}
-}

FoodOrders/AbstractFoodOrdersContracts/DI/UnityDependencyContainer.cs

@@ -1,55 +0,0 @@
-using Microsoft.Extensions.Logging;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using Unity;
-using Unity.Microsoft.Logging;
-
-namespace AbstractFoodOrdersContracts.DI
-{
-	public class UnityDependencyContainer : IDependencyContainer
-	{
-		private readonly UnityContainer _unityContainer;
-
-		public UnityDependencyContainer()
-		{
-			_unityContainer = new UnityContainer();
-		}
-
-		public void AddLogging(Action<ILoggingBuilder> configure)
-		{
-			_unityContainer.AddExtension(new LoggingExtension(LoggerFactory.Create(configure)));
-		}
-
-		public void RegisterType<T, U>(bool isSingle) where U : class, T where T : class
-		{
-			if (isSingle)
-			{
-				_unityContainer.RegisterSingleton<T, U>();
-			}
-			else
-			{
-				_unityContainer.RegisterType<T, U>();
-			}
-		}
-
-		public void RegisterType<T>(bool isSingle) where T : class
-		{
-			if (isSingle)
-			{
-				_unityContainer.RegisterSingleton<T>();
-			}
-			else
-			{
-				_unityContainer.RegisterType<T>();
-			}
-		}
-
-		public T Resolve<T>()
-		{
-			return _unityContainer.Resolve<T>();
-		}
-	}
-}

FoodOrders/AbstractFoodOrdersContracts/StoragesContracts/IBackUpInfo.cs

@@ -1,14 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace AbstractFoodOrdersContracts.StoragesContracts
-{
-	public interface IBackUpInfo
-	{
-		List<T>? GetList<T>() where T : class, new();
-		Type? GetTypeByModelInterface(string modelInterfaceName);
-	}
-}

FoodOrders/AbstractFoodOrdersContracts/ViewModels/ClientViewModel.cs

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

FoodOrders/AbstractFoodOrdersContracts/ViewModels/ComponentViewModel.cs

@@ -1,5 +1,4 @@
-using AbstractFoodOrdersContracts.Attributes;
-using AbstractFoodOrdersDataModels.Models;
+using AbstractFoodOrdersDataModels.Models;
 using System;
 using System.Collections.Generic;
 using System.ComponentModel;
@@ -11,12 +10,11 @@ namespace AbstractFoodOrdersContracts.ViewModels
 {
     public class ComponentViewModel : IComponentModel
     {
-		[Column(visible: false)]
-		public int Id { get; set; }
-		[Column(title: "Название компонента", gridViewAutoSize: GridViewAutoSize.Fill, isUseAutoSize: true)]
-		public string ComponentName { get; set; } = string.Empty;
-		[Column(title: "Цена", width: 50)]
-		public double Cost { get; set; }
-	}
+        public int Id { get; set; }
+        [DisplayName("Название компонента")]
+        public string ComponentName { get; set; } = string.Empty;
+        [DisplayName("Цена")]
+        public double Cost { get; set; }
+    }
 
 }

FoodOrders/AbstractFoodOrdersContracts/ViewModels/DishViewModel.cs

@@ -1,5 +1,4 @@
-using AbstractFoodOrdersContracts.Attributes;
-using AbstractFoodOrdersDataModels.Models;
+using AbstractFoodOrdersDataModels.Models;
 using System;
 using System.Collections.Generic;
 using System.ComponentModel;
@@ -11,18 +10,12 @@ namespace AbstractFoodOrdersContracts.ViewModels
 {
     public class DishViewModel : IDishModel
     {
-		[Column(visible: false)]
-		public int Id { get; set; }
-		[Column(title: "Название блюда", gridViewAutoSize: GridViewAutoSize.Fill, isUseAutoSize: true)]
-		public string DishName { get; set; } = string.Empty;
-		[Column(title: "Цена", width: 75)]
-		public double Price { get; set; }
-		[Column(visible: false)]
-		public Dictionary<int, (IComponentModel, int)> DishComponents
-		{
-			get;
-			set;
-		} = new();
-	}
+        public int Id { get; set; }
+        [DisplayName("Название изделия")]
+        public string DishName { get; set; } = string.Empty;
+        [DisplayName("Цена")]
+        public double Price { get; set; }
+        public Dictionary<int, (IComponentModel, int)> DishComponents { get; set; } = new();
+    }
 
 }

FoodOrders/AbstractFoodOrdersContracts/ViewModels/ImplementerViewModel.cs

@@ -1,5 +1,4 @@
-using AbstractFoodOrdersContracts.Attributes;
-using AbstractFoodOrdersDataModels.Models;
+using AbstractFoodOrdersDataModels.Models;
 using System;
 using System.Collections.Generic;
 using System.ComponentModel;
@@ -11,15 +10,14 @@ namespace AbstractFoodOrdersContracts.ViewModels
 {
 	public class ImplementerViewModel:IImplementerModel
 	{
-		[Column(visible: false)]
 		public int Id { get; set; }
-		[Column(title: "ФИО", width: 150)]
+		[DisplayName("ФИО")]
 		public string ImplementerFIO { get; set; } = String.Empty;
-		[Column(title: "Пароль", width: 150)]
+		[DisplayName("Пароль")]
 		public string Password { get; set; } = String.Empty;
-		[Column(title: "Опыт работы", width: 120)]
+		[DisplayName("Опыт работы")]
 		public int WorkExperience { get; set; }
-		[Column(title: "Квалификация", width: 120)]
+		[DisplayName("Квалификация")]
 		public int Qualification { get; set; }
 	}
 }

FoodOrders/AbstractFoodOrdersContracts/ViewModels/MessageInfoViewModel.cs

@@ -1,5 +1,4 @@
-using AbstractFoodOrdersContracts.Attributes;
-using AbstractFoodOrdersDataModels.Models;
+using AbstractFoodOrdersDataModels.Models;
 using System;
 using System.Collections.Generic;
 using System.ComponentModel;
@@ -11,20 +10,15 @@ namespace AbstractFoodOrdersContracts.ViewModels
 {
 	public class MessageInfoViewModel:IMessageInfoModel
 	{
-		[Column(visible: false)]
 		public string MessageId { get; set; } = string.Empty;
-		[Column(visible: false)]
 		public int? ClientId { get; set; }
-		[Column(title: "Отправитель", width: 100)]
+		[DisplayName("Отправитель")]
 		public string SenderName { get; set; } = string.Empty;
-		[Column(title: "Доставлено", width: 100)]
+		[DisplayName("Доставлено")]
 		public DateTime DateDelivery { get; set; }
-		[Column(title: "Заголовок", width: 75)]
+		[DisplayName("Заголовок")]
 		public string Subject { get; set; } = string.Empty;
-		[Column(title: "Текст", gridViewAutoSize: GridViewAutoSize.Fill, isUseAutoSize: true)]
+		[DisplayName("Текст")]
 		public string Body { get; set; } = string.Empty;
-
-		[Column(visible: false)]
-		public int Id { get; set; }
 	}
 }

FoodOrders/AbstractFoodOrdersContracts/ViewModels/OrderViewModel.cs

@@ -1,5 +1,4 @@
-using AbstractFoodOrdersContracts.Attributes;
-using AbstractFoodOrdersDataModels.Enums;
+using AbstractFoodOrdersDataModels.Enums;
 using AbstractFoodOrdersDataModels.Models;
 using System;
 using System.Collections.Generic;
@@ -12,31 +11,27 @@ namespace AbstractFoodOrdersContracts.ViewModels
 {
     public class OrderViewModel : IOrderModel
     {
-		[Column(title: "Номер", width: 80)]
-		public int Id { get; set; }
-		[Column(visible: false)]
-		public int DishId { get; set; }
-		[Column(title: "Блюдо", width: 90)]
-		public string DishName { get; set; } = string.Empty;
-		[Column(visible: false)]
+        [DisplayName("Номер")]
+        public int Id { get; set; }
+        public int DishId { get; set; }
+        [DisplayName("Изделие")]
+        public string DishName { get; set; } = string.Empty;
 		public int? ImplementerId { get; set; }
-		[Column(title: "Исполнитель", width: 120)]
+		[DisplayName("Исполнитель")]
 		public string? ImplementerFIO { get; set; }
-		[Column(visible: false)]
 		public int ClientId { get; set; }
-		[Column(title: "ФИО клиента", width: 120)]
-		public string ClientFIO { get; set; } = string.Empty;
-		[Column(visible: false)]
+        [DisplayName("ФИО клиента")]
+        public string ClientFIO { get; set; } = string.Empty;
 		public string ClientEmail { get; set; } = string.Empty;
-		[Column(title: "Количество", width: 100)]
-		public int Count { get; set; }
-		[Column(title: "Сумма", width: 100)]
-		public double Sum { get; set; }
-		[Column(title: "Статус", width: 100)]
-		public OrderStatus Status { get; set; } = OrderStatus.Неизвестен;
-		[Column(title: "Дата создания", width: 120)]
-		public DateTime DateCreate { get; set; } = DateTime.Now;
-		[Column(title: "Дата выполнения", width: 120)]
-		public DateTime? DateImplement { get; set; }
-	}
+		[DisplayName("Количество")]
+        public int Count { get; set; }
+        [DisplayName("Сумма")]
+        public double Sum { get; set; }
+        [DisplayName("Статус")]
+        public OrderStatus Status { get; set; } = OrderStatus.Неизвестен;
+        [DisplayName("Дата создания")]
+        public DateTime DateCreate { get; set; } = DateTime.Now;
+        [DisplayName("Дата выполнения")]
+        public DateTime? DateImplement { get; set; }
+    }
 }

FoodOrders/AbstractFoodOrdersDataModels/Models/IMessageInfoModel.cs

@@ -6,7 +6,7 @@ using System.Threading.Tasks;
 
 namespace AbstractFoodOrdersDataModels.Models
 {
-	public interface IMessageInfoModel:IId
+	public interface IMessageInfoModel
 	{
 		string MessageId { get; }
 		int? ClientId { get; }

FoodOrders/AbstractFoodOrdersDatabaseImplement/AbstractFoodOrdersDatabaseImplement.csproj

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

FoodOrders/AbstractFoodOrdersDatabaseImplement/DatabaseImplementationExtension.cs

@@ -1,27 +0,0 @@
-using AbstractFoodOrdersContracts.DI;
-using AbstractFoodOrdersContracts.StoragesContracts;
-using AbstractFoodOrdersDatabaseImplement.Implements;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace AbstractFoodOrdersDatabaseImplement
-{
-	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<IDishStorage, DishStorage>();
-			DependencyManager.Instance.RegisterType<IBackUpInfo, BackUpInfo>();
-		}
-	}
-}

FoodOrders/AbstractFoodOrdersDatabaseImplement/Implements/BackUpInfo.cs

@@ -1,32 +0,0 @@
-using AbstractFoodOrdersContracts.StoragesContracts;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace AbstractFoodOrdersDatabaseImplement.Implements
-{
-	public class BackUpInfo : IBackUpInfo
-	{
-		public List<T>? GetList<T>() where T : class, new()
-		{
-			using var context = new AbstractFoodOrdersDatabase();
-			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;
-		}
-	}
-}

FoodOrders/AbstractFoodOrdersDatabaseImplement/Migrations/20230601100316_MessageInfoUpdate.Designer.cs

@@ -1,285 +0,0 @@
-// <auto-generated />
-using System;
-using AbstractFoodOrdersDatabaseImplement;
-using Microsoft.EntityFrameworkCore;
-using Microsoft.EntityFrameworkCore.Infrastructure;
-using Microsoft.EntityFrameworkCore.Metadata;
-using Microsoft.EntityFrameworkCore.Migrations;
-using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
-
-#nullable disable
-
-namespace AbstractFoodOrdersDatabaseImplement.Migrations
-{
-    [DbContext(typeof(AbstractFoodOrdersDatabase))]
-    [Migration("20230601100316_MessageInfoUpdate")]
-    partial class MessageInfoUpdate
-    {
-        /// <inheritdoc />
-        protected override void BuildTargetModel(ModelBuilder modelBuilder)
-        {
-#pragma warning disable 612, 618
-            modelBuilder
-                .HasAnnotation("ProductVersion", "7.0.5")
-                .HasAnnotation("Relational:MaxIdentifierLength", 128);
-
-            SqlServerModelBuilderExtensions.UseIdentityColumns(modelBuilder);
-
-            modelBuilder.Entity("AbstractFoodOrdersDatabaseImplement.Models.Client", b =>
-                {
-                    b.Property<int>("Id")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("int");
-
-                    SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property<int>("Id"));
-
-                    b.Property<string>("ClientFIO")
-                        .IsRequired()
-                        .HasColumnType("nvarchar(max)");
-
-                    b.Property<string>("Email")
-                        .IsRequired()
-                        .HasColumnType("nvarchar(max)");
-
-                    b.Property<string>("Password")
-                        .IsRequired()
-                        .HasColumnType("nvarchar(max)");
-
-                    b.HasKey("Id");
-
-                    b.ToTable("Clients");
-                });
-
-            modelBuilder.Entity("AbstractFoodOrdersDatabaseImplement.Models.Component", b =>
-                {
-                    b.Property<int>("Id")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("int");
-
-                    SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property<int>("Id"));
-
-                    b.Property<string>("ComponentName")
-                        .IsRequired()
-                        .HasColumnType("nvarchar(max)");
-
-                    b.Property<double>("Cost")
-                        .HasColumnType("float");
-
-                    b.HasKey("Id");
-
-                    b.ToTable("Components");
-                });
-
-            modelBuilder.Entity("AbstractFoodOrdersDatabaseImplement.Models.Dish", b =>
-                {
-                    b.Property<int>("Id")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("int");
-
-                    SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property<int>("Id"));
-
-                    b.Property<string>("DishName")
-                        .IsRequired()
-                        .HasColumnType("nvarchar(max)");
-
-                    b.Property<double>("Price")
-                        .HasColumnType("float");
-
-                    b.HasKey("Id");
-
-                    b.ToTable("Dishes");
-                });
-
-            modelBuilder.Entity("AbstractFoodOrdersDatabaseImplement.Models.DishComponent", b =>
-                {
-                    b.Property<int>("Id")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("int");
-
-                    SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property<int>("Id"));
-
-                    b.Property<int>("ComponentId")
-                        .HasColumnType("int");
-
-                    b.Property<int>("Count")
-                        .HasColumnType("int");
-
-                    b.Property<int>("DishId")
-                        .HasColumnType("int");
-
-                    b.HasKey("Id");
-
-                    b.HasIndex("ComponentId");
-
-                    b.HasIndex("DishId");
-
-                    b.ToTable("DishComponents");
-                });
-
-            modelBuilder.Entity("AbstractFoodOrdersDatabaseImplement.Models.Implementer", b =>
-                {
-                    b.Property<int>("Id")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("int");
-
-                    SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property<int>("Id"));
-
-                    b.Property<string>("ImplementerFIO")
-                        .IsRequired()
-                        .HasColumnType("nvarchar(max)");
-
-                    b.Property<string>("Password")
-                        .IsRequired()
-                        .HasColumnType("nvarchar(max)");
-
-                    b.Property<int>("Qualification")
-                        .HasColumnType("int");
-
-                    b.Property<int>("WorkExperience")
-                        .HasColumnType("int");
-
-                    b.HasKey("Id");
-
-                    b.ToTable("Implementers");
-                });
-
-            modelBuilder.Entity("AbstractFoodOrdersDatabaseImplement.Models.MessageInfo", b =>
-                {
-                    b.Property<string>("MessageId")
-                        .HasColumnType("nvarchar(450)");
-
-                    b.Property<string>("Body")
-                        .IsRequired()
-                        .HasColumnType("nvarchar(max)");
-
-                    b.Property<int?>("ClientId")
-                        .HasColumnType("int");
-
-                    b.Property<DateTime>("DateDelivery")
-                        .HasColumnType("datetime2");
-
-                    b.Property<string>("SenderName")
-                        .IsRequired()
-                        .HasColumnType("nvarchar(max)");
-
-                    b.Property<string>("Subject")
-                        .IsRequired()
-                        .HasColumnType("nvarchar(max)");
-
-                    b.HasKey("MessageId");
-
-                    b.ToTable("MessageInfos");
-                });
-
-            modelBuilder.Entity("AbstractFoodOrdersDatabaseImplement.Models.Order", b =>
-                {
-                    b.Property<int>("Id")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("int");
-
-                    SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property<int>("Id"));
-
-                    b.Property<int>("ClientId")
-                        .HasColumnType("int");
-
-                    b.Property<int>("Count")
-                        .HasColumnType("int");
-
-                    b.Property<DateTime>("DateCreate")
-                        .HasColumnType("datetime2");
-
-                    b.Property<DateTime?>("DateImplement")
-                        .HasColumnType("datetime2");
-
-                    b.Property<int>("DishId")
-                        .HasColumnType("int");
-
-                    b.Property<int?>("ImplementerId")
-                        .HasColumnType("int");
-
-                    b.Property<int>("Status")
-                        .HasColumnType("int");
-
-                    b.Property<double>("Sum")
-                        .HasColumnType("float");
-
-                    b.HasKey("Id");
-
-                    b.HasIndex("ClientId");
-
-                    b.HasIndex("DishId");
-
-                    b.HasIndex("ImplementerId");
-
-                    b.ToTable("Orders");
-                });
-
-            modelBuilder.Entity("AbstractFoodOrdersDatabaseImplement.Models.DishComponent", b =>
-                {
-                    b.HasOne("AbstractFoodOrdersDatabaseImplement.Models.Component", "Component")
-                        .WithMany("DishComponents")
-                        .HasForeignKey("ComponentId")
-                        .OnDelete(DeleteBehavior.Cascade)
-                        .IsRequired();
-
-                    b.HasOne("AbstractFoodOrdersDatabaseImplement.Models.Dish", "Dish")
-                        .WithMany("Components")
-                        .HasForeignKey("DishId")
-                        .OnDelete(DeleteBehavior.Cascade)
-                        .IsRequired();
-
-                    b.Navigation("Component");
-
-                    b.Navigation("Dish");
-                });
-
-            modelBuilder.Entity("AbstractFoodOrdersDatabaseImplement.Models.Order", b =>
-                {
-                    b.HasOne("AbstractFoodOrdersDatabaseImplement.Models.Client", "Client")
-                        .WithMany("ClientOrders")
-                        .HasForeignKey("ClientId")
-                        .OnDelete(DeleteBehavior.Cascade)
-                        .IsRequired();
-
-                    b.HasOne("AbstractFoodOrdersDatabaseImplement.Models.Dish", "Dish")
-                        .WithMany("Orders")
-                        .HasForeignKey("DishId")
-                        .OnDelete(DeleteBehavior.Cascade)
-                        .IsRequired();
-
-                    b.HasOne("AbstractFoodOrdersDatabaseImplement.Models.Implementer", "Implementer")
-                        .WithMany("Orders")
-                        .HasForeignKey("ImplementerId");
-
-                    b.Navigation("Client");
-
-                    b.Navigation("Dish");
-
-                    b.Navigation("Implementer");
-                });
-
-            modelBuilder.Entity("AbstractFoodOrdersDatabaseImplement.Models.Client", b =>
-                {
-                    b.Navigation("ClientOrders");
-                });
-
-            modelBuilder.Entity("AbstractFoodOrdersDatabaseImplement.Models.Component", b =>
-                {
-                    b.Navigation("DishComponents");
-                });
-
-            modelBuilder.Entity("AbstractFoodOrdersDatabaseImplement.Models.Dish", b =>
-                {
-                    b.Navigation("Components");
-
-                    b.Navigation("Orders");
-                });
-
-            modelBuilder.Entity("AbstractFoodOrdersDatabaseImplement.Models.Implementer", b =>
-                {
-                    b.Navigation("Orders");
-                });
-#pragma warning restore 612, 618
-        }
-    }
-}

FoodOrders/AbstractFoodOrdersDatabaseImplement/Migrations/20230601100316_MessageInfoUpdate.cs

@@ -1,22 +0,0 @@
-using Microsoft.EntityFrameworkCore.Migrations;
-
-#nullable disable
-
-namespace AbstractFoodOrdersDatabaseImplement.Migrations
-{
-    /// <inheritdoc />
-    public partial class MessageInfoUpdate : Migration
-    {
-        /// <inheritdoc />
-        protected override void Up(MigrationBuilder migrationBuilder)
-        {
-
-        }
-
-        /// <inheritdoc />
-        protected override void Down(MigrationBuilder migrationBuilder)
-        {
-
-        }
-    }
-}

FoodOrders/AbstractFoodOrdersDatabaseImplement/Models/Client.cs

@@ -6,25 +6,19 @@ using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations;
 using System.ComponentModel.DataAnnotations.Schema;
 using System.Linq;
-using System.Runtime.Serialization;
 using System.Text;
 using System.Threading.Tasks;
 
 namespace AbstractFoodOrdersDatabaseImplement.Models
 {
-	[DataContract]
-	public class Client:IClientModel
+    public class Client:IClientModel
     {
-		[DataMember]
-		public int Id { get; set; }
-		[DataMember]
-		[Required]
+        public int Id { get; set; }
+        [Required]
         public string ClientFIO { get; private set; } = string.Empty;
-		[DataMember]
-		[Required]
+        [Required]
         public string Password { get; set; } = string.Empty;
-		[DataMember]
-		[Required]
+        [Required]
         public string Email { get; private set; } = string.Empty;
         [ForeignKey("ClientId")]
         public virtual List<Order> ClientOrders { get; set; } = new();

FoodOrders/AbstractFoodOrdersDatabaseImplement/Models/Component.cs

@@ -3,20 +3,15 @@ using AbstractFoodOrdersContracts.ViewModels;
 using AbstractFoodOrdersDataModels.Models;
 using System.ComponentModel.DataAnnotations.Schema;
 using System.ComponentModel.DataAnnotations;
-using System.Runtime.Serialization;
 
 namespace AbstractFoodOrdersDatabaseImplement.Models
 {
-	[DataContract]
-	public class Component : IComponentModel
+    public class Component : IComponentModel
     {
-		[DataMember]
-		public int Id { get; private set; }
-		[DataMember]
-		[Required]
+        public int Id { get; private set; }
+        [Required]
         public string ComponentName { get; private set; } = string.Empty;
-		[DataMember]
-		[Required]
+        [Required]
         public double Cost { get; set; }
         [ForeignKey("ComponentId")]
         public virtual List<DishComponent> DishComponents { get; set; } = new();

FoodOrders/AbstractFoodOrdersDatabaseImplement/Models/Dish.cs

@@ -8,20 +8,15 @@ using System.Text;
 using System.Threading.Tasks;
 using AbstractFoodOrdersContracts.BindingModels;
 using AbstractFoodOrdersContracts.ViewModels;
-using System.Runtime.Serialization;
 
 namespace AbstractFoodOrdersDatabaseImplement.Models
 {
-    [DataContract]
     public class Dish : IDishModel
     {
-		[DataMember]
-		public int Id { get; set; }
-		[DataMember]
-		[Required]
+        public int Id { get; set; }
+        [Required]
         public string DishName { get; set; } = string.Empty;
-		[DataMember]
-		[Required]
+        [Required]
         public double Price { get; set; }
         private Dictionary<int, (IComponentModel, int)>? _dishComponents = null;
         [NotMapped]

FoodOrders/AbstractFoodOrdersDatabaseImplement/Models/Implementer.cs

@@ -8,24 +8,18 @@ using System.ComponentModel.DataAnnotations;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
-using System.Runtime.Serialization;
 
 namespace AbstractFoodOrdersDatabaseImplement.Models
 {
 	public class Implementer:IImplementerModel
 	{
-		[DataMember]
 		public int Id { get; private set; }
-		[DataMember]
 		[Required]
 		public string ImplementerFIO { get; set; } = string.Empty;
-		[DataMember]
 		[Required]
 		public string Password { get; set; } = string.Empty;
-		[DataMember]
 		[Required]
 		public int WorkExperience { get; set; }
-		[DataMember]
 		[Required]
 		public int Qualification { get; set; }
 		[ForeignKey("ImplementerId")]

FoodOrders/AbstractFoodOrdersDatabaseImplement/Models/MessageInfo.cs

@@ -8,35 +8,24 @@ using System.ComponentModel.DataAnnotations;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
-using System.Runtime.Serialization;
 
 namespace AbstractFoodOrdersDatabaseImplement.Models
 {
-	[DataContract]
 	public class MessageInfo:IMessageInfoModel
 	{
-		[DataMember]
 		[Key]
 		[DatabaseGenerated(DatabaseGeneratedOption.None)]
 		public string MessageId { get; set; } = string.Empty;
-		[DataMember]
 		public int? ClientId { get; set; }
-		[DataMember]
 		[Required]
 		public string SenderName { get; set; } = string.Empty;
-		[DataMember]
 		[Required]
 		public DateTime DateDelivery { get; set; }
-		[DataMember]
 		[Required]
 		public string Subject { get; set; } = string.Empty;
-		[DataMember]
 		[Required]
 		public string Body { get; set; } = string.Empty;
 
-		[NotMapped]
-		public int Id { get; private set; }
-
 		public static MessageInfo? Create(MessageInfoBindingModel model)
 		{
 			if (model == null)

FoodOrders/AbstractFoodOrdersDatabaseImplement/Models/Order.cs

@@ -7,7 +7,6 @@ using System.Collections;
 using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations;
 using System.Linq;
-using System.Runtime.Serialization;
 using System.Text;
 using System.Threading.Tasks;
 
@@ -15,32 +14,23 @@ namespace AbstractFoodOrdersDatabaseImplement.Models
 {
     public class Order : IOrderModel
     {
-		[DataMember]
-		public int Id { get; private set; }
-		[DataMember]
-		[Required]
+        public int Id { get; private set; }
+        [Required]
         public int DishId { get; private set; }
-		[DataMember]
-		[Required]
+        [Required]
         public int ClientId { get; set; }
         public virtual Client Client { get; set; } = new();
-		[DataMember]
 		public int? ImplementerId { get; set; }
 		public virtual Implementer? Implementer { get; set; } = new();
-		[DataMember]
 		[Required]
         public int Count { get; private set; }
-		[DataMember]
-		[Required]
+        [Required]
         public double Sum { get; private set; }
-		[DataMember]
-		[Required]
+        [Required]
         public OrderStatus Status { get; private set; }
-		[DataMember]
-		[Required]
+        [Required]
         public DateTime DateCreate { get; private set; }
-		[DataMember]
-		public DateTime? DateImplement { get; private set; }
+        public DateTime? DateImplement { get; private set; }
         public virtual Dish Dish { get; set; }
         public static Order? Create(AbstractFoodOrdersDatabase data, OrderBindingModel? model)
         {

FoodOrders/AbstractFoodOrdersListImplement/AbstractFoodOrdersListImplement.csproj

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

FoodOrders/AbstractFoodOrdersListImplement/Implements/BackUpInfo.cs

@@ -1,22 +0,0 @@
-using AbstractFoodOrdersContracts.StoragesContracts;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace AbstractFoodOrdersListImplement.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();
-		}
-	}
-}

FoodOrders/AbstractFoodOrdersListImplement/ListImplementationExtension.cs

@@ -1,26 +0,0 @@
-using AbstractFoodOrdersContracts.DI;
-using AbstractFoodOrdersContracts.StoragesContracts;
-using AbstractFoodOrdersListImplement.Implements;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace AbstractFoodOrdersListImplement
-{
-	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<IDishStorage, DishStorage>();
-			DependencyManager.Instance.RegisterType<IBackUpInfo, BackUpInfo>();
-		}
-	}
-}

FoodOrders/AbstractFoodOrdersListImplement/Models/MessageInfo.cs

@@ -17,7 +17,6 @@ namespace AbstractFoodOrdersListImplement.Models
 		public DateTime DateDelivery { get; set; }
 		public string Subject { get; set; } = string.Empty;
 		public string Body { get; set; } = string.Empty;
-		public int Id { get; private set; }
 
 		public static MessageInfo? Create(MessageInfoBindingModel model)
 		{

FoodOrders/AbstractShopFileImplement/AbstractFoodOrdersFileImplement.csproj

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

FoodOrders/AbstractShopFileImplement/DataFileSingleton.cs

@@ -8,58 +8,66 @@ using System.Xml.Linq;
 
 namespace AbstractFoodOrdersFileImplement
 {
-	public class DataFileSingleton
-	{
-		private static DataFileSingleton? instance;
-		private readonly string ComponentFileName = "Component.xml";
-		private readonly string OrderFileName = "Order.xml";
-		private readonly string DishFileName = "Dish.xml";
-		private readonly string ClientFileName = "Client.xml";
+    internal class DataFileSingleton
+    {
+        private static DataFileSingleton? instance;
+        private readonly string ComponentFileName = "Component.xml";
+        private readonly string OrderFileName = "Order.xml";
+        private readonly string DishFileName = "Dish.xml";
+        private readonly string ClientFileName = "Client.xml";
 		private readonly string ImplementerFileName = "Implementer.xml";
 		private readonly string MessageInfoFileName = "MessageInfo.xml";
 		public List<Component> Components { get; private set; }
-		public List<Order> Orders { get; private set; }
-		public List<Dish> Dishes { get; private set; }
-		public List<Client> Clients { get; private set; }
+        public List<Order> Orders { get; private set; }
+        public List<Dish> Dishes { get; private set; }
+        public List<Client> Clients { get; private set; }
 		public List<Implementer> Implementers { get; private set; }
 		public List<MessageInfo> MessageInfos { get; private set; }
 		public static DataFileSingleton GetInstance()
-		{
-			if (instance == null)
-			{
-				instance = new DataFileSingleton();
-			}
-			return instance;
-		}
-		public void SaveComponents() => SaveData(Components, ComponentFileName, "Components", x => x.GetXElement);
-		public void SaveDishes() => SaveData(Dishes, DishFileName, "Dishes", x => x.GetXElement);
-		public void SaveOrders() => SaveData(Orders, OrderFileName, "Orders", x => x.GetXElement);
-		public void SaveClients() => SaveData(Clients, ClientFileName, "Clients", x => x.GetXElement);
+        {
+            if (instance == null)
+            {
+                instance = new DataFileSingleton();
+            }
+            return instance;
+        }
+        public void SaveComponents() => SaveData(Components, ComponentFileName, "Components", x => x.GetXElement);
+        public void SaveDishes() => SaveData(Dishes, DishFileName, "Dishes", x => x.GetXElement);
+        public void SaveOrders() => SaveData(Orders, OrderFileName, "Orders", x => x.GetXElement);
+        public void SaveClients() => SaveData(Clients, ClientFileName, "Clients", x => x.GetXElement);
 		public void SaveImplementers() => SaveData(Implementers, ImplementerFileName, "Implementers", x => x.GetXElement);
 		public void SaveMessageInfos() => SaveData(MessageInfos, MessageInfoFileName, "MessageInfos", x => x.GetXElement);
 		private DataFileSingleton()
-		{
-			Components = LoadData(ComponentFileName, "Component", x => Component.Create(x)!)!;
-			Dishes = LoadData(DishFileName, "Dish", x => Dish.Create(x)!)!;
-			Orders = LoadData(OrderFileName, "Order", x => Order.Create(x)!)!;
-			Clients = LoadData(ClientFileName, "Client", x => Client.Create(x)!)!;
+        {
+            Components = LoadData(ComponentFileName, "Component", x =>
+           Component.Create(x)!)!;
+            Dishes = LoadData(DishFileName, "Dish", x =>
+           Dish.Create(x)!)!;
+            Orders = LoadData(OrderFileName, "Order", x =>
+           Order.Create(x)!)!;
+            Clients = LoadData(ClientFileName, "Client", x =>
+           Client.Create(x)!)!;
 			Implementers = LoadData(ImplementerFileName, "Implementer", x => Implementer.Create(x)!)!;
 			MessageInfos = LoadData(MessageInfoFileName, "MessageInfo", x => MessageInfo.Create(x)!)!;
 		}
-		private static List<T>? LoadData<T>(string filename, string xmlNodeName, Func<XElement, T> selectFunction)
-		{
-			if (File.Exists(filename))
-			{
-				return XDocument.Load(filename)?.Root?.Elements(xmlNodeName)?.Select(selectFunction)?.ToList();
-			}
-			return new List<T>();
-		}
-		private static void SaveData<T>(List<T> data, string filename, string xmlNodeName, Func<T, XElement> selectFunction)
-		{
-			if (data != null)
-			{
-				new XDocument(new XElement(xmlNodeName, data.Select(selectFunction).ToArray())).Save(filename);
-			}
-		}
-	}
+        private static List<T>? LoadData<T>(string filename, string xmlNodeName,
+       Func<XElement, T> selectFunction)
+        {
+            if (File.Exists(filename))
+            {
+                return
+               XDocument.Load(filename)?.Root?.Elements(xmlNodeName)?.Select(selectFunction)?.ToList();
+            }
+            return new List<T>();
+        }
+        private static void SaveData<T>(List<T> data, string filename, string
+       xmlNodeName, Func<T, XElement> selectFunction)
+        {
+            if (data != null)
+            {
+                new XDocument(new XElement(xmlNodeName,
+               data.Select(selectFunction).ToArray())).Save(filename);
+            }
+        }
+    }
 }

FoodOrders/AbstractShopFileImplement/FileImplementationExtension.cs

@@ -1,27 +0,0 @@
-using AbstractFoodOrdersContracts.DI;
-using AbstractFoodOrdersContracts.StoragesContracts;
-using AbstractFoodOrdersFileImplement.Implements;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace AbstractFoodOrdersFileImplement
-{
-	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<IDishStorage, DishStorage>();
-			DependencyManager.Instance.RegisterType<IBackUpInfo, BackUpInfo>();
-		}
-	}
-}

FoodOrders/AbstractShopFileImplement/Implements/BackUpInfo.cs

@@ -1,43 +0,0 @@
-using AbstractFoodOrdersContracts.StoragesContracts;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Reflection;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace AbstractFoodOrdersFileImplement.Implements
-{
-	public class BackUpInfo : IBackUpInfo
-	{
-		private readonly DataFileSingleton source;
-		private readonly PropertyInfo[] sourceProps;
-
-		public BackUpInfo()
-		{
-			source = DataFileSingleton.GetInstance();
-			sourceProps = source.GetType().GetProperties(BindingFlags.Instance | BindingFlags.Public);
-		}
-
-		public List<T>? GetList<T>() where T : class, new()
-		{
-			return (List<T>?)sourceProps
-				.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;
-		}
-	}
-}

FoodOrders/AbstractShopFileImplement/Implements/OrderStorage.cs

@@ -12,61 +12,59 @@ using System.Threading.Tasks;
 
 namespace AbstractFoodOrdersFileImplement.Implements
 {
-	public class OrderStorage : IOrderStorage
-	{
-		private readonly DataFileSingleton source;
-		public OrderStorage()
-		{
-			source = DataFileSingleton.GetInstance();
-		}
-		public List<OrderViewModel> GetFullList()
-		{
-			return source.Orders
-			.Select(x => AccessDishStorage(x.GetViewModel))
-			.ToList();
-		}
+    public class OrderStorage : IOrderStorage
+    {
+        private readonly DataFileSingleton source;
 
-		public List<OrderViewModel> GetFilteredList(OrderSearchModel model)
-		{
+        public OrderStorage()
+        {
+            source = DataFileSingleton.GetInstance();
+        }
+
+        public List<OrderViewModel> GetFullList()
+        {
+            return source.Orders.Select(x => x.GetViewModel)
+                .Select(y => { y.DishName = source.Dishes.FirstOrDefault(x => x.Id == y?.DishId)?.DishName; return y; }).ToList();
+        }
+
+        public List<OrderViewModel> GetFilteredList(OrderSearchModel model)
+        {
 			if (!model.Id.HasValue || !model.DateFrom.HasValue || !model.DateTo.HasValue || !model.OrderStatus.HasValue)
 			{
 				return new();
 			}
-			if (model.OrderStatus.HasValue)
-			{
-				return source.Orders
-				.Where(x => x.ImplementerId == model.ImplementerId)
-				.Select(x => AccessDishStorage(x.GetViewModel))
-				.ToList();
-			}
-			if (!model.DateFrom.HasValue || !model.DateTo.HasValue)
-			{
-				return source.Orders
-				.Where(x => x.Id == model.Id)
-				.Select(x => AccessDishStorage(x.GetViewModel))
-				.ToList();
-			}
-			else
-			{
-				return source.Orders
-				.Where(x => x.DateCreate >= model.DateFrom && x.DateCreate <= model.DateTo)
-				.Select(x => AccessDishStorage(x.GetViewModel))
-				.ToList();
+            if (model.OrderStatus.HasValue)
+            {
+                return source.Orders.Where(x => x.ImplementerId == model.ImplementerId)
+                .Select(x => x.GetViewModel)
+                .Select(y => { y.DishName = source.Dishes.FirstOrDefault(x => x.Id == y?.DishId)?.DishName; return y; }).ToList();
+            }
+            if (!model.DateFrom.HasValue || !model.DateTo.HasValue)
+            {
+                return source.Orders.Where(x => x.Id == model.Id)
+                .Select(x => x.GetViewModel)
+                .Select(y => { y.DishName = source.Dishes.FirstOrDefault(x => x.Id == y?.DishId)?.DishName; return y; }).ToList();
+            }
+            else
+            {
+				return source.Orders.Where(x => x.DateCreate >= model.DateFrom && x.DateCreate <= model.DateTo)
+			   .Select(x => x.GetViewModel)
+			   .Select(y => { y.DishName = source.Dishes.FirstOrDefault(x => x.Id == y?.DishId)?.DishName; return y; }).ToList();
 			}
 		}
 
-		public OrderViewModel? GetElement(OrderSearchModel model)
-		{
+        public OrderViewModel? GetElement(OrderSearchModel model)
+        {
 			if (!model.Id.HasValue && !model.ImplementerId.HasValue && !model.OrderStatus.HasValue)
 			{
 				return null;
 			}
-			if (!model.Id.HasValue)
-			{
+            if (!model.Id.HasValue)
+            {
 				return AccessDishStorage(source.Orders
-				.FirstOrDefault(x => model.ImplementerId.HasValue && model.OrderStatus.HasValue
-				&& x.ImplementerId == model.ImplementerId && x.Status == model.OrderStatus)
-				?.GetViewModel);
+			   .FirstOrDefault(x => model.ImplementerId.HasValue && model.OrderStatus.HasValue
+			   && x.ImplementerId == model.ImplementerId && x.Status == model.OrderStatus)
+			   ?.GetViewModel);
 			}
 			else
 			{
@@ -76,8 +74,16 @@ namespace AbstractFoodOrdersFileImplement.Implements
 			}
 		}
 
-		public OrderViewModel? Insert(OrderBindingModel model)
-		{
+        //для загрузки названий изделия в заказе
+        private OrderViewModel AccessDishStorage(OrderViewModel model)
+        {
+			string? dishName = source.Dishes.FirstOrDefault(x => x.Id == model?.DishId)?.DishName;
+			if (dishName != null) model.DishName = dishName;
+			return model;
+		}
+
+        public OrderViewModel? Insert(OrderBindingModel model)
+        {
 			model.Id = source.Orders.Count > 0 ? source.Orders.Max(x => x.Id) + 1 : 1;
 			var newOrder = Order.Create(model);
 			if (newOrder == null)
@@ -89,8 +95,8 @@ namespace AbstractFoodOrdersFileImplement.Implements
 			return AccessDishStorage(newOrder.GetViewModel);
 		}
 
-		public OrderViewModel? Update(OrderBindingModel model)
-		{
+        public OrderViewModel? Update(OrderBindingModel model)
+        {
 			var order = source.Orders.FirstOrDefault(x => x.Id == model.Id);
 			if (order == null)
 			{
@@ -101,8 +107,8 @@ namespace AbstractFoodOrdersFileImplement.Implements
 			return AccessDishStorage(order.GetViewModel);
 		}
 
-		public OrderViewModel? Delete(OrderBindingModel model)
-		{
+        public OrderViewModel? Delete(OrderBindingModel model)
+        {
 			var element = source.Orders.FirstOrDefault(x => x.Id == model.Id);
 			if (element != null)
 			{
@@ -112,12 +118,5 @@ namespace AbstractFoodOrdersFileImplement.Implements
 			}
 			return null;
 		}
-
-		public OrderViewModel AccessDishStorage(OrderViewModel model)
-		{
-			string? pastryName = source.Dishes.FirstOrDefault(x => x.Id == model?.DishId)?.DishName;
-			if (pastryName != null) model.DishName = pastryName;
-			return model;
-		}
-	}
+    }
 }

FoodOrders/AbstractShopFileImplement/Models/Client.cs

@@ -4,24 +4,18 @@ using AbstractFoodOrdersDataModels.Models;
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Runtime.Serialization;
 using System.Text;
 using System.Threading.Tasks;
 using System.Xml.Linq;
 
 namespace AbstractFoodOrdersFileImplement.Models
 {
-	[DataContract]
-	public class Client:IClientModel
+    public class Client:IClientModel
     {
-        [DataMember]
         public int Id { get; set; }
-		[DataMember]
-		public string ClientFIO { get; set; } = string.Empty;
-		[DataMember]
-		public string Password { get; set; } = string.Empty;
-		[DataMember]
-		public string Email { get; set; } = string.Empty;
+        public string ClientFIO { get; set; } = string.Empty;
+        public string Password { get; set; } = string.Empty;
+        public string Email { get; set; } = string.Empty;
         public static Client? Create(ClientBindingModel? model)
         {
             if (model == null)

FoodOrders/AbstractShopFileImplement/Models/Component.cs

@@ -1,20 +1,15 @@
 using AbstractFoodOrdersContracts.BindingModels;
 using AbstractFoodOrdersContracts.ViewModels;
 using AbstractFoodOrdersDataModels.Models;
-using System.Runtime.Serialization;
 using System.Xml.Linq;
 
 namespace AbstractFoodOrdersFileImplement.Models
 {
-    [DataContract]
     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 int Id { get; private set; }
+        public string ComponentName { get; private set; } = string.Empty;
+        public double Cost { get; set; }
         public static Component? Create(ComponentBindingModel model)
         {
             if (model == null)

FoodOrders/AbstractShopFileImplement/Models/Dish.cs

@@ -4,22 +4,17 @@ using AbstractFoodOrdersDataModels.Models;
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Runtime.Serialization;
 using System.Text;
 using System.Threading.Tasks;
 using System.Xml.Linq;
 
 namespace AbstractFoodOrdersFileImplement.Models
 {
-    [DataContract]
     public class Dish : IDishModel
     {
-		[DataMember]
-		public int Id { get; private set; }
-		[DataMember]
-		public string DishName { get; private set; } = string.Empty;
-		[DataMember]
-		public double Price { get; private set; }
+        public int Id { get; private set; }
+        public string DishName { get; private set; } = string.Empty;
+        public double Price { get; private set; }
         public Dictionary<int, int> Components { get; private set; } = new();
         private Dictionary<int, (IComponentModel, int)>? _dishComponents =
        null;

FoodOrders/AbstractShopFileImplement/Models/Implementer.cs

@@ -4,25 +4,21 @@ using AbstractFoodOrdersDataModels.Models;
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Runtime.Serialization;
 using System.Text;
 using System.Threading.Tasks;
 using System.Xml.Linq;
 
 namespace AbstractFoodOrdersFileImplement.Models
 {
-	[DataContract]
 	public class Implementer:IImplementerModel
 	{
-		[DataMember]
 		public int Id { get; private set; }
-		[DataMember]
 		public string ImplementerFIO { get; set; } = string.Empty;
-		[DataMember]
+
 		public string Password { get; set; } = string.Empty;
-		[DataMember]
+
 		public int WorkExperience { get; set; }
-		[DataMember]
+
 		public int Qualification { get; set; }
 
 		public static Implementer? Create(ImplementerBindingModel? model)

FoodOrders/AbstractShopFileImplement/Models/MessageInfo.cs

@@ -4,29 +4,20 @@ using AbstractFoodOrdersDataModels.Models;
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Runtime.Serialization;
 using System.Text;
 using System.Threading.Tasks;
 using System.Xml.Linq;
 
 namespace AbstractFoodOrdersFileImplement.Models
 {
-	[DataContract]
 	public class MessageInfo:IMessageInfoModel
 	{
-		[DataMember]
 		public string MessageId { get; set; } = string.Empty;
-		[DataMember]
 		public int? ClientId { get; set; }
-		[DataMember]
 		public string SenderName { get; set; } = string.Empty;
-		[DataMember]
 		public DateTime DateDelivery { get; set; }
-		[DataMember]
 		public string Subject { get; set; } = string.Empty;
-		[DataMember]
 		public string Body { get; set; } = string.Empty;
-		public int Id { get; private set; }
 
 		public static MessageInfo? Create(MessageInfoBindingModel model)
 		{

FoodOrders/AbstractShopFileImplement/Models/Order.cs

@@ -6,102 +6,100 @@ using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Reflection;
-using System.Runtime.Serialization;
 using System.Text;
 using System.Threading.Tasks;
 using System.Xml.Linq;
 
 namespace AbstractFoodOrdersFileImplement.Models
 {
-	[DataContract]
-	public class Order : IOrderModel
-	{
-		[DataMember]
-		public int Id { get; private set; }
-		[DataMember]
-		public int DishId { get; private set; }
-		[DataMember]
-		public int ClientId { get; private set; }
-		[DataMember]
+    public class Order : IOrderModel
+    {
+        public int Id { get; private set; }
+        public int DishId { get; private set; }
+        public int ClientId { get; private set; }
 		public int? ImplementerId { get; private set; }
-		[DataMember]
 		public int Count { get; private set; }
-		[DataMember]
-		public double Sum { get; private set; }
-		[DataMember]
-		public OrderStatus Status { get; private set; }
-		[DataMember]
-		public DateTime DateCreate { get; private set; }
-		[DataMember]
-		public DateTime? DateImplement { get; private set; }
+        public double Sum { get; private set; }
+        public OrderStatus Status { get; private set; } = OrderStatus.Неизвестен;
+        public DateTime DateCreate { get; private set; } = DateTime.Now;
+        public DateTime? DateImplement { get; private set; }
 
-		public static Order? Create(OrderBindingModel? model)
-		{
-			if (model == null)
-			{
-				return null;
-			}
-			return new Order()
-			{
-				Id = model.Id,
-				DishId = model.DishId,
-				Count = model.Count,
-				Sum = model.Sum,
-				Status = model.Status,
-				DateCreate = model.DateCreate,
-				DateImplement = model.DateImplement,
-				ImplementerId = model.ImplementerId
-			};
-		}
+        public static Order? Create(OrderBindingModel? model)
+        {
+            if (model == null)
+            {
+                return null;
+            }
+            return new Order()
+            {
+                Id = model.Id,
+                DishId = model.DishId,
+                ClientId = model.ClientId,
+                Count = model.Count,
+                Sum = model.Sum,
+                Status = model.Status,
+                DateCreate = model.DateCreate,
+                DateImplement = model.DateImplement,
+                ImplementerId = model.ImplementerId
+            };
+        }
+        public static Order? Create(XElement element)
+        {
+            if (element == null)
+            {
+                return null;
+            }
+            return new Order()
+            {
+                Id = Convert.ToInt32(element.Attribute("Id")!.Value),
+                DishId = Convert.ToInt32(element.Element("DishId")!.Value),
+                ClientId = Convert.ToInt32(element.Element("ClientId")!.Value),
+                Count = Convert.ToInt32(element.Element("Count")!.Value),
+                Sum = Convert.ToDouble(element.Element("Sum")!.Value),
+                Status = (OrderStatus)Enum.Parse(typeof(OrderStatus), element.Element("Status")!.Value),
+                DateCreate = Convert.ToDateTime(element.Element("DateCreate")!.Value),
+                DateImplement = string.IsNullOrEmpty(element.Element("DateImplement")!.Value) ? null :
+                    Convert.ToDateTime(element.Element("DateImplement")!.Value),
 
-		public static Order? Create(XElement element)
-		{
-			if (element == null)
-			{
-				return null;
-			}
-			return new Order()
-			{
-				Id = Convert.ToInt32(element.Attribute("Id")!.Value),
-				DishId = Convert.ToInt32(element.Element("DishId")!.Value),
-				Count = Convert.ToInt32(element.Element("Count")!.Value),
-				Sum = Convert.ToDouble(element.Element("Sum")!.Value),
-				Status = (OrderStatus)Convert.ToInt32(element.Element("Status")!.Value),
-				DateCreate = Convert.ToDateTime(element.Element("DateCreate")!.Value),
-				DateImplement = Convert.ToDateTime(String.IsNullOrEmpty(element.Element("DateImplement")!.Value) ? null : element.Element("DateImplement")!.Value),
 				ImplementerId = Convert.ToInt32(element.Element("ImplementerId")!.Value),
 			};
-		}
-
-		public void Update(OrderBindingModel model)
-		{
-			if (model == null)
-			{
-				return;
-			}
-			Status = model.Status;
+        }
+        public void Update(OrderBindingModel? model)
+        {
+            if (model == null)
+            {
+                return;
+            }
+            DishId = model.DishId;
+            ClientId = model.ClientId;
+            Count = model.Count;
+            Sum = model.Sum;
+            Status = model.Status;
+            DateCreate = model.DateCreate;
+            DateImplement = model.DateImplement;
 			ImplementerId = model.ImplementerId;
-			if (model.DateImplement.HasValue) DateImplement = model.DateImplement;
 		}
-		public OrderViewModel GetViewModel => new()
-		{
-			Id = Id,
-			DishId = DishId,
-			Count = Count,
-			Sum = Sum,
-			Status = Status,
-			DateCreate = DateCreate,
-			DateImplement = DateImplement,
+        public OrderViewModel GetViewModel => new()
+        {
+            Id = Id,
+            DishId = DishId,
+            ClientId = ClientId,
+            Count = Count,
+            Sum = Sum,
+            Status = Status,
+            DateCreate = DateCreate,
+            DateImplement = DateImplement,
 			ImplementerId = ImplementerId
 		};
-		public XElement GetXElement => new("Order",
-		new XAttribute("Id", Id),
-		new XElement("DishId", DishId),
-		new XElement("Count", Count.ToString()),
-		new XElement("Sum", Sum.ToString()),
-		new XElement("Status", ((int)Status).ToString()),
-		new XElement("DateCreate", DateCreate.ToString()),
-		new XElement("ImplementerId", ImplementerId.ToString()),
-		new XElement("DateImplement", DateImplement.ToString()));
-	}
+        public XElement GetXElement => new("Order",
+            new XAttribute("Id", Id),
+            new XElement("DishId", DishId),
+            new XElement("ClientId", ClientId),
+			 new XElement("ImplementerId", ImplementerId.ToString()),
+			new XElement("Count", Count.ToString()),
+            new XElement("Sum", Sum.ToString()),
+            new XElement("Status", Status.ToString()),
+            new XElement("DateCreate", DateCreate.ToString()),
+            new XElement("DateImplement", DateImplement.ToString()));
+    }
 }

FoodOrders/FoodOrders/DataGridViewExtension.cs

@@ -1,55 +0,0 @@
-using AbstractFoodOrdersContracts.Attributes;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace FoodOrders
-{
-	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;
-					}
-				}
-			}
-		}
-
-	}
-}

FoodOrders/FoodOrders/FormClients.cs

@@ -32,9 +32,15 @@ namespace FoodOrders
 
         private void LoadData()
         {
-           try
+            try
             {
-                dataGridViewClients.FillAndConfigGrid(_logic.ReadList(null));
+                var list = _logic.ReadList(null);
+                if (list != null)
+                {
+                    dataGridViewClients.DataSource = list;
+                    dataGridViewClients.Columns["Id"].Visible = false;
+                    dataGridViewClients.Columns["ClientFIO"].AutoSizeMode = DataGridViewAutoSizeColumnMode.Fill;
+                }
                 _logger.LogInformation("Загрузка клиентов");
             }
             catch (Exception ex)

FoodOrders/FoodOrders/FormComponents.cs

@@ -1,6 +1,5 @@
 using AbstractFoodOrdersContracts.BindingModels;
 using AbstractFoodOrdersContracts.BusinessLogicsContracts;
-using AbstractFoodOrdersContracts.DI;
 using FoodOrders;
 using Microsoft.Extensions.Logging;
 using System;
@@ -31,37 +30,51 @@ namespace FoodOrders
         }
         private void LoadData()
         {
-			try
-			{
-				dataGridView.FillAndConfigGrid(_logic.ReadList(null));
-				_logger.LogInformation("Загрузка компонентов");
-			}
-			catch (Exception ex)
-			{
-				_logger.LogError(ex, "Ошибка загрузки компонент");
-				MessageBox.Show(ex.Message, "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error);
-			}
-		}
+            try
+            {
+                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)
+            {
+                _logger.LogError(ex, "Ошибка загрузки компонентов");
+                MessageBox.Show(ex.Message, "Ошибка", MessageBoxButtons.OK,
+               MessageBoxIcon.Error);
+            }
+        }
         private void ButtonAdd_Click(object sender, EventArgs e)
         {
-			var form = DependencyManager.Instance.Resolve<FormComponent>();
-			if (form.ShowDialog() == DialogResult.OK)
-			{
-				LoadData();
-			}
-		}
+            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>();
-				form.Id = Convert.ToInt32(dataGridView.SelectedRows[0].Cells["Id"].Value);
-				if (form.ShowDialog() == DialogResult.OK)
-				{
-					LoadData();
-				}
-			}
-		}
+            if (dataGridView.SelectedRows.Count == 1)
+            {
+                var service = 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)
         {
             if (dataGridView.SelectedRows.Count == 1)

FoodOrders/FoodOrders/FormDish.cs

@@ -1,6 +1,5 @@
 using AbstractFoodOrdersContracts.BindingModels;
 using AbstractFoodOrdersContracts.BusinessLogicsContracts;
-using AbstractFoodOrdersContracts.DI;
 using AbstractFoodOrdersContracts.SearchModels;
 using AbstractFoodOrdersDataModels.Models;
 using Microsoft.Extensions.Logging;
@@ -39,7 +38,8 @@ namespace FoodOrders
                 {
                     var view = _logic.ReadElement(new DishSearchModel
                     {
-                        Id = _id.Value
+                        Id =
+                   _id.Value
                     });
                     if (view != null)
                     {
@@ -82,8 +82,9 @@ namespace FoodOrders
         }
         private void ButtonAdd_Click(object sender, EventArgs e)
         {
-			var form = DependencyManager.Instance.Resolve<FormDishComponent>();
-			
+            var service = Program.ServiceProvider?.GetService(typeof(FormDishComponent));
+            if (service is FormDishComponent form)
+            {
                 if (form.ShowDialog() == DialogResult.OK)
                     {
                         if (form.ComponentModel == null)
@@ -103,15 +104,18 @@ namespace FoodOrders
                         }
                         LoadData();
                     }
-            
+            }
         }
         private void ButtonUpd_Click(object sender, EventArgs e)
         {
             if (dataGridView.SelectedRows.Count == 1)
             {
-                var form = DependencyManager.Instance.Resolve<FormDishComponent>();
-				
-                    int id = Convert.ToInt32(dataGridView.SelectedRows[0].Cells[0].Value);
+                var service =
+               Program.ServiceProvider?.GetService(typeof(FormDishComponent));
+                if (service is FormDishComponent form)
+                {
+                    int id =
+                   Convert.ToInt32(dataGridView.SelectedRows[0].Cells[0].Value);
                     form.Id = id;
                     form.Count = _productComponents[id].Item2;
                     if (form.ShowDialog() == DialogResult.OK)
@@ -124,7 +128,7 @@ namespace FoodOrders
                      _productComponents[form.Id] = (form.ComponentModel, form.Count);
                         LoadData();
                     }
-                
+                }
             }
         }
         private void ButtonDel_Click(object sender, EventArgs e)

FoodOrders/FoodOrders/FormDishes.cs

@@ -1,6 +1,5 @@
 using AbstractFoodOrdersContracts.BindingModels;
 using AbstractFoodOrdersContracts.BusinessLogicsContracts;
-using AbstractFoodOrdersContracts.DI;
 using Microsoft.Extensions.Logging;
 using System;
 using System.Collections.Generic;
@@ -33,39 +32,52 @@ namespace FoodOrders
 
         private void LoadData()
         {
-			try
-			{
-				dataGridView.FillAndConfigGrid(_logic.ReadList(null));
-				_logger.LogInformation("Загрузка изделий");
-			}
-			catch (Exception ex)
-			{
-				_logger.LogError(ex, "Ошибка загрузки изделий");
-				MessageBox.Show(ex.Message, "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error);
-			}
-		}
+            try
+            {
+                var list = _logic.ReadList(null);
+                if (list != null)
+                {
+                    dataGridView.DataSource = list;
+                    dataGridView.Columns["Id"].Visible = false;
+                    dataGridView.Columns["DishComponents"].Visible = false;
+                    dataGridView.Columns["DishName"].AutoSizeMode = DataGridViewAutoSizeColumnMode.Fill;
+                }
+                _logger.LogInformation("Загрузка изделий");
+            }
+            catch (Exception ex)
+            {
+                _logger.LogError(ex, "Ошибка загрузки изделий");
+                MessageBox.Show(ex.Message, "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error);
+            }
+        }
 
         private void buttonAdd_Click(object sender, EventArgs e)
         {
-			var form = DependencyManager.Instance.Resolve<FormDish>();
-			if (form.ShowDialog() == DialogResult.OK)
-			{
-				LoadData();
-			}
-		}
+            var service = Program.ServiceProvider?.GetService(typeof(FormDish));
+            if (service is FormDish 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<FormDish>();
-				form.Id = Convert.ToInt32(dataGridView.SelectedRows[0].Cells["Id"].Value);
-				if (form.ShowDialog() == DialogResult.OK)
-				{
-					LoadData();
-				}
-			}
-		}
+            if (dataGridView.SelectedRows.Count == 1)
+            {
+                var service = Program.ServiceProvider?.GetService(typeof(FormDish));
+                if (service is FormDish 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)
         {

FoodOrders/FoodOrders/FormImplementers.cs

@@ -1,6 +1,5 @@
 using AbstractFoodOrdersContracts.BindingModels;
 using AbstractFoodOrdersContracts.BusinessLogicsContracts;
-using AbstractFoodOrdersContracts.DI;
 using Microsoft.Extensions.Logging;
 using System;
 using System.Collections.Generic;
@@ -34,7 +33,13 @@ namespace FoodOrders
 		{
 			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("Загрузка исполнителей");
 			}
 			catch (Exception ex)
@@ -46,10 +51,13 @@ namespace FoodOrders
 
 		private void buttonAdd_Click(object sender, EventArgs e)
 		{
-			var form = DependencyManager.Instance.Resolve<FormCreateImplementer>();
-			if (form.ShowDialog() == DialogResult.OK)
+			var service = Program.ServiceProvider?.GetService(typeof(FormCreateImplementer));
+			if (service is FormCreateImplementer form)
 			{
-				LoadData();
+				if (form.ShowDialog() == DialogResult.OK)
+				{
+					LoadData();
+				}
 			}
 		}
 
@@ -57,11 +65,14 @@ namespace FoodOrders
 		{
 			if (dataGridView.SelectedRows.Count == 1)
 			{
-				var form = DependencyManager.Instance.Resolve<FormCreateImplementer>();
-				form.Id = Convert.ToInt32(dataGridView.SelectedRows[0].Cells["Id"].Value);
-				if (form.ShowDialog() == DialogResult.OK)
+				var service = Program.ServiceProvider?.GetService(typeof(FormCreateImplementer));
+				if (service is FormCreateImplementer form)
 				{
-					LoadData();
+					form.Id = Convert.ToInt32(dataGridView.SelectedRows[0].Cells["Id"].Value);
+					if (form.ShowDialog() == DialogResult.OK)
+					{
+						LoadData();
+					}
 				}
 			}
 		}

FoodOrders/FoodOrders/FormMails.cs

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

FoodOrders/FoodOrders/FormMain.Designer.cs

@@ -34,7 +34,6 @@
 			БлюдаToolStripMenuItem = new ToolStripMenuItem();
 			ClientToolStripMenuItem = new ToolStripMenuItem();
 			исполнителиToolStripMenuItem = new ToolStripMenuItem();
-			письмаToolStripMenuItem = new ToolStripMenuItem();
 			отчётыToolStripMenuItem = new ToolStripMenuItem();
 			ComponentToolStripMenuItem = new ToolStripMenuItem();
 			ComponentProductsToolStripMenuItem = new ToolStripMenuItem();
@@ -44,7 +43,7 @@
 			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 });
+			menuStrip.Items.AddRange(new ToolStripItem[] { справочникиToolStripMenuItem, отчётыToolStripMenuItem, запускРаботыToolStripMenuItem });
 			menuStrip.Location = new Point(0, 0);
 			menuStrip.Name = "menuStrip";
 			menuStrip.Size = new Size(1104, 28);
@@ -69,38 +68,31 @@
 			// КомпонентыToolStripMenuItem
 			// 
 			КомпонентыToolStripMenuItem.Name = "КомпонентыToolStripMenuItem";
-			КомпонентыToolStripMenuItem.Size = new Size(185, 26);
+			КомпонентыToolStripMenuItem.Size = new Size(224, 26);
 			КомпонентыToolStripMenuItem.Text = "Компоненты";
 			КомпонентыToolStripMenuItem.Click += КомпонентыToolStripMenuItem_Click;
 			// 
 			// БлюдаToolStripMenuItem
 			// 
 			БлюдаToolStripMenuItem.Name = "БлюдаToolStripMenuItem";
-			БлюдаToolStripMenuItem.Size = new Size(185, 26);
+			БлюдаToolStripMenuItem.Size = new Size(224, 26);
 			БлюдаToolStripMenuItem.Text = "Блюда";
 			БлюдаToolStripMenuItem.Click += ИзделияToolStripMenuItem_Click;
 			// 
 			// ClientToolStripMenuItem
 			// 
 			ClientToolStripMenuItem.Name = "ClientToolStripMenuItem";
-			ClientToolStripMenuItem.Size = new Size(185, 26);
+			ClientToolStripMenuItem.Size = new Size(224, 26);
 			ClientToolStripMenuItem.Text = "Клиенты";
 			ClientToolStripMenuItem.Click += ClientToolStripMenuItem_Click;
 			// 
 			// исполнителиToolStripMenuItem
 			// 
 			исполнителиToolStripMenuItem.Name = "исполнителиToolStripMenuItem";
-			исполнителиToolStripMenuItem.Size = new Size(185, 26);
+			исполнителиToolStripMenuItem.Size = new Size(224, 26);
 			исполнителиToolStripMenuItem.Text = "Исполнители";
 			исполнителиToolStripMenuItem.Click += ИсполнителиToolStripMenuItem_Click;
 			// 
-			// письмаToolStripMenuItem
-			// 
-			письмаToolStripMenuItem.Name = "письмаToolStripMenuItem";
-			письмаToolStripMenuItem.Size = new Size(185, 26);
-			письмаToolStripMenuItem.Text = "Письма";
-			письмаToolStripMenuItem.Click += письмаToolStripMenuItem_Click;
-			// 
 			// отчётыToolStripMenuItem
 			// 
 			отчётыToolStripMenuItem.DropDownItems.AddRange(new ToolStripItem[] { ComponentToolStripMenuItem, ComponentProductsToolStripMenuItem, OrdersToolStripMenuItem });
@@ -177,12 +169,12 @@
 			ButtonRef.UseVisualStyleBackColor = true;
 			ButtonRef.Click += ButtonRef_Click;
 			// 
-			// создатьБекапToolStripMenuItem
+			// письмаToolStripMenuItem
 			// 
-			создатьБекапToolStripMenuItem.Name = "создатьБекапToolStripMenuItem";
-			создатьБекапToolStripMenuItem.Size = new Size(123, 24);
-			создатьБекапToolStripMenuItem.Text = "Создать Бекап";
-			создатьБекапToolStripMenuItem.Click += создатьБекапToolStripMenuItem_Click;
+			письмаToolStripMenuItem.Name = "письмаToolStripMenuItem";
+			письмаToolStripMenuItem.Size = new Size(224, 26);
+			письмаToolStripMenuItem.Text = "Письма";
+			письмаToolStripMenuItem.Click += письмаToolStripMenuItem_Click;
 			// 
 			// FormMain
 			// 
@@ -223,6 +215,5 @@
 		private ToolStripMenuItem запускРаботыToolStripMenuItem;
 		private ToolStripMenuItem исполнителиToolStripMenuItem;
 		private ToolStripMenuItem письмаToolStripMenuItem;
-		private ToolStripMenuItem создатьБекапToolStripMenuItem;
 	}
 }

FoodOrders/FoodOrders/FormMain.cs

@@ -1,7 +1,6 @@
 using AbstractFoodOrdersBusinessLogic.BusinessLogics;
 using AbstractFoodOrdersContracts.BindingModels;
 using AbstractFoodOrdersContracts.BusinessLogicsContracts;
-using AbstractFoodOrdersContracts.DI;
 using Microsoft.Extensions.Logging;
 using System;
 using System.Collections.Generic;
@@ -21,15 +20,13 @@ namespace FoodOrders
 		private readonly IOrderLogic _orderLogic;
 		private readonly IReportLogic _reportLogic;
 		private readonly IWorkProcess _workProcess;
-		private readonly IBackUpLogic _backUpLogic;
-		public FormMain(ILogger<FormMain> logger, IOrderLogic orderLogic, IReportLogic reportLogic, IWorkProcess workProcess, IBackUpLogic backUpLogic)
+		public FormMain(ILogger<FormMain> logger, IOrderLogic orderLogic, IReportLogic reportLogic, IWorkProcess workProcess)
 		{
 			InitializeComponent();
 			_logger = logger;
 			_orderLogic = orderLogic;
 			_reportLogic = reportLogic;
 			_workProcess = workProcess;
-			_backUpLogic = backUpLogic;
 		}
 		private void FormMain_Load(object sender, EventArgs e)
 		{
@@ -37,33 +34,96 @@ namespace FoodOrders
 		}
 		private void LoadData()
 		{
-
 			try
 			{
-				dataGridView.FillAndConfigGrid(_orderLogic.ReadList(null));
+				var list = _orderLogic.ReadList(null);
+				if (list != null)
+				{
+					dataGridView.DataSource = list;
+					dataGridView.Columns["ClientId"].Visible = false;
+					dataGridView.Columns["DishId"].Visible = false;
+					dataGridView.Columns["ImplementerId"].Visible = false;
+					dataGridView.Columns["ClientEmail"].Visible = false;
+				}
 				_logger.LogInformation("Загрузка заказов");
 			}
 			catch (Exception ex)
 			{
-				_logger.LogError(ex, "Ошибка загрузки изделий");
+				_logger.LogError(ex, "Ошибка загрузки заказов");
 				MessageBox.Show(ex.Message, "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error);
 			}
 		}
 		private void КомпонентыToolStripMenuItem_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 ИзделияToolStripMenuItem_Click(object sender, EventArgs e)
 		{
-			var form = DependencyManager.Instance.Resolve<FormDishes>();
-			form.ShowDialog();
+			var service =
+		   Program.ServiceProvider?.GetService(typeof(FormDishes));
+			if (service is FormDishes 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)
+		{
+			if (dataGridView.SelectedRows.Count == 1)
+			{
+				int id = Convert.ToInt32(dataGridView.SelectedRows[0].Cells["Id"].Value);
+				_logger.LogInformation("Заказ №{id}. Меняется статус на 'В работе'", id);
+				try
+				{
+					var operationResult = _orderLogic.TakeOrderInWork(new OrderBindingModel { Id = id });
+					if (!operationResult)
+					{
+						throw new Exception("Ошибка при сохранении. Дополнительная информация в логах.");
+					}
+					LoadData();
+				}
+				catch (Exception ex)
+				{
+					_logger.LogError(ex, "Ошибка передачи заказа в работу");
+					MessageBox.Show(ex.Message, "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error);
+				}
+			}
+		}
+		private void ButtonOrderReady_Click(object sender, EventArgs e)
+		{
+			if (dataGridView.SelectedRows.Count == 1)
+			{
+				int id = Convert.ToInt32(dataGridView.SelectedRows[0].Cells["Id"].Value);
+				_logger.LogInformation("Заказ №{id}. Меняется статус на 'Готов'", id);
+				try
+				{
+					var operationResult = _orderLogic.FinishOrder(new OrderBindingModel { Id = id });
+					if (!operationResult)
+					{
+						throw new Exception("Ошибка при сохранении. Дополнительная информация в логах.");
+					}
+					LoadData();
+				}
+				catch (Exception ex)
+				{
+					_logger.LogError(ex, "Ошибка отметки о готовности заказа");
+					MessageBox.Show(ex.Message, "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error);
+				}
+			}
 		}
 		private void ButtonIssuedOrder_Click(object sender, EventArgs e)
 		{
@@ -114,61 +174,52 @@ namespace FoodOrders
 
 		private void ComponentProductsToolStripMenuItem_Click(object sender, EventArgs e)
 		{
-			var form = DependencyManager.Instance.Resolve<FormReportDishComponents>();
-			form.ShowDialog();
+			var service = Program.ServiceProvider?.GetService(typeof(FormReportDishComponents));
+			if (service is FormReportDishComponents form)
+			{
+				form.ShowDialog();
+			}
 		}
 
 		private void OrdersToolStripMenuItem_Click(object sender, EventArgs e)
 		{
-			var form = DependencyManager.Instance.Resolve<FormReportOrders>();
-			form.ShowDialog();
+			var service = Program.ServiceProvider?.GetService(typeof(FormReportOrders));
+			if (service is FormReportOrders form)
+			{
+				form.ShowDialog();
+			}
 
 		}
 
 		private void ClientToolStripMenuItem_Click(object sender, EventArgs e)
 		{
-			var form = DependencyManager.Instance.Resolve<FormClients>();
-			form.ShowDialog();
+			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>();
-			form.ShowDialog();
+			var service = Program.ServiceProvider?.GetService(typeof(FormImplementers));
+			if (service is FormImplementers form)
+			{
+				form.ShowDialog();
+			}
 		}
 		private void ЗапускРаботыToolStripMenuItem_Click(object sender, EventArgs e)
 		{
-			_workProcess.DoWork(DependencyManager.Instance.Resolve<IImplementerLogic>(), _orderLogic);
-			MessageBox.Show("Процесс обработки запущен", "Сообщение", MessageBoxButtons.OK, MessageBoxIcon.Information);
+			_workProcess.DoWork((Program.ServiceProvider?.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>();
-			form.ShowDialog();
-		}
-
-		private void создатьБекапToolStripMenuItem_Click(object sender, EventArgs e)
-		{
-			try
+			var service = Program.ServiceProvider?.GetService(typeof(FormMails));
+			if (service is FormMails form)
 			{
-				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);
+				form.ShowDialog();
 			}
 		}
 	}

FoodOrders/FoodOrders/Program.cs

@@ -10,7 +10,6 @@ using NLog.Extensions.Logging;
 using System.Drawing;
 using AbstractFoodOrdersBusinessLogic.MailWorker;
 using AbstractFoodOrdersContracts.BindingModels;
-using AbstractFoodOrdersContracts.DI;
 
 namespace FoodOrders
 {
@@ -27,71 +26,83 @@ namespace FoodOrders
             // 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,
-					MailPassword = System.Configuration.ConfigurationManager.AppSettings["MailPassword"] ?? string.Empty,
-					SmtpClientHost = System.Configuration.ConfigurationManager.AppSettings["SmtpClientHost"] ?? string.Empty,
-					SmtpClientPort = Convert.ToInt32(System.Configuration.ConfigurationManager.AppSettings["SmtpClientPort"]),
-					PopHost = System.Configuration.ConfigurationManager.AppSettings["PopHost"] ?? string.Empty,
-					PopPort = Convert.ToInt32(System.Configuration.ConfigurationManager.AppSettings["PopPort"])
+					MailLogin =
+				System.Configuration.ConfigurationManager.AppSettings["MailLogin"] ?? string.Empty,
+					MailPassword =
+				System.Configuration.ConfigurationManager.AppSettings["MailPassword"] ?? string.Empty,
+					SmtpClientHost =
+				System.Configuration.ConfigurationManager.AppSettings["SmtpClientHost"] ?? string.Empty,
+					SmtpClientPort =
+				Convert.ToInt32(System.Configuration.ConfigurationManager.AppSettings["SmtpClientPort"]),
+				PopHost =
+				System.Configuration.ConfigurationManager.AppSettings["PopHost"] ?? string.Empty,
+				PopPort =
+				Convert.ToInt32(System.Configuration.ConfigurationManager.AppSettings["PopPort"])
 				});
-
-				var timer = new System.Threading.Timer(new TimerCallback(MailCheck!), null, 0, 100000);
+				// <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
+				var timer = new System.Threading.Timer(new
+				TimerCallback(MailCheck!), null, 0, 10000);
 			}
 			catch (Exception ex)
 			{
-				var logger = DependencyManager.Instance.Resolve<ILogger>();
+				var logger = _serviceProvider.GetService<ILogger>();
 				logger?.LogError(ex, "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>");
 			}
 
-			Application.Run(DependencyManager.Instance.Resolve<FormMain>());
+			Application.Run(_serviceProvider.GetRequiredService<FormMain>());
+        }
+        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<IDishStorage, DishStorage>();
+            services.AddTransient<IClientStorage, ClientStorage>();
+            services.AddTransient<IImplementerStorage, ImplementerStorage>();
+			services.AddTransient<IMessageInfoStorage,MessageInfoStorage>();
+
+			services.AddTransient<IComponentLogic, ComponentLogic>();
+            services.AddTransient<IOrderLogic, OrderLogic>();
+            services.AddTransient<IDishLogic, DishLogic>();
+            services.AddTransient<IReportLogic, ReportLogic>();
+            services.AddTransient<IClientLogic, ClientLogic>();
+			services.AddTransient<IImplementerLogic, ImplementerLogic>();
+			services.AddTransient<IMessageInfoLogic, MessageInfoLogic>();
+
+			services.AddTransient<IWorkProcess, WorkModeling>();
+			services.AddSingleton<AbstractMailWorker, MailKitWorker>();
+
+			services.AddTransient<AbstractSaveToExcel, SaveToExcel>();
+            services.AddTransient<AbstractSaveToWord, SaveToWord>();
+            services.AddTransient<AbstractSaveToPdf, SaveToPdf>();
+
+            services.AddTransient<FormMain>();
+            services.AddTransient<FormComponent>();
+            services.AddTransient<FormComponents>();
+            services.AddTransient<FormCreateOrder>();
+            services.AddTransient<FormDish>();
+            services.AddTransient<FormDishComponent>();
+            services.AddTransient<FormDishes>();
+            services.AddTransient<FormReportDishComponents>();
+            services.AddTransient<FormReportOrders>();
+            services.AddTransient<FormClients>();
+			services.AddTransient<FormCreateImplementer>();
+			services.AddTransient<FormImplementers>();
+			services.AddTransient<FormMails>();
 		}
-		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<IDishLogic, DishLogic>();
-			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<FormDish>();
-			DependencyManager.Instance.RegisterType<FormDishes>();
-			DependencyManager.Instance.RegisterType<FormDishComponent>();
-			DependencyManager.Instance.RegisterType<FormClients>();
-			DependencyManager.Instance.RegisterType<FormCreateImplementer>();
-			DependencyManager.Instance.RegisterType<FormImplementers>();
-			DependencyManager.Instance.RegisterType<FormReportDishComponents>();
-			DependencyManager.Instance.RegisterType<FormReportOrders>();
-			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();
 	}
 }