From da6b817890df94fb188d2f3965728858faa03e7d Mon Sep 17 00:00:00 2001 From: "yuliya.mavrina@internet.ru" Date: Wed, 22 May 2024 18:43:11 +0300 Subject: [PATCH] =?UTF-8?q?=D0=9B=D0=B0=D0=B1=D0=BE=D1=80=D0=B0=D1=82?= =?UTF-8?q?=D0=BE=D1=80=D0=BD=D0=B0=D1=8F=5F8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitignore | 5 + .../RenovationWork/DataGridViewExtension.cs | 51 +++++++++ RenovationWork/RenovationWork/FormClients.cs | 12 +-- .../RenovationWork/FormComponents.cs | 30 +++--- .../RenovationWork/FormImplementers.cs | 13 +-- RenovationWork/RenovationWork/FormMail.cs | 9 +- .../RenovationWork/FormMain.Designer.cs | 48 ++++++--- RenovationWork/RenovationWork/FormMain.cs | 101 ++++++++--------- RenovationWork/RenovationWork/FormRepair.cs | 75 ++++++------- RenovationWork/RenovationWork/FormRepairs.cs | 42 +++----- RenovationWork/RenovationWork/Program.cs | 84 +++++++-------- .../BusinessLogics/BackUpLogic.cs | 102 ++++++++++++++++++ .../Attributes/ColumnAttribute.cs | 31 ++++++ .../Attributes/GridViewAutoSize.cs | 27 +++++ .../BindingModels/BackUpSaveBinidngModel.cs | 7 ++ .../BindingModels/MessageInfoBindingModel.cs | 6 +- .../BusinessLogicsContracts/IBackUpLogic.cs | 9 ++ .../DI/DependencyManager.cs | 61 +++++++++++ .../DI/IDependencyContainer.cs | 27 +++++ .../DI/IImplementationExtension.cs | 11 ++ .../DI/ServiceDependencyContainer.cs | 57 ++++++++++ .../DI/ServiceProviderLoader.cs | 54 ++++++++++ .../RenovationWorkContracts.csproj | 4 + .../StoragesContracts/IBackUpInfo.cs | 9 ++ .../ViewModels/ClientViewModel.cs | 21 ++-- .../ViewModels/ComponentViewModel.cs | 14 ++- .../ViewModels/ImplementerViewModel.cs | 26 +++-- .../ViewModels/MessageInfoViewModel.cs | 25 +++-- .../ViewModels/OrderViewModel.cs | 62 ++++++----- .../ViewModels/RepairViewModel.cs | 23 ++-- .../Models/IMessageInfoModel.cs | 2 +- .../ImplementationExtension.cs | 22 ++++ .../Implements/BackUpInfo.cs | 32 ++++++ .../Models/Client.cs | 26 +++-- .../Models/Component.cs | 16 ++- .../Models/Implementer.cs | 24 +++-- .../Models/MessageInfo.cs | 25 ++++- .../Models/Order.cs | 41 +++++-- .../Models/Repair.cs | 19 +++- .../RenovationWorkDatabaseImplement.csproj | 4 + .../ImplementationExtension.cs | 22 ++++ .../Implements/BackUpInfo.cs | 39 +++++++ .../Models/Client.cs | 20 +++- .../Models/Component.cs | 15 ++- .../Models/Implementer.cs | 23 ++-- .../Models/MessageInfo.cs | 17 +++ .../Models/Order.cs | 39 +++++-- .../Models/Repair.cs | 19 +++- .../RenovationWorkFileImplement.csproj | 4 + .../ImplementationExtension.cs | 27 +++++ .../Implements/BackUpInfo.cs | 17 +++ .../Models/MessageInfo.cs | 2 + .../RenovationWorkListImplement.csproj | 6 +- 53 files changed, 1142 insertions(+), 365 deletions(-) create mode 100644 RenovationWork/RenovationWork/DataGridViewExtension.cs create mode 100644 RenovationWork/RenovationWorkBusinessLogic/BusinessLogics/BackUpLogic.cs create mode 100644 RenovationWork/RenovationWorkContracts/Attributes/ColumnAttribute.cs create mode 100644 RenovationWork/RenovationWorkContracts/Attributes/GridViewAutoSize.cs create mode 100644 RenovationWork/RenovationWorkContracts/BindingModels/BackUpSaveBinidngModel.cs create mode 100644 RenovationWork/RenovationWorkContracts/BusinessLogicsContracts/IBackUpLogic.cs create mode 100644 RenovationWork/RenovationWorkContracts/DI/DependencyManager.cs create mode 100644 RenovationWork/RenovationWorkContracts/DI/IDependencyContainer.cs create mode 100644 RenovationWork/RenovationWorkContracts/DI/IImplementationExtension.cs create mode 100644 RenovationWork/RenovationWorkContracts/DI/ServiceDependencyContainer.cs create mode 100644 RenovationWork/RenovationWorkContracts/DI/ServiceProviderLoader.cs create mode 100644 RenovationWork/RenovationWorkContracts/StoragesContracts/IBackUpInfo.cs create mode 100644 RenovationWork/RenovationWorkDatabaseImplement/ImplementationExtension.cs create mode 100644 RenovationWork/RenovationWorkDatabaseImplement/Implements/BackUpInfo.cs create mode 100644 RenovationWork/RenovationWorkFileImplement/ImplementationExtension.cs create mode 100644 RenovationWork/RenovationWorkFileImplement/Implements/BackUpInfo.cs create mode 100644 RenovationWork/RenovationWorkListImplement/ImplementationExtension.cs create mode 100644 RenovationWork/RenovationWorkListImplement/Implements/BackUpInfo.cs diff --git a/.gitignore b/.gitignore index ca1c7a3..72cfb7b 100644 --- a/.gitignore +++ b/.gitignore @@ -14,6 +14,11 @@ # User-specific files (MonoDevelop/Xamarin Studio) *.userprefs +# dll файлы +*.dll + +/RenovationWork/ImplementationExtensions + # Mono auto generated files mono_crash.* diff --git a/RenovationWork/RenovationWork/DataGridViewExtension.cs b/RenovationWork/RenovationWork/DataGridViewExtension.cs new file mode 100644 index 0000000..05ce16b --- /dev/null +++ b/RenovationWork/RenovationWork/DataGridViewExtension.cs @@ -0,0 +1,51 @@ +using RenovationWorkContracts.Attributes; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace RenovationWorkView +{ + internal 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; + } + } + } + } + } +} \ No newline at end of file diff --git a/RenovationWork/RenovationWork/FormClients.cs b/RenovationWork/RenovationWork/FormClients.cs index 736f8c1..d13fc39 100644 --- a/RenovationWork/RenovationWork/FormClients.cs +++ b/RenovationWork/RenovationWork/FormClients.cs @@ -31,16 +31,8 @@ namespace RenovationWorkView { 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; - } - _logger.LogInformation("Загрузка клиентов"); + dataGridView.FillAndConfigGrid(_logic.ReadList(null)); + _logger.LogInformation("Загрузка клиентов"); } catch (Exception ex) { diff --git a/RenovationWork/RenovationWork/FormComponents.cs b/RenovationWork/RenovationWork/FormComponents.cs index 3d741cf..fbbfaf7 100644 --- a/RenovationWork/RenovationWork/FormComponents.cs +++ b/RenovationWork/RenovationWork/FormComponents.cs @@ -10,6 +10,7 @@ using System.Windows.Forms; using RenovationWorkContracts.BindingModels; using RenovationWorkContracts.BusinessLogicsContracts; using Microsoft.Extensions.Logging; +using RenovationWorkContracts.DI; namespace RenovationWorkView { @@ -51,29 +52,24 @@ namespace RenovationWorkView private void buttonAdd_Click(object sender, EventArgs e) { - var service = Program.ServiceProvider?.GetService(typeof(FormComponent)); - if (service is FormComponent form) - { - if (form.ShowDialog() == DialogResult.OK) - { - LoadData(); - } - } + var form = DependencyManager.Instance.Resolve(); + if (form.ShowDialog() == DialogResult.OK) + { + LoadData(); + } } private void buttonUpd_Click(object sender, EventArgs e) { if (dataGridView.SelectedRows.Count == 1) { - var service = Program.ServiceProvider?.GetService(typeof(FormComponent)); - if (service is FormComponent form) - { - form.Id = Convert.ToInt32(dataGridView.SelectedRows[0].Cells["Id"].Value); - if (form.ShowDialog() == DialogResult.OK) - { - LoadData(); - } - } + var form = DependencyManager.Instance.Resolve(); + + form.Id = Convert.ToInt32(dataGridView.SelectedRows[0].Cells["Id"].Value); + if (form.ShowDialog() == DialogResult.OK) + { + LoadData(); + } } } diff --git a/RenovationWork/RenovationWork/FormImplementers.cs b/RenovationWork/RenovationWork/FormImplementers.cs index 3e99842..ec9bda0 100644 --- a/RenovationWork/RenovationWork/FormImplementers.cs +++ b/RenovationWork/RenovationWork/FormImplementers.cs @@ -32,17 +32,8 @@ namespace RenovationWorkView { 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; - } - _logger.LogInformation("Загрузка компонентов"); + dataGridView.FillAndConfigGrid(_logic.ReadList(null)); + _logger.LogInformation("Загрузка компонентов"); } catch (Exception ex) { diff --git a/RenovationWork/RenovationWork/FormMail.cs b/RenovationWork/RenovationWork/FormMail.cs index 125ecff..588bf38 100644 --- a/RenovationWork/RenovationWork/FormMail.cs +++ b/RenovationWork/RenovationWork/FormMail.cs @@ -27,14 +27,7 @@ namespace RenovationWorkView { 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/RenovationWork/RenovationWork/FormMain.Designer.cs b/RenovationWork/RenovationWork/FormMain.Designer.cs index 4470da3..43aa5f1 100644 --- a/RenovationWork/RenovationWork/FormMain.Designer.cs +++ b/RenovationWork/RenovationWork/FormMain.Designer.cs @@ -39,23 +39,24 @@ componentRepairsПоИзделиямToolStripMenuItem = new ToolStripMenuItem(); OrdersToolStripMenuItem = new ToolStripMenuItem(); StartWorkingToolStripMenuItem = new ToolStripMenuItem(); + mailToolStripMenuItem = new ToolStripMenuItem(); + createBackUpToolStripMenuItem = new ToolStripMenuItem(); dataGridView = new DataGridView(); buttonCreateOrder = new Button(); buttonTakeOrderInWork = new Button(); buttonOrderReady = new Button(); buttonIssuedOrder = new Button(); buttonRef = new Button(); - mailToolStripMenuItem = new ToolStripMenuItem(); menuStrip.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)dataGridView).BeginInit(); SuspendLayout(); // // menuStrip // - menuStrip.Items.AddRange(new ToolStripItem[] { refbooksToolStripMenuItem, отчетыToolStripMenuItem, StartWorkingToolStripMenuItem, mailToolStripMenuItem }); + menuStrip.Items.AddRange(new ToolStripItem[] { refbooksToolStripMenuItem, отчетыToolStripMenuItem, StartWorkingToolStripMenuItem, mailToolStripMenuItem, createBackUpToolStripMenuItem }); menuStrip.Location = new Point(0, 0); menuStrip.Name = "menuStrip"; - menuStrip.Size = new Size(1129, 24); + menuStrip.Size = new Size(1236, 24); menuStrip.TabIndex = 0; menuStrip.Text = "menuStrip1"; // @@ -129,6 +130,20 @@ StartWorkingToolStripMenuItem.Text = "Запуск работ"; StartWorkingToolStripMenuItem.Click += StartWorkingToolStripMenuItem_Click_1; // + // mailToolStripMenuItem + // + mailToolStripMenuItem.Name = "mailToolStripMenuItem"; + mailToolStripMenuItem.Size = new Size(62, 20); + mailToolStripMenuItem.Text = "Письма"; + mailToolStripMenuItem.Click += mailToolStripMenuItem_Click; + // + // createBackUpToolStripMenuItem + // + createBackUpToolStripMenuItem.Name = "createBackUpToolStripMenuItem"; + createBackUpToolStripMenuItem.Size = new Size(97, 20); + createBackUpToolStripMenuItem.Text = "Создать бекап"; + createBackUpToolStripMenuItem.Click += createBackUpToolStripMenuItem_Click; + // // dataGridView // dataGridView.BackgroundColor = SystemColors.ControlLightLight; @@ -136,12 +151,13 @@ dataGridView.Location = new Point(12, 27); dataGridView.Name = "dataGridView"; dataGridView.RowTemplate.Height = 25; - dataGridView.Size = new Size(942, 341); + dataGridView.Size = new Size(1049, 341); dataGridView.TabIndex = 1; // // buttonCreateOrder // - buttonCreateOrder.Location = new Point(960, 42); + buttonCreateOrder.ImageAlign = ContentAlignment.MiddleRight; + buttonCreateOrder.Location = new Point(1067, 42); buttonCreateOrder.Name = "buttonCreateOrder"; buttonCreateOrder.Size = new Size(157, 23); buttonCreateOrder.TabIndex = 2; @@ -151,7 +167,8 @@ // // buttonTakeOrderInWork // - buttonTakeOrderInWork.Location = new Point(960, 71); + buttonTakeOrderInWork.ImageAlign = ContentAlignment.MiddleRight; + buttonTakeOrderInWork.Location = new Point(1067, 71); buttonTakeOrderInWork.Name = "buttonTakeOrderInWork"; buttonTakeOrderInWork.Size = new Size(157, 23); buttonTakeOrderInWork.TabIndex = 3; @@ -161,7 +178,8 @@ // // buttonOrderReady // - buttonOrderReady.Location = new Point(960, 100); + buttonOrderReady.ImageAlign = ContentAlignment.MiddleRight; + buttonOrderReady.Location = new Point(1067, 100); buttonOrderReady.Name = "buttonOrderReady"; buttonOrderReady.Size = new Size(157, 23); buttonOrderReady.TabIndex = 4; @@ -171,7 +189,8 @@ // // buttonIssuedOrder // - buttonIssuedOrder.Location = new Point(960, 129); + buttonIssuedOrder.ImageAlign = ContentAlignment.MiddleRight; + buttonIssuedOrder.Location = new Point(1067, 129); buttonIssuedOrder.Name = "buttonIssuedOrder"; buttonIssuedOrder.Size = new Size(157, 23); buttonIssuedOrder.TabIndex = 5; @@ -181,7 +200,8 @@ // // buttonRef // - buttonRef.Location = new Point(960, 158); + buttonRef.ImageAlign = ContentAlignment.MiddleRight; + buttonRef.Location = new Point(1067, 158); buttonRef.Name = "buttonRef"; buttonRef.Size = new Size(157, 23); buttonRef.TabIndex = 6; @@ -189,18 +209,11 @@ buttonRef.UseVisualStyleBackColor = true; buttonRef.Click += buttonRef_Click; // - // mailToolStripMenuItem - // - mailToolStripMenuItem.Name = "mailToolStripMenuItem"; - mailToolStripMenuItem.Size = new Size(62, 20); - mailToolStripMenuItem.Text = "Письма"; - mailToolStripMenuItem.Click += mailToolStripMenuItem_Click; - // // FormMain // AutoScaleDimensions = new SizeF(7F, 15F); AutoScaleMode = AutoScaleMode.Font; - ClientSize = new Size(1129, 370); + ClientSize = new Size(1236, 370); Controls.Add(buttonRef); Controls.Add(buttonIssuedOrder); Controls.Add(buttonOrderReady); @@ -239,5 +252,6 @@ private ToolStripMenuItem ImplementersToolStripMenuItem; private ToolStripMenuItem StartWorkingToolStripMenuItem; private ToolStripMenuItem mailToolStripMenuItem; + private ToolStripMenuItem createBackUpToolStripMenuItem; } } \ No newline at end of file diff --git a/RenovationWork/RenovationWork/FormMain.cs b/RenovationWork/RenovationWork/FormMain.cs index a05011b..6ed43d1 100644 --- a/RenovationWork/RenovationWork/FormMain.cs +++ b/RenovationWork/RenovationWork/FormMain.cs @@ -11,6 +11,7 @@ using RenovationWorkContracts.BindingModels; using RenovationWorkContracts.BusinessLogicsContracts; using Microsoft.Extensions.Logging; using RenovationWorkBusinessLogic.BusinessLogics; +using RenovationWorkContracts.DI; namespace RenovationWorkView { @@ -20,13 +21,15 @@ namespace RenovationWorkView 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) @@ -35,20 +38,10 @@ namespace RenovationWorkView } private void LoadData() { - _logger.LogInformation("Загрузка заказов"); try { - var list = _orderLogic.ReadList(null); - if (list != null) - { - dataGridView.DataSource = list; - dataGridView.Columns["RepairId"].Visible = false; - dataGridView.Columns["ImplementerId"].Visible = false; - dataGridView.Columns["ClientId"].Visible = false; - dataGridView.Columns["RepairName"].AutoSizeMode = DataGridViewAutoSizeColumnMode.Fill; - dataGridView.Columns["ClientFIO"].AutoSizeMode = DataGridViewAutoSizeColumnMode.Fill; - dataGridView.Columns["ImplementerFIO"].AutoSizeMode = DataGridViewAutoSizeColumnMode.Fill; - } + dataGridView.FillAndConfigGrid(_orderLogic.ReadList(null)); + _logger.LogInformation("Загрузка заказов"); } catch (Exception ex) { @@ -59,30 +52,21 @@ namespace RenovationWorkView private void componentsToolStripMenuItem_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 JobTypeToolStripMenuItem_Click(object sender, EventArgs e) { - var service = Program.ServiceProvider?.GetService(typeof(FormRepairs)); - if (service is FormRepairs form) - { - form.ShowDialog(); - } + var form = DependencyManager.Instance.Resolve(); + form.ShowDialog(); } private void buttonCreateOrder_Click(object sender, EventArgs e) { - var service = Program.ServiceProvider?.GetService(typeof(FormCreateOrder)); - if (service is FormCreateOrder form) - { - form.ShowDialog(); - LoadData(); - } + var form = DependencyManager.Instance.Resolve(); + form.ShowDialog(); + LoadData(); } private void buttonTakeOrderInWork_Click(object sender, EventArgs e) @@ -180,54 +164,63 @@ namespace RenovationWorkView private void componentRepairsПоИзделиямToolStripMenuItem_Click(object sender, EventArgs e) { - var service = Program.ServiceProvider?.GetService(typeof(FormReportRepairComponents)); - if (service is FormReportRepairComponents form) - { - form.ShowDialog(); - } + var form = DependencyManager.Instance.Resolve(); + form.ShowDialog(); } private void OrdersToolStripMenuItem_Click(object sender, EventArgs e) { - var service = Program.ServiceProvider?.GetService(typeof(FormReportOrders)); - if (service is FormReportOrders form) - { - form.ShowDialog(); - } + var form = DependencyManager.Instance.Resolve(); + form.ShowDialog(); } private void ClientsToolStripMenuItem_Click(object sender, EventArgs e) { - var service = Program.ServiceProvider?.GetService(typeof(FormClients)); - if (service is FormClients form) - { - form.ShowDialog(); - } + var form = DependencyManager.Instance.Resolve(); + form.ShowDialog(); } private void ImplementersToolStripMenuItem_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 StartWorkingToolStripMenuItem_Click_1(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 mailToolStripMenuItem_Click(object sender, EventArgs e) { - var service = Program.ServiceProvider?.GetService(typeof(FormMail)); - if (service is FormMail 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("Бекап создан", "Сообщение", + MessageBoxButtons.OK, MessageBoxIcon.Information); + } + } + } + catch (Exception ex) + { + MessageBox.Show(ex.Message, "Ошибка создания бэкапа", MessageBoxButtons.OK, + MessageBoxIcon.Error); } } } } - diff --git a/RenovationWork/RenovationWork/FormRepair.cs b/RenovationWork/RenovationWork/FormRepair.cs index 777b6cf..bf741be 100644 --- a/RenovationWork/RenovationWork/FormRepair.cs +++ b/RenovationWork/RenovationWork/FormRepair.cs @@ -12,6 +12,7 @@ using RenovationWorkContracts.BusinessLogicsContracts; using RenovationWorkContracts.SearchModels; using RenovationWorkDataModels.Models; using Microsoft.Extensions.Logging; +using RenovationWorkContracts.DI; namespace RenovationWorkView { @@ -78,51 +79,43 @@ namespace RenovationWorkView private void buttonAdd_Click(object sender, EventArgs e) { - var service = - Program.ServiceProvider?.GetService(typeof(FormRepairComponent)); - if (service is FormRepairComponent form) - if (form.ShowDialog() == DialogResult.OK) - { - if (form.ComponentModel == null) - { - return; - } - _logger.LogInformation("Добавление нового компонента: { ComponentName} - { Count}", form.ComponentModel.ComponentName, form.Count); - if (_repairComponents.ContainsKey(form.Id)) - { - _repairComponents[form.Id] = (form.ComponentModel, - form.Count); - } - else - { - _repairComponents.Add(form.Id, (form.ComponentModel, - form.Count)); - } - LoadData(); - } - } + var form = DependencyManager.Instance.Resolve(); + if (form.ShowDialog() == DialogResult.OK) + { + return; + } + _logger.LogInformation("Добавление нового компонента:{ ComponentName}-{ Count}", form.ComponentModel.ComponentName, form.Count); + if (_repairComponents.ContainsKey(form.Id)) + { + _repairComponents[form.Id] = (form.ComponentModel, + form.Count); + } + else + { + _repairComponents.Add(form.Id, (form.ComponentModel, + form.Count)); + } + LoadData(); + } - private void buttonUpd_Click(object sender, EventArgs e) + private void buttonUpd_Click(object sender, EventArgs e) { if (dataGridView.SelectedRows.Count == 1) { - var service = Program.ServiceProvider?.GetService(typeof(FormRepairComponent)); - if (service is FormRepairComponent form) - { - int id = Convert.ToInt32(dataGridView.SelectedRows[0].Cells[0].Value); - form.Id = id; - form.Count = _repairComponents[id].Item2; - if (form.ShowDialog() == DialogResult.OK) - { - if (form.ComponentModel == null) - { - return; - } - _logger.LogInformation("Изменение компонента: { ComponentName} - { Count} ", form.ComponentModel.ComponentName, form.Count); - _repairComponents[form.Id] = (form.ComponentModel, form.Count); - LoadData(); - } - } + var form = DependencyManager.Instance.Resolve(); + int id = Convert.ToInt32(dataGridView.SelectedRows[0].Cells[0].Value); + form.Id = id; + form.Count = _repairComponents[id].Item2; + if (form.ShowDialog() == DialogResult.OK) + { + if (form.ComponentModel == null) + { + return; + } + _logger.LogInformation("Изменение компонента:{ ComponentName}-{ Count}", form.ComponentModel.ComponentName, form.Count); + _repairComponents[form.Id] = (form.ComponentModel, form.Count); + LoadData(); + } } } diff --git a/RenovationWork/RenovationWork/FormRepairs.cs b/RenovationWork/RenovationWork/FormRepairs.cs index dc8d7f4..c19626f 100644 --- a/RenovationWork/RenovationWork/FormRepairs.cs +++ b/RenovationWork/RenovationWork/FormRepairs.cs @@ -10,6 +10,7 @@ using System.Windows.Forms; using RenovationWorkContracts.BindingModels; using RenovationWorkContracts.BusinessLogicsContracts; using Microsoft.Extensions.Logging; +using RenovationWorkContracts.DI; namespace RenovationWorkView { @@ -32,48 +33,35 @@ namespace RenovationWorkView { 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) { - _logger.LogError(ex, "Ошибка загрузки компьютеров"); + _logger.LogError(ex, "Ошибка загрузки ремонтных работ"); MessageBox.Show(ex.Message, "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error); } } private void buttonAdd_Click(object sender, EventArgs e) { - var service = Program.ServiceProvider?.GetService(typeof(FormRepair)); - if (service is FormRepair form) - { - if (form.ShowDialog() == DialogResult.OK) - { - LoadData(); - } - } + var form = DependencyManager.Instance.Resolve(); + if (form.ShowDialog() == DialogResult.OK) + { + LoadData(); + } } private void buttonUpd_Click(object sender, EventArgs e) { if (dataGridView.SelectedRows.Count == 1) { - var service = Program.ServiceProvider?.GetService(typeof(FormRepair)); - if (service is FormRepair form) - { - form.Id = Convert.ToInt32(dataGridView.SelectedRows[0].Cells["Id"].Value); - if (form.ShowDialog() == DialogResult.OK) - { - LoadData(); - } - } + var form = DependencyManager.Instance.Resolve(); + form.Id = Convert.ToInt32(dataGridView.SelectedRows[0].Cells["Id"].Value); + if (form.ShowDialog() == DialogResult.OK) + { + LoadData(); + } } } diff --git a/RenovationWork/RenovationWork/Program.cs b/RenovationWork/RenovationWork/Program.cs index 4e0a0f2..ec3a39d 100644 --- a/RenovationWork/RenovationWork/Program.cs +++ b/RenovationWork/RenovationWork/Program.cs @@ -9,6 +9,7 @@ using RenovationWorkDatabaseImplement.Implements; using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.Logging; using NLog.Extensions.Logging; +using RenovationWorkContracts.DI; using System; @@ -27,12 +28,10 @@ namespace RenovationWorkView // 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"] @@ -50,50 +49,51 @@ namespace RenovationWorkView } 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.AddTransient(); - services.AddTransient(); - services.AddTransient(); - services.AddTransient(); - services.AddTransient(); - services.AddTransient(); - services.AddTransient(); - services.AddTransient(); - services.AddTransient(); - services.AddTransient(); - services.AddTransient(); - services.AddTransient(); - services.AddTransient(); - services.AddTransient(); - services.AddTransient(); - services.AddTransient(); - services.AddSingleton(); - services.AddTransient(); - services.AddTransient(); - services.AddTransient(); - services.AddTransient(); - services.AddTransient(); - services.AddTransient(); - services.AddTransient(); - services.AddTransient(); - services.AddTransient(); - services.AddTransient(); - services.AddTransient(); - services.AddTransient(); - services.AddTransient(); - services.AddTransient(); + + DependencyManager.Instance.RegisterType(); + DependencyManager.Instance.RegisterType(); + DependencyManager.Instance.RegisterType(); + DependencyManager.Instance.RegisterType(); + DependencyManager.Instance.RegisterType(); + DependencyManager.Instance.RegisterType(); + DependencyManager.Instance.RegisterType(); + DependencyManager.Instance.RegisterType(); + + DependencyManager.Instance.RegisterType(); + DependencyManager.Instance.RegisterType(); + DependencyManager.Instance.RegisterType(); + DependencyManager.Instance.RegisterType(true); + + DependencyManager.Instance.RegisterType(); + + DependencyManager.Instance.RegisterType(); + DependencyManager.Instance.RegisterType(); + DependencyManager.Instance.RegisterType(); + DependencyManager.Instance.RegisterType(); + DependencyManager.Instance.RegisterType(); + DependencyManager.Instance.RegisterType(); + DependencyManager.Instance.RegisterType(); + DependencyManager.Instance.RegisterType(); + DependencyManager.Instance.RegisterType(); + DependencyManager.Instance.RegisterType(); + DependencyManager.Instance.RegisterType(); + DependencyManager.Instance.RegisterType(); + DependencyManager.Instance.RegisterType(); } - private static void MailCheck(object obj) => ServiceProvider?.GetService()?.MailCheck(); + private static void MailCheck(object obj) => DependencyManager.Instance.Resolve()?.MailCheck(); } } \ No newline at end of file diff --git a/RenovationWork/RenovationWorkBusinessLogic/BusinessLogics/BackUpLogic.cs b/RenovationWork/RenovationWorkBusinessLogic/BusinessLogics/BackUpLogic.cs new file mode 100644 index 0000000..cdf952f --- /dev/null +++ b/RenovationWork/RenovationWorkBusinessLogic/BusinessLogics/BackUpLogic.cs @@ -0,0 +1,102 @@ +using Microsoft.Extensions.Logging; +using RenovationWorkContracts.BindingModels; +using RenovationWorkContracts.BusinessLogicsContracts; +using RenovationWorkContracts.StoragesContracts; +using RenovationWorkDataModels; +using System; +using System.Collections.Generic; +using System.IO.Compression; +using System.Linq; +using System.Reflection; +using System.Runtime.Serialization.Json; +using System.Text; +using System.Threading.Tasks; + +namespace RenovationWorkBusinessLogic.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/RenovationWork/RenovationWorkContracts/Attributes/ColumnAttribute.cs b/RenovationWork/RenovationWorkContracts/Attributes/ColumnAttribute.cs new file mode 100644 index 0000000..a0d2b3b --- /dev/null +++ b/RenovationWork/RenovationWorkContracts/Attributes/ColumnAttribute.cs @@ -0,0 +1,31 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace RenovationWorkContracts.Attributes +{ + [AttributeUsage(AttributeTargets.Property)] + public class ColumnAttribute : Attribute + { + 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; } + + 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; + } + } +} diff --git a/RenovationWork/RenovationWorkContracts/Attributes/GridViewAutoSize.cs b/RenovationWork/RenovationWorkContracts/Attributes/GridViewAutoSize.cs new file mode 100644 index 0000000..cd12439 --- /dev/null +++ b/RenovationWork/RenovationWorkContracts/Attributes/GridViewAutoSize.cs @@ -0,0 +1,27 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace RenovationWorkContracts.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/RenovationWork/RenovationWorkContracts/BindingModels/BackUpSaveBinidngModel.cs b/RenovationWork/RenovationWorkContracts/BindingModels/BackUpSaveBinidngModel.cs new file mode 100644 index 0000000..38d0049 --- /dev/null +++ b/RenovationWork/RenovationWorkContracts/BindingModels/BackUpSaveBinidngModel.cs @@ -0,0 +1,7 @@ +namespace RenovationWorkContracts.BindingModels +{ + public class BackUpSaveBinidngModel + { + public string FolderName { get; set; } = string.Empty; + } +} diff --git a/RenovationWork/RenovationWorkContracts/BindingModels/MessageInfoBindingModel.cs b/RenovationWork/RenovationWorkContracts/BindingModels/MessageInfoBindingModel.cs index 9efd182..1cfc0f2 100644 --- a/RenovationWork/RenovationWorkContracts/BindingModels/MessageInfoBindingModel.cs +++ b/RenovationWork/RenovationWorkContracts/BindingModels/MessageInfoBindingModel.cs @@ -1,5 +1,4 @@ - -using RenovationWorkDataModels.Models; +using RenovationWorkDataModels.Models; using System; using System.Collections.Generic; using System.Linq; @@ -16,5 +15,6 @@ namespace RenovationWorkContracts.BindingModels public string Subject { get; set; } = string.Empty; public string Body { get; set; } = string.Empty; public DateTime DateDelivery { get; set; } + public int Id => throw new NotImplementedException(); } -} \ No newline at end of file +} diff --git a/RenovationWork/RenovationWorkContracts/BusinessLogicsContracts/IBackUpLogic.cs b/RenovationWork/RenovationWorkContracts/BusinessLogicsContracts/IBackUpLogic.cs new file mode 100644 index 0000000..b1261fc --- /dev/null +++ b/RenovationWork/RenovationWorkContracts/BusinessLogicsContracts/IBackUpLogic.cs @@ -0,0 +1,9 @@ +using RenovationWorkContracts.BindingModels; + +namespace RenovationWorkContracts.BusinessLogicsContracts +{ + public interface IBackUpLogic + { + void CreateBackUp(BackUpSaveBinidngModel model); + } +} \ No newline at end of file diff --git a/RenovationWork/RenovationWorkContracts/DI/DependencyManager.cs b/RenovationWork/RenovationWorkContracts/DI/DependencyManager.cs new file mode 100644 index 0000000..a7f6678 --- /dev/null +++ b/RenovationWork/RenovationWorkContracts/DI/DependencyManager.cs @@ -0,0 +1,61 @@ +using Microsoft.Extensions.Logging; + +namespace RenovationWorkContracts.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(); + } +} \ No newline at end of file diff --git a/RenovationWork/RenovationWorkContracts/DI/IDependencyContainer.cs b/RenovationWork/RenovationWorkContracts/DI/IDependencyContainer.cs new file mode 100644 index 0000000..abf6042 --- /dev/null +++ b/RenovationWork/RenovationWorkContracts/DI/IDependencyContainer.cs @@ -0,0 +1,27 @@ +using Microsoft.Extensions.Logging; + +namespace RenovationWorkContracts.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/RenovationWork/RenovationWorkContracts/DI/IImplementationExtension.cs b/RenovationWork/RenovationWorkContracts/DI/IImplementationExtension.cs new file mode 100644 index 0000000..9ecff54 --- /dev/null +++ b/RenovationWork/RenovationWorkContracts/DI/IImplementationExtension.cs @@ -0,0 +1,11 @@ +namespace RenovationWorkContracts.DI +{ + public interface IImplementationExtension + { + public int Priority { get; } + /// + /// Регистрация сервисов + /// + public void RegisterServices(); + } +} diff --git a/RenovationWork/RenovationWorkContracts/DI/ServiceDependencyContainer.cs b/RenovationWork/RenovationWorkContracts/DI/ServiceDependencyContainer.cs new file mode 100644 index 0000000..35673b6 --- /dev/null +++ b/RenovationWork/RenovationWorkContracts/DI/ServiceDependencyContainer.cs @@ -0,0 +1,57 @@ +using Microsoft.Extensions.DependencyInjection; +using Microsoft.Extensions.Logging; + +namespace RenovationWorkContracts.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()!; + } + } +} \ No newline at end of file diff --git a/RenovationWork/RenovationWorkContracts/DI/ServiceProviderLoader.cs b/RenovationWork/RenovationWorkContracts/DI/ServiceProviderLoader.cs new file mode 100644 index 0000000..3a3c11d --- /dev/null +++ b/RenovationWork/RenovationWorkContracts/DI/ServiceProviderLoader.cs @@ -0,0 +1,54 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Reflection; +using System.Text; +using System.Threading.Tasks; + +namespace RenovationWorkContracts.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"; + } + } +} \ No newline at end of file diff --git a/RenovationWork/RenovationWorkContracts/RenovationWorkContracts.csproj b/RenovationWork/RenovationWorkContracts/RenovationWorkContracts.csproj index 96ab30f..096e6d5 100644 --- a/RenovationWork/RenovationWorkContracts/RenovationWorkContracts.csproj +++ b/RenovationWork/RenovationWorkContracts/RenovationWorkContracts.csproj @@ -6,6 +6,10 @@ enable + + + + diff --git a/RenovationWork/RenovationWorkContracts/StoragesContracts/IBackUpInfo.cs b/RenovationWork/RenovationWorkContracts/StoragesContracts/IBackUpInfo.cs new file mode 100644 index 0000000..18f2d7b --- /dev/null +++ b/RenovationWork/RenovationWorkContracts/StoragesContracts/IBackUpInfo.cs @@ -0,0 +1,9 @@ +namespace RenovationWorkContracts.StoragesContracts +{ + public interface IBackUpInfo + { + List? GetList() where T : class, new(); + + Type? GetTypeByModelInterface(string modelInterfaceName); + } +} diff --git a/RenovationWork/RenovationWorkContracts/ViewModels/ClientViewModel.cs b/RenovationWork/RenovationWorkContracts/ViewModels/ClientViewModel.cs index 436bf17..b7cf158 100644 --- a/RenovationWork/RenovationWorkContracts/ViewModels/ClientViewModel.cs +++ b/RenovationWork/RenovationWorkContracts/ViewModels/ClientViewModel.cs @@ -1,4 +1,5 @@ -using RenovationWorkDataModels.Models; +using RenovationWorkContracts.Attributes; +using RenovationWorkDataModels.Models; using System.ComponentModel; @@ -6,13 +7,17 @@ namespace RenovationWorkContracts.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: "Логин (эл. почта)", 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/RenovationWork/RenovationWorkContracts/ViewModels/ComponentViewModel.cs b/RenovationWork/RenovationWorkContracts/ViewModels/ComponentViewModel.cs index 2ff68d6..2a5cba7 100644 --- a/RenovationWork/RenovationWorkContracts/ViewModels/ComponentViewModel.cs +++ b/RenovationWork/RenovationWorkContracts/ViewModels/ComponentViewModel.cs @@ -4,6 +4,7 @@ using System.Linq; using System.Text; using System.Threading.Tasks; using RenovationWorkDataModels.Models; +using RenovationWorkContracts.Attributes; using System.ComponentModel; @@ -11,11 +12,14 @@ namespace RenovationWorkContracts.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: 150)] + public double Cost { get; set; } } } diff --git a/RenovationWork/RenovationWorkContracts/ViewModels/ImplementerViewModel.cs b/RenovationWork/RenovationWorkContracts/ViewModels/ImplementerViewModel.cs index 2f1cabd..a4076a3 100644 --- a/RenovationWork/RenovationWorkContracts/ViewModels/ImplementerViewModel.cs +++ b/RenovationWork/RenovationWorkContracts/ViewModels/ImplementerViewModel.cs @@ -1,4 +1,5 @@ -using RenovationWorkDataModels.Models; +using RenovationWorkContracts.Attributes; +using RenovationWorkDataModels.Models; using System; using System.Collections.Generic; using System.ComponentModel; @@ -10,14 +11,19 @@ namespace RenovationWorkContracts.ViewModels { public class ImplementerViewModel : IImplementerModel { - public int Id { get; set; } - [DisplayName("ФИО исполнителя")] - public string ImplementerFIO { get; set; } = string.Empty; - [DisplayName("Стаж работы")] - public int WorkExperience { get; set; } = 0; - [DisplayName("Квалификация")] - public int Qualification { get; set; } = 0; - [DisplayName("Пароль")] - public string Password { get; set; } = string.Empty; + [Column(visible: false)] + public int Id { get; set; } + + [Column(title: "ФИО исполнителя", gridViewAutoSize: GridViewAutoSize.Fill, isUseAutoSize: true)] + public string ImplementerFIO { get; set; } = string.Empty; + + [Column(title: "Стаж работы", width: 60)] + public int WorkExperience { get; set; } = 0; + + [Column(title: "Квалификация", width: 60)] + public int Qualification { get; set; } = 0; + + [Column(title: "Пароль", width: 100)] + public string Password { get; set; } = string.Empty; } } diff --git a/RenovationWork/RenovationWorkContracts/ViewModels/MessageInfoViewModel.cs b/RenovationWork/RenovationWorkContracts/ViewModels/MessageInfoViewModel.cs index 9e25fcc..27612d6 100644 --- a/RenovationWork/RenovationWorkContracts/ViewModels/MessageInfoViewModel.cs +++ b/RenovationWork/RenovationWorkContracts/ViewModels/MessageInfoViewModel.cs @@ -1,24 +1,33 @@ -using RenovationWorkDataModels.Models; +using RenovationWorkContracts.Attributes; +using RenovationWorkDataModels.Models; using System; using System.Collections.Generic; using System.ComponentModel; -using System.Linq; -using System.Text; -using System.Threading.Tasks; + namespace RenovationWorkContracts.ViewModels { public class MessageInfoViewModel : IMessageInfoModel { + [Column(visible: false)] + public int Id { get; set; } + + [Column(visible: false)] public string MessageId { get; set; } = string.Empty; + + [Column(visible: false)] public int? ClientId { get; set; } - [DisplayName("Отправитель")] + + [Column(title: "Отправитель", width: 150)] public string SenderName { get; set; } = string.Empty; - [DisplayName("Дата письма")] + + [Column(title: "Дата письма", width: 120)] public DateTime DateDelivery { get; set; } - [DisplayName("Заголовок")] + + [Column(title: "Заголовок", width: 120)] public string Subject { get; set; } = string.Empty; - [DisplayName("Текст")] + + [Column(title: "Текст", gridViewAutoSize: GridViewAutoSize.Fill, isUseAutoSize: true)] public string Body { get; set; } = string.Empty; } } \ No newline at end of file diff --git a/RenovationWork/RenovationWorkContracts/ViewModels/OrderViewModel.cs b/RenovationWork/RenovationWorkContracts/ViewModels/OrderViewModel.cs index ff66fbf..ce296f2 100644 --- a/RenovationWork/RenovationWorkContracts/ViewModels/OrderViewModel.cs +++ b/RenovationWork/RenovationWorkContracts/ViewModels/OrderViewModel.cs @@ -1,8 +1,4 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; +using RenovationWorkContracts.Attributes; using RenovationWorkDataModels.Enums; using RenovationWorkDataModels.Models; using System.ComponentModel; @@ -12,26 +8,40 @@ namespace RenovationWorkContracts.ViewModels { public class OrderViewModel : IOrderModel { - [DisplayName("Номер")] - public int Id { get; set; } - public int? ImplementerId { get; set; } = null; - public int ClientId { get; set; } - [DisplayName("Клиент")] - public string ClientFIO { get; set; } = string.Empty; - public int RepairId { get; set; } - [DisplayName("Изделие")] - public string RepairName { 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 string ImplementerFIO { get; set; } = string.Empty; - [DisplayName("Дата создания")] - public DateTime DateCreate { get; set; } = DateTime.Now; - [DisplayName("Дата выполнения")] - public DateTime? DateImplement { get; set; } + [Column(title: "Номер", width: 90)] + public int Id { get; set; } + + [Column(visible: false)] + public int? ImplementerId { get; set; } = null; + + [Column(visible: false)] + public int ClientId { get; set; } + + [Column(title: "Имя клиента", width: 190)] + public string ClientFIO { get; set; } = string.Empty; + + [Column(visible: false)] + public int RepairId { get; set; } + + [Column(title: "Изделие", gridViewAutoSize: GridViewAutoSize.Fill, isUseAutoSize: true)] + public string RepairName { get; set; } = string.Empty; + + [Column(title: "Количество", width: 100)] + public int Count { get; set; } + + [Column(title: "Сумма", width: 120)] + public double Sum { get; set; } + + [Column(title: "Статус", width: 70)] + public OrderStatus Status { get; set; } = OrderStatus.Неизвестен; + + [Column(title: "Исполнитель", width: 150)] + public string ImplementerFIO { get; set; } = string.Empty; + + [Column(title: "Дата создания", width: 120)] + public DateTime DateCreate { get; set; } = DateTime.Now; + + [Column(title: "Дата выполнения", width: 120)] + public DateTime? DateImplement { get; set; } } } \ No newline at end of file diff --git a/RenovationWork/RenovationWorkContracts/ViewModels/RepairViewModel.cs b/RenovationWork/RenovationWorkContracts/ViewModels/RepairViewModel.cs index 9ba0548..c27cccf 100644 --- a/RenovationWork/RenovationWorkContracts/ViewModels/RepairViewModel.cs +++ b/RenovationWork/RenovationWorkContracts/ViewModels/RepairViewModel.cs @@ -1,8 +1,4 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; +using RenovationWorkContracts.Attributes; using RenovationWorkDataModels.Models; using System.ComponentModel; @@ -10,11 +6,16 @@ namespace RenovationWorkContracts.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: 70)] + public double Price { get; set; } + + [Column(visible: false)] + public Dictionary RepairComponents { get; set; } = new(); } } \ No newline at end of file diff --git a/RenovationWork/RenovationWorkDataModels/Models/IMessageInfoModel.cs b/RenovationWork/RenovationWorkDataModels/Models/IMessageInfoModel.cs index da62cd5..f121bb5 100644 --- a/RenovationWork/RenovationWorkDataModels/Models/IMessageInfoModel.cs +++ b/RenovationWork/RenovationWorkDataModels/Models/IMessageInfoModel.cs @@ -6,7 +6,7 @@ using System.Threading.Tasks; namespace RenovationWorkDataModels.Models { - public interface IMessageInfoModel + public interface IMessageInfoModel : IId { string MessageId { get; } int? ClientId { get; } diff --git a/RenovationWork/RenovationWorkDatabaseImplement/ImplementationExtension.cs b/RenovationWork/RenovationWorkDatabaseImplement/ImplementationExtension.cs new file mode 100644 index 0000000..2c93e1e --- /dev/null +++ b/RenovationWork/RenovationWorkDatabaseImplement/ImplementationExtension.cs @@ -0,0 +1,22 @@ +using RenovationWorkContracts.DI; +using RenovationWorkContracts.StoragesContracts; +using RenovationWorkDatabaseImplement.Implements; + +namespace RenovationWorkDatabaseImplement +{ + public class ImplementationExtension : IImplementationExtension + { + public int Priority => 3; + + 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/RenovationWork/RenovationWorkDatabaseImplement/Implements/BackUpInfo.cs b/RenovationWork/RenovationWorkDatabaseImplement/Implements/BackUpInfo.cs new file mode 100644 index 0000000..ac2510c --- /dev/null +++ b/RenovationWork/RenovationWorkDatabaseImplement/Implements/BackUpInfo.cs @@ -0,0 +1,32 @@ +using RenovationWorkContracts.StoragesContracts; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace RenovationWorkDatabaseImplement.Implements +{ + public class BackUpInfo : IBackUpInfo + { + public List? GetList() where T : class, new() + { + using var context = new RenovationWorkDatabase(); + 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/RenovationWork/RenovationWorkDatabaseImplement/Models/Client.cs b/RenovationWork/RenovationWorkDatabaseImplement/Models/Client.cs index e26e18c..34800c5 100644 --- a/RenovationWork/RenovationWorkDatabaseImplement/Models/Client.cs +++ b/RenovationWork/RenovationWorkDatabaseImplement/Models/Client.cs @@ -8,18 +8,28 @@ using System.ComponentModel.DataAnnotations; using System.Linq; using System.Text; using System.Threading.Tasks; +using System.Runtime.Serialization; namespace RenovationWorkDatabaseImplement.Models { - public class Client : IClientModel + [DataContract] + public class Client : IClientModel { - public int Id { get; private set; } - [Required] - public string ClientFIO { get; private set; } = string.Empty; - [Required] - public string Email { get; set; } = string.Empty; - [Required] - public string Password { get; set; } = string.Empty; + [DataMember] + public int Id { get; private set; } + + [DataMember] + [Required] + public string ClientFIO { get; private set; } = string.Empty; + + [DataMember] + [Required] + public string Email { get; set; } = string.Empty; + + [DataMember] + [Required] + public string Password { get; set; } = string.Empty; + [ForeignKey("ClientId")] public virtual List Orders { get; set; } = new(); public static Client? Create(ClientBindingModel model) diff --git a/RenovationWork/RenovationWorkDatabaseImplement/Models/Component.cs b/RenovationWork/RenovationWorkDatabaseImplement/Models/Component.cs index b1e7dbd..06c4716 100644 --- a/RenovationWork/RenovationWorkDatabaseImplement/Models/Component.cs +++ b/RenovationWork/RenovationWorkDatabaseImplement/Models/Component.cs @@ -6,16 +6,24 @@ using System.ComponentModel.DataAnnotations; using RenovationWorkDataModels.Models; using RenovationWorkDatabaseImplement.Models; using System.Collections.Generic; +using System.Runtime.Serialization; namespace RenovationWorkDatabaseImplement { - 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/RenovationWork/RenovationWorkDatabaseImplement/Models/Implementer.cs b/RenovationWork/RenovationWorkDatabaseImplement/Models/Implementer.cs index 1a26601..8bdcc96 100644 --- a/RenovationWork/RenovationWorkDatabaseImplement/Models/Implementer.cs +++ b/RenovationWork/RenovationWorkDatabaseImplement/Models/Implementer.cs @@ -9,20 +9,32 @@ using RenovationWorkContracts.BindingModels; using RenovationWorkDatabaseImplement.Models; using RenovationWorkContracts.ViewModels; using RenovationWorkDataModels.Models; +using System.Runtime.Serialization; namespace RenovationWorkDatabaseImplement.Models { - public class Implementer : IImplementerModel + [DataContract] + public class Implementer : IImplementerModel { - public int Id { get; private set; } - [Required] + [DataMember] + public int Id { get; private set; } + + [DataMember] + [Required] public string ImplementerFIO { get; private set; } = string.Empty; - [Required] + + [DataMember] + [Required] public string Password { get; set; } = string.Empty; - [Required] + + [DataMember] + [Required] public int Qualification { get; set; } = 0; - [Required] + + [DataMember] + [Required] public int WorkExperience { get; set; } = 0; + [ForeignKey("ImplementerId")] public virtual List Orders { get; set; } = new(); public static Implementer? Create(ImplementerBindingModel model) diff --git a/RenovationWork/RenovationWorkDatabaseImplement/Models/MessageInfo.cs b/RenovationWork/RenovationWorkDatabaseImplement/Models/MessageInfo.cs index 55869af..e783d81 100644 --- a/RenovationWork/RenovationWorkDatabaseImplement/Models/MessageInfo.cs +++ b/RenovationWork/RenovationWorkDatabaseImplement/Models/MessageInfo.cs @@ -4,7 +4,9 @@ using RenovationWorkDataModels.Models; using System; using System.Collections.Generic; using System.ComponentModel.DataAnnotations; +using System.ComponentModel.DataAnnotations.Schema; using System.Linq; +using System.Runtime.Serialization; using System.Text; using System.Threading.Tasks; @@ -12,14 +14,35 @@ namespace RenovationWorkDatabaseImplement.Models { public class MessageInfo : IMessageInfoModel { + [NotMapped] + public int Id { get; private set; } + + [DataMember] [Key] + [DatabaseGenerated(DatabaseGeneratedOption.None)] public string MessageId { get; private set; } = string.Empty; + + [DataMember] public int? ClientId { get; private set; } + public virtual Client? Client { get; set; } + + + [DataMember] + [Required] public string SenderName { get; private set; } = string.Empty; + + [DataMember] + [Required] public DateTime DateDelivery { get; private set; } = DateTime.Now; + + [DataMember] + [Required] public string Subject { get; private set; } = string.Empty; + + [DataMember] + [Required] public string Body { get; private set; } = string.Empty; - public Client? Client { get; private set; } + public static MessageInfo? Create(RenovationWorkDatabase context, MessageInfoBindingModel model) { if (model == null) diff --git a/RenovationWork/RenovationWorkDatabaseImplement/Models/Order.cs b/RenovationWork/RenovationWorkDatabaseImplement/Models/Order.cs index be11f25..403e7d5 100644 --- a/RenovationWork/RenovationWorkDatabaseImplement/Models/Order.cs +++ b/RenovationWork/RenovationWorkDatabaseImplement/Models/Order.cs @@ -6,30 +6,49 @@ using System; using System.Collections.Generic; using System.ComponentModel.DataAnnotations; using System.Linq; +using System.Runtime.Serialization; using System.Text; using System.Threading.Tasks; namespace RenovationWorkDatabaseImplement.Models { - public class Order : IOrderModel + [DataContract] + public class Order : IOrderModel { - public int Id { get; private set; } - [Required] + [DataMember] + public int Id { get; private set; } + + [DataMember] + [Required] public int ClientId { get; private set; } - public virtual Client Client { get; private set; } - [Required] + public virtual Client Client { get; private set; } = new(); + + [DataMember] + [Required] public int RepairId { get; private set; } public virtual Repair Repair { get; set; } = new(); - [Required] + + [DataMember] + [Required] public int Count { get; private set; } - [Required] + + [DataMember] + [Required] public double Sum { get; private set; } - [Required] + + [DataMember] + [Required] public OrderStatus Status { get; private set; } = OrderStatus.Неизвестен; - [Required] + + [DataMember] + [Required] public DateTime DateCreate { get; private set; } = DateTime.Now; - public DateTime? DateImplement { get; private set; } - public int? ImplementerId { get; private set; } = null; + + [DataMember] + public DateTime? DateImplement { get; private set; } + + [DataMember] + public int? ImplementerId { get; private set; } = null; public virtual Implementer? Implementer { get; private set; } public static Order Create(RenovationWorkDatabase context, OrderBindingModel model) diff --git a/RenovationWork/RenovationWorkDatabaseImplement/Models/Repair.cs b/RenovationWork/RenovationWorkDatabaseImplement/Models/Repair.cs index 49ee272..39955fb 100644 --- a/RenovationWork/RenovationWorkDatabaseImplement/Models/Repair.cs +++ b/RenovationWork/RenovationWorkDatabaseImplement/Models/Repair.cs @@ -8,19 +8,28 @@ using RenovationWorkContracts.ViewModels; using RenovationWorkDataModels.Models; using System.ComponentModel.DataAnnotations.Schema; using System.ComponentModel.DataAnnotations; +using System.Runtime.Serialization; namespace RenovationWorkDatabaseImplement.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/RenovationWork/RenovationWorkDatabaseImplement/RenovationWorkDatabaseImplement.csproj b/RenovationWork/RenovationWorkDatabaseImplement/RenovationWorkDatabaseImplement.csproj index 3657dad..7a9bf05 100644 --- a/RenovationWork/RenovationWorkDatabaseImplement/RenovationWorkDatabaseImplement.csproj +++ b/RenovationWork/RenovationWorkDatabaseImplement/RenovationWorkDatabaseImplement.csproj @@ -21,4 +21,8 @@ + + + + diff --git a/RenovationWork/RenovationWorkFileImplement/ImplementationExtension.cs b/RenovationWork/RenovationWorkFileImplement/ImplementationExtension.cs new file mode 100644 index 0000000..11696a3 --- /dev/null +++ b/RenovationWork/RenovationWorkFileImplement/ImplementationExtension.cs @@ -0,0 +1,22 @@ +using RenovationWorkContracts.DI; +using RenovationWorkContracts.StoragesContracts; +using RenovationWorkFileImplement.Implements; + +namespace RenovationWorkFileImplement +{ + public class ImplementationExtension : 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/RenovationWork/RenovationWorkFileImplement/Implements/BackUpInfo.cs b/RenovationWork/RenovationWorkFileImplement/Implements/BackUpInfo.cs new file mode 100644 index 0000000..9855ac6 --- /dev/null +++ b/RenovationWork/RenovationWorkFileImplement/Implements/BackUpInfo.cs @@ -0,0 +1,39 @@ +using RenovationWorkContracts.StoragesContracts; +using System.Reflection; + +namespace RenovationWorkFileImplement.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 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); + + } + + 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/RenovationWork/RenovationWorkFileImplement/Models/Client.cs b/RenovationWork/RenovationWorkFileImplement/Models/Client.cs index add1980..ea806b5 100644 --- a/RenovationWork/RenovationWorkFileImplement/Models/Client.cs +++ b/RenovationWork/RenovationWorkFileImplement/Models/Client.cs @@ -4,18 +4,28 @@ using RenovationWorkDataModels.Models; using System; using System.Collections.Generic; using System.Linq; +using System.Runtime.Serialization; using System.Text; using System.Threading.Tasks; using System.Xml.Linq; namespace RenovationWorkFileImplement.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/RenovationWork/RenovationWorkFileImplement/Models/Component.cs b/RenovationWork/RenovationWorkFileImplement/Models/Component.cs index da4a7d6..c34a1e5 100644 --- a/RenovationWork/RenovationWorkFileImplement/Models/Component.cs +++ b/RenovationWork/RenovationWorkFileImplement/Models/Component.cs @@ -7,14 +7,21 @@ using RenovationWorkContracts.BindingModels; using RenovationWorkContracts.ViewModels; using RenovationWorkDataModels.Models; using System.Xml.Linq; +using System.Runtime.Serialization; namespace RenovationWorkFileImplement.Models { - public class Component : IComponentModel + [DataContract] + public class Component : IComponentModel { - public int Id { get; set; } - public string ComponentName { get; set; } = string.Empty; - public double Cost { get; set; } + [DataMember] + public int Id { get; set; } + + [DataMember] + public string ComponentName { get; set; } = string.Empty; + + [DataMember] + public double Cost { get; set; } public static Component? Create(ComponentBindingModel model) { diff --git a/RenovationWork/RenovationWorkFileImplement/Models/Implementer.cs b/RenovationWork/RenovationWorkFileImplement/Models/Implementer.cs index 1e2f88b..504a411 100644 --- a/RenovationWork/RenovationWorkFileImplement/Models/Implementer.cs +++ b/RenovationWork/RenovationWorkFileImplement/Models/Implementer.cs @@ -4,19 +4,30 @@ using RenovationWorkDataModels.Models; using System; using System.Collections.Generic; using System.Linq; +using System.Runtime.Serialization; using System.Text; using System.Threading.Tasks; using System.Xml.Linq; namespace RenovationWorkFileImplement.Models { - public class Implementer : IImplementerModel + [DataContract] + public class Implementer : IImplementerModel { - public int Id { get; private set; } - public string ImplementerFIO { get; private set; } = string.Empty; - public string Password { get; set; } = string.Empty; - public int Qualification { get; set; } = 0; - public int WorkExperience { get; set; } = 0; + [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) { if (model == null) diff --git a/RenovationWork/RenovationWorkFileImplement/Models/MessageInfo.cs b/RenovationWork/RenovationWorkFileImplement/Models/MessageInfo.cs index 4873d72..0d7dc4d 100644 --- a/RenovationWork/RenovationWorkFileImplement/Models/MessageInfo.cs +++ b/RenovationWork/RenovationWorkFileImplement/Models/MessageInfo.cs @@ -4,20 +4,37 @@ using RenovationWorkDataModels.Models; using System; using System.Collections.Generic; using System.Linq; +using System.Runtime.Serialization; using System.Text; using System.Threading.Tasks; using System.Xml.Linq; namespace RenovationWorkFileImplement.Models { + [DataContract] public class MessageInfo : IMessageInfoModel { + [DataMember] + public int Id { get; private set; } + + [DataMember] public string MessageId { get; private set; } = string.Empty; + + [DataMember] public int? ClientId { get; private set; } + + [DataMember] public string SenderName { get; private set; } = string.Empty; + + [DataMember] public DateTime DateDelivery { get; private set; } = DateTime.Now; + + [DataMember] public string Subject { get; private set; } = string.Empty; + + [DataMember] public string Body { get; private set; } = string.Empty; + public static MessageInfo? Create(MessageInfoBindingModel model) { if (model == null) diff --git a/RenovationWork/RenovationWorkFileImplement/Models/Order.cs b/RenovationWork/RenovationWorkFileImplement/Models/Order.cs index ef95ff5..0b7c343 100644 --- a/RenovationWork/RenovationWorkFileImplement/Models/Order.cs +++ b/RenovationWork/RenovationWorkFileImplement/Models/Order.cs @@ -8,20 +8,39 @@ using RenovationWorkContracts.ViewModels; using RenovationWorkDataModels.Enums; using RenovationWorkDataModels.Models; using System.Xml.Linq; +using System.Runtime.Serialization; namespace RenovationWorkFileImplement.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; } - public int? ImplementerId { get; private set; } = null; - 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 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; } + + [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/RenovationWork/RenovationWorkFileImplement/Models/Repair.cs b/RenovationWork/RenovationWorkFileImplement/Models/Repair.cs index 4ad86d7..aacc1dd 100644 --- a/RenovationWork/RenovationWorkFileImplement/Models/Repair.cs +++ b/RenovationWork/RenovationWorkFileImplement/Models/Repair.cs @@ -7,17 +7,26 @@ using RenovationWorkContracts.BindingModels; using RenovationWorkContracts.ViewModels; using RenovationWorkDataModels.Models; using System.Xml.Linq; +using System.Runtime.Serialization; namespace RenovationWorkFileImplement.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/RenovationWork/RenovationWorkFileImplement/RenovationWorkFileImplement.csproj b/RenovationWork/RenovationWorkFileImplement/RenovationWorkFileImplement.csproj index 2d896a8..9f98d95 100644 --- a/RenovationWork/RenovationWorkFileImplement/RenovationWorkFileImplement.csproj +++ b/RenovationWork/RenovationWorkFileImplement/RenovationWorkFileImplement.csproj @@ -11,4 +11,8 @@ + + + + diff --git a/RenovationWork/RenovationWorkListImplement/ImplementationExtension.cs b/RenovationWork/RenovationWorkListImplement/ImplementationExtension.cs new file mode 100644 index 0000000..90963a8 --- /dev/null +++ b/RenovationWork/RenovationWorkListImplement/ImplementationExtension.cs @@ -0,0 +1,27 @@ +using RenovationWorkContracts.DI; +using RenovationWorkContracts.StoragesContracts; +using RenovationWorkListImplement.Implements; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace RenovationWorkListImplement +{ + internal class ImplementationExtension : 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/RenovationWork/RenovationWorkListImplement/Implements/BackUpInfo.cs b/RenovationWork/RenovationWorkListImplement/Implements/BackUpInfo.cs new file mode 100644 index 0000000..d22edbd --- /dev/null +++ b/RenovationWork/RenovationWorkListImplement/Implements/BackUpInfo.cs @@ -0,0 +1,17 @@ +using RenovationWorkContracts.StoragesContracts; + +namespace RenovationWorkListImplement.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/RenovationWork/RenovationWorkListImplement/Models/MessageInfo.cs b/RenovationWork/RenovationWorkListImplement/Models/MessageInfo.cs index a376105..9fcf790 100644 --- a/RenovationWork/RenovationWorkListImplement/Models/MessageInfo.cs +++ b/RenovationWork/RenovationWorkListImplement/Models/MessageInfo.cs @@ -17,6 +17,8 @@ namespace RenovationWorkListImplement.Models 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 int Id => throw new NotImplementedException(); + public static MessageInfo? Create(MessageInfoBindingModel model) { if (model == null) diff --git a/RenovationWork/RenovationWorkListImplement/RenovationWorkListImplement.csproj b/RenovationWork/RenovationWorkListImplement/RenovationWorkListImplement.csproj index 2d896a8..348d195 100644 --- a/RenovationWork/RenovationWorkListImplement/RenovationWorkListImplement.csproj +++ b/RenovationWork/RenovationWorkListImplement/RenovationWorkListImplement.csproj @@ -1,4 +1,4 @@ - + net6.0 @@ -11,4 +11,8 @@ + + + +