From 88dc4a7b935efcb24821f77f81a361c88833e695 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=94=D0=B0=D0=BD=D0=B8=D0=B8=D0=BB=20=D0=9F=D1=83=D1=82?= =?UTF-8?q?=D0=B8=D0=BD=D1=86=D0=B5=D0=B2?= Date: Mon, 20 May 2024 11:41:37 +0400 Subject: [PATCH 1/2] =?UTF-8?q?=D0=93=D0=BE=D1=82=D0=BE=D0=B2=D0=B0=D1=8F?= =?UTF-8?q?=20=D0=BB=D0=B0=D0=B1=D0=BE=D1=80=D0=B0=D1=82=D0=BE=D1=80=D0=BD?= =?UTF-8?q?=D0=B0=D1=8F=208=20(=D0=B1=D0=B0=D0=B7=D0=B0)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitignore | 3 + .../BusinessLogics/BackUpLogic.cs | 98 +++++++++++++++++ .../Attributes/ColumnAttribute.cs | 25 +++++ .../Attributes/GridViewAutoSize.cs | 21 ++++ .../BindingModels/BackUpSaveBindingModel.cs | 7 ++ .../BindingModels/MessageInfoBindingModel.cs | 2 + .../BusinessLogicsContracts/IBackUpLogic.cs | 9 ++ .../DI/DependencyManager.cs | 61 +++++++++++ .../DI/IDependencyContainer.cs | 35 ++++++ .../DI/IImplementationExtension.cs | 11 ++ .../DI/ServiceDependencyContainer.cs | 57 ++++++++++ .../DI/ServiceProviderLoader.cs | 50 +++++++++ .../DI/UnityDependencyContainer.cs | 37 +++++++ .../FoodOrdersContracts.csproj | 7 ++ .../StoragesContracts/IBackUpInfo.cs | 9 ++ .../ViewModels/ClientViewModel.cs | 11 +- .../ViewModels/ComponentViewModel.cs | 9 +- .../ViewModels/DishViewModel.cs | 10 +- .../ViewModels/ImplementerViewModel.cs | 13 +-- .../ViewModels/MessageInfoViewModel .cs | 21 ++-- .../ViewModels/OrderViewModel.cs | 29 +++-- .../Models/IMessageInfoModel.cs | 2 +- .../DatabaseImplementationExtension.cs | 22 ++++ .../FoodOrdersDatabase.cs | 1 - .../FoodOrdersDatabaseImplement.csproj | 4 + .../Implemets/BackUpInfo.cs | 27 +++++ .../Models/Client.cs | 6 ++ .../Models/Component.cs | 5 + .../Models/Dish.cs | 8 ++ .../Models/Implementer.cs | 7 ++ .../Models/MessageInfo.cs | 29 +++-- .../Models/Order.cs | 18 ++++ .../FileImplementationExtension.cs | 22 ++++ .../FoodOrdersFileImplement.csproj | 4 + .../Implements/BackUpInfo.cs | 36 +++++++ .../FoodOrdersFileImplement/Models/Client.cs | 6 ++ .../Models/Component.cs | 5 + .../FoodOrdersFileImplement/Models/Dish.cs | 6 ++ .../Models/Implementer.cs | 7 ++ .../Models/MessageInfo.cs | 10 ++ .../FoodOrdersFileImplement/Models/Order.cs | 11 ++ .../FoodOrdersListImplement.csproj | 4 + .../Implements/BackUpInfo.cs | 17 +++ .../ListImplementationExtension.cs | 22 ++++ .../Models/MessageInfo.cs | 2 + .../FoodOrdersView/DataGridViewExtension.cs | 46 ++++++++ FoodOrders/FoodOrdersView/FormComponents.cs | 29 ++--- FoodOrders/FoodOrdersView/FormDish.cs | 73 ++++++------- FoodOrders/FoodOrdersView/FormDishes.cs | 30 ++---- FoodOrders/FoodOrdersView/FormImplementers.cs | 32 ++---- FoodOrders/FoodOrdersView/FormMails.cs | 9 +- FoodOrders/FoodOrdersView/FormMain.cs | 100 ++++++++---------- .../FoodOrdersView/FormMain.designer.cs | 35 +++--- FoodOrders/FoodOrdersView/Program.cs | 81 +++++++------- 54 files changed, 974 insertions(+), 267 deletions(-) create mode 100644 FoodOrders/FoodOrdersBusinessLogic/BusinessLogics/BackUpLogic.cs create mode 100644 FoodOrders/FoodOrdersContracts/Attributes/ColumnAttribute.cs create mode 100644 FoodOrders/FoodOrdersContracts/Attributes/GridViewAutoSize.cs create mode 100644 FoodOrders/FoodOrdersContracts/BindingModels/BackUpSaveBindingModel.cs create mode 100644 FoodOrders/FoodOrdersContracts/BusinessLogicsContracts/IBackUpLogic.cs create mode 100644 FoodOrders/FoodOrdersContracts/DI/DependencyManager.cs create mode 100644 FoodOrders/FoodOrdersContracts/DI/IDependencyContainer.cs create mode 100644 FoodOrders/FoodOrdersContracts/DI/IImplementationExtension.cs create mode 100644 FoodOrders/FoodOrdersContracts/DI/ServiceDependencyContainer.cs create mode 100644 FoodOrders/FoodOrdersContracts/DI/ServiceProviderLoader.cs create mode 100644 FoodOrders/FoodOrdersContracts/DI/UnityDependencyContainer.cs create mode 100644 FoodOrders/FoodOrdersContracts/StoragesContracts/IBackUpInfo.cs create mode 100644 FoodOrders/FoodOrdersDatabaseImplement/DatabaseImplementationExtension.cs create mode 100644 FoodOrders/FoodOrdersDatabaseImplement/Implemets/BackUpInfo.cs create mode 100644 FoodOrders/FoodOrdersFileImplement/FileImplementationExtension.cs create mode 100644 FoodOrders/FoodOrdersFileImplement/Implements/BackUpInfo.cs create mode 100644 FoodOrders/FoodOrdersListImplement/Implements/BackUpInfo.cs create mode 100644 FoodOrders/FoodOrdersListImplement/ListImplementationExtension.cs create mode 100644 FoodOrders/FoodOrdersView/DataGridViewExtension.cs diff --git a/.gitignore b/.gitignore index ca1c7a3..52737dc 100644 --- a/.gitignore +++ b/.gitignore @@ -14,6 +14,9 @@ # User-specific files (MonoDevelop/Xamarin Studio) *.userprefs +# dll файлы +*.dll + # Mono auto generated files mono_crash.* diff --git a/FoodOrders/FoodOrdersBusinessLogic/BusinessLogics/BackUpLogic.cs b/FoodOrders/FoodOrdersBusinessLogic/BusinessLogics/BackUpLogic.cs new file mode 100644 index 0000000..fe25797 --- /dev/null +++ b/FoodOrders/FoodOrdersBusinessLogic/BusinessLogics/BackUpLogic.cs @@ -0,0 +1,98 @@ +using FoodOrdersContracts.BindingModels; +using FoodOrdersContracts.BusinessLogicsContracts; +using FoodOrdersContracts.StoragesContracts; +using FoodOrdersDataModels; +using Microsoft.Extensions.Logging; +using System.IO.Compression; +using System.Reflection; +using System.Runtime.Serialization.Json; + +namespace FoodOrdersBusinessLogic.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/FoodOrders/FoodOrdersContracts/Attributes/ColumnAttribute.cs b/FoodOrders/FoodOrdersContracts/Attributes/ColumnAttribute.cs new file mode 100644 index 0000000..b2030ef --- /dev/null +++ b/FoodOrders/FoodOrdersContracts/Attributes/ColumnAttribute.cs @@ -0,0 +1,25 @@ +namespace FoodOrdersContracts.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/FoodOrders/FoodOrdersContracts/Attributes/GridViewAutoSize.cs b/FoodOrders/FoodOrdersContracts/Attributes/GridViewAutoSize.cs new file mode 100644 index 0000000..45f1d10 --- /dev/null +++ b/FoodOrders/FoodOrdersContracts/Attributes/GridViewAutoSize.cs @@ -0,0 +1,21 @@ +namespace FoodOrdersContracts.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/FoodOrders/FoodOrdersContracts/BindingModels/BackUpSaveBindingModel.cs b/FoodOrders/FoodOrdersContracts/BindingModels/BackUpSaveBindingModel.cs new file mode 100644 index 0000000..b3a2807 --- /dev/null +++ b/FoodOrders/FoodOrdersContracts/BindingModels/BackUpSaveBindingModel.cs @@ -0,0 +1,7 @@ +namespace FoodOrdersContracts.BindingModels +{ + public class BackUpSaveBindingModel + { + public string FolderName { get; set; } = string.Empty; + } +} \ No newline at end of file diff --git a/FoodOrders/FoodOrdersContracts/BindingModels/MessageInfoBindingModel.cs b/FoodOrders/FoodOrdersContracts/BindingModels/MessageInfoBindingModel.cs index 09cd690..11f47a7 100644 --- a/FoodOrders/FoodOrdersContracts/BindingModels/MessageInfoBindingModel.cs +++ b/FoodOrders/FoodOrdersContracts/BindingModels/MessageInfoBindingModel.cs @@ -4,6 +4,8 @@ namespace FoodOrdersContracts.BindingModels { public class MessageInfoBindingModel : IMessageInfoModel { + public int Id => throw new NotImplementedException(); + public string MessageId { get; set; } = string.Empty; public int? ClientId { get; set; } diff --git a/FoodOrders/FoodOrdersContracts/BusinessLogicsContracts/IBackUpLogic.cs b/FoodOrders/FoodOrdersContracts/BusinessLogicsContracts/IBackUpLogic.cs new file mode 100644 index 0000000..3ffda54 --- /dev/null +++ b/FoodOrders/FoodOrdersContracts/BusinessLogicsContracts/IBackUpLogic.cs @@ -0,0 +1,9 @@ +using FoodOrdersContracts.BindingModels; + +namespace FoodOrdersContracts.BusinessLogicsContracts +{ + public interface IBackUpLogic + { + void CreateBackUp(BackUpSaveBindingModel model); + } +} \ No newline at end of file diff --git a/FoodOrders/FoodOrdersContracts/DI/DependencyManager.cs b/FoodOrders/FoodOrdersContracts/DI/DependencyManager.cs new file mode 100644 index 0000000..206900b --- /dev/null +++ b/FoodOrders/FoodOrdersContracts/DI/DependencyManager.cs @@ -0,0 +1,61 @@ +using Microsoft.Extensions.Logging; + +namespace FoodOrdersContracts.DI +{ + public class DependencyManager + { + private readonly IDependencyContainer _dependencyManager; + + private static DependencyManager? _manager; + + private static readonly object _lockObject = new(); + + private DependencyManager() + { + _dependencyManager = new UnityDependencyContainer(); + } + + public static DependencyManager Instance { get { if (_manager == null) { lock (_lockObject) { _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/FoodOrders/FoodOrdersContracts/DI/IDependencyContainer.cs b/FoodOrders/FoodOrdersContracts/DI/IDependencyContainer.cs new file mode 100644 index 0000000..7eeb52e --- /dev/null +++ b/FoodOrders/FoodOrdersContracts/DI/IDependencyContainer.cs @@ -0,0 +1,35 @@ +using Microsoft.Extensions.Logging; + +namespace FoodOrdersContracts.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/FoodOrders/FoodOrdersContracts/DI/IImplementationExtension.cs b/FoodOrders/FoodOrdersContracts/DI/IImplementationExtension.cs new file mode 100644 index 0000000..741dfa6 --- /dev/null +++ b/FoodOrders/FoodOrdersContracts/DI/IImplementationExtension.cs @@ -0,0 +1,11 @@ +namespace FoodOrdersContracts.DI +{ + public interface IImplementationExtension + { + public int Priority { get; } + /// + /// Регистрация сервисов + /// + public void RegisterServices(); + } +} \ No newline at end of file diff --git a/FoodOrders/FoodOrdersContracts/DI/ServiceDependencyContainer.cs b/FoodOrders/FoodOrdersContracts/DI/ServiceDependencyContainer.cs new file mode 100644 index 0000000..e17c76f --- /dev/null +++ b/FoodOrders/FoodOrdersContracts/DI/ServiceDependencyContainer.cs @@ -0,0 +1,57 @@ +using Microsoft.Extensions.DependencyInjection; +using Microsoft.Extensions.Logging; + +namespace FoodOrdersContracts.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()!; + } + } +} diff --git a/FoodOrders/FoodOrdersContracts/DI/ServiceProviderLoader.cs b/FoodOrders/FoodOrdersContracts/DI/ServiceProviderLoader.cs new file mode 100644 index 0000000..095fc3c --- /dev/null +++ b/FoodOrders/FoodOrdersContracts/DI/ServiceProviderLoader.cs @@ -0,0 +1,50 @@ +using System.Reflection; + +namespace FoodOrdersContracts.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/FoodOrders/FoodOrdersContracts/DI/UnityDependencyContainer.cs b/FoodOrders/FoodOrdersContracts/DI/UnityDependencyContainer.cs new file mode 100644 index 0000000..9209ade --- /dev/null +++ b/FoodOrders/FoodOrdersContracts/DI/UnityDependencyContainer.cs @@ -0,0 +1,37 @@ +using Microsoft.Extensions.Logging; +using Unity.Microsoft.Logging; +using Unity; + +namespace FoodOrdersContracts.DI +{ + public class UnityDependencyContainer : IDependencyContainer + { + private readonly IUnityContainer _container; + + public UnityDependencyContainer() + { + _container = new UnityContainer(); + } + + public void AddLogging(Action configure) + { + var factory = LoggerFactory.Create(configure); + _container.AddExtension(new LoggingExtension(factory)); + } + + public void RegisterType(bool isSingle) where U : class, T where T : class + { + _container.RegisterType(isSingle ? TypeLifetime.Singleton : TypeLifetime.Transient); + } + + public void RegisterType(bool isSingle) where T : class + { + _container.RegisterType(isSingle ? TypeLifetime.Singleton : TypeLifetime.Transient); + } + + public T Resolve() + { + return _container.Resolve(); + } + } +} diff --git a/FoodOrders/FoodOrdersContracts/FoodOrdersContracts.csproj b/FoodOrders/FoodOrdersContracts/FoodOrdersContracts.csproj index a94660f..5632349 100644 --- a/FoodOrders/FoodOrdersContracts/FoodOrdersContracts.csproj +++ b/FoodOrders/FoodOrdersContracts/FoodOrdersContracts.csproj @@ -6,6 +6,13 @@ enable + + + + + + + diff --git a/FoodOrders/FoodOrdersContracts/StoragesContracts/IBackUpInfo.cs b/FoodOrders/FoodOrdersContracts/StoragesContracts/IBackUpInfo.cs new file mode 100644 index 0000000..1d0eefe --- /dev/null +++ b/FoodOrders/FoodOrdersContracts/StoragesContracts/IBackUpInfo.cs @@ -0,0 +1,9 @@ +namespace FoodOrdersContracts.StoragesContracts +{ + public interface IBackUpInfo + { + List? GetList() where T : class, new(); + + Type? GetTypeByModelInterface(string modelInterfaceName); + } +} \ No newline at end of file diff --git a/FoodOrders/FoodOrdersContracts/ViewModels/ClientViewModel.cs b/FoodOrders/FoodOrdersContracts/ViewModels/ClientViewModel.cs index 5e205e6..e4fccf5 100644 --- a/FoodOrders/FoodOrdersContracts/ViewModels/ClientViewModel.cs +++ b/FoodOrders/FoodOrdersContracts/ViewModels/ClientViewModel.cs @@ -1,7 +1,7 @@ -using FoodOrdersDataModels.Models; +using FoodOrdersContracts.Attributes; +using FoodOrdersDataModels.Models; using System; using System.Collections.Generic; -using System.ComponentModel; using System.Linq; using System.Text; using System.Threading.Tasks; @@ -10,12 +10,13 @@ namespace FoodOrdersContracts.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; } } diff --git a/FoodOrders/FoodOrdersContracts/ViewModels/ComponentViewModel.cs b/FoodOrders/FoodOrdersContracts/ViewModels/ComponentViewModel.cs index e7f8cc9..4bfda2b 100644 --- a/FoodOrders/FoodOrdersContracts/ViewModels/ComponentViewModel.cs +++ b/FoodOrders/FoodOrdersContracts/ViewModels/ComponentViewModel.cs @@ -1,16 +1,17 @@ -using FoodOrdersDataModels.Models; -using System.ComponentModel; +using FoodOrdersContracts.Attributes; +using FoodOrdersDataModels.Models; namespace FoodOrdersContracts.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; } } } \ No newline at end of file diff --git a/FoodOrders/FoodOrdersContracts/ViewModels/DishViewModel.cs b/FoodOrders/FoodOrdersContracts/ViewModels/DishViewModel.cs index 0b07095..ea91036 100644 --- a/FoodOrders/FoodOrdersContracts/ViewModels/DishViewModel.cs +++ b/FoodOrders/FoodOrdersContracts/ViewModels/DishViewModel.cs @@ -1,18 +1,20 @@ -using FoodOrdersDataModels.Models; -using System.ComponentModel; +using FoodOrdersContracts.Attributes; +using FoodOrdersDataModels.Models; namespace FoodOrdersContracts.ViewModels { public class DishViewModel : IDishModel { + [Column(visible: false)] public int Id { get; set; } - [DisplayName("Название блюда")] + [Column(title: "Название блюда", gridViewAutoSize: GridViewAutoSize.Fill, isUseAutoSize: true)] public string DishName { get; set; } = string.Empty; - [DisplayName("Цена")] + [Column(title: "Цена", width: 150)] public double Price { get; set; } + [Column(visible: false)] public Dictionary DishComponents { get; diff --git a/FoodOrders/FoodOrdersContracts/ViewModels/ImplementerViewModel.cs b/FoodOrders/FoodOrdersContracts/ViewModels/ImplementerViewModel.cs index 5164819..b1dddff 100644 --- a/FoodOrders/FoodOrdersContracts/ViewModels/ImplementerViewModel.cs +++ b/FoodOrders/FoodOrdersContracts/ViewModels/ImplementerViewModel.cs @@ -1,22 +1,23 @@ -using FoodOrdersDataModels.Models; -using System.ComponentModel; +using FoodOrdersContracts.Attributes; +using FoodOrdersDataModels.Models; namespace FoodOrdersContracts.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: 100)] public int WorkExperience { get; set; } - [DisplayName("Квалификация")] + [Column(title: "Квалификация", width: 100)] public int Qualification { get; set; } } } \ No newline at end of file diff --git a/FoodOrders/FoodOrdersContracts/ViewModels/MessageInfoViewModel .cs b/FoodOrders/FoodOrdersContracts/ViewModels/MessageInfoViewModel .cs index 466b856..806bbc7 100644 --- a/FoodOrders/FoodOrdersContracts/ViewModels/MessageInfoViewModel .cs +++ b/FoodOrders/FoodOrdersContracts/ViewModels/MessageInfoViewModel .cs @@ -1,20 +1,29 @@ -using FoodOrdersDataModels.Models; -using System.ComponentModel; +using FoodOrdersContracts.Attributes; +using FoodOrdersDataModels.Models; namespace FoodOrdersContracts.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: 150)] public string Subject { get; set; } = string.Empty; - [DisplayName("Текст")] + + [Column(title: "Текст", gridViewAutoSize: GridViewAutoSize.Fill, isUseAutoSize: true)] public string Body { get; set; } = string.Empty; } } diff --git a/FoodOrders/FoodOrdersContracts/ViewModels/OrderViewModel.cs b/FoodOrders/FoodOrdersContracts/ViewModels/OrderViewModel.cs index 300f466..fb79d4a 100644 --- a/FoodOrders/FoodOrdersContracts/ViewModels/OrderViewModel.cs +++ b/FoodOrders/FoodOrdersContracts/ViewModels/OrderViewModel.cs @@ -1,41 +1,48 @@ -using FoodOrdersDataModels.Enums; +using FoodOrdersContracts.Attributes; +using FoodOrdersDataModels.Enums; using FoodOrdersDataModels.Models; -using System.ComponentModel; namespace FoodOrdersContracts.ViewModels { public class OrderViewModel : IOrderModel { - [DisplayName("Номер")] + [Column(title: "Номер", width: 100)] public int Id { get; set; } + [Column(visible: false)] public int DishId { get; set; } - [DisplayName("Еда")] + [Column(title: "Еда", gridViewAutoSize: GridViewAutoSize.Fill, isUseAutoSize: true)] public string DishName { get; set; } = string.Empty; + + [Column(visible: false)] public int ClientId { get; set; } - [DisplayName("Клиент")] + + [Column(title: "Клиент", gridViewAutoSize: GridViewAutoSize.Fill, isUseAutoSize: true)] public string ClientFIO { get; set; } = string.Empty; + + [Column(visible: false)] public string ClientEmail { get; set; } = string.Empty; + [Column(visible: false)] public int? ImplementerId { get; set; } - [DisplayName("Исполнитель")] + [Column(title: "Исполнитель", gridViewAutoSize: GridViewAutoSize.Fill, isUseAutoSize: true)] public string ImplementerFIO { get; set; } = string.Empty; - [DisplayName("Количество")] + [Column(title: "Количество", width: 100)] public int Count { get; set; } - [DisplayName("Сумма")] + [Column(title: "Сумма", width: 120)] public double Sum { get; set; } - [DisplayName("Статус")] + [Column(title: "Статус", width: 100)] public OrderStatus Status { get; set; } = OrderStatus.Неизвестен; - [DisplayName("Дата создания")] + [Column(title: "Дата создания", width: 120)] public DateTime DateCreate { get; set; } = DateTime.Now; - [DisplayName("Дата выполнения")] + [Column(title: "Дата выполнения", width: 120)] public DateTime? DateImplement { get; set; } } } diff --git a/FoodOrders/FoodOrdersDataModels/Models/IMessageInfoModel.cs b/FoodOrders/FoodOrdersDataModels/Models/IMessageInfoModel.cs index 1d87dfd..b8b8701 100644 --- a/FoodOrders/FoodOrdersDataModels/Models/IMessageInfoModel.cs +++ b/FoodOrders/FoodOrdersDataModels/Models/IMessageInfoModel.cs @@ -1,6 +1,6 @@ namespace FoodOrdersDataModels.Models { - public interface IMessageInfoModel + public interface IMessageInfoModel : IId { string MessageId { get; } int? ClientId { get; } diff --git a/FoodOrders/FoodOrdersDatabaseImplement/DatabaseImplementationExtension.cs b/FoodOrders/FoodOrdersDatabaseImplement/DatabaseImplementationExtension.cs new file mode 100644 index 0000000..2922741 --- /dev/null +++ b/FoodOrders/FoodOrdersDatabaseImplement/DatabaseImplementationExtension.cs @@ -0,0 +1,22 @@ +using FoodOrdersContracts.DI; +using FoodOrdersContracts.StoragesContracts; +using FoodOrdersDatabaseImplement.Implements; + +namespace FoodOrdersDatabaseImplement +{ + 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(); + } + } +} diff --git a/FoodOrders/FoodOrdersDatabaseImplement/FoodOrdersDatabase.cs b/FoodOrders/FoodOrdersDatabaseImplement/FoodOrdersDatabase.cs index b477e18..ef7e5f1 100644 --- a/FoodOrders/FoodOrdersDatabaseImplement/FoodOrdersDatabase.cs +++ b/FoodOrders/FoodOrdersDatabaseImplement/FoodOrdersDatabase.cs @@ -4,7 +4,6 @@ using System.Linq; using System.Text; using System.Threading.Tasks; using FoodOrdersDatabaseImplement.Models; -using FoodOrdersDatabaseImplement.Models; using Microsoft.EntityFrameworkCore; namespace FoodOrdersDatabaseImplement diff --git a/FoodOrders/FoodOrdersDatabaseImplement/FoodOrdersDatabaseImplement.csproj b/FoodOrders/FoodOrdersDatabaseImplement/FoodOrdersDatabaseImplement.csproj index 5e293f3..20d8d42 100644 --- a/FoodOrders/FoodOrdersDatabaseImplement/FoodOrdersDatabaseImplement.csproj +++ b/FoodOrders/FoodOrdersDatabaseImplement/FoodOrdersDatabaseImplement.csproj @@ -20,4 +20,8 @@ + + + + diff --git a/FoodOrders/FoodOrdersDatabaseImplement/Implemets/BackUpInfo.cs b/FoodOrders/FoodOrdersDatabaseImplement/Implemets/BackUpInfo.cs new file mode 100644 index 0000000..5e306d7 --- /dev/null +++ b/FoodOrders/FoodOrdersDatabaseImplement/Implemets/BackUpInfo.cs @@ -0,0 +1,27 @@ +using FoodOrdersContracts.StoragesContracts; + +namespace FoodOrdersDatabaseImplement.Implements +{ + public class BackUpInfo : IBackUpInfo + { + public List? GetList() where T : class, new() + { + using var context = new FoodOrdersDatabase(); + 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/FoodOrders/FoodOrdersDatabaseImplement/Models/Client.cs b/FoodOrders/FoodOrdersDatabaseImplement/Models/Client.cs index 8e6dd8d..d758dc1 100644 --- a/FoodOrders/FoodOrdersDatabaseImplement/Models/Client.cs +++ b/FoodOrders/FoodOrdersDatabaseImplement/Models/Client.cs @@ -9,19 +9,25 @@ using FoodOrdersContracts.ViewModels; using FoodOrdersDataModels.Models; using System.ComponentModel.DataAnnotations.Schema; using System.ComponentModel.DataAnnotations; +using System.Runtime.Serialization; namespace FoodOrdersDatabaseImplement.Models { + [DataContract] public class Client : IClientModel { + [DataMember] public int Id { get; private set; } + [DataMember] [Required] public string ClientFIO { get; private set; } = string.Empty; + [DataMember] [Required] public string Email { get; private set; } = string.Empty; + [DataMember] [Required] public string Password { get; private set; } = string.Empty; diff --git a/FoodOrders/FoodOrdersDatabaseImplement/Models/Component.cs b/FoodOrders/FoodOrdersDatabaseImplement/Models/Component.cs index 95148a6..c4237a1 100644 --- a/FoodOrders/FoodOrdersDatabaseImplement/Models/Component.cs +++ b/FoodOrders/FoodOrdersDatabaseImplement/Models/Component.cs @@ -8,16 +8,21 @@ using System.Text; using System.Threading.Tasks; using FoodOrdersContracts.ViewModels; using FoodOrdersContracts.BindingModels; +using System.Runtime.Serialization; namespace FoodOrdersDatabaseImplement.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; } diff --git a/FoodOrders/FoodOrdersDatabaseImplement/Models/Dish.cs b/FoodOrders/FoodOrdersDatabaseImplement/Models/Dish.cs index f889698..d7edc44 100644 --- a/FoodOrders/FoodOrdersDatabaseImplement/Models/Dish.cs +++ b/FoodOrders/FoodOrdersDatabaseImplement/Models/Dish.cs @@ -8,19 +8,27 @@ using System.ComponentModel.DataAnnotations; using FoodOrdersDataModels.Models; using FoodOrdersContracts.BindingModels; using FoodOrdersContracts.ViewModels; +using System.Runtime.Serialization; namespace FoodOrdersDatabaseImplement.Models { + [DataContract] public class Dish : IDishModel { + [DataMember] public int Id { get; private set; } + + [DataMember] [Required] public string DishName { get; private set; } = string.Empty; + + [DataMember] [Required] public double Price { get; private set; } private Dictionary? _dishComponents = null; + [DataMember] [NotMapped] public Dictionary DishComponents { diff --git a/FoodOrders/FoodOrdersDatabaseImplement/Models/Implementer.cs b/FoodOrders/FoodOrdersDatabaseImplement/Models/Implementer.cs index 0ec9d4c..8d78af4 100644 --- a/FoodOrders/FoodOrdersDatabaseImplement/Models/Implementer.cs +++ b/FoodOrders/FoodOrdersDatabaseImplement/Models/Implementer.cs @@ -3,22 +3,29 @@ using FoodOrdersContracts.ViewModels; using FoodOrdersDataModels.Models; using System.ComponentModel.DataAnnotations; using System.ComponentModel.DataAnnotations.Schema; +using System.Runtime.Serialization; namespace FoodOrdersDatabaseImplement.Models { + [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; } diff --git a/FoodOrders/FoodOrdersDatabaseImplement/Models/MessageInfo.cs b/FoodOrders/FoodOrdersDatabaseImplement/Models/MessageInfo.cs index 0d85148..ba56291 100644 --- a/FoodOrders/FoodOrdersDatabaseImplement/Models/MessageInfo.cs +++ b/FoodOrders/FoodOrdersDatabaseImplement/Models/MessageInfo.cs @@ -2,23 +2,40 @@ using FoodOrdersContracts.ViewModels; using FoodOrdersDataModels.Models; using System.ComponentModel.DataAnnotations; +using System.ComponentModel.DataAnnotations.Schema; +using System.Runtime.Serialization; namespace FoodOrdersDatabaseImplement.Models { + [DataContract] public class MessageInfo : IMessageInfoModel { + [NotMapped] + public int Id { get; private set; } + + [DataMember] [Key] - public string MessageId { get; private set; } = string.Empty; + [DatabaseGenerated(DatabaseGeneratedOption.None)] + public string MessageId { get; set; } = string.Empty; - public int? ClientId { get; private set; } + [DataMember] + public int? ClientId { get; set; } - public string SenderName { get; private set; } = string.Empty; + [DataMember] + [Required] + public string SenderName { get; set; } = string.Empty; - public DateTime DateDelivery { get; private set; } = DateTime.Now; + [DataMember] + [Required] + public DateTime DateDelivery { get; set; } - public string Subject { get; private set; } = string.Empty; + [DataMember] + [Required] + public string Subject { get; set; } = string.Empty; - public string Body { get; private set; } = string.Empty; + [DataMember] + [Required] + public string Body { get; set; } = string.Empty; public virtual Client? Client { get; private set; } diff --git a/FoodOrders/FoodOrdersDatabaseImplement/Models/Order.cs b/FoodOrders/FoodOrdersDatabaseImplement/Models/Order.cs index e832e1c..7cab67f 100644 --- a/FoodOrders/FoodOrdersDatabaseImplement/Models/Order.cs +++ b/FoodOrders/FoodOrdersDatabaseImplement/Models/Order.cs @@ -7,28 +7,46 @@ using System.Collections.Generic; using System.ComponentModel.DataAnnotations; using System.Linq; using System.Runtime.ConstrainedExecution; +using System.Runtime.Serialization; using System.Text; using System.Threading.Tasks; namespace FoodOrdersDatabaseImplement.Models { + [DataContract] public class Order : IOrderModel { + [DataMember] public int Id { get; private set; } + + [DataMember] [Required] public int DishId { get; private set; } + + [DataMember] [Required] public int ClientId { get; private set; } + + [DataMember] public int? ImplementerId { get; private set; } + + [DataMember] [Required] public int Count { get; private set; } + + [DataMember] [Required] public double Sum { get; private set; } + + [DataMember] [Required] public OrderStatus Status { get; private set; } = OrderStatus.Неизвестен; + + [DataMember] [Required] public DateTime DateCreate { get; private set; } = DateTime.Now; + [DataMember] public DateTime? DateImplement { get; private set; } public virtual Dish Dish { get; private set; } public virtual Client Client { get; set; } diff --git a/FoodOrders/FoodOrdersFileImplement/FileImplementationExtension.cs b/FoodOrders/FoodOrdersFileImplement/FileImplementationExtension.cs new file mode 100644 index 0000000..2855e2f --- /dev/null +++ b/FoodOrders/FoodOrdersFileImplement/FileImplementationExtension.cs @@ -0,0 +1,22 @@ +using FoodOrdersContracts.DI; +using FoodOrdersContracts.StoragesContracts; +using FoodOrdersFileImplement.Implements; + +namespace FoodOrdersFileImplement +{ + 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(); + } + } +} diff --git a/FoodOrders/FoodOrdersFileImplement/FoodOrdersFileImplement.csproj b/FoodOrders/FoodOrdersFileImplement/FoodOrdersFileImplement.csproj index 51e14c2..74afae5 100644 --- a/FoodOrders/FoodOrdersFileImplement/FoodOrdersFileImplement.csproj +++ b/FoodOrders/FoodOrdersFileImplement/FoodOrdersFileImplement.csproj @@ -11,4 +11,8 @@ + + + + diff --git a/FoodOrders/FoodOrdersFileImplement/Implements/BackUpInfo.cs b/FoodOrders/FoodOrdersFileImplement/Implements/BackUpInfo.cs new file mode 100644 index 0000000..01775f6 --- /dev/null +++ b/FoodOrders/FoodOrdersFileImplement/Implements/BackUpInfo.cs @@ -0,0 +1,36 @@ +using FoodOrdersContracts.StoragesContracts; +using System.Reflection; + +namespace FoodOrdersFileImplement.Implements +{ + public class BackUpInfo : IBackUpInfo + { + private readonly DataFileSingleton source; + + public BackUpInfo() + { + source = DataFileSingleton.GetInstance(); + } + + public List? GetList() where T : class, new() + { + 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; + } + } +} diff --git a/FoodOrders/FoodOrdersFileImplement/Models/Client.cs b/FoodOrders/FoodOrdersFileImplement/Models/Client.cs index 0c209e0..f799a51 100644 --- a/FoodOrders/FoodOrdersFileImplement/Models/Client.cs +++ b/FoodOrders/FoodOrdersFileImplement/Models/Client.cs @@ -1,18 +1,24 @@ using FoodOrdersContracts.BindingModels; using FoodOrdersContracts.ViewModels; using FoodOrdersDataModels.Models; +using System.Runtime.Serialization; using System.Xml.Linq; namespace FoodOrdersFileImplement.Models { + [DataContract] public class Client : IClientModel { + [DataMember] public int Id { get; private set; } + [DataMember] public string ClientFIO { get; private set; } = string.Empty; + [DataMember] public string Email { get; private set; } = string.Empty; + [DataMember] public string Password { get; private set; } = string.Empty; public static Client? Create(ClientBindingModel model) diff --git a/FoodOrders/FoodOrdersFileImplement/Models/Component.cs b/FoodOrders/FoodOrdersFileImplement/Models/Component.cs index 2066099..fea3edf 100644 --- a/FoodOrders/FoodOrdersFileImplement/Models/Component.cs +++ b/FoodOrders/FoodOrdersFileImplement/Models/Component.cs @@ -1,16 +1,21 @@ using FoodOrdersContracts.BindingModels; using FoodOrdersContracts.ViewModels; using FoodOrdersDataModels.Models; +using System.Runtime.Serialization; using System.Xml.Linq; namespace FoodOrdersFileImplement.Models { + [DataContract] public class Component : IComponentModel { + [DataMember] public int Id { get; private set; } + [DataMember] public string ComponentName { get; private set; } = string.Empty; + [DataMember] public double Cost { get; set; } public static Component? Create(ComponentBindingModel model) diff --git a/FoodOrders/FoodOrdersFileImplement/Models/Dish.cs b/FoodOrders/FoodOrdersFileImplement/Models/Dish.cs index b78c7f9..0069a01 100644 --- a/FoodOrders/FoodOrdersFileImplement/Models/Dish.cs +++ b/FoodOrders/FoodOrdersFileImplement/Models/Dish.cs @@ -1,22 +1,28 @@ using FoodOrdersContracts.BindingModels; using FoodOrdersContracts.ViewModels; using FoodOrdersDataModels.Models; +using System.Runtime.Serialization; using System.Xml.Linq; namespace FoodOrdersFileImplement.Models { + [DataContract] public class Dish : IDishModel { + [DataMember] public int Id { get; private set; } + [DataMember] public string DishName { get; private set; } = string.Empty; + [DataMember] public double Price { get; private set; } public Dictionary Components { get; private set; } = new(); private Dictionary? _DishComponents = null; + [DataMember] public Dictionary DishComponents { get diff --git a/FoodOrders/FoodOrdersFileImplement/Models/Implementer.cs b/FoodOrders/FoodOrdersFileImplement/Models/Implementer.cs index 3e5a680..77043a9 100644 --- a/FoodOrders/FoodOrdersFileImplement/Models/Implementer.cs +++ b/FoodOrders/FoodOrdersFileImplement/Models/Implementer.cs @@ -1,20 +1,27 @@ using FoodOrdersContracts.BindingModels; using FoodOrdersContracts.ViewModels; using FoodOrdersDataModels.Models; +using System.Runtime.Serialization; using System.Xml.Linq; namespace FoodOrdersFileImplement.Models { + [DataContract] internal class Implementer : IImplementerModel { + [DataMember] public int Id { get; set; } + [DataMember] public string ImplementerFIO { get; set; } = string.Empty; + [DataMember] public string Password { get; set; } = string.Empty; + [DataMember] public int WorkExperience { get; set; } + [DataMember] public int Qualification { get; set; } public static Implementer? Create(ImplementerBindingModel? model) diff --git a/FoodOrders/FoodOrdersFileImplement/Models/MessageInfo.cs b/FoodOrders/FoodOrdersFileImplement/Models/MessageInfo.cs index b7568c0..d305a98 100644 --- a/FoodOrders/FoodOrdersFileImplement/Models/MessageInfo.cs +++ b/FoodOrders/FoodOrdersFileImplement/Models/MessageInfo.cs @@ -1,22 +1,32 @@ using FoodOrdersContracts.BindingModels; using FoodOrdersContracts.ViewModels; using FoodOrdersDataModels.Models; +using System.Runtime.Serialization; using System.Xml.Linq; namespace FoodOrdersFileImplement.Models { + [DataContract] public class MessageInfo : IMessageInfoModel { + public int Id { get; private set; } + + [DataMember] public string MessageId { get; private set; } = string.Empty; + [DataMember] public int? ClientId { get; private set; } + [DataMember] public string SenderName { get; private set; } = string.Empty; + [DataMember] public DateTime DateDelivery { get; private set; } = DateTime.Now; + [DataMember] public string Subject { get; private set; } = string.Empty; + [DataMember] public string Body { get; private set; } = string.Empty; public static MessageInfo? Create(MessageInfoBindingModel model) diff --git a/FoodOrders/FoodOrdersFileImplement/Models/Order.cs b/FoodOrders/FoodOrdersFileImplement/Models/Order.cs index 38a1064..b4de9b5 100644 --- a/FoodOrders/FoodOrdersFileImplement/Models/Order.cs +++ b/FoodOrders/FoodOrdersFileImplement/Models/Order.cs @@ -3,28 +3,39 @@ using FoodOrdersContracts.ViewModels; using FoodOrdersDataModels.Enums; using FoodOrdersDataModels.Models; using System.Reflection; +using System.Runtime.Serialization; using System.Xml.Linq; namespace FoodOrdersFileImplement.Models { + [DataContract] public class Order : IOrderModel { + [DataMember] public int Id { get; private set; } + [DataMember] public int DishId { get; private set; } + [DataMember] public int ClientId { get; private set; } + [DataMember] public int? ImplementerId { get; private set; } + [DataMember] public int Count { get; private set; } + [DataMember] public double Sum { get; private set; } + [DataMember] public OrderStatus Status { get; private set; } + [DataMember] public DateTime DateCreate { get; private set; } + [DataMember] public DateTime? DateImplement { get; private set; } public static Order? Create(OrderBindingModel? model) diff --git a/FoodOrders/FoodOrdersListImplement/FoodOrdersListImplement.csproj b/FoodOrders/FoodOrdersListImplement/FoodOrdersListImplement.csproj index 51e14c2..74afae5 100644 --- a/FoodOrders/FoodOrdersListImplement/FoodOrdersListImplement.csproj +++ b/FoodOrders/FoodOrdersListImplement/FoodOrdersListImplement.csproj @@ -11,4 +11,8 @@ + + + + diff --git a/FoodOrders/FoodOrdersListImplement/Implements/BackUpInfo.cs b/FoodOrders/FoodOrdersListImplement/Implements/BackUpInfo.cs new file mode 100644 index 0000000..87f1127 --- /dev/null +++ b/FoodOrders/FoodOrdersListImplement/Implements/BackUpInfo.cs @@ -0,0 +1,17 @@ +using FoodOrdersContracts.StoragesContracts; + +namespace FoodOrdersListImplement.Implements +{ + public class BackUpInfo : IBackUpInfo + { + public List? GetList() where T : class, new() + { + throw new NotImplementedException(); + } + + public Type? GetTypeByModelInterface(string modelInterfaceName) + { + throw new NotImplementedException(); + } + } +} diff --git a/FoodOrders/FoodOrdersListImplement/ListImplementationExtension.cs b/FoodOrders/FoodOrdersListImplement/ListImplementationExtension.cs new file mode 100644 index 0000000..13e997a --- /dev/null +++ b/FoodOrders/FoodOrdersListImplement/ListImplementationExtension.cs @@ -0,0 +1,22 @@ +using FoodOrdersContracts.DI; +using FoodOrdersContracts.StoragesContracts; +using FoodOrdersListImplement.Implements; + +namespace FoodOrdersListImplement +{ + 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/FoodOrders/FoodOrdersListImplement/Models/MessageInfo.cs b/FoodOrders/FoodOrdersListImplement/Models/MessageInfo.cs index 31e7df0..04a6b05 100644 --- a/FoodOrders/FoodOrdersListImplement/Models/MessageInfo.cs +++ b/FoodOrders/FoodOrdersListImplement/Models/MessageInfo.cs @@ -6,6 +6,8 @@ namespace FoodOrdersListImplement.Models { public class MessageInfo : IMessageInfoModel { + public int Id => throw new NotImplementedException(); + public string MessageId { get; private set; } = string.Empty; public int? ClientId { get; private set; } diff --git a/FoodOrders/FoodOrdersView/DataGridViewExtension.cs b/FoodOrders/FoodOrdersView/DataGridViewExtension.cs new file mode 100644 index 0000000..21a48d3 --- /dev/null +++ b/FoodOrders/FoodOrdersView/DataGridViewExtension.cs @@ -0,0 +1,46 @@ +using FoodOrdersContracts.Attributes; + +namespace FoodOrdersView +{ + public 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/FoodOrders/FoodOrdersView/FormComponents.cs b/FoodOrders/FoodOrdersView/FormComponents.cs index 52bb7b5..bef92c1 100644 --- a/FoodOrders/FoodOrdersView/FormComponents.cs +++ b/FoodOrders/FoodOrdersView/FormComponents.cs @@ -1,5 +1,6 @@ using FoodOrdersContracts.BindingModels; using FoodOrdersContracts.BusinessLogicsContracts; +using FoodOrdersContracts.DI; using Microsoft.Extensions.Logging; namespace FoodOrdersView @@ -26,13 +27,7 @@ namespace FoodOrdersView { try { - var list = _logic.ReadList(null); - if (list != null) - { - dataGridView.DataSource = list; - dataGridView.Columns["Id"].Visible = false; - dataGridView.Columns["ComponentName"].AutoSizeMode = DataGridViewAutoSizeColumnMode.Fill; - } + dataGridView.FillAndConfigGrid(_logic.ReadList(null)); _logger.LogInformation("Загрузка компонентов"); } catch (Exception ex) @@ -44,13 +39,10 @@ namespace FoodOrdersView 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(); + if (form.ShowDialog() == DialogResult.OK) { - if (form.ShowDialog() == DialogResult.OK) - { - LoadData(); - } + LoadData(); } } @@ -58,14 +50,11 @@ namespace FoodOrdersView { if (dataGridView.SelectedRows.Count == 1) { - var service = Program.ServiceProvider?.GetService(typeof(FormComponent)); - if (service is FormComponent form) + var form = DependencyManager.Instance.Resolve(); + 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(); } } } diff --git a/FoodOrders/FoodOrdersView/FormDish.cs b/FoodOrders/FoodOrdersView/FormDish.cs index e51bb8a..32d29bf 100644 --- a/FoodOrders/FoodOrdersView/FormDish.cs +++ b/FoodOrders/FoodOrdersView/FormDish.cs @@ -1,5 +1,6 @@ using FoodOrdersContracts.BindingModels; using FoodOrdersContracts.BusinessLogicsContracts; +using FoodOrdersContracts.DI; using FoodOrdersContracts.SearchModels; using FoodOrdersDataModels.Models; using Microsoft.Extensions.Logging; @@ -14,7 +15,7 @@ namespace FoodOrdersView private int? _id; - private Dictionary _FoodComponents; + private Dictionary _dishComponents; public int Id { set { _id = value; } } @@ -23,7 +24,7 @@ namespace FoodOrdersView InitializeComponent(); _logger = logger; _logic = logic; - _FoodComponents = new Dictionary(); + _dishComponents = new Dictionary(); } private void FormFood_Load(object sender, EventArgs e) @@ -38,7 +39,7 @@ namespace FoodOrdersView { textBoxName.Text = view.DishName; textBoxPrice.Text = view.Price.ToString(); - _FoodComponents = view.DishComponents ?? new Dictionary(); + _dishComponents = view.DishComponents ?? new Dictionary(); LoadData(); } } @@ -55,10 +56,10 @@ namespace FoodOrdersView _logger.LogInformation("Загрузка компонент блюда"); try { - if (_FoodComponents != null) + if (_dishComponents != null) { dataGridView.Rows.Clear(); - foreach (var FoodC in _FoodComponents) + foreach (var FoodC in _dishComponents) { dataGridView.Rows.Add(new object[] { FoodC.Key, FoodC.Value.Item1.ComponentName, FoodC.Value.Item2 }); } @@ -74,26 +75,23 @@ namespace FoodOrdersView private void ButtonAdd_Click(object sender, EventArgs e) { - var service = Program.ServiceProvider?.GetService(typeof(FormDishComponent)); - if (service is FormDishComponent form) + var form = DependencyManager.Instance.Resolve(); + if (form.ShowDialog() == DialogResult.OK) { - if (form.ShowDialog() == DialogResult.OK) + if (form.ComponentModel == null) { - if (form.ComponentModel == null) - { - return; - } - _logger.LogInformation("Добавление нового компонента: {ComponentName} - {Count}", form.ComponentModel.ComponentName, form.Count); - if (_FoodComponents.ContainsKey(form.Id)) - { - _FoodComponents[form.Id] = (form.ComponentModel, form.Count); - } - else - { - _FoodComponents.Add(form.Id, (form.ComponentModel, form.Count)); - } - LoadData(); + return; } + _logger.LogInformation("Добавление нового компонента: {ComponentName} - {Count}", form.ComponentModel.ComponentName, form.Count); + if (_dishComponents.ContainsKey(form.Id)) + { + _dishComponents[form.Id] = (form.ComponentModel, form.Count); + } + else + { + _dishComponents.Add(form.Id, (form.ComponentModel, form.Count)); + } + LoadData(); } } @@ -101,22 +99,19 @@ namespace FoodOrdersView { if (dataGridView.SelectedRows.Count == 1) { - var service = Program.ServiceProvider?.GetService(typeof(FormDishComponent)); - if (service is FormDishComponent form) + var form = DependencyManager.Instance.Resolve(); + int id = Convert.ToInt32(dataGridView.SelectedRows[0].Cells[0].Value); + form.Id = id; + form.Count = _dishComponents[id].Item2; + if (form.ShowDialog() == DialogResult.OK) { - int id = Convert.ToInt32(dataGridView.SelectedRows[0].Cells[0].Value); - form.Id = id; - form.Count = _FoodComponents[id].Item2; - if (form.ShowDialog() == DialogResult.OK) + if (form.ComponentModel == null) { - if (form.ComponentModel == null) - { - return; - } - _logger.LogInformation("Изменение компонента: {ComponentName} - {Count}", form.ComponentModel.ComponentName, form.Count); - _FoodComponents[form.Id] = (form.ComponentModel, form.Count); - LoadData(); + return; } + _logger.LogInformation("Изменение компонента: {ComponentName} - {Count}", form.ComponentModel.ComponentName, form.Count); + _dishComponents[form.Id] = (form.ComponentModel, form.Count); + LoadData(); } } } @@ -131,7 +126,7 @@ namespace FoodOrdersView { _logger.LogInformation("Удаление компонента: {ComponentName} - {Count}", dataGridView.SelectedRows[0].Cells[1].Value, dataGridView.SelectedRows[0].Cells[2].Value); - _FoodComponents?.Remove(Convert.ToInt32(dataGridView.SelectedRows[0].Cells[0].Value)); + _dishComponents?.Remove(Convert.ToInt32(dataGridView.SelectedRows[0].Cells[0].Value)); } catch (Exception ex) { @@ -159,7 +154,7 @@ namespace FoodOrdersView MessageBox.Show("Заполните цену", "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error); return; } - if (_FoodComponents == null || _FoodComponents.Count == 0) + if (_dishComponents == null || _dishComponents.Count == 0) { MessageBox.Show("Заполните компоненты", "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error); return; @@ -172,7 +167,7 @@ namespace FoodOrdersView Id = _id ?? 0, DishName = textBoxName.Text, Price = Convert.ToDouble(textBoxPrice.Text), - DishComponents = _FoodComponents + DishComponents = _dishComponents }; var operationResult = _id.HasValue ? _logic.Update(model) : _logic.Create(model); if (!operationResult) @@ -199,7 +194,7 @@ namespace FoodOrdersView private double CalcPrice() { double price = 0; - foreach (var elem in _FoodComponents) + foreach (var elem in _dishComponents) { price += ((elem.Value.Item1?.Cost ?? 0) * elem.Value.Item2); } diff --git a/FoodOrders/FoodOrdersView/FormDishes.cs b/FoodOrders/FoodOrdersView/FormDishes.cs index 26a4298..caea21d 100644 --- a/FoodOrders/FoodOrdersView/FormDishes.cs +++ b/FoodOrders/FoodOrdersView/FormDishes.cs @@ -1,5 +1,6 @@ using FoodOrdersContracts.BindingModels; using FoodOrdersContracts.BusinessLogicsContracts; +using FoodOrdersContracts.DI; using Microsoft.Extensions.Logging; namespace FoodOrdersView @@ -26,14 +27,7 @@ namespace FoodOrdersView { try { - var list = _logic.ReadList(null); - if (list != null) - { - dataGridView.DataSource = list; - dataGridView.Columns["Id"].Visible = false; - dataGridView.Columns["DishName"].AutoSizeMode = DataGridViewAutoSizeColumnMode.Fill; - dataGridView.Columns["DishComponents"].Visible = false; - } + dataGridView.FillAndConfigGrid(_logic.ReadList(null)); _logger.LogInformation("Загрузка блюда"); } catch (Exception ex) @@ -45,13 +39,10 @@ namespace FoodOrdersView private void ButtonAdd_Click(object sender, EventArgs e) { - var service = Program.ServiceProvider?.GetService(typeof(FormDish)); - if (service is FormDish form) + var form = DependencyManager.Instance.Resolve(); + if (form.ShowDialog() == DialogResult.OK) { - if (form.ShowDialog() == DialogResult.OK) - { - LoadData(); - } + LoadData(); } } @@ -59,14 +50,11 @@ namespace FoodOrdersView { if (dataGridView.SelectedRows.Count == 1) { - var service = Program.ServiceProvider?.GetService(typeof(FormDish)); - if (service is FormDish form) + var form = DependencyManager.Instance.Resolve(); + 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(); } } } diff --git a/FoodOrders/FoodOrdersView/FormImplementers.cs b/FoodOrders/FoodOrdersView/FormImplementers.cs index 65c3c5a..4934b05 100644 --- a/FoodOrders/FoodOrdersView/FormImplementers.cs +++ b/FoodOrders/FoodOrdersView/FormImplementers.cs @@ -1,5 +1,6 @@ using FoodOrdersContracts.BindingModels; using FoodOrdersContracts.BusinessLogicsContracts; +using FoodOrdersContracts.DI; using Microsoft.Extensions.Logging; namespace FoodOrdersView @@ -26,16 +27,7 @@ namespace FoodOrdersView { try { - var list = _logic.ReadList(null); - if (list != null) - { - dataGridView.DataSource = list; - dataGridView.Columns["Id"].Visible = false; - dataGridView.Columns["ImplementerFIO"].AutoSizeMode = DataGridViewAutoSizeColumnMode.Fill; - dataGridView.Columns["Password"].AutoSizeMode = DataGridViewAutoSizeColumnMode.Fill; - dataGridView.Columns["WorkExperience"].AutoSizeMode = DataGridViewAutoSizeColumnMode.Fill; - dataGridView.Columns["Qualification"].AutoSizeMode = DataGridViewAutoSizeColumnMode.Fill; - } + dataGridView.FillAndConfigGrid(_logic.ReadList(null)); _logger.LogInformation("Implementers loading"); } catch (Exception ex) @@ -47,13 +39,10 @@ namespace FoodOrdersView private void ButtonAdd_Click(object sender, EventArgs e) { - var service = Program.ServiceProvider?.GetService(typeof(FormImplementer)); - if (service is FormImplementer form) + var form = DependencyManager.Instance.Resolve(); + if (form.ShowDialog() == DialogResult.OK) { - if (form.ShowDialog() == DialogResult.OK) - { - LoadData(); - } + LoadData(); } } @@ -61,14 +50,11 @@ namespace FoodOrdersView { if (dataGridView.SelectedRows.Count == 1) { - var service = Program.ServiceProvider?.GetService(typeof(FormImplementer)); - if (service is FormImplementer form) + var form = DependencyManager.Instance.Resolve(); + 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(); } } } diff --git a/FoodOrders/FoodOrdersView/FormMails.cs b/FoodOrders/FoodOrdersView/FormMails.cs index b85a0de..35526c0 100644 --- a/FoodOrders/FoodOrdersView/FormMails.cs +++ b/FoodOrders/FoodOrdersView/FormMails.cs @@ -25,14 +25,7 @@ namespace FoodOrdersView { 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("Messages loading"); } catch (Exception ex) diff --git a/FoodOrders/FoodOrdersView/FormMain.cs b/FoodOrders/FoodOrdersView/FormMain.cs index 6c93e7d..86e014c 100644 --- a/FoodOrders/FoodOrdersView/FormMain.cs +++ b/FoodOrders/FoodOrdersView/FormMain.cs @@ -2,6 +2,7 @@ using FoodOrdersContracts.BindingModels; using FoodOrdersContracts.BusinessLogicsContracts; using Microsoft.Extensions.Logging; +using FoodOrdersContracts.DI; namespace FoodOrdersView { @@ -13,15 +14,18 @@ namespace FoodOrdersView private readonly IReportLogic _reportLogic; + private readonly IBackUpLogic _backUpLogic; + private readonly IWorkProcess _workProcess; - public FormMain(ILogger logger, IOrderLogic orderLogic, IReportLogic reportLogic, IWorkProcess workProcess) + 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) @@ -33,18 +37,7 @@ namespace FoodOrdersView { try { - var list = _orderLogic.ReadList(null); - if (list != null) - { - dataGridView.DataSource = list; - dataGridView.Columns["DishId"].Visible = false; - dataGridView.Columns["DishName"].AutoSizeMode = DataGridViewAutoSizeColumnMode.Fill; - dataGridView.Columns["ClientId"].Visible = false; - dataGridView.Columns["ClientEmail"].Visible = false; - dataGridView.Columns["ClientFIO"].AutoSizeMode = DataGridViewAutoSizeColumnMode.Fill; - dataGridView.Columns["ImplementerId"].Visible = false; - dataGridView.Columns["ImplementerFIO"].AutoSizeMode = DataGridViewAutoSizeColumnMode.Fill; - } + dataGridView.FillAndConfigGrid(_orderLogic.ReadList(null)); _logger.LogInformation("Загрузка заказов"); } catch (Exception ex) @@ -56,30 +49,21 @@ namespace FoodOrdersView private void КомпонентыToolStripMenuItem_Click(object sender, EventArgs e) { - var service = Program.ServiceProvider?.GetService(typeof(FormComponents)); - if (service is FormComponents form) - { - form.ShowDialog(); - } + var form = DependencyManager.Instance.Resolve(); + form.ShowDialog(); } private void БлюдоToolStripMenuItem_Click(object sender, EventArgs e) { - var service = Program.ServiceProvider?.GetService(typeof(FormDishes)); - if (service is FormDishes form) - { - form.ShowDialog(); - } + var form = DependencyManager.Instance.Resolve(); + 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(); + form.ShowDialog(); + LoadData(); } private void ButtonIssuedOrder_Click(object sender, EventArgs e) @@ -112,21 +96,14 @@ namespace FoodOrdersView } private void СписокЗаказовToolStripMenuItem_Click(object sender, EventArgs e) { - var service = Program.ServiceProvider?.GetService(typeof(FormReportOrders)); - if (service is FormReportOrders form) - { - form.ShowDialog(); - } + var form = DependencyManager.Instance.Resolve(); + form.ShowDialog(); } private void компонентыПоБлюдамToolStripMenuItem_Click(object sender, EventArgs e) { - var service = Program.ServiceProvider?.GetService(typeof(FormReportDishComponents)); - if (service is FormReportDishComponents form) - { - form.ShowDialog(); - } - + var form = DependencyManager.Instance.Resolve(); + form.ShowDialog(); } private void списокБлюдToolStripMenuItem_Click(object sender, EventArgs e) @@ -142,34 +119,49 @@ namespace FoodOrdersView private void клиентыToolStripMenuItem_Click(object sender, EventArgs e) { - var service = Program.ServiceProvider?.GetService(typeof(FormClients)); - if (service is FormClients form) - { - form.ShowDialog(); - } + var form = DependencyManager.Instance.Resolve(); + form.ShowDialog(); } private void запускРаботToolStripMenuItem_Click(object sender, EventArgs e) { - _workProcess.DoWork((Program.ServiceProvider?.GetService(typeof(IImplementerLogic)) as IImplementerLogic)!, _orderLogic); + _workProcess.DoWork(DependencyManager.Instance.Resolve(), _orderLogic); MessageBox.Show("Процесс обработки запущен", "Сообщение", MessageBoxButtons.OK, MessageBoxIcon.Information); } private void исполнителиToolStripMenuItem_Click(object sender, EventArgs e) { - var service = Program.ServiceProvider?.GetService(typeof(FormImplementers)); - if (service is FormImplementers form) - { - form.ShowDialog(); - } + var form = DependencyManager.Instance.Resolve(); + form.ShowDialog(); } private void почтыToolStripMenuItem_Click(object sender, EventArgs e) { - var service = Program.ServiceProvider?.GetService(typeof(FormMails)); - if (service is FormMails form) + var form = DependencyManager.Instance.Resolve(); + form.ShowDialog(); + } + + private void создатьБэкапToolStripMenuItem_Click(object sender, EventArgs e) + { + try { - form.ShowDialog(); + 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/FoodOrders/FoodOrdersView/FormMain.designer.cs b/FoodOrders/FoodOrdersView/FormMain.designer.cs index 6caebcc..9e35419 100644 --- a/FoodOrders/FoodOrdersView/FormMain.designer.cs +++ b/FoodOrders/FoodOrdersView/FormMain.designer.cs @@ -34,16 +34,17 @@ БлюдаToolStripMenuItem = new ToolStripMenuItem(); клиентыToolStripMenuItem = new ToolStripMenuItem(); исполнителиToolStripMenuItem = new ToolStripMenuItem(); + почтыToolStripMenuItem = new ToolStripMenuItem(); отчетыToolStripMenuItem = new ToolStripMenuItem(); списокБлюдToolStripMenuItem = new ToolStripMenuItem(); компонентыПоБлюдамToolStripMenuItem = new ToolStripMenuItem(); списокЗаказовToolStripMenuItem = new ToolStripMenuItem(); запускРаботToolStripMenuItem = new ToolStripMenuItem(); + создатьБэкапToolStripMenuItem = new ToolStripMenuItem(); buttonIssuedOrder = new Button(); buttonCreateOrder = new Button(); dataGridView = new DataGridView(); buttonUpd = new Button(); - почтыToolStripMenuItem = new ToolStripMenuItem(); menuStrip.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)dataGridView).BeginInit(); SuspendLayout(); @@ -51,7 +52,7 @@ // menuStrip // menuStrip.ImageScalingSize = new Size(20, 20); - menuStrip.Items.AddRange(new ToolStripItem[] { справочникиToolStripMenuItem, отчетыToolStripMenuItem, запускРаботToolStripMenuItem }); + menuStrip.Items.AddRange(new ToolStripItem[] { справочникиToolStripMenuItem, отчетыToolStripMenuItem, запускРаботToolStripMenuItem, создатьБэкапToolStripMenuItem }); menuStrip.Location = new Point(0, 0); menuStrip.Name = "menuStrip"; menuStrip.Padding = new Padding(8, 3, 0, 3); @@ -69,31 +70,38 @@ // компонентыToolStripMenuItem // компонентыToolStripMenuItem.Name = "компонентыToolStripMenuItem"; - компонентыToolStripMenuItem.Size = new Size(224, 26); + компонентыToolStripMenuItem.Size = new Size(185, 26); компонентыToolStripMenuItem.Text = "Компоненты"; компонентыToolStripMenuItem.Click += КомпонентыToolStripMenuItem_Click; // // БлюдаToolStripMenuItem // БлюдаToolStripMenuItem.Name = "БлюдаToolStripMenuItem"; - БлюдаToolStripMenuItem.Size = new Size(224, 26); + БлюдаToolStripMenuItem.Size = new Size(185, 26); БлюдаToolStripMenuItem.Text = "Еда"; БлюдаToolStripMenuItem.Click += БлюдоToolStripMenuItem_Click; // // клиентыToolStripMenuItem // клиентыToolStripMenuItem.Name = "клиентыToolStripMenuItem"; - клиентыToolStripMenuItem.Size = new Size(224, 26); + клиентыToolStripMenuItem.Size = new Size(185, 26); клиентыToolStripMenuItem.Text = "Клиенты"; клиентыToolStripMenuItem.Click += клиентыToolStripMenuItem_Click; // // исполнителиToolStripMenuItem // исполнителиToolStripMenuItem.Name = "исполнителиToolStripMenuItem"; - исполнителиToolStripMenuItem.Size = new Size(224, 26); + исполнителиToolStripMenuItem.Size = new Size(185, 26); исполнителиToolStripMenuItem.Text = "Исполнители"; исполнителиToolStripMenuItem.Click += исполнителиToolStripMenuItem_Click; // + // почтыToolStripMenuItem + // + почтыToolStripMenuItem.Name = "почтыToolStripMenuItem"; + почтыToolStripMenuItem.Size = new Size(185, 26); + почтыToolStripMenuItem.Text = "Почты"; + почтыToolStripMenuItem.Click += почтыToolStripMenuItem_Click; + // // отчетыToolStripMenuItem // отчетыToolStripMenuItem.DropDownItems.AddRange(new ToolStripItem[] { списокБлюдToolStripMenuItem, компонентыПоБлюдамToolStripMenuItem, списокЗаказовToolStripMenuItem }); @@ -129,6 +137,13 @@ запускРаботToolStripMenuItem.Text = "Запуск работ"; запускРаботToolStripMenuItem.Click += запускРаботToolStripMenuItem_Click; // + // создатьБэкапToolStripMenuItem + // + создатьБэкапToolStripMenuItem.Name = "создатьБэкапToolStripMenuItem"; + создатьБэкапToolStripMenuItem.Size = new Size(122, 24); + создатьБэкапToolStripMenuItem.Text = "Создать бэкап"; + создатьБэкапToolStripMenuItem.Click += создатьБэкапToolStripMenuItem_Click; + // // buttonIssuedOrder // buttonIssuedOrder.Anchor = AnchorStyles.Top | AnchorStyles.Right; @@ -183,13 +198,6 @@ buttonUpd.UseVisualStyleBackColor = true; buttonUpd.Click += ButtonUpd_Click; // - // почтыToolStripMenuItem - // - почтыToolStripMenuItem.Name = "почтыToolStripMenuItem"; - почтыToolStripMenuItem.Size = new Size(224, 26); - почтыToolStripMenuItem.Text = "Почты"; - почтыToolStripMenuItem.Click += почтыToolStripMenuItem_Click; - // // FormMain // AutoScaleDimensions = new SizeF(8F, 20F); @@ -231,6 +239,7 @@ private ToolStripMenuItem запускРаботToolStripMenuItem; private ToolStripMenuItem исполнителиToolStripMenuItem; private ToolStripMenuItem почтыToolStripMenuItem; + private ToolStripMenuItem создатьБэкапToolStripMenuItem; } } diff --git a/FoodOrders/FoodOrdersView/Program.cs b/FoodOrders/FoodOrdersView/Program.cs index af6c9e8..f2d75f3 100644 --- a/FoodOrders/FoodOrdersView/Program.cs +++ b/FoodOrders/FoodOrdersView/Program.cs @@ -9,14 +9,12 @@ using Microsoft.Extensions.Logging; using NLog.Extensions.Logging; using FoodOrdersBusinessLogic.MailWorker; using FoodOrdersContracts.BindingModels; +using FoodOrdersContracts.DI; namespace FoodOrdersView { internal static class Program { - private static ServiceProvider? _serviceProvider; - public static ServiceProvider? ServiceProvider => _serviceProvider; - /// /// The main entry point for the application. /// @@ -26,13 +24,10 @@ namespace FoodOrdersView // To customize application configuration such as set high DPI settings or default font, // 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 +42,50 @@ namespace FoodOrdersView } catch (Exception ex) { - var logger = _serviceProvider.GetService(); + var logger = DependencyManager.Instance.Resolve(); logger?.LogError(ex, " "); } - Application.Run(_serviceProvider.GetRequiredService()); + Application.Run(DependencyManager.Instance.Resolve()); } - private static void MailCheck(object obj) => ServiceProvider?.GetService()?.MailCheck(); - private static void ConfigureServices(ServiceCollection services) + private static void MailCheck(object obj) => DependencyManager.Instance.Resolve()?.MailCheck(); + private static void InitDependency() { - services.AddLogging(option => + 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(); + DependencyManager.Instance.RegisterType(); + DependencyManager.Instance.RegisterType(); + DependencyManager.Instance.RegisterType(); + DependencyManager.Instance.RegisterType(); + DependencyManager.Instance.RegisterType(); + DependencyManager.Instance.RegisterType(); + DependencyManager.Instance.RegisterType(); - services.AddTransient(); - services.AddSingleton(); + DependencyManager.Instance.RegisterType(); + DependencyManager.Instance.RegisterType(); + DependencyManager.Instance.RegisterType(); + DependencyManager.Instance.RegisterType(); + DependencyManager.Instance.RegisterType(true); + 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(); - 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(); } } } \ No newline at end of file -- 2.25.1 From ef25011d0481fda1788453194ce5dc8fae4a0fee Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=94=D0=B0=D0=BD=D0=B8=D0=B8=D0=BB=20=D0=9F=D1=83=D1=82?= =?UTF-8?q?=D0=B8=D0=BD=D1=86=D0=B5=D0=B2?= Date: Mon, 20 May 2024 11:44:29 +0400 Subject: [PATCH 2/2] =?UTF-8?q?=D0=93=D0=B8=D1=82=D0=98=D0=B3=D0=BD=D0=BE?= =?UTF-8?q?=D1=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitignore | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.gitignore b/.gitignore index 52737dc..8faa9ec 100644 --- a/.gitignore +++ b/.gitignore @@ -17,6 +17,9 @@ # dll файлы *.dll +/FoodOrders/ImplementationExtensions + + # Mono auto generated files mono_crash.* -- 2.25.1