MotorPlant/MotorPlantBusinessLogic/BackUpLogic.cs

@@ -1,98 +0,0 @@
-using Microsoft.Extensions.Logging;
-using MotorPlantContracts.BindingModels;
-using MotorPlantContracts.BusinessLogicsContracts;
-using MotorPlantContracts.StoragesContracts;
-using MotorPlantDataModels;
-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 MotorPlantBusinessLogic.BusinessLogic
-{
-    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);
-        }
-    }
-}

MotorPlant/MotorPlantContracts/Attributes/ColumnAttribute.cs

@@ -1,26 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace MotorPlantContracts.Attributes
-{
-    [AttributeUsage(AttributeTargets.Property)]
-    public class ColumnAttribute : Attribute
-    {
-        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; }
-        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;
-        }
-    }
-}

MotorPlant/MotorPlantContracts/Attributes/GridViewAutoSize.cs

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

MotorPlant/MotorPlantContracts/BindingModels/BackUpSaveBinidngModel.cs

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

MotorPlant/MotorPlantContracts/BindingModels/MessageInfoBindingModel.cs

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

MotorPlant/MotorPlantContracts/BusinessLogicsContracts/IBackUpLogic.cs

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

MotorPlant/MotorPlantContracts/DI/DependencyManager.cs

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

MotorPlant/MotorPlantContracts/DI/IDependencyContainer.cs

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

MotorPlant/MotorPlantContracts/DI/IImplementationExtension.cs

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

MotorPlant/MotorPlantContracts/DI/ServiceDependencyContainer.cs

@@ -1,56 +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 MotorPlantContracts.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>()!;
-        }
-    }
-}

MotorPlant/MotorPlantContracts/DI/ServiceProviderLoader.cs

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

MotorPlant/MotorPlantContracts/StoragesContracts/IBackUpInfo.cs

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

MotorPlant/MotorPlantContracts/ViewModels/ClientViewModel.cs

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

MotorPlant/MotorPlantContracts/ViewModels/ComponentViewModel.cs

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

MotorPlant/MotorPlantContracts/ViewModels/EngineViewModel.cs

@@ -1,18 +1,15 @@
 using MotorPlantDataModels.Models;
 using System.ComponentModel;
-using MotorPlantContracts.Attributes;
 
 namespace MotorPlantContracts.ViewModels
 {
     public class EngineViewModel : IEngineModel
     {
-        [Column(visible: false)]
         public int Id { get; set; }
-        [Column(title: "Название изделия", gridViewAutoSize: GridViewAutoSize.Fill, isUseAutoSize: true)]
+        [DisplayName("Название изделия")]
         public string EngineName { get; set; } = string.Empty;
-        [Column(title: "Цена", width: 70)]
+        [DisplayName("Цена")]
         public double Price { get; set; }
-        [Column(visible: false)]
         public Dictionary<int, (IComponentModel, int)> EngineComponents
         {
             get;

MotorPlant/MotorPlantContracts/ViewModels/ImplementerViewModel.cs

@@ -5,21 +5,19 @@ using System.ComponentModel;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
-using MotorPlantContracts.Attributes;
 
 namespace MotorPlantContracts.ViewModels
 {
     public class ImplementerViewModel : IImplementerModel
     {
-        [Column(visible: false)]
         public int Id { get; set; }
-        [Column(title: "ФИО исполнителя", gridViewAutoSize: GridViewAutoSize.Fill, isUseAutoSize: true)]
+        [DisplayName("ФИО исполнителя")]
         public string ImplementerFIO { get; set; } = string.Empty;
-        [Column(title: "Стаж работы", width: 60)]
+        [DisplayName("Стаж работы")]
         public int WorkExperience { get; set; } = 0;
-        [Column(title: "Квалификация", width: 60)]
+        [DisplayName("Квалификация")]
         public int Qualification { get; set; } = 0;
-        [Column(title: "Пароль", width: 100)]
+        [DisplayName("Пароль")]
         public string Password { get; set; } = string.Empty;
     }
 }

MotorPlant/MotorPlantContracts/ViewModels/MessageInfoViewModel.cs

@@ -5,25 +5,20 @@ using System.ComponentModel;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
-using MotorPlantContracts.Attributes;
 
 namespace MotorPlantContracts.ViewModels
 {
     public class MessageInfoViewModel : IMessageInfoModel
     {
-        [Column(visible: false)]
-        public int Id { get; set; }
-        [Column(visible: false)]
         public string MessageId { get; set; } = string.Empty;
-        [Column(visible: false)]
         public int? ClientId { get; set; }
-        [Column(title: "Отправитель", width: 150)]
+        [DisplayName("Отправитель")]
         public string SenderName { get; set; } = string.Empty;
-        [Column(title: "Дата письма", width: 120)]
+        [DisplayName("Дата письма")]
         public DateTime DateDelivery { get; set; }
-        [Column(title: "Заголовок", width: 120)]
+        [DisplayName("Заголовок")]
         public string Subject { get; set; } = string.Empty;
-        [Column(title: "Текст", gridViewAutoSize: GridViewAutoSize.Fill, isUseAutoSize: true)]
+        [DisplayName("Текст")]
         public string Body { get; set; } = string.Empty;
     }
 }

MotorPlant/MotorPlantContracts/ViewModels/OrderViewModel.cs

@@ -1,35 +1,31 @@
 using MotorPlantDataModels.Enums;
 using MotorPlantDataModels.Models;
 using System.ComponentModel;
-using MotorPlantContracts.Attributes;
 
 namespace MotorPlantContracts.ViewModels
 {
     public class OrderViewModel : IOrderModel
     {
-        [Column(title: "Номер", width: 90)]
+        [DisplayName("Номер")]
         public int Id { get; set; }
-        [Column(visible: false)]
         public int EngineId { get; set; }
-        [Column(visible: false)]
         public int ClientId { get; set; }
-        [Column(visible: false)]
         public int? ImplementerId { get; set; } = null;
-        [Column(title: "Клиент", width: 190)]
+        [DisplayName("Клиент")]
         public string ClientFIO { get; set; } = string.Empty;
-        [Column(title: "Двигатель", gridViewAutoSize: GridViewAutoSize.Fill, isUseAutoSize: true)]
+        [DisplayName("Двигатель")]
         public string EngineName { get; set; } = string.Empty;
-        [Column(title: "Исполнитель", width: 150)]
+        [DisplayName("Исполнитель")]
         public string ImplementerFIO { get; set; } = string.Empty;
-        [Column(title: "Количество", width: 100)]
+        [DisplayName("Количество")]
         public int Count { get; set; }
-        [Column(title: "Сумма", width: 120)]
+        [DisplayName("Сумма")]
         public double Sum { get; set; }
-        [Column(title: "Статус", width: 70)]
+        [DisplayName("Статус")]
         public OrderStatus Status { get; set; } = OrderStatus.Неизвестен;
-        [Column(title: "Дата создания", width: 120)]
+        [DisplayName("Дата создания")]
         public DateTime DateCreate { get; set; } = DateTime.Now;
-        [Column(title: "Дата выполнения", width: 120)]
+        [DisplayName("Дата выполнения")]
         public DateTime? DateImplement { get; set; }
     }
 

MotorPlant/MotorPlantDataModels/IImplementerModel.cs

@@ -6,7 +6,7 @@ using System.Threading.Tasks;
 
 namespace MotorPlantDataModels
 {
-    public interface IImplementerModel : IId
+    public interface IImplementerModel
     {
         string ImplementerFIO { get; }
         string Password { get; }

MotorPlant/MotorPlantDataModels/IMessageInfoModel.cs

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

MotorPlant/MotorPlantDatabaseImplement/BackUpInfo.cs

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

MotorPlant/MotorPlantDatabaseImplement/Client.cs

@@ -6,26 +6,20 @@ 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 MotorPlantDatabaseImplement.Models
 {
-    [DataContract]
+	public class Client : IClientModel
-    public class Client : IClientModel
+	{
-    {
+		public int Id { get; private set; }
-        [DataMember]
+		[Required]
-        public int Id { get; private set; }
+		public string ClientFIO { get; set; } = string.Empty;
-        [DataMember]
+		[Required]
-        [Required]
+		public string Email { get; set; } = string.Empty;
-        public string ClientFIO { get; set; } = string.Empty;
+		[Required]
-        [DataMember]
+		public string Password { get; set; } = string.Empty;
-        [Required]
-        public string Email { get; set; } = string.Empty;
-        [DataMember]
-        [Required]
-        public string Password { get; set; } = string.Empty;
 		[ForeignKey("ClientId")]
 		public virtual List<Order> Orders { get; set; } = new();
 		public static Client? Create(ClientBindingModel model)

MotorPlant/MotorPlantDatabaseImplement/Component.cs

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

MotorPlant/MotorPlantDatabaseImplement/Engine.cs

@@ -3,23 +3,18 @@ using MotorPlantContracts.ViewModels;
 using MotorPlantDataModels.Models;
 using System.ComponentModel.DataAnnotations.Schema;
 using System.ComponentModel.DataAnnotations;
-using System.Runtime.Serialization;
 
 namespace MotorPlantDatabaseImplement.Models
 {
-    [DataContract]
     public class Engine : IEngineModel
     {
-        [DataMember]
         public int Id { get; set; }
-        [DataMember]
         [Required]
         public string EngineName { get; set; } = string.Empty;
-        [DataMember]
         [Required]
         public double Price { get; set; }
-        private Dictionary<int, (IComponentModel, int)>? _EngineComponents = null;
+        private Dictionary<int, (IComponentModel, int)>? _EngineComponents =
-        [DataMember]
+       null;
         [NotMapped]
         public Dictionary<int, (IComponentModel, int)> EngineComponents
         {

MotorPlant/MotorPlantDatabaseImplement/ImplementationExtension.cs

@@ -1,21 +0,0 @@
-using MotorPlantContracts.DI;
-using MotorPlantContracts.StoragesContracts;
-using MotorPlantDatabaseImplement.Implements;
-
-namespace MotorPlantDatabaseImplement
-{
-    public class ImplementationExtension : IImplementationExtension
-    {
-        public int Priority => 3;
-        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<IEngineStorage, EngineStorage>();
-            DependencyManager.Instance.RegisterType<IBackUpInfo, BackUpInfo>();
-        }
-    }
-}

MotorPlant/MotorPlantDatabaseImplement/Implementer.cs

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

MotorPlant/MotorPlantDatabaseImplement/MessageInfo.cs

@@ -4,9 +4,7 @@ using MotorPlantDataModels.Models;
 using System;
 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;
 
@@ -14,25 +12,12 @@ namespace MotorPlantDatabaseImplement.Models
 {
     public class MessageInfo : IMessageInfoModel
     {
-        [NotMapped]
-        public int Id { get; private set; }
-        [DataMember]
         [Key]
-        [DatabaseGenerated(DatabaseGeneratedOption.None)]
         public string MessageId { get; private set; } = string.Empty;
-        [DataMember]
         public int? ClientId { get; private set; }
-        [DataMember]
-        [Required]
         public string SenderName { get; private set; } = string.Empty;
-        [DataMember]
-        [Required]
         public DateTime DateDelivery { get; private set; } = DateTime.Now;
-        [DataMember]
-        [Required]
         public string Subject { get; private set; } = string.Empty;
-        [DataMember]
-        [Required]
         public string Body { get; private set; } = string.Empty;
         public Client? Client { get; private set; }
         public static MessageInfo? Create(MotorPlantDataBase context, MessageInfoBindingModel model)

MotorPlant/MotorPlantDatabaseImplement/MotorPlantDatabaseImplement.csproj

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

MotorPlant/MotorPlantDatabaseImplement/Order.cs

@@ -3,38 +3,27 @@ using MotorPlantContracts.ViewModels;
 using MotorPlantDataModels.Enums;
 using MotorPlantDataModels.Models;
 using System.ComponentModel.DataAnnotations;
-using System.Runtime.Serialization;
 
 namespace MotorPlantDatabaseImplement.Models
 {
-    [DataContract]
     public class Order : IOrderModel
     {
-        [DataMember]
         public int Id { get; private set; }
-        [DataMember]
         [Required]
         public int Count { get; private set; }
-        [DataMember]
         [Required]
         public double Sum { get; private set; }
-        [DataMember]
         [Required]
         public OrderStatus Status { get; private set; }
-        [DataMember]
         [Required]
         public DateTime DateCreate { get; private set; }
-        [DataMember]
         public DateTime? DateImplement { get; private set; }
-        [DataMember]
         [Required]
         public int EngineId { get; private set; }
         public virtual Engine Engine { get; private set; }
-        [DataMember]
         [Required]
         public int ClientId { get; private set; }
         public virtual Client Client { get; private set; }
-        [DataMember]
         public int? ImplementerId { get; private set; } = null;
         public virtual Implementer? Implementer { get; private set; }
         public static Order? Create(MotorPlantDataBase context, OrderBindingModel model)

MotorPlant/MotorPlantFileImplement/BackUpInfo.cs

@@ -1,41 +0,0 @@
-using MotorPlantContracts.StoragesContracts;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Reflection;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace MotorPlantFileImplement.Implements
-{
-    public class BackUpInfo : IBackUpInfo
-    {
-        private readonly DataFileSingleton source;
-        private readonly PropertyInfo[] sourceProperties;
-        public BackUpInfo()
-        {
-            source = DataFileSingleton.GetInstance();
-            sourceProperties = source.GetType().GetProperties(BindingFlags.Instance | BindingFlags.Public);
-        }
-        public List<T>? GetList<T>() where T : class, new()
-        {
-            var requredType = typeof(T);
-            return (List<T>?)sourceProperties.FirstOrDefault(x => x.PropertyType.IsGenericType && x.PropertyType.GetGenericArguments()[0] == requredType)
-                ?.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;
-        }
-    }
-}

MotorPlant/MotorPlantFileImplement/Client.cs

@@ -9,20 +9,14 @@ using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 using System.Xml.Linq;
-using System.Runtime.Serialization;
 
 namespace MotorPlantFileImplement.Models
 {
-    [DataContract]
     public class Client : IClientModel
     {
-        [DataMember]
         public int Id { get; private set; }
-        [DataMember]
         public string ClientFIO { get; private set; } = string.Empty;
-        [DataMember]
         public string Email { get; set; } = string.Empty;
-        [DataMember]
         public string Password { get; set; } = string.Empty;
         public static Client? Create(ClientBindingModel model)
         {

MotorPlant/MotorPlantFileImplement/Component.cs

@@ -1,19 +1,14 @@
 using MotorPlantContracts.BindingModels;
 using MotorPlantContracts.ViewModels;
 using MotorPlantDataModels.Models;
-using System.Runtime.Serialization;
 using System.Xml.Linq;
 
 namespace MotorPlantFileImplement.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 static Component? Create(ComponentBindingModel model)
         {

MotorPlant/MotorPlantFileImplement/Engine.cs

@@ -1,19 +1,14 @@
 using MotorPlantContracts.BindingModels;
 using MotorPlantContracts.ViewModels;
 using MotorPlantDataModels.Models;
-using System.Runtime.Serialization;
 using System.Xml.Linq;
 
 namespace MotorPlantFileImplement.Models
 {
-    [DataContract]
     public class Engine : IEngineModel
     {
-        [DataMember]
         public int Id { get; private set; }
-        [DataMember]
         public string EngineName { 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)>? _EngineComponents = null;

MotorPlant/MotorPlantFileImplement/ImplementationExtension.cs

@@ -1,21 +0,0 @@
-using MotorPlantContracts.DI;
-using MotorPlantContracts.StoragesContracts;
-using MotorPlantFileImplement.Implements;
-
-namespace MotorPlantFileImplement
-{
-    public class ImplementationExtension : 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<IEngineStorage, EngineStorage>();
-            DependencyManager.Instance.RegisterType<IBackUpInfo, BackUpInfo>();
-        }
-    }
-}

MotorPlant/MotorPlantFileImplement/Implementer.cs

@@ -4,25 +4,18 @@ using MotorPlantDataModels;
 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 MotorPlantFileImplement.Models
 {
-    [DataContract]
     public class Implementer : IImplementerModel
     {
-        [DataMember]
         public int Id { get; private set; }
-        [DataMember]
         public string ImplementerFIO { get; private set; } = string.Empty;
-        [DataMember]
         public string Password { get; set; } = string.Empty;
-        [DataMember]
         public int Qualification { get; set; } = 0;
-        [DataMember]
         public int WorkExperience { get; set; } = 0;
         public static Implementer? Create(ImplementerBindingModel model)
         {

MotorPlant/MotorPlantFileImplement/MessageInfo.cs

@@ -4,29 +4,19 @@ using MotorPlantDataModels.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 MotorPlantFileImplement.Models
 {
-    [DataContract]
     public class MessageInfo : IMessageInfoModel
     {
-        [DataMember]
-        public int Id { get; private set; }
-        [DataMember]
         public string MessageId { get; private set; } = string.Empty;
-        [DataMember]
         public int? ClientId { get; private set; }
-        [DataMember]
         public string SenderName { get; private set; } = string.Empty;
-        [DataMember]
         public DateTime DateDelivery { get; private set; } = DateTime.Now;
-        [DataMember]
         public string Subject { get; private set; } = string.Empty;
-        [DataMember]
         public string Body { get; private set; } = string.Empty;
         public static MessageInfo? Create(MessageInfoBindingModel model)
         {

MotorPlant/MotorPlantFileImplement/MotorPlantFileImplement.csproj

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

MotorPlant/MotorPlantFileImplement/Order.cs

@@ -2,31 +2,20 @@
 using MotorPlantContracts.ViewModels;
 using MotorPlantDataModels.Enums;
 using MotorPlantDataModels.Models;
-using System.Runtime.Serialization;
 using System.Xml.Linq;
 
 namespace MotorPlantFileImplement.Models
 {
-    [DataContract]
     public class Order : IOrderModel
     {
-        [DataMember]
         public int EngineId { get; private set; }
-        [DataMember]
         public int ClientId { get; private set; }
-        [DataMember]
         public int? ImplementerId { get; private set; } = null;
-        [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; }
-        [DataMember]
         public int Id { get; private set; }
         public static Order? Create(OrderBindingModel? model)
         {

MotorPlant/MotorPlantListImplement/BackUpInfo.cs

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

MotorPlant/MotorPlantListImplement/ImplementationExtension.cs

@@ -1,21 +0,0 @@
-using MotorPlantContracts.DI;
-using MotorPlantContracts.StoragesContracts;
-using MotorPlantListImplement.Implements;
-
-namespace MotorPlantListImplement
-{
-    internal class ImplementationExtension : 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<IEngineStorage, EngineStorage>();
-            DependencyManager.Instance.RegisterType<IBackUpInfo, BackUpInfo>();
-        }
-    }
-}

MotorPlant/MotorPlantListImplement/MessageInfo.cs

@@ -17,7 +17,6 @@ namespace MotorPlantListImplement.Models
         public DateTime DateDelivery { get; private set; } = DateTime.Now;
         public string Subject { get; private set; } = string.Empty;
         public string Body { get; private set; } = string.Empty;
-        public int Id => throw new NotImplementedException();
         public static MessageInfo? Create(MessageInfoBindingModel model)
         {
             if (model == null)

MotorPlant/MotorPlantListImplement/MotorPlantListImplement.csproj

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

MotorPlant/MotorPlantView/DataGridViewExtension.cs

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

MotorPlant/MotorPlantView/FormClients.cs

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

MotorPlant/MotorPlantView/FormComponents.cs

@@ -1,7 +1,6 @@
 using Microsoft.Extensions.Logging;
 using MotorPlantContracts.BindingModels;
 using MotorPlantContracts.BusinessLogicsContracts;
-using MotorPlantContracts.DI;
 
 namespace MotorPlantView.Forms
 {
@@ -43,10 +42,13 @@ namespace MotorPlantView.Forms
 
         private void buttonAdd_Click(object sender, EventArgs e)
         {
-            var form = DependencyManager.Instance.Resolve<FormComponent>();
+            var service = Program.ServiceProvider?.GetService(typeof(FormComponent));
-            if (form.ShowDialog() == DialogResult.OK)
+            if (service is FormComponent form)
             {
-                LoadData();
+                if (form.ShowDialog() == DialogResult.OK)
+                {
+                    LoadData();
+                }
             }
         }
 
@@ -54,12 +56,14 @@ namespace MotorPlantView.Forms
         {
             if (dataGridView.SelectedRows.Count == 1)
             {
-                var form = DependencyManager.Instance.Resolve<FormComponent>();
+                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();
+                    form.Id = Convert.ToInt32(dataGridView.SelectedRows[0].Cells["Id"].Value);
+                    if (form.ShowDialog() == DialogResult.OK)
+                    {
+                        LoadData();
+                    }
                 }
             }
         }

MotorPlant/MotorPlantView/FormEngine.cs

@@ -3,8 +3,6 @@ using MotorPlantDataModels.Models;
 using MotorPlantContracts.BusinessLogicsContracts;
 using MotorPlantContracts.SearchModels;
 using MotorPlantContracts.BindingModels;
-using MotorPlantContracts.DI;
-using MotorPlantDatabaseImplement.Models;
 
 namespace MotorPlantView.Forms
 {
@@ -13,14 +11,14 @@ namespace MotorPlantView.Forms
         private readonly ILogger _logger;
         private readonly IEngineLogic _logic;
         private int? _id;
-        private Dictionary<int, (IComponentModel, int)> _engineComponents;
+        private Dictionary<int, (IComponentModel, int)> _productComponents;
         public int Id { set { _id = value; } }
         public FormEngine(ILogger<FormEngine> logger, IEngineLogic logic)
         {
             InitializeComponent();
             _logger = logger;
             _logic = logic;
-            _engineComponents = new Dictionary<int, (IComponentModel, int)>();
+            _productComponents = new Dictionary<int, (IComponentModel, int)>();
         }
         private void FormEngine_Load(object sender, EventArgs e)
         {
@@ -37,7 +35,7 @@ namespace MotorPlantView.Forms
                     {
                         textBoxName.Text = view.EngineName;
                         textBoxPrice.Text = view.Price.ToString();
-                        _engineComponents = view.EngineComponents ?? new Dictionary<int, (IComponentModel, int)>();
+                        _productComponents = view.EngineComponents ?? new Dictionary<int, (IComponentModel, int)>();
                         LoadData();
                     }
                 }
@@ -52,10 +50,10 @@ namespace MotorPlantView.Forms
             _logger.LogInformation("Загрузка компонент изделия");
             try
             {
-                if (_engineComponents != null)
+                if (_productComponents != null)
                 {
                     dataGridView.Rows.Clear();
-                    foreach (var pc in _engineComponents)
+                    foreach (var pc in _productComponents)
                     {
                         dataGridView.Rows.Add(new object[] { pc.Key, pc.Value.Item1.ComponentName, pc.Value.Item2 });
                     }
@@ -69,44 +67,51 @@ namespace MotorPlantView.Forms
         }
         private void buttonAdd_Click(object sender, EventArgs e)
         {
-            var form = DependencyManager.Instance.Resolve<FormEngineComponent>();
+            var service = Program.ServiceProvider?.GetService(typeof(FormEngineComponent));
-            if (form.ShowDialog() == DialogResult.OK)
+            if (service is FormEngineComponent form)
             {
-                return;
-            }
-            _logger.LogInformation("Добавление нового ингридиента:{ ComponentName}-{ Count}", form.ComponentModel.ComponentName, form.Count);
-            if (_engineComponents.ContainsKey(form.Id))
-            {
-                _engineComponents[form.Id] = (form.ComponentModel,
-                form.Count);
-            }
-            else
-            {
-                _engineComponents.Add(form.Id, (form.ComponentModel,
-                form.Count));
-            }
-            LoadData();
-        }
-        private void buttonUpd_Click(object sender, EventArgs e)
-        {
-            if (dataGridView.SelectedRows.Count == 1)
-            {
-                var form = DependencyManager.Instance.Resolve<FormEngineComponent>();
-                int id = Convert.ToInt32(dataGridView.SelectedRows[0].Cells[0].Value);
-                form.Id = id;
-                form.Count = _engineComponents[id].Item2;
                 if (form.ShowDialog() == DialogResult.OK)
                 {
                     if (form.ComponentModel == null)
                     {
                         return;
                     }
-                    _logger.LogInformation("Изменение ингридиента:{ ComponentName}-{ Count}", form.ComponentModel.ComponentName, form.Count);
+                    _logger.LogInformation("Добавление нового компонента: { ComponentName} - { Count} ", form.ComponentModel.ComponentName, form.Count);
-                    _engineComponents[form.Id] = (form.ComponentModel, form.Count);
+                    if (_productComponents.ContainsKey(form.Id))
+                    {
+                        _productComponents[form.Id] = (form.ComponentModel, form.Count);
+                    }
+                    else
+                    {
+                        _productComponents.Add(form.Id, (form.ComponentModel, form.Count));
+                    }
                     LoadData();
                 }
             }
         }
+        private void buttonUpd_Click(object sender, EventArgs e)
+        {
+            if (dataGridView.SelectedRows.Count == 1)
+            {
+                var service = Program.ServiceProvider?.GetService(typeof(FormEngineComponent));
+                if (service is FormEngineComponent form)
+                {
+                    int id = Convert.ToInt32(dataGridView.SelectedRows[0].Cells[0].Value);
+                    form.Id = id;
+                    form.Count = _productComponents[id].Item2;
+                    if (form.ShowDialog() == DialogResult.OK)
+                    {
+                        if (form.ComponentModel == null)
+                        {
+                            return;
+                        }
+                        _logger.LogInformation("Изменение компонента: { ComponentName} - { Count}", form.ComponentModel.ComponentName, form.Count);
+                        _productComponents[form.Id] = (form.ComponentModel, form.Count);
+                        LoadData();
+                    }
+                }
+            }
+        }
         private void buttonDel_Click(object sender, EventArgs e)
         {
             if (dataGridView.SelectedRows.Count == 1)
@@ -116,7 +121,7 @@ namespace MotorPlantView.Forms
                     try
                     {
                         _logger.LogInformation("Удаление компонента: { ComponentName} - { Count}", dataGridView.SelectedRows[0].Cells[1].Value);
-                        _engineComponents?.Remove(Convert.ToInt32(dataGridView.SelectedRows[0].Cells[0].Value));
+                        _productComponents?.Remove(Convert.ToInt32(dataGridView.SelectedRows[0].Cells[0].Value));
                     }
                     catch (Exception ex)
                     {
@@ -142,7 +147,7 @@ namespace MotorPlantView.Forms
                 MessageBox.Show("Заполните цену", "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error);
                 return;
             }
-            if (_engineComponents == null || _engineComponents.Count == 0)
+            if (_productComponents == null || _productComponents.Count == 0)
             {
                 MessageBox.Show("Заполните компоненты", "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error);
                 return;
@@ -155,7 +160,7 @@ namespace MotorPlantView.Forms
                     Id = _id ?? 0,
                     EngineName = textBoxName.Text,
                     Price = Convert.ToDouble(textBoxPrice.Text),
-                    EngineComponents = _engineComponents
+                    EngineComponents = _productComponents
                 };
                 var operationResult = _id.HasValue ? _logic.Update(model) : _logic.Create(model);
                 if (!operationResult)
@@ -181,7 +186,7 @@ namespace MotorPlantView.Forms
         private double CalcPrice()
         {
             double price = 0;
-            foreach (var elem in _engineComponents)
+            foreach (var elem in _productComponents)
             {
                 price += ((elem.Value.Item1?.Cost ?? 0) * elem.Value.Item2);
             }

MotorPlant/MotorPlantView/FormEngines.cs

@@ -1,7 +1,6 @@
 using Microsoft.Extensions.Logging;
 using MotorPlantContracts.BindingModels;
 using MotorPlantContracts.BusinessLogicsContracts;
-using MotorPlantContracts.DI;
 
 namespace MotorPlantView.Forms
 {
@@ -25,7 +24,14 @@ namespace MotorPlantView.Forms
         {
             try
             {
-                dataGridView.FillAndConfigGrid(_logic.ReadList(null));
+                var list = _logic.ReadList(null);
+                if (list != null)
+                {
+                    dataGridView.DataSource = list;
+                    dataGridView.Columns["Id"].Visible = false;
+                    dataGridView.Columns["EngineComponents"].Visible = false;
+                    dataGridView.Columns["EngineName"].AutoSizeMode = DataGridViewAutoSizeColumnMode.Fill;
+                }
                 _logger.LogInformation("Загрузка компонентов");
             }
             catch (Exception ex)
@@ -36,10 +42,13 @@ namespace MotorPlantView.Forms
 
         private void buttonAdd_Click(object sender, EventArgs e)
         {
-            var form = DependencyManager.Instance.Resolve<FormEngine>();
+            var service = Program.ServiceProvider?.GetService(typeof(FormEngine));
-            if (form.ShowDialog() == DialogResult.OK)
+            if (service is FormEngine form)
             {
-                LoadData();
+                if (form.ShowDialog() == DialogResult.OK)
+                {
+                    LoadData();
+                }
             }
         }
 
@@ -47,11 +56,14 @@ namespace MotorPlantView.Forms
         {
             if (dataGridView.SelectedRows.Count == 1)
             {
-                var form = DependencyManager.Instance.Resolve<FormEngine>();
+                var service = Program.ServiceProvider?.GetService(typeof(FormEngine));
-                form.Id = Convert.ToInt32(dataGridView.SelectedRows[0].Cells["Id"].Value);
+                if (service is FormEngine form)
-                if (form.ShowDialog() == DialogResult.OK)
                 {
-                    LoadData();
+                    form.Id = Convert.ToInt32(dataGridView.SelectedRows[0].Cells["Id"].Value);
+                    if (form.ShowDialog() == DialogResult.OK)
+                    {
+                        LoadData();
+                    }
                 }
             }
         }

MotorPlant/MotorPlantView/FormMain.Designer.cs

@@ -45,7 +45,6 @@
             buttonOrderReady = new Button();
             buttonIssuedOrder = new Button();
             buttonRef = new Button();
-            создатьБекапToolStripMenuItem = new ToolStripMenuItem();
             dataGridView = new DataGridView();
             toolStrip1.SuspendLayout();
             ((System.ComponentModel.ISupportInitialize)dataGridView).BeginInit();
@@ -54,7 +53,7 @@
             // toolStrip1
             // 
             toolStrip1.ImageScalingSize = new Size(20, 20);
-            toolStrip1.Items.AddRange(new ToolStripItem[] { toolStripDropDownButton1, ReportsToolStripMenuItem, запускРаботToolStripMenuItem, почтаToolStripMenuItem, создатьБекапToolStripMenuItem });
+            toolStrip1.Items.AddRange(new ToolStripItem[] { toolStripDropDownButton1, ReportsToolStripMenuItem, запускРаботToolStripMenuItem, почтаToolStripMenuItem });
             toolStrip1.Location = new Point(0, 0);
             toolStrip1.Name = "toolStrip1";
             toolStrip1.Size = new Size(969, 25);
@@ -73,14 +72,14 @@
             // КомпонентыToolStripMenuItem
             // 
             КомпонентыToolStripMenuItem.Name = "КомпонентыToolStripMenuItem";
-            КомпонентыToolStripMenuItem.Size = new Size(174, 22);
+            КомпонентыToolStripMenuItem.Size = new Size(180, 22);
             КомпонентыToolStripMenuItem.Text = "Компоненты";
             КомпонентыToolStripMenuItem.Click += КомпонентыToolStripMenuItem_Click;
             // 
             // ДвигателиToolStripMenuItem
             // 
             ДвигателиToolStripMenuItem.Name = "ДвигателиToolStripMenuItem";
-            ДвигателиToolStripMenuItem.Size = new Size(174, 22);
+            ДвигателиToolStripMenuItem.Size = new Size(180, 22);
             ДвигателиToolStripMenuItem.Text = "Двигатели";
             ДвигателиToolStripMenuItem.Click += ИзделияToolStripMenuItem_Click;
             // 
@@ -184,14 +183,14 @@
 			// клиентыToolStripMenuItem
 			// 
 			клиентыToolStripMenuItem.Name = "клиентыToolStripMenuItem";
-			клиентыToolStripMenuItem.Size = new Size(174, 22);
+			клиентыToolStripMenuItem.Size = new Size(180, 22);
 			клиентыToolStripMenuItem.Text = "Клиенты";
 			клиентыToolStripMenuItem.Click += клиентыToolStripMenuItem_Click;
             //
             // исполнителиToolStripMenuItem
             //
             исполнителиToolStripMenuItem.Name = "исполнителиToolStripMenuItem";
-            исполнителиToolStripMenuItem.Size = new Size(174, 22);
+            исполнителиToolStripMenuItem.Size = new Size(180, 22);
             исполнителиToolStripMenuItem.Text = "Исполнители";
             исполнителиToolStripMenuItem.Click += исполнителиToolStripMenuItem_Click;
             //
@@ -202,13 +201,6 @@
             почтаToolStripMenuItem.Text = "Почта";
             почтаToolStripMenuItem.Click += почтаToolStripMenuItem_Click;
             // 
-            // создатьБекапToolStripMenuItem
-            //
-            создатьБекапToolStripMenuItem.Name = "создатьБекапToolStripMenuItem";
-            создатьБекапToolStripMenuItem.Size = new Size(97, 25);
-            создатьБекапToolStripMenuItem.Text = "Создать Бекап";
-            создатьБекапToolStripMenuItem.Click += createBackUpToolStripMenuItem_Click;
-            // 
             // FormMain
             // 
             AutoScaleDimensions = new SizeF(7F, 15F);
@@ -251,6 +243,5 @@
         private ToolStripMenuItem запускРаботToolStripMenuItem;
         private ToolStripMenuItem исполнителиToolStripMenuItem;
         private ToolStripMenuItem почтаToolStripMenuItem;
-        private ToolStripMenuItem создатьБекапToolStripMenuItem;
     }
 }

MotorPlant/MotorPlantView/FormMain.cs

@@ -2,8 +2,6 @@
 using MotorPlantContracts.BindingModels;
 using MotorPlantContracts.BusinessLogicsContracts;
 using MotorPlantBusinessLogic;
-using MotorPlantContracts.DI;
-using System.Windows.Forms;
 
 namespace MotorPlantView.Forms
 {
@@ -13,16 +11,13 @@ namespace MotorPlantView.Forms
         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)
-
-        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)
         {
@@ -30,32 +25,52 @@ namespace MotorPlantView.Forms
         }
         private void LoadData()
         {
+            _logger.LogInformation("Загрузка заказов");
             try
             {
-                dataGridView.FillAndConfigGrid(_orderLogic.ReadList(null));
+                var list = _orderLogic.ReadList(null);
+
+                if (list != null)
+                {
+                    dataGridView.DataSource = list;
+                    dataGridView.Columns["EngineId"].Visible = false;
+                    dataGridView.Columns["ClientId"].Visible = false;
+                    dataGridView.Columns["ImplementerId"].Visible = false;
+                    dataGridView.Columns["EngineName"].AutoSizeMode = DataGridViewAutoSizeColumnMode.Fill;
+                }
+
                 _logger.LogInformation("Загрузка заказов");
             }
             catch (Exception 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>();
+            var service = Program.ServiceProvider?.GetService(typeof(FormComponents));
-            form.ShowDialog();
+            if (service is FormComponents form)
+            {
+                form.ShowDialog();
+            }
         }
         private void ИзделияToolStripMenuItem_Click(object sender, EventArgs e)
         {
-            var form = DependencyManager.Instance.Resolve<FormEngines>();
+            var service = Program.ServiceProvider?.GetService(typeof(FormEngines));
-            form.ShowDialog();
+
+            if (service is FormEngines form)
+            {
+                form.ShowDialog();
+            }
         }
         private void buttonCreateOrder_Click(object sender, EventArgs e)
         {
-            var form = DependencyManager.Instance.Resolve<FormCreateOrder>();
+            var service = Program.ServiceProvider?.GetService(typeof(FormCreateOrder));
-            form.ShowDialog();
+            if (service is FormCreateOrder form)
-            LoadData();
+            {
+                form.ShowDialog();
+                LoadData();
+            }
         }
         private void buttonTakeOrderInWork_Click(object sender, EventArgs e)
         {
@@ -139,62 +154,61 @@ namespace MotorPlantView.Forms
             using var dialog = new SaveFileDialog { Filter = "docx|*.docx" };
             if (dialog.ShowDialog() == DialogResult.OK)
             {
-                _reportLogic.SaveEnginesToWordFile(new ReportBindingModel { FileName = dialog.FileName });
+                _reportLogic.SaveEnginesToWordFile(new ReportBindingModel
-                MessageBox.Show("Выполнено", "Успех", MessageBoxButtons.OK, MessageBoxIcon.Information);
+                {
+                    FileName = dialog.FileName
+                });
+                MessageBox.Show("Выполнено", "Успех", MessageBoxButtons.OK,
+               MessageBoxIcon.Information);
             }
         }
         private void компонентыПоДвигателямToolStripMenuItem_Click(object sender, EventArgs e)
         {
-            var form = DependencyManager.Instance.Resolve<FormReportEngineComponents>();
+            var service = Program.ServiceProvider?.GetService(typeof(FormReportEngineComponents));
-            form.ShowDialog();
+            if (service is FormReportEngineComponents form)
+            {
+                form.ShowDialog();
+            }
         }
         private void списокЗаказовToolStripMenuItem_Click(object sender, EventArgs e)
         {
-            var form = DependencyManager.Instance.Resolve<FormReportOrders>();
+            var service = Program.ServiceProvider?.GetService(typeof(FormReportOrders));
-            form.ShowDialog();
+            if (service is FormReportOrders form)
+            {
+                form.ShowDialog();
+            }
         }
 		private void клиентыToolStripMenuItem_Click(object sender, EventArgs e)
 		{
-            var form = DependencyManager.Instance.Resolve<FormClients>();
+			var service = Program.ServiceProvider?.GetService(typeof(FormClients));
-            form.ShowDialog();
+			if (service is FormClients form)
-        }
+			{
+				form.ShowDialog();
+			}
+		}
         private void запускРаботToolStripMenuItem_Click(object sender, EventArgs e)
         {
-            _workProcess.DoWork(DependencyManager.Instance.Resolve<IImplementerLogic>(), _orderLogic);
+            _workProcess.DoWork((Program.ServiceProvider?.GetService(typeof(IImplementerLogic
-            MessageBox.Show("Процесс обработки запущен", "Сообщение", MessageBoxButtons.OK, MessageBoxIcon.Information);
+)) as IImplementerLogic)!, _orderLogic);
+            MessageBox.Show("Процесс обработки запущен", "Сообщение",
+           MessageBoxButtons.OK, MessageBoxIcon.Information);
         }
         private void исполнителиToolStripMenuItem_Click(object sender, EventArgs e)
         {
-            var form = DependencyManager.Instance.Resolve<ImplementersForm>();
+            var service =
-            form.ShowDialog();
+Program.ServiceProvider?.GetService(typeof(ImplementersForm));
+            if (service is ImplementersForm form)
+            {
+                form.ShowDialog();
+            }
         }
         private void почтаToolStripMenuItem_Click(object sender, EventArgs e)
         {
-            var form = DependencyManager.Instance.Resolve<FormViewMail>();
+            var service =
-            form.ShowDialog();
+Program.ServiceProvider?.GetService(typeof(FormViewMail));
-        }
+            if (service is FormViewMail form)
-        private void createBackUpToolStripMenuItem_Click(object sender, EventArgs e)
-        {
-            try
             {
-                if (_backUpLogic != null)
+                form.ShowDialog();
-                {
-                    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);
             }
 
         }

MotorPlant/MotorPlantView/FormViewMail.Designer.cs

@@ -42,14 +42,14 @@
             dataGridView.Size = new Size(776, 426);
             dataGridView.TabIndex = 0;
             // 
-            // ViewMailForm
+            // FormViewMail
             // 
             AutoScaleDimensions = new SizeF(8F, 20F);
             AutoScaleMode = AutoScaleMode.Font;
             ClientSize = new Size(800, 450);
             Controls.Add(dataGridView);
-            Name = "ViewMailForm";
+            Name = "FormViewMail";
-            Text = "ViewMailForm";
+            Text = "Письма";
             Load += ViewMailForm_Load;
             ((System.ComponentModel.ISupportInitialize)dataGridView).EndInit();
             ResumeLayout(false);

MotorPlant/MotorPlantView/FormViewMail.cs

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

MotorPlant/MotorPlantView/ImplementersForm.cs

@@ -31,8 +31,21 @@ namespace MotorPlantView.Forms
         {
             try
             {
-                dataGridView1.FillAndConfigGrid(_logic.ReadList(null));
+                var list = _logic.ReadList(null);
-                _logger.LogInformation("Загрузка исполнителей");
+                if (list != null)
+                {
+                    dataGridView1.DataSource = list;
+                    dataGridView1.Columns["Id"].Visible = false;
+                    dataGridView1.Columns["ImplementerFIO"].AutoSizeMode =
+                   DataGridViewAutoSizeColumnMode.Fill;
+                    dataGridView1.Columns["Password"].AutoSizeMode =
+                   DataGridViewAutoSizeColumnMode.Fill;
+                    dataGridView1.Columns["Qualification"].AutoSizeMode =
+                   DataGridViewAutoSizeColumnMode.Fill;
+                    dataGridView1.Columns["WorkExperience"].AutoSizeMode =
+                   DataGridViewAutoSizeColumnMode.Fill;
+                }
+                _logger.LogInformation("Загрузка компонентов");
             }
             catch (Exception ex)
             {

MotorPlant/MotorPlantView/Program.cs

@@ -11,7 +11,6 @@ using MotorPlantBusinessLogic;
 using MotorPlantBusinessLogic.BusinessLogic;
 using MotorPlantBusinessLogic.MailWorker;
 using MotorPlantContracts.BindingModels;
-using MotorPlantContracts.DI;
 
 namespace MotorPlantView.Forms
 {
@@ -28,66 +27,84 @@ namespace MotorPlantView.Forms
             // 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,
+                    MailLogin =
-                    MailPassword = System.Configuration.ConfigurationManager.AppSettings["MailPassword"] ?? string.Empty,
+                System.Configuration.ConfigurationManager.AppSettings["MailLogin"] ??
-                    SmtpClientHost = System.Configuration.ConfigurationManager.AppSettings["SmtpClientHost"] ?? string.Empty,
+                string.Empty,
-                    SmtpClientPort = Convert.ToInt32(System.Configuration.ConfigurationManager.AppSettings["SmtpClientPort"]),
+                    MailPassword =
-                    PopHost = System.Configuration.ConfigurationManager.AppSettings["PopHost"] ?? string.Empty,
+                System.Configuration.ConfigurationManager.AppSettings["MailPassword"] ??
-                    PopPort = Convert.ToInt32(System.Configuration.ConfigurationManager.AppSettings["PopPort"])
+                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);
+                // ñîçäàåì òàéìåð
+                var timer = new System.Threading.Timer(new
+                TimerCallback(MailCheck!), null, 0, 100000);
             }
             catch (Exception ex)
             {
-                var logger = DependencyManager.Instance.Resolve<ILogger>();
+                var logger = _serviceProvider.GetService<ILogger>();
-                logger?.LogError(ex, "Mails Problem");
+                logger?.LogError(ex, "Îøèáêà ðàáîòû ñ ïî÷òîé");
             }
-            Application.Run(DependencyManager.Instance.Resolve<FormMain>());
+            Application.Run(_serviceProvider.GetRequiredService<FormMain>());
         }
-        private static void InitDependency()
+        private static void ConfigureServices(ServiceCollection services)
         {
-            DependencyManager.InitDependency();
+            services.AddLogging(option =>
-
-            DependencyManager.Instance.AddLogging(option =>
             {
                 option.SetMinimumLevel(LogLevel.Information);
                 option.AddNLog("nlog.config");
             });
-            DependencyManager.Instance.RegisterType<IComponentLogic, ComponentLogic>();
+            services.AddTransient<IComponentStorage, ComponentStorage>();
-            DependencyManager.Instance.RegisterType<IOrderLogic, OrderLogic>();
+            services.AddTransient<IOrderStorage, OrderStorage>();
-            DependencyManager.Instance.RegisterType<IEngineLogic, EngineLogic>();
+            services.AddTransient<IEngineStorage, EngineStorage>();
-            DependencyManager.Instance.RegisterType<IReportLogic, ReportLogic>();
-            DependencyManager.Instance.RegisterType<IClientLogic, ClientLogic>();
-            DependencyManager.Instance.RegisterType<IImplementerLogic, ImplementerLogic>();
-            DependencyManager.Instance.RegisterType<IMessageInfoLogic, MessageInfoLogic>();
-            DependencyManager.Instance.RegisterType<IBackUpLogic, BackUpLogic>();
-            DependencyManager.Instance.RegisterType<IWorkProcess, WorkModeling>();
 
-            DependencyManager.Instance.RegisterType<AbstractSaveToExcel, SaveToExcel>();
+            services.AddTransient<IComponentLogic, ComponentLogic>();
-            DependencyManager.Instance.RegisterType<AbstractSaveToWord, SaveToWord>();
+            services.AddTransient<IOrderLogic, OrderLogic>();
-            DependencyManager.Instance.RegisterType<AbstractSaveToPdf, SaveToPdf>();
+            services.AddTransient<IEngineLogic, EngineLogic>();
-            DependencyManager.Instance.RegisterType<AbstractMailWorker, MailKitWorker>();
+            services.AddTransient<IReportLogic, ReportLogic>();
+			services.AddTransient<IClientLogic, ClientLogic>();
+			services.AddTransient<IClientStorage, ClientStorage>();
+            services.AddTransient<IImplementerLogic, ImplementerLogic>();
+            services.AddTransient<IImplementerStorage, ImplementerStorage>();
+            services.AddTransient<IWorkProcess, WorkModeling>();
+            services.AddTransient<IMessageInfoStorage, MessageInfoStorage>();
+            services.AddTransient<IMessageInfoLogic, MessageInfoLogic>();
 
-            DependencyManager.Instance.RegisterType<FormMain>();
+            services.AddTransient<FormMain>();
-            DependencyManager.Instance.RegisterType<FormComponent>();
+            services.AddTransient<FormComponent>();
-            DependencyManager.Instance.RegisterType<FormComponents>();
+            services.AddTransient<FormComponents>();
-            DependencyManager.Instance.RegisterType<FormCreateOrder>();
+            services.AddTransient<FormCreateOrder>();
-            DependencyManager.Instance.RegisterType<FormEngine>();
+            services.AddTransient<FormEngine>();
-            DependencyManager.Instance.RegisterType<FormEngineComponent>();
+            services.AddTransient<FormEngineComponent>();
-            DependencyManager.Instance.RegisterType<FormEngines>();
+            services.AddTransient<FormEngines>();
-            DependencyManager.Instance.RegisterType<FormReportEngineComponents>();
+            services.AddTransient<FormReportEngineComponents>();
-            DependencyManager.Instance.RegisterType<FormReportOrders>();
+            services.AddTransient<FormReportOrders>();
-            DependencyManager.Instance.RegisterType<FormClients>();
+            services.AddTransient<AbstractSaveToExcel, SaveToExcel>();
-            DependencyManager.Instance.RegisterType<ImplementersForm>();
+            services.AddTransient<AbstractSaveToWord, SaveToWord>();
-            DependencyManager.Instance.RegisterType<ImplementerForm>();
+            services.AddTransient<AbstractSaveToPdf, SaveToPdf>();
-            DependencyManager.Instance.RegisterType<FormViewMail>();
+            services.AddSingleton<AbstractMailWorker, MailKitWorker>();
+            services.AddTransient<FormClients>();
+            services.AddTransient<ImplementersForm>();
+            services.AddTransient<ImplementerForm>();
+            services.AddTransient<FormViewMail>();
         }
-        private static void MailCheck(object obj) => DependencyManager.Instance.Resolve<AbstractMailWorker>()?.MailCheck();
+        private static void MailCheck(object obj) =>
+ServiceProvider?.GetService<AbstractMailWorker>()?.MailCheck();
     }
 }