diff --git a/.gitignore b/.gitignore index ca1c7a3..9e9f60f 100644 --- a/.gitignore +++ b/.gitignore @@ -14,6 +14,10 @@ # User-specific files (MonoDevelop/Xamarin Studio) *.userprefs +# dll файлы +*.dll +/GiftShop/ImplementationExtensions + # Mono auto generated files mono_crash.* diff --git a/GiftShop/GiftShopBusinessLogic/BusinessLogics/BackUpLogic.cs b/GiftShop/GiftShopBusinessLogic/BusinessLogics/BackUpLogic.cs new file mode 100644 index 0000000..d27699f --- /dev/null +++ b/GiftShop/GiftShopBusinessLogic/BusinessLogics/BackUpLogic.cs @@ -0,0 +1,101 @@ +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/MailWorker/AbstractMailWorker.cs b/GiftShop/GiftShopBusinessLogic/MailWorker/AbstractMailWorker.cs index c432c93..fc9d57b 100644 --- a/GiftShop/GiftShopBusinessLogic/MailWorker/AbstractMailWorker.cs +++ b/GiftShop/GiftShopBusinessLogic/MailWorker/AbstractMailWorker.cs @@ -94,7 +94,5 @@ namespace GiftShopBusinessLogic.MailWorker protected abstract Task SendMailAsync(MailSendInfoBindingModel info); protected abstract Task> ReceiveMailAsync(); - - } } 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..9bfd6e2 --- /dev/null +++ b/GiftShop/GiftShopContracts/BindingModels/BackUpSaveBinidngModel.cs @@ -0,0 +1,7 @@ +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..2862b68 --- /dev/null +++ b/GiftShop/GiftShopContracts/DI/DependencyManager.cs @@ -0,0 +1,41 @@ +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..d7b75e4 --- /dev/null +++ b/GiftShop/GiftShopContracts/DI/IDependencyContainer.cs @@ -0,0 +1,12 @@ +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..e72ad8d --- /dev/null +++ b/GiftShop/GiftShopContracts/DI/IImplementationExtension.cs @@ -0,0 +1,8 @@ +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..c70f697 --- /dev/null +++ b/GiftShop/GiftShopContracts/DI/ServiceProviderLoader.cs @@ -0,0 +1,51 @@ +using System.Reflection; + +namespace GiftShopContracts.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/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 1d12326..571ccc1 100644 --- a/GiftShop/GiftShopContracts/GiftShopContracts.csproj +++ b/GiftShop/GiftShopContracts/GiftShopContracts.csproj @@ -8,10 +8,19 @@ + + + + + + + + + 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 2296592..21da9d7 100644 --- a/GiftShop/GiftShopContracts/ViewModels/OrderViewModel.cs +++ b/GiftShop/GiftShopContracts/ViewModels/OrderViewModel.cs @@ -1,49 +1,46 @@ -using GiftShopDataModels.Enums; +using GiftShopContracts.Attributes; +using GiftShopDataModels.Enums; using GiftShopDataModels.Models; using System.ComponentModel; 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; } - public int? ImplementerId { get; set; } + [Column(visible: false)] + public int? ImplementerId { get; set; } - [DisplayName("Изделие")] + [Column("Номер", gridViewAutoSize: GridViewAutoSize.AllCells, isUseAutoSize: true)] + public int Id { get; set; } - public string GiftName { get; set; } = string.Empty; + [Column("ФИО исполнителя", gridViewAutoSize: GridViewAutoSize.Fill, isUseAutoSize: true)] + public string ImplementerFIO { get; set; } = string.Empty; - [DisplayName("ФИО исполнителя")] - public string ImplementerFIO { get; set; } = string.Empty; + [Column("Название изделия", gridViewAutoSize: GridViewAutoSize.AllCells, isUseAutoSize: true)] + public string GiftName { get; set; } = string.Empty; - [DisplayName("Клиент")] + [Column("ФИО клиента", gridViewAutoSize: GridViewAutoSize.Fill, isUseAutoSize: true)] public string ClientFIO { get; set; } = string.Empty; - [DisplayName("Количество")] + [Column("Количество", gridViewAutoSize: GridViewAutoSize.AllCells, isUseAutoSize: true)] + public int Count { get; set; } - public int Count { get; set; } + [Column("Сумма", gridViewAutoSize: GridViewAutoSize.AllCells, isUseAutoSize: true)] + public double Sum { get; set; } - [DisplayName("Сумма")] + [Column("Статус", gridViewAutoSize: GridViewAutoSize.AllCells, isUseAutoSize: true)] + public OrderStatus Status { get; set; } = OrderStatus.Неизвестен; - public double Sum { get; set; } + [Column("Дата создания", width: 100)] + public DateTime DateCreate { get; set; } = DateTime.Now; - [DisplayName("Статус")] - - public OrderStatus Status { get; set; } = OrderStatus.Неизвестен; - - [DisplayName("Дата создания")] - - 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 3ad2062..2537900 100644 --- a/GiftShop/GiftShopDatabaseImplement/GiftShopDatabaseImplement.csproj +++ b/GiftShop/GiftShopDatabaseImplement/GiftShopDatabaseImplement.csproj @@ -21,4 +21,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/Implements/MessageInfoStorage.cs b/GiftShop/GiftShopDatabaseImplement/Implements/MessageInfoStorage.cs index 27f5e98..3e503cf 100644 --- a/GiftShop/GiftShopDatabaseImplement/Implements/MessageInfoStorage.cs +++ b/GiftShop/GiftShopDatabaseImplement/Implements/MessageInfoStorage.cs @@ -39,7 +39,7 @@ namespace GiftShopDatabaseImplement.Implements public MessageInfoViewModel? Insert(MessageInfoBindingModel model) { using var context = new GiftShopDatabase(); - var newMessage = Message.Create(context, model); + var newMessage = Message.Create(model,context); if (newMessage == null || context.Messages.Any(x => x.MessageId.Equals(model.MessageId))) { return null; diff --git a/GiftShop/GiftShopDatabaseImplement/Models/Client.cs b/GiftShop/GiftShopDatabaseImplement/Models/Client.cs index ff1dd36..3a9f7a4 100644 --- a/GiftShop/GiftShopDatabaseImplement/Models/Client.cs +++ b/GiftShop/GiftShopDatabaseImplement/Models/Client.cs @@ -3,23 +3,27 @@ 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")] public virtual List Orders { get; set; } = new(); - [ForeignKey("ClientId")] - public virtual List ClientMessages { get; set; } = new(); public static Client? Create(ClientBindingModel model) { if (model == null) 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..f6286ba 100644 --- a/GiftShop/GiftShopDatabaseImplement/Models/Gift.cs +++ b/GiftShop/GiftShopDatabaseImplement/Models/Gift.cs @@ -3,23 +3,32 @@ 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 + + [ForeignKey("ClientId")] + public virtual List ClientMessages { get; set; } = new(); + + [NotMapped] + [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 6e6a0eb..b8df282 100644 --- a/GiftShop/GiftShopDatabaseImplement/Models/Message.cs +++ b/GiftShop/GiftShopDatabaseImplement/Models/Message.cs @@ -2,28 +2,41 @@ using GiftShopContracts.ViewModels; using GiftShopDataModels.Models; using System.ComponentModel.DataAnnotations; -using System.ComponentModel.DataAnnotations.Schema; +using System.Runtime.Serialization; namespace GiftShopDatabaseImplement.Models { + [DataContract] public class Message : IMessageInfoModel { [Key] - [DatabaseGenerated(DatabaseGeneratedOption.None)] + [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 static Message? Create(GiftShopDatabase context, MessageInfoBindingModel model) + + public int Id => throw new NotImplementedException(); + + public static Message? Create(MessageInfoBindingModel model, GiftShopDatabase context) { if (model == null) { diff --git a/GiftShop/GiftShopDatabaseImplement/Models/Order.cs b/GiftShop/GiftShopDatabaseImplement/Models/Order.cs index eb7145a..140c931 100644 --- a/GiftShop/GiftShopDatabaseImplement/Models/Order.cs +++ b/GiftShop/GiftShopDatabaseImplement/Models/Order.cs @@ -3,39 +3,52 @@ using GiftShopContracts.ViewModels; using GiftShopDataModels.Enums; using GiftShopDataModels.Models; using System.ComponentModel.DataAnnotations; +using System.Runtime.Serialization; namespace GiftShopDatabaseImplement.Models { + [DataContract] public class Order : IOrderModel - { + { + [DataMember] public int Id { 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; + [DataMember] [Required] - public int Count { get; private set; } + public int Count { get; private set; } + [DataMember] [Required] - public double Sum { get; private set; } + public double Sum { get; private set; } + [DataMember] [Required] - public OrderStatus Status { get; private set; } = OrderStatus.Неизвестен; + public OrderStatus Status { get; private set; } = OrderStatus.Неизвестен; + [DataMember] [Required] - public DateTime DateCreate { get; private set; } = DateTime.Now; + public DateTime DateCreate { get; private set; } = DateTime.Now; + [DataMember] public DateTime? DateImplement { get; private set; } - public virtual Gift Gift { get; set; } + public virtual Gift Gift { get; set; } public Client Client { get; set; } + public Implementer? Implementer { get; set; } public static Order? Create(OrderBindingModel? model, GiftShopDatabase context) @@ -65,12 +78,11 @@ namespace GiftShopDatabaseImplement.Models } public void Update(OrderBindingModel? model) - { - if (model == null) - { - return; + { + if (model == null) + { + return; } - Status = model.Status; DateImplement = model.DateImplement; ImplementerId = model.ImplementerId; @@ -99,4 +111,4 @@ namespace GiftShopDatabaseImplement.Models } } } -} \ No newline at end of file +} 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 ec26524..53f864e 100644 --- a/GiftShop/GiftShopFileImplement/GiftShopFileImplement.csproj +++ b/GiftShop/GiftShopFileImplement/GiftShopFileImplement.csproj @@ -15,4 +15,8 @@ + + + + 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 ccf3083..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; } - public int? ImplementerId { get; set; } + [DataMember] + public int? ImplementerId { get; set; } - public int ClientId { get; private set; } + [DataMember] + public int ClientId { get; private set; } - public string GiftName { get; private set; } = string.Empty; + [DataMember] + public string GiftName { get; private set; } = string.Empty; - public int Count { get; private set; } + [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) { @@ -38,11 +50,11 @@ namespace GiftShopFileImplement.Models { Id = model.Id, GiftId = model.GiftId, - GiftName = model.GiftName, - Count = model.Count, - ClientId = model.ClientId, - ImplementerId = model.ImplementerId, - Sum = model.Sum, + GiftName = model.GiftName, + Count = model.Count, + ClientId = model.ClientId, + ImplementerId = model.ImplementerId, + Sum = model.Sum, Status = model.Status, DateCreate = model.DateCreate, DateImplement = model.DateImplement @@ -56,22 +68,26 @@ namespace GiftShopFileImplement.Models return null; } var order = new Order() - { - Id = Convert.ToInt32(element.Attribute("Id")!.Value), - GiftId = Convert.ToInt32(element.Element("GiftId")!.Value), - GiftName = element.Element("GiftName")!.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) - }; + { + Id = Convert.ToInt32(element.Attribute("Id")!.Value), + GiftId = Convert.ToInt32(element.Element("GiftId")!.Value), + ClientId = Convert.ToInt32(element.Element("ClientId")!.Value), + Count = Convert.ToInt32(element.Element("Count")!.Value), + Sum = Convert.ToDouble(element.Element("Sum")!.Value), + 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) @@ -79,35 +95,35 @@ namespace GiftShopFileImplement.Models if (model == null) { return; - } - Status = model.Status; - DateImplement = model.DateImplement; - } + } + Status = model.Status; + DateImplement = model.DateImplement; + } public OrderViewModel GetViewModel => new() - { - Id = Id, - GiftId = GiftId, - ClientId = ClientId, - ImplementerId = ImplementerId, - GiftName = GiftName, - Count = Count, - Sum = Sum, - Status = Status, - DateCreate = DateCreate, - DateImplement = DateImplement - }; + { + Id = Id, + GiftId = GiftId, + ClientId = ClientId, + ImplementerId = ImplementerId, + GiftName = GiftName, + Count = Count, + Sum = Sum, + Status = Status, + DateCreate = DateCreate, + DateImplement = DateImplement + }; public XElement GetXElement => new("Order", - new XAttribute("Id", Id), - new XElement("GiftName", GiftName), - new XElement("GiftId", GiftId.ToString()), - new XElement("ClientId", ClientId.ToString()), - new XElement("ImplementerId", ImplementerId.ToString()), - new XElement("Count", Count.ToString()), - new XElement("Sum", Sum.ToString()), - new XElement("Status", Status.ToString()), - new XElement("DateCreate", DateCreate.ToString()), - new XElement("DateImplement", DateImplement.ToString())); - } + new XAttribute("Id", Id), + new XElement("GiftName", GiftName), + new XElement("GiftId", GiftId.ToString()), + new XElement("ClientId", ClientId.ToString()), + new XElement("ImplementerId", ImplementerId.ToString()), + new XElement("Count", Count.ToString()), + new XElement("Sum", Sum.ToString()), + new XElement("Status", Status.ToString()), + new XElement("DateCreate", DateCreate.ToString()), + new XElement("DateImplement", DateImplement.ToString())); + } } diff --git a/GiftShop/GiftShopListImplement/GiftShopListImplement.csproj b/GiftShop/GiftShopListImplement/GiftShopListImplement.csproj index ec26524..53f864e 100644 --- a/GiftShop/GiftShopListImplement/GiftShopListImplement.csproj +++ b/GiftShop/GiftShopListImplement/GiftShopListImplement.csproj @@ -15,4 +15,8 @@ + + + + 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..1ec75dd 100644 --- a/GiftShop/GiftShopView/FormGifts.cs +++ b/GiftShop/GiftShopView/FormGifts.cs @@ -1,7 +1,9 @@ using GiftShopContracts.BindingModels; using GiftShopContracts.BusinessLogicsContracts; +using GiftShopContracts.DI; using Microsoft.Extensions.Logging; + namespace GiftShopView { public partial class FormGifts : Form @@ -24,53 +26,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..0b073ae 100644 --- a/GiftShop/GiftShopView/FormImplementers.cs +++ b/GiftShop/GiftShopView/FormImplementers.cs @@ -1,6 +1,7 @@ using GiftShopContracts.BindingModels; using GiftShopContracts.BusinessLogicsContracts; using Microsoft.Extensions.Logging; +using GiftShopContracts.DI; 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,14 +30,11 @@ 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,18 +84,9 @@ 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("Загрузка исполнителей"); } - catch (Exception ex) { _logger.LogError(ex, "Ошибка загрузки исполнителей"); 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..d6e2b25 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,10 +52,11 @@ // 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); + menuStrip.Padding = new Padding(8, 2, 0, 2); + menuStrip.Size = new Size(1709, 33); menuStrip.TabIndex = 0; menuStrip.Text = "menuStrip1"; // @@ -62,34 +64,34 @@ // справочникиToolStripMenuItem.DropDownItems.AddRange(new ToolStripItem[] { компонентыToolStripMenuItem, изделияToolStripMenuItem, клиентыToolStripMenuItem, исполнителиToolStripMenuItem }); справочникиToolStripMenuItem.Name = "справочникиToolStripMenuItem"; - справочникиToolStripMenuItem.Size = new Size(117, 24); + справочникиToolStripMenuItem.Size = new Size(139, 29); справочникиToolStripMenuItem.Text = "Справочники"; // // компонентыToolStripMenuItem // компонентыToolStripMenuItem.Name = "компонентыToolStripMenuItem"; - компонентыToolStripMenuItem.Size = new Size(185, 26); + компонентыToolStripMenuItem.Size = new Size(220, 34); компонентыToolStripMenuItem.Text = "Компоненты"; компонентыToolStripMenuItem.Click += КомпонентыToolStripMenuItem_Click; // // изделияToolStripMenuItem // изделияToolStripMenuItem.Name = "изделияToolStripMenuItem"; - изделияToolStripMenuItem.Size = new Size(185, 26); + изделияToolStripMenuItem.Size = new Size(220, 34); изделияToolStripMenuItem.Text = "Изделия"; изделияToolStripMenuItem.Click += ИзделияToolStripMenuItem_Click; // // клиентыToolStripMenuItem // клиентыToolStripMenuItem.Name = "клиентыToolStripMenuItem"; - клиентыToolStripMenuItem.Size = new Size(185, 26); + клиентыToolStripMenuItem.Size = new Size(220, 34); клиентыToolStripMenuItem.Text = "Клиенты"; клиентыToolStripMenuItem.Click += ClientsToolStripMenuItem_Click; // // исполнителиToolStripMenuItem // исполнителиToolStripMenuItem.Name = "исполнителиToolStripMenuItem"; - исполнителиToolStripMenuItem.Size = new Size(185, 26); + исполнителиToolStripMenuItem.Size = new Size(220, 34); исполнителиToolStripMenuItem.Text = "Исполнители"; исполнителиToolStripMenuItem.Click += исполнителиToolStripMenuItem_Click; // @@ -97,53 +99,62 @@ // отчётыToolStripMenuItem.DropDownItems.AddRange(new ToolStripItem[] { списокКомпонентовToolStripMenuItem, компонентыПоИзделиямToolStripMenuItem, списокЗаказовToolStripMenuItem }); отчётыToolStripMenuItem.Name = "отчётыToolStripMenuItem"; - отчётыToolStripMenuItem.Size = new Size(73, 24); + отчётыToolStripMenuItem.Size = new Size(88, 29); отчётыToolStripMenuItem.Text = "Отчёты"; // // списокКомпонентовToolStripMenuItem // списокКомпонентовToolStripMenuItem.Name = "списокКомпонентовToolStripMenuItem"; - списокКомпонентовToolStripMenuItem.Size = new Size(276, 26); + списокКомпонентовToolStripMenuItem.Size = new Size(327, 34); списокКомпонентовToolStripMenuItem.Text = "Список компонентов"; списокКомпонентовToolStripMenuItem.Click += ComponentsToolStripMenuItem_Click; // // компонентыПоИзделиямToolStripMenuItem // компонентыПоИзделиямToolStripMenuItem.Name = "компонентыПоИзделиямToolStripMenuItem"; - компонентыПоИзделиямToolStripMenuItem.Size = new Size(276, 26); + компонентыПоИзделиямToolStripMenuItem.Size = new Size(327, 34); компонентыПоИзделиямToolStripMenuItem.Text = "Компоненты по изделиям"; компонентыПоИзделиямToolStripMenuItem.Click += ComponentGiftsToolStripMenuItem_Click; // // списокЗаказовToolStripMenuItem // списокЗаказовToolStripMenuItem.Name = "списокЗаказовToolStripMenuItem"; - списокЗаказовToolStripMenuItem.Size = new Size(276, 26); + списокЗаказовToolStripMenuItem.Size = new Size(327, 34); списокЗаказовToolStripMenuItem.Text = "Список заказов"; списокЗаказовToolStripMenuItem.Click += OrdersToolStripMenuItem_Click; // // запускРаботToolStripMenuItem // запускРаботToolStripMenuItem.Name = "запускРаботToolStripMenuItem"; - запускРаботToolStripMenuItem.Size = new Size(114, 24); + запускРаботToolStripMenuItem.Size = new Size(136, 29); запускРаботToolStripMenuItem.Text = "Запуск работ"; запускРаботToolStripMenuItem.Click += запускРаботToolStripMenuItem_Click; // + // письмаToolStripMenuItem + // + письмаToolStripMenuItem.Name = "письмаToolStripMenuItem"; + письмаToolStripMenuItem.Size = new Size(90, 29); + письмаToolStripMenuItem.Text = "Письма"; + письмаToolStripMenuItem.Click += письмаToolStripMenuItem_Click; + // // dataGridView // dataGridView.BackgroundColor = SystemColors.ControlLightLight; dataGridView.ColumnHeadersHeightSizeMode = DataGridViewColumnHeadersHeightSizeMode.AutoSize; - dataGridView.Location = new Point(12, 41); + dataGridView.Location = new Point(15, 51); + dataGridView.Margin = new Padding(4, 4, 4, 4); dataGridView.Name = "dataGridView"; dataGridView.RowHeadersWidth = 51; dataGridView.RowTemplate.Height = 29; - dataGridView.Size = new Size(1123, 423); + dataGridView.Size = new Size(1404, 529); dataGridView.TabIndex = 1; // // buttonCreateOrder // - buttonCreateOrder.Location = new Point(1155, 90); + buttonCreateOrder.Location = new Point(1444, 112); + buttonCreateOrder.Margin = new Padding(4, 4, 4, 4); buttonCreateOrder.Name = "buttonCreateOrder"; - buttonCreateOrder.Size = new Size(189, 57); + buttonCreateOrder.Size = new Size(236, 71); buttonCreateOrder.TabIndex = 2; buttonCreateOrder.Text = "Создать заказ"; buttonCreateOrder.UseVisualStyleBackColor = true; @@ -151,9 +162,10 @@ // // buttonIssuedOrder // - buttonIssuedOrder.Location = new Point(1155, 228); + buttonIssuedOrder.Location = new Point(1444, 285); + buttonIssuedOrder.Margin = new Padding(4, 4, 4, 4); buttonIssuedOrder.Name = "buttonIssuedOrder"; - buttonIssuedOrder.Size = new Size(189, 57); + buttonIssuedOrder.Size = new Size(236, 71); buttonIssuedOrder.TabIndex = 5; buttonIssuedOrder.Text = "Заказ выдан"; buttonIssuedOrder.UseVisualStyleBackColor = true; @@ -161,32 +173,34 @@ // // buttonRef // - buttonRef.Location = new Point(1155, 356); + buttonRef.Location = new Point(1444, 445); + buttonRef.Margin = new Padding(4, 4, 4, 4); buttonRef.Name = "buttonRef"; - buttonRef.Size = new Size(189, 57); + buttonRef.Size = new Size(236, 71); buttonRef.TabIndex = 6; buttonRef.Text = "Обновить список"; 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(145, 29); + создатьБэкапToolStripMenuItem.Text = "Создать бекап"; + создатьБэкапToolStripMenuItem.Click += создатьБекапToolStripMenuItem_Click; // // FormMain // - AutoScaleDimensions = new SizeF(8F, 20F); + AutoScaleDimensions = new SizeF(10F, 25F); AutoScaleMode = AutoScaleMode.Font; - ClientSize = new Size(1367, 471); + ClientSize = new Size(1709, 589); Controls.Add(buttonRef); Controls.Add(buttonIssuedOrder); Controls.Add(buttonCreateOrder); Controls.Add(dataGridView); Controls.Add(menuStrip); MainMenuStrip = menuStrip; + Margin = new Padding(4, 4, 4, 4); Name = "FormMain"; Text = "Магазин подарков"; Load += FormMain_Load; @@ -215,5 +229,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..19cb83b 100644 --- a/GiftShop/GiftShopView/FormMain.cs +++ b/GiftShop/GiftShopView/FormMain.cs @@ -1,5 +1,7 @@ -using GiftShopContracts.BindingModels; +using GiftShopBusinessLogic.BusinessLogics; +using GiftShopContracts.BindingModels; using GiftShopContracts.BusinessLogicsContracts; +using GiftShopContracts.DI; using GiftShopDataModels.Enums; using Microsoft.Extensions.Logging; @@ -15,13 +17,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 +39,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 +51,21 @@ 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 +123,61 @@ 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/FormMain.resx b/GiftShop/GiftShopView/FormMain.resx index 1263609..d114de7 100644 --- a/GiftShop/GiftShopView/FormMain.resx +++ b/GiftShop/GiftShopView/FormMain.resx @@ -1,4 +1,64 @@ - + + + diff --git a/GiftShop/GiftShopView/Program.cs b/GiftShop/GiftShopView/Program.cs index 504be58..0435df5 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() - { - ApplicationConfiguration.Initialize(); - var services = new ServiceCollection(); - ConfigureServices(services); - _serviceProvider = services.BuildServiceProvider(); + internal static class Program + { + [STAThread] + static void Main() + { + ApplicationConfiguration.Initialize(); + var services = new ServiceCollection(); + 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,53 @@ 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(); + + 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(); + } + + 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..2c5ea11 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..8869be1 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..06fe735 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..bb205d1 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..f313689 Binary files /dev/null and b/GiftShop/ImplementationExtensions/GiftShopListImplement.dll differ