SushiBar/SushiBarBusinessLogic/BackUpLogic.cs

@@ -0,0 +1,103 @@
+using Microsoft.Extensions.Logging;
+using SushiBarContracts.BindingModels;
+using SushiBarContracts.BusinessLogicsContracts;
+using SushiBarContracts.StoragesContracts;
+using SushiBarDataModels;
+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 SushiBarBusinessLogic
+{
+    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);
+        }
+    }
+}
+

SushiBar/SushiBarContracts/Attributes/ColumnAttribute.cs

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

SushiBar/SushiBarContracts/Attributes/GridViewAutoSize.cs

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

SushiBar/SushiBarContracts/BindingModels/BackUpSaveBinidngModel.cs

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

SushiBar/SushiBarContracts/BindingModels/MessageInfoBindingModel.cs

@@ -15,5 +15,6 @@ namespace SushiBarContracts.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();
     }
 }

SushiBar/SushiBarContracts/BusinessLogicsContracts/IBackUpLogic.cs

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

SushiBar/SushiBarContracts/DI/DependencyManager.cs

@@ -0,0 +1,61 @@
+using Microsoft.Extensions.Logging;
+
+namespace SushiBarContracts.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>();
+    }
+}

SushiBar/SushiBarContracts/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 SushiBarContracts.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>();
+    }
+}

SushiBar/SushiBarContracts/DI/IImplementationExtension.cs

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

SushiBar/SushiBarContracts/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 SushiBarContracts.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>()!;
+        }
+    }
+}

SushiBar/SushiBarContracts/DI/ServiceProviderLoader.cs

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

SushiBar/SushiBarContracts/StoragesContracts/IBackUpInfo.cs

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

SushiBar/SushiBarContracts/SushiBarContracts.csproj

@@ -6,6 +6,11 @@
     <Nullable>enable</Nullable>
   </PropertyGroup>
 
+  <ItemGroup>
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="8.0.4" />
+    <PackageReference Include="Microsoft.Extensions.Logging" Version="8.0.0" />
+  </ItemGroup>
+
   <ItemGroup>
     <ProjectReference Include="..\SushiBarDataModels\SushiBarDataModels.csproj" />
   </ItemGroup>

SushiBar/SushiBarContracts/ViewModels/ClientViewModel.cs

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

SushiBar/SushiBarContracts/ViewModels/ComponentViewModel.cs

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

SushiBar/SushiBarContracts/ViewModels/ImplementerViewModel.cs

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

SushiBar/SushiBarContracts/ViewModels/MessageInfoViewModel.cs

@@ -1,4 +1,5 @@
-using SushiBarDataModels.Models;
+using SushiBarContracts.Attributes;
+using SushiBarDataModels.Models;
 using System;
 using System.Collections.Generic;
 using System.ComponentModel;
@@ -10,20 +11,25 @@ namespace SushiBarContracts.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; }
 
-        [DisplayName("Отправитель")]
+        [Column(title: "Отправитель", width: 150)]
         public string SenderName { get; set; } = string.Empty;
 
-        [DisplayName("Дата письма")]
+        [Column(title: "Дата письма", width: 120)]
         public DateTime DateDelivery { get; set; }
 
-        [DisplayName("Заголовок")]
+        [Column(title: "Заголовок", width: 120)]
         public string Subject { get; set; } = string.Empty;
 
-        [DisplayName("Текст")]
+        [Column(title: "Текст", gridViewAutoSize: GridViewAutoSize.Fill, isUseAutoSize: true)]
         public string Body { get; set; } = string.Empty;
     }
-}
+}

SushiBar/SushiBarContracts/ViewModels/OrderViewModel.cs

@@ -1,4 +1,5 @@
-using SushiBarDataModels.Enums;
+using SushiBarContracts.Attributes;
+using SushiBarDataModels.Enums;
 using SushiBarDataModels.Models;
 using System;
 using System.Collections.Generic;
@@ -9,36 +10,46 @@ using System.Threading.Tasks;
 
 namespace SushiBarContracts.ViewModels
 {
-	public class OrderViewModel : IOrderModel
-	{
-		[DisplayName("Номер")]
-		public int Id { get; set; }
-		public int? ImplementerId { get; set; }
-		[DisplayName("Исполнитель")]
-		public string? ImplementerFIO { get; set; } = null;
-		public int SushiId { get; set; }
-		public int ClientId { get; set; }
+    public class OrderViewModel : IOrderModel
+    {
+        [Column(title: "Номер", width: 90)]
+        public int Id { get; set; }
+
+        [Column(visible: false)]
+        public int ClientId { get; set; }
+
+        [Column(title: "Имя клиента", width: 190)]
+        public string ClientFIO { get; set; } = string.Empty;
+
+        [Column(visible: false)]
         public string ClientEmail { get; set; } = string.Empty;
 
-        [DisplayName("ФИО клиента")]
-		public string ClientFIO { get; set; } = string.Empty;
+        [Column(visible: false)]
+        public int? ImplementerId { get; set; }
 
-		[DisplayName("Изделие")]
-		public string SushiName { get; set; } = string.Empty;
+        [Column(title: "Исполнитель", width: 150)]
+        public string? ImplementerFIO { get; set; } = null;
 
-		[DisplayName("Количество")]
-		public int Count { get; set; }
+        [Column(visible: false)]
+        public int SushiId { get; set; }
 
-		[DisplayName("Сумма")]
-		public double Sum { get; set; }
+        [Column(title: "Суши", gridViewAutoSize: GridViewAutoSize.Fill, isUseAutoSize: true)]
+        public string SushiName { get; set; } = string.Empty;
 
-		[DisplayName("Статус")]
-		public OrderStatus Status { get; set; } = OrderStatus.Неизвестен;
+        [Column(title: "Количество", width: 100)]
+        public int Count { get; set; }
 
-		[DisplayName("Дата создания")]
-		public DateTime DateCreate { get; set; } = DateTime.Now;
+        [Column(title: "Сумма", width: 120)]
+        public double Sum { get; set; }
 
-		[DisplayName("Дата выполнения")]
-		public DateTime? DateImplement { get; set; }
-	}
+        [Column(title: "Статус", width: 70)]
+        public OrderStatus Status { get; set; } = OrderStatus.Неизвестен;
+
+        [Column(title: "Дата создания", width: 120)]
+        public DateTime DateCreate { get; set; } = DateTime.Now;
+
+        [Column(title: "Дата выполнения", width: 120)]
+        public DateTime? DateImplement { get; set; }
+    }
 }
+

SushiBar/SushiBarContracts/ViewModels/SushiViewModel.cs

@@ -1,4 +1,5 @@
-using SushiBarDataModels.Models;
+using SushiBarContracts.Attributes;
+using SushiBarDataModels.Models;
 using System;
 using System.Collections.Generic;
 using System.ComponentModel;
@@ -10,15 +11,19 @@ namespace SushiBarContracts.ViewModels
 {
     public class SushiViewModel : ISushiModel
     {
+        [Column(visible: false)]
         public int Id { get; set; }
-        [DisplayName("Название суши")]
+        [Column(title: "Название суши", gridViewAutoSize: GridViewAutoSize.Fill, isUseAutoSize: true)]
         public string SushiName { get; set; } = string.Empty;
-        [DisplayName("Цена")]
+        [Column(title: "Цена", width: 70)]
         public double Price { get; set; }
+        [Column(visible: false)]
         public Dictionary<int, (IComponentModel, int)> SushiComponents
         {
             get;
             set;
         } = new();
+
     }
 }
+

SushiBar/SushiBarDataModels/IMessageInfoModel.cs

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

SushiBar/SushiBarDatabaseImplement/BackUpInfo.cs

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

SushiBar/SushiBarDatabaseImplement/Client.cs

@@ -1,76 +1,84 @@
 using SushiBarContracts.BindingModels;
 using SushiBarContracts.ViewModels;
-using SushiBarDatabaseImplement.Models;
 using SushiBarDataModels.Models;
-using System.ComponentModel.DataAnnotations.Schema;
-using System.ComponentModel.DataAnnotations;
 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;
 
-namespace SushiBarDatabaseImplement
+namespace SushiBarDatabaseImplement.Models
 {
-	public class Client : IClientModel
-	{
-		public int Id { get; private set; }
+    [DataContract]
+    public class Client : IClientModel
+    {
+        [DataMember]
+        public int Id { get; private set; }
 
-		[Required]
-		public string ClientFIO { get; set; } = string.Empty;
-		[Required]
-		public string Email { get; set; } = string.Empty;
-		[Required]
-		public string Password { get; set; } = string.Empty;
+        [DataMember]
+        [Required]
+        public string ClientFIO { get; set; } = string.Empty;
 
-		[ForeignKey("ClientId")]
+        [DataMember]
+        [Required]
+        public string Email { get; set; } = string.Empty;
+
+        [DataMember]
+        [Required]
+        public string Password { get; set; } = string.Empty;
+
+        [ForeignKey("ClientId")]
         public virtual List<Order> ClientOrders { get; set; } = new();
 
         [ForeignKey("ClientId")]
         public virtual List<MessageInfo> ClientMessages { get; set; } = new();
+
         public static Client? Create(ClientBindingModel model)
         {
-			if (model == null)
-			{
-				return null;
-			}
-			return new Client()
-			{
-				Id = model.Id,
-				ClientFIO = model.ClientFIO,
-				Email = model.Email,
-				Password = model.Password
-			};
-		}
+            if (model == null)
+            {
+                return null;
+            }
+            return new Client()
+            {
+                Id = model.Id,
+                ClientFIO = model.ClientFIO,
+                Email = model.Email,
+                Password = model.Password
+            };
+        }
 
-		public static Client Create(ClientViewModel model)
-		{
-			return new Client
-			{
-				Id = model.Id,
-				ClientFIO = model.ClientFIO,
-				Email = model.Email,
-				Password = model.Password
-			};
-		}
+        public static Client Create(ClientViewModel model)
+        {
+            return new Client
+            {
+                Id = model.Id,
+                ClientFIO = model.ClientFIO,
+                Email = model.Email,
+                Password = model.Password
+            };
+        }
 
-		public void Update(ClientBindingModel model)
-		{
-			if (model == null)
-			{
-				return;
-			}
-			ClientFIO = model.ClientFIO;
-			Email = model.Email;
-			Password = model.Password;
-		}
+        public void Update(ClientBindingModel model)
+        {
+            if (model == null)
+            {
+                return;
+            }
+            ClientFIO = model.ClientFIO;
+            Email = model.Email;
+            Password = model.Password;
+        }
 
-		public ClientViewModel GetViewModel => new()
-		{
-			Id = Id,
-			ClientFIO = ClientFIO,
-			Email = Email,
-			Password = Password
-		};
-	}
+        public ClientViewModel GetViewModel => new()
+        {
+            Id = Id,
+            ClientFIO = ClientFIO,
+            Email = Email,
+            Password = Password
+        };
+    }
 }

SushiBar/SushiBarDatabaseImplement/ClientStorage.cs

@@ -2,6 +2,7 @@
 using SushiBarContracts.SearchModels;
 using SushiBarContracts.StoragesContracts;
 using SushiBarContracts.ViewModels;
+using SushiBarDatabaseImplement.Models;
 using System;
 using System.Collections.Generic;
 using System.Linq;

SushiBar/SushiBarDatabaseImplement/Component.cs

@@ -1,19 +1,31 @@
-using SushiBarContracts.BindingModels;
+using System;
+using System.Collections.Generic;
+using System.ComponentModel.DataAnnotations.Schema;
+using System.ComponentModel.DataAnnotations;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using SushiBarContracts.BindingModels;
 using SushiBarContracts.ViewModels;
 using SushiBarDataModels.Models;
-using System.ComponentModel.DataAnnotations;
-using System.ComponentModel.DataAnnotations.Schema;
+using System.Runtime.Serialization;
+
 namespace SushiBarDatabaseImplement.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")]
         public virtual List<SushiComponent> SushiComponents { get; set; } = new();
+
         public static Component? Create(ComponentBindingModel model)
         {
             if (model == null)
@@ -27,6 +39,7 @@ namespace SushiBarDatabaseImplement.Models
                 Cost = model.Cost
             };
         }
+
         public static Component Create(ComponentViewModel model)
         {
             return new Component
@@ -36,6 +49,7 @@ namespace SushiBarDatabaseImplement.Models
                 Cost = model.Cost
             };
         }
+
         public void Update(ComponentBindingModel model)
         {
             if (model == null)
@@ -45,6 +59,7 @@ namespace SushiBarDatabaseImplement.Models
             ComponentName = model.ComponentName;
             Cost = model.Cost;
         }
+
         public ComponentViewModel GetViewModel => new()
         {
             Id = Id,
@@ -52,4 +67,4 @@ namespace SushiBarDatabaseImplement.Models
             Cost = Cost
         };
     }
-}
+}

SushiBar/SushiBarDatabaseImplement/ImplementationExtension.cs

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

SushiBar/SushiBarDatabaseImplement/Implementer.cs

@@ -1,72 +1,73 @@
 using System;
 using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;	
-using SushiBarContracts.BindingModels;
-using SushiBarContracts.SearchModels;
-using SushiBarContracts.ViewModels;
 using System.ComponentModel.DataAnnotations.Schema;
 using System.ComponentModel.DataAnnotations;
-using SushiBarDataModels;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using SushiBarContracts.BindingModels;
 using SushiBarDatabaseImplement.Models;
+using SushiBarContracts.ViewModels;
+using System.Runtime.Serialization;
 
-namespace SushiBarDatabaseImplement
+namespace SushiBarDataModels.Models
 {
-	public class Implementer : IImplementerModel
-	{
-		public int Id { get; set; }
+    [DataContract]
+    public class Implementer : IImplementerModel
+    {
+        [DataMember]
+        public int Id { get; set; }
+        [DataMember]
+        [Required]
+        public string ImplementerFIO { get; set; } = string.Empty;
+        [DataMember]
+        [Required]
+        public string Password { get; set; } = string.Empty;
+        [DataMember]
+        [Required]
+        public int WorkExperience { get; set; }
+        [DataMember]
+        [Required]
+        public int Qualification { get; set; }
 
-		[Required]
-		public string ImplementerFIO { get; set; } = string.Empty;
+        [ForeignKey("ImplementerId")]
+        public virtual List<Order> Order { get; set; } = new();
 
-		[Required]
-		public string Password { get; set; } = string.Empty;
+        public static Implementer? Create(ImplementerBindingModel? model)
+        {
+            if (model == null)
+            {
+                return null;
+            }
+            return new Implementer()
+            {
+                Id = model.Id,
+                ImplementerFIO = model.ImplementerFIO,
+                Password = model.Password,
+                WorkExperience = model.WorkExperience,
+                Qualification = model.Qualification
+            };
+        }
 
-		[Required]
-		public int WorkExperience { get; set; }
+        public void Update(ImplementerBindingModel model)
+        {
+            if (model == null)
+            {
+                return;
+            }
+            ImplementerFIO = model.ImplementerFIO;
+            Password = model.Password;
+            WorkExperience = model.WorkExperience;
+            Qualification = model.Qualification;
+        }
 
-		[Required]
-		public int Qualification { get; set; }
-
-		[ForeignKey("ImplementerId")]
-		public virtual List<Order> Order { get; set; } = new();
-
-		public static Implementer? Create(ImplementerBindingModel? model)
-		{
-			if (model == null)
-			{
-				return null;
-			}
-			return new Implementer()
-			{
-				Id = model.Id,
-				ImplementerFIO = model.ImplementerFIO,
-				Password = model.Password,
-				WorkExperience = model.WorkExperience,
-				Qualification = model.Qualification
-			};
-		}
-
-		public void Update(ImplementerBindingModel model)
-		{
-			if (model == null)
-			{
-				return;
-			}
-			ImplementerFIO = model.ImplementerFIO;
-			Password = model.Password;
-			WorkExperience = model.WorkExperience;
-			Qualification = model.Qualification;
-		}
-
-		public ImplementerViewModel GetViewModel => new()
-		{
-			Id = Id,
-			ImplementerFIO = ImplementerFIO,
-			Password = Password,
-			WorkExperience = WorkExperience,
-			Qualification = Qualification
-		};
-	}
+        public ImplementerViewModel GetViewModel => new()
+        {
+            Id = Id,
+            ImplementerFIO = ImplementerFIO,
+            Password = Password,
+            WorkExperience = WorkExperience,
+            Qualification = Qualification
+        };
+    }
 }

SushiBar/SushiBarDatabaseImplement/ImplementerStorage.cs

@@ -2,12 +2,14 @@
 using SushiBarContracts.SearchModels;
 using SushiBarContracts.StoragesContracts;
 using SushiBarContracts.ViewModels;
+using SushiBarDataModels.Models;
 using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 
+
 namespace SushiBarDatabaseImplement
 {
 	public class ImplementerStorage : IImplementerStorage

SushiBar/SushiBarDatabaseImplement/MessageInfo.cs

@@ -8,28 +8,38 @@ using System.ComponentModel.DataAnnotations;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
+using System.Runtime.Serialization;
 
 namespace SushiBarDatabaseImplement.Models
 {
     public class MessageInfo : IMessageInfoModel
     {
+        [NotMapped]
+        public int Id { get; private set; }
+
+        [DataMember]
         [Key]
         [DatabaseGenerated(DatabaseGeneratedOption.None)]
         public string MessageId { get; set; } = string.Empty;
 
+        [DataMember]
         public int? ClientId { get; set; }
 
         public virtual Client? Client { get; set; }
 
+        [DataMember]
         [Required]
         public string SenderName { get; set; } = string.Empty;
 
+        [DataMember]
         [Required]
         public DateTime DateDelivery { get; set; }
 
+        [DataMember]
         [Required]
         public string Subject { get; set; } = string.Empty;
 
+        [DataMember]
         [Required]
         public string Body { get; set; } = string.Empty;
 
@@ -61,4 +71,4 @@ namespace SushiBarDatabaseImplement.Models
             Body = Body
         };
     }
-}
+}

SushiBar/SushiBarDatabaseImplement/Migrations/20240601134444_Initial.Designer.cs

@@ -12,7 +12,7 @@ using SushiBarDatabaseImplement;
 namespace SushiBarDatabaseImplement.Migrations
 {
     [DbContext(typeof(SushiBarDatabase))]
-    [Migration("20240601121133_Initial")]
+    [Migration("20240601134444_Initial")]
     partial class Initial
     {
         /// <inheritdoc />
@@ -25,32 +25,7 @@ namespace SushiBarDatabaseImplement.Migrations
 
             NpgsqlModelBuilderExtensions.UseIdentityByDefaultColumns(modelBuilder);
 
-            modelBuilder.Entity("SushiBarDatabaseImplement.Client", b =>
-                {
-                    b.Property<int>("Id")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("integer");
-
-                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
-
-                    b.Property<string>("ClientFIO")
-                        .IsRequired()
-                        .HasColumnType("text");
-
-                    b.Property<string>("Email")
-                        .IsRequired()
-                        .HasColumnType("text");
-
-                    b.Property<string>("Password")
-                        .IsRequired()
-                        .HasColumnType("text");
-
-                    b.HasKey("Id");
-
-                    b.ToTable("Clients");
-                });
-
-            modelBuilder.Entity("SushiBarDatabaseImplement.Implementer", b =>
+            modelBuilder.Entity("SushiBarDataModels.Models.Implementer", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd()
@@ -77,6 +52,31 @@ namespace SushiBarDatabaseImplement.Migrations
                     b.ToTable("Implementers");
                 });
 
+            modelBuilder.Entity("SushiBarDatabaseImplement.Models.Client", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
+
+                    b.Property<string>("ClientFIO")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("Email")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("Password")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("Clients");
+                });
+
             modelBuilder.Entity("SushiBarDatabaseImplement.Models.Component", b =>
                 {
                     b.Property<int>("Id")
@@ -218,7 +218,7 @@ namespace SushiBarDatabaseImplement.Migrations
 
             modelBuilder.Entity("SushiBarDatabaseImplement.Models.MessageInfo", b =>
                 {
-                    b.HasOne("SushiBarDatabaseImplement.Client", "Client")
+                    b.HasOne("SushiBarDatabaseImplement.Models.Client", "Client")
                         .WithMany("ClientMessages")
                         .HasForeignKey("ClientId");
 
@@ -227,13 +227,13 @@ namespace SushiBarDatabaseImplement.Migrations
 
             modelBuilder.Entity("SushiBarDatabaseImplement.Models.Order", b =>
                 {
-                    b.HasOne("SushiBarDatabaseImplement.Client", "Client")
+                    b.HasOne("SushiBarDatabaseImplement.Models.Client", "Client")
                         .WithMany("ClientOrders")
                         .HasForeignKey("ClientId")
                         .OnDelete(DeleteBehavior.Cascade)
                         .IsRequired();
 
-                    b.HasOne("SushiBarDatabaseImplement.Implementer", "Implementer")
+                    b.HasOne("SushiBarDataModels.Models.Implementer", "Implementer")
                         .WithMany("Order")
                         .HasForeignKey("ImplementerId");
 
@@ -269,18 +269,18 @@ namespace SushiBarDatabaseImplement.Migrations
                     b.Navigation("Sushi");
                 });
 
-            modelBuilder.Entity("SushiBarDatabaseImplement.Client", b =>
+            modelBuilder.Entity("SushiBarDataModels.Models.Implementer", b =>
+                {
+                    b.Navigation("Order");
+                });
+
+            modelBuilder.Entity("SushiBarDatabaseImplement.Models.Client", b =>
                 {
                     b.Navigation("ClientMessages");
 
                     b.Navigation("ClientOrders");
                 });
 
-            modelBuilder.Entity("SushiBarDatabaseImplement.Implementer", b =>
-                {
-                    b.Navigation("Order");
-                });
-
             modelBuilder.Entity("SushiBarDatabaseImplement.Models.Component", b =>
                 {
                     b.Navigation("SushiComponents");

SushiBar/SushiBarDatabaseImplement/Migrations/SushiBarDatabaseModelSnapshot.cs

@@ -22,32 +22,7 @@ namespace SushiBarDatabaseImplement.Migrations
 
             NpgsqlModelBuilderExtensions.UseIdentityByDefaultColumns(modelBuilder);
 
-            modelBuilder.Entity("SushiBarDatabaseImplement.Client", b =>
-                {
-                    b.Property<int>("Id")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("integer");
-
-                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
-
-                    b.Property<string>("ClientFIO")
-                        .IsRequired()
-                        .HasColumnType("text");
-
-                    b.Property<string>("Email")
-                        .IsRequired()
-                        .HasColumnType("text");
-
-                    b.Property<string>("Password")
-                        .IsRequired()
-                        .HasColumnType("text");
-
-                    b.HasKey("Id");
-
-                    b.ToTable("Clients");
-                });
-
-            modelBuilder.Entity("SushiBarDatabaseImplement.Implementer", b =>
+            modelBuilder.Entity("SushiBarDataModels.Models.Implementer", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd()
@@ -74,6 +49,31 @@ namespace SushiBarDatabaseImplement.Migrations
                     b.ToTable("Implementers");
                 });
 
+            modelBuilder.Entity("SushiBarDatabaseImplement.Models.Client", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
+
+                    b.Property<string>("ClientFIO")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("Email")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("Password")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("Clients");
+                });
+
             modelBuilder.Entity("SushiBarDatabaseImplement.Models.Component", b =>
                 {
                     b.Property<int>("Id")
@@ -215,7 +215,7 @@ namespace SushiBarDatabaseImplement.Migrations
 
             modelBuilder.Entity("SushiBarDatabaseImplement.Models.MessageInfo", b =>
                 {
-                    b.HasOne("SushiBarDatabaseImplement.Client", "Client")
+                    b.HasOne("SushiBarDatabaseImplement.Models.Client", "Client")
                         .WithMany("ClientMessages")
                         .HasForeignKey("ClientId");
 
@@ -224,13 +224,13 @@ namespace SushiBarDatabaseImplement.Migrations
 
             modelBuilder.Entity("SushiBarDatabaseImplement.Models.Order", b =>
                 {
-                    b.HasOne("SushiBarDatabaseImplement.Client", "Client")
+                    b.HasOne("SushiBarDatabaseImplement.Models.Client", "Client")
                         .WithMany("ClientOrders")
                         .HasForeignKey("ClientId")
                         .OnDelete(DeleteBehavior.Cascade)
                         .IsRequired();
 
-                    b.HasOne("SushiBarDatabaseImplement.Implementer", "Implementer")
+                    b.HasOne("SushiBarDataModels.Models.Implementer", "Implementer")
                         .WithMany("Order")
                         .HasForeignKey("ImplementerId");
 
@@ -266,18 +266,18 @@ namespace SushiBarDatabaseImplement.Migrations
                     b.Navigation("Sushi");
                 });
 
-            modelBuilder.Entity("SushiBarDatabaseImplement.Client", b =>
+            modelBuilder.Entity("SushiBarDataModels.Models.Implementer", b =>
+                {
+                    b.Navigation("Order");
+                });
+
+            modelBuilder.Entity("SushiBarDatabaseImplement.Models.Client", b =>
                 {
                     b.Navigation("ClientMessages");
 
                     b.Navigation("ClientOrders");
                 });
 
-            modelBuilder.Entity("SushiBarDatabaseImplement.Implementer", b =>
-                {
-                    b.Navigation("Order");
-                });
-
             modelBuilder.Entity("SushiBarDatabaseImplement.Models.Component", b =>
                 {
                     b.Navigation("SushiComponents");

SushiBar/SushiBarDatabaseImplement/Order.cs

@@ -2,85 +2,100 @@
 using SushiBarContracts.ViewModels;
 using SushiBarDataModels.Enums;
 using SushiBarDataModels.Models;
+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 SushiBarDatabaseImplement.Models
 {
-	public class Order : IOrderModel
-	{
-		public int Id { get; private set; }
+    [DataContract]
+    public class Order : IOrderModel
+    {
+        [DataMember]
+        public int Id { get; private set; }
+        [DataMember]
+        [Required]
+        public int ClientId { get; private set; }
+        public virtual Client Client { get; private set; } = new();
+        [DataMember]
+        [Required]
+        public int SushiId { get; private set; }
 
-		[Required]
-		public int ClientId { get; private set; }
-		public virtual Client Client { get; private set; } = new();
-		[Required]
-		public int SushiId { get; private set; }
+        public virtual Sushi Sushi { get; set; } = new();
 
-		public virtual Sushi Sushi { get; set; } = new();
+        [DataMember]
+        [Required]
+        public int Count { get; private set; }
 
-		[Required]
-		public int Count { get; private set; }
+        [DataMember]
+        [Required]
+        public double Sum { get; private set; }
 
-		[Required]
-		public double Sum { get; private set; }
+        [DataMember]
+        [Required]
+        public OrderStatus Status { get; private set; } = OrderStatus.Неизвестен;
 
-		[Required]
-		public OrderStatus Status { get; private set; } = OrderStatus.Неизвестен;
+        [DataMember]
+        [Required]
+        public DateTime DateCreate { get; private set; } = DateTime.Now;
 
-		[Required]
-		public DateTime DateCreate { get; private set; } = DateTime.Now;
+        [DataMember]
+        public DateTime? DateImplement { get; private set; }
+        [DataMember]
+        public int? ImplementerId { get; private set; }
 
-		public DateTime? DateImplement { get; private set; }
-		public int? ImplementerId { get; private set; }
+        public virtual Implementer? Implementer { get; set; } = new();
 
-		public virtual Implementer? Implementer { get; set; } = new();
+        public static Order Create(SushiBarDatabase context, OrderBindingModel model)
+        {
+            return new Order()
+            {
+                Id = model.Id,
+                ClientId = model.ClientId,
+                Client = context.Clients.First(x => x.Id == model.ClientId),
+                SushiId = model.SushiId,
+                Sushi = context.Sushis.First(x => x.Id == model.SushiId),
+                ImplementerId = model.ImplementerId,
+                Implementer = model.ImplementerId.HasValue ? context.Implementers.First(x => x.Id == model.ImplementerId) : null,
+                Count = model.Count,
+                Sum = model.Sum,
+                Status = model.Status,
+                DateCreate = model.DateCreate,
+                DateImplement = model.DateImplement,
+            };
+        }
 
-		public static Order Create(SushiBarDatabase context, OrderBindingModel model)
-		{
-			return new Order()
-			{
-				Id = model.Id,
-				ClientId = model.ClientId,
-				Client = context.Clients.First(x => x.Id == model.ClientId),
-				SushiId = model.SushiId,
-				Sushi = context.Sushis.First(x => x.Id == model.SushiId),
-				ImplementerId = model.ImplementerId,
-				Implementer = model.ImplementerId.HasValue ? context.Implementers.First(x => x.Id == model.ImplementerId) : null,
-				Count = model.Count,
-				Sum = model.Sum,
-				Status = model.Status,
-				DateCreate = model.DateCreate,
-				DateImplement = model.DateImplement,
-			};
-		}
+        public void Update(SushiBarDatabase context, OrderBindingModel? model)
+        {
+            if (model == null)
+            {
+                return;
+            }
+            Status = model.Status;
+            DateImplement = model.DateImplement;
+            ImplementerId = model.ImplementerId;
+            Implementer = model.ImplementerId.HasValue ? context.Implementers.First(x => x.Id == model.ImplementerId) : null;
+        }
 
-		public void Update(SushiBarDatabase context, OrderBindingModel? model)
-		{
-			if (model == null)
-			{
-				return;
-			}
-			Status = model.Status;
-			DateImplement = model.DateImplement;
-			ImplementerId = model.ImplementerId;
-			Implementer = model.ImplementerId.HasValue ? context.Implementers.First(x => x.Id == model.ImplementerId) : null;
-		}
-
-		public OrderViewModel GetViewModel => new()
-		{
-			Id = Id,
-			ClientId = ClientId,
-			ClientFIO = Client.ClientFIO,
+        public OrderViewModel GetViewModel => new()
+        {
+            Id = Id,
+            ClientId = ClientId,
+            ClientFIO = Client.ClientFIO,
             ClientEmail = Client.Email,
             SushiId = SushiId,
-			SushiName = Sushi.SushiName,
-			ImplementerId = ImplementerId,
-			ImplementerFIO = Implementer != null ? Implementer.ImplementerFIO : null,
-			Count = Count,
-			Sum = Sum,
-			Status = Status,
-			DateCreate = DateCreate,
-			DateImplement = DateImplement,
-		};
-	}	
-}
+            SushiName = Sushi.SushiName,
+            ImplementerId = ImplementerId,
+            ImplementerFIO = Implementer != null ? Implementer.ImplementerFIO : null,
+            Count = Count,
+            Sum = Sum,
+            Status = Status,
+            DateCreate = DateCreate,
+            DateImplement = DateImplement,
+        };
+    }
+}

SushiBar/SushiBarDatabaseImplement/Sushi.cs

@@ -8,18 +8,26 @@ using System.Text;
 using System.Threading.Tasks;
 using SushiBarContracts.BindingModels;
 using SushiBarContracts.ViewModels;
+using System.Runtime.Serialization;
 
 namespace SushiBarDatabaseImplement.Models
 {
+    [DataContract]
     public class Sushi : ISushiModel
     {
+        [DataMember]
         public int Id { get; set; }
+        [DataMember]
         [Required]
         public string SushiName { get; set; } = string.Empty;
+        [DataMember]
         [Required]
         public double Price { get; set; }
 
+
+
         private Dictionary<int, (IComponentModel, int)>? _sushiComponents = null;
+        [DataMember]
         [NotMapped]
         public Dictionary<int, (IComponentModel, int)> SushiComponents
         {
@@ -98,4 +106,4 @@ namespace SushiBarDatabaseImplement.Models
             _sushiComponents = null;
         }
     }
-}   
+}

SushiBar/SushiBarDatabaseImplement/SushiBarDatabase.cs

@@ -5,7 +5,7 @@ using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 using SushiBarDatabaseImplement.Models;
-using Microsoft.Extensions.Options;
+using SushiBarDataModels.Models;
 
 namespace SushiBarDatabaseImplement
 {
@@ -15,7 +15,7 @@ namespace SushiBarDatabaseImplement
 		{
 			if (OptionsBuilder.IsConfigured == false)
 			{
-				OptionsBuilder.UseNpgsql(@"Host=localhost;Database=SushiBarFull7;Username=postgres;Password=postgres");
+				OptionsBuilder.UseNpgsql(@"Host=localhost;Database=SushiBarFull8;Username=postgres;Password=postgres");
 			}
 
 			base.OnConfiguring(OptionsBuilder);
@@ -23,12 +23,12 @@ namespace SushiBarDatabaseImplement
 			AppContext.SetSwitch("Npgsql.EnableLegacyTimestampBehavior", true);
 			AppContext.SetSwitch("Npgsql.DisableDateTimeInfinityConversions", true);
 		}
-		public virtual DbSet<Component> Components { set; get; }
+        public virtual DbSet<Component> Components { set; get; }
         public virtual DbSet<Sushi> Sushis { set; get; }
         public virtual DbSet<SushiComponent> SushiComponents { set; get; }
         public virtual DbSet<Order> Orders { set; get; }
-        public virtual DbSet<Client> Clients { get; set; }
-		public virtual DbSet<Implementer> Implementers { set; get; }
+        public virtual DbSet<Client> Clients { set; get; }
+        public virtual DbSet<Implementer> Implementers { set; get; }
         public virtual DbSet<MessageInfo> MessageInfos { set; get; }
     }
 }

SushiBar/SushiBarDatabaseImplement/SushiBarDatabaseImplement.csproj

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

SushiBar/SushiBarFileImplement/BackUpInfo.cs

@@ -0,0 +1,44 @@
+using SushiBarContracts.StoragesContracts;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Reflection;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace SushiBarFileImplement.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;
+        }
+    }
+}

SushiBar/SushiBarFileImplement/ImplementationExtension.cs

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

SushiBar/SushiBarFileImplement/MessageInfo.cs

@@ -76,5 +76,7 @@ namespace SushiBarFileImplement.Models
             new XAttribute("SenderName", SenderName),
             new XAttribute("DateDelivery", DateDelivery)
             );
+
+        public int Id => throw new NotImplementedException();
     }
 }

SushiBar/SushiBarFileImplement/SushiBarFileImplement.csproj

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

SushiBar/SushiBarListImplement/BackUpInfo.cs

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

SushiBar/SushiBarListImplement/ImplementationExtension.cs

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

SushiBar/SushiBarListImplement/MessageInfo.cs

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

SushiBar/SushiBarListImplement/SushiBarListImplement.csproj

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

SushiBar/SushiBarView/DataGridViewExtension.cs

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

SushiBar/SushiBarView/FormClients.Designer.cs

@@ -20,66 +20,66 @@
 			base.Dispose(disposing);
 		}
 
-		#region Windows Form Designer generated code
+        #region Windows Form Designer generated code
 
-		/// <summary>
-		/// Required method for Designer support - do not modify
-		/// the contents of this method with the code editor.
-		/// </summary>
-		private void InitializeComponent()
-		{
-			buttonDel = new Button();
-			buttonRef = new Button();
-			dataGridView = new DataGridView();
-			((System.ComponentModel.ISupportInitialize)dataGridView).BeginInit();
-			SuspendLayout();
-			// 
-			// buttonDel
-			// 
-			buttonDel.Location = new Point(382, 12);
-			buttonDel.Name = "buttonDel";
-			buttonDel.Size = new Size(119, 38);
-			buttonDel.TabIndex = 0;
-			buttonDel.Text = "Удалить";
-			buttonDel.UseVisualStyleBackColor = true;
-			buttonDel.Click += buttonDel_Click;
-			// 
-			// buttonRef
-			// 
-			buttonRef.Location = new Point(382, 56);
-			buttonRef.Name = "buttonRef";
-			buttonRef.Size = new Size(119, 37);
-			buttonRef.TabIndex = 1;
-			buttonRef.Text = "Обновить";
-			buttonRef.UseVisualStyleBackColor = true;
-			buttonRef.Click += buttonRef_Click;
-			// 
-			// dataGridView
-			// 
-			dataGridView.ColumnHeadersHeightSizeMode = DataGridViewColumnHeadersHeightSizeMode.AutoSize;
-			dataGridView.Location = new Point(2, 2);
-			dataGridView.Name = "dataGridView";
-			dataGridView.Size = new Size(374, 447);
-			dataGridView.TabIndex = 2;
-			// 
-			// FormClients
-			// 
-			AutoScaleDimensions = new SizeF(7F, 15F);
-			AutoScaleMode = AutoScaleMode.Font;
-			ClientSize = new Size(513, 450);
-			Controls.Add(dataGridView);
-			Controls.Add(buttonRef);
-			Controls.Add(buttonDel);
-			Name = "FormClients";
-			Text = "Клиенты";
-			Load += FormClients_Load;
-			((System.ComponentModel.ISupportInitialize)dataGridView).EndInit();
-			ResumeLayout(false);
-		}
+        /// <summary>
+        /// Required method for Designer support - do not modify
+        /// the contents of this method with the code editor.
+        /// </summary>
+        private void InitializeComponent()
+        {
+            buttonDel = new Button();
+            buttonRef = new Button();
+            dataGridView = new DataGridView();
+            ((System.ComponentModel.ISupportInitialize)dataGridView).BeginInit();
+            SuspendLayout();
+            // 
+            // buttonDel
+            // 
+            buttonDel.Location = new Point(610, 12);
+            buttonDel.Name = "buttonDel";
+            buttonDel.Size = new Size(119, 38);
+            buttonDel.TabIndex = 0;
+            buttonDel.Text = "Удалить";
+            buttonDel.UseVisualStyleBackColor = true;
+            buttonDel.Click += buttonDel_Click;
+            // 
+            // buttonRef
+            // 
+            buttonRef.Location = new Point(610, 56);
+            buttonRef.Name = "buttonRef";
+            buttonRef.Size = new Size(119, 37);
+            buttonRef.TabIndex = 1;
+            buttonRef.Text = "Обновить";
+            buttonRef.UseVisualStyleBackColor = true;
+            buttonRef.Click += buttonRef_Click;
+            // 
+            // dataGridView
+            // 
+            dataGridView.ColumnHeadersHeightSizeMode = DataGridViewColumnHeadersHeightSizeMode.AutoSize;
+            dataGridView.Location = new Point(2, 2);
+            dataGridView.Name = "dataGridView";
+            dataGridView.Size = new Size(602, 447);
+            dataGridView.TabIndex = 2;
+            // 
+            // FormClients
+            // 
+            AutoScaleDimensions = new SizeF(7F, 15F);
+            AutoScaleMode = AutoScaleMode.Font;
+            ClientSize = new Size(741, 450);
+            Controls.Add(dataGridView);
+            Controls.Add(buttonRef);
+            Controls.Add(buttonDel);
+            Name = "FormClients";
+            Text = "Клиенты";
+            Load += FormClients_Load;
+            ((System.ComponentModel.ISupportInitialize)dataGridView).EndInit();
+            ResumeLayout(false);
+        }
 
-		#endregion
+        #endregion
 
-		private Button buttonDel;
+        private Button buttonDel;
 		private Button buttonRef;
 		private DataGridView dataGridView;
 	}

SushiBar/SushiBarView/FormClients.cs

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

SushiBar/SushiBarView/FormComponents.Designer.cs

@@ -38,12 +38,10 @@
             // 
             // dataGridView
             // 
-            dataGridView.AutoSizeColumnsMode = DataGridViewAutoSizeColumnsMode.Fill;
             dataGridView.BackgroundColor = SystemColors.Window;
             dataGridView.ColumnHeadersHeightSizeMode = DataGridViewColumnHeadersHeightSizeMode.AutoSize;
             dataGridView.Location = new Point(2, 2);
             dataGridView.Name = "dataGridView";
-            dataGridView.RowTemplate.Height = 25;
             dataGridView.Size = new Size(443, 446);
             dataGridView.TabIndex = 0;
             // 

SushiBar/SushiBarView/FormComponents.cs

@@ -10,19 +10,26 @@ using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 using System.Windows.Forms;
+using SushiBarContracts.DI;
 
 namespace SushiBarView
 {
     public partial class FormComponents : Form
     {
+        public FormComponents()
+        {
+            InitializeComponent();
+        }
         private readonly ILogger _logger;
         private readonly IComponentLogic _logic;
-        public FormComponents(ILogger<FormComponents> logger, IComponentLogic logic)
+        public FormComponents(ILogger<FormComponents> logger, IComponentLogic
+       logic)
         {
             InitializeComponent();
             _logger = logger;
             _logic = logic;
         }
+
         private void FormComponents_Load(object sender, EventArgs e)
         {
             LoadData();
@@ -48,32 +55,26 @@ namespace SushiBarView
                MessageBoxIcon.Error);
             }
         }
+
         private void ButtonAdd_Click(object sender, EventArgs e)
         {
-            var service =
-           Program.ServiceProvider?.GetService(typeof(FormComponent));
-            if (service is FormComponent form)
+            var form = DependencyManager.Instance.Resolve<FormComponent>();
+            if (form.ShowDialog() == DialogResult.OK)
             {
-                if (form.ShowDialog() == DialogResult.OK)
-                {
-                    LoadData();
-                }
+                LoadData();
             }
         }
+
         private void ButtonUpd_Click(object sender, EventArgs e)
         {
             if (dataGridView.SelectedRows.Count == 1)
             {
-                var service =
-               Program.ServiceProvider?.GetService(typeof(FormComponent));
-                if (service is FormComponent form)
+                var form = DependencyManager.Instance.Resolve<FormComponent>();
+
+                form.Id = Convert.ToInt32(dataGridView.SelectedRows[0].Cells["Id"].Value);
+                if (form.ShowDialog() == DialogResult.OK)
                 {
-                    form.Id =
-                   Convert.ToInt32(dataGridView.SelectedRows[0].Cells["Id"].Value);
-                    if (form.ShowDialog() == DialogResult.OK)
-                    {
-                        LoadData();
-                    }
+                    LoadData();
                 }
             }
         }
@@ -82,10 +83,10 @@ namespace SushiBarView
             if (dataGridView.SelectedRows.Count == 1)
             {
                 if (MessageBox.Show("Удалить запись?", "Вопрос",
-                MessageBoxButtons.YesNo, MessageBoxIcon.Question) == DialogResult.Yes)
+               MessageBoxButtons.YesNo, MessageBoxIcon.Question) == DialogResult.Yes)
                 {
                     int id =
-                    Convert.ToInt32(dataGridView.SelectedRows[0].Cells["Id"].Value);
+                   Convert.ToInt32(dataGridView.SelectedRows[0].Cells["Id"].Value);
                     _logger.LogInformation("Удаление компонента");
                     try
                     {
@@ -102,7 +103,7 @@ namespace SushiBarView
                     {
                         _logger.LogError(ex, "Ошибка удаления компонента");
                         MessageBox.Show(ex.Message, "Ошибка",
-                        MessageBoxButtons.OK, MessageBoxIcon.Error);
+                       MessageBoxButtons.OK, MessageBoxIcon.Error);
                     }
                 }
             }
@@ -111,6 +112,6 @@ namespace SushiBarView
         {
             LoadData();
         }
+
     }
 }
-

SushiBar/SushiBarView/FormImplementers.Designer.cs

@@ -20,90 +20,92 @@
 			base.Dispose(disposing);
 		}
 
-		#region Windows Form Designer generated code
+        #region Windows Form Designer generated code
 
-		/// <summary>
-		/// Required method for Designer support - do not modify
-		/// the contents of this method with the code editor.
-		/// </summary>
-		private void InitializeComponent()
-		{
-			dataGridView = new DataGridView();
-			buttonAdd = new Button();
-			buttonUpd = new Button();
-			buttonDel = new Button();
-			buttonRef = new Button();
-			((System.ComponentModel.ISupportInitialize)dataGridView).BeginInit();
-			SuspendLayout();
-			// 
-			// dataGridView
-			// 
-			dataGridView.ColumnHeadersHeightSizeMode = DataGridViewColumnHeadersHeightSizeMode.AutoSize;
-			dataGridView.Location = new Point(2, 3);
-			dataGridView.Name = "dataGridView";
-			dataGridView.Size = new Size(469, 405);
-			dataGridView.TabIndex = 0;
-			// 
-			// buttonAdd
-			// 
-			buttonAdd.Location = new Point(477, 12);
-			buttonAdd.Name = "buttonAdd";
-			buttonAdd.Size = new Size(123, 52);
-			buttonAdd.TabIndex = 1;
-			buttonAdd.Text = "Добавить";
-			buttonAdd.UseVisualStyleBackColor = true;
-			buttonAdd.Click += buttonAdd_Click;
-			// 
-			// buttonUpd
-			// 
-			buttonUpd.Location = new Point(477, 70);
-			buttonUpd.Name = "buttonUpd";
-			buttonUpd.Size = new Size(123, 52);
-			buttonUpd.TabIndex = 2;
-			buttonUpd.Text = "Изменить";
-			buttonUpd.UseVisualStyleBackColor = true;
-			buttonUpd.Click += buttonUpd_Click;
-			// 
-			// buttonDel
-			// 
-			buttonDel.Location = new Point(477, 128);
-			buttonDel.Name = "buttonDel";
-			buttonDel.Size = new Size(123, 52);
-			buttonDel.TabIndex = 3;
-			buttonDel.Text = "Удалить";
-			buttonDel.UseVisualStyleBackColor = true;
-			buttonDel.Click += buttonDel_Click;
-			// 
-			// buttonRef
-			// 
-			buttonRef.Location = new Point(477, 186);
-			buttonRef.Name = "buttonRef";
-			buttonRef.Size = new Size(123, 52);
-			buttonRef.TabIndex = 4;
-			buttonRef.Text = "Обновить";
-			buttonRef.UseVisualStyleBackColor = true;
-			buttonRef.Click += buttonRef_Click;
-			// 
-			// FormImplementers
-			// 
-			AutoScaleDimensions = new SizeF(7F, 15F);
-			AutoScaleMode = AutoScaleMode.Font;
-			ClientSize = new Size(612, 411);
-			Controls.Add(buttonRef);
-			Controls.Add(buttonDel);
-			Controls.Add(buttonUpd);
-			Controls.Add(buttonAdd);
-			Controls.Add(dataGridView);
-			Name = "FormImplementers";
-			Text = "Исполнители";
-			Load += FormImplementers_Load;
-			((System.ComponentModel.ISupportInitialize)dataGridView).EndInit();
-			ResumeLayout(false);
-		}
+        /// <summary>
+        /// Required method for Designer support - do not modify
+        /// the contents of this method with the code editor.
+        /// </summary>
+        private void InitializeComponent()
+        {
+            dataGridView = new DataGridView();
+            buttonAdd = new Button();
+            buttonUpd = new Button();
+            buttonDel = new Button();
+            buttonRef = new Button();
+            ((System.ComponentModel.ISupportInitialize)dataGridView).BeginInit();
+            SuspendLayout();
+            // 
+            // dataGridView
+            // 
+            dataGridView.AllowUserToAddRows = false;
+            dataGridView.AllowUserToDeleteRows = false;
+            dataGridView.ColumnHeadersHeightSizeMode = DataGridViewColumnHeadersHeightSizeMode.AutoSize;
+            dataGridView.Location = new Point(0, 0);
+            dataGridView.Name = "dataGridView";
+            dataGridView.Size = new Size(679, 411);
+            dataGridView.TabIndex = 0;
+            // 
+            // buttonAdd
+            // 
+            buttonAdd.Location = new Point(685, 12);
+            buttonAdd.Name = "buttonAdd";
+            buttonAdd.Size = new Size(123, 52);
+            buttonAdd.TabIndex = 1;
+            buttonAdd.Text = "Добавить";
+            buttonAdd.UseVisualStyleBackColor = true;
+            buttonAdd.Click += buttonAdd_Click;
+            // 
+            // buttonUpd
+            // 
+            buttonUpd.Location = new Point(685, 70);
+            buttonUpd.Name = "buttonUpd";
+            buttonUpd.Size = new Size(123, 52);
+            buttonUpd.TabIndex = 2;
+            buttonUpd.Text = "Изменить";
+            buttonUpd.UseVisualStyleBackColor = true;
+            buttonUpd.Click += buttonUpd_Click;
+            // 
+            // buttonDel
+            // 
+            buttonDel.Location = new Point(685, 128);
+            buttonDel.Name = "buttonDel";
+            buttonDel.Size = new Size(123, 52);
+            buttonDel.TabIndex = 3;
+            buttonDel.Text = "Удалить";
+            buttonDel.UseVisualStyleBackColor = true;
+            buttonDel.Click += buttonDel_Click;
+            // 
+            // buttonRef
+            // 
+            buttonRef.Location = new Point(685, 186);
+            buttonRef.Name = "buttonRef";
+            buttonRef.Size = new Size(123, 52);
+            buttonRef.TabIndex = 4;
+            buttonRef.Text = "Обновить";
+            buttonRef.UseVisualStyleBackColor = true;
+            buttonRef.Click += buttonRef_Click;
+            // 
+            // FormImplementers
+            // 
+            AutoScaleDimensions = new SizeF(7F, 15F);
+            AutoScaleMode = AutoScaleMode.Font;
+            ClientSize = new Size(820, 411);
+            Controls.Add(buttonRef);
+            Controls.Add(buttonDel);
+            Controls.Add(buttonUpd);
+            Controls.Add(buttonAdd);
+            Controls.Add(dataGridView);
+            Name = "FormImplementers";
+            Text = "Исполнители";
+            Load += FormImplementers_Load;
+            ((System.ComponentModel.ISupportInitialize)dataGridView).EndInit();
+            ResumeLayout(false);
+        }
 
-		#endregion
+        #endregion
 
-		private DataGridView dataGridView;
+        private DataGridView dataGridView;
 		private Button buttonAdd;
 		private Button buttonUpd;
 		private Button buttonDel;

SushiBar/SushiBarView/FormImplementers.cs

@@ -1,7 +1,7 @@
 using Microsoft.Extensions.Logging;
 using SushiBarContracts.BindingModels;
 using SushiBarContracts.BusinessLogicsContracts;
-using SushiBarContracts.ViewModels;
+using SushiBarContracts.DI;
 using System;
 using System.Collections.Generic;
 using System.ComponentModel;
@@ -14,105 +14,98 @@ using System.Windows.Forms;
 
 namespace SushiBarView
 {
-	public partial class FormImplementers : Form
-	{
-		private readonly ILogger _logger;
-		private readonly IImplementerLogic _logic;
+    public partial class FormImplementers : Form
+    {
+        private readonly ILogger _logger;
+        private readonly IImplementerLogic _logic;
 
-		public FormImplementers(ILogger<FormImplementers> logger, IImplementerLogic implementerLogic)
-		{
-			InitializeComponent();
-			_logger = logger;
-			_logic = implementerLogic;
-		}
+        public FormImplementers(ILogger<FormImplementers> logger, IImplementerLogic implementerLogic)
+        {
+            InitializeComponent();
+            _logger = logger;
+            _logic = implementerLogic;
+        }
 
-		private void LoadData()
-		{
-			try
-			{
-				var list = _logic.ReadList(null);
-				if (list != null)
-				{
-					dataGridView.DataSource = list;
-					dataGridView.Columns["Id"].Visible = false;
-					dataGridView.Columns["ImplementerFIO"].AutoSizeMode =
-					DataGridViewAutoSizeColumnMode.Fill;
-				}
-				_logger.LogInformation("Загрузка исполнителей");
-			}
-			catch (Exception ex)
-			{
-				_logger.LogError(ex, "Ошибка загрузки исполнителей");
-				MessageBox.Show(ex.Message, "Ошибка", MessageBoxButtons.OK,
-				MessageBoxIcon.Error);
-			}
-		}
+        private void LoadData()
+        {
+            try
+            {
+                dataGridView.FillAndConfigGrid(_logic.ReadList(null));
+                _logger.LogInformation("Загрузка исполнителей");
+            }
+            catch (Exception ex)
+            {
+                _logger.LogError(ex, "Ошибка загрузки исполнителей");
+                MessageBox.Show(ex.Message, "Ошибка", MessageBoxButtons.OK,
+                MessageBoxIcon.Error);
+            }
+        }
 
-		private void FormImplementers_Load(object sender, EventArgs e)
-		{
-			LoadData();
-		}
+        private void FormImplementers_Load(object sender, EventArgs e)
+        {
+            LoadData();
+        }
 
-		private void buttonAdd_Click(object sender, EventArgs e)
-		{
-			var service = Program.ServiceProvider?.GetService(typeof(FormImplementer));
-			if (service is FormImplementer form)
-			{
-				if (form.ShowDialog() == DialogResult.OK)
-				{
-					LoadData();
-				}
-			}
-		}
+        private void buttonAdd_Click(object sender, EventArgs e)
+        {
+            var form = DependencyManager.Instance.Resolve<FormImplementer>();
+            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(FormImplementer));
-				if (service is FormImplementer form)
-				{
-					form.Id = Convert.ToInt32(dataGridView.SelectedRows[0].Cells["Id"].Value);
-					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(FormImplementer));
+                if (service is FormImplementer form)
+                {
+                    form.Id = Convert.ToInt32(dataGridView.SelectedRows[0].Cells["Id"].Value);
+                    if (form.ShowDialog() == DialogResult.OK)
+                    {
+                        LoadData();
+                    }
+                }
+            }
+        }
 
-		private void buttonDel_Click(object sender, EventArgs e)
-		{
-			if (dataGridView.SelectedRows.Count == 1)
-			{
-				if (MessageBox.Show("Удалить запись?", "Вопрос",
-				MessageBoxButtons.YesNo, MessageBoxIcon.Question) == DialogResult.Yes)
-				{
-					int id = Convert.ToInt32(dataGridView.SelectedRows[0].Cells["Id"].Value);
-					_logger.LogInformation("Удаление исполнителя");
-					try
-					{
-						if (!_logic.Delete(new ImplementerBindingModel
-						{
-							Id = id
-						}))
-						{
-							throw new Exception("Ошибка при удалении. Дополнительная информация в логах.");
-						}
-						LoadData();
-					}
-					catch (Exception ex)
-					{
-						_logger.LogError(ex, "Ошибка удаления исполнителя");
-						MessageBox.Show(ex.Message, "Ошибка",
-						MessageBoxButtons.OK, MessageBoxIcon.Error);
-					}
-				}
-			}
-		}
-		private void buttonRef_Click(object sender, EventArgs e)
-		{
-			LoadData();
-		}
-	}
+        private void buttonDel_Click(object sender, EventArgs e)
+        {
+            if (dataGridView.SelectedRows.Count == 1)
+            {
+                if (MessageBox.Show("Удалить запись?", "Вопрос",
+                MessageBoxButtons.YesNo, MessageBoxIcon.Question) == DialogResult.Yes)
+                {
+                    int id = Convert.ToInt32(dataGridView.SelectedRows[0].Cells["Id"].Value);
+                    _logger.LogInformation("Удаление исполнителя");
+                    try
+                    {
+                        if (!_logic.Delete(new ImplementerBindingModel
+                        {
+                            Id = id
+                        }))
+                        {
+                            throw new Exception("Ошибка при удалении. Дополнительная информация в логах.");
+                        }
+                        LoadData();
+                    }
+                    catch (Exception ex)
+                    {
+                        _logger.LogError(ex, "Ошибка удаления исполнителя");
+                        MessageBox.Show(ex.Message, "Ошибка",
+                        MessageBoxButtons.OK, MessageBoxIcon.Error);
+                    }
+                }
+            }
+        }
+        private void buttonRef_Click(object sender, EventArgs e)
+        {
+            LoadData();
+        }
+    }
 }

SushiBar/SushiBarView/FormMail.cs

@@ -28,15 +28,7 @@ namespace SushiBarView
         {
             try
             {
-                var list = _logic.ReadList(null);
-                if (list != null)
-                {
-                    dataGridView.DataSource = list;
-                    dataGridView.Columns["MessageId"].Visible = false;
-                    dataGridView.Columns["ClientId"].Visible = false;
-                    dataGridView.Columns["Body"].AutoSizeMode =
-                    DataGridViewAutoSizeColumnMode.Fill;
-                }
+                dataGridView.FillAndConfigGrid(_logic.ReadList(null));
                 _logger.LogInformation("Загрузка почтовых собщений");
             }
             catch (Exception ex)

SushiBar/SushiBarView/FormMain.Designer.cs

@@ -44,6 +44,7 @@
             ComponentSushisToolStripMenuItem = new ToolStripMenuItem();
             OrdersToolStripMenuItem = new ToolStripMenuItem();
             startWorkToolStripMenuItem = new ToolStripMenuItem();
+            createBackUpToolStripMenuItem = new ToolStripMenuItem();
             ((System.ComponentModel.ISupportInitialize)dataGridView).BeginInit();
             menuStrip.SuspendLayout();
             SuspendLayout();
@@ -90,7 +91,7 @@
             // 
             // menuStrip
             // 
-            menuStrip.Items.AddRange(new ToolStripItem[] { toolStripMenuItem, ReportsToolStripMenuItem, startWorkToolStripMenuItem });
+            menuStrip.Items.AddRange(new ToolStripItem[] { toolStripMenuItem, ReportsToolStripMenuItem, startWorkToolStripMenuItem, createBackUpToolStripMenuItem });
             menuStrip.Location = new Point(0, 0);
             menuStrip.Name = "menuStrip";
             menuStrip.Size = new Size(1381, 24);
@@ -107,35 +108,35 @@
             // componentsToolStripMenuItem
             // 
             componentsToolStripMenuItem.Name = "componentsToolStripMenuItem";
-            componentsToolStripMenuItem.Size = new Size(180, 22);
+            componentsToolStripMenuItem.Size = new Size(149, 22);
             componentsToolStripMenuItem.Text = "Компоненты";
             componentsToolStripMenuItem.Click += componentsToolStripMenuItem_Click;
             // 
             // sushiToolStripMenuItem
             // 
             sushiToolStripMenuItem.Name = "sushiToolStripMenuItem";
-            sushiToolStripMenuItem.Size = new Size(180, 22);
+            sushiToolStripMenuItem.Size = new Size(149, 22);
             sushiToolStripMenuItem.Text = "Суши";
             sushiToolStripMenuItem.Click += sushiToolStripMenuItem_Click;
             // 
             // clientToolStripMenuItem
             // 
             clientToolStripMenuItem.Name = "clientToolStripMenuItem";
-            clientToolStripMenuItem.Size = new Size(180, 22);
+            clientToolStripMenuItem.Size = new Size(149, 22);
             clientToolStripMenuItem.Text = "Клиент";
             clientToolStripMenuItem.Click += clientToolStripMenuItem_Click;
             // 
             // employersToolStripMenuItem
             // 
             employersToolStripMenuItem.Name = "employersToolStripMenuItem";
-            employersToolStripMenuItem.Size = new Size(180, 22);
+            employersToolStripMenuItem.Size = new Size(149, 22);
             employersToolStripMenuItem.Text = "Исполнители";
             employersToolStripMenuItem.Click += employersToolStripMenuItem_Click;
             // 
             // mailToolStripMenuItem
             // 
             mailToolStripMenuItem.Name = "mailToolStripMenuItem";
-            mailToolStripMenuItem.Size = new Size(180, 22);
+            mailToolStripMenuItem.Size = new Size(149, 22);
             mailToolStripMenuItem.Text = "Почта";
             mailToolStripMenuItem.Click += mailToolStripMenuItem_Click;
             // 
@@ -174,6 +175,13 @@
             startWorkToolStripMenuItem.Text = "Запуск работ";
             startWorkToolStripMenuItem.Click += startWorkToolStripMenuItem_Click;
             // 
+            // createBackUpToolStripMenuItem
+            // 
+            createBackUpToolStripMenuItem.Name = "createBackUpToolStripMenuItem";
+            createBackUpToolStripMenuItem.Size = new Size(97, 20);
+            createBackUpToolStripMenuItem.Text = "Создать бекап";
+            createBackUpToolStripMenuItem.Click += createBackUpToolStripMenuItem_Click;
+            // 
             // FormMain
             // 
             AutoScaleDimensions = new SizeF(7F, 15F);
@@ -213,5 +221,6 @@
 		private ToolStripMenuItem startWorkToolStripMenuItem;
 		private ToolStripMenuItem employersToolStripMenuItem;
         private ToolStripMenuItem mailToolStripMenuItem;
+        private ToolStripMenuItem createBackUpToolStripMenuItem;
     }
 }

SushiBar/SushiBarView/FormMain.cs

@@ -2,6 +2,8 @@
 using SushiBarBusinessLogic.BusinessLogics;
 using SushiBarContracts.BindingModels;
 using SushiBarContracts.BusinessLogicsContracts;
+using SushiBarContracts.DI;
+using System.Windows.Forms;
 using System;
 using System.Collections.Generic;
 using System.ComponentModel;
@@ -20,13 +22,15 @@ namespace SushiBarView
         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)
         {
@@ -37,15 +41,7 @@ namespace SushiBarView
             _logger.LogInformation("Загрузка заказов");
             try
             {
-                var list = _orderLogic.ReadList(null);
-                if (list != null)
-                {
-                    dataGridView.DataSource = list;
-                    dataGridView.Columns["SushiId"].Visible = false;
-                    dataGridView.Columns["ClientId"].Visible = false;
-                    dataGridView.Columns["ClientEmail"].Visible = false;
-                    dataGridView.Columns["ImplementerId"].Visible = false;
-                }
+                dataGridView.FillAndConfigGrid(_orderLogic.ReadList(null));
                 _logger.LogInformation("Загрузка заказов");
             }
             catch (Exception ex)
@@ -56,29 +52,19 @@ namespace SushiBarView
         }
         private void componentsToolStripMenuItem_Click(object sender, EventArgs e)
         {
-            var service = Program.ServiceProvider?.GetService(typeof(FormComponents));
-            if (service is FormComponents form)
-            {
-                form.ShowDialog();
-            }
+            var form = DependencyManager.Instance.Resolve<FormComponents>();
+            form.ShowDialog();
         }
         private void sushiToolStripMenuItem_Click(object sender, EventArgs e)
         {
-            var service = Program.ServiceProvider?.GetService(typeof(FormSushis));
-            if (service is FormSushis form)
-            {
-                form.ShowDialog();
-            }
+            var form = DependencyManager.Instance.Resolve<FormSushis>();
+            form.ShowDialog();
         }
         private void ButtonCreateOrder_Click(object sender, EventArgs e)
         {
-            var service =
-           Program.ServiceProvider?.GetService(typeof(FormCreateOrder));
-            if (service is FormCreateOrder form)
-            {
-                form.ShowDialog();
-                LoadData();
-            }
+            var form = DependencyManager.Instance.Resolve<FormCreateOrder>();
+            form.ShowDialog();
+            LoadData();
         }
         private void ButtonIssuedOrder_Click(object sender, EventArgs e)
         {
@@ -125,21 +111,13 @@ e)
         private void ComponentSushisToolStripMenuItem_Click(object sender,
        EventArgs e)
         {
-            var service =
-           Program.ServiceProvider?.GetService(typeof(FormReportSushiComponents));
-            if (service is FormReportSushiComponents form)
-            {
-                form.ShowDialog();
-            }
+            var form = DependencyManager.Instance.Resolve<FormReportSushiComponents>();
+            form.ShowDialog();
         }
         private void OrdersToolStripMenuItem_Click(object sender, EventArgs e)
         {
-            var service =
-           Program.ServiceProvider?.GetService(typeof(FormReportOrders));
-            if (service is FormReportOrders form)
-            {
-                form.ShowDialog();
-            }
+            var form = DependencyManager.Instance.Resolve<FormReportOrders>();
+            form.ShowDialog();
         }
 
         private void ButtonRef_Click(object sender, EventArgs e)
@@ -149,33 +127,54 @@ e)
 
         private void clientToolStripMenuItem_Click(object sender, EventArgs e)
         {
-            var service = Program.ServiceProvider?.GetService(typeof(FormClients));
-            if (service is FormClients form)
-            {
-                form.ShowDialog();
-            }
+            var form = DependencyManager.Instance.Resolve<FormClients>();
+            form.ShowDialog();
         }
         private void employersToolStripMenuItem_Click(object sender, EventArgs e)
         {
-            var service = Program.ServiceProvider?.GetService(typeof(FormImplementers));
-            if (service is FormImplementers form)
-            {
-                form.ShowDialog();
-            }
+            var form = DependencyManager.Instance.Resolve<FormImplementers>();
+            form.ShowDialog();
         }
 
         private void startWorkToolStripMenuItem_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);
         }
         private void mailToolStripMenuItem_Click(object sender, EventArgs e)
         {
-            var service = Program.ServiceProvider?.GetService(typeof(FormMail));
-            if (service is FormMail form)
+            var form = DependencyManager.Instance.Resolve<FormMail>();
+            form.ShowDialog();
+        }
+
+        private void createBackUpToolStripMenuItem_Click(object sender, EventArgs e)
+        {
+            try
             {
-                form.ShowDialog();
+                if (_backUpLogic != null)
+                {
+                    var fbd = new FolderBrowserDialog();
+                    if (fbd.ShowDialog() == DialogResult.OK)
+                    {
+                        _backUpLogic.CreateBackUp(new BackUpSaveBinidngModel
+                        {
+                            FolderName = fbd.SelectedPath
+                        });
+                        MessageBox.Show("Бекап создан", "Сообщение",
+                        MessageBoxButtons.OK, MessageBoxIcon.Information);
+                    }
+                }
             }
+            catch (Exception ex)
+            {
+                MessageBox.Show(ex.Message, "Ошибка создания бэкапа", MessageBoxButtons.OK,
+                MessageBoxIcon.Error);
+            }
+        }
+
+        private void создатьToolStripMenuItem_Click(object sender, EventArgs e)
+        {
+
         }
     }
 }

SushiBar/SushiBarView/FormSushi.cs

@@ -12,6 +12,7 @@ using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 using System.Windows.Forms;
+using SushiBarContracts.DI;
 
 namespace SushiBarView
 {
@@ -99,56 +100,44 @@ namespace SushiBarView
         }
         private void ButtonAdd_Click(object sender, EventArgs e)
         {
-            var service =
-           Program.ServiceProvider?.GetService(typeof(FormSushiComponent));
-            if (service is FormSushiComponent form)
+            var form = DependencyManager.Instance.Resolve<FormSushiComponent>();
+            if (form.ShowDialog() != DialogResult.OK)
             {
+                return;
+            }
+            _logger.LogInformation("Добавление нового ингридиента:{ ComponentName}-{ Count}", form.ComponentModel.ComponentName, form.Count);
+            if (_sushiComponents.ContainsKey(form.Id))
+            {
+                _sushiComponents[form.Id] = (form.ComponentModel,
+                form.Count);
+            }
+            else
+            {
+                _sushiComponents.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<FormSushiComponent>();
+                int id = Convert.ToInt32(dataGridView.SelectedRows[0].Cells[0].Value);
+                form.Id = id;
+                form.Count = _sushiComponents[id].Item2;
                 if (form.ShowDialog() == DialogResult.OK)
                 {
                     if (form.ComponentModel == null)
                     {
                         return;
                     }
-                    _logger.LogInformation("Добавление нового компонента: { ComponentName}- { Count}", form.ComponentModel.ComponentName, form.Count);
-                    if (_sushiComponents.ContainsKey(form.Id))
-                    {
-                        _sushiComponents[form.Id] = (form.ComponentModel,
-                       form.Count);
-                    }
-                    else
-                    {
-                        _sushiComponents.Add(form.Id, (form.ComponentModel,
-                       form.Count));
-                    }
+                    _logger.LogInformation("Изменение компонента:{ ComponentName}-{ Count}", form.ComponentModel.ComponentName, form.Count);
+                    _sushiComponents[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(FormSushiComponent));
-                if (service is FormSushiComponent form)
-                {
-                    int id =
-                   Convert.ToInt32(dataGridView.SelectedRows[0].Cells[0].Value);
-                    form.Id = id;
-                    form.Count = _sushiComponents[id].Item2;
-                    if (form.ShowDialog() == DialogResult.OK)
-                    {
-                        if (form.ComponentModel == null)
-                        {
-                            return;
-                        }
-                        _logger.LogInformation("Изменение компонента: { ComponentName} - { Count}", form.ComponentModel.ComponentName, form.Count);
-                        _sushiComponents[form.Id] = (form.ComponentModel, form.Count);
-                        LoadData();
-                    }
-                }
-            }
-        }
         private void ButtonDel_Click(object sender, EventArgs e)
         {
             if (dataGridView.SelectedRows.Count == 1)

SushiBar/SushiBarView/FormSushis.cs

@@ -10,6 +10,7 @@ using System.Threading.Tasks;
 using System.Windows.Forms;
 using SushiBarContracts.BindingModels;
 using SushiBarContracts.BusinessLogicsContracts;
+using SushiBarContracts.DI;
 
 namespace SushiBarView
 {
@@ -17,13 +18,11 @@ namespace SushiBarView
     {
         private void ButtonAdd_Click(object sender, EventArgs e)
         {
-            var service = Program.ServiceProvider?.GetService(typeof(FormSushi));
-            if (service is FormSushi form)
+            var form = DependencyManager.Instance.Resolve<FormSushi>();
+            if (form.ShowDialog() == DialogResult.OK)
             {
-                if (form.ShowDialog() == DialogResult.OK)
-                {
-                    LoadData();
-                }
+                LoadData();
+
             }
         }
 
@@ -46,15 +45,7 @@ namespace SushiBarView
         {
             try
             {
-                var list = _logic.ReadList(null);
-                if (list != null)
-                {
-                    dataGridView.DataSource = list;
-                    dataGridView.Columns["Id"].Visible = false;
-                    dataGridView.Columns["SushiComponents"].Visible = false;
-                    dataGridView.Columns["SushiName"].AutoSizeMode =
-                    DataGridViewAutoSizeColumnMode.Fill;
-                }
+                dataGridView.FillAndConfigGrid(_logic.ReadList(null));
                 _logger.LogInformation("Загрузка суши");
             }
             catch (Exception ex)
@@ -68,14 +59,11 @@ namespace SushiBarView
         {
             if (dataGridView.SelectedRows.Count == 1)
             {
-                var service = Program.ServiceProvider?.GetService(typeof(FormSushi));
-                if (service is FormSushi form)
+                var form = DependencyManager.Instance.Resolve<FormSushi>();
+                form.Id = Convert.ToInt32(dataGridView.SelectedRows[0].Cells["Id"].Value);
+                if (form.ShowDialog() == DialogResult.OK)
                 {
-                    form.Id = Convert.ToInt32(dataGridView.SelectedRows[0].Cells["Id"].Value);
-                    if (form.ShowDialog() == DialogResult.OK)
-                    {
-                        LoadData();
-                    }
+                    LoadData();
                 }
             }
         }

SushiBar/SushiBarView/Program.cs

@@ -1,18 +1,18 @@
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Logging;
 using SushiBarContracts.BusinessLogicsContracts;
-using SushiBarDatabaseImplement.Implements;
+using System;
 using SushiBarBusinessLogic.BusinessLogics;
+using SushiBarDatabaseImplement.Implements;
 using SushiBarContracts.StoragesContracts;
+using SushiBarView;
 using NLog.Extensions.Logging;
 using SushiBarBusinessLogic.OfficePackage.Implements;
 using SushiBarBusinessLogic.OfficePackage;
-using Microsoft.EntityFrameworkCore.Design;
 using SushiBarBusinessLogic;
-using SushiBarDatabaseImplement;
 using SushiBarBusinessLogic.MailWorker;
 using SushiBarContracts.BindingModels;
-
+using SushiBarContracts.DI;
 
 namespace SushiBarView
 {
@@ -27,12 +27,10 @@ namespace SushiBarView
         static void Main()
         {
             ApplicationConfiguration.Initialize();
-            var services = new ServiceCollection();
-            ConfigureServices(services);
-            _serviceProvider = services.BuildServiceProvider();
+            InitDependency();
             try
             {
-                var mailSender = _serviceProvider.GetService<AbstractMailWorker>();
+                var mailSender = DependencyManager.Instance.Resolve<AbstractMailWorker>();
                 mailSender?.MailConfig(new MailConfigBindingModel
                 {
                     MailLogin = System.Configuration.ConfigurationManager.AppSettings["MailLogin"] ?? string.Empty,
@@ -47,57 +45,47 @@ namespace SushiBarView
             }
             catch (Exception ex)
             {
-                var logger = _serviceProvider.GetService<ILogger>();
+                var logger = DependencyManager.Instance.Resolve<ILogger>();
                 logger?.LogError(ex, "Mails Problem");
             }
-            Application.Run(_serviceProvider.GetRequiredService<FormMain>());
+            Application.Run(DependencyManager.Instance.Resolve<FormMain>());
         }
-		private static void ConfigureServices(ServiceCollection services)
-		{
-			services.AddLogging(option =>
-			{
-				option.SetMinimumLevel(LogLevel.Information);
-				option.AddNLog("nlog.config");
-			});
-			services.AddTransient<IComponentStorage, ComponentStorage>();
-			services.AddTransient<IOrderStorage, OrderStorage>();
-			services.AddTransient<ISushiStorage, SushiStorage>();
-			services.AddTransient<IClientStorage, ClientStorage>();
-			services.AddTransient<IImplementerStorage, ImplementerStorage>();
-            services.AddTransient<IMessageInfoStorage, MessageInfoStorage>();
+        private static void InitDependency()
+        {
+            DependencyManager.InitDependency();
 
-            services.AddTransient<IComponentLogic, ComponentLogic>();
-			services.AddTransient<IOrderLogic, OrderLogic>();
-			services.AddTransient<ISushiLogic, SushiLogic>();
-			services.AddTransient<IClientLogic, ClientLogic>();
-			services.AddTransient<IComponentLogic, ComponentLogic>();
-			services.AddTransient<IImplementerLogic, ImplementerLogic>();
-            services.AddTransient<IMessageInfoLogic, MessageInfoLogic>();
-            services.AddTransient<IWorkProcess, WorkModeling>();
-            services.AddSingleton<AbstractMailWorker, MailKitWorker>();
-
-            services.AddTransient<FormMain>();
-			services.AddTransient<FormComponent>();
-			services.AddTransient<FormComponents>();
-			services.AddTransient<FormCreateOrder>();
-			services.AddTransient<FormSushis>();
-			services.AddTransient<FormSushiComponent>();
-			services.AddTransient<FormSushi>();
-			services.AddTransient<FormReportOrders>();
-			services.AddTransient<FormReportSushiComponents>();
-			services.AddTransient<FormImplementers>();
-			services.AddTransient<FormImplementer>();
-			services.AddTransient<IReportLogic, ReportLogic>();
-			services.AddTransient<FormClients>();
-            services.AddTransient<FormMail>();
-            services.AddTransient<EntityFrameworkDesignServicesBuilder>();
-
-			services.AddTransient<AbstractSaveToWord, SaveToWord>();
-			services.AddTransient<AbstractSaveToExcel, SaveToExcel>();
-			services.AddTransient<AbstractSaveToPdf, SaveToPdf>();
-
-			services.AddTransient<FormMain>();
-		}
-        private static void MailCheck(object obj) => ServiceProvider?.GetService<AbstractMailWorker>()?.MailCheck();
+            DependencyManager.Instance.AddLogging(option =>
+            {
+                option.SetMinimumLevel(LogLevel.Information);
+                option.AddNLog("nlog.config");
+            });
+            DependencyManager.Instance.RegisterType<IClientLogic, ClientLogic>();
+            DependencyManager.Instance.RegisterType<IComponentLogic, ComponentLogic>();
+            DependencyManager.Instance.RegisterType<IOrderLogic, OrderLogic>();
+            DependencyManager.Instance.RegisterType<ISushiLogic, SushiLogic>();
+            DependencyManager.Instance.RegisterType<IReportLogic, ReportLogic>();
+            DependencyManager.Instance.RegisterType<IImplementerLogic, ImplementerLogic>();
+            DependencyManager.Instance.RegisterType<IMessageInfoLogic, MessageInfoLogic>();
+            DependencyManager.Instance.RegisterType<IBackUpLogic, BackUpLogic>();
+            DependencyManager.Instance.RegisterType<AbstractSaveToWord, SaveToWord>();
+            DependencyManager.Instance.RegisterType<AbstractSaveToExcel, SaveToExcel>();
+            DependencyManager.Instance.RegisterType<AbstractSaveToPdf, SaveToPdf>();
+            DependencyManager.Instance.RegisterType<AbstractMailWorker, MailKitWorker>(true);
+            DependencyManager.Instance.RegisterType<IWorkProcess, WorkModeling>();
+            DependencyManager.Instance.RegisterType<FormMain>();
+            DependencyManager.Instance.RegisterType<FormComponent>();
+            DependencyManager.Instance.RegisterType<FormComponents>();
+            DependencyManager.Instance.RegisterType<FormCreateOrder>();
+            DependencyManager.Instance.RegisterType<FormSushi>();
+            DependencyManager.Instance.RegisterType<FormSushiComponent>();
+            DependencyManager.Instance.RegisterType<FormSushis>();
+            DependencyManager.Instance.RegisterType<FormReportOrders>();
+            DependencyManager.Instance.RegisterType<FormReportSushiComponents>();
+            DependencyManager.Instance.RegisterType<FormClients>();
+            DependencyManager.Instance.RegisterType<FormImplementers>();
+            DependencyManager.Instance.RegisterType<FormImplementer>();
+            DependencyManager.Instance.RegisterType<FormMail>();
+        }
+        private static void MailCheck(object obj) => DependencyManager.Instance.Resolve<AbstractMailWorker>()?.MailCheck();
     }
 }

SushiBar/SushiBarView/SushiBarView.csproj

@@ -13,6 +13,9 @@
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
+    <PackageReference Include="Microsoft.Extensions.Configuration" Version="8.0.0" />
+    <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="8.0.0" />
+    <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="8.0.0" />
     <PackageReference Include="NLog.Extensions.Logging" Version="5.3.8" />
     <PackageReference Include="ReportViewerCore.WinForms" Version="15.1.19" />
   </ItemGroup>
@@ -21,6 +24,7 @@
     <ProjectReference Include="..\SushiBarBusinessLogic\SushiBarBusinessLogic.csproj" />
     <ProjectReference Include="..\SushiBarContracts\SushiBarContracts.csproj" />
     <ProjectReference Include="..\SushiBarDatabaseImplement\SushiBarDatabaseImplement.csproj" />
+    <ProjectReference Include="..\SushiBarFileImplement\SushiBarFileImplement.csproj" />
     <ProjectReference Include="..\SushiBarListImplement\SushiBarListImplement.csproj" />
   </ItemGroup>
 

desktop.ini

@@ -0,0 +1,4 @@
+[ViewState]
+Mode=
+Vid=
+FolderType=Generic