From 6fafe02cee228f8fca09ea601a283720e01553ef Mon Sep 17 00:00:00 2001 From: Anastasia Date: Sat, 13 May 2023 15:21:46 +0400 Subject: [PATCH] =?UTF-8?q?=D0=A1=D0=B4=D0=B5=D0=BB=D0=B0=D0=BD=D0=BD?= =?UTF-8?q?=D0=B0=D1=8F=208=20=D0=BB=D0=B0=D0=B1.=20=D1=80=D0=B0=D0=B1?= =?UTF-8?q?=D0=BE=D1=82=D0=B0.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitignore | 3 + .../Models/IMessageInfoModel.cs | 5 +- .../JewelryStore/DataGridViewExtension.cs | 58 +++++++++ JewelryStore/JewelryStore/FormClients.cs | 8 +- JewelryStore/JewelryStore/FormComponents.cs | 29 ++--- JewelryStore/JewelryStore/FormImplementers.cs | 33 ++--- JewelryStore/JewelryStore/FormJewel.cs | 58 +++++---- JewelryStore/JewelryStore/FormJewels.cs | 29 ++--- JewelryStore/JewelryStore/FormMails.cs | 9 +- .../JewelryStore/FormMain.Designer.cs | 12 +- JewelryStore/JewelryStore/FormMain.cs | 98 +++++++-------- JewelryStore/JewelryStore/Program.cs | 77 ++++++------ .../BusinessLogics/BackUpLogic.cs | 117 ++++++++++++++++++ .../Attributes/ColumnAttribute.cs | 26 ++++ .../Attributes/GridViewAutoSize.cs | 20 +++ .../BindingModels/BackUpSaveBinidngModel.cs | 13 ++ .../BindingModels/MessageInfoBindingModel.cs | 3 + .../BusinessLogicsContracts/IBackUpLogic.cs | 14 +++ .../DI/DependencyManager.cs | 43 +++++++ .../DI/IDependencyContainer.cs | 18 +++ .../DI/IImplementationExtension.cs | 14 +++ .../DI/ServiceDependencyContainer.cs | 64 ++++++++++ .../DI/ServiceProviderLoader.cs | 57 +++++++++ .../DI/UnityDependencyContainer.cs | 43 +++++++ .../JewelryStoreContracts.csproj | 6 + .../StoragesModels/IBackUpInfo.cs | 14 +++ .../ViewModels/ClientViewModel.cs | 11 +- .../ViewModels/ComponentViewModel.cs | 8 +- .../ViewModels/ImplementerViewModel.cs | 12 +- .../ViewModels/JewelViewModel.cs | 9 +- .../ViewModels/MessageInfoViewModel.cs | 16 ++- .../ViewModels/OrderViewModel.cs | 24 ++-- .../DatabaseImplementationExtension.cs | 28 +++++ .../Implements/BackUpInfo.cs | 34 +++++ .../JewelryStoreDatabaseImplement.csproj | 4 + .../Models/Client.cs | 6 + .../Models/Component.cs | 5 + .../Models/Implementer.cs | 7 ++ .../Models/Jewel.cs | 6 + .../Models/Message.cs | 10 ++ .../Models/Order.cs | 10 ++ .../FileImplementationExtension.cs | 28 +++++ .../Implements/BackUpInfo.cs | 37 ++++++ .../JewelryStoreFileImplement.csproj | 6 +- .../Models/Client.cs | 6 + .../Models/Component.cs | 5 + .../Models/Implementer.cs | 11 +- .../JewelryStoreFileImplement/Models/Jewel.cs | 6 + .../Models/Message.cs | 15 ++- .../JewelryStoreFileImplement/Models/Order.cs | 12 +- .../Implements/BackUpInfo.cs | 22 ++++ .../JewelryStoreListImplement.csproj | 4 + .../ListImplementationExtension.cs | 28 +++++ .../Models/Message.cs | 2 + 54 files changed, 1002 insertions(+), 241 deletions(-) create mode 100644 JewelryStore/JewelryStore/DataGridViewExtension.cs create mode 100644 JewelryStore/JewelryStoreBusinessLogic/BusinessLogics/BackUpLogic.cs create mode 100644 JewelryStore/JewelryStoreContracts/Attributes/ColumnAttribute.cs create mode 100644 JewelryStore/JewelryStoreContracts/Attributes/GridViewAutoSize.cs create mode 100644 JewelryStore/JewelryStoreContracts/BindingModels/BackUpSaveBinidngModel.cs create mode 100644 JewelryStore/JewelryStoreContracts/BusinessLogicsContracts/IBackUpLogic.cs create mode 100644 JewelryStore/JewelryStoreContracts/DI/DependencyManager.cs create mode 100644 JewelryStore/JewelryStoreContracts/DI/IDependencyContainer.cs create mode 100644 JewelryStore/JewelryStoreContracts/DI/IImplementationExtension.cs create mode 100644 JewelryStore/JewelryStoreContracts/DI/ServiceDependencyContainer.cs create mode 100644 JewelryStore/JewelryStoreContracts/DI/ServiceProviderLoader.cs create mode 100644 JewelryStore/JewelryStoreContracts/DI/UnityDependencyContainer.cs create mode 100644 JewelryStore/JewelryStoreContracts/StoragesModels/IBackUpInfo.cs create mode 100644 JewelryStore/JewelryStoreDatabaseImplement/DatabaseImplementationExtension.cs create mode 100644 JewelryStore/JewelryStoreDatabaseImplement/Implements/BackUpInfo.cs create mode 100644 JewelryStore/JewelryStoreFileImplement/FileImplementationExtension.cs create mode 100644 JewelryStore/JewelryStoreFileImplement/Implements/BackUpInfo.cs create mode 100644 JewelryStore/JewelryStoreListImplement/Implements/BackUpInfo.cs create mode 100644 JewelryStore/JewelryStoreListImplement/ListImplementationExtension.cs diff --git a/.gitignore b/.gitignore index ca1c7a3..52737dc 100644 --- a/.gitignore +++ b/.gitignore @@ -14,6 +14,9 @@ # User-specific files (MonoDevelop/Xamarin Studio) *.userprefs +# dll файлы +*.dll + # Mono auto generated files mono_crash.* diff --git a/JewelryStore/JewelryShopDataModels/Models/IMessageInfoModel.cs b/JewelryStore/JewelryShopDataModels/Models/IMessageInfoModel.cs index 120de88..93b8941 100644 --- a/JewelryStore/JewelryShopDataModels/Models/IMessageInfoModel.cs +++ b/JewelryStore/JewelryShopDataModels/Models/IMessageInfoModel.cs @@ -1,4 +1,5 @@ -using System; +using JewelryShopDataModels; +using System; using System.Collections.Generic; using System.Linq; using System.Text; @@ -6,7 +7,7 @@ using System.Threading.Tasks; namespace JewelryStoreDataModels.Models { - public interface IMessageInfoModel + public interface IMessageInfoModel : IId { string MessageId { get; } int? ClientId { get; } diff --git a/JewelryStore/JewelryStore/DataGridViewExtension.cs b/JewelryStore/JewelryStore/DataGridViewExtension.cs new file mode 100644 index 0000000..fd41c30 --- /dev/null +++ b/JewelryStore/JewelryStore/DataGridViewExtension.cs @@ -0,0 +1,58 @@ +using JewelryStoreContracts.Attributes; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace JewelryStore +{ + 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/JewelryStore/JewelryStore/FormClients.cs b/JewelryStore/JewelryStore/FormClients.cs index 7a45d2d..44a9917 100644 --- a/JewelryStore/JewelryStore/FormClients.cs +++ b/JewelryStore/JewelryStore/FormClients.cs @@ -64,13 +64,7 @@ namespace JewelryStore { try { - var list = _logic.ReadList(null); - if (list != null) - { - dataGridView.DataSource = list; - dataGridView.Columns["Id"].Visible = false; - dataGridView.Columns["ClientFIO"].AutoSizeMode = DataGridViewAutoSizeColumnMode.Fill; - } + dataGridView.FillandConfigGrid(_logic.ReadList(null)); _logger.LogInformation("Загрузка клиентов"); } catch (Exception ex) diff --git a/JewelryStore/JewelryStore/FormComponents.cs b/JewelryStore/JewelryStore/FormComponents.cs index 00a7a46..12008f5 100644 --- a/JewelryStore/JewelryStore/FormComponents.cs +++ b/JewelryStore/JewelryStore/FormComponents.cs @@ -1,5 +1,6 @@ using JewelryStoreContracts.BindingModels; using JewelryStoreContracts.BusinessLogicsContracts; +using JewelryStoreContracts.DI; using Microsoft.Extensions.Logging; using System.Windows.Forms; @@ -26,13 +27,7 @@ namespace JewelryStore { try { - var list = _logic.ReadList(null); - if (list != null) - { - dataGridView.DataSource = list; - dataGridView.Columns["Id"].Visible = false; - dataGridView.Columns["ComponentName"].AutoSizeMode = DataGridViewAutoSizeColumnMode.Fill; - } + dataGridView.FillandConfigGrid(_logic.ReadList(null)); _logger.LogInformation("Загрузка компонентов"); } catch (Exception ex) @@ -44,13 +39,10 @@ namespace JewelryStore 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(); } } @@ -91,14 +83,11 @@ namespace JewelryStore { 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/JewelryStore/JewelryStore/FormImplementers.cs b/JewelryStore/JewelryStore/FormImplementers.cs index 04c5fae..3c18e65 100644 --- a/JewelryStore/JewelryStore/FormImplementers.cs +++ b/JewelryStore/JewelryStore/FormImplementers.cs @@ -1,5 +1,6 @@ using JewelryStoreContracts.BindingModels; using JewelryStoreContracts.BusinessLogicsContracts; +using JewelryStoreContracts.DI; using Microsoft.Extensions.Logging; using System; using System.Collections.Generic; @@ -29,15 +30,7 @@ namespace JewelryStore { try { - var list = _logicI.ReadList(null); - - if (list != null) - { - dataGridView.DataSource = list; - dataGridView.Columns["Id"].Visible = false; - dataGridView.Columns["ImplementerFIO"].AutoSizeMode = DataGridViewAutoSizeColumnMode.Fill; - } - + dataGridView.FillandConfigGrid(_logicI.ReadList(null)); _logger.LogInformation("Загрузка исполнителей"); } @@ -50,14 +43,11 @@ namespace JewelryStore private void ButtonAdd_Click(object sender, EventArgs e) { - var service = Program.ServiceProvider?.GetService(typeof(FormImplementer)); + var form = DependencyManager.Instance.Resolve(); - if (service is FormImplementer form) + if (form.ShowDialog() == DialogResult.OK) { - if (form.ShowDialog() == DialogResult.OK) - { - LoadData(); - } + LoadData(); } } @@ -65,14 +55,13 @@ namespace JewelryStore { 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(); } } } diff --git a/JewelryStore/JewelryStore/FormJewel.cs b/JewelryStore/JewelryStore/FormJewel.cs index 380cf8d..1c1d4a6 100644 --- a/JewelryStore/JewelryStore/FormJewel.cs +++ b/JewelryStore/JewelryStore/FormJewel.cs @@ -1,5 +1,6 @@ using JewelryStoreContracts.BindingModels; using JewelryStoreContracts.BusinessLogicsContracts; +using JewelryStoreContracts.DI; using JewelryStoreContracts.SearchModels; using JewelryStoreDataModels.Models; using Microsoft.Extensions.Logging; @@ -74,26 +75,26 @@ namespace JewelryStore private void ButtonAdd_Click(object sender, EventArgs e) { - var service = Program.ServiceProvider?.GetService(typeof(FormJewelComponent)); - if (service is FormJewelComponent form) + var form = DependencyManager.Instance.Resolve(); + + if (form.ShowDialog() == DialogResult.OK) { - if (form.ShowDialog() == DialogResult.OK) + if (form.ComponentModel == null) { - if (form.ComponentModel == null) - { - return; - } - _logger.LogInformation("Добавление нового компонента:{ ComponentName} - { Count}", form.ComponentModel.ComponentName, form.Count); - if (_JewelComponents.ContainsKey(form.Id)) - { - _JewelComponents[form.Id] = (form.ComponentModel, form.Count); - } - else - { - _JewelComponents.Add(form.Id, (form.ComponentModel, form.Count)); - } - LoadData(); + return; } + _logger.LogInformation("Добавление нового компонента: { ComponentName}- { Count}", form.ComponentModel.ComponentName, form.Count); + + if (_JewelComponents.ContainsKey(form.Id)) + { + _JewelComponents[form.Id] = (form.ComponentModel, form.Count); + } + else + { + _JewelComponents.Add(form.Id, (form.ComponentModel, form.Count)); + } + + LoadData(); } } @@ -101,22 +102,19 @@ namespace JewelryStore { if (dataGridView.SelectedRows.Count == 1) { - var service = Program.ServiceProvider?.GetService(typeof(FormJewelComponent)); - if (service is FormJewelComponent form) + var form = DependencyManager.Instance.Resolve(); + int id = Convert.ToInt32(dataGridView.SelectedRows[0].Cells[0].Value); + form.Id = id; + form.Count = _JewelComponents[id].Item2; + if (form.ShowDialog() == DialogResult.OK) { - int id = Convert.ToInt32(dataGridView.SelectedRows[0].Cells[0].Value); - form.Id = id; - form.Count = _JewelComponents[id].Item2; - if (form.ShowDialog() == DialogResult.OK) + if (form.ComponentModel == null) { - if (form.ComponentModel == null) - { - return; - } - _logger.LogInformation("Изменение компонента: { ComponentName} - { Count}", form.ComponentModel.ComponentName, form.Count); - _JewelComponents[form.Id] = (form.ComponentModel, form.Count); - LoadData(); + return; } + _logger.LogInformation("Изменение компонента: { ComponentName} - { Count} ", form.ComponentModel.ComponentName, form.Count); + _JewelComponents[id] = (form.ComponentModel, form.Count); + LoadData(); } } } diff --git a/JewelryStore/JewelryStore/FormJewels.cs b/JewelryStore/JewelryStore/FormJewels.cs index c770810..e6627bd 100644 --- a/JewelryStore/JewelryStore/FormJewels.cs +++ b/JewelryStore/JewelryStore/FormJewels.cs @@ -1,5 +1,6 @@ using JewelryStoreContracts.BindingModels; using JewelryStoreContracts.BusinessLogicsContracts; +using JewelryStoreContracts.DI; using Microsoft.Extensions.Logging; namespace JewelryStore @@ -20,13 +21,7 @@ namespace JewelryStore { try { - var list = _logic.ReadList(null); - if (list != null) - { - dataGridView.DataSource = list; - dataGridView.Columns["Id"].Visible = false; - dataGridView.Columns["JewelName"].AutoSizeMode = DataGridViewAutoSizeColumnMode.Fill; - } + dataGridView.FillandConfigGrid(_logic.ReadList(null)); _logger.LogInformation("Загрузка изделий"); } catch (Exception ex) @@ -38,13 +33,10 @@ namespace JewelryStore private void ButtonAdd_Click(object sender, EventArgs e) { - var service = Program.ServiceProvider?.GetService(typeof(FormJewel)); - if (service is FormJewel form) + var form = DependencyManager.Instance.Resolve(); + if (form.ShowDialog() == DialogResult.OK) { - if (form.ShowDialog() == DialogResult.OK) - { - LoadData(); - } + LoadData(); } } @@ -52,14 +44,11 @@ namespace JewelryStore { if (dataGridView.SelectedRows.Count == 1) { - var service = Program.ServiceProvider?.GetService(typeof(FormJewel)); - if (service is FormJewel 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/JewelryStore/JewelryStore/FormMails.cs b/JewelryStore/JewelryStore/FormMails.cs index 5507ba1..84c2195 100644 --- a/JewelryStore/JewelryStore/FormMails.cs +++ b/JewelryStore/JewelryStore/FormMails.cs @@ -29,14 +29,7 @@ namespace JewelryStore { 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/JewelryStore/JewelryStore/FormMain.Designer.cs b/JewelryStore/JewelryStore/FormMain.Designer.cs index e9caced..46e8ba6 100644 --- a/JewelryStore/JewelryStore/FormMain.Designer.cs +++ b/JewelryStore/JewelryStore/FormMain.Designer.cs @@ -39,6 +39,7 @@ this.списокЗаказовToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.запускРаботToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.письмаToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.создатьБэкапToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.dataGridView = new System.Windows.Forms.DataGridView(); this.buttonCreateOrder = new System.Windows.Forms.Button(); this.buttonIssuedOrder = new System.Windows.Forms.Button(); @@ -54,7 +55,8 @@ this.СправочникиToolStripMenuItem, this.отчетыToolStripMenuItem, this.запускРаботToolStripMenuItem, - this.письмаToolStripMenuItem}); + this.письмаToolStripMenuItem, + this.создатьБэкапToolStripMenuItem}); this.menuStrip.Location = new System.Drawing.Point(0, 0); this.menuStrip.Name = "menuStrip"; this.menuStrip.Size = new System.Drawing.Size(1121, 33); @@ -137,6 +139,13 @@ this.письмаToolStripMenuItem.Text = "Письма"; this.письмаToolStripMenuItem.Click += new System.EventHandler(this.ПисьмаToolStripMenuItem_Click); // + // создатьБэкапToolStripMenuItem + // + this.создатьБэкапToolStripMenuItem.Name = "создатьБэкапToolStripMenuItem"; + this.создатьБэкапToolStripMenuItem.Size = new System.Drawing.Size(144, 29); + this.создатьБэкапToolStripMenuItem.Text = "Создать бэкап"; + this.создатьБэкапToolStripMenuItem.Click += new System.EventHandler(this.СоздатьБекапToolStripMenuItem_Click); + // // dataGridView // this.dataGridView.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) @@ -221,5 +230,6 @@ private ToolStripMenuItem запускРаботToolStripMenuItem; private ToolStripMenuItem исполнителиToolStripMenuItem; private ToolStripMenuItem письмаToolStripMenuItem; + private ToolStripMenuItem создатьБэкапToolStripMenuItem; } } \ No newline at end of file diff --git a/JewelryStore/JewelryStore/FormMain.cs b/JewelryStore/JewelryStore/FormMain.cs index d12209a..3fccd5f 100644 --- a/JewelryStore/JewelryStore/FormMain.cs +++ b/JewelryStore/JewelryStore/FormMain.cs @@ -1,6 +1,7 @@ using JewelryStoreBusinessLogic.BusinessLogics; using JewelryStoreContracts.BindingModels; using JewelryStoreContracts.BusinessLogicsContracts; +using JewelryStoreContracts.DI; using JewelryStoreDataModels.Enums; using Microsoft.Extensions.Logging; using System.Windows.Forms; @@ -13,14 +14,17 @@ namespace JewelryStore private readonly IOrderLogic _orderLogic; private readonly IReportLogic _reportLogic; private readonly IWorkProcess _workProcess; + private readonly IBackUpLogic _backUpLogic; - public FormMain(ILogger logger, IWorkProcess workProcess, IOrderLogic orderLogic, IReportLogic reportLogic) + public FormMain(ILogger logger, IBackUpLogic backUpLogic, IWorkProcess workProcess, IOrderLogic orderLogic, IReportLogic reportLogic) { InitializeComponent(); _logger = logger; _orderLogic = orderLogic; _reportLogic = reportLogic; _workProcess = workProcess; + _backUpLogic = backUpLogic; + LoadData(); } private void FormMain_Load(object sender, EventArgs e) @@ -32,14 +36,7 @@ namespace JewelryStore { try { - var list = _orderLogic.ReadList(null); - if (list != null) - { - dataGridView.DataSource = list; - dataGridView.Columns["JewelId"].Visible = false; - dataGridView.Columns["ClientId"].Visible = false; - dataGridView.Columns["ImplementerId"].Visible = false; - } + dataGridView.FillandConfigGrid(_orderLogic.ReadList(null)); _logger.LogInformation("Загрузка заказов"); } catch (Exception ex) @@ -51,30 +48,21 @@ namespace JewelryStore 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(FormJewels)); - if (service is FormJewels 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) @@ -178,53 +166,63 @@ namespace JewelryStore } private void КомпонентыПоИзделиямToolStripMenuItem_Click(object sender, EventArgs e) { - var service = Program.ServiceProvider?.GetService(typeof(FormReportJewelComponents)); - if (service is FormReportJewelComponents 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 Клиенты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 ЗапускРаботToolStripMenuItem_Click(object sender, EventArgs e) { - _workProcess.DoWork((Program.ServiceProvider?.GetService(typeof(IImplementerLogic)) as IImplementerLogic)!, _orderLogic); + _workProcess.DoWork(DependencyManager.Instance.Resolve(), _orderLogic); MessageBox.Show("Процесс обработки запущен", "Сообщение", MessageBoxButtons.OK, MessageBoxIcon.Information); } private void ИсполнителиToolStripMenuItem_Click(object sender, EventArgs e) { - var service = Program.ServiceProvider?.GetService(typeof(FormImplementers)); - - if (service is FormImplementers form) - { - form.ShowDialog(); - } + var form = DependencyManager.Instance.Resolve(); + form.ShowDialog(); } private void ПисьмаToolStripMenuItem_Click(object sender, EventArgs e) { - var service = Program.ServiceProvider?.GetService(typeof(FormMails)); - if (service is FormMails form) + var form = DependencyManager.Instance.Resolve(); + form.ShowDialog(); + } + + private void СоздатьБекапToolStripMenuItem_Click(object sender, EventArgs e) + { + try { - form.ShowDialog(); + if (_backUpLogic != null) + { + var fbd = new FolderBrowserDialog(); + if (fbd.ShowDialog() == DialogResult.OK) + { + _backUpLogic.CreateBackUp(new BackUpSaveBinidngModel + { + FolderName = fbd.SelectedPath + }); + MessageBox.Show("Бекап создан", "Сообщение", + MessageBoxButtons.OK, MessageBoxIcon.Information); + } + } } + catch (Exception ex) + { + MessageBox.Show(ex.Message, "Ошибка", MessageBoxButtons.OK, + MessageBoxIcon.Error); + } + } } } \ No newline at end of file diff --git a/JewelryStore/JewelryStore/Program.cs b/JewelryStore/JewelryStore/Program.cs index 50cfd47..71eb7ab 100644 --- a/JewelryStore/JewelryStore/Program.cs +++ b/JewelryStore/JewelryStore/Program.cs @@ -10,6 +10,7 @@ using JewelryStoreBusinessLogic.OfficePackage; using JewelryStoreContracts.StoragesModels; using JewelryStoreContracts.BindingModels; using JewelryStoreBusinessLogic.MailWorker; +using JewelryStoreContracts.DI; namespace JewelryStore { @@ -24,12 +25,11 @@ namespace JewelryStore static void Main() { 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, @@ -44,51 +44,50 @@ namespace JewelryStore } catch (Exception ex) { - var logger = _serviceProvider.GetService(); + var logger = DependencyManager.Instance.Resolve(); logger?.LogError(ex, "Error"); } - Application.Run(_serviceProvider.GetRequiredService()); + Application.Run(DependencyManager.Instance.Resolve()); } - private static void ConfigureServices(ServiceCollection services) + private static void InitDependency() { - services.AddLogging(option => + 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.AddSingleton(); + DependencyManager.Instance.RegisterType(); + DependencyManager.Instance.RegisterType(); + DependencyManager.Instance.RegisterType(); + DependencyManager.Instance.RegisterType(); + DependencyManager.Instance.RegisterType(); + DependencyManager.Instance.RegisterType(); + DependencyManager.Instance.RegisterType(); + DependencyManager.Instance.RegisterType(); + DependencyManager.Instance.RegisterType(); - services.AddTransient(); - services.AddTransient(); - services.AddTransient(); - services.AddTransient(); - services.AddTransient(); - services.AddTransient(); - services.AddTransient(); - services.AddTransient(); - services.AddTransient(); - services.AddTransient(); - services.AddTransient(); - services.AddTransient(); - services.AddTransient(); - services.AddTransient(); - services.AddTransient(); - services.AddTransient(); + DependencyManager.Instance.RegisterType(true); + + DependencyManager.Instance.RegisterType(); + DependencyManager.Instance.RegisterType(); + DependencyManager.Instance.RegisterType(); + + DependencyManager.Instance.RegisterType(); + DependencyManager.Instance.RegisterType(); + DependencyManager.Instance.RegisterType(); + DependencyManager.Instance.RegisterType(); + DependencyManager.Instance.RegisterType(); + DependencyManager.Instance.RegisterType(); + DependencyManager.Instance.RegisterType(); + DependencyManager.Instance.RegisterType(); + DependencyManager.Instance.RegisterType(); + DependencyManager.Instance.RegisterType(); + DependencyManager.Instance.RegisterType(); + DependencyManager.Instance.RegisterType(); + DependencyManager.Instance.RegisterType(); } private static void MailCheck(object obj) => ServiceProvider?.GetService()?.MailCheck(); diff --git a/JewelryStore/JewelryStoreBusinessLogic/BusinessLogics/BackUpLogic.cs b/JewelryStore/JewelryStoreBusinessLogic/BusinessLogics/BackUpLogic.cs new file mode 100644 index 0000000..4211259 --- /dev/null +++ b/JewelryStore/JewelryStoreBusinessLogic/BusinessLogics/BackUpLogic.cs @@ -0,0 +1,117 @@ +using JewelryShopDataModels; +using JewelryStoreContracts.BindingModels; +using JewelryStoreContracts.BusinessLogicsContracts; +using JewelryStoreContracts.StoragesModels; +using Microsoft.Extensions.Logging; +using System; +using System.Collections.Generic; +using System.IO.Compression; +using System.Linq; +using System.Reflection; +using System.Runtime.Serialization.Json; +using System.Text; +using System.Threading.Tasks; + +namespace JewelryStoreBusinessLogic.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/JewelryStore/JewelryStoreContracts/Attributes/ColumnAttribute.cs b/JewelryStore/JewelryStoreContracts/Attributes/ColumnAttribute.cs new file mode 100644 index 0000000..4c5ed4b --- /dev/null +++ b/JewelryStore/JewelryStoreContracts/Attributes/ColumnAttribute.cs @@ -0,0 +1,26 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace JewelryStoreContracts.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/JewelryStore/JewelryStoreContracts/Attributes/GridViewAutoSize.cs b/JewelryStore/JewelryStoreContracts/Attributes/GridViewAutoSize.cs new file mode 100644 index 0000000..9f86e3c --- /dev/null +++ b/JewelryStore/JewelryStoreContracts/Attributes/GridViewAutoSize.cs @@ -0,0 +1,20 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace JewelryStoreContracts.Attributes +{ + public enum GridViewAutoSize + { + NotSet = 0, + None = 1, + ColumnHeader = 2, + AllCellsExceptHeader = 4, + AllCells = 6, + DisplayedCellsExceptHeader = 8, + DisplayedCells = 10, + Fill = 16 + } +} diff --git a/JewelryStore/JewelryStoreContracts/BindingModels/BackUpSaveBinidngModel.cs b/JewelryStore/JewelryStoreContracts/BindingModels/BackUpSaveBinidngModel.cs new file mode 100644 index 0000000..c0de2f6 --- /dev/null +++ b/JewelryStore/JewelryStoreContracts/BindingModels/BackUpSaveBinidngModel.cs @@ -0,0 +1,13 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace JewelryStoreContracts.BindingModels +{ + public class BackUpSaveBinidngModel + { + public string FolderName { get; set; } = string.Empty; + } +} diff --git a/JewelryStore/JewelryStoreContracts/BindingModels/MessageInfoBindingModel.cs b/JewelryStore/JewelryStoreContracts/BindingModels/MessageInfoBindingModel.cs index 0d982a7..88ef32b 100644 --- a/JewelryStore/JewelryStoreContracts/BindingModels/MessageInfoBindingModel.cs +++ b/JewelryStore/JewelryStoreContracts/BindingModels/MessageInfoBindingModel.cs @@ -15,5 +15,8 @@ namespace JewelryStoreContracts.BindingModels public string Subject { get; set; } = string.Empty; public string Body { get; set; } = string.Empty; public DateTime DateDelivery { get; set; } + + public int Id => throw new NotImplementedException(); + } } diff --git a/JewelryStore/JewelryStoreContracts/BusinessLogicsContracts/IBackUpLogic.cs b/JewelryStore/JewelryStoreContracts/BusinessLogicsContracts/IBackUpLogic.cs new file mode 100644 index 0000000..aee7af4 --- /dev/null +++ b/JewelryStore/JewelryStoreContracts/BusinessLogicsContracts/IBackUpLogic.cs @@ -0,0 +1,14 @@ +using JewelryStoreContracts.BindingModels; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace JewelryStoreContracts.BusinessLogicsContracts +{ + public interface IBackUpLogic + { + void CreateBackUp(BackUpSaveBinidngModel model); + } +} diff --git a/JewelryStore/JewelryStoreContracts/DI/DependencyManager.cs b/JewelryStore/JewelryStoreContracts/DI/DependencyManager.cs new file mode 100644 index 0000000..e8e1fd8 --- /dev/null +++ b/JewelryStore/JewelryStoreContracts/DI/DependencyManager.cs @@ -0,0 +1,43 @@ +using Microsoft.Extensions.Logging; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace JewelryStoreContracts.DI +{ + public class DependencyManager + { + private readonly IDependencyContainer _dependencyManager; + private static DependencyManager? _manager; + private static readonly object _locjObject = new(); + + private DependencyManager() + { + _dependencyManager = new ServiceDependencyContainer(); + } + + public static DependencyManager Instance { get { if (_manager == null) { lock (_locjObject) { _manager = new DependencyManager(); } } return _manager; } } + + public static void InitDependency() + { + var ext = ServiceProviderLoader.GetImplementationExtensions(); + if (ext == null) + { + throw new ArgumentNullException("Отсутствуют компоненты для загрузки зависимостей по модулям"); + } + + // регистрируем зависимости + ext.RegisterServices(); + } + + public void AddLogging(Action configure) => _dependencyManager.AddLogging(configure); + + public void RegisterType(bool isSingle = false) where U : class, T where T : class => _dependencyManager.RegisterType(isSingle); + + public void RegisterType(bool isSingle = false) where T : class => _dependencyManager.RegisterType(isSingle); + + public T Resolve() => _dependencyManager.Resolve(); + } +} diff --git a/JewelryStore/JewelryStoreContracts/DI/IDependencyContainer.cs b/JewelryStore/JewelryStoreContracts/DI/IDependencyContainer.cs new file mode 100644 index 0000000..c0f1051 --- /dev/null +++ b/JewelryStore/JewelryStoreContracts/DI/IDependencyContainer.cs @@ -0,0 +1,18 @@ +using Microsoft.Extensions.Logging; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace JewelryStoreContracts.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/JewelryStore/JewelryStoreContracts/DI/IImplementationExtension.cs b/JewelryStore/JewelryStoreContracts/DI/IImplementationExtension.cs new file mode 100644 index 0000000..03bf9e4 --- /dev/null +++ b/JewelryStore/JewelryStoreContracts/DI/IImplementationExtension.cs @@ -0,0 +1,14 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace JewelryStoreContracts.DI +{ + public interface IImplementationExtension + { + public int Priority { get; } + public void RegisterServices(); + } +} diff --git a/JewelryStore/JewelryStoreContracts/DI/ServiceDependencyContainer.cs b/JewelryStore/JewelryStoreContracts/DI/ServiceDependencyContainer.cs new file mode 100644 index 0000000..dcd6f9d --- /dev/null +++ b/JewelryStore/JewelryStoreContracts/DI/ServiceDependencyContainer.cs @@ -0,0 +1,64 @@ +using Microsoft.Extensions.DependencyInjection; +using Microsoft.Extensions.Logging; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace JewelryStoreContracts.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/JewelryStore/JewelryStoreContracts/DI/ServiceProviderLoader.cs b/JewelryStore/JewelryStoreContracts/DI/ServiceProviderLoader.cs new file mode 100644 index 0000000..8902894 --- /dev/null +++ b/JewelryStore/JewelryStoreContracts/DI/ServiceProviderLoader.cs @@ -0,0 +1,57 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Reflection; +using System.Text; +using System.Threading.Tasks; + +namespace JewelryStoreContracts.DI +{ + public class ServiceProviderLoader + { + public static IImplementationExtension? GetImplementationExtensions() + { + IImplementationExtension? source = null; + var files = Directory.GetFiles(TryGetImplementationExtensionsFolder(), "*.dll", SearchOption.AllDirectories); + + foreach (var file in files.Distinct()) + { + Assembly asm = Assembly.LoadFrom(file); + + foreach (var t in asm.GetExportedTypes()) + { + if (t.IsClass && typeof(IImplementationExtension).IsAssignableFrom(t)) + { + if (source == null) + { + source = (IImplementationExtension)Activator.CreateInstance(t)!; + } + else + { + var newSource = (IImplementationExtension)Activator.CreateInstance(t)!; + + if (newSource.Priority > source.Priority) + { + source = newSource; + } + } + } + } + } + + return source; + } + + private static string TryGetImplementationExtensionsFolder() + { + var directory = new DirectoryInfo(Directory.GetCurrentDirectory()); + + while (directory != null && !directory.GetDirectories("ImplementationExtensions", SearchOption.AllDirectories).Any(x => x.Name == "ImplementationExtensions")) + { + directory = directory.Parent; + } + + return $"{directory?.FullName}\\ImplementationExtensions"; + } + } +} diff --git a/JewelryStore/JewelryStoreContracts/DI/UnityDependencyContainer.cs b/JewelryStore/JewelryStoreContracts/DI/UnityDependencyContainer.cs new file mode 100644 index 0000000..4fa86c0 --- /dev/null +++ b/JewelryStore/JewelryStoreContracts/DI/UnityDependencyContainer.cs @@ -0,0 +1,43 @@ +using Microsoft.Extensions.Logging; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using Unity; +using Unity.Microsoft.Logging; + +namespace JewelryStoreContracts.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/JewelryStore/JewelryStoreContracts/JewelryStoreContracts.csproj b/JewelryStore/JewelryStoreContracts/JewelryStoreContracts.csproj index 1e0a91c..0b68a0c 100644 --- a/JewelryStore/JewelryStoreContracts/JewelryStoreContracts.csproj +++ b/JewelryStore/JewelryStoreContracts/JewelryStoreContracts.csproj @@ -6,6 +6,12 @@ enable + + + + + + diff --git a/JewelryStore/JewelryStoreContracts/StoragesModels/IBackUpInfo.cs b/JewelryStore/JewelryStoreContracts/StoragesModels/IBackUpInfo.cs new file mode 100644 index 0000000..100eee5 --- /dev/null +++ b/JewelryStore/JewelryStoreContracts/StoragesModels/IBackUpInfo.cs @@ -0,0 +1,14 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace JewelryStoreContracts.StoragesModels +{ + public interface IBackUpInfo + { + List? GetList() where T : class, new(); + Type? GetTypeByModelInterface(string modelInterfaceName); + } +} diff --git a/JewelryStore/JewelryStoreContracts/ViewModels/ClientViewModel.cs b/JewelryStore/JewelryStoreContracts/ViewModels/ClientViewModel.cs index fb12e3f..c4d7ea3 100644 --- a/JewelryStore/JewelryStoreContracts/ViewModels/ClientViewModel.cs +++ b/JewelryStore/JewelryStoreContracts/ViewModels/ClientViewModel.cs @@ -1,4 +1,5 @@ -using JewelryStoreDataModels.Models; +using JewelryStoreContracts.Attributes; +using JewelryStoreDataModels.Models; using System; using System.Collections.Generic; using System.ComponentModel; @@ -10,12 +11,12 @@ namespace JewelryStoreContracts.ViewModels { public class ClientViewModel : IClientModel { + [Column(visible: false)] public int Id { get; set; } - [DisplayName("ФИО клиента")] - public string ClientFIO { get; set; } = string.Empty; - [DisplayName("Логин (эл. почта)")] + [Column("ФИО клиента", gridViewAutoSize: GridViewAutoSize.Fill, isUseAutoSize: true)] public string ClientFIO { get; set; } = string.Empty; + [Column("Логин (эл. почта)", width: 150)] public string Email { get; set; } = string.Empty; - [DisplayName("Пароль")] + [Column("Логин (эл. почта)", width: 150)] public string Password { get; set; } = string.Empty; } } diff --git a/JewelryStore/JewelryStoreContracts/ViewModels/ComponentViewModel.cs b/JewelryStore/JewelryStoreContracts/ViewModels/ComponentViewModel.cs index ab46b0a..76f45ba 100644 --- a/JewelryStore/JewelryStoreContracts/ViewModels/ComponentViewModel.cs +++ b/JewelryStore/JewelryStoreContracts/ViewModels/ComponentViewModel.cs @@ -1,14 +1,16 @@ -using JewelryStoreDataModels.Models; +using JewelryStoreContracts.Attributes; +using JewelryStoreDataModels.Models; using System.ComponentModel; namespace JewelryStoreContracts.ViewModels { public class ComponentViewModel : IComponentModel { + [Column(visible: false)] public int Id { get; set; } - [DisplayName("Название компонента")] + [Column("Название компонента", gridViewAutoSize: GridViewAutoSize.Fill, isUseAutoSize: true)] public string ComponentName { get; set; } = string.Empty; - [DisplayName("Цена")] + [Column("Цена", width: 80)] public double Cost { get; set; } } } \ No newline at end of file diff --git a/JewelryStore/JewelryStoreContracts/ViewModels/ImplementerViewModel.cs b/JewelryStore/JewelryStoreContracts/ViewModels/ImplementerViewModel.cs index f84e6f7..8b6effc 100644 --- a/JewelryStore/JewelryStoreContracts/ViewModels/ImplementerViewModel.cs +++ b/JewelryStore/JewelryStoreContracts/ViewModels/ImplementerViewModel.cs @@ -1,4 +1,5 @@ -using JewelryStoreDataModels.Models; +using JewelryStoreContracts.Attributes; +using JewelryStoreDataModels.Models; using System; using System.Collections.Generic; using System.ComponentModel; @@ -10,18 +11,19 @@ namespace JewelryStoreContracts.ViewModels { public class ImplementerViewModel : IImplementerModel { + [Column(visible: false)] public int Id { get; set; } - [DisplayName("ФИО исполнителя")] + [Column("ФИО исполнителя", gridViewAutoSize: GridViewAutoSize.Fill, isUseAutoSize: true)] public string ImplementerFIO { get; set; } = string.Empty; - [DisplayName("Пароль")] + [Column("Пароль", width: 150)] public string Password { get; set; } = string.Empty; - [DisplayName("Стаж работы")] + [Column("Стаж работы", gridViewAutoSize: GridViewAutoSize.AllCells, isUseAutoSize: true)] public int WorkExperience { get; set; } - [DisplayName("Квалификация")] + [Column("Квалификация", gridViewAutoSize: GridViewAutoSize.AllCells, isUseAutoSize: true)] public int Qualification { get; set; } } } diff --git a/JewelryStore/JewelryStoreContracts/ViewModels/JewelViewModel.cs b/JewelryStore/JewelryStoreContracts/ViewModels/JewelViewModel.cs index 3fe9d88..701667a 100644 --- a/JewelryStore/JewelryStoreContracts/ViewModels/JewelViewModel.cs +++ b/JewelryStore/JewelryStoreContracts/ViewModels/JewelViewModel.cs @@ -1,15 +1,18 @@ -using JewelryStoreDataModels.Models; +using JewelryStoreContracts.Attributes; +using JewelryStoreDataModels.Models; using System.ComponentModel; namespace JewelryStoreContracts.ViewModels { public class JewelViewModel : IJewelModel { + [Column(visible: false)] public int Id { get; set; } - [DisplayName("Название изделия")] + [Column("Название изделия", gridViewAutoSize: GridViewAutoSize.Fill, isUseAutoSize: true)] public string JewelName { get; set; } = string.Empty; - [DisplayName("Цена")] + [Column("Цена", width: 100)] public double Price { get; set; } + [Column(visible: false)] public Dictionary JewelComponents { get; diff --git a/JewelryStore/JewelryStoreContracts/ViewModels/MessageInfoViewModel.cs b/JewelryStore/JewelryStoreContracts/ViewModels/MessageInfoViewModel.cs index 5556a90..f39b46d 100644 --- a/JewelryStore/JewelryStoreContracts/ViewModels/MessageInfoViewModel.cs +++ b/JewelryStore/JewelryStoreContracts/ViewModels/MessageInfoViewModel.cs @@ -1,4 +1,5 @@ -using JewelryStoreDataModels.Models; +using JewelryStoreContracts.Attributes; +using JewelryStoreDataModels.Models; using System; using System.Collections.Generic; using System.ComponentModel; @@ -10,20 +11,25 @@ namespace JewelryStoreContracts.ViewModels { public class MessageInfoViewModel : IMessageInfoModel { + [Column(visible: false)] public string MessageId { get; set; } = string.Empty; + [Column(visible: false)] public int? ClientId { get; set; } - [DisplayName("Имя отправителя")] + [Column("Имя отправителя", gridViewAutoSize: GridViewAutoSize.DisplayedCells, isUseAutoSize: true)] public string SenderName { get; set; } = string.Empty; - [DisplayName("Дата отправления")] + [Column("Дата отправления", width: 100)] public DateTime DateDelivery { get; set; } - [DisplayName("Тема")] + [Column("Тема", width: 150)] public string Subject { get; set; } = string.Empty; - [DisplayName("Содержание")] + [Column("Содержание", gridViewAutoSize: GridViewAutoSize.Fill, isUseAutoSize: true)] public string Body { get; set; } = string.Empty; + + [Column(visible: false)] + public int Id => throw new NotImplementedException(); } } diff --git a/JewelryStore/JewelryStoreContracts/ViewModels/OrderViewModel.cs b/JewelryStore/JewelryStoreContracts/ViewModels/OrderViewModel.cs index 2d87c4b..55087e5 100644 --- a/JewelryStore/JewelryStoreContracts/ViewModels/OrderViewModel.cs +++ b/JewelryStore/JewelryStoreContracts/ViewModels/OrderViewModel.cs @@ -1,4 +1,5 @@ -using JewelryStoreDataModels.Enums; +using JewelryStoreContracts.Attributes; +using JewelryStoreDataModels.Enums; using JewelryStoreDataModels.Models; using System.ComponentModel; @@ -6,30 +7,33 @@ namespace JewelryStoreContracts.ViewModels { public class OrderViewModel : IOrderModel { - [DisplayName("Номер")] + [Column("Номер", gridViewAutoSize: GridViewAutoSize.AllCells, isUseAutoSize: true)] public int Id { get; set; } + [Column(visible: false)] public int JewelId { get; set; } + [Column(visible: false)] public int ClientId { get; set; } + [Column(visible: false)] public int? ImplementerId { get; set; } - [DisplayName("Изделие")] + [Column("Изделие", gridViewAutoSize: GridViewAutoSize.AllCells, isUseAutoSize: true)] public string JewelName { get; set; } = string.Empty; - [DisplayName("Количество")] + [Column("Количество", gridViewAutoSize: GridViewAutoSize.AllCells, isUseAutoSize: true)] public int Count { get; set; } - [DisplayName("Сумма")] + [Column("Сумма", gridViewAutoSize: GridViewAutoSize.AllCells, isUseAutoSize: true)] public double Sum { get; set; } - [DisplayName("Статус")] + [Column("Статус", gridViewAutoSize: GridViewAutoSize.AllCells, isUseAutoSize: true)] public OrderStatus Status { get; set; } = OrderStatus.Неизвестен; - [DisplayName("Дата создания")] + [Column("Дата создания", width: 100)] public DateTime DateCreate { get; set; } = DateTime.Now; - [DisplayName("Дата выполнения")] + [Column("Дата выполнения", width: 100)] public DateTime? DateImplement { get; set; } - [DisplayName("Клиент")] + [Column("ФИО клиента", gridViewAutoSize: GridViewAutoSize.Fill, isUseAutoSize: true)] public string ClientFIO { get; set; } = string.Empty; - [DisplayName("ФИО исполнителя")] + [Column("ФИО исполнителя", gridViewAutoSize: GridViewAutoSize.Fill, isUseAutoSize: true)] public string ImplementerFIO { get; set; } = string.Empty; } } \ No newline at end of file diff --git a/JewelryStore/JewelryStoreDatabaseImplement/DatabaseImplementationExtension.cs b/JewelryStore/JewelryStoreDatabaseImplement/DatabaseImplementationExtension.cs new file mode 100644 index 0000000..aa7528f --- /dev/null +++ b/JewelryStore/JewelryStoreDatabaseImplement/DatabaseImplementationExtension.cs @@ -0,0 +1,28 @@ +using JewelryStoreContracts.DI; +using JewelryStoreContracts.StoragesContracts; +using JewelryStoreContracts.StoragesModels; +using JewelryStoreDatabaseImplement.Implements; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace JewelryStoreDatabaseImplement +{ + 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/JewelryStore/JewelryStoreDatabaseImplement/Implements/BackUpInfo.cs b/JewelryStore/JewelryStoreDatabaseImplement/Implements/BackUpInfo.cs new file mode 100644 index 0000000..aec0df2 --- /dev/null +++ b/JewelryStore/JewelryStoreDatabaseImplement/Implements/BackUpInfo.cs @@ -0,0 +1,34 @@ +using JewelryStoreContracts.StoragesModels; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace JewelryStoreDatabaseImplement.Implements +{ + public class BackUpInfo : IBackUpInfo + { + public List? GetList() where T : class, new() + { + using var context = new JewelryStoreDatabase(); + 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/JewelryStore/JewelryStoreDatabaseImplement/JewelryStoreDatabaseImplement.csproj b/JewelryStore/JewelryStoreDatabaseImplement/JewelryStoreDatabaseImplement.csproj index a4777d7..1473003 100644 --- a/JewelryStore/JewelryStoreDatabaseImplement/JewelryStoreDatabaseImplement.csproj +++ b/JewelryStore/JewelryStoreDatabaseImplement/JewelryStoreDatabaseImplement.csproj @@ -19,4 +19,8 @@ + + + + diff --git a/JewelryStore/JewelryStoreDatabaseImplement/Models/Client.cs b/JewelryStore/JewelryStoreDatabaseImplement/Models/Client.cs index dd02136..b5e35d9 100644 --- a/JewelryStore/JewelryStoreDatabaseImplement/Models/Client.cs +++ b/JewelryStore/JewelryStoreDatabaseImplement/Models/Client.cs @@ -8,17 +8,23 @@ using System.ComponentModel.DataAnnotations; using System.Linq; using System.Text; using System.Threading.Tasks; +using System.Runtime.Serialization; namespace JewelryStoreDatabaseImplement.Models { + [DataContract] public class Client : IClientModel { + [DataMember] public int Id { get; private set; } [Required] + [DataMember] public string ClientFIO { get; set; } = string.Empty; [Required] + [DataMember] public string Email { get; set; } = string.Empty; [Required] + [DataMember] public string Password { get; set; } = string.Empty; [ForeignKey("ClientId")] diff --git a/JewelryStore/JewelryStoreDatabaseImplement/Models/Component.cs b/JewelryStore/JewelryStoreDatabaseImplement/Models/Component.cs index aef391a..24d318a 100644 --- a/JewelryStore/JewelryStoreDatabaseImplement/Models/Component.cs +++ b/JewelryStore/JewelryStoreDatabaseImplement/Models/Component.cs @@ -8,15 +8,20 @@ using System.Threading.Tasks; using JewelryStoreContracts.BindingModels; using JewelryStoreContracts.ViewModels; using JewelryStoreDataModels.Models; +using System.Runtime.Serialization; namespace JewelryStoreDatabaseImplement.Models { + [DataContract] public class Component : IComponentModel { + [DataMember] public int Id { get; private set; } [Required] + [DataMember] public string ComponentName { get; private set; } = string.Empty; [Required] + [DataMember] public double Cost { get; set; } [ForeignKey("ComponentId")] public virtual List JewelComponents { get; set; } = new(); diff --git a/JewelryStore/JewelryStoreDatabaseImplement/Models/Implementer.cs b/JewelryStore/JewelryStoreDatabaseImplement/Models/Implementer.cs index eb6fd12..ab98e2d 100644 --- a/JewelryStore/JewelryStoreDatabaseImplement/Models/Implementer.cs +++ b/JewelryStore/JewelryStoreDatabaseImplement/Models/Implementer.cs @@ -8,23 +8,30 @@ using System.ComponentModel.DataAnnotations; using System.Linq; using System.Text; using System.Threading.Tasks; +using System.Runtime.Serialization; namespace JewelryStoreDatabaseImplement.Models { + [DataContract] public class Implementer : IImplementerModel { [Required] + [DataMember] public string ImplementerFIO { get; private set; } = string.Empty; [Required] + [DataMember] public string Password { get; private set; } = string.Empty; [Required] + [DataMember] public int WorkExperience { get; private set; } [Required] + [DataMember] public int Qualification { get; private set; } + [DataMember] public int Id { get; private set; } [ForeignKey("ImplementerId")] diff --git a/JewelryStore/JewelryStoreDatabaseImplement/Models/Jewel.cs b/JewelryStore/JewelryStoreDatabaseImplement/Models/Jewel.cs index 79dffdb..bef5d82 100644 --- a/JewelryStore/JewelryStoreDatabaseImplement/Models/Jewel.cs +++ b/JewelryStore/JewelryStoreDatabaseImplement/Models/Jewel.cs @@ -8,18 +8,24 @@ using System.Text; using System.Threading.Tasks; using JewelryStoreContracts.BindingModels; using JewelryStoreContracts.ViewModels; +using System.Runtime.Serialization; namespace JewelryStoreDatabaseImplement.Models { + [DataContract] public class Jewel : IJewelModel { + [DataMember] public int Id { get; set; } [Required] + [DataMember] public string JewelName { get; set; } = string.Empty; [Required] + [DataMember] public double Price { get; set; } private Dictionary? _jewelComponents = null; [NotMapped] + [DataMember] public Dictionary JewelComponents { get diff --git a/JewelryStore/JewelryStoreDatabaseImplement/Models/Message.cs b/JewelryStore/JewelryStoreDatabaseImplement/Models/Message.cs index b0761d3..95d935b 100644 --- a/JewelryStore/JewelryStoreDatabaseImplement/Models/Message.cs +++ b/JewelryStore/JewelryStoreDatabaseImplement/Models/Message.cs @@ -5,23 +5,31 @@ 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 JewelryStoreDatabaseImplement.Models { + [DataContract] public class Message : IMessageInfoModel { [Key] + [DataMember] public string MessageId { get; private set; } = string.Empty; + [DataMember] public int? ClientId { get; private set; } [Required] + [DataMember] public string SenderName { get; private set; } = string.Empty; [Required] + [DataMember] public DateTime DateDelivery { get; private set; } = DateTime.Now; [Required] + [DataMember] public string Subject { get; private set; } = string.Empty; [Required] + [DataMember] public string Body { get; private set; } = string.Empty; public virtual Client Client { get; set; } @@ -52,5 +60,7 @@ namespace JewelryStoreDatabaseImplement.Models SenderName = SenderName, DateDelivery = DateDelivery, }; + + public int Id => throw new NotImplementedException(); } } diff --git a/JewelryStore/JewelryStoreDatabaseImplement/Models/Order.cs b/JewelryStore/JewelryStoreDatabaseImplement/Models/Order.cs index b488724..5665575 100644 --- a/JewelryStore/JewelryStoreDatabaseImplement/Models/Order.cs +++ b/JewelryStore/JewelryStoreDatabaseImplement/Models/Order.cs @@ -7,26 +7,36 @@ using System.Collections.Generic; using System.ComponentModel.DataAnnotations; using System.Diagnostics; using System.Linq; +using System.Runtime.Serialization; using System.Text; using System.Threading.Tasks; namespace JewelryStoreDatabaseImplement.Models { + [DataContract] public class Order : IOrderModel { + [DataMember] public int Id { get; private set; } [Required] + [DataMember] public int JewelId { get; set; } [Required] + [DataMember] public int Count { get; set; } [Required] + [DataMember] public double Sum { get; set; } [Required] + [DataMember] public OrderStatus Status { get; set; } [Required] + [DataMember] public int ClientId { get; set; } [Required] + [DataMember] public DateTime DateCreate { get; set; } + [DataMember] public DateTime? DateImplement { get; set; } public Jewel Jewel { get; set; } public Client Client { get; set; } diff --git a/JewelryStore/JewelryStoreFileImplement/FileImplementationExtension.cs b/JewelryStore/JewelryStoreFileImplement/FileImplementationExtension.cs new file mode 100644 index 0000000..7228e5a --- /dev/null +++ b/JewelryStore/JewelryStoreFileImplement/FileImplementationExtension.cs @@ -0,0 +1,28 @@ +using JewelryStoreContracts.DI; +using JewelryStoreContracts.StoragesContracts; +using JewelryStoreContracts.StoragesModels; +using JewelryStoreFileImplement.Implements; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace JewelryStoreFileImplement +{ + 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/JewelryStore/JewelryStoreFileImplement/Implements/BackUpInfo.cs b/JewelryStore/JewelryStoreFileImplement/Implements/BackUpInfo.cs new file mode 100644 index 0000000..e0e20aa --- /dev/null +++ b/JewelryStore/JewelryStoreFileImplement/Implements/BackUpInfo.cs @@ -0,0 +1,37 @@ +using JewelryStoreContracts.StoragesModels; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace JewelryStoreFileImplement.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/JewelryStore/JewelryStoreFileImplement/JewelryStoreFileImplement.csproj b/JewelryStore/JewelryStoreFileImplement/JewelryStoreFileImplement.csproj index ff6099f..054321b 100644 --- a/JewelryStore/JewelryStoreFileImplement/JewelryStoreFileImplement.csproj +++ b/JewelryStore/JewelryStoreFileImplement/JewelryStoreFileImplement.csproj @@ -1,4 +1,4 @@ - + net6.0 @@ -15,4 +15,8 @@ + + + + diff --git a/JewelryStore/JewelryStoreFileImplement/Models/Client.cs b/JewelryStore/JewelryStoreFileImplement/Models/Client.cs index 7f8816c..9cd13f6 100644 --- a/JewelryStore/JewelryStoreFileImplement/Models/Client.cs +++ b/JewelryStore/JewelryStoreFileImplement/Models/Client.cs @@ -4,17 +4,23 @@ using JewelryStoreDataModels.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 JewelryStoreFileImplement.Models { + [DataContract] public class Client : IClientModel { + [DataMember] public int Id { get; private set; } + [DataMember] public string ClientFIO { get; private set; } = string.Empty; + [DataMember] public string Email { get; set; } = string.Empty; + [DataMember] public string Password { get; set; } = string.Empty; public static Client? Create(ClientBindingModel model) diff --git a/JewelryStore/JewelryStoreFileImplement/Models/Component.cs b/JewelryStore/JewelryStoreFileImplement/Models/Component.cs index cd90b4f..32ddd44 100644 --- a/JewelryStore/JewelryStoreFileImplement/Models/Component.cs +++ b/JewelryStore/JewelryStoreFileImplement/Models/Component.cs @@ -4,16 +4,21 @@ using JewelryStoreDataModels.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 JewelryStoreFileImplement.Models { + [DataContract] public class Component : IComponentModel { + [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) diff --git a/JewelryStore/JewelryStoreFileImplement/Models/Implementer.cs b/JewelryStore/JewelryStoreFileImplement/Models/Implementer.cs index e6b305f..1639a9e 100644 --- a/JewelryStore/JewelryStoreFileImplement/Models/Implementer.cs +++ b/JewelryStore/JewelryStoreFileImplement/Models/Implementer.cs @@ -4,22 +4,25 @@ using JewelryStoreDataModels.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 JewelryStoreFileImplement.Models { + [DataContract] public class Implementer : IImplementerModel { + [DataMember] public string ImplementerFIO { get; private set; } = string.Empty; - + [DataMember] public string Password { get; private set; } = string.Empty; - + [DataMember] public int WorkExperience { get; private set; } - + [DataMember] public int Qualification { get; private set; } - + [DataMember] public int Id { get; private set; } public static Implementer? Create(XElement element) diff --git a/JewelryStore/JewelryStoreFileImplement/Models/Jewel.cs b/JewelryStore/JewelryStoreFileImplement/Models/Jewel.cs index 6c591b9..d53a2c4 100644 --- a/JewelryStore/JewelryStoreFileImplement/Models/Jewel.cs +++ b/JewelryStore/JewelryStoreFileImplement/Models/Jewel.cs @@ -4,19 +4,25 @@ using JewelryStoreDataModels.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 JewelryStoreFileImplement.Models { + [DataContract] public class Jewel : IJewelModel { + [DataMember] public int Id { get; private set; } + [DataMember] public string JewelName { get; private set; } = string.Empty; + [DataMember] public double Price { get; private set; } public Dictionary Components { get; private set; } = new(); private Dictionary? _jewelComponents = null; + [DataMember] public Dictionary JewelComponents { get diff --git a/JewelryStore/JewelryStoreFileImplement/Models/Message.cs b/JewelryStore/JewelryStoreFileImplement/Models/Message.cs index 666ba1f..3a2ed5b 100644 --- a/JewelryStore/JewelryStoreFileImplement/Models/Message.cs +++ b/JewelryStore/JewelryStoreFileImplement/Models/Message.cs @@ -4,24 +4,27 @@ using JewelryStoreDataModels.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 JewelryStoreFileImplement.Models { + [DataContract] public class Message : IMessageInfoModel { + [DataMember] public string MessageId { get; private set; } = string.Empty; - + [DataMember] public int? ClientId { get; private set; } - + [DataMember] public string SenderName { get; private set; } = string.Empty; - + [DataMember] public DateTime DateDelivery { get; private set; } = DateTime.Now; - + [DataMember] public string Subject { get; private set; } = string.Empty; - + [DataMember] public string Body { get; private set; } = string.Empty; public static Message? Create(MessageInfoBindingModel model) @@ -76,5 +79,7 @@ namespace JewelryStoreFileImplement.Models new XAttribute("SenderName", SenderName), new XAttribute("DateDelivery", DateDelivery) ); + + public int Id => throw new NotImplementedException(); } } diff --git a/JewelryStore/JewelryStoreFileImplement/Models/Order.cs b/JewelryStore/JewelryStoreFileImplement/Models/Order.cs index 373e56d..62fa44a 100644 --- a/JewelryStore/JewelryStoreFileImplement/Models/Order.cs +++ b/JewelryStore/JewelryStoreFileImplement/Models/Order.cs @@ -5,22 +5,33 @@ using JewelryStoreDataModels.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 JewelryStoreFileImplement.Models { + [DataContract] public class Order : IOrderModel { + [DataMember] public int JewelId { get; private set; } + [DataMember] public int ClientId { get; private set; } + [DataMember] public int? ImplementerId { get; set; } + [DataMember] public int Count { 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; } + [DataMember] public int Id { get; private set; } public static Order? Create(OrderBindingModel? model) @@ -49,7 +60,6 @@ namespace JewelryStoreFileImplement.Models { return null; } - return new Order() { Id = Convert.ToInt32(element.Attribute("Id")!.Value), diff --git a/JewelryStore/JewelryStoreListImplement/Implements/BackUpInfo.cs b/JewelryStore/JewelryStoreListImplement/Implements/BackUpInfo.cs new file mode 100644 index 0000000..64603cd --- /dev/null +++ b/JewelryStore/JewelryStoreListImplement/Implements/BackUpInfo.cs @@ -0,0 +1,22 @@ +using JewelryStoreContracts.StoragesModels; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace JewelryStoreListImplement.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/JewelryStore/JewelryStoreListImplement/JewelryStoreListImplement.csproj b/JewelryStore/JewelryStoreListImplement/JewelryStoreListImplement.csproj index 8995315..86b455e 100644 --- a/JewelryStore/JewelryStoreListImplement/JewelryStoreListImplement.csproj +++ b/JewelryStore/JewelryStoreListImplement/JewelryStoreListImplement.csproj @@ -11,4 +11,8 @@ + + + + diff --git a/JewelryStore/JewelryStoreListImplement/ListImplementationExtension.cs b/JewelryStore/JewelryStoreListImplement/ListImplementationExtension.cs new file mode 100644 index 0000000..6709a0b --- /dev/null +++ b/JewelryStore/JewelryStoreListImplement/ListImplementationExtension.cs @@ -0,0 +1,28 @@ +using JewelryStoreContracts.DI; +using JewelryStoreContracts.StoragesContracts; +using JewelryStoreContracts.StoragesModels; +using JewelryStoreListImplement.Implements; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace JewelryStoreListImplement +{ + 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/JewelryStore/JewelryStoreListImplement/Models/Message.cs b/JewelryStore/JewelryStoreListImplement/Models/Message.cs index e38444e..c74968b 100644 --- a/JewelryStore/JewelryStoreListImplement/Models/Message.cs +++ b/JewelryStore/JewelryStoreListImplement/Models/Message.cs @@ -49,5 +49,7 @@ namespace JewelryStoreListImplement.Models ClientId = ClientId, MessageId = MessageId }; + + public int Id => throw new NotImplementedException(); } }