diff --git a/GiftShop/GiftShopBusinessLogic/BusinessLogics/BackUpLogic.cs b/GiftShop/GiftShopBusinessLogic/BusinessLogics/BackUpLogic.cs new file mode 100644 index 0000000..8a5079d --- /dev/null +++ b/GiftShop/GiftShopBusinessLogic/BusinessLogics/BackUpLogic.cs @@ -0,0 +1,104 @@ +using GiftShopContracts.BindingModels; +using GiftShopContracts.BusinessLogicsContracts; +using GiftShopContracts.StoragesContracts; +using GiftShopDataModels; +using Microsoft.Extensions.Logging; +using System.IO.Compression; +using System.Reflection; +using System.Runtime.Serialization.Json; + +namespace GiftShopBusinessLogic.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(BackUpSaveBinidngModel model) + { + if (_backUpInfo == null) + { + return; + } + try + { + _logger.LogDebug("Clear folder"); + // зачистка папки и удаление старого архива + var dirInfo = new DirectoryInfo(model.FolderName); + if (dirInfo.Exists) + { + foreach (var file in dirInfo.GetFiles()) + { + file.Delete(); + } + } + _logger.LogDebug("Delete archive"); + string fileName = $"{model.FolderName}.zip"; + if (File.Exists(fileName)) + { + File.Delete(fileName); + } + // берем метод для сохранения + _logger.LogDebug("Get assembly"); + var typeIId = typeof(IId); + var assembly = typeIId.Assembly; + if (assembly == null) + { + throw new ArgumentNullException("Сборка не найдена", + nameof(assembly)); + } + var types = assembly.GetTypes(); + var method = GetType().GetMethod("SaveToFile", + BindingFlags.NonPublic | BindingFlags.Instance); + _logger.LogDebug("Find {count} types", types.Length); + foreach (var type in types) + { + if (type.IsInterface && type.GetInterface(typeIId.Name) != + null) + { + var modelType = + _backUpInfo.GetTypeByModelInterface(type.Name); + if (modelType == null) + { + throw new InvalidOperationException($"Не найден класс - модель для {type.Name}"); + } + _logger.LogDebug("Call SaveToFile method for {name} type", type.Name); + // вызываем метод на выполнение + method?.MakeGenericMethod(modelType).Invoke(this, new + object[] { model.FolderName }); + } + } + _logger.LogDebug("Create zip and remove folder"); + // архивируем + ZipFile.CreateFromDirectory(model.FolderName, fileName); + // удаляем папку + dirInfo.Delete(true); + } + catch (Exception) + { + throw; + } + } + + private void SaveToFile(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); + } + } +} diff --git a/GiftShop/GiftShopBusinessLogic/BusinessLogics/ClientLogic.cs b/GiftShop/GiftShopBusinessLogic/BusinessLogics/ClientLogic.cs index d50860c..ce33113 100644 --- a/GiftShop/GiftShopBusinessLogic/BusinessLogics/ClientLogic.cs +++ b/GiftShop/GiftShopBusinessLogic/BusinessLogics/ClientLogic.cs @@ -106,7 +106,7 @@ namespace GiftShopBusinessLogic.BusinessLogics { throw new ArgumentException("Неправильно введенный email", nameof(model.Email)); } - if (model.Password.Length < 10 || model.Password.Length > 50) + if (!Regex.IsMatch(model.Password, @"^((\w+\d+\W+)|(\w+\W+\d+)|(\d+\w+\W+)|(\d+\W+\w+)|(\W+\w+\d+)|(\W+\d+\w+))[\w\d\W]*$") || model.Password.Length < 10 || model.Password.Length > 50) { throw new ArgumentException("Неправильно введенный пароль", nameof(model.Password)); } diff --git a/GiftShop/GiftShopBusinessLogic/GiftShopBusinessLogic.csproj b/GiftShop/GiftShopBusinessLogic/GiftShopBusinessLogic.csproj index 4caa566..c3aa783 100644 --- a/GiftShop/GiftShopBusinessLogic/GiftShopBusinessLogic.csproj +++ b/GiftShop/GiftShopBusinessLogic/GiftShopBusinessLogic.csproj @@ -9,8 +9,12 @@ + - + + + + diff --git a/GiftShop/GiftShopContracts/Attributes/ColumnAttribute.cs b/GiftShop/GiftShopContracts/Attributes/ColumnAttribute.cs new file mode 100644 index 0000000..d2207a7 --- /dev/null +++ b/GiftShop/GiftShopContracts/Attributes/ColumnAttribute.cs @@ -0,0 +1,26 @@ +namespace GiftShopContracts.Attributes +{ + [AttributeUsage(AttributeTargets.Property)] + public class ColumnAttribute : Attribute + { + 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; + } + 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; } + } + +} diff --git a/GiftShop/GiftShopContracts/Attributes/GridViewAutoSize.cs b/GiftShop/GiftShopContracts/Attributes/GridViewAutoSize.cs new file mode 100644 index 0000000..da5c10c --- /dev/null +++ b/GiftShop/GiftShopContracts/Attributes/GridViewAutoSize.cs @@ -0,0 +1,21 @@ +namespace GiftShopContracts.Attributes +{ + public enum GridViewAutoSize + { + NotSet = 0, + + None = 1, + + ColumnHeader = 2, + + AllCellsExceptHeader = 4, + + AllCells = 6, + + DisplayedCellsExceptHeader = 8, + + DisplayedCells = 10, + + Fill = 16 + } +} diff --git a/GiftShop/GiftShopContracts/BindingModels/BackUpSaveBinidngModel.cs b/GiftShop/GiftShopContracts/BindingModels/BackUpSaveBinidngModel.cs new file mode 100644 index 0000000..6b49c4b --- /dev/null +++ b/GiftShop/GiftShopContracts/BindingModels/BackUpSaveBinidngModel.cs @@ -0,0 +1,8 @@ +namespace GiftShopContracts.BindingModels +{ + public class BackUpSaveBinidngModel + { + public string FolderName { get; set; } = string.Empty; + } + +} diff --git a/GiftShop/GiftShopContracts/BindingModels/MessageInfoBindingModel.cs b/GiftShop/GiftShopContracts/BindingModels/MessageInfoBindingModel.cs index 3b00ebd..36f9834 100644 --- a/GiftShop/GiftShopContracts/BindingModels/MessageInfoBindingModel.cs +++ b/GiftShop/GiftShopContracts/BindingModels/MessageInfoBindingModel.cs @@ -15,5 +15,7 @@ namespace GiftShopContracts.BindingModels public string Body { get; set; } = string.Empty; public DateTime DateDelivery { get; set; } + + public int Id => throw new NotImplementedException(); } } diff --git a/GiftShop/GiftShopContracts/BusinessLogicsContracts/IBackUpLogic.cs b/GiftShop/GiftShopContracts/BusinessLogicsContracts/IBackUpLogic.cs new file mode 100644 index 0000000..c0d3941 --- /dev/null +++ b/GiftShop/GiftShopContracts/BusinessLogicsContracts/IBackUpLogic.cs @@ -0,0 +1,9 @@ +using GiftShopContracts.BindingModels; + +namespace GiftShopContracts.BusinessLogicsContracts +{ + public interface IBackUpLogic + { + void CreateBackUp(BackUpSaveBinidngModel model); + } +} diff --git a/GiftShop/GiftShopContracts/DI/DependencyManager.cs b/GiftShop/GiftShopContracts/DI/DependencyManager.cs new file mode 100644 index 0000000..6fa51e1 --- /dev/null +++ b/GiftShop/GiftShopContracts/DI/DependencyManager.cs @@ -0,0 +1,68 @@ +using Microsoft.Extensions.Logging; + +namespace GiftShopContracts.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(); + } + +} diff --git a/GiftShop/GiftShopContracts/DI/IDependencyContainer.cs b/GiftShop/GiftShopContracts/DI/IDependencyContainer.cs new file mode 100644 index 0000000..2fe5399 --- /dev/null +++ b/GiftShop/GiftShopContracts/DI/IDependencyContainer.cs @@ -0,0 +1,36 @@ +using Microsoft.Extensions.Logging; + +namespace GiftShopContracts.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(); + } + +} diff --git a/GiftShop/GiftShopContracts/DI/IImplementationExtension.cs b/GiftShop/GiftShopContracts/DI/IImplementationExtension.cs new file mode 100644 index 0000000..21fe115 --- /dev/null +++ b/GiftShop/GiftShopContracts/DI/IImplementationExtension.cs @@ -0,0 +1,14 @@ +namespace GiftShopContracts.DI +{ + /// + /// Интерфейс для регистрации зависимостей в модулях + /// + public interface IImplementationExtension + { + public int Priority { get; } + /// + /// Регистрация сервисов + /// + public void RegisterServices(); + } +} diff --git a/GiftShop/GiftShopContracts/DI/ServiceDependencyContainer.cs b/GiftShop/GiftShopContracts/DI/ServiceDependencyContainer.cs new file mode 100644 index 0000000..57aeeab --- /dev/null +++ b/GiftShop/GiftShopContracts/DI/ServiceDependencyContainer.cs @@ -0,0 +1,59 @@ +using Microsoft.Extensions.DependencyInjection; +using Microsoft.Extensions.Logging; + +namespace GiftShopContracts.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/GiftShop/GiftShopContracts/DI/ServiceProviderLoader.cs b/GiftShop/GiftShopContracts/DI/ServiceProviderLoader.cs new file mode 100644 index 0000000..e9597bd --- /dev/null +++ b/GiftShop/GiftShopContracts/DI/ServiceProviderLoader.cs @@ -0,0 +1,62 @@ +using System.Reflection; + +namespace GiftShopContracts.DI +{ + /// + /// Загрузчик данных + /// + public static partial 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"; + } + } + +} diff --git a/GiftShop/GiftShopContracts/DI/UnityDependencyContainer.cs b/GiftShop/GiftShopContracts/DI/UnityDependencyContainer.cs new file mode 100644 index 0000000..6079b45 --- /dev/null +++ b/GiftShop/GiftShopContracts/DI/UnityDependencyContainer.cs @@ -0,0 +1,38 @@ +using Microsoft.Extensions.Logging; +using Unity; +using Unity.Microsoft.Logging; + +namespace GiftShopContracts.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 T : class + { + _container.RegisterType(isSingle ? TypeLifetime.Singleton : TypeLifetime.Transient); + + } + + public T Resolve() + { + return _container.Resolve(); + } + + void IDependencyContainer.RegisterType(bool isSingle) + { + _container.RegisterType(isSingle ? TypeLifetime.Singleton : TypeLifetime.Transient); + } + } +} diff --git a/GiftShop/GiftShopContracts/GiftShopContracts.csproj b/GiftShop/GiftShopContracts/GiftShopContracts.csproj index 66d285f..e518f3b 100644 --- a/GiftShop/GiftShopContracts/GiftShopContracts.csproj +++ b/GiftShop/GiftShopContracts/GiftShopContracts.csproj @@ -6,6 +6,17 @@ enable + + + + + + + + + + + diff --git a/GiftShop/GiftShopContracts/StoragesContracts/IBackUpInfo.cs b/GiftShop/GiftShopContracts/StoragesContracts/IBackUpInfo.cs new file mode 100644 index 0000000..329539e --- /dev/null +++ b/GiftShop/GiftShopContracts/StoragesContracts/IBackUpInfo.cs @@ -0,0 +1,10 @@ +namespace GiftShopContracts.StoragesContracts +{ + public interface IBackUpInfo + { + List? GetList() where T : class, new(); + + Type? GetTypeByModelInterface(string modelInterfaceName); + } + +} diff --git a/GiftShop/GiftShopContracts/ViewModels/ClientViewModel.cs b/GiftShop/GiftShopContracts/ViewModels/ClientViewModel.cs index 9a7cc20..da94740 100644 --- a/GiftShop/GiftShopContracts/ViewModels/ClientViewModel.cs +++ b/GiftShop/GiftShopContracts/ViewModels/ClientViewModel.cs @@ -1,19 +1,21 @@ -using GiftShopDataModels.Models; +using GiftShopContracts.Attributes; +using GiftShopDataModels.Models; using System.ComponentModel; namespace GiftShopContracts.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("ФИО клиента", gridViewAutoSize: GridViewAutoSize.Fill, isUseAutoSize: true)] + public string ClientFIO { get; set; } = string.Empty; - [DisplayName("Логин (эл. почта)")] - public string Email { get; set; } = string.Empty; + [Column("Логин (эл. почта)", width: 150)] + public string Email { get; set; } = string.Empty; - [DisplayName("Пароль")] - public string Password { get; set; } = string.Empty; + [Column("Пароль", width: 150)] + public string Password { get; set; } = string.Empty; } } diff --git a/GiftShop/GiftShopContracts/ViewModels/ComponentViewModel.cs b/GiftShop/GiftShopContracts/ViewModels/ComponentViewModel.cs index 5cd0840..c06e3ec 100644 --- a/GiftShop/GiftShopContracts/ViewModels/ComponentViewModel.cs +++ b/GiftShop/GiftShopContracts/ViewModels/ComponentViewModel.cs @@ -1,17 +1,18 @@ -using GiftShopDataModels.Models; +using GiftShopContracts.Attributes; +using GiftShopDataModels.Models; using System.ComponentModel; namespace GiftShopContracts.ViewModels { public class ComponentViewModel : IComponentModel { - public int Id { get; set; } + [Column(visible: false)] + public int Id { get; set; } - [DisplayName("Название компонента")] - public string ComponentName { get; set; } = string.Empty; + [Column("Название компонента", gridViewAutoSize: GridViewAutoSize.Fill, isUseAutoSize: true)] + public string ComponentName { get; set; } = string.Empty; - [DisplayName("Цена")] - - public double Cost { get; set; } + [Column("Цена", width: 80)] + public double Cost { get; set; } } } diff --git a/GiftShop/GiftShopContracts/ViewModels/GiftViewModel.cs b/GiftShop/GiftShopContracts/ViewModels/GiftViewModel.cs index deaa759..2f3a374 100644 --- a/GiftShop/GiftShopContracts/ViewModels/GiftViewModel.cs +++ b/GiftShop/GiftShopContracts/ViewModels/GiftViewModel.cs @@ -1,19 +1,21 @@ -using GiftShopDataModels.Models; +using GiftShopContracts.Attributes; +using GiftShopDataModels.Models; using System.ComponentModel; namespace GiftShopContracts.ViewModels { public class GiftViewModel : IGiftModel { - public int Id { get; set; } + [Column(visible: false)] + public int Id { get; set; } - [DisplayName("Название изделия")] - public string GiftName { get; set; } = string.Empty; + [Column("Название изделия", gridViewAutoSize: GridViewAutoSize.Fill, isUseAutoSize: true)] + public string GiftName { get; set; } = string.Empty; - [DisplayName("Цена")] + [Column("Цена", width: 100)] + public double Price { get; set; } - public double Price { get; set; } - - public Dictionary GiftComponents { get; set; } = new(); + [Column(visible: false)] + public Dictionary GiftComponents { get; set; } = new(); } } diff --git a/GiftShop/GiftShopContracts/ViewModels/ImplementerViewModel.cs b/GiftShop/GiftShopContracts/ViewModels/ImplementerViewModel.cs index 0b246a6..75f0010 100644 --- a/GiftShop/GiftShopContracts/ViewModels/ImplementerViewModel.cs +++ b/GiftShop/GiftShopContracts/ViewModels/ImplementerViewModel.cs @@ -1,22 +1,24 @@ -using GiftShopDataModels.Models; +using GiftShopContracts.Attributes; +using GiftShopDataModels.Models; using System.ComponentModel; namespace GiftShopContracts.ViewModels { public class ImplementerViewModel : IImplementerModel { + [Column(visible: false)] public int Id { get; set; } - [DisplayName("ФИО исполнителя")] + [Column("ФИО исполнителя", gridViewAutoSize: GridViewAutoSize.Fill, isUseAutoSize: true)] public string ImplementerFIO { get; set; } = string.Empty; - [DisplayName("Пароль")] + [Column("Пароль", width: 150)] public string Password { get; set; } = string.Empty; - [DisplayName("Стаж работы")] + [Column("Стаж работы", gridViewAutoSize: GridViewAutoSize.AllCells, isUseAutoSize: true)] public int WorkExperience { get; set; } - [DisplayName("Квалификация")] + [Column("Квалификация", gridViewAutoSize: GridViewAutoSize.AllCells, isUseAutoSize: true)] public int Qualification { get; set; } } } diff --git a/GiftShop/GiftShopContracts/ViewModels/MessageInfoViewModel.cs b/GiftShop/GiftShopContracts/ViewModels/MessageInfoViewModel.cs index 56547bc..130cb76 100644 --- a/GiftShop/GiftShopContracts/ViewModels/MessageInfoViewModel.cs +++ b/GiftShop/GiftShopContracts/ViewModels/MessageInfoViewModel.cs @@ -1,24 +1,30 @@ -using GiftShopDataModels.Models; +using GiftShopContracts.Attributes; +using GiftShopDataModels.Models; using System.ComponentModel; namespace GiftShopContracts.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("Имя отправителя", gridViewAutoSize: GridViewAutoSize.DisplayedCells, isUseAutoSize: true)] public string SenderName { get; set; } = string.Empty; - [DisplayName("Дата отправления")] + [Column("Дата отправления", width: 100)] public DateTime DateDelivery { get; set; } - [DisplayName("Тема")] + [Column("Тема", width: 150)] public string Subject { get; set; } = string.Empty; - [DisplayName("Содержание")] + [Column("Содержание", gridViewAutoSize: GridViewAutoSize.Fill, isUseAutoSize: true)] public string Body { get; set; } = string.Empty; + + [Column(visible: false)] + public int Id => throw new NotImplementedException(); } } diff --git a/GiftShop/GiftShopContracts/ViewModels/OrderViewModel.cs b/GiftShop/GiftShopContracts/ViewModels/OrderViewModel.cs index a0fee94..21da9d7 100644 --- a/GiftShop/GiftShopContracts/ViewModels/OrderViewModel.cs +++ b/GiftShop/GiftShopContracts/ViewModels/OrderViewModel.cs @@ -1,4 +1,5 @@ -using GiftShopDataModels.Enums; +using GiftShopContracts.Attributes; +using GiftShopDataModels.Enums; using GiftShopDataModels.Models; using System.ComponentModel; @@ -6,37 +7,40 @@ namespace GiftShopContracts.ViewModels { public class OrderViewModel : IOrderModel { - [DisplayName("Номер")] - public int Id { get; set; } - - public int GiftId { get; set; } + [Column(visible: false)] + public int GiftId { get; set; } + [Column(visible: false)] public int ClientId { get; set; } + [Column(visible: false)] public int? ImplementerId { get; set; } - [DisplayName("Изделие")] - public string GiftName { get; set; } = string.Empty; + [Column("Номер", gridViewAutoSize: GridViewAutoSize.AllCells, isUseAutoSize: true)] + public int Id { get; set; } - [DisplayName("ФИО исполнителя")] + [Column("ФИО исполнителя", gridViewAutoSize: GridViewAutoSize.Fill, isUseAutoSize: true)] public string ImplementerFIO { get; set; } = string.Empty; - [DisplayName("Клиент")] + [Column("Название изделия", gridViewAutoSize: GridViewAutoSize.AllCells, isUseAutoSize: true)] + public string GiftName { get; set; } = string.Empty; + + [Column("ФИО клиента", gridViewAutoSize: GridViewAutoSize.Fill, isUseAutoSize: true)] public string ClientFIO { get; set; } = string.Empty; - [DisplayName("Количество")] - public int Count { get; set; } + [Column("Количество", gridViewAutoSize: GridViewAutoSize.AllCells, isUseAutoSize: true)] + public int Count { get; set; } - [DisplayName("Сумма")] - public double Sum { get; set; } + [Column("Сумма", gridViewAutoSize: GridViewAutoSize.AllCells, isUseAutoSize: true)] + public double Sum { get; set; } - [DisplayName("Статус")] - public OrderStatus Status { get; set; } = OrderStatus.Неизвестен; + [Column("Статус", gridViewAutoSize: GridViewAutoSize.AllCells, isUseAutoSize: true)] + public OrderStatus Status { get; set; } = OrderStatus.Неизвестен; - [DisplayName("Дата создания")] - public DateTime DateCreate { get; set; } = DateTime.Now; + [Column("Дата создания", width: 100)] + public DateTime DateCreate { get; set; } = DateTime.Now; - [DisplayName("Дата выполнения")] - public DateTime? DateImplement { get; set; } - } + [Column("Дата выполнения", width: 100)] + public DateTime? DateImplement { get; set; } + } } diff --git a/GiftShop/GiftShopDataModels/Models/IMessageInfoModel.cs b/GiftShop/GiftShopDataModels/Models/IMessageInfoModel.cs index 06e4789..c386147 100644 --- a/GiftShop/GiftShopDataModels/Models/IMessageInfoModel.cs +++ b/GiftShop/GiftShopDataModels/Models/IMessageInfoModel.cs @@ -1,6 +1,6 @@ namespace GiftShopDataModels.Models { - public interface IMessageInfoModel + public interface IMessageInfoModel : IId { string MessageId { get; } diff --git a/GiftShop/GiftShopDatabaseImplement/DatabaseImplementationExtension.cs b/GiftShop/GiftShopDatabaseImplement/DatabaseImplementationExtension.cs new file mode 100644 index 0000000..9a34f10 --- /dev/null +++ b/GiftShop/GiftShopDatabaseImplement/DatabaseImplementationExtension.cs @@ -0,0 +1,23 @@ +using GiftShopContracts.DI; +using GiftShopContracts.StoragesContracts; +using GiftShopDatabaseImplement.Implements; + +namespace GiftShopDatabaseImplement +{ + 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/GiftShop/GiftShopDatabaseImplement/GiftShopDatabaseImplement.csproj b/GiftShop/GiftShopDatabaseImplement/GiftShopDatabaseImplement.csproj index 81ac990..f232822 100644 --- a/GiftShop/GiftShopDatabaseImplement/GiftShopDatabaseImplement.csproj +++ b/GiftShop/GiftShopDatabaseImplement/GiftShopDatabaseImplement.csproj @@ -20,4 +20,8 @@ + + + + diff --git a/GiftShop/GiftShopDatabaseImplement/Implements/BackUpInfo.cs b/GiftShop/GiftShopDatabaseImplement/Implements/BackUpInfo.cs new file mode 100644 index 0000000..d0d8ecc --- /dev/null +++ b/GiftShop/GiftShopDatabaseImplement/Implements/BackUpInfo.cs @@ -0,0 +1,29 @@ +using GiftShopContracts.StoragesContracts; + +namespace GiftShopDatabaseImplement.Implements +{ + public class BackUpInfo : IBackUpInfo + { + public List? GetList() where T : class, new() + { + using var context = new GiftShopDatabase(); + 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; + } + } + +} diff --git a/GiftShop/GiftShopDatabaseImplement/Models/Client.cs b/GiftShop/GiftShopDatabaseImplement/Models/Client.cs index 41f4d04..3a9f7a4 100644 --- a/GiftShop/GiftShopDatabaseImplement/Models/Client.cs +++ b/GiftShop/GiftShopDatabaseImplement/Models/Client.cs @@ -3,17 +3,23 @@ using GiftShopContracts.ViewModels; using GiftShopDataModels.Models; using System.ComponentModel.DataAnnotations.Schema; using System.ComponentModel.DataAnnotations; +using System.Runtime.Serialization; namespace GiftShopDatabaseImplement.Models { + [DataContract] public class Client : IClientModel { + [DataMember] public int Id { get; private set; } [Required] + [DataMember] public string ClientFIO { get; set; } = string.Empty; [Required] + [DataMember] public string Email { get; set; } = string.Empty; [Required] + [DataMember] public string Password { get; set; } = string.Empty; [ForeignKey("ClientId")] diff --git a/GiftShop/GiftShopDatabaseImplement/Models/Component.cs b/GiftShop/GiftShopDatabaseImplement/Models/Component.cs index 20022c7..9e21c4c 100644 --- a/GiftShop/GiftShopDatabaseImplement/Models/Component.cs +++ b/GiftShop/GiftShopDatabaseImplement/Models/Component.cs @@ -3,18 +3,23 @@ using System.ComponentModel.DataAnnotations.Schema; using System.ComponentModel.DataAnnotations; using GiftShopContracts.ViewModels; using GiftShopContracts.BindingModels; +using System.Runtime.Serialization; namespace GiftShopDatabaseImplement.Models { - public class Component : IComponentModel + [DataContract] + public class Component : IComponentModel { - public int Id { get; private set; } + [DataMember] + public int Id { get; private set; } [Required] - public string ComponentName { get; private set; } = string.Empty; + [DataMember] + public string ComponentName { get; private set; } = string.Empty; [Required] - public double Cost { get; set; } + [DataMember] + public double Cost { get; set; } [ForeignKey("ComponentId")] public virtual List GiftComponents { get; set; } = new(); diff --git a/GiftShop/GiftShopDatabaseImplement/Models/Gift.cs b/GiftShop/GiftShopDatabaseImplement/Models/Gift.cs index 388cf2f..fcf0f67 100644 --- a/GiftShop/GiftShopDatabaseImplement/Models/Gift.cs +++ b/GiftShop/GiftShopDatabaseImplement/Models/Gift.cs @@ -3,23 +3,29 @@ using System.ComponentModel.DataAnnotations.Schema; using System.ComponentModel.DataAnnotations; using GiftShopContracts.BindingModels; using GiftShopContracts.ViewModels; +using System.Runtime.Serialization; namespace GiftShopDatabaseImplement.Models { - public class Gift : IGiftModel + [DataContract] + public class Gift : IGiftModel { - public int Id { get; set; } + [DataMember] + public int Id { get; set; } [Required] - public string GiftName { get; set; } = string.Empty; + [DataMember] + public string GiftName { get; set; } = string.Empty; [Required] - public double Price { get; set; } + [DataMember] + public double Price { get; set; } private Dictionary? _giftComponents = null; [NotMapped] - public Dictionary GiftComponents + [DataMember] + public Dictionary GiftComponents { get { diff --git a/GiftShop/GiftShopDatabaseImplement/Models/Implementer.cs b/GiftShop/GiftShopDatabaseImplement/Models/Implementer.cs index f4ac6a2..f5a8ae7 100644 --- a/GiftShop/GiftShopDatabaseImplement/Models/Implementer.cs +++ b/GiftShop/GiftShopDatabaseImplement/Models/Implementer.cs @@ -3,23 +3,30 @@ using GiftShopContracts.ViewModels; using GiftShopDataModels.Models; using System.ComponentModel.DataAnnotations.Schema; using System.ComponentModel.DataAnnotations; +using System.Runtime.Serialization; namespace GiftShopDatabaseImplement.Models { + [DataContract] public class Implementer : IImplementerModel { [Required] + [DataMember] public string ImplementerFIO { get; private set; } = string.Empty; [Required] + [DataMember] public string Password { get; private set; } = string.Empty; [Required] + [DataMember] public int WorkExperience { get; private set; } [Required] + [DataMember] public int Qualification { get; private set; } + [DataMember] public int Id { get; private set; } [ForeignKey("ImplementerId")] diff --git a/GiftShop/GiftShopDatabaseImplement/Models/Message.cs b/GiftShop/GiftShopDatabaseImplement/Models/Message.cs index c02da99..a2059e5 100644 --- a/GiftShop/GiftShopDatabaseImplement/Models/Message.cs +++ b/GiftShop/GiftShopDatabaseImplement/Models/Message.cs @@ -2,25 +2,40 @@ using GiftShopContracts.ViewModels; using GiftShopDataModels.Models; using System.ComponentModel.DataAnnotations; +using System.Runtime.Serialization; namespace GiftShopDatabaseImplement.Models { + [DataContract] public class Message : IMessageInfoModel { [Key] + [DataMember] public string MessageId { get; private set; } = string.Empty; + [DataMember] public int? ClientId { get; private set; } + [Required] + [DataMember] public string SenderName { get; private set; } = string.Empty; + [Required] + [DataMember] public DateTime DateDelivery { get; private set; } = DateTime.Now; + [Required] + [DataMember] public string Subject { get; private set; } = string.Empty; + [Required] + [DataMember] public string Body { get; private set; } = string.Empty; public Client? Client { get; private set; } + + public int Id => throw new NotImplementedException(); + public static Message? Create(MessageInfoBindingModel model) { if (model == null) diff --git a/GiftShop/GiftShopDatabaseImplement/Models/Order.cs b/GiftShop/GiftShopDatabaseImplement/Models/Order.cs index dfcec2c..2fd2bf2 100644 --- a/GiftShop/GiftShopDatabaseImplement/Models/Order.cs +++ b/GiftShop/GiftShopDatabaseImplement/Models/Order.cs @@ -3,35 +3,47 @@ using GiftShopContracts.ViewModels; using GiftShopDataModels.Enums; using GiftShopDataModels.Models; using System.ComponentModel.DataAnnotations; +using System.Runtime.Serialization; namespace GiftShopDatabaseImplement.Models { - public class Order : IOrderModel + [DataContract] + public class Order : IOrderModel { - public int Id { get; private set; } + [DataMember] + public int Id { get; private set; } - public int GiftId { get; private set; } + [DataMember] + public int GiftId { get; private set; } [Required] + [DataMember] public int ClientId { get; set; } + [DataMember] public int? ImplementerId { get; private set; } + [DataMember] public string GiftName { get; private set; } = string.Empty; - [Required] + [DataMember] + [Required] public int Count { get; private set; } - [Required] + [DataMember] + [Required] public double Sum { get; private set; } - [Required] + [DataMember] + [Required] public OrderStatus Status { get; private set; } = OrderStatus.Неизвестен; - [Required] + [DataMember] + [Required] public DateTime DateCreate { get; private set; } = DateTime.Now; - public DateTime? DateImplement { get; private set; } + [DataMember] + public DateTime? DateImplement { get; private set; } public virtual Gift Gift { get; set; } diff --git a/GiftShop/GiftShopFileImplement/FileImplementationExtension.cs b/GiftShop/GiftShopFileImplement/FileImplementationExtension.cs new file mode 100644 index 0000000..48c4d2d --- /dev/null +++ b/GiftShop/GiftShopFileImplement/FileImplementationExtension.cs @@ -0,0 +1,22 @@ +using GiftShopContracts.DI; +using GiftShopContracts.StoragesContracts; +using GiftShopFileImplement.Implements; +using System; +namespace GiftShopFileImplement +{ + 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/GiftShop/GiftShopFileImplement/GiftShopFileImplement.csproj b/GiftShop/GiftShopFileImplement/GiftShopFileImplement.csproj index ec87bae..03b19f5 100644 --- a/GiftShop/GiftShopFileImplement/GiftShopFileImplement.csproj +++ b/GiftShop/GiftShopFileImplement/GiftShopFileImplement.csproj @@ -6,9 +6,18 @@ enable + + + + + + + + + diff --git a/GiftShop/GiftShopFileImplement/Implements/BackUpInfo.cs b/GiftShop/GiftShopFileImplement/Implements/BackUpInfo.cs new file mode 100644 index 0000000..a1d2384 --- /dev/null +++ b/GiftShop/GiftShopFileImplement/Implements/BackUpInfo.cs @@ -0,0 +1,32 @@ +using GiftShopContracts.StoragesContracts; + +namespace GiftShopFileImplement.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; + } + } +} diff --git a/GiftShop/GiftShopFileImplement/Models/Client.cs b/GiftShop/GiftShopFileImplement/Models/Client.cs index 6fa2c4a..74e1be9 100644 --- a/GiftShop/GiftShopFileImplement/Models/Client.cs +++ b/GiftShop/GiftShopFileImplement/Models/Client.cs @@ -1,19 +1,25 @@ using GiftShopContracts.BindingModels; using GiftShopContracts.ViewModels; using GiftShopDataModels.Models; +using System.Runtime.Serialization; using System.Xml.Linq; namespace GiftShopFileImplement.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) { diff --git a/GiftShop/GiftShopFileImplement/Models/Component.cs b/GiftShop/GiftShopFileImplement/Models/Component.cs index 7197228..b5fa464 100644 --- a/GiftShop/GiftShopFileImplement/Models/Component.cs +++ b/GiftShop/GiftShopFileImplement/Models/Component.cs @@ -1,17 +1,22 @@ using GiftShopContracts.BindingModels; using GiftShopContracts.ViewModels; using GiftShopDataModels.Models; +using System.Runtime.Serialization; using System.Xml.Linq; namespace GiftShopFileImplement.Models { - internal class Component : IComponentModel + [DataContract] + public class Component : IComponentModel { - public int Id { get; private set; } - - public string ComponentName { get; private set; } = string.Empty; + [DataMember] + public int Id { get; private set; } - public double Cost { get; 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/GiftShop/GiftShopFileImplement/Models/Gift.cs b/GiftShop/GiftShopFileImplement/Models/Gift.cs index 34f3373..20a0910 100644 --- a/GiftShop/GiftShopFileImplement/Models/Gift.cs +++ b/GiftShop/GiftShopFileImplement/Models/Gift.cs @@ -1,23 +1,29 @@ using GiftShopContracts.BindingModels; using GiftShopContracts.ViewModels; using GiftShopDataModels.Models; +using System.Runtime.Serialization; using System.Xml.Linq; namespace GiftShopFileImplement.Models { - internal class Gift : IGiftModel + [DataContract] + public class Gift : IGiftModel { - public int Id { get; private set; } + [DataMember] + public int Id { get; private set; } - public string GiftName { get; private set; } = string.Empty; + [DataMember] + public string GiftName { get; private set; } = string.Empty; - public double Price { get; private set; } + [DataMember] + public double Price { get; private set; } public Dictionary Components { get; private set; } = new(); private Dictionary? _giftComponents = null; - public Dictionary GiftComponents + [DataMember] + public Dictionary GiftComponents { get { diff --git a/GiftShop/GiftShopFileImplement/Models/Implementer.cs b/GiftShop/GiftShopFileImplement/Models/Implementer.cs index 64cdca2..6451652 100644 --- a/GiftShop/GiftShopFileImplement/Models/Implementer.cs +++ b/GiftShop/GiftShopFileImplement/Models/Implementer.cs @@ -1,20 +1,27 @@ using GiftShopContracts.BindingModels; using GiftShopContracts.ViewModels; using GiftShopDataModels.Models; +using System.Runtime.Serialization; using System.Xml.Linq; namespace GiftShopFileImplement.Models { + [DataContract] public class Implementer : IImplementerModel { + [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; } + [DataMember] public int Id { get; private set; } public static Implementer? Create(XElement element) diff --git a/GiftShop/GiftShopFileImplement/Models/Message.cs b/GiftShop/GiftShopFileImplement/Models/Message.cs index f45793b..3fac815 100644 --- a/GiftShop/GiftShopFileImplement/Models/Message.cs +++ b/GiftShop/GiftShopFileImplement/Models/Message.cs @@ -1,22 +1,30 @@ using GiftShopContracts.BindingModels; using GiftShopContracts.ViewModels; using GiftShopDataModels.Models; +using System.Runtime.Serialization; using System.Xml.Linq; namespace GiftShopFileImplement.Models { + [DataContract] public class Message : IMessageInfoModel { + [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) { @@ -70,5 +78,6 @@ namespace GiftShopFileImplement.Models new XAttribute("SenderName", SenderName), new XAttribute("DateDelivery", DateDelivery) ); + public int Id => throw new NotImplementedException(); } } diff --git a/GiftShop/GiftShopFileImplement/Models/Order.cs b/GiftShop/GiftShopFileImplement/Models/Order.cs index e2c5acf..5f6cba7 100644 --- a/GiftShop/GiftShopFileImplement/Models/Order.cs +++ b/GiftShop/GiftShopFileImplement/Models/Order.cs @@ -2,31 +2,43 @@ using GiftShopContracts.ViewModels; using GiftShopDataModels.Enums; using GiftShopDataModels.Models; +using System.Runtime.Serialization; using System.Xml.Linq; namespace GiftShopFileImplement.Models { - internal class Order : IOrderModel + [DataContract] + public class Order : IOrderModel { - public int GiftId { get; private set; } + [DataMember] + public int GiftId { get; private set; } + [DataMember] public int? ImplementerId { get; set; } + [DataMember] public int ClientId { get; private set; } + [DataMember] public string GiftName { get; private set; } = string.Empty; + [DataMember] public int Count { get; private set; } - public double Sum { get; private set; } + [DataMember] + public double Sum { get; private set; } - public OrderStatus Status { get; private set; } = OrderStatus.Неизвестен; + [DataMember] + public OrderStatus Status { get; private set; } = OrderStatus.Неизвестен; - public DateTime DateCreate { get; private set; } = DateTime.Now; + [DataMember] + public DateTime DateCreate { get; private set; } = DateTime.Now; - public DateTime? DateImplement { get; private set; } + [DataMember] + public DateTime? DateImplement { get; private set; } - public int Id { get; private set; } + [DataMember] + public int Id { get; private set; } public static Order? Create(OrderBindingModel? model) { @@ -59,19 +71,23 @@ namespace GiftShopFileImplement.Models { Id = Convert.ToInt32(element.Attribute("Id")!.Value), GiftId = Convert.ToInt32(element.Element("GiftId")!.Value), - GiftName = element.Element("GiftName")!.Value, + ClientId = Convert.ToInt32(element.Element("ClientId")!.Value), Count = Convert.ToInt32(element.Element("Count")!.Value), Sum = Convert.ToDouble(element.Element("Sum")!.Value), - ImplementerId = Convert.ToInt32(element.Element("ImplementerId")!.Value), - ClientId = Convert.ToInt32(element.Element("ClientId")!.Value), - Status = (OrderStatus)Enum.Parse(typeof(OrderStatus), element.Element("Status")!.Value), - DateCreate = DateTime.ParseExact(element.Element("DateCreate")!.Value, "G", null) + Status = (OrderStatus)Convert.ToInt32(element.Element("Status")!.Value), + DateCreate = DateTime.ParseExact(element.Element("DateCreate")!.Value, "G", null), }; DateTime.TryParse(element.Element("DateImplement")!.Value, out DateTime dateImpl); order.DateImplement = dateImpl; - return order; + if (!Enum.TryParse(element.Element("Status")!.Value, out OrderStatus status)) + { + return null; + } + order.Status = status; + + return order; } public void Update(OrderBindingModel? model) diff --git a/GiftShop/GiftShopListImplement/GiftShopListImplement.csproj b/GiftShop/GiftShopListImplement/GiftShopListImplement.csproj index ec87bae..1586085 100644 --- a/GiftShop/GiftShopListImplement/GiftShopListImplement.csproj +++ b/GiftShop/GiftShopListImplement/GiftShopListImplement.csproj @@ -8,7 +8,12 @@ + + + + + diff --git a/GiftShop/GiftShopListImplement/Implements/BackUpInfo.cs b/GiftShop/GiftShopListImplement/Implements/BackUpInfo.cs new file mode 100644 index 0000000..0483ee6 --- /dev/null +++ b/GiftShop/GiftShopListImplement/Implements/BackUpInfo.cs @@ -0,0 +1,17 @@ +using GiftShopContracts.StoragesContracts; + +namespace GiftShopListImplement.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/GiftShop/GiftShopListImplement/ListImplementationExtension.cs b/GiftShop/GiftShopListImplement/ListImplementationExtension.cs new file mode 100644 index 0000000..94b7e3f --- /dev/null +++ b/GiftShop/GiftShopListImplement/ListImplementationExtension.cs @@ -0,0 +1,23 @@ +using GiftShopContracts.DI; +using GiftShopContracts.StoragesContracts; +using GiftShopListImplement.Implements; + +namespace GiftShopListImplement +{ + 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(); + } + } + +} diff --git a/GiftShop/GiftShopListImplement/Models/Message.cs b/GiftShop/GiftShopListImplement/Models/Message.cs index a5e90d1..5382111 100644 --- a/GiftShop/GiftShopListImplement/Models/Message.cs +++ b/GiftShop/GiftShopListImplement/Models/Message.cs @@ -44,5 +44,7 @@ namespace GiftShopListImplement.Models ClientId = ClientId, MessageId = MessageId }; + + public int Id => throw new NotImplementedException(); } } diff --git a/GiftShop/GiftShopView/DataGridViewExtension.cs b/GiftShop/GiftShopView/DataGridViewExtension.cs new file mode 100644 index 0000000..72ff91d --- /dev/null +++ b/GiftShop/GiftShopView/DataGridViewExtension.cs @@ -0,0 +1,47 @@ +using GiftShopContracts.Attributes; + +namespace GiftShopView +{ + 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; + } + } + } + } + } +} diff --git a/GiftShop/GiftShopView/FormClients.cs b/GiftShop/GiftShopView/FormClients.cs index a45eb6e..bda09e4 100644 --- a/GiftShop/GiftShopView/FormClients.cs +++ b/GiftShop/GiftShopView/FormClients.cs @@ -24,23 +24,18 @@ namespace GiftShopView private void LoadData() { - 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("Загрузка клиентов"); - } - catch (Exception ex) - { - _logger.LogError(ex, "Ошибка загрузки клиентов"); - MessageBox.Show(ex.Message, "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error); - } - } + try + { + dataGridView.FillandConfigGrid(_logic.ReadList(null)); + _logger.LogInformation("Загрузка клиентов"); + + } + catch (Exception ex) + { + _logger.LogError(ex, "Ошибка загрузки клиентов"); + MessageBox.Show(ex.Message, "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error); + } + } private void ButtonDel_Click(object sender, EventArgs e) { diff --git a/GiftShop/GiftShopView/FormComponents.cs b/GiftShop/GiftShopView/FormComponents.cs index 9e1d88e..f5ac6dd 100644 --- a/GiftShop/GiftShopView/FormComponents.cs +++ b/GiftShop/GiftShopView/FormComponents.cs @@ -1,5 +1,6 @@ using GiftShopContracts.BindingModels; using GiftShopContracts.BusinessLogicsContracts; +using GiftShopContracts.DI; using Microsoft.Extensions.Logging; namespace GiftShopView @@ -24,56 +25,40 @@ namespace GiftShopView private void LoadData() { - 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("Загрузка компонентов"); - } - catch (Exception ex) - { - _logger.LogError(ex, "Ошибка загрузки компонентов"); - MessageBox.Show(ex.Message, "Ошибка", MessageBoxButtons.OK, - MessageBoxIcon.Error); - } - } + try + { + dataGridView.FillandConfigGrid(_logic.ReadList(null)); + _logger.LogInformation("Загрузка компонентов"); + } + catch (Exception ex) + { + _logger.LogError(ex, "Ошибка загрузки компонентов"); + MessageBox.Show(ex.Message, "Ошибка", MessageBoxButtons.OK, + MessageBoxIcon.Error); + } + } private void ButtonAdd_Click(object sender, EventArgs e) { - var service = - Program.ServiceProvider?.GetService(typeof(FormComponent)); - if (service is FormComponent form) - { - if (form.ShowDialog() == DialogResult.OK) - { - LoadData(); - } - } - } + var form = DependencyManager.Instance.Resolve(); + if (form.ShowDialog() == DialogResult.OK) + { + LoadData(); + } + } private void ButtonUpd_Click(object sender, EventArgs e) { - if (dataGridView.SelectedRows.Count == 1) - { - var service = - Program.ServiceProvider?.GetService(typeof(FormComponent)); - if (service is FormComponent form) - { - form.Id = - Convert.ToInt32(dataGridView.SelectedRows[0].Cells["Id"].Value); - if (form.ShowDialog() == DialogResult.OK) - { - LoadData(); - } - } - } - } + if (dataGridView.SelectedRows.Count == 1) + { + var form = DependencyManager.Instance.Resolve(); + form.Id = Convert.ToInt32(dataGridView.SelectedRows[0].Cells["Id"].Value); + if (form.ShowDialog() == DialogResult.OK) + { + LoadData(); + } + } + } private void ButtonDel_Click(object sender, EventArgs e) { diff --git a/GiftShop/GiftShopView/FormGift.cs b/GiftShop/GiftShopView/FormGift.cs index 3a65c6f..2215c88 100644 --- a/GiftShop/GiftShopView/FormGift.cs +++ b/GiftShop/GiftShopView/FormGift.cs @@ -1,5 +1,6 @@ using GiftShopContracts.BindingModels; using GiftShopContracts.BusinessLogicsContracts; +using GiftShopContracts.DI; using GiftShopContracts.SearchModels; using GiftShopDataModels.Models; using Microsoft.Extensions.Logging; @@ -79,54 +80,49 @@ namespace GiftShopView private void ButtonAdd_Click(object sender, EventArgs e) { - var service = Program.ServiceProvider?.GetService(typeof(FormGiftComponent)); - if (service is FormGiftComponent form) - { - if (form.ShowDialog() == DialogResult.OK) - { - if (form.ComponentModel == null) - { - return; - } - _logger.LogInformation("Добавление нового компонента:{ ComponentName} - { Count}", form.ComponentModel.ComponentName, form.Count); - if (_giftComponents.ContainsKey(form.Id)) - { - _giftComponents[form.Id] = (form.ComponentModel, form.Count); - } - else - { - _giftComponents.Add(form.Id, (form.ComponentModel, form.Count)); - } - LoadData(); - } - } - } + var form = DependencyManager.Instance.Resolve(); + + if (form.ShowDialog() == DialogResult.OK) + { + if (form.ComponentModel == null) + { + return; + } + _logger.LogInformation("Добавление нового компонента:{ ComponentName} - { Count}", form.ComponentModel.ComponentName, form.Count); + if (_giftComponents.ContainsKey(form.Id)) + { + _giftComponents[form.Id] = (form.ComponentModel, form.Count); + } + else + { + _giftComponents.Add(form.Id, (form.ComponentModel, form.Count)); + } + LoadData(); + } + } private void ButtonUpd_Click(object sender, EventArgs e) { - if (dataGridView.SelectedRows.Count == 1) - { - var service = - Program.ServiceProvider?.GetService(typeof(FormGiftComponent)); - if (service is FormGiftComponent form) - { - int id = - Convert.ToInt32(dataGridView.SelectedRows[0].Cells[0].Value); - form.Id = id; - form.Count = _giftComponents[id].Item2; - if (form.ShowDialog() == DialogResult.OK) - { - if (form.ComponentModel == null) - { - return; - } - _logger.LogInformation("Изменение компонента:{ ComponentName} - { Count}", form.ComponentModel.ComponentName, form.Count); - _giftComponents[form.Id] = (form.ComponentModel, form.Count); - LoadData(); - } - } - } - } + if (dataGridView.SelectedRows.Count == 1) + { + var form = DependencyManager.Instance.Resolve(); + + int id = Convert.ToInt32(dataGridView.SelectedRows[0].Cells[0].Value); + form.Id = id; + form.Count = _giftComponents[id].Item2; + if (form.ShowDialog() == DialogResult.OK) + { + if (form.ComponentModel == null) + { + return; + } + _logger.LogInformation("Изменение компонента:{ ComponentName} - { Count}", form.ComponentModel.ComponentName, form.Count); + _giftComponents[form.Id] = (form.ComponentModel, form.Count); + LoadData(); + } + + } + } private void ButtonDel_Click(object sender, EventArgs e) { diff --git a/GiftShop/GiftShopView/FormGifts.cs b/GiftShop/GiftShopView/FormGifts.cs index 5067af1..e4525ed 100644 --- a/GiftShop/GiftShopView/FormGifts.cs +++ b/GiftShop/GiftShopView/FormGifts.cs @@ -1,5 +1,6 @@ using GiftShopContracts.BindingModels; using GiftShopContracts.BusinessLogicsContracts; +using GiftShopContracts.DI; using Microsoft.Extensions.Logging; namespace GiftShopView @@ -24,53 +25,43 @@ namespace GiftShopView private void LoadData() { - try - { - var list = _logic.ReadList(null); - if (list != null) - { - dataGridView.DataSource = list; - dataGridView.Columns["Id"].Visible = false; - dataGridView.Columns["GiftName"].AutoSizeMode = DataGridViewAutoSizeColumnMode.Fill; - dataGridView.Columns["GiftComponents"].Visible = false; - } - _logger.LogInformation("Загрузка изделий"); + try + { + dataGridView.FillandConfigGrid(_logic.ReadList(null)); + _logger.LogInformation("Загрузка изделий"); - } - catch (Exception ex) - { - _logger.LogError(ex, "Ошибка загрузки изделий"); - MessageBox.Show(ex.Message, "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error); - } - } + } + catch (Exception ex) + { + _logger.LogError(ex, "Ошибка загрузки изделий"); + MessageBox.Show(ex.Message, "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error); + } + } private void ButtonAdd_Click(object sender, EventArgs e) { - var service = Program.ServiceProvider?.GetService(typeof(FormGift)); - if (service is FormGift form) - { - if (form.ShowDialog() == DialogResult.OK) - { - LoadData(); - } - } - } + var form = DependencyManager.Instance.Resolve(); + + if (form.ShowDialog() == DialogResult.OK) + { + LoadData(); + } + } private void ButtonUpd_Click(object sender, EventArgs e) { - if (dataGridView.SelectedRows.Count == 1) - { - var service = Program.ServiceProvider?.GetService(typeof(FormGift)); - if (service is FormGift form) - { - form.Id = Convert.ToInt32(dataGridView.SelectedRows[0].Cells["Id"].Value); - if (form.ShowDialog() == DialogResult.OK) - { - LoadData(); - } - } - } - } + if (dataGridView.SelectedRows.Count == 1) + { + var form = DependencyManager.Instance.Resolve(); + + form.Id = Convert.ToInt32(dataGridView.SelectedRows[0].Cells["Id"].Value); + if (form.ShowDialog() == DialogResult.OK) + { + LoadData(); + } + + } + } private void ButtonDel_Click(object sender, EventArgs e) { diff --git a/GiftShop/GiftShopView/FormImplementers.cs b/GiftShop/GiftShopView/FormImplementers.cs index fc88be4..9e9c8e1 100644 --- a/GiftShop/GiftShopView/FormImplementers.cs +++ b/GiftShop/GiftShopView/FormImplementers.cs @@ -1,5 +1,6 @@ using GiftShopContracts.BindingModels; using GiftShopContracts.BusinessLogicsContracts; +using GiftShopContracts.DI; using Microsoft.Extensions.Logging; namespace GiftShopView @@ -17,14 +18,11 @@ namespace GiftShopView private void AddButton_Click(object sender, EventArgs e) { - var service = Program.ServiceProvider?.GetService(typeof(FormImplementer)); + var form = DependencyManager.Instance.Resolve(); - if (service is FormImplementer form) + if (form.ShowDialog() == DialogResult.OK) { - if (form.ShowDialog() == DialogResult.OK) - { - LoadData(); - } + LoadData(); } } @@ -32,15 +30,13 @@ namespace GiftShopView { 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(); } + } } @@ -89,15 +85,7 @@ namespace GiftShopView { 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("Загрузка исполнителей"); } diff --git a/GiftShop/GiftShopView/FormMails.cs b/GiftShop/GiftShopView/FormMails.cs index 9c7a2e8..bf1eac7 100644 --- a/GiftShop/GiftShopView/FormMails.cs +++ b/GiftShop/GiftShopView/FormMails.cs @@ -17,25 +17,18 @@ namespace GiftShopView private void LoadData() { - 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; - } - _logger.LogInformation("Загрузка писем"); - } - catch (Exception ex) - { - _logger.LogError(ex, "Ошибка загрузки писем"); - MessageBox.Show(ex.Message, "Ошибка", MessageBoxButtons.OK, - MessageBoxIcon.Error); - } - } + try + { + dataGridView.FillandConfigGrid(_logic.ReadList(null)); + _logger.LogInformation("Загрузка писем"); + } + catch (Exception ex) + { + _logger.LogError(ex, "Ошибка загрузки писем"); + MessageBox.Show(ex.Message, "Ошибка", MessageBoxButtons.OK, + MessageBoxIcon.Error); + } + } private void FormMails_Load(object sender, EventArgs e) { diff --git a/GiftShop/GiftShopView/FormMain.Designer.cs b/GiftShop/GiftShopView/FormMain.Designer.cs index a874af5..6c1431c 100644 --- a/GiftShop/GiftShopView/FormMain.Designer.cs +++ b/GiftShop/GiftShopView/FormMain.Designer.cs @@ -39,11 +39,12 @@ компонентыПоИзделиямToolStripMenuItem = new ToolStripMenuItem(); списокЗаказовToolStripMenuItem = new ToolStripMenuItem(); запускРаботToolStripMenuItem = new ToolStripMenuItem(); + письмаToolStripMenuItem = new ToolStripMenuItem(); dataGridView = new DataGridView(); buttonCreateOrder = new Button(); buttonIssuedOrder = new Button(); buttonRef = new Button(); - письмаToolStripMenuItem = new ToolStripMenuItem(); + создатьБекап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, письмаToolStripMenuItem }); + menuStrip.Items.AddRange(new ToolStripItem[] { справочникиToolStripMenuItem, отчётыToolStripMenuItem, запускРаботToolStripMenuItem, письмаToolStripMenuItem, создатьБекапToolStripMenuItem }); menuStrip.Location = new Point(0, 0); menuStrip.Name = "menuStrip"; menuStrip.Size = new Size(1367, 28); @@ -68,28 +69,28 @@ // компонентыToolStripMenuItem // компонентыToolStripMenuItem.Name = "компонентыToolStripMenuItem"; - компонентыToolStripMenuItem.Size = new Size(185, 26); + компонентыToolStripMenuItem.Size = new Size(224, 26); компонентыToolStripMenuItem.Text = "Компоненты"; компонентыToolStripMenuItem.Click += КомпонентыToolStripMenuItem_Click; // // изделияToolStripMenuItem // изделияToolStripMenuItem.Name = "изделияToolStripMenuItem"; - изделияToolStripMenuItem.Size = new Size(185, 26); + изделияToolStripMenuItem.Size = new Size(224, 26); изделияToolStripMenuItem.Text = "Изделия"; изделияToolStripMenuItem.Click += ИзделияToolStripMenuItem_Click; // // клиентыToolStripMenuItem // клиентыToolStripMenuItem.Name = "клиентыToolStripMenuItem"; - клиентыToolStripMenuItem.Size = new Size(185, 26); + клиентыToolStripMenuItem.Size = new Size(224, 26); клиентыToolStripMenuItem.Text = "Клиенты"; клиентыToolStripMenuItem.Click += ClientsToolStripMenuItem_Click; // // исполнителиToolStripMenuItem // исполнителиToolStripMenuItem.Name = "исполнителиToolStripMenuItem"; - исполнителиToolStripMenuItem.Size = new Size(185, 26); + исполнителиToolStripMenuItem.Size = new Size(224, 26); исполнителиToolStripMenuItem.Text = "Исполнители"; исполнителиToolStripMenuItem.Click += исполнителиToolStripMenuItem_Click; // @@ -128,6 +129,13 @@ запускРаботToolStripMenuItem.Text = "Запуск работ"; запускРаботToolStripMenuItem.Click += запускРаботToolStripMenuItem_Click; // + // письмаToolStripMenuItem + // + письмаToolStripMenuItem.Name = "письмаToolStripMenuItem"; + письмаToolStripMenuItem.Size = new Size(77, 24); + письмаToolStripMenuItem.Text = "Письма"; + письмаToolStripMenuItem.Click += письмаToolStripMenuItem_Click; + // // dataGridView // dataGridView.BackgroundColor = SystemColors.ControlLightLight; @@ -169,12 +177,12 @@ buttonRef.UseVisualStyleBackColor = true; buttonRef.Click += ButtonRef_Click; // - // письмаToolStripMenuItem + // создатьБекапToolStripMenuItem // - письмаToolStripMenuItem.Name = "письмаToolStripMenuItem"; - письмаToolStripMenuItem.Size = new Size(77, 24); - письмаToolStripMenuItem.Text = "Письма"; - письмаToolStripMenuItem.Click += письмаToolStripMenuItem_Click; + создатьБекапToolStripMenuItem.Name = "создатьБекапToolStripMenuItem"; + создатьБекапToolStripMenuItem.Size = new Size(123, 24); + создатьБекапToolStripMenuItem.Text = "Создать бекап"; + создатьБекапToolStripMenuItem.Click += создатьБекапToolStripMenuItem_Click; // // FormMain // @@ -215,5 +223,6 @@ private ToolStripMenuItem исполнителиToolStripMenuItem; private ToolStripMenuItem запускРаботToolStripMenuItem; private ToolStripMenuItem письмаToolStripMenuItem; + private ToolStripMenuItem создатьБекапToolStripMenuItem; } } \ No newline at end of file diff --git a/GiftShop/GiftShopView/FormMain.cs b/GiftShop/GiftShopView/FormMain.cs index 102e778..f1c28ad 100644 --- a/GiftShop/GiftShopView/FormMain.cs +++ b/GiftShop/GiftShopView/FormMain.cs @@ -1,5 +1,6 @@ using GiftShopContracts.BindingModels; using GiftShopContracts.BusinessLogicsContracts; +using GiftShopContracts.DI; using GiftShopDataModels.Enums; using Microsoft.Extensions.Logging; @@ -15,13 +16,16 @@ namespace GiftShopView 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) @@ -34,15 +38,7 @@ namespace GiftShopView _logger.LogInformation("Загрузка заказов"); try { - var list = _orderLogic.ReadList(null); - if (list != null) - { - dataGridView.DataSource = list; - dataGridView.Columns["GiftId"].Visible = false; - dataGridView.Columns["GiftName"].AutoSizeMode = DataGridViewAutoSizeColumnMode.Fill; - dataGridView.Columns["ClientId"].Visible = false; - dataGridView.Columns["ImplementerId"].Visible = false; - } + dataGridView.FillandConfigGrid(_orderLogic.ReadList(null)); _logger.LogInformation("Загрузка заказов"); } catch (Exception ex) @@ -54,30 +50,20 @@ namespace GiftShopView 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(FormGifts)); - if (service is FormGifts 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) @@ -135,55 +121,64 @@ namespace GiftShopView private void ComponentGiftsToolStripMenuItem_Click(object sender, EventArgs e) { - var service = Program.ServiceProvider?.GetService(typeof(FormReportGiftComponents)); - - if (service is FormReportGiftComponents form) - { - form.ShowDialog(); - } + var form = DependencyManager.Instance.Resolve(); + form.ShowDialog(); } private void OrdersToolStripMenuItem_Click(object sender, EventArgs e) { - var service = Program.ServiceProvider?.GetService(typeof(FormReportOrders)); - - if (service is FormReportOrders form) - { - form.ShowDialog(); - } + var form = DependencyManager.Instance.Resolve(); + form.ShowDialog(); } private void ClientsToolStripMenuItem_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) { - 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) { - _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(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 BackUpSaveBinidngModel + { + FolderName = fbd.SelectedPath + }); + MessageBox.Show("Бекап создан", "Сообщение", + MessageBoxButtons.OK, MessageBoxIcon.Information); + } + } + } + catch (Exception ex) + { + MessageBox.Show(ex.Message, "Ошибка", MessageBoxButtons.OK, + MessageBoxIcon.Error); } } } diff --git a/GiftShop/GiftShopView/GiftShopView.csproj b/GiftShop/GiftShopView/GiftShopView.csproj index 56e6506..ecd2aa7 100644 --- a/GiftShop/GiftShopView/GiftShopView.csproj +++ b/GiftShop/GiftShopView/GiftShopView.csproj @@ -26,7 +26,7 @@ - + diff --git a/GiftShop/GiftShopView/Program.cs b/GiftShop/GiftShopView/Program.cs index 504be58..0951df9 100644 --- a/GiftShop/GiftShopView/Program.cs +++ b/GiftShop/GiftShopView/Program.cs @@ -9,23 +9,21 @@ using Microsoft.Extensions.Logging; using NLog.Extensions.Logging; using GiftShopBusinessLogic.MailWorker; using GiftShopContracts.BindingModels; +using GiftShopContracts.DI; namespace GiftShopView { internal static class Program { - private static ServiceProvider? _serviceProvider; - public static ServiceProvider? ServiceProvider => _serviceProvider; - [STAThread] - static void Main() + [STAThread] + static void Main() { 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, @@ -40,55 +38,52 @@ namespace GiftShopView } catch (Exception ex) { - var logger = _serviceProvider.GetService(); + var logger = DependencyManager.Instance.Resolve(); logger?.LogError(ex, " "); } - Application.Run(_serviceProvider.GetRequiredService()); - } - - private static void ConfigureServices(ServiceCollection services) - { - services.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.AddTransient(); - services.AddTransient(); - services.AddTransient(); - services.AddSingleton(); - - 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(); + Application.Run(DependencyManager.Instance.Resolve()); } - private static void MailCheck(object obj) => ServiceProvider?.GetService()?.MailCheck(); + private static void InitDependency() + { + DependencyManager.InitDependency(); + DependencyManager.Instance.AddLogging(option => + { + option.SetMinimumLevel(LogLevel.Information); + option.AddNLog("nlog.config"); + }); + 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(true); + + 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(); + DependencyManager.Instance.RegisterType(); + } + + private static void MailCheck(object obj) => DependencyManager.Instance.Resolve()?.MailCheck(); } } \ No newline at end of file diff --git a/GiftShop/ImplementationExtensions/GiftShopContracts.dll b/GiftShop/ImplementationExtensions/GiftShopContracts.dll new file mode 100644 index 0000000..655fbea Binary files /dev/null and b/GiftShop/ImplementationExtensions/GiftShopContracts.dll differ diff --git a/GiftShop/ImplementationExtensions/GiftShopDataModels.dll b/GiftShop/ImplementationExtensions/GiftShopDataModels.dll new file mode 100644 index 0000000..d46f64d Binary files /dev/null and b/GiftShop/ImplementationExtensions/GiftShopDataModels.dll differ diff --git a/GiftShop/ImplementationExtensions/GiftShopDatabaseImplement.dll b/GiftShop/ImplementationExtensions/GiftShopDatabaseImplement.dll new file mode 100644 index 0000000..40eb044 Binary files /dev/null and b/GiftShop/ImplementationExtensions/GiftShopDatabaseImplement.dll differ diff --git a/GiftShop/ImplementationExtensions/GiftShopFileImplement.dll b/GiftShop/ImplementationExtensions/GiftShopFileImplement.dll new file mode 100644 index 0000000..6c9e873 Binary files /dev/null and b/GiftShop/ImplementationExtensions/GiftShopFileImplement.dll differ diff --git a/GiftShop/ImplementationExtensions/GiftShopListImplement.dll b/GiftShop/ImplementationExtensions/GiftShopListImplement.dll new file mode 100644 index 0000000..fb70f34 Binary files /dev/null and b/GiftShop/ImplementationExtensions/GiftShopListImplement.dll differ