From f6f158ee9cfc7c77bc91030244b3b1d122e78818 Mon Sep 17 00:00:00 2001 From: Dasha Date: Tue, 14 May 2024 01:08:00 +0400 Subject: [PATCH] done --- .gitignore | 5 + .../BusinessLogics/BackUpLogic.cs | 98 +++++++++++++++++++ .../Attributes/ColumnAttribute.cs | 25 +++++ .../Attributes/GridViewAutoSize.cs | 21 ++++ .../BindingModels/BackUpSaveBindingModel.cs | 7 ++ .../BindingModels/MessageInfoBindingModel.cs | 1 + .../BusinessLogicsContracts/IBackUpLogic.cs | 9 ++ .../DI/DependencyManager.cs | 61 ++++++++++++ .../DI/IDependencyContainer.cs | 35 +++++++ .../DI/IImplementationExtension.cs | 11 +++ .../DI/ServiceDependencyContainer.cs | 59 +++++++++++ .../DI/ServiceProviderLoader.cs | 50 ++++++++++ .../FishFactoryContracts.csproj | 4 + .../StoragesContracts/IBackUpInfo.cs | 9 ++ .../ViewModels/CannedViewModel.cs | 21 ++-- .../ViewModels/ClientViewModel.cs | 18 ++-- .../ViewModels/ComponentViewModel.cs | 13 +-- .../ViewModels/ImplementerViewModel.cs | 12 ++- .../ViewModels/MessageInfoViewModel.cs | 17 ++-- .../ViewModels/OrderViewModel.cs | 43 ++++---- .../Models/IMessageInfoModel.cs | 2 +- .../DatabaseImplementationExtension.cs | 22 +++++ .../FishFactoryDatabaseImplement.csproj | 4 + .../Implements/BackUpInfo.cs | 27 +++++ .../Models/Canned.cs | 16 ++- .../Models/Client.cs | 16 ++- .../Models/Component.cs | 13 ++- .../Models/Implementer.cs | 7 ++ .../Models/Message.cs | 9 ++ .../Models/Order.cs | 27 +++-- .../FileImplementationExtension.cs | 22 +++++ .../FishFactoryFileImplement.csproj | 4 + .../Implements/BackUpInfo.cs | 29 ++++++ .../FishFactoryFileImplement/Models/Canned.cs | 16 ++- .../FishFactoryFileImplement/Models/Client.cs | 16 ++- .../Models/Component.cs | 13 ++- .../Models/Implementer.cs | 7 ++ .../Models/Message.cs | 11 +++ .../FishFactoryFileImplement/Models/Order.cs | 27 +++-- .../FishFactoryListImplement.csproj | 4 + .../Implements/BackUpInfo.cs | 17 ++++ .../ListImplementationExtension.cs | 22 +++++ .../Models/Message.cs | 2 + .../FishFactoryView/DataGridViewExtension.cs | 46 +++++++++ FishFactory/FishFactoryView/FormCanned.cs | 9 +- FishFactory/FishFactoryView/FormClients.cs | 10 +- FishFactory/FishFactoryView/FormComponents.cs | 19 ++-- .../FishFactoryView/FormImplementers.cs | 13 +-- FishFactory/FishFactoryView/FormListCanned.cs | 20 ++-- FishFactory/FishFactoryView/FormMails.cs | 9 +- .../FishFactoryView/FormMain.Designer.cs | 12 ++- FishFactory/FishFactoryView/FormMain.cs | 76 ++++++++------ FishFactory/FishFactoryView/Program.cs | 87 ++++++++-------- 53 files changed, 922 insertions(+), 231 deletions(-) create mode 100644 FishFactory/FishFactoryBusinessLogic/BusinessLogics/BackUpLogic.cs create mode 100644 FishFactory/FishFactoryContracts/Attributes/ColumnAttribute.cs create mode 100644 FishFactory/FishFactoryContracts/Attributes/GridViewAutoSize.cs create mode 100644 FishFactory/FishFactoryContracts/BindingModels/BackUpSaveBindingModel.cs create mode 100644 FishFactory/FishFactoryContracts/BusinessLogicsContracts/IBackUpLogic.cs create mode 100644 FishFactory/FishFactoryContracts/DI/DependencyManager.cs create mode 100644 FishFactory/FishFactoryContracts/DI/IDependencyContainer.cs create mode 100644 FishFactory/FishFactoryContracts/DI/IImplementationExtension.cs create mode 100644 FishFactory/FishFactoryContracts/DI/ServiceDependencyContainer.cs create mode 100644 FishFactory/FishFactoryContracts/DI/ServiceProviderLoader.cs create mode 100644 FishFactory/FishFactoryContracts/StoragesContracts/IBackUpInfo.cs create mode 100644 FishFactory/FishFactoryDatabaseImplement/DatabaseImplementationExtension.cs create mode 100644 FishFactory/FishFactoryDatabaseImplement/Implements/BackUpInfo.cs create mode 100644 FishFactory/FishFactoryFileImplement/FileImplementationExtension.cs create mode 100644 FishFactory/FishFactoryFileImplement/Implements/BackUpInfo.cs create mode 100644 FishFactory/FishFactoryListImplement/Implements/BackUpInfo.cs create mode 100644 FishFactory/FishFactoryListImplement/ListImplementationExtension.cs create mode 100644 FishFactory/FishFactoryView/DataGridViewExtension.cs diff --git a/.gitignore b/.gitignore index ca1c7a3..e4f4745 100644 --- a/.gitignore +++ b/.gitignore @@ -14,6 +14,11 @@ # User-specific files (MonoDevelop/Xamarin Studio) *.userprefs +# dll файлы +*.dll + +/FishFactory/ImplementationExtensions + # Mono auto generated files mono_crash.* diff --git a/FishFactory/FishFactoryBusinessLogic/BusinessLogics/BackUpLogic.cs b/FishFactory/FishFactoryBusinessLogic/BusinessLogics/BackUpLogic.cs new file mode 100644 index 0000000..6b23397 --- /dev/null +++ b/FishFactory/FishFactoryBusinessLogic/BusinessLogics/BackUpLogic.cs @@ -0,0 +1,98 @@ +using FishFactoryContracts.BindingModels; +using FishFactoryContracts.BusinessLogicsContracts; +using FishFactoryContracts.StoragesContracts; +using FishFactoryDataModels; +using Microsoft.Extensions.Logging; +using System.IO.Compression; +using System.Reflection; +using System.Runtime.Serialization.Json; + +namespace FishFactoryBusinessLogic.BusinessLogics +{ + public class BackUpLogic : IBackUpLogic + { + private readonly ILogger _logger; + + private readonly IBackUpInfo _backUpInfo; + + public BackUpLogic(ILogger logger, IBackUpInfo backUpInfo) + { + _logger = logger; + _backUpInfo = backUpInfo; + } + + public void CreateBackUp(BackUpSaveBindingModel 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(string folderName) where T : class, new() + { + var records = _backUpInfo.GetList(); + if (records == null) + { + _logger.LogWarning("{type} type get null list", typeof(T).Name); + return; + } + var jsonFormatter = new DataContractJsonSerializer(typeof(List)); + using var fs = new FileStream(string.Format("{0}/{1}.json", folderName, typeof(T).Name), FileMode.OpenOrCreate); + jsonFormatter.WriteObject(fs, records); + } + } +} \ No newline at end of file diff --git a/FishFactory/FishFactoryContracts/Attributes/ColumnAttribute.cs b/FishFactory/FishFactoryContracts/Attributes/ColumnAttribute.cs new file mode 100644 index 0000000..26ed426 --- /dev/null +++ b/FishFactory/FishFactoryContracts/Attributes/ColumnAttribute.cs @@ -0,0 +1,25 @@ +namespace FishFactoryContracts.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; + } + } +} \ No newline at end of file diff --git a/FishFactory/FishFactoryContracts/Attributes/GridViewAutoSize.cs b/FishFactory/FishFactoryContracts/Attributes/GridViewAutoSize.cs new file mode 100644 index 0000000..65234b1 --- /dev/null +++ b/FishFactory/FishFactoryContracts/Attributes/GridViewAutoSize.cs @@ -0,0 +1,21 @@ +namespace FishFactoryContracts.Attributes +{ + public enum GridViewAutoSize + { + NotSet = 0, + + None = 1, + + ColumnHeader = 2, + + AllCellsExceptHeader = 4, + + AllCells = 6, + + DisplayedCellsExceptHeader = 8, + + DisplayedCells = 10, + + Fill = 16 + } +} \ No newline at end of file diff --git a/FishFactory/FishFactoryContracts/BindingModels/BackUpSaveBindingModel.cs b/FishFactory/FishFactoryContracts/BindingModels/BackUpSaveBindingModel.cs new file mode 100644 index 0000000..5133853 --- /dev/null +++ b/FishFactory/FishFactoryContracts/BindingModels/BackUpSaveBindingModel.cs @@ -0,0 +1,7 @@ +namespace FishFactoryContracts.BindingModels +{ + public class BackUpSaveBindingModel + { + public string FolderName { get; set; } = string.Empty; + } +} \ No newline at end of file diff --git a/FishFactory/FishFactoryContracts/BindingModels/MessageInfoBindingModel.cs b/FishFactory/FishFactoryContracts/BindingModels/MessageInfoBindingModel.cs index 617da32..ec019dd 100644 --- a/FishFactory/FishFactoryContracts/BindingModels/MessageInfoBindingModel.cs +++ b/FishFactory/FishFactoryContracts/BindingModels/MessageInfoBindingModel.cs @@ -15,5 +15,6 @@ namespace FishFactoryContracts.BindingModels public string Body { get; set; } = string.Empty; public DateTime DateDelivery { get; set; } + public int Id => throw new NotImplementedException(); } } \ No newline at end of file diff --git a/FishFactory/FishFactoryContracts/BusinessLogicsContracts/IBackUpLogic.cs b/FishFactory/FishFactoryContracts/BusinessLogicsContracts/IBackUpLogic.cs new file mode 100644 index 0000000..fafaac1 --- /dev/null +++ b/FishFactory/FishFactoryContracts/BusinessLogicsContracts/IBackUpLogic.cs @@ -0,0 +1,9 @@ +using FishFactoryContracts.BindingModels; + +namespace FishFactoryContracts.BusinessLogicsContracts +{ + public interface IBackUpLogic + { + void CreateBackUp(BackUpSaveBindingModel model); + } +} \ No newline at end of file diff --git a/FishFactory/FishFactoryContracts/DI/DependencyManager.cs b/FishFactory/FishFactoryContracts/DI/DependencyManager.cs new file mode 100644 index 0000000..4635071 --- /dev/null +++ b/FishFactory/FishFactoryContracts/DI/DependencyManager.cs @@ -0,0 +1,61 @@ +using Microsoft.Extensions.Logging; + +namespace FishFactoryContracts.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; } } + + /// + /// Иницализация библиотек, в которых идут установки зависомстей + /// + public static void InitDependency() + { + var ext = ServiceProviderLoader.GetImplementationExtensions(); + if (ext == null) + { + throw new ArgumentNullException("Отсутствуют компоненты для загрузки зависимостей по модулям"); + } + // регистрируем зависимости + ext.RegisterServices(); + } + + /// + /// Регистрация логгера + /// + /// + public void AddLogging(Action configure) => _dependencyManager.AddLogging(configure); + + /// + /// Добавление зависимости + /// + /// + /// + public void RegisterType(bool isSingle = false) where U : class, T where T : class => _dependencyManager.RegisterType(isSingle); + + /// + /// Добавление зависимости + /// + /// + /// + public void RegisterType(bool isSingle = false) where T : class => _dependencyManager.RegisterType(isSingle); + + /// + /// Получение класса со всеми зависмостями + /// + /// + /// + public T Resolve() => _dependencyManager.Resolve(); + } +} \ No newline at end of file diff --git a/FishFactory/FishFactoryContracts/DI/IDependencyContainer.cs b/FishFactory/FishFactoryContracts/DI/IDependencyContainer.cs new file mode 100644 index 0000000..33003cc --- /dev/null +++ b/FishFactory/FishFactoryContracts/DI/IDependencyContainer.cs @@ -0,0 +1,35 @@ +using Microsoft.Extensions.Logging; + +namespace FishFactoryContracts.DI +{ + public interface IDependencyContainer + { + /// + /// Регистрация логгера + /// + /// + void AddLogging(Action configure); + + /// + /// Добавление зависимости + /// + /// + /// + /// + void RegisterType(bool isSingle) where U : class, T where T : class; + + /// + /// Добавление зависимости + /// + /// + /// + void RegisterType(bool isSingle) where T : class; + + /// + /// Получение класса со всеми зависмостями + /// + /// + /// + T Resolve(); + } +} \ No newline at end of file diff --git a/FishFactory/FishFactoryContracts/DI/IImplementationExtension.cs b/FishFactory/FishFactoryContracts/DI/IImplementationExtension.cs new file mode 100644 index 0000000..1ac5006 --- /dev/null +++ b/FishFactory/FishFactoryContracts/DI/IImplementationExtension.cs @@ -0,0 +1,11 @@ +namespace FishFactoryContracts.DI +{ + public interface IImplementationExtension + { + public int Priority { get; } + /// + /// Регистрация сервисов + /// + public void RegisterServices(); + } +} \ No newline at end of file diff --git a/FishFactory/FishFactoryContracts/DI/ServiceDependencyContainer.cs b/FishFactory/FishFactoryContracts/DI/ServiceDependencyContainer.cs new file mode 100644 index 0000000..6a591a7 --- /dev/null +++ b/FishFactory/FishFactoryContracts/DI/ServiceDependencyContainer.cs @@ -0,0 +1,59 @@ +using FishFactoryContracts.DI; +using Microsoft.Extensions.DependencyInjection; +using Microsoft.Extensions.Logging; +using System; + +namespace FishFactoryContracts.DI +{ + public class ServiceDependencyContainer : IDependencyContainer + { + private ServiceProvider? _serviceProvider; + + private readonly ServiceCollection _serviceCollection; + + public ServiceDependencyContainer() + { + _serviceCollection = new ServiceCollection(); + } + + public void AddLogging(Action configure) + { + _serviceCollection.AddLogging(configure); + } + + public void RegisterType(bool isSingle) where U : class, T where T : class + { + if (isSingle) + { + _serviceCollection.AddSingleton(); + } + else + { + _serviceCollection.AddTransient(); + } + _serviceProvider = null; + } + + public void RegisterType(bool isSingle) where T : class + { + if (isSingle) + { + _serviceCollection.AddSingleton(); + } + else + { + _serviceCollection.AddTransient(); + } + _serviceProvider = null; + } + + public T Resolve() + { + if (_serviceProvider == null) + { + _serviceProvider = _serviceCollection.BuildServiceProvider(); + } + return _serviceProvider.GetService()!; + } + } +} \ No newline at end of file diff --git a/FishFactory/FishFactoryContracts/DI/ServiceProviderLoader.cs b/FishFactory/FishFactoryContracts/DI/ServiceProviderLoader.cs new file mode 100644 index 0000000..5fb6469 --- /dev/null +++ b/FishFactory/FishFactoryContracts/DI/ServiceProviderLoader.cs @@ -0,0 +1,50 @@ +using System.Reflection; + +namespace FishFactoryContracts.DI +{ + public class ServiceProviderLoader + { + /// + /// Загрузка всех классов-реализаций IImplementationExtension + /// + /// + 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"; + } + } +} \ No newline at end of file diff --git a/FishFactory/FishFactoryContracts/FishFactoryContracts.csproj b/FishFactory/FishFactoryContracts/FishFactoryContracts.csproj index 4a17316..12e2381 100644 --- a/FishFactory/FishFactoryContracts/FishFactoryContracts.csproj +++ b/FishFactory/FishFactoryContracts/FishFactoryContracts.csproj @@ -6,6 +6,10 @@ enable + + + + diff --git a/FishFactory/FishFactoryContracts/StoragesContracts/IBackUpInfo.cs b/FishFactory/FishFactoryContracts/StoragesContracts/IBackUpInfo.cs new file mode 100644 index 0000000..1bdf40a --- /dev/null +++ b/FishFactory/FishFactoryContracts/StoragesContracts/IBackUpInfo.cs @@ -0,0 +1,9 @@ +namespace FishFactoryContracts.StoragesContracts +{ + public interface IBackUpInfo + { + List? GetList() where T : class, new(); + + Type? GetTypeByModelInterface(string modelInterfaceName); + } +} \ No newline at end of file diff --git a/FishFactory/FishFactoryContracts/ViewModels/CannedViewModel.cs b/FishFactory/FishFactoryContracts/ViewModels/CannedViewModel.cs index 6c9e262..60cd6bc 100644 --- a/FishFactory/FishFactoryContracts/ViewModels/CannedViewModel.cs +++ b/FishFactory/FishFactoryContracts/ViewModels/CannedViewModel.cs @@ -1,19 +1,18 @@ -using FishFactoryDataModels.Models; +using FishFactoryContracts.Attributes; +using FishFactoryDataModels.Models; using System.ComponentModel; namespace FishFactoryContracts.ViewModels { public class CannedViewModel : ICannedModel { - public int Id { get; set; } - [DisplayName("Название изделия")] - public string CannedName { get; set; } = string.Empty; - [DisplayName("Цена")] - public double Price { get; set; } - public Dictionary CannedComponents - { - get; - set; - } = new(); + [Column(visible: false)] + public int Id { get; set; } + [Column(title: "Консерва", gridViewAutoSize: GridViewAutoSize.Fill, isUseAutoSize: true)] + public string CannedName { get; set; } = string.Empty; + [Column(title: "Цена", width: 70)] + public double Price { get; set; } + [Column(visible: false)] + public Dictionary CannedComponents { get; set; } = new(); } } diff --git a/FishFactory/FishFactoryContracts/ViewModels/ClientViewModel.cs b/FishFactory/FishFactoryContracts/ViewModels/ClientViewModel.cs index 519bd97..2336283 100644 --- a/FishFactory/FishFactoryContracts/ViewModels/ClientViewModel.cs +++ b/FishFactory/FishFactoryContracts/ViewModels/ClientViewModel.cs @@ -1,19 +1,21 @@ -using FishFactoryDataModels.Models; +using FishFactoryContracts.Attributes; +using FishFactoryDataModels.Models; using System.ComponentModel; namespace FishFactoryContracts.ViewModels { public class ClientViewModel : IClientModel { - public int Id { get; set; } + [Column(visible: false)] + public int Id { get; set; } - [DisplayName("Клиент")] - public string ClientFIO { get; set; } = string.Empty; + [Column(title: "Клиент", gridViewAutoSize: GridViewAutoSize.Fill, isUseAutoSize: true)] + public string ClientFIO { get; set; } = string.Empty; - [DisplayName("Логин (эл. почта)")] - public string Email { get; set; } = string.Empty; + [Column(title: "Логин (эл. почта)", width: 150)] + public string Email { get; set; } = string.Empty; - [DisplayName("Пароль")] - public string Password { get; set; } = string.Empty; + [Column(title: "Пароль", width: 150)] + public string Password { get; set; } = string.Empty; } } \ No newline at end of file diff --git a/FishFactory/FishFactoryContracts/ViewModels/ComponentViewModel.cs b/FishFactory/FishFactoryContracts/ViewModels/ComponentViewModel.cs index 1f78339..b71acc8 100644 --- a/FishFactory/FishFactoryContracts/ViewModels/ComponentViewModel.cs +++ b/FishFactory/FishFactoryContracts/ViewModels/ComponentViewModel.cs @@ -1,14 +1,15 @@ -using System.ComponentModel; +using FishFactoryContracts.Attributes; using FishFactoryDataModels.Models; namespace FishFactoryContracts.ViewModels { public class ComponentViewModel : IComponentModel { - public int Id { get; set; } - [DisplayName("Название ингредиента")] - public string ComponentName { get; set; } = string.Empty; - [DisplayName("Цена")] - public double Cost { get; set; } + [Column(visible: false)] + public int Id { get; set; } + [Column(title: "Название ингридиента", gridViewAutoSize: GridViewAutoSize.Fill, isUseAutoSize: true)] + public string ComponentName { get; set; } = string.Empty; + [Column(title: "Цена", width: 150)] + public double Cost { get; set; } } } diff --git a/FishFactory/FishFactoryContracts/ViewModels/ImplementerViewModel.cs b/FishFactory/FishFactoryContracts/ViewModels/ImplementerViewModel.cs index 60ecf8a..5d68c35 100644 --- a/FishFactory/FishFactoryContracts/ViewModels/ImplementerViewModel.cs +++ b/FishFactory/FishFactoryContracts/ViewModels/ImplementerViewModel.cs @@ -1,4 +1,5 @@ -using FishFactoryDataModels.Models; +using FishFactoryContracts.Attributes; +using FishFactoryDataModels.Models; using System.ComponentModel; namespace FishFactoryContracts.ViewModels @@ -8,18 +9,19 @@ namespace FishFactoryContracts.ViewModels /// public class ImplementerViewModel : IImplementerModel { + [Column(visible: false)] public int Id { get; set; } - [DisplayName("ФИО исполнителя")] + [Column(title: "ФИО исполнителя", gridViewAutoSize: GridViewAutoSize.Fill, isUseAutoSize: true)] public string ImplementerFIO { get; set; } = string.Empty; - [DisplayName("Пароль")] + [Column(title: "Пароль", width: 100)] public string Password { get; set; } = string.Empty; - [DisplayName("Стаж работы")] + [Column(title: "Стаж работы", width: 50)] public int WorkExperience { get; set; } - [DisplayName("Квалификация")] + [Column(title: "Квалификация", width: 50)] public int Qualification { get; set; } } } \ No newline at end of file diff --git a/FishFactory/FishFactoryContracts/ViewModels/MessageInfoViewModel.cs b/FishFactory/FishFactoryContracts/ViewModels/MessageInfoViewModel.cs index d56ce06..1115011 100644 --- a/FishFactory/FishFactoryContracts/ViewModels/MessageInfoViewModel.cs +++ b/FishFactory/FishFactoryContracts/ViewModels/MessageInfoViewModel.cs @@ -1,24 +1,29 @@ -using FishFactoryDataModels.Models; -using System.ComponentModel; +using FishFactoryContracts.Attributes; +using FishFactoryDataModels.Models; namespace FishFactoryContracts.ViewModels { public class MessageInfoViewModel : IMessageInfoModel { + [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: 150)] public DateTime DateDelivery { get; set; } - [DisplayName("Заголовок")] + [Column(title: "Заголовок", width: 150)] public string Subject { get; set; } = string.Empty; - [DisplayName("Текст")] + [Column(title: "Текст", gridViewAutoSize: GridViewAutoSize.Fill, isUseAutoSize: true)] public string Body { get; set; } = string.Empty; + + [Column(visible: false)] + public int Id => throw new NotImplementedException(); } } \ No newline at end of file diff --git a/FishFactory/FishFactoryContracts/ViewModels/OrderViewModel.cs b/FishFactory/FishFactoryContracts/ViewModels/OrderViewModel.cs index 3d6a6ea..96b909f 100644 --- a/FishFactory/FishFactoryContracts/ViewModels/OrderViewModel.cs +++ b/FishFactory/FishFactoryContracts/ViewModels/OrderViewModel.cs @@ -1,4 +1,4 @@ -using System.ComponentModel; +using FishFactoryContracts.Attributes; using FishFactoryDataModels.Enums; using FishFactoryDataModels.Models; @@ -6,26 +6,29 @@ namespace FishFactoryContracts.ViewModels { public class OrderViewModel : IOrderModel { - [DisplayName("Номер")] - public int Id { get; set; } - public int CannedId { get; set; } - public int ClientId { get; set; } + [Column(title: "Номер", width: 50)] + public int Id { get; set; } + [Column(visible: false)] + public int CannedId { get; set; } + [Column(visible: false)] + public int ClientId { get; set; } + [Column(visible: false)] public int? ImplementerId { get; set; } - [DisplayName("Консерва")] - public string CannedName { get; set; } = string.Empty; - [DisplayName("Клиент")] - public string ClientFIO { get; set; } = string.Empty; - [DisplayName("Исполнитель")] + [Column(title: "Консерва", width: 100)] + public string CannedName { get; set; } = string.Empty; + [Column(title: "Клиент", gridViewAutoSize: GridViewAutoSize.Fill, isUseAutoSize: true)] + public string ClientFIO { get; set; } = string.Empty; + [Column(title: "Исполнитель", width: 130)] public string ImplementerFIO { get; set; } = string.Empty; - [DisplayName("Количество")] - public int Count { get; set; } - [DisplayName("Сумма")] - public double Sum { get; set; } - [DisplayName("Статус")] - public OrderStatus Status { get; set; } = OrderStatus.Неизвестен; - [DisplayName("Дата создания")] - public DateTime DateCreate { get; set; } = DateTime.Now; - [DisplayName("Дата выполнения")] - public DateTime? DateImplement { get; set; } + [Column(title: "Количество", width: 100)] + public int Count { get; set; } + [Column(title: "Сумма", width: 50)] + public double Sum { get; set; } + [Column(title: "Статус", width: 50)] + public OrderStatus Status { get; set; } = OrderStatus.Неизвестен; + [Column(title: "Дата создания", width: 100)] + public DateTime DateCreate { get; set; } = DateTime.Now; + [Column(title: "Дата выполнения", width: 100)] + public DateTime? DateImplement { get; set; } } } diff --git a/FishFactory/FishFactoryDataModels/Models/IMessageInfoModel.cs b/FishFactory/FishFactoryDataModels/Models/IMessageInfoModel.cs index accd4b9..9abc767 100644 --- a/FishFactory/FishFactoryDataModels/Models/IMessageInfoModel.cs +++ b/FishFactory/FishFactoryDataModels/Models/IMessageInfoModel.cs @@ -1,6 +1,6 @@ namespace FishFactoryDataModels.Models { - public interface IMessageInfoModel + public interface IMessageInfoModel : IId { string MessageId { get; } diff --git a/FishFactory/FishFactoryDatabaseImplement/DatabaseImplementationExtension.cs b/FishFactory/FishFactoryDatabaseImplement/DatabaseImplementationExtension.cs new file mode 100644 index 0000000..ba1b83c --- /dev/null +++ b/FishFactory/FishFactoryDatabaseImplement/DatabaseImplementationExtension.cs @@ -0,0 +1,22 @@ +using FishFactoryContracts.DI; +using FishFactoryContracts.StoragesContracts; +using FishFactoryDatabaseImplement.Implements; + +namespace FishFactoryDatabaseImplement +{ + public class DatabaseImplementationExtension : IImplementationExtension + { + public int Priority => 2; + + public void RegisterServices() + { + DependencyManager.Instance.RegisterType(); + DependencyManager.Instance.RegisterType(); + DependencyManager.Instance.RegisterType(); + DependencyManager.Instance.RegisterType(); + DependencyManager.Instance.RegisterType(); + DependencyManager.Instance.RegisterType(); + DependencyManager.Instance.RegisterType(); + } + } +} \ No newline at end of file diff --git a/FishFactory/FishFactoryDatabaseImplement/FishFactoryDatabaseImplement.csproj b/FishFactory/FishFactoryDatabaseImplement/FishFactoryDatabaseImplement.csproj index d39908f..76d2d76 100644 --- a/FishFactory/FishFactoryDatabaseImplement/FishFactoryDatabaseImplement.csproj +++ b/FishFactory/FishFactoryDatabaseImplement/FishFactoryDatabaseImplement.csproj @@ -20,4 +20,8 @@ + + + + diff --git a/FishFactory/FishFactoryDatabaseImplement/Implements/BackUpInfo.cs b/FishFactory/FishFactoryDatabaseImplement/Implements/BackUpInfo.cs new file mode 100644 index 0000000..73521ee --- /dev/null +++ b/FishFactory/FishFactoryDatabaseImplement/Implements/BackUpInfo.cs @@ -0,0 +1,27 @@ +using FishFactoryContracts.StoragesContracts; + +namespace FishFactoryDatabaseImplement.Implements +{ + public class BackUpInfo : IBackUpInfo + { + public List? GetList() where T : class, new() + { + using var context = new FishFactoryDatabase(); + return context.Set().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; + } + } +} \ No newline at end of file diff --git a/FishFactory/FishFactoryDatabaseImplement/Models/Canned.cs b/FishFactory/FishFactoryDatabaseImplement/Models/Canned.cs index 384b9a9..73b36cc 100644 --- a/FishFactory/FishFactoryDatabaseImplement/Models/Canned.cs +++ b/FishFactory/FishFactoryDatabaseImplement/Models/Canned.cs @@ -3,22 +3,28 @@ using FishFactoryContracts.ViewModels; using FishFactoryDataModels.Models; using System.ComponentModel.DataAnnotations; using System.ComponentModel.DataAnnotations.Schema; +using System.Runtime.Serialization; namespace FishFactoryDatabaseImplement.Models { - public class Canned : ICannedModel + [DataContract] + public class Canned : ICannedModel { - public int Id { get; set; } + [DataMember] + public int Id { get; set; } - [Required] + [DataMember] + [Required] public string CannedName { get; set; } = string.Empty; - [Required] + [DataMember] + [Required] public double Price { get; set; } private Dictionary? _cannedComponents = null; - [NotMapped] + [DataMember] + [NotMapped] public Dictionary CannedComponents { get diff --git a/FishFactory/FishFactoryDatabaseImplement/Models/Client.cs b/FishFactory/FishFactoryDatabaseImplement/Models/Client.cs index 93ef565..46415db 100644 --- a/FishFactory/FishFactoryDatabaseImplement/Models/Client.cs +++ b/FishFactory/FishFactoryDatabaseImplement/Models/Client.cs @@ -3,17 +3,23 @@ using FishFactoryContracts.ViewModels; using FishFactoryDataModels.Models; using System.ComponentModel.DataAnnotations; using System.ComponentModel.DataAnnotations.Schema; +using System.Runtime.Serialization; namespace FishFactoryDatabaseImplement.Models { - public class Client : IClientModel + [DataContract] + public class Client : IClientModel { - public int Id { get; private set; } - [Required] + [DataMember] + public int Id { get; private set; } + [DataMember] + [Required] public string ClientFIO { get; set; } = string.Empty; - [Required] + [DataMember] + [Required] public string Email { get; set; } = string.Empty; - [Required] + [DataMember] + [Required] public string Password { get; set; } = string.Empty; [ForeignKey("ClientId")] diff --git a/FishFactory/FishFactoryDatabaseImplement/Models/Component.cs b/FishFactory/FishFactoryDatabaseImplement/Models/Component.cs index 432cec2..1ea8c3a 100644 --- a/FishFactory/FishFactoryDatabaseImplement/Models/Component.cs +++ b/FishFactory/FishFactoryDatabaseImplement/Models/Component.cs @@ -3,17 +3,22 @@ using FishFactoryContracts.ViewModels; using FishFactoryDataModels.Models; using System.ComponentModel.DataAnnotations; using System.ComponentModel.DataAnnotations.Schema; +using System.Runtime.Serialization; namespace FishFactoryDatabaseImplement.Models { - public class Component : IComponentModel + [DataContract] + public class Component : IComponentModel { - public int Id { get; private set; } + [DataMember] + public int Id { get; private set; } - [Required] + [DataMember] + [Required] public string ComponentName { get; private set; } = string.Empty; - [Required] + [DataMember] + [Required] public double Cost { get; set; } [ForeignKey("ComponentId")] diff --git a/FishFactory/FishFactoryDatabaseImplement/Models/Implementer.cs b/FishFactory/FishFactoryDatabaseImplement/Models/Implementer.cs index 29e11bd..c28b94c 100644 --- a/FishFactory/FishFactoryDatabaseImplement/Models/Implementer.cs +++ b/FishFactory/FishFactoryDatabaseImplement/Models/Implementer.cs @@ -3,18 +3,25 @@ using FishFactoryContracts.ViewModels; using FishFactoryDataModels.Models; using System.ComponentModel.DataAnnotations.Schema; using System.ComponentModel.DataAnnotations; +using System.Runtime.Serialization; namespace FishFactoryDatabaseImplement.Models { + [DataContract] public class Implementer : IImplementerModel { + [DataMember] public int Id { get; private set; } + [DataMember] [Required] public string ImplementerFIO { get; private set; } = string.Empty; + [DataMember] [Required] public string Password { get; private set; } = string.Empty; + [DataMember] [Required] public int WorkExperience { get; private set; } + [DataMember] [Required] public int Qualification { get; private set; } [ForeignKey("ImplementerId")] diff --git a/FishFactory/FishFactoryDatabaseImplement/Models/Message.cs b/FishFactory/FishFactoryDatabaseImplement/Models/Message.cs index be4a554..c5ebea4 100644 --- a/FishFactory/FishFactoryDatabaseImplement/Models/Message.cs +++ b/FishFactory/FishFactoryDatabaseImplement/Models/Message.cs @@ -2,20 +2,28 @@ using FishFactoryContracts.ViewModels; using FishFactoryDataModels.Models; using System.ComponentModel.DataAnnotations; +using System.Runtime.Serialization; namespace FishFactoryDatabaseImplement.Models { + [DataContract] public class Message : IMessageInfoModel { [Key] + [DataMember] public string MessageId { get; private set; } = string.Empty; + [DataMember] public int? ClientId { get; private set; } + [DataMember] [Required] public string SenderName { get; private set; } = string.Empty; + [DataMember] [Required] public DateTime DateDelivery { get; private set; } = DateTime.Now; + [DataMember] [Required] public string Subject { get; private set; } = string.Empty; + [DataMember] [Required] public string Body { get; private set; } = string.Empty; @@ -45,5 +53,6 @@ namespace FishFactoryDatabaseImplement.Models SenderName = SenderName, DateDelivery = DateDelivery, }; + public int Id => throw new NotImplementedException(); } } \ No newline at end of file diff --git a/FishFactory/FishFactoryDatabaseImplement/Models/Order.cs b/FishFactory/FishFactoryDatabaseImplement/Models/Order.cs index 3400210..8048f7a 100644 --- a/FishFactory/FishFactoryDatabaseImplement/Models/Order.cs +++ b/FishFactory/FishFactoryDatabaseImplement/Models/Order.cs @@ -3,26 +3,37 @@ using FishFactoryContracts.ViewModels; using FishFactoryDataModels.Models; using FishFactoryDataModels.Enums; using System.ComponentModel.DataAnnotations; +using System.Runtime.Serialization; namespace FishFactoryDatabaseImplement.Models { - public class Order : IOrderModel + [DataContract] + public class Order : IOrderModel { - [Required] + [DataMember] + [Required] public int CannedId { get; set; } - [Required] + [DataMember] + [Required] public int ClientId { get; set; } + [DataMember] public int? ImplementerId { get; private set; } + [DataMember] [Required] public int Count { get; set; } - [Required] + [DataMember] + [Required] public double Sum { get; set; } - [Required] + [DataMember] + [Required] public OrderStatus Status { get; set; } - [Required] + [DataMember] + [Required] public DateTime DateCreate { get; set; } - public DateTime? DateImplement { get; set; } - public int Id { get; set; } + [DataMember] + public DateTime? DateImplement { get; set; } + [DataMember] + public int Id { get; set; } public Canned Canned { get; set; } public Client Client { get; set; } public Implementer? Implementer { get; set; } diff --git a/FishFactory/FishFactoryFileImplement/FileImplementationExtension.cs b/FishFactory/FishFactoryFileImplement/FileImplementationExtension.cs new file mode 100644 index 0000000..e2adfae --- /dev/null +++ b/FishFactory/FishFactoryFileImplement/FileImplementationExtension.cs @@ -0,0 +1,22 @@ +using FishFactoryContracts.DI; +using FishFactoryContracts.StoragesContracts; +using FishFactoryFileImplement.Implements; + +namespace FishFactoryFileImplement +{ + public class FileImplementationExtension : IImplementationExtension + { + public int Priority => 1; + + public void RegisterServices() + { + DependencyManager.Instance.RegisterType(); + DependencyManager.Instance.RegisterType(); + DependencyManager.Instance.RegisterType(); + DependencyManager.Instance.RegisterType(); + DependencyManager.Instance.RegisterType(); + DependencyManager.Instance.RegisterType(); + DependencyManager.Instance.RegisterType(); + } + } +} \ No newline at end of file diff --git a/FishFactory/FishFactoryFileImplement/FishFactoryFileImplement.csproj b/FishFactory/FishFactoryFileImplement/FishFactoryFileImplement.csproj index 39f5797..db85ee2 100644 --- a/FishFactory/FishFactoryFileImplement/FishFactoryFileImplement.csproj +++ b/FishFactory/FishFactoryFileImplement/FishFactoryFileImplement.csproj @@ -15,4 +15,8 @@ + + + + diff --git a/FishFactory/FishFactoryFileImplement/Implements/BackUpInfo.cs b/FishFactory/FishFactoryFileImplement/Implements/BackUpInfo.cs new file mode 100644 index 0000000..248f851 --- /dev/null +++ b/FishFactory/FishFactoryFileImplement/Implements/BackUpInfo.cs @@ -0,0 +1,29 @@ +using FishFactoryContracts.StoragesContracts; + +namespace FishFactoryFileImplement.Implements +{ + public class BackUpInfo : IBackUpInfo + { + public List? GetList() where T : class, new() + { + var source = DataFileSingleton.GetInstance(); + return (List?)source.GetType().GetProperties() + .FirstOrDefault(x => x.PropertyType.IsGenericType && x.PropertyType.GetGenericArguments()[0] == typeof(T)) + ?.GetValue(source); + } + + public Type? GetTypeByModelInterface(string modelInterfaceName) + { + var assembly = typeof(BackUpInfo).Assembly; + var types = assembly.GetTypes(); + foreach (var type in types) + { + if (type.IsClass && type.GetInterface(modelInterfaceName) != null) + { + return type; + } + } + return null; + } + } +} \ No newline at end of file diff --git a/FishFactory/FishFactoryFileImplement/Models/Canned.cs b/FishFactory/FishFactoryFileImplement/Models/Canned.cs index b1c2d10..09bc304 100644 --- a/FishFactory/FishFactoryFileImplement/Models/Canned.cs +++ b/FishFactory/FishFactoryFileImplement/Models/Canned.cs @@ -1,18 +1,24 @@ using FishFactoryContracts.BindingModels; using FishFactoryContracts.ViewModels; using FishFactoryDataModels.Models; +using System.Runtime.Serialization; using System.Xml.Linq; namespace FishFactoryFileImplement.Models { - public class Canned : ICannedModel + [DataContract] + public class Canned : ICannedModel { - public int Id { get; private set; } - public string CannedName { get; private set; } = string.Empty; - public double Price { get; private set; } + [DataMember] + public int Id { get; private set; } + [DataMember] + public string CannedName { get; private set; } = string.Empty; + [DataMember] + public double Price { get; private set; } public Dictionary Components { get; private set; } = new(); private Dictionary? _productComponents = null; - public Dictionary CannedComponents + [DataMember] + public Dictionary CannedComponents { get { diff --git a/FishFactory/FishFactoryFileImplement/Models/Client.cs b/FishFactory/FishFactoryFileImplement/Models/Client.cs index f2fa129..89a529c 100644 --- a/FishFactory/FishFactoryFileImplement/Models/Client.cs +++ b/FishFactory/FishFactoryFileImplement/Models/Client.cs @@ -1,16 +1,22 @@ using FishFactoryContracts.BindingModels; using FishFactoryContracts.ViewModels; using FishFactoryDataModels.Models; +using System.Runtime.Serialization; using System.Xml.Linq; namespace FishFactoryFileImplement.Models { - public class Client : IClientModel + [DataContract] + public class Client : IClientModel { - public int Id { get; private set; } - public string ClientFIO { get; private set; } = string.Empty; - public string Email { get; set; } = string.Empty; - public string Password { get; set; } = string.Empty; + [DataMember] + public int Id { get; private set; } + [DataMember] + public string ClientFIO { get; private set; } = string.Empty; + [DataMember] + public string Email { get; set; } = string.Empty; + [DataMember] + public string Password { get; set; } = string.Empty; public static Client? Create(ClientBindingModel model) { if (model == null) diff --git a/FishFactory/FishFactoryFileImplement/Models/Component.cs b/FishFactory/FishFactoryFileImplement/Models/Component.cs index 1881953..64e1636 100644 --- a/FishFactory/FishFactoryFileImplement/Models/Component.cs +++ b/FishFactory/FishFactoryFileImplement/Models/Component.cs @@ -1,15 +1,20 @@ using FishFactoryContracts.BindingModels; using FishFactoryContracts.ViewModels; using FishFactoryDataModels.Models; +using System.Runtime.Serialization; using System.Xml.Linq; namespace FishFactoryFileImplement.Models { - public class Component : IComponentModel + [DataContract] + public class Component : IComponentModel { - public int Id { get; private set; } - public string ComponentName { get; private set; } = string.Empty; - public double Cost { get; set; } + [DataMember] + public int Id { get; private set; } + [DataMember] + public string ComponentName { get; private set; } = string.Empty; + [DataMember] + public double Cost { get; set; } public static Component? Create(ComponentBindingModel model) { if (model == null) diff --git a/FishFactory/FishFactoryFileImplement/Models/Implementer.cs b/FishFactory/FishFactoryFileImplement/Models/Implementer.cs index cb5a843..c34400d 100644 --- a/FishFactory/FishFactoryFileImplement/Models/Implementer.cs +++ b/FishFactory/FishFactoryFileImplement/Models/Implementer.cs @@ -1,20 +1,27 @@ using FishFactoryContracts.BindingModels; using FishFactoryContracts.ViewModels; using FishFactoryDataModels.Models; +using System.Runtime.Serialization; using System.Xml.Linq; namespace FishFactoryFileImplement.Models { + [DataContract] public class Implementer : IImplementerModel { + [DataMember] public int Id { get; private set; } + [DataMember] public string ImplementerFIO { get; private set; } = string.Empty; + [DataMember] public string Password { get; private set; } = string.Empty; + [DataMember] public int WorkExperience { get; private set; } + [DataMember] public int Qualification { get; private set; } public static Implementer? Create(ImplementerBindingModel? model) diff --git a/FishFactory/FishFactoryFileImplement/Models/Message.cs b/FishFactory/FishFactoryFileImplement/Models/Message.cs index 80b8f43..a0898e0 100644 --- a/FishFactory/FishFactoryFileImplement/Models/Message.cs +++ b/FishFactory/FishFactoryFileImplement/Models/Message.cs @@ -2,22 +2,33 @@ using FishFactoryContracts.ViewModels; using FishFactoryDataModels.Models; using System.Reflection; +using System.Runtime.Serialization; using System.Xml.Linq; namespace FishFactoryFileImplement.Models { + [DataContract] public class Message : IMessageInfoModel { + [DataMember] + public int Id { get; private set; } + + [DataMember] public string MessageId { get; private set; } = string.Empty; + [DataMember] public int? ClientId { get; private set; } + [DataMember] public string SenderName { get; private set; } = string.Empty; + [DataMember] public DateTime DateDelivery { get; private set; } = DateTime.Now; + [DataMember] public string Subject { get; private set; } = string.Empty; + [DataMember] public string Body { get; private set; } = string.Empty; public static Message? Create(MessageInfoBindingModel model) diff --git a/FishFactory/FishFactoryFileImplement/Models/Order.cs b/FishFactory/FishFactoryFileImplement/Models/Order.cs index 0474512..c529713 100644 --- a/FishFactory/FishFactoryFileImplement/Models/Order.cs +++ b/FishFactory/FishFactoryFileImplement/Models/Order.cs @@ -2,21 +2,32 @@ using FishFactoryContracts.ViewModels; using FishFactoryDataModels.Models; using FishFactoryDataModels.Enums; +using System.Runtime.Serialization; using System.Xml.Linq; namespace FishFactoryFileImplement.Models { - public class Order : IOrderModel + [DataContract] + public class Order : IOrderModel { - public int Id { get; private set; } - public int CannedId { get; private set; } - public int ClientId { get; private set; } + [DataMember] + public int Id { get; private set; } + [DataMember] + public int CannedId { get; private set; } + [DataMember] + public int ClientId { get; private set; } + [DataMember] public int? ImplementerId { get; private set; } + [DataMember] public int Count { get; private set; } - public double Sum { get; private set; } - public OrderStatus Status { get; private set; } = OrderStatus.Неизвестен; - public DateTime DateCreate { get; private set; } = DateTime.Now; - public DateTime? DateImplement { get; private set; } + [DataMember] + public double Sum { get; private set; } + [DataMember] + public OrderStatus Status { get; private set; } = OrderStatus.Неизвестен; + [DataMember] + public DateTime DateCreate { get; private set; } = DateTime.Now; + [DataMember] + public DateTime? DateImplement { get; private set; } public static Order? Create(OrderBindingModel? model) { diff --git a/FishFactory/FishFactoryListImplement/FishFactoryListImplement.csproj b/FishFactory/FishFactoryListImplement/FishFactoryListImplement.csproj index 39f5797..db85ee2 100644 --- a/FishFactory/FishFactoryListImplement/FishFactoryListImplement.csproj +++ b/FishFactory/FishFactoryListImplement/FishFactoryListImplement.csproj @@ -15,4 +15,8 @@ + + + + diff --git a/FishFactory/FishFactoryListImplement/Implements/BackUpInfo.cs b/FishFactory/FishFactoryListImplement/Implements/BackUpInfo.cs new file mode 100644 index 0000000..8008a01 --- /dev/null +++ b/FishFactory/FishFactoryListImplement/Implements/BackUpInfo.cs @@ -0,0 +1,17 @@ +using FishFactoryContracts.StoragesContracts; + +namespace FishFactoryListImplement.Implements +{ + public class BackUpInfo : IBackUpInfo + { + public List? GetList() where T : class, new() + { + throw new NotImplementedException(); + } + + public Type? GetTypeByModelInterface(string modelInterfaceName) + { + throw new NotImplementedException(); + } + } +} \ No newline at end of file diff --git a/FishFactory/FishFactoryListImplement/ListImplementationExtension.cs b/FishFactory/FishFactoryListImplement/ListImplementationExtension.cs new file mode 100644 index 0000000..da3461f --- /dev/null +++ b/FishFactory/FishFactoryListImplement/ListImplementationExtension.cs @@ -0,0 +1,22 @@ +using FishFactoryContracts.DI; +using FishFactoryContracts.StoragesContracts; +using FishFactoryListImplement.Implements; + +namespace FishFactoryListImplement +{ + public class ListImplementationExtension : IImplementationExtension + { + public int Priority => 0; + + public void RegisterServices() + { + DependencyManager.Instance.RegisterType(); + DependencyManager.Instance.RegisterType(); + DependencyManager.Instance.RegisterType(); + DependencyManager.Instance.RegisterType(); + DependencyManager.Instance.RegisterType(); + DependencyManager.Instance.RegisterType(); + DependencyManager.Instance.RegisterType(); + } + } +} \ No newline at end of file diff --git a/FishFactory/FishFactoryListImplement/Models/Message.cs b/FishFactory/FishFactoryListImplement/Models/Message.cs index 2bf05ec..8c56f6d 100644 --- a/FishFactory/FishFactoryListImplement/Models/Message.cs +++ b/FishFactory/FishFactoryListImplement/Models/Message.cs @@ -18,6 +18,8 @@ namespace FishFactoryListImplement.Models public string Body { get; private set; } = string.Empty; + public int Id => throw new NotImplementedException(); + public static Message? Create(MessageInfoBindingModel model) { if (model == null) diff --git a/FishFactory/FishFactoryView/DataGridViewExtension.cs b/FishFactory/FishFactoryView/DataGridViewExtension.cs new file mode 100644 index 0000000..28c1368 --- /dev/null +++ b/FishFactory/FishFactoryView/DataGridViewExtension.cs @@ -0,0 +1,46 @@ +using FishFactoryContracts.Attributes; + +namespace FishFactoryView +{ + internal static class DataGridViewExtension + { + public static void FillAndConfigGrid(this DataGridView grid, List? 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; + } + } + } + } + } +} \ No newline at end of file diff --git a/FishFactory/FishFactoryView/FormCanned.cs b/FishFactory/FishFactoryView/FormCanned.cs index 96d0ee9..f5dc4f0 100644 --- a/FishFactory/FishFactoryView/FormCanned.cs +++ b/FishFactory/FishFactoryView/FormCanned.cs @@ -3,6 +3,7 @@ using FishFactoryContracts.BindingModels; using FishFactoryContracts.BusinessLogicsContracts; using FishFactoryContracts.SearchModels; using FishFactoryDataModels.Models; +using FishFactoryContracts.DI; using System.Windows.Forms; namespace FishFactoryView @@ -71,8 +72,8 @@ namespace FishFactoryView } private void ButtonAdd_Click(object sender, EventArgs e) { - var service = Program.ServiceProvider?.GetService(typeof(FormCannedComponent)); - if (service is FormCannedComponent form) + var service = DependencyManager.Instance.Resolve(); + if (service is FormCannedComponent form) { if (form.ShowDialog() == DialogResult.OK) { @@ -99,8 +100,8 @@ namespace FishFactoryView { if (dataGridView.SelectedRows.Count == 1) { - var service = Program.ServiceProvider?.GetService(typeof(FormCannedComponent)); - if (service is FormCannedComponent form) + var service = DependencyManager.Instance.Resolve(); + if (service is FormCannedComponent form) { int id = Convert.ToInt32(dataGridView.SelectedRows[0].Cells[0].Value); diff --git a/FishFactory/FishFactoryView/FormClients.cs b/FishFactory/FishFactoryView/FormClients.cs index 5cba098..7e97d3e 100644 --- a/FishFactory/FishFactoryView/FormClients.cs +++ b/FishFactory/FishFactoryView/FormClients.cs @@ -27,14 +27,8 @@ namespace FishFactoryView { 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) { diff --git a/FishFactory/FishFactoryView/FormComponents.cs b/FishFactory/FishFactoryView/FormComponents.cs index 018c901..c10da0d 100644 --- a/FishFactory/FishFactoryView/FormComponents.cs +++ b/FishFactory/FishFactoryView/FormComponents.cs @@ -1,6 +1,7 @@ using Microsoft.Extensions.Logging; using FishFactoryContracts.BindingModels; using FishFactoryContracts.BusinessLogicsContracts; +using FishFactoryContracts.DI; using System.Windows.Forms; namespace FishFactoryView @@ -23,14 +24,8 @@ namespace FishFactoryView { try { - var list = _logic.ReadList(null); - if (list != null) - { - dataGridView.DataSource = list; - dataGridView.Columns["Id"].Visible = false; - dataGridView.Columns["ComponentName"].AutoSizeMode = DataGridViewAutoSizeColumnMode.Fill; - } - _logger.LogInformation("Загрузка ингредиентов"); + dataGridView.FillAndConfigGrid(_logic.ReadList(null)); + _logger.LogInformation("Загрузка ингредиентов"); } catch (Exception ex) { @@ -41,8 +36,8 @@ namespace FishFactoryView } private void ButtonAdd_Click(object sender, EventArgs e) { - var service = Program.ServiceProvider?.GetService(typeof(FormComponent)); - if (service is FormComponent form) + var service = DependencyManager.Instance.Resolve(); + if (service is FormComponent form) { if (form.ShowDialog() == DialogResult.OK) { @@ -54,8 +49,8 @@ namespace FishFactoryView { if (dataGridView.SelectedRows.Count == 1) { - var service = Program.ServiceProvider?.GetService(typeof(FormComponent)); - if (service is FormComponent form) + var service = DependencyManager.Instance.Resolve(); + if (service is FormComponent form) { form.Id = Convert.ToInt32(dataGridView.SelectedRows[0].Cells["Id"].Value); if (form.ShowDialog() == DialogResult.OK) diff --git a/FishFactory/FishFactoryView/FormImplementers.cs b/FishFactory/FishFactoryView/FormImplementers.cs index 16c5b4e..e5feaa1 100644 --- a/FishFactory/FishFactoryView/FormImplementers.cs +++ b/FishFactory/FishFactoryView/FormImplementers.cs @@ -1,6 +1,7 @@ using Microsoft.Extensions.Logging; using FishFactoryContracts.BindingModels; using FishFactoryContracts.BusinessLogicsContracts; +using FishFactoryContracts.DI; using System.Windows.Forms; namespace FishFactoryView @@ -23,13 +24,7 @@ namespace FishFactoryView { try { - var list = _logic.ReadList(null); - if (list != null) - { - dataGridView.DataSource = list; - dataGridView.Columns["Id"].Visible = false; - dataGridView.Columns["ImplementerFIO"].AutoSizeMode = DataGridViewAutoSizeColumnMode.Fill; - } + dataGridView.FillAndConfigGrid(_logic.ReadList(null)); _logger.LogInformation("Загрузка исполнителей"); } catch (Exception ex) @@ -41,7 +36,7 @@ namespace FishFactoryView } private void ButtonAdd_Click(object sender, EventArgs e) { - var service = Program.ServiceProvider?.GetService(typeof(FormImplementer)); + var service = DependencyManager.Instance.Resolve(); if (service is FormImplementer form) { if (form.ShowDialog() == DialogResult.OK) @@ -54,7 +49,7 @@ namespace FishFactoryView { if (dataGridView.SelectedRows.Count == 1) { - var service = Program.ServiceProvider?.GetService(typeof(FormImplementer)); + var service = DependencyManager.Instance.Resolve(); if (service is FormImplementer form) { form.Id = Convert.ToInt32(dataGridView.SelectedRows[0].Cells["Id"].Value); diff --git a/FishFactory/FishFactoryView/FormListCanned.cs b/FishFactory/FishFactoryView/FormListCanned.cs index 8b67093..5aaa970 100644 --- a/FishFactory/FishFactoryView/FormListCanned.cs +++ b/FishFactory/FishFactoryView/FormListCanned.cs @@ -1,6 +1,7 @@ using Microsoft.Extensions.Logging; using FishFactoryContracts.BindingModels; using FishFactoryContracts.BusinessLogicsContracts; +using FishFactoryContracts.DI; using System.Windows.Forms; namespace FishFactoryView @@ -24,15 +25,8 @@ namespace FishFactoryView { try { - var list = _logic.ReadList(null); - if (list != null) - { - dataGridView.DataSource = list; - dataGridView.Columns["Id"].Visible = false; - dataGridView.Columns["CannedName"].AutoSizeMode = DataGridViewAutoSizeColumnMode.Fill; - dataGridView.Columns["CannedComponents"].Visible = false; - } - _logger.LogInformation("Загрузка консервы"); + dataGridView.FillAndConfigGrid(_logic.ReadList(null)); + _logger.LogInformation("Загрузка консервы"); } catch (Exception ex) { @@ -43,8 +37,8 @@ namespace FishFactoryView private void ButtonAdd_Click(object sender, EventArgs e) { - var service = Program.ServiceProvider?.GetService(typeof(FormCanned)); - if (service is FormCanned form) + var service = DependencyManager.Instance.Resolve(); + if (service is FormCanned form) { if (form.ShowDialog() == DialogResult.OK) { @@ -57,8 +51,8 @@ namespace FishFactoryView { if (dataGridView.SelectedRows.Count == 1) { - var service = Program.ServiceProvider?.GetService(typeof(FormCanned)); - if (service is FormCanned form) + var service = DependencyManager.Instance.Resolve(); + if (service is FormCanned form) { form.Id = Convert.ToInt32(dataGridView.SelectedRows[0].Cells["Id"].Value); if (form.ShowDialog() == DialogResult.OK) diff --git a/FishFactory/FishFactoryView/FormMails.cs b/FishFactory/FishFactoryView/FormMails.cs index b6d8fad..ff34aae 100644 --- a/FishFactory/FishFactoryView/FormMails.cs +++ b/FishFactory/FishFactoryView/FormMails.cs @@ -20,14 +20,7 @@ namespace FishFactoryView { try { - var list = _logic.ReadList(null); - if (list != null) - { - dataGridView.DataSource = list; - dataGridView.Columns["ClientId"].Visible = false; - dataGridView.Columns["MessageId"].Visible = false; - dataGridView.Columns["Body"].AutoSizeMode = DataGridViewAutoSizeColumnMode.Fill; - } + dataGridView.FillAndConfigGrid(_logic.ReadList(null)); _logger.LogInformation("Загрузка писем"); } catch (Exception ex) diff --git a/FishFactory/FishFactoryView/FormMain.Designer.cs b/FishFactory/FishFactoryView/FormMain.Designer.cs index adcd7a2..65e66f2 100644 --- a/FishFactory/FishFactoryView/FormMain.Designer.cs +++ b/FishFactory/FishFactoryView/FormMain.Designer.cs @@ -39,6 +39,7 @@ this.ComponentsByCannedToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.ordersListToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.startOfWorkToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.createBackUpToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.buttonUpdate = new System.Windows.Forms.Button(); this.buttonSetToFinish = new System.Windows.Forms.Button(); this.buttonCreateOrder = new System.Windows.Forms.Button(); @@ -54,7 +55,8 @@ this.reference_booksToolStripMenuItem, this.reportsToolStripMenuItem, this.startOfWorkToolStripMenuItem, - this.lettersToolStripMenuItem}); + this.lettersToolStripMenuItem, + this.createBackUpToolStripMenuItem}); this.menuStrip.Location = new System.Drawing.Point(0, 0); this.menuStrip.Name = "menuStrip"; this.menuStrip.Size = new System.Drawing.Size(1086, 24); @@ -145,6 +147,13 @@ this.lettersToolStripMenuItem.Text = "Письма"; this.lettersToolStripMenuItem.Click += new System.EventHandler(this.MailsToolStripMenuItem_Click); // + // createBackUpToolStripMenuItem + // + this.createBackUpToolStripMenuItem.Name = "createBackUpToolStripMenuItem"; + this.createBackUpToolStripMenuItem.Size = new System.Drawing.Size(97, 20); + this.createBackUpToolStripMenuItem.Text = "Создать бекап"; + this.createBackUpToolStripMenuItem.Click += new System.EventHandler(this.CreateBackUpToolStripMenuItem_Click); + // // buttonUpdate // this.buttonUpdate.Location = new System.Drawing.Point(905, 253); @@ -230,5 +239,6 @@ private ToolStripMenuItem performersToolStripMenuItem; private ToolStripMenuItem startOfWorkToolStripMenuItem; private ToolStripMenuItem lettersToolStripMenuItem; + private ToolStripMenuItem createBackUpToolStripMenuItem; } } \ No newline at end of file diff --git a/FishFactory/FishFactoryView/FormMain.cs b/FishFactory/FishFactoryView/FormMain.cs index 9f7afbc..e330d54 100644 --- a/FishFactory/FishFactoryView/FormMain.cs +++ b/FishFactory/FishFactoryView/FormMain.cs @@ -1,6 +1,7 @@ using Microsoft.Extensions.Logging; using FishFactoryContracts.BindingModels; using FishFactoryContracts.BusinessLogicsContracts; +using FishFactoryContracts.DI; namespace FishFactoryView { @@ -10,13 +11,15 @@ namespace FishFactoryView private readonly IOrderLogic _orderLogic; private readonly IReportLogic _reportLogic; private readonly IWorkProcess _workProcess; - public FormMain(ILogger logger, IOrderLogic orderLogic, IReportLogic reportLogic, IWorkProcess workProcess) + private readonly IBackUpLogic _backUpLogic; + public FormMain(ILogger 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) { @@ -27,18 +30,8 @@ namespace FishFactoryView _logger.LogInformation("Загрузка заказов"); try { - var list = _orderLogic.ReadList(null); - if (list != null) - { - dataGridView.DataSource = list; - dataGridView.Columns["CannedId"].Visible = false; - dataGridView.Columns["ClientId"].Visible = false; - dataGridView.Columns["ImplementerId"].Visible = false; - dataGridView.Columns["CannedName"].AutoSizeMode = DataGridViewAutoSizeColumnMode.Fill; - dataGridView.Columns["ClientFIO"].AutoSizeMode = DataGridViewAutoSizeColumnMode.Fill; - dataGridView.Columns["ImplementerFIO"].AutoSizeMode = DataGridViewAutoSizeColumnMode.Fill; - } - _logger.LogInformation("Загрузка заказов"); + dataGridView.FillAndConfigGrid(_orderLogic.ReadList(null)); + _logger.LogInformation("Загрузка заказов"); } catch (Exception ex) { @@ -48,16 +41,16 @@ namespace FishFactoryView } private void ComponentsToolStripMenuItem_Click(object sender, EventArgs e) { - var service = Program.ServiceProvider?.GetService(typeof(FormComponents)); - if (service is FormComponents form) + var service = DependencyManager.Instance.Resolve(); + if (service is FormComponents form) { form.ShowDialog(); } } private void CannedToolStripMenuItem_Click(object sender, EventArgs e) { - var service = Program.ServiceProvider?.GetService(typeof(FormListCanned)); - if (service is FormListCanned form) + var service = DependencyManager.Instance.Resolve(); + if (service is FormListCanned form) { form.ShowDialog(); } @@ -65,7 +58,7 @@ namespace FishFactoryView private void ImplementersToolStripMenuItem_Click(object sender, EventArgs e) { - var service = Program.ServiceProvider?.GetService(typeof(FormImplementers)); + var service = DependencyManager.Instance.Resolve(); if (service is FormImplementers form) { form.ShowDialog(); @@ -75,7 +68,7 @@ namespace FishFactoryView private void DoWorkToolStripMenuItem_Click(object sender, EventArgs e) { _workProcess.DoWork(( - Program.ServiceProvider?.GetService(typeof(IImplementerLogic)) as IImplementerLogic)!, + DependencyManager.Instance.Resolve() as IImplementerLogic)!, _orderLogic); MessageBox.Show("Процесс обработки запущен", "Сообщение", MessageBoxButtons.OK, MessageBoxIcon.Information); @@ -83,8 +76,8 @@ namespace FishFactoryView private void ButtonCreateOrder_Click(object sender, EventArgs e) { - var service = Program.ServiceProvider?.GetService(typeof(FormCreateOrder)); - if (service is FormCreateOrder form) + var service = DependencyManager.Instance.Resolve(); + if (service is FormCreateOrder form) { form.ShowDialog(); LoadData(); @@ -183,8 +176,8 @@ namespace FishFactoryView private void CannedComponentToolStripMenuItem_Click(object sender, EventArgs e) { - var service = Program.ServiceProvider?.GetService(typeof(FormReportCannedComponents)); - if (service is FormReportCannedComponents form) + var service = DependencyManager.Instance.Resolve(); + if (service is FormReportCannedComponents form) { form.ShowDialog(); } @@ -192,8 +185,8 @@ namespace FishFactoryView private void OrdersToolStripMenuItem_Click(object sender, EventArgs e) { - var service = Program.ServiceProvider?.GetService(typeof(FormReportOrders)); - if (service is FormReportOrders form) + var service = DependencyManager.Instance.Resolve(); + if (service is FormReportOrders form) { form.ShowDialog(); } @@ -201,8 +194,8 @@ namespace FishFactoryView private void ClientsToolStripMenuItem_Click(object sender, EventArgs e) { - var service = Program.ServiceProvider?.GetService(typeof(FormClients)); - if (service is FormClients form) + var service = DependencyManager.Instance.Resolve(); + if (service is FormClients form) { form.ShowDialog(); } @@ -210,11 +203,36 @@ namespace FishFactoryView private void MailsToolStripMenuItem_Click(object sender, EventArgs e) { - var service = Program.ServiceProvider?.GetService(typeof(FormMails)); + var service = DependencyManager.Instance.Resolve(); if (service is FormMails form) { form.ShowDialog(); } } - } + + private void CreateBackUpToolStripMenuItem_Click(object sender, EventArgs e) + { + try + { + if (_backUpLogic != null) + { + var fbd = new FolderBrowserDialog(); + if (fbd.ShowDialog() == DialogResult.OK) + { + _backUpLogic.CreateBackUp(new BackUpSaveBindingModel + { + FolderName = fbd.SelectedPath + }); + MessageBox.Show("Бекап создан", "Сообщение", + MessageBoxButtons.OK, MessageBoxIcon.Information); + } + } + } + catch (Exception ex) + { + MessageBox.Show(ex.Message, "Ошибка", MessageBoxButtons.OK, + MessageBoxIcon.Error); + } + } + } } diff --git a/FishFactory/FishFactoryView/Program.cs b/FishFactory/FishFactoryView/Program.cs index cae1df8..5cbcde1 100644 --- a/FishFactory/FishFactoryView/Program.cs +++ b/FishFactory/FishFactoryView/Program.cs @@ -9,13 +9,12 @@ using FishFactoryContracts.StoragesContracts; using FishFactoryDatabaseImplement.Implements; using FishFactoryBusinessLogic.MailWorker; using FishFactoryContracts.BindingModels; +using FishFactoryContracts.DI; namespace FishFactoryView { internal static class Program { - private static ServiceProvider? _serviceProvider; - public static ServiceProvider? ServiceProvider => _serviceProvider; /// /// . /// @@ -26,12 +25,11 @@ namespace FishFactoryView // see https://aka.ms/applicationconfiguration. ApplicationConfiguration.Initialize(); - var services = new ServiceCollection(); - ConfigureServices(services); - _serviceProvider = services.BuildServiceProvider(); + InitDependency(); + try { - var mailSender = _serviceProvider.GetService(); + var mailSender = DependencyManager.Instance.Resolve(); mailSender?.MailConfig(new MailConfigBindingModel { MailLogin = System.Configuration.ConfigurationManager.AppSettings["MailLogin"] ?? string.Empty, @@ -47,54 +45,51 @@ namespace FishFactoryView } catch (Exception ex) { - var logger = _serviceProvider.GetService(); - logger?.LogError(ex, " "); + var logger = DependencyManager.Instance.Resolve(); + logger?.LogError(ex, " "); } - Application.Run(_serviceProvider.GetRequiredService()); - } + Application.Run(DependencyManager.Instance.Resolve()); + } - private static void ConfigureServices(ServiceCollection services) - { - services.AddLogging(option => - { + private static void InitDependency() + { + DependencyManager.InitDependency(); + + DependencyManager.Instance.AddLogging(option => + { option.SetMinimumLevel(LogLevel.Information); option.AddNLog("nlog.config"); }); - services.AddTransient(); - services.AddTransient(); - services.AddTransient(); - services.AddTransient(); - services.AddTransient(); - services.AddTransient(); - services.AddTransient(); - services.AddTransient(); - services.AddTransient(); - services.AddTransient(); - services.AddTransient(); - services.AddTransient(); - services.AddTransient(); - services.AddTransient(); - services.AddSingleton(); + DependencyManager.Instance.RegisterType(); + DependencyManager.Instance.RegisterType(); + DependencyManager.Instance.RegisterType(); + DependencyManager.Instance.RegisterType(); + DependencyManager.Instance.RegisterType(); + DependencyManager.Instance.RegisterType(); + DependencyManager.Instance.RegisterType(); + DependencyManager.Instance.RegisterType(); + DependencyManager.Instance.RegisterType(); + DependencyManager.Instance.RegisterType(true); - services.AddTransient(); - services.AddTransient(); - services.AddTransient(); + DependencyManager.Instance.RegisterType(); + DependencyManager.Instance.RegisterType(); + DependencyManager.Instance.RegisterType(); - services.AddTransient(); - services.AddTransient(); - services.AddTransient(); - services.AddTransient(); - services.AddTransient(); - services.AddTransient(); - services.AddTransient(); - services.AddTransient(); - services.AddTransient(); - services.AddTransient(); - services.AddTransient(); - services.AddTransient(); - services.AddTransient(); + DependencyManager.Instance.RegisterType(); + DependencyManager.Instance.RegisterType(); + DependencyManager.Instance.RegisterType(); + DependencyManager.Instance.RegisterType(); + DependencyManager.Instance.RegisterType(); + DependencyManager.Instance.RegisterType(); + DependencyManager.Instance.RegisterType(); + DependencyManager.Instance.RegisterType(); + DependencyManager.Instance.RegisterType(); + DependencyManager.Instance.RegisterType(); + DependencyManager.Instance.RegisterType(); + DependencyManager.Instance.RegisterType(); + DependencyManager.Instance.RegisterType(); } - private static void MailCheck(object obj) => ServiceProvider?.GetService()?.MailCheck(); + private static void MailCheck(object obj) => DependencyManager.Instance.Resolve()?.MailCheck(); } } -- 2.25.1