diff --git a/FlowerShop/FlowerShop/DataGridViewExtension.cs b/FlowerShop/FlowerShop/DataGridViewExtension.cs new file mode 100644 index 0000000..b5c06cc --- /dev/null +++ b/FlowerShop/FlowerShop/DataGridViewExtension.cs @@ -0,0 +1,50 @@ +using FlowerShopContracts.Attributes; + +namespace FlowerShop +{ + 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/FlowerShop/FlowerShop/FlowerShop.csproj b/FlowerShop/FlowerShop/FlowerShop.csproj index a2de8e0..724db71 100644 --- a/FlowerShop/FlowerShop/FlowerShop.csproj +++ b/FlowerShop/FlowerShop/FlowerShop.csproj @@ -22,7 +22,7 @@ runtime; build; native; contentfiles; analyzers; buildtransitive - + diff --git a/FlowerShop/FlowerShop/FormBouquet.cs b/FlowerShop/FlowerShop/FormBouquet.cs index 199e887..e846c48 100644 --- a/FlowerShop/FlowerShop/FormBouquet.cs +++ b/FlowerShop/FlowerShop/FormBouquet.cs @@ -1,5 +1,6 @@ using FlowerShopContracts.BindingModels; using FlowerShopContracts.BusinessLogicsContracts; +using FlowerShopContracts.DI; using FlowerShopContracts.SearchModels; using FlowerShopDataModels.Models; using Microsoft.Extensions.Logging; @@ -70,9 +71,42 @@ namespace FlowerShop private void buttonAdd_Click(object sender, EventArgs e) { - var service = Program.ServiceProvider?.GetService(typeof(FormBouquetComponent)); - if (service is FormBouquetComponent form) + var form = DependencyManager.Instance.Resolve(); + + if (form.ShowDialog() == DialogResult.OK) { + if (form.ComponentModel == null) + { + return; + } + + _logger.LogInformation("Добавление нового компонента: { ComponentName} - { Count}", form.ComponentModel.ComponentName, form.Count); + + if (_bouquetComponents.ContainsKey(form.Id)) + { + _bouquetComponents[form.Id] = (form.ComponentModel, form.Count); + } + + else + { + _bouquetComponents.Add(form.Id, (form.ComponentModel, form.Count)); + } + + LoadData(); + } + } + + private void buttonChange_Click(object sender, EventArgs e) + { + if (dataGridView.SelectedRows.Count == 1) + { + var form = DependencyManager.Instance.Resolve(); + + int id = Convert.ToInt32(dataGridView.SelectedRows[0].Cells[0].Value); + + form.Id = id; + form.Count = _bouquetComponents[id].Item2; + if (form.ShowDialog() == DialogResult.OK) { if (form.ComponentModel == null) @@ -80,51 +114,14 @@ namespace FlowerShop return; } - _logger.LogInformation("Добавление нового компонента: { ComponentName} - { Count}", form.ComponentModel.ComponentName, form.Count); - - if (_bouquetComponents.ContainsKey(form.Id)) - { - _bouquetComponents[form.Id] = (form.ComponentModel, form.Count); - } - - else - { - _bouquetComponents.Add(form.Id, (form.ComponentModel, form.Count)); - } - + _logger.LogInformation("Изменение компонента: { ComponentName} - { Count}", form.ComponentModel.ComponentName, form.Count); + _bouquetComponents[form.Id] = (form.ComponentModel, form.Count); LoadData(); } } } - private void buttonChange_Click(object sender, EventArgs e) - { - if (dataGridView.SelectedRows.Count == 1) - { - var service = Program.ServiceProvider?.GetService(typeof(FormBouquetComponent)); - if (service is FormBouquetComponent form) - { - int id = Convert.ToInt32(dataGridView.SelectedRows[0].Cells[0].Value); - form.Id = id; - form.Count = _bouquetComponents[id].Item2; - - if (form.ShowDialog() == DialogResult.OK) - { - if (form.ComponentModel == null) - { - return; - } - - _logger.LogInformation("Изменение компонента: { ComponentName} - { Count}", form.ComponentModel.ComponentName, form.Count); - _bouquetComponents[form.Id] = (form.ComponentModel, form.Count); - LoadData(); - } - } - } - - } - private void buttonDelete_Click(object sender, EventArgs e) { if (dataGridView.SelectedRows.Count == 1) diff --git a/FlowerShop/FlowerShop/FormBouquets.cs b/FlowerShop/FlowerShop/FormBouquets.cs index 2dca392..7a9d999 100644 --- a/FlowerShop/FlowerShop/FormBouquets.cs +++ b/FlowerShop/FlowerShop/FormBouquets.cs @@ -1,5 +1,6 @@ using FlowerShopContracts.BindingModels; using FlowerShopContracts.BusinessLogicsContracts; +using FlowerShopContracts.DI; using Microsoft.Extensions.Logging; namespace FlowerShop @@ -20,18 +21,9 @@ namespace FlowerShop { try { - var list = _logic.ReadList(null); - - if (list != null) - { - dataGridView.DataSource = list; - dataGridView.Columns["Id"].Visible = false; - dataGridView.Columns["BouquetName"].AutoSizeMode = DataGridViewAutoSizeColumnMode.Fill; - dataGridView.Columns["BouquetComponents"].Visible = false; - } + dataGridView.FillAndConfigGrid(_logic.ReadList(null)); _logger.LogInformation("Receiving bouquets"); - } catch (Exception ex) { @@ -42,14 +34,11 @@ namespace FlowerShop private void AddButton_Click(object sender, EventArgs e) { - var service = Program.ServiceProvider?.GetService(typeof(FormBouquet)); + var form = DependencyManager.Instance.Resolve(); - if (service is FormBouquet form) + if (form.ShowDialog() == DialogResult.OK) { - if (form.ShowDialog() == DialogResult.OK) - { - LoadData(); - } + LoadData(); } } @@ -57,16 +46,13 @@ namespace FlowerShop { if (dataGridView.SelectedRows.Count == 1) { - var service = Program.ServiceProvider?.GetService(typeof(FormBouquet)); + var form = DependencyManager.Instance.Resolve(); - if (service is FormBouquet form) + 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/FlowerShop/FlowerShop/FormClients.cs b/FlowerShop/FlowerShop/FormClients.cs index 24b70c7..0907b82 100644 --- a/FlowerShop/FlowerShop/FormClients.cs +++ b/FlowerShop/FlowerShop/FormClients.cs @@ -25,13 +25,7 @@ namespace FlowerShop { 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("Receiving clients"); } diff --git a/FlowerShop/FlowerShop/FormComponents.cs b/FlowerShop/FlowerShop/FormComponents.cs index 1bfbe37..3724795 100644 --- a/FlowerShop/FlowerShop/FormComponents.cs +++ b/FlowerShop/FlowerShop/FormComponents.cs @@ -1,5 +1,6 @@ using FlowerShopContracts.BindingModels; using FlowerShopContracts.BusinessLogicsContracts; +using FlowerShopContracts.DI; using Microsoft.Extensions.Logging; namespace FlowerShop @@ -25,13 +26,8 @@ namespace FlowerShop { 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("Receiving components"); } catch (Exception ex) @@ -43,13 +39,11 @@ namespace FlowerShop 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(); } } @@ -57,14 +51,12 @@ namespace FlowerShop { 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/FlowerShop/FlowerShop/FormImplementers.cs b/FlowerShop/FlowerShop/FormImplementers.cs index e8d5f44..d7b6e2e 100644 --- a/FlowerShop/FlowerShop/FormImplementers.cs +++ b/FlowerShop/FlowerShop/FormImplementers.cs @@ -1,5 +1,6 @@ using FlowerShopContracts.BindingModels; using FlowerShopContracts.BusinessLogicsContracts; +using FlowerShopContracts.DI; using Microsoft.Extensions.Logging; namespace FlowerShop @@ -25,13 +26,7 @@ namespace FlowerShop { try { - var list = _logic.ReadList(null); - if (list != null) - { - dataGridView.DataSource = list; - dataGridView.Columns["Id"].Visible = false; - dataGridView.Columns["ImplementerFIO"].AutoSizeMode = DataGridViewAutoSizeColumnMode.Fill; - } + dataGridView.FillAndConfigGrid(_logic.ReadList(null)); _logger.LogInformation("Загрузка исполнителей"); } @@ -44,13 +39,11 @@ namespace FlowerShop private void buttonCreate_Click(object sender, EventArgs e) { - var service = Program.ServiceProvider?.GetService(typeof(FormImplementer)); - if (service is FormImplementer form) + var form = DependencyManager.Instance.Resolve(); + + if (form.ShowDialog() == DialogResult.OK) { - if (form.ShowDialog() == DialogResult.OK) - { - LoadData(); - } + LoadData(); } } @@ -58,14 +51,13 @@ namespace FlowerShop { 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/FlowerShop/FlowerShop/FormMails.cs b/FlowerShop/FlowerShop/FormMails.cs index b8fc97b..59d03c4 100644 --- a/FlowerShop/FlowerShop/FormMails.cs +++ b/FlowerShop/FlowerShop/FormMails.cs @@ -19,17 +19,9 @@ namespace FlowerShop { try { - var list = _logic.ReadList(null); + dataGridView.FillAndConfigGrid(_logic.ReadList(null)); - if (list != null) - { - dataGridView.DataSource = list; - dataGridView.Columns["ClientId"].Visible = false; - dataGridView.Columns["MessageId"].Visible = false; - dataGridView.Columns["Body"].AutoSizeMode = DataGridViewAutoSizeColumnMode.Fill; - } - - _logger.LogInformation("Loading mails"); + _logger.LogInformation("Loading mails"); } catch (Exception ex) { diff --git a/FlowerShop/FlowerShop/FormMain.Designer.cs b/FlowerShop/FlowerShop/FormMain.Designer.cs index 2ef7b9f..0ad415b 100644 --- a/FlowerShop/FlowerShop/FormMain.Designer.cs +++ b/FlowerShop/FlowerShop/FormMain.Designer.cs @@ -38,12 +38,13 @@ this.bouquetsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.clientsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.implementersToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.mailsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.reportsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.listOfBouquetsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.componentsByBouquetsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.listOfOrdersToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.doWorksToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.mailsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.createBackupToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); ((System.ComponentModel.ISupportInitialize)(this.dataGridView)).BeginInit(); this.menuStrip.SuspendLayout(); this.SuspendLayout(); @@ -98,7 +99,8 @@ this.menuStrip.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { this.guidesToolStripMenuItem, this.reportsToolStripMenuItem, - this.doWorksToolStripMenuItem}); + this.doWorksToolStripMenuItem, + this.createBackupToolStripMenuItem}); this.menuStrip.Location = new System.Drawing.Point(0, 0); this.menuStrip.Name = "menuStrip"; this.menuStrip.Padding = new System.Windows.Forms.Padding(4, 1, 0, 1); @@ -121,31 +123,38 @@ // componentsToolStripMenuItem // this.componentsToolStripMenuItem.Name = "componentsToolStripMenuItem"; - this.componentsToolStripMenuItem.Size = new System.Drawing.Size(180, 22); + this.componentsToolStripMenuItem.Size = new System.Drawing.Size(149, 22); this.componentsToolStripMenuItem.Text = "Компоненты"; this.componentsToolStripMenuItem.Click += new System.EventHandler(this.componentsToolStripMenuItem_Click); // // bouquetsToolStripMenuItem // this.bouquetsToolStripMenuItem.Name = "bouquetsToolStripMenuItem"; - this.bouquetsToolStripMenuItem.Size = new System.Drawing.Size(180, 22); + this.bouquetsToolStripMenuItem.Size = new System.Drawing.Size(149, 22); this.bouquetsToolStripMenuItem.Text = "Букеты"; this.bouquetsToolStripMenuItem.Click += new System.EventHandler(this.bouquetsToolStripMenuItem_Click); // // clientsToolStripMenuItem // this.clientsToolStripMenuItem.Name = "clientsToolStripMenuItem"; - this.clientsToolStripMenuItem.Size = new System.Drawing.Size(180, 22); + this.clientsToolStripMenuItem.Size = new System.Drawing.Size(149, 22); this.clientsToolStripMenuItem.Text = "Клиенты"; this.clientsToolStripMenuItem.Click += new System.EventHandler(this.clientsToolStripMenuItem_Click); // // implementersToolStripMenuItem // this.implementersToolStripMenuItem.Name = "implementersToolStripMenuItem"; - this.implementersToolStripMenuItem.Size = new System.Drawing.Size(180, 22); + this.implementersToolStripMenuItem.Size = new System.Drawing.Size(149, 22); this.implementersToolStripMenuItem.Text = "Исполнители"; this.implementersToolStripMenuItem.Click += new System.EventHandler(this.implementersToolStripMenuItem_Click); // + // mailsToolStripMenuItem + // + this.mailsToolStripMenuItem.Name = "mailsToolStripMenuItem"; + this.mailsToolStripMenuItem.Size = new System.Drawing.Size(149, 22); + this.mailsToolStripMenuItem.Text = "Письма"; + this.mailsToolStripMenuItem.Click += new System.EventHandler(this.mailsToolStripMenuItem_Click); + // // reportsToolStripMenuItem // this.reportsToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { @@ -184,12 +193,12 @@ this.doWorksToolStripMenuItem.Text = "Запуск работ"; this.doWorksToolStripMenuItem.Click += new System.EventHandler(this.doWorksToolStripMenuItem_Click); // - // mailsToolStripMenuItem + // createBackupToolStripMenuItem // - this.mailsToolStripMenuItem.Name = "mailsToolStripMenuItem"; - this.mailsToolStripMenuItem.Size = new System.Drawing.Size(180, 22); - this.mailsToolStripMenuItem.Text = "Письма"; - this.mailsToolStripMenuItem.Click += new System.EventHandler(this.mailsToolStripMenuItem_Click); + this.createBackupToolStripMenuItem.Name = "createBackupToolStripMenuItem"; + this.createBackupToolStripMenuItem.Size = new System.Drawing.Size(97, 22); + this.createBackupToolStripMenuItem.Text = "Создать бэкап"; + this.createBackupToolStripMenuItem.Click += new System.EventHandler(this.createBackupToolStripMenuItem_Click); // // FormMain // @@ -232,5 +241,6 @@ private ToolStripMenuItem implementersToolStripMenuItem; private ToolStripMenuItem doWorksToolStripMenuItem; private ToolStripMenuItem mailsToolStripMenuItem; + private ToolStripMenuItem createBackupToolStripMenuItem; } } \ No newline at end of file diff --git a/FlowerShop/FlowerShop/FormMain.cs b/FlowerShop/FlowerShop/FormMain.cs index 58667d8..9859bb9 100644 --- a/FlowerShop/FlowerShop/FormMain.cs +++ b/FlowerShop/FlowerShop/FormMain.cs @@ -1,6 +1,6 @@ -using FlowerShopBusinessLogic.BusinessLogics; -using FlowerShopContracts.BindingModels; +using FlowerShopContracts.BindingModels; using FlowerShopContracts.BusinessLogicsContracts; +using FlowerShopContracts.DI; using Microsoft.Extensions.Logging; namespace FlowerShop @@ -11,14 +11,16 @@ namespace FlowerShop private readonly IOrderLogic _orderLogic; private readonly IReportLogic _reportLogic; private readonly IWorkProcess _workProcess; + private readonly IBackUpLogic _backUpLogic; - public FormMain(ILogger logger, IOrderLogic orderLogic, IReportLogic reportLogic, IWorkProcess workProcess) + 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 MainForm_Load(object sender, EventArgs e) @@ -31,15 +33,7 @@ namespace FlowerShop _logger.LogInformation("Загрузка заказов"); try { - var list = _orderLogic.ReadList(null); - - if (list != null) - { - dataGridView.DataSource = list; - dataGridView.Columns["BouquetId"].Visible = false; - dataGridView.Columns["ClientId"].Visible = false; - dataGridView.Columns["ImplementerId"].Visible = false; - } + dataGridView.FillAndConfigGrid(_orderLogic.ReadList(null)); } catch (Exception ex) { @@ -50,31 +44,22 @@ namespace FlowerShop 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 bouquetsToolStripMenuItem_Click(object sender, EventArgs e) { - var service = Program.ServiceProvider?.GetService(typeof(FormBouquets)); - - if (service is FormBouquets form) - { - form.ShowDialog(); - } + var form = DependencyManager.Instance.Resolve(); + form.ShowDialog(); } private void buttonCreate_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 buttonToWork_Click(object sender, EventArgs e) @@ -173,52 +158,62 @@ namespace FlowerShop private void componentsByBouquetsToolStripMenuItem_Click(object sender, EventArgs e) { - var service = Program.ServiceProvider?.GetService(typeof(FormReportBouquetComponents)); - if (service is FormReportBouquetComponents form) - { - form.ShowDialog(); - } + var form = DependencyManager.Instance.Resolve(); + form.ShowDialog(); } private void listOfOrdersToolStripMenuItem_Click(object sender, EventArgs e) { - var service = Program.ServiceProvider?.GetService(typeof(FormReportOrder)); - if (service is FormReportOrder 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 doWorksToolStripMenuItem_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 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 mailsToolStripMenuItem_Click(object sender, EventArgs e) { - var service = Program.ServiceProvider?.GetService(typeof(FormMails)); - if (service is FormMails form) + var form = DependencyManager.Instance.Resolve(); + form.ShowDialog(); + } + + private void createBackupToolStripMenuItem_Click(object sender, EventArgs e) + { + try { - form.ShowDialog(); + if (_backUpLogic != null) + { + var fbd = new FolderBrowserDialog(); + if (fbd.ShowDialog() == DialogResult.OK) + { + _backUpLogic.CreateBackUp(new BackUpSaveBindingModel + { + FolderName = fbd.SelectedPath + }); + + MessageBox.Show("Бекап создан", "Сообщение", MessageBoxButtons.OK, MessageBoxIcon.Information); + } + } + } + catch (Exception ex) + { + MessageBox.Show(ex.Message, "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error); } } } diff --git a/FlowerShop/FlowerShop/Program.cs b/FlowerShop/FlowerShop/Program.cs index c829707..96f7bbd 100644 --- a/FlowerShop/FlowerShop/Program.cs +++ b/FlowerShop/FlowerShop/Program.cs @@ -1,33 +1,26 @@ -using FlowerShopContracts.StoragesContracts; using FlowerShopBusinessLogic.OfficePackage; using FlowerShopBusinessLogic.OfficePackage.Implements; -using Microsoft.Extensions.DependencyInjection; -using FlowerShopDatabaseImplement.Implements; using FlowerShopBusinessLogic.BusinessLogics; using FlowerShopContracts.BusinessLogicsContracts; using NLog.Extensions.Logging; using Microsoft.Extensions.Logging; using FlowerShopBusinessLogic.MailWorker; using FlowerShopContracts.BindingModels; +using FlowerShopContracts.DI; namespace FlowerShop { internal static class Program { - private static ServiceProvider? _serviceProvider; - public static ServiceProvider? ServiceProvider => _serviceProvider; - [STAThread] static void Main() { ApplicationConfiguration.Initialize(); - var services = new ServiceCollection(); - ConfigureServices(services); - _serviceProvider = services.BuildServiceProvider(); + InitDependency(); try { - var mailSender = _serviceProvider.GetService(); + var mailSender = DependencyManager.Instance.Resolve(); mailSender?.MailConfig(new MailConfigBindingModel { MailLogin = System.Configuration.ConfigurationManager.AppSettings["MailLogin"] ?? string.Empty, @@ -42,57 +35,54 @@ namespace FlowerShop } catch (Exception ex) { - var logger = _serviceProvider.GetService(); + var logger = DependencyManager.Instance.Resolve(); logger?.LogError(ex, "Error during work with mail"); } - Application.Run(_serviceProvider.GetRequiredService()); + Application.Run(DependencyManager.Instance.Resolve()); } - private static void MailCheck(object obj) => ServiceProvider?.GetService()?.MailCheck(); + private static void MailCheck(object obj) => DependencyManager.Instance.Resolve()?.MailCheck(); - 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(); + 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(); + DependencyManager.Instance.RegisterType(); + DependencyManager.Instance.RegisterType(); + DependencyManager.Instance.RegisterType(); - services.AddSingleton(); + DependencyManager.Instance.RegisterType(true); - 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(); + DependencyManager.Instance.RegisterType(); } } } \ No newline at end of file diff --git a/FlowerShop/FlowerShopBusinessLogic/BusinessLogics/BackUpLogics.cs b/FlowerShop/FlowerShopBusinessLogic/BusinessLogics/BackUpLogics.cs new file mode 100644 index 0000000..7012d4e --- /dev/null +++ b/FlowerShop/FlowerShopBusinessLogic/BusinessLogics/BackUpLogics.cs @@ -0,0 +1,107 @@ +using FlowerShopContracts.BusinessLogicsContracts; +using FlowerShopContracts.StoragesContracts; +using FlowerShopContracts.BindingModels; +using FlowerShopDataModels; +using Microsoft.Extensions.Logging; +using System.IO.Compression; +using System.Reflection; +using System.Runtime.Serialization.Json; + +namespace FlowerShopBusinessLogic.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(BackUpSaveBindingModel 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/FlowerShop/FlowerShopContracts/Attributes/ColumnAttribute.cs b/FlowerShop/FlowerShopContracts/Attributes/ColumnAttribute.cs new file mode 100644 index 0000000..f0b08d4 --- /dev/null +++ b/FlowerShop/FlowerShopContracts/Attributes/ColumnAttribute.cs @@ -0,0 +1,20 @@ +namespace FlowerShopContracts.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/FlowerShop/FlowerShopContracts/Attributes/GridViewAutoSize.cs b/FlowerShop/FlowerShopContracts/Attributes/GridViewAutoSize.cs new file mode 100644 index 0000000..1735943 --- /dev/null +++ b/FlowerShop/FlowerShopContracts/Attributes/GridViewAutoSize.cs @@ -0,0 +1,14 @@ +namespace FlowerShopContracts.Attributes +{ + public enum GridViewAutoSize + { + NotSet = 0, + None = 1, + ColumnHeader = 2, + AllCellsExceptHeader = 4, + AllCells = 6, + DisplayedCellsExceptHeader = 8, + DisplayedCells = 10, + Fill = 16 + } +} diff --git a/FlowerShop/FlowerShopContracts/BindingModels/BackUpSaveBindingModel.cs b/FlowerShop/FlowerShopContracts/BindingModels/BackUpSaveBindingModel.cs new file mode 100644 index 0000000..42017a2 --- /dev/null +++ b/FlowerShop/FlowerShopContracts/BindingModels/BackUpSaveBindingModel.cs @@ -0,0 +1,7 @@ +namespace FlowerShopContracts.BindingModels +{ + public class BackUpSaveBindingModel + { + public string FolderName { get; set; } = string.Empty; + } +} diff --git a/FlowerShop/FlowerShopContracts/BindingModels/MessageInfoBindingModel.cs b/FlowerShop/FlowerShopContracts/BindingModels/MessageInfoBindingModel.cs index 17b59d5..4195d52 100644 --- a/FlowerShop/FlowerShopContracts/BindingModels/MessageInfoBindingModel.cs +++ b/FlowerShop/FlowerShopContracts/BindingModels/MessageInfoBindingModel.cs @@ -15,5 +15,7 @@ namespace FlowerShopContracts.BindingModels public string Subject { get; set; } = string.Empty; public string Body { get; set; } = string.Empty; + + public int Id => throw new NotImplementedException(); } } diff --git a/FlowerShop/FlowerShopContracts/BusinessLogicsContracts/IBackUpLogic.cs b/FlowerShop/FlowerShopContracts/BusinessLogicsContracts/IBackUpLogic.cs new file mode 100644 index 0000000..5667b61 --- /dev/null +++ b/FlowerShop/FlowerShopContracts/BusinessLogicsContracts/IBackUpLogic.cs @@ -0,0 +1,9 @@ +using FlowerShopContracts.BindingModels; + +namespace FlowerShopContracts.BusinessLogicsContracts +{ + public interface IBackUpLogic + { + void CreateBackUp(BackUpSaveBindingModel model); + } +} diff --git a/FlowerShop/FlowerShopContracts/DI/DependencyManager.cs b/FlowerShop/FlowerShopContracts/DI/DependencyManager.cs new file mode 100644 index 0000000..152f8f0 --- /dev/null +++ b/FlowerShop/FlowerShopContracts/DI/DependencyManager.cs @@ -0,0 +1,39 @@ +using Microsoft.Extensions.Logging; + +namespace FlowerShopContracts.DI +{ + public class DependencyManager + { + private readonly IDependencyContainer _dependencyManager; + + private static DependencyManager? _manager; + + private static readonly object _locjObject = new(); + + private DependencyManager() + { + _dependencyManager = new UnityDependencyContainer(); + } + + public static DependencyManager Instance { get { if (_manager == null) { lock (_locjObject) { _manager = new DependencyManager(); } } return _manager; } } + + public static void InitDependency() + { + var ext = ServiceProviderLoader.GetImplementationExtensions(); + if (ext == null) + { + throw new ArgumentNullException("Отсутствуют компоненты для загрузки зависимостей по модулям"); + } + + ext.RegisterServices(); + } + + public void AddLogging(Action configure) => _dependencyManager.AddLogging(configure); + + public void RegisterType(bool isSingle = false) where U : class, T where T : class => _dependencyManager.RegisterType(isSingle); + + public void RegisterType(bool isSingle = false) where T : class => _dependencyManager.RegisterType(isSingle); + + public T Resolve() => _dependencyManager.Resolve(); + } +} diff --git a/FlowerShop/FlowerShopContracts/DI/IDependencyContainer.cs b/FlowerShop/FlowerShopContracts/DI/IDependencyContainer.cs new file mode 100644 index 0000000..9846189 --- /dev/null +++ b/FlowerShop/FlowerShopContracts/DI/IDependencyContainer.cs @@ -0,0 +1,15 @@ +using Microsoft.Extensions.Logging; + +namespace FlowerShopContracts.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/FlowerShop/FlowerShopContracts/DI/IImplementationExtension.cs b/FlowerShop/FlowerShopContracts/DI/IImplementationExtension.cs new file mode 100644 index 0000000..ae598e9 --- /dev/null +++ b/FlowerShop/FlowerShopContracts/DI/IImplementationExtension.cs @@ -0,0 +1,9 @@ +namespace FlowerShopContracts.DI +{ + public interface IImplementationExtension + { + public int Priority { get; } + + public void RegisterServices(); + } +} diff --git a/FlowerShop/FlowerShopContracts/DI/ServiceDependencyContainer.cs b/FlowerShop/FlowerShopContracts/DI/ServiceDependencyContainer.cs new file mode 100644 index 0000000..56cfc56 --- /dev/null +++ b/FlowerShop/FlowerShopContracts/DI/ServiceDependencyContainer.cs @@ -0,0 +1,60 @@ +using Microsoft.Extensions.Logging; +using Microsoft.Extensions.DependencyInjection; + +namespace FlowerShopContracts.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/FlowerShop/FlowerShopContracts/DI/ServiceProviderLoader.cs b/FlowerShop/FlowerShopContracts/DI/ServiceProviderLoader.cs new file mode 100644 index 0000000..4f10a40 --- /dev/null +++ b/FlowerShop/FlowerShopContracts/DI/ServiceProviderLoader.cs @@ -0,0 +1,48 @@ +using System.Reflection; + +namespace FlowerShopContracts.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/FlowerShop/FlowerShopContracts/DI/UnityDependencyContainer.cs b/FlowerShop/FlowerShopContracts/DI/UnityDependencyContainer.cs new file mode 100644 index 0000000..4b1c338 --- /dev/null +++ b/FlowerShop/FlowerShopContracts/DI/UnityDependencyContainer.cs @@ -0,0 +1,38 @@ +using Microsoft.Extensions.Logging; +using Unity.Microsoft.Logging; +using Unity; + +namespace FlowerShopContracts.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/FlowerShop/FlowerShopContracts/FlowerShopContracts.csproj b/FlowerShop/FlowerShopContracts/FlowerShopContracts.csproj index 5192185..fac472e 100644 --- a/FlowerShop/FlowerShopContracts/FlowerShopContracts.csproj +++ b/FlowerShop/FlowerShopContracts/FlowerShopContracts.csproj @@ -6,6 +6,12 @@ enable + + + + + + diff --git a/FlowerShop/FlowerShopContracts/StoragesContracts/IBackUpInfo.cs b/FlowerShop/FlowerShopContracts/StoragesContracts/IBackUpInfo.cs new file mode 100644 index 0000000..1fd9af5 --- /dev/null +++ b/FlowerShop/FlowerShopContracts/StoragesContracts/IBackUpInfo.cs @@ -0,0 +1,8 @@ +namespace FlowerShopContracts.StoragesContracts +{ + public interface IBackUpInfo + { + List? GetList() where T : class, new(); + Type? GetTypeByModelInterface(string modelInterfaceName); + } +} diff --git a/FlowerShop/FlowerShopContracts/ViewModels/BouquetViewModel.cs b/FlowerShop/FlowerShopContracts/ViewModels/BouquetViewModel.cs index 2a7d6ed..f2d6d34 100644 --- a/FlowerShop/FlowerShopContracts/ViewModels/BouquetViewModel.cs +++ b/FlowerShop/FlowerShopContracts/ViewModels/BouquetViewModel.cs @@ -1,15 +1,17 @@ -using FlowerShopDataModels.Models; -using System.ComponentModel; +using FlowerShopContracts.Attributes; +using FlowerShopDataModels.Models; namespace FlowerShopContracts.ViewModels { public class BouquetViewModel : IBouquetModel { + [Column(visible: false)] public int Id { get; set; } - [DisplayName("Название букета")] + [Column("Название букета", gridViewAutoSize: GridViewAutoSize.Fill, isUseAutoSize: true)] public string BouquetName { get; set; } = string.Empty; - [DisplayName("Цена")] + [Column("Цена", width: 150)] public double Price { get; set; } + [Column(visible: false)] public Dictionary BouquetComponents { get; set; } = new(); } } diff --git a/FlowerShop/FlowerShopContracts/ViewModels/ClientViewModel.cs b/FlowerShop/FlowerShopContracts/ViewModels/ClientViewModel.cs index 55e7336..a1f7c88 100644 --- a/FlowerShop/FlowerShopContracts/ViewModels/ClientViewModel.cs +++ b/FlowerShop/FlowerShopContracts/ViewModels/ClientViewModel.cs @@ -1,19 +1,20 @@ -using FlowerShopDataModels.Models; -using System.ComponentModel; +using FlowerShopContracts.Attributes; +using FlowerShopDataModels.Models; namespace FlowerShopContracts.ViewModels { public class ClientViewModel : IClientModel { + [Column(visible: false)] public int Id { get; set; } - [DisplayName("ФИО клиента")] + [Column("ФИО клиента", width: 150)] public string ClientFIO { get; set; } = string.Empty; - [DisplayName("Логин (почта)")] + [Column("Логин (почта)", gridViewAutoSize: GridViewAutoSize.Fill, isUseAutoSize: true)] public string Email { get; set; } = string.Empty; - [DisplayName("Пароль")] + [Column("Пароль", width: 150)] public string Password { get; set; } = string.Empty; } } diff --git a/FlowerShop/FlowerShopContracts/ViewModels/ComponentViewModel.cs b/FlowerShop/FlowerShopContracts/ViewModels/ComponentViewModel.cs index 3a06a8f..70dc98c 100644 --- a/FlowerShop/FlowerShopContracts/ViewModels/ComponentViewModel.cs +++ b/FlowerShop/FlowerShopContracts/ViewModels/ComponentViewModel.cs @@ -1,14 +1,15 @@ -using FlowerShopDataModels.Models; -using System.ComponentModel; +using FlowerShopContracts.Attributes; +using FlowerShopDataModels.Models; namespace FlowerShopContracts.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: 100)] public double Cost { get; set; } } } diff --git a/FlowerShop/FlowerShopContracts/ViewModels/ImplementerViewModel.cs b/FlowerShop/FlowerShopContracts/ViewModels/ImplementerViewModel.cs index ef2e876..8f3e573 100644 --- a/FlowerShop/FlowerShopContracts/ViewModels/ImplementerViewModel.cs +++ b/FlowerShop/FlowerShopContracts/ViewModels/ImplementerViewModel.cs @@ -1,22 +1,23 @@ -using FlowerShopDataModels.Models; -using System.ComponentModel; +using FlowerShopContracts.Attributes; +using FlowerShopDataModels.Models; namespace FlowerShopContracts.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: 200)] public string Password { get; set; } = string.Empty; - [DisplayName("Трудовой стаж")] + [Column("Трудовой стаж", width: 200)] public int WorkExperience { get; set; } - [DisplayName("Квалификация")] + [Column("Квалификация", width: 200)] public int Qualification { get; set; } } } diff --git a/FlowerShop/FlowerShopContracts/ViewModels/MessageInfoViewModel.cs b/FlowerShop/FlowerShopContracts/ViewModels/MessageInfoViewModel.cs index 07a4dc7..8462e46 100644 --- a/FlowerShop/FlowerShopContracts/ViewModels/MessageInfoViewModel.cs +++ b/FlowerShop/FlowerShopContracts/ViewModels/MessageInfoViewModel.cs @@ -1,20 +1,23 @@ -using FlowerShopDataModels.Models; -using System.ComponentModel; +using FlowerShopContracts.Attributes; +using FlowerShopDataModels.Models; namespace FlowerShopContracts.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/FlowerShop/FlowerShopContracts/ViewModels/OrderViewModel.cs b/FlowerShop/FlowerShopContracts/ViewModels/OrderViewModel.cs index 27abdd1..a066f39 100644 --- a/FlowerShop/FlowerShopContracts/ViewModels/OrderViewModel.cs +++ b/FlowerShop/FlowerShopContracts/ViewModels/OrderViewModel.cs @@ -1,34 +1,36 @@ -using FlowerShopDataModels.Enums; +using FlowerShopContracts.Attributes; +using FlowerShopDataModels.Enums; using FlowerShopDataModels.Models; -using System.ComponentModel; namespace FlowerShopContracts.ViewModels { public class OrderViewModel : IOrderModel { - [DisplayName("Номер")] + [Column("Номер", gridViewAutoSize: GridViewAutoSize.AllCells, isUseAutoSize: true)] public int Id { get; set; } + [Column(visible: false)] public int BouquetId { get; set; } - + [Column(visible: false)] public int ClientId { get; set; } - [DisplayName("ФИО клиента")] + [Column("ФИО клиента", gridViewAutoSize: GridViewAutoSize.AllCells, isUseAutoSize: true)] public string ClientFIO { get; set; } = string.Empty; + [Column(visible: false)] public int? ImplementerId { get; set; } - [DisplayName("ФИО исполнителя")] + [Column("ФИО исполнителя", gridViewAutoSize: GridViewAutoSize.AllCells, isUseAutoSize: true)] public string ImplementerFIO { get; set; } = string.Empty; - [DisplayName("Букет")] + [Column("Букет", gridViewAutoSize: GridViewAutoSize.AllCells, isUseAutoSize: true)] public string BouquetName { 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; } } } diff --git a/FlowerShop/FlowerShopDataModels/Models/IMessageInfoModel.cs b/FlowerShop/FlowerShopDataModels/Models/IMessageInfoModel.cs index 1c244fe..1decfd2 100644 --- a/FlowerShop/FlowerShopDataModels/Models/IMessageInfoModel.cs +++ b/FlowerShop/FlowerShopDataModels/Models/IMessageInfoModel.cs @@ -1,6 +1,6 @@ namespace FlowerShopDataModels.Models { - public interface IMessageInfoModel + public interface IMessageInfoModel : IId { string MessageId { get; } int? ClientId { get; } diff --git a/FlowerShop/FlowerShopDatabaseImplement/DatabaseImplementationExtension.cs b/FlowerShop/FlowerShopDatabaseImplement/DatabaseImplementationExtension.cs new file mode 100644 index 0000000..36f0665 --- /dev/null +++ b/FlowerShop/FlowerShopDatabaseImplement/DatabaseImplementationExtension.cs @@ -0,0 +1,22 @@ +using FlowerShopContracts.DI; +using FlowerShopContracts.StoragesContracts; +using FlowerShopDatabaseImplement.Implements; + +namespace FlowerShopDatabaseImplement +{ + 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/FlowerShop/FlowerShopDatabaseImplement/FlowerShopDatabaseImplement.csproj b/FlowerShop/FlowerShopDatabaseImplement/FlowerShopDatabaseImplement.csproj index 81edb67..1b8f1a9 100644 --- a/FlowerShop/FlowerShopDatabaseImplement/FlowerShopDatabaseImplement.csproj +++ b/FlowerShop/FlowerShopDatabaseImplement/FlowerShopDatabaseImplement.csproj @@ -24,4 +24,8 @@ + + + + diff --git a/FlowerShop/FlowerShopDatabaseImplement/Implements/BackUpInfo.cs b/FlowerShop/FlowerShopDatabaseImplement/Implements/BackUpInfo.cs new file mode 100644 index 0000000..b97c07d --- /dev/null +++ b/FlowerShop/FlowerShopDatabaseImplement/Implements/BackUpInfo.cs @@ -0,0 +1,30 @@ +using FlowerShopContracts.StoragesContracts; + +namespace FlowerShopDatabaseImplement.Implements +{ + public class BackUpInfo : IBackUpInfo + { + public List? GetList() where T : class, new() + { + using var context = new FlowerShopDatabase(); + + 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/FlowerShop/FlowerShopDatabaseImplement/Migrations/20230510060536_db.Designer.cs b/FlowerShop/FlowerShopDatabaseImplement/Migrations/20230510065624_init.Designer.cs similarity index 99% rename from FlowerShop/FlowerShopDatabaseImplement/Migrations/20230510060536_db.Designer.cs rename to FlowerShop/FlowerShopDatabaseImplement/Migrations/20230510065624_init.Designer.cs index fc2c1c7..730f6ee 100644 --- a/FlowerShop/FlowerShopDatabaseImplement/Migrations/20230510060536_db.Designer.cs +++ b/FlowerShop/FlowerShopDatabaseImplement/Migrations/20230510065624_init.Designer.cs @@ -12,8 +12,8 @@ using Microsoft.EntityFrameworkCore.Storage.ValueConversion; namespace FlowerShopDatabaseImplement.Migrations { [DbContext(typeof(FlowerShopDatabase))] - [Migration("20230510060536_db")] - partial class db + [Migration("20230510065624_init")] + partial class init { /// protected override void BuildTargetModel(ModelBuilder modelBuilder) diff --git a/FlowerShop/FlowerShopDatabaseImplement/Migrations/20230510060536_db.cs b/FlowerShop/FlowerShopDatabaseImplement/Migrations/20230510065624_init.cs similarity index 90% rename from FlowerShop/FlowerShopDatabaseImplement/Migrations/20230510060536_db.cs rename to FlowerShop/FlowerShopDatabaseImplement/Migrations/20230510065624_init.cs index 0fc7c2b..76aac14 100644 --- a/FlowerShop/FlowerShopDatabaseImplement/Migrations/20230510060536_db.cs +++ b/FlowerShop/FlowerShopDatabaseImplement/Migrations/20230510065624_init.cs @@ -5,7 +5,7 @@ namespace FlowerShopDatabaseImplement.Migrations { /// - public partial class db : Migration + public partial class init : Migration { /// protected override void Up(MigrationBuilder migrationBuilder) diff --git a/FlowerShop/FlowerShopDatabaseImplement/Models/Bouquet.cs b/FlowerShop/FlowerShopDatabaseImplement/Models/Bouquet.cs index 0cb5b5e..98cf5d6 100644 --- a/FlowerShop/FlowerShopDatabaseImplement/Models/Bouquet.cs +++ b/FlowerShop/FlowerShopDatabaseImplement/Models/Bouquet.cs @@ -3,22 +3,28 @@ using FlowerShopContracts.ViewModels; using FlowerShopDataModels.Models; using System.ComponentModel.DataAnnotations; using System.ComponentModel.DataAnnotations.Schema; +using System.Runtime.Serialization; namespace FlowerShopDatabaseImplement.Models { + [DataContract] public class Bouquet : IBouquetModel { + [DataMember] public int Id { get; private set; } [Required] + [DataMember] public string BouquetName { get; private set; } = string.Empty; [Required] + [DataMember] public double Price { get; private set; } private Dictionary? _bouquetComponents = null; [NotMapped] + [DataMember] public Dictionary BouquetComponents { get diff --git a/FlowerShop/FlowerShopDatabaseImplement/Models/Client.cs b/FlowerShop/FlowerShopDatabaseImplement/Models/Client.cs index 367405c..3e7e405 100644 --- a/FlowerShop/FlowerShopDatabaseImplement/Models/Client.cs +++ b/FlowerShop/FlowerShopDatabaseImplement/Models/Client.cs @@ -3,20 +3,26 @@ using FlowerShopContracts.ViewModels; using FlowerShopDataModels.Models; using System.ComponentModel.DataAnnotations.Schema; using System.ComponentModel.DataAnnotations; +using System.Runtime.Serialization; namespace FlowerShopDatabaseImplement.Models { + [DataContract] public class Client : IClientModel { + [DataMember] public int Id { get; private set; } [Required] + [DataMember] public string ClientFIO { get; private set; } = string.Empty; [Required] + [DataMember] public string Email { get; private set; } = string.Empty; [Required] + [DataMember] public string Password { get; private set; } = string.Empty; [ForeignKey("ClientId")] diff --git a/FlowerShop/FlowerShopDatabaseImplement/Models/Component.cs b/FlowerShop/FlowerShopDatabaseImplement/Models/Component.cs index 117df09..db3dffe 100644 --- a/FlowerShop/FlowerShopDatabaseImplement/Models/Component.cs +++ b/FlowerShop/FlowerShopDatabaseImplement/Models/Component.cs @@ -3,18 +3,22 @@ using FlowerShopContracts.ViewModels; using FlowerShopDataModels.Models; using System.ComponentModel.DataAnnotations; using System.ComponentModel.DataAnnotations.Schema; - +using System.Runtime.Serialization; namespace FlowerShopDatabaseImplement.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")] diff --git a/FlowerShop/FlowerShopDatabaseImplement/Models/Implementer.cs b/FlowerShop/FlowerShopDatabaseImplement/Models/Implementer.cs index 8543d47..11f8454 100644 --- a/FlowerShop/FlowerShopDatabaseImplement/Models/Implementer.cs +++ b/FlowerShop/FlowerShopDatabaseImplement/Models/Implementer.cs @@ -2,19 +2,26 @@ using FlowerShopContracts.BindingModels; using FlowerShopContracts.ViewModels; using System.ComponentModel.DataAnnotations.Schema; +using System.Runtime.Serialization; namespace FlowerShopDatabaseImplement.Models { + [DataContract] public class Implementer : IImplementerModel { + [DataMember] public int Id { get; private set; } + [DataMember] public string ImplementerFIO { get; private set; } = string.Empty; + [DataMember] public string Password { get; private set; } = string.Empty; + [DataMember] public int WorkExperience { get; private set; } + [DataMember] public int Qualification { get; private set; } [ForeignKey("ImplementerId")] diff --git a/FlowerShop/FlowerShopDatabaseImplement/Models/MessageInfo.cs b/FlowerShop/FlowerShopDatabaseImplement/Models/MessageInfo.cs index 492729c..8424d41 100644 --- a/FlowerShop/FlowerShopDatabaseImplement/Models/MessageInfo.cs +++ b/FlowerShop/FlowerShopDatabaseImplement/Models/MessageInfo.cs @@ -2,22 +2,30 @@ using FlowerShopContracts.ViewModels; using FlowerShopDataModels.Models; using System.ComponentModel.DataAnnotations; +using System.Runtime.Serialization; namespace FlowerShopDatabaseImplement.Models { + [DataContract] public class MessageInfo : IMessageInfoModel { [Key] + [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 virtual Client? Client { get; private set; } @@ -49,5 +57,7 @@ namespace FlowerShopDatabaseImplement.Models SenderName = SenderName, DateDelivery = DateDelivery, }; + + public int Id => throw new NotImplementedException(); } } diff --git a/FlowerShop/FlowerShopDatabaseImplement/Models/Order.cs b/FlowerShop/FlowerShopDatabaseImplement/Models/Order.cs index 1c2e136..eb4ca45 100644 --- a/FlowerShop/FlowerShopDatabaseImplement/Models/Order.cs +++ b/FlowerShop/FlowerShopDatabaseImplement/Models/Order.cs @@ -3,34 +3,45 @@ using FlowerShopContracts.ViewModels; using FlowerShopDataModels.Enums; using FlowerShopDataModels.Models; using System.ComponentModel.DataAnnotations; +using System.Runtime.Serialization; namespace FlowerShopDatabaseImplement.Models { + [DataContract] public class Order : IOrderModel { + [DataMember] public int Id { get; private set; } [Required] + [DataMember] public int BouquetId { get; private set; } [Required] + [DataMember] public int ClientId { get; private set; } + [DataMember] public int? ImplementerId { get; private set; } [Required] + [DataMember] public int Count { get; private set; } [Required] + [DataMember] public double Sum { get; private set; } [Required] + [DataMember] public OrderStatus Status { get; private set; } = OrderStatus.Неизвестен; [Required] + [DataMember] public DateTime DateCreate { get; private set; } = DateTime.Now; + [DataMember] public DateTime? DateImplement { get; private set; } public virtual Bouquet Bouquet { get; set; } diff --git a/FlowerShop/FlowerShopFileImplement/FileImplementationExtension.cs b/FlowerShop/FlowerShopFileImplement/FileImplementationExtension.cs new file mode 100644 index 0000000..af42a04 --- /dev/null +++ b/FlowerShop/FlowerShopFileImplement/FileImplementationExtension.cs @@ -0,0 +1,22 @@ +using FlowerShopContracts.DI; +using FlowerShopContracts.StoragesContracts; +using FlowerShopFileImplement.Implements; + +namespace FlowerShopFileImplement +{ + 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/FlowerShop/FlowerShopFileImplement/FlowerShopFileImplement.csproj b/FlowerShop/FlowerShopFileImplement/FlowerShopFileImplement.csproj index ca6fa62..7bf356e 100644 --- a/FlowerShop/FlowerShopFileImplement/FlowerShopFileImplement.csproj +++ b/FlowerShop/FlowerShopFileImplement/FlowerShopFileImplement.csproj @@ -11,4 +11,8 @@ + + + + diff --git a/FlowerShop/FlowerShopFileImplement/Implements/BackUpInfo.cs b/FlowerShop/FlowerShopFileImplement/Implements/BackUpInfo.cs new file mode 100644 index 0000000..f0b6d55 --- /dev/null +++ b/FlowerShop/FlowerShopFileImplement/Implements/BackUpInfo.cs @@ -0,0 +1,32 @@ +using FlowerShopContracts.StoragesContracts; + +namespace FlowerShopFileImplement.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/FlowerShop/FlowerShopFileImplement/Models/Bouquet.cs b/FlowerShop/FlowerShopFileImplement/Models/Bouquet.cs index 45f5ceb..d6c8c97 100644 --- a/FlowerShop/FlowerShopFileImplement/Models/Bouquet.cs +++ b/FlowerShop/FlowerShopFileImplement/Models/Bouquet.cs @@ -2,22 +2,27 @@ using FlowerShopContracts.ViewModels; using FlowerShopDataModels.Models; using System.Xml.Linq; -using System.Linq; +using System.Runtime.Serialization; namespace FlowerShopFileImplement.Models { + [DataContract] public class Bouquet : IBouquetModel { + [DataMember] public string BouquetName { get; private set; } = string.Empty; + [DataMember] public double Price { get; private set; } + [DataMember] public int Id { get; private set; } - + public Dictionary Components { get; private set; } = new(); private Dictionary? _bouquetComponents = new(); + [DataMember] public Dictionary BouquetComponents { get diff --git a/FlowerShop/FlowerShopFileImplement/Models/Client.cs b/FlowerShop/FlowerShopFileImplement/Models/Client.cs index 7033563..10a7eec 100644 --- a/FlowerShop/FlowerShopFileImplement/Models/Client.cs +++ b/FlowerShop/FlowerShopFileImplement/Models/Client.cs @@ -2,17 +2,25 @@ using FlowerShopContracts.ViewModels; using FlowerShopDataModels.Models; using System.Xml.Linq; +using System.Runtime.Serialization; + namespace FlowerShopFileImplement.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; private set; } = string.Empty; + [DataMember] public string Password { get; private set; } = string.Empty; public static Client? Create(ClientBindingModel model) diff --git a/FlowerShop/FlowerShopFileImplement/Models/Component.cs b/FlowerShop/FlowerShopFileImplement/Models/Component.cs index cc65f26..80afaf0 100644 --- a/FlowerShop/FlowerShopFileImplement/Models/Component.cs +++ b/FlowerShop/FlowerShopFileImplement/Models/Component.cs @@ -2,16 +2,20 @@ using FlowerShopContracts.ViewModels; using FlowerShopDataModels.Models; using System.Xml.Linq; -using System.Linq; +using System.Runtime.Serialization; namespace FlowerShopFileImplement.Models { + [DataContract] public class Component : IComponentModel { + [DataMember] public string ComponentName { get; private set; } = String.Empty; + [DataMember] public double Cost { get; set; } + [DataMember] public int Id { get; private set; } public static Component? Create(ComponentBindingModel? model) diff --git a/FlowerShop/FlowerShopFileImplement/Models/Implementer.cs b/FlowerShop/FlowerShopFileImplement/Models/Implementer.cs index 706023a..ad02560 100644 --- a/FlowerShop/FlowerShopFileImplement/Models/Implementer.cs +++ b/FlowerShop/FlowerShopFileImplement/Models/Implementer.cs @@ -1,25 +1,27 @@ using FlowerShopContracts.BindingModels; using FlowerShopContracts.ViewModels; using FlowerShopDataModels.Models; -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; using System.Xml.Linq; +using System.Runtime.Serialization; namespace FlowerShopFileImplement.Models { + [DataContract] public class Implementer : IImplementerModel { + [DataMember] public int Id { get; private set; } + [DataMember] public string ImplementerFIO { get; private set; } = string.Empty; + [DataMember] public string Password { get; private set; } = string.Empty; + [DataMember] public int WorkExperience { get; private set; } + [DataMember] public int Qualification { get; private set; } public static Implementer? Create(XElement element) diff --git a/FlowerShop/FlowerShopFileImplement/Models/MessageInfo.cs b/FlowerShop/FlowerShopFileImplement/Models/MessageInfo.cs index 8cca586..10aaf3b 100644 --- a/FlowerShop/FlowerShopFileImplement/Models/MessageInfo.cs +++ b/FlowerShop/FlowerShopFileImplement/Models/MessageInfo.cs @@ -2,21 +2,29 @@ using FlowerShopContracts.ViewModels; using FlowerShopDataModels.Models; using System.Xml.Linq; +using System.Runtime.Serialization; namespace FlowerShopFileImplement.Models { + [DataContract] public class MessageInfo : IMessageInfoModel { + [DataMember] public string MessageId { get; private set; } = string.Empty; + [DataMember] public int? ClientId { get; private set; } + [DataMember] public string SenderName { get; private set; } = string.Empty; + [DataMember] public DateTime DateDelivery { get; private set; } = DateTime.Now; + [DataMember] public string Subject { get; private set; } = string.Empty; + [DataMember] public string Body { get; private set; } = string.Empty; public static MessageInfo? Create(MessageInfoBindingModel model) @@ -73,5 +81,7 @@ namespace FlowerShopFileImplement.Models new XAttribute("SenderName", SenderName), new XAttribute("DateDelivery", DateDelivery) ); + + public int Id => throw new NotImplementedException(); } } diff --git a/FlowerShop/FlowerShopFileImplement/Models/Order.cs b/FlowerShop/FlowerShopFileImplement/Models/Order.cs index 5d31587..2d0bc8c 100644 --- a/FlowerShop/FlowerShopFileImplement/Models/Order.cs +++ b/FlowerShop/FlowerShopFileImplement/Models/Order.cs @@ -2,30 +2,41 @@ using FlowerShopContracts.ViewModels; using FlowerShopDataModels.Enums; using FlowerShopDataModels.Models; +using System.Runtime.Serialization; using System.Xml.Linq; namespace FlowerShopFileImplement.Models { + [DataContract] public class Order : IOrderModel { + [DataMember] + public int Id { get; private set; } + + [DataMember] public int BouquetId { get; private set; } + [DataMember] public int ClientId { get; 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; } - public int Id { get; private set; } - public static Order? Create(OrderBindingModel? model) { if (model == null) diff --git a/FlowerShop/FlowerShopListImplement/FlowerShopListImplement.csproj b/FlowerShop/FlowerShopListImplement/FlowerShopListImplement.csproj index ca6fa62..7bf356e 100644 --- a/FlowerShop/FlowerShopListImplement/FlowerShopListImplement.csproj +++ b/FlowerShop/FlowerShopListImplement/FlowerShopListImplement.csproj @@ -11,4 +11,8 @@ + + + + diff --git a/FlowerShop/FlowerShopListImplement/Implements/BackUpInfo.cs b/FlowerShop/FlowerShopListImplement/Implements/BackUpInfo.cs new file mode 100644 index 0000000..0c49327 --- /dev/null +++ b/FlowerShop/FlowerShopListImplement/Implements/BackUpInfo.cs @@ -0,0 +1,17 @@ +using FlowerShopContracts.StoragesContracts; + +namespace FlowerShopListImplement.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/FlowerShop/FlowerShopListImplement/ListImplementationExtension.cs b/FlowerShop/FlowerShopListImplement/ListImplementationExtension.cs new file mode 100644 index 0000000..ae9457e --- /dev/null +++ b/FlowerShop/FlowerShopListImplement/ListImplementationExtension.cs @@ -0,0 +1,22 @@ +using FlowerShopContracts.DI; +using FlowerShopContracts.StoragesContracts; +using FlowerShopListImplement.Implements; + +namespace FlowerShopListImplement +{ + 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/FlowerShop/FlowerShopListImplement/Models/MessageInfo.cs b/FlowerShop/FlowerShopListImplement/Models/MessageInfo.cs index 6a8df7e..5977495 100644 --- a/FlowerShop/FlowerShopListImplement/Models/MessageInfo.cs +++ b/FlowerShop/FlowerShopListImplement/Models/MessageInfo.cs @@ -45,5 +45,7 @@ namespace FlowerShopListImplement.Models SenderName = SenderName, DateDelivery = DateDelivery, }; + + public int Id => throw new NotImplementedException(); } } diff --git a/FlowerShop/ImplementationExtensions/FlowerShopContracts.dll b/FlowerShop/ImplementationExtensions/FlowerShopContracts.dll new file mode 100644 index 0000000..e52a11a Binary files /dev/null and b/FlowerShop/ImplementationExtensions/FlowerShopContracts.dll differ diff --git a/FlowerShop/ImplementationExtensions/FlowerShopDataModels.dll b/FlowerShop/ImplementationExtensions/FlowerShopDataModels.dll new file mode 100644 index 0000000..ab379bb Binary files /dev/null and b/FlowerShop/ImplementationExtensions/FlowerShopDataModels.dll differ diff --git a/FlowerShop/ImplementationExtensions/FlowerShopDatabaseImplement.dll b/FlowerShop/ImplementationExtensions/FlowerShopDatabaseImplement.dll new file mode 100644 index 0000000..dda8f5b Binary files /dev/null and b/FlowerShop/ImplementationExtensions/FlowerShopDatabaseImplement.dll differ diff --git a/FlowerShop/ImplementationExtensions/FlowerShopFileImplement.dll b/FlowerShop/ImplementationExtensions/FlowerShopFileImplement.dll new file mode 100644 index 0000000..9241adb Binary files /dev/null and b/FlowerShop/ImplementationExtensions/FlowerShopFileImplement.dll differ diff --git a/FlowerShop/ImplementationExtensions/FlowerShopListImplement.dll b/FlowerShop/ImplementationExtensions/FlowerShopListImplement.dll new file mode 100644 index 0000000..e9f2e46 Binary files /dev/null and b/FlowerShop/ImplementationExtensions/FlowerShopListImplement.dll differ