Search client by login

AutoWorkshop.sln

@@ -15,13 +15,11 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AutoWorkshopListImplement",
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AutoWorkshopFileImplement", "AutoWorkshopFileImplement\AutoWorkshopFileImplement.csproj", "{862B0F3D-1B88-45B8-9526-AD21A6D6FA81}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AutoWorkshopDatabaseImplement", "AutoWorkshopDatabaseImplement\AutoWorkshopDatabaseImplement.csproj", "{751668F7-01A3-43F0-BDD8-ABB3A8F5A955}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AutoWorkshopDatabaseImplement", "AutoWorkshopDatabaseImplement\AutoWorkshopDatabaseImplement.csproj", "{751668F7-01A3-43F0-BDD8-ABB3A8F5A955}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AutoWorkshopRestApi", "AutoWorkshopRestApi\AutoWorkshopRestApi.csproj", "{15C54F32-1549-4887-BE08-DC6845B0D7ED}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AutoWorkshopRestApi", "AutoWorkshopRestApi\AutoWorkshopRestApi.csproj", "{15C54F32-1549-4887-BE08-DC6845B0D7ED}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AutoWorkshopClientApp", "AutoWorkshopClientApp\AutoWorkshopClientApp.csproj", "{EAE83B19-8CE1-4589-907A-DB9C8313FA06}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AutoWorkshopShopApp", "AutoWorkshopShopApp\AutoWorkshopShopApp.csproj", "{5934B924-59F1-42B6-9116-33F4947525CC}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AutoWorkshopClientApp", "AutoWorkshopClientApp\AutoWorkshopClientApp.csproj", "{EAE83B19-8CE1-4589-907A-DB9C8313FA06}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -65,10 +63,6 @@ Global
 		{EAE83B19-8CE1-4589-907A-DB9C8313FA06}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{EAE83B19-8CE1-4589-907A-DB9C8313FA06}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{EAE83B19-8CE1-4589-907A-DB9C8313FA06}.Release|Any CPU.Build.0 = Release|Any CPU
-		{5934B924-59F1-42B6-9116-33F4947525CC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{5934B924-59F1-42B6-9116-33F4947525CC}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{5934B924-59F1-42B6-9116-33F4947525CC}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{5934B924-59F1-42B6-9116-33F4947525CC}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

AutoWorkshopBusinessLogic/AutoWorkshopBusinessLogic.csproj

@@ -8,6 +8,7 @@
 
   <ItemGroup>
     <PackageReference Include="DocumentFormat.OpenXml" Version="2.19.0" />
+    <PackageReference Include="MailKit" Version="4.5.0" />
     <PackageReference Include="Microsoft.Extensions.Logging" Version="8.0.0" />
     <PackageReference Include="PdfSharp.MigraDoc.Standard" Version="1.51.15" />
   </ItemGroup>

AutoWorkshopBusinessLogic/BusinessLogics/ClientLogic.cs

@@ -4,10 +4,11 @@ using AutoWorkshopContracts.SearchModels;
 using AutoWorkshopContracts.StoragesContracts;
 using AutoWorkshopContracts.ViewModels;
 using Microsoft.Extensions.Logging;
+using System.Text.RegularExpressions;
 
 namespace AutoWorkshopBusinessLogic.BusinessLogics
 {
-    public class ClientLogic : IClientLogic
+	public class ClientLogic : IClientLogic
     {
         private readonly ILogger _logger;
         private readonly IClientStorage _clientStorage;
@@ -100,11 +101,11 @@ namespace AutoWorkshopBusinessLogic.BusinessLogics
             if (string.IsNullOrEmpty(Model.ClientFIO))
                 throw new ArgumentNullException("Нет ФИО клиента", nameof(Model.ClientFIO));
             
-            if (string.IsNullOrEmpty(Model.Email))
-                throw new ArgumentNullException("Нет Email клиента", nameof(Model.ClientFIO));
+            if (string.IsNullOrEmpty(Model.Email) || !Regex.IsMatch(Model.Email, @"^[a-z0-9._%+-]+\@([a-z0-9-]+\.)+[a-z]{2,4}$"))
+                throw new ArgumentException("Почта не соответствует требованиям", nameof(Model.Email));
 
-            if (string.IsNullOrEmpty(Model.Password))
-                throw new ArgumentNullException("Нет пароля клиента", nameof(Model.ClientFIO));
+            if (string.IsNullOrEmpty(Model.Password) || !Regex.IsMatch(Model.Password, @"^(?=.*[A-Za-z])(?=.*\d)(?=.*[^A-Za-z0-9\n]).{10,50}$"))
+                throw new ArgumentException("Пароль не соответствует требованиям", nameof(Model.Password));
 
             _logger.LogInformation("Client. ClientFIO: {ClientFIO}." +
                 "Email: {Email}. Password: {Password}. Id: {Id} ", Model.ClientFIO, Model.Email, Model.Password, Model.Id);

AutoWorkshopBusinessLogic/BusinessLogics/ImplementerLogic.cs

@@ -0,0 +1,135 @@
+using AutoWorkshopContracts.BindingModels;
+using AutoWorkshopContracts.BusinessLogicsContracts;
+using AutoWorkshopContracts.SearchModels;
+using AutoWorkshopContracts.StoragesContracts;
+using AutoWorkshopContracts.ViewModels;
+using Microsoft.Extensions.Logging;
+
+namespace AutoWorkshopBusinessLogic.BusinessLogics
+{
+    public class ImplementerLogic : IImplementerLogic
+    {
+        private readonly ILogger _logger;
+        private readonly IImplementerStorage _implementerStorage;
+
+        public ImplementerLogic(ILogger<IImplementerLogic> Logger, IImplementerStorage ImplementerStorage)
+        {
+            _logger = Logger;
+            _implementerStorage = ImplementerStorage;
+        }
+
+        public List<ImplementerViewModel>? ReadList(ImplementerSearchModel? Model)
+        {
+            _logger.LogInformation("ReadList. ImplementerFIO: {ImplementerFIO}. Password: {Password}. Id: {Id}", 
+                Model?.ImplementerFIO, Model?.Password?.Length, Model?.Id);
+            
+            var List = Model == null ? _implementerStorage.GetFullList() : _implementerStorage.GetFilteredList(Model);
+            
+            if (List == null)
+            {
+                _logger.LogWarning("ReadList return null list");
+                return null;
+            }
+            
+            _logger.LogInformation("ReadList. Count: {Count}", List.Count);
+            return List;
+        }
+
+        public ImplementerViewModel? ReadElement(ImplementerSearchModel Model)
+        {
+            if (Model is null)
+            {
+                throw new ArgumentNullException(nameof(Model));
+            }
+            
+            _logger.LogInformation("ReadElement. ImplementerFIO: {ImplementerFIO}. Password: {Password}. Id: {Id}", 
+                Model?.ImplementerFIO, Model?.Password?.Length, Model?.Id);
+            
+            var Element = _implementerStorage.GetElement(Model);
+            
+            if (Element == null)
+            {
+                _logger.LogWarning("ReadElement element not found");
+                return null;
+            }
+            
+            _logger.LogInformation("ReadElement find. Id: {Id}", Element.Id);
+            return Element;
+        }
+
+        public bool Create(ImplementerBindingModel Model)
+        {
+            CheckModel(Model);
+            
+            if (_implementerStorage.Insert(Model) == null)
+            {
+                _logger.LogWarning("Insert operation failed");
+                return false;
+            }
+            
+            return true;
+        }
+
+        public bool Update(ImplementerBindingModel Model)
+        {
+            CheckModel(Model);
+            
+            if (_implementerStorage.Update(Model) == null)
+            {
+                _logger.LogWarning("Update operation failed");
+                return false;
+            }
+            
+            return true;
+        }
+
+        public bool Delete(ImplementerBindingModel Model)
+        {
+            CheckModel(Model, false);
+            
+            _logger.LogInformation("Delete. Id:{Id}", Model.Id);
+            
+            if (_implementerStorage.Delete(Model) == null)
+            {
+                _logger.LogWarning("Delete operation failed");
+                return false;
+            }
+            
+            return true;
+        }
+
+        private void CheckModel(ImplementerBindingModel Model, bool WithParams = true)
+        {
+            if (Model == null)
+                throw new ArgumentNullException(nameof(Model));
+            
+            if (!WithParams)
+                return;
+            
+            if (string.IsNullOrEmpty(Model.ImplementerFIO))
+                throw new ArgumentNullException("Нет ФИО исполнителя", nameof(Model.ImplementerFIO));
+
+            if (string.IsNullOrEmpty(Model.Password))
+                throw new ArgumentNullException("Нет пароля исполнителя", nameof(Model.Password));
+
+            if (Model.WorkExperience < 0)
+                throw new ArgumentNullException("Стаж должен быть неотрицательным целым числом", nameof(Model.WorkExperience));
+
+            if (Model.Qualification < 0)
+                throw new ArgumentNullException("Квалификация должна быть неотрицательным целым числом", nameof(Model.Qualification));
+
+            _logger.LogInformation("Implementer. ImplementerFIO: {ImplementerFIO}. Password: {Password}. WorkExperience: {WorkExperience}. Qualification: {Qualification}. Id: {Id}",
+                Model.ImplementerFIO, Model.Password, Model.WorkExperience, Model.Qualification, Model.Id);
+            
+            var Implementer = _implementerStorage.GetElement(new ImplementerSearchModel
+            {
+                ImplementerFIO = Model.ImplementerFIO
+            });
+            
+            if (Implementer != null && Implementer.Id != Model.Id)
+            {
+                throw new InvalidOperationException("Исполнитель с таким ФИО уже есть");
+            }
+        }
+    }
+}

AutoWorkshopBusinessLogic/BusinessLogics/MessageInfoLogic.cs

@@ -0,0 +1,85 @@
+using AutoWorkshopContracts.BindingModels;
+using AutoWorkshopContracts.BusinessLogicContracts;
+using AutoWorkshopContracts.SearchModels;
+using AutoWorkshopContracts.StoragesContracts;
+using AutoWorkshopContracts.ViewModels;
+using Microsoft.Extensions.Logging;
+
+namespace AutoWorkshopBusinessLogic.BusinessLogics
+{
+	public class MessageInfoLogic : IMessageInfoLogic
+	{
+		private readonly ILogger _logger;
+		
+		private readonly IMessageInfoStorage _messageInfoStorage;
+		private readonly IClientStorage _clientStorage;
+
+		public MessageInfoLogic(ILogger<MessageInfoLogic> Logger, IMessageInfoStorage MessageInfoStorage, IClientStorage ClientStorage)
+		{
+			_logger = Logger;
+			_messageInfoStorage = MessageInfoStorage;
+			_clientStorage = ClientStorage;
+		}
+
+		public List<MessageInfoViewModel>? ReadList(MessageInfoSearchModel? Model)
+		{
+			_logger.LogDebug("ReadList. MessageId: {MessageId}, ClientId: {ClientId}", Model?.MessageId, Model?.ClientId);
+
+			var Result = Model == null ? _messageInfoStorage.GetFullList() : _messageInfoStorage.GetFilteredList(Model);
+
+			_logger.LogDebug("ReadList result. Count: {Count}", Result.Count);
+			return Result;
+		}
+
+		public bool Create(MessageInfoBindingModel Model)
+		{
+			CheckModel(Model);
+			
+			if (_messageInfoStorage.Insert(Model) == null)
+			{
+				_logger.LogWarning("Insert operation failed");
+				return false;
+			}
+			
+			return true;
+		}
+
+		private void CheckModel(MessageInfoBindingModel Model, bool WithParams = true)
+		{
+			if (Model == null)
+				throw new ArgumentNullException(nameof(Model));
+
+			if (!WithParams)
+				return;
+
+			if (string.IsNullOrEmpty(Model.MessageId))
+				throw new ArgumentNullException("Не указан id сообщения", nameof(Model.MessageId));
+
+			if (string.IsNullOrEmpty(Model.SenderName))
+				throw new ArgumentNullException("Не указао почта", nameof(Model.SenderName));
+
+			if (string.IsNullOrEmpty(Model.Subject))
+				throw new ArgumentNullException("Не указана тема", nameof(Model.Subject));
+
+			if (string.IsNullOrEmpty(Model.Body))
+				throw new ArgumentNullException("Не указан текст сообщения", nameof(Model.Subject));
+
+			_logger.LogInformation("MessageInfo. MessageId: {MessageId}. SenderName: {SenderName}. Subject: {Subject}. Body: {Body}", 
+				Model.MessageId, Model.SenderName, Model.Subject, Model.Body);
+			
+			var Element = _clientStorage.GetElement(new ClientSearchModel
+			{
+				Email = Model.SenderName
+			});
+			
+			if (Element == null)
+			{
+				_logger.LogWarning("Не удалось найти клиента, отправившего письмо с адреса {Email}", Model.SenderName);
+			}
+			else
+			{
+				Model.ClientId = Element.Id;
+			}
+		}
+	}
+}

AutoWorkshopBusinessLogic/BusinessLogics/OrderLogic.cs

@@ -1,4 +1,5 @@
-using AutoWorkshopContracts.BindingModels;
+using AutoWorkshopBusinessLogic.MailWorker;
+using AutoWorkshopContracts.BindingModels;
 using AutoWorkshopContracts.BusinessLogicContracts;
 using AutoWorkshopContracts.SearchModels;
 using AutoWorkshopContracts.StoragesContracts;
@@ -8,36 +9,38 @@ using Microsoft.Extensions.Logging;
 
 namespace AutoWorkshopBusinessLogic.BusinessLogics
 {
-    public class OrderLogic : IOrderLogic
+	public class OrderLogic : IOrderLogic
     {
         private readonly ILogger _logger;
 
         private readonly IOrderStorage _orderStorage;
-        private readonly IShopStorage _shopStorage;
 
-        public OrderLogic(ILogger<RepairLogic> Logger, IOrderStorage OrderStorage, IShopStorage ShopStorage)
+        private readonly AbstractMailWorker _mailLogic;
+
+        static readonly object _locker = new object();
+
+        public OrderLogic(ILogger<RepairLogic> Logger, IOrderStorage OrderStorage, AbstractMailWorker MailLogic)
         {
             _logger = Logger;
-            
             _orderStorage = OrderStorage;
-            _shopStorage = ShopStorage;
+            _mailLogic = MailLogic;
         }
 
         public List<OrderViewModel>? ReadList(OrderSearchModel? Model)
         {
-            _logger.LogInformation("ReadList. Id:{Id}", Model?.Id);
+            _logger.LogInformation("ReadList. ClientId: {ClientId}. Status: {Status}. ImplementerId: {ImplementerId}. DateFrom: {DateFrom}. DateTo: {DateTo}. OrderId: {Id}",
+                Model?.ClientId, Model?.Status, Model?.ImplementerId, Model?.DateFrom, Model?.DateTo, Model?.Id);
+            
             var List = Model is null ? _orderStorage.GetFullList() : _orderStorage.GetFilteredList(Model);
-
             if (List is null)
             {
                 _logger.LogWarning("ReadList return null list");
                 return null;
             }
-
             _logger.LogInformation("ReadList. Count: {Count}", List.Count);
             return List;
         }
-
+        
         public bool CreateOrder(OrderBindingModel Model)
         {
             CheckModel(Model);
@@ -50,23 +53,30 @@ namespace AutoWorkshopBusinessLogic.BusinessLogics
 
             Model.Status = OrderStatus.Accepted;
 
-            if (_orderStorage.Insert(Model) is null)
+            var CreatedOrder = _orderStorage.Insert(Model);
+
+			if (CreatedOrder == null)
             {
                 _logger.LogWarning("Insert operation failed");
                 return false;
             }
 
-            return true;
-        }
-
-        private bool ChangeOrderStatus(OrderBindingModel Model, OrderStatus NewStatus)
-        {
-            CheckModel(Model, false);
-
-            var Order = _orderStorage.GetElement(new OrderSearchModel { Id = Model.Id });
-            
-            if (Order == null)
+            Task.Run(() => _mailLogic.SendMailAsync(new MailSendInfoBindingModel
             {
+            	MailAddress = CreatedOrder.ClientEmail,
+            	Subject = $"Изменение статуса заказа номер {CreatedOrder.Id}",
+            	Text = $"Ваш заказ номер {CreatedOrder.Id} на ремонт {CreatedOrder.RepairName} от {CreatedOrder.DateCreate} на сумму {CreatedOrder.Sum} принят."
+            }));
+
+			return true;
+		}
+		
+        private bool ChangeOrderStatus(OrderBindingModel Model, OrderStatus NewStatus)
+		{
+			CheckModel(Model, false);
+			var Order = _orderStorage.GetElement(new OrderSearchModel { Id = Model.Id });
+			if (Order == null)
+			{
                 _logger.LogWarning("Change status operation failed. Order not found");
                 return false;
             }
@@ -79,6 +89,8 @@ namespace AutoWorkshopBusinessLogic.BusinessLogics
             }
             
             Model.RepairId = Order.RepairId;
+            Model.ClientId = Order.ClientId;
+            if (!Model.ImplementerId.HasValue) Model.ImplementerId = Order.ImplementerId;
             Model.Count = Order.Count;
             Model.Sum = Order.Sum;
             Model.DateCreate = Order.DateCreate;
@@ -92,15 +104,26 @@ namespace AutoWorkshopBusinessLogic.BusinessLogics
             if (_orderStorage.Update(Model) == null)
             {
                 _logger.LogWarning("Change status operation failed");
-                return false;
-            }
+				return false;
+			}
 
-            return true;
+			string DateInfo = Model.DateImplement.HasValue ? $"Дата выполнения: {Model.DateImplement}" : "";
+			Task.Run(() => _mailLogic.SendMailAsync(new MailSendInfoBindingModel
+			{
+				MailAddress = Order.ClientEmail,
+				Subject = $"Изменение статуса заказа номер {Order.Id}",
+				Text = $"Ваш заказ номер {Order.Id} на ремонт {Order.RepairName} от {Order.DateCreate} на сумму {Order.Sum}. Статус изменен на {NewStatus}. {DateInfo}"
+			}));
+
+			return true;
         }
 
         public bool TakeOrderInWork(OrderBindingModel Model)
         {
-            return ChangeOrderStatus(Model, OrderStatus.BeingProcessed);
+            lock (_locker)
+            {
+                return ChangeOrderStatus(Model, OrderStatus.BeingProcessed);
+            }
         }
 
         public bool FinishOrder(OrderBindingModel Model)
@@ -110,23 +133,6 @@ namespace AutoWorkshopBusinessLogic.BusinessLogics
 
         public bool DeliveryOrder(OrderBindingModel Model)
         {
-            var Order = _orderStorage.GetElement(new OrderSearchModel
-            {
-                Id = Model.Id
-            });
-
-            if (Order is null)
-                throw new ArgumentNullException(nameof(Order));
-
-            if (!_shopStorage.RestockingShops(new SupplyBindingModel
-            {
-                RepairId = Order.RepairId,
-                Count = Order.Count
-            }))
-            {
-                throw new ArgumentException("Недостаточно места");
-            }
-
             return ChangeOrderStatus(Model, OrderStatus.Delivered);
         }
 
@@ -149,5 +155,27 @@ namespace AutoWorkshopBusinessLogic.BusinessLogics
                 Model.RepairId, Model.Count, Model.Sum, Model.Status, Model.DateCreate,
                 Model.DateImplement, Model.Id);
         }
+
+        public OrderViewModel? ReadElement(OrderSearchModel Model)
+        {
+            if (Model == null)
+            {
+                throw new ArgumentNullException(nameof(Model));
+            }
+
+            _logger.LogInformation("ReadElement. ClientId: {ClientId}. Status: {Status}. ImplementerId: {ImplementerId}. DateFrom: {DateFrom}. DateTo: {DateTo}. OrderId: {Id}",
+                Model.ClientId, Model.Status, Model.ImplementerId, Model.DateFrom, Model.DateTo, Model.Id);
+            
+            var Order = _orderStorage.GetElement(Model);
+            
+            if (Order == null)
+            {
+                _logger.LogWarning("ReadElement element not found");
+                return null;
+            }
+            
+            _logger.LogInformation("ReadElement find. Id: {Id}", Order.Id);
+            return Order;
+        }
     }
 }

AutoWorkshopBusinessLogic/BusinessLogics/ReportLogic.cs

@@ -13,18 +13,16 @@ namespace AutoWorkshopBusinessLogic.BusinessLogics
         private readonly IComponentStorage _componentStorage;
         private readonly IRepairStorage _RepairStorage;
         private readonly IOrderStorage _orderStorage;
-        private readonly IShopStorage _shopStorage;
         private readonly AbstractSaveToExcel _saveToExcel;
         private readonly AbstractSaveToWord _saveToWord;
         private readonly AbstractSaveToPdf _saveToPdf;
 
-        public ReportLogic(IRepairStorage RepairStorage, IComponentStorage ComponentStorage, IOrderStorage OrderStorage, IShopStorage ShopStorage,
+        public ReportLogic(IRepairStorage RepairStorage, IComponentStorage ComponentStorage, IOrderStorage OrderStorage,
             AbstractSaveToExcel SaveToExcel, AbstractSaveToWord SaveToWord, AbstractSaveToPdf SaveToPdf)
         {
             _RepairStorage = RepairStorage;
             _componentStorage = ComponentStorage;
             _orderStorage = OrderStorage;
-            _shopStorage = ShopStorage;
 
             _saveToExcel = SaveToExcel;
             _saveToWord = SaveToWord;
@@ -43,26 +41,6 @@ namespace AutoWorkshopBusinessLogic.BusinessLogics
                 .ToList();
         }
 
-        public List<ReportShopsViewModel> GetShops()
-        {
-            return _shopStorage.GetFullList().Select(x => new ReportShopsViewModel
-            {
-                ShopName = x.ShopName,
-                Repairs = x.ShopRepairs.Select(x => (x.Value.Item1.RepairName, x.Value.Item2)).ToList(),
-                TotalCount = x.ShopRepairs.Select(x => x.Value.Item2).Sum()
-            }).ToList();
-        }
-
-        public List<ReportGroupedOrdersViewModel> GetGroupedOrders()
-        {
-            return _orderStorage.GetFullList().GroupBy(x => x.DateCreate.Date).Select(x => new ReportGroupedOrdersViewModel
-            {
-                Date = x.Key,
-                OrdersCount = x.Count(),
-                OrdersSum = x.Select(y => y.Sum).Sum()
-            }).ToList();
-        }
-
         public List<ReportOrdersViewModel> GetOrders(ReportBindingModel Model)
         {
             return _orderStorage.GetFilteredList(new OrderSearchModel { DateFrom = Model.DateFrom, DateTo = Model.DateTo })
@@ -79,7 +57,7 @@ namespace AutoWorkshopBusinessLogic.BusinessLogics
 
         public void SaveRepairsToWordFile(ReportBindingModel Model)
         {
-            _saveToWord.CreateRepairsDoc(new WordRepairsInfo
+            _saveToWord.CreateDoc(new WordInfo
             {
                 FileName = Model.FileName,
                 Title = "Список ремонтов",
@@ -89,7 +67,7 @@ namespace AutoWorkshopBusinessLogic.BusinessLogics
 
         public void SaveRepairComponentToExcelFile(ReportBindingModel Model)
         {
-            _saveToExcel.CreateReport(new ExcelRepairsInfo
+            _saveToExcel.CreateReport(new ExcelInfo
             {
                 FileName = Model.FileName,
                 Title = "Список ремонтов",
@@ -99,7 +77,7 @@ namespace AutoWorkshopBusinessLogic.BusinessLogics
 
         public void SaveOrdersToPdfFile(ReportBindingModel Model)
         {
-            _saveToPdf.CreateDoc(new PdfOrdersInfo
+            _saveToPdf.CreateDoc(new PdfInfo
             {
                 FileName = Model.FileName,
                 Title = "Список заказов",
@@ -108,35 +86,5 @@ namespace AutoWorkshopBusinessLogic.BusinessLogics
                 Orders = GetOrders(Model)
             });
         }
-
-        public void SaveShopsToWordFile(ReportBindingModel model)
-        {
-            _saveToWord.CreateShopsDoc(new WordShopsInfo
-            {
-                FileName = model.FileName,
-                Title = "Список магазинов",
-                Shops = _shopStorage.GetFullList()
-            });
-        }
-
-        public void SaveShopsToExcelFile(ReportBindingModel model)
-        {
-            _saveToExcel.CreateShopRepairsReport(new ExcelShopsInfo
-            {
-                FileName = model.FileName,
-                Title = "Загруженность магазинов",
-                ShopRepairs = GetShops()
-            });
-        }
-
-        public void SaveGroupedOrdersToPdfFile(ReportBindingModel model)
-        {
-            _saveToPdf.CreateGroupedOrdersDoc(new PdfGroupedOrdersInfo
-            {
-                FileName = model.FileName,
-                Title = "Список заказов, объединенных по датам",
-                GroupedOrders = GetGroupedOrders()
-            });
-        }
     }
 }

AutoWorkshopBusinessLogic/BusinessLogics/ShopLogic.cs

@@ -1,194 +0,0 @@
-using AutoWorkshopContracts.BindingModels;
-using AutoWorkshopContracts.BusinessLogicsContracts;
-using AutoWorkshopContracts.SearchModels;
-using AutoWorkshopContracts.StoragesContracts;
-using AutoWorkshopContracts.ViewModels;
-using Microsoft.Extensions.Logging;
-
-namespace AutoWorkshopBusinessLogic.BusinessLogics
-{
-    public class ShopLogic : IShopLogic
-    {
-        private readonly ILogger _logger;
-        private readonly IShopStorage _shopStorage;
-        private readonly IRepairStorage _repairStorage;
-
-        public ShopLogic(ILogger<ShopLogic> Logger, IShopStorage ShopStorage, IRepairStorage RepairStorage)
-        {
-            _logger = Logger;
-            _shopStorage = ShopStorage;
-            _repairStorage = RepairStorage;
-        }
-
-        public List<ShopViewModel>? ReadList(ShopSearchModel? Model)
-        {
-            _logger.LogInformation("ReadList. ShopName:{ShopName}.Id:{ Id}", Model?.ShopName, Model?.Id);
-            
-            var List = Model == null ? _shopStorage.GetFullList() : _shopStorage.GetFilteredList(Model);
-            
-            if (List == null)
-            {
-                _logger.LogWarning("ReadList return null list");
-                return null;
-            }
-            
-            _logger.LogInformation("ReadList. Count:{Count}", List.Count);
-            return List;
-        }
-
-        public ShopViewModel? ReadElement(ShopSearchModel Model)
-        {
-            if (Model == null)
-                throw new ArgumentNullException(nameof(Model));
-
-            _logger.LogInformation("ReadElement. ShopName:{ShopName}.Id:{ Id}", Model.ShopName, Model.Id);
-            
-            var Element = _shopStorage.GetElement(Model);
-            if (Element == null)
-            {
-                _logger.LogWarning("ReadElement element not found");
-                return null;
-            }
-            
-            _logger.LogInformation("ReadElement find. Id:{Id}", Element.Id);
-            return Element;
-        }
-
-        public bool Create(ShopBindingModel Model)
-        {
-            CheckModel(Model);
-            
-            if (_shopStorage.Insert(Model) == null)
-            {
-                _logger.LogWarning("Insert operation failed");
-                return false;
-            }
-            
-            return true;
-        }
-
-        public bool Update(ShopBindingModel Model)
-        {
-            CheckModel(Model);
-            
-            if (_shopStorage.Update(Model) == null)
-            {
-                _logger.LogWarning("Update operation failed");
-                return false;
-            }
-            
-            return true;
-        }
-
-        public bool Delete(ShopBindingModel Model)
-        {
-            CheckModel(Model, false);
-            _logger.LogInformation("Delete. Id:{Id}", Model.Id);
-            
-            if (_shopStorage.Delete(Model) == null)
-            {
-                _logger.LogWarning("Delete operation failed");
-                return false;
-            }
-            
-            return true;
-        }
-
-        public bool MakeSupply(SupplyBindingModel Model)
-        {
-            if (Model == null)
-                throw new ArgumentNullException(nameof(Model));
-
-            if (Model.Count <= 0)
-                throw new ArgumentException("Количество ремонтов должно быть больше 0");
-
-            ShopViewModel? Shop = _shopStorage.GetElement(new ShopSearchModel
-            {
-                Id = Model.ShopId
-            });
-            
-            if (Shop == null)
-                throw new ArgumentException("Магазина не существует");
-
-            int CurrentRepairsNum = Shop.ShopRepairs.Select(x => x.Value.Item2).Sum();
-            if (Model.Count > Shop.RepairsMaxCount - CurrentRepairsNum)
-            {
-                _logger.LogWarning("Попытка добавить в магазин число элементов, большее RepairsMaxCount");
-                return false;
-            }
-
-            if (Shop.ShopRepairs.ContainsKey(Model.RepairId))
-            {
-                var RepairsNum = Shop.ShopRepairs[Model.RepairId];
-                RepairsNum.Item2 += Model.Count;
-                Shop.ShopRepairs[Model.RepairId] = RepairsNum;
-            }
-            else
-            {
-                var Repair = _repairStorage.GetElement(new RepairSearchModel
-                {
-                    Id = Model.RepairId
-                });
-                
-                if (Repair == null)
-                    throw new ArgumentException($"Поставка: Товар с id {Model.RepairId} не найден");
-
-                Shop.ShopRepairs.Add(Model.RepairId, (Repair, Model.Count));
-            }
-
-            _shopStorage.Update(new ShopBindingModel()
-            {
-                Id = Shop.Id,
-                ShopName = Shop.ShopName,
-                Address = Shop.Address,
-                OpeningDate = Shop.OpeningDate,
-                ShopRepairs = Shop.ShopRepairs,
-                RepairsMaxCount = Shop.RepairsMaxCount,
-            });
-            return true;
-        }
-
-        private void CheckModel(ShopBindingModel Model, bool WithParams=true)
-        {
-            if (Model == null)
-                throw new ArgumentNullException(nameof(Model));
-
-            if (!WithParams)
-                return;
-
-            if (string.IsNullOrEmpty(Model.Address))
-                throw new ArgumentException("Адрес магазина длжен быть заполнен", nameof(Model.Address));
-
-            if (string.IsNullOrEmpty(Model.ShopName))
-                throw new ArgumentException("Название магазина должно быть заполнено", nameof(Model.ShopName));
-
-            _logger.LogInformation("Shop. ShopName: {ShopName}. Address: {Address}. OpeningDate: {OpeningDate}. Id:{Id}", 
-                Model.ShopName, Model.Address, Model.OpeningDate, Model.Id);
-            
-            var Element = _shopStorage.GetElement(new ShopSearchModel
-            {
-                ShopName = Model.ShopName
-            });
-            if (Element != null && Element.Id != Model.Id)
-            {
-                throw new InvalidOperationException("Магазин с таким названием уже есть");
-            }
-        }
-
-        public bool MakeSell(SupplySearchModel Model)
-        {
-            if (!Model.RepairId.HasValue || !Model.Count.HasValue)
-                return false;
-
-            _logger.LogInformation("Поиск ремонтов во всех магазинах");
-            if (_shopStorage.Sell(Model))
-            {
-                _logger.LogInformation("Продажа выполнена успешно");
-                return true;
-            }
-            
-            _logger.LogInformation("Продажа не выполнена");
-            return false;
-        }
-    }
-}

AutoWorkshopBusinessLogic/BusinessLogics/WorkModeling.cs

@@ -0,0 +1,153 @@
+using AutoWorkshopContracts.BindingModels;
+using AutoWorkshopContracts.BusinessLogicContracts;
+using AutoWorkshopContracts.BusinessLogicsContracts;
+using AutoWorkshopContracts.SearchModels;
+using AutoWorkshopContracts.ViewModels;
+using AutoWorkshopDataModels.Enums;
+using Microsoft.Extensions.Logging;
+
+namespace AutoWorkshopBusinessLogic.BusinessLogics
+{
+    public class WorkModeling : IWorkProcess
+    {
+        private readonly ILogger _logger;
+
+        private readonly Random _rnd;
+
+        private IOrderLogic? _orderLogic;
+
+        public WorkModeling(ILogger<WorkModeling> Logger)
+        {
+            _logger = Logger;
+            _rnd = new Random(1000);
+        }
+
+        public void DoWork(IImplementerLogic ImplementerLogic, IOrderLogic OrderLogic)
+        {
+            _orderLogic = OrderLogic;
+            
+            var Implementers = ImplementerLogic.ReadList(null);
+            
+            if (Implementers == null)
+            {
+                _logger.LogWarning("DoWork. Implementers is null");
+                return;
+            }
+            
+            var Orders = _orderLogic.ReadList(new OrderSearchModel { Status = OrderStatus.Accepted });
+            var BeingProcessedOrders = _orderLogic.ReadList(new OrderSearchModel { Status = OrderStatus.BeingProcessed });
+                // in case there are BeingProcessed orders but no Accepted orders
+
+            if (Orders == null || BeingProcessedOrders == null || (Orders.Count == 0 && BeingProcessedOrders.Count == 0))
+            {
+                _logger.LogWarning("DoWork. Orders is null or empty");
+                return;
+            }
+            
+            _logger.LogDebug("DoWork for {Count} orders", Orders.Count);
+
+            foreach (var Implementer in Implementers)
+            {
+                Task.Run(() => WorkerWorkAsync(Implementer, Orders));
+            }
+        }
+
+        private async Task WorkerWorkAsync(ImplementerViewModel Implementer, List<OrderViewModel> Orders)
+        {
+            if (_orderLogic == null || Implementer == null)
+            {
+                return;
+            }
+            
+            await RunOrderInWork(Implementer);
+
+            await Task.Run(() =>
+            {
+                foreach (var Order in Orders)
+                {
+                    try
+                    {
+                        _logger.LogDebug("WorkerWorkAsync. Worker {Id} try get order {Order}", Implementer.Id, Order.Id);
+
+                        // TakeOrderInWork will fail when the worker tries to change status to BeingProcessed when the order is already BeingProcessed
+                        // which would happen when other worker already acquired that order
+                        bool AcquireResult = _orderLogic.TakeOrderInWork(new OrderBindingModel
+                        {
+                            Id = Order.Id,
+                            ImplementerId = Implementer.Id
+                        });
+
+                        if (!AcquireResult)
+                        {
+                            _logger.LogDebug("WorkerWorkAsync. Worker {Id} tried to get order {Order} but it's already acquired by other worker", Implementer.Id, Order.Id);
+                            continue;
+                        }
+
+                        Thread.Sleep(Implementer.WorkExperience * _rnd.Next(100, 1000) * Order.Count);
+                        
+                        _logger.LogDebug("WorkerWorkAsync. Worker {Id} finish order {Order}", Implementer.Id, Order.Id);
+                        _orderLogic.FinishOrder(new OrderBindingModel
+                        {
+                            Id = Order.Id
+                        });
+                    }
+  
+                    catch (InvalidOperationException ex)
+                    {
+                        _logger.LogWarning(ex, "Error try get work");
+                    }
+
+                    catch (Exception ex)
+                    {
+                        _logger.LogError(ex, "Error while do work");
+                        throw;
+                    }
+
+                    Thread.Sleep(Implementer.Qualification * _rnd.Next(10, 100));
+                }
+            });
+        }
+
+        private async Task RunOrderInWork(ImplementerViewModel Implementer)
+        {
+            if (_orderLogic == null || Implementer == null)
+                return;
+            
+            try
+            {
+                var RunOrder = await Task.Run(() => _orderLogic.ReadElement(new OrderSearchModel
+                {
+                    ImplementerId = Implementer.Id,
+                    Status = OrderStatus.BeingProcessed
+                }));
+                
+                if (RunOrder == null)
+                {
+                    return;
+                }
+
+                _logger.LogDebug("RunOrderInWork. Worker {Id} back to order {Order}", Implementer.Id, RunOrder.Id);
+                Thread.Sleep(Implementer.WorkExperience * _rnd.Next(100, 300) * RunOrder.Count);
+                
+                _logger.LogDebug("RunOrderInWork. Worker {Id} finish order {Order}", Implementer.Id, RunOrder.Id);
+                _orderLogic.FinishOrder(new OrderBindingModel
+                {
+                    Id = RunOrder.Id
+                });
+
+                Thread.Sleep(Implementer.Qualification * _rnd.Next(10, 100));
+            }
+
+            catch (InvalidOperationException ex)
+            {
+                _logger.LogWarning(ex, "Error try get work");
+            }
+
+            catch (Exception ex)
+            {
+                _logger.LogError(ex, "Error while do work");
+                throw;
+            }
+        }
+    }
+}

AutoWorkshopBusinessLogic/MailWorker/AbstractMailWorker.cs

@@ -0,0 +1,84 @@
+using AutoWorkshopContracts.BindingModels;
+using AutoWorkshopContracts.BusinessLogicContracts;
+using Microsoft.Extensions.Logging;
+
+namespace AutoWorkshopBusinessLogic.MailWorker
+{
+    public abstract class AbstractMailWorker
+    {
+        protected string _mailLogin = string.Empty;
+
+        protected string _mailPassword = string.Empty;
+
+        protected string _smtpClientHost = string.Empty;
+
+        protected int _smtpClientPort;
+
+        protected string _popHost = string.Empty;
+
+        protected int _popPort;
+
+        private readonly IMessageInfoLogic _messageInfoLogic;
+
+        private readonly ILogger _logger;
+
+        public AbstractMailWorker(ILogger<AbstractMailWorker> Logger, IMessageInfoLogic MessageInfoLogic)
+        {
+            _logger = Logger;
+            _messageInfoLogic = MessageInfoLogic;
+        }
+
+        public void MailConfig(MailConfigBindingModel Config)
+        {
+            _mailLogin = Config.MailLogin;
+            _mailPassword = Config.MailPassword;
+            _smtpClientHost = Config.SmtpClientHost;
+            _smtpClientPort = Config.SmtpClientPort;
+            _popHost = Config.PopHost;
+            _popPort = Config.PopPort;
+
+            _logger.LogDebug("MailConfig: {Login}, {Password}, {ClientHost}, {ClientPort}, {PopHost}, {PopPort}",
+                 _mailLogin, _mailPassword, _smtpClientHost, _smtpClientPort, _popHost, _popPort);
+        }
+
+        public async void SendMailAsync(MailSendInfoBindingModel Info)
+        {
+            if (string.IsNullOrEmpty(_mailLogin) || string.IsNullOrEmpty(_mailPassword))
+                return;
+
+            if (string.IsNullOrEmpty(_smtpClientHost) || _smtpClientPort == 0)
+                return;
+
+            if (string.IsNullOrEmpty(Info.MailAddress) || string.IsNullOrEmpty(Info.Subject) || string.IsNullOrEmpty(Info.Text))
+                return;
+
+            _logger.LogDebug("MailSendAsync: {To}, {Subject}", Info.MailAddress, Info.Subject);
+
+            await SendMailImpl(Info);
+        }
+
+        public async void CheckMailAsync()
+        {
+            if (string.IsNullOrEmpty(_mailLogin) || string.IsNullOrEmpty(_mailPassword))
+                return;
+
+            if (string.IsNullOrEmpty(_popHost) || _popPort == 0)
+                return;
+
+            if (_messageInfoLogic == null)
+                return;
+
+            var List = await ReceiveMailImpl();
+            _logger.LogDebug("CheckMailAsync: New mails: {Count}", List.Count);
+            
+            foreach (var Mail in List)
+            {
+                _messageInfoLogic.Create(Mail);
+            }
+        }
+
+        protected abstract Task SendMailImpl(MailSendInfoBindingModel Info);
+
+        protected abstract Task<List<MessageInfoBindingModel>> ReceiveMailImpl();
+    }
+}

AutoWorkshopBusinessLogic/MailWorker/MailKitWorker.cs

@@ -0,0 +1,85 @@
+using AutoWorkshopContracts.BindingModels;
+using AutoWorkshopContracts.BusinessLogicContracts;
+using MailKit.Net.Pop3;
+using MailKit.Security;
+using Microsoft.Extensions.Logging;
+using System.Net;
+using System.Net.Mail;
+using System.Text;
+
+namespace AutoWorkshopBusinessLogic.MailWorker
+{
+	public class MailKitWorker : AbstractMailWorker
+    {
+        public MailKitWorker(ILogger<MailKitWorker> Logger, IMessageInfoLogic MessageInfoLogic) 
+            : base(Logger, MessageInfoLogic) { }
+
+        protected override async Task SendMailImpl(MailSendInfoBindingModel Info)
+        {
+            using var MailMessage = new MailMessage();
+            using var SmtpClient = new SmtpClient(_smtpClientHost, _smtpClientPort);
+
+            try
+            {
+                MailMessage.From = new MailAddress(_mailLogin);
+                MailMessage.To.Add(new MailAddress(Info.MailAddress));
+                MailMessage.Subject = Info.Subject;
+                MailMessage.Body = Info.Text;
+                MailMessage.SubjectEncoding = Encoding.UTF8;
+                MailMessage.BodyEncoding = Encoding.UTF8;
+                
+                SmtpClient.UseDefaultCredentials = false;
+                SmtpClient.EnableSsl = true;
+                SmtpClient.DeliveryMethod = SmtpDeliveryMethod.Network;
+                SmtpClient.Credentials = new NetworkCredential(_mailLogin, _mailPassword);
+
+                await Task.Run(() => SmtpClient.Send(MailMessage));
+            }
+            catch (Exception) 
+            {
+                throw;
+            }
+        }
+
+        protected override async Task<List<MessageInfoBindingModel>> ReceiveMailImpl()
+        {
+            var Result = new List<MessageInfoBindingModel>();
+
+            using var Client = new Pop3Client();
+
+            await Task.Run(() =>
+            {
+                try
+                {
+                    Client.Connect(_popHost, _popPort, SecureSocketOptions.SslOnConnect);
+                    Client.Authenticate(_mailLogin, _mailPassword);
+
+                    for (int i = 0; i < Client.Count; i++)
+                    {
+                        var Message = Client.GetMessage(i);
+
+                        foreach (var Mail in Message.From.Mailboxes)
+                        {
+                            Result.Add(new MessageInfoBindingModel
+                            {
+                                DateDelivery = Message.Date.DateTime,
+                                MessageId = Message.MessageId,
+                                SenderName = Mail.Address,
+                                Subject = Message.Subject,
+                                Body = Message.TextBody
+                            });
+                        }
+                    }
+                }
+                catch (AuthenticationException)
+                { }
+                finally
+                {
+                    Client.Disconnect(true);
+                }
+            });
+
+            return Result;
+        }
+    }
+}

AutoWorkshopBusinessLogic/OfficePackage/AbstractSaveToExcel.cs

@@ -5,7 +5,7 @@ namespace AutoWorkshopBusinessLogic.OfficePackage
 {
     public abstract class AbstractSaveToExcel
     {
-        public void CreateReport(ExcelRepairsInfo Info)
+        public void CreateReport(ExcelInfo Info)
         {
             CreateExcel(Info);
 
@@ -78,88 +78,13 @@ namespace AutoWorkshopBusinessLogic.OfficePackage
 
             SaveExcel(Info);
         }
-
-        public void CreateShopRepairsReport(ExcelShopsInfo Info)
-        {
-            CreateExcel(Info);
-
-            InsertCellInWorksheet(new ExcelCellParameters
-            {
-                ColumnName = "A",
-                RowIndex = 1,
-                Text = Info.Title,
-                StyleInfo = ExcelStyleInfoType.Title
-            });
-
-            MergeCells(new ExcelMergeParameters
-            {
-                CellFromName = "A1",
-                CellToName = "C1"
-            });
-
-            uint RowIndex = 2;
-
-            foreach (var ShopRep in Info.ShopRepairs)
-            {
-                InsertCellInWorksheet(new ExcelCellParameters
-                {
-                    ColumnName = "A",
-                    RowIndex = RowIndex,
-                    Text = ShopRep.ShopName,
-                    StyleInfo = ExcelStyleInfoType.Text
-                });
-
-                RowIndex++;
-
-                foreach (var (Repair, Count) in ShopRep.Repairs)
-                {
-                    InsertCellInWorksheet(new ExcelCellParameters
-                    {
-                        ColumnName = "B",
-                        RowIndex = RowIndex,
-                        Text = Repair,
-                        StyleInfo = ExcelStyleInfoType.TextWithBroder
-                    });
-
-                    InsertCellInWorksheet(new ExcelCellParameters
-                    {
-                        ColumnName = "C",
-                        RowIndex = RowIndex,
-                        Text = Count.ToString(),
-                        StyleInfo = ExcelStyleInfoType.TextWithBroder
-                    });
-
-                    RowIndex++;
-                }
-
-                InsertCellInWorksheet(new ExcelCellParameters
-                {
-                    ColumnName = "A",
-                    RowIndex = RowIndex,
-                    Text = "Итого",
-                    StyleInfo = ExcelStyleInfoType.Text
-                });
-                
-                InsertCellInWorksheet(new ExcelCellParameters
-                {
-                    ColumnName = "C",
-                    RowIndex = RowIndex,
-                    Text = ShopRep.TotalCount.ToString(),
-                    StyleInfo = ExcelStyleInfoType.Text
-                });
-                
-                RowIndex++;
-            }
-
-            SaveExcel(Info);
-        }
-
-        protected abstract void CreateExcel(IDocumentInfo Info);
+        
+        protected abstract void CreateExcel(ExcelInfo Info);
         
         protected abstract void InsertCellInWorksheet(ExcelCellParameters ExcelParams);
         
         protected abstract void MergeCells(ExcelMergeParameters ExcelParams);
         
-        protected abstract void SaveExcel(IDocumentInfo Info);
+        protected abstract void SaveExcel(ExcelInfo Info);
     }
 }

AutoWorkshopBusinessLogic/OfficePackage/AbstractSaveToPdf.cs

@@ -5,7 +5,7 @@ namespace AutoWorkshopBusinessLogic.OfficePackage
 {
     public abstract class AbstractSaveToPdf
     {
-        public void CreateDoc(PdfOrdersInfo Info)
+        public void CreateDoc(PdfInfo Info)
         {
             CreatePdf(Info);
             CreateParagraph(new PdfParagraph { Text = Info.Title, Style = "NormalTitle", ParagraphAlignment = PdfParagraphAlignmentType.Center });
@@ -33,35 +33,8 @@ namespace AutoWorkshopBusinessLogic.OfficePackage
 
             SavePdf(Info);
         }
-
-        public void CreateGroupedOrdersDoc(PdfGroupedOrdersInfo Info)
-        {
-            CreatePdf(Info);
-            CreateParagraph(new PdfParagraph { Text = Info.Title, Style = "NormalTitle", ParagraphAlignment = PdfParagraphAlignmentType.Center });
-
-            CreateTable(new List<string> { "4cm", "3cm", "2cm" });
-            CreateRow(new PdfRowParameters
-            {
-                Texts = new List<string> { "Дата заказа", "Кол-во", "Сумма" },
-                Style = "NormalTitle",
-                ParagraphAlignment = PdfParagraphAlignmentType.Center
-            });
-
-            foreach (var groupedOrder in Info.GroupedOrders)
-            {
-                CreateRow(new PdfRowParameters
-                {
-                    Texts = new List<string> { groupedOrder.Date.ToShortDateString(), groupedOrder.OrdersCount.ToString(), groupedOrder.OrdersSum.ToString() },
-                    Style = "Normal",
-                    ParagraphAlignment = PdfParagraphAlignmentType.Left
-                });
-            }
-
-            CreateParagraph(new PdfParagraph { Text = $"Итого: {Info.GroupedOrders.Sum(x => x.OrdersSum)}\t", Style = "Normal", ParagraphAlignment = PdfParagraphAlignmentType.Center });
-            SavePdf(Info);
-        }
-
-        protected abstract void CreatePdf(IDocumentInfo Info);
+        
+        protected abstract void CreatePdf(PdfInfo Info);
         
         protected abstract void CreateParagraph(PdfParagraph Paragraph);
         
@@ -69,6 +42,6 @@ namespace AutoWorkshopBusinessLogic.OfficePackage
         
         protected abstract void CreateRow(PdfRowParameters RowParameters);
         
-        protected abstract void SavePdf(IDocumentInfo Info);
+        protected abstract void SavePdf(PdfInfo Info);
     }
 }

AutoWorkshopBusinessLogic/OfficePackage/AbstractSaveToWord.cs

@@ -5,7 +5,7 @@ namespace AutoWorkshopBusinessLogic.OfficePackage
 {
     public abstract class AbstractSaveToWord
     {
-        public void CreateRepairsDoc(WordRepairsInfo Info)
+        public void CreateDoc(WordInfo Info)
         {
             CreateWord(Info);
 
@@ -37,57 +37,11 @@ namespace AutoWorkshopBusinessLogic.OfficePackage
 
             SaveWord(Info);
         }
-
-        public void CreateShopsDoc(WordShopsInfo Info)
-        {
-            CreateWord(Info);
-            
-            CreateParagraph(new WordParagraph
-            {
-                Texts = new List<(string, WordTextProperties)> { (Info.Title, new WordTextProperties { Bold = true, Size = "24", }) },
-                TextProperties = new WordTextProperties
-                {
-                    Size = "24",
-                    JustificationType = WordJustificationType.Center
-                }
-            });
-
-            CreateTable(new List<string> { "3000", "3000", "3000" });
-            CreateRow(new WordRowParameters
-            {
-                Texts = new List<string> { "Название", "Адрес", "Дата открытия" },
-                TextProperties = new WordTextProperties
-                {
-                    Size = "24",
-                    Bold = true,
-                    JustificationType = WordJustificationType.Center
-                }
-            });
-
-            foreach (var Shop in Info.Shops)
-            {
-                CreateRow(new WordRowParameters
-                {
-                    Texts = new List<string> { Shop.ShopName, Shop.Address, Shop.OpeningDate.ToString() },
-                    TextProperties = new WordTextProperties
-                    {
-                        Size = "22",
-                        JustificationType = WordJustificationType.Both
-                    }
-                });
-            }
-
-            SaveWord(Info);
-        }
-
-        protected abstract void CreateWord(IDocumentInfo Info);
+        
+        protected abstract void CreateWord(WordInfo Info);
         
         protected abstract void CreateParagraph(WordParagraph Paragraph);
         
-        protected abstract void SaveWord(IDocumentInfo Info);
-
-        protected abstract void CreateTable(List<string> Colums);
-        
-        protected abstract void CreateRow(WordRowParameters RowParameters);
+        protected abstract void SaveWord(WordInfo Info);
     }
 }

AutoWorkshopBusinessLogic/OfficePackage/HelperModels/ExcelInfo.cs

@@ -2,7 +2,7 @@
 
 namespace AutoWorkshopBusinessLogic.OfficePackage.HelperModels
 {
-    public class ExcelRepairsInfo : IDocumentInfo
+    public class ExcelInfo
     {
         public string FileName { get; set; } = string.Empty;
         

AutoWorkshopBusinessLogic/OfficePackage/HelperModels/ExcelShopsInfo.cs

@@ -1,13 +0,0 @@
-using AutoWorkshopContracts.ViewModels;
-
-namespace AutoWorkshopBusinessLogic.OfficePackage.HelperModels
-{
-    public class ExcelShopsInfo : IDocumentInfo
-    {
-        public string FileName { get; set; } = string.Empty;
-        
-        public string Title { get; set; } = string.Empty;
-        
-        public List<ReportShopsViewModel> ShopRepairs { get; set; } = new();
-    }
-}

AutoWorkshopBusinessLogic/OfficePackage/HelperModels/IDocumentInfo.cs

@@ -1,9 +0,0 @@
-namespace AutoWorkshopBusinessLogic.OfficePackage.HelperModels
-{
-    public interface IDocumentInfo
-    {
-        public string FileName { get; set; }
-
-        public string Title { get; set; }
-    }
-}

AutoWorkshopBusinessLogic/OfficePackage/HelperModels/PdfGroupedOrdersInfo.cs

@@ -1,17 +0,0 @@
-using AutoWorkshopContracts.ViewModels;
-
-namespace AutoWorkshopBusinessLogic.OfficePackage.HelperModels
-{
-    public class PdfGroupedOrdersInfo : IDocumentInfo
-    {
-        public string FileName { get; set; } = string.Empty;
-        
-        public string Title { get; set; } = string.Empty;
-        
-        public DateTime DateFrom { get; set; }
-        
-        public DateTime DateTo { get; set; }
-        
-        public List<ReportGroupedOrdersViewModel> GroupedOrders { get; set; } = new();
-    }
-}

AutoWorkshopBusinessLogic/OfficePackage/HelperModels/PdfInfo.cs

@@ -2,7 +2,7 @@
 
 namespace AutoWorkshopBusinessLogic.OfficePackage.HelperModels
 {
-    public class PdfOrdersInfo : IDocumentInfo
+    public class PdfInfo
     {
         public string FileName { get; set; } = string.Empty;
         

AutoWorkshopBusinessLogic/OfficePackage/HelperModels/WordInfo.cs

@@ -2,7 +2,7 @@
 
 namespace AutoWorkshopBusinessLogic.OfficePackage.HelperModels
 {
-    public class WordRepairsInfo : IDocumentInfo
+    public class WordInfo
     {
         public string FileName { get; set; } = string.Empty;
         

AutoWorkshopBusinessLogic/OfficePackage/HelperModels/WordRowParameters.cs

@@ -1,9 +0,0 @@
-namespace AutoWorkshopBusinessLogic.OfficePackage.HelperModels
-{
-    public class WordRowParameters
-    {
-        public List<string> Texts { get; set; } = new();
-        
-        public WordTextProperties TextProperties { get; set; } = new();
-    }
-}

AutoWorkshopBusinessLogic/OfficePackage/HelperModels/WordShopsInfo.cs

@@ -1,13 +0,0 @@
-using AutoWorkshopContracts.ViewModels;
-
-namespace AutoWorkshopBusinessLogic.OfficePackage.HelperModels
-{
-    public class WordShopsInfo : IDocumentInfo
-    {
-        public string FileName { get; set; } = string.Empty;
-        
-        public string Title { get; set; } = string.Empty;
-       
-        public List<ShopViewModel> Shops { get; set; } = new();
-    }
-}

AutoWorkshopBusinessLogic/OfficePackage/Implements/SaveToExcel.cs

@@ -139,7 +139,7 @@ namespace AutoWorkshopBusinessLogic.OfficePackage.Implements
             };
         }
 
-        protected override void CreateExcel(IDocumentInfo Info)
+        protected override void CreateExcel(ExcelInfo Info)
         {
             _spreadsheetDocument = SpreadsheetDocument.Create(Info.FileName, SpreadsheetDocumentType.Workbook);
 
@@ -269,7 +269,7 @@ namespace AutoWorkshopBusinessLogic.OfficePackage.Implements
             MergeCells.Append(MergeCell);
         }
 
-        protected override void SaveExcel(IDocumentInfo Info)
+        protected override void SaveExcel(ExcelInfo Info)
         {
             if (_spreadsheetDocument == null)
                 return;

AutoWorkshopBusinessLogic/OfficePackage/Implements/SaveToPdf.cs

@@ -33,7 +33,7 @@ namespace AutoWorkshopBusinessLogic.OfficePackage.Implements
             Style.Font.Bold = true;
         }
 
-        protected override void CreatePdf(IDocumentInfo Info)
+        protected override void CreatePdf(PdfInfo Info)
         {
             _document = new Document();
             DefineStyles(_document);
@@ -94,7 +94,7 @@ namespace AutoWorkshopBusinessLogic.OfficePackage.Implements
             }
         }
 
-        protected override void SavePdf(IDocumentInfo Info)
+        protected override void SavePdf(PdfInfo Info)
         {
             var Renderer = new PdfDocumentRenderer(true)
             {

AutoWorkshopBusinessLogic/OfficePackage/Implements/SaveToWord.cs

@@ -64,7 +64,7 @@ namespace AutoWorkshopBusinessLogic.OfficePackage.Implements
             return Properties;
         }
         
-        protected override void CreateWord(IDocumentInfo Info)
+        protected override void CreateWord(WordInfo Info)
         {
             _wordDocument = WordprocessingDocument.Create(Info.FileName, WordprocessingDocumentType.Document);
             MainDocumentPart mainPart = _wordDocument.AddMainDocumentPart();
@@ -103,7 +103,7 @@ namespace AutoWorkshopBusinessLogic.OfficePackage.Implements
             _docBody.AppendChild(DocParagraph);
         }
         
-        protected override void SaveWord(IDocumentInfo Info)
+        protected override void SaveWord(WordInfo Info)
         {
             if (_docBody == null || _wordDocument == null)
             {
@@ -114,79 +114,5 @@ namespace AutoWorkshopBusinessLogic.OfficePackage.Implements
             _wordDocument.MainDocumentPart!.Document.Save();
             _wordDocument.Close();
         }
-
-        private Table? _lastTable;
-        
-        protected override void CreateTable(List<string> Columns)
-        {
-            if (_docBody == null)
-                return;
-
-            _lastTable = new Table();
-
-            var TableProp = new TableProperties();
-            TableProp.AppendChild(new TableLayout { Type = TableLayoutValues.Fixed });
-            TableProp.AppendChild(new TableBorders(
-                    new TopBorder() { Val = new EnumValue<BorderValues>(BorderValues.Single), Size = 4 },
-                    new LeftBorder() { Val = new EnumValue<BorderValues>(BorderValues.Single), Size = 4 },
-                    new RightBorder() { Val = new EnumValue<BorderValues>(BorderValues.Single), Size = 4 },
-                    new BottomBorder() { Val = new EnumValue<BorderValues>(BorderValues.Single), Size = 4 },
-                    new InsideHorizontalBorder() { Val = new EnumValue<BorderValues>(BorderValues.Single), Size = 4 },
-                    new InsideVerticalBorder() { Val = new EnumValue<BorderValues>(BorderValues.Single), Size = 4 }
-                ));
-            TableProp.AppendChild(new TableWidth { Type = TableWidthUnitValues.Auto });
-            _lastTable.AppendChild(TableProp);
-
-            TableGrid TableGrid = new TableGrid();
-            
-            foreach (var Column in Columns)
-            {
-                TableGrid.AppendChild(new GridColumn() { Width = Column });
-            }
-            
-            _lastTable.AppendChild(TableGrid);
-            _docBody.AppendChild(_lastTable);
-        }
-
-        protected override void CreateRow(WordRowParameters RowParameters)
-        {
-            if (_docBody == null || _lastTable == null)
-                return;
-
-            TableRow DocRow = new TableRow();
-            foreach (var Column in RowParameters.Texts)
-            {
-                var DocParagraph = new Paragraph();
-                WordParagraph Paragraph = new WordParagraph
-                {
-                    Texts = new List<(string, WordTextProperties)> { (Column, RowParameters.TextProperties) },
-                    TextProperties = RowParameters.TextProperties
-                };
-
-                DocParagraph.AppendChild(CreateParagraphProperties(Paragraph.TextProperties));
-
-                foreach (var Run in Paragraph.Texts)
-                {
-                    var DocRun = new Run();
-                    var Properties = new RunProperties();
-
-                    Properties.AppendChild(new FontSize { Val = Run.Item2.Size });
-                    if (Run.Item2.Bold)
-                    {
-                        Properties.AppendChild(new Bold());
-                    }                    
-                    DocRun.AppendChild(Properties);
-                    DocRun.AppendChild(new Text { Text = Run.Item1, Space = SpaceProcessingModeValues.Preserve });
-                    DocParagraph.AppendChild(DocRun);
-                }
-
-                TableCell docCell = new TableCell();
-                
-                docCell.AppendChild(DocParagraph);
-                DocRow.AppendChild(docCell);
-            }
-            
-            _lastTable.AppendChild(DocRow);
-        }
     }
 }

AutoWorkshopClientApp/Controllers/HomeController.cs

@@ -156,5 +156,16 @@ namespace AutoWorkshopClientApp.Controllers
 			RepairViewModel? Repair = ApiClient.GetRequest<RepairViewModel>($"api/main/getrepair?repairId={repair}");
 			return count * (Repair?.Price ?? 1);
 		}
+
+		[HttpGet]
+		public IActionResult Mails()
+		{
+			if (ApiClient.Client == null)
+			{
+				return Redirect("~/Home/Enter");
+			}
+
+			return View(ApiClient.GetRequest<List<MessageInfoViewModel>>($"api/client/getmessages?clientId={ApiClient.Client.Id}"));
+		}
 	}
 }

AutoWorkshopClientApp/Views/Home/Mails.cshtml

@@ -0,0 +1,51 @@
+@using AutoWorkshopContracts.ViewModels
+
+@model List<MessageInfoViewModel>
+@{
+	ViewData["Title"] = "Mails";
+}
+
+<div class="text-center">
+	<h1 class="display-4">Заказы</h1>
+</div>
+
+<div class="text-center">
+	@{
+		if (Model == null)
+		{
+			<h3 class="display-4">Авторизируйтесь</h3>
+			return;
+		}
+		<table class="table">
+			<thead>
+				<tr>
+					<th>
+						Дата письма
+					</th>
+					<th>
+						Заголовок
+					</th>
+					<th>
+						Текст
+					</th>
+				</tr>
+			</thead>
+			<tbody>
+				@foreach (var Item in Model)
+				{
+					<tr>
+						<td>
+							@Html.DisplayFor(ModelItem => Item.DateDelivery)
+						</td>
+						<td>
+							@Html.DisplayFor(ModelItem => Item.Subject)
+						</td>
+						<td>
+							@Html.DisplayFor(ModelItem => Item.Body)
+						</td>
+					</tr>
+				}
+			</tbody>
+		</table>
+	}
+</div>

AutoWorkshopClientApp/Views/Shared/_Layout.cshtml

@@ -26,6 +26,9 @@
 						<li class="nav-item">
 							<a class="nav-link text-dark" asparea="" asp-controller="Home" asp-action="Privacy">Личные данные</a>
 						</li>
+						<li>
+							<a class="nav-link text-dark" asparea="" asp-controller="Home" asp-action="Mails">Письма</a>
+						</li>
 						<li class="nav-item">
 							<a class="nav-link text-dark" asparea="" asp-controller="Home" asp-action="Enter">Вход</a>
 						</li>

AutoWorkshopContracts/BindingModels/ImplementerBindingModel.cs

@@ -0,0 +1,17 @@
+using AutoWorkshopDataModels.Models;
+
+namespace AutoWorkshopContracts.BindingModels
+{
+    public class ImplementerBindingModel : IImplementerModel
+    {
+        public int Id { get; set; }
+
+        public string ImplementerFIO { get; set; } = string.Empty;
+
+        public string Password { get; set; } = string.Empty;
+
+        public int WorkExperience { get; set; }
+
+        public int Qualification { get; set; }
+    }
+}

AutoWorkshopContracts/BindingModels/MailConfigBindingModel.cs

@@ -0,0 +1,17 @@
+namespace AutoWorkshopContracts.BindingModels
+{
+	public class MailConfigBindingModel
+    {
+        public string MailLogin { get; set; } = string.Empty;
+
+        public string MailPassword { get; set; } = string.Empty;
+
+        public string SmtpClientHost { get; set; } = string.Empty;
+
+        public int SmtpClientPort { get; set; }
+
+        public string PopHost {  get; set; } = string.Empty;
+
+        public int PopPort { get; set; }
+    }
+}

AutoWorkshopContracts/BindingModels/MailSendInfoBindingModel.cs

@@ -0,0 +1,11 @@
+namespace AutoWorkshopContracts.BindingModels
+{
+	public class MailSendInfoBindingModel
+    {
+        public string MailAddress { get; set; } = string.Empty;
+
+        public string Subject { get; set; } = string.Empty;
+
+        public string Text { get; set; } = string.Empty;
+    }
+}

AutoWorkshopContracts/BindingModels/MessageInfoBindingModel.cs

@@ -0,0 +1,19 @@
+using AutoWorkshopDataModels.Models;
+
+namespace AutoWorkshopContracts.BindingModels
+{
+    public class MessageInfoBindingModel : IMessageInfoModel
+    {
+        public string MessageId { get; set; } = string.Empty;
+
+        public int? ClientId { get; set; }
+
+        public string SenderName { get; set; } = string.Empty;
+
+        public DateTime DateDelivery { get; set; }
+
+        public string Subject { get; set; } = string.Empty;
+
+        public string Body { get; set; } = string.Empty;
+    }
+}

AutoWorkshopContracts/BindingModels/OrderBindingModel.cs

@@ -8,6 +8,7 @@ namespace AutoWorkshopContracts.BindingModels
         public int Id { get; set; }
         public int RepairId { get; set; }
         public int ClientId { get; set; }
+        public int? ImplementerId { get; set; }
         public int Count { get; set; }
         public double Sum { get; set; }
         public OrderStatus Status { get; set; } = OrderStatus.Undefined;

AutoWorkshopContracts/BindingModels/ShopBindingModel.cs

@@ -1,19 +0,0 @@
-using AutoWorkshopDataModels.Models;
-
-namespace AutoWorkshopContracts.BindingModels
-{
-    public class ShopBindingModel : IShopModel
-    {
-        public int Id { get; set; }
-        
-        public string ShopName { get; set; } = string.Empty;
-        
-        public string Address { get; set; } = string.Empty;
-        
-        public DateTime OpeningDate { get; set; } = DateTime.Now;
-        
-        public Dictionary<int, (IRepairModel, int)> ShopRepairs { get; set; } = new();
-
-        public int RepairsMaxCount { get; set; }
-    }
-}

AutoWorkshopContracts/BindingModels/SupplyBindingModel.cs

@@ -1,13 +0,0 @@
-using AutoWorkshopDataModels.Models;
-
-namespace AutoWorkshopContracts.BindingModels
-{
-    public class SupplyBindingModel : ISupplyModel
-    {
-        public int ShopId { get; set; }
-        
-        public int RepairId { get; set; }
-        
-        public int Count { get; set; }
-    }
-}

AutoWorkshopContracts/BusinessLogicContracts/IImplementerLogic.cs

@@ -0,0 +1,19 @@
+using AutoWorkshopContracts.BindingModels;
+using AutoWorkshopContracts.SearchModels;
+using AutoWorkshopContracts.ViewModels;
+
+namespace AutoWorkshopContracts.BusinessLogicsContracts
+{
+    public interface IImplementerLogic
+    {
+        List<ImplementerViewModel>? ReadList(ImplementerSearchModel? Model);
+        
+        ImplementerViewModel? ReadElement(ImplementerSearchModel Model);
+        
+        bool Create(ImplementerBindingModel Model);
+        
+        bool Update(ImplementerBindingModel Model);
+        
+        bool Delete(ImplementerBindingModel Model);
+    }
+}

AutoWorkshopContracts/BusinessLogicContracts/IMessageInfoLogic.cs

@@ -0,0 +1,13 @@
+using AutoWorkshopContracts.BindingModels;
+using AutoWorkshopContracts.SearchModels;
+using AutoWorkshopContracts.ViewModels;
+
+namespace AutoWorkshopContracts.BusinessLogicContracts
+{
+    public interface IMessageInfoLogic
+    {
+        List<MessageInfoViewModel>? ReadList(MessageInfoSearchModel? Model);
+
+        bool Create(MessageInfoBindingModel Model);
+    }
+}

AutoWorkshopContracts/BusinessLogicContracts/IOrderLogic.cs

@@ -11,5 +11,6 @@ namespace AutoWorkshopContracts.BusinessLogicContracts
         bool TakeOrderInWork(OrderBindingModel Model);
         bool FinishOrder(OrderBindingModel Model);
         bool DeliveryOrder(OrderBindingModel Model);
+        OrderViewModel? ReadElement(OrderSearchModel Model);
     }
 }

AutoWorkshopContracts/BusinessLogicContracts/IReportLogic.cs

@@ -8,21 +8,11 @@ namespace AutoWorkshopContracts.BusinessLogicContracts
         List<ReportRepairComponentViewModel> GetRepairComponents();
         
         List<ReportOrdersViewModel> GetOrders(ReportBindingModel Model);
-
-        List<ReportShopsViewModel> GetShops();
-
-        List<ReportGroupedOrdersViewModel> GetGroupedOrders();
-
+        
         void SaveRepairsToWordFile(ReportBindingModel Model);
         
         void SaveRepairComponentToExcelFile(ReportBindingModel Model);
         
         void SaveOrdersToPdfFile(ReportBindingModel Model);
-
-        void SaveShopsToWordFile(ReportBindingModel Model);
-        
-        void SaveShopsToExcelFile(ReportBindingModel Model);
-        
-        void SaveGroupedOrdersToPdfFile(ReportBindingModel Model);
     }
 }

AutoWorkshopContracts/BusinessLogicContracts/IShopLogic.cs

@@ -1,23 +0,0 @@
-using AutoWorkshopContracts.BindingModels;
-using AutoWorkshopContracts.SearchModels;
-using AutoWorkshopContracts.ViewModels;
-
-namespace AutoWorkshopContracts.BusinessLogicsContracts
-{
-    public interface IShopLogic
-    {
-        List<ShopViewModel>? ReadList(ShopSearchModel? Model);
-        
-        ShopViewModel? ReadElement(ShopSearchModel Model);
-        
-        bool Create(ShopBindingModel Model);
-        
-        bool Update(ShopBindingModel Model);
-        
-        bool Delete(ShopBindingModel Model);
-        
-        bool MakeSupply(SupplyBindingModel Model);
-
-        bool MakeSell(SupplySearchModel Model);
-    }
-}

AutoWorkshopContracts/BusinessLogicContracts/IWorkProcess.cs

@@ -0,0 +1,9 @@
+using AutoWorkshopContracts.BusinessLogicsContracts;
+
+namespace AutoWorkshopContracts.BusinessLogicContracts
+{
+    public interface IWorkProcess
+    {
+        void DoWork(IImplementerLogic ImplementerLogic, IOrderLogic OrderLogic);
+    }
+}

AutoWorkshopContracts/SearchModels/ImplementerSearchModel.cs

@@ -0,0 +1,11 @@
+namespace AutoWorkshopContracts.SearchModels
+{
+    public class ImplementerSearchModel
+    {
+        public int? Id { get; set; }
+        
+        public string? ImplementerFIO { get; set; }
+        
+        public string? Password { get; set; }
+    }
+}

AutoWorkshopContracts/SearchModels/MessageInfoSearchModel.cs

@@ -0,0 +1,9 @@
+namespace AutoWorkshopContracts.SearchModels
+{
+    public class MessageInfoSearchModel
+    {
+        public string? MessageId { get; set; }
+
+        public int? ClientId { get; set; }
+    }
+}

AutoWorkshopContracts/SearchModels/OrderSearchModel.cs

@@ -1,4 +1,6 @@
-namespace AutoWorkshopContracts.SearchModels
+using AutoWorkshopDataModels.Enums;
+
+namespace AutoWorkshopContracts.SearchModels
 {
     public class OrderSearchModel
     {
@@ -6,6 +8,10 @@
 
         public int? ClientId { get; set; }
 
+        public OrderStatus? Status { get; set; }
+
+        public int? ImplementerId { get; set; }
+
         public DateTime? DateFrom { get; set; }
         
         public DateTime? DateTo { get; set; }

AutoWorkshopContracts/SearchModels/ShopSearchModel.cs

@@ -1,9 +0,0 @@
-namespace AutoWorkshopContracts.SearchModels
-{
-    public class ShopSearchModel
-    {
-        public int? Id { get; set; }
-        
-        public string? ShopName { get; set; }
-    }
-}

AutoWorkshopContracts/SearchModels/SupplySearchModel.cs

@@ -1,9 +0,0 @@
-namespace AutoWorkshopContracts.SearchModels
-{
-    public class SupplySearchModel
-    {
-        public int? RepairId { get; set; }
-        
-        public int? Count { get; set; }
-    }
-}

AutoWorkshopContracts/StoragesContracts/IImplementerStorage.cs

@@ -0,0 +1,21 @@
+using AutoWorkshopContracts.BindingModels;
+using AutoWorkshopContracts.SearchModels;
+using AutoWorkshopContracts.ViewModels;
+
+namespace AutoWorkshopContracts.StoragesContracts
+{
+    public interface IImplementerStorage
+    {
+        List<ImplementerViewModel> GetFullList();
+        
+        List<ImplementerViewModel> GetFilteredList(ImplementerSearchModel Model);
+        
+        ImplementerViewModel? GetElement(ImplementerSearchModel Model);
+        
+        ImplementerViewModel? Insert(ImplementerBindingModel Model);
+        
+        ImplementerViewModel? Update(ImplementerBindingModel Model);
+        
+        ImplementerViewModel? Delete(ImplementerBindingModel Model);
+    }
+}

AutoWorkshopContracts/StoragesContracts/IMessageInfoStorage.cs

@@ -0,0 +1,17 @@
+using AutoWorkshopContracts.BindingModels;
+using AutoWorkshopContracts.SearchModels;
+using AutoWorkshopContracts.ViewModels;
+
+namespace AutoWorkshopContracts.StoragesContracts
+{
+    public interface IMessageInfoStorage
+    {
+        List<MessageInfoViewModel> GetFullList();
+
+        List<MessageInfoViewModel> GetFilteredList(MessageInfoSearchModel Model);
+
+        MessageInfoViewModel? GetElement(MessageInfoSearchModel Model);
+
+        MessageInfoViewModel? Insert(MessageInfoBindingModel Model);
+    }
+}

AutoWorkshopContracts/StoragesContracts/IShopStorage.cs

@@ -1,25 +0,0 @@
-using AutoWorkshopContracts.BindingModels;
-using AutoWorkshopContracts.SearchModels;
-using AutoWorkshopContracts.ViewModels;
-
-namespace AutoWorkshopContracts.StoragesContracts
-{
-    public interface IShopStorage
-    {
-        List<ShopViewModel> GetFullList();
-        
-        List<ShopViewModel> GetFilteredList(ShopSearchModel Model);
-        
-        ShopViewModel? GetElement(ShopSearchModel Model);
-        
-        ShopViewModel? Insert(ShopBindingModel Model);
-        
-        ShopViewModel? Update(ShopBindingModel Model);
-        
-        ShopViewModel? Delete(ShopBindingModel Model);
-        
-        bool Sell(SupplySearchModel Model);
-        
-        bool RestockingShops(SupplyBindingModel Model);
-    }
-}

AutoWorkshopContracts/ViewModels/ImplementerViewModel.cs

@@ -0,0 +1,22 @@
+using AutoWorkshopDataModels.Models;
+using System.ComponentModel;
+
+namespace AutoWorkshopContracts.ViewModels
+{
+    public class ImplementerViewModel : IImplementerModel
+    {
+        public int Id { get; set; }
+
+        [DisplayName("ФИО исполнителя")]
+        public string ImplementerFIO { get; set; } = string.Empty;
+
+        [DisplayName("Пароль")]
+        public string Password { get; set; } = string.Empty;
+
+        [DisplayName("Стаж работы")]
+        public int WorkExperience { get; set; }
+
+        [DisplayName("Квалификация")]
+        public int Qualification { get; set; }
+    }
+}

AutoWorkshopContracts/ViewModels/MessageInfoViewModel.cs

@@ -0,0 +1,24 @@
+using AutoWorkshopDataModels.Models;
+using System.ComponentModel;
+
+namespace AutoWorkshopContracts.ViewModels
+{
+    public class MessageInfoViewModel : IMessageInfoModel
+    {
+        public string MessageId { get; set; } = string.Empty;
+
+        public int? ClientId { get; set; }
+
+        [DisplayName("Отправитель")]
+        public string SenderName { get; set; } = string.Empty;
+
+        [DisplayName("Дата доставки")]
+        public DateTime DateDelivery { get; set; }
+
+        [DisplayName("Тема")]
+        public string Subject { get; set; } = string.Empty;
+
+        [DisplayName("Содержание")]
+        public string Body { get; set; } = string.Empty;
+    }
+}

AutoWorkshopContracts/ViewModels/OrderViewModel.cs

@@ -19,6 +19,14 @@ namespace AutoWorkshopContracts.ViewModels
         [DisplayName("Клиент")]
         public string ClientFIO { get; set; } = string.Empty;
 
+        [DisplayName("Почта клиента")]
+        public string ClientEmail { get; set; } = string.Empty;
+
+        public int? ImplementerId { get; set; }
+        
+        [DisplayName("Исполнитель")]
+        public string? ImplementerFIO { get; set; }
+
         [DisplayName("Количество")]        
         public int Count { get; set; }
         

AutoWorkshopContracts/ViewModels/RepairCount.cs

@@ -1,9 +0,0 @@
-namespace AutoWorkshopContracts.ViewModels
-{
-    public class RepairCount
-    {
-        public RepairViewModel Repair { get; set; } = new();
-        
-        public int Count { get; set; } = new();
-    }
-}

AutoWorkshopContracts/ViewModels/ReportGroupedOrdersViewModel.cs

@@ -1,11 +0,0 @@
-namespace AutoWorkshopContracts.ViewModels
-{
-    public class ReportGroupedOrdersViewModel
-    {
-        public DateTime Date { get; set; } = DateTime.Now;
-        
-        public int OrdersCount { get; set; }
-        
-        public double OrdersSum { get; set; }
-    }
-}

AutoWorkshopContracts/ViewModels/ReportShopsViewModel.cs

@@ -1,11 +0,0 @@
-namespace AutoWorkshopContracts.ViewModels
-{
-    public class ReportShopsViewModel
-    {
-        public string ShopName { get; set; } = string.Empty;
-        
-        public int TotalCount { get; set; }
-        
-        public List<(string Repair, int Count)> Repairs { get; set; } = new();
-    }
-}

AutoWorkshopContracts/ViewModels/ShopRepairsViewModel.cs

@@ -1,9 +0,0 @@
-namespace AutoWorkshopContracts.ViewModels
-{
-    public class ShopRepairsViewModel
-    {
-        public ShopViewModel Shop { get; set; } = new();
-        
-        public Dictionary<int, RepairCount> ShopRepairs { get; set; } = new();
-    }
-}

AutoWorkshopContracts/ViewModels/ShopViewModel.cs

@@ -1,24 +0,0 @@
-using AutoWorkshopDataModels.Models;
-using System.ComponentModel;
-
-namespace AutoWorkshopContracts.ViewModels
-{
-    public class ShopViewModel : IShopModel
-    {
-        public int Id { get; set; }
-        
-        [DisplayName("Название")]
-        public string ShopName { get; set; } = string.Empty;
-        
-        [DisplayName("Адрес")]
-        public string Address { get; set; } = string.Empty;
-        
-        [DisplayName("Дата открытия")]
-        public DateTime OpeningDate { get; set; }
-        
-        public Dictionary<int, (IRepairModel, int)> ShopRepairs { get; set; } = new();
-
-        [DisplayName("Вместимость")]
-        public int RepairsMaxCount { get; set; }
-    }
-}

AutoWorkshopDataModels/Models/IImplementerModel.cs

@@ -0,0 +1,13 @@
+namespace AutoWorkshopDataModels.Models
+{
+    public interface IImplementerModel : IId
+    {
+        string ImplementerFIO { get; }
+
+        string Password { get; }
+
+        int WorkExperience { get; }
+
+        int Qualification { get; }
+    }
+}

AutoWorkshopDataModels/Models/IMessageInfoModel.cs

@@ -0,0 +1,17 @@
+namespace AutoWorkshopDataModels.Models
+{
+    public interface IMessageInfoModel
+    {
+        string MessageId { get; }
+
+        int? ClientId { get; }
+
+        string SenderName { get; }
+
+        DateTime DateDelivery { get; }
+
+        string Subject { get; }
+
+        string Body { get; }
+    }
+}

AutoWorkshopDataModels/Models/IOrderModel.cs

@@ -6,6 +6,7 @@ namespace AutoWorkshopDataModels.Models
     {
         int RepairId { get; }
         int ClientId { get; }
+        int? ImplementerId { get; }
         int Count { get; }
         double Sum { get; }
         OrderStatus Status { get; }

AutoWorkshopDataModels/Models/IShopModel.cs

@@ -1,15 +0,0 @@
-namespace AutoWorkshopDataModels.Models
-{
-    public interface IShopModel : IId
-    {
-        string ShopName { get; }
-        
-        string Address { get; }
-        
-        DateTime OpeningDate { get; }
-        
-        Dictionary<int, (IRepairModel, int)> ShopRepairs { get; }
-
-        int RepairsMaxCount { get; }
-    }
-}

AutoWorkshopDataModels/Models/ISupplyModel.cs

@@ -1,11 +0,0 @@
-namespace AutoWorkshopDataModels.Models
-{
-    public interface ISupplyModel
-    {
-        int ShopId { get; }
-        
-        int RepairId { get; }
-        
-        int Count { get; }
-    }
-}

AutoWorkshopDatabaseImplement/AutoWorkshopDatabase.cs

@@ -9,7 +9,7 @@ namespace AutoWorkshopDatabaseImplement
         {
             if (OptionsBuilder.IsConfigured == false)
             {
-                OptionsBuilder.UseNpgsql(@"Host=localhost;Port=5000;Database=AutoWorkshop_Hard;Username=postgres;Password=admin");
+                OptionsBuilder.UseNpgsql(@"Host=localhost;Database=AutoWorkshop;Username=postgres;Password=admin");
             }
             
             base.OnConfiguring(OptionsBuilder);
@@ -26,10 +26,10 @@ namespace AutoWorkshopDatabaseImplement
         
         public virtual DbSet<Order> Orders { set; get; }
 
-        public virtual DbSet<Shop> Shops { get; set; }
-        
-        public virtual DbSet<ShopRepair> ShopRepairs { get; set; }
-
         public virtual DbSet<Client> Clients { set; get; }
+
+        public virtual DbSet<Implementer> Implementers { set; get; }
+
+        public virtual DbSet<MessageInfo> Messages { set; get; }
     }
 }

AutoWorkshopDatabaseImplement/Implements/ClientStorage.cs

@@ -19,7 +19,7 @@ namespace AutoWorkshopDatabaseImplement.Implements
         
         public List<ClientViewModel> GetFilteredList(ClientSearchModel Model)
         {
-            if (string.IsNullOrEmpty(Model.ClientFIO) && string.IsNullOrEmpty(Model.Email))
+            if (string.IsNullOrEmpty(Model.Email) && string.IsNullOrEmpty(Model.ClientFIO))
                 return new();
 
             using var Context = new AutoWorkshopDatabase();
@@ -44,7 +44,7 @@ namespace AutoWorkshopDatabaseImplement.Implements
             
             return Context.Clients
                 .FirstOrDefault(x => (string.IsNullOrEmpty(Model.ClientFIO) || x.ClientFIO == Model.ClientFIO) &&
-                    (!Model.Id.HasValue || x.Id == Model.Id) && (string.IsNullOrEmpty(Model.Email) || x.Email == Model.Email) &&
+					(string.IsNullOrEmpty(Model.Email) || x.Email == Model.Email) && (!Model.Id.HasValue || x.Id == Model.Id) &&
                     (string.IsNullOrEmpty(Model.Password) || x.Password == Model.Password))?
                 .GetViewModel;
         }

AutoWorkshopDatabaseImplement/Implements/ImplementerStorage.cs

@@ -0,0 +1,90 @@
+using AutoWorkshopContracts.BindingModels;
+using AutoWorkshopContracts.SearchModels;
+using AutoWorkshopContracts.StoragesContracts;
+using AutoWorkshopContracts.ViewModels;
+using AutoWorkshopDatabaseImplement.Models;
+
+namespace AutoWorkshopDatabaseImplement.Implements
+{
+    public class ImplementerStorage : IImplementerStorage
+    {
+        public List<ImplementerViewModel> GetFullList()
+        {
+            using var Context = new AutoWorkshopDatabase();
+            
+            return Context.Implementers.Select(x => x.GetViewModel).ToList();
+        }
+
+        public List<ImplementerViewModel> GetFilteredList(ImplementerSearchModel Model)
+        {
+            if (string.IsNullOrEmpty(Model.ImplementerFIO))
+            {
+                return new();
+            }
+            using var Context = new AutoWorkshopDatabase();
+            return Context.Implementers.Where(x => x.ImplementerFIO.Contains(Model.ImplementerFIO)).Select(x => x.GetViewModel).ToList();
+        }
+
+        public ImplementerViewModel? GetElement(ImplementerSearchModel Model)
+        {
+            if (string.IsNullOrEmpty(Model.ImplementerFIO) && !Model.Id.HasValue)
+            {
+                return null;
+            }
+            
+            using var Context = new AutoWorkshopDatabase();
+            
+            return Context.Implementers.FirstOrDefault(x =>
+                (!string.IsNullOrEmpty(Model.ImplementerFIO) && x.ImplementerFIO == Model.ImplementerFIO && (!string.IsNullOrEmpty(Model.Password) ? x.Password == Model.Password : true)) ||
+                (Model.Id.HasValue && x.Id == Model.Id))
+                ?.GetViewModel;
+        }
+
+        public ImplementerViewModel? Insert(ImplementerBindingModel Model)
+        {
+            var NewImplementer = Implementer.Create(Model);
+            if (NewImplementer == null)
+            {
+                return null;
+            }
+            using var Context = new AutoWorkshopDatabase();
+            
+            Context.Implementers.Add(NewImplementer);
+            Context.SaveChanges();
+            
+            return NewImplementer.GetViewModel;
+        }
+
+        public ImplementerViewModel? Update(ImplementerBindingModel Model)
+        {
+            using var Context = new AutoWorkshopDatabase();
+            
+            var Implementer = Context.Implementers.FirstOrDefault(x => x.Id == Model.Id);
+            if (Implementer == null)
+            {
+                return null;
+            }
+            
+            Implementer.Update(Model);
+            Context.SaveChanges();
+            
+            return Implementer.GetViewModel;
+        }
+
+        public ImplementerViewModel? Delete(ImplementerBindingModel Model)
+        {
+            using var Context = new AutoWorkshopDatabase();
+            
+            var Implementer = Context.Implementers.FirstOrDefault(rec => rec.Id == Model.Id);
+            if (Implementer == null)
+            {
+                return null;
+            }
+            
+            Context.Implementers.Remove(Implementer);
+            Context.SaveChanges();
+            
+            return Implementer.GetViewModel;
+        }
+    }
+}

AutoWorkshopDatabaseImplement/Implements/MessageInfoStorage.cs

@@ -0,0 +1,56 @@
+using AutoWorkshopContracts.BindingModels;
+using AutoWorkshopContracts.SearchModels;
+using AutoWorkshopContracts.StoragesContracts;
+using AutoWorkshopContracts.ViewModels;
+using AutoWorkshopDatabaseImplement.Models;
+
+namespace AutoWorkshopDatabaseImplement.Implements
+{
+	public class MessageInfoStorage : IMessageInfoStorage
+	{
+		public List<MessageInfoViewModel> GetFullList()
+		{
+			using var Context = new AutoWorkshopDatabase();
+			
+			return Context.Messages
+				.Select(x => x.GetViewModel)
+				.ToList();
+		}
+
+		public List<MessageInfoViewModel> GetFilteredList(MessageInfoSearchModel Model)
+		{
+			using var Context = new AutoWorkshopDatabase();
+
+			return Context.Messages
+				.Where(x => x.ClientId.HasValue && x.ClientId ==  Model.ClientId)
+				.Select(x => x.GetViewModel)
+				.ToList();
+		}
+
+		public MessageInfoViewModel? GetElement(MessageInfoSearchModel Model)
+		{
+			if (string.IsNullOrEmpty(Model.MessageId))
+				return null;
+
+			using var Context = new AutoWorkshopDatabase();
+
+			return Context.Messages
+				.FirstOrDefault(x => x.MessageId == Model.MessageId)?
+				.GetViewModel;
+		}
+
+		public MessageInfoViewModel? Insert(MessageInfoBindingModel Model)
+		{
+			var NewMessageInfo = MessageInfo.Create(Model);
+
+			if (NewMessageInfo == null)
+				return null;
+
+			using var Context = new AutoWorkshopDatabase();
+			Context.Messages.Add(NewMessageInfo);
+
+			Context.SaveChanges();
+			return NewMessageInfo.GetViewModel;
+		}
+	}
+}

AutoWorkshopDatabaseImplement/Implements/OrderStorage.cs

@@ -16,6 +16,7 @@ namespace AutoWorkshopDatabaseImplement.Implements
             return Context.Orders
                 .Include(x => x.Repair)
                 .Include(x => x.Client)
+                .Include(x => x.Implementer)
                 .Select(x => x.GetViewModel)
                 .ToList();
         }
@@ -29,6 +30,7 @@ namespace AutoWorkshopDatabaseImplement.Implements
                 return Context.Orders
                     .Include(x => x.Repair)
                     .Include(x => x.Client)
+                    .Include(x => x.Implementer)
                     .Where(x => (x.DateCreate >= Model.DateFrom && x.DateCreate <= Model.DateTo) && (!Model.ClientId.HasValue || x.ClientId == Model.ClientId))
                     .Select(x => x.GetViewModel)
                     .ToList();
@@ -37,14 +39,18 @@ namespace AutoWorkshopDatabaseImplement.Implements
             return Context.Orders
                 .Include(x => x.Repair)
                 .Include(x => x.Client)
-                .Where(x => (Model.Id.HasValue && x.Id == Model.Id) || (Model.ClientId.HasValue && x.ClientId == Model.ClientId))
+                .Include (x => x.Implementer)
+                .Where(x => (Model.Id.HasValue && x.Id == Model.Id) 
+                    || (Model.ClientId.HasValue && x.ClientId == Model.ClientId)
+                    || (Model.ImplementerId.HasValue && x.ImplementerId == Model.ImplementerId)
+                    || (Model.Status.HasValue && x.Status == Model.Status))
                 .Select(x => x.GetViewModel)
                 .ToList();
         }
         
         public OrderViewModel? GetElement(OrderSearchModel Model)
         {
-            if (!Model.Id.HasValue)
+            if (!Model.Id.HasValue && !Model.ImplementerId.HasValue && !Model.Status.HasValue)
                 return null;
 
             using var Context = new AutoWorkshopDatabase();
@@ -52,7 +58,9 @@ namespace AutoWorkshopDatabaseImplement.Implements
             return Context.Orders
                 .Include(x => x.Repair)
                 .Include(x => x.Client)
-                .FirstOrDefault(x => Model.Id.HasValue && x.Id == Model.Id)?
+                .Include(x => x.Implementer)
+                .FirstOrDefault(x => (Model.Id.HasValue && x.Id == Model.Id)
+                    || (Model.ImplementerId.HasValue && Model.Status.HasValue && x.ImplementerId == Model.ImplementerId && x.Status == Model.Status) )?
                 .GetViewModel;
         }
         
@@ -70,7 +78,7 @@ namespace AutoWorkshopDatabaseImplement.Implements
             Context.Orders.Add(NewOrder);
             Context.SaveChanges();
             
-            return Context.Orders.Include(x => x.Repair).Include(x => x.Client).FirstOrDefault(x => x.Id == NewOrder.Id)?.GetViewModel;
+            return Context.Orders.Include(x => x.Repair).Include(x => x.Client).Include(x => x.Implementer).FirstOrDefault(x => x.Id == NewOrder.Id)?.GetViewModel;
         }
         
         public OrderViewModel? Update(OrderBindingModel Model)
@@ -84,13 +92,13 @@ namespace AutoWorkshopDatabaseImplement.Implements
             Order.Update(Model);
             Context.SaveChanges();
             
-            return Context.Orders.Include(x => x.Repair).Include(x => x.Client).FirstOrDefault(x => x.Id == Model.Id)?.GetViewModel;
+            return Context.Orders.Include(x => x.Repair).Include(x => x.Client).Include(x => x.Implementer).FirstOrDefault(x => x.Id == Model.Id)?.GetViewModel;
         }
         
         public OrderViewModel? Delete(OrderBindingModel Model)
         {
             using var Context = new AutoWorkshopDatabase();
-            var Order = Context.Orders.Include(x => x.Repair).Include(x => x.Client).FirstOrDefault(rec => rec.Id == Model.Id);
+            var Order = Context.Orders.Include(x => x.Repair).Include(x => x.Client).Include(x => x.Implementer).FirstOrDefault(rec => rec.Id == Model.Id);
 
             if (Order == null)
                 return null;

AutoWorkshopDatabaseImplement/Implements/ShopStorage.cs

@@ -1,221 +0,0 @@
-using AutoWorkshopContracts.BindingModels;
-using AutoWorkshopContracts.SearchModels;
-using AutoWorkshopContracts.StoragesContracts;
-using AutoWorkshopContracts.ViewModels;
-using AutoWorkshopDatabaseImplement.Models;
-using Microsoft.EntityFrameworkCore;
-
-namespace AutoWorkshopDatabaseImplement.Implements
-{
-    public class ShopStorage : IShopStorage
-    {
-        public List<ShopViewModel> GetFullList()
-        {
-            using var Context = new AutoWorkshopDatabase();
-            return Context.Shops
-                .Include(x => x.Repairs)
-                .ThenInclude(x => x.Repair)
-                .ToList()
-                .Select(x => x.GetViewModel)
-                .ToList();
-        }
-
-        public List<ShopViewModel> GetFilteredList(ShopSearchModel Model)
-        {
-            if (string.IsNullOrEmpty(Model.ShopName))
-                return new();
-
-            using var Context = new AutoWorkshopDatabase();
-            
-            return Context.Shops
-                .Include(x => x.Repairs)
-                .ThenInclude(x => x.Repair)
-                .Where(x => x.ShopName.Contains(Model.ShopName))
-                .ToList()
-                .Select(x => x.GetViewModel)
-                .ToList();
-        }
-
-        public ShopViewModel? GetElement(ShopSearchModel Model)
-        {
-            if (string.IsNullOrEmpty(Model.ShopName) && !Model.Id.HasValue)
-                return new();
-
-            using var Context = new AutoWorkshopDatabase();
-            
-            return Context.Shops
-                .Include(x => x.Repairs)
-                .ThenInclude(x => x.Repair)
-                .FirstOrDefault(x => (!string.IsNullOrEmpty(Model.ShopName) && x.ShopName == Model.ShopName) ||
-                    (Model.Id.HasValue && x.Id == Model.Id))?
-                .GetViewModel;
-        }
-
-        public ShopViewModel? Insert(ShopBindingModel Model)
-        {
-            using var Context = new AutoWorkshopDatabase();
-            
-            var NewShop = Shop.Create(Context, Model);
-            if (NewShop == null)
-                return null;
-
-            Context.Shops.Add(NewShop);
-            Context.SaveChanges();
-            
-            return NewShop.GetViewModel;
-        }
-
-        public ShopViewModel? Update(ShopBindingModel Model)
-        {
-            using var Context = new AutoWorkshopDatabase();
-
-            using var Transaction = Context.Database.BeginTransaction();
-            try
-            {
-                var Shop = Context.Shops.FirstOrDefault(x => x.Id == Model.Id);
-                
-                if (Shop == null)
-                    return null;
-
-                Shop.Update(Model);
-                Context.SaveChanges();
-                Shop.UpdateRepairs(Context, Model);
-                
-                Transaction.Commit();
-                return Shop.GetViewModel;
-            }
-            catch
-            {
-                Transaction.Rollback();
-                throw;
-            }
-        }
-
-        public ShopViewModel? Delete(ShopBindingModel Model)
-        {
-            using var Context = new AutoWorkshopDatabase();
-
-            var Shop = Context.Shops
-                .Include(x => x.Repairs)
-                .FirstOrDefault(x => x.Id == Model.Id);
-
-            if (Shop == null)
-                return null;
-
-            Context.Shops.Remove(Shop);
-            Context.SaveChanges();
-            
-            return Shop.GetViewModel;
-        }        
-
-        public bool Sell(SupplySearchModel Model)
-        {
-            using var Context = new AutoWorkshopDatabase();
-            var Transaction = Context.Database.BeginTransaction();
-            
-            try
-            {
-                var ShopsWithDesiredRepair = Context.Shops
-                    .Include(x => x.Repairs)
-                    .ThenInclude(x => x.Repair)
-                    .ToList()
-                    .Where(x => x.ShopRepairs.ContainsKey(Model.RepairId.Value))
-                    .OrderByDescending(x => x.ShopRepairs[Model.RepairId.Value].Item2)
-                    .ToList();
-
-                foreach (var Shop in ShopsWithDesiredRepair)
-                {
-                    int Slack = Model.Count.Value - Shop.ShopRepairs[Model.RepairId.Value].Item2;
-                    
-                    if (Slack > 0)
-                    {
-                        Shop.ShopRepairs.Remove(Model.RepairId.Value);                        
-                        Shop.RepairsDictionatyUpdate(Context);
-                        Context.SaveChanges();
-                        
-                        Model.Count = Slack;
-                    }
-                    else
-                    {
-                        if (Slack == 0)
-                        {
-                            Shop.ShopRepairs.Remove(Model.RepairId.Value);
-                        }
-                        else
-                        {
-                            var RepairAndCount = Shop.ShopRepairs[Model.RepairId.Value];
-                            RepairAndCount.Item2 = -Slack;
-                            Shop.ShopRepairs[Model.RepairId.Value] = RepairAndCount;
-                        }
-
-                        Shop.RepairsDictionatyUpdate(Context);
-                        Transaction.Commit();
-                        
-                        return true;
-                    }
-                }
-                
-                Transaction.Rollback();
-                return false;
-            }
-            catch
-            {
-                Transaction.Rollback();
-                throw;
-            }
-        }
-
-		public bool RestockingShops(SupplyBindingModel Model)
-		{
-			using var Context = new AutoWorkshopDatabase();
-			var Transaction = Context.Database.BeginTransaction();
-
-			var Shops = Context.Shops
-				.Include(x => x.Repairs)
-				.ThenInclude(x => x.Repair)
-				.ToList()
-				.Where(x => x.RepairsMaxCount > x.ShopRepairs
-					.Select(x => x.Value.Item2).Sum())
-				.ToList();
-
-			try
-			{
-				foreach (Shop Shop in Shops)
-				{
-					int FreeSpaceNum = Shop.RepairsMaxCount - Shop.ShopRepairs.Select(x => x.Value.Item2).Sum();
-					
-                    int Refill = Math.Min(FreeSpaceNum, Model.Count);
-					Model.Count -= Refill;
-
-					if (Shop.ShopRepairs.ContainsKey(Model.RepairId))
-					{
-						var RepairAndCount = Shop.ShopRepairs[Model.RepairId];
-						RepairAndCount.Item2 += Refill;
-						Shop.ShopRepairs[Model.RepairId] = RepairAndCount;
-					}
-					else
-					{
-						var Repair = Context.Repairs.First(x => x.Id == Model.RepairId);
-						Shop.ShopRepairs.Add(Model.RepairId, (Repair, Refill));
-					}
-
-					Shop.RepairsDictionatyUpdate(Context);
-
-					if (Model.Count == 0)
-					{
-						Transaction.Commit();
-						return true;
-					}
-				}
-
-				Transaction.Rollback();
-				return false;
-			}
-			catch
-			{
-				Transaction.Rollback();
-				throw;
-			}
-		}
-	}
-}

AutoWorkshopDatabaseImplement/Migrations/20240419194703_Mails.Designer.cs

@@ -12,8 +12,8 @@ using Npgsql.EntityFrameworkCore.PostgreSQL.Metadata;
 namespace AutoWorkshopDatabaseImplement.Migrations
 {
     [DbContext(typeof(AutoWorkshopDatabase))]
-    [Migration("20240514192226_Lab5_Hard")]
-    partial class Lab5_Hard
+    [Migration("20240419194703_Mails")]
+    partial class Mails
     {
         /// <inheritdoc />
         protected override void BuildTargetModel(ModelBuilder modelBuilder)
@@ -70,6 +70,63 @@ namespace AutoWorkshopDatabaseImplement.Migrations
                     b.ToTable("Components");
                 });
 
+            modelBuilder.Entity("AutoWorkshopDatabaseImplement.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("AutoWorkshopDatabaseImplement.Models.MessageInfo", b =>
+                {
+                    b.Property<string>("MessageId")
+                        .HasColumnType("text");
+
+                    b.Property<string>("Body")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<int?>("ClientId")
+                        .HasColumnType("integer");
+
+                    b.Property<DateTime>("DateDelivery")
+                        .HasColumnType("timestamp without time zone");
+
+                    b.Property<string>("SenderName")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("Subject")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.HasKey("MessageId");
+
+                    b.HasIndex("ClientId");
+
+                    b.ToTable("Messages");
+                });
+
             modelBuilder.Entity("AutoWorkshopDatabaseImplement.Models.Order", b =>
                 {
                     b.Property<int>("Id")
@@ -90,6 +147,9 @@ namespace AutoWorkshopDatabaseImplement.Migrations
                     b.Property<DateTime?>("DateImplement")
                         .HasColumnType("timestamp without time zone");
 
+                    b.Property<int?>("ImplementerId")
+                        .HasColumnType("integer");
+
                     b.Property<int>("RepairId")
                         .HasColumnType("integer");
 
@@ -103,6 +163,8 @@ namespace AutoWorkshopDatabaseImplement.Migrations
 
                     b.HasIndex("ClientId");
 
+                    b.HasIndex("ImplementerId");
+
                     b.HasIndex("RepairId");
 
                     b.ToTable("Orders");
@@ -154,67 +216,25 @@ namespace AutoWorkshopDatabaseImplement.Migrations
                     b.ToTable("RepairComponents");
                 });
 
-            modelBuilder.Entity("AutoWorkshopDatabaseImplement.Models.Shop", b =>
+            modelBuilder.Entity("AutoWorkshopDatabaseImplement.Models.MessageInfo", b =>
                 {
-                    b.Property<int>("Id")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("integer");
-
-                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
-
-                    b.Property<string>("Address")
-                        .IsRequired()
-                        .HasColumnType("text");
-
-                    b.Property<DateTime>("OpeningDate")
-                        .HasColumnType("timestamp without time zone");
-
-                    b.Property<int>("RepairsMaxCount")
-                        .HasColumnType("integer");
-
-                    b.Property<string>("ShopName")
-                        .IsRequired()
-                        .HasColumnType("text");
-
-                    b.HasKey("Id");
-
-                    b.ToTable("Shops");
-                });
-
-            modelBuilder.Entity("AutoWorkshopDatabaseImplement.Models.ShopRepair", b =>
-                {
-                    b.Property<int>("Id")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("integer");
-
-                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
-
-                    b.Property<int>("Count")
-                        .HasColumnType("integer");
-
-                    b.Property<int>("RepairId")
-                        .HasColumnType("integer");
-
-                    b.Property<int>("ShopId")
-                        .HasColumnType("integer");
-
-                    b.HasKey("Id");
-
-                    b.HasIndex("RepairId");
-
-                    b.HasIndex("ShopId");
-
-                    b.ToTable("ShopRepairs");
+                    b.HasOne("AutoWorkshopDatabaseImplement.Models.Client", null)
+                        .WithMany("ClientMessages")
+                        .HasForeignKey("ClientId");
                 });
 
             modelBuilder.Entity("AutoWorkshopDatabaseImplement.Models.Order", b =>
                 {
                     b.HasOne("AutoWorkshopDatabaseImplement.Models.Client", "Client")
-                        .WithMany("Orders")
+                        .WithMany("ClientOrders")
                         .HasForeignKey("ClientId")
                         .OnDelete(DeleteBehavior.Cascade)
                         .IsRequired();
 
+                    b.HasOne("AutoWorkshopDatabaseImplement.Models.Implementer", "Implementer")
+                        .WithMany("Order")
+                        .HasForeignKey("ImplementerId");
+
                     b.HasOne("AutoWorkshopDatabaseImplement.Models.Repair", "Repair")
                         .WithMany("Orders")
                         .HasForeignKey("RepairId")
@@ -223,6 +243,8 @@ namespace AutoWorkshopDatabaseImplement.Migrations
 
                     b.Navigation("Client");
 
+                    b.Navigation("Implementer");
+
                     b.Navigation("Repair");
                 });
 
@@ -245,28 +267,11 @@ namespace AutoWorkshopDatabaseImplement.Migrations
                     b.Navigation("Repair");
                 });
 
-            modelBuilder.Entity("AutoWorkshopDatabaseImplement.Models.ShopRepair", b =>
-                {
-                    b.HasOne("AutoWorkshopDatabaseImplement.Models.Repair", "Repair")
-                        .WithMany("Shops")
-                        .HasForeignKey("RepairId")
-                        .OnDelete(DeleteBehavior.Cascade)
-                        .IsRequired();
-
-                    b.HasOne("AutoWorkshopDatabaseImplement.Models.Shop", "Shop")
-                        .WithMany("Repairs")
-                        .HasForeignKey("ShopId")
-                        .OnDelete(DeleteBehavior.Cascade)
-                        .IsRequired();
-
-                    b.Navigation("Repair");
-
-                    b.Navigation("Shop");
-                });
-
             modelBuilder.Entity("AutoWorkshopDatabaseImplement.Models.Client", b =>
                 {
-                    b.Navigation("Orders");
+                    b.Navigation("ClientMessages");
+
+                    b.Navigation("ClientOrders");
                 });
 
             modelBuilder.Entity("AutoWorkshopDatabaseImplement.Models.Component", b =>
@@ -274,18 +279,16 @@ namespace AutoWorkshopDatabaseImplement.Migrations
                     b.Navigation("RepairComponents");
                 });
 
+            modelBuilder.Entity("AutoWorkshopDatabaseImplement.Models.Implementer", b =>
+                {
+                    b.Navigation("Order");
+                });
+
             modelBuilder.Entity("AutoWorkshopDatabaseImplement.Models.Repair", b =>
                 {
                     b.Navigation("Components");
 
                     b.Navigation("Orders");
-
-                    b.Navigation("Shops");
-                });
-
-            modelBuilder.Entity("AutoWorkshopDatabaseImplement.Models.Shop", b =>
-                {
-                    b.Navigation("Repairs");
                 });
 #pragma warning restore 612, 618
         }

AutoWorkshopDatabaseImplement/Migrations/20240419194703_Mails.cs

@@ -7,7 +7,7 @@ using Npgsql.EntityFrameworkCore.PostgreSQL.Metadata;
 namespace AutoWorkshopDatabaseImplement.Migrations
 {
     /// <inheritdoc />
-    public partial class Lab5_Hard : Migration
+    public partial class Mails : Migration
     {
         /// <inheritdoc />
         protected override void Up(MigrationBuilder migrationBuilder)
@@ -41,6 +41,22 @@ namespace AutoWorkshopDatabaseImplement.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),
+                    WorkExperience = table.Column<int>(type: "integer", nullable: false),
+                    Qualification = table.Column<int>(type: "integer", nullable: false)
+                },
+                constraints: table =>
+                {
+                    table.PrimaryKey("PK_Implementers", x => x.Id);
+                });
+
             migrationBuilder.CreateTable(
                 name: "Repairs",
                 columns: table => new
@@ -56,19 +72,24 @@ namespace AutoWorkshopDatabaseImplement.Migrations
                 });
 
             migrationBuilder.CreateTable(
-                name: "Shops",
+                name: "Messages",
                 columns: table => new
                 {
-                    Id = table.Column<int>(type: "integer", nullable: false)
-                        .Annotation("Npgsql:ValueGenerationStrategy", NpgsqlValueGenerationStrategy.IdentityByDefaultColumn),
-                    ShopName = table.Column<string>(type: "text", nullable: false),
-                    Address = table.Column<string>(type: "text", nullable: false),
-                    OpeningDate = table.Column<DateTime>(type: "timestamp without time zone", nullable: false),
-                    RepairsMaxCount = table.Column<int>(type: "integer", nullable: false)
+                    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_Shops", x => x.Id);
+                    table.PrimaryKey("PK_Messages", x => x.MessageId);
+                    table.ForeignKey(
+                        name: "FK_Messages_Clients_ClientId",
+                        column: x => x.ClientId,
+                        principalTable: "Clients",
+                        principalColumn: "Id");
                 });
 
             migrationBuilder.CreateTable(
@@ -79,6 +100,7 @@ namespace AutoWorkshopDatabaseImplement.Migrations
                         .Annotation("Npgsql:ValueGenerationStrategy", NpgsqlValueGenerationStrategy.IdentityByDefaultColumn),
                     RepairId = table.Column<int>(type: "integer", nullable: false),
                     ClientId = table.Column<int>(type: "integer", nullable: false),
+                    ImplementerId = table.Column<int>(type: "integer", nullable: true),
                     Count = table.Column<int>(type: "integer", nullable: false),
                     Sum = table.Column<double>(type: "double precision", nullable: false),
                     Status = table.Column<int>(type: "integer", nullable: false),
@@ -94,6 +116,11 @@ namespace AutoWorkshopDatabaseImplement.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,
@@ -129,38 +156,21 @@ namespace AutoWorkshopDatabaseImplement.Migrations
                         onDelete: ReferentialAction.Cascade);
                 });
 
-            migrationBuilder.CreateTable(
-                name: "ShopRepairs",
-                columns: table => new
-                {
-                    Id = table.Column<int>(type: "integer", nullable: false)
-                        .Annotation("Npgsql:ValueGenerationStrategy", NpgsqlValueGenerationStrategy.IdentityByDefaultColumn),
-                    RepairId = table.Column<int>(type: "integer", nullable: false),
-                    ShopId = table.Column<int>(type: "integer", nullable: false),
-                    Count = table.Column<int>(type: "integer", nullable: false)
-                },
-                constraints: table =>
-                {
-                    table.PrimaryKey("PK_ShopRepairs", x => x.Id);
-                    table.ForeignKey(
-                        name: "FK_ShopRepairs_Repairs_RepairId",
-                        column: x => x.RepairId,
-                        principalTable: "Repairs",
-                        principalColumn: "Id",
-                        onDelete: ReferentialAction.Cascade);
-                    table.ForeignKey(
-                        name: "FK_ShopRepairs_Shops_ShopId",
-                        column: x => x.ShopId,
-                        principalTable: "Shops",
-                        principalColumn: "Id",
-                        onDelete: ReferentialAction.Cascade);
-                });
+            migrationBuilder.CreateIndex(
+                name: "IX_Messages_ClientId",
+                table: "Messages",
+                column: "ClientId");
 
             migrationBuilder.CreateIndex(
                 name: "IX_Orders_ClientId",
                 table: "Orders",
                 column: "ClientId");
 
+            migrationBuilder.CreateIndex(
+                name: "IX_Orders_ImplementerId",
+                table: "Orders",
+                column: "ImplementerId");
+
             migrationBuilder.CreateIndex(
                 name: "IX_Orders_RepairId",
                 table: "Orders",
@@ -175,21 +185,14 @@ namespace AutoWorkshopDatabaseImplement.Migrations
                 name: "IX_RepairComponents_RepairId",
                 table: "RepairComponents",
                 column: "RepairId");
-
-            migrationBuilder.CreateIndex(
-                name: "IX_ShopRepairs_RepairId",
-                table: "ShopRepairs",
-                column: "RepairId");
-
-            migrationBuilder.CreateIndex(
-                name: "IX_ShopRepairs_ShopId",
-                table: "ShopRepairs",
-                column: "ShopId");
         }
 
         /// <inheritdoc />
         protected override void Down(MigrationBuilder migrationBuilder)
         {
+            migrationBuilder.DropTable(
+                name: "Messages");
+
             migrationBuilder.DropTable(
                 name: "Orders");
 
@@ -197,19 +200,16 @@ namespace AutoWorkshopDatabaseImplement.Migrations
                 name: "RepairComponents");
 
             migrationBuilder.DropTable(
-                name: "ShopRepairs");
+                name: "Clients");
 
             migrationBuilder.DropTable(
-                name: "Clients");
+                name: "Implementers");
 
             migrationBuilder.DropTable(
                 name: "Components");
 
             migrationBuilder.DropTable(
                 name: "Repairs");
-
-            migrationBuilder.DropTable(
-                name: "Shops");
         }
     }
 }

AutoWorkshopDatabaseImplement/Migrations/AutoWorkshopDatabaseModelSnapshot.cs

@@ -67,6 +67,63 @@ namespace AutoWorkshopDatabaseImplement.Migrations
                     b.ToTable("Components");
                 });
 
+            modelBuilder.Entity("AutoWorkshopDatabaseImplement.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("AutoWorkshopDatabaseImplement.Models.MessageInfo", b =>
+                {
+                    b.Property<string>("MessageId")
+                        .HasColumnType("text");
+
+                    b.Property<string>("Body")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<int?>("ClientId")
+                        .HasColumnType("integer");
+
+                    b.Property<DateTime>("DateDelivery")
+                        .HasColumnType("timestamp without time zone");
+
+                    b.Property<string>("SenderName")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("Subject")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.HasKey("MessageId");
+
+                    b.HasIndex("ClientId");
+
+                    b.ToTable("Messages");
+                });
+
             modelBuilder.Entity("AutoWorkshopDatabaseImplement.Models.Order", b =>
                 {
                     b.Property<int>("Id")
@@ -87,6 +144,9 @@ namespace AutoWorkshopDatabaseImplement.Migrations
                     b.Property<DateTime?>("DateImplement")
                         .HasColumnType("timestamp without time zone");
 
+                    b.Property<int?>("ImplementerId")
+                        .HasColumnType("integer");
+
                     b.Property<int>("RepairId")
                         .HasColumnType("integer");
 
@@ -100,6 +160,8 @@ namespace AutoWorkshopDatabaseImplement.Migrations
 
                     b.HasIndex("ClientId");
 
+                    b.HasIndex("ImplementerId");
+
                     b.HasIndex("RepairId");
 
                     b.ToTable("Orders");
@@ -151,67 +213,25 @@ namespace AutoWorkshopDatabaseImplement.Migrations
                     b.ToTable("RepairComponents");
                 });
 
-            modelBuilder.Entity("AutoWorkshopDatabaseImplement.Models.Shop", b =>
+            modelBuilder.Entity("AutoWorkshopDatabaseImplement.Models.MessageInfo", b =>
                 {
-                    b.Property<int>("Id")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("integer");
-
-                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
-
-                    b.Property<string>("Address")
-                        .IsRequired()
-                        .HasColumnType("text");
-
-                    b.Property<DateTime>("OpeningDate")
-                        .HasColumnType("timestamp without time zone");
-
-                    b.Property<int>("RepairsMaxCount")
-                        .HasColumnType("integer");
-
-                    b.Property<string>("ShopName")
-                        .IsRequired()
-                        .HasColumnType("text");
-
-                    b.HasKey("Id");
-
-                    b.ToTable("Shops");
-                });
-
-            modelBuilder.Entity("AutoWorkshopDatabaseImplement.Models.ShopRepair", b =>
-                {
-                    b.Property<int>("Id")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("integer");
-
-                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
-
-                    b.Property<int>("Count")
-                        .HasColumnType("integer");
-
-                    b.Property<int>("RepairId")
-                        .HasColumnType("integer");
-
-                    b.Property<int>("ShopId")
-                        .HasColumnType("integer");
-
-                    b.HasKey("Id");
-
-                    b.HasIndex("RepairId");
-
-                    b.HasIndex("ShopId");
-
-                    b.ToTable("ShopRepairs");
+                    b.HasOne("AutoWorkshopDatabaseImplement.Models.Client", null)
+                        .WithMany("ClientMessages")
+                        .HasForeignKey("ClientId");
                 });
 
             modelBuilder.Entity("AutoWorkshopDatabaseImplement.Models.Order", b =>
                 {
                     b.HasOne("AutoWorkshopDatabaseImplement.Models.Client", "Client")
-                        .WithMany("Orders")
+                        .WithMany("ClientOrders")
                         .HasForeignKey("ClientId")
                         .OnDelete(DeleteBehavior.Cascade)
                         .IsRequired();
 
+                    b.HasOne("AutoWorkshopDatabaseImplement.Models.Implementer", "Implementer")
+                        .WithMany("Order")
+                        .HasForeignKey("ImplementerId");
+
                     b.HasOne("AutoWorkshopDatabaseImplement.Models.Repair", "Repair")
                         .WithMany("Orders")
                         .HasForeignKey("RepairId")
@@ -220,6 +240,8 @@ namespace AutoWorkshopDatabaseImplement.Migrations
 
                     b.Navigation("Client");
 
+                    b.Navigation("Implementer");
+
                     b.Navigation("Repair");
                 });
 
@@ -242,28 +264,11 @@ namespace AutoWorkshopDatabaseImplement.Migrations
                     b.Navigation("Repair");
                 });
 
-            modelBuilder.Entity("AutoWorkshopDatabaseImplement.Models.ShopRepair", b =>
-                {
-                    b.HasOne("AutoWorkshopDatabaseImplement.Models.Repair", "Repair")
-                        .WithMany("Shops")
-                        .HasForeignKey("RepairId")
-                        .OnDelete(DeleteBehavior.Cascade)
-                        .IsRequired();
-
-                    b.HasOne("AutoWorkshopDatabaseImplement.Models.Shop", "Shop")
-                        .WithMany("Repairs")
-                        .HasForeignKey("ShopId")
-                        .OnDelete(DeleteBehavior.Cascade)
-                        .IsRequired();
-
-                    b.Navigation("Repair");
-
-                    b.Navigation("Shop");
-                });
-
             modelBuilder.Entity("AutoWorkshopDatabaseImplement.Models.Client", b =>
                 {
-                    b.Navigation("Orders");
+                    b.Navigation("ClientMessages");
+
+                    b.Navigation("ClientOrders");
                 });
 
             modelBuilder.Entity("AutoWorkshopDatabaseImplement.Models.Component", b =>
@@ -271,18 +276,16 @@ namespace AutoWorkshopDatabaseImplement.Migrations
                     b.Navigation("RepairComponents");
                 });
 
+            modelBuilder.Entity("AutoWorkshopDatabaseImplement.Models.Implementer", b =>
+                {
+                    b.Navigation("Order");
+                });
+
             modelBuilder.Entity("AutoWorkshopDatabaseImplement.Models.Repair", b =>
                 {
                     b.Navigation("Components");
 
                     b.Navigation("Orders");
-
-                    b.Navigation("Shops");
-                });
-
-            modelBuilder.Entity("AutoWorkshopDatabaseImplement.Models.Shop", b =>
-                {
-                    b.Navigation("Repairs");
                 });
 #pragma warning restore 612, 618
         }

AutoWorkshopDatabaseImplement/Models/Client.cs

@@ -20,7 +20,10 @@ namespace AutoWorkshopDatabaseImplement.Models
         public string Password { get; set; } = string.Empty;
         
         [ForeignKey("ClientId")]
-        public virtual List<Order> Orders { get; set; } = new();
+        public virtual List<Order> ClientOrders { get; set; } = new();
+
+        [ForeignKey("ClientId")]
+        public virtual List<MessageInfo> ClientMessages { get; set; } = new();
         
         public static Client? Create(ClientBindingModel Model)
         {

AutoWorkshopDatabaseImplement/Models/Implementer.cs

@@ -0,0 +1,64 @@
+using AutoWorkshopContracts.BindingModels;
+using AutoWorkshopContracts.ViewModels;
+using AutoWorkshopDataModels.Models;
+using System.ComponentModel.DataAnnotations;
+using System.ComponentModel.DataAnnotations.Schema;
+
+namespace AutoWorkshopDatabaseImplement.Models
+{
+    public class Implementer : IImplementerModel
+    {
+        public int Id { get; set; }
+
+        [Required]
+        public string ImplementerFIO { get; set; } = string.Empty;
+
+        [Required]
+        public string Password { get; set; } = string.Empty;
+
+        [Required]
+        public int WorkExperience { get; set; }
+
+        [Required]
+        public int Qualification { get; set; }
+
+        [ForeignKey("ImplementerId")]
+        public virtual List<Order> Order { get; set; } = new();
+
+        public static Implementer? Create(ImplementerBindingModel? Model)
+        {
+            if (Model == null)
+                return null;
+            
+            return new Implementer()
+            {
+                Id = Model.Id,
+                ImplementerFIO = Model.ImplementerFIO,
+                Password = Model.Password,
+                WorkExperience = Model.WorkExperience,
+                Qualification = Model.Qualification
+            };
+        }
+
+        public void Update(ImplementerBindingModel Model)
+        {
+            if (Model == null)
+            {
+                return;
+            }
+            ImplementerFIO = Model.ImplementerFIO;
+            Password = Model.Password;
+            WorkExperience = Model.WorkExperience;
+            Qualification = Model.Qualification;
+        }
+
+        public ImplementerViewModel GetViewModel => new()
+        {
+            Id = Id,
+            ImplementerFIO = ImplementerFIO,
+            Password = Password,
+            WorkExperience = WorkExperience,
+            Qualification = Qualification
+        };
+    }
+}

AutoWorkshopDatabaseImplement/Models/MessageInfo.cs

@@ -0,0 +1,49 @@
+using AutoWorkshopContracts.BindingModels;
+using AutoWorkshopContracts.ViewModels;
+using AutoWorkshopDataModels.Models;
+using System.ComponentModel.DataAnnotations;
+
+namespace AutoWorkshopDatabaseImplement.Models
+{
+	public class MessageInfo : IMessageInfoModel
+	{
+		[Key]
+		public string MessageId { get; set; } = string.Empty;
+
+		public int? ClientId { get; set; }
+
+		public string SenderName { get; set; } = string.Empty;
+
+		public DateTime DateDelivery { get; set; }
+
+		public string Subject { get; set; } = string.Empty;
+
+		public string Body { get; set; } = string.Empty;
+
+		public static MessageInfo? Create(MessageInfoBindingModel? Model)
+		{
+			if (Model == null)
+				return null;
+			
+			return new()
+			{
+				MessageId = Model.MessageId,
+				ClientId = Model.ClientId,
+				SenderName = Model.SenderName,
+				DateDelivery = Model.DateDelivery,
+				Subject = Model.Subject,
+				Body = Model.Body
+			};
+		}
+
+		public MessageInfoViewModel GetViewModel => new()
+		{
+			MessageId = MessageId,
+			ClientId = ClientId,
+			SenderName = SenderName,
+			DateDelivery = DateDelivery,
+			Subject = Subject,
+			Body = Body
+		};
+	}
+}

AutoWorkshopDatabaseImplement/Models/Order.cs

@@ -20,6 +20,10 @@ namespace AutoWorkshopDatabaseImplement.Models
         
         public virtual Client Client { get; set; }
 
+        public int? ImplementerId { get; private set; }
+
+        public virtual Implementer? Implementer { get; set; }
+
         [Required]
         public int Count { get; private set; }
         
@@ -44,6 +48,7 @@ namespace AutoWorkshopDatabaseImplement.Models
                 Id = Model.Id,
                 RepairId = Model.RepairId,
                 ClientId = Model.ClientId,
+                ImplementerId = Model.ImplementerId,
                 Count = Model.Count,
                 Sum = Model.Sum,
                 Status = Model.Status,
@@ -57,6 +62,7 @@ namespace AutoWorkshopDatabaseImplement.Models
             if (Model is null)
                 return;
 
+            ImplementerId = Model.ImplementerId;
             Status = Model.Status;
             DateImplement = Model.DateImplement;
         }
@@ -66,8 +72,11 @@ namespace AutoWorkshopDatabaseImplement.Models
             Id = Id,
             RepairId = RepairId,
             ClientId = ClientId,
+            ImplementerId = ImplementerId,
             RepairName = Repair.RepairName,
             ClientFIO = Client.ClientFIO,
+            ClientEmail = Client.Email,
+            ImplementerFIO = Implementer?.ImplementerFIO,
             Count = Count,
             Sum = Sum,
             Status = Status,

AutoWorkshopDatabaseImplement/Models/Repair.cs

@@ -38,10 +38,7 @@ namespace AutoWorkshopDatabaseImplement.Models
         
         [ForeignKey("RepairId")]
         public virtual List<Order> Orders { get; set; } = new();
-
-        [ForeignKey("RepairId")]
-        public virtual List<ShopRepair> Shops { get; set; } = new();
-
+        
         public static Repair Create(AutoWorkshopDatabase Context, RepairBindingModel Model)
         {
             return new Repair()

AutoWorkshopDatabaseImplement/Models/Shop.cs

@@ -1,131 +0,0 @@
-using AutoWorkshopContracts.BindingModels;
-using AutoWorkshopContracts.ViewModels;
-using AutoWorkshopDataModels.Models;
-using System.ComponentModel.DataAnnotations;
-using System.ComponentModel.DataAnnotations.Schema;
-
-namespace AutoWorkshopDatabaseImplement.Models
-{
-    public class Shop : IShopModel
-    {
-        public int Id { get; set; }
-
-        [Required]
-        public string ShopName { get; set; } = string.Empty;
-
-        [Required]
-        public string Address { get; set; } = string.Empty;
-
-        [Required]
-        public DateTime OpeningDate { get; set; }
-
-        [Required]
-        public int RepairsMaxCount { get; set; }
-
-        [ForeignKey("ShopId")]
-        public List<ShopRepair> Repairs { get; set; } = new();
-
-        private Dictionary<int, (IRepairModel, int)>? _shopRepairs = null;
-
-        [NotMapped]
-        public Dictionary<int, (IRepairModel, int)> ShopRepairs
-        {
-            get
-            {
-                if (_shopRepairs == null)
-                {
-                    if (_shopRepairs == null)
-                    {
-                        _shopRepairs = Repairs.ToDictionary(ShopRep => ShopRep.RepairId, ShopRep => (ShopRep.Repair as IRepairModel, ShopRep.Count));
-                    }                    
-                    return _shopRepairs;
-                }
-                
-                return _shopRepairs;
-            }
-        }
-
-        public static Shop Create(AutoWorkshopDatabase Context, ShopBindingModel Model)
-        {
-            return new Shop()
-            {
-                Id = Model.Id,
-                ShopName = Model.ShopName,
-                Address = Model.Address,
-                OpeningDate = Model.OpeningDate,
-                Repairs = Model.ShopRepairs.Select(x => new ShopRepair
-                {
-                    Repair = Context.Repairs.First(y => y.Id == x.Key),
-                    Count = x.Value.Item2
-                }).ToList(),
-                RepairsMaxCount = Model.RepairsMaxCount
-            };
-        }
-
-        public void Update(ShopBindingModel Model)
-        {
-            ShopName = Model.ShopName;
-            Address = Model.Address;
-            OpeningDate = Model.OpeningDate;
-            RepairsMaxCount = Model.RepairsMaxCount;
-        }
-
-        public ShopViewModel GetViewModel => new()
-        {
-            Id = Id,
-            ShopName = ShopName,
-            Address = Address,
-            OpeningDate = OpeningDate,
-            ShopRepairs = ShopRepairs,
-            RepairsMaxCount = RepairsMaxCount
-        };
-
-        public void UpdateRepairs(AutoWorkshopDatabase Context, ShopBindingModel Model)
-        {
-            var ShopRepairs = Context.ShopRepairs
-                .Where(rec => rec.ShopId == Model.Id)
-                .ToList();
-            
-            if (ShopRepairs != null && ShopRepairs.Count > 0)
-            {
-                Context.ShopRepairs.RemoveRange(ShopRepairs.Where(rec => !Model.ShopRepairs.ContainsKey(rec.RepairId)));
-                Context.SaveChanges();
-
-				ShopRepairs = Context.ShopRepairs.Where(rec => rec.ShopId == Model.Id).ToList();
-
-				foreach (var RepairToUpdate in ShopRepairs)
-                {
-                    RepairToUpdate.Count = Model.ShopRepairs[RepairToUpdate.RepairId].Item2;
-                    Model.ShopRepairs.Remove(RepairToUpdate.RepairId);
-                }
-                
-                Context.SaveChanges();
-            }
-            
-            var Shop = Context.Shops.First(x => x.Id == Id);
-            
-            foreach (var ShopRepair in Model.ShopRepairs)
-            {
-                Context.ShopRepairs.Add(new ShopRepair
-                {
-                    Shop = Shop,
-                    Repair = Context.Repairs.First(x => x.Id == ShopRepair.Key),
-                    Count = ShopRepair.Value.Item2
-                });
-                
-                Context.SaveChanges();
-            }
-            
-            _shopRepairs = null;
-        }
-
-        public void RepairsDictionatyUpdate(AutoWorkshopDatabase Context)
-        {
-            UpdateRepairs(Context, new ShopBindingModel
-            {
-                Id = Id,
-                ShopRepairs = ShopRepairs
-            });
-        }
-    }
-}

AutoWorkshopDatabaseImplement/Models/ShopRepair.cs

@@ -1,22 +0,0 @@
-using System.ComponentModel.DataAnnotations;
-
-namespace AutoWorkshopDatabaseImplement.Models
-{
-    public class ShopRepair
-    {
-        public int Id { get; set; }
-
-        [Required]
-        public int RepairId { get; set; }
-
-        [Required]
-        public int ShopId { get; set; }
-
-        [Required]
-        public int Count { get; set; }
-
-        public virtual Shop Shop { get; set; } = new();
-
-        public virtual Repair Repair { get; set; } = new();
-    }
-}

AutoWorkshopFileImplement/DataFileSingleton.cs

@@ -10,27 +10,31 @@ namespace AutoWorkshopFileImplement
         private readonly string ComponentFileName = "Component.xml";
         private readonly string OrderFileName = "Order.xml";
         private readonly string RepairFileName = "Repair.xml";
-        private readonly string ShopFileName = "Shop.xml";
         private readonly string ClientFileName = "Client.xml";
+        private readonly string ImplementerFileName = "Implementer.xml";
+		private readonly string MessageInfoFileName = "MessageInfo.xml";
 
-        public List<Component> Components { get; private set; }
+		public List<Component> Components { get; private set; }
         
         public List<Order> Orders { get; private set; }
         
         public List<Repair> Repairs { get; private set; }
-        
-        public List<Shop> Shops { get; private set; }
 
         public List<Client> Clients { get; private set; }
 
-        private DataFileSingleton()
+        public List<Implementer> Implementers { get; private set; }
+
+		public List<MessageInfo> Messages { get; private set; }
+
+		private DataFileSingleton()
         {
             Components  = LoadData(ComponentFileName, "Component", x => Component.Create(x)!)!;
             Repairs     = LoadData(RepairFileName, "Repair", x => Repair.Create(x)!)!;
             Orders      = LoadData(OrderFileName, "Order", x => Order.Create(x)!)!;
-            Shops       = LoadData(ShopFileName, "Shop", x => Shop.Create(x)!)!;
             Clients     = LoadData(ClientFileName, "Client", x => Client.Create(x)!)!;
-        }
+            Implementers = LoadData(ImplementerFileName, "Implementer", x => Implementer.Create(x)!)!;
+			Messages    = LoadData(MessageInfoFileName, "MessageInfo", x => MessageInfo.Create(x)!)!;
+		}
         
         public static DataFileSingleton GetInstance()
         {
@@ -45,10 +49,11 @@ namespace AutoWorkshopFileImplement
         public void SaveComponents() => SaveData(Components, ComponentFileName, "Components", x => x.GetXElement);
         public void SaveRepairs() => SaveData(Repairs, RepairFileName, "Repairs", x => x.GetXElement);
         public void SaveOrders() => SaveData(Orders, OrderFileName, "Orders", x => x.GetXElement);
-        public void SaveShops() => SaveData(Shops, ShopFileName, "Shops", x => x.GetXElement);
         public void SaveClients() => SaveData(Clients, ClientFileName, "Clients", x => x.GetXElement);
+        public void SaveImplementers() => SaveData(Implementers, ImplementerFileName, "Implementers", x => x.GetXElement);
+		public void SaveMessages() => SaveData(Orders, ImplementerFileName, "Messages", x => x.GetXElement);
 
-        private static List<T>? LoadData<T>(string FileName, string XmlNodeName, Func<XElement, T> SelectFunction)
+		private static List<T>? LoadData<T>(string FileName, string XmlNodeName, Func<XElement, T> SelectFunction)
         {
             if (File.Exists(FileName))
             {

AutoWorkshopFileImplement/Implements/ImplementerStorage.cs

@@ -0,0 +1,97 @@
+using AutoWorkshopContracts.BindingModels;
+using AutoWorkshopContracts.SearchModels;
+using AutoWorkshopContracts.StoragesContracts;
+using AutoWorkshopContracts.ViewModels;
+using AutoWorkshopFileImplement.Models;
+
+namespace AutoWorkshopFileImplement.Implements
+{
+    public class ImplementerStorage : IImplementerStorage
+    {
+        private readonly DataFileSingleton _source;
+        
+        public ImplementerStorage()
+        {
+            _source = DataFileSingleton.GetInstance();
+        }
+
+        public List<ImplementerViewModel> GetFullList()
+        {
+            return _source.Implementers.Select(x => x.GetViewModel).ToList();
+        }
+
+        public List<ImplementerViewModel> GetFilteredList(ImplementerSearchModel Model)
+        {
+            if (Model == null)
+                return new();
+
+            if (Model.Id.HasValue)
+            {
+                var Res = GetElement(Model);
+                return Res != null ? new() { Res } : new();
+            }
+            
+            if (Model.ImplementerFIO != null)
+            {
+                return _source.Implementers
+                    .Where(x => x.ImplementerFIO.Equals(Model.ImplementerFIO))
+                    .Select(x => x.GetViewModel)
+                    .ToList();
+            }
+            
+            return new();
+        }
+
+        public ImplementerViewModel? GetElement(ImplementerSearchModel Model)
+        {
+            if (Model.Id.HasValue)
+                return _source.Implementers.FirstOrDefault(x => x.Id == Model.Id)?.GetViewModel;
+
+            if (Model.ImplementerFIO != null && Model.Password != null)
+                return _source.Implementers.FirstOrDefault(x => x.ImplementerFIO.Equals(Model.ImplementerFIO) && x.Password.Equals(Model.Password))?.GetViewModel;
+
+            if (Model.ImplementerFIO != null)
+                return _source.Implementers.FirstOrDefault(x => x.ImplementerFIO.Equals(Model.ImplementerFIO))?.GetViewModel;
+
+            return null;
+        }
+
+        public ImplementerViewModel? Insert(ImplementerBindingModel Model)
+        {
+            Model.Id = _source.Implementers.Count > 0 ? _source.Implementers.Max(x => x.Id) + 1 : 1;
+ 
+            var Res = Implementer.Create(Model);
+            if (Res != null)
+            {
+                _source.Implementers.Add(Res);
+                _source.SaveImplementers();
+            }
+            
+            return Res?.GetViewModel;
+        }
+
+        public ImplementerViewModel? Update(ImplementerBindingModel Model)
+        {
+            var Res = _source.Implementers.FirstOrDefault(x => x.Id == Model.Id);            
+            if (Res != null)
+            {
+                Res.Update(Model);
+                _source.SaveImplementers();
+            }
+            
+            return Res?.GetViewModel;
+        }
+
+        public ImplementerViewModel? Delete(ImplementerBindingModel Model)
+        {
+            var Res = _source.Implementers.FirstOrDefault(x => x.Id == Model.Id);
+            if (Res != null)
+            {
+                _source.Implementers.Remove(Res);
+                _source.SaveImplementers();
+            }
+            
+            return Res?.GetViewModel;
+        }
+    }
+}

AutoWorkshopFileImplement/Implements/MessageInfoStorage.cs

@@ -0,0 +1,56 @@
+using AutoWorkshopContracts.BindingModels;
+using AutoWorkshopContracts.SearchModels;
+using AutoWorkshopContracts.StoragesContracts;
+using AutoWorkshopContracts.ViewModels;
+using AutoWorkshopFileImplement.Models;
+
+namespace AutoWorkshopFileImplement.Implements
+{
+	public class MessageInfoStorage : IMessageInfoStorage
+	{
+		private readonly DataFileSingleton _source;
+
+		public MessageInfoStorage()
+		{
+			_source = DataFileSingleton.GetInstance();
+		}
+
+		public List<MessageInfoViewModel> GetFullList()
+		{
+			return _source.Messages
+				.Select(x => x.GetViewModel)
+				.ToList();
+		}
+
+		public List<MessageInfoViewModel> GetFilteredList(MessageInfoSearchModel Model)
+		{
+			return _source.Messages
+				.Where(x => x.ClientId.HasValue && x.ClientId == Model.ClientId)
+				.Select(x => x.GetViewModel)
+				.ToList();
+		}
+
+		public MessageInfoViewModel? GetElement(MessageInfoSearchModel Model)
+		{
+			if (string.IsNullOrEmpty(Model.MessageId))
+				return null;
+
+			return _source.Messages
+				.FirstOrDefault(x => x.MessageId == Model.MessageId)?
+				.GetViewModel;
+		}
+
+		public MessageInfoViewModel? Insert(MessageInfoBindingModel Model)
+		{
+			var NewMessageInfo = MessageInfo.Create(Model);
+
+			if (NewMessageInfo == null)
+				return null;
+
+			_source.Messages.Add(NewMessageInfo);
+			_source.SaveMessages();
+
+			return NewMessageInfo.GetViewModel;
+		}
+	}
+}

AutoWorkshopFileImplement/Implements/OrderStorage.cs

@@ -26,14 +26,16 @@ namespace AutoWorkshopFileImplement.Implements
             if (Model.DateFrom.HasValue)
             {
                 return _source.Orders
-                    .Where(x => (x.DateCreate >= Model.DateFrom && x.DateCreate <= Model.DateTo) && (!Model.ClientId.HasValue || x.ClientId == Model.ClientId))
-                    .Select(x => AddClientFIO(AddRepairName(x.GetViewModel)))
+                    .Where(x => (x.DateCreate >= Model.DateFrom && x.DateCreate <= Model.DateTo) && (!Model.ClientId.HasValue || x.ClientId == Model.ClientId)
+                        && (!Model.ImplementerId.HasValue || x.ImplementerId == Model.ImplementerId))
+                    .Select(x => AddImplementerFIO(AddClientFIO(AddRepairName(x.GetViewModel))))
                     .ToList();
             }
 
             return _source.Orders
-                .Where(x => (Model.Id.HasValue && x.Id == Model.Id) || (Model.ClientId.HasValue && x.ClientId == Model.ClientId))
-                .Select(x => AddClientFIO(AddRepairName(x.GetViewModel)))
+                .Where(x => (Model.Id.HasValue && x.Id == Model.Id) || (Model.ClientId.HasValue && x.ClientId == Model.ClientId)
+                    || (Model.ImplementerId.HasValue && x.ImplementerId == Model.ImplementerId))
+                .Select(x => AddImplementerFIO(AddClientFIO(AddRepairName(x.GetViewModel))))
                 .ToList();
         }
 
@@ -54,15 +56,17 @@ namespace AutoWorkshopFileImplement.Implements
         
         public OrderViewModel? GetElement(OrderSearchModel Model)
         {
-            if (!Model.Id.HasValue)
+            if (!Model.Id.HasValue && !Model.ImplementerId.HasValue && !Model.Status.HasValue)
                 return null;
-            
-            var Order = _source.Orders.FirstOrDefault(x => (Model.Id.HasValue && x.Id == Model.Id));
+
+            var Order = _source.Orders.FirstOrDefault(x => 
+                (Model.Id.HasValue && x.Id == Model.Id)
+                || (Model.ImplementerId.HasValue && Model.Status.HasValue && x.ImplementerId == Model.ImplementerId && x.Status == Model.Status) );
             
             if (Order == null)
                 return null;
 
-            return AddRepairName(Order.GetViewModel);
+            return AddImplementerFIO(AddClientFIO(AddRepairName(Order.GetViewModel)));
         }
         
         public OrderViewModel? Insert(OrderBindingModel Model)
@@ -108,5 +112,16 @@ namespace AutoWorkshopFileImplement.Implements
             Model.ClientFIO = SelectedClient?.ClientFIO ?? string.Empty;
             return Model;
         }
+
+        public OrderViewModel AddImplementerFIO(OrderViewModel Model)
+        {
+            var SelectedImplementer = _source.Implementers.FirstOrDefault(x => x.Id == Model.ImplementerId);
+
+            if (SelectedImplementer != null)
+            {
+                Model.ImplementerFIO = SelectedImplementer.ImplementerFIO;
+            }
+            return Model;
+        }
     }
 }

AutoWorkshopFileImplement/Implements/ShopStorage.cs

@@ -1,168 +0,0 @@
-using AutoWorkshopContracts.BindingModels;
-using AutoWorkshopContracts.SearchModels;
-using AutoWorkshopContracts.StoragesContracts;
-using AutoWorkshopContracts.ViewModels;
-using AutoWorkshopFileImplement.Models;
-
-namespace AutoWorkshopFileImplement.Implements
-{
-    public class ShopStorage : IShopStorage
-    {
-        private readonly DataFileSingleton _source;
-
-        public ShopStorage()
-        {
-            _source = DataFileSingleton.GetInstance();
-        }
-
-        public List<ShopViewModel> GetFullList()
-        {
-            return _source.Shops.Select(x => x.GetViewModel).ToList();
-        }
-
-        public List<ShopViewModel> GetFilteredList(ShopSearchModel Model)
-        {
-            if (string.IsNullOrEmpty(Model.ShopName))
-                return new();
-
-            return _source.Shops
-                .Where(x => x.ShopName
-                .Contains(Model.ShopName))
-                .Select(x => x.GetViewModel)
-                .ToList();
-        }
-
-        public ShopViewModel? GetElement(ShopSearchModel Model)
-        {
-            if (string.IsNullOrEmpty(Model.ShopName) && !Model.Id.HasValue)
-                return null;
-
-            return _source.Shops.FirstOrDefault(x =>
-                (!string.IsNullOrEmpty(Model.ShopName) && x.ShopName == Model.ShopName) ||
-                (Model.Id.HasValue && x.Id == Model.Id))?
-                .GetViewModel;
-        }
-
-        public ShopViewModel? Insert(ShopBindingModel Model)
-        {
-            Model.Id = _source.Shops.Count > 0 ? _source.Shops.Max(x => x.Id) + 1 : 1;
-            
-            var NewShop = Shop.Create(Model);
-            if (NewShop == null)
-                return null;
-            
-            _source.Shops.Add(NewShop);
-            _source.SaveShops();
-            
-            return NewShop.GetViewModel;
-        }
-
-        public ShopViewModel? Update(ShopBindingModel Model)
-        {
-            var Shop = _source.Shops.FirstOrDefault(x => x.Id == Model.Id);
-            if (Shop == null)
-                return null;
-
-            Shop.Update(Model);
-            _source.SaveShops();
-            
-            return Shop.GetViewModel;
-        }
-
-        public ShopViewModel? Delete(ShopBindingModel Model)
-        {
-            var Shop = _source.Shops.FirstOrDefault(x => x.Id == Model.Id);
-
-            if (Shop == null)
-                return null;
-
-            _source.Shops.Remove(Shop);
-            _source.SaveShops();
-            
-            return Shop.GetViewModel;
-        }
-
-        public bool Sell(SupplySearchModel Model)
-        {
-            if (Model == null || !Model.RepairId.HasValue || !Model.Count.HasValue)
-                return false;
-            
-            int TotalRepairsNum = _source.Shops
-                .Select(x => x.Repairs.ContainsKey(Model.RepairId.Value) ? x.Repairs[Model.RepairId.Value] : 0)
-                .Sum();
-            if (TotalRepairsNum < Model.Count)
-                return false;
-
-            var ShopsWithDesiredRepair = _source.Shops
-                .Where(x => x.Repairs.ContainsKey(Model.RepairId.Value))
-                .OrderByDescending(x => x.Repairs[Model.RepairId.Value])
-                .ToList();
-            
-            foreach (var Shop in ShopsWithDesiredRepair)
-            {
-                int Slack = Model.Count.Value - Shop.Repairs[Model.RepairId.Value];
-                
-                if (Slack > 0)
-                {
-                    Shop.Repairs.Remove(Model.RepairId.Value);
-                    Shop.RepairsUpdate();
-                    
-                    Model.Count = Slack;
-                }
-                else
-                {
-                    if (Slack == 0)
-                        Shop.Repairs.Remove(Model.RepairId.Value);
-                    else
-                        Shop.Repairs[Model.RepairId.Value] = -Slack;
-
-                    Shop.RepairsUpdate();
-                    _source.SaveShops();
-                    
-                    return true;
-                }
-            }
-            
-            _source.SaveShops();
-            return false;
-        }
-
-        public bool RestockingShops(SupplyBindingModel Model)
-        {
-            int TotalFreeSpaceNum = _source.Shops
-                .Select(x => x.RepairsMaxCount - x.ShopRepairs
-                    .Select(y => y.Value.Item2)
-                    .Sum())
-                .Sum();
-
-            if (TotalFreeSpaceNum < Model.Count)
-                return false;
-
-            foreach (Shop Shop in _source.Shops)
-            {
-                int FreeSpaceNum = Shop.RepairsMaxCount - Shop.ShopRepairs.Select(x => x.Value.Item2).Sum();
-                
-                if (FreeSpaceNum <= 0)
-                    continue;
-
-                FreeSpaceNum = Math.Min(FreeSpaceNum, Model.Count);
-                Model.Count -= FreeSpaceNum;
-                
-                if (Shop.Repairs.ContainsKey(Model.RepairId))
-                    Shop.Repairs[Model.RepairId] += FreeSpaceNum;
-                else
-                    Shop.Repairs.Add(Model.RepairId, FreeSpaceNum);
-
-                Shop.RepairsUpdate();
-                
-                if (Model.Count == 0)
-                {
-                    _source.SaveShops();
-                    return true;
-                }
-            }
-            
-            return false;
-        }
-    }
-}

AutoWorkshopFileImplement/Models/Implementer.cs

@@ -0,0 +1,79 @@
+using AutoWorkshopContracts.BindingModels;
+using AutoWorkshopContracts.ViewModels;
+using AutoWorkshopDataModels.Models;
+using System.Xml.Linq;
+
+namespace AutoWorkshopFileImplement.Models
+{
+    public class Implementer : IImplementerModel
+    {
+        public int Id { get; private set; }
+
+        public string ImplementerFIO { get; private set; } = string.Empty;
+
+        public string Password { get; private set; } = string.Empty;
+
+        public int WorkExperience { get; private set; }
+
+        public int Qualification { get; private set; }
+
+        public static Implementer? Create(ImplementerBindingModel Model)
+        {
+            if (Model == null)
+                return null;
+            
+            return new()
+            {
+                Id = Model.Id,
+                ImplementerFIO = Model.ImplementerFIO,
+                Password = Model.Password,
+                WorkExperience = Model.WorkExperience,
+                Qualification = Model.Qualification,
+            };
+        }
+
+        public static Implementer? Create(XElement Element)
+        {
+            if (Element == null)
+                return null;
+
+            return new()
+            {
+                Id = Convert.ToInt32(Element.Attribute("Id")!.Value),
+                ImplementerFIO = Element.Element("ImplementerFIO")!.Value,
+                Password = Element.Element("Password")!.Value,                
+                WorkExperience = Convert.ToInt32(Element.Element("WorkExperience")!.Value),
+                Qualification = Convert.ToInt32(Element.Element("Qualification")!.Value),
+            };
+        }
+
+        public void Update(ImplementerBindingModel Model)
+        {
+            if (Model == null)
+                return;
+
+            ImplementerFIO = Model.ImplementerFIO;
+            Password = Model.Password;
+            WorkExperience = Model.WorkExperience;
+            Qualification = Model.Qualification;
+        }
+
+        public ImplementerViewModel GetViewModel => new()
+        {
+            Id = Id,
+            ImplementerFIO = ImplementerFIO,
+            Password = Password,
+            WorkExperience = WorkExperience,
+            Qualification = Qualification,
+        };
+
+        public XElement GetXElement => new(
+            "Implementer",
+            new XAttribute("Id", Id),
+            new XElement("ImplementerFIO", ImplementerFIO),
+            new XElement("Password", Password),
+            new XElement("WorkExperience", WorkExperience),
+            new XElement("Qualification", Qualification)
+            );
+    }
+}

AutoWorkshopFileImplement/Models/MessageInfo.cs

@@ -0,0 +1,74 @@
+using AutoWorkshopContracts.BindingModels;
+using AutoWorkshopContracts.ViewModels;
+using AutoWorkshopDataModels.Models;
+using System.Xml.Linq;
+
+namespace AutoWorkshopFileImplement.Models
+{
+	public class MessageInfo : IMessageInfoModel
+	{
+		public string MessageId { get; set; } = string.Empty;
+
+		public int? ClientId { get; set; }
+
+		public string SenderName { get; set; } = string.Empty;
+
+		public DateTime DateDelivery { get; set; }
+
+		public string Subject { get; set; } = string.Empty;
+
+		public string Body { get; set; } = string.Empty;
+
+		public static MessageInfo? Create(MessageInfoBindingModel? Model)
+		{
+			if (Model == null)
+				return null;
+
+			return new()
+			{
+				MessageId = Model.MessageId,
+				ClientId = Model.ClientId,
+				SenderName = Model.SenderName,
+				DateDelivery = Model.DateDelivery,
+				Subject = Model.Subject,
+				Body = Model.Body
+			};
+		}
+
+		public MessageInfoViewModel GetViewModel => new()
+		{
+			MessageId = MessageId,
+			ClientId = ClientId,
+			SenderName = SenderName,
+			DateDelivery = DateDelivery,
+			Subject = Subject,
+			Body = Body
+		};
+
+		public static MessageInfo? Create(XElement Element)
+		{
+			if (Element == null)
+				return null;
+
+			return new()
+			{
+				MessageId		= Element.Attribute("MessageId")!.Value,
+				ClientId		= Convert.ToInt32(Element.Attribute("ClientId")!.Value),
+				SenderName		= Element.Attribute("SenderName")!.Value,
+				DateDelivery	= Convert.ToDateTime(Element.Attribute("DateDelivery")!.Value),
+				Subject			= Element.Attribute("Subject")!.Value,
+				Body			= Element.Attribute("Body")!.Value,
+			};
+		}
+
+		public XElement GetXElement => new(
+			"MessageInfo",
+			new XAttribute("MessageId", MessageId),
+			new XAttribute("ClientId", ClientId),
+			new XAttribute("SenderName", SenderName),
+			new XAttribute("DateDelivery", DateDelivery),
+			new XAttribute("Subject", Subject),
+			new XAttribute("Body", Body)
+		);
+	}
+}

AutoWorkshopFileImplement/Models/Order.cs

@@ -14,6 +14,8 @@ namespace AutoWorkshopFileImplement.Models
 
         public int ClientId { get; private set; }
 
+        public int? ImplementerId { get; set; }
+
         public int Count { get; private set; }
 
         public double Sum { get; private set; }
@@ -34,6 +36,7 @@ namespace AutoWorkshopFileImplement.Models
                 Id = Model.Id,
                 RepairId = Model.RepairId,
                 ClientId = Model.ClientId,
+                ImplementerId = Model.ImplementerId,
                 Count = Model.Count,
                 Sum = Model.Sum,
                 Status = Model.Status,
@@ -52,6 +55,7 @@ namespace AutoWorkshopFileImplement.Models
                 Id = Convert.ToInt32(Element.Attribute("Id")!.Value),
                 RepairId = Convert.ToInt32(Element.Element("RepairId")!.Value),
                 ClientId = Convert.ToInt32(Element.Element("ClientId")!.Value),
+                ImplementerId = Convert.ToInt32(Element.Element("ImplementerId")!.Value),
                 Count = Convert.ToInt32(Element.Element("Count")!.Value),
                 Sum = Convert.ToDouble(Element.Element("Sum")!.Value),
                 Status = (OrderStatus)Enum.Parse(typeof(OrderStatus), Element.Element("Status")!.Value),
@@ -65,6 +69,7 @@ namespace AutoWorkshopFileImplement.Models
             if (Model is null)
                 return;
 
+            ImplementerId = Model.ImplementerId;
             Status = Model.Status;
             DateImplement = Model.DateImplement;
         }
@@ -74,6 +79,7 @@ namespace AutoWorkshopFileImplement.Models
             Id = Id,
             RepairId = RepairId,
             ClientId = ClientId,
+            ImplementerId = ImplementerId,
             Count = Count,
             Sum = Sum,
             Status = Status,
@@ -86,6 +92,7 @@ namespace AutoWorkshopFileImplement.Models
             new XAttribute("Id", Id),
             new XElement("RepairId", RepairId),
             new XElement("ClientId", ClientId),
+            new XElement("ImplementerId", ImplementerId),
             new XElement("Count", Count.ToString()),
             new XElement("Sum", Sum.ToString()),
             new XElement("Status", Status.ToString()),

AutoWorkshopFileImplement/Models/Shop.cs

@@ -1,110 +0,0 @@
-using AutoWorkshopContracts.BindingModels;
-using AutoWorkshopContracts.ViewModels;
-using AutoWorkshopDataModels.Models;
-using System.Xml.Linq;
-
-namespace AutoWorkshopFileImplement.Models
-{
-    public class Shop : IShopModel
-    {
-        public int Id { get; private set; }
-        
-        public string ShopName { get; private set; } = string.Empty;
-        
-        public string Address { get; private set; } = string.Empty;
-        
-        public DateTime OpeningDate { get; private set; }
-        
-        public Dictionary<int, int> Repairs { get; private set; } = new();
-        
-        private Dictionary<int, (IRepairModel, int)>? _shopRepairs = null;
-
-        public Dictionary<int, (IRepairModel, int)> ShopRepairs
-        {
-            get
-            {
-                if (_shopRepairs == null)
-                {
-                    var Source = DataFileSingleton.GetInstance();
-                    _shopRepairs = Repairs.ToDictionary(x => x.Key, y => ((Source.Repairs.FirstOrDefault(z => z.Id == y.Key) as IRepairModel)!, y.Value));
-                }
-                
-                return _shopRepairs;
-            }
-        }
-
-        public int RepairsMaxCount { get; private set; }
-
-        public static Shop? Create(ShopBindingModel? Model)
-        {
-            if (Model == null)
-                return null;
-
-            return new Shop()
-            {
-                Id = Model.Id,
-                ShopName = Model.ShopName,
-                Address = Model.Address,
-                OpeningDate = Model.OpeningDate,
-                Repairs = Model.ShopRepairs.ToDictionary(x => x.Key, x => x.Value.Item2),
-                RepairsMaxCount = Model.RepairsMaxCount
-            };
-        }
-
-        public static Shop? Create(XElement Element)
-        {
-            if (Element == null)
-                return null;
-
-            return new Shop()
-            {
-                Id = Convert.ToInt32(Element.Attribute("Id")!.Value),
-                ShopName = Element.Element("ShopName")!.Value,
-                Address = Element.Element("Address")!.Value,
-                OpeningDate = Convert.ToDateTime(Element.Element("OpeningDate")!.Value),
-                Repairs = Element.Element("ShopRepairs")!.Elements("ShopRepair")!.ToDictionary(x => Convert.ToInt32(x.Element("Key")?.Value),
-                    x => Convert.ToInt32(x.Element("Value")?.Value)),
-                RepairsMaxCount = Convert.ToInt32(Element.Element("RepairsMaxCount")!.Value)
-            };
-        }
-
-        public void Update(ShopBindingModel? Model)
-        {
-            if (Model == null)
-                return;
-
-            ShopName = Model.ShopName;
-            Address = Model.Address;
-            OpeningDate = Model.OpeningDate;
-            RepairsMaxCount = Model.RepairsMaxCount;
-            Repairs = Model.ShopRepairs.ToDictionary(x => x.Key, x => x.Value.Item2);
-            _shopRepairs = null;
-        }
-
-        public ShopViewModel GetViewModel => new()
-        {
-            Id = Id,
-            ShopName = ShopName,
-            Address = Address,
-            OpeningDate = OpeningDate,
-            ShopRepairs = ShopRepairs,
-            RepairsMaxCount = RepairsMaxCount
-        };
-
-        public XElement GetXElement => new(
-            "Shop",
-            new XAttribute("Id", Id),
-            new XElement("ShopName", ShopName),
-            new XElement("Address", Address),
-            new XElement("OpeningDate", OpeningDate.ToString()),
-            new XElement("ShopRepairs", Repairs.Select(
-                x => new XElement("ShopRepair", new XElement("Key", x.Key), new XElement("Value", x.Value))).ToArray()),
-            new XElement("RepairsMaxCount", RepairsMaxCount.ToString())
-        );
-
-        public void RepairsUpdate()
-        {
-            _shopRepairs = null;
-        }
-    }
-}

AutoWorkshopImplement/DataListSingleton.cs

@@ -12,18 +12,20 @@ namespace AutoWorkshopListImplement
         
         public List<Repair> Repairs { get; set; }
 
-        public List<Shop> Shops { get; set; }
-        
-
         public List<Client> Clients { get; set; }
 
+        public List<Implementer> Implementers { get; set; }
+
+        public List<MessageInfo> Messages { get; set; }
+
         private DataListSingleton()
         {
             Components = new List<Component>();
             Orders = new List<Order>();
             Repairs = new List<Repair>();
-            Shops = new List<Shop>();
             Clients = new List<Client>();
+            Implementers = new List<Implementer>();
+            Messages = new List<MessageInfo>();
         }
 
         public static DataListSingleton GetInstance()

AutoWorkshopImplement/Implements/ImplementerStorage.cs

@@ -0,0 +1,104 @@
+using AutoWorkshopContracts.BindingModels;
+using AutoWorkshopContracts.SearchModels;
+using AutoWorkshopContracts.StoragesContracts;
+using AutoWorkshopContracts.ViewModels;
+using AutoWorkshopListImplement.Models;
+
+namespace AutoWorkshopListImplement.Implements
+{
+    public class ImplementerStorage : IImplementerStorage
+    {
+        private readonly DataListSingleton _source;
+        
+        public ImplementerStorage()
+        {
+            _source = DataListSingleton.GetInstance();
+        }
+
+        public List<ImplementerViewModel> GetFullList()
+        {
+            var Result = new List<ImplementerViewModel>();
+            
+            foreach (var Implementer in _source.Implementers)
+            {
+                Result.Add(Implementer.GetViewModel);
+            }
+            
+            return Result;
+        }
+
+        public List<ImplementerViewModel> GetFilteredList(ImplementerSearchModel Model)
+        {
+            if (string.IsNullOrEmpty(Model.ImplementerFIO))
+                return new();
+
+            return _source.Implementers
+                .Where(x => (!string.IsNullOrEmpty(Model.ImplementerFIO) && x.ImplementerFIO.Contains(Model.ImplementerFIO)))
+                .Select(x => x.GetViewModel)
+                .ToList();
+        }
+
+        public ImplementerViewModel? GetElement(ImplementerSearchModel Model)
+        {
+            foreach (var Implementer in _source.Implementers)
+            {
+                if ((Model.Id.HasValue && Implementer.Id == Model.Id) || 
+                    (!string.IsNullOrEmpty(Model.ImplementerFIO) && Implementer.ImplementerFIO == Model.ImplementerFIO))
+                {
+                    return Implementer.GetViewModel;
+                }
+            }
+
+            return null;
+        }
+       
+        public ImplementerViewModel? Insert(ImplementerBindingModel Model)
+        {
+            Model.Id = 1;
+            foreach (var Implementer in _source.Implementers)
+            {
+                if (Model.Id <= Implementer.Id)
+                {
+                    Model.Id = Implementer.Id + 1;
+                }
+            }
+            
+            var NewImplementer = Implementer.Create(Model);
+            if (NewImplementer == null)
+                return null;
+            
+            _source.Implementers.Add(NewImplementer);
+            return NewImplementer.GetViewModel;
+        }
+
+        public ImplementerViewModel? Update(ImplementerBindingModel Model)
+        {
+            foreach (var Implementer in _source.Implementers)
+            {
+                if (Implementer.Id == Model.Id)
+                {
+                    Implementer.Update(Model);
+                    return Implementer.GetViewModel;
+                }
+            }
+            
+            return null;
+        }
+
+        public ImplementerViewModel? Delete(ImplementerBindingModel Model)
+        {
+            for (int i = 0; i < _source.Implementers.Count; ++i)
+            {
+                if (_source.Implementers[i].Id == Model.Id)
+                {
+                    var Implementer = _source.Implementers[i];
+                    _source.Implementers.RemoveAt(i);
+
+                    return Implementer.GetViewModel;
+                }
+            }
+
+            return null;
+        }
+    }
+}

AutoWorkshopImplement/Implements/MessageInfoStorage.cs

@@ -0,0 +1,54 @@
+using AutoWorkshopContracts.BindingModels;
+using AutoWorkshopContracts.SearchModels;
+using AutoWorkshopContracts.StoragesContracts;
+using AutoWorkshopContracts.ViewModels;
+using AutoWorkshopListImplement.Models;
+
+namespace AutoWorkshopListImplement.Implements
+{
+	public class MessageInfoStorage : IMessageInfoStorage
+	{
+		private readonly DataListSingleton _source;
+
+		public MessageInfoStorage()
+		{
+			_source = DataListSingleton.GetInstance();
+		}
+
+		public List<MessageInfoViewModel> GetFullList()
+		{
+			return _source.Messages
+				.Select(x => x.GetViewModel)
+				.ToList();
+		}
+
+		public List<MessageInfoViewModel> GetFilteredList(MessageInfoSearchModel Model)
+		{
+			return _source.Messages
+				.Where(x => x.ClientId.HasValue && x.ClientId == Model.ClientId)
+				.Select(x => x.GetViewModel)
+				.ToList();
+		}
+
+		public MessageInfoViewModel? GetElement(MessageInfoSearchModel Model)
+		{
+			if (string.IsNullOrEmpty(Model.MessageId))
+				return null;
+
+			return _source.Messages
+				.FirstOrDefault(x => x.MessageId == Model.MessageId)?
+				.GetViewModel;
+		}
+
+		public MessageInfoViewModel? Insert(MessageInfoBindingModel Model)
+		{
+			var NewMessageInfo = MessageInfo.Create(Model);
+
+			if (NewMessageInfo == null)
+				return null;
+
+			_source.Messages.Add(NewMessageInfo);
+			return NewMessageInfo.GetViewModel;
+		}
+	}
+}

AutoWorkshopImplement/Implements/OrderStorage.cs

@@ -32,27 +32,30 @@ namespace AutoWorkshopListImplement.Implements
             if (Model.DateFrom.HasValue)
             {
                 return _source.Orders
-                    .Where(x => (x.DateCreate >= Model.DateFrom && x.DateCreate <= Model.DateTo) && (!Model.ClientId.HasValue || x.ClientId == Model.ClientId))
-                    .Select(x => JoinClientFIO(JoinRepairName(x.GetViewModel)))
+                    .Where(x => (x.DateCreate >= Model.DateFrom && x.DateCreate <= Model.DateTo) && (!Model.ClientId.HasValue || x.ClientId == Model.ClientId)
+                         && (!Model.ImplementerId.HasValue || x.ImplementerId == Model.ImplementerId))
+                    .Select(x => JoinImplementerFIO(JoinClientFIO(JoinRepairName(x.GetViewModel))))
                     .ToList();
             }
 
             return _source.Orders
-                .Where(x => (Model.Id.HasValue && x.Id == Model.Id) || (Model.ClientId.HasValue && x.ClientId == Model.ClientId))
-                .Select(x => JoinClientFIO(JoinRepairName(x.GetViewModel)))
+                .Where(x => (Model.Id.HasValue && x.Id == Model.Id) || (Model.ClientId.HasValue && x.ClientId == Model.ClientId)
+                     || (Model.ImplementerId.HasValue && x.ImplementerId == Model.ImplementerId))
+                .Select(x => JoinImplementerFIO(JoinClientFIO(JoinRepairName(x.GetViewModel))))
                 .ToList();
         }
 
         public OrderViewModel? GetElement(OrderSearchModel Model)
         {
-            if (!Model.Id.HasValue)
+            if (!Model.Id.HasValue && !Model.ImplementerId.HasValue && !Model.Status.HasValue)
                 return null;
 
             foreach (var Order in _source.Orders)
             {
-                if (Order.Id == Model.Id)
+                if ((Model.Id.HasValue && Order.Id == Model.Id)
+                    || (Model.ImplementerId.HasValue && Model.Status.HasValue && Order.ImplementerId == Model.ImplementerId && Order.Status == Model.Status))
                 {
-                    return JoinRepairName(Order.GetViewModel);
+                    return JoinImplementerFIO(JoinClientFIO(JoinRepairName(Order.GetViewModel)));
                 }
             }
 
@@ -130,5 +133,16 @@ namespace AutoWorkshopListImplement.Implements
             }            
             return Model;
         }
+
+        public OrderViewModel JoinImplementerFIO(OrderViewModel Model)
+        {
+            var SelectedImplementer = _source.Implementers.FirstOrDefault(x => x.Id == Model.ImplementerId);
+
+            if (SelectedImplementer != null)
+            {
+                Model.ImplementerFIO = SelectedImplementer.ImplementerFIO;
+            }
+            return Model;
+        }
     }
 }

AutoWorkshopImplement/Implements/ShopStorage.cs

@@ -1,122 +0,0 @@
-using AutoWorkshopContracts.BindingModels;
-using AutoWorkshopContracts.SearchModels;
-using AutoWorkshopContracts.StoragesContracts;
-using AutoWorkshopContracts.ViewModels;
-using AutoWorkshopListImplement.Models;
-
-namespace AutoWorkshopListImplement.Implements
-{
-    public class ShopStorage : IShopStorage
-    {
-        private readonly DataListSingleton _source;
-
-        public ShopStorage()
-        {
-            _source = DataListSingleton.GetInstance();
-        }
-
-        public List<ShopViewModel> GetFullList()
-        {
-            var Result = new List<ShopViewModel>();
-            
-            foreach (var Shop in _source.Shops)
-            {
-                Result.Add(Shop.GetViewModel);
-            }
-            
-            return Result;
-        }
-
-        public List<ShopViewModel> GetFilteredList(ShopSearchModel Model)
-        {
-            var Result = new List<ShopViewModel>();
-            
-            if (string.IsNullOrEmpty(Model.ShopName))
-                return Result;
-
-            foreach (var Shop in _source.Shops)
-            {
-                if (Shop.ShopName.Contains(Model.ShopName))
-                    Result.Add(Shop.GetViewModel);
-            }
-            
-            return Result;
-        }
-
-        public ShopViewModel? GetElement(ShopSearchModel Model)
-        {
-            if (string.IsNullOrEmpty(Model.ShopName) && !Model.Id.HasValue)
-                return null;
-
-            foreach (var Shop in _source.Shops)
-            {
-                if ((!string.IsNullOrEmpty(Model.ShopName) && Shop.ShopName == Model.ShopName) ||
-                    (Model.Id.HasValue && Shop.Id == Model.Id))
-                {
-                    return Shop.GetViewModel;
-                }
-            }
-            
-            return null;
-        }
-
-        public ShopViewModel? Insert(ShopBindingModel Model)
-        {
-            Model.Id = 1;
-            
-            foreach (var Shop in _source.Shops)
-            {
-                if (Model.Id <= Shop.Id)
-                    Model.Id = Shop.Id + 1;
-            }
-            
-            var NewShop = Shop.Create(Model);
-            
-            if (NewShop is null)
-                return null;
- 
-            _source.Shops.Add(NewShop);
-            return NewShop.GetViewModel;
-        }
-
-        public ShopViewModel? Update(ShopBindingModel Model)
-        {
-            foreach (var Shop in _source.Shops)
-            {
-                if (Shop.Id == Model.Id)
-                {
-                    Shop.Update(Model);
-                    return Shop.GetViewModel;
-                }
-            }
-            
-            return null;
-        }
-
-        public ShopViewModel? Delete(ShopBindingModel Model)
-        {
-            for (int i = 0; i < _source.Shops.Count; ++i)
-            {
-                if (_source.Shops[i].Id == Model.Id)
-                {
-                    var Shop = _source.Shops[i];
-                    _source.Shops.RemoveAt(i);
-                    
-                    return Shop.GetViewModel;
-                }
-            }
-            
-            return null;
-        }
-
-        public bool Sell(SupplySearchModel Model)
-        {
-            throw new NotImplementedException();
-        }
-
-        public bool RestockingShops(SupplyBindingModel Model)
-        {
-            throw new NotImplementedException();
-        }
-    }
-}

AutoWorkshopImplement/Models/Implementer.cs

@@ -0,0 +1,54 @@
+using AutoWorkshopContracts.BindingModels;
+using AutoWorkshopContracts.ViewModels;
+using AutoWorkshopDataModels.Models;
+
+namespace AutoWorkshopListImplement.Models
+{
+    public class Implementer : IImplementerModel
+    {
+        public int Id { get; private set; }
+
+        public string ImplementerFIO { get; private set; } = string.Empty;
+
+        public string Password { get; private set; } = string.Empty;
+
+        public int WorkExperience { get; private set; }
+
+        public int Qualification { get; private set; }
+
+        public static Implementer? Create(ImplementerBindingModel Model)
+        {
+            if (Model == null)
+            {
+                return null;
+            }
+            return new()
+            {
+                Id = Model.Id,
+                Password = Model.Password,
+                Qualification = Model.Qualification,
+                ImplementerFIO = Model.ImplementerFIO,
+                WorkExperience = Model.WorkExperience,
+            };
+        }
+
+        public void Update(ImplementerBindingModel Model)
+        {
+            if (Model == null)
+                return;
+            
+            Password = Model.Password;
+            Qualification = Model.Qualification;
+            ImplementerFIO = Model.ImplementerFIO;
+            WorkExperience = Model.WorkExperience;
+        }
+
+        public ImplementerViewModel GetViewModel => new()
+        {
+            Id = Id,
+            Password = Password,
+            Qualification = Qualification,
+            ImplementerFIO = ImplementerFIO,
+        };
+    }
+}

AutoWorkshopImplement/Models/MessageInfo.cs

@@ -0,0 +1,47 @@
+using AutoWorkshopContracts.BindingModels;
+using AutoWorkshopContracts.ViewModels;
+using AutoWorkshopDataModels.Models;
+
+namespace AutoWorkshopListImplement.Models
+{
+	public class MessageInfo : IMessageInfoModel
+	{
+		public string MessageId { get; set; } = string.Empty;
+
+		public int? ClientId { get; set; }
+
+		public string SenderName { get; set; } = string.Empty;
+
+		public DateTime DateDelivery { get; set; }
+
+		public string Subject { get; set; } = string.Empty;
+
+		public string Body { get; set; } = string.Empty;
+
+		public static MessageInfo? Create(MessageInfoBindingModel? Model)
+		{
+			if (Model == null)
+				return null;
+
+			return new()
+			{
+				MessageId = Model.MessageId,
+				ClientId = Model.ClientId,
+				SenderName = Model.SenderName,
+				DateDelivery = Model.DateDelivery,
+				Subject = Model.Subject,
+				Body = Model.Body
+			};
+		}
+
+		public MessageInfoViewModel GetViewModel => new()
+		{
+			MessageId = MessageId,
+			ClientId = ClientId,
+			SenderName = SenderName,
+			DateDelivery = DateDelivery,
+			Subject = Subject,
+			Body = Body
+		};
+	}
+}

AutoWorkshopImplement/Models/Order.cs

@@ -13,6 +13,8 @@ namespace AutoWorkshopListImplement.Models
 
         public int ClientId { get; private set; }
 
+        public int? ImplementerId { get; private set; }
+
         public int Count { get; private set; }
         
         public double Sum { get; private set; }
@@ -33,6 +35,7 @@ namespace AutoWorkshopListImplement.Models
                 Id = Model.Id,
                 RepairId = Model.RepairId,
                 ClientId = Model.ClientId,
+                ImplementerId = Model.ImplementerId,
                 Count = Model.Count,
                 Sum = Model.Sum,
                 Status = Model.Status,
@@ -46,11 +49,7 @@ namespace AutoWorkshopListImplement.Models
             if (Model == null)
                 return;
 
-            RepairId = Model.RepairId;
-            Count = Model.Count;
-            Sum = Model.Sum;
             Status = Model.Status;
-            DateCreate = Model.DateCreate;
             DateImplement = Model.DateImplement;
         }
 
@@ -59,6 +58,7 @@ namespace AutoWorkshopListImplement.Models
             Id = Id,
             RepairId = RepairId,
             ClientId = ClientId,
+            ImplementerId = ImplementerId,
             Count = Count,
             Sum = Sum,
             Status = Status,

AutoWorkshopImplement/Models/Shop.cs

@@ -1,57 +0,0 @@
-using AutoWorkshopContracts.BindingModels;
-using AutoWorkshopContracts.ViewModels;
-using AutoWorkshopDataModels.Models;
-
-namespace AutoWorkshopListImplement.Models
-{
-    public class Shop : IShopModel
-    {
-        public int Id { get; private set; }
-        
-        public string ShopName { get; private set; } = string.Empty;
-        
-        public string Address { get; private set; } = string.Empty;
-        
-        public DateTime OpeningDate { get; private set; }
-        
-        public Dictionary<int, (IRepairModel, int)> ShopRepairs { get; private set; } = new();
-
-        public int RepairsMaxCount { get; private set; }
-
-        public static Shop? Create(ShopBindingModel? Model)
-        {
-            if (Model is null)
-                return null;
-
-            return new Shop()
-            {
-                Id = Model.Id,
-                ShopName = Model.ShopName,
-                Address = Model.Address,
-                OpeningDate = Model.OpeningDate,
-                RepairsMaxCount = Model.RepairsMaxCount,
-            };
-        }
-
-        public void Update(ShopBindingModel? Model)
-        {
-            if (Model is null)
-                return;
-
-            ShopName = Model.ShopName;
-            Address = Model.Address;
-            OpeningDate = Model.OpeningDate;
-            RepairsMaxCount = Model.RepairsMaxCount;
-        }
-
-        public ShopViewModel GetViewModel => new()
-        {
-            Id = Id,
-            ShopName = ShopName,
-            Address = Address,
-            OpeningDate = OpeningDate,
-            ShopRepairs = ShopRepairs,
-            RepairsMaxCount = RepairsMaxCount,
-        };
-    }
-}

AutoWorkshopRestApi/Controllers/ClientController.cs

@@ -12,11 +12,13 @@ namespace AutoWorkshopRestApi.Controllers
     {
         private readonly ILogger _logger;
         private readonly IClientLogic _clientLogic;
+        private readonly IMessageInfoLogic _mailLogic;
         
-        public ClientController(IClientLogic ClientLogic, ILogger<ClientController> Logger)
+        public ClientController(IClientLogic ClientLogic, IMessageInfoLogic MailLogic, ILogger<ClientController> Logger)
         {
             _logger = Logger;
             _clientLogic = ClientLogic;
+            _mailLogic = MailLogic;
         }
         
         [HttpGet]
@@ -64,5 +66,22 @@ namespace AutoWorkshopRestApi.Controllers
                 throw;
             }
         }
+
+        [HttpGet]
+        public List<MessageInfoViewModel>? GetMessages(int ClientId)
+        {
+            try
+            {
+                return _mailLogic.ReadList(new MessageInfoSearchModel
+                {
+                    ClientId = ClientId
+                });
+            }
+            catch (Exception ex)
+            {
+                _logger.LogError(ex, "Ошибка получения писем клиента");
+                throw;
+            }
+        }
     }
 }

AutoWorkshopRestApi/Controllers/ImplementerController.cs

@@ -0,0 +1,108 @@
+using AutoWorkshopContracts.BindingModels;
+using AutoWorkshopContracts.BusinessLogicContracts;
+using AutoWorkshopContracts.BusinessLogicsContracts;
+using AutoWorkshopContracts.SearchModels;
+using AutoWorkshopContracts.ViewModels;
+using AutoWorkshopDataModels.Enums;
+using Microsoft.AspNetCore.Mvc;
+
+namespace AutoWorkshopRestApi.Controllers
+{
+    [Route("api/[controller]/[action]")]
+    [ApiController]
+    public class ImplementerController : Controller
+    {
+        private readonly ILogger _logger;
+
+        private readonly IOrderLogic _order;
+
+        private readonly IImplementerLogic _logic;
+
+        public ImplementerController(IOrderLogic Order, IImplementerLogic Logic, ILogger<ImplementerController> Logger)
+        {
+            _logger = Logger;
+            _order = Order;
+            _logic = Logic;
+        }
+
+        [HttpGet]
+        public ImplementerViewModel? Login(string login, string password)
+        {
+            try
+            {
+                return _logic.ReadElement(new ImplementerSearchModel
+                {
+                    ImplementerFIO = login,
+                    Password = password
+                });
+            }
+            catch (Exception ex)
+            {
+                _logger.LogError(ex, "Ошибка авторизации сотрудника");
+                throw;
+            }
+        }
+
+        [HttpGet]
+        public List<OrderViewModel>? GetNewOrders()
+        {
+            try
+            {
+                return _order.ReadList(new OrderSearchModel
+                {
+                    Status = OrderStatus.Accepted
+                });
+            }
+            catch (Exception ex)
+            {
+                _logger.LogError(ex, "Ошибка получения новых заказов");
+                throw;
+            }
+        }
+
+        [HttpGet]
+        public OrderViewModel? GetImplementerOrder(int implementerId)
+        {
+            try
+            {
+                return _order.ReadElement(new OrderSearchModel
+                {
+                    ImplementerId = implementerId
+                });
+            }
+            catch (Exception ex)
+            {
+                _logger.LogError(ex, "Ошибка получения текущего заказа исполнителя");
+                throw;
+            }
+        }
+
+        [HttpPost]
+        public void TakeOrderInWork(OrderBindingModel Model)
+        {
+            try
+            {
+                _order.TakeOrderInWork(Model);
+            }
+            catch (Exception ex)
+            {
+                _logger.LogError(ex, "Ошибка перевода заказа с №{Id} в работу", Model.Id);
+                throw;
+            }
+        }
+
+        [HttpPost]
+        public void FinishOrder(OrderBindingModel Model)
+        {
+            try
+            {
+                _order.FinishOrder(Model);
+            }
+            catch (Exception ex)
+            {
+                _logger.LogError(ex, "Ошибка отметки о готовности заказа с №{Id}", Model.Id);
+                throw;
+            }
+        }
+    }
+}

AutoWorkshopRestApi/Controllers/ShopController.cs

@@ -1,125 +0,0 @@
-using AutoWorkshopContracts.BindingModels;
-using AutoWorkshopContracts.BusinessLogicsContracts;
-using AutoWorkshopContracts.SearchModels;
-using AutoWorkshopContracts.ViewModels;
-using Microsoft.AspNetCore.Mvc;
-
-namespace AutoWorkshopRestApi.Controllers
-{
-    [Route("api/[controller]/[action]")]
-    [ApiController]
-    public class ShopController : Controller
-    {
-        private readonly ILogger _logger;
-        private readonly IShopLogic _shopLogic;
-
-        public ShopController(ILogger<ShopController> Logger, IShopLogic ShopLogic)
-        {
-            _logger = Logger;
-            _shopLogic = ShopLogic;
-        }
-
-        [HttpGet]
-        public List<ShopViewModel>? GetShopList()
-        {
-            try
-            {
-                return _shopLogic.ReadList(null);
-            }
-            catch (Exception ex)
-            {
-                _logger.LogError(ex, "Ошибка получения списка магазинов");
-                throw;
-            }
-        }
-
-        [HttpGet]
-        public ShopRepairsViewModel? GetShop(int ShopId)
-        {
-            try
-            {
-                var Shop = _shopLogic.ReadElement(new ShopSearchModel { Id = ShopId });
-
-                if (Shop == null)
-                    return null;
-
-                return new ShopRepairsViewModel
-                {
-                    Shop = Shop,
-                    ShopRepairs = Shop.ShopRepairs.ToDictionary(x => x.Key, x => new RepairCount
-                    {
-                        Repair = new RepairViewModel()
-                        {
-                            Id = x.Value.Item1.Id,
-                            RepairName = x.Value.Item1.RepairName,
-                            RepairComponents = x.Value.Item1.RepairComponents,
-                            Price = x.Value.Item1.Price,
-                        },
-                        Count = x.Value.Item2
-                    })
-                };
-            }
-            catch (Exception ex)
-            {
-                _logger.LogError(ex, "Ошибка получения магазина");
-                throw;
-            }
-        }
-
-        [HttpPost]
-        public void CreateShop(ShopBindingModel Model)
-        {
-            try
-            {
-                _shopLogic.Create(Model);
-            }
-            catch (Exception ex)
-            {
-                _logger.LogError(ex, "Ошибка создания магазина");
-                throw;
-            }
-        }
-
-        [HttpPost]
-        public void UpdateShop(ShopBindingModel Model)
-        {
-            try
-            {
-                _shopLogic.Update(Model);
-            }
-            catch (Exception ex)
-            {
-                _logger.LogError(ex, "Ошибка обновления магазина");
-                throw;
-            }
-        }
-
-        [HttpPost]
-        public void DeleteShop(ShopBindingModel Model)
-        {
-            try
-            {
-                _shopLogic.Delete(Model);
-            }
-            catch (Exception ex)
-            {
-                _logger.LogError(ex, "Ошибка удаления магазина");
-                throw;
-            }
-        }
-
-        [HttpPost]
-        public void MakeSupply(SupplyBindingModel Model)
-        {
-            try
-            {
-                _shopLogic.MakeSupply(Model);
-            }
-            catch (Exception ex)
-            {
-                _logger.LogError(ex, "Ошибка создания поставки в магазин");
-                throw;
-            }
-        }
-    }
-}

AutoWorkshopRestApi/Program.cs

@@ -1,4 +1,6 @@
 using AutoWorkshopBusinessLogic.BusinessLogics;
+using AutoWorkshopBusinessLogic.MailWorker;
+using AutoWorkshopContracts.BindingModels;
 using AutoWorkshopContracts.BusinessLogicContracts;
 using AutoWorkshopContracts.BusinessLogicsContracts;
 using AutoWorkshopContracts.StoragesContracts;
@@ -13,12 +15,16 @@ Builder.Logging.AddLog4Net("log4net.config");
 Builder.Services.AddTransient<IClientStorage, ClientStorage>();
 Builder.Services.AddTransient<IOrderStorage, OrderStorage>();
 Builder.Services.AddTransient<IRepairStorage, RepairStorage>();
-Builder.Services.AddTransient<IShopStorage, ShopStorage>();
+Builder.Services.AddTransient<IImplementerStorage, ImplementerStorage>();
+Builder.Services.AddTransient<IMessageInfoStorage, MessageInfoStorage>();
 
 Builder.Services.AddTransient<IOrderLogic, OrderLogic>();
 Builder.Services.AddTransient<IClientLogic, ClientLogic>();
 Builder.Services.AddTransient<IRepairLogic, RepairLogic>();
-Builder.Services.AddTransient<IShopLogic, ShopLogic>();
+Builder.Services.AddTransient<IImplementerLogic, ImplementerLogic>();
+Builder.Services.AddTransient<IMessageInfoLogic, MessageInfoLogic>();
+
+Builder.Services.AddSingleton<AbstractMailWorker, MailKitWorker>();
 
 Builder.Services.AddControllers();
 
@@ -34,6 +40,18 @@ Builder.Services.AddSwaggerGen(c =>
 
 var App = Builder.Build();
 
+var MailSender = App.Services.GetService<AbstractMailWorker>();
+MailSender?.MailConfig(new MailConfigBindingModel
+{
+	MailLogin       = Builder.Configuration?.GetSection("MailLogin")?.Value?.ToString() ?? string.Empty,
+	MailPassword    = Builder.Configuration?.GetSection("MailPassword")?.Value?.ToString() ?? string.Empty,
+	SmtpClientHost  = Builder.Configuration?.GetSection("SmtpClientHost")?.Value?.ToString() ?? string.Empty,
+	SmtpClientPort  = Convert.ToInt32(Builder.Configuration?.GetSection("SmtpClientPort")?.Value?.ToString()),
+	PopHost         = Builder.Configuration?.GetSection("PopHost")?.Value?.ToString() ?? string.Empty,
+	PopPort         = Convert.ToInt32(Builder.Configuration?.GetSection("PopPort")?.Value?.ToString())
+});
+
+
 if (App.Environment.IsDevelopment())
 {
     App.UseSwagger();