diff --git a/AutomobilePlant/DataGridViewExtension.cs b/AutomobilePlant/DataGridViewExtension.cs new file mode 100644 index 0000000..947556a --- /dev/null +++ b/AutomobilePlant/DataGridViewExtension.cs @@ -0,0 +1,50 @@ +using AutomobilePlantContracts.Attributes; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace AutomobilePlant +{ + 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/AutomobilePlant/FormCar.cs b/AutomobilePlant/FormCar.cs index 315f1d3..3ea576c 100644 --- a/AutomobilePlant/FormCar.cs +++ b/AutomobilePlant/FormCar.cs @@ -12,6 +12,7 @@ using System.Windows.Forms; using AutomobilePlantContracts.BusinessLogicContracts; using AutomobilePlantContracts.SearchModels; using AutomobilePlantContracts.BindingModels; +using AutomobilePlantContracts.DI; namespace AutomobilePlant { @@ -94,50 +95,45 @@ namespace AutomobilePlant private void ButtonAdd_Click(object sender, EventArgs e) { - var service = Program.ServiceProvider?.GetService(typeof(FormCarComponent)); - if (service is FormCarComponent 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 (_carComponents.ContainsKey(form.Id)) - { - _carComponents[form.Id] = (form.ComponentModel, form.Count); - } - else - { - _carComponents.Add(form.Id, (form.ComponentModel, form.Count)); - } - LoadData(); - } - } + return; + } + } + _logger.LogInformation("Добавление нового компонента: { ComponentName}-{Count}", form.ComponentModel.ComponentName, form.Count); + if (_carComponents.ContainsKey(form.Id)) + { + _carComponents[form.Id] = (form.ComponentModel, form.Count); + } + else + { + _carComponents.Add(form.Id, (form.ComponentModel, form.Count)); + } + LoadData(); } private void ButtonEdit_Click(object sender, EventArgs e) { if (dataGridView.SelectedRows.Count == 1) { - var service = Program.ServiceProvider?.GetService(typeof(FormCarComponent)); - if (service is FormCarComponent form) + var form = DependencyManager.Instance.Resolve(); + int id = Convert.ToInt32(dataGridView.SelectedRows[0].Cells[0].Value); + form.Id = id; + form.Count = _carComponents[id].Item2; + + if (form.ShowDialog() == DialogResult.OK) { - int id = Convert.ToInt32(dataGridView.SelectedRows[0].Cells[0].Value); - form.Id = id; - form.Count = _carComponents[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); - _carComponents[form.Id] = (form.ComponentModel, form.Count); - LoadData(); + return; } - } + _logger.LogInformation("Изменение компонента:{ ComponentName}- { Count}", form.ComponentModel.ComponentName, form.Count); + _carComponents[form.Id] = (form.ComponentModel, form.Count); + LoadData(); + } } } diff --git a/AutomobilePlant/FormCars.cs b/AutomobilePlant/FormCars.cs index c68e240..a77388e 100644 --- a/AutomobilePlant/FormCars.cs +++ b/AutomobilePlant/FormCars.cs @@ -11,6 +11,7 @@ using System.Windows.Forms; using AutomobilePlantContracts.BusinessLogicContracts; using AutomobilePlantContracts.SearchModels; using AutomobilePlantContracts.BindingModels; +using AutomobilePlantContracts.DI; namespace AutomobilePlant { @@ -34,15 +35,8 @@ namespace AutomobilePlant { try { - var list = _logic.ReadList(null); - if (list != null) - { - dataGridView.DataSource = list; - dataGridView.Columns["Id"].Visible = false; - dataGridView.Columns["CarName"].AutoSizeMode = DataGridViewAutoSizeColumnMode.Fill; - dataGridView.Columns["CarComponents"].Visible = false; - } - _logger.LogInformation("Загрузка автомобилей"); + dataGridView.FillAndConfigGrid(_logic.ReadList(null)); + _logger.LogInformation("Загрузка автомобилей"); } catch (Exception ex) { @@ -53,13 +47,10 @@ namespace AutomobilePlant private void ButtonAdd_Click(object sender, EventArgs e) { - var service = Program.ServiceProvider?.GetService(typeof(FormCar)); - if (service is FormCar form) + var form = DependencyManager.Instance.Resolve(); + if (form.ShowDialog() == DialogResult.OK) { - if (form.ShowDialog() == DialogResult.OK) - { - LoadData(); - } + LoadData(); } } @@ -67,14 +58,11 @@ namespace AutomobilePlant { if (dataGridView.SelectedRows.Count == 1) { - var service = Program.ServiceProvider?.GetService(typeof(FormCar)); - if (service is FormCar 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/AutomobilePlant/FormClients.cs b/AutomobilePlant/FormClients.cs index 9529e69..6db9b7b 100644 --- a/AutomobilePlant/FormClients.cs +++ b/AutomobilePlant/FormClients.cs @@ -33,14 +33,8 @@ namespace AutomobilePlant { try { - var list = _logic.ReadList(null); - if (list != null) - { - dataGridView.DataSource = list; - dataGridView.Columns["Id"].Visible = false; - dataGridView.Columns["ClientFIO"].AutoSizeMode = DataGridViewAutoSizeColumnMode.Fill; - } - _logger.LogInformation("Загрузка клиентов"); + dataGridView.FillAndConfigGrid(_logic.ReadList(null)); + _logger.LogInformation("Загрузка клиентов"); } catch (Exception ex) { diff --git a/AutomobilePlant/FormComponents.cs b/AutomobilePlant/FormComponents.cs index f9a7d77..852aac8 100644 --- a/AutomobilePlant/FormComponents.cs +++ b/AutomobilePlant/FormComponents.cs @@ -1,5 +1,6 @@ using AutomobilePlantContracts.BindingModels; using AutomobilePlantContracts.BusinessLogicContracts; +using AutomobilePlantContracts.DI; using Microsoft.Extensions.Logging; using System; using System.Collections.Generic; @@ -34,14 +35,8 @@ namespace AutomobilePlant { try { - var list = _logic.ReadList(null); - if (list != null) - { - dataGridView.DataSource = list; - dataGridView.Columns["Id"].Visible = false; - dataGridView.Columns["ComponentName"].AutoSizeMode = DataGridViewAutoSizeColumnMode.Fill; - } - _logger.LogInformation("Загрузка компонентов"); + dataGridView.FillAndConfigGrid(_logic.ReadList(null)); + _logger.LogInformation("Загрузка компонентов"); } catch (Exception ex) { @@ -52,28 +47,22 @@ namespace AutomobilePlant private void ButtonAdd_Click(object sender, EventArgs e) { - var service = Program.ServiceProvider?.GetService(typeof(FormComponent)); - if (service is FormComponent form) - { - if (form.ShowDialog() == DialogResult.OK) - { - LoadData(); - } - } + var form = DependencyManager.Instance.Resolve(); + if (form.ShowDialog() == DialogResult.OK) + { + LoadData(); + } } private void ButtonEdit_Click(object sender, EventArgs e) { 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/AutomobilePlant/FormImplementers.cs b/AutomobilePlant/FormImplementers.cs index b29b12b..17f5ed1 100644 --- a/AutomobilePlant/FormImplementers.cs +++ b/AutomobilePlant/FormImplementers.cs @@ -1,5 +1,6 @@ using AutomobilePlantContracts.BindingModels; using AutomobilePlantContracts.BusinessLogicContracts; +using AutomobilePlantContracts.DI; using Microsoft.Extensions.Logging; using System; using System.Collections.Generic; @@ -32,32 +33,22 @@ namespace AutomobilePlant { try { - var list = _logic.ReadList(null); - if (list != null) - { - dataGridView.DataSource = list; - dataGridView.Columns["Id"].Visible = false; - dataGridView.Columns["ImplementerFIO"].AutoSizeMode = DataGridViewAutoSizeColumnMode.Fill; - } - _logger.LogInformation("Загрузка исполнителей"); + dataGridView.FillAndConfigGrid(_logic.ReadList(null)); + _logger.LogInformation("Загрузка исполнителей"); } catch (Exception ex) { _logger.LogError(ex, "Ошибка загрузки исполнителей"); - MessageBox.Show(ex.Message, "Ошибка", MessageBoxButtons.OK, - MessageBoxIcon.Error); + MessageBox.Show(ex.Message, "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error); } } 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(); } } @@ -65,14 +56,11 @@ namespace AutomobilePlant { 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/AutomobilePlant/FormMails.cs b/AutomobilePlant/FormMails.cs index e9c6469..e68c319 100644 --- a/AutomobilePlant/FormMails.cs +++ b/AutomobilePlant/FormMails.cs @@ -28,14 +28,7 @@ namespace AutomobilePlant { 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/AutomobilePlant/FormMain.Designer.cs b/AutomobilePlant/FormMain.Designer.cs index 49f6cb8..5d7e425 100644 --- a/AutomobilePlant/FormMain.Designer.cs +++ b/AutomobilePlant/FormMain.Designer.cs @@ -34,16 +34,17 @@ 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.отчеты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.запускРабот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.buttonSetToFinish = new System.Windows.Forms.Button(); this.buttonUpdate = new System.Windows.Forms.Button(); - письмаToolStripMenuItem = new ToolStripMenuItem(); this.menuStrip.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.dataGridView)).BeginInit(); this.SuspendLayout(); @@ -54,7 +55,8 @@ this.menuStrip.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { 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(1436, 28); @@ -68,7 +70,7 @@ this.автомобилиToolStripMenuItem, this.клиентыToolStripMenuItem, this.исполнителиToolStripMenuItem, - this.письмаToolStripMenuItem}); + this.письмаToolStripMenuItem}); this.справочникиToolStripMenuItem.Name = "справочникиToolStripMenuItem"; this.справочникиToolStripMenuItem.Size = new System.Drawing.Size(117, 24); this.справочникиToolStripMenuItem.Text = "Справочники"; @@ -101,6 +103,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(185, 26); + this.письмаToolStripMenuItem.Text = "Письма"; + this.письмаToolStripMenuItem.Click += new System.EventHandler(this.письмаToolStripMenuItem_Click); + // // отчетыToolStripMenuItem // this.отчетыToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { @@ -139,12 +148,12 @@ this.запускРаботToolStripMenuItem.Text = "Запуск работ"; this.запускРаботToolStripMenuItem.Click += new System.EventHandler(this.запускРаботToolStripMenuItem_Click); // - // письмаToolStripMenuItem + // создатьБэкапToolStripMenuItem // - письмаToolStripMenuItem.Name = "письмаToolStripMenuItem"; - письмаToolStripMenuItem.Size = new Size(224, 26); - письмаToolStripMenuItem.Text = "Письма"; - письмаToolStripMenuItem.Click += письмаToolStripMenuItem_Click; + this.создатьБэкапToolStripMenuItem.Name = "создатьБэкапToolStripMenuItem"; + this.создатьБэкапToolStripMenuItem.Size = new System.Drawing.Size(122, 24); + this.создатьБэкапToolStripMenuItem.Text = "Создать бэкап"; + this.создатьБэкапToolStripMenuItem.Click += new System.EventHandler(this.создатьБэкапToolStripMenuItem_Click); // // dataGridView // @@ -226,5 +235,6 @@ private ToolStripMenuItem исполнителиToolStripMenuItem; private ToolStripMenuItem запускРаботToolStripMenuItem; private ToolStripMenuItem письмаToolStripMenuItem; + private ToolStripMenuItem создатьБэкапToolStripMenuItem; } } \ No newline at end of file diff --git a/AutomobilePlant/FormMain.cs b/AutomobilePlant/FormMain.cs index 38def58..cb11e34 100644 --- a/AutomobilePlant/FormMain.cs +++ b/AutomobilePlant/FormMain.cs @@ -1,6 +1,7 @@ using AutomobilePlantBusinessLogic.BusinessLogics; using AutomobilePlantContracts.BindingModels; using AutomobilePlantContracts.BusinessLogicContracts; +using AutomobilePlantContracts.DI; using AutomobilePlantDataModels.Enums; using Microsoft.Extensions.Logging; using System; @@ -21,14 +22,16 @@ namespace AutomobilePlant private readonly IOrderLogic _orderLogic; private readonly IReportLogic _reportLogic; private readonly IWorkProcess _workProcess; - public FormMain(ILogger logger, IOrderLogic orderLogic, IReportLogic reportLogic, IWorkProcess workProcess) + private readonly IBackUpLogic _backUpLogic; + public FormMain(ILogger logger, IOrderLogic orderLogic, IReportLogic reportLogic, IWorkProcess workProcess, IBackUpLogic backUpLogic) { InitializeComponent(); _logger = logger; _orderLogic = orderLogic; _reportLogic = reportLogic; _workProcess = workProcess; - } + _backUpLogic = backUpLogic; + } private void FormMain_Load(object sender, EventArgs e) { @@ -40,16 +43,8 @@ namespace AutomobilePlant _logger.LogInformation("Загрузка заказов"); try { - var list = _orderLogic.ReadList(null); - if (list != null) - { - dataGridView.DataSource = list; - dataGridView.Columns["CarId"].Visible = false; - dataGridView.Columns["ClientId"].Visible = false; - dataGridView.Columns["ImplementerId"].Visible = false; - - } - _logger.LogInformation("Загрузка заказов"); + dataGridView.FillAndConfigGrid(_orderLogic.ReadList(null)); + _logger.LogInformation("Загрузка заказов"); } catch (Exception ex) { @@ -60,57 +55,39 @@ namespace AutomobilePlant 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(FormCars)); - if (service is FormCars 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) { - 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(FormReportCarComponents)); - if (service is FormReportCarComponents form) - { - form.ShowDialog(); - } - } + var form = DependencyManager.Instance.Resolve(); + form.ShowDialog(); + } private void списокЗаказовToolStripMenuItem_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 списокАвтомобилейToolStripMenuItem_Click(object sender, EventArgs e) { @@ -123,18 +100,14 @@ namespace AutomobilePlant }); MessageBox.Show("Выполнено", "Успех", MessageBoxButtons.OK, MessageBoxIcon.Information); } - } 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 ButtonSetToFinish_Click(object sender, EventArgs e) { @@ -170,16 +143,36 @@ namespace AutomobilePlant private void запускРаботToolStripMenuItem_Click(object sender, EventArgs e) { - _workProcess.DoWork((Program.ServiceProvider?.GetService(typeof(IImplementerLogic)) as IImplementerLogic)!, _orderLogic); - MessageBox.Show("Процесс обработки запущен", "Сообщение", MessageBoxButtons.OK, MessageBoxIcon.Information); + _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(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); } } } diff --git a/AutomobilePlant/FormMain.resx b/AutomobilePlant/FormMain.resx index 81a9e3d..3ecc32f 100644 --- a/AutomobilePlant/FormMain.resx +++ b/AutomobilePlant/FormMain.resx @@ -60,4 +60,7 @@ 17, 17 + + 60 + \ No newline at end of file diff --git a/AutomobilePlant/Program.cs b/AutomobilePlant/Program.cs index 13d1471..2ed1377 100644 --- a/AutomobilePlant/Program.cs +++ b/AutomobilePlant/Program.cs @@ -4,6 +4,7 @@ using AutomobilePlantBusinessLogic.OfficePackage; using AutomobilePlantBusinessLogic.OfficePackage.Implements; using AutomobilePlantContracts.BindingModels; using AutomobilePlantContracts.BusinessLogicContracts; +using AutomobilePlantContracts.DI; using AutomobilePlantContracts.StorageContracts; using AutomobilePlantDatabaseImplement.Implements; using Microsoft.Extensions.DependencyInjection; @@ -14,20 +15,15 @@ namespace AutomobilePlant { 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, @@ -37,61 +33,58 @@ namespace AutomobilePlant PopHost = System.Configuration.ConfigurationManager.AppSettings["PopHost"] ?? string.Empty, PopPort = Convert.ToInt32(System.Configuration.ConfigurationManager.AppSettings["PopPort"]) }); - // + // var timer = new System.Threading.Timer(new TimerCallback(MailCheck!), null, 0, 100000); } catch (Exception ex) { - var logger = _serviceProvider.GetService(); + var logger = DependencyManager.Instance.Resolve(); logger?.LogError(ex, " "); } - Application.Run(_serviceProvider.GetRequiredService()); + Application.Run(DependencyManager.Instance.Resolve()); } - private static void 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 => - { - option.SetMinimumLevel(LogLevel.Information); - option.AddNLog("nlog.config"); - }); - services.AddTransient(); - services.AddTransient(); - services.AddTransient(); - services.AddTransient(); - services.AddTransient(); - services.AddTransient(); + DependencyManager.InitDependency(); - services.AddTransient(); - services.AddTransient(); - services.AddTransient(); - services.AddTransient(); - services.AddTransient(); - services.AddTransient(); - services.AddTransient(); - services.AddTransient(); + DependencyManager.Instance.AddLogging(option => + { + option.SetMinimumLevel(LogLevel.Information); + option.AddNLog("nlog.config"); + }); - 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.AddSingleton(); + 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(); + DependencyManager.Instance.RegisterType(isSingle: 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(); } - } + } } \ No newline at end of file diff --git a/AutomobilePlantBusinessLogic/BusinessLogics/BackUpLogic.cs b/AutomobilePlantBusinessLogic/BusinessLogics/BackUpLogic.cs new file mode 100644 index 0000000..320cc76 --- /dev/null +++ b/AutomobilePlantBusinessLogic/BusinessLogics/BackUpLogic.cs @@ -0,0 +1,100 @@ +using AutomobilePlantContracts.BindingModels; +using AutomobilePlantContracts.BusinessLogicContracts; +using AutomobilePlantContracts.StorageContracts; +using AutomobilePlantDataModels; +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 AutomobilePlantBusinessLogic.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/AutomobilePlantClientApp/Views/Shared/_Layout.cshtml b/AutomobilePlantClientApp/Views/Shared/_Layout.cshtml index 3333c49..5d0defd 100644 --- a/AutomobilePlantClientApp/Views/Shared/_Layout.cshtml +++ b/AutomobilePlantClientApp/Views/Shared/_Layout.cshtml @@ -48,7 +48,7 @@ diff --git a/AutomobilePlantContracts/Attributes/ColumnAttribute.cs b/AutomobilePlantContracts/Attributes/ColumnAttribute.cs new file mode 100644 index 0000000..540828b --- /dev/null +++ b/AutomobilePlantContracts/Attributes/ColumnAttribute.cs @@ -0,0 +1,26 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace AutomobilePlantContracts.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/AutomobilePlantContracts/Attributes/GridViewAutoSize.cs b/AutomobilePlantContracts/Attributes/GridViewAutoSize.cs new file mode 100644 index 0000000..fa6f210 --- /dev/null +++ b/AutomobilePlantContracts/Attributes/GridViewAutoSize.cs @@ -0,0 +1,20 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace AutomobilePlantContracts.Attributes +{ + public enum GridViewAutoSize + { + NotSet = 0, + None = 1, + ColumnHeader = 2, + AllCellsExceptHeader = 4, + AllCells = 6, + DisplayedCellsExceptHeader = 8, + DisplayedCells = 10, + Fill = 16 + } +} diff --git a/AutomobilePlantContracts/AutomobilePlantContracts.csproj b/AutomobilePlantContracts/AutomobilePlantContracts.csproj index 743e9bf..1d6431f 100644 --- a/AutomobilePlantContracts/AutomobilePlantContracts.csproj +++ b/AutomobilePlantContracts/AutomobilePlantContracts.csproj @@ -6,6 +6,12 @@ enable + + + + + + diff --git a/AutomobilePlantContracts/BindingModels/BackUpSaveBinidngModel.cs b/AutomobilePlantContracts/BindingModels/BackUpSaveBinidngModel.cs new file mode 100644 index 0000000..dd2c599 --- /dev/null +++ b/AutomobilePlantContracts/BindingModels/BackUpSaveBinidngModel.cs @@ -0,0 +1,13 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace AutomobilePlantContracts.BindingModels +{ + public class BackUpSaveBinidngModel + { + public string FolderName { get; set; } = string.Empty; + } +} diff --git a/AutomobilePlantContracts/BindingModels/MessageInfoBindingModel.cs b/AutomobilePlantContracts/BindingModels/MessageInfoBindingModel.cs index a91bbb1..b112587 100644 --- a/AutomobilePlantContracts/BindingModels/MessageInfoBindingModel.cs +++ b/AutomobilePlantContracts/BindingModels/MessageInfoBindingModel.cs @@ -20,5 +20,6 @@ namespace AutomobilePlantContracts.BindingModels public string Subject { get; set; } = string.Empty; public string Body { get; set; } = string.Empty; + public int Id => throw new NotImplementedException(); } } diff --git a/AutomobilePlantContracts/BusinessLogicContracts/IBackUpLogic.cs b/AutomobilePlantContracts/BusinessLogicContracts/IBackUpLogic.cs new file mode 100644 index 0000000..4ba591b --- /dev/null +++ b/AutomobilePlantContracts/BusinessLogicContracts/IBackUpLogic.cs @@ -0,0 +1,14 @@ +using AutomobilePlantContracts.BindingModels; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace AutomobilePlantContracts.BusinessLogicContracts +{ + public interface IBackUpLogic + { + void CreateBackUp(BackUpSaveBinidngModel model); + } +} diff --git a/AutomobilePlantContracts/DI/DependencyManager.cs b/AutomobilePlantContracts/DI/DependencyManager.cs new file mode 100644 index 0000000..8a1f845 --- /dev/null +++ b/AutomobilePlantContracts/DI/DependencyManager.cs @@ -0,0 +1,49 @@ +using Microsoft.Extensions.Logging; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace AutomobilePlantContracts.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/AutomobilePlantContracts/DI/IDependencyContainer.cs b/AutomobilePlantContracts/DI/IDependencyContainer.cs new file mode 100644 index 0000000..fba2285 --- /dev/null +++ b/AutomobilePlantContracts/DI/IDependencyContainer.cs @@ -0,0 +1,24 @@ +using Microsoft.Extensions.Logging; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace AutomobilePlantContracts.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/AutomobilePlantContracts/DI/IImplementationExtension.cs b/AutomobilePlantContracts/DI/IImplementationExtension.cs new file mode 100644 index 0000000..0dd6a30 --- /dev/null +++ b/AutomobilePlantContracts/DI/IImplementationExtension.cs @@ -0,0 +1,15 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace AutomobilePlantContracts.DI +{ + public interface IImplementationExtension + { + public int Priority { get; } + // Регистрация сервисов + public void RegisterServices(); + } +} diff --git a/AutomobilePlantContracts/DI/ServiceDependencyContainer.cs b/AutomobilePlantContracts/DI/ServiceDependencyContainer.cs new file mode 100644 index 0000000..bc24305 --- /dev/null +++ b/AutomobilePlantContracts/DI/ServiceDependencyContainer.cs @@ -0,0 +1,62 @@ +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 AutomobilePlantContracts.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/AutomobilePlantContracts/DI/ServiceProviderLoader.cs b/AutomobilePlantContracts/DI/ServiceProviderLoader.cs new file mode 100644 index 0000000..5e771ac --- /dev/null +++ b/AutomobilePlantContracts/DI/ServiceProviderLoader.cs @@ -0,0 +1,52 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Reflection; +using System.Text; +using System.Threading.Tasks; + +namespace AutomobilePlantContracts.DI +{ + public class ServiceProviderLoader + { + // Загрузка всех классов-реализаций IImplementationExtension + public static IImplementationExtension? GetImplementationExtensions() + { + IImplementationExtension? source = null; + var files = Directory.GetFiles(TryGetImplementationExtensionsFolder(), "*.dll", SearchOption.AllDirectories); + foreach (var file in files.Distinct()) + { + Assembly asm = Assembly.LoadFrom(file); + foreach (var t in asm.GetExportedTypes()) + { + if (t.IsClass && typeof(IImplementationExtension).IsAssignableFrom(t)) + { + if (source == null) + { + source = (IImplementationExtension)Activator.CreateInstance(t)!; + } + else + { + var newSource = (IImplementationExtension)Activator.CreateInstance(t)!; + if (newSource.Priority > source.Priority) + { + source = newSource; + } + } + } + } + } + return source; + } + + private static string TryGetImplementationExtensionsFolder() + { + var directory = new DirectoryInfo(Directory.GetCurrentDirectory()); + while (directory != null && !directory.GetDirectories("ImplementationExtensions", SearchOption.AllDirectories).Any(x => x.Name == "ImplementationExtensions")) + { + directory = directory.Parent; + } + return $"{directory?.FullName}\\ImplementationExtensions"; + } + } +} diff --git a/AutomobilePlantContracts/DI/UnityDependencyContainer.cs b/AutomobilePlantContracts/DI/UnityDependencyContainer.cs new file mode 100644 index 0000000..623630b --- /dev/null +++ b/AutomobilePlantContracts/DI/UnityDependencyContainer.cs @@ -0,0 +1,44 @@ +using Microsoft.Extensions.Logging; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using Unity; +using Unity.Lifetime; +using Unity.Microsoft.Logging; + +namespace AutomobilePlantContracts.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/AutomobilePlantContracts/StorageContracts/IBackUpInfo.cs b/AutomobilePlantContracts/StorageContracts/IBackUpInfo.cs new file mode 100644 index 0000000..429e760 --- /dev/null +++ b/AutomobilePlantContracts/StorageContracts/IBackUpInfo.cs @@ -0,0 +1,14 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace AutomobilePlantContracts.StorageContracts +{ + public interface IBackUpInfo + { + List? GetList() where T : class, new(); + Type? GetTypeByModelInterface(string modelInterfaceName); + } +} diff --git a/AutomobilePlantContracts/ViewModels/CarViewModel.cs b/AutomobilePlantContracts/ViewModels/CarViewModel.cs index c095358..c515a07 100644 --- a/AutomobilePlantContracts/ViewModels/CarViewModel.cs +++ b/AutomobilePlantContracts/ViewModels/CarViewModel.cs @@ -1,4 +1,5 @@ -using AutomobilePlantDataModels.Models; +using AutomobilePlantContracts.Attributes; +using AutomobilePlantDataModels.Models; using System; using System.Collections.Generic; using System.ComponentModel; @@ -10,11 +11,14 @@ namespace AutomobilePlantContracts.ViewModels { public class CarViewModel : ICarModel { + + [Column(visible: false)] public int Id { get; set; } - [DisplayName("Название машины")] - public string CarName { get; set; } = string.Empty; - [DisplayName("Цена")] - public double Price { get; set; } - public Dictionary CarComponents { get; set; } = new(); + [Column("Название машины", gridViewAutoSize: GridViewAutoSize.Fill, isUseAutoSize: true)] + public string CarName { get; set; } = string.Empty; + [Column("Цена", width: 100)] + public double Price { get; set; } + [Column(visible: false)] + public Dictionary CarComponents { get; set; } = new(); } } diff --git a/AutomobilePlantContracts/ViewModels/ClientViewModel.cs b/AutomobilePlantContracts/ViewModels/ClientViewModel.cs index 6ed5ca4..5363a44 100644 --- a/AutomobilePlantContracts/ViewModels/ClientViewModel.cs +++ b/AutomobilePlantContracts/ViewModels/ClientViewModel.cs @@ -1,4 +1,5 @@ -using AutomobilePlantDataModels.Models; +using AutomobilePlantContracts.Attributes; +using AutomobilePlantDataModels.Models; using System; using System.Collections.Generic; using System.ComponentModel; @@ -10,12 +11,13 @@ namespace AutomobilePlantContracts.ViewModels { public class ClientViewModel : IClientModel { - public int Id { get; set; } - [DisplayName("ФИО клиента")] - public string ClientFIO { get; set; } = string.Empty; - [DisplayName("Логин (почта)")] - public string Email { get; set; } = string.Empty; - [DisplayName("Пароль")] - public string Password { get; set; } = string.Empty; + [Column(visible: false)] + public int Id { get; set; } + [Column(title: "ФИО клиента", width: 150)] + public string ClientFIO { get; set; } = string.Empty; + [Column(title: "Логин (эл.почта)", gridViewAutoSize: GridViewAutoSize.Fill, isUseAutoSize: true)] + public string Email { get; set; } = string.Empty; + [Column(title: "Пароль", width: 150)] + public string Password { get; set; } = string.Empty; } } diff --git a/AutomobilePlantContracts/ViewModels/ComponentViewModel.cs b/AutomobilePlantContracts/ViewModels/ComponentViewModel.cs index 92d581d..213ca41 100644 --- a/AutomobilePlantContracts/ViewModels/ComponentViewModel.cs +++ b/AutomobilePlantContracts/ViewModels/ComponentViewModel.cs @@ -1,4 +1,5 @@ -using AutomobilePlantDataModels.Models; +using AutomobilePlantContracts.Attributes; +using AutomobilePlantDataModels.Models; using System; using System.Collections.Generic; using System.ComponentModel; @@ -10,10 +11,11 @@ namespace AutomobilePlantContracts.ViewModels { public class ComponentViewModel : IComponentModel { - public int Id { get; set; } - [DisplayName("Название компонента")] - public string ComponentName { get; set; } = string.Empty; - [DisplayName("Цена")] - public double Cost { get; set; } + [Column(visible: false)] + public int Id { get; set; } + [Column("Название компонента", gridViewAutoSize: GridViewAutoSize.Fill, isUseAutoSize: true)] + public string ComponentName { get; set; } = string.Empty; + [Column("Цена", width: 100)] + public double Cost { get; set; } } } diff --git a/AutomobilePlantContracts/ViewModels/ImplementerViewModel.cs b/AutomobilePlantContracts/ViewModels/ImplementerViewModel.cs index 3fa40fc..cb73ec0 100644 --- a/AutomobilePlantContracts/ViewModels/ImplementerViewModel.cs +++ b/AutomobilePlantContracts/ViewModels/ImplementerViewModel.cs @@ -1,4 +1,5 @@ -using AutomobilePlantDataModels.Models; +using AutomobilePlantContracts.Attributes; +using AutomobilePlantDataModels.Models; using System; using System.Collections.Generic; using System.ComponentModel; @@ -10,18 +11,19 @@ namespace AutomobilePlantContracts.ViewModels { public class ImplementerViewModel : IImplementerModel { - public int Id { get; set; } + [Column(visible: false)] + public int Id { get; set; } - [DisplayName("ФИО")] - public string ImplementerFIO { get; set; } = string.Empty; + [Column("ФИО Исполнителя", gridViewAutoSize: GridViewAutoSize.Fill, isUseAutoSize: true)] + public string ImplementerFIO { get; set; } = string.Empty; - [DisplayName("Пароль")] - public string Password { get; set; } = string.Empty; + [Column("Пароль", width:150)] + public string Password { get; set; } = string.Empty; - [DisplayName("Трудовой стаж")] - public int WorkExperience { get; set; } + [Column("Трудовой стаж", width: 150)] + public int WorkExperience { get; set; } - [DisplayName("Квалификация")] - public int Qualification { get; set; } + [Column("Квалификация", width: 150)] + public int Qualification { get; set; } } } diff --git a/AutomobilePlantContracts/ViewModels/MessageInfoViewModel.cs b/AutomobilePlantContracts/ViewModels/MessageInfoViewModel.cs index c48ca49..b615434 100644 --- a/AutomobilePlantContracts/ViewModels/MessageInfoViewModel.cs +++ b/AutomobilePlantContracts/ViewModels/MessageInfoViewModel.cs @@ -1,4 +1,5 @@ -using AutomobilePlantDataModels.Models; +using AutomobilePlantContracts.Attributes; +using AutomobilePlantDataModels.Models; using System; using System.Collections.Generic; using System.ComponentModel; @@ -10,16 +11,20 @@ namespace AutomobilePlantContracts.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/AutomobilePlantContracts/ViewModels/OrderViewModel.cs b/AutomobilePlantContracts/ViewModels/OrderViewModel.cs index c2280f3..2f7d8ea 100644 --- a/AutomobilePlantContracts/ViewModels/OrderViewModel.cs +++ b/AutomobilePlantContracts/ViewModels/OrderViewModel.cs @@ -1,4 +1,5 @@ -using AutomobilePlantDataModels.Enums; +using AutomobilePlantContracts.Attributes; +using AutomobilePlantDataModels.Enums; using AutomobilePlantDataModels.Models; using System; using System.Collections.Generic; @@ -11,27 +12,30 @@ namespace AutomobilePlantContracts.ViewModels { public class OrderViewModel : IOrderModel { - [DisplayName("Номер")] - public int Id { get; set; } - public int CarId { get; set; } - [DisplayName("Машина")] - public string CarName { get; set; } = string.Empty; - public int ClientId { get; set; } - [DisplayName("ФИО клиента")] - public string ClientFIO { get; set; } = string.Empty; - public int? ImplementerId { get; set; } - [DisplayName("ФИО исполнителя")] - public string ImplementerFIO { get; set; } = string.Empty; + [Column("Номер", gridViewAutoSize: GridViewAutoSize.AllCells, isUseAutoSize: true)] + public int Id { get; set; } + [Column(visible: false)] + public int CarId { get; set; } + [Column("Машина", gridViewAutoSize: GridViewAutoSize.AllCells, isUseAutoSize: true)] + public string CarName { get; set; } = string.Empty; + [Column(visible: false)] + public int ClientId { get; set; } + [Column("ФИО клиента", gridViewAutoSize: GridViewAutoSize.AllCells, isUseAutoSize: true)] + public string ClientFIO { get; set; } = string.Empty; + [Column(visible: false)] + public int? ImplementerId { get; set; } + [Column("ФИО исполнителя", gridViewAutoSize: GridViewAutoSize.AllCells, isUseAutoSize: true)] + public string ImplementerFIO { get; set; } = string.Empty; - [DisplayName("Количество")] - public int Count { get; set; } - [DisplayName("Сумма")] - public double Sum { get; set; } - [DisplayName("Статус")] - public OrderStatus Status { get; set; } = OrderStatus.Неизвестен; - [DisplayName("Дата создания")] - public DateTime DateCreate { get; set; } = DateTime.Now; - [DisplayName("Дата выполнения")] - public DateTime? DateImplement { get; set; } + [Column("Количество", gridViewAutoSize: GridViewAutoSize.AllCells, isUseAutoSize: true)] + public int Count { get; set; } + [Column("Сумма", gridViewAutoSize: GridViewAutoSize.AllCells, isUseAutoSize: true)] + public double Sum { get; set; } + [Column("Статус", gridViewAutoSize: GridViewAutoSize.AllCells, isUseAutoSize: true)] + public OrderStatus Status { get; set; } = OrderStatus.Неизвестен; + [Column("Дата создания", width: 100)] + public DateTime DateCreate { get; set; } = DateTime.Now; + [Column("Дата выполнения", width: 100)] + public DateTime? DateImplement { get; set; } } } diff --git a/AutomobilePlantDataModels/Models/IMessageInfoModel.cs b/AutomobilePlantDataModels/Models/IMessageInfoModel.cs index 25644a3..2b9f5b6 100644 --- a/AutomobilePlantDataModels/Models/IMessageInfoModel.cs +++ b/AutomobilePlantDataModels/Models/IMessageInfoModel.cs @@ -6,7 +6,7 @@ using System.Threading.Tasks; namespace AutomobilePlantDataModels.Models { - public interface IMessageInfoModel + public interface IMessageInfoModel : IId { string MessageId { get; } int? ClientId { get; } diff --git a/AutomobilePlantDatabaseImplement/AutomobilePlantDatabase.cs b/AutomobilePlantDatabaseImplement/AutomobilePlantDatabase.cs index 3df895b..43dd8b3 100644 --- a/AutomobilePlantDatabaseImplement/AutomobilePlantDatabase.cs +++ b/AutomobilePlantDatabaseImplement/AutomobilePlantDatabase.cs @@ -16,7 +16,7 @@ namespace AutomobilePlantDatabaseImplement { if (optionsBuilder.IsConfigured == false) { - optionsBuilder.UseSqlServer(@"Data Source=DESKTOP-50UQ1O1\MSSQLSERVER01;Initial Catalog=AutomobileWorkDatabase;Integrated Security=True;MultipleActiveResultSets=True;;TrustServerCertificate=True"); + optionsBuilder.UseSqlServer(@"Data Source=DESKTOP-50UQ1O1\MSSQLSERVER01;Initial Catalog=AutomobilePlantWorkDatabase1;Integrated Security=True;MultipleActiveResultSets=True;;TrustServerCertificate=True"); } base.OnConfiguring(optionsBuilder); } diff --git a/AutomobilePlantDatabaseImplement/AutomobilePlantDatabaseImplement.csproj b/AutomobilePlantDatabaseImplement/AutomobilePlantDatabaseImplement.csproj index 869eafc..e934e14 100644 --- a/AutomobilePlantDatabaseImplement/AutomobilePlantDatabaseImplement.csproj +++ b/AutomobilePlantDatabaseImplement/AutomobilePlantDatabaseImplement.csproj @@ -24,4 +24,8 @@ + + + + diff --git a/AutomobilePlantDatabaseImplement/DatabaseImplementationExtension.cs b/AutomobilePlantDatabaseImplement/DatabaseImplementationExtension.cs new file mode 100644 index 0000000..05d1de4 --- /dev/null +++ b/AutomobilePlantDatabaseImplement/DatabaseImplementationExtension.cs @@ -0,0 +1,27 @@ +using AutomobilePlantContracts.DI; +using AutomobilePlantContracts.StorageContracts; +using AutomobilePlantDatabaseImplement.Implements; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace AutomobilePlantDatabaseImplement +{ + 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/AutomobilePlantDatabaseImplement/Implements/BackUpInfo.cs b/AutomobilePlantDatabaseImplement/Implements/BackUpInfo.cs new file mode 100644 index 0000000..43b32bc --- /dev/null +++ b/AutomobilePlantDatabaseImplement/Implements/BackUpInfo.cs @@ -0,0 +1,32 @@ +using AutomobilePlantContracts.StorageContracts; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace AutomobilePlantDatabaseImplement.Implements +{ + public class BackUpInfo : IBackUpInfo + { + public List? GetList() where T : class, new() + { + using var context = new AutomobilePlantDatabase(); + 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/AutomobilePlantDatabaseImplement/Migrations/20240621194115_init.Designer.cs b/AutomobilePlantDatabaseImplement/Migrations/20240621194115_init.Designer.cs new file mode 100644 index 0000000..4548e9c --- /dev/null +++ b/AutomobilePlantDatabaseImplement/Migrations/20240621194115_init.Designer.cs @@ -0,0 +1,298 @@ +// +using System; +using AutomobilePlantDatabaseImplement; +using Microsoft.EntityFrameworkCore; +using Microsoft.EntityFrameworkCore.Infrastructure; +using Microsoft.EntityFrameworkCore.Metadata; +using Microsoft.EntityFrameworkCore.Migrations; +using Microsoft.EntityFrameworkCore.Storage.ValueConversion; + +#nullable disable + +namespace AutomobilePlantDatabaseImplement.Migrations +{ + [DbContext(typeof(AutomobilePlantDatabase))] + [Migration("20240621194115_init")] + partial class init + { + /// + protected override void BuildTargetModel(ModelBuilder modelBuilder) + { +#pragma warning disable 612, 618 + modelBuilder + .HasAnnotation("ProductVersion", "7.0.3") + .HasAnnotation("Relational:MaxIdentifierLength", 128); + + SqlServerModelBuilderExtensions.UseIdentityColumns(modelBuilder); + + modelBuilder.Entity("AutomobilePlantDatabaseImplement.Models.Car", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("int"); + + SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property("Id")); + + b.Property("CarName") + .IsRequired() + .HasColumnType("nvarchar(max)"); + + b.Property("Price") + .HasColumnType("float"); + + b.HasKey("Id"); + + b.ToTable("Cars"); + }); + + modelBuilder.Entity("AutomobilePlantDatabaseImplement.Models.CarComponent", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("int"); + + SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property("Id")); + + b.Property("CarId") + .HasColumnType("int"); + + b.Property("ComponentId") + .HasColumnType("int"); + + b.Property("Count") + .HasColumnType("int"); + + b.HasKey("Id"); + + b.HasIndex("CarId"); + + b.HasIndex("ComponentId"); + + b.ToTable("CarComponents"); + }); + + modelBuilder.Entity("AutomobilePlantDatabaseImplement.Models.Client", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("int"); + + SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property("Id")); + + b.Property("ClientFIO") + .IsRequired() + .HasColumnType("nvarchar(max)"); + + b.Property("Email") + .IsRequired() + .HasColumnType("nvarchar(max)"); + + b.Property("Password") + .IsRequired() + .HasColumnType("nvarchar(max)"); + + b.HasKey("Id"); + + b.ToTable("Clients"); + }); + + modelBuilder.Entity("AutomobilePlantDatabaseImplement.Models.Component", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("int"); + + SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property("Id")); + + b.Property("ComponentName") + .IsRequired() + .HasColumnType("nvarchar(max)"); + + b.Property("Cost") + .HasColumnType("float"); + + b.HasKey("Id"); + + b.ToTable("Components"); + }); + + modelBuilder.Entity("AutomobilePlantDatabaseImplement.Models.Implementer", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("int"); + + SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property("Id")); + + b.Property("ImplementerFIO") + .IsRequired() + .HasColumnType("nvarchar(max)"); + + b.Property("Password") + .IsRequired() + .HasColumnType("nvarchar(max)"); + + b.Property("Qualification") + .HasColumnType("int"); + + b.Property("WorkExperience") + .HasColumnType("int"); + + b.HasKey("Id"); + + b.ToTable("Implementers"); + }); + + modelBuilder.Entity("AutomobilePlantDatabaseImplement.Models.MessageInfo", b => + { + b.Property("MessageId") + .HasColumnType("nvarchar(450)"); + + b.Property("Body") + .IsRequired() + .HasColumnType("nvarchar(max)"); + + b.Property("ClientId") + .HasColumnType("int"); + + b.Property("DateDelivery") + .HasColumnType("datetime2"); + + b.Property("SenderName") + .IsRequired() + .HasColumnType("nvarchar(max)"); + + b.Property("Subject") + .IsRequired() + .HasColumnType("nvarchar(max)"); + + b.HasKey("MessageId"); + + b.HasIndex("ClientId"); + + b.ToTable("Messages"); + }); + + modelBuilder.Entity("AutomobilePlantDatabaseImplement.Models.Order", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("int"); + + SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property("Id")); + + b.Property("CarId") + .HasColumnType("int"); + + b.Property("ClientId") + .HasColumnType("int"); + + b.Property("Count") + .HasColumnType("int"); + + b.Property("DateCreate") + .HasColumnType("datetime2"); + + b.Property("DateImplement") + .HasColumnType("datetime2"); + + b.Property("ImplementerId") + .HasColumnType("int"); + + b.Property("Status") + .HasColumnType("int"); + + b.Property("Sum") + .HasColumnType("float"); + + b.HasKey("Id"); + + b.HasIndex("CarId"); + + b.HasIndex("ClientId"); + + b.HasIndex("ImplementerId"); + + b.ToTable("Orders"); + }); + + modelBuilder.Entity("AutomobilePlantDatabaseImplement.Models.CarComponent", b => + { + b.HasOne("AutomobilePlantDatabaseImplement.Models.Car", "Car") + .WithMany("Components") + .HasForeignKey("CarId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("AutomobilePlantDatabaseImplement.Models.Component", "Component") + .WithMany("CarComponents") + .HasForeignKey("ComponentId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("Car"); + + b.Navigation("Component"); + }); + + modelBuilder.Entity("AutomobilePlantDatabaseImplement.Models.MessageInfo", b => + { + b.HasOne("AutomobilePlantDatabaseImplement.Models.Client", "Client") + .WithMany("Messages") + .HasForeignKey("ClientId"); + + b.Navigation("Client"); + }); + + modelBuilder.Entity("AutomobilePlantDatabaseImplement.Models.Order", b => + { + b.HasOne("AutomobilePlantDatabaseImplement.Models.Car", "Car") + .WithMany("Orders") + .HasForeignKey("CarId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("AutomobilePlantDatabaseImplement.Models.Client", "Client") + .WithMany("Orders") + .HasForeignKey("ClientId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("AutomobilePlantDatabaseImplement.Models.Implementer", "Implementer") + .WithMany("Orders") + .HasForeignKey("ImplementerId"); + + b.Navigation("Car"); + + b.Navigation("Client"); + + b.Navigation("Implementer"); + }); + + modelBuilder.Entity("AutomobilePlantDatabaseImplement.Models.Car", b => + { + b.Navigation("Components"); + + b.Navigation("Orders"); + }); + + modelBuilder.Entity("AutomobilePlantDatabaseImplement.Models.Client", b => + { + b.Navigation("Messages"); + + b.Navigation("Orders"); + }); + + modelBuilder.Entity("AutomobilePlantDatabaseImplement.Models.Component", b => + { + b.Navigation("CarComponents"); + }); + + modelBuilder.Entity("AutomobilePlantDatabaseImplement.Models.Implementer", b => + { + b.Navigation("Orders"); + }); +#pragma warning restore 612, 618 + } + } +} diff --git a/AutomobilePlantDatabaseImplement/Migrations/20240621194115_init.cs b/AutomobilePlantDatabaseImplement/Migrations/20240621194115_init.cs new file mode 100644 index 0000000..14e5f00 --- /dev/null +++ b/AutomobilePlantDatabaseImplement/Migrations/20240621194115_init.cs @@ -0,0 +1,214 @@ +using System; +using Microsoft.EntityFrameworkCore.Migrations; + +#nullable disable + +namespace AutomobilePlantDatabaseImplement.Migrations +{ + /// + public partial class init : Migration + { + /// + protected override void Up(MigrationBuilder migrationBuilder) + { + migrationBuilder.CreateTable( + name: "Cars", + columns: table => new + { + Id = table.Column(type: "int", nullable: false) + .Annotation("SqlServer:Identity", "1, 1"), + CarName = table.Column(type: "nvarchar(max)", nullable: false), + Price = table.Column(type: "float", nullable: false) + }, + constraints: table => + { + table.PrimaryKey("PK_Cars", x => x.Id); + }); + + migrationBuilder.CreateTable( + name: "Clients", + columns: table => new + { + Id = table.Column(type: "int", nullable: false) + .Annotation("SqlServer:Identity", "1, 1"), + ClientFIO = table.Column(type: "nvarchar(max)", nullable: false), + Email = table.Column(type: "nvarchar(max)", nullable: false), + Password = table.Column(type: "nvarchar(max)", nullable: false) + }, + constraints: table => + { + table.PrimaryKey("PK_Clients", x => x.Id); + }); + + migrationBuilder.CreateTable( + name: "Components", + columns: table => new + { + Id = table.Column(type: "int", nullable: false) + .Annotation("SqlServer:Identity", "1, 1"), + ComponentName = table.Column(type: "nvarchar(max)", nullable: false), + Cost = table.Column(type: "float", nullable: false) + }, + constraints: table => + { + table.PrimaryKey("PK_Components", x => x.Id); + }); + + migrationBuilder.CreateTable( + name: "Implementers", + columns: table => new + { + Id = table.Column(type: "int", nullable: false) + .Annotation("SqlServer:Identity", "1, 1"), + ImplementerFIO = table.Column(type: "nvarchar(max)", nullable: false), + Password = table.Column(type: "nvarchar(max)", nullable: false), + WorkExperience = table.Column(type: "int", nullable: false), + Qualification = table.Column(type: "int", nullable: false) + }, + constraints: table => + { + table.PrimaryKey("PK_Implementers", x => x.Id); + }); + + migrationBuilder.CreateTable( + name: "Messages", + columns: table => new + { + MessageId = table.Column(type: "nvarchar(450)", nullable: false), + ClientId = table.Column(type: "int", nullable: true), + SenderName = table.Column(type: "nvarchar(max)", nullable: false), + DateDelivery = table.Column(type: "datetime2", nullable: false), + Subject = table.Column(type: "nvarchar(max)", nullable: false), + Body = table.Column(type: "nvarchar(max)", nullable: false) + }, + constraints: table => + { + table.PrimaryKey("PK_Messages", x => x.MessageId); + table.ForeignKey( + name: "FK_Messages_Clients_ClientId", + column: x => x.ClientId, + principalTable: "Clients", + principalColumn: "Id"); + }); + + migrationBuilder.CreateTable( + name: "CarComponents", + columns: table => new + { + Id = table.Column(type: "int", nullable: false) + .Annotation("SqlServer:Identity", "1, 1"), + CarId = table.Column(type: "int", nullable: false), + ComponentId = table.Column(type: "int", nullable: false), + Count = table.Column(type: "int", nullable: false) + }, + constraints: table => + { + table.PrimaryKey("PK_CarComponents", x => x.Id); + table.ForeignKey( + name: "FK_CarComponents_Cars_CarId", + column: x => x.CarId, + principalTable: "Cars", + principalColumn: "Id", + onDelete: ReferentialAction.Cascade); + table.ForeignKey( + name: "FK_CarComponents_Components_ComponentId", + column: x => x.ComponentId, + principalTable: "Components", + principalColumn: "Id", + onDelete: ReferentialAction.Cascade); + }); + + migrationBuilder.CreateTable( + name: "Orders", + columns: table => new + { + Id = table.Column(type: "int", nullable: false) + .Annotation("SqlServer:Identity", "1, 1"), + CarId = table.Column(type: "int", nullable: false), + ClientId = table.Column(type: "int", nullable: false), + ImplementerId = table.Column(type: "int", nullable: true), + Count = table.Column(type: "int", nullable: false), + Sum = table.Column(type: "float", nullable: false), + Status = table.Column(type: "int", nullable: false), + DateCreate = table.Column(type: "datetime2", nullable: false), + DateImplement = table.Column(type: "datetime2", nullable: true) + }, + constraints: table => + { + table.PrimaryKey("PK_Orders", x => x.Id); + table.ForeignKey( + name: "FK_Orders_Cars_CarId", + column: x => x.CarId, + principalTable: "Cars", + principalColumn: "Id", + onDelete: ReferentialAction.Cascade); + table.ForeignKey( + name: "FK_Orders_Clients_ClientId", + column: x => x.ClientId, + principalTable: "Clients", + principalColumn: "Id", + onDelete: ReferentialAction.Cascade); + table.ForeignKey( + name: "FK_Orders_Implementers_ImplementerId", + column: x => x.ImplementerId, + principalTable: "Implementers", + principalColumn: "Id"); + }); + + migrationBuilder.CreateIndex( + name: "IX_CarComponents_CarId", + table: "CarComponents", + column: "CarId"); + + migrationBuilder.CreateIndex( + name: "IX_CarComponents_ComponentId", + table: "CarComponents", + column: "ComponentId"); + + migrationBuilder.CreateIndex( + name: "IX_Messages_ClientId", + table: "Messages", + column: "ClientId"); + + migrationBuilder.CreateIndex( + name: "IX_Orders_CarId", + table: "Orders", + column: "CarId"); + + migrationBuilder.CreateIndex( + name: "IX_Orders_ClientId", + table: "Orders", + column: "ClientId"); + + migrationBuilder.CreateIndex( + name: "IX_Orders_ImplementerId", + table: "Orders", + column: "ImplementerId"); + } + + /// + protected override void Down(MigrationBuilder migrationBuilder) + { + migrationBuilder.DropTable( + name: "CarComponents"); + + migrationBuilder.DropTable( + name: "Messages"); + + migrationBuilder.DropTable( + name: "Orders"); + + migrationBuilder.DropTable( + name: "Components"); + + migrationBuilder.DropTable( + name: "Cars"); + + migrationBuilder.DropTable( + name: "Clients"); + + migrationBuilder.DropTable( + name: "Implementers"); + } + } +} diff --git a/AutomobilePlantDatabaseImplement/Models/Car.cs b/AutomobilePlantDatabaseImplement/Models/Car.cs index b84c10e..b1c2d1b 100644 --- a/AutomobilePlantDatabaseImplement/Models/Car.cs +++ b/AutomobilePlantDatabaseImplement/Models/Car.cs @@ -9,21 +9,27 @@ using System.Linq; using System.Reflection.Metadata; using System.Text; using System.Threading.Tasks; +using System.Runtime.Serialization; namespace AutomobilePlantDatabaseImplement.Models { - public class Car : ICarModel + [DataContract] + public class Car : ICarModel { - public int Id { get; private set; } + [DataMember] + public int Id { get; private set; } [Required] - public string CarName { get; private set; } = string.Empty; + [DataMember] + public string CarName { get; private set; } = string.Empty; [Required] - public double Price { get; private set; } + [DataMember] + public double Price { get; private set; } private Dictionary? _carComponents = null; [NotMapped] - public Dictionary CarComponents + [DataMember] + public Dictionary CarComponents { get { diff --git a/AutomobilePlantDatabaseImplement/Models/Client.cs b/AutomobilePlantDatabaseImplement/Models/Client.cs index 8078b9b..8b1c744 100644 --- a/AutomobilePlantDatabaseImplement/Models/Client.cs +++ b/AutomobilePlantDatabaseImplement/Models/Client.cs @@ -8,21 +8,27 @@ using System.ComponentModel.DataAnnotations; using System.Linq; using System.Text; using System.Threading.Tasks; +using System.Runtime.Serialization; namespace AutomobilePlantDatabaseImplement.Models { - public class Client : IClientModel + [DataContract] + public class Client : IClientModel { - public int Id { get; private set; } + [DataMember] + public int Id { get; private set; } [Required] - public string ClientFIO { get; private set; } = string.Empty; + [DataMember] + public string ClientFIO { get; private set; } = string.Empty; [Required] - public string Email { get; private set; } = string.Empty; + [DataMember] + public string Email { get; private set; } = string.Empty; [Required] - public string Password { get; private set; } = string.Empty; + [DataMember] + public string Password { get; private set; } = string.Empty; [ForeignKey("ClientId")] public virtual List Orders { get; set; } = new(); diff --git a/AutomobilePlantDatabaseImplement/Models/Component.cs b/AutomobilePlantDatabaseImplement/Models/Component.cs index aa0abd4..8bb003f 100644 --- a/AutomobilePlantDatabaseImplement/Models/Component.cs +++ b/AutomobilePlantDatabaseImplement/Models/Component.cs @@ -9,17 +9,22 @@ using System.Linq; using System.Numerics; using System.Text; using System.Threading.Tasks; +using System.Runtime.Serialization; namespace AutomobilePlantDatabaseImplement.Models { - public class Component : IComponentModel + [DataContract] + public class Component : IComponentModel { - public int Id { get; private set; } + [DataMember] + public int Id { get; private set; } [Required] - public string ComponentName { get; private set; } = String.Empty; + [DataMember] + public string ComponentName { get; private set; } = String.Empty; [Required] - public double Cost { get; set; } + [DataMember] + public double Cost { get; set; } [ForeignKey("ComponentId")] public virtual List CarComponents { get; set; } = new(); diff --git a/AutomobilePlantDatabaseImplement/Models/Implementer.cs b/AutomobilePlantDatabaseImplement/Models/Implementer.cs index 03130c4..6c4df02 100644 --- a/AutomobilePlantDatabaseImplement/Models/Implementer.cs +++ b/AutomobilePlantDatabaseImplement/Models/Implementer.cs @@ -5,22 +5,25 @@ using System; using System.Collections.Generic; using System.ComponentModel.DataAnnotations.Schema; using System.Linq; +using System.Runtime.Serialization; using System.Text; using System.Threading.Tasks; namespace AutomobilePlantDatabaseImplement.Models { - public class Implementer : IImplementerModel + [DataContract] + public class Implementer : IImplementerModel { - public int Id { get; private set; } - - public string ImplementerFIO { get; private set; } = string.Empty; - - public string Password { get; private set; } = string.Empty; - - public int WorkExperience { get; private set; } - - public int Qualification { get; private set; } + [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")] public virtual List Orders { get; private set; } = new(); diff --git a/AutomobilePlantDatabaseImplement/Models/MessageInfo.cs b/AutomobilePlantDatabaseImplement/Models/MessageInfo.cs index 4643729..a26197a 100644 --- a/AutomobilePlantDatabaseImplement/Models/MessageInfo.cs +++ b/AutomobilePlantDatabaseImplement/Models/MessageInfo.cs @@ -5,24 +5,27 @@ 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 AutomobilePlantDatabaseImplement.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; } @@ -53,5 +56,7 @@ namespace AutomobilePlantDatabaseImplement.Models SenderName = SenderName, DateDelivery = DateDelivery, }; + + public int Id => throw new NotImplementedException(); } } diff --git a/AutomobilePlantDatabaseImplement/Models/Order.cs b/AutomobilePlantDatabaseImplement/Models/Order.cs index ac02953..6f19278 100644 --- a/AutomobilePlantDatabaseImplement/Models/Order.cs +++ b/AutomobilePlantDatabaseImplement/Models/Order.cs @@ -8,30 +8,40 @@ using System.ComponentModel.DataAnnotations; using System.Linq; using System.Reflection.Metadata; using System.Runtime.ConstrainedExecution; +using System.Runtime.Serialization; using System.Text; using System.Threading.Tasks; namespace AutomobilePlantDatabaseImplement.Models { - public class Order : IOrderModel + [DataContract] + public class Order : IOrderModel { - public int Id { get; private set; } + [DataMember] + public int Id { get; private set; } [Required] - public int CarId { get; private set; } + [DataMember] + public int CarId { get; private set; } [Required] - public int ClientId { get; private set; } - public int? ImplementerId { get; private set; } + [DataMember] + public int ClientId { get; private set; } + [DataMember] + public int? ImplementerId { get; private set; } [Required] - public int Count { get; private set; } + [DataMember] + public int Count { get; private set; } [Required] - public double Sum { get; private set; } + [DataMember] + public double Sum { get; private set; } [Required] - public OrderStatus Status { get; private set; } = OrderStatus.Неизвестен; + [DataMember] + public OrderStatus Status { get; private set; } = OrderStatus.Неизвестен; [Required] - public DateTime DateCreate { get; private set; } = DateTime.Now; - - public DateTime? DateImplement { get; private set; } + [DataMember] + public DateTime DateCreate { get; private set; } = DateTime.Now; + [DataMember] + public DateTime? DateImplement { get; private set; } public virtual Car Car { get; private set; } public virtual Client Client { get; set; } public Implementer? Implementer { get; private set; } diff --git a/AutomobilePlantFileImplement/AutomobilePlantFileImplement.csproj b/AutomobilePlantFileImplement/AutomobilePlantFileImplement.csproj index a6820c2..547b455 100644 --- a/AutomobilePlantFileImplement/AutomobilePlantFileImplement.csproj +++ b/AutomobilePlantFileImplement/AutomobilePlantFileImplement.csproj @@ -11,4 +11,8 @@ + + + + diff --git a/AutomobilePlantFileImplement/FileImplementationExtension.cs b/AutomobilePlantFileImplement/FileImplementationExtension.cs new file mode 100644 index 0000000..17da98b --- /dev/null +++ b/AutomobilePlantFileImplement/FileImplementationExtension.cs @@ -0,0 +1,27 @@ +using AutomobilePlantContracts.DI; +using AutomobilePlantContracts.StorageContracts; +using AutomobilePlantFileImplement.Implements; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace AutomobilePlantFileImplement +{ + 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/AutomobilePlantFileImplement/Implements/BackUpInfo.cs b/AutomobilePlantFileImplement/Implements/BackUpInfo.cs new file mode 100644 index 0000000..f6746b8 --- /dev/null +++ b/AutomobilePlantFileImplement/Implements/BackUpInfo.cs @@ -0,0 +1,33 @@ +using AutomobilePlantContracts.StorageContracts; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace AutomobilePlantFileImplement.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/AutomobilePlantFileImplement/Models/Car.cs b/AutomobilePlantFileImplement/Models/Car.cs index 47c09a5..8324887 100644 --- a/AutomobilePlantFileImplement/Models/Car.cs +++ b/AutomobilePlantFileImplement/Models/Car.cs @@ -5,24 +5,28 @@ using System; using System.Collections.Generic; using System.Linq; using System.Reflection.Metadata; +using System.Runtime.Serialization; using System.Text; using System.Threading.Tasks; using System.Xml.Linq; namespace AutomobilePlantFileImplement.Models { - public class Car : ICarModel + [DataContract] + public class Car : ICarModel { - public string CarName { get; private set; } = string.Empty; - - public double Price { get; private set; } - - public int Id { get; private set; } + [DataMember] + public string CarName { 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? _carComponents = null; - public Dictionary CarComponents + [DataMember] + public Dictionary CarComponents { get { diff --git a/AutomobilePlantFileImplement/Models/Client.cs b/AutomobilePlantFileImplement/Models/Client.cs index 615de15..ff1425e 100644 --- a/AutomobilePlantFileImplement/Models/Client.cs +++ b/AutomobilePlantFileImplement/Models/Client.cs @@ -4,21 +4,24 @@ using AutomobilePlantDataModels.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 AutomobilePlantFileImplement.Models { - public class Client : IClientModel + [DataContract] + public class Client : IClientModel { - public int Id { get; private set; } - - public string ClientFIO { get; private set; } = string.Empty; - - public string Email { get; private set; } = string.Empty; - - public string Password { get; private set; } = string.Empty; + [DataMember] + public int Id { get; private set; } + [DataMember] + public string ClientFIO { get; private set; } = string.Empty; + [DataMember] + public string Email { get; private set; } = string.Empty; + [DataMember] + public string Password { get; private set; } = string.Empty; public static Client? Create(ClientBindingModel model) { diff --git a/AutomobilePlantFileImplement/Models/Component.cs b/AutomobilePlantFileImplement/Models/Component.cs index ab3185b..68aa630 100644 --- a/AutomobilePlantFileImplement/Models/Component.cs +++ b/AutomobilePlantFileImplement/Models/Component.cs @@ -5,18 +5,22 @@ using System; using System.Collections.Generic; using System.Linq; using System.Numerics; +using System.Runtime.Serialization; using System.Text; using System.Threading.Tasks; using System.Xml.Linq; namespace AutomobilePlantFileImplement.Models { - public class Component : IComponentModel + [DataContract] + public class Component : IComponentModel { - public string ComponentName { get; private set; } = String.Empty; - - public double Cost { get; set; } - public int Id { get; private set; } + [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/AutomobilePlantFileImplement/Models/Implementer.cs b/AutomobilePlantFileImplement/Models/Implementer.cs index efb1577..7d3d075 100644 --- a/AutomobilePlantFileImplement/Models/Implementer.cs +++ b/AutomobilePlantFileImplement/Models/Implementer.cs @@ -4,23 +4,26 @@ using AutomobilePlantDataModels.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 AutomobilePlantFileImplement.Models { - public class Implementer : IImplementerModel + [DataContract] + public class Implementer : IImplementerModel { - public int Id { get; private set; } - - public string ImplementerFIO { get; private set; } = string.Empty; - - public string Password { get; private set; } = string.Empty; - - public int WorkExperience { get; private set; } - - public int Qualification { get; private set; } + [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/AutomobilePlantFileImplement/Models/MessageInfo.cs b/AutomobilePlantFileImplement/Models/MessageInfo.cs index ac76fd9..dd1765f 100644 --- a/AutomobilePlantFileImplement/Models/MessageInfo.cs +++ b/AutomobilePlantFileImplement/Models/MessageInfo.cs @@ -4,24 +4,27 @@ using AutomobilePlantDataModels.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 AutomobilePlantFileImplement.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) @@ -75,6 +78,8 @@ namespace AutomobilePlantFileImplement.Models new XAttribute("MessageId", MessageId), new XAttribute("SenderName", SenderName), new XAttribute("DateDelivery", DateDelivery) - ); + ); + + public int Id => throw new NotImplementedException(); } } diff --git a/AutomobilePlantFileImplement/Models/Order.cs b/AutomobilePlantFileImplement/Models/Order.cs index 5e179aa..8f92787 100644 --- a/AutomobilePlantFileImplement/Models/Order.cs +++ b/AutomobilePlantFileImplement/Models/Order.cs @@ -5,29 +5,35 @@ using AutomobilePlantDataModels.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 AutomobilePlantFileImplement.Models { - public class Order : IOrderModel + [DataContract] + public class Order : IOrderModel { - public int CarId { get; private set; } - public int ClientId { get; set; } - public int? ImplementerId { get; set; } + [DataMember] + public int Id { get; private set; } + [DataMember] + public int CarId { 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 Count { get; private set; } - - public double Sum { get; private set; } - - public OrderStatus Status { get; private set; } = OrderStatus.Неизвестен; - - public DateTime DateCreate { get; private set; } = DateTime.Now; - - public DateTime? DateImplement { get; private set; } - - public int Id { get; private set; } public static Order? Create(OrderBindingModel? model) { diff --git a/AutomobilePlantListImplements/AutomobilePlantListImplements.csproj b/AutomobilePlantListImplements/AutomobilePlantListImplements.csproj index a6820c2..95c981f 100644 --- a/AutomobilePlantListImplements/AutomobilePlantListImplements.csproj +++ b/AutomobilePlantListImplements/AutomobilePlantListImplements.csproj @@ -1,4 +1,4 @@ - + net6.0 @@ -11,4 +11,8 @@ + + + + diff --git a/AutomobilePlantListImplements/Implements/BackUpInfo.cs b/AutomobilePlantListImplements/Implements/BackUpInfo.cs new file mode 100644 index 0000000..2751bc6 --- /dev/null +++ b/AutomobilePlantListImplements/Implements/BackUpInfo.cs @@ -0,0 +1,22 @@ +using AutomobilePlantContracts.StorageContracts; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace AutomobilePlantListImplements.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/AutomobilePlantListImplements/ListImplementationExtension.cs b/AutomobilePlantListImplements/ListImplementationExtension.cs new file mode 100644 index 0000000..87c8832 --- /dev/null +++ b/AutomobilePlantListImplements/ListImplementationExtension.cs @@ -0,0 +1,27 @@ +using AutomobilePlantContracts.DI; +using AutomobilePlantContracts.StorageContracts; +using AutomobilePlantListImplements.Implements; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace AutomobilePlantListImplements +{ + 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/AutomobilePlantListImplements/Models/MessageInfo.cs b/AutomobilePlantListImplements/Models/MessageInfo.cs index 1361408..da4b1d1 100644 --- a/AutomobilePlantListImplements/Models/MessageInfo.cs +++ b/AutomobilePlantListImplements/Models/MessageInfo.cs @@ -49,5 +49,7 @@ namespace AutomobilePlantListImplements.Models SenderName = SenderName, DateDelivery = DateDelivery, }; + + public int Id => throw new NotImplementedException(); } } diff --git a/AutomobilePlantRestApi/appsettings.json b/AutomobilePlantRestApi/appsettings.json index d4b4d1e..fde82fc 100644 --- a/AutomobilePlantRestApi/appsettings.json +++ b/AutomobilePlantRestApi/appsettings.json @@ -1,16 +1,16 @@ { - "Logging": { - "LogLevel": { - "Default": "Information", - "Microsoft.AspNetCore": "Warning" - } - }, - "AllowedHosts": "*", + "Logging": { + "LogLevel": { + "Default": "Information", + "Microsoft.AspNetCore": "Warning" + } + }, + "AllowedHosts": "*", - "SmtpClientHost": "smtp.gmail.com", - "SmtpClientPort": "587", - "PopHost": "pop.gmail.com", - "PopPort": "995", - "MailLogin": "mailforlab8@gmail.com", - "MailPassword": "pvmu cnof aakc ckvd" + "SmtpClientHost": "smtp.gmail.com", + "SmtpClientPort": "587", + "PopHost": "pop.gmail.com", + "PopPort": "995", + "MailLogin": "mailforlab8@gmail.com", + "MailPassword": "pvmu cnof aakc ckvd" } diff --git a/ImplementationExtensions/AutomobilePlantContracts.dll b/ImplementationExtensions/AutomobilePlantContracts.dll new file mode 100644 index 0000000..9fb917a Binary files /dev/null and b/ImplementationExtensions/AutomobilePlantContracts.dll differ diff --git a/ImplementationExtensions/AutomobilePlantDataModels.dll b/ImplementationExtensions/AutomobilePlantDataModels.dll new file mode 100644 index 0000000..54e22d5 Binary files /dev/null and b/ImplementationExtensions/AutomobilePlantDataModels.dll differ diff --git a/ImplementationExtensions/AutomobilePlantDatabaseImplement.dll b/ImplementationExtensions/AutomobilePlantDatabaseImplement.dll new file mode 100644 index 0000000..3e8368e Binary files /dev/null and b/ImplementationExtensions/AutomobilePlantDatabaseImplement.dll differ diff --git a/ImplementationExtensions/AutomobilePlantFileImplement.dll b/ImplementationExtensions/AutomobilePlantFileImplement.dll new file mode 100644 index 0000000..dcf0afa Binary files /dev/null and b/ImplementationExtensions/AutomobilePlantFileImplement.dll differ diff --git a/ImplementationExtensions/AutomobilePlantListImplements.dll b/ImplementationExtensions/AutomobilePlantListImplements.dll new file mode 100644 index 0000000..867047b Binary files /dev/null and b/ImplementationExtensions/AutomobilePlantListImplements.dll differ