RenovationWork/RenovationWork/Clients.cs

@@ -31,7 +31,15 @@ namespace RenovationWorkView
 		{
 			try
 			{
-				dataGridView.FillAndConfigGrid(_logic.ReadList(null));
+				var list = _logic.ReadList(null);
+				if (list != null)
+				{
+					dataGridView.DataSource = list;
+					dataGridView.Columns["Id"].Visible = false;
+					dataGridView.Columns["ClientFIO"].AutoSizeMode = DataGridViewAutoSizeColumnMode.Fill;
+					dataGridView.Columns["Email"].AutoSizeMode = DataGridViewAutoSizeColumnMode.Fill;
+					dataGridView.Columns["Password"].AutoSizeMode = DataGridViewAutoSizeColumnMode.Fill;
+				}
 				_logger.LogInformation("Загрузка клиентов");
 			}
 			catch (Exception ex)

RenovationWork/RenovationWork/DataGridViewExtension.cs

@@ -1,51 +0,0 @@
-using RenovationWorkContracts.Attributes;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace RenovationWorkView
-{
-	internal static class DataGridViewExtension
-	{
-		public static void FillAndConfigGrid<T>(this DataGridView grid, List<T>? 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;
-					}
-				}
-			}
-		}
-	}
-}

RenovationWork/RenovationWork/FormComponents.cs

@@ -10,7 +10,6 @@ using System.Windows.Forms;
 using RenovationWorkContracts.BindingModels;
 using RenovationWorkContracts.BusinessLogicsContracts;
 using Microsoft.Extensions.Logging;
-using RenovationWorkContracts.DI;
 
 namespace RenovationWorkView
 {
@@ -52,9 +51,9 @@ namespace RenovationWorkView
 
         private void buttonAdd_Click(object sender, EventArgs e)
         {
-			var form = DependencyManager.Instance.Resolve<FormComponent>();
+            var service = Program.ServiceProvider?.GetService(typeof(FormComponent));
-			if (form.ShowDialog() == DialogResult.OK)
+            if (service is FormComponent form)
-			{
+            {
                 if (form.ShowDialog() == DialogResult.OK)
                 {
                     LoadData();
@@ -66,14 +65,16 @@ namespace RenovationWorkView
         {
             if (dataGridView.SelectedRows.Count == 1)
             {
-				var form = DependencyManager.Instance.Resolve<FormComponent>();
+                var service = Program.ServiceProvider?.GetService(typeof(FormComponent));
-
+                if (service is FormComponent form)
-				form.Id = Convert.ToInt32(dataGridView.SelectedRows[0].Cells["Id"].Value);
+                {
-				if (form.ShowDialog() == DialogResult.OK)
+                    form.Id = Convert.ToInt32(dataGridView.SelectedRows[0].Cells["Id"].Value);
-				{
+                    if (form.ShowDialog() == DialogResult.OK)
-					LoadData();
+                    {
-				}
+                        LoadData();
-			}
+                    }
+                }
+            }
         }
 
         private void buttonDel_Click(object sender, EventArgs e)

RenovationWork/RenovationWork/FormImplementers.cs

@@ -1,7 +1,6 @@
 using Microsoft.Extensions.Logging;
 using RenovationWorkContracts.BindingModels;
 using RenovationWorkContracts.BusinessLogicsContracts;
-using RenovationWorkContracts.DI;
 using System;
 using System.Collections.Generic;
 using System.ComponentModel;
@@ -33,20 +32,29 @@ namespace RenovationWorkView
         {
             try
             {
-                dataGridView.FillAndConfigGrid(_logic.ReadList(null));
+                var list = _logic.ReadList(null);
-				_logger.LogInformation("Загрузка компонентов");
+                if (list != null)
+                {
+                    dataGridView.DataSource = list;
+                    dataGridView.Columns["Id"].Visible = false;
+                    dataGridView.Columns["ImplementerFIO"].AutoSizeMode = DataGridViewAutoSizeColumnMode.Fill;
+                    dataGridView.Columns["Password"].AutoSizeMode = DataGridViewAutoSizeColumnMode.Fill;
+                    dataGridView.Columns["Qualification"].AutoSizeMode = DataGridViewAutoSizeColumnMode.Fill;
+                    dataGridView.Columns["WorkExperience"].AutoSizeMode = DataGridViewAutoSizeColumnMode.Fill;
+                }
+                _logger.LogInformation("Загрузка компонентов");
             }
             catch (Exception ex)
             {
-                _logger.LogError(ex, "Ошибка загрузки компонентов");
+                _logger.LogError(ex, "Ошибка загрузки исполнителей");
                 MessageBox.Show(ex.Message, "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error);
             }
         }
 
         private void buttonCreate_Click(object sender, EventArgs e)
         {
-            var service = DependencyManager.Instance.Resolve<FormImplementer>();
+            var service = Program.ServiceProvider?.GetService(typeof(FormImplementer));
-			if (service is FormImplementer form)
+            if (service is FormImplementer form)
             {
                 if (form.ShowDialog() == DialogResult.OK)
                 {
@@ -59,8 +67,9 @@ namespace RenovationWorkView
         {
             if (dataGridView.SelectedRows.Count == 1)
             {
-                var service = DependencyManager.Instance.Resolve<FormImplementer>();
+                var service =
-				if (service is FormImplementer form)
+               Program.ServiceProvider?.GetService(typeof(FormImplementer));
+                if (service is FormImplementer form)
                 {
                     form.Id = Convert.ToInt32(dataGridView.SelectedRows[0].Cells["Id"].Value);
                     if (form.ShowDialog() == DialogResult.OK)

RenovationWork/RenovationWork/FormMail.cs

@@ -27,7 +27,14 @@ namespace RenovationWorkView
 		{
 			try
 			{
-				dataGridView.FillAndConfigGrid(_logic.ReadList(null));
+				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;
+				}
 				_logger.LogInformation("Загрузка списка писем");
 			}
 			catch (Exception ex)

RenovationWork/RenovationWork/FormMain.Designer.cs

@@ -39,24 +39,23 @@
 			ComponentRepairToolStripMenuItem = new ToolStripMenuItem();
 			OrdersToolStripMenuItem = new ToolStripMenuItem();
 			StartWorkingToolStripMenuItem = new ToolStripMenuItem();
-			mailToolStripMenuItem = new ToolStripMenuItem();
-			backupToolStripMenuItem = new ToolStripMenuItem();
 			dataGridView = new DataGridView();
 			buttonCreateOrder = new Button();
 			buttonTakeOrderInWork = new Button();
 			buttonOrderReady = new Button();
 			buttonIssuedOrder = new Button();
 			buttonRef = new Button();
+			mailToolStripMenuItem = new ToolStripMenuItem();
 			menuStrip.SuspendLayout();
 			((System.ComponentModel.ISupportInitialize)dataGridView).BeginInit();
 			SuspendLayout();
 			// 
 			// menuStrip
 			// 
-			menuStrip.Items.AddRange(new ToolStripItem[] { refbooksToolStripMenuItem, ReportsToolStripMenuItem, StartWorkingToolStripMenuItem, mailToolStripMenuItem, backupToolStripMenuItem });
+			menuStrip.Items.AddRange(new ToolStripItem[] { refbooksToolStripMenuItem, ReportsToolStripMenuItem, StartWorkingToolStripMenuItem, mailToolStripMenuItem });
 			menuStrip.Location = new Point(0, 0);
 			menuStrip.Name = "menuStrip";
-			menuStrip.Size = new Size(1233, 24);
+			menuStrip.Size = new Size(1125, 24);
 			menuStrip.TabIndex = 0;
 			menuStrip.Text = "menuStrip1";
 			// 
@@ -130,33 +129,18 @@
 			StartWorkingToolStripMenuItem.Text = "Запуск работ";
 			StartWorkingToolStripMenuItem.Click += StartWorkingToolStripMenuItem_Click;
 			// 
-			// mailToolStripMenuItem
-			// 
-			mailToolStripMenuItem.Name = "mailToolStripMenuItem";
-			mailToolStripMenuItem.Size = new Size(62, 20);
-			mailToolStripMenuItem.Text = "Письма";
-			mailToolStripMenuItem.Click += mailToolStripMenuItem_Click;
-			// 
-			// backupToolStripMenuItem
-			// 
-			backupToolStripMenuItem.Name = "backupToolStripMenuItem";
-			backupToolStripMenuItem.Size = new Size(51, 20);
-			backupToolStripMenuItem.Text = "бекап";
-			backupToolStripMenuItem.Click += backupToolStripMenuItem_Click;
-			// 
 			// dataGridView
 			// 
 			dataGridView.BackgroundColor = SystemColors.ControlLightLight;
 			dataGridView.ColumnHeadersHeightSizeMode = DataGridViewColumnHeadersHeightSizeMode.AutoSize;
 			dataGridView.Location = new Point(12, 27);
 			dataGridView.Name = "dataGridView";
-			dataGridView.Size = new Size(1049, 341);
+			dataGridView.Size = new Size(942, 341);
 			dataGridView.TabIndex = 1;
 			// 
 			// buttonCreateOrder
 			// 
-			buttonCreateOrder.ImageAlign = ContentAlignment.MiddleRight;
+			buttonCreateOrder.Location = new Point(960, 27);
-			buttonCreateOrder.Location = new Point(1067, 27);
 			buttonCreateOrder.Name = "buttonCreateOrder";
 			buttonCreateOrder.Size = new Size(157, 23);
 			buttonCreateOrder.TabIndex = 2;
@@ -166,8 +150,7 @@
 			// 
 			// buttonTakeOrderInWork
 			// 
-			buttonTakeOrderInWork.ImageAlign = ContentAlignment.MiddleRight;
+			buttonTakeOrderInWork.Location = new Point(960, 56);
-			buttonTakeOrderInWork.Location = new Point(1067, 71);
 			buttonTakeOrderInWork.Name = "buttonTakeOrderInWork";
 			buttonTakeOrderInWork.Size = new Size(157, 45);
 			buttonTakeOrderInWork.TabIndex = 3;
@@ -177,8 +160,7 @@
 			// 
 			// buttonOrderReady
 			// 
-			buttonOrderReady.ImageAlign = ContentAlignment.MiddleRight;
+			buttonOrderReady.Location = new Point(960, 107);
-			buttonOrderReady.Location = new Point(1067, 122);
 			buttonOrderReady.Name = "buttonOrderReady";
 			buttonOrderReady.Size = new Size(157, 23);
 			buttonOrderReady.TabIndex = 4;
@@ -188,8 +170,7 @@
 			// 
 			// buttonIssuedOrder
 			// 
-			buttonIssuedOrder.ImageAlign = ContentAlignment.MiddleRight;
+			buttonIssuedOrder.Location = new Point(960, 136);
-			buttonIssuedOrder.Location = new Point(1067, 151);
 			buttonIssuedOrder.Name = "buttonIssuedOrder";
 			buttonIssuedOrder.Size = new Size(157, 23);
 			buttonIssuedOrder.TabIndex = 5;
@@ -199,8 +180,7 @@
 			// 
 			// buttonRef
 			// 
-			buttonRef.ImageAlign = ContentAlignment.MiddleRight;
+			buttonRef.Location = new Point(960, 165);
-			buttonRef.Location = new Point(1067, 180);
 			buttonRef.Name = "buttonRef";
 			buttonRef.Size = new Size(157, 23);
 			buttonRef.TabIndex = 6;
@@ -208,11 +188,18 @@
 			buttonRef.UseVisualStyleBackColor = true;
 			buttonRef.Click += buttonRef_Click;
 			// 
+			// mailToolStripMenuItem
+			// 
+			mailToolStripMenuItem.Name = "mailToolStripMenuItem";
+			mailToolStripMenuItem.Size = new Size(62, 20);
+			mailToolStripMenuItem.Text = "Письма";
+			mailToolStripMenuItem.Click += mailToolStripMenuItem_Click;
+			// 
 			// FormMain
 			// 
 			AutoScaleDimensions = new SizeF(7F, 15F);
 			AutoScaleMode = AutoScaleMode.Font;
-			ClientSize = new Size(1233, 370);
+			ClientSize = new Size(1125, 370);
 			Controls.Add(buttonRef);
 			Controls.Add(buttonIssuedOrder);
 			Controls.Add(buttonOrderReady);
@@ -251,6 +238,5 @@
 		private ToolStripMenuItem ImplementersToolStripMenuItem;
 		private ToolStripMenuItem StartWorkingToolStripMenuItem;
 		private ToolStripMenuItem mailToolStripMenuItem;
-		private ToolStripMenuItem backupToolStripMenuItem;
 	}
 }

RenovationWork/RenovationWork/FormMain.cs

@@ -9,7 +9,6 @@ using System.Threading.Tasks;
 using System.Windows.Forms;
 using RenovationWorkContracts.BindingModels;
 using RenovationWorkContracts.BusinessLogicsContracts;
-using RenovationWorkContracts.DI;
 using Microsoft.Extensions.Logging;
 
 namespace RenovationWorkView
@@ -20,15 +19,13 @@ namespace RenovationWorkView
 		private readonly IOrderLogic _orderLogic;
 		private readonly IReportLogic _reportLogic;
 		private readonly IWorkProcess _workProcess;
-		private readonly IBackUpLogic _backUpLogic;
+		public FormMain(ILogger<FormMain> logger, IOrderLogic orderLogic, IReportLogic reportLogic, IWorkProcess workProcess)
-		public FormMain(ILogger<FormMain> 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)
@@ -37,10 +34,19 @@ namespace RenovationWorkView
 		}
 		private void LoadData()
 		{
+			_logger.LogInformation("Загрузка заказов");
 			try
 			{
-				dataGridView.FillAndConfigGrid(_orderLogic.ReadList(null));
+				var list = _orderLogic.ReadList(null);
-				_logger.LogInformation("Загрузка заказов");
+				if (list != null)
+				{
+					dataGridView.DataSource = list;
+					dataGridView.Columns["RepairId"].Visible = false;
+					dataGridView.Columns["RepairName"].AutoSizeMode = DataGridViewAutoSizeColumnMode.Fill;
+					dataGridView.Columns["ClientId"].Visible = false;
+					dataGridView.Columns["ImplementerId"].Visible = false;
+					dataGridView.Columns["ImplementerFIO"].AutoSizeMode = DataGridViewAutoSizeColumnMode.Fill;
+				}
 			}
 			catch (Exception ex)
 			{
@@ -51,21 +57,30 @@ namespace RenovationWorkView
 
 		private void componentsToolStripMenuItem_Click(object sender, EventArgs e)
 		{
-			var form = DependencyManager.Instance.Resolve<FormComponents>();
+			var service = Program.ServiceProvider?.GetService(typeof(FormComponents));
-			form.ShowDialog();
+			if (service is FormComponents form)
+			{
+				form.ShowDialog();
+			}
 		}
 
 		private void JobTypeToolStripMenuItem_Click(object sender, EventArgs e)
 		{
-			var form = DependencyManager.Instance.Resolve<FormRepairs>();
+			var service = Program.ServiceProvider?.GetService(typeof(FormRepairs));
-			form.ShowDialog();
+			if (service is FormRepairs form)
+			{
+				form.ShowDialog();
+			}
 		}
 
 		private void buttonCreateOrder_Click(object sender, EventArgs e)
 		{
-			var form = DependencyManager.Instance.Resolve<FormCreateOrder>();
+			var service = Program.ServiceProvider?.GetService(typeof(FormCreateOrder));
-			form.ShowDialog();
+			if (service is FormCreateOrder form)
-			LoadData();
+			{
+				form.ShowDialog();
+				LoadData();
+			}
 		}
 
 		private void buttonTakeOrderInWork_Click(object sender, EventArgs e)
@@ -159,62 +174,52 @@ namespace RenovationWorkView
 
 		private void ComponentRepairToolStripMenuItem_Click(object sender, EventArgs e)
 		{
-			var form = DependencyManager.Instance.Resolve<FormReportRepairComponents>();
+			var service = Program.ServiceProvider?.GetService(typeof(FormReportRepairComponents));
-			form.ShowDialog();
+			if (service is FormReportRepairComponents form)
+			{
+				form.ShowDialog();
+			}
 		}
 
 		private void OrdersToolStripMenuItem_Click(object sender, EventArgs e)
 		{
-			var form = DependencyManager.Instance.Resolve<FormReportOrders>();
+			var service = Program.ServiceProvider?.GetService(typeof(FormReportOrders));
-			form.ShowDialog();
+			if (service is FormReportOrders form)
+			{
+				form.ShowDialog();
+			}
 		}
 
 		private void ClientsToolStripMenuItem_Click(object sender, EventArgs e)
 		{
-			var form = DependencyManager.Instance.Resolve<FormClients>();
+			var service = Program.ServiceProvider?.GetService(typeof(FormClients));
-			form.ShowDialog();
+			if (service is FormClients form)
+			{
+				form.ShowDialog();
+			}
 		}
 
 		private void ImplementersToolStripMenuItem_Click(object sender, EventArgs e)
 		{
-			var form = DependencyManager.Instance.Resolve<FormImplementers>();
+			var service = Program.ServiceProvider?.GetService(typeof(FormImplementers));
-			form.ShowDialog();
+			if (service is FormImplementers form)
+			{
+				form.ShowDialog();
+			}
 		}
 
 		private void StartWorkingToolStripMenuItem_Click(object sender, EventArgs e)
 		{
-			_workProcess.DoWork(DependencyManager.Instance.Resolve<IImplementerLogic>(), _orderLogic);
+			_workProcess.DoWork((Program.ServiceProvider?.GetService(typeof(IImplementerLogic)) as IImplementerLogic)!, _orderLogic);
 			MessageBox.Show("Процесс обработки запущен", "Сообщение", MessageBoxButtons.OK, MessageBoxIcon.Information);
 		}
 
 		private void mailToolStripMenuItem_Click(object sender, EventArgs e)
 		{
-			var form = DependencyManager.Instance.Resolve<FormMail>();
+			var service = Program.ServiceProvider?.GetService(typeof(FormMail));
-			form.ShowDialog();
+			if (service is FormMail form)
-		}
-
-		private void backupToolStripMenuItem_Click(object sender, EventArgs e)
-		{
-			try
 			{
-				if (_backUpLogic != null)
+				form.ShowDialog();
-				{
-					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);
 			}
 		}
 	}

RenovationWork/RenovationWork/FormRepair.cs

@@ -11,7 +11,6 @@ using RenovationWorkContracts.BindingModels;
 using RenovationWorkContracts.BusinessLogicsContracts;
 using RenovationWorkContracts.SearchModels;
 using RenovationWorkDataModels.Models;
-using RenovationWorkContracts.DI;
 using Microsoft.Extensions.Logging;
 
 namespace RenovationWorkView
@@ -79,44 +78,52 @@ namespace RenovationWorkView
 
         private void buttonAdd_Click(object sender, EventArgs e)
         {
-			var form = DependencyManager.Instance.Resolve<FormRepairComponent>();
+            var service =
-			if (form.ShowDialog() == DialogResult.OK)
+         Program.ServiceProvider?.GetService(typeof(FormRepairComponent));
-			{
+            if (service is FormRepairComponent form)
-				return;
+                if (form.ShowDialog() == DialogResult.OK)
-			}
+                {
-			_logger.LogInformation("Добавление нового компонента:{ ComponentName}-{ Count}", form.ComponentModel.ComponentName, form.Count);
+                    if (form.ComponentModel == null)
-			if (_repairComponents.ContainsKey(form.Id))
+                    {
-			{
+                        return;
-				_repairComponents[form.Id] = (form.ComponentModel,
+                    }
-				form.Count);
+                    _logger.LogInformation("Добавление нового компонента: { ComponentName} - { Count}", form.ComponentModel.ComponentName, form.Count);
-			}
+                    if (_repairComponents.ContainsKey(form.Id))
-			else
+                    {
-			{
+                        _repairComponents[form.Id] = (form.ComponentModel,
-				_repairComponents.Add(form.Id, (form.ComponentModel,
+                       form.Count);
-				form.Count));
+                    }
-			}
+                    else
-			LoadData();
+                    {
-		}
+                        _repairComponents.Add(form.Id, (form.ComponentModel,
+                       form.Count));
+                    }
+                    LoadData();
+                }
+        }
 
         private void buttonUpd_Click(object sender, EventArgs e)
         {
             if (dataGridView.SelectedRows.Count == 1)
             {
-				var form = DependencyManager.Instance.Resolve<FormRepairComponent>();
+                var service = Program.ServiceProvider?.GetService(typeof(FormRepairComponent));
-				int id = Convert.ToInt32(dataGridView.SelectedRows[0].Cells[0].Value);
+                if (service is FormRepairComponent form)
-				form.Id = id;
+                {
-				form.Count = _repairComponents[id].Item2;
+                    int id = Convert.ToInt32(dataGridView.SelectedRows[0].Cells[0].Value);
-				if (form.ShowDialog() == DialogResult.OK)
+                    form.Id = id;
-				{
+                    form.Count = _repairComponents[id].Item2;
-					if (form.ComponentModel == null)
+                    if (form.ShowDialog() == DialogResult.OK)
-					{
+                    {
-						return;
+                        if (form.ComponentModel == null)
-					}
+                        {
-					_logger.LogInformation("Изменение компонента:{ ComponentName}-{ Count}", form.ComponentModel.ComponentName, form.Count);
+                            return;
-					_repairComponents[form.Id] = (form.ComponentModel, form.Count);
+                        }
-					LoadData();
+                        _logger.LogInformation("Изменение компонента: { ComponentName} - { Count} ", form.ComponentModel.ComponentName, form.Count);
-				}
+                        _repairComponents[form.Id] = (form.ComponentModel, form.Count);
-			}
+                        LoadData();
+                    }
+                }
+            }
         }
 
         private void buttonDel_Click(object sender, EventArgs e)

RenovationWork/RenovationWork/FormRepairs.cs

@@ -9,7 +9,6 @@ using System.Threading.Tasks;
 using System.Windows.Forms;
 using RenovationWorkContracts.BindingModels;
 using RenovationWorkContracts.BusinessLogicsContracts;
-using RenovationWorkContracts.DI;
 using Microsoft.Extensions.Logging;
 
 namespace RenovationWorkView
@@ -33,36 +32,49 @@ namespace RenovationWorkView
         {
             try
             {
-				dataGridView.FillAndConfigGrid(_logic.ReadList(null));
+                var list = _logic.ReadList(null);
-				_logger.LogInformation("Загрузка ремонтных работ");
+                if (list != null)
-			}
+                {
+                    dataGridView.DataSource = list;
+                    dataGridView.Columns["Id"].Visible = false;
+                    dataGridView.Columns["RepairName"].AutoSizeMode = DataGridViewAutoSizeColumnMode.Fill;
+                    dataGridView.Columns["RepairComponents"].Visible = false;
+                }
+                _logger.LogInformation("Загрузка компьютеров");
+            }
             catch (Exception ex)
             {
-                _logger.LogError(ex, "Ошибка загрузки ремонтных работ");
+                _logger.LogError(ex, "Ошибка загрузки компьютеров");
                 MessageBox.Show(ex.Message, "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error);
             }
         }
 
         private void buttonAdd_Click(object sender, EventArgs e)
         {
-			var form = DependencyManager.Instance.Resolve<FormRepair>();
+            var service = Program.ServiceProvider?.GetService(typeof(FormRepair));
-			if (form.ShowDialog() == DialogResult.OK)
+            if (service is FormRepair form)
-			{
+            {
-				LoadData();
+                if (form.ShowDialog() == DialogResult.OK)
-			}
+                {
-		}
+                    LoadData();
+                }
+            }
+        }
 
         private void buttonUpd_Click(object sender, EventArgs e)
         {
             if (dataGridView.SelectedRows.Count == 1)
             {
-				var form = DependencyManager.Instance.Resolve<FormRepair>();
+                var service = Program.ServiceProvider?.GetService(typeof(FormRepair));
-				form.Id = Convert.ToInt32(dataGridView.SelectedRows[0].Cells["Id"].Value);
+                if (service is FormRepair form)
-				if (form.ShowDialog() == DialogResult.OK)
+                {
-				{
+                    form.Id = Convert.ToInt32(dataGridView.SelectedRows[0].Cells["Id"].Value);
-					LoadData();
+                    if (form.ShowDialog() == DialogResult.OK)
-				}
+                    {
-			}
+                        LoadData();
+                    }
+                }
+            }
         }
 
         private void buttonDel_Click(object sender, EventArgs e)

RenovationWork/RenovationWork/Program.cs

@@ -10,7 +10,6 @@ using RenovationWorkBusinessLogic.OfficePackage.Implements;
 using RenovationWorkBusinessLogic.OfficePackage;
 using RenovationWorkBusinessLogic.MailWorker;
 using RenovationWorkContracts.BindingModels;
-using RenovationWorkContracts.DI;
 
 namespace RenovationWorkView
 {
@@ -27,10 +26,12 @@ namespace RenovationWorkView
             // To customize application configuration such as set high DPI settings or default font,
             // see https://aka.ms/applicationconfiguration.
             ApplicationConfiguration.Initialize();
-			InitDependency();
+            var services = new ServiceCollection();
-			try
+            ConfigureServices(services);
+            _serviceProvider = services.BuildServiceProvider();
+            try
             {
-                var mailSender = DependencyManager.Instance.Resolve<AbstractMailWorker>();
+                var mailSender = _serviceProvider.GetService<AbstractMailWorker>();
                 mailSender?.MailConfig(new MailConfigBindingModel
                 {
                     MailLogin = System.Configuration.ConfigurationManager.AppSettings["MailLogin"]
@@ -48,51 +49,52 @@ namespace RenovationWorkView
             }
             catch (Exception ex)
             {
-                var logger = DependencyManager.Instance.Resolve<ILogger>();
+                var logger = _serviceProvider.GetService<ILogger>();
-                logger?.LogError(ex, "Error");
+                logger?.LogError(ex, "Îøèáêà ðàáîòû ñ ïî÷òîé");
             }
-            Application.Run(DependencyManager.Instance.Resolve<FormMain>());
+            Application.Run(_serviceProvider.GetRequiredService<FormMain>());
         }
-		private static void InitDependency()
+        private static void ConfigureServices(ServiceCollection services)
-		{
+        {
-			DependencyManager.InitDependency();
+            services.AddLogging(option =>
+            {
+                option.SetMinimumLevel(LogLevel.Information);
+                option.AddNLog("nlog.config");
+            });
+            services.AddTransient<IComponentStorage, ComponentStorage>();
+            services.AddTransient<IOrderStorage, OrderStorage>();
+            services.AddTransient<IRepairStorage, RepairStorage>();
+            services.AddTransient<IComponentLogic, ComponentLogic>();
+            services.AddTransient<IOrderLogic, OrderLogic>();
+            services.AddTransient<IRepairLogic, RepairLogic>();
+            services.AddTransient<IReportLogic, ReportLogic>();
+			services.AddTransient<IClientLogic, ClientLogic>();
+			services.AddTransient<IClientStorage, ClientStorage>();
+			services.AddTransient<IImplementerLogic, ImplementerLogic>();
+			services.AddTransient<IImplementerStorage, ImplementerStorage>();
+			services.AddTransient<IWorkProcess, WorkModeling>();
+            services.AddTransient<IMessageInfoLogic, MessageInfoLogic>();
+            services.AddTransient<IMessageInfoStorage, MessageInfoStorage>();
+            services.AddSingleton<AbstractMailWorker, MailKitWorker>();
 
-			DependencyManager.Instance.AddLogging(option =>
+            services.AddTransient<AbstractSaveToWord, SaveToWord>();
-			{
+			services.AddTransient<AbstractSaveToExcel, SaveToExcel>();
-				option.SetMinimumLevel(LogLevel.Information);
+			services.AddTransient<AbstractSaveToPdf, SaveToPdf>();
-				option.AddNLog("nlog.config");
-			});
 			
-			DependencyManager.Instance.RegisterType<IClientLogic, ClientLogic>();
+            services.AddTransient<FormMain>();
-			DependencyManager.Instance.RegisterType<IComponentLogic, ComponentLogic>();
+            services.AddTransient<FormComponent>();
-			DependencyManager.Instance.RegisterType<IOrderLogic, OrderLogic>();
+            services.AddTransient<FormComponents>();
-			DependencyManager.Instance.RegisterType<IRepairLogic, RepairLogic>();
+            services.AddTransient<FormCreateOrder>();
-			DependencyManager.Instance.RegisterType<IReportLogic, ReportLogic>();
+            services.AddTransient<FormRepair>();
-			DependencyManager.Instance.RegisterType<IImplementerLogic, ImplementerLogic>();
+            services.AddTransient<FormRepairComponent>();
-			DependencyManager.Instance.RegisterType<IMessageInfoLogic, MessageInfoLogic>();
+            services.AddTransient<FormRepairs>();
-			DependencyManager.Instance.RegisterType<IBackUpLogic, BackUpLogic>();
+            services.AddTransient<FormReportRepairComponents>();
-
+            services.AddTransient<FormReportOrders>();
-			DependencyManager.Instance.RegisterType<AbstractSaveToWord, SaveToWord>();
+			services.AddTransient<FormClients>();
-			DependencyManager.Instance.RegisterType<AbstractSaveToExcel, SaveToExcel>();
+			services.AddTransient<FormImplementers>();
-			DependencyManager.Instance.RegisterType<AbstractSaveToPdf, SaveToPdf>();
+			services.AddTransient<FormImplementer>();
-			DependencyManager.Instance.RegisterType<AbstractMailWorker, MailKitWorker>(true);
+            services.AddTransient<FormMail>();
-
+        }
-			DependencyManager.Instance.RegisterType<IWorkProcess, WorkModeling>();
+        private static void MailCheck(object obj) => ServiceProvider?.GetService<AbstractMailWorker>()?.MailCheck();
-
-			DependencyManager.Instance.RegisterType<FormMain>();
-			DependencyManager.Instance.RegisterType<FormComponent>();
-			DependencyManager.Instance.RegisterType<FormComponents>();
-			DependencyManager.Instance.RegisterType<FormCreateOrder>();
-			DependencyManager.Instance.RegisterType<FormRepair>();
-			DependencyManager.Instance.RegisterType<FormRepairComponent>();
-			DependencyManager.Instance.RegisterType<FormRepairs>();
-			DependencyManager.Instance.RegisterType<FormReportOrders>();
-			DependencyManager.Instance.RegisterType<FormReportRepairComponents>();
-			DependencyManager.Instance.RegisterType<FormClients>();
-			DependencyManager.Instance.RegisterType<FormImplementers>();
-			DependencyManager.Instance.RegisterType<FormImplementer>();
-			DependencyManager.Instance.RegisterType<FormMail>();
-		}
-		private static void MailCheck(object obj) => DependencyManager.Instance.Resolve<AbstractMailWorker>()?.MailCheck();
     }
 }

RenovationWork/RenovationWorkBusinessLogic/BusinessLogics/BackUpLogic.cs

@@ -1,104 +0,0 @@
-using Microsoft.Extensions.Logging;
-using RenovationWorkContracts.BindingModels;
-using RenovationWorkContracts.BusinessLogicsContracts;
-using RenovationWorkContracts.StoragesContracts;
-using RenovationWorkDatabaseImplement.Models;
-using RenovationWorkDataModels;
-using System;
-using System.Collections.Generic;
-using System.IO.Compression;
-using System.Linq;
-using System.Reflection;
-using System.Runtime.Serialization.Json;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace RenovationWorkBusinessLogic.BusinessLogics
-{
-	public class BackUpLogic : IBackUpLogic
-	{
-		private readonly ILogger _logger;
-
-		private readonly IBackUpInfo _backUpInfo;
-
-		public BackUpLogic(ILogger<BackUpLogic> 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<T>(string folderName) where T : class, new()
-		{
-			var records = _backUpInfo.GetList<T>();
-			if (records == null)
-			{
-				_logger.LogWarning("{type} type get null list", typeof(T).Name);
-				return;
-			}
-			var jsonFormatter = new DataContractJsonSerializer(typeof(List<T>));
-			using var fs = new FileStream(string.Format("{0}/{1}.json", folderName, typeof(T).Name), FileMode.OpenOrCreate);
-			jsonFormatter.WriteObject(fs, records);
-		}
-	}
-}

RenovationWork/RenovationWorkBusinessLogic/MailWorker/AbstractMailWorker.cs

@@ -19,11 +19,9 @@ namespace RenovationWorkBusinessLogic.MailWorker
 		protected int _popPort;
 		private readonly IMessageInfoLogic _messageInfoLogic;
 		private readonly ILogger _logger;
-		private readonly IClientLogic _clientLogic;
 		public AbstractMailWorker(ILogger<AbstractMailWorker> logger,
-			IMessageInfoLogic messageInfoLogic, IClientLogic client)
+			IMessageInfoLogic messageInfoLogic)
 		{
-			_clientLogic = client;
 			_logger = logger;
 			_messageInfoLogic = messageInfoLogic;
 		}
@@ -75,11 +73,11 @@ namespace RenovationWorkBusinessLogic.MailWorker
 			_logger.LogDebug("Check Mail: {Count} new mails", list.Count);
 			foreach (var mail in list)
 			{
-				mail.ClientId = _clientLogic.ReadElement(new() { Email = mail.SenderName })?.Id;
 				_messageInfoLogic.Create(mail);
 			}
 		}
 		protected abstract Task SendMailAsync(MailSendInfoBindingModel info);
-		protected abstract Task<List<MessageInfoBindingModel>> ReceiveMailAsync();
+		protected abstract Task<List<MessageInfoBindingModel>>
+		ReceiveMailAsync();
 	}
 }

RenovationWork/RenovationWorkBusinessLogic/MailWorker/MailKitWorker.cs

@@ -16,7 +16,7 @@ namespace RenovationWorkBusinessLogic.MailWorker
 	public class MailKitWorker : AbstractMailWorker
 	{
 		public MailKitWorker(ILogger<MailKitWorker> logger, IMessageInfoLogic
-			messageInfoLogic, IClientLogic client) : base(logger, messageInfoLogic, client) { }
+			messageInfoLogic) : base(logger, messageInfoLogic) { }
 		protected override async Task SendMailAsync(MailSendInfoBindingModel info)
 		{
 			using var objMailMessage = new MailMessage();

RenovationWork/RenovationWorkBusinessLogic/RenovationWorkBusinessLogic.csproj

@@ -15,7 +15,6 @@
 
   <ItemGroup>
     <ProjectReference Include="..\RenovationWorkContracts\RenovationWorkContracts.csproj" />
-    <ProjectReference Include="..\RenovationWorkDatabaseImplement\RenovationWorkDatabaseImplement.csproj" />
   </ItemGroup>
 
 </Project>

RenovationWork/RenovationWorkContracts/Attributes/ColumnAttribute.cs

@@ -1,31 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace RenovationWorkContracts.Attributes
-{
-	[AttributeUsage(AttributeTargets.Property)]
-	public class ColumnAttribute : Attribute
-	{
-		public string Title { get; private set; }
-
-		public bool Visible { get; private set; }
-
-		public int Width { get; private set; }
-
-		public GridViewAutoSize GridViewAutoSize { get; private set; }
-
-		public bool IsUseAutoSize { get; private set; }
-
-		public ColumnAttribute(string title = "", bool visible = true, int width = 0, GridViewAutoSize gridViewAutoSize = GridViewAutoSize.None, bool isUseAutoSize = false)
-		{
-			Title = title;
-			Visible = visible;
-			Width = width;
-			GridViewAutoSize = gridViewAutoSize;
-			IsUseAutoSize = isUseAutoSize;
-		}
-	}
-}

RenovationWork/RenovationWorkContracts/Attributes/GridViewAutoSize.cs

@@ -1,27 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace RenovationWorkContracts.Attributes
-{
-	public enum GridViewAutoSize
-	{
-		NotSet = 0,
-
-		None = 1,
-
-		ColumnHeader = 2,
-
-		AllCellsExceptHeader = 4,
-
-		AllCells = 6,
-
-		DisplayedCellsExceptHeader = 8,
-
-		DisplayedCells = 10,
-
-		Fill = 16
-	}
-}

RenovationWork/RenovationWorkContracts/BindingModels/BackUpSaveBindingModel.cs

@@ -1,7 +0,0 @@
-namespace RenovationWorkContracts.BindingModels
-{
-	public class BackUpSaveBindingModel
-	{
-		public string FolderName { get; set; } = string.Empty;
-	}
-}

RenovationWork/RenovationWorkContracts/BindingModels/MessageInfoBindingModel.cs

@@ -16,6 +16,5 @@ namespace RenovationWorkContracts.BindingModels
 		public string Subject { get; set; } = string.Empty;
 		public string Body { get; set; } = string.Empty;
 		public DateTime DateDelivery { get; set; }
-		public int Id => throw new NotImplementedException();
 	}
 }

RenovationWork/RenovationWorkContracts/BusinessLogicsContracts/IBackUpLogic.cs

@@ -1,9 +0,0 @@
-using RenovationWorkContracts.BindingModels;
-
-namespace RenovationWorkContracts.BusinessLogicsContracts
-{
-	public interface IBackUpLogic
-	{
-		void CreateBackUp(BackUpSaveBindingModel model);
-	}
-}

RenovationWork/RenovationWorkContracts/DI/DependencyManager.cs

@@ -1,61 +0,0 @@
-using Microsoft.Extensions.Logging;
-
-namespace RenovationWorkContracts.DI
-{
-	public class DependencyManager
-	{
-		private readonly IDependencyContainer _dependencyManager;
-
-		private static DependencyManager? _manager;
-
-		private static readonly object _locjObject = new();
-
-		private DependencyManager()
-		{
-			_dependencyManager = new UnityDependencyContainer();
-		}
-
-		public static DependencyManager Instance { get { if (_manager == null) { lock (_locjObject) { _manager = new DependencyManager(); } } return _manager; } }
-
-		/// <summary>
-		/// Иницализация библиотек, в которых идут установки зависомстей
-		/// </summary>
-		public static void InitDependency()
-		{
-			var ext = ServiceProviderLoader.GetImplementationExtensions();
-			if (ext == null)
-			{
-				throw new ArgumentNullException("Отсутствуют компоненты для загрузки зависимостей по модулям");
-			}
-			// регистрируем зависимости
-			ext.RegisterServices();
-		}
-
-		/// <summary>
-		/// Регистрация логгера
-		/// </summary>
-		/// <param name="configure"></param>
-		public void AddLogging(Action<ILoggingBuilder> configure) => _dependencyManager.AddLogging(configure);
-
-		/// <summary>
-		/// Добавление зависимости
-		/// </summary>
-		/// <typeparam name="T"></typeparam>
-		/// <typeparam name="U"></typeparam>
-		public void RegisterType<T, U>(bool isSingle = false) where U : class, T where T : class => _dependencyManager.RegisterType<T, U>(isSingle);
-
-		/// <summary>
-		/// Добавление зависимости
-		/// </summary>
-		/// <typeparam name="T"></typeparam>
-		/// <typeparam name="U"></typeparam>
-		public void RegisterType<T>(bool isSingle = false) where T : class => _dependencyManager.RegisterType<T>(isSingle);
-
-		/// <summary>
-		/// Получение класса со всеми зависмостями
-		/// </summary>
-		/// <typeparam name="T"></typeparam>
-		/// <returns></returns>
-		public T Resolve<T>() => _dependencyManager.Resolve<T>();
-	}
-}

RenovationWork/RenovationWorkContracts/DI/IDependencyContainer.cs

@@ -1,27 +0,0 @@
-using Microsoft.Extensions.Logging;
-
-namespace RenovationWorkContracts.DI
-{
-	public interface IDependencyContainer
-	{
-		/// <summary>
-		/// Регистрация логгера
-		/// </summary>
-		void AddLogging(Action<ILoggingBuilder> configure);
-
-		/// <summary>
-		/// Добавление зависимости
-		/// </summary>
-		void RegisterType<T, U>(bool isSingle) where U : class, T where T : class;
-
-		/// <summary>
-		/// Добавление зависимости
-		/// </summary>
-		void RegisterType<T>(bool isSingle) where T : class;
-
-		/// <summary>
-		/// Получение класса со всеми зависмостями
-		/// </summary>
-		T Resolve<T>();
-	}
-}

RenovationWork/RenovationWorkContracts/DI/IImplementationExtension.cs

@@ -1,11 +0,0 @@
-namespace RenovationWorkContracts.DI
-{
-	public interface IImplementationExtension
-	{
-		public int Priority { get; }
-		/// <summary>
-		/// Регистрация сервисов
-		/// </summary>
-		public void RegisterServices();
-	}
-}

RenovationWork/RenovationWorkContracts/DI/ServiceDependencyContainer.cs

@@ -1,57 +0,0 @@
-using Microsoft.Extensions.DependencyInjection;
-using Microsoft.Extensions.Logging;
-
-namespace RenovationWorkContracts.DI
-{
-	public class ServiceDependencyContainer : IDependencyContainer
-	{
-		private ServiceProvider? _serviceProvider;
-
-		private readonly ServiceCollection _serviceCollection;
-
-		public ServiceDependencyContainer()
-		{
-			_serviceCollection = new ServiceCollection();
-		}
-
-		public void AddLogging(Action<ILoggingBuilder> configure)
-		{
-			_serviceCollection.AddLogging(configure);
-		}
-
-		public void RegisterType<T, U>(bool isSingle) where U : class, T where T : class
-		{
-			if (isSingle)
-			{
-				_serviceCollection.AddSingleton<T, U>();
-			}
-			else
-			{
-				_serviceCollection.AddTransient<T, U>();
-			}
-			_serviceProvider = null;
-		}
-
-		public void RegisterType<T>(bool isSingle) where T : class
-		{
-			if (isSingle)
-			{
-				_serviceCollection.AddSingleton<T>();
-			}
-			else
-			{
-				_serviceCollection.AddTransient<T>();
-			}
-			_serviceProvider = null;
-		}
-
-		public T Resolve<T>()
-		{
-			if (_serviceProvider == null)
-			{
-				_serviceProvider = _serviceCollection.BuildServiceProvider();
-			}
-			return _serviceProvider.GetService<T>()!;
-		}
-	}
-}

RenovationWork/RenovationWorkContracts/DI/ServiceProviderLoader.cs

@@ -1,54 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Reflection;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace RenovationWorkContracts.DI
-{
-	public static partial class ServiceProviderLoader
-	{
-		/// <summary>
-		/// Загрузка всех классов-реализаций IImplementationExtension
-		/// </summary>
-		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";
-		}
-	}
-}

RenovationWork/RenovationWorkContracts/DI/UnityDependencyContainer.cs

@@ -1,84 +0,0 @@
-using Microsoft.Extensions.Logging;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using Unity.Microsoft.Logging;
-using Unity;
-
-namespace RenovationWorkContracts.DI
-{
-	/// <summary>
-	/// Реализация интерфейса установки зависимости между элементами 
-	/// </summary>
-	public class UnityDependencyContainer : IDependencyContainer
-	{
-		/// <summary>
-		/// Контейнер сервисов для регистрации зависимостей
-		/// </summary>
-		private readonly UnityContainer _container;
-
-		/// <summary>
-		/// Конструктор
-		/// </summary>
-		public UnityDependencyContainer()
-		{
-			_container = new UnityContainer();
-		}
-
-		/// <summary>
-		/// Регистрация логгера
-		/// </summary>
-		/// <param name="configure"></param>
-		public void AddLogging(Action<ILoggingBuilder> configure)
-		{
-			_container.AddExtension(new LoggingExtension(LoggerFactory.Create(configure)));
-		}
-
-		/// <summary>
-		/// Добавление зависимости
-		/// </summary>
-		/// <typeparam name="T"></typeparam>
-		/// <typeparam name="U"></typeparam>
-		/// <param name="isSingle"></param>
-		public void RegisterType<T, U>(bool isSingle) where U : class, T where T : class
-		{
-			if (isSingle)
-			{
-				_container.RegisterSingleton<T, U>();
-			}
-			else
-			{
-				_container.RegisterType<T, U>();
-			}
-		}
-
-		/// <summary>
-		/// Добавление зависимости
-		/// </summary>
-		/// <typeparam name="T"></typeparam>
-		/// <param name="isSingle"></param>
-		public void RegisterType<T>(bool isSingle) where T : class
-		{
-			if (isSingle)
-			{
-				_container.RegisterSingleton<T>();
-			}
-			else
-			{
-				_container.RegisterType<T>();
-			}
-		}
-
-		/// <summary>
-		/// Получение класса со всеми зависимостями
-		/// </summary>
-		/// <typeparam name="T"></typeparam>
-		/// <returns></returns>
-		public T Resolve<T>()
-		{
-			return _container.Resolve<T>();
-		}
-	}
-}

RenovationWork/RenovationWorkContracts/RenovationWorkContracts.csproj

@@ -6,12 +6,6 @@
     <Nullable>enable</Nullable>
   </PropertyGroup>
 
-  <ItemGroup>
-    <PackageReference Include="Microsoft.Extensions.Logging" Version="8.0.0" />
-    <PackageReference Include="Unity" Version="5.11.10" />
-    <PackageReference Include="Unity.Microsoft.Logging" Version="5.11.1" />
-  </ItemGroup>
-
   <ItemGroup>
     <ProjectReference Include="..\RenovationWorkDataModels\RenovationWorkDataModels.csproj" />
   </ItemGroup>

RenovationWork/RenovationWorkContracts/StoragesContracts/IBackUpInfo.cs

@@ -1,9 +0,0 @@
-namespace RenovationWorkContracts.StoragesContracts
-{
-	public interface IBackUpInfo
-	{
-		List<T>? GetList<T>() where T : class, new();
-
-		Type? GetTypeByModelInterface(string modelInterfaceName);
-	}
-}

RenovationWork/RenovationWorkContracts/ViewModels/ClientViewModel.cs

@@ -1,5 +1,4 @@
 using RenovationWorkDataModels.Models;
-using RenovationWorkContracts.Attributes;
 using System.ComponentModel;
 
 
@@ -7,13 +6,12 @@ namespace RenovationWorkContracts.ViewModels
 {
 	public class ClientViewModel : IClientModel
 	{
-		[Column(visible: false)]
 		public int Id { get; set; }
-		[Column(title: "ФИО клиента", width: 150)]
+		[DisplayName("ФИО клиента")]
 		public string ClientFIO { get; set; } = string.Empty;
-		[Column(title: "Логин (эл. почта)", gridViewAutoSize: GridViewAutoSize.Fill, isUseAutoSize: true)]
+		[DisplayName("Логин (эл. почта)")]
 		public string Email { get; set; } = string.Empty;
-		[Column(title: "Пароль", width: 150)]
+		[DisplayName("Пароль")]
 		public string Password { get; set; } = string.Empty;
 	}
 }

RenovationWork/RenovationWorkContracts/ViewModels/ComponentViewModel.cs

@@ -5,19 +5,17 @@ using System.Text;
 using System.Threading.Tasks;
 using RenovationWorkDataModels.Models;
 using System.ComponentModel;
-using RenovationWorkContracts.Attributes;
 
 
 namespace RenovationWorkContracts.ViewModels
 {
     public class ComponentViewModel : IComponentModel
     {
-		[Column(visible: false)]
+        public int Id { get; set; }
-		public int Id { get; set; }
+        [DisplayName("Название компонента")]
-		[Column(title: "Название компонента", gridViewAutoSize: GridViewAutoSize.Fill, isUseAutoSize: true)]
+        public string ComponentName { get; set; } = string.Empty;
-		public string ComponentName { get; set; } = string.Empty;
+        [DisplayName("Цена")]
-		[Column(title: "Цена", width: 150)]
+        public double Cost { get; set; }
-		public double Cost { get; set; }
 
     }
 }

RenovationWork/RenovationWorkContracts/ViewModels/ImplementerViewModel.cs

@@ -5,21 +5,19 @@ using System.ComponentModel;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
-using RenovationWorkContracts.Attributes;
 
 namespace RenovationWorkContracts.ViewModels
 {
     public class ImplementerViewModel : IImplementerModel
     {
-		[Column(visible: false)]
+        public int Id { get; set; }
-		public int Id { get; set; }
+        [DisplayName("ФИО исполнителя")]
-		[Column(title: "ФИО исполнителя", gridViewAutoSize: GridViewAutoSize.Fill, isUseAutoSize: true)]
+        public string ImplementerFIO { get; set; } = string.Empty;
-		public string ImplementerFIO { get; set; } = string.Empty;
+        [DisplayName("Стаж работы")]
-		[Column(title: "Стаж работы", width: 60)]
+        public int WorkExperience { get; set; } = 0;
-		public int WorkExperience { get; set; } = 0;
+        [DisplayName("Квалификация")]
-		[Column(title: "Квалификация", width: 60)]
+        public int Qualification { get; set; } = 0;
-		public int Qualification { get; set; } = 0;
+        [DisplayName("Пароль")]
-		[Column(title: "Пароль", width: 100)]
+        public string Password { get; set; } = string.Empty;
-		public string Password { get; set; } = string.Empty;
     }
 }

RenovationWork/RenovationWorkContracts/ViewModels/MessageInfoViewModel.cs

@@ -1,5 +1,4 @@
 using RenovationWorkDataModels.Models;
-using RenovationWorkContracts.Attributes;
 using System;
 using System.Collections.Generic;
 using System.ComponentModel;
@@ -11,19 +10,15 @@ namespace RenovationWorkContracts.ViewModels
 {
 	public class MessageInfoViewModel : IMessageInfoModel
 	{
-		[Column(visible: false)]
-		public int Id {  get; set; }
-		[Column(visible: false)]
 		public string MessageId { get; set; } = string.Empty;
-		[Column(visible: false)]
 		public int? ClientId { get; set; }
-		[Column(title: "Отправитель", width: 150)]
+		[DisplayName("Отправитель")]
 		public string SenderName { get; set; } = string.Empty;
-		[Column(title: "Дата письма", width: 120)]
+		[DisplayName("Дата письма")]
 		public DateTime DateDelivery { get; set; }
-		[Column(title: "Заголовок", width: 120)]
+		[DisplayName("Заголовок")]
 		public string Subject { get; set; } = string.Empty;
-		[Column(title: "Текст", gridViewAutoSize: GridViewAutoSize.Fill, isUseAutoSize: true)]
+		[DisplayName("Текст")]
 		public string Body { get; set; } = string.Empty;
 	}
 }

RenovationWork/RenovationWorkContracts/ViewModels/OrderViewModel.cs

@@ -5,7 +5,6 @@ using System.Text;
 using System.Threading.Tasks;
 using RenovationWorkDataModels.Enums;
 using RenovationWorkDataModels.Models;
-using RenovationWorkContracts.Attributes;
 using System.ComponentModel;
 
 
@@ -13,29 +12,26 @@ namespace RenovationWorkContracts.ViewModels
 {
     public class OrderViewModel : IOrderModel
     {
-		[Column(title: "Номер", width: 90)]
+        [DisplayName("Номер")]
-		public int Id { get; set; }
+        public int Id { get; set; }
-		[Column(visible: false)]
 		public int ClientId { get; set; }
-		[Column(title: "Имя клиента", width: 150)]
+		[DisplayName("Клиент")]
 		public string ClientFIO { get; set; } = string.Empty;
-		[Column(visible: false)]
 		public int RepairId { get; set; }
-		[Column(title: "Изделие", gridViewAutoSize: GridViewAutoSize.Fill, isUseAutoSize: true)]
+        [DisplayName("Изделие")]
-		public string RepairName { get; set; } = string.Empty;
+        public string RepairName { get; set; } = string.Empty;
-		[Column(title: "Количество", width: 100)]
+        [DisplayName("Количество")]
-		public int Count { get; set; }
+        public int Count { get; set; }
-		[Column(title: "Сумма", width: 120)]
+        [DisplayName("Сумма")]
-		public double Sum { get; set; }
+        public double Sum { get; set; }
-		[Column(title: "Статус", width: 70)]
+        [DisplayName("Статус")]
-		public OrderStatus Status { get; set; } = OrderStatus.Неизвестен;
+        public OrderStatus Status { get; set; } = OrderStatus.Неизвестен;
-		[Column(title: "Исполнитель", width: 150)]
+		[DisplayName("Исполнитель")]
 		public string ImplementerFIO { get; set; } = string.Empty;
-		[Column(visible: false)]
 		public int? ImplementerId { get; set; } = null;
-		[Column(title: "Дата создания", width: 120)]
+		[DisplayName("Дата создания")]
-		public DateTime DateCreate { get; set; } = DateTime.Now;
+        public DateTime DateCreate { get; set; } = DateTime.Now;
-		[Column(title: "Дата выполнения", width: 120)]
+        [DisplayName("Дата выполнения")]
-		public DateTime? DateImplement { get; set; }
+        public DateTime? DateImplement { get; set; }
     }
 }

RenovationWork/RenovationWorkContracts/ViewModels/RepairViewModel.cs

@@ -4,20 +4,17 @@ using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 using RenovationWorkDataModels.Models;
-using RenovationWorkContracts.Attributes;
 using System.ComponentModel;
 
 namespace RenovationWorkContracts.ViewModels
 {
     public class RepairViewModel : IRepairModel
     {
-		[Column(visible: false)]
+        public int Id { get; set; }
-		public int Id { get; set; }
+        [DisplayName("Название изделия")]
-		[Column(title: "Название изделия", gridViewAutoSize: GridViewAutoSize.Fill, isUseAutoSize: true)]
+        public string RepairName { get; set; } = string.Empty;
-		public string RepairName { get; set; } = string.Empty;
+        [DisplayName("Цена")]
-		[Column(title: "Цена", width: 70)]
+        public double Price { get; set; }
-		public double Price { get; set; }
+        public Dictionary<int, (IComponentModel, int)> RepairComponents { get; set; } = new();
-		[Column(visible: false)]
-		public Dictionary<int, (IComponentModel, int)> RepairComponents { get; set; } = new();
     }
 }

RenovationWork/RenovationWorkDataModels/Enums/OrderStatus.cs

@@ -12,7 +12,6 @@ namespace RenovationWorkDataModels.Enums
         Принят = 0,
         Выполняется = 1,
         Готов = 2,
-        Выдан = 3, 
+        Выдан = 3
-        Ожидание = 4
+    }
-	}
 }

RenovationWork/RenovationWorkDataModels/Models/IMessageInfoModel.cs

@@ -6,7 +6,7 @@ using System.Threading.Tasks;
 
 namespace RenovationWorkDataModels.Models
 {
-	public interface IMessageInfoModel: IId
+	public interface IMessageInfoModel
 	{
 		string MessageId { get; }
 		int? ClientId { get; }

RenovationWork/RenovationWorkDatabaseImplement/ImplementationExtension.cs

@@ -1,22 +0,0 @@
-using RenovationWorkContracts.DI;
-using RenovationWorkContracts.StoragesContracts;
-using RenovationWorkDatabaseImplement.Implements;
-
-namespace RenovationWorkDatabaseImplement
-{
-	public class ImplementationExtension : IImplementationExtension
-	{
-		public int Priority => 3;
-
-		public void RegisterServices()
-		{
-			DependencyManager.Instance.RegisterType<IClientStorage, ClientStorage>();
-			DependencyManager.Instance.RegisterType<IComponentStorage, ComponentStorage>();
-			DependencyManager.Instance.RegisterType<IImplementerStorage, ImplementerStorage>();
-			DependencyManager.Instance.RegisterType<IOrderStorage, OrderStorage>();
-			DependencyManager.Instance.RegisterType<IRepairStorage, RepairStorage>();
-			DependencyManager.Instance.RegisterType<IMessageInfoStorage, MessageInfoStorage>();
-			DependencyManager.Instance.RegisterType<IBackUpInfo, BackUpInfo>();
-		}
-	}
-}

RenovationWork/RenovationWorkDatabaseImplement/Implements/BackUpInfo.cs

@@ -1,32 +0,0 @@
-using RenovationWorkContracts.StoragesContracts;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace RenovationWorkDatabaseImplement.Implements
-{
-	public class BackUpInfo : IBackUpInfo
-	{
-		public List<T>? GetList<T>() where T : class, new()
-		{
-			using var context = new RenovationWorkDatabase();
-			return context.Set<T>().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;
-		}
-	}
-}

RenovationWork/RenovationWorkDatabaseImplement/Implements/MessageInfoStorage.cs

@@ -40,7 +40,7 @@ namespace RenovationWorkDatabaseImplement.Implements
 		public MessageInfoViewModel? Insert(MessageInfoBindingModel model)
 		{
 			using var context = new RenovationWorkDatabase();
-			var newMessage = MessageInfo.Create(model);
+			var newMessage = MessageInfo.Create(context, model);
 			if (newMessage == null || context.Messages.Any(x => x.MessageId.Equals(model.MessageId)))
 			{
 				return null;

RenovationWork/RenovationWorkDatabaseImplement/Migrations/20240502204206_InitialCreate.Designer.cs

@@ -0,0 +1,214 @@
+// <auto-generated />
+using System;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.Infrastructure;
+using Microsoft.EntityFrameworkCore.Migrations;
+using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
+using Npgsql.EntityFrameworkCore.PostgreSQL.Metadata;
+using RenovationWorkDatabaseImplement;
+
+#nullable disable
+
+namespace RenovationWorkDatabaseImplement.Migrations
+{
+    [DbContext(typeof(RenovationWorkDatabase))]
+    [Migration("20240502204206_InitialCreate")]
+    partial class InitialCreate
+    {
+        /// <inheritdoc />
+        protected override void BuildTargetModel(ModelBuilder modelBuilder)
+        {
+#pragma warning disable 612, 618
+            modelBuilder
+                .HasAnnotation("ProductVersion", "8.0.4")
+                .HasAnnotation("Relational:MaxIdentifierLength", 63);
+
+            NpgsqlModelBuilderExtensions.UseIdentityByDefaultColumns(modelBuilder);
+
+            modelBuilder.Entity("RenovationWorkDatabaseImplement.Models.Client", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
+
+                    b.Property<string>("ClientFIO")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("Email")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("Password")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("Clients");
+                });
+
+            modelBuilder.Entity("RenovationWorkDatabaseImplement.Models.Component", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
+
+                    b.Property<string>("ComponentName")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<double>("Cost")
+                        .HasColumnType("double precision");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("Components");
+                });
+
+            modelBuilder.Entity("RenovationWorkDatabaseImplement.Models.Order", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
+
+                    b.Property<int>("ClientId")
+                        .HasColumnType("integer");
+
+                    b.Property<int>("Count")
+                        .HasColumnType("integer");
+
+                    b.Property<DateTime>("DateCreate")
+                        .HasColumnType("timestamp without time zone");
+
+                    b.Property<DateTime?>("DateImplement")
+                        .HasColumnType("timestamp without time zone");
+
+                    b.Property<int>("RepairId")
+                        .HasColumnType("integer");
+
+                    b.Property<int>("Status")
+                        .HasColumnType("integer");
+
+                    b.Property<double>("Sum")
+                        .HasColumnType("double precision");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("ClientId");
+
+                    b.HasIndex("RepairId");
+
+                    b.ToTable("Orders");
+                });
+
+            modelBuilder.Entity("RenovationWorkDatabaseImplement.Models.Repair", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
+
+                    b.Property<double>("Price")
+                        .HasColumnType("double precision");
+
+                    b.Property<string>("RepairName")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("Repairs");
+                });
+
+            modelBuilder.Entity("RenovationWorkDatabaseImplement.Models.RepairComponent", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
+
+                    b.Property<int>("ComponentId")
+                        .HasColumnType("integer");
+
+                    b.Property<int>("Count")
+                        .HasColumnType("integer");
+
+                    b.Property<int>("RepairId")
+                        .HasColumnType("integer");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("ComponentId");
+
+                    b.HasIndex("RepairId");
+
+                    b.ToTable("RepairComponents");
+                });
+
+            modelBuilder.Entity("RenovationWorkDatabaseImplement.Models.Order", b =>
+                {
+                    b.HasOne("RenovationWorkDatabaseImplement.Models.Client", "Client")
+                        .WithMany("Orders")
+                        .HasForeignKey("ClientId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("RenovationWorkDatabaseImplement.Models.Repair", "Repair")
+                        .WithMany("Orders")
+                        .HasForeignKey("RepairId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Client");
+
+                    b.Navigation("Repair");
+                });
+
+            modelBuilder.Entity("RenovationWorkDatabaseImplement.Models.RepairComponent", b =>
+                {
+                    b.HasOne("RenovationWorkDatabaseImplement.Models.Component", "Component")
+                        .WithMany("RepairComponent")
+                        .HasForeignKey("ComponentId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("RenovationWorkDatabaseImplement.Models.Repair", "Repair")
+                        .WithMany("Components")
+                        .HasForeignKey("RepairId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Component");
+
+                    b.Navigation("Repair");
+                });
+
+            modelBuilder.Entity("RenovationWorkDatabaseImplement.Models.Client", b =>
+                {
+                    b.Navigation("Orders");
+                });
+
+            modelBuilder.Entity("RenovationWorkDatabaseImplement.Models.Component", b =>
+                {
+                    b.Navigation("RepairComponent");
+                });
+
+            modelBuilder.Entity("RenovationWorkDatabaseImplement.Models.Repair", b =>
+                {
+                    b.Navigation("Components");
+
+                    b.Navigation("Orders");
+                });
+#pragma warning restore 612, 618
+        }
+    }
+}

RenovationWork/RenovationWorkDatabaseImplement/Migrations/20240502204206_InitialCreate.cs

@@ -7,7 +7,7 @@ using Npgsql.EntityFrameworkCore.PostgreSQL.Metadata;
 namespace RenovationWorkDatabaseImplement.Migrations
 {
     /// <inheritdoc />
-    public partial class FirstMigration : Migration
+    public partial class InitialCreate : Migration
     {
         /// <inheritdoc />
         protected override void Up(MigrationBuilder migrationBuilder)
@@ -41,38 +41,6 @@ namespace RenovationWorkDatabaseImplement.Migrations
                     table.PrimaryKey("PK_Components", x => x.Id);
                 });
 
-            migrationBuilder.CreateTable(
-                name: "Implementers",
-                columns: table => new
-                {
-                    Id = table.Column<int>(type: "integer", nullable: false)
-                        .Annotation("Npgsql:ValueGenerationStrategy", NpgsqlValueGenerationStrategy.IdentityByDefaultColumn),
-                    ImplementerFIO = table.Column<string>(type: "text", nullable: false),
-                    Password = table.Column<string>(type: "text", nullable: false),
-                    Qualification = table.Column<int>(type: "integer", nullable: false),
-                    WorkExperience = table.Column<int>(type: "integer", nullable: false)
-                },
-                constraints: table =>
-                {
-                    table.PrimaryKey("PK_Implementers", x => x.Id);
-                });
-
-            migrationBuilder.CreateTable(
-                name: "Messages",
-                columns: table => new
-                {
-                    MessageId = table.Column<string>(type: "text", nullable: false),
-                    ClientId = table.Column<int>(type: "integer", nullable: true),
-                    SenderName = table.Column<string>(type: "text", nullable: false),
-                    DateDelivery = table.Column<DateTime>(type: "timestamp without time zone", nullable: false),
-                    Subject = table.Column<string>(type: "text", nullable: false),
-                    Body = table.Column<string>(type: "text", nullable: false)
-                },
-                constraints: table =>
-                {
-                    table.PrimaryKey("PK_Messages", x => x.MessageId);
-                });
-
             migrationBuilder.CreateTable(
                 name: "Repairs",
                 columns: table => new
@@ -99,8 +67,7 @@ namespace RenovationWorkDatabaseImplement.Migrations
                     Sum = table.Column<double>(type: "double precision", nullable: false),
                     Status = table.Column<int>(type: "integer", nullable: false),
                     DateCreate = table.Column<DateTime>(type: "timestamp without time zone", nullable: false),
-                    DateImplement = table.Column<DateTime>(type: "timestamp without time zone", nullable: true),
+                    DateImplement = table.Column<DateTime>(type: "timestamp without time zone", nullable: true)
-                    ImplementerId = table.Column<int>(type: "integer", nullable: true)
                 },
                 constraints: table =>
                 {
@@ -111,11 +78,6 @@ namespace RenovationWorkDatabaseImplement.Migrations
                         principalTable: "Clients",
                         principalColumn: "Id",
                         onDelete: ReferentialAction.Cascade);
-                    table.ForeignKey(
-                        name: "FK_Orders_Implementers_ImplementerId",
-                        column: x => x.ImplementerId,
-                        principalTable: "Implementers",
-                        principalColumn: "Id");
                     table.ForeignKey(
                         name: "FK_Orders_Repairs_RepairId",
                         column: x => x.RepairId,
@@ -156,11 +118,6 @@ namespace RenovationWorkDatabaseImplement.Migrations
                 table: "Orders",
                 column: "ClientId");
 
-            migrationBuilder.CreateIndex(
-                name: "IX_Orders_ImplementerId",
-                table: "Orders",
-                column: "ImplementerId");
-
             migrationBuilder.CreateIndex(
                 name: "IX_Orders_RepairId",
                 table: "Orders",
@@ -180,9 +137,6 @@ namespace RenovationWorkDatabaseImplement.Migrations
         /// <inheritdoc />
         protected override void Down(MigrationBuilder migrationBuilder)
         {
-            migrationBuilder.DropTable(
-                name: "Messages");
-
             migrationBuilder.DropTable(
                 name: "Orders");
 
@@ -192,9 +146,6 @@ namespace RenovationWorkDatabaseImplement.Migrations
             migrationBuilder.DropTable(
                 name: "Clients");
 
-            migrationBuilder.DropTable(
-                name: "Implementers");
-
             migrationBuilder.DropTable(
                 name: "Components");
 

RenovationWork/RenovationWorkDatabaseImplement/Migrations/20240503053109_labSix.Designer.cs

@@ -0,0 +1,257 @@
+// <auto-generated />
+using System;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.Infrastructure;
+using Microsoft.EntityFrameworkCore.Migrations;
+using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
+using Npgsql.EntityFrameworkCore.PostgreSQL.Metadata;
+using RenovationWorkDatabaseImplement;
+
+#nullable disable
+
+namespace RenovationWorkDatabaseImplement.Migrations
+{
+    [DbContext(typeof(RenovationWorkDatabase))]
+    [Migration("20240503053109_labSix")]
+    partial class labSix
+    {
+        /// <inheritdoc />
+        protected override void BuildTargetModel(ModelBuilder modelBuilder)
+        {
+#pragma warning disable 612, 618
+            modelBuilder
+                .HasAnnotation("ProductVersion", "8.0.4")
+                .HasAnnotation("Relational:MaxIdentifierLength", 63);
+
+            NpgsqlModelBuilderExtensions.UseIdentityByDefaultColumns(modelBuilder);
+
+            modelBuilder.Entity("RenovationWorkDatabaseImplement.Models.Client", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
+
+                    b.Property<string>("ClientFIO")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("Email")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("Password")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("Clients");
+                });
+
+            modelBuilder.Entity("RenovationWorkDatabaseImplement.Models.Component", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
+
+                    b.Property<string>("ComponentName")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<double>("Cost")
+                        .HasColumnType("double precision");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("Components");
+                });
+
+            modelBuilder.Entity("RenovationWorkDatabaseImplement.Models.Implementer", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
+
+                    b.Property<string>("ImplementerFIO")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("Password")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<int>("Qualification")
+                        .HasColumnType("integer");
+
+                    b.Property<int>("WorkExperience")
+                        .HasColumnType("integer");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("Implementers");
+                });
+
+            modelBuilder.Entity("RenovationWorkDatabaseImplement.Models.Order", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
+
+                    b.Property<int>("ClientId")
+                        .HasColumnType("integer");
+
+                    b.Property<int>("Count")
+                        .HasColumnType("integer");
+
+                    b.Property<DateTime>("DateCreate")
+                        .HasColumnType("timestamp without time zone");
+
+                    b.Property<DateTime?>("DateImplement")
+                        .HasColumnType("timestamp without time zone");
+
+                    b.Property<int?>("ImplementerId")
+                        .HasColumnType("integer");
+
+                    b.Property<int>("RepairId")
+                        .HasColumnType("integer");
+
+                    b.Property<int>("Status")
+                        .HasColumnType("integer");
+
+                    b.Property<double>("Sum")
+                        .HasColumnType("double precision");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("ClientId");
+
+                    b.HasIndex("ImplementerId");
+
+                    b.HasIndex("RepairId");
+
+                    b.ToTable("Orders");
+                });
+
+            modelBuilder.Entity("RenovationWorkDatabaseImplement.Models.Repair", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
+
+                    b.Property<double>("Price")
+                        .HasColumnType("double precision");
+
+                    b.Property<string>("RepairName")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("Repairs");
+                });
+
+            modelBuilder.Entity("RenovationWorkDatabaseImplement.Models.RepairComponent", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
+
+                    b.Property<int>("ComponentId")
+                        .HasColumnType("integer");
+
+                    b.Property<int>("Count")
+                        .HasColumnType("integer");
+
+                    b.Property<int>("RepairId")
+                        .HasColumnType("integer");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("ComponentId");
+
+                    b.HasIndex("RepairId");
+
+                    b.ToTable("RepairComponents");
+                });
+
+            modelBuilder.Entity("RenovationWorkDatabaseImplement.Models.Order", b =>
+                {
+                    b.HasOne("RenovationWorkDatabaseImplement.Models.Client", "Client")
+                        .WithMany("Orders")
+                        .HasForeignKey("ClientId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("RenovationWorkDatabaseImplement.Models.Implementer", "Implementer")
+                        .WithMany("Orders")
+                        .HasForeignKey("ImplementerId");
+
+                    b.HasOne("RenovationWorkDatabaseImplement.Models.Repair", "Repair")
+                        .WithMany("Orders")
+                        .HasForeignKey("RepairId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Client");
+
+                    b.Navigation("Implementer");
+
+                    b.Navigation("Repair");
+                });
+
+            modelBuilder.Entity("RenovationWorkDatabaseImplement.Models.RepairComponent", b =>
+                {
+                    b.HasOne("RenovationWorkDatabaseImplement.Models.Component", "Component")
+                        .WithMany("RepairComponent")
+                        .HasForeignKey("ComponentId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("RenovationWorkDatabaseImplement.Models.Repair", "Repair")
+                        .WithMany("Components")
+                        .HasForeignKey("RepairId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Component");
+
+                    b.Navigation("Repair");
+                });
+
+            modelBuilder.Entity("RenovationWorkDatabaseImplement.Models.Client", b =>
+                {
+                    b.Navigation("Orders");
+                });
+
+            modelBuilder.Entity("RenovationWorkDatabaseImplement.Models.Component", b =>
+                {
+                    b.Navigation("RepairComponent");
+                });
+
+            modelBuilder.Entity("RenovationWorkDatabaseImplement.Models.Implementer", b =>
+                {
+                    b.Navigation("Orders");
+                });
+
+            modelBuilder.Entity("RenovationWorkDatabaseImplement.Models.Repair", b =>
+                {
+                    b.Navigation("Components");
+
+                    b.Navigation("Orders");
+                });
+#pragma warning restore 612, 618
+        }
+    }
+}

RenovationWork/RenovationWorkDatabaseImplement/Migrations/20240503053109_labSix.cs

@@ -0,0 +1,68 @@
+using Microsoft.EntityFrameworkCore.Migrations;
+using Npgsql.EntityFrameworkCore.PostgreSQL.Metadata;
+
+#nullable disable
+
+namespace RenovationWorkDatabaseImplement.Migrations
+{
+    /// <inheritdoc />
+    public partial class labSix : Migration
+    {
+        /// <inheritdoc />
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.AddColumn<int>(
+                name: "ImplementerId",
+                table: "Orders",
+                type: "integer",
+                nullable: true);
+
+            migrationBuilder.CreateTable(
+                name: "Implementers",
+                columns: table => new
+                {
+                    Id = table.Column<int>(type: "integer", nullable: false)
+                        .Annotation("Npgsql:ValueGenerationStrategy", NpgsqlValueGenerationStrategy.IdentityByDefaultColumn),
+                    ImplementerFIO = table.Column<string>(type: "text", nullable: false),
+                    Password = table.Column<string>(type: "text", nullable: false),
+                    Qualification = table.Column<int>(type: "integer", nullable: false),
+                    WorkExperience = table.Column<int>(type: "integer", nullable: false)
+                },
+                constraints: table =>
+                {
+                    table.PrimaryKey("PK_Implementers", x => x.Id);
+                });
+
+            migrationBuilder.CreateIndex(
+                name: "IX_Orders_ImplementerId",
+                table: "Orders",
+                column: "ImplementerId");
+
+            migrationBuilder.AddForeignKey(
+                name: "FK_Orders_Implementers_ImplementerId",
+                table: "Orders",
+                column: "ImplementerId",
+                principalTable: "Implementers",
+                principalColumn: "Id");
+        }
+
+        /// <inheritdoc />
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropForeignKey(
+                name: "FK_Orders_Implementers_ImplementerId",
+                table: "Orders");
+
+            migrationBuilder.DropTable(
+                name: "Implementers");
+
+            migrationBuilder.DropIndex(
+                name: "IX_Orders_ImplementerId",
+                table: "Orders");
+
+            migrationBuilder.DropColumn(
+                name: "ImplementerId",
+                table: "Orders");
+        }
+    }
+}

RenovationWork/RenovationWorkDatabaseImplement/Migrations/20240618025243_LabSeven.Designer.cs

@@ -12,8 +12,8 @@ using RenovationWorkDatabaseImplement;
 namespace RenovationWorkDatabaseImplement.Migrations
 {
     [DbContext(typeof(RenovationWorkDatabase))]
-    [Migration("20241016174244_FirstMigration")]
+    [Migration("20240618025243_LabSeven")]
-    partial class FirstMigration
+    partial class LabSeven
     {
         /// <inheritdoc />
         protected override void BuildTargetModel(ModelBuilder modelBuilder)
@@ -122,6 +122,8 @@ namespace RenovationWorkDatabaseImplement.Migrations
 
                     b.HasKey("MessageId");
 
+                    b.HasIndex("ClientId");
+
                     b.ToTable("Messages");
                 });
 
@@ -214,6 +216,15 @@ namespace RenovationWorkDatabaseImplement.Migrations
                     b.ToTable("RepairComponents");
                 });
 
+            modelBuilder.Entity("RenovationWorkDatabaseImplement.Models.MessageInfo", b =>
+                {
+                    b.HasOne("RenovationWorkDatabaseImplement.Models.Client", "Client")
+                        .WithMany()
+                        .HasForeignKey("ClientId");
+
+                    b.Navigation("Client");
+                });
+
             modelBuilder.Entity("RenovationWorkDatabaseImplement.Models.Order", b =>
                 {
                     b.HasOne("RenovationWorkDatabaseImplement.Models.Client", "Client")

RenovationWork/RenovationWorkDatabaseImplement/Migrations/20240618025243_LabSeven.cs

@@ -0,0 +1,48 @@
+using System;
+using Microsoft.EntityFrameworkCore.Migrations;
+
+#nullable disable
+
+namespace RenovationWorkDatabaseImplement.Migrations
+{
+    /// <inheritdoc />
+    public partial class LabSeven : Migration
+    {
+        /// <inheritdoc />
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.CreateTable(
+                name: "Messages",
+                columns: table => new
+                {
+                    MessageId = table.Column<string>(type: "text", nullable: false),
+                    ClientId = table.Column<int>(type: "integer", nullable: true),
+                    SenderName = table.Column<string>(type: "text", nullable: false),
+                    DateDelivery = table.Column<DateTime>(type: "timestamp without time zone", nullable: false),
+                    Subject = table.Column<string>(type: "text", nullable: false),
+                    Body = table.Column<string>(type: "text", 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.CreateIndex(
+                name: "IX_Messages_ClientId",
+                table: "Messages",
+                column: "ClientId");
+        }
+
+        /// <inheritdoc />
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropTable(
+                name: "Messages");
+        }
+    }
+}

RenovationWork/RenovationWorkDatabaseImplement/Migrations/RenovationWorkDatabaseModelSnapshot.cs

@@ -119,6 +119,8 @@ namespace RenovationWorkDatabaseImplement.Migrations
 
                     b.HasKey("MessageId");
 
+                    b.HasIndex("ClientId");
+
                     b.ToTable("Messages");
                 });
 
@@ -211,6 +213,15 @@ namespace RenovationWorkDatabaseImplement.Migrations
                     b.ToTable("RepairComponents");
                 });
 
+            modelBuilder.Entity("RenovationWorkDatabaseImplement.Models.MessageInfo", b =>
+                {
+                    b.HasOne("RenovationWorkDatabaseImplement.Models.Client", "Client")
+                        .WithMany()
+                        .HasForeignKey("ClientId");
+
+                    b.Navigation("Client");
+                });
+
             modelBuilder.Entity("RenovationWorkDatabaseImplement.Models.Order", b =>
                 {
                     b.HasOne("RenovationWorkDatabaseImplement.Models.Client", "Client")

RenovationWork/RenovationWorkDatabaseImplement/Models/Client.cs

@@ -8,22 +8,16 @@ using System.ComponentModel.DataAnnotations;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
-using System.Runtime.Serialization;
 
 namespace RenovationWorkDatabaseImplement.Models
 {
-	[DataContract]
 	public class Client : IClientModel
 	{
-		[DataMember]
 		public int Id { get; private set; }
-		[DataMember]
 		[Required]
 		public string ClientFIO { get; private set; } = string.Empty;
-		[DataMember]
 		[Required]
 		public string Email { get; set; } = string.Empty;
-		[DataMember]
 		[Required]
 		public string Password { get; set; } = string.Empty;
 		[ForeignKey("ClientId")]

RenovationWork/RenovationWorkDatabaseImplement/Models/Component.cs

@@ -9,20 +9,15 @@ using System.Threading.Tasks;
 using RenovationWorkContracts.BindingModels;
 using RenovationWorkContracts.ViewModels;
 using RenovationWorkDataModels.Models;
-using System.Runtime.Serialization;
 
 namespace RenovationWorkDatabaseImplement.Models
 {
-	[DataContract]
+    public class Component : IComponentModel
-	public class Component : IComponentModel
     {
-		[DataMember]
+        public int Id { get; private set; }
-		public int Id { get; private set; }
+        [Required]
-		[DataMember]
-		[Required]
         public string ComponentName { get; private set; } = string.Empty;
-		[DataMember]
+        [Required]
-		[Required]
         public double Cost { get; set; }
         [ForeignKey("ComponentId")]
         public virtual List<RepairComponent> RepairComponent { get; set; } = new();

RenovationWork/RenovationWorkDatabaseImplement/Models/Implementer.cs

@@ -9,26 +9,19 @@ using RenovationWorkContracts.BindingModels;
 using RenovationWorkDatabaseImplement.Models;
 using RenovationWorkContracts.ViewModels;
 using RenovationWorkDataModels.Models;
-using System.Runtime.Serialization;
 
 namespace RenovationWorkDatabaseImplement.Models
 {
-	[DataContract]
+    public class Implementer : IImplementerModel
-	public class Implementer : IImplementerModel
     {
-		[DataMember]
+        public int Id { get; private set; }
-		public int Id { get; private set; }
+        [Required]
-		[DataMember]
-		[Required]
         public string ImplementerFIO { get; private set; } = string.Empty;
-		[DataMember]
+        [Required]
-		[Required]
         public string Password { get; set; } = string.Empty;
-		[DataMember]
+        [Required]
-		[Required]
         public int Qualification { get; set; } = 0;
-		[DataMember]
+        [Required]
-		[Required]
         public int WorkExperience { get; set; } = 0;
         [ForeignKey("ImplementerId")]
         public virtual List<Order> Orders { get; set; } = new();

RenovationWork/RenovationWorkDatabaseImplement/Models/MessageInfo.cs

@@ -4,54 +4,47 @@ using RenovationWorkDataModels.Models;
 using System;
 using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations;
-using System.ComponentModel.DataAnnotations.Schema;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
-using System.Runtime.Serialization;
 
 namespace RenovationWorkDatabaseImplement.Models
 {
 	public class MessageInfo : IMessageInfoModel
 	{
 		[Key]
-		public string MessageId { get; set; } = string.Empty;
+		public string MessageId { get; private set; } = string.Empty;
-		public int? ClientId { get; set; }
+		public int? ClientId { get; private set; }
-		[Required]
+		public string SenderName { get; private set; } = string.Empty;
-		public string SenderName { get; set; } = string.Empty;
+		public DateTime DateDelivery { get; private set; } = DateTime.Now;
-		[Required]
+		public string Subject { get; private set; } = string.Empty;
-		public DateTime DateDelivery { get; set; }
+		public string Body { get; private set; } = string.Empty;
-		[Required]
+		public Client? Client { get; private set; }
-		public string Subject { get; set; } = string.Empty;
+		public static MessageInfo? Create(RenovationWorkDatabase context, MessageInfoBindingModel model)
-		[Required]
-		public string Body { get; set; } = string.Empty;
-		public static MessageInfo? Create(MessageInfoBindingModel model)
 		{
 			if (model == null)
 			{
 				return null;
 			}
-
 			return new()
 			{
+				Body = model.Body,
+				Subject = model.Subject,
+				ClientId = context.Clients.FirstOrDefault(x => x.Email == model.SenderName).Id,
+				Client = context.Clients.FirstOrDefault(x => x.Email == model.SenderName),
 				MessageId = model.MessageId,
 				SenderName = model.SenderName,
-				ClientId = model.ClientId,
+				DateDelivery = model.DateDelivery,
-				DateDelivery = DateTime.SpecifyKind(model.DateDelivery, DateTimeKind.Utc),
-				Subject = model.Subject,
-				Body = model.Body
 			};
 		}
-
 		public MessageInfoViewModel GetViewModel => new()
 		{
+			Body = Body,
+			Subject = Subject,
+			ClientId = ClientId,
 			MessageId = MessageId,
 			SenderName = SenderName,
 			DateDelivery = DateDelivery,
-			Subject = Subject,
-			Body = Body
 		};
-
-		public int Id => throw new NotImplementedException();
 	}
 }

RenovationWork/RenovationWorkDatabaseImplement/Models/Order.cs

@@ -9,47 +9,38 @@ using RenovationWorkContracts.BindingModels;
 using RenovationWorkContracts.ViewModels;
 using RenovationWorkDataModels.Enums;
 using RenovationWorkDataModels.Models;
-using System.Runtime.Serialization;
 
 namespace RenovationWorkDatabaseImplement.Models
 {
-	[DataContract]
+    public class Order : IOrderModel
-	public class Order : IOrderModel
     {
-		[DataMember]
+        public int Id { get; private set; }
-		public int Id { get; private set; }
 
-		[DataMember]
 		[Required]
 		public int ClientId { get; private set; }
 		public virtual Client Client { get; private set; }
 
-		[DataMember]
 		[Required]
         public int RepairId { get; private set; }
+        
         public virtual Repair Repair { get; set; } = new();
         
-		[DataMember]
+        [Required]
-		[Required]
         public int Count { get; private set; }
         
-		[DataMember]
+        [Required]
-		[Required]
         public double Sum { get; private set; }
         
-		[DataMember]
+        [Required]
-		[Required]
         public OrderStatus Status { get; private set; } = OrderStatus.Неизвестен;
         
-		[DataMember]
+        [Required]
-		[Required]
         public DateTime DateCreate { get; private set; } = DateTime.Now;
         
-		[DataMember]
+        public DateTime? DateImplement { get; private set; }
-		public DateTime? DateImplement { get; private set; }
 
-		[DataMember]
 		public int? ImplementerId { get; private set; } = null;
+
 		public virtual Implementer? Implementer { get; private set; }
 
 		public static Order Create(RenovationWorkDatabase context, OrderBindingModel model)

RenovationWork/RenovationWorkDatabaseImplement/Models/Repair.cs

@@ -3,24 +3,18 @@ using RenovationWorkContracts.ViewModels;
 using RenovationWorkDataModels.Models;
 using System.ComponentModel.DataAnnotations;
 using System.ComponentModel.DataAnnotations.Schema;
-using System.Runtime.Serialization;
 
 namespace RenovationWorkDatabaseImplement.Models
 {
-	[DataContract]
+    public class Repair : IRepairModel
-	public class Repair : IRepairModel
     {
-		[DataMember]
+        public int Id { get; set; }
-		public int Id { get; set; }
+        [Required]
-		[DataMember]
-		[Required]
         public string RepairName { get; set; } = string.Empty;
-		[DataMember]
+        [Required]
-		[Required]
         public double Price { get; set; }
         private Dictionary<int, (IComponentModel, int)>? _repairComponents = null;
-		[DataMember]
+        [NotMapped]
-		[NotMapped]
         public Dictionary<int, (IComponentModel, int)> RepairComponents
         {
             get

RenovationWork/RenovationWorkDatabaseImplement/RenovationWorkDatabaseImplement.csproj

@@ -20,8 +20,4 @@
     <ProjectReference Include="..\RenovationWorkDataModels\RenovationWorkDataModels.csproj" />
   </ItemGroup>
 
-  <Target Name="PostBuild" AfterTargets="PostBuildEvent">
-    <Exec Command="copy /Y &quot;$(TargetDir)*.dll&quot; &quot;$(SolutionDir)ImplementationExtensions\*.dll&quot;" />
-	</Target>
-
 </Project>

RenovationWork/RenovationWorkFileImplement/ImplementationExtension.cs

@@ -1,22 +0,0 @@
-using RenovationWorkContracts.DI;
-using RenovationWorkContracts.StoragesContracts;
-using RenovationWorkFileImplement.Implements;
-
-namespace RenovationWorkFileImplement
-{
-	public class ImplementationExtension : IImplementationExtension
-	{
-		public int Priority => 1;
-
-		public void RegisterServices()
-		{
-			DependencyManager.Instance.RegisterType<IClientStorage, ClientStorage>();
-			DependencyManager.Instance.RegisterType<IComponentStorage, ComponentStorage>();
-			DependencyManager.Instance.RegisterType<IImplementerStorage, ImplementerStorage>();
-			DependencyManager.Instance.RegisterType<IMessageInfoStorage, MessageInfoStorage>();
-			DependencyManager.Instance.RegisterType<IOrderStorage, OrderStorage>();
-			DependencyManager.Instance.RegisterType<IRepairStorage, RepairStorage>();
-			DependencyManager.Instance.RegisterType<IBackUpInfo, BackUpInfo>();
-		}
-	}
-}

RenovationWork/RenovationWorkFileImplement/Implements/BackUpInfo.cs

@@ -1,39 +0,0 @@
-using RenovationWorkContracts.StoragesContracts;
-using System.Reflection;
-
-namespace RenovationWorkFileImplement.Implements
-{
-	public class BackUpInfo : IBackUpInfo
-	{
-		private readonly DataFileSingleton source;
-		private readonly PropertyInfo[] sourceProperties;
-
-		public BackUpInfo()
-		{
-			source = DataFileSingleton.GetInstance();
-			sourceProperties = source.GetType().GetProperties(BindingFlags.Instance | BindingFlags.Public);
-		}
-
-		public List<T>? GetList<T>() where T : class, new()
-		{
-			var requredType = typeof(T);
-			return (List<T>?)sourceProperties.FirstOrDefault(x => x.PropertyType.IsGenericType && x.PropertyType.GetGenericArguments()[0] == requredType)
-				?.GetValue(source);
-
-		}
-
-		public Type? GetTypeByModelInterface(string modelInterfaceName)
-		{
-			var assembly = typeof(BackUpInfo).Assembly;
-			var types = assembly.GetTypes();
-			foreach (var type in types)
-			{
-				if (type.IsClass && type.GetInterface(modelInterfaceName) != null)
-				{
-					return type;
-				}
-			}
-			return null;
-		}
-	}
-}

RenovationWork/RenovationWorkFileImplement/Models/Client.cs

@@ -7,20 +7,14 @@ using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 using System.Xml.Linq;
-using System.Runtime.Serialization;
 
 namespace RenovationWorkFileImplement.Models
 {
-	[DataContract]
 	public class Client : IClientModel
 	{
-		[DataMember]
 		public int Id { get; private set; }
-		[DataMember]
 		public string ClientFIO { get; private set; } = string.Empty;
-		[DataMember]
 		public string Email { get; set; } = string.Empty;
-		[DataMember]
 		public string Password { get; set; } = string.Empty;
 		public static Client? Create(ClientBindingModel model)
 		{

RenovationWork/RenovationWorkFileImplement/Models/Component.cs

@@ -2,19 +2,15 @@
 using RenovationWorkContracts.ViewModels;
 using RenovationWorkDataModels.Models;
 using System.Xml.Linq;
-using System.Runtime.Serialization;
+
 
 namespace RenovationWorkFileImplement.Models
 {
-	[DataContract]
+    public class Component: IComponentModel
-	public class Component: IComponentModel
     {
-		[DataMember]
+        public int Id { get; private set; }
-		public int Id { get; private set; }
+        public string ComponentName { get; private set; } = string.Empty;
-		[DataMember]
+        public double Cost { get; set; }
-		public string ComponentName { get; private set; } = string.Empty;
-		[DataMember]
-		public double Cost { get; set; }
         public static Component? Create(ComponentBindingModel model)
         {
             if (model == null)

RenovationWork/RenovationWorkFileImplement/Models/Implementer.cs

@@ -7,23 +7,16 @@ using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 using System.Xml.Linq;
-using System.Runtime.Serialization;
 
 namespace RenovationWorkFileImplement.Models
 {
-	[DataContract]
+    public class Implementer : IImplementerModel
-	public class Implementer : IImplementerModel
     {
-		[DataMember]
+        public int Id { get; private set; }
-		public int Id { get; private set; }
+        public string ImplementerFIO { get; private set; } = string.Empty;
-		[DataMember]
+        public string Password { get; set; } = string.Empty;
-		public string ImplementerFIO { get; private set; } = string.Empty;
+        public int Qualification { get; set; } = 0;
-		[DataMember]
+        public int WorkExperience { get; set; } = 0;
-		public string Password { get; set; } = string.Empty;
-		[DataMember]
-		public int Qualification { get; set; } = 0;
-		[DataMember]
-		public int WorkExperience { get; set; } = 0;
         public static Implementer? Create(ImplementerBindingModel model)
         {
             if (model == null)

RenovationWork/RenovationWorkFileImplement/Models/MessageInfo.cs

@@ -7,26 +7,16 @@ using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 using System.Xml.Linq;
-using System.Runtime.Serialization;
 
 namespace RenovationWorkFileImplement.Models
 {
-	[DataContract]
 	public class MessageInfo : IMessageInfoModel
 	{
-		[DataMember]
-		public int Id { get; private set; }
-		[DataMember]
 		public string MessageId { get; private set; } = string.Empty;
-		[DataMember]
 		public int? ClientId { get; private set; }
-		[DataMember]
 		public string SenderName { get; private set; } = string.Empty;
-		[DataMember]
 		public DateTime DateDelivery { get; private set; } = DateTime.Now;
-		[DataMember]
 		public string Subject { get; private set; } = string.Empty;
-		[DataMember]
 		public string Body { get; private set; } = string.Empty;
 		public static MessageInfo? Create(MessageInfoBindingModel model)
 		{

RenovationWork/RenovationWorkFileImplement/Models/Order.cs

@@ -3,31 +3,20 @@ using RenovationWorkContracts.ViewModels;
 using RenovationWorkDataModels.Enums;
 using RenovationWorkDataModels.Models;
 using System.Xml.Linq;
-using System.Runtime.Serialization;
 
 namespace RenovationWorkFileImplement.Models
 {
-	[DataContract]
+    public class Order: IOrderModel
-	public class Order: IOrderModel
     {
-		[DataMember]
+        public int Id { get; private set; }
-		public int Id { get; private set; }
+        public int RepairId { get; private set; }
-		[DataMember]
-		public int RepairId { get; private set; }
-		[DataMember]
 		public int ClientId { get; private set; }
-		[DataMember]
 		public int? ImplementerId { get; private set; } = null;
-		[DataMember]
 		public int Count { get; private set; }
-		[DataMember]
+        public double Sum { get; private set; }
-		public double Sum { get; private set; }
+        public OrderStatus Status { get; private set; }
-		[DataMember]
+        public DateTime DateCreate { get; private set; }
-		public OrderStatus Status { get; private set; }
+        public DateTime? DateImplement { get; private set; }
-		[DataMember]
-		public DateTime DateCreate { get; private set; }
-		[DataMember]
-		public DateTime? DateImplement { get; private set; }
 
         public static Order? Create(OrderBindingModel model)
         {

RenovationWork/RenovationWorkFileImplement/Models/Repair.cs

@@ -2,23 +2,17 @@
 using RenovationWorkContracts.ViewModels;
 using RenovationWorkDataModels.Models;
 using System.Xml.Linq;
-using System.Runtime.Serialization;
 
 namespace RenovationWorkFileImplement.Models
 {
-	[DataContract]
+    public class Repair : IRepairModel
-	public class Repair : IRepairModel
     {
-		[DataMember]
+        public int Id { get; private set; }
-		public int Id { get; private set; }
+        public string RepairName { get; private set; } = string.Empty;
-		[DataMember]
+        public double Price { get; private set; }
-		public string RepairName { get; private set; } = string.Empty;
-		[DataMember]
-		public double Price { get; private set; }
         public Dictionary<int, int> Components { get; private set; } = new();
         private Dictionary<int, (IComponentModel, int)>? _repairComponents = null;
-		[DataMember]
+        public Dictionary<int, (IComponentModel, int)> RepairComponents
-		public Dictionary<int, (IComponentModel, int)> RepairComponents
         {
             get
             {

RenovationWork/RenovationWorkFileImplement/RenovationWorkFileImplement.csproj

@@ -11,8 +11,4 @@
     <ProjectReference Include="..\RenovationWorkDataModels\RenovationWorkDataModels.csproj" />
   </ItemGroup>
 
-  <Target Name="PostBuild" AfterTargets="PostBuildEvent">
-		<Exec Command="copy /Y &quot;$(TargetDir)*.dll&quot; &quot;$(SolutionDir)ImplementationExtensions\*.dll&quot;" />
-	</Target>
-
 </Project>

RenovationWork/RenovationWorkListImplement/ImplementationExtension.cs

@@ -1,27 +0,0 @@
-using RenovationWorkContracts.DI;
-using RenovationWorkContracts.StoragesContracts;
-using RenovationWorkListImplement.Implements;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace RenovationWorkListImplement
-{
-	internal class ImplementationExtension : IImplementationExtension
-	{
-		public int Priority => 0;
-
-		public void RegisterServices()
-		{
-			DependencyManager.Instance.RegisterType<IClientStorage, ClientStorage>();
-			DependencyManager.Instance.RegisterType<IComponentStorage, ComponentStorage>();
-			DependencyManager.Instance.RegisterType<IImplementerStorage, ImplementerStorage>();
-			DependencyManager.Instance.RegisterType<IMessageInfoStorage, MessageInfoStorage>();
-			DependencyManager.Instance.RegisterType<IOrderStorage, OrderStorage>();
-			DependencyManager.Instance.RegisterType<IRepairStorage, RepairStorage>();
-			DependencyManager.Instance.RegisterType<IBackUpInfo, BackUpInfo>();
-		}
-	}
-}

RenovationWork/RenovationWorkListImplement/Implements/BackUpInfo.cs

@@ -1,17 +0,0 @@
-using RenovationWorkContracts.StoragesContracts;
-
-namespace RenovationWorkListImplement.Implements
-{
-	public class BackUpInfo : IBackUpInfo
-	{
-		public List<T>? GetList<T>() where T : class, new()
-		{
-			throw new NotImplementedException();
-		}
-
-		public Type? GetTypeByModelInterface(string modelInterfaceName)
-		{
-			throw new NotImplementedException();
-		}
-	}
-}

RenovationWork/RenovationWorkListImplement/Models/MessageInfo.cs

@@ -17,7 +17,6 @@ namespace RenovationWorkListImplement.Models
 		public DateTime DateDelivery { get; private set; } = DateTime.Now;
 		public string Subject { get; private set; } = string.Empty;
 		public string Body { get; private set; } = string.Empty;
-		public int Id => throw new NotImplementedException();
 		public static MessageInfo? Create(MessageInfoBindingModel model)
 		{
 			if (model == null)

RenovationWork/RenovationWorkListImplement/RenovationWorkListImplement.csproj

@@ -11,8 +11,4 @@
     <ProjectReference Include="..\RenovationWorkDataModels\RenovationWorkDataModels.csproj" />
   </ItemGroup>
 
-  <Target Name="PostBuild" AfterTargets="PostBuildEvent">
-		<Exec Command="copy /Y &quot;$(TargetDir)*.dll&quot; &quot;$(SolutionDir)ImplementationExtensions\*.dll&quot;" />
-	</Target>
-
 </Project>