Что-то сделано

LawFirm/AbstractLawFirmContracts/AbstractLawFirmContracts/BindingModels/MessageInfoBindingModel.cs

@@ -9,7 +9,8 @@ namespace AbstractLawFirmContracts.BindingModels
 {
     public class MessageInfoBindingModel : IMessageInfoModel
     {
-        public string MessageId { get; set; } = string.Empty;
+		public int Id => throw new NotImplementedException();
+		public string MessageId { get; set; } = string.Empty;
 
         public int? ClientId { get; set; }
 

LawFirm/AbstractLawFirmContracts/AbstractLawFirmContracts/DI/DependencyManager.cs

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

LawFirm/AbstractLawFirmContracts/AbstractLawFirmContracts/DI/IDependencyContainer.cs

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

LawFirm/AbstractLawFirmContracts/AbstractLawFirmContracts/DI/IImplementationExtension.cs

@@ -0,0 +1,17 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace AbstractLawFirmContracts.DI
+{
+	public interface IImplementationExtension
+	{
+		public int Priority { get; }
+		/// <summary>
+		/// Регистрация сервисов
+		/// </summary>
+		public void RegisterServices();
+	}
+}

LawFirm/AbstractLawFirmContracts/AbstractLawFirmContracts/DI/ServiceDependencyContainer.cs

@@ -0,0 +1,62 @@
+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 AbstractLawFirmContracts.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>()!;
+		}
+	}
+}

LawFirm/AbstractLawFirmContracts/AbstractLawFirmContracts/DI/ServiceProviderLoader.cs

@@ -0,0 +1,51 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Reflection;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace AbstractLawFirmContracts.DI
+{
+	public class ServiceProviderLoader
+	{
+		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";
+		}
+	}
+}

LawFirm/AbstractLawFirmContracts/AbstractLawFirmContracts/DI/UnityDependencyContainer.cs

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

LawFirm/AbstractLawFirmContracts/AbstractLawFirmContracts/ViewModels/ClientViewModel.cs

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

LawFirm/AbstractLawFirmContracts/AbstractLawFirmContracts/ViewModels/ComponentViewModel.cs

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

LawFirm/AbstractLawFirmContracts/AbstractLawFirmContracts/ViewModels/DocumentViewModel.cs

@@ -1,4 +1,5 @@
-using AbstractLawFirmDataModels.Models;
+using AbstractLawFirmContracts.Attributes;
+using AbstractLawFirmDataModels.Models;
 using System;
 using System.Collections.Generic;
 using System.ComponentModel;
@@ -10,13 +11,15 @@ namespace AbstractLawFirmContracts.ViewModels
 {
     public class DocumentViewModel : IDocumentModel
     {
-        public int Id { get; set; }
+		[Column(visible: false)]
-        [DisplayName("Название пакета документов")]
+		public int Id { get; set; }
-        public string DocumentName { get; set; } = string.Empty;
+		[Column("Название пакета документов", gridViewAutoSize: GridViewAutoSize.Fill, isUseAutoSize: true)]
-        [DisplayName("Цена")]
+		public string DocumentName { get; set; } = string.Empty;
-        public double Price { get; set; }
+		[Column("Цена", width: 100)]
-        public Dictionary<int, (IComponentModel, int)> DocumentComponents
+		public double Price { get; set; }
-        {
+		[Column(visible: false)]
+		public Dictionary<int, (IComponentModel, int)> DocumentComponents
+		{
             get;
             set;
         } = new();

LawFirm/AbstractLawFirmContracts/AbstractLawFirmContracts/ViewModels/ImplementerViewModel.cs

@@ -1,4 +1,5 @@
-using AbstractLawFirmDataModels.Models;
+using AbstractLawFirmContracts.Attributes;
+using AbstractLawFirmDataModels.Models;
 using System;
 using System.Collections.Generic;
 using System.ComponentModel;
@@ -10,18 +11,19 @@ namespace AbstractLawFirmContracts.ViewModels
 {
     public class ImplementerViewModel : IImplementerModel
     {
-        public int Id { get; set; }
+		[Column(visible: false)]
+		public int Id { get; set; }
 
-        [DisplayName("ФИО")]
+		[Column("ФИО", gridViewAutoSize: GridViewAutoSize.Fill, isUseAutoSize: true)]
-        public string ImplementerFIO { get; set; } = string.Empty;
+		public string ImplementerFIO { get; set; } = string.Empty;
 
-        [DisplayName("Пароль")]
+		[Column("Пароль", width: 110)]
-        public string Password { get; set; } = string.Empty;
+		public string Password { get; set; } = string.Empty;
 
-        [DisplayName("Трудовой стаж")]
+		[Column("Трудовой стаж", width: 110)]
-        public int WorkExperience { get; set; }
+		public int WorkExperience { get; set; }
 
-        [DisplayName("Квалификация")]
+		[Column("Квалификация", width: 110)]
-        public int Qualification { get; set; }
+		public int Qualification { get; set; }
     }
 }

LawFirm/AbstractLawFirmContracts/AbstractLawFirmContracts/ViewModels/MessageInfoViewModel.cs

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

LawFirm/AbstractLawFirmContracts/AbstractLawFirmContracts/ViewModels/OrderViewModel.cs

@@ -1,4 +1,5 @@
-using AbstractLawFirmDataModels.Enums;
+using AbstractLawFirmContracts.Attributes;
+using AbstractLawFirmDataModels.Enums;
 using AbstractLawFirmDataModels.Models;
 using System;
 using System.Collections.Generic;
@@ -11,26 +12,30 @@ namespace AbstractLawFirmContracts.ViewModels
 {
     public class OrderViewModel : IOrderModel
     {
-        [DisplayName("Номер")]
+		[Column("Номер", gridViewAutoSize: GridViewAutoSize.AllCells, isUseAutoSize: true)]
-        public int Id { get; set; }
+		public int Id { get; set; }
-        public int DocumentId { get; set; }
+		[Column(visible: false)]
-        public int ClientId { get; set; }
+		public int DocumentId { get; set; }
-        [DisplayName("Пакет документов")]
+		[Column("Пакет документов", width: 110)]
-        public string DocumentName { get; set; } = string.Empty;
+		public string DocumentName { get; set; } = string.Empty;
-        [DisplayName("ФИО клиента")]
+		[Column(visible: false)]
-        public string ClientFIO { get; set; } = string.Empty;
+		public int ClientId { get; set; }
-        public int? ImplementerId { get; set; }
+
-        [DisplayName("ФИО исполнителя")]
+		[Column("ФИО клиента", gridViewAutoSize: GridViewAutoSize.AllCells, isUseAutoSize: true)]
-        public string ImplementerFIO { get; set; } = string.Empty;
+		public string ClientFIO { get; set; } = string.Empty;
-        [DisplayName("Количество")]
+		[Column(visible: false)]
-        public int Count { get; set; }
+		public int? ImplementerId { get; set; }
-        [DisplayName("Сумма")]
+		[Column("ФИО исполнителя", gridViewAutoSize: GridViewAutoSize.AllCells, isUseAutoSize: true)]
-        public double Sum { get; set; }
+		public string ImplementerFIO { get; set; } = string.Empty;
-        [DisplayName("Статус")]
+		[Column("Количество", gridViewAutoSize: GridViewAutoSize.AllCells, isUseAutoSize: true)]
-        public OrderStatus Status { get; set; } = OrderStatus.Неизвестен;
+		public int Count { get; set; }
-        [DisplayName("Дата создания")]
+		[Column("Сумма", gridViewAutoSize: GridViewAutoSize.AllCells, isUseAutoSize: true)]
-        public DateTime DateCreate { get; set; } = DateTime.Now;
+		public double Sum { get; set; }
-        [DisplayName("Дата выполнения")]
+		[Column("Статус", gridViewAutoSize: GridViewAutoSize.AllCells, isUseAutoSize: true)]
-        public DateTime? DateImplement { get; set; }
+		public OrderStatus Status { get; set; } = OrderStatus.Неизвестен;
-    }
+		[Column("Дата создания", width: 100)]
+		public DateTime DateCreate { get; set; } = DateTime.Now;
+		[Column("Дата выполнения", width: 100)]
+		public DateTime? DateImplement { get; set; }
+	}
 }

LawFirm/AbstractLawFirmDataModels/AbstractLawFirmDataModels/Models/IMessageInfoModel.cs

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

LawFirm/AbstractLawFirmDatabaseImplement/AbstractLawFirmDataBaseImplement.csproj

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

LawFirm/AbstractLawFirmDatabaseImplement/DatabaseImplementationExtension.cs

@@ -0,0 +1,28 @@
+using AbstractLawFirmContracts.DI;
+using AbstractLawFirmContracts.StoragesContracts;
+using AbstractLawFirmDatabaseImplement.Implements;
+using AbstractLawFirmDataBaseImplement.Implements;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace AbstractLawFirmDataBaseImplement
+{
+	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<IDocumentStorage, DocumentStorage>();
+			DependencyManager.Instance.RegisterType<IBackUpInfo, BackUpInfo>();
+		}
+	}
+}

LawFirm/AbstractLawFirmDatabaseImplement/Implements/BackUpInfo.cs

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

LawFirm/AbstractLawFirmDatabaseImplement/Models/Client.cs

@@ -9,21 +9,27 @@ using System.Threading.Tasks;
 using AbstractLawFirmDatabaseImplement.Models;
 using AbstractLawFirmContracts.BindingModels;
 using AbstractLawFirmContracts.ViewModels;
+using System.Runtime.Serialization;
 
 namespace AbstractLawFirmDataBaseImplement.Models
 {
-    public class Client : IClientModel
+	[DataContract]
+	public class Client : IClientModel
     {
+        [DataMember]
         public int Id { get; private set; }
 
         [Required]
-        public string ClientFIO { get; private set; } = string.Empty;
+		[DataMember]
+		public string ClientFIO { get; private set; } = string.Empty;
 
         [Required]
-        public string Email { get; private set; } = string.Empty;
+		[DataMember]
+		public string Email { get; private set; } = string.Empty;
 
         [Required]
-        public string Password { get; private set; } = string.Empty;
+		[DataMember]
+		public string Password { get; private set; } = string.Empty;
 
         [ForeignKey("ClientId")]
         public virtual List<Order> Orders { get; set; } = new();

LawFirm/AbstractLawFirmDatabaseImplement/Models/Component.cs

@@ -10,16 +10,21 @@ using System.Text;
 using System.Threading.Tasks;
 using AbstractLawFirmDataBaseImplement.Models;
 using AbstractLawFirmDatabaseImplement.Models;
+using System.Runtime.Serialization;
 
 namespace AbstractLawFirmDataBaseImplement.Models
 {
+    [DataContract]
     public class Component : IComponentModel
     {
+        [DataMember]
         public int Id { get; private set; }
         [Required]
-        public string ComponentName { get; private set; } = string.Empty;
+		[DataMember]
+		public string ComponentName { get; private set; } = string.Empty;
         [Required]
-        public double Cost { get; set; }
+		[DataMember]
+		public double Cost { get; set; }
         [ForeignKey("ComponentId")]
         public virtual List<DocumentComponent> DocumentComponents { get; set; } = new();
         public static Component? Create(ComponentBindingModel model)

LawFirm/AbstractLawFirmDatabaseImplement/Models/Document.cs

@@ -10,19 +10,25 @@ using System.Text;
 using System.Threading.Tasks;
 using AbstractLawFirmDataBaseImplement.Models;
 using AbstractLawFirmDataBaseImplement;
+using System.Runtime.Serialization;
 
 namespace AbstractLawFirmDatabaseImplement.Models
 {
+    [DataContract]
     public class Document : IDocumentModel
     {
-        public int Id { get; set; }
+		[DataMember]
+		public int Id { get; set; }
         [Required]
-        public string DocumentName { get; set; } = string.Empty;
+		[DataMember]
+		public string DocumentName { get; set; } = string.Empty;
         [Required]
-        public double Price { get; set; }
+		[DataMember]
+		public double Price { get; set; }
         private Dictionary<int, (IComponentModel, int)>? _documentComponents = null;
         [NotMapped]
-        public Dictionary<int, (IComponentModel, int)> DocumentComponents
+		[DataMember]
+		public Dictionary<int, (IComponentModel, int)> DocumentComponents
         {
             get
             {

LawFirm/AbstractLawFirmDatabaseImplement/Models/Implementer.cs

@@ -6,22 +6,25 @@ using System;
 using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations.Schema;
 using System.Linq;
+using System.Runtime.Serialization;
 using System.Text;
 using System.Threading.Tasks;
 
 namespace AbstractLawFirmDataBaseImplement.Models
 {
+    [DataContract]
     public class Implementer : IImplementerModel
     {
+        [DataMember]
         public int Id { get; private set; }
-
+		[DataMember]
-        public string ImplementerFIO { get; private set; } = string.Empty;
+		public string ImplementerFIO { get; private set; } = string.Empty;
-
+		[DataMember]
-        public string Password { get; private set; } = string.Empty;
+		public string Password { get; private set; } = string.Empty;
-
+		[DataMember]
-        public int WorkExperience { get; private set; }
+		public int WorkExperience { get; private set; }
-
+		[DataMember]
-        public int Qualification { get; private set; }
+		public int Qualification { get; private set; }
 
         [ForeignKey("ImplementerId")]
         public virtual List<Order> Orders { get; private set; } = new();

LawFirm/AbstractLawFirmDatabaseImplement/Models/MessageInfo.cs

@@ -5,24 +5,32 @@ using System;
 using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations;
 using System.Linq;
+using System.Runtime.Serialization;
 using System.Text;
 using System.Threading.Tasks;
 
 namespace AbstractLawFirmDataBaseImplement.Models
 {
+    [DataContract]
     public class MessageInfo : IMessageInfoModel
     {
         [Key]
-        public string MessageId { get; private set; } = string.Empty;
+		[DataMember]
-        public int? ClientId { get; private set; }
+		public string MessageId { get; private set; } = string.Empty;
+		[DataMember]
+		public int? ClientId { get; private set; }
         [Required]
-        public string SenderName { get; private set; } = string.Empty;
+		[DataMember]
+		public string SenderName { get; private set; } = string.Empty;
         [Required]
-        public DateTime DateDelivery { get; private set; }
+		[DataMember]
+		public DateTime DateDelivery { get; private set; }
         [Required]
-        public string Subject { get; private set; } = string.Empty;
+		[DataMember]
+		public string Subject { get; private set; } = string.Empty;
         [Required]
-        public string Body { get; private set; } = string.Empty;
+		[DataMember]
+		public string Body { get; private set; } = string.Empty;
         public virtual Client? Client { get; private set; }
         public static MessageInfo? Create(MessageInfoBindingModel model)
         {
@@ -50,5 +58,7 @@ namespace AbstractLawFirmDataBaseImplement.Models
             DateDelivery = DateDelivery,
             Subject = Subject,
         };
-    }
+
+		public int Id => throw new NotImplementedException();
+	}
 }

LawFirm/AbstractLawFirmDatabaseImplement/Models/Order.cs

@@ -7,29 +7,39 @@ using System;
 using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations;
 using System.Linq;
+using System.Runtime.Serialization;
 using System.Text;
 using System.Threading.Tasks;
 
 namespace AbstractLawFirmDatabaseImplement.Models
 {
+    [DataContract]
     public class Order : IOrderModel
     {
-        public int Id { get; private set; }
+		[DataMember]
+		public int Id { get; private set; }
         [Required]
-        public int DocumentId { get; private set; }
+		[DataMember]
+		public int DocumentId { get; private set; }
         [Required]
-        public int ClientId { get; private set; }
+		[DataMember]
-        public int? ImplementerId { get; private set; }
+		public int ClientId { get; private set; }
+		[DataMember]
+		public int? ImplementerId { get; private set; }
         [Required]
-        public int Count { get; private set; }
+		[DataMember]
+		public int Count { get; private set; }
         [Required]
-        public double Sum { get; private set; }
+		[DataMember]
+		public double Sum { get; private set; }
         [Required]
-        public OrderStatus Status { get; private set; } = OrderStatus.Неизвестен;
+		[DataMember]
+		public OrderStatus Status { get; private set; } = OrderStatus.Неизвестен;
         [Required]
-        public DateTime DateCreate { get; private set; } = DateTime.Now;
+		[DataMember]
-
+		public DateTime DateCreate { get; private set; } = DateTime.Now;
-        public DateTime? DateImplement { get; private set; }
+		[DataMember]
+		public DateTime? DateImplement { get; private set; }
         public virtual Document Document { get; set; }
         public virtual Client Client { get; set; }
         public Implementer? Implementer { get; private set; }

LawFirm/AbstractLawFirmFileImpliment/FileImplementationExtension.cs

@@ -0,0 +1,26 @@
+using AbstractLawFirmContracts.DI;
+using AbstractLawFirmContracts.StoragesContracts;
+using AbstractLawFirmFileImplement.Implements;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace AbstractLawFirmFileImplement
+{
+	public class FileImplementationExtension : IImplementationExtension
+	{
+		public int Priority => 1;
+
+		public void RegisterServices()
+		{
+			DependencyManager.Instance.RegisterType<IComponentStorage, ComponentStorage>();
+			DependencyManager.Instance.RegisterType<IImplementerStorage, ImplementerStorage>();
+			DependencyManager.Instance.RegisterType<IMessageInfoStorage, MessageInfoStorage>();
+			DependencyManager.Instance.RegisterType<IOrderStorage, OrderStorage>();
+			DependencyManager.Instance.RegisterType<IDocumentStorage, DocumentStorage>();
+			DependencyManager.Instance.RegisterType<IBackUpInfo, BackUpInfo>();
+		}
+	}
+}

LawFirm/AbstractLawFirmFileImpliment/Implements/BackUpInfo.cs

@@ -0,0 +1,34 @@
+using AbstractLawFirmContracts.StoragesContracts;
+using AbstractLawFirmFileImpliment;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace AbstractLawFirmFileImplement.Implements
+{
+	public class BackUpInfo : IBackUpInfo
+	{
+		public List<T>? GetList<T>() where T : class, new()
+		{
+			var source = DataFileSingleton.GetInstance();
+			return (List<T>?)source.GetType().GetProperties()
+				.FirstOrDefault(x => x.PropertyType.IsGenericType && x.PropertyType.GetGenericArguments()[0] == typeof(T))
+				?.GetValue(source);
+		}
+		public Type? GetTypeByModelInterface(string modelInterfaceName)
+		{
+			var assembly = typeof(BackUpInfo).Assembly;
+			var types = assembly.GetTypes();
+			foreach (var type in types)
+			{
+				if (type.IsClass && type.GetInterface(modelInterfaceName) != null)
+				{
+					return type;
+				}
+			}
+			return null;
+		}
+	}
+}

LawFirm/AbstractLawFirmFileImpliment/Implements/OrderStorage.cs

@@ -27,30 +27,21 @@ namespace AbstractLawFirmFileImplement.Implements
             {
                 return null;
             }
-            return source.Orders.FirstOrDefault(x => (model.Id.HasValue && x.Id == model.Id))?.GetViewModel;
+			if (model.ImplementerId.HasValue && model.Status != null)
-        }
+				return source.Orders.FirstOrDefault(x => x.ImplementerId == model.ImplementerId && model.Status.Equals(x.Status))?.GetViewModel;
+			return source.Orders.FirstOrDefault(x => (model.Id.HasValue && x.Id == model.Id))?.GetViewModel;
+		}
 
         public List<OrderViewModel> GetFilteredList(OrderSearchModel model)
         {
-            if (model.ClientId.HasValue)
+			return source.Orders
-            {
+				.Where(x => x.Id == model.Id ||
-                return source.Orders
+				model.DateFrom <= x.DateCreate && x.DateCreate <= model.DateTo ||
-                    .Where(x => x.ClientId == model.ClientId)
+				x.ClientId == model.ClientId ||
-                    .Select(x => x.GetViewModel)
+				model.Status.Equals(x.Status))
-                    .ToList();
+				.Select(x => x.GetViewModel)
-            }
+				.ToList();
-            if (model.Status != null)
+		}
-            {
-                return source.Orders
-                    .Where(x => model.Status.Equals(x.Status))
-                    .Select(x => x.GetViewModel)
-                    .ToList();
-            }
-            return source.Orders
-            .Where(x => x.Id == model.Id || model.DateFrom <= x.DateCreate && x.DateCreate <= model.DateTo)
-            .Select(x => x.GetViewModel)
-            .ToList();
-        }
 
         public List<OrderViewModel> GetFullList()
         {
@@ -101,7 +92,7 @@ namespace AbstractLawFirmFileImplement.Implements
             {
                 viewModel.DocumentName = document.DocumentName;
             }
-            return viewModel;
+			return viewModel;
         }
     }
 }

LawFirm/AbstractLawFirmFileImpliment/Models/Component.cs

@@ -4,17 +4,22 @@ using AbstractLawFirmDataModels.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 AbstractLawFirmFileImplement.Models
 {
+    [DataContract]
     public class Component : IComponentModel
     {
+        [DataMember]
         public int Id { get; private set; }
-        public string ComponentName { get; private set; } = string.Empty;
+		[DataMember]
-        public double Cost { get; set; }
+		public string ComponentName { get; private set; } = string.Empty;
+		[DataMember]
+		public double Cost { get; set; }
         public static Component? Create(ComponentBindingModel model)
         {
             if (model == null)

LawFirm/AbstractLawFirmFileImpliment/Models/Document.cs

@@ -5,17 +5,22 @@ using AbstractLawFirmFileImpliment;
 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 AbstractLawFirmFileImplement.Models
 {
+    [DataContract]
     public class Document : IDocumentModel
     {
-        public int Id { get; private set; }
+		[DataMember]
-        public string DocumentName { get; private set; } = string.Empty;
+		public int Id { get; private set; }
-        public double Price { get; private set; }
+		[DataMember]
+		public string DocumentName { get; private set; } = string.Empty;
+		[DataMember]
+		public double Price { get; private set; }
         public Dictionary<int, int> Components { get; private set; } = new();
         private Dictionary<int, (IComponentModel, int)>? _documentComponents = null;
         public Dictionary<int, (IComponentModel, int)> DocumentComponents

LawFirm/AbstractLawFirmFileImpliment/Models/Implementer.cs

@@ -4,23 +4,26 @@ using AbstractLawFirmDataModels.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 AbstractLawFirmFileImplement.Models
 {
+    [DataContract]
     public class Implementer : IImplementerModel
     {
-        public int Id { get; private set; }
+		[DataMember]
-
+		public int Id { get; private set; }
-        public string ImplementerFIO { get; private set; } = string.Empty;
+		[DataMember]
-
+		public string ImplementerFIO { get; private set; } = string.Empty;
-        public string Password { get; private set; } = string.Empty;
+		[DataMember]
-
+		public string Password { get; private set; } = string.Empty;
-        public int WorkExperience { get; private set; }
+		[DataMember]
-
+		public int WorkExperience { get; private set; }
-        public int Qualification { get; private set; }
+		[DataMember]
+		public int Qualification { get; private set; }
 
         public static Implementer? Create(XElement element)
         {

LawFirm/AbstractLawFirmFileImpliment/Models/MessageInfo.cs

@@ -4,24 +4,28 @@ using AbstractLawFirmDataModels.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 AbstractLawFirmFileImplement.Models
 {
+	[DataContract]
 	public class MessageInfo : IMessageInfoModel
 	{
+		public int Id => throw new NotImplementedException();
+		[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 static MessageInfo? Create(MessageInfoBindingModel? model)

LawFirm/AbstractLawFirmFileImpliment/Models/Order.cs

@@ -7,23 +7,34 @@ using System;
 using System.Collections.Generic;
 using System.Diagnostics;
 using System.Linq;
+using System.Runtime.Serialization;
 using System.Text;
 using System.Threading.Tasks;
 using System.Xml.Linq;
 
 namespace AbstractLawFirmFileImplement.Models
 {
+    [DataContract]
     public class Order : IOrderModel
     {
+        [DataMember]
         public int Id { get; private set; }
-        public int DocumentId { get; private set; }
+		[DataMember]
-        public int ClientId { get; private set; }
+		public int DocumentId { get; private set; }
-        public int? ImplementerId { get; set; }
+		[DataMember]
-        public int Count { get; private set; }
+		public int ClientId { get; private set; }
-        public double Sum { get; private set; }
+		[DataMember]
-        public OrderStatus Status { get; private set; } = OrderStatus.Неизвестен;
+		public int? ImplementerId { get; set; }
-        public DateTime DateCreate { get; private set; }
+		[DataMember]
-        public DateTime? DateImplement { get; private set; }
+		public int Count { get; private set; }
+		[DataMember]
+		public double Sum { get; private set; }
+		[DataMember]
+		public OrderStatus Status { get; private set; } = OrderStatus.Неизвестен;
+		[DataMember]
+		public DateTime DateCreate { get; private set; }
+		[DataMember]
+		public DateTime? DateImplement { get; private set; }
         public static Order? Create(OrderBindingModel? model)
         {
             if (model == null)

LawFirm/AbstractLawFirmListImplement/AbstractLawFirmListImplement.csproj

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

LawFirm/AbstractLawFirmListImplement/Implements/BackUpInfo.cs

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

LawFirm/AbstractLawFirmListImplement/Implements/OrderStorage.cs

@@ -85,8 +85,17 @@ namespace AbstractLawFirmListImplement.Implements
                 {
                     return order.GetViewModel;
                 }
-            }
+				else if (model.ImplementerId.HasValue && model.Status != null && order.ImplementerId == model.ImplementerId && model.Status.Equals(order.Status))
-            return null;
+				{
+					return GetViewModel(order);
+				}
+				else if (model.ImplementerId.HasValue && model.ImplementerId == order.ImplementerId)
+				{
+					return order.GetViewModel;
+				}
+			}
+
+			return null;
         }
         public OrderViewModel? Insert(OrderBindingModel model)
         {

LawFirm/AbstractLawFirmListImplement/ListImplementationExtension.cs

@@ -0,0 +1,26 @@
+using AbstractLawFirmContracts.DI;
+using AbstractLawFirmContracts.StoragesContracts;
+using AbstractLawFirmListImplement.Implements;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace AbstractLawFirmListImplement
+{
+	public class ListImplementationExtension : IImplementationExtension
+	{
+		public int Priority => 0;
+
+		public void RegisterServices()
+		{
+			DependencyManager.Instance.RegisterType<IComponentStorage, ComponentStorage>();
+			DependencyManager.Instance.RegisterType<IImplementerStorage, ImplementerStorage>();
+			DependencyManager.Instance.RegisterType<IMessageInfoStorage, MessageInfoStorage>();
+			DependencyManager.Instance.RegisterType<IOrderStorage, OrderStorage>();
+			DependencyManager.Instance.RegisterType<IDocumentStorage, DocumentStorage>();
+			DependencyManager.Instance.RegisterType<IBackUpInfo, BackUpInfo>();
+		}
+	}
+}

LawFirm/AbstractLawFirmListImplement/Models/MessageInfo.cs

@@ -11,6 +11,7 @@ namespace AbstractLawFirmListImplement.Models
 {
 	public class MessageInfo : IMessageInfoModel
 	{
+		public int Id => throw new NotImplementedException();
 		public string MessageId { get; set; } = string.Empty;
 
 		public int? ClientId { get; set; }

LawFirm/AbstractLawFirmListImplement/Models/Order.cs

@@ -18,10 +18,10 @@ namespace AbstractLawFirmListImplement.Models
         public int? ImplementerId { get; private set; }
         public int Count { get; private set; }
         public double Sum { get; private set; }
-        public OrderStatus Status { get; private set; }
+		public OrderStatus Status { get; private set; } = OrderStatus.Неизвестен;
-        public DateTime DateCreate { get; private set; }
+		public DateTime DateCreate { get; private set; } = DateTime.Now;
-        public DateTime? DateImplement { get; private set; }
+		public DateTime? DateImplement { get; private set; }
-        public static Order? Create(OrderBindingModel? model)
+		public static Order? Create(OrderBindingModel? model)
         {
             if (model == null)
             {

LawFirm/LawFirmView/DataGridViewExtension.cs

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

LawFirm/LawFirmView/FormClients.cs

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

LawFirm/LawFirmView/FormComponents.cs

@@ -1,5 +1,6 @@
 using AbstractLawFirmContracts.BindingModels.BindingModels;
 using AbstractLawFirmContracts.BusinessLogicsContracts;
+using AbstractLawFirmContracts.DI;
 using Microsoft.Extensions.Logging;
 using Microsoft.VisualBasic.Logging;
 using System;
@@ -33,16 +34,9 @@ namespace LawFirmView
         {
             try
             {
-                var list = _logic.ReadList(null);
+				dataGridView.FillAndConfigGrid(_logic.ReadList(null));
-                if (list != null)
+				_logger.LogInformation("Загрузка компонентов");
-                {
+			}
-                    dataGridView.DataSource = list;
-                    dataGridView.Columns["Id"].Visible = false;
-                    dataGridView.Columns["ComponentName"].AutoSizeMode =
-                   DataGridViewAutoSizeColumnMode.Fill;
-                }
-                _logger.LogInformation("Загрузка компонентов");
-            }
             catch (Exception ex)
             {
                 _logger.LogError(ex, "Ошибка загрузки компонентов");
@@ -53,31 +47,26 @@ namespace LawFirmView
 
         private void buttonAdd_Click(object sender, EventArgs e)
         {
-            var service = Program.ServiceProvider?.GetService(typeof(FormComponent));
+			var form = DependencyManager.Instance.Resolve<FormComponent>();
-            if (service is FormComponent form)
+			if (form.ShowDialog() == DialogResult.OK)
-            {
-                if (form.ShowDialog() == DialogResult.OK)
                 {
                     LoadData();
                 }
-            }
+            
         }
 
         private void buttonUpd_Click(object sender, EventArgs e)
         {
             if (dataGridView.SelectedRows.Count == 1)
             {
-                var service =
+				var form = DependencyManager.Instance.Resolve<FormComponent>();
-               Program.ServiceProvider?.GetService(typeof(FormComponent));
+				form.Id =
-                if (service is FormComponent form)
-                {
-                    form.Id =
                    Convert.ToInt32(dataGridView.SelectedRows[0].Cells["Id"].Value);
                     if (form.ShowDialog() == DialogResult.OK)
                     {
                     LoadData();
                     }
-                }
+                
             }
 
         }

LawFirm/LawFirmView/FormDocument.cs

@@ -12,6 +12,7 @@ using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 using System.Windows.Forms;
+using AbstractLawFirmContracts.DI;
 
 namespace LawFirmView
 {
@@ -86,30 +87,27 @@ pc.Value.Item1.ComponentName, pc.Value.Item2 });
 
         private void buttonAdd_Click(object sender, EventArgs e)
         {
-            var service =
+			var form = DependencyManager.Instance.Resolve<FormDocumentComponent>();
-            Program.ServiceProvider?.GetService(typeof(FormDocumentComponent));
+            if (form.ShowDialog() == DialogResult.OK)
-            if (service is FormDocumentComponent form)
             {
-                if (form.ShowDialog() == DialogResult.OK)
+                if (form.ComponentModel == null)
                 {
-                    if (form.ComponentModel == null)
+
-                    {
+					return;
-                        return;
+				}
-                    }
+				_logger.LogInformation("Добавление нового компонента:{ ComponentName}- { Count}", form.ComponentModel.ComponentName, form.Count);
-                    _logger.LogInformation("Добавление нового компонента:{ ComponentName}- { Count}", form.ComponentModel.ComponentName, form.Count);
+				if (_documentComponents.ContainsKey(form.Id))
-                    if (_documentComponents.ContainsKey(form.Id))
+				{
-                    {
+					_documentComponents[form.Id] = (form.ComponentModel,
-                        _documentComponents[form.Id] = (form.ComponentModel,
+				   form.Count);
-                       form.Count);
+				}
-                    }
+				else
-                    else
+				{
-                    {
+					_documentComponents.Add(form.Id, (form.ComponentModel,
-                        _documentComponents.Add(form.Id, (form.ComponentModel,
+				   form.Count));
-                       form.Count));
+				}
-                    }
+				LoadData();
-                    LoadData();
+			}
-                }
-            }
 
         }
 
@@ -117,11 +115,8 @@ pc.Value.Item1.ComponentName, pc.Value.Item2 });
         {
             if (dataGridView.SelectedRows.Count == 1)
             {
-                var service =
+				var form = DependencyManager.Instance.Resolve<FormDocumentComponent>();
-               Program.ServiceProvider?.GetService(typeof(FormDocumentComponent));
+				int id =
-                if (service is FormDocumentComponent form)
-                {
-                    int id =
                    Convert.ToInt32(dataGridView.SelectedRows[0].Cells[0].Value);
                     form.Id = id;
                     form.Count = _documentComponents[id].Item2;
@@ -136,7 +131,7 @@ pc.Value.Item1.ComponentName, pc.Value.Item2 });
                         LoadData();
                     }
                 }
-            }
+ 
 
         }
 

LawFirm/LawFirmView/FormDocuments.cs

@@ -11,6 +11,7 @@ using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 using System.Windows.Forms;
+using AbstractLawFirmContracts.DI;
 
 namespace LawFirmView
 {
@@ -33,17 +34,9 @@ namespace LawFirmView
         {
             try
             {
-                var list = _logic.ReadList(null);
+				dataGridView.FillAndConfigGrid(_logic.ReadList(null));
-                if (list != null)
+				_logger.LogInformation("Загрузка пакетов документов");
-                {
+			}
-                    dataGridView.DataSource = list;
-                    dataGridView.Columns["Id"].Visible = false;
-                    dataGridView.Columns["DocumentName"].AutoSizeMode =
-                   DataGridViewAutoSizeColumnMode.Fill;
-                    dataGridView.Columns["DocumentComponents"].Visible = false;
-                }
-                _logger.LogInformation("Загрузка пакетов документов");
-            }
             catch (Exception ex)
             {
                 _logger.LogError(ex, "Ошибка загрузки пакетов документов");
@@ -54,29 +47,25 @@ namespace LawFirmView
 
         private void buttonAdd_Click(object sender, EventArgs e)
         {
-            var service = Program.ServiceProvider?.GetService(typeof(FormDocument));
+			var form = DependencyManager.Instance.Resolve<FormDocument>();
-            if (service is FormDocument form)
+			if (form.ShowDialog() == DialogResult.OK)
-            {
-                if (form.ShowDialog() == DialogResult.OK)
                 {
                     LoadData();
                 }
-            }
+            
         }
 
         private void buttonUpd_Click(object sender, EventArgs e)
         {
             if (dataGridView.SelectedRows.Count == 1)
             {
-                var service = Program.ServiceProvider?.GetService(typeof(FormDocument));
+				var form = DependencyManager.Instance.Resolve<FormDocument>();
-                if (service is FormDocument form)
+				form.Id = Convert.ToInt32(dataGridView.SelectedRows[0].Cells["Id"].Value);
-                {
-                    form.Id = Convert.ToInt32(dataGridView.SelectedRows[0].Cells["Id"].Value);
                     if (form.ShowDialog() == DialogResult.OK)
                     {
                         LoadData();
                     }
-                }
+                
             }
         }
 

LawFirm/LawFirmView/FormImplementers.cs

@@ -1,5 +1,6 @@
 using AbstractLawFirmContracts.BindingModels;
 using AbstractLawFirmContracts.BusinessLogicsContracts;
+using AbstractLawFirmContracts.DI;
 using Microsoft.Extensions.Logging;
 using System;
 using System.Collections.Generic;
@@ -32,15 +33,9 @@ namespace LawFirmView
         {
             try
             {
-                var list = _logic.ReadList(null);
+				dataGridView.FillAndConfigGrid(_logic.ReadList(null));
-                if (list != null)
+				_logger.LogInformation("Загрузка исполнителей");
-                {
+			}
-                    dataGridView.DataSource = list;
-                    dataGridView.Columns["Id"].Visible = false;
-                    dataGridView.Columns["ImplementerFIO"].AutoSizeMode = DataGridViewAutoSizeColumnMode.Fill;
-                }
-                _logger.LogInformation("Загрузка исполнителей");
-            }
             catch (Exception ex)
             {
                 _logger.LogError(ex, "Ошибка загрузки исполнителей");
@@ -51,30 +46,25 @@ namespace LawFirmView
 
         private void buttonCreate_Click(object sender, EventArgs e)
         {
-            var service = Program.ServiceProvider?.GetService(typeof(FormImplementer));
+			var form = DependencyManager.Instance.Resolve<FormImplementer>();
-            if (service is FormImplementer form)
+			if (form.ShowDialog() == DialogResult.OK)
-            {
-                if (form.ShowDialog() == DialogResult.OK)
                 {
                     LoadData();
                 }
-            }
         }
 
         private void buttonUpdate_Click(object sender, EventArgs e)
         {
             if (dataGridView.SelectedRows.Count == 1)
             {
-                var service = Program.ServiceProvider?.GetService(typeof(FormImplementer));
+				var form = DependencyManager.Instance.Resolve<FormImplementer>();
-                if (service is FormImplementer form)
+				form.Id = Convert.ToInt32(dataGridView.SelectedRows[0].Cells["Id"].Value);
-                {
-                    form.Id = Convert.ToInt32(dataGridView.SelectedRows[0].Cells["Id"].Value);
                     if (form.ShowDialog() == DialogResult.OK)
                     {
                         LoadData();
                     }
                 }
-            }
+            
         }
 
         private void buttonDelete_Click(object sender, EventArgs e)

LawFirm/LawFirmView/FormMail.cs

@@ -31,14 +31,7 @@ namespace LawFirmView
 		{
 			try
 			{
-				var list = _logic.ReadList(null);
+				dataGridView.FillAndConfigGrid(_logic.ReadList(null));
-				if (list != null)
-				{
-					dataGridView.DataSource = list;
-					dataGridView.Columns["ClientId"].Visible = false;
-					dataGridView.Columns["MessageId"].Visible = false;
-					dataGridView.Columns["Body"].AutoSizeMode = DataGridViewAutoSizeColumnMode.Fill;
-				}
 				_logger.LogInformation("Loading materials");
 			}
 			catch (Exception ex)

LawFirm/LawFirmView/FormMain.cs

@@ -4,6 +4,7 @@ using AbstractLawFirmContracts.BusinessLogicsContracts;
 using AbstractLawFirmDataModels.Enums;
 using Microsoft.Extensions.Logging;
 using AbstractLawFirmBusinessLogic.BusinessLogic;
+using AbstractLawFirmContracts.DI;
 
 namespace LawFirmView
 {
@@ -13,14 +14,16 @@ namespace LawFirmView
         private readonly IOrderLogic _orderLogic;
         private readonly IReportLogic _reportLogic;
         private readonly IWorkProcess _workProcess;
-        public FormMain(ILogger<FormMain> logger, IOrderLogic orderLogic, IReportLogic reportLogic, IWorkProcess workProcess)
+		private readonly IBackUpLogic _backUpLogic;
+		public FormMain(ILogger<FormMain> logger, IOrderLogic orderLogic, IReportLogic reportLogic, IWorkProcess workProcess, IBackUpLogic backUpLogic)
         {
             InitializeComponent();
             _logger = logger;
             _orderLogic = orderLogic;
             _reportLogic = reportLogic;
             _workProcess = workProcess;
-        }
+			_backUpLogic = backUpLogic;
+		}
 
         private void FormMain_Load(object sender, EventArgs e)
         {
@@ -31,17 +34,8 @@ namespace LawFirmView
             _logger.LogInformation("Загрузка заказов");
             try
             {
-                var list = _orderLogic.ReadList(null);
+               dataGridView.FillAndConfigGrid(_orderLogic.ReadList(null));
-                if (list != null)
+				_logger.LogInformation("Загрузка заказов");}
-                {
-                    dataGridView.DataSource = list;
-                    dataGridView.Columns["DocumentId"].Visible = false;
-                    dataGridView.Columns["ClientId"].Visible = false;
-                    dataGridView.Columns["ImplementerId"].Visible = false;
-
-                }
-                _logger.LogInformation("Загрузка заказов");
-            }
             catch (Exception ex)
             {
                 _logger.LogError(ex, "Ошибка загрузки заказов");
@@ -51,31 +45,24 @@ namespace LawFirmView
 
         private void компонентыToolStripMenuItem_Click(object sender, EventArgs e)
         {
-            var service = Program.ServiceProvider?.GetService(typeof(FormComponents));
+			var form = DependencyManager.Instance.Resolve<FormComponents>();
-            if (service is FormComponents form)
+			form.ShowDialog();
-            {
-                form.ShowDialog();
-            }
 
         }
 
         private void пакетыДокументовToolStripMenuItem_Click(object sender, EventArgs e)
         {
             var service = Program.ServiceProvider?.GetService(typeof(FormDocuments));
-            if (service is FormDocuments form)
+			var form = DependencyManager.Instance.Resolve<FormDocuments>();
-            {
+            form.ShowDialog();
-                form.ShowDialog();
+
-            }
+		}
-        }
 
         private void buttonCreateOrder_Click(object sender, EventArgs e)
         {
-            var service = Program.ServiceProvider?.GetService(typeof(FormCreateOrder));
+			var form = DependencyManager.Instance.Resolve<FormCreateOrder>();
-            if (service is FormCreateOrder form)
+			form.ShowDialog();
-            {
+			LoadData();
-                form.ShowDialog();
-                LoadData();
-            }
 
         }
 
@@ -192,51 +179,60 @@ namespace LawFirmView
 
         private void компонентыПоПакетамДокументовToolStripMenuItem_Click(object sender, EventArgs e)
         {
-            var service = Program.ServiceProvider?.GetService(typeof(FormReportDocumentComponents));
+			var form = DependencyManager.Instance.Resolve<FormReportDocumentComponents>();
-            if (service is FormReportDocumentComponents form)
+			form.ShowDialog();
-            {
+		}
-                form.ShowDialog();
-            }
-
-        }
 
         private void списокЗаказовToolStripMenuItem_Click(object sender, EventArgs e)
         {
-            var service = Program.ServiceProvider?.GetService(typeof(FormReportOrders));
+			var form = DependencyManager.Instance.Resolve<FormReportOrders>();
-            if (service is FormReportOrders form)
+			form.ShowDialog();
-            {
+		}
-                form.ShowDialog();
-            }
-        }
 
         private void клиентыToolStripMenuItem_Click(object sender, EventArgs e)
         {
-            var service = Program.ServiceProvider?.GetService(typeof(FormClients));
+			var form = DependencyManager.Instance.Resolve<FormClients>();
-            if (service is FormClients form)
+			form.ShowDialog();
-            {
+		}
-                form.ShowDialog();
-            }
-        }
         private void исполнителиToolStripMenuItem_Click(object sender, EventArgs e)
         {
-            var service = Program.ServiceProvider?.GetService(typeof(Исполнители));
+			var form = DependencyManager.Instance.Resolve<Исполнители>();
-            if (service is Исполнители form)
+			form.ShowDialog();
-            {
+		}
-                form.ShowDialog();
-            }
-        }
 
         private void запускРаботToolStripMenuItem_Click(object sender, EventArgs e)
         {
-            _workProcess.DoWork((Program.ServiceProvider?.GetService(typeof(IImplementerLogic)) as IImplementerLogic)!, _orderLogic);
+			_workProcess.DoWork(DependencyManager.Instance.Resolve<IImplementerLogic>(), _orderLogic);
-            MessageBox.Show("Процесс обработки запущен", "Сообщение", MessageBoxButtons.OK, MessageBoxIcon.Information);
+			MessageBox.Show("Процесс обработки запущен", "Сообщение", MessageBoxButtons.OK, MessageBoxIcon.Information);
-        }private void почтаToolStripMenuItem_Click(object sender, EventArgs e)
-	{
-		var service = Program.ServiceProvider?.GetService(typeof(FormMail));
-		if (service is FormMail form)
-		{
-			form.ShowDialog();
 		}
+		private void почтаToolStripMenuItem_Click(object sender, EventArgs e)
+	{
+			var form = DependencyManager.Instance.Resolve<FormMail>();
+			form.ShowDialog();
+
+		}
+
+		private void создатьБэкапToolStripMenuItem_Click(object sender, EventArgs e)
+		{
+			try
+			{
+				if (_backUpLogic != null)
+				{
+					var fbd = new FolderBrowserDialog();
+					if (fbd.ShowDialog() == DialogResult.OK)
+					{
+						_backUpLogic.CreateBackUp(new BackUpSaveBinidngModel
+						{
+							FolderName = fbd.SelectedPath
+						});
+						MessageBox.Show("Backup created", "Message", MessageBoxButtons.OK, MessageBoxIcon.Information);
+					}
+				}
+			}
+			catch (Exception ex)
+				{
+				MessageBox.Show(ex.Message, "Error", MessageBoxButtons.OK, MessageBoxIcon.Error);
+			}
 	}
 
     }

LawFirm/LawFirmView/Program.cs

@@ -11,6 +11,8 @@ using NLog.Extensions.Logging;
 using System;
 using AbstractLawFirmDataBaseImplement.Implements;
 using AbstractLawFirmBusinessLogic.MailWorker;
+using AbstractLawFirmContracts.DI;
+using DocumentFormat.OpenXml.Spreadsheet;
 using AbstractLawFirmContracts.BindingModels;
 
 namespace LawFirmView
@@ -28,13 +30,10 @@ namespace LawFirmView
             // To customize application configuration such as set high DPI settings or default font,
             // see https://aka.ms/applicationconfiguration.
             ApplicationConfiguration.Initialize();
-            var services = new ServiceCollection();
+			InitDependency();
-            ConfigureServices(services);
-            _serviceProvider = services.BuildServiceProvider();
 			try
 			{
-				var mailSender =
+				var mailSender = DependencyManager.Instance.Resolve<AbstractMailWorker>();
-				_serviceProvider.GetService<AbstractMailWorker>();
 				mailSender?.MailConfig(new MailConfigBindingModel
 				{
 					MailLogin =
@@ -62,47 +61,46 @@ namespace LawFirmView
 				logger?.LogError(ex, "Error");
 			}
 
-			Application.Run(_serviceProvider.GetRequiredService<FormMain>());
+			Application.Run(DependencyManager.Instance.Resolve<FormMain>());
 		}
-        private static void ConfigureServices(ServiceCollection services)
+		private static void InitDependency()
-        {
+		{
-            services.AddLogging(option =>
+			DependencyManager.InitDependency();
-            {
+
-                option.SetMinimumLevel(LogLevel.Information);
+			DependencyManager.Instance.AddLogging(option =>
-                option.AddNLog("nlog.config");
+			{
-            });
+				option.SetMinimumLevel(LogLevel.Information);
-            services.AddTransient<IComponentStorage, ComponentStorage>();
+				option.AddNLog("nlog.config");
-            services.AddTransient<IOrderStorage, OrderStorage>();
+			});
-            services.AddTransient<IDocumentStorage, DocumentStorage>();
+			DependencyManager.Instance.RegisterType<IComponentLogic, ComponentLogic>();
-            services.AddTransient<IClientStorage, ClientStorage>();
+			DependencyManager.Instance.RegisterType<IOrderLogic, OrderLogic>();
-            services.AddTransient<IImplementerStorage, ImplementerStorage>();
+			DependencyManager.Instance.RegisterType<IDocumentLogic, DocumentLogic>();
-            services.AddTransient<IComponentLogic, ComponentLogic>();
+			DependencyManager.Instance.RegisterType<IReportLogic, ReportLogic>();
-            services.AddTransient<IClientLogic, ClientLogic>();
+			DependencyManager.Instance.RegisterType<IClientLogic, ClientLogic>();
-            services.AddTransient<IOrderLogic, OrderLogic>();
+			DependencyManager.Instance.RegisterType<IBackUpLogic, BackUpLogic>();
-            services.AddTransient<IDocumentLogic, DocumentLogic>();
+			DependencyManager.Instance.RegisterType<IImplementerLogic, ImplementerLogic>();
-            services.AddTransient<IReportLogic, ReportLogic>();
+			DependencyManager.Instance.RegisterType<IMessageInfoLogic, MessageInfoLogic>();
-            services.AddTransient<IImplementerLogic, ImplementerLogic>();
+			DependencyManager.Instance.RegisterType<AbstractSaveToWord, SaveToWord>();
-            services.AddTransient<IWorkProcess, WorkModeling>();
+			DependencyManager.Instance.RegisterType<AbstractSaveToExcel, SaveToExcel>();
-			services.AddTransient<IMessageInfoStorage, MessageInfoStorage>();
+			DependencyManager.Instance.RegisterType<AbstractSaveToPdf, SaveToPdf>();
-			services.AddTransient<IMessageInfoLogic, MessageInfoLogic>();
+			DependencyManager.Instance.RegisterType<IWorkProcess, WorkModeling>();
-			services.AddSingleton<AbstractMailWorker, MailKitWorker>();
+			DependencyManager.Instance.RegisterType<AbstractMailWorker, MailKitWorker>();
-			services.AddTransient<AbstractSaveToWord, SaveToWord>();
+			DependencyManager.Instance.RegisterType<FormMain>();
-			services.AddTransient<AbstractSaveToExcel, SaveToExcel>();
+			DependencyManager.Instance.RegisterType<FormComponent>();
-            services.AddTransient<AbstractSaveToPdf, SaveToPdf>();
+			DependencyManager.Instance.RegisterType<FormComponents>();
-            services.AddTransient<FormMain>();
+			DependencyManager.Instance.RegisterType<FormCreateOrder>();
-            services.AddTransient<FormComponent>();
+			DependencyManager.Instance.RegisterType<FormDocument>();
-            services.AddTransient<FormComponents>();
+			DependencyManager.Instance.RegisterType<FormDocumentComponent>();
-            services.AddTransient<FormClients>();
+			DependencyManager.Instance.RegisterType<FormDocuments>();
-            services.AddTransient<FormCreateOrder>();
+			DependencyManager.Instance.RegisterType<FormReportDocumentComponents>();
-            services.AddTransient<FormDocument>();
+			DependencyManager.Instance.RegisterType<FormReportOrders>();
-            services.AddTransient<FormDocumentComponent>();
+			DependencyManager.Instance.RegisterType<FormClients>();
-            services.AddTransient<FormDocuments>();
+			DependencyManager.Instance.RegisterType<Исполнители>();
-            services.AddTransient<FormReportDocumentComponents>();
+			DependencyManager.Instance.RegisterType<FormImplementer>();
-            services.AddTransient<FormReportOrders>();
+			DependencyManager.Instance.RegisterType<FormMail>();
-            services.AddTransient<Исполнители>();
-            services.AddTransient<FormImplementer>();
-			services.AddTransient<FormMail>();
 		}
-		private static void MailCheck(object obj) => ServiceProvider?.GetService<AbstractMailWorker>()?.MailCheck();
+		private static void MailCheck(object obj) => DependencyManager.Instance.Resolve<AbstractMailWorker>()?.MailCheck();
+
+
 	}
 }