diff --git a/.gitignore b/.gitignore index ca1c7a3..710a2d5 100644 --- a/.gitignore +++ b/.gitignore @@ -398,3 +398,4 @@ FodyWeavers.xsd # JetBrains Rider *.sln.iml +/CarpentryWorkshop/ImplementationExtensions diff --git a/CarpentryWorkshop/CarpentryWorkshop.sln b/CarpentryWorkshop/CarpentryWorkshop.sln index b11aa99..77da952 100644 --- a/CarpentryWorkshop/CarpentryWorkshop.sln +++ b/CarpentryWorkshop/CarpentryWorkshop.sln @@ -56,11 +56,9 @@ Global {249894CF-B596-4AFD-8EB7-F167056920A1}.Release|Any CPU.ActiveCfg = Release|Any CPU {249894CF-B596-4AFD-8EB7-F167056920A1}.Release|Any CPU.Build.0 = Release|Any CPU {D9D18CB0-4068-43B6-92F9-85905E53FF95}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {D9D18CB0-4068-43B6-92F9-85905E53FF95}.Debug|Any CPU.Build.0 = Debug|Any CPU {D9D18CB0-4068-43B6-92F9-85905E53FF95}.Release|Any CPU.ActiveCfg = Release|Any CPU {D9D18CB0-4068-43B6-92F9-85905E53FF95}.Release|Any CPU.Build.0 = Release|Any CPU {69DE353E-934B-4CBA-89C0-BC253741F810}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {69DE353E-934B-4CBA-89C0-BC253741F810}.Debug|Any CPU.Build.0 = Debug|Any CPU {69DE353E-934B-4CBA-89C0-BC253741F810}.Release|Any CPU.ActiveCfg = Release|Any CPU {69DE353E-934B-4CBA-89C0-BC253741F810}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection diff --git a/CarpentryWorkshop/CarpentryWorkshop/DataGridViewExtension.cs b/CarpentryWorkshop/CarpentryWorkshop/DataGridViewExtension.cs new file mode 100644 index 0000000..1a5d37e --- /dev/null +++ b/CarpentryWorkshop/CarpentryWorkshop/DataGridViewExtension.cs @@ -0,0 +1,45 @@ +using CarpentryWorkshopContracts.Attributes; + +namespace CarpentryWorkshopView +{ + 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/CarpentryWorkshop/CarpentryWorkshop/FormClients.cs b/CarpentryWorkshop/CarpentryWorkshop/FormClients.cs index 6ffc595..d5ddc79 100644 --- a/CarpentryWorkshop/CarpentryWorkshop/FormClients.cs +++ b/CarpentryWorkshop/CarpentryWorkshop/FormClients.cs @@ -35,14 +35,8 @@ namespace CarpentryWorkshopView { 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("Clients loading"); + dataGridView.FillAndConfigGrid(_logic.ReadList(null)); + _logger.LogInformation("Clients loading"); } catch (Exception ex) { diff --git a/CarpentryWorkshop/CarpentryWorkshop/FormComponents.cs b/CarpentryWorkshop/CarpentryWorkshop/FormComponents.cs index 98cca33..835f901 100644 --- a/CarpentryWorkshop/CarpentryWorkshop/FormComponents.cs +++ b/CarpentryWorkshop/CarpentryWorkshop/FormComponents.cs @@ -1,6 +1,7 @@ using CarpentryWorkshop; using CarpentryWorkshopContracts.BindingModels; using CarpentryWorkshopContracts.BusinessLogicsContracts; +using CarpentryWorkshopContracts.DI; using Microsoft.Extensions.Logging; namespace CarpentryWorkshopView @@ -27,15 +28,8 @@ namespace CarpentryWorkshopView { 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) { @@ -46,13 +40,10 @@ namespace CarpentryWorkshopView private void buttonAdd_Click(object sender, EventArgs e) { - var service = Program.ServiceProvider?.GetService(typeof(FormComponent)); - if (service is FormComponent form) + var form = DependencyManager.Instance.Resolve(); + if (form.ShowDialog() == DialogResult.OK) { - if (form.ShowDialog() == DialogResult.OK) - { - LoadData(); - } + LoadData(); } } @@ -60,14 +51,11 @@ namespace CarpentryWorkshopView { if (dataGridView.SelectedRows.Count == 1) { - var service = Program.ServiceProvider?.GetService(typeof(FormComponent)); - if (service is FormComponent form) + var form = DependencyManager.Instance.Resolve(); + form.Id = Convert.ToInt32(dataGridView.SelectedRows[0].Cells["Id"].Value); + if (form.ShowDialog() == DialogResult.OK) { - form.Id = Convert.ToInt32(dataGridView.SelectedRows[0].Cells["Id"].Value); - if (form.ShowDialog() == DialogResult.OK) - { - LoadData(); - } + LoadData(); } } } diff --git a/CarpentryWorkshop/CarpentryWorkshop/FormImplementers.cs b/CarpentryWorkshop/CarpentryWorkshop/FormImplementers.cs index d98a601..f95c378 100644 --- a/CarpentryWorkshop/CarpentryWorkshop/FormImplementers.cs +++ b/CarpentryWorkshop/CarpentryWorkshop/FormImplementers.cs @@ -1,6 +1,7 @@ using CarpentryWorkshop; using CarpentryWorkshopContracts.BindingModels; using CarpentryWorkshopContracts.BusinessLogicsContracts; +using CarpentryWorkshopContracts.DI; using Microsoft.Extensions.Logging; using System; using System.Collections.Generic; @@ -28,26 +29,22 @@ namespace CarpentryWorkshopView private void buttonAdd_Click(object sender, EventArgs e) { - var service = Program.ServiceProvider?.GetService(typeof(FormImplementer)); - if (service is FormImplementer form) + var form = DependencyManager.Instance.Resolve(); + if (form.ShowDialog() == DialogResult.OK) { - form.ShowDialog(); + LoadData(); } - LoadData(); } private void buttonUpdate_Click(object sender, EventArgs e) { 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(); } } } @@ -57,13 +54,7 @@ namespace CarpentryWorkshopView 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) diff --git a/CarpentryWorkshop/CarpentryWorkshop/FormMails.cs b/CarpentryWorkshop/CarpentryWorkshop/FormMails.cs index e64e7c8..cf50fb4 100644 --- a/CarpentryWorkshop/CarpentryWorkshop/FormMails.cs +++ b/CarpentryWorkshop/CarpentryWorkshop/FormMails.cs @@ -19,14 +19,7 @@ namespace CarpentryWorkshopView { 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/CarpentryWorkshop/CarpentryWorkshop/FormMain.Designer.cs b/CarpentryWorkshop/CarpentryWorkshop/FormMain.Designer.cs index b15c876..d7887cf 100644 --- a/CarpentryWorkshop/CarpentryWorkshop/FormMain.Designer.cs +++ b/CarpentryWorkshop/CarpentryWorkshop/FormMain.Designer.cs @@ -34,12 +34,13 @@ ИзделияToolStripMenuItem = new ToolStripMenuItem(); клиентыToolStripMenuItem = new ToolStripMenuItem(); исполнителиToolStripMenuItem = new ToolStripMenuItem(); + mailsToolStripMenuItem = new ToolStripMenuItem(); отчётыToolStripMenuItem = new ToolStripMenuItem(); списокИзделийToolStripMenuItem = new ToolStripMenuItem(); компонентыПоИзделиямToolStripMenuItem = new ToolStripMenuItem(); списокЗаказовToolStripMenuItem = new ToolStripMenuItem(); запускРаботToolStripMenuItem = new ToolStripMenuItem(); - mailsToolStripMenuItem = new ToolStripMenuItem(); + createBackupToolStripMenuItem = new ToolStripMenuItem(); dataGridView = new DataGridView(); ButtonCreateOrder = new Button(); ButtonIssuedOrder = new Button(); @@ -50,10 +51,10 @@ // // menuStrip1 // - menuStrip1.Items.AddRange(new ToolStripItem[] { справочникиToolStripMenuItem, отчётыToolStripMenuItem, запускРаботToolStripMenuItem }); + menuStrip1.Items.AddRange(new ToolStripItem[] { справочникиToolStripMenuItem, отчётыToolStripMenuItem, запускРаботToolStripMenuItem, createBackupToolStripMenuItem }); menuStrip1.Location = new Point(0, 0); menuStrip1.Name = "menuStrip1"; - menuStrip1.Size = new Size(896, 24); + menuStrip1.Size = new Size(1009, 24); menuStrip1.TabIndex = 0; menuStrip1.Text = "menuStrip1"; // @@ -92,6 +93,13 @@ исполнителиToolStripMenuItem.Text = "Исполнители"; исполнителиToolStripMenuItem.Click += исполнителиToolStripMenuItem_Click; // + // mailsToolStripMenuItem + // + mailsToolStripMenuItem.Name = "mailsToolStripMenuItem"; + mailsToolStripMenuItem.Size = new Size(149, 22); + mailsToolStripMenuItem.Text = "mails"; + mailsToolStripMenuItem.Click += mailsToolStripMenuItem_Click; + // // отчётыToolStripMenuItem // отчётыToolStripMenuItem.DropDownItems.AddRange(new ToolStripItem[] { списокИзделийToolStripMenuItem, компонентыПоИзделиямToolStripMenuItem, списокЗаказовToolStripMenuItem }); @@ -127,12 +135,12 @@ запускРаботToolStripMenuItem.Text = "Запуск Работ"; запускРаботToolStripMenuItem.Click += запускРаботToolStripMenuItem_Click; // - // mailsToolStripMenuItem + // createBackupToolStripMenuItem // - mailsToolStripMenuItem.Name = "mailsToolStripMenuItem"; - mailsToolStripMenuItem.Size = new Size(180, 22); - mailsToolStripMenuItem.Text = "mails"; - mailsToolStripMenuItem.Click += mailsToolStripMenuItem_Click; + createBackupToolStripMenuItem.Name = "createBackupToolStripMenuItem"; + createBackupToolStripMenuItem.Size = new Size(95, 20); + createBackupToolStripMenuItem.Text = "Create backup"; + createBackupToolStripMenuItem.Click += createBackupToolStripMenuItem_Click; // // dataGridView // @@ -140,13 +148,13 @@ dataGridView.Location = new Point(1, 32); dataGridView.Name = "dataGridView"; dataGridView.RowTemplate.Height = 25; - dataGridView.Size = new Size(755, 243); + dataGridView.Size = new Size(868, 243); dataGridView.TabIndex = 1; // // ButtonCreateOrder // ButtonCreateOrder.Anchor = AnchorStyles.Top | AnchorStyles.Right; - ButtonCreateOrder.Location = new Point(762, 44); + ButtonCreateOrder.Location = new Point(875, 44); ButtonCreateOrder.Name = "ButtonCreateOrder"; ButtonCreateOrder.Size = new Size(122, 23); ButtonCreateOrder.TabIndex = 2; @@ -157,7 +165,7 @@ // ButtonIssuedOrder // ButtonIssuedOrder.Anchor = AnchorStyles.Top | AnchorStyles.Right; - ButtonIssuedOrder.Location = new Point(762, 73); + ButtonIssuedOrder.Location = new Point(875, 73); ButtonIssuedOrder.Name = "ButtonIssuedOrder"; ButtonIssuedOrder.Size = new Size(122, 23); ButtonIssuedOrder.TabIndex = 5; @@ -168,7 +176,7 @@ // ButtonRef // ButtonRef.Anchor = AnchorStyles.Top | AnchorStyles.Right; - ButtonRef.Location = new Point(762, 102); + ButtonRef.Location = new Point(875, 102); ButtonRef.Name = "ButtonRef"; ButtonRef.Size = new Size(122, 23); ButtonRef.TabIndex = 6; @@ -180,7 +188,7 @@ // AutoScaleDimensions = new SizeF(7F, 15F); AutoScaleMode = AutoScaleMode.Font; - ClientSize = new Size(896, 280); + ClientSize = new Size(1009, 280); Controls.Add(ButtonRef); Controls.Add(ButtonIssuedOrder); Controls.Add(ButtonCreateOrder); @@ -214,5 +222,6 @@ private ToolStripMenuItem исполнителиToolStripMenuItem; private ToolStripMenuItem запускРаботToolStripMenuItem; private ToolStripMenuItem mailsToolStripMenuItem; + private ToolStripMenuItem createBackupToolStripMenuItem; } } \ No newline at end of file diff --git a/CarpentryWorkshop/CarpentryWorkshop/FormMain.cs b/CarpentryWorkshop/CarpentryWorkshop/FormMain.cs index a423db7..a17ef58 100644 --- a/CarpentryWorkshop/CarpentryWorkshop/FormMain.cs +++ b/CarpentryWorkshop/CarpentryWorkshop/FormMain.cs @@ -1,7 +1,10 @@ using CarpentryWorkshop; +using CarpentryWorkshopBusinessLogic.BusinessLogics; using CarpentryWorkshopContracts.BindingModels; using CarpentryWorkshopContracts.BusinessLogicsContracts; +using CarpentryWorkshopContracts.DI; using CarpentryWorkshopDataModels.Enums; +using DocumentFormat.OpenXml.Spreadsheet; using Microsoft.Extensions.Logging; namespace CarpentryWorkshopView @@ -12,13 +15,15 @@ namespace CarpentryWorkshopView 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) { @@ -29,14 +34,7 @@ namespace CarpentryWorkshopView _logger.LogInformation("Загрузка заказов"); try { - var list = _orderLogic.ReadList(null); - if (list != null) - { - dataGridView.DataSource = list; - dataGridView.Columns["WoodId"].Visible = false; - dataGridView.Columns["ClientId"].Visible = false; - dataGridView.Columns["ImplementerId"].Visible = false; - } + dataGridView.FillAndConfigGrid(_orderLogic.ReadList(null)); _logger.LogInformation("Загрузка изделий"); } catch (Exception ex) @@ -47,38 +45,25 @@ namespace CarpentryWorkshopView } 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(FormWoods)); - if (service is FormWoods form) - { - form.ShowDialog(); - } + var form = DependencyManager.Instance.Resolve(); + form.ShowDialog(); } private void КлиентыToolStripMenuItem_Click(object sender, EventArgs e) { - var service = Program.ServiceProvider?.GetService(typeof(FormClients)); - if (service is FormClients form) - { - form.ShowDialog(); - } + var form = DependencyManager.Instance.Resolve(); + form.ShowDialog(); } private void 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 OrderBindingModel CreateBindingModel(int id, bool isDone = false) @@ -178,21 +163,14 @@ namespace CarpentryWorkshopView private void компонентыПоИзделиямToolStripMenuItem_Click(object sender, EventArgs e) { - var service = Program.ServiceProvider?.GetService(typeof(FormReportWoodComponents)); - if (service is FormReportWoodComponents form) - { - form.ShowDialog(); - } - + var form = DependencyManager.Instance.Resolve(); + form.ShowDialog(); } private void списокЗаказовToolStripMenuItem_Click(object sender, EventArgs e) { - var service = Program.ServiceProvider?.GetService(typeof(FormReportOrders)); - if (service is FormReportOrders form) - { - form.ShowDialog(); - } + var form = DependencyManager.Instance.Resolve(); + form.ShowDialog(); } private void ButtonRef_Click(object sender, EventArgs e) @@ -201,23 +179,39 @@ namespace CarpentryWorkshopView } 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 mailsToolStripMenuItem_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 createBackupToolStripMenuItem_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("Backup created", "Message", MessageBoxButtons.OK, MessageBoxIcon.Information); + } + } + } + catch (Exception ex) + { + MessageBox.Show(ex.Message, "Error", MessageBoxButtons.OK, MessageBoxIcon.Error); } } } diff --git a/CarpentryWorkshop/CarpentryWorkshop/FormWood.cs b/CarpentryWorkshop/CarpentryWorkshop/FormWood.cs index c16da1e..02378ef 100644 --- a/CarpentryWorkshop/CarpentryWorkshop/FormWood.cs +++ b/CarpentryWorkshop/CarpentryWorkshop/FormWood.cs @@ -1,6 +1,7 @@ using CarpentryWorkshop; using CarpentryWorkshopContracts.BindingModels; using CarpentryWorkshopContracts.BusinessLogicsContracts; +using CarpentryWorkshopContracts.DI; using CarpentryWorkshopContracts.SearchModels; using CarpentryWorkshopDataModels.Models; using Microsoft.Extensions.Logging; @@ -67,50 +68,44 @@ namespace CarpentryWorkshopView } private void ButtonAdd_Click(object sender, EventArgs e) { - var service = Program.ServiceProvider?.GetService(typeof(FormWoodComponent)); - if (service is FormWoodComponent form) + 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 (_woodComponents.ContainsKey(form.Id)) + { + _woodComponents[form.Id] = (form.ComponentModel, form.Count); + } + else + { + _woodComponents.Add(form.Id, (form.ComponentModel, form.Count)); + } + LoadData(); + } + } + private void ButtonUpd_Click(object sender, EventArgs e) + { + 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 = _woodComponents[id].Item2; if (form.ShowDialog() == DialogResult.OK) { if (form.ComponentModel == null) { return; } - _logger.LogInformation("Добавление нового компонента: {ComponentName} - {Count}", form.ComponentModel.ComponentName, form.Count); - if (_woodComponents.ContainsKey(form.Id)) - { - _woodComponents[form.Id] = (form.ComponentModel, form.Count); - } - else - { - _woodComponents.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(FormWoodComponent)); - if (service is FormWoodComponent form) - { - int id = Convert.ToInt32(dataGridView.SelectedRows[0].Cells[0].Value); - form.Id = id; - form.Count = _woodComponents[id].Item2; - if (form.ShowDialog() == DialogResult.OK) - { - if (form.ComponentModel == null) - { - return; - } - _logger.LogInformation("Изменение компонента: {ComponentName} - {Count}", form.ComponentModel.ComponentName, form.Count); - _woodComponents[form.Id] = (form.ComponentModel, form.Count); - LoadData(); - } - } - } + _logger.LogInformation("Изменение компонента: { ComponentName} - { Count}", form.ComponentModel.ComponentName, form.Count); + _woodComponents[form.Id] = (form.ComponentModel, form.Count); + LoadData(); + } + } } private void ButtonDel_Click(object sender, EventArgs e) { diff --git a/CarpentryWorkshop/CarpentryWorkshop/FormWoods.cs b/CarpentryWorkshop/CarpentryWorkshop/FormWoods.cs index 94ffbb0..993b78e 100644 --- a/CarpentryWorkshop/CarpentryWorkshop/FormWoods.cs +++ b/CarpentryWorkshop/CarpentryWorkshop/FormWoods.cs @@ -1,6 +1,7 @@ using CarpentryWorkshop; using CarpentryWorkshopContracts.BindingModels; using CarpentryWorkshopContracts.BusinessLogicsContracts; +using CarpentryWorkshopContracts.DI; using Microsoft.Extensions.Logging; namespace CarpentryWorkshopView @@ -23,16 +24,8 @@ namespace CarpentryWorkshopView { try { - var list = _logic.ReadList(null); - if (list != null) - { - dataGridView.DataSource = list; - dataGridView.Columns["Id"].Visible = false; - dataGridView.Columns["WoodName"].AutoSizeMode = DataGridViewAutoSizeColumnMode.Fill; - dataGridView.Columns[3].Visible = false; - - } - _logger.LogInformation("Загрузка продуктов"); + dataGridView.FillAndConfigGrid(_logic.ReadList(null)); + _logger.LogInformation("Загрузка продуктов"); } catch (Exception ex) { @@ -42,27 +35,21 @@ namespace CarpentryWorkshopView } private void ButtonAdd_Click(object sender, EventArgs e) { - var service = Program.ServiceProvider?.GetService(typeof(FormWood)); - if (service is FormWood form) + var form = DependencyManager.Instance.Resolve(); + if (form.ShowDialog() == DialogResult.OK) { - if (form.ShowDialog() == DialogResult.OK) - { - LoadData(); - } + LoadData(); } } private void ButtonUpd_Click(object sender, EventArgs e) { if (dataGridView.SelectedRows.Count == 1) { - var service = Program.ServiceProvider?.GetService(typeof(FormWood)); - if (service is FormWood form) + var form = DependencyManager.Instance.Resolve(); + form.Id = Convert.ToInt32(dataGridView.SelectedRows[0].Cells["Id"].Value); + if (form.ShowDialog() == DialogResult.OK) { - form.Id = Convert.ToInt32(dataGridView.SelectedRows[0].Cells["Id"].Value); - if (form.ShowDialog() == DialogResult.OK) - { - LoadData(); - } + LoadData(); } } } diff --git a/CarpentryWorkshop/CarpentryWorkshop/Program.cs b/CarpentryWorkshop/CarpentryWorkshop/Program.cs index 4c0d157..4c03fff 100644 --- a/CarpentryWorkshop/CarpentryWorkshop/Program.cs +++ b/CarpentryWorkshop/CarpentryWorkshop/Program.cs @@ -10,13 +10,13 @@ using CarpentryWorkshopView; using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.Logging; using NLog.Extensions.Logging; +using CarpentryWorkshopContracts.DI; +using DocumentFormat.OpenXml.Spreadsheet; namespace CarpentryWorkshop { internal static class Program { - private static ServiceProvider? _serviceProvider; - public static ServiceProvider? ServiceProvider => _serviceProvider; /// /// The main entry point for the application. @@ -27,13 +27,11 @@ namespace CarpentryWorkshop // To customize application configuration such as set high DPI settings or default font, // see https://aka.ms/applicationconfiguration. ApplicationConfiguration.Initialize(); - var services = new ServiceCollection(); - ConfigureServices(services); - _serviceProvider = services.BuildServiceProvider(); + InitDependency(); try { - var mailSender = _serviceProvider.GetService(); + var mailSender = DependencyManager.Instance.Resolve(); mailSender?.MailConfig(new MailConfigBindingModel { MailLogin = System.Configuration.ConfigurationManager.AppSettings["MailLogin"] ?? string.Empty, @@ -48,54 +46,49 @@ namespace CarpentryWorkshop } catch (Exception ex) { - var logger = _serviceProvider.GetService(); + var logger = DependencyManager.Instance.Resolve(); logger?.LogError(ex, " "); } - Application.Run(_serviceProvider.GetRequiredService()); - } - private static void MailCheck(object obj) => ServiceProvider?.GetService()?.MailCheck(); - 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.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(); + Application.Run(DependencyManager.Instance.Resolve()); } - } + private static void MailCheck(object obj) => DependencyManager.Instance.Resolve()?.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(); + DependencyManager.Instance.RegisterType(); + DependencyManager.Instance.RegisterType(); + DependencyManager.Instance.RegisterType(); + DependencyManager.Instance.RegisterType(); + DependencyManager.Instance.RegisterType(); + DependencyManager.Instance.RegisterType(); + DependencyManager.Instance.RegisterType(); + DependencyManager.Instance.RegisterType(); + DependencyManager.Instance.RegisterType(); + DependencyManager.Instance.RegisterType(); + DependencyManager.Instance.RegisterType(); + DependencyManager.Instance.RegisterType(); + DependencyManager.Instance.RegisterType(); + } + } } \ No newline at end of file diff --git a/CarpentryWorkshop/CarpentryWorkshopBusinessLogic/BusinessLogics/BackUpLogic.cs b/CarpentryWorkshop/CarpentryWorkshopBusinessLogic/BusinessLogics/BackUpLogic.cs new file mode 100644 index 0000000..39ff4e9 --- /dev/null +++ b/CarpentryWorkshop/CarpentryWorkshopBusinessLogic/BusinessLogics/BackUpLogic.cs @@ -0,0 +1,95 @@ +using CarpentryWorkshopContracts.BindingModels; +using CarpentryWorkshopContracts.BusinessLogicsContracts; +using CarpentryWorkshopContracts.StoragesContracts; +using CarpentryWorkshopDataModels; +using Microsoft.Extensions.Logging; +using System.IO.Compression; +using System.Reflection; +using System.Runtime.Serialization.Json; + +namespace CarpentryWorkshopBusinessLogic.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/CarpentryWorkshop/CarpentryWorkshopContracts/Attributes/ColumnAttribute.cs b/CarpentryWorkshop/CarpentryWorkshopContracts/Attributes/ColumnAttribute.cs new file mode 100644 index 0000000..964b6f5 --- /dev/null +++ b/CarpentryWorkshop/CarpentryWorkshopContracts/Attributes/ColumnAttribute.cs @@ -0,0 +1,25 @@ +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace CarpentryWorkshopContracts.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/CarpentryWorkshop/CarpentryWorkshopContracts/Attributes/GridViewAutoSize.cs b/CarpentryWorkshop/CarpentryWorkshopContracts/Attributes/GridViewAutoSize.cs new file mode 100644 index 0000000..3391090 --- /dev/null +++ b/CarpentryWorkshop/CarpentryWorkshopContracts/Attributes/GridViewAutoSize.cs @@ -0,0 +1,14 @@ +namespace CarpentryWorkshopContracts.Attributes +{ + public enum GridViewAutoSize + { + NotSet = 0, + None = 1, + ColumnHeader = 2, + AllCellsExceptHeader = 4, + AllCells = 6, + DisplayedCellsExceptHeader = 8, + DisplayedCells = 10, + Fill = 16 + } +} diff --git a/CarpentryWorkshop/CarpentryWorkshopContracts/BindingModels/BackUpSaveBinidngModel.cs b/CarpentryWorkshop/CarpentryWorkshopContracts/BindingModels/BackUpSaveBinidngModel.cs new file mode 100644 index 0000000..6272383 --- /dev/null +++ b/CarpentryWorkshop/CarpentryWorkshopContracts/BindingModels/BackUpSaveBinidngModel.cs @@ -0,0 +1,7 @@ +namespace CarpentryWorkshopContracts.BindingModels +{ + public class BackUpSaveBinidngModel + { + public string FolderName { get; set; } = string.Empty; + } +} diff --git a/CarpentryWorkshop/CarpentryWorkshopContracts/BindingModels/MessageInfoBindingModel.cs b/CarpentryWorkshop/CarpentryWorkshopContracts/BindingModels/MessageInfoBindingModel.cs index 62e9132..66d5c27 100644 --- a/CarpentryWorkshop/CarpentryWorkshopContracts/BindingModels/MessageInfoBindingModel.cs +++ b/CarpentryWorkshop/CarpentryWorkshopContracts/BindingModels/MessageInfoBindingModel.cs @@ -9,6 +9,7 @@ namespace CarpentryWorkshopContracts.BindingModels public string SenderName { get; set; } = string.Empty; public string Subject { get; set; } = string.Empty; public string Body { get; set; } = string.Empty; + public int Id => throw new NotImplementedException(); public DateTime DateDelivery { get; set; } } } diff --git a/CarpentryWorkshop/CarpentryWorkshopContracts/BusinessLogicsContracts/IBackUpLogic.cs b/CarpentryWorkshop/CarpentryWorkshopContracts/BusinessLogicsContracts/IBackUpLogic.cs new file mode 100644 index 0000000..c0c3953 --- /dev/null +++ b/CarpentryWorkshop/CarpentryWorkshopContracts/BusinessLogicsContracts/IBackUpLogic.cs @@ -0,0 +1,9 @@ +using CarpentryWorkshopContracts.BindingModels; + +namespace CarpentryWorkshopContracts.BusinessLogicsContracts +{ + public interface IBackUpLogic + { + void CreateBackUp(BackUpSaveBinidngModel model); + } +} diff --git a/CarpentryWorkshop/CarpentryWorkshopContracts/CarpentryWorkshopContracts.csproj b/CarpentryWorkshop/CarpentryWorkshopContracts/CarpentryWorkshopContracts.csproj index 6ef3d42..9a82aa1 100644 --- a/CarpentryWorkshop/CarpentryWorkshopContracts/CarpentryWorkshopContracts.csproj +++ b/CarpentryWorkshop/CarpentryWorkshopContracts/CarpentryWorkshopContracts.csproj @@ -6,6 +6,11 @@ enable + + + + + diff --git a/CarpentryWorkshop/CarpentryWorkshopContracts/DI/DependencyManager.cs b/CarpentryWorkshop/CarpentryWorkshopContracts/DI/DependencyManager.cs new file mode 100644 index 0000000..588ded3 --- /dev/null +++ b/CarpentryWorkshop/CarpentryWorkshopContracts/DI/DependencyManager.cs @@ -0,0 +1,63 @@ +using Microsoft.Extensions.Logging; + +namespace CarpentryWorkshopContracts.DI +{ + /// + /// Менеджер для работы с зависимостями + /// + public class DependencyManager + { + private readonly IDependencyContainer _dependencyManager; + + private static DependencyManager? _manager; + + private static readonly object _locjObject = new(); + + private DependencyManager() + { + _dependencyManager = new UnityDependencyContainer(); + } + + 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/CarpentryWorkshop/CarpentryWorkshopContracts/DI/IDependencyContainer.cs b/CarpentryWorkshop/CarpentryWorkshopContracts/DI/IDependencyContainer.cs new file mode 100644 index 0000000..4346aa8 --- /dev/null +++ b/CarpentryWorkshop/CarpentryWorkshopContracts/DI/IDependencyContainer.cs @@ -0,0 +1,38 @@ +using Microsoft.Extensions.Logging; + +namespace CarpentryWorkshopContracts.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/CarpentryWorkshop/CarpentryWorkshopContracts/DI/IImplementationExtension.cs b/CarpentryWorkshop/CarpentryWorkshopContracts/DI/IImplementationExtension.cs new file mode 100644 index 0000000..4b1445f --- /dev/null +++ b/CarpentryWorkshop/CarpentryWorkshopContracts/DI/IImplementationExtension.cs @@ -0,0 +1,14 @@ +namespace CarpentryWorkshopContracts.DI +{ + /// + /// Интерфейс для регистрации зависимостей в модулях + /// + public interface IImplementationExtension + { + public int Priority { get; } + /// + /// Регистрация сервисов + /// + public void RegisterServices(); + } +} diff --git a/CarpentryWorkshop/CarpentryWorkshopContracts/DI/ServiceDependencyContainer.cs b/CarpentryWorkshop/CarpentryWorkshopContracts/DI/ServiceDependencyContainer.cs new file mode 100644 index 0000000..f551529 --- /dev/null +++ b/CarpentryWorkshop/CarpentryWorkshopContracts/DI/ServiceDependencyContainer.cs @@ -0,0 +1,57 @@ +using Microsoft.Extensions.DependencyInjection; +using Microsoft.Extensions.Logging; + +namespace CarpentryWorkshopContracts.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/CarpentryWorkshop/CarpentryWorkshopContracts/DI/ServiceProviderLoader.cs b/CarpentryWorkshop/CarpentryWorkshopContracts/DI/ServiceProviderLoader.cs new file mode 100644 index 0000000..caff71b --- /dev/null +++ b/CarpentryWorkshop/CarpentryWorkshopContracts/DI/ServiceProviderLoader.cs @@ -0,0 +1,53 @@ +using System.Reflection; + +namespace CarpentryWorkshopContracts.DI +{ + /// + /// Загрузчик данных + /// + public class ServiceProviderLoader + { + /// + /// Загрузка всех классов-реализаций IImplementationExtension + /// + /// + public static IImplementationExtension? GetImplementationExtensions() + { + IImplementationExtension? source = null; + var files = Directory.GetFiles(TryGetImplementationExtensionsFolder(), "*.dll", SearchOption.AllDirectories); + foreach (var file in files.Distinct()) + { + Assembly asm = Assembly.LoadFrom(file); + foreach (var t in asm.GetExportedTypes()) + { + if (t.IsClass && typeof(IImplementationExtension).IsAssignableFrom(t)) + { + if (source == null) + { + source = (IImplementationExtension)Activator.CreateInstance(t)!; + } + else + { + var newSource = (IImplementationExtension)Activator.CreateInstance(t)!; + if (newSource.Priority > source.Priority) + { + source = newSource; + } + } + } + } + } + return source; + } + + private static string TryGetImplementationExtensionsFolder() + { + var directory = new DirectoryInfo(Directory.GetCurrentDirectory()); + while (directory != null && !directory.GetDirectories("ImplementationExtensions", SearchOption.AllDirectories).Any(x => x.Name == "ImplementationExtensions")) + { + directory = directory.Parent; + } + return $"{directory?.FullName}\\ImplementationExtensions"; + } + } +} diff --git a/CarpentryWorkshop/CarpentryWorkshopContracts/DI/UnityDependencyContainer.cs b/CarpentryWorkshop/CarpentryWorkshopContracts/DI/UnityDependencyContainer.cs new file mode 100644 index 0000000..79c34a6 --- /dev/null +++ b/CarpentryWorkshop/CarpentryWorkshopContracts/DI/UnityDependencyContainer.cs @@ -0,0 +1,38 @@ +using Microsoft.Extensions.Logging; +using Unity; +using Unity.Microsoft.Logging; + +namespace CarpentryWorkshopContracts.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/CarpentryWorkshop/CarpentryWorkshopContracts/StoragesContracts/IBackUpInfo.cs b/CarpentryWorkshop/CarpentryWorkshopContracts/StoragesContracts/IBackUpInfo.cs new file mode 100644 index 0000000..efc82ea --- /dev/null +++ b/CarpentryWorkshop/CarpentryWorkshopContracts/StoragesContracts/IBackUpInfo.cs @@ -0,0 +1,8 @@ +namespace CarpentryWorkshopContracts.StoragesContracts +{ + public interface IBackUpInfo + { + List? GetList() where T : class, new(); + Type? GetTypeByModelInterface(string modelInterfaceName); + } +} diff --git a/CarpentryWorkshop/CarpentryWorkshopContracts/ViewModels/ClientViewModel.cs b/CarpentryWorkshop/CarpentryWorkshopContracts/ViewModels/ClientViewModel.cs index b74fb7a..bca8aad 100644 --- a/CarpentryWorkshop/CarpentryWorkshopContracts/ViewModels/ClientViewModel.cs +++ b/CarpentryWorkshop/CarpentryWorkshopContracts/ViewModels/ClientViewModel.cs @@ -1,16 +1,17 @@ using CarpentryWorkshopDataModels.Models; -using System.ComponentModel; +using CarpentryWorkshopContracts.Attributes; namespace CarpentryWorkshopContracts.ViewModels { public class ClientViewModel : IClientModel { - public int Id { get; set; } - [DisplayName("Client's FIO")] - public string ClientFIO { get; set; } = string.Empty; - [DisplayName("Login (Email)")] - public string Email { get; set; } = string.Empty; - [DisplayName("Password")] - public string Password { get; set; } = string.Empty; + [Column(visible: false)] + public int Id { get; set; } + [Column(title: "Client's FIO", width: 150)] + public string ClientFIO { get; set; } = string.Empty; + [Column(title: "Login (Email)", gridViewAutoSize: GridViewAutoSize.Fill, isUseAutoSize: true)] + public string Email { get; set; } = string.Empty; + [Column(title: "Password", width: 150)] + public string Password { get; set; } = string.Empty; } } diff --git a/CarpentryWorkshop/CarpentryWorkshopContracts/ViewModels/ComponentViewModel.cs b/CarpentryWorkshop/CarpentryWorkshopContracts/ViewModels/ComponentViewModel.cs index 6e7b31c..553d2db 100644 --- a/CarpentryWorkshop/CarpentryWorkshopContracts/ViewModels/ComponentViewModel.cs +++ b/CarpentryWorkshop/CarpentryWorkshopContracts/ViewModels/ComponentViewModel.cs @@ -1,14 +1,15 @@ using CarpentryWorkshopDataModels.Models; -using System.ComponentModel; +using CarpentryWorkshopContracts.Attributes; namespace CarpentryWorkshopContracts.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("Component's name", gridViewAutoSize: GridViewAutoSize.Fill, isUseAutoSize: true)] + public string ComponentName { get; set; } = string.Empty; + [Column("Cost", width: 100)] + public double Cost { get; set; } } } \ No newline at end of file diff --git a/CarpentryWorkshop/CarpentryWorkshopContracts/ViewModels/ImplementerViewModel.cs b/CarpentryWorkshop/CarpentryWorkshopContracts/ViewModels/ImplementerViewModel.cs index 2627c9e..81d5ace 100644 --- a/CarpentryWorkshop/CarpentryWorkshopContracts/ViewModels/ImplementerViewModel.cs +++ b/CarpentryWorkshop/CarpentryWorkshopContracts/ViewModels/ImplementerViewModel.cs @@ -1,21 +1,22 @@ using CarpentryWorkshopDataModels.Models; -using System.ComponentModel; +using CarpentryWorkshopContracts.Attributes; namespace CarpentryWorkshopContracts.ViewModels { public class ImplementerViewModel : IImplementerModel { + [Column(visible: false)] public int Id { get; set; } - [DisplayName("Исполнитель ФИО")] + [Column("FIO", gridViewAutoSize: GridViewAutoSize.Fill, isUseAutoSize: true)] public string ImplementerFIO { get; set; } = string.Empty; - [DisplayName("Пароль")] + [Column("Password", width: 150)] public string Password { get; set; } = string.Empty; - [DisplayName("Опыт работы")] + [Column("Work expirience", width: 150)] public int WorkExperience { get; set; } - [DisplayName("Квалификация")] + [Column("Qualification", width: 150)] public int Qualification { get; set; } } } diff --git a/CarpentryWorkshop/CarpentryWorkshopContracts/ViewModels/MessageInfoViewModel.cs b/CarpentryWorkshop/CarpentryWorkshopContracts/ViewModels/MessageInfoViewModel.cs index b0cad95..97abf7a 100644 --- a/CarpentryWorkshop/CarpentryWorkshopContracts/ViewModels/MessageInfoViewModel.cs +++ b/CarpentryWorkshop/CarpentryWorkshopContracts/ViewModels/MessageInfoViewModel.cs @@ -1,24 +1,23 @@ using CarpentryWorkshopDataModels.Models; -using System.ComponentModel; +using CarpentryWorkshopContracts.Attributes; namespace CarpentryWorkshopContracts.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("Sender", gridViewAutoSize: GridViewAutoSize.DisplayedCells, isUseAutoSize: true)] public string SenderName { get; set; } = string.Empty; - - [DisplayName("Дата письма")] + [Column("Delivery Date", width: 100)] public DateTime DateDelivery { get; set; } - - [DisplayName("Заголовок")] + [Column("Subject", width: 150)] public string Subject { get; set; } = string.Empty; - - [DisplayName("Текст")] + [Column("Body", gridViewAutoSize: GridViewAutoSize.Fill, isUseAutoSize: true)] public string Body { get; set; } = string.Empty; + [Column(visible: false)] + public int Id => throw new NotImplementedException(); } } diff --git a/CarpentryWorkshop/CarpentryWorkshopContracts/ViewModels/OrderViewModel.cs b/CarpentryWorkshop/CarpentryWorkshopContracts/ViewModels/OrderViewModel.cs index ce52937..9d02a6e 100644 --- a/CarpentryWorkshop/CarpentryWorkshopContracts/ViewModels/OrderViewModel.cs +++ b/CarpentryWorkshop/CarpentryWorkshopContracts/ViewModels/OrderViewModel.cs @@ -1,31 +1,34 @@ using CarpentryWorkshopDataModels.Enums; using CarpentryWorkshopDataModels.Models; -using System.ComponentModel; +using CarpentryWorkshopContracts.Attributes; namespace CarpentryWorkshopContracts.ViewModels { public class OrderViewModel : IOrderModel { - [DisplayName("Номер")] - public int Id { get; set; } - public int WoodId { get; set; } - [DisplayName("Изделие")] - public string WoodName { get; set; } = string.Empty; - public int ClientId { get; set; } - [DisplayName("Клиент")] - public string ClientFIO { get; set; } = string.Empty; + [Column("Number", gridViewAutoSize: GridViewAutoSize.AllCells, isUseAutoSize: true)] + public int Id { get; set; } + [Column(visible: false)] + public int WoodId { get; set; } + [Column("Wood's name", gridViewAutoSize: GridViewAutoSize.AllCells, isUseAutoSize: true)] + public string WoodName { get; set; } = string.Empty; + [Column(visible: false)] + public int ClientId { get; set; } + [Column("Client's FIO", gridViewAutoSize: GridViewAutoSize.AllCells, isUseAutoSize: true)] + public string ClientFIO { get; set; } = string.Empty; + [Column(visible: false)] public int? ImplementerId { get; set; } - [DisplayName("Имя исполнителя")] + [Column("Implementer's FIO", gridViewAutoSize: GridViewAutoSize.AllCells, isUseAutoSize: true)] public string? ImplementerFIO { get; set; } - [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("Count", gridViewAutoSize: GridViewAutoSize.AllCells, isUseAutoSize: true)] + public int Count { get; set; } + [Column("Sum", gridViewAutoSize: GridViewAutoSize.AllCells, isUseAutoSize: true)] + public double Sum { get; set; } + [Column("Status", gridViewAutoSize: GridViewAutoSize.AllCells, isUseAutoSize: true)] + public OrderStatus Status { get; set; } = OrderStatus.Неизвестен; + [Column("Date of creation", width: 100)] + public DateTime DateCreate { get; set; } = DateTime.Now; + [Column("Date of completion", width: 100)] + public DateTime? DateImplement { get; set; } } } \ No newline at end of file diff --git a/CarpentryWorkshop/CarpentryWorkshopContracts/ViewModels/WoodViewModel.cs b/CarpentryWorkshop/CarpentryWorkshopContracts/ViewModels/WoodViewModel.cs index aef07a4..1d39a0e 100644 --- a/CarpentryWorkshop/CarpentryWorkshopContracts/ViewModels/WoodViewModel.cs +++ b/CarpentryWorkshop/CarpentryWorkshopContracts/ViewModels/WoodViewModel.cs @@ -1,19 +1,17 @@ using CarpentryWorkshopDataModels.Models; -using System.ComponentModel; +using CarpentryWorkshopContracts.Attributes; namespace CarpentryWorkshopContracts.ViewModels { public class WoodViewModel : IWoodModel { - public int Id { get; set; } - [DisplayName("Название изделия")] - public string WoodName { get; set; } = string.Empty; - [DisplayName("Цена")] - public double Price { get; set; } - public Dictionary WoodComponents - { - get; - set; - } = new(); + [Column(visible: false)] + public int Id { get; set; } + [Column("Wood's name", gridViewAutoSize: GridViewAutoSize.Fill, isUseAutoSize: true)] + public string WoodName { get; set; } = string.Empty; + [Column("Price", width: 100)] + public double Price { get; set; } + [Column(visible: false)] + public Dictionary WoodComponents { get; set; } = new(); } } \ No newline at end of file diff --git a/CarpentryWorkshop/CarpentryWorkshopDataModels/Models/IMessageInfoModel.cs b/CarpentryWorkshop/CarpentryWorkshopDataModels/Models/IMessageInfoModel.cs index 7b4dac5..c7efe41 100644 --- a/CarpentryWorkshop/CarpentryWorkshopDataModels/Models/IMessageInfoModel.cs +++ b/CarpentryWorkshop/CarpentryWorkshopDataModels/Models/IMessageInfoModel.cs @@ -1,6 +1,6 @@ namespace CarpentryWorkshopDataModels.Models { - public interface IMessageInfoModel + public interface IMessageInfoModel : IId { string MessageId { get; } int? ClientId { get; } diff --git a/CarpentryWorkshop/CarpentryWorkshopDatabaseImplement/CarpentryWorkshopDatabaseImplement.csproj b/CarpentryWorkshop/CarpentryWorkshopDatabaseImplement/CarpentryWorkshopDatabaseImplement.csproj index 59417c2..9c238ab 100644 --- a/CarpentryWorkshop/CarpentryWorkshopDatabaseImplement/CarpentryWorkshopDatabaseImplement.csproj +++ b/CarpentryWorkshop/CarpentryWorkshopDatabaseImplement/CarpentryWorkshopDatabaseImplement.csproj @@ -20,8 +20,8 @@ - - - + + + diff --git a/CarpentryWorkshop/CarpentryWorkshopDatabaseImplement/DatabaseImplementationExtension.cs b/CarpentryWorkshop/CarpentryWorkshopDatabaseImplement/DatabaseImplementationExtension.cs new file mode 100644 index 0000000..b567d0f --- /dev/null +++ b/CarpentryWorkshop/CarpentryWorkshopDatabaseImplement/DatabaseImplementationExtension.cs @@ -0,0 +1,22 @@ +using CarpentryWorkshopContracts.DI; +using CarpentryWorkshopContracts.StoragesContracts; +using CarpentryWorkshopDatabaseImplement.Implements; + +namespace CarpentryWorkshopDatabaseImplement +{ + 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/CarpentryWorkshop/CarpentryWorkshopDatabaseImplement/Implements/BackUpInfo.cs b/CarpentryWorkshop/CarpentryWorkshopDatabaseImplement/Implements/BackUpInfo.cs new file mode 100644 index 0000000..eaf26f5 --- /dev/null +++ b/CarpentryWorkshop/CarpentryWorkshopDatabaseImplement/Implements/BackUpInfo.cs @@ -0,0 +1,27 @@ +using CarpentryWorkshopContracts.StoragesContracts; + +namespace CarpentryWorkshopDatabaseImplement.Implements +{ + public class BackUpInfo : IBackUpInfo + { + public List? GetList() where T : class, new() + { + using var context = new CarpentryWorkshopDatabase(); + 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/CarpentryWorkshop/CarpentryWorkshopDatabaseImplement/Migrations/20240508053502_InitialCreate.Designer.cs b/CarpentryWorkshop/CarpentryWorkshopDatabaseImplement/Migrations/20240522040952_InitialCreate.Designer.cs similarity index 99% rename from CarpentryWorkshop/CarpentryWorkshopDatabaseImplement/Migrations/20240508053502_InitialCreate.Designer.cs rename to CarpentryWorkshop/CarpentryWorkshopDatabaseImplement/Migrations/20240522040952_InitialCreate.Designer.cs index a13b8c7..53a04b2 100644 --- a/CarpentryWorkshop/CarpentryWorkshopDatabaseImplement/Migrations/20240508053502_InitialCreate.Designer.cs +++ b/CarpentryWorkshop/CarpentryWorkshopDatabaseImplement/Migrations/20240522040952_InitialCreate.Designer.cs @@ -12,7 +12,7 @@ using Microsoft.EntityFrameworkCore.Storage.ValueConversion; namespace CarpentryWorkshopDatabaseImplement.Migrations { [DbContext(typeof(CarpentryWorkshopDatabase))] - [Migration("20240508053502_InitialCreate")] + [Migration("20240522040952_InitialCreate")] partial class InitialCreate { /// diff --git a/CarpentryWorkshop/CarpentryWorkshopDatabaseImplement/Migrations/20240508053502_InitialCreate.cs b/CarpentryWorkshop/CarpentryWorkshopDatabaseImplement/Migrations/20240522040952_InitialCreate.cs similarity index 100% rename from CarpentryWorkshop/CarpentryWorkshopDatabaseImplement/Migrations/20240508053502_InitialCreate.cs rename to CarpentryWorkshop/CarpentryWorkshopDatabaseImplement/Migrations/20240522040952_InitialCreate.cs diff --git a/CarpentryWorkshop/CarpentryWorkshopDatabaseImplement/Models/Client.cs b/CarpentryWorkshop/CarpentryWorkshopDatabaseImplement/Models/Client.cs index 95e95d8..eb34fba 100644 --- a/CarpentryWorkshop/CarpentryWorkshopDatabaseImplement/Models/Client.cs +++ b/CarpentryWorkshop/CarpentryWorkshopDatabaseImplement/Models/Client.cs @@ -3,21 +3,27 @@ using CarpentryWorkshopContracts.ViewModels; using CarpentryWorkshopDataModels.Models; using System.ComponentModel.DataAnnotations.Schema; using System.ComponentModel.DataAnnotations; +using System.Runtime.Serialization; namespace CarpentryWorkshopDatabaseImplement.Models { - public class Client : IClientModel + [DataContract] + public class Client : IClientModel { - public int Id { get; private set; } + [DataMember] + public int Id { get; private set; } [Required] - public string ClientFIO { get; private set; } = string.Empty; + [DataMember] + public string ClientFIO { get; private set; } = string.Empty; [Required] - public string Email { get; private set; } = string.Empty; + [DataMember] + public string Email { get; private set; } = string.Empty; [Required] - public string Password { get; private set; } = string.Empty; + [DataMember] + public string Password { get; private set; } = string.Empty; [ForeignKey("ClientId")] public virtual List Orders { get; set; } = new(); diff --git a/CarpentryWorkshop/CarpentryWorkshopDatabaseImplement/Models/Component.cs b/CarpentryWorkshop/CarpentryWorkshopDatabaseImplement/Models/Component.cs index 1c926bc..702b4e6 100644 --- a/CarpentryWorkshop/CarpentryWorkshopDatabaseImplement/Models/Component.cs +++ b/CarpentryWorkshop/CarpentryWorkshopDatabaseImplement/Models/Component.cs @@ -3,18 +3,23 @@ using CarpentryWorkshopContracts.ViewModels; using System.ComponentModel.DataAnnotations.Schema; using System.ComponentModel.DataAnnotations; using CarpentryWorkshopDataModels.Models; +using System.Runtime.Serialization; namespace CarpentryWorkshopDatabaseImplement.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 WoodComponents { get; set; } = new(); diff --git a/CarpentryWorkshop/CarpentryWorkshopDatabaseImplement/Models/Implementer.cs b/CarpentryWorkshop/CarpentryWorkshopDatabaseImplement/Models/Implementer.cs index a64093f..f3c401e 100644 --- a/CarpentryWorkshop/CarpentryWorkshopDatabaseImplement/Models/Implementer.cs +++ b/CarpentryWorkshop/CarpentryWorkshopDatabaseImplement/Models/Implementer.cs @@ -3,26 +3,32 @@ using CarpentryWorkshopContracts.ViewModels; using CarpentryWorkshopDataModels.Models; using System.ComponentModel.DataAnnotations.Schema; using System.ComponentModel.DataAnnotations; +using System.Runtime.Serialization; namespace CarpentryWorkshopDatabaseImplement.Models { + [DataContract] public class Implementer : IImplementerModel { + [DataMember] public int Id { get; private set; } [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; } - [Required] [ForeignKey("ImplementerId")] public virtual List Orders { get; set; } = new(); diff --git a/CarpentryWorkshop/CarpentryWorkshopDatabaseImplement/Models/MessageInfo.cs b/CarpentryWorkshop/CarpentryWorkshopDatabaseImplement/Models/MessageInfo.cs index a043c40..ae1b17e 100644 --- a/CarpentryWorkshop/CarpentryWorkshopDatabaseImplement/Models/MessageInfo.cs +++ b/CarpentryWorkshop/CarpentryWorkshopDatabaseImplement/Models/MessageInfo.cs @@ -3,31 +3,40 @@ using CarpentryWorkshopContracts.ViewModels; using CarpentryWorkshopDataModels.Models; using System.ComponentModel.DataAnnotations.Schema; using System.ComponentModel.DataAnnotations; +using System.Runtime.Serialization; namespace CarpentryWorkshopDatabaseImplement.Models { + [DataContract] public class MessageInfo : IMessageInfoModel { [Key] - [DatabaseGenerated(DatabaseGeneratedOption.None)] + [DataMember] public string MessageId { get; set; } = string.Empty; + [DataMember] public int? ClientId { get; set; } public virtual Client? Client { get; set; } [Required] + [DataMember] public string SenderName { get; set; } = string.Empty; [Required] - public DateTime DateDelivery { get; set; } + [DataMember] + public DateTime DateDelivery { get; set; } = DateTime.Now; [Required] + [DataMember] public string Subject { get; set; } = string.Empty; [Required] + [DataMember] public string Body { get; set; } = string.Empty; + public int Id => throw new NotImplementedException(); + public static MessageInfo? Create(MessageInfoBindingModel? model) { if (model == null) diff --git a/CarpentryWorkshop/CarpentryWorkshopDatabaseImplement/Models/Order.cs b/CarpentryWorkshop/CarpentryWorkshopDatabaseImplement/Models/Order.cs index e9f1afc..97c1d1d 100644 --- a/CarpentryWorkshop/CarpentryWorkshopDatabaseImplement/Models/Order.cs +++ b/CarpentryWorkshop/CarpentryWorkshopDatabaseImplement/Models/Order.cs @@ -3,27 +3,37 @@ using CarpentryWorkshopContracts.ViewModels; using CarpentryWorkshopDataModels.Enums; using CarpentryWorkshopDataModels.Models; using System.ComponentModel.DataAnnotations; +using System.Runtime.Serialization; namespace CarpentryWorkshopDatabaseImplement.Models { - public class Order : IOrderModel + [DataContract] + public class Order : IOrderModel { - public int Id { get; private set; } + [DataMember] + public int Id { get; private set; } [Required] - public int WoodId { get; private set; } + [DataMember] + public int WoodId { get; private set; } [Required] - public int ClientId { get; private set; } + [DataMember] + public int ClientId { get; private set; } + [DataMember] public int? ImplementerId { get; set; } [Required] - public int Count { get; private set; } + [DataMember] + public int Count { get; private set; } [Required] - public double Sum { get; private set; } + [DataMember] + public double Sum { get; private set; } [Required] - public OrderStatus Status { get; private set; } = OrderStatus.Неизвестен; + [DataMember] + public OrderStatus Status { get; private set; } = OrderStatus.Неизвестен; [Required] - public DateTime DateCreate { get; private set; } = DateTime.Now; - - public DateTime? DateImplement { get; private set; } + [DataMember] + public DateTime DateCreate { get; private set; } = DateTime.Now; + [DataMember] + public DateTime? DateImplement { get; private set; } public virtual Wood? Wood { get; private set; } public virtual Client? Client { get; set; } public virtual Implementer? Implementer { get; set; } diff --git a/CarpentryWorkshop/CarpentryWorkshopDatabaseImplement/Models/Wood.cs b/CarpentryWorkshop/CarpentryWorkshopDatabaseImplement/Models/Wood.cs index b6e21ec..6eb06d2 100644 --- a/CarpentryWorkshop/CarpentryWorkshopDatabaseImplement/Models/Wood.cs +++ b/CarpentryWorkshop/CarpentryWorkshopDatabaseImplement/Models/Wood.cs @@ -3,21 +3,27 @@ using CarpentryWorkshopContracts.ViewModels; using CarpentryWorkshopDataModels.Models; using System.ComponentModel.DataAnnotations; using System.ComponentModel.DataAnnotations.Schema; +using System.Runtime.Serialization; namespace CarpentryWorkshopDatabaseImplement.Models { - public class Wood : IWoodModel + [DataContract] + public class Wood : IWoodModel { - public int Id { get; private set; } + [DataMember] + public int Id { get; private set; } [Required] - public string WoodName { get; private set; } = string.Empty; + [DataMember] + public string WoodName { get; private set; } = string.Empty; [Required] - public double Price { get; private set; } + [DataMember] + public double Price { get; private set; } private Dictionary? _woodComponents = null; [NotMapped] - public Dictionary WoodComponents + [DataMember] + public Dictionary WoodComponents { get { diff --git a/CarpentryWorkshop/CarpentryWorkshopFileImplement/CarpentryWorkshopFileImplement.csproj b/CarpentryWorkshop/CarpentryWorkshopFileImplement/CarpentryWorkshopFileImplement.csproj index 319d159..8cf080b 100644 --- a/CarpentryWorkshop/CarpentryWorkshopFileImplement/CarpentryWorkshopFileImplement.csproj +++ b/CarpentryWorkshop/CarpentryWorkshopFileImplement/CarpentryWorkshopFileImplement.csproj @@ -11,4 +11,8 @@ - + + + + + diff --git a/CarpentryWorkshop/CarpentryWorkshopFileImplement/FileImplementationExtension.cs b/CarpentryWorkshop/CarpentryWorkshopFileImplement/FileImplementationExtension.cs new file mode 100644 index 0000000..9368992 --- /dev/null +++ b/CarpentryWorkshop/CarpentryWorkshopFileImplement/FileImplementationExtension.cs @@ -0,0 +1,22 @@ +using CarpentryWorkshopContracts.DI; +using CarpentryWorkshopContracts.StoragesContracts; +using CarpentryWorkshopFileImplement.Implements; + +namespace CarpentryWorkshopFileImplement +{ + 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/CarpentryWorkshop/CarpentryWorkshopFileImplement/Implements/BackUpInfo.cs b/CarpentryWorkshop/CarpentryWorkshopFileImplement/Implements/BackUpInfo.cs new file mode 100644 index 0000000..656b80d --- /dev/null +++ b/CarpentryWorkshop/CarpentryWorkshopFileImplement/Implements/BackUpInfo.cs @@ -0,0 +1,28 @@ +using CarpentryWorkshopContracts.StoragesContracts; + +namespace CarpentryWorkshopFileImplement.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/CarpentryWorkshop/CarpentryWorkshopFileImplement/Models/Client.cs b/CarpentryWorkshop/CarpentryWorkshopFileImplement/Models/Client.cs index 5c29975..0bc2dbf 100644 --- a/CarpentryWorkshop/CarpentryWorkshopFileImplement/Models/Client.cs +++ b/CarpentryWorkshop/CarpentryWorkshopFileImplement/Models/Client.cs @@ -1,19 +1,22 @@ using CarpentryWorkshopContracts.BindingModels; using CarpentryWorkshopContracts.ViewModels; using CarpentryWorkshopDataModels.Models; +using System.Runtime.Serialization; using System.Xml.Linq; namespace CarpentryWorkshopFileImplement.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; private set; } = string.Empty; - - public string Password { get; private set; } = string.Empty; + [DataMember] + public int Id { get; private set; } + [DataMember] + public string ClientFIO { get; private set; } = string.Empty; + [DataMember] + public string Email { get; private set; } = string.Empty; + [DataMember] + public string Password { get; private set; } = string.Empty; public static Client? Create(ClientBindingModel model) { diff --git a/CarpentryWorkshop/CarpentryWorkshopFileImplement/Models/Component.cs b/CarpentryWorkshop/CarpentryWorkshopFileImplement/Models/Component.cs index 50c8488..6ea7aff 100644 --- a/CarpentryWorkshop/CarpentryWorkshopFileImplement/Models/Component.cs +++ b/CarpentryWorkshop/CarpentryWorkshopFileImplement/Models/Component.cs @@ -1,15 +1,20 @@ using CarpentryWorkshopContracts.BindingModels; using CarpentryWorkshopContracts.ViewModels; using CarpentryWorkshopDataModels.Models; +using System.Runtime.Serialization; using System.Xml.Linq; namespace CarpentryWorkshopFileImplement.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/CarpentryWorkshop/CarpentryWorkshopFileImplement/Models/Implementer.cs b/CarpentryWorkshop/CarpentryWorkshopFileImplement/Models/Implementer.cs index 80280fa..ce5fd60 100644 --- a/CarpentryWorkshop/CarpentryWorkshopFileImplement/Models/Implementer.cs +++ b/CarpentryWorkshop/CarpentryWorkshopFileImplement/Models/Implementer.cs @@ -1,16 +1,23 @@ using CarpentryWorkshopContracts.BindingModels; using CarpentryWorkshopContracts.ViewModels; using CarpentryWorkshopDataModels.Models; +using System.Runtime.Serialization; using System.Xml.Linq; namespace CarpentryWorkshopFileImplement.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; private set; } = string.Empty; + [DataMember] public int WorkExperience { get; private set; } + [DataMember] public int Qualification { get; private set; } public static Implementer? Create(ImplementerBindingModel model) { diff --git a/CarpentryWorkshop/CarpentryWorkshopFileImplement/Models/MessageInfo.cs b/CarpentryWorkshop/CarpentryWorkshopFileImplement/Models/MessageInfo.cs index 63acd24..a4c488a 100644 --- a/CarpentryWorkshop/CarpentryWorkshopFileImplement/Models/MessageInfo.cs +++ b/CarpentryWorkshop/CarpentryWorkshopFileImplement/Models/MessageInfo.cs @@ -1,23 +1,27 @@ using CarpentryWorkshopContracts.BindingModels; using CarpentryWorkshopContracts.ViewModels; using CarpentryWorkshopDataModels.Models; +using System.Runtime.Serialization; using System.Xml.Linq; namespace CarpentryWorkshopFileImplement.Models { + [DataContract] public class MessageInfo : IMessageInfoModel { + [DataMember] public string MessageId { get; private set; } = string.Empty; - + [DataMember] public int? ClientId { get; private set; } - + [DataMember] public string SenderName { get; private set; } = string.Empty; - + [DataMember] public DateTime DateDelivery { get; private set; } = DateTime.Now; - + [DataMember] public string Subject { get; private set; } = string.Empty; - + [DataMember] public string Body { get; private set; } = string.Empty; + public int Id => throw new NotImplementedException(); public static MessageInfo? Create(MessageInfoBindingModel model) { diff --git a/CarpentryWorkshop/CarpentryWorkshopFileImplement/Models/Order.cs b/CarpentryWorkshop/CarpentryWorkshopFileImplement/Models/Order.cs index feef652..4a1680d 100644 --- a/CarpentryWorkshop/CarpentryWorkshopFileImplement/Models/Order.cs +++ b/CarpentryWorkshop/CarpentryWorkshopFileImplement/Models/Order.cs @@ -3,21 +3,32 @@ using CarpentryWorkshopContracts.ViewModels; using CarpentryWorkshopDataModels.Enums; using CarpentryWorkshopDataModels.Models; using System.Reflection; +using System.Runtime.Serialization; using System.Xml.Linq; namespace CarpentryWorkshopFileImplement.Models { - public class Order : IOrderModel + [DataContract] + public class Order : IOrderModel { - public int Id { get; private set; } - public int WoodId { get; private set; } - public int ClientId { get; private set; } + [DataMember] + public int Id { get; private set; } + [DataMember] + public int WoodId { get; private set; } + [DataMember] + public int ClientId { get; private set; } + [DataMember] public int? ImplementerId { get; private set; } + [DataMember] public int Count { get; private set; } - public double Sum { get; private set; } - public OrderStatus Status { get; private set; } = OrderStatus.Неизвестен; - public DateTime DateCreate { get; private set; } = DateTime.Now; - public DateTime? DateImplement { get; private set; } + [DataMember] + public double Sum { get; private set; } + [DataMember] + public OrderStatus Status { get; private set; } = OrderStatus.Неизвестен; + [DataMember] + public DateTime DateCreate { get; private set; } = DateTime.Now; + [DataMember] + public DateTime? DateImplement { get; private set; } public static Order? Create(OrderBindingModel model) { if (model == null) diff --git a/CarpentryWorkshop/CarpentryWorkshopFileImplement/Models/Wood.cs b/CarpentryWorkshop/CarpentryWorkshopFileImplement/Models/Wood.cs index c703955..6a91f73 100644 --- a/CarpentryWorkshop/CarpentryWorkshopFileImplement/Models/Wood.cs +++ b/CarpentryWorkshop/CarpentryWorkshopFileImplement/Models/Wood.cs @@ -3,15 +3,21 @@ using CarpentryWorkshopFileImplement; using CarpentryWorkshopContracts.BindingModels; using CarpentryWorkshopContracts.ViewModels; using System.Xml.Linq; +using System.Runtime.Serialization; namespace CarpentryWorkshopFileImplement.Models { - public class Wood : IWoodModel + [DataContract] + public class Wood : IWoodModel { - public int Id { get; private set; } - public string WoodName { get; private set; } = string.Empty; - public double Price { get; private set; } - public Dictionary Components { get; private set; } = new(); + [DataMember] + public int Id { get; private set; } + [DataMember] + public string WoodName { get; private set; } = string.Empty; + [DataMember] + public double Price { get; private set; } + [DataMember] + public Dictionary Components { get; private set; } = new(); private Dictionary? _woodComponents = null; public Dictionary WoodComponents diff --git a/CarpentryWorkshop/CarpentryWorkshopListImplement/CarpentryWorkshopListImplement.csproj b/CarpentryWorkshop/CarpentryWorkshopListImplement/CarpentryWorkshopListImplement.csproj index 319d159..9c00e95 100644 --- a/CarpentryWorkshop/CarpentryWorkshopListImplement/CarpentryWorkshopListImplement.csproj +++ b/CarpentryWorkshop/CarpentryWorkshopListImplement/CarpentryWorkshopListImplement.csproj @@ -11,4 +11,8 @@ + + + + diff --git a/CarpentryWorkshop/CarpentryWorkshopListImplement/Implements/BackUpInfo.cs b/CarpentryWorkshop/CarpentryWorkshopListImplement/Implements/BackUpInfo.cs new file mode 100644 index 0000000..9a559a3 --- /dev/null +++ b/CarpentryWorkshop/CarpentryWorkshopListImplement/Implements/BackUpInfo.cs @@ -0,0 +1,17 @@ +using CarpentryWorkshopContracts.StoragesContracts; + +namespace CarpentryWorkshopListImplement.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/CarpentryWorkshop/CarpentryWorkshopListImplement/ListImplementationExtension.cs b/CarpentryWorkshop/CarpentryWorkshopListImplement/ListImplementationExtension.cs new file mode 100644 index 0000000..439505d --- /dev/null +++ b/CarpentryWorkshop/CarpentryWorkshopListImplement/ListImplementationExtension.cs @@ -0,0 +1,22 @@ +using CarpentryWorkshopContracts.DI; +using CarpentryWorkshopContracts.StoragesContracts; +using CarpentryWorkshopListImplement.Implements; + +namespace CarpentryWorkshopListImplement +{ + 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/CarpentryWorkshop/CarpentryWorkshopListImplement/Models/MessageInfo.cs b/CarpentryWorkshop/CarpentryWorkshopListImplement/Models/MessageInfo.cs index b445985..9bf36d2 100644 --- a/CarpentryWorkshop/CarpentryWorkshopListImplement/Models/MessageInfo.cs +++ b/CarpentryWorkshop/CarpentryWorkshopListImplement/Models/MessageInfo.cs @@ -18,6 +18,8 @@ namespace CarpentryWorkshopListImplement.Models public string Body { get; private set; } = string.Empty; + public int Id => throw new NotImplementedException(); + public static MessageInfo? Create(MessageInfoBindingModel model) { if (model == null)