diff --git a/.gitignore b/.gitignore index ca1c7a3..9c21aff 100644 --- a/.gitignore +++ b/.gitignore @@ -69,6 +69,8 @@ ScaffoldingReadMe.txt # StyleCop StyleCopReport.xml +/ProjectFlowerShop/ImplementationExtensions + # Files built by Visual Studio *_i.c *_p.c diff --git a/FlowerShopBusinessLogic/BackUpLogic.cs b/FlowerShopBusinessLogic/BackUpLogic.cs new file mode 100644 index 0000000..2e59059 --- /dev/null +++ b/FlowerShopBusinessLogic/BackUpLogic.cs @@ -0,0 +1,96 @@ +using FlowerShopContracts.BindingModels; +using FlowerShopContracts.BusinessLogicsContracts; +using FlowerShopContracts.StoragesContracts; +using FlowerShopDataModels; +using Microsoft.Extensions.Logging; +using System; +using System.Collections.Generic; +using System.IO.Compression; +using System.Linq; +using System.Reflection; +using System.Runtime.Serialization.Json; +using System.Text; +using System.Threading.Tasks; + +namespace FlowerShopBusinessLogic.BusinessLogic +{ + 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/FlowerShopContracts/Attributes/ColumnAttribute.cs b/FlowerShopContracts/Attributes/ColumnAttribute.cs new file mode 100644 index 0000000..1ca901e --- /dev/null +++ b/FlowerShopContracts/Attributes/ColumnAttribute.cs @@ -0,0 +1,27 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace FlowerShopContracts.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/FlowerShopContracts/Attributes/GridViewAutoSize.cs b/FlowerShopContracts/Attributes/GridViewAutoSize.cs new file mode 100644 index 0000000..98f4eb0 --- /dev/null +++ b/FlowerShopContracts/Attributes/GridViewAutoSize.cs @@ -0,0 +1,20 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace FlowerShopContracts.Attributes +{ + public enum GridViewAutoSize + { + NotSet = 0, + None = 1, + ColumnHeader = 2, + AllCellsExceptHeader = 4, + AllCells = 6, + DisplayedCellsExceptHeader = 8, + DisplayedCells = 10, + Fill = 16 + } +} diff --git a/FlowerShopContracts/BindingModels/BackUpSaveBindingModel.cs b/FlowerShopContracts/BindingModels/BackUpSaveBindingModel.cs new file mode 100644 index 0000000..4d12df6 --- /dev/null +++ b/FlowerShopContracts/BindingModels/BackUpSaveBindingModel.cs @@ -0,0 +1,13 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace FlowerShopContracts.BindingModels +{ + public class BackUpSaveBinidngModel + { + public string FolderName { get; set; } = string.Empty; + } +} diff --git a/FlowerShopContracts/BindingModels/MessageInfoBindingModel.cs b/FlowerShopContracts/BindingModels/MessageInfoBindingModel.cs index 8b5fd4b..d6db511 100644 --- a/FlowerShopContracts/BindingModels/MessageInfoBindingModel.cs +++ b/FlowerShopContracts/BindingModels/MessageInfoBindingModel.cs @@ -15,5 +15,6 @@ namespace FlowerShopContracts.BindingModels public string Subject { get; set; } = string.Empty; public string Body { get; set; } = string.Empty; public DateTime DateDelivery { get; set; } + public int Id => throw new NotImplementedException(); } } diff --git a/FlowerShopContracts/BusinessLogicsContracts/IBackUpLogic.cs b/FlowerShopContracts/BusinessLogicsContracts/IBackUpLogic.cs new file mode 100644 index 0000000..904dafd --- /dev/null +++ b/FlowerShopContracts/BusinessLogicsContracts/IBackUpLogic.cs @@ -0,0 +1,14 @@ +using FlowerShopContracts.BindingModels; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace FlowerShopContracts.BusinessLogicsContracts +{ + public interface IBackUpLogic + { + void CreateBackUp(BackUpSaveBinidngModel model); + } +} diff --git a/FlowerShopContracts/DI/DependancyManager.cs b/FlowerShopContracts/DI/DependancyManager.cs new file mode 100644 index 0000000..6acf583 --- /dev/null +++ b/FlowerShopContracts/DI/DependancyManager.cs @@ -0,0 +1,46 @@ +using Microsoft.Extensions.Logging; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace FlowerShopContracts.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/FlowerShopContracts/DI/IDependencyContainer.cs b/FlowerShopContracts/DI/IDependencyContainer.cs new file mode 100644 index 0000000..04ab01c --- /dev/null +++ b/FlowerShopContracts/DI/IDependencyContainer.cs @@ -0,0 +1,18 @@ +using Microsoft.Extensions.Logging; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace FlowerShopContracts.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/FlowerShopContracts/DI/IImplementationExtension.cs b/FlowerShopContracts/DI/IImplementationExtension.cs new file mode 100644 index 0000000..8a2a7ea --- /dev/null +++ b/FlowerShopContracts/DI/IImplementationExtension.cs @@ -0,0 +1,14 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace FlowerShopContracts.DI +{ + public interface IImplementationExtension + { + public int Priority { get; } + public void RegisterServices(); + } +} diff --git a/FlowerShopContracts/DI/ServiceDependencyContainer.cs b/FlowerShopContracts/DI/ServiceDependencyContainer.cs new file mode 100644 index 0000000..3ccbbb7 --- /dev/null +++ b/FlowerShopContracts/DI/ServiceDependencyContainer.cs @@ -0,0 +1,62 @@ +using Microsoft.Extensions.DependencyInjection; +using Microsoft.Extensions.Logging; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace FlowerShopContracts.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 T : class + { + if (isSingle) + { + _serviceCollection.AddSingleton(); + } + else + { + _serviceCollection.AddTransient(); + } + _serviceProvider = null; + } + + public void RegisterType(bool isSingle) where U : class, T 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/FlowerShopContracts/DI/ServiceProviderLoader.cs b/FlowerShopContracts/DI/ServiceProviderLoader.cs new file mode 100644 index 0000000..65d0476 --- /dev/null +++ b/FlowerShopContracts/DI/ServiceProviderLoader.cs @@ -0,0 +1,58 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Reflection; +using System.Text; +using System.Threading.Tasks; + +namespace FlowerShopContracts.DI +{ + public static partial class ServiceProviderLoader + { + 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/FlowerShopContracts/FlowerShopContracts.csproj b/FlowerShopContracts/FlowerShopContracts.csproj index 901b7f6..8f5b718 100644 --- a/FlowerShopContracts/FlowerShopContracts.csproj +++ b/FlowerShopContracts/FlowerShopContracts.csproj @@ -7,7 +7,8 @@ - + + diff --git a/FlowerShopContracts/StoragesContracts/IBackUpInfo.cs b/FlowerShopContracts/StoragesContracts/IBackUpInfo.cs new file mode 100644 index 0000000..87e8e34 --- /dev/null +++ b/FlowerShopContracts/StoragesContracts/IBackUpInfo.cs @@ -0,0 +1,14 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace FlowerShopContracts.StoragesContracts +{ + public interface IBackUpInfo + { + List? GetList() where T : class, new(); + Type? GetTypeByModelInterface(string modelInterfaceName); + } +} diff --git a/FlowerShopContracts/ViewModels/ClientViewModel.cs b/FlowerShopContracts/ViewModels/ClientViewModel.cs index 79577d0..5c72c27 100644 --- a/FlowerShopContracts/ViewModels/ClientViewModel.cs +++ b/FlowerShopContracts/ViewModels/ClientViewModel.cs @@ -1,4 +1,5 @@ -using FlowerShopDataModels.Models; +using FlowerShopContracts.Attributes; +using FlowerShopDataModels.Models; using System; using System.Collections.Generic; using System.ComponentModel; @@ -10,12 +11,13 @@ namespace FlowerShopContracts.ViewModels { public class ClientViewModel : IClientModel { - public int Id { get; set; } - [DisplayName("ФИО клиента")] - public string ClientFIO { get; set; } = string.Empty; - [DisplayName("Логин (эл. почта)")] - public string Email { get; set; } = string.Empty; - [DisplayName("Пароль")] - public string Password { get; set; } = string.Empty; - } + [Column(visible: false)] + public int Id { get; set; } + [Column(title: "ФИО клиента", width: 150)] + public string ClientFIO { get; set; } = string.Empty; + [Column(title: "Email клиента", gridViewAutoSize: GridViewAutoSize.Fill, isUseAutoSize: true)] + public string Email { get; set; } = string.Empty; + [Column(title: "Пароль", width: 150)] + public string Password { get; set; } = string.Empty; + } } diff --git a/FlowerShopContracts/ViewModels/ComponentViewModel.cs b/FlowerShopContracts/ViewModels/ComponentViewModel.cs index 667f0bb..ab18bc5 100644 --- a/FlowerShopContracts/ViewModels/ComponentViewModel.cs +++ b/FlowerShopContracts/ViewModels/ComponentViewModel.cs @@ -1,4 +1,5 @@ -using FlowerShopDataModels.Models; +using FlowerShopContracts.Attributes; +using FlowerShopDataModels.Models; using System; using System.Collections.Generic; using System.ComponentModel; @@ -10,10 +11,11 @@ namespace FlowerShopContracts.ViewModels { public class ComponentViewModel : IComponentModel { - public int Id { get; set; } - [DisplayName("Название компонента")] - public string ComponentName { get; set; } = string.Empty; - [DisplayName("Цена")] - public double Cost { get; set; } - } + [Column(visible: false)] + public int Id { get; set; } + [Column(title: "Название компонента", gridViewAutoSize: GridViewAutoSize.Fill, isUseAutoSize: true)] + public string ComponentName { get; set; } = string.Empty; + [Column(title: "Цена", width: 80)] + public double Cost { get; set; } + } } diff --git a/FlowerShopContracts/ViewModels/FlowerViewModel.cs b/FlowerShopContracts/ViewModels/FlowerViewModel.cs index 0010c97..75cc88e 100644 --- a/FlowerShopContracts/ViewModels/FlowerViewModel.cs +++ b/FlowerShopContracts/ViewModels/FlowerViewModel.cs @@ -1,4 +1,5 @@ -using FlowerShopDataModels.Models; +using FlowerShopContracts.Attributes; +using FlowerShopDataModels.Models; using System; using System.Collections.Generic; using System.ComponentModel; @@ -10,13 +11,15 @@ namespace FlowerShopContracts.ViewModels { public class FlowerViewModel : IFlowerModel { - public int Id { get; set; } - [DisplayName("Название изделия")] - public string FlowerName { get; set; } = string.Empty; - [DisplayName("Цена")] - public double Price { get; set; } - public Dictionary FlowerComponents - { + [Column(visible: false)] + public int Id { get; set; } + [Column(title: "Название цветка", gridViewAutoSize: GridViewAutoSize.Fill, isUseAutoSize: true)] + public string FlowerName { get; set; } = string.Empty; + [Column(title: "Цена", width: 100)] + public double Price { get; set; } + [Column(visible: false)] + public Dictionary FlowerComponents + { get; set; } = new(); diff --git a/FlowerShopContracts/ViewModels/ImplementerViewModel.cs b/FlowerShopContracts/ViewModels/ImplementerViewModel.cs index 7c43f92..518b7c5 100644 --- a/FlowerShopContracts/ViewModels/ImplementerViewModel.cs +++ b/FlowerShopContracts/ViewModels/ImplementerViewModel.cs @@ -1,4 +1,5 @@ -using FlowerShopDataModels.Models; +using FlowerShopContracts.Attributes; +using FlowerShopDataModels.Models; using System; using System.Collections.Generic; using System.ComponentModel; @@ -10,14 +11,15 @@ namespace FlowerShopContracts.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: "Стаж работы", gridViewAutoSize: GridViewAutoSize.AllCells, isUseAutoSize: true)] public int WorkExperience { get; set; } = 0; - [DisplayName("Квалификация")] + [Column(title: "Квалификация", gridViewAutoSize: GridViewAutoSize.AllCells, isUseAutoSize: true)] public int Qualification { get; set; } = 0; - [DisplayName("Пароль")] + [Column(title: "Пароль", width: 150)] public string Password { get; set; } = string.Empty; } } diff --git a/FlowerShopContracts/ViewModels/MessageInfoViewModel.cs b/FlowerShopContracts/ViewModels/MessageInfoViewModel.cs index 3f5339b..601736c 100644 --- a/FlowerShopContracts/ViewModels/MessageInfoViewModel.cs +++ b/FlowerShopContracts/ViewModels/MessageInfoViewModel.cs @@ -1,4 +1,5 @@ -using FlowerShopDataModels.Models; +using FlowerShopContracts.Attributes; +using FlowerShopDataModels.Models; using System; using System.Collections.Generic; using System.ComponentModel; @@ -10,15 +11,19 @@ namespace FlowerShopContracts.ViewModels { public class MessageInfoViewModel : IMessageInfoModel { + [Column(visible: false)] public string MessageId { get; set; } = string.Empty; + [Column(visible: false)] public int? ClientId { get; set; } - [DisplayName("Отправитель")] + [Column(title: "Отправитель", gridViewAutoSize: GridViewAutoSize.DisplayedCells, isUseAutoSize: true)] public string SenderName { get; set; } = string.Empty; - [DisplayName("Дата письма")] + [Column(title: "Дата письма", width: 100)] public DateTime DateDelivery { get; set; } - [DisplayName("Заголовок")] + [Column(title: "Заголовок", width: 150)] public string Subject { get; set; } = string.Empty; - [DisplayName("Текст")] + [Column(title: "Текст", gridViewAutoSize: GridViewAutoSize.Fill, isUseAutoSize: true)] public string Body { get; set; } = string.Empty; + [Column(visible: false)] + public int Id => throw new NotImplementedException(); } } diff --git a/FlowerShopContracts/ViewModels/OrderViewModel.cs b/FlowerShopContracts/ViewModels/OrderViewModel.cs index 05602be..1127c09 100644 --- a/FlowerShopContracts/ViewModels/OrderViewModel.cs +++ b/FlowerShopContracts/ViewModels/OrderViewModel.cs @@ -6,31 +6,35 @@ using System.ComponentModel; using System.Linq; using System.Text; using System.Threading.Tasks; +using FlowerShopContracts.Attributes; namespace FlowerShopContracts.ViewModels { public class OrderViewModel : IOrderModel { - [DisplayName("Номер")] - public int Id { get; set; } - public int FlowerId { get; set; } + [Column(title: "Номер", gridViewAutoSize: GridViewAutoSize.AllCells, isUseAutoSize: true)] + public int Id { get; set; } + [Column(visible: false)] + public int FlowerId { get; set; } + [Column(visible: false)] public int? ImplementerId { get; set; } = null; - [DisplayName("Изделие")] - public string FlowerName { get; set; } = string.Empty; - [DisplayName("Исполнитель")] + [Column(visible: false)] + public int ClientId { get; set; } + [Column(title: "Цветок", gridViewAutoSize: GridViewAutoSize.AllCells, isUseAutoSize: true)] + public string FlowerName { get; set; } = string.Empty; + [Column(title: "ФИО исполнителя", gridViewAutoSize: GridViewAutoSize.Fill, isUseAutoSize: true)] public string ImplementerFIO { get; set; } = string.Empty; - [DisplayName("Количество")] - public int Count { get; set; } - [DisplayName("Сумма")] - public double Sum { get; set; } - [DisplayName("Статус")] - public OrderStatus Status { get; set; } = OrderStatus.Неизвестен; - [DisplayName("Дата создания")] - public DateTime DateCreate { get; set; } = DateTime.Now; - [DisplayName("Дата выполнения")] - public DateTime? DateImplement { get; set; } - public int ClientId { get; set; } - [DisplayName("Клиент")] - public string ClientFIO { get; set; } = string.Empty; + [Column(title: "Количество", gridViewAutoSize: GridViewAutoSize.AllCells, isUseAutoSize: true)] + public int Count { get; set; } + [Column(title: "Сумма", gridViewAutoSize: GridViewAutoSize.AllCells, isUseAutoSize: true)] + public double Sum { get; set; } + [Column(title: "Статус", gridViewAutoSize: GridViewAutoSize.AllCells, isUseAutoSize: true)] + public OrderStatus Status { get; set; } = OrderStatus.Неизвестен; + [Column(title: "Дата создания", width: 100)] + public DateTime DateCreate { get; set; } = DateTime.Now; + [Column(title: "Дата выполнения", width: 100)] + public DateTime? DateImplement { get; set; } + [Column(title: "ФИО клиента", gridViewAutoSize: GridViewAutoSize.Fill, isUseAutoSize: true)] + public string ClientFIO { get; set; } = string.Empty; } } diff --git a/FlowerShopDataModels/IMessageInfoModel.cs b/FlowerShopDataModels/IMessageInfoModel.cs index b03660a..2712a5c 100644 --- a/FlowerShopDataModels/IMessageInfoModel.cs +++ b/FlowerShopDataModels/IMessageInfoModel.cs @@ -6,7 +6,7 @@ using System.Threading.Tasks; namespace FlowerShopDataModels.Models { - public interface IMessageInfoModel + public interface IMessageInfoModel : IId { string MessageId { get; } int? ClientId { get; } diff --git a/FlowerShopDatabaseImplement/BackUpInfo.cs b/FlowerShopDatabaseImplement/BackUpInfo.cs new file mode 100644 index 0000000..f4cb197 --- /dev/null +++ b/FlowerShopDatabaseImplement/BackUpInfo.cs @@ -0,0 +1,31 @@ +using FlowerShopContracts.StoragesContracts; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace FlowerShopDatabaseImplement.Implements +{ + public class BackUpInfo : IBackUpInfo + { + public List? GetList() where T : class, new() + { + using var context = new FlowerShopDataBase(); + 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/FlowerShopDatabaseImplement/Client.cs b/FlowerShopDatabaseImplement/Client.cs index fa27197..52fdca7 100644 --- a/FlowerShopDatabaseImplement/Client.cs +++ b/FlowerShopDatabaseImplement/Client.cs @@ -10,19 +10,25 @@ using System.Text; using System.Threading.Tasks; using System.ComponentModel.DataAnnotations.Schema; using System.ComponentModel.DataAnnotations; +using System.Runtime.Serialization; namespace FlowerShopDatabaseImplement.Models { - public class Client : IClientModel + [DataContract] + public class Client : IClientModel { - public int Id { get; private set; } - [Required] - public string ClientFIO { get; private set; } = string.Empty; - [Required] - public string Email { get; set; } = string.Empty; - [Required] - public string Password { get; set; } = string.Empty; - [ForeignKey("ClientId")] + [DataMember] + public int Id { get; private set; } + [DataMember] + [Required] + public string ClientFIO { get; private set; } = string.Empty; + [DataMember] + [Required] + public string Email { get; set; } = string.Empty; + [DataMember] + [Required] + public string Password { get; set; } = string.Empty; + [ForeignKey("ClientId")] public virtual List Orders { get; set; } = new(); public static Client? Create(ClientBindingModel model) { diff --git a/FlowerShopDatabaseImplement/Component.cs b/FlowerShopDatabaseImplement/Component.cs index b1bf724..601d682 100644 --- a/FlowerShopDatabaseImplement/Component.cs +++ b/FlowerShopDatabaseImplement/Component.cs @@ -9,17 +9,22 @@ using FlowerShopContracts.BindingModels; using FlowerShopContracts.ViewModels; using System.ComponentModel.DataAnnotations.Schema; using System.ComponentModel.DataAnnotations; +using System.Runtime.Serialization; namespace FlowerShopDatabaseImplement.Models { - public class Component : IComponentModel + [DataContract] + public class Component : IComponentModel { - public int Id { get; private set; } - [Required] - public string ComponentName { get; private set; } = string.Empty; - [Required] - public double Cost { get; set; } - [ForeignKey("ComponentId")] + [DataMember] + public int Id { get; private set; } + [DataMember] + [Required] + public string ComponentName { get; private set; } = string.Empty; + [DataMember] + [Required] + public double Cost { get; set; } + [ForeignKey("ComponentId")] public virtual List FlowerComponents { get; set; } = new(); public static Component? Create(ComponentBindingModel model) diff --git a/FlowerShopDatabaseImplement/DatabaseImplementationExtension.cs b/FlowerShopDatabaseImplement/DatabaseImplementationExtension.cs new file mode 100644 index 0000000..9fb1449 --- /dev/null +++ b/FlowerShopDatabaseImplement/DatabaseImplementationExtension.cs @@ -0,0 +1,27 @@ +using FlowerShopContracts.DI; +using FlowerShopContracts.StoragesContracts; +using FlowerShopDatabaseImplement.Implements; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace FlowerShopDatabaseImplement +{ + public class DatabaseImplementationExtension : IImplementationExtension + { + public int Priority => 2; + // регистрация зависимостей в контейнере dependency manager + 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/FlowerShopDatabaseImplement/Flower.cs b/FlowerShopDatabaseImplement/Flower.cs index 1c50d43..65fd76c 100644 --- a/FlowerShopDatabaseImplement/Flower.cs +++ b/FlowerShopDatabaseImplement/Flower.cs @@ -10,19 +10,25 @@ using System.Collections.Generic; using System.Linq; using System.Text; using System.Threading.Tasks; +using System.Runtime.Serialization; namespace FlowerShopDatabaseImplement.Models { - public class Flower : IFlowerModel + [DataContract] + public class Flower : IFlowerModel { - public int Id { get; set; } - [Required] - public string FlowerName { get; set; } = string.Empty; - [Required] - public double Price { get; set; } - private Dictionary? _flowerComponents = null; - [NotMapped] - public Dictionary FlowerComponents + [DataMember] + public int Id { get; set; } + [DataMember] + [Required] + public string FlowerName { get; set; } = string.Empty; + [DataMember] + [Required] + public double Price { get; set; } + private Dictionary? _flowerComponents = null; + [DataMember] + [NotMapped] + public Dictionary FlowerComponents { get { diff --git a/FlowerShopDatabaseImplement/FlowerShopDatabaseImplement.csproj b/FlowerShopDatabaseImplement/FlowerShopDatabaseImplement.csproj index 43c2b67..15ac4ff 100644 --- a/FlowerShopDatabaseImplement/FlowerShopDatabaseImplement.csproj +++ b/FlowerShopDatabaseImplement/FlowerShopDatabaseImplement.csproj @@ -20,4 +20,8 @@ + + + + diff --git a/FlowerShopDatabaseImplement/MessageInfo.cs b/FlowerShopDatabaseImplement/MessageInfo.cs index 3bb2b1e..99f803b 100644 --- a/FlowerShopDatabaseImplement/MessageInfo.cs +++ b/FlowerShopDatabaseImplement/MessageInfo.cs @@ -2,6 +2,7 @@ using System.Collections.Generic; using System.ComponentModel.DataAnnotations; using System.Linq; +using System.Runtime.Serialization; using System.Text; using System.Threading.Tasks; using FlowerShopContracts.BindingModels; @@ -11,21 +12,18 @@ using FlowerShopDataModels.Models; namespace FlowerShopDatabaseImplement.Models { + [DataContract] public class MessageInfo : IMessageInfoModel { [Key] + [DataMember] public string MessageId { get; private set; } = string.Empty; - + public int Id => throw new NotImplementedException(); public int? ClientId { get; private set; } - public string SenderName { get; private set; } = string.Empty; - public DateTime DateDelivery { get; private set; } = DateTime.Now; - public string Subject { get; private set; } = string.Empty; - public string Body { get; private set; } = string.Empty; - public Client? Client { get; private set; } public static MessageInfo? Create(FlowerShopDataBase context, MessageInfoBindingModel model) diff --git a/FlowerShopDatabaseImplement/Order.cs b/FlowerShopDatabaseImplement/Order.cs index ea2093d..df6a46c 100644 --- a/FlowerShopDatabaseImplement/Order.cs +++ b/FlowerShopDatabaseImplement/Order.cs @@ -10,27 +10,38 @@ using System.Linq; using System.Text; using System.Threading.Tasks; using FlowerShopDataModels.Enums; +using System.Runtime.Serialization; namespace FlowerShopDatabaseImplement.Models { - public class Order : IOrderModel + [DataContract] + public class Order : IOrderModel { - public int Id { get; private set; } - [Required] - public int Count { get; private set; } - [Required] - public double Sum { get; private set; } - [Required] - public OrderStatus Status { get; private set; } - [Required] - public DateTime DateCreate { get; private set; } - public DateTime? DateImplement { get; private set; } - [Required] - public int FlowerId { get; private set; } - [Required] - public int ClientId { get; private set; } - public virtual Client? Client { get; private set; } + [DataMember] + public int Id { get; private set; } + [DataMember] + [Required] + public int Count { get; private set; } + [DataMember] + [Required] + public double Sum { get; private set; } + [DataMember] + [Required] + public OrderStatus Status { get; private set; } + [DataMember] + [Required] + public DateTime DateCreate { get; private set; } + [DataMember] + public DateTime? DateImplement { get; private set; } + [DataMember] + [Required] + public int FlowerId { get; private set; } + [DataMember] + [Required] + public int ClientId { get; private set; } + public virtual Client? Client { get; private set; } public virtual Flower? Flower { get; set; } + [DataMember] public int? ImplementerId { get; private set; } = null; public virtual Implementer? Implementer { get; private set; } public static Order? Create(OrderBindingModel model) diff --git a/FlowerShopFileImplement/BackUpInfo.cs b/FlowerShopFileImplement/BackUpInfo.cs new file mode 100644 index 0000000..cad8a19 --- /dev/null +++ b/FlowerShopFileImplement/BackUpInfo.cs @@ -0,0 +1,44 @@ +using FlowerShopContracts.StoragesContracts; +using FlowerShopFileImplement.Implements; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Reflection; +using System.Text; +using System.Threading.Tasks; + +namespace FlowerShopFileImplement.Implements +{ + public class BackUpInfo : IBackUpInfo + { + private readonly DataFileSingleton source; + private readonly PropertyInfo[] sourceProperties; + + public BackUpInfo() + { + source = DataFileSingleton.GetInstance(); + sourceProperties = source.GetType().GetProperties(BindingFlags.Instance | BindingFlags.Public); + } + public 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; + } + public List? GetList() where T : class, new() + { + var requredType = typeof(T); + return (List?)sourceProperties.FirstOrDefault(x => x.PropertyType.IsGenericType && x.PropertyType.GetGenericArguments()[0] == requredType) + ?.GetValue(source); + } + + } +} diff --git a/FlowerShopFileImplement/Client.cs b/FlowerShopFileImplement/Client.cs index 337bd99..f64e572 100644 --- a/FlowerShopFileImplement/Client.cs +++ b/FlowerShopFileImplement/Client.cs @@ -4,19 +4,25 @@ using FlowerShopDataModels.Models; using System; using System.Collections.Generic; using System.Linq; +using System.Runtime.Serialization; using System.Text; using System.Threading.Tasks; using System.Xml.Linq; namespace FlowerShopFileImplement.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; - public static Client? Create(ClientBindingModel model) + [DataMember] + public int Id { get; private set; } + [DataMember] + public string ClientFIO { get; private set; } = string.Empty; + [DataMember] + public string Email { get; set; } = string.Empty; + [DataMember] + public string Password { get; set; } = string.Empty; + public static Client? Create(ClientBindingModel model) { if (model == null) { diff --git a/FlowerShopFileImplement/Component.cs b/FlowerShopFileImplement/Component.cs index 9353091..5ec77b8 100644 --- a/FlowerShopFileImplement/Component.cs +++ b/FlowerShopFileImplement/Component.cs @@ -1,17 +1,21 @@ using FlowerShopContracts.BindingModels; using FlowerShopContracts.ViewModels; using FlowerShopDataModels.Models; - +using System.Runtime.Serialization; using System.Xml.Linq; namespace FlowerShopFileImplement.Models { - public class Component : IComponentModel + [DataContract] + public class Component : IComponentModel { - public int Id { get; private set; } - public string ComponentName { get; private set; } = string.Empty; - public double Cost { get; set; } - public static Component? Create(ComponentBindingModel model) + [DataMember] + public int Id { get; set; } + [DataMember] + public string ComponentName { get; set; } = string.Empty; + [DataMember] + public double Cost { get; set; } + public static Component? Create(ComponentBindingModel model) { if (model == null) { diff --git a/FlowerShopFileImplement/FileImplementationExtension.cs b/FlowerShopFileImplement/FileImplementationExtension.cs new file mode 100644 index 0000000..9a5daa3 --- /dev/null +++ b/FlowerShopFileImplement/FileImplementationExtension.cs @@ -0,0 +1,32 @@ +using FlowerShopContracts.DI; +using FlowerShopContracts.StoragesContracts; +using FlowerShopFileImplement.Implements; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace FlowerShopFileImplement +{ + public class FileImplementationExtension : 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/FlowerShopFileImplement/Flower.cs b/FlowerShopFileImplement/Flower.cs index 71dd4b5..60a3ff5 100644 --- a/FlowerShopFileImplement/Flower.cs +++ b/FlowerShopFileImplement/Flower.cs @@ -2,18 +2,23 @@ using FlowerShopContracts.ViewModels; using FlowerShopDataModels.Models; using FlowerShopFileImplement.Implements; +using System.Runtime.Serialization; using System.Xml.Linq; namespace FlowerShopFileImplement.Models { - public class Flower : IFlowerModel + [DataContract] + public class Flower : IFlowerModel { - public int Id { get; private set; } - public string FlowerName { get; private set; } = string.Empty; - public double Price { get; private set; } - public Dictionary Components { get; private set; } = new(); - private Dictionary? _flowerComponents = - null; - public Dictionary FlowerComponents + [DataMember] + public int Id { get; private set; } + [DataMember] + public string FlowerName { get; private set; } = string.Empty; + [DataMember] + public double Price { get; private set; } + public Dictionary Components { get; private set; } = new(); + private Dictionary? _flowerComponents =null; + [DataMember] + public Dictionary FlowerComponents { get { diff --git a/FlowerShopFileImplement/FlowerShopFileImplement.csproj b/FlowerShopFileImplement/FlowerShopFileImplement.csproj index ca6fa62..3b5a66b 100644 --- a/FlowerShopFileImplement/FlowerShopFileImplement.csproj +++ b/FlowerShopFileImplement/FlowerShopFileImplement.csproj @@ -10,5 +10,9 @@ + + + + diff --git a/FlowerShopFileImplement/Implementer.cs b/FlowerShopFileImplement/Implementer.cs index fe608a9..5ac0410 100644 --- a/FlowerShopFileImplement/Implementer.cs +++ b/FlowerShopFileImplement/Implementer.cs @@ -4,18 +4,25 @@ using FlowerShopDataModels.Models; using System; using System.Collections.Generic; using System.Linq; +using System.Runtime.Serialization; using System.Text; using System.Threading.Tasks; using System.Xml.Linq; namespace FlowerShopFileImplement.Models { + [DataContract] public class Implementer : IImplementerModel { + [DataMember] public int Id { get; private set; } + [DataMember] public string ImplementerFIO { get; private set; } = string.Empty; + [DataMember] public string Password { get; set; } = string.Empty; + [DataMember] public int Qualification { get; set; } = 0; + [DataMember] public int WorkExperience { get; set; } = 0; public static Implementer? Create(ImplementerBindingModel model) { diff --git a/FlowerShopFileImplement/MessageInfo.cs b/FlowerShopFileImplement/MessageInfo.cs index 26f4cf5..671e24a 100644 --- a/FlowerShopFileImplement/MessageInfo.cs +++ b/FlowerShopFileImplement/MessageInfo.cs @@ -4,26 +4,29 @@ using FlowerShopDataModels.Models; using System; using System.Collections.Generic; using System.Linq; +using System.Runtime.Serialization; using System.Text; using System.Threading.Tasks; using System.Xml.Linq; namespace FlowerShopFileImplement.Models { + [DataContract] public class MessageInfo : 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 int Id => throw new NotImplementedException(); public static MessageInfo? Create(MessageInfoBindingModel model) { if (model == null) diff --git a/FlowerShopFileImplement/Order.cs b/FlowerShopFileImplement/Order.cs index 57117d1..28321d7 100644 --- a/FlowerShopFileImplement/Order.cs +++ b/FlowerShopFileImplement/Order.cs @@ -3,21 +3,31 @@ using FlowerShopContracts.ViewModels; using FlowerShopDataModels.Enums; using FlowerShopDataModels; using System.Xml.Linq; +using System.Runtime.Serialization; namespace FlowerShopFileImplement.Models { - public class Order : IOrderModel + [DataContract] + public class Order : IOrderModel { - public int Id { get; private set; } - public int FlowerId { get; private set; } - public int Count { get; private set; } - public double Sum { get; private set; } - public OrderStatus Status { get; private set; } - public DateTime DateCreate { get; private set; } - public DateTime? DateImplement { get; private set; } - public int ClientId { get; private set; } + [DataMember] + public int Id { get; private set; } + [DataMember] + public int FlowerId { get; private set; } + [DataMember] public int? ImplementerId { get; private set; } = null; - + [DataMember] + public OrderStatus Status { get; private set; } + [DataMember] + public int Count { get; private set; } + [DataMember] + public double Sum { get; private set; } + [DataMember] + public DateTime DateCreate { get; private set; } + [DataMember] + public DateTime? DateImplement { get; private set; } + [DataMember] + public int ClientId { get; private set; } public static Order? Create(OrderBindingModel model) { diff --git a/FlowerShopListImplement/BackUpInfo.cs b/FlowerShopListImplement/BackUpInfo.cs new file mode 100644 index 0000000..805ace9 --- /dev/null +++ b/FlowerShopListImplement/BackUpInfo.cs @@ -0,0 +1,22 @@ +using FlowerShopContracts.StoragesContracts; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace FlowerShopListImplement.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/FlowerShopListImplement/FlowerShopListImplement.csproj b/FlowerShopListImplement/FlowerShopListImplement.csproj index ca6fa62..6fc841a 100644 --- a/FlowerShopListImplement/FlowerShopListImplement.csproj +++ b/FlowerShopListImplement/FlowerShopListImplement.csproj @@ -11,4 +11,9 @@ + + + + + diff --git a/FlowerShopListImplement/ListImplementationExtension.cs b/FlowerShopListImplement/ListImplementationExtension.cs new file mode 100644 index 0000000..f7f30c7 --- /dev/null +++ b/FlowerShopListImplement/ListImplementationExtension.cs @@ -0,0 +1,32 @@ +using FlowerShopContracts.DI; +using FlowerShopContracts.StoragesContracts; +using FlowerShopListImplement.Implements; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace FlowerShopListImplement +{ + 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/FlowerShopListImplement/MessageInfo.cs b/FlowerShopListImplement/MessageInfo.cs index e0004ee..92b0206 100644 --- a/FlowerShopListImplement/MessageInfo.cs +++ b/FlowerShopListImplement/MessageInfo.cs @@ -12,7 +12,7 @@ namespace FlowerShopListImplement.Models public class MessageInfo : IMessageInfoModel { public string MessageId { get; private set; } = string.Empty; - + public int Id => throw new NotImplementedException(); public int? ClientId { get; private set; } public string SenderName { get; private set; } = string.Empty; diff --git a/ProjectFlowerShop/DataGridViewExtension.cs b/ProjectFlowerShop/DataGridViewExtension.cs new file mode 100644 index 0000000..9649e21 --- /dev/null +++ b/ProjectFlowerShop/DataGridViewExtension.cs @@ -0,0 +1,54 @@ +using FlowerShopContracts.Attributes; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace ProjectFlowerShop +{ + 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/ProjectFlowerShop/FormClients.cs b/ProjectFlowerShop/FormClients.cs index 48a61a6..b740633 100644 --- a/ProjectFlowerShop/FormClients.cs +++ b/ProjectFlowerShop/FormClients.cs @@ -31,16 +31,10 @@ namespace ProjectFlowerShop var list = _logic.ReadList(null); if (list != null) { - DataGridView.DataSource = list; - DataGridView.Columns["Id"].Visible = false; - DataGridView.Columns["ClientFIO"].AutoSizeMode = - DataGridViewAutoSizeColumnMode.Fill; - DataGridView.Columns["Email"].AutoSizeMode = - DataGridViewAutoSizeColumnMode.Fill; - DataGridView.Columns["Password"].AutoSizeMode = - DataGridViewAutoSizeColumnMode.Fill; - } - _logger.LogInformation("Загрузка клиентов"); + DataGridView.FillandConfigGrid(list); + _logger.LogInformation("Загрузка клиентов"); + } + _logger.LogInformation("Загрузка клиентов"); } catch (Exception ex) { diff --git a/ProjectFlowerShop/FormComponents.cs b/ProjectFlowerShop/FormComponents.cs index 051a3d1..8284981 100644 --- a/ProjectFlowerShop/FormComponents.cs +++ b/ProjectFlowerShop/FormComponents.cs @@ -1,5 +1,6 @@ using FlowerShopContracts.BindingModels; using FlowerShopContracts.BusinessLogicsContracts; +using FlowerShopContracts.DI; using Microsoft.Extensions.Logging; using System; using System.Collections.Generic; @@ -32,16 +33,9 @@ namespace ProjectFlowerShop { try { - var list = _logic.ReadList(null); - if (list != null) - { - dataGridView.DataSource = list; - dataGridView.Columns["Id"].Visible = false; - dataGridView.Columns["ComponentName"].AutoSizeMode = - DataGridViewAutoSizeColumnMode.Fill; - } - _logger.LogInformation("Загрузка компонентов"); - } + dataGridView.FillandConfigGrid(_logic.ReadList(null)); + _logger.LogInformation("Загрузка компонентов"); + } catch (Exception ex) { _logger.LogError(ex, "Ошибка загрузки компонентов"); @@ -52,8 +46,8 @@ namespace ProjectFlowerShop private void buttonAdd_Click(object sender, EventArgs e) { - var service = Program.ServiceProvider?.GetService(typeof(ComponentForm)); - if (service is ComponentForm form) + var service = DependencyManager.Instance.Resolve(); + if (service is ComponentForm form) { if (form.ShowDialog() == DialogResult.OK) { @@ -67,8 +61,8 @@ namespace ProjectFlowerShop if (dataGridView.SelectedRows.Count == 1) { var service = - Program.ServiceProvider?.GetService(typeof(ComponentForm)); - if (service is ComponentForm form) + DependencyManager.Instance.Resolve(); + if (service is ComponentForm form) { form.Id = Convert.ToInt32(dataGridView.SelectedRows[0].Cells["Id"].Value); diff --git a/ProjectFlowerShop/FormFlower.cs b/ProjectFlowerShop/FormFlower.cs index 40ad362..c78fcaa 100644 --- a/ProjectFlowerShop/FormFlower.cs +++ b/ProjectFlowerShop/FormFlower.cs @@ -12,6 +12,7 @@ using System.Linq; using System.Text; using System.Threading.Tasks; using System.Windows.Forms; +using FlowerShopContracts.DI; namespace ProjectFlowerShop { @@ -95,7 +96,8 @@ namespace ProjectFlowerShop private void buttonAdd_Click(object sender, EventArgs e) { - var service = Program.ServiceProvider?.GetService(typeof(FormFlowerComponent)); + var service = + DependencyManager.Instance.Resolve(); if (service is FormFlowerComponent form) { if (form.ShowDialog() == DialogResult.OK) @@ -123,8 +125,7 @@ namespace ProjectFlowerShop { if (dataGridView.SelectedRows.Count == 1) { - var service = - Program.ServiceProvider?.GetService(typeof(FormFlowerComponent)); + var service =DependencyManager.Instance.Resolve(); if (service is FormFlowerComponent form) { int id = diff --git a/ProjectFlowerShop/FormFlowers.cs b/ProjectFlowerShop/FormFlowers.cs index 49c1b87..7cfcbdb 100644 --- a/ProjectFlowerShop/FormFlowers.cs +++ b/ProjectFlowerShop/FormFlowers.cs @@ -11,6 +11,7 @@ using System.Linq; using System.Text; using System.Threading.Tasks; using System.Windows.Forms; +using FlowerShopContracts.DI; namespace ProjectFlowerShop { @@ -34,15 +35,8 @@ namespace ProjectFlowerShop { try { - var list = _logic.ReadList(null); - if (list != null) - { - DataGridView.DataSource = list; - DataGridView.Columns["Id"].Visible = false; - DataGridView.Columns["FlowerName"].AutoSizeMode = DataGridViewAutoSizeColumnMode.Fill; - DataGridView.Columns["FlowerComponents"].Visible = false; - } - _logger.LogInformation("Загрузка цветов"); + DataGridView.FillandConfigGrid(_logic.ReadList(null)); + _logger.LogInformation("Загрузка цветов"); } catch (Exception ex) { @@ -53,8 +47,8 @@ namespace ProjectFlowerShop private void AddButton_Click(object sender, EventArgs e) { - var service = Program.ServiceProvider?.GetService(typeof(FormFlower)); - if (service is FormFlower form) + var service =DependencyManager.Instance.Resolve(); + if (service is FormFlower form) { if (form.ShowDialog() == DialogResult.OK) { @@ -67,8 +61,8 @@ namespace ProjectFlowerShop { if (DataGridView.SelectedRows.Count == 1) { - var service = Program.ServiceProvider?.GetService(typeof(FormFlower)); - if (service is FormFlower form) + var service =DependencyManager.Instance.Resolve(); + if (service is FormFlower form) { var tmp = Convert.ToInt32(DataGridView.SelectedRows[0].Cells["Id"].Value); form.Id = Convert.ToInt32(DataGridView.SelectedRows[0].Cells["Id"].Value); diff --git a/ProjectFlowerShop/FormViewMail.cs b/ProjectFlowerShop/FormViewMail.cs index 8e3d10d..fbdb38c 100644 --- a/ProjectFlowerShop/FormViewMail.cs +++ b/ProjectFlowerShop/FormViewMail.cs @@ -27,14 +27,7 @@ namespace ProjectFlowerShop { try { - var list = _logic.ReadList(null); - if (list != null) - { - dataGridView.DataSource = list; - dataGridView.Columns["ClientId"].Visible = false; - dataGridView.Columns["MessageId"].Visible = false; - dataGridView.Columns["Body"].AutoSizeMode = DataGridViewAutoSizeColumnMode.Fill; - } + dataGridView.FillandConfigGrid(_logic.ReadList(null)); _logger.LogInformation("Загрузка списка писем"); } catch (Exception ex) diff --git a/ProjectFlowerShop/ImplementersForm.cs b/ProjectFlowerShop/ImplementersForm.cs index 047bae4..c010109 100644 --- a/ProjectFlowerShop/ImplementersForm.cs +++ b/ProjectFlowerShop/ImplementersForm.cs @@ -1,5 +1,6 @@ using FlowerShopContracts.BindingModels; using FlowerShopContracts.BusinessLogicsContracts; +using FlowerShopContracts.DI; using Microsoft.Extensions.Logging; using System; using System.Collections.Generic; @@ -33,21 +34,8 @@ namespace ProjectFlowerShop { try { - var list = _logic.ReadList(null); - if (list != null) - { - dataGridView1.DataSource = list; - dataGridView1.Columns["Id"].Visible = false; - dataGridView1.Columns["ImplementerFIO"].AutoSizeMode = - DataGridViewAutoSizeColumnMode.Fill; - dataGridView1.Columns["Password"].AutoSizeMode = - DataGridViewAutoSizeColumnMode.Fill; - dataGridView1.Columns["Qualification"].AutoSizeMode = - DataGridViewAutoSizeColumnMode.Fill; - dataGridView1.Columns["WorkExperience"].AutoSizeMode = - DataGridViewAutoSizeColumnMode.Fill; - } - _logger.LogInformation("Загрузка компонентов"); + dataGridView1.FillandConfigGrid(_logic.ReadList(null)); + _logger.LogInformation("Загрузка исполнителей"); } catch (Exception ex) { @@ -58,7 +46,7 @@ namespace ProjectFlowerShop } private void CreateButton_Click(object sender, EventArgs e) { - var service = Program.ServiceProvider?.GetService(typeof(ImplementerForm)); + var service =DependencyManager.Instance.Resolve(); if (service is ImplementerForm form) { if (form.ShowDialog() == DialogResult.OK) @@ -73,7 +61,7 @@ namespace ProjectFlowerShop if (dataGridView1.SelectedRows.Count == 1) { var service = - Program.ServiceProvider?.GetService(typeof(ImplementerForm)); + DependencyManager.Instance.Resolve(); if (service is ImplementerForm form) { form.Id = diff --git a/ProjectFlowerShop/MainForm.Designer.cs b/ProjectFlowerShop/MainForm.Designer.cs index 07caf38..5a7cc1d 100644 --- a/ProjectFlowerShop/MainForm.Designer.cs +++ b/ProjectFlowerShop/MainForm.Designer.cs @@ -35,6 +35,7 @@ клиентыToolStripMenuItem = new ToolStripMenuItem(); исполнителиToolStripMenuItem = new ToolStripMenuItem(); стартРаботToolStripMenuItem = new ToolStripMenuItem(); + почтаToolStripMenuItem = new ToolStripMenuItem(); отчетыToolStripMenuItem = new ToolStripMenuItem(); списокКомпонентовToolStripMenuItem = new ToolStripMenuItem(); компонентыToolStripMenuItem = new ToolStripMenuItem(); @@ -45,7 +46,7 @@ ReadyButton = new Button(); IssuedButton = new Button(); RefreshButton = new Button(); - почтаToolStripMenuItem = new ToolStripMenuItem(); + создатьБэкапToolStripMenuItem = new ToolStripMenuItem(); menuStrip1.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)DataGridView).BeginInit(); SuspendLayout(); @@ -62,7 +63,7 @@ // // ToolStripMenu // - ToolStripMenu.DropDownItems.AddRange(new ToolStripItem[] { КомпонентыStripMenuItem, ЦветыStripMenuItem, клиентыToolStripMenuItem, исполнителиToolStripMenuItem, стартРаботToolStripMenuItem, почтаToolStripMenuItem }); + ToolStripMenu.DropDownItems.AddRange(new ToolStripItem[] { КомпонентыStripMenuItem, ЦветыStripMenuItem, клиентыToolStripMenuItem, исполнителиToolStripMenuItem, стартРаботToolStripMenuItem, почтаToolStripMenuItem, создатьБэкапToolStripMenuItem }); ToolStripMenu.Name = "ToolStripMenu"; ToolStripMenu.Size = new Size(117, 24); ToolStripMenu.Text = "Справочники"; @@ -102,6 +103,13 @@ стартРаботToolStripMenuItem.Text = "Старт работ"; стартРаботToolStripMenuItem.Click += стартРаботToolStripMenuItem_Click; // + // почтаToolStripMenuItem + // + почтаToolStripMenuItem.Name = "почтаToolStripMenuItem"; + почтаToolStripMenuItem.Size = new Size(224, 26); + почтаToolStripMenuItem.Text = "Почта"; + почтаToolStripMenuItem.Click += почтаToolStripMenuItem_Click; + // // отчетыToolStripMenuItem // отчетыToolStripMenuItem.DropDownItems.AddRange(new ToolStripItem[] { списокКомпонентовToolStripMenuItem, компонентыToolStripMenuItem, списокЗаказовToolStripMenuItem }); @@ -189,12 +197,12 @@ RefreshButton.UseVisualStyleBackColor = true; RefreshButton.Click += RefreshButton_Click; // - // почтаToolStripMenuItem + // создатьБэкапToolStripMenuItem // - почтаToolStripMenuItem.Name = "почтаToolStripMenuItem"; - почтаToolStripMenuItem.Size = new Size(224, 26); - почтаToolStripMenuItem.Text = "Почта"; - почтаToolStripMenuItem.Click += почтаToolStripMenuItem_Click; + создатьБэкапToolStripMenuItem.Name = "создатьБэкапToolStripMenuItem"; + создатьБэкапToolStripMenuItem.Size = new Size(224, 26); + создатьБэкапToolStripMenuItem.Text = "Создать Бэкап"; + создатьБэкапToolStripMenuItem.Click += создатьБэкапToolStripMenuItem_Click; // // MainForm // @@ -239,5 +247,6 @@ private ToolStripMenuItem исполнителиToolStripMenuItem; private ToolStripMenuItem стартРаботToolStripMenuItem; private ToolStripMenuItem почтаToolStripMenuItem; + private ToolStripMenuItem создатьБэкапToolStripMenuItem; } } \ No newline at end of file diff --git a/ProjectFlowerShop/MainForm.cs b/ProjectFlowerShop/MainForm.cs index 103496a..1c58a5a 100644 --- a/ProjectFlowerShop/MainForm.cs +++ b/ProjectFlowerShop/MainForm.cs @@ -1,6 +1,7 @@ using FlowerShopBusinessLogic; using FlowerShopContracts.BindingModels; using FlowerShopContracts.BusinessLogicsContracts; +using FlowerShopContracts.DI; using FlowerShopDataModels; using FlowerShopDataModels.Enums; using Microsoft.Extensions.Logging; @@ -23,18 +24,21 @@ namespace ProjectFlowerShop private readonly IOrderLogic _orderLogic; private readonly IReportLogic _reportLogic; private readonly IWorkProcess _workProcess; - public MainForm(ILogger logger, IOrderLogic orderLogic, IReportLogic reportLogic, IWorkProcess workProcess) + private readonly IBackUpLogic _backUpLogic; + public MainForm(ILogger logger, IOrderLogic orderLogic, IReportLogic reportLogic, + IWorkProcess workProcess, IBackUpLogic backUpLogic) { InitializeComponent(); _logger = logger; _orderLogic = orderLogic; _reportLogic = reportLogic; _workProcess = workProcess; + _backUpLogic = backUpLogic; } private void КомпонентыStripMenuItem_Click(object sender, EventArgs e) { - var service = Program.ServiceProvider?.GetService(typeof(FormComponents)); + var service = DependencyManager.Instance.Resolve(); if (service is FormComponents form) { form.ShowDialog(); @@ -52,15 +56,7 @@ namespace ProjectFlowerShop _logger.LogInformation("Загрузка заказов"); try { - var list = _orderLogic.ReadList(null); - if (list != null) - { - DataGridView.DataSource = list; - DataGridView.Columns["FlowerId"].Visible = false; - DataGridView.Columns["ClientId"].Visible = false; - DataGridView.Columns["ImplementerId"].Visible = false; - DataGridView.Columns["FlowerName"].AutoSizeMode = DataGridViewAutoSizeColumnMode.Fill; - } + DataGridView.FillandConfigGrid(_orderLogic.ReadList(null)); _logger.LogInformation("Загрузка заказов"); } catch (Exception ex) @@ -72,7 +68,7 @@ namespace ProjectFlowerShop private void ЦветыStripMenuItem_Click(object sender, EventArgs e) { - var service = Program.ServiceProvider?.GetService(typeof(FormFlowers)); + var service = DependencyManager.Instance.Resolve(); if (service is FormFlowers form) { form.ShowDialog(); @@ -81,7 +77,7 @@ namespace ProjectFlowerShop private void CreateOrderButton_Click(object sender, EventArgs e) { - var service = Program.ServiceProvider?.GetService(typeof(FormCreateOrder)); + var service = DependencyManager.Instance.Resolve(); if (service is FormCreateOrder form) { form.ShowDialog(); @@ -204,7 +200,7 @@ namespace ProjectFlowerShop private void компонентыToolStripMenuItem_Click(object sender, EventArgs e) { - var service = Program.ServiceProvider?.GetService(typeof(FormReportFlowerComponent)); + var service = DependencyManager.Instance.Resolve(); if (service is FormReportFlowerComponent form) { form.ShowDialog(); @@ -214,7 +210,7 @@ namespace ProjectFlowerShop private void списокЗаказовToolStripMenuItem_Click(object sender, EventArgs e) { - var service = Program.ServiceProvider?.GetService(typeof(FormReportOrders)); + var service = DependencyManager.Instance.Resolve(); if (service is FormReportOrders form) { form.ShowDialog(); @@ -223,7 +219,7 @@ namespace ProjectFlowerShop private void клиентыToolStripMenuItem_Click(object sender, EventArgs e) { - var service = Program.ServiceProvider?.GetService(typeof(FormClients)); + var service = DependencyManager.Instance.Resolve(); if (service is FormClients form) { form.ShowDialog(); @@ -232,14 +228,14 @@ namespace ProjectFlowerShop 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(ImplementersForm)); + var service = DependencyManager.Instance.Resolve(); if (service is ImplementersForm form) { form.ShowDialog(); @@ -248,11 +244,36 @@ namespace ProjectFlowerShop private void почтаToolStripMenuItem_Click(object sender, EventArgs e) { - var service = Program.ServiceProvider?.GetService(typeof(FormViewMail)); + var service = DependencyManager.Instance.Resolve(); if (service is FormViewMail form) { form.ShowDialog(); } } + + private void создатьБэкапToolStripMenuItem_Click(object sender, EventArgs e) + { + try + { + 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/ProjectFlowerShop/Program.cs b/ProjectFlowerShop/Program.cs index a8daa98..05b7a34 100644 --- a/ProjectFlowerShop/Program.cs +++ b/ProjectFlowerShop/Program.cs @@ -14,13 +14,13 @@ using FlowerShopBusinessLogic; using FlowerShopBusinessLogic.OfficePackage.Implements; using FlowerShopBusinessLogic.OfficePackage; using FlowerShopContracts.BindingModels; +using FlowerShopContracts.DI; namespace ProjectFlowerShop { internal static class Program { - private static ServiceProvider? _serviceProvider; - public static ServiceProvider? ServiceProvider => _serviceProvider; + /// /// The main entry point for the application. /// @@ -29,12 +29,11 @@ namespace ProjectFlowerShop { ApplicationConfiguration.Initialize(); var services = new ServiceCollection(); - ConfigureServices(services); - _serviceProvider = services.BuildServiceProvider(); + InitDependency(); try { var mailSender = - _serviceProvider.GetService(); + DependencyManager.Instance.Resolve(); mailSender?.MailConfig(new MailConfigBindingModel { MailLogin = @@ -59,54 +58,52 @@ namespace ProjectFlowerShop } 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(); + Application.Run(DependencyManager.Instance.Resolve()); + } - services.AddTransient(); - services.AddTransient(); - services.AddTransient(); - services.AddTransient(); - services.AddTransient(); - services.AddTransient(); - services.AddTransient(); - services.AddTransient(); + 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(); - 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(); + DependencyManager.Instance.RegisterType(); + DependencyManager.Instance.RegisterType(); + DependencyManager.Instance.RegisterType(); + } + + private static void MailCheck(object obj) => DependencyManager.Instance.Resolve()?.MailCheck(); - services.AddSingleton(); - services.AddTransient(); - services.AddTransient(); - services.AddTransient(); - } - private static void MailCheck(object obj) =>ServiceProvider?.GetService()?.MailCheck(); } }