diff --git a/.gitignore b/.gitignore index ca1c7a3..f5bc3d3 100644 --- a/.gitignore +++ b/.gitignore @@ -69,6 +69,8 @@ ScaffoldingReadMe.txt # StyleCop StyleCopReport.xml +/CarRepairShop/ImplementationExtensions + # Files built by Visual Studio *_i.c *_p.c diff --git a/CarRepairShop/CarRepairShop/DataGridViewExtension.cs b/CarRepairShop/CarRepairShop/DataGridViewExtension.cs new file mode 100644 index 0000000..3903314 --- /dev/null +++ b/CarRepairShop/CarRepairShop/DataGridViewExtension.cs @@ -0,0 +1,51 @@ +using CarRepairShopContracts.Attributes; + +namespace CarRepairShop +{ + 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/CarRepairShop/CarRepairShop/FormClients.cs b/CarRepairShop/CarRepairShop/FormClients.cs index cbe698f..4114fa3 100644 --- a/CarRepairShop/CarRepairShop/FormClients.cs +++ b/CarRepairShop/CarRepairShop/FormClients.cs @@ -19,15 +19,7 @@ namespace CarRepairShop { try { - 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; - } + DataGridView.FillandConfigGrid(_logic.ReadList(null)); _logger.LogInformation("Загрузка клиентов"); } catch (Exception ex) diff --git a/CarRepairShop/CarRepairShop/FormComponents.cs b/CarRepairShop/CarRepairShop/FormComponents.cs index e50d691..c3c761b 100644 --- a/CarRepairShop/CarRepairShop/FormComponents.cs +++ b/CarRepairShop/CarRepairShop/FormComponents.cs @@ -1,5 +1,6 @@ using CarRepairShopContracts.BindingModels; using CarRepairShopContracts.BusinessLogicsContracts; +using CarRepairShopContracts.DI; using Microsoft.Extensions.Logging; using System; using System.Collections.Generic; @@ -32,16 +33,9 @@ namespace CarRepairShop { 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, "Ошибка загрузки компонентов"); @@ -51,7 +45,7 @@ namespace CarRepairShop } private void ButtonAdd_Click(object sender, EventArgs e) { - var service = Program.ServiceProvider?.GetService(typeof(FormComponent)); + var service = DependencyManager.Instance.Resolve(); if (service is FormComponent form) { if (form.ShowDialog() == DialogResult.OK) @@ -64,11 +58,10 @@ namespace CarRepairShop { if (dataGridView.SelectedRows.Count == 1) { - var service = Program.ServiceProvider?.GetService(typeof(FormComponent)); + var service = DependencyManager.Instance.Resolve(); if (service is FormComponent form) { - form.Id = - Convert.ToInt32(dataGridView.SelectedRows[0].Cells["Id"].Value); + form.Id = Convert.ToInt32(dataGridView.SelectedRows[0].Cells["Id"].Value); if (form.ShowDialog() == DialogResult.OK) { LoadData(); diff --git a/CarRepairShop/CarRepairShop/FormImplementers.cs b/CarRepairShop/CarRepairShop/FormImplementers.cs index 3cb3278..5fbc8ef 100644 --- a/CarRepairShop/CarRepairShop/FormImplementers.cs +++ b/CarRepairShop/CarRepairShop/FormImplementers.cs @@ -1,6 +1,8 @@ using CarRepairShopContracts.BindingModels; using CarRepairShopContracts.BusinessLogicsContracts; +using CarRepairShopContracts.DI; using Microsoft.Extensions.Logging; +using System.Windows.Forms; namespace CarRepairShop { @@ -24,20 +26,7 @@ namespace CarRepairShop { try { - var list = _logic.ReadList(null); - if (list != null) - { - dataGridView.DataSource = list; - dataGridView.Columns["Id"].Visible = false; - dataGridView.Columns["ImplementerFIO"].AutoSizeMode = - DataGridViewAutoSizeColumnMode.Fill; - dataGridView.Columns["Password"].AutoSizeMode = - DataGridViewAutoSizeColumnMode.Fill; - dataGridView.Columns["Qualification"].AutoSizeMode = - DataGridViewAutoSizeColumnMode.Fill; - dataGridView.Columns["WorkExperience"].AutoSizeMode = - DataGridViewAutoSizeColumnMode.Fill; - } + dataGridView.FillandConfigGrid(_logic.ReadList(null)); _logger.LogInformation("Загрузка компонентов"); } catch (Exception ex) @@ -49,7 +38,7 @@ namespace CarRepairShop } private void CreateButton_Click(object sender, EventArgs e) { - var service = Program.ServiceProvider?.GetService(typeof(FormImplementer)); + var service = DependencyManager.Instance.Resolve(); if (service is FormImplementer form) { if (form.ShowDialog() == DialogResult.OK) @@ -64,7 +53,7 @@ namespace CarRepairShop if (dataGridView.SelectedRows.Count == 1) { var service = - Program.ServiceProvider?.GetService(typeof(FormImplementer)); + DependencyManager.Instance.Resolve(); if (service is FormImplementer form) { form.Id = diff --git a/CarRepairShop/CarRepairShop/FormMails.cs b/CarRepairShop/CarRepairShop/FormMails.cs index 4e8e782..68ff1ab 100644 --- a/CarRepairShop/CarRepairShop/FormMails.cs +++ b/CarRepairShop/CarRepairShop/FormMails.cs @@ -18,14 +18,7 @@ namespace CarRepairShop { 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/CarRepairShop/CarRepairShop/FormMain.Designer.cs b/CarRepairShop/CarRepairShop/FormMain.Designer.cs index fb23cb4..26084f4 100644 --- a/CarRepairShop/CarRepairShop/FormMain.Designer.cs +++ b/CarRepairShop/CarRepairShop/FormMain.Designer.cs @@ -39,13 +39,14 @@ компонентыПоРемонтуToolStripMenuItem = new ToolStripMenuItem(); списокЗаказовToolStripMenuItem = new ToolStripMenuItem(); запускРаботToolStripMenuItem1 = new ToolStripMenuItem(); + почтаToolStripMenuItem = new ToolStripMenuItem(); dataGridView = new DataGridView(); buttonCreateOrder = new Button(); buttonTakeOrderInWork = new Button(); buttonOrderReady = new Button(); buttonIssuedOrder = new Button(); buttonRefresh = new Button(); - почтаToolStripMenuItem = new ToolStripMenuItem(); + создатьБэкапToolStripMenuItem = new ToolStripMenuItem(); menuStrip.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)dataGridView).BeginInit(); SuspendLayout(); @@ -53,7 +54,7 @@ // menuStrip // menuStrip.ImageScalingSize = new Size(20, 20); - menuStrip.Items.AddRange(new ToolStripItem[] { справочникиToolStripMenuItem, отчётыToolStripMenuItem, запускРаботToolStripMenuItem1, почтаToolStripMenuItem }); + menuStrip.Items.AddRange(new ToolStripItem[] { справочникиToolStripMenuItem, отчётыToolStripMenuItem, запускРаботToolStripMenuItem1, почтаToolStripMenuItem, создатьБэкапToolStripMenuItem }); menuStrip.Location = new Point(0, 0); menuStrip.Name = "menuStrip"; menuStrip.Size = new Size(1542, 28); @@ -130,6 +131,13 @@ запускРаботToolStripMenuItem1.Text = "Запуск работ"; запускРаботToolStripMenuItem1.Click += StartingWorkToolStripMenuItem_Click; // + // почтаToolStripMenuItem + // + почтаToolStripMenuItem.Name = "почтаToolStripMenuItem"; + почтаToolStripMenuItem.Size = new Size(65, 24); + почтаToolStripMenuItem.Text = "Почта"; + почтаToolStripMenuItem.Click += MailToolStripMenuItem_Click; + // // dataGridView // dataGridView.AllowUserToAddRows = false; @@ -192,12 +200,12 @@ buttonRefresh.UseVisualStyleBackColor = true; buttonRefresh.Click += ButtonRef_Click; // - // почтаToolStripMenuItem + // создатьБэкапToolStripMenuItem // - почтаToolStripMenuItem.Name = "почтаToolStripMenuItem"; - почтаToolStripMenuItem.Size = new Size(65, 24); - почтаToolStripMenuItem.Text = "Почта"; - почтаToolStripMenuItem.Click += MailToolStripMenuItem_Click; + создатьБэкапToolStripMenuItem.Name = "создатьБэкапToolStripMenuItem"; + создатьБэкапToolStripMenuItem.Size = new Size(122, 24); + создатьБэкапToolStripMenuItem.Text = "Создать бэкап"; + создатьБэкапToolStripMenuItem.Click += CreateBackUpToolStripMenuItem_Click; // // FormMain // @@ -243,5 +251,6 @@ private ToolStripMenuItem исполнителиToolStripMenuItem; private ToolStripMenuItem запускРаботToolStripMenuItem1; private ToolStripMenuItem почтаToolStripMenuItem; + private ToolStripMenuItem создатьБэкапToolStripMenuItem; } } \ No newline at end of file diff --git a/CarRepairShop/CarRepairShop/FormMain.cs b/CarRepairShop/CarRepairShop/FormMain.cs index 5b9004d..b0b95aa 100644 --- a/CarRepairShop/CarRepairShop/FormMain.cs +++ b/CarRepairShop/CarRepairShop/FormMain.cs @@ -1,5 +1,6 @@ using CarRepairShopContracts.BindingModels; using CarRepairShopContracts.BusinessLogicsContracts; +using CarRepairShopContracts.DI; using CarRepairShopDataModels.Enums; using Microsoft.Extensions.Logging; @@ -11,13 +12,15 @@ namespace CarRepairShop private readonly IOrderLogic _orderLogic; private readonly IReportLogic _reportLogic; private readonly IWorkProcess _workProcess; - public FormMain(ILogger logger, IOrderLogic orderLogic, IReportLogic reportLogic, IWorkProcess workProcess) + private readonly IBackUpLogic _backUpLogic; + public FormMain(ILogger logger, IOrderLogic orderLogic, IReportLogic reportLogic, IWorkProcess workProcess, IBackUpLogic backUpLogic) { InitializeComponent(); _logger = logger; _orderLogic = orderLogic; _reportLogic = reportLogic; _workProcess = workProcess; + _backUpLogic = backUpLogic; } private void FormMain_Load(object sender, EventArgs e) { @@ -28,15 +31,7 @@ namespace CarRepairShop _logger.LogInformation("Загрузка заказов"); try { - var list = _orderLogic.ReadList(null); - if (list != null) - { - dataGridView.DataSource = list; - dataGridView.Columns["RepairId"].Visible = false; - dataGridView.Columns["ClientId"].Visible = false; - dataGridView.Columns["ImplementerId"].Visible = false; - dataGridView.Columns["RepairName"].AutoSizeMode = DataGridViewAutoSizeColumnMode.Fill; - } + dataGridView.FillandConfigGrid(_orderLogic.ReadList(null)); _logger.LogInformation("Загрузка заказов"); } catch (Exception ex) @@ -48,7 +43,7 @@ namespace CarRepairShop private void ComponentsToolStripMenuItem_Click(object sender, EventArgs e) { var service = - Program.ServiceProvider?.GetService(typeof(FormComponents)); + DependencyManager.Instance.Resolve(); if (service is FormComponents form) { form.ShowDialog(); @@ -56,7 +51,7 @@ namespace CarRepairShop } private void RepairToolStripMenuItem_Click(object sender, EventArgs e) { - var service = Program.ServiceProvider?.GetService(typeof(FormRepairs)); + var service = DependencyManager.Instance.Resolve(); if (service is FormRepairs form) { form.ShowDialog(); @@ -78,7 +73,7 @@ namespace CarRepairShop } private void RepairComponentToolStripMenuItem_Click(object sender, EventArgs e) { - var service = Program.ServiceProvider?.GetService(typeof(FormReportRepairComponents)); + var service = DependencyManager.Instance.Resolve(); if (service is FormReportRepairComponents form) { form.ShowDialog(); @@ -86,7 +81,7 @@ namespace CarRepairShop } private void ListOrderToolStripMenuItem_Click(object sender, EventArgs e) { - var service = Program.ServiceProvider?.GetService(typeof(FormReportOrders)); + var service = DependencyManager.Instance.Resolve(); if (service is FormReportOrders form) { form.ShowDialog(); @@ -94,7 +89,7 @@ namespace CarRepairShop } private void ClientsToolStripMenuItem_Click(object sender, EventArgs e) { - var service = Program.ServiceProvider?.GetService(typeof(FormClients)); + var service = DependencyManager.Instance.Resolve(); if (service is FormClients form) { form.ShowDialog(); @@ -102,7 +97,7 @@ namespace CarRepairShop } private void ImplementersToolStripMenuItem_Click(object sender, EventArgs e) { - var service = Program.ServiceProvider?.GetService(typeof(FormImplementers)); + var service = DependencyManager.Instance.Resolve(); if (service is FormImplementers form) { form.ShowDialog(); @@ -111,15 +106,14 @@ namespace CarRepairShop private void StartingWorkToolStripMenuItem_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 ButtonCreateOrder_Click(object sender, EventArgs e) { - var service = Program.ServiceProvider?.GetService(typeof(FormCreateOrder)); + var service = DependencyManager.Instance.Resolve(); if (service is FormCreateOrder form) { form.ShowDialog(); @@ -218,11 +212,36 @@ namespace CarRepairShop } private void MailToolStripMenuItem_Click(object sender, EventArgs e) { - var service = Program.ServiceProvider?.GetService(typeof(FormMails)); + var service = DependencyManager.Instance.Resolve(); if (service is FormMails form) { form.ShowDialog(); } } + private void CreateBackUpToolStripMenuItem_Click(object sender, EventArgs e) + { + try + { + if (_backUpLogic != null) + { + var fbd = new FolderBrowserDialog(); + if (fbd.ShowDialog() == DialogResult.OK) + { + _backUpLogic.CreateBackUp(new BackUpSaveBinidngModel + { + FolderName = fbd.SelectedPath + }); + MessageBox.Show("Бекап создан", "Сообщение", + MessageBoxButtons.OK, MessageBoxIcon.Information); + } + } + } + catch (Exception ex) + { + MessageBox.Show(ex.Message, "Ошибка", MessageBoxButtons.OK, + MessageBoxIcon.Error); + } + + } } } diff --git a/CarRepairShop/CarRepairShop/FormRepair.cs b/CarRepairShop/CarRepairShop/FormRepair.cs index 7603346..46c734f 100644 --- a/CarRepairShop/CarRepairShop/FormRepair.cs +++ b/CarRepairShop/CarRepairShop/FormRepair.cs @@ -1,5 +1,6 @@ using CarRepairShopContracts.BindingModels; using CarRepairShopContracts.BusinessLogicsContracts; +using CarRepairShopContracts.DI; using CarRepairShopContracts.SearchModels; using CarRepairShopDataModels.Models; using Microsoft.Extensions.Logging; @@ -72,7 +73,7 @@ namespace CarRepairShop private void ButtonAdd_Click(object sender, EventArgs e) { var service = - Program.ServiceProvider?.GetService(typeof(FormRepairComponent)); + DependencyManager.Instance.Resolve(); if (service is FormRepairComponent form) { if (form.ShowDialog() == DialogResult.OK) @@ -101,7 +102,7 @@ namespace CarRepairShop if (dataGridViewComponents.SelectedRows.Count == 1) { var service = - Program.ServiceProvider?.GetService(typeof(FormRepairComponent)); + DependencyManager.Instance.Resolve(); if (service is FormRepairComponent form) { int id = diff --git a/CarRepairShop/CarRepairShop/FormRepairs.cs b/CarRepairShop/CarRepairShop/FormRepairs.cs index ab0c331..4b06846 100644 --- a/CarRepairShop/CarRepairShop/FormRepairs.cs +++ b/CarRepairShop/CarRepairShop/FormRepairs.cs @@ -1,5 +1,6 @@ using CarRepairShopContracts.BindingModels; using CarRepairShopContracts.BusinessLogicsContracts; +using CarRepairShopContracts.DI; using Microsoft.Extensions.Logging; namespace CarRepairShop @@ -24,15 +25,8 @@ namespace CarRepairShop { try { - var list = _logic.ReadList(null); - if (list != null) - { - dataGridView.DataSource = list; - dataGridView.Columns["Id"].Visible = false; - dataGridView.Columns["RepairName"].AutoSizeMode = DataGridViewAutoSizeColumnMode.Fill; - dataGridView.Columns["RepairComponents"].Visible = false; - } - _logger.LogInformation("Загрузка ремонтов"); + dataGridView.FillandConfigGrid(_logic.ReadList(null)); + _logger.LogInformation("Загрузка ремонтов"); } catch (Exception ex) { @@ -43,7 +37,7 @@ namespace CarRepairShop private void ButtonAdd_Click(object sender, EventArgs e) { - var service = Program.ServiceProvider?.GetService(typeof(FormRepair)); + var service = DependencyManager.Instance.Resolve(); if (service is FormRepair form) { if (form.ShowDialog() == DialogResult.OK) @@ -57,7 +51,7 @@ namespace CarRepairShop { if (dataGridView.SelectedRows.Count == 1) { - var service = Program.ServiceProvider?.GetService(typeof(FormRepair)); + var service = DependencyManager.Instance.Resolve(); if (service is FormRepair form) { var tmp = Convert.ToInt32(dataGridView.SelectedRows[0].Cells["Id"].Value); diff --git a/CarRepairShop/CarRepairShop/Program.cs b/CarRepairShop/CarRepairShop/Program.cs index b8c1735..b238a91 100644 --- a/CarRepairShop/CarRepairShop/Program.cs +++ b/CarRepairShop/CarRepairShop/Program.cs @@ -9,13 +9,12 @@ using Microsoft.Extensions.Logging; using NLog.Extensions.Logging; using CarRepairShopBusinessLogic.MailWorker; using CarRepairShopContracts.BindingModels; +using CarRepairShopContracts.DI; namespace CarRepairShop { internal static class Program { - private static ServiceProvider? _serviceProvider; - public static ServiceProvider? ServiceProvider => _serviceProvider; /// /// The main entry point for the application. /// @@ -24,14 +23,13 @@ namespace CarRepairShop { // To customize application configuration such as set high DPI settings or default font, // see https://aka.ms/applicationconfiguration. - ApplicationConfiguration.Initialize(); - var services = new ServiceCollection(); - ConfigureServices(services); - _serviceProvider = services.BuildServiceProvider(); + ApplicationConfiguration.Initialize(); + var services = new ServiceCollection(); + InitDependency(); try { var mailSender = - _serviceProvider.GetService(); + DependencyManager.Instance.Resolve(); mailSender?.MailConfig(new MailConfigBindingModel { MailLogin = System.Configuration.ConfigurationManager.AppSettings["MailLogin"] ?? @@ -49,52 +47,54 @@ namespace CarRepairShop } catch (Exception ex) { - var logger = _serviceProvider.GetService(); + var logger = DependencyManager.Instance.Resolve(); logger?.LogError(ex, " "); } - Application.Run(_serviceProvider.GetRequiredService()); + Application.Run(DependencyManager.Instance.Resolve()); } - private static void ConfigureServices(ServiceCollection services) - { - services.AddLogging(option => + private static void InitDependency() + { + DependencyManager.InitDependency(); + DependencyManager.Instance.AddLogging(option => { option.SetMinimumLevel(LogLevel.Information); option.AddNLog("nlog.config"); }); - services.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(); - 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(); + DependencyManager.Instance.RegisterType(true); + DependencyManager.Instance.RegisterType(); + DependencyManager.Instance.RegisterType(); + DependencyManager.Instance.RegisterType(); + DependencyManager.Instance.RegisterType(); + DependencyManager.Instance.RegisterType(); + DependencyManager.Instance.RegisterType(); + DependencyManager.Instance.RegisterType(); + DependencyManager.Instance.RegisterType(); + DependencyManager.Instance.RegisterType(); + DependencyManager.Instance.RegisterType(); + DependencyManager.Instance.RegisterType(); + DependencyManager.Instance.RegisterType(); + DependencyManager.Instance.RegisterType(); + DependencyManager.Instance.RegisterType(); + 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(); + DependencyManager.Instance.RegisterType(); } private static void MailCheck(object obj) => - ServiceProvider?.GetService()?.MailCheck(); + DependencyManager.Instance.Resolve()?.MailCheck(); } } \ No newline at end of file diff --git a/CarRepairShop/CarRepairShopBusinessLogic/BusinessLogics/BackUpLogic.cs b/CarRepairShop/CarRepairShopBusinessLogic/BusinessLogics/BackUpLogic.cs new file mode 100644 index 0000000..1123fac --- /dev/null +++ b/CarRepairShop/CarRepairShopBusinessLogic/BusinessLogics/BackUpLogic.cs @@ -0,0 +1,101 @@ +using CarRepairShopContracts.BindingModels; +using CarRepairShopContracts.BusinessLogicsContracts; +using CarRepairShopContracts.StoragesContracts; +using CarRepairShopDataModels; +using Microsoft.Extensions.Logging; +using System.IO.Compression; +using System.Reflection; +using System.Runtime.Serialization.Json; + + +namespace CarRepairShopBusinessLogic.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/CarRepairShop/CarRepairShopContracts/Attributes/ColumnAttribute.cs b/CarRepairShop/CarRepairShopContracts/Attributes/ColumnAttribute.cs new file mode 100644 index 0000000..acc5d99 --- /dev/null +++ b/CarRepairShop/CarRepairShopContracts/Attributes/ColumnAttribute.cs @@ -0,0 +1,21 @@ +namespace CarRepairShopContracts.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; } + } +} \ No newline at end of file diff --git a/CarRepairShop/CarRepairShopContracts/Attributes/GridViewAutoSize.cs b/CarRepairShop/CarRepairShopContracts/Attributes/GridViewAutoSize.cs new file mode 100644 index 0000000..5dec5ae --- /dev/null +++ b/CarRepairShop/CarRepairShopContracts/Attributes/GridViewAutoSize.cs @@ -0,0 +1,14 @@ +namespace CarRepairShopContracts.Attributes +{ + public enum GridViewAutoSize + { + NotSet = 0, + None = 1, + ColumnHeader = 2, + AllCellsExceptHeader = 4, + AllCells = 6, + DisplayedCellsExceptHeader = 8, + DisplayedCells = 10, + Fill = 16 + } +} \ No newline at end of file diff --git a/CarRepairShop/CarRepairShopContracts/BindingModels/BackUpSaveBinidngModel.cs b/CarRepairShop/CarRepairShopContracts/BindingModels/BackUpSaveBinidngModel.cs new file mode 100644 index 0000000..ffba2b2 --- /dev/null +++ b/CarRepairShop/CarRepairShopContracts/BindingModels/BackUpSaveBinidngModel.cs @@ -0,0 +1,8 @@ +namespace CarRepairShopContracts.BindingModels +{ + public class BackUpSaveBinidngModel + { + public string FolderName { get; set; } = string.Empty; + } + +} diff --git a/CarRepairShop/CarRepairShopContracts/BindingModels/MessageInfoBindingModel.cs b/CarRepairShop/CarRepairShopContracts/BindingModels/MessageInfoBindingModel.cs index 765e9dd..8481aad 100644 --- a/CarRepairShop/CarRepairShopContracts/BindingModels/MessageInfoBindingModel.cs +++ b/CarRepairShop/CarRepairShopContracts/BindingModels/MessageInfoBindingModel.cs @@ -15,5 +15,6 @@ namespace CarRepairShopContracts.BindingModels public string Body { get; set; } = string.Empty; public DateTime DateDelivery { get; set; } + public int Id => throw new NotImplementedException(); } } diff --git a/CarRepairShop/CarRepairShopContracts/BusinessLogicsContracts/IBackUpLogic.cs b/CarRepairShop/CarRepairShopContracts/BusinessLogicsContracts/IBackUpLogic.cs new file mode 100644 index 0000000..f019972 --- /dev/null +++ b/CarRepairShop/CarRepairShopContracts/BusinessLogicsContracts/IBackUpLogic.cs @@ -0,0 +1,9 @@ +using CarRepairShopContracts.BindingModels; + +namespace CarRepairShopContracts.BusinessLogicsContracts +{ + public interface IBackUpLogic + { + void CreateBackUp(BackUpSaveBinidngModel model); + } +} diff --git a/CarRepairShop/CarRepairShopContracts/CarRepairShopContracts.csproj b/CarRepairShop/CarRepairShopContracts/CarRepairShopContracts.csproj index 215400f..b431c81 100644 --- a/CarRepairShop/CarRepairShopContracts/CarRepairShopContracts.csproj +++ b/CarRepairShop/CarRepairShopContracts/CarRepairShopContracts.csproj @@ -6,6 +6,10 @@ enable + + + + diff --git a/CarRepairShop/CarRepairShopContracts/DI/DependencyManager.cs b/CarRepairShop/CarRepairShopContracts/DI/DependencyManager.cs new file mode 100644 index 0000000..c3743df --- /dev/null +++ b/CarRepairShop/CarRepairShopContracts/DI/DependencyManager.cs @@ -0,0 +1,41 @@ +using Microsoft.Extensions.Logging; + +namespace CarRepairShopContracts.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/CarRepairShop/CarRepairShopContracts/DI/IDependencyContainer.cs b/CarRepairShop/CarRepairShopContracts/DI/IDependencyContainer.cs new file mode 100644 index 0000000..632bbad --- /dev/null +++ b/CarRepairShop/CarRepairShopContracts/DI/IDependencyContainer.cs @@ -0,0 +1,13 @@ +using Microsoft.Extensions.Logging; + +namespace CarRepairShopContracts.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/CarRepairShop/CarRepairShopContracts/DI/IImplementationExtension.cs b/CarRepairShop/CarRepairShopContracts/DI/IImplementationExtension.cs new file mode 100644 index 0000000..8f19cd2 --- /dev/null +++ b/CarRepairShop/CarRepairShopContracts/DI/IImplementationExtension.cs @@ -0,0 +1,9 @@ +namespace CarRepairShopContracts.DI +{ + public interface IImplementationExtension + { + public int Priority { get; } + public void RegisterServices(); + + } +} diff --git a/CarRepairShop/CarRepairShopContracts/DI/ServiceDependencyContainer.cs b/CarRepairShop/CarRepairShopContracts/DI/ServiceDependencyContainer.cs new file mode 100644 index 0000000..2e2d9be --- /dev/null +++ b/CarRepairShop/CarRepairShopContracts/DI/ServiceDependencyContainer.cs @@ -0,0 +1,57 @@ +using Microsoft.Extensions.DependencyInjection; +using Microsoft.Extensions.Logging; + +namespace CarRepairShopContracts.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/CarRepairShop/CarRepairShopContracts/DI/ServiceProviderLoader.cs b/CarRepairShop/CarRepairShopContracts/DI/ServiceProviderLoader.cs new file mode 100644 index 0000000..7ffe990 --- /dev/null +++ b/CarRepairShop/CarRepairShopContracts/DI/ServiceProviderLoader.cs @@ -0,0 +1,54 @@ +using System.Reflection; + +namespace CarRepairShopContracts.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/CarRepairShop/CarRepairShopContracts/StoragesContracts/IBackUpInfo.cs b/CarRepairShop/CarRepairShopContracts/StoragesContracts/IBackUpInfo.cs new file mode 100644 index 0000000..7c35887 --- /dev/null +++ b/CarRepairShop/CarRepairShopContracts/StoragesContracts/IBackUpInfo.cs @@ -0,0 +1,8 @@ +namespace CarRepairShopContracts.StoragesContracts +{ + public interface IBackUpInfo + { + List? GetList() where T : class, new(); + Type? GetTypeByModelInterface(string modelInterfaceName); + } +} diff --git a/CarRepairShop/CarRepairShopContracts/ViewModels/ClientViewModel.cs b/CarRepairShop/CarRepairShopContracts/ViewModels/ClientViewModel.cs index 67aa5d3..035f94a 100644 --- a/CarRepairShop/CarRepairShopContracts/ViewModels/ClientViewModel.cs +++ b/CarRepairShop/CarRepairShopContracts/ViewModels/ClientViewModel.cs @@ -1,16 +1,17 @@ -using CarRepairShopDataModels; -using System.ComponentModel; +using CarRepairShopContracts.Attributes; +using CarRepairShopDataModels; namespace CarRepairShopContracts.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/CarRepairShop/CarRepairShopContracts/ViewModels/ComponentViewModel.cs b/CarRepairShop/CarRepairShopContracts/ViewModels/ComponentViewModel.cs index 7958153..560d6b0 100644 --- a/CarRepairShop/CarRepairShopContracts/ViewModels/ComponentViewModel.cs +++ b/CarRepairShop/CarRepairShopContracts/ViewModels/ComponentViewModel.cs @@ -1,14 +1,15 @@ -using CarRepairShopDataModels.Models; -using System.ComponentModel; +using CarRepairShopContracts.Attributes; +using CarRepairShopDataModels.Models; namespace CarRepairShopContracts.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/CarRepairShop/CarRepairShopContracts/ViewModels/ImplementerViewModel.cs b/CarRepairShop/CarRepairShopContracts/ViewModels/ImplementerViewModel.cs index e5a2fba..b18dc54 100644 --- a/CarRepairShop/CarRepairShopContracts/ViewModels/ImplementerViewModel.cs +++ b/CarRepairShop/CarRepairShopContracts/ViewModels/ImplementerViewModel.cs @@ -1,18 +1,19 @@ -using CarRepairShopDataModels; -using System.ComponentModel; +using CarRepairShopContracts.Attributes; +using CarRepairShopDataModels; namespace CarRepairShopContracts.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/CarRepairShop/CarRepairShopContracts/ViewModels/MessageInfoViewModel.cs b/CarRepairShop/CarRepairShopContracts/ViewModels/MessageInfoViewModel.cs index 724ad80..f202d38 100644 --- a/CarRepairShop/CarRepairShopContracts/ViewModels/MessageInfoViewModel.cs +++ b/CarRepairShop/CarRepairShopContracts/ViewModels/MessageInfoViewModel.cs @@ -1,19 +1,24 @@ -using CarRepairShopDataModels; +using CarRepairShopContracts.Attributes; +using CarRepairShopDataModels; using System.ComponentModel; namespace CarRepairShopContracts.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/CarRepairShop/CarRepairShopContracts/ViewModels/OrderViewModel.cs b/CarRepairShop/CarRepairShopContracts/ViewModels/OrderViewModel.cs index 7cddd0b..b552c41 100644 --- a/CarRepairShop/CarRepairShopContracts/ViewModels/OrderViewModel.cs +++ b/CarRepairShop/CarRepairShopContracts/ViewModels/OrderViewModel.cs @@ -1,32 +1,34 @@ -using CarRepairShopDataModels; +using CarRepairShopContracts.Attributes; +using CarRepairShopDataModels; using CarRepairShopDataModels.Enums; -using CarRepairShopDataModels.Models; -using System.ComponentModel; namespace CarRepairShopContracts.ViewModels { public class OrderViewModel : IOrderModel { - [DisplayName("Номер")] - public int Id { get; set; } - public int RepairId { get; set; } - [DisplayName("Ремонт")] - public string RepairName { get; set; } = string.Empty; - public int ClientId { get; set; } - [DisplayName("Клиент")] - public string ClientFIO { get; set; } = string.Empty; + [Column(title: "Номер", gridViewAutoSize: GridViewAutoSize.AllCells, isUseAutoSize: true)] + public int Id { get; set; } + [Column(visible: false)] + public int RepairId { get; set; } + [Column(title: "Ремонт", gridViewAutoSize: GridViewAutoSize.AllCells, isUseAutoSize: true)] + public string RepairName { get; set; } = string.Empty; + [Column(visible: false)] + public int ClientId { get; set; } + [Column(title: "ФИО клиента", gridViewAutoSize: GridViewAutoSize.Fill, isUseAutoSize: true)] + public string ClientFIO { get; set; } = string.Empty; + [Column(visible: false)] public int? ImplementerId { get; set; } = null; - [DisplayName("Исполнитель")] + [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; } + [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; } } } diff --git a/CarRepairShop/CarRepairShopContracts/ViewModels/RepairViewModel.cs b/CarRepairShop/CarRepairShopContracts/ViewModels/RepairViewModel.cs index e6776f7..352d8f1 100644 --- a/CarRepairShop/CarRepairShopContracts/ViewModels/RepairViewModel.cs +++ b/CarRepairShop/CarRepairShopContracts/ViewModels/RepairViewModel.cs @@ -1,15 +1,17 @@ -using CarRepairShopDataModels.Models; -using System.ComponentModel; +using CarRepairShopContracts.Attributes; +using CarRepairShopDataModels.Models; namespace CarRepairShopContracts.ViewModels { public class RepairViewModel : IRepairModel { - public int Id { get; set; } - [DisplayName("Название ремонта")] - public string RepairName { get; set; } = string.Empty; - [DisplayName("Цена")] - public double Price { get; set; } - public Dictionary RepairComponents { get; set; } = new(); + [Column(visible: false)] + public int Id { get; set; } + [Column(title: "Название ремонта", gridViewAutoSize: GridViewAutoSize.Fill, isUseAutoSize: true)] + public string RepairName { get; set; } = string.Empty; + [Column(title: "Цена", width: 100)] + public double Price { get; set; } + [Column(visible: false)] + public Dictionary RepairComponents { get; set; } = new(); } } diff --git a/CarRepairShop/CarRepairShopDataModels/IMessageInfoModel.cs b/CarRepairShop/CarRepairShopDataModels/IMessageInfoModel.cs index 7a12450..baa6092 100644 --- a/CarRepairShop/CarRepairShopDataModels/IMessageInfoModel.cs +++ b/CarRepairShop/CarRepairShopDataModels/IMessageInfoModel.cs @@ -1,6 +1,6 @@ namespace CarRepairShopDataModels { - public interface IMessageInfoModel + public interface IMessageInfoModel : IId { string MessageId { get; } int? ClientId { get; } diff --git a/CarRepairShop/CarRepairShopDatabaseImplement/CarRepairShopDatabaseImplement.csproj b/CarRepairShop/CarRepairShopDatabaseImplement/CarRepairShopDatabaseImplement.csproj index 792b545..a592eac 100644 --- a/CarRepairShop/CarRepairShopDatabaseImplement/CarRepairShopDatabaseImplement.csproj +++ b/CarRepairShop/CarRepairShopDatabaseImplement/CarRepairShopDatabaseImplement.csproj @@ -20,4 +20,8 @@ + + + + diff --git a/CarRepairShop/CarRepairShopDatabaseImplement/DatabaseImplementationExtension.cs b/CarRepairShop/CarRepairShopDatabaseImplement/DatabaseImplementationExtension.cs new file mode 100644 index 0000000..34ed73d --- /dev/null +++ b/CarRepairShop/CarRepairShopDatabaseImplement/DatabaseImplementationExtension.cs @@ -0,0 +1,27 @@ +using CarRepairShopContracts.DI; +using CarRepairShopContracts.StoragesContracts; +using CarRepairShopDatabaseImplement.Implements; + +namespace CarRepairShopDatabaseImplement +{ + 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/CarRepairShop/CarRepairShopDatabaseImplement/Implements/BackUpInfo.cs b/CarRepairShop/CarRepairShopDatabaseImplement/Implements/BackUpInfo.cs new file mode 100644 index 0000000..166bbbb --- /dev/null +++ b/CarRepairShop/CarRepairShopDatabaseImplement/Implements/BackUpInfo.cs @@ -0,0 +1,28 @@ +using CarRepairShopContracts.StoragesContracts; + +namespace CarRepairShopDatabaseImplement.Implements +{ + public class BackUpInfo : IBackUpInfo + { + public List? GetList() where T : class, new() + { + using var context = new RepairsShopDatabase(); + 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/CarRepairShop/CarRepairShopDatabaseImplement/Models/Client.cs b/CarRepairShop/CarRepairShopDatabaseImplement/Models/Client.cs index 4cf5730..4b975bd 100644 --- a/CarRepairShop/CarRepairShopDatabaseImplement/Models/Client.cs +++ b/CarRepairShop/CarRepairShopDatabaseImplement/Models/Client.cs @@ -3,17 +3,23 @@ using CarRepairShopContracts.ViewModels; using CarRepairShopDataModels; using System.ComponentModel.DataAnnotations.Schema; using System.ComponentModel.DataAnnotations; +using System.Runtime.Serialization; namespace CarRepairShopDatabaseImplement.Models { - public class Client : IClientModel + [DataContract] + public class Client : IClientModel { - public int Id { get; private set; } - [Required] + [DataMember] + public int Id { get; private set; } + [DataMember] + [Required] public string ClientFIO { get; private set; } = string.Empty; - [Required] + [DataMember] + [Required] public string Email { get; set; } = string.Empty; - [Required] + [DataMember] + [Required] public string Password { get; set; } = string.Empty; [ForeignKey("ClientId")] public virtual List Orders { get; set; } = new(); diff --git a/CarRepairShop/CarRepairShopDatabaseImplement/Models/Component.cs b/CarRepairShop/CarRepairShopDatabaseImplement/Models/Component.cs index fdf1ef2..2056508 100644 --- a/CarRepairShop/CarRepairShopDatabaseImplement/Models/Component.cs +++ b/CarRepairShop/CarRepairShopDatabaseImplement/Models/Component.cs @@ -3,15 +3,20 @@ using CarRepairShopContracts.ViewModels; using CarRepairShopDataModels.Models; using System.ComponentModel.DataAnnotations.Schema; using System.ComponentModel.DataAnnotations; +using System.Runtime.Serialization; namespace CarRepairShopDatabaseImplement.Models { - public class Component : IComponentModel + [DataContract] + public class Component : IComponentModel { - public int Id { get; private set; } - [Required] + [DataMember] + public int Id { get; private set; } + [DataMember] + [Required] public string ComponentName { get; private set; } = string.Empty; - [Required] + [DataMember] + [Required] public double Cost { get; set; } [ForeignKey("ComponentId")] public virtual List RepairComponents { get; set; } = new(); diff --git a/CarRepairShop/CarRepairShopDatabaseImplement/Models/MessageInfo.cs b/CarRepairShop/CarRepairShopDatabaseImplement/Models/MessageInfo.cs index 7b6c807..0a16abc 100644 --- a/CarRepairShop/CarRepairShopDatabaseImplement/Models/MessageInfo.cs +++ b/CarRepairShop/CarRepairShopDatabaseImplement/Models/MessageInfo.cs @@ -2,17 +2,29 @@ using CarRepairShopContracts.ViewModels; using CarRepairShopDataModels; using System.ComponentModel.DataAnnotations; +using System.ComponentModel.DataAnnotations.Schema; +using System.Runtime.Serialization; namespace CarRepairShopDatabaseImplement.Models { + + [DataContract] public class MessageInfo : IMessageInfoModel { + [NotMapped] + public int Id { get; private set; } + [DataMember] [Key] 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 Client? Client { get; private set; } public static MessageInfo? Create(RepairsShopDatabase context, MessageInfoBindingModel model) diff --git a/CarRepairShop/CarRepairShopDatabaseImplement/Models/Order.cs b/CarRepairShop/CarRepairShopDatabaseImplement/Models/Order.cs index e65efc2..d8de48b 100644 --- a/CarRepairShop/CarRepairShopDatabaseImplement/Models/Order.cs +++ b/CarRepairShop/CarRepairShopDatabaseImplement/Models/Order.cs @@ -1,28 +1,40 @@ using CarRepairShopContracts.BindingModels; using CarRepairShopContracts.ViewModels; +using CarRepairShopDataModels; using CarRepairShopDataModels.Enums; using System.ComponentModel.DataAnnotations; +using System.Runtime.Serialization; namespace CarRepairShopDatabaseImplement.Models { - public class Order + [DataContract] + public class Order : IOrderModel { - public int Id { get; private set; } - [Required] + [DataMember] + public int Id { get; private set; } + [DataMember] + [Required] public int Count { get; private set; } - [Required] + [DataMember] + [Required] public double Sum { get; private set; } - [Required] + [DataMember] + [Required] public OrderStatus Status { get; private set; } - [Required] + [DataMember] + [Required] public DateTime DateCreate { get; private set; } - public DateTime? DateImplement { get; private set; } - [Required] + [DataMember] + public DateTime? DateImplement { get; private set; } + [DataMember] + [Required] public int RepairId { get; private set; } public virtual Repair? Repair { get; private set; } - [Required] + [DataMember] + [Required] public int ClientId { get; private set; } public virtual Client? Client { get; private set; } + [DataMember] public int? ImplementerId { get; private set; } = null; public virtual Implementer? Implementer { get; private set; } diff --git a/CarRepairShop/CarRepairShopDatabaseImplement/Models/Repair.cs b/CarRepairShop/CarRepairShopDatabaseImplement/Models/Repair.cs index e979943..9877948 100644 --- a/CarRepairShop/CarRepairShopDatabaseImplement/Models/Repair.cs +++ b/CarRepairShop/CarRepairShopDatabaseImplement/Models/Repair.cs @@ -3,18 +3,24 @@ using CarRepairShopContracts.ViewModels; using CarRepairShopDataModels.Models; using System.ComponentModel.DataAnnotations; using System.ComponentModel.DataAnnotations.Schema; +using System.Runtime.Serialization; namespace CarRepairShopDatabaseImplement.Models { - public class Repair : IRepairModel + [DataContract] + public class Repair : IRepairModel { - public int Id { get; set; } - [Required] + [DataMember] + public int Id { get; set; } + [DataMember] + [Required] public string RepairName { get; set; } = string.Empty; - [Required] + [DataMember] + [Required] public double Price { get; set; } private Dictionary? _repairComponents = null; - [NotMapped] + [DataMember] + [NotMapped] public Dictionary RepairComponents { get diff --git a/CarRepairShop/CarRepairShopFileImplement/CarRepairShopFileImplement.csproj b/CarRepairShop/CarRepairShopFileImplement/CarRepairShopFileImplement.csproj index e49be3f..60d2cac 100644 --- a/CarRepairShop/CarRepairShopFileImplement/CarRepairShopFileImplement.csproj +++ b/CarRepairShop/CarRepairShopFileImplement/CarRepairShopFileImplement.csproj @@ -11,4 +11,8 @@ + + + + diff --git a/CarRepairShop/CarRepairShopFileImplement/FileImplementationExtension.cs b/CarRepairShop/CarRepairShopFileImplement/FileImplementationExtension.cs new file mode 100644 index 0000000..c9ee0ac --- /dev/null +++ b/CarRepairShop/CarRepairShopFileImplement/FileImplementationExtension.cs @@ -0,0 +1,27 @@ +using CarRepairShopContracts.DI; +using CarRepairShopContracts.StoragesContracts; +using CarRepairShopFileImplement.Implements; + +namespace CarRepairShopFileImplement +{ + 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/CarRepairShop/CarRepairShopFileImplement/Implements/BackUpInfo .cs b/CarRepairShop/CarRepairShopFileImplement/Implements/BackUpInfo .cs new file mode 100644 index 0000000..9880e16 --- /dev/null +++ b/CarRepairShop/CarRepairShopFileImplement/Implements/BackUpInfo .cs @@ -0,0 +1,38 @@ +using CarRepairShopContracts.StoragesContracts; +using System.Reflection; + +namespace CarRepairShopFileImplement.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/CarRepairShop/CarRepairShopFileImplement/Models/Client.cs b/CarRepairShop/CarRepairShopFileImplement/Models/Client.cs index 2f9708d..a9195ef 100644 --- a/CarRepairShop/CarRepairShopFileImplement/Models/Client.cs +++ b/CarRepairShop/CarRepairShopFileImplement/Models/Client.cs @@ -1,16 +1,22 @@ using CarRepairShopContracts.BindingModels; using CarRepairShopContracts.ViewModels; using CarRepairShopDataModels; +using System.Runtime.Serialization; using System.Xml.Linq; namespace CarRepairShopFileImplement.Models { - public class Client : IClientModel + [DataContract] + public class Client : IClientModel { - public int Id { get; private set; } - public string ClientFIO { get; private set; } = string.Empty; - public string Email { get; set; } = string.Empty; - public string Password { get; set; } = string.Empty; + [DataMember] + public int Id { get; private set; } + [DataMember] + public string ClientFIO { get; private set; } = string.Empty; + [DataMember] + public string Email { get; set; } = string.Empty; + [DataMember] + public string Password { get; set; } = string.Empty; public static Client? Create(ClientBindingModel model) { if (model == null) diff --git a/CarRepairShop/CarRepairShopFileImplement/Models/Component.cs b/CarRepairShop/CarRepairShopFileImplement/Models/Component.cs index 081302a..c5d1f93 100644 --- a/CarRepairShop/CarRepairShopFileImplement/Models/Component.cs +++ b/CarRepairShop/CarRepairShopFileImplement/Models/Component.cs @@ -1,15 +1,20 @@ using CarRepairShopContracts.BindingModels; using CarRepairShopContracts.ViewModels; using CarRepairShopDataModels.Models; +using System.Runtime.Serialization; using System.Xml.Linq; namespace CarRepairShopFileImplement.Models { - public class Component : IComponentModel + [DataContract] + public class Component : IComponentModel { - public int Id { get; private set; } - public string ComponentName { get; private set; } = string.Empty; - public double Cost { get; set; } + [DataMember] + public int Id { get; private set; } + [DataMember] + public string ComponentName { get; private set; } = string.Empty; + [DataMember] + public double Cost { get; set; } public static Component? Create(ComponentBindingModel model) { if (model == null) diff --git a/CarRepairShop/CarRepairShopFileImplement/Models/Implementer.cs b/CarRepairShop/CarRepairShopFileImplement/Models/Implementer.cs index daf44a7..f333978 100644 --- a/CarRepairShop/CarRepairShopFileImplement/Models/Implementer.cs +++ b/CarRepairShop/CarRepairShopFileImplement/Models/Implementer.cs @@ -1,16 +1,23 @@ using CarRepairShopContracts.BindingModels; using CarRepairShopContracts.ViewModels; using CarRepairShopDataModels; +using System.Runtime.Serialization; using System.Xml.Linq; namespace CarRepairShopFileImplement.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/CarRepairShop/CarRepairShopFileImplement/Models/MessageInfo.cs b/CarRepairShop/CarRepairShopFileImplement/Models/MessageInfo.cs index 8b9011c..1350265 100644 --- a/CarRepairShop/CarRepairShopFileImplement/Models/MessageInfo.cs +++ b/CarRepairShop/CarRepairShopFileImplement/Models/MessageInfo.cs @@ -1,25 +1,28 @@ using CarRepairShopContracts.BindingModels; using CarRepairShopContracts.ViewModels; using CarRepairShopDataModels; +using System.Runtime.Serialization; using System.Xml.Linq; namespace CarRepairShopFileImplement.Models { - public class MessageInfo : IMessageInfoModel + [DataContract] + public class MessageInfo : IMessageInfoModel { - public string MessageId { get; private set; } = string.Empty; - - 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 static MessageInfo? Create(MessageInfoBindingModel model) + [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/CarRepairShop/CarRepairShopFileImplement/Models/Order.cs b/CarRepairShop/CarRepairShopFileImplement/Models/Order.cs index 751ca6a..b4bf771 100644 --- a/CarRepairShop/CarRepairShopFileImplement/Models/Order.cs +++ b/CarRepairShop/CarRepairShopFileImplement/Models/Order.cs @@ -3,20 +3,31 @@ using CarRepairShopContracts.ViewModels; using CarRepairShopDataModels.Enums; using CarRepairShopDataModels; using System.Xml.Linq; +using System.Runtime.Serialization; namespace CarRepairShopFileImplement.Models { - public class Order : IOrderModel + [DataContract] + public class Order : IOrderModel { - public int Id { get; private set; } - public int RepairId { get; private set; } - public int ClientId { get; private set; } + [DataMember] + public int Id { get; private set; } + [DataMember] + public int RepairId { get; private set; } + [DataMember] + public int ClientId { get; private set; } + [DataMember] public int? ImplementerId { get; private set; } = null; + [DataMember] 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; } + [DataMember] + public double Sum { get; private set; } + [DataMember] + public OrderStatus Status { get; private set; } + [DataMember] + public DateTime DateCreate { get; private set; } + [DataMember] + public DateTime? DateImplement { get; private set; } public static Order? Create(OrderBindingModel model) { diff --git a/CarRepairShop/CarRepairShopFileImplement/Models/Repair.cs b/CarRepairShop/CarRepairShopFileImplement/Models/Repair.cs index 8bf7242..4b0af42 100644 --- a/CarRepairShop/CarRepairShopFileImplement/Models/Repair.cs +++ b/CarRepairShop/CarRepairShopFileImplement/Models/Repair.cs @@ -1,18 +1,24 @@ using CarRepairShopContracts.BindingModels; using CarRepairShopContracts.ViewModels; using CarRepairShopDataModels.Models; +using System.Runtime.Serialization; using System.Xml.Linq; namespace CarRepairShopFileImplement.Models { - public class Repair : IRepairModel + [DataContract] + public class Repair : IRepairModel { - public int Id { get; private set; } - public string RepairName { get; private set; } = string.Empty; - public double Price { get; private set; } + [DataMember] + public int Id { get; private set; } + [DataMember] + public string RepairName { get; private set; } = string.Empty; + [DataMember] + public double Price { get; private set; } public Dictionary Components { get; private set; } = new(); private Dictionary? _repairComponents = null; - public Dictionary RepairComponents + [DataMember] + public Dictionary RepairComponents { get { diff --git a/CarRepairShop/CarRepairShopListImplement/CarRepairShopListImplement.csproj b/CarRepairShop/CarRepairShopListImplement/CarRepairShopListImplement.csproj index e49be3f..60d2cac 100644 --- a/CarRepairShop/CarRepairShopListImplement/CarRepairShopListImplement.csproj +++ b/CarRepairShop/CarRepairShopListImplement/CarRepairShopListImplement.csproj @@ -11,4 +11,8 @@ + + + + diff --git a/CarRepairShop/CarRepairShopListImplement/Implements/BackUpInfo.cs b/CarRepairShop/CarRepairShopListImplement/Implements/BackUpInfo.cs new file mode 100644 index 0000000..dc51ab0 --- /dev/null +++ b/CarRepairShop/CarRepairShopListImplement/Implements/BackUpInfo.cs @@ -0,0 +1,17 @@ +using CarRepairShopContracts.StoragesContracts; + +namespace CarRepairShopListImplement.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/CarRepairShop/CarRepairShopListImplement/ListImplementationExtension.cs b/CarRepairShop/CarRepairShopListImplement/ListImplementationExtension.cs new file mode 100644 index 0000000..10f47bf --- /dev/null +++ b/CarRepairShop/CarRepairShopListImplement/ListImplementationExtension.cs @@ -0,0 +1,28 @@ +using CarRepairShopContracts.DI; +using CarRepairShopContracts.StoragesContracts; +using CarRepairShopListImplement.Implements; + +namespace CarRepairShopListImplement +{ + 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/CarRepairShop/CarRepairShopListImplement/Models/MessageInfo.cs b/CarRepairShop/CarRepairShopListImplement/Models/MessageInfo.cs index 43a5b06..9c0cd3e 100644 --- a/CarRepairShop/CarRepairShopListImplement/Models/MessageInfo.cs +++ b/CarRepairShop/CarRepairShopListImplement/Models/MessageInfo.cs @@ -17,6 +17,7 @@ namespace CarRepairShopListImplement.Models public string Subject { get; private set; } = string.Empty; public string Body { get; private set; } = string.Empty; + public int Id => throw new NotImplementedException(); public static MessageInfo? Create(MessageInfoBindingModel model) {