cлияние веточек деревца

.gitignore

@@ -13,6 +13,10 @@
 
 # User-specific files (MonoDevelop/Xamarin Studio)
 *.userprefs
+# dll файлы
+*.dll
+
+/SushiBar/ImplementationExtensions
 
 # Mono auto generated files
 mono_crash.*

SushiBar/SushiBarBusinessLogic_/BackUpLogic.cs

@@ -0,0 +1,102 @@
+using Microsoft.Extensions.Logging;
+using SushiBarContracts.BindingModels;
+using SushiBarContracts.BusinessLogicsContracts;
+using SushiBarContracts.StoragesContracts;
+using SushiBarDataModels;
+using System;
+using System.Collections.Generic;
+using System.IO.Compression;
+using System.Linq;
+using System.Reflection;
+using System.Runtime.Serialization.Json;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace SushiBarBusinessLogic
+{
+	public class BackUpLogic : IBackUpLogic
+	{
+		private readonly ILogger _logger;
+
+		private readonly IBackUpInfo _backUpInfo;
+
+		public BackUpLogic(ILogger<BackUpLogic> logger, IBackUpInfo backUpInfo)
+		{
+			_logger = logger;
+			_backUpInfo = backUpInfo;
+		}
+
+		public void CreateBackUp(BackUpSaveBinidngModel model)
+		{
+			if (_backUpInfo == null)
+			{
+				return;
+			}
+			try
+			{
+				_logger.LogDebug("Clear folder");
+				var dirInfo = new DirectoryInfo(model.FolderName);
+				if (dirInfo.Exists)
+				{
+					foreach (var file in dirInfo.GetFiles())
+					{
+						file.Delete();
+					}
+				}
+				_logger.LogDebug("Delete archive");
+				string fileName = $"{model.FolderName}.zip";
+				if (File.Exists(fileName))
+				{
+					File.Delete(fileName);
+				}
+				// берем метод для сохранения
+				_logger.LogDebug("Get assembly");
+				var typeIId = typeof(IId);
+				var assembly = typeIId.Assembly;
+				if (assembly == null)
+				{
+					throw new ArgumentNullException("Сборка не найдена", nameof(assembly));
+				}
+				var types = assembly.GetTypes();
+				var method = GetType().GetMethod("SaveToFile", BindingFlags.NonPublic | BindingFlags.Instance);
+				_logger.LogDebug("Find {count} types", types.Length);
+				foreach (var type in types)
+				{
+					if (type.IsInterface && type.GetInterface(typeIId.Name) != null)
+					{
+						var modelType = _backUpInfo.GetTypeByModelInterface(type.Name);
+						if (modelType == null)
+						{
+							throw new InvalidOperationException($"Не найден класс-модель для {type.Name}");
+						}
+						_logger.LogDebug("Call SaveToFile method for {name} type", type.Name);
+						// вызываем метод на выполнение
+						method?.MakeGenericMethod(modelType).Invoke(this, new object[] { model.FolderName });
+					}
+				}
+				_logger.LogDebug("Create zip and remove folder");
+				// архивируем
+				ZipFile.CreateFromDirectory(model.FolderName, fileName);
+				// удаляем папку
+				dirInfo.Delete(true);
+			}
+			catch (Exception)
+			{
+				throw;
+			}
+		}
+
+		private void SaveToFile<T>(string folderName) where T : class, new()
+		{
+			var records = _backUpInfo.GetList<T>();
+			if (records == null)
+			{
+				_logger.LogWarning("{type} type get null list", typeof(T).Name);
+				return;
+			}
+			var jsonFormatter = new DataContractJsonSerializer(typeof(List<T>));
+			using var fs = new FileStream(string.Format("{0}/{1}.json", folderName, typeof(T).Name), FileMode.OpenOrCreate);
+			jsonFormatter.WriteObject(fs, records);
+		}
+	}
+}

SushiBar/SushiBarBusinessLogic_/BusinessLogics/OrderLogic.cs

@@ -1,144 +0,0 @@
-using Microsoft.Extensions.Logging;
-using SushiBarContracts.BindingModels;
-using SushiBarContracts.BusinessLogicsContracts;
-using SushiBarContracts.SearchModels;
-using SushiBarContracts.StoragesContracts;
-using SushiBarContracts.ViewModels;
-using SushiBarDataModels.Enums;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace SushiBarBusinessLogic.BusinessLogics
-{
-    public class OrderLogic : IOrderLogic
-    {
-        private readonly ILogger _logger;
-        private readonly IOrderStorage _orderStorage;
-        private readonly IShopStorage _shopStorage;
-
-        public OrderLogic(ILogger<OrderLogic> logger, IOrderStorage orderStorage, IShopStorage shopStorage)
-        {
-            _logger = logger;
-            _orderStorage = orderStorage;
-            _shopStorage = shopStorage;
-        }
-        public List<OrderViewModel>? ReadList(OrderSearchModel? model)
-        {
-            _logger.LogInformation("ReadList. OrderId:{Id}", model?.Id);
-            var list = model == null ? _orderStorage.GetFullList() : _orderStorage.GetFilteredList(model);
-            if (list == 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);
-            if (model.Status != OrderStatus.Неизвестен)
-                return false;
-            model.Status = OrderStatus.Принят;
-            if (_orderStorage.Insert(model) == null)
-            {
-                _logger.LogWarning("Insert operation failed");
-                return false;
-            }
-            return true;
-        }
-
-        public bool TakeOrderInWork(OrderBindingModel model)
-        {
-            return ChangeStatus(model, OrderStatus.Выполняется);
-        }
-
-        public bool FinishOrder(OrderBindingModel model)
-        {
-            return ChangeStatus(model, OrderStatus.Готов);
-        }
-
-        public bool DeliveryOrder(OrderBindingModel model)
-        {
-            var order = _orderStorage.GetElement(new OrderSearchModel
-            {
-                Id = model.Id,
-            });
-            if (order == null)
-            {
-                throw new ArgumentNullException(nameof(order));
-            }
-            if (!_shopStorage.RestockingShops(new SupplyBindingModel
-            {
-                SushiId = order.SushiId,
-                Count = order.Count
-            }))
-            {
-                throw new ArgumentException("Недостаточно места");
-            }
-            return ChangeStatus(model, OrderStatus.Выдан);
-        }
-
-        private void CheckModel(OrderBindingModel model, bool withParams = true)
-        {
-            if (model == null)
-            {
-                throw new ArgumentNullException(nameof(model));
-            }
-            if (!withParams)
-            {
-                return;
-            }
-            if (model.Count <= 0)
-            {
-                throw new ArgumentException("Колличество суши в заказе не может быть меньше 1", nameof(model.Count));
-            }
-            if (model.Sum <= 0)
-            {
-                throw new ArgumentException("Стоимость заказа на может быть меньше 1", nameof(model.Sum));
-            }
-            if (model.DateImplement.HasValue && model.DateImplement < model.DateCreate)
-            {
-                throw new ArithmeticException($"Дата выдачи заказа {model.DateImplement} не может быть раньше даты его создания {model.DateCreate}");
-            }
-            _logger.LogInformation("Sushi. SushiId:{SushiId}.Count:{Count}.Sum:{Sum}Id:{Id}",
-                model.SushiId, model.Count, model.Sum, model.Id);
-        }
-
-        private bool ChangeStatus(OrderBindingModel model, OrderStatus requiredStatus)
-        {
-            CheckModel(model, false);
-            var element = _orderStorage.GetElement(new OrderSearchModel()
-            {
-                Id = model.Id
-            });
-            if (element == null)
-            {
-                throw new ArgumentNullException(nameof(element));
-            }
-            model.DateCreate = element.DateCreate;
-            model.SushiId = element.SushiId;
-            model.DateImplement = element.DateImplement;
-            model.Status = element.Status;
-            model.Count = element.Count;
-            model.Sum = element.Sum;
-            if (requiredStatus - model.Status == 1)
-            {
-                model.Status = requiredStatus;
-                if (model.Status == OrderStatus.Выдан)
-                    model.DateImplement = DateTime.Now;
-                if (_orderStorage.Update(model) == null)
-                {
-                    _logger.LogWarning("Update operation failed");
-                    return false;
-                }
-                return true;
-            }
-            _logger.LogWarning("Changing status operation faled: Current-{Status}:required-{requiredStatus}.", model.Status, requiredStatus);
-            throw new ArgumentException($"Невозможно присвоить статус {requiredStatus} заказу с текущим статусом {model.Status}");
-        }
-    }
-}

SushiBar/SushiBarBusinessLogic_/ClientLogic.cs

@@ -4,6 +4,7 @@ using SushiBar.BusinessLogicsContracts;
 using SushiBar.SearchModels;
 using SushiBar.StoragesContracts;
 using SushiBar.ViewModels;
+using System.Text.RegularExpressions;
 
 namespace SushiBarBusinessLogic.BusinessLogics
 {
@@ -96,17 +97,18 @@ namespace SushiBarBusinessLogic.BusinessLogics
             {
                 throw new ArgumentNullException("Нет ФИО пользователя", nameof(model.ClientFIO));
             }
-            if (string.IsNullOrEmpty(model.Email))
-            {
-                throw new ArgumentNullException("Нет почты пользователя", nameof(model.Email));
+            if (string.IsNullOrEmpty(model.Email) || !Regex.IsMatch(model.Email, @"^[a-z0-9._%+-]+\@([a-z0-9-]+\.)+[a-z]{2,4}$"))
+			{
+                throw new ArgumentNullException("Нет указана валидная почта", nameof(model.Email));
             }
-            if (string.IsNullOrEmpty(model.Password))
-            {
-                throw new ArgumentNullException("Нет пароля пользователя", nameof(model.Password));
-            }
-            _logger.LogInformation("Client. ClientFIO:{ClientFIO}.Email:{Email}.Password:{Password}.Id:{Id}",
-                model.ClientFIO, model.Email, model.Password, model.Id);
-            var element = _clientStorage.GetElement(new ClientSearchModel
+            if (string.IsNullOrEmpty(model.Password) || !Regex.IsMatch(model.Password, @"^(?=.*[A-Za-z])(?=.*\d)(?=.*[^A-Za-z0-9\n]).{10,50}$"))
+			{
+                throw new ArgumentNullException("Не указан правильный пароль", nameof(model.Password));
+
+			}
+			_logger.LogInformation("Client. ClientFIO:{ClientFIO}.Email:{Email}.Id:{Id}",
+			model.ClientFIO, model.Email, model.Id);
+			var element = _clientStorage.GetElement(new ClientSearchModel
             {
                 ClientFIO = model.ClientFIO
             });

SushiBar/SushiBarBusinessLogic_/ImplementerLogic.cs

@@ -0,0 +1,130 @@
+using Microsoft.Extensions.Logging;
+using SushiBarContracts.BindingModels;
+using SushiBarContracts.BusinessLogicsContracts;
+using SushiBarContracts.SearchModels;
+using SushiBarContracts.StoragesContracts;
+using SushiBarContracts.ViewModels;
+using SushiBarDataModels.Models;
+using SushiBarBusinessLogic.BusinessLogics;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace SushiBarBusinessLogic
+{
+    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 == 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("Стаж должен быть больше 0", 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 element = _implementerStorage.GetElement(new ImplementerSearchModel
+            {
+                ImplementerFIO = model.ImplementerFIO
+            });
+            if (element != null && element.Id != model.Id)
+            {
+                throw new InvalidOperationException("Исполнитель с таким ФИО уже есть");
+            }
+        }
+    }
+}

SushiBar/SushiBarBusinessLogic_/MailWorker/AbstractMailWorker.cs

@@ -0,0 +1,133 @@
+using Microsoft.Extensions.Logging;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using SushiBar.StoragesContracts;
+using SushiBarContracts.BindingModels;
+using SushiBarContracts.BusinessLogicsContracts;
+using SushiBarContracts.SearchModels;
+using SushiBarContracts.StoragesContracts;
+using SushiBarContracts.ViewModels;
+
+namespace SushiBarBusinessLogic.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("Config: {login}, {password}, {clientHost}, {clientPOrt}, {popHost}, {popPort}", _mailLogin, _mailPassword.Length, _smtpClientHost, _smtpClientPort, _popHost, _popPort);
+        }
+        public async void MailSendAsync(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("Send Mail: {To}, {Subject}", info.MailAddress, info.Subject);
+            await SendMailAsync(info);
+        }
+        public async void MailCheck()
+        {
+            if (string.IsNullOrEmpty(_mailLogin) || string.IsNullOrEmpty(_mailPassword))
+            {
+                return;
+            }
+
+            if (string.IsNullOrEmpty(_popHost) || _popPort == 0)
+            {
+                return;
+            }
+
+            if (_messageInfoLogic == null)
+            {
+                return;
+            }
+
+            var list = await ReceiveMailAsync();
+            _logger.LogDebug("Check Mail: {Count} new mails", list.Count);
+            foreach (var mail in list)
+            {
+                _messageInfoLogic.Create(mail);
+            }
+        }
+
+        public async void MailSendReplyAsync(MailReplySendInfoBindingModel 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) || string.IsNullOrEmpty(info.ParentMessageId))
+            {
+                return;
+            }
+
+            _logger.LogDebug("Send Mail as reply: {To}, {Subject}, {parentId}", info.MailAddress, info.Subject, info.ParentMessageId);
+
+            string? messageId = await SendMailAsync(info);
+            if (string.IsNullOrEmpty(messageId))
+            {
+                throw new InvalidOperationException("Непредвиденная ошибка при отправке сообщения в ответ");
+            }
+            if (_messageInfoLogic.Create(new MessageInfoBindingModel
+            {
+                MessageId = messageId,
+                DateDelivery = DateTime.Now,
+                SenderName = _mailLogin,
+                IsReply = true,
+                Subject = info.Subject,
+                Body = info.Text,
+            }))
+            {
+                _messageInfoLogic.Update(new MessageInfoBindingModel()
+                {
+                    MessageId = info.ParentMessageId,
+                    ReplyMessageId = messageId,
+                    IsReaded = true
+                });
+            }
+        }
+
+        protected abstract Task<string?> SendMailAsync(MailSendInfoBindingModel info);
+        protected abstract Task<List<MessageInfoBindingModel>> ReceiveMailAsync();
+    }
+}

SushiBar/SushiBarBusinessLogic_/MailWorker/MailKitWorker.cs

@@ -0,0 +1,104 @@
+using Microsoft.Extensions.Logging;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Net.Mail;
+using System.Net;
+using System.Text;
+using System.Threading.Tasks;
+using SushiBarContracts.BindingModels;
+using MailKit.Security;
+using MailKit.Net.Pop3;
+using SushiBarContracts.BusinessLogicsContracts;
+
+namespace SushiBarBusinessLogic.MailWorker
+{
+	public class MailKitWorker : AbstractMailWorker
+	{
+        public MailKitWorker(ILogger<MailKitWorker> logger, IMessageInfoLogic messageInfoLogic) : base(logger, messageInfoLogic) { }
+
+        protected override async Task<string?> SendMailAsync(MailSendInfoBindingModel info)
+        {
+            string? resount = null;
+            using var objMailMessage = new MailMessage();
+            using var objSmtpClient = new SmtpClient(_smtpClientHost, _smtpClientPort);
+            try
+            {
+                ConfigurateSmtpClient(objSmtpClient);
+                CreateMessage(objMailMessage, info);
+
+                if (info is MailReplySendInfoBindingModel replyInfo)
+                {
+                    objMailMessage.Headers.Add("In-Reply-To", replyInfo.ParentMessageId);
+                    objMailMessage.Headers.Add("References", replyInfo.ParentMessageId);
+
+                    string messageGuid = Guid.NewGuid().ToString();
+                    objMailMessage.Headers.Add("Message-Id", messageGuid);
+                    resount = messageGuid;
+                }
+
+                await Task.Run(() => objSmtpClient.Send(objMailMessage));
+            }
+            catch (Exception)
+            {
+                throw;
+            }
+            return resount;
+        }
+
+        protected override async Task<List<MessageInfoBindingModel>> ReceiveMailAsync()
+        {
+            var list = 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)
+                        {
+                            list.Add(new MessageInfoBindingModel
+                            {
+                                DateDelivery = message.Date.DateTime,
+                                MessageId = message.MessageId,
+                                SenderName = mail.Address,
+                                Subject = message.Subject,
+                                Body = message.TextBody
+                            });
+                        }
+                    }
+                }
+                catch (MailKit.Security.AuthenticationException)
+                { }
+                finally
+                {
+                    client.Disconnect(true);
+                }
+            });
+            return list;
+        }
+
+        private void CreateMessage(MailMessage objMailMessage, MailSendInfoBindingModel info)
+        {
+            objMailMessage.From = new MailAddress(_mailLogin);
+            objMailMessage.To.Add(new MailAddress(info.MailAddress));
+            objMailMessage.Subject = info.Subject;
+            objMailMessage.Body = info.Text;
+            objMailMessage.SubjectEncoding = Encoding.UTF8;
+            objMailMessage.BodyEncoding = Encoding.UTF8;
+        }
+
+        private void ConfigurateSmtpClient(SmtpClient objSmtpClient)
+        {
+
+            objSmtpClient.UseDefaultCredentials = false;
+            objSmtpClient.EnableSsl = true;
+            objSmtpClient.DeliveryMethod = SmtpDeliveryMethod.Network;
+            objSmtpClient.Credentials = new NetworkCredential(_mailLogin, _mailPassword);
+        }
+    }
+}

SushiBar/SushiBarBusinessLogic_/MessageInfoLogic.cs

@@ -0,0 +1,125 @@
+using Microsoft.Extensions.Logging;
+using SushiBar.SearchModels;
+using SushiBar.StoragesContracts;
+using SushiBarContracts.BindingModels;
+using SushiBarContracts.BusinessLogicsContracts;
+using SushiBarContracts.SearchModels;
+using SushiBarContracts.StoragesContracts;
+using SushiBarContracts.ViewModels;
+using SushiBarDataModels.Models;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace SushiBarBusinessLogic
+{
+	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)
+		{
+			if (model == null)
+			{
+				throw new ArgumentNullException(nameof(model));
+			}
+			_logger.LogInformation("ReadList. MessageId:{MessageId}.ClientId:{ClientId}.PageLength:{PageLength}.PageCount:{PageIndex}", model?.MessageId, model?.ClientId, model?.PageLength, model?.PageIndex);
+			var list = _messageInfoStorage.GetFilteredList(model);
+			if (list == null)
+			{
+				_logger.LogWarning("ReadList return null list");
+				return null;
+			}
+			_logger.LogInformation("ReadList. Count:{Count}", list.Count);
+			return list;
+		}
+		public bool Create(MessageInfoBindingModel model)
+		{
+			CheckModel(model);
+			var message = _messageInfoStorage.Insert(model);
+			if (message == 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 (string.IsNullOrEmpty(model.MessageId))
+			{
+				throw new ArgumentNullException("Не указан id сообщения", nameof(model.MessageId));
+			}
+			if (!withParams)
+			{
+				return;
+			}
+			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:{Email}", model.SenderName);
+			}
+			else
+			{
+				model.ClientId = element.Id;
+			}
+		}
+
+		public MessageInfoViewModel? ReadElement(MessageInfoSearchModel model)
+		{
+			if (model == null)
+			{
+				throw new ArgumentNullException(nameof(model));
+			}
+			_logger.LogInformation("ReadElement. MessageId:{MessageId}", model?.MessageId);
+			var element = _messageInfoStorage.GetElement(model);
+			if (element == null)
+			{
+				_logger.LogWarning("ReadElement element not found");
+				return null;
+			}
+			_logger.LogInformation("ReadElement find. Id:{Id}", element.MessageId);
+			return element;
+		}
+
+		public bool Update(MessageInfoBindingModel model)
+		{
+			CheckModel(model, withParams: false);
+			if (_messageInfoStorage.Update(model) == null)
+			{
+				_logger.LogWarning("Update operation failed");
+				return false;
+			}
+			return true;
+		}
+	}
+}

SushiBar/SushiBarBusinessLogic_/OrderLogic.cs

@@ -0,0 +1,213 @@
+using Microsoft.Extensions.Logging;
+using SushiBarContracts.BindingModels;
+using SushiBarContracts.BusinessLogicsContracts;
+using SushiBarContracts.SearchModels;
+using SushiBarContracts.StoragesContracts;
+using SushiBarContracts.ViewModels;
+using SushiBarDataModels.Enums;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using MigraDoc.Rendering;
+using SushiBarBusinessLogic.MailWorker;
+
+namespace SushiBarBusinessLogic.BusinessLogics
+{
+    public class OrderLogic : IOrderLogic
+    {
+        private readonly ILogger _logger;
+        private readonly IOrderStorage _orderStorage;
+        private readonly AbstractMailWorker _mailWorker;
+        static readonly object _locker = new object();
+        private readonly IShopStorage _shopStorage;
+        public OrderLogic(ILogger<OrderLogic> logger, IOrderStorage orderStorage, IShopStorage shopStorage, AbstractMailWorker mailWorker)
+        {
+            _logger = logger;
+            _orderStorage = orderStorage;
+            _shopStorage = shopStorage;
+            _mailWorker = mailWorker;
+        }
+
+        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 element = _orderStorage.GetElement(model);
+            if (element == null)
+            {
+                _logger.LogWarning("ReadElement element not found");
+                return null;
+            }
+            _logger.LogInformation("ReadElement find. Id:{Id}", element.Id);
+            return element;
+        }
+
+        public List<OrderViewModel>? ReadList(OrderSearchModel? model)
+        {
+            _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 == null ? _orderStorage.GetFullList() : _orderStorage.GetFilteredList(model);
+            if (list == 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);
+            if (model.Status != OrderStatus.Неизвестен)
+                return false;
+            model.Status = OrderStatus.Принят;
+            var element = _orderStorage.Insert(model);
+            if (element == null)
+            {
+                _logger.LogWarning("Insert operation failed");
+                return false;
+            }
+            Task.Run(() => _mailWorker.MailSendAsync(new MailSendInfoBindingModel
+            {
+                MailAddress = element.ClientEmail,
+                Subject = $"Изменение статуса заказа номер {element.Id}",
+                Text = $"Ваш заказ номер {element.Id} на пиццу {element.SushiName} от {element.DateCreate} на сумму {element.Sum} принят."
+            }));
+            return true;
+        }
+
+        public bool TakeOrderInWork(OrderBindingModel model)
+        {
+            lock (_locker)
+            {
+                return ChangeStatus(model, OrderStatus.Выполняется);
+            }
+        }
+
+        public bool FinishOrder(OrderBindingModel model)
+        {
+            return ChangeStatus(model, OrderStatus.Готов);
+        }
+
+        public bool DeliveryOrder(OrderBindingModel model)
+        {
+            lock (_locker)
+            {
+                (model, var element) = FillOrderBindingModel(model);
+                if (model.Status != OrderStatus.Готов && model.Status != OrderStatus.Ожидает)
+                {
+                    _logger.LogWarning("Changing status operation faled: Current-{Status}:required-Выдан.", model.Status);
+                    throw new InvalidOperationException($"Невозможно приствоить статус выдан заказу с текущим статусом {model.Status}");
+                }
+                if (!_shopStorage.RestockingShops(new SupplyBindingModel
+                {
+                    SushiId = model.SushiId,
+                    Count = model.Count
+                }))
+                {
+                    if (model.Status == OrderStatus.Готов)
+                    {
+                        model.Status = OrderStatus.Ожидает;
+
+                        UpdateOrder(model, element);
+                    }
+                    throw new ArgumentException("Недостаточно места в магазинах для поставки");
+                }
+                model.Status = OrderStatus.Выдан;
+                return UpdateOrder(model, element);
+            }
+        }
+
+        private void CheckModel(OrderBindingModel model, bool withParams = true)
+        {
+            if (model == null)
+            {
+                throw new ArgumentNullException(nameof(model));
+            }
+            if (!withParams)
+            {
+                return;
+            }
+            if (model.Count <= 0)
+            {
+                throw new ArgumentException("Колличество пиццы в заказе не может быть меньше 1", nameof(model.Count));
+            }
+            if (model.Sum <= 0)
+            {
+                throw new ArgumentException("Стоимость заказа на может быть меньше 1", nameof(model.Sum));
+            }
+            if (model.DateImplement.HasValue && model.DateImplement < model.DateCreate)
+            {
+                throw new ArithmeticException($"Дата выдачи заказа {model.DateImplement} не может быть раньше даты его создания {model.DateCreate}");
+            }
+            _logger.LogInformation("Sushi. SushiId:{SushiId}.Count:{Count}.Sum:{Sum}Id:{Id}",
+                model.SushiId, model.Count, model.Sum, model.Id);
+        }
+        private bool ChangeStatus(OrderBindingModel model, OrderStatus requiredStatus)
+        {
+            (model, var element) = FillOrderBindingModel(model);
+
+            if (requiredStatus - model.Status == 1)
+            {
+                model.Status = requiredStatus;
+                if (model.Status == OrderStatus.Готов)
+                    model.DateImplement = DateTime.Now;
+                return UpdateOrder(model, element);
+            }
+            _logger.LogWarning("Changing status operation faled: Current-{Status}:required-{requiredStatus}.", model.Status, requiredStatus);
+            throw new InvalidOperationException($"Невозможно приствоить статус {requiredStatus} заказу с текущим статусом {model.Status}");
+        }
+
+        private (OrderBindingModel, OrderViewModel) FillOrderBindingModel(OrderBindingModel model)
+        {
+            CheckModel(model, false);
+            var element = _orderStorage.GetElement(new OrderSearchModel()
+            {
+                Id = model.Id
+            });
+            if (element == null)
+            {
+                throw new InvalidOperationException(nameof(element));
+            }
+            model.Id = element.Id;
+            model.DateCreate = element.DateCreate;
+            model.SushiId = element.SushiId;
+            model.DateImplement = element.DateImplement;
+            model.ClientId = element.ClientId;
+            model.Status = element.Status;
+            model.Count = element.Count;
+            model.Sum = element.Sum;
+            if (!model.ImplementerId.HasValue)
+            {
+                model.ImplementerId = element.ImplementerId;
+            }
+            return (model, element);
+        }
+
+        private bool UpdateOrder(OrderBindingModel model, OrderViewModel MailNotificationModel)
+        {
+            if (_orderStorage.Update(model) == null)
+            {
+                _logger.LogWarning("Update operation failed");
+                return false;
+            }
+            _logger.LogWarning("Update operation sucsess");
+            string DateInfo = model.DateImplement.HasValue ? $"Дата выполнения {model.DateImplement}" : "";
+            Task.Run(() => _mailWorker.MailSendAsync(new MailSendInfoBindingModel
+            {
+                MailAddress = MailNotificationModel.ClientEmail,
+                Subject = $"Изменение статуса заказа номер {MailNotificationModel.Id}",
+                Text = $"Ваш заказ номер {MailNotificationModel.Id} на изделие {MailNotificationModel.SushiName} от" +
+                $" {MailNotificationModel.DateCreate} на сумму {MailNotificationModel.Sum} {model.Status}. {DateInfo}"
+            }));
+            return true;
+        }
+    }
+}

SushiBar/SushiBarBusinessLogic_/SushiBarBusinessLogic.csproj

@@ -16,6 +16,7 @@
     </PackageReference>
     <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="8.0.0" />
     <PackageReference Include="PdfSharp.MigraDoc.Standard" Version="1.51.9" />
+    <PackageReference Include="MailKit" Version="4.2.0" />
   </ItemGroup>
 
   <ItemGroup>

SushiBar/SushiBarBusinessLogic_/WorkModeling .cs

@@ -0,0 +1,184 @@
+using Microsoft.Extensions.Logging;
+using SushiBarContracts.BindingModels;
+using SushiBarContracts.BusinessLogicsContracts;
+using SushiBarContracts.SearchModels;
+using SushiBarContracts.ViewModels;
+using SushiBarDataModels.Enums;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace SushiBarBusinessLogic
+{
+    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.Принят });
+			
+			if (orders == null )
+            {
+                _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 DeliverWaitingOrder(implementer);
+			await RunOrderInWork(implementer);
+
+            await Task.Run(() =>
+            {
+                foreach (var order in orders)
+                {
+                    try
+                    {
+                        _logger.LogDebug("DoWork. Worker {Id} try get order {Order}", implementer.Id, order.Id);
+                        // пытаемся назначить заказ на исполнителя
+                        _orderLogic.TakeOrderInWork(new OrderBindingModel
+                        {
+                            Id = order.Id,
+                            ImplementerId = implementer.Id
+                        });
+                        // делаем работу
+                        Thread.Sleep(implementer.WorkExperience * _rnd.Next(100, 1000) * order.Count);
+                        _logger.LogDebug("DoWork. Worker {Id} finish order {Order}", implementer.Id, order.Id);
+                        _orderLogic.FinishOrder(new OrderBindingModel
+                        {
+                            Id = order.Id
+                        });
+						_orderLogic.DeliveryOrder(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.Выполняется
+                }));
+                if (runOrder == null)
+                {
+                    return;
+                }
+
+                _logger.LogDebug("DoWork. Worker {Id} back to order {Order}", implementer.Id, runOrder.Id);
+                // доделываем работу
+                Thread.Sleep(implementer.WorkExperience * _rnd.Next(100, 300) * runOrder.Count);
+                _logger.LogDebug("DoWork. 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;
+            }
+        }
+
+		private async Task DeliverWaitingOrder(ImplementerViewModel implementer)
+		{
+			if (_orderLogic == null || implementer == null)
+			{
+				return;
+			}
+			var waitingOrders = await Task.Run(() => _orderLogic.ReadList(new OrderSearchModel
+			{
+				ImplementerId = implementer.Id,
+				Status = OrderStatus.Ожидает
+			}));
+			if (waitingOrders == null || waitingOrders.Count == 0)
+			{
+				return;
+			}
+			_logger.LogInformation("DeliverWaitingOrder. Find some waitig order for implementer:{id}.Count:{count}", implementer.Id, waitingOrders.Count);
+			foreach (var waitingOrder in waitingOrders)
+			{
+				try
+				{
+					_logger.LogInformation("DeliverWaitingOrder. Trying to deliver order id:{id}", waitingOrder.Id);
+					var res = _orderLogic.DeliveryOrder(new OrderBindingModel
+					{
+						Id = waitingOrder.Id
+					});
+				}
+				catch (ArgumentException ex)
+				{
+					_logger.LogWarning(ex, "DeliverWaitingOrder. Fault");
+				}
+				catch (InvalidOperationException ex)
+				{
+					_logger.LogWarning(ex, "Error try deliver order");
+				}
+				catch (Exception ex)
+				{
+					_logger.LogError(ex, "Error while do work");
+					throw;
+				}
+			}
+		}
+	}
+}

SushiBar/SushiBarClientApp/APIClient.cs

@@ -12,7 +12,9 @@ namespace SushiBarClientApp
         private static readonly HttpClient _client = new();
 
         public static string? Password { get; set; }
-        
+        public static ClientViewModel? Client { get; set; } = null;
+        public static int MailPage { get; set; } = 1;
+
         public static void Connect(IConfiguration configuration)
         {
             _client.BaseAddress = new Uri(configuration["IPAddress"]);

SushiBar/SushiBarClientApp/Controllers/HomeController.cs

@@ -19,11 +19,52 @@ namespace SushiBarClientApp.Controllers
 
         public IActionResult Index()
         {
-            if (APIClient.Password == null)
+            if (APIClient.Client == null)
             {
                 return Redirect("~/Home/Enter");
             }
-            return View(APIClient.GetRequest<List<ShopViewModel>>($"api/shop/getshoplist?password={APIClient.Password}"));
+            return View(APIClient.GetRequest<List<OrderViewModel>>($"api/main/getorders?clientId={APIClient.Client.Id}"));
+        }
+
+        [HttpGet]
+        public IActionResult Privacy()
+        {
+            if (APIClient.Client == null)
+            {
+                return Redirect("~/Home/Enter");
+            }
+            return View(APIClient.Client);
+        }
+
+        [HttpPost]
+        public void Privacy(string login, string password, string fio)
+        {
+            if (APIClient.Client == null)
+            {
+                throw new Exception("Вы как суда попали? Суда вход только авторизованным");
+            }
+            if (string.IsNullOrEmpty(login) || string.IsNullOrEmpty(password) || string.IsNullOrEmpty(fio))
+            {
+                throw new Exception("Введите логин, пароль и ФИО");
+            }
+            APIClient.PostRequest("api/client/updatedata", new ClientBindingModel
+            {
+                Id = APIClient.Client.Id,
+                ClientFIO = fio,
+                Email = login,
+                Password = password
+            });
+
+            APIClient.Client.ClientFIO = fio;
+            APIClient.Client.Email = login;
+            APIClient.Client.Password = password;
+            Response.Redirect("Index");
+        }
+
+        [ResponseCache(Duration = 0, Location = ResponseCacheLocation.None, NoStore = true)]
+        public IActionResult Error()
+        {
+            return View(new ErrorViewModel { RequestId = Activity.Current?.Id ?? HttpContext.TraceIdentifier });
         }
 
         [HttpGet]
@@ -33,119 +74,88 @@ namespace SushiBarClientApp.Controllers
         }
 
         [HttpPost]
-        public void Enter(string password)
+        public void Enter(string login, string password)
         {
-            bool resout = APIClient.GetRequest<bool>($"/api/shop/authentication?password={password}");
-            if (!resout)
+            if (string.IsNullOrEmpty(login) || string.IsNullOrEmpty(password))
             {
-                Response.Redirect("../Home/Enter");
-                return;
+                throw new Exception("Введите логин и пароль");
+            }
+            APIClient.Client = APIClient.GetRequest<ClientViewModel>($"api/client/login?login={login}&password={password}");
+            if (APIClient.Client == null)
+            {
+                throw new Exception("Неверный логин/пароль");
             }
-            APIClient.Password = password;
             Response.Redirect("Index");
         }
 
+        [HttpGet]
+        public IActionResult Register()
+        {
+            return View();
+        }
+
+        [HttpPost]
+        public void Register(string login, string password, string fio)
+        {
+            if (string.IsNullOrEmpty(login) || string.IsNullOrEmpty(password) || string.IsNullOrEmpty(fio))
+            {
+                throw new Exception("Введите логин, пароль и ФИО");
+            }
+            APIClient.PostRequest("api/client/register", new ClientBindingModel
+            {
+                ClientFIO = fio,
+                Email = login,
+                Password = password
+            });
+            Response.Redirect("Enter");
+            return;
+        }
+
         [HttpGet]
         public IActionResult Create()
         {
-            if (APIClient.Password == null)
-            {
-                return Redirect("~/Home/Enter");
-            }
-            return View("Shop");
-        }
-
-        [HttpPost]
-        public void Create(int id, string shopname, string adress, DateTime openingdate, int maxcount)
-        {
-            if (string.IsNullOrEmpty(shopname) || string.IsNullOrEmpty(adress))
-            {
-                throw new Exception("Название или адрес не может быть пустым");
-            }
-            if (openingdate == default(DateTime))
-            {
-                throw new Exception("Дата открытия не может быть пустой");
-            }
-
-            APIClient.PostRequest($"api/shop/createshop?password={APIClient.Password}", new ShopBindingModel
-            {
-                Id = id,
-                ShopName = shopname,
-                Adress = adress,
-                OpeningDate = openingdate,
-                SushiMaxCount = maxcount
-            });
-            Response.Redirect("Index");
-        }
-
-        [HttpGet]
-        public IActionResult Update(int Id)
-        {
-            if (APIClient.Password == null)
-            {
-                return Redirect("~/Home/Enter");
-            }
-            return View("Shop", APIClient.GetRequest<ShopSushiViewModel>($"api/shop/getshop?shopId={Id}&password={APIClient.Password}"));
-        }
-
-        [HttpPost]
-        public void Update(int id, string shopname, string adress, DateTime openingdate, int maxcount)
-        {
-            if (string.IsNullOrEmpty(shopname) || string.IsNullOrEmpty(adress))
-            {
-                throw new Exception("Название или адрес не может быть пустым");
-            }
-            if (openingdate == default(DateTime))
-            {
-                throw new Exception("Дата открытия не может быть пустой");
-            }
-            APIClient.PostRequest($"api/shop/updateshop?password={APIClient.Password}", new ShopBindingModel
-            {
-                Id = id,
-                ShopName = shopname,
-                Adress = adress,
-                OpeningDate = openingdate,
-                SushiMaxCount = maxcount
-            });
-            Response.Redirect("../Index");
-        }
-
-        [HttpPost]
-        public void Delete(int Id)
-        {
-            APIClient.DeleteRequest($"api/shop/deleteshop?shopId={Id}&password={APIClient.Password}");
-            Response.Redirect("../Index");
-        }
-
-        [HttpGet]
-        public IActionResult Supply()
-        {
-            if (APIClient.Password == null)
-            {
-                return Redirect("~/Home/Enter");
-            }
-
-            ViewBag.Shops = APIClient.GetRequest<List<ShopViewModel>>($"api/shop/getshoplist?password={APIClient.Password}");
-            ViewBag.Sushis = APIClient.GetRequest<List<SushiViewModel>>($"api/main/getsushilist");
+            ViewBag.Sushis = APIClient.GetRequest<List<SushiViewModel>>("api/main/getSushilist");
             return View();
         }
 
         [HttpPost]
-        public void Supply(int shop, int sushi, int count)
+        public void Create(int Sushi, int count)
         {
-            APIClient.PostRequest($"api/shop/makesypply?password={APIClient.Password}", new SupplyBindingModel
+            if (APIClient.Client == null)
             {
-                ShopId = shop,
-                SushiId = sushi,
-                Count = count
+                throw new Exception("Вы как суда попали? Суда вход только авторизованным");
+            }
+            if (count <= 0)
+            {
+                throw new Exception("Количество и сумма должны быть больше 0");
+            }
+            APIClient.PostRequest("api/main/createorder", new OrderBindingModel
+            {
+                ClientId = APIClient.Client.Id,
+                SushiId = Sushi,
+                Count = count,
+                Sum = Calc(count, Sushi)
             });
             Response.Redirect("Index");
         }
 
-        [ResponseCache(Duration = 0, Location = ResponseCacheLocation.None, NoStore = true)]
-        public IActionResult Error()
+        [HttpPost]
+        public double Calc(int count, int Sushi)
         {
-            return View(new ErrorViewModel { RequestId = Activity.Current?.Id ?? HttpContext.TraceIdentifier });
+            var sus = APIClient.GetRequest<SushiViewModel>($"api/main/getSushi?SushiId={Sushi}");
+            return count * (sus?.Price ?? 1);
+        }
+
+        [HttpGet]
+        public IActionResult Mails(int page = 1)
+        {
+            if (APIClient.Client == null)
+            {
+                return Redirect("~/Home/Enter");
+            }
+
+            page = Math.Max(page, 1);
+            return View(APIClient.GetRequest<List<MessageInfoViewModel>>($"api/client/getmessages?clientId={APIClient.Client.Id}&page={page}"));
         }
     }
 }

SushiBar/SushiBarClientApp/Views/Home/Index.cshtml

@@ -1,68 +1,75 @@
 @using SushiBarContracts.ViewModels
 
-@model List<ShopViewModel>
+@model List<OrderViewModel>
 
 @{
 	ViewData["Title"] = "Home Page";
 }
 
 <div class="text-center">
-    <h1 class="display-4">Магазины</h1>
+	<h1 class="display-4">Заказы</h1>
 </div>
 
 
-<div class="text-center ">
-    <p>
-        <a asp-action="Create">Создать магазин</a>
-    </p>
+<div class="text-center">
+	@{
+		if (Model == null)
+		{
+					<h3 class="display-4">Авторизируйтесь</h3>
+			return;
+		}
 
-    <table class="table">
-        <thead>
-            <tr>
-                <th>
-                    Номер
-                </th>
-                <th>
-                    Название
-                </th>
-                <th>
-                    Адрес
-                </th>
-                <th>
-                    Дата открытия
-                </th>
-                <th>
-                    Максимальная вместимость
-                </th>
-                <th>
-
-                </th>
-            </tr>
-        </thead>
-        <tbody>
-            @foreach (var item in Model)
-            {
-                <tr>
-                    <td>
-                        @Html.DisplayFor(modelItem => item.Id)
-                    </td>
-                    <td>
-                        @Html.DisplayFor(modelItem => item.ShopName)
-                    </td>
-                    <td>
-                        @Html.DisplayFor(modelItem => item.Adress)
-                    </td>
-                    <td>
-                        @Html.DisplayFor(modelItem => item.OpeningDate)
-                    </td>
-                    <td>
-                        @Html.DisplayFor(modelItem => item.SushiMaxCount)
-                    </td>
-                    <td>
-                        <a class="btn btn-primary" asp-action="Update" asp-route-Id="@(item.Id)" role="button">Изменить</a>
-                    </td>
-                </tr>
-            }
-        </tbody>
-    </table>
+			<p>
+				<a asp-action="Create">Создать заказ</a>
+			</p>
+			<table class="table">
+				<thead>
+					<tr>
+						<th>
+							Номер
+						</th>
+						<th>
+							Пицца
+						</th>
+						<th>
+							Дата создания
+						</th>
+						<th>
+							Количество
+						</th>
+						<th>
+							Сумма
+						</th>
+						<th>
+							Статус
+						</th>
+					</tr>
+				</thead>
+				<tbody>
+				@foreach (var item in Model)
+				{
+							<tr>
+								<td>
+							@Html.DisplayFor(modelItem => item.Id)
+								</td>
+								<td>
+							@Html.DisplayFor(modelItem => item.SushiName)
+								</td>
+								<td>
+							@Html.DisplayFor(modelItem => item.DateCreate)
+								</td>
+								<td>
+							@Html.DisplayFor(modelItem => item.Count)
+								</td>
+								<td>
+							@Html.DisplayFor(modelItem => item.Sum)
+								</td>
+								<td>
+							@Html.DisplayFor(modelItem => item.Status)
+								</td>
+							</tr>
+				}
+				</tbody>
+			</table>
+	}
 </div>

SushiBar/SushiBarClientApp/Views/Home/Mails.cshtml

@@ -0,0 +1,74 @@
+@using SushiBarContracts.ViewModels
+
+@model List<MessageInfoViewModel>
+@Url.ActionContext.RouteData.Values["page"]
+
+@{
+	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 class="d-flex justify-content-center align-items-center">
+			@{
+				int page = int.Parse(Context.Request.Query["page"]);
+						<div class="m-1">
+							<input type="number" class="form-control" min="1" step="1" asp-action="Mails" name="page" value="@(page)" readonly>
+						</div>
+				if (page > 1)
+				{
+								<a name="page" class="btn btn-primary" type="button" asp-action="Mails" asp-route-page="@(page-1)">&lt;-</a>
+				}
+				else
+				{
+								<p class="btn btn-primary my-auto">&lt;-</p>
+				}
+
+						<a name="" id="" class="btn btn-primary" type="button" asp-action="Mails" asp-route-page="@(page+1)">-&gt;</a>
+			}
+			</div>
+	}
+</div>

SushiBar/SushiBarClientApp/Views/Home/Supply.cshtml

@@ -10,7 +10,7 @@
         <select class="form-select form-select-lg" id="shop" name="shop" asp-items="@(new SelectList(@ViewBag.Shops,"Id", "ShopName"))"></select>
     </div>
     <div class="mb-3">
-        <label class="form-label">Суши</label>
+        <label class="form-label">Пицца</label>
         <select class="form-select form-select-lg" id="sushi" name="sushi" asp-items="@(new SelectList(@ViewBag.Sushis,"Id", "SushiName"))"></select>
     </div>
     <div class="mb-3">

SushiBar/SushiBarClientApp/Views/Shared/_Layout.cshtml

@@ -14,7 +14,7 @@
     <header>
         <nav class="navbar navbar-expand-sm navbar-toggleable-sm navbar-light bg-white border-bottom box-shadow mb-3">
             <div class="container-fluid">
-                <a class="navbar-brand" asp-area="" asp-controller="Home" asp-action="Index">PizzeriaShopsApi</a>
+                <a class="navbar-brand" asp-area="" asp-controller="Home" asp-action="Index">SushiBarShopsApi</a>
                 <button class="navbar-toggler" type="button" data-bs-toggle="collapse" data-bs-target=".navbar-collapse" aria-controls="navbarSupportedContent"
                         aria-expanded="false" aria-label="Toggle navigation">
                     <span class="navbar-toggler-icon"></span>
@@ -25,7 +25,17 @@
                             <a class="nav-link text-dark" asp-area="" asp-controller="Home" asp-action="Index">Главная</a>
                         </li>
                         <li class="nav-item">
-                            <a class="nav-link text-dark" asp-area="" asp-controller="Home" asp-action="Supply">Поставка</a>
+                            <a class="nav-link text-dark" asp-area="" asp-controller="Home" asp-action="Privacy">Личные данные</a>
+                        </li>
+                        <li class="nav-item">
+                            <a class="nav-link text-dark" asp-area="" asp-controller="Home" asp-action="Mails" asp-route-page="1">Письма</a>
+                        </li>
+                        <li class="nav-item">
+                            <a class="nav-link text-dark" asp-area="" asp-controller="Home" asp-action="Enter">Вход</a>
+                        </li>
+                        <li class="nav-item">
+                            <a class="nav-link text-dark" asp-area="" asp-controller="Home" asp-action="Register">Регистрация</a>
+                           @*  <a class="nav-link text-dark" asp-area="" asp-controller="Home" asp-action="Supply">Поставка</a> *@
                         </li>
                     </ul>
                 </div>

SushiBar/SushiBarContracts/Attributes/ColumnAttribute.cs

@@ -0,0 +1,25 @@
+namespace SushiBarContracts.Attributes
+{
+	[AttributeUsage(AttributeTargets.Property)]
+	public class ColumnAttribute : Attribute
+	{
+		public string Title { get; private set; }
+
+		public bool Visible { get; private set; }
+
+		public int Width { get; private set; }
+
+		public GridViewAutoSize GridViewAutoSize { get; private set; }
+
+		public bool IsUseAutoSize { get; private set; }
+
+		public ColumnAttribute(string title = "", bool visible = true, int width = 0, GridViewAutoSize gridViewAutoSize = GridViewAutoSize.None, bool isUseAutoSize = false)
+		{
+			Title = title;
+			Visible = visible;
+			Width = width;
+			GridViewAutoSize = gridViewAutoSize;
+			IsUseAutoSize = isUseAutoSize;
+		}
+	}
+}

SushiBar/SushiBarContracts/Attributes/GridViewAutoSize.cs

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

SushiBar/SushiBarContracts/BindingModels/BackUpSaveBinidngModel.cs

@@ -0,0 +1,13 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace SushiBarContracts.BindingModels
+{
+	public class BackUpSaveBinidngModel
+	{
+		public string FolderName { get; set; } = string.Empty;
+	}
+}

SushiBar/SushiBarContracts/BindingModels/ImplementerBindingModel.cs

@@ -0,0 +1,18 @@
+using SushiBarDataModels.Models;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace SushiBarContracts.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; }
+    }
+}

SushiBar/SushiBarContracts/BindingModels/MailConfigBindingModel.cs

@@ -0,0 +1,18 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace SushiBarContracts.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; }
+	}
+}

SushiBar/SushiBarContracts/BindingModels/MailReplySendInfoBindingModel.cs

@@ -0,0 +1,13 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace SushiBarContracts.BindingModels
+{
+	public class MailReplySendInfoBindingModel : MailSendInfoBindingModel
+	{
+		public string ParentMessageId { get; set; } = string.Empty;
+	}
+}

SushiBar/SushiBarContracts/BindingModels/MailSendInfoBindingModel.cs

@@ -0,0 +1,15 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace SushiBarContracts.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;
+	}
+}

SushiBar/SushiBarContracts/BindingModels/MessageInfoBindingModel.cs

@@ -0,0 +1,24 @@
+using SushiBarDataModels.Models;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace SushiBarContracts.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 string Subject { get; set; } = string.Empty;
+		public string Body { get; set; } = string.Empty;
+		public DateTime DateDelivery { get; set; }
+		public bool IsReaded { get; set; }
+		public string? ReplyMessageId { get; set; }
+		public bool IsReply { get; set; }
+		public int Id => throw new NotImplementedException();
+	}
+}
+

SushiBar/SushiBarContracts/BindingModels/OrderBindingModel.cs

@@ -13,6 +13,7 @@ namespace SushiBarContracts.BindingModels
         public int Id { get; set; }
         public int SushiId { 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.Неизвестен;

SushiBar/SushiBarContracts/BusinessLogicsContracts/IBackUpLogic.cs

@@ -0,0 +1,14 @@
+using SushiBarContracts.BindingModels;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace SushiBarContracts.BusinessLogicsContracts
+{
+	public interface IBackUpLogic
+	{
+		void CreateBackUp(BackUpSaveBinidngModel model);
+	}
+}

SushiBar/SushiBarContracts/BusinessLogicsContracts/IImplementerLogic.cs

@@ -0,0 +1,20 @@
+using SushiBarContracts.BindingModels;
+using SushiBarContracts.SearchModels;
+using SushiBarContracts.ViewModels;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace SushiBarContracts.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);
+    }
+}

SushiBar/SushiBarContracts/BusinessLogicsContracts/IMessageInfoLogic.cs

@@ -0,0 +1,19 @@
+using SushiBarContracts.BindingModels;
+using SushiBarContracts.SearchModels;
+using SushiBarContracts.ViewModels;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace SushiBarContracts.BusinessLogicsContracts
+{
+	public interface IMessageInfoLogic
+	{
+		List<MessageInfoViewModel>? ReadList(MessageInfoSearchModel? model);
+		MessageInfoViewModel? ReadElement(MessageInfoSearchModel model);
+		bool Create(MessageInfoBindingModel model);
+		bool Update(MessageInfoBindingModel model);
+	}
+}

SushiBar/SushiBarContracts/BusinessLogicsContracts/IOrderLogic.cs

@@ -16,5 +16,6 @@ namespace SushiBarContracts.BusinessLogicsContracts
         bool TakeOrderInWork(OrderBindingModel model);
         bool FinishOrder(OrderBindingModel model);
         bool DeliveryOrder(OrderBindingModel model);
+        OrderViewModel? ReadElement(OrderSearchModel model);
     }
 }

SushiBar/SushiBarContracts/BusinessLogicsContracts/IWorkProcess.cs

@@ -0,0 +1,13 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace SushiBarContracts.BusinessLogicsContracts
+{
+    public interface IWorkProcess
+    {
+        void DoWork(IImplementerLogic implementerLogic, IOrderLogic orderLogic);
+    }
+}

SushiBar/SushiBarContracts/DI/DependencyManager.cs

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

SushiBar/SushiBarContracts/DI/IDependencyContainer.cs

@@ -0,0 +1,40 @@
+using Microsoft.Extensions.Logging;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace SushiBarContracts.DI
+{
+	public interface IDependencyContainer
+	{
+		/// <summary>
+		/// Регистрация логгера
+		/// </summary>
+		/// <param name="configure"></param>
+		void AddLogging(Action<ILoggingBuilder> configure);
+
+		/// <summary>
+		/// Добавление зависимости
+		/// </summary>
+		/// <typeparam name="T"></typeparam>
+		/// <typeparam name="U"></typeparam>
+		/// <param name="isSingle"></param>
+		void RegisterType<T, U>(bool isSingle) where U : class, T where T : class;
+
+		/// <summary>
+		/// Добавление зависимости
+		/// </summary>
+		/// <typeparam name="T"></typeparam>
+		/// <param name="isSingle"></param>
+		void RegisterType<T>(bool isSingle) where T : class;
+
+		/// <summary>
+		/// Получение класса со всеми зависмостями
+		/// </summary>
+		/// <typeparam name="T"></typeparam>
+		/// <returns></returns>
+		T Resolve<T>();
+	}
+}

SushiBar/SushiBarContracts/DI/IImplementationExtension.cs

@@ -0,0 +1,17 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace SushiBarContracts.DI
+{
+	public interface IImplementationExtension
+	{
+		public int Priority { get; }
+		/// <summary>
+		/// Регистрация сервисов
+		/// </summary>
+		public void RegisterServices();
+	}
+}

SushiBar/SushiBarContracts/DI/ServiceDependencyContainer.cs

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

SushiBar/SushiBarContracts/DI/ServiceProviderLoader.cs

@@ -0,0 +1,56 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Reflection;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace SushiBarContracts.DI
+{
+	public class ServiceProviderLoader
+	{
+		/// <summary>
+		/// Загрузка всех классов-реализаций IImplementationExtension
+		/// </summary>
+		/// <returns></returns>
+		public static IImplementationExtension? GetImplementationExtensions()
+		{
+			IImplementationExtension? source = null;
+			var files = Directory.GetFiles(TryGetImplementationExtensionsFolder(), "*.dll", SearchOption.AllDirectories);
+			foreach (var file in files.Distinct())
+			{
+				Assembly asm = Assembly.LoadFrom(file);
+				foreach (var t in asm.GetExportedTypes())
+				{
+					if (t.IsClass && typeof(IImplementationExtension).IsAssignableFrom(t))
+					{
+						if (source == null)
+						{
+							source = (IImplementationExtension)Activator.CreateInstance(t)!;
+						}
+						else
+						{
+							var newSource = (IImplementationExtension)Activator.CreateInstance(t)!;
+							if (newSource.Priority > source.Priority)
+							{
+								source = newSource;
+							}
+						}
+					}
+				}
+			}
+			return source;
+		}
+
+		private static string TryGetImplementationExtensionsFolder()
+		{
+			var directory = new DirectoryInfo(Directory.GetCurrentDirectory());
+			while (directory != null && !directory.GetDirectories("ImplementationExtensions", SearchOption.AllDirectories).Any(x => x.Name == "ImplementationExtensions"))
+			{
+				directory = directory.Parent;
+			}
+			return $"{directory?.FullName}\\ImplementationExtensions";
+		}
+	}
+}
+

SushiBar/SushiBarContracts/SearchModels/ImplementerSearchModel.cs

@@ -0,0 +1,15 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace SushiBarContracts.SearchModels
+{
+    public class ImplementerSearchModel
+    {
+        public int? Id { get; set; }
+        public string? ImplementerFIO { get; set; }
+        public string? Password { get; set; }
+    }
+}

SushiBar/SushiBarContracts/SearchModels/MessageInfoSearchModel.cs

@@ -0,0 +1,16 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace SushiBarContracts.SearchModels
+{
+	public class MessageInfoSearchModel
+	{
+		public int? ClientId { get; set; }
+		public string? MessageId { get; set; }
+		public int? PageLength { get; set; }
+		public int? PageIndex { get; set; }
+	}
+}

SushiBar/SushiBarContracts/SearchModels/OrderSearchModel.cs

@@ -1,4 +1,5 @@
-using System;
+using SushiBarDataModels.Enums;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
@@ -12,5 +13,7 @@ namespace SushiBarContracts.SearchModels
         public int? ClientId { get; set; }
         public DateTime? DateFrom { get; set; }
         public DateTime? DateTo { get; set; }
+        public OrderStatus? Status { get; set; }
+        public int? ImplementerId { get; set; }
     }
 }

SushiBar/SushiBarContracts/StoragesContracts/IBackUpInfo.cs

@@ -0,0 +1,15 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace SushiBarContracts.StoragesContracts
+{
+	public interface IBackUpInfo
+	{
+		List<T>? GetList<T>() where T : class, new();
+
+		Type? GetTypeByModelInterface(string modelInterfaceName);
+	}
+}

SushiBar/SushiBarContracts/StoragesContracts/IImplementerStorage.cs

@@ -0,0 +1,21 @@
+using SushiBarContracts.BindingModels;
+using SushiBarContracts.SearchModels;
+using SushiBarContracts.ViewModels;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace SushiBarContracts.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);
+    }
+}

SushiBar/SushiBarContracts/StoragesContracts/IMessageInfoStorage.cs

@@ -0,0 +1,20 @@
+using SushiBarContracts.BindingModels;
+using SushiBarContracts.SearchModels;
+using SushiBarContracts.ViewModels;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace SushiBarContracts.StoragesContracts
+{
+	public interface IMessageInfoStorage
+	{
+		List<MessageInfoViewModel> GetFullList();
+		List<MessageInfoViewModel> GetFilteredList(MessageInfoSearchModel model);
+		MessageInfoViewModel? GetElement(MessageInfoSearchModel model);
+		MessageInfoViewModel? Insert(MessageInfoBindingModel model);
+		MessageInfoViewModel? Update(MessageInfoBindingModel model);
+	}
+}

SushiBar/SushiBarContracts/ViewModels/ClientViewModel.cs

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

SushiBar/SushiBarContracts/ViewModels/ComponentViewModel.cs

@@ -1,4 +1,5 @@
-using SushiBarDataModels.Models;
+using SushiBarContracts.Attributes;
+using SushiBarDataModels.Models;
 using System;
 using System.Collections.Generic;
 using System.ComponentModel;
@@ -10,12 +11,13 @@ namespace SushiBarContracts.ViewModels
 {
     public class ComponentViewModel : IComponentModel
     {
-        public int Id { get; set; }
-        
-        [DisplayName("Название компонента")]
-        public string ComponentName { get; set; } = string.Empty;
-        
-        [DisplayName("Цена")]
-        public double Cost { get; set; }
+		[Column(visible: false)]
+		public int Id { get; set; }
+
+		[Column(title: "Название компонента", gridViewAutoSize: GridViewAutoSize.Fill, isUseAutoSize: true)]
+		public string ComponentName { get; set; } = string.Empty;
+
+		[Column(title: "Цена", width: 150)]
+		public double Cost { get; set; }
     }
 }

SushiBar/SushiBarContracts/ViewModels/ImplementerViewModel.cs

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

SushiBar/SushiBarContracts/ViewModels/MessageInfoViewModel.cs

@@ -0,0 +1,44 @@
+using SushiBarContracts.Attributes;
+using SushiBarDataModels.Models;
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace SushiBarContracts.ViewModels
+{
+	public class MessageInfoViewModel : IMessageInfoModel
+	{
+		[Column(visible: false)]
+		public int Id { get; set; }
+
+		[Column(visible: false)]
+		public string MessageId { get; set; } = string.Empty;
+
+		[Column(visible: false)]
+		public int? ClientId { get; set; }
+
+		[Column(title: "Отправитель", width: 150)]
+		public string SenderName { get; set; } = string.Empty;
+
+		[Column(title: "Дата письма", width: 120)]
+		public DateTime DateDelivery { get; set; }
+
+		[Column(title: "Заголовок", width: 120)]
+		public string Subject { get; set; } = string.Empty;
+
+		[Column(title: "Текст", gridViewAutoSize: GridViewAutoSize.Fill, isUseAutoSize: true)]
+		public string Body { get; set; } = string.Empty;
+
+		[DisplayName("Прочитанно")]
+		public bool IsReaded { get; set; }
+
+		public string? ReplyMessageId { get; set; }
+
+		public IMessageInfoModel? Reply { get; set; }
+
+		public bool IsReply { get; set; }
+	}
+}

SushiBar/SushiBarContracts/ViewModels/OrderViewModel.cs

@@ -1,4 +1,5 @@
-using SushiBarDataModels.Enums;
+using SushiBarContracts.Attributes;
+using SushiBarDataModels.Enums;
 using SushiBarDataModels.Models;
 using System;
 using System.Collections.Generic;
@@ -11,31 +12,43 @@ namespace SushiBarContracts.ViewModels
 {
     public class OrderViewModel : IOrderModel
     {
-        [DisplayName("Номер")]
-        public int Id { get; set; }
+		[Column(title: "Номер", width: 90)]
+		public int Id { get; set; }
 
-        public int SushiId { get; set; }
-        public int ClientId { get; set; }
+		[Column(visible: false)]
+		public int ClientId { get; set; }
 
-        [DisplayName("ФИО клиента")]
-        public string ClientFIO { get; set; } = string.Empty;
+		[Column(title: "Имя клиента", width: 190)]
+		public string ClientFIO { get; set; } = string.Empty;
 
-        [DisplayName("Изделие")]
-        public string SushiName { get; set; } = string.Empty;
-        
-        [DisplayName("Количество")]
-        public int Count { get; set; }
-        
-        [DisplayName("Сумма")]
-        public double Sum { get; set; }
-        
-        [DisplayName("Статус")]
-        public OrderStatus Status { get; set; } = OrderStatus.Неизвестен;
-        
-        [DisplayName("Дата создания")]
-        public DateTime DateCreate { get; set; } = DateTime.Now;
-        
-        [DisplayName("Дата выполнения")]
-        public DateTime? DateImplement { get; set; }
-    }
+		[Column(visible: false)]
+		public string ClientEmail { get; set; } = string.Empty;
+
+		[Column(visible: false)]
+		public int? ImplementerId { get; set; }
+
+		[Column(title: "Исполнитель", width: 150)]
+		public string? ImplementerFIO { get; set; } = null;
+
+		[Column(visible: false)]
+		public int SushiId { get; set; }
+
+		[Column(title: "Суши", gridViewAutoSize: GridViewAutoSize.Fill, isUseAutoSize: true)]
+		public string SushiName { get; set; } = string.Empty;
+
+		[Column(title: "Количество", width: 100)]
+		public int Count { get; set; }
+
+		[Column(title: "Сумма", width: 120)]
+		public double Sum { get; set; }
+
+		[Column(title: "Статус", width: 70)]
+		public OrderStatus Status { get; set; } = OrderStatus.Неизвестен;
+
+		[Column(title: "Дата создания", width: 120)]
+		public DateTime DateCreate { get; set; } = DateTime.Now;
+
+		[Column(title: "Дата выполнения", width: 120)]
+		public DateTime? DateImplement { get; set; }
+	}
 }

SushiBar/SushiBarContracts/ViewModels/SushiViewModel.cs

@@ -1,4 +1,5 @@
-using SushiBarDataModels.Models;
+using SushiBarContracts.Attributes;
+using SushiBarDataModels.Models;
 using System;
 using System.Collections.Generic;
 using System.ComponentModel;
@@ -10,12 +11,14 @@ namespace SushiBarContracts.ViewModels
 {
     public class SushiViewModel : ISushiModel
     {
-        public int Id { get; set; }
-        [DisplayName("Название изделия")]
-        public string SushiName { get; set; } = string.Empty;
-        [DisplayName("Цена")]
-        public double Price { get; set; }
-        public Dictionary<int, (IComponentModel, int)> SushiComponents
+		[Column(visible: false)]
+		public int Id { get; set; }
+		[Column(title: "Название сущи", gridViewAutoSize: GridViewAutoSize.Fill, isUseAutoSize: true)]
+		public string SushiName { get; set; } = string.Empty;
+		[Column(title: "Цена", width: 70)]
+		public double Price { get; set; }
+		[Column(visible: false)]
+		public Dictionary<int, (IComponentModel, int)> SushiComponents
         {
             get;
             set;

SushiBar/SushiBarDataModels/Enums/OrderStatus.cs

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

SushiBar/SushiBarDataModels/Models/IImplementerModel.cs

@@ -0,0 +1,19 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace SushiBarDataModels.Models
+{
+    public interface IImplementerModel : IId
+    {
+        string ImplementerFIO { get; }
+
+        string Password { get; }
+
+        int WorkExperience { get; }
+
+        int Qualification { get; }
+    }
+}

SushiBar/SushiBarDataModels/Models/IMessageInfoModel.cs

@@ -0,0 +1,21 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace SushiBarDataModels.Models
+{
+    public interface IMessageInfoModel
+    {
+		string MessageId { get; }
+		int? ClientId { get; }
+		string SenderName { get; }
+		DateTime DateDelivery { get; }
+		string Subject { get; }
+		string Body { get; }
+		bool IsReaded { get; }
+		string? ReplyMessageId { get; }
+		bool IsReply { get; }
+	}
+}

SushiBar/SushiBarDataModels/Models/IOrderModel.cs

@@ -16,5 +16,6 @@ namespace SushiBarDataModels.Models
         OrderStatus Status { get; }
         DateTime DateCreate { get; }
         DateTime? DateImplement { get; }
+        int? ImplementerId { get; }
     }
 }

SushiBar/SushiBarDatabaseImplement/ImplementationExtension.cs

@@ -0,0 +1,28 @@
+using SushiBar.StoragesContracts;
+using SushiBarContracts.DI;
+using SushiBarContracts.StoragesContracts;
+using SushiBarDatabaseImplement.Implements;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace SushiBarDatabaseImplement
+{
+	public class ImplementationExtension : IImplementationExtension
+	{
+		public int Priority => 3;
+
+		public void RegisterServices()
+		{
+			DependencyManager.Instance.RegisterType<IClientStorage, ClientStorage>();
+			DependencyManager.Instance.RegisterType<IComponentStorage, ComponentStorage>();
+			DependencyManager.Instance.RegisterType<IImplementerStorage, ImplementerStorage>();
+			DependencyManager.Instance.RegisterType<IMessageInfoStorage, MessageInfoStorage>();
+			DependencyManager.Instance.RegisterType<IOrderStorage, OrderStorage>();
+			DependencyManager.Instance.RegisterType<ISushiStorage, SushiStorage>();
+			DependencyManager.Instance.RegisterType<IBackUpInfo, BackUpInfo>();
+		}
+	}
+}

SushiBar/SushiBarDatabaseImplement/Implements/BackUpInfo.cs

@@ -0,0 +1,32 @@
+using SushiBarContracts.StoragesContracts;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace SushiBarDatabaseImplement.Implements
+{
+	public class BackUpInfo : IBackUpInfo
+	{
+		public List<T>? GetList<T>() where T : class, new()
+		{
+			using var context = new SushiBarDatabase();
+			return context.Set<T>().ToList();
+		}
+
+		public Type? GetTypeByModelInterface(string modelInterfaceName)
+		{
+			var assembly = typeof(BackUpInfo).Assembly;
+			var types = assembly.GetTypes();
+			foreach (var type in types)
+			{
+				if (type.IsClass && type.GetInterface(modelInterfaceName) != null)
+				{
+					return type;
+				}
+			}
+			return null;
+		}
+	}
+}

SushiBar/SushiBarDatabaseImplement/Implements/ClientStorage.cs

@@ -36,10 +36,9 @@ namespace SushiBarDatabaseImplement.Implements
                 return null;
             }
             using var context = new SushiBarDatabase();
-            return context.Clients.FirstOrDefault(x =>
-            (!string.IsNullOrEmpty(model.Email) && x.Email == model.Email && !string.IsNullOrEmpty(model.Password) && x.Password == model.Password) ||
-            (model.Id.HasValue && x.Id == model.Id))
-                ?.GetViewModel;
+            return context.Clients.FirstOrDefault(x => (model.Id.HasValue && x.Id == model.Id) ||
+                 (!string.IsNullOrEmpty(model.ClientFIO) && x.ClientFIO == model.ClientFIO) ||
+                 (!string.IsNullOrEmpty(model.Email) && x.Email == model.Email && (string.IsNullOrEmpty(model.Password) || x.Password == model.Password)))?.GetViewModel;
         }
 
         public ClientViewModel? Insert(ClientBindingModel model)

SushiBar/SushiBarDatabaseImplement/Implements/ImplementerStorage.cs

@@ -0,0 +1,84 @@
+using SushiBarContracts.BindingModels;
+using SushiBarContracts.SearchModels;
+using SushiBarContracts.StoragesContracts;
+using SushiBarContracts.ViewModels;
+using SushiBarDataModels.Models;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace SushiBarDatabaseImplement.Implements
+{
+    public class ImplementerStorage : IImplementerStorage
+    {
+        public List<ImplementerViewModel> GetFullList()
+        {
+            using var context = new SushiBarDatabase();
+            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 SushiBarDatabase();
+            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 SushiBarDatabase();
+            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 SushiBarDatabase();
+            context.Implementers.Add(newImplementer);
+            context.SaveChanges();
+            return newImplementer.GetViewModel;
+        }
+
+        public ImplementerViewModel? Update(ImplementerBindingModel model)
+        {
+            using var context = new SushiBarDatabase();
+            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 SushiBarDatabase();
+            var implementer = context.Implementers.FirstOrDefault(rec => rec.Id == model.Id);
+            if (implementer != null)
+            {
+                context.Implementers.Remove(implementer);
+                context.SaveChanges();
+                return implementer.GetViewModel;
+            }
+            return null;
+        }
+    }
+}

SushiBar/SushiBarDatabaseImplement/Implements/MessageInfoStorage.cs

@@ -0,0 +1,82 @@
+using SushiBarContracts.BindingModels;
+using SushiBarContracts.SearchModels;
+using SushiBarContracts.StoragesContracts;
+using SushiBarContracts.ViewModels;
+using SushiBarDatabaseImplement.Models;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace SushiBarDatabaseImplement.Implements
+{
+	public class MessageInfoStorage : IMessageInfoStorage
+	{
+		public List<MessageInfoViewModel> GetFullList()
+		{
+			using var context = new SushiBarDatabase();
+			return context.MessageInfos.Select(x => x.GetViewModel).ToList();
+		}
+		public List<MessageInfoViewModel> GetFilteredList(MessageInfoSearchModel model)
+		{
+			if (!model.ClientId.HasValue && !model.PageLength.HasValue && !model.PageIndex.HasValue)
+			{
+				return new();
+			}
+			using var context = new SushiBarDatabase();
+			IEnumerable<MessageInfo> request = context.MessageInfos.Where(x => !x.IsReply);
+			if (model.ClientId.HasValue)
+				request = request.Where(x => x.ClientId.HasValue && x.ClientId == model.ClientId);
+			if (model.PageLength.HasValue)
+			{
+				int skipRows = model.PageIndex.HasValue ? (model.PageIndex.Value - 1) * model.PageLength.Value : 0;
+				request = request.Skip(skipRows).Take(model.PageLength.Value);
+			}
+
+			return request.Select(x => x.GetViewModel).ToList();
+		}
+
+		public MessageInfoViewModel? GetElement(MessageInfoSearchModel model)
+		{
+			if (string.IsNullOrEmpty(model.MessageId))
+			{
+				return new();
+			}
+			using var context = new SushiBarDatabase();
+			return context.MessageInfos.FirstOrDefault(x => x.MessageId == model.MessageId)?.GetViewModel;
+		}
+		public MessageInfoViewModel? Insert(MessageInfoBindingModel model)
+		{
+			var newMessage = MessageInfo.Create(model);
+			if (newMessage == null)
+			{
+				return null;
+			}
+			using var context = new SushiBarDatabase();
+			try
+			{
+				context.MessageInfos.Add(newMessage);
+				context.SaveChanges();
+				return newMessage.GetViewModel;
+			}
+			catch (Exception ex)
+			{
+				return null;
+			}
+		}
+
+		public MessageInfoViewModel? Update(MessageInfoBindingModel model)
+		{
+			using var context = new SushiBarDatabase();
+			var message = context.MessageInfos.FirstOrDefault(x => x.MessageId == model.MessageId);
+			if (message == null)
+			{
+				return null;
+			}
+			message.Update(context, model);
+			context.SaveChanges();
+			return message.GetViewModel;
+		}
+	}
+	}

SushiBar/SushiBarDatabaseImplement/Implements/OrderStorage.cs

@@ -17,35 +17,34 @@ namespace SushiBarDatabaseImplement.Implements
         public List<OrderViewModel> GetFullList()
         {
             using var context = new SushiBarDatabase();
-            return context.Orders.Include(x => x.Sushi).Include(x => x.Client).Select(x => x.GetViewModel).ToList();
+            return context.Orders.Include(x => x.Sushi).Include(x => x.Client).Include(y => y.Implementer).Select(x => x.GetViewModel).ToList();
         }
 
         public List<OrderViewModel> GetFilteredList(OrderSearchModel model)
         {
             using var context = new SushiBarDatabase();
-            if (model.DateFrom.HasValue)
+            if ((!model.DateFrom.HasValue || !model.DateTo.HasValue) && !model.ClientId.HasValue && !model.Status.HasValue)
             {
-                return context.Orders.Include(x => x.Sushi).Where(x => x.DateCreate >= model.DateFrom && x.DateCreate <= model.DateTo).Select(x => x.GetViewModel).ToList();
+                return new();
             }
-            if (model.ClientId.HasValue)
-            {
-                return context.Orders.Include(x => x.Sushi).Where(x => x.ClientId == model.ClientId).Select(x => x.GetViewModel).ToList();
-            }
-            if (model.ClientId.HasValue)
-            {
-                return context.Orders.Include(x => x.Sushi).Where(x => x.ClientId == model.ClientId).Select(x => x.GetViewModel).ToList();
-            }
-            return context.Orders.Include(x => x.Sushi).Where(x => x.Id == model.Id).Select(x => x.GetViewModel).ToList();
+                return context.Orders.Include(x => x.Sushi).Include(x => x.Client).Include(x => x.Implementer).Where(x =>
+                 (model.DateFrom.HasValue && model.DateTo.HasValue && x.DateCreate >= model.DateFrom && x.DateCreate <= model.DateTo) ||
+                 (model.ClientId.HasValue && x.ClientId == model.ClientId) ||
+                 (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 new();
             }
             using var context = new SushiBarDatabase();
-            return context.Orders.Include(x => x.Sushi).FirstOrDefault(x => x.Id == model.Id)?.GetViewModel;
+            return context.Orders.Include(x => x.Sushi).Include(x => x.Client).Include(x => x.Implementer).FirstOrDefault(x =>
+                (model.Id.HasValue && x.Id == model.Id) ||
+                (model.ImplementerId.HasValue && x.ImplementerId == model.ImplementerId && x.Status == model.Status))
+                ?.GetViewModel;
         }
 
         public OrderViewModel? Insert(OrderBindingModel model)
@@ -71,7 +70,7 @@ namespace SushiBarDatabaseImplement.Implements
             {
                 return null;
             }
-            order.Update(model);
+            order.Update(context, model);
             context.SaveChanges();
             return order.GetViewModel;
         }

SushiBar/SushiBarDatabaseImplement/Migrations/20240313082356_InitialCreate.cs

@@ -1,125 +0,0 @@
-using System;
-using Microsoft.EntityFrameworkCore.Migrations;
-
-#nullable disable
-
-namespace SushiBarDatabaseImplement.Migrations
-{
-    /// <inheritdoc />
-    public partial class InitialCreate : Migration
-    {
-        /// <inheritdoc />
-        protected override void Up(MigrationBuilder migrationBuilder)
-        {
-            migrationBuilder.CreateTable(
-                name: "Components",
-                columns: table => new
-                {
-                    Id = table.Column<int>(type: "int", nullable: false)
-                        .Annotation("SqlServer:Identity", "1, 1"),
-                    ComponentName = table.Column<string>(type: "nvarchar(max)", nullable: false),
-                    Cost = table.Column<double>(type: "float", nullable: false)
-                },
-                constraints: table =>
-                {
-                    table.PrimaryKey("PK_Components", x => x.Id);
-                });
-
-            migrationBuilder.CreateTable(
-                name: "Sushis",
-                columns: table => new
-                {
-                    Id = table.Column<int>(type: "int", nullable: false)
-                        .Annotation("SqlServer:Identity", "1, 1"),
-                    SushiName = table.Column<string>(type: "nvarchar(max)", nullable: false),
-                    Price = table.Column<double>(type: "float", nullable: false)
-                },
-                constraints: table =>
-                {
-                    table.PrimaryKey("PK_Sushis", x => x.Id);
-                });
-
-            migrationBuilder.CreateTable(
-                name: "Orders",
-                columns: table => new
-                {
-                    Id = table.Column<int>(type: "int", nullable: false)
-                        .Annotation("SqlServer:Identity", "1, 1"),
-                    SushiId = table.Column<int>(type: "int", nullable: false),
-                    Count = table.Column<int>(type: "int", nullable: false),
-                    Sum = table.Column<double>(type: "float", nullable: false),
-                    Status = table.Column<int>(type: "int", nullable: false),
-                    DateCreate = table.Column<DateTime>(type: "datetime2", nullable: false),
-                    DateImplement = table.Column<DateTime>(type: "datetime2", nullable: true)
-                },
-                constraints: table =>
-                {
-                    table.PrimaryKey("PK_Orders", x => x.Id);
-                    table.ForeignKey(
-                        name: "FK_Orders_Sushis_SushiId",
-                        column: x => x.SushiId,
-                        principalTable: "Sushis",
-                        principalColumn: "Id",
-                        onDelete: ReferentialAction.Cascade);
-                });
-
-            migrationBuilder.CreateTable(
-                name: "SushiComponents",
-                columns: table => new
-                {
-                    Id = table.Column<int>(type: "int", nullable: false)
-                        .Annotation("SqlServer:Identity", "1, 1"),
-                    SushiId = table.Column<int>(type: "int", nullable: false),
-                    ComponentId = table.Column<int>(type: "int", nullable: false),
-                    Count = table.Column<int>(type: "int", nullable: false)
-                },
-                constraints: table =>
-                {
-                    table.PrimaryKey("PK_SushiComponents", x => x.Id);
-                    table.ForeignKey(
-                        name: "FK_SushiComponents_Components_ComponentId",
-                        column: x => x.ComponentId,
-                        principalTable: "Components",
-                        principalColumn: "Id",
-                        onDelete: ReferentialAction.Cascade);
-                    table.ForeignKey(
-                        name: "FK_SushiComponents_Sushis_SushiId",
-                        column: x => x.SushiId,
-                        principalTable: "Sushis",
-                        principalColumn: "Id",
-                        onDelete: ReferentialAction.Cascade);
-                });
-
-            migrationBuilder.CreateIndex(
-                name: "IX_Orders_SushiId",
-                table: "Orders",
-                column: "SushiId");
-
-            migrationBuilder.CreateIndex(
-                name: "IX_SushiComponents_ComponentId",
-                table: "SushiComponents",
-                column: "ComponentId");
-
-            migrationBuilder.CreateIndex(
-                name: "IX_SushiComponents_SushiId",
-                table: "SushiComponents",
-                column: "SushiId");
-        }
-
-        /// <inheritdoc />
-        protected override void Down(MigrationBuilder migrationBuilder)
-        {
-            migrationBuilder.DropTable(
-                name: "Orders");
-
-            migrationBuilder.DropTable(
-                name: "SushiComponents");
-
-            migrationBuilder.DropTable(
-                name: "Components");
-
-            migrationBuilder.DropTable(
-                name: "Sushis");
-        }
-    }
-}

SushiBar/SushiBarDatabaseImplement/Migrations/20240420142132_InitialCreate.Designer.cs

@@ -1,296 +0,0 @@
-// <auto-generated />
-using System;
-using Microsoft.EntityFrameworkCore;
-using Microsoft.EntityFrameworkCore.Infrastructure;
-using Microsoft.EntityFrameworkCore.Metadata;
-using Microsoft.EntityFrameworkCore.Migrations;
-using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
-using SushiBarDatabaseImplement;
-
-#nullable disable
-
-namespace SushiBarDatabaseImplement.Migrations
-{
-    [DbContext(typeof(SushiBarDatabase))]
-<<<<<<<< HEAD:SushiBar/SushiBarDatabaseImplement/Migrations/20240420142132_InitialCreate.Designer.cs
-    [Migration("20240420142132_InitialCreate")]
-    partial class InitialCreate
-========
-    [Migration("20240424121819_InitCreate")]
-    partial class InitCreate
->>>>>>>> Lab_4_Hard:SushiBar/SushiBarDatabaseImplement/Migrations/20240424121819_InitCreate.Designer.cs
-    {
-        /// <inheritdoc />
-        protected override void BuildTargetModel(ModelBuilder modelBuilder)
-        {
-#pragma warning disable 612, 618
-            modelBuilder
-                .HasAnnotation("ProductVersion", "7.0.17")
-                .HasAnnotation("Relational:MaxIdentifierLength", 128);
-
-            SqlServerModelBuilderExtensions.UseIdentityColumns(modelBuilder);
-
-            modelBuilder.Entity("SushiBarDatabaseImplement.Models.Client", b =>
-                {
-                    b.Property<int>("Id")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("int");
-
-                    SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property<int>("Id"));
-
-                    b.Property<string>("ClientFIO")
-                        .IsRequired()
-                        .HasColumnType("nvarchar(max)");
-
-                    b.Property<string>("Email")
-                        .IsRequired()
-                        .HasColumnType("nvarchar(max)");
-
-                    b.Property<string>("Password")
-                        .IsRequired()
-                        .HasColumnType("nvarchar(max)");
-
-                    b.HasKey("Id");
-
-                    b.ToTable("Clients");
-                });
-
-            modelBuilder.Entity("SushiBarDatabaseImplement.Models.Component", b =>
-                {
-                    b.Property<int>("Id")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("int");
-
-                    SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property<int>("Id"));
-
-                    b.Property<string>("ComponentName")
-                        .IsRequired()
-                        .HasColumnType("nvarchar(max)");
-
-                    b.Property<double>("Cost")
-                        .HasColumnType("float");
-
-                    b.HasKey("Id");
-
-                    b.ToTable("Components");
-                });
-
-            modelBuilder.Entity("SushiBarDatabaseImplement.Models.Order", b =>
-                {
-                    b.Property<int>("Id")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("int");
-
-                    SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property<int>("Id"));
-
-                    b.Property<int>("ClientId")
-                        .HasColumnType("int");
-
-                    b.Property<int>("Count")
-                        .HasColumnType("int");
-
-                    b.Property<DateTime>("DateCreate")
-                        .HasColumnType("datetime2");
-
-                    b.Property<DateTime?>("DateImplement")
-                        .HasColumnType("datetime2");
-
-                    b.Property<int>("Status")
-                        .HasColumnType("int");
-
-                    b.Property<double>("Sum")
-                        .HasColumnType("float");
-
-                    b.Property<int>("SushiId")
-                        .HasColumnType("int");
-
-                    b.HasKey("Id");
-
-                    b.HasIndex("ClientId");
-
-                    b.HasIndex("SushiId");
-
-                    b.ToTable("Orders");
-                });
-
-            modelBuilder.Entity("SushiBarDatabaseImplement.Models.Shop", b =>
-                {
-                    b.Property<int>("Id")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("int");
-
-                    SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property<int>("Id"));
-
-                    b.Property<string>("Adress")
-                        .IsRequired()
-                        .HasColumnType("nvarchar(max)");
-
-                    b.Property<DateTime>("OpeningDate")
-                        .HasColumnType("datetime2");
-
-                    b.Property<string>("ShopName")
-                        .IsRequired()
-                        .HasColumnType("nvarchar(max)");
-
-                    b.Property<int>("SushiMaxCount")
-                        .HasColumnType("int");
-
-                    b.HasKey("Id");
-
-                    b.ToTable("Shops");
-                });
-
-            modelBuilder.Entity("SushiBarDatabaseImplement.Models.ShopSushis", b =>
-                {
-                    b.Property<int>("Id")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("int");
-
-                    SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property<int>("Id"));
-
-                    b.Property<int>("Count")
-                        .HasColumnType("int");
-
-                    b.Property<int>("ShopId")
-                        .HasColumnType("int");
-
-                    b.Property<int>("SushiId")
-                        .HasColumnType("int");
-
-                    b.HasKey("Id");
-
-                    b.HasIndex("ShopId");
-
-                    b.HasIndex("SushiId");
-
-                    b.ToTable("ShopSushis");
-                });
-
-            modelBuilder.Entity("SushiBarDatabaseImplement.Models.Sushi", b =>
-                {
-                    b.Property<int>("Id")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("int");
-
-                    SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property<int>("Id"));
-
-                    b.Property<double>("Price")
-                        .HasColumnType("float");
-
-                    b.Property<string>("SushiName")
-                        .IsRequired()
-                        .HasColumnType("nvarchar(max)");
-
-                    b.HasKey("Id");
-
-                    b.ToTable("Sushis");
-                });
-
-            modelBuilder.Entity("SushiBarDatabaseImplement.Models.SushiComponent", b =>
-                {
-                    b.Property<int>("Id")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("int");
-
-                    SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property<int>("Id"));
-
-                    b.Property<int>("ComponentId")
-                        .HasColumnType("int");
-
-                    b.Property<int>("Count")
-                        .HasColumnType("int");
-
-                    b.Property<int>("SushiId")
-                        .HasColumnType("int");
-
-                    b.HasKey("Id");
-
-                    b.HasIndex("ComponentId");
-
-                    b.HasIndex("SushiId");
-
-                    b.ToTable("SushiComponents");
-                });
-
-            modelBuilder.Entity("SushiBarDatabaseImplement.Models.Order", b =>
-                {
-                    b.HasOne("SushiBarDatabaseImplement.Models.Client", "Client")
-                        .WithMany("Orders")
-                        .HasForeignKey("ClientId")
-                        .OnDelete(DeleteBehavior.Cascade)
-                        .IsRequired();
-
-                    b.HasOne("SushiBarDatabaseImplement.Models.Sushi", "Sushi")
-                        .WithMany("Orders")
-                        .HasForeignKey("SushiId")
-                        .OnDelete(DeleteBehavior.Cascade)
-                        .IsRequired();
-
-                    b.Navigation("Client");
-
-                    b.Navigation("Sushi");
-                });
-
-            modelBuilder.Entity("SushiBarDatabaseImplement.Models.ShopSushis", b =>
-                {
-                    b.HasOne("SushiBarDatabaseImplement.Models.Shop", "Shop")
-                        .WithMany("Sushis")
-                        .HasForeignKey("ShopId")
-                        .OnDelete(DeleteBehavior.Cascade)
-                        .IsRequired();
-
-                    b.HasOne("SushiBarDatabaseImplement.Models.Sushi", "Sushi")
-                        .WithMany()
-                        .HasForeignKey("SushiId")
-                        .OnDelete(DeleteBehavior.Cascade)
-                        .IsRequired();
-
-                    b.Navigation("Shop");
-
-                    b.Navigation("Sushi");
-                });
-
-            modelBuilder.Entity("SushiBarDatabaseImplement.Models.SushiComponent", b =>
-                {
-                    b.HasOne("SushiBarDatabaseImplement.Models.Component", "Component")
-                        .WithMany("SushiComponents")
-                        .HasForeignKey("ComponentId")
-                        .OnDelete(DeleteBehavior.Cascade)
-                        .IsRequired();
-
-                    b.HasOne("SushiBarDatabaseImplement.Models.Sushi", "Sushi")
-                        .WithMany("Components")
-                        .HasForeignKey("SushiId")
-                        .OnDelete(DeleteBehavior.Cascade)
-                        .IsRequired();
-
-                    b.Navigation("Component");
-
-                    b.Navigation("Sushi");
-                });
-
-            modelBuilder.Entity("SushiBarDatabaseImplement.Models.Client", b =>
-                {
-                    b.Navigation("Orders");
-                });
-
-            modelBuilder.Entity("SushiBarDatabaseImplement.Models.Component", b =>
-                {
-                    b.Navigation("SushiComponents");
-                });
-
-            modelBuilder.Entity("SushiBarDatabaseImplement.Models.Shop", b =>
-                {
-                    b.Navigation("Sushis");
-                });
-
-            modelBuilder.Entity("SushiBarDatabaseImplement.Models.Sushi", b =>
-                {
-                    b.Navigation("Components");
-
-                    b.Navigation("Orders");
-                });
-#pragma warning restore 612, 618
-        }
-    }
-}

SushiBar/SushiBarDatabaseImplement/Migrations/20240420142132_InitialCreate.cs

@@ -1,215 +0,0 @@
-using System;
-using Microsoft.EntityFrameworkCore.Migrations;
-
-#nullable disable
-
-namespace SushiBarDatabaseImplement.Migrations
-{
-    /// <inheritdoc />
-    public partial class InitCreate : Migration
-    {
-        /// <inheritdoc />
-        protected override void Up(MigrationBuilder migrationBuilder)
-        {
-            migrationBuilder.CreateTable(
-                name: "Clients",
-                columns: table => new
-                {
-                    Id = table.Column<int>(type: "int", nullable: false)
-                        .Annotation("SqlServer:Identity", "1, 1"),
-                    ClientFIO = table.Column<string>(type: "nvarchar(max)", nullable: false),
-                    Email = table.Column<string>(type: "nvarchar(max)", nullable: false),
-                    Password = table.Column<string>(type: "nvarchar(max)", nullable: false)
-                },
-                constraints: table =>
-                {
-                    table.PrimaryKey("PK_Clients", x => x.Id);
-                });
-
-            migrationBuilder.CreateTable(
-                name: "Components",
-                columns: table => new
-                {
-                    Id = table.Column<int>(type: "int", nullable: false)
-                        .Annotation("SqlServer:Identity", "1, 1"),
-                    ComponentName = table.Column<string>(type: "nvarchar(max)", nullable: false),
-                    Cost = table.Column<double>(type: "float", nullable: false)
-                },
-                constraints: table =>
-                {
-                    table.PrimaryKey("PK_Components", x => x.Id);
-                });
-
-            migrationBuilder.CreateTable(
-                name: "Shops",
-                columns: table => new
-                {
-                    Id = table.Column<int>(type: "int", nullable: false)
-                        .Annotation("SqlServer:Identity", "1, 1"),
-                    ShopName = table.Column<string>(type: "nvarchar(max)", nullable: false),
-                    Adress = table.Column<string>(type: "nvarchar(max)", nullable: false),
-                    OpeningDate = table.Column<DateTime>(type: "datetime2", nullable: false),
-                    SushiMaxCount = table.Column<int>(type: "int", nullable: false)
-                },
-                constraints: table =>
-                {
-                    table.PrimaryKey("PK_Shops", x => x.Id);
-                });
-
-            migrationBuilder.CreateTable(
-                name: "Sushis",
-                columns: table => new
-                {
-                    Id = table.Column<int>(type: "int", nullable: false)
-                        .Annotation("SqlServer:Identity", "1, 1"),
-                    SushiName = table.Column<string>(type: "nvarchar(max)", nullable: false),
-                    Price = table.Column<double>(type: "float", nullable: false)
-                },
-                constraints: table =>
-                {
-                    table.PrimaryKey("PK_Sushis", x => x.Id);
-                });
-
-            migrationBuilder.CreateTable(
-                name: "Orders",
-                columns: table => new
-                {
-                    Id = table.Column<int>(type: "int", nullable: false)
-                        .Annotation("SqlServer:Identity", "1, 1"),
-                    ClientId = table.Column<int>(type: "int", nullable: false),
-                    SushiId = table.Column<int>(type: "int", nullable: false),
-                    Count = table.Column<int>(type: "int", nullable: false),
-                    Sum = table.Column<double>(type: "float", nullable: false),
-                    Status = table.Column<int>(type: "int", nullable: false),
-                    DateCreate = table.Column<DateTime>(type: "datetime2", nullable: false),
-                    DateImplement = table.Column<DateTime>(type: "datetime2", nullable: true)
-                },
-                constraints: table =>
-                {
-                    table.PrimaryKey("PK_Orders", x => x.Id);
-                    table.ForeignKey(
-                        name: "FK_Orders_Clients_ClientId",
-                        column: x => x.ClientId,
-                        principalTable: "Clients",
-                        principalColumn: "Id",
-                        onDelete: ReferentialAction.Cascade);
-                    table.ForeignKey(
-                        name: "FK_Orders_Sushis_SushiId",
-                        column: x => x.SushiId,
-                        principalTable: "Sushis",
-                        principalColumn: "Id",
-                        onDelete: ReferentialAction.Cascade);
-                });
-
-            migrationBuilder.CreateTable(
-                name: "ShopSushis",
-                columns: table => new
-                {
-                    Id = table.Column<int>(type: "int", nullable: false)
-                        .Annotation("SqlServer:Identity", "1, 1"),
-                    SushiId = table.Column<int>(type: "int", nullable: false),
-                    ShopId = table.Column<int>(type: "int", nullable: false),
-                    Count = table.Column<int>(type: "int", nullable: false)
-                },
-                constraints: table =>
-                {
-                    table.PrimaryKey("PK_ShopSushis", x => x.Id);
-                    table.ForeignKey(
-                        name: "FK_ShopSushis_Shops_ShopId",
-                        column: x => x.ShopId,
-                        principalTable: "Shops",
-                        principalColumn: "Id",
-                        onDelete: ReferentialAction.Cascade);
-                    table.ForeignKey(
-                        name: "FK_ShopSushis_Sushis_SushiId",
-                        column: x => x.SushiId,
-                        principalTable: "Sushis",
-                        principalColumn: "Id",
-                        onDelete: ReferentialAction.Cascade);
-                });
-
-            migrationBuilder.CreateTable(
-                name: "SushiComponents",
-                columns: table => new
-                {
-                    Id = table.Column<int>(type: "int", nullable: false)
-                        .Annotation("SqlServer:Identity", "1, 1"),
-                    SushiId = table.Column<int>(type: "int", nullable: false),
-                    ComponentId = table.Column<int>(type: "int", nullable: false),
-                    Count = table.Column<int>(type: "int", nullable: false)
-                },
-                constraints: table =>
-                {
-                    table.PrimaryKey("PK_SushiComponents", x => x.Id);
-                    table.ForeignKey(
-                        name: "FK_SushiComponents_Components_ComponentId",
-                        column: x => x.ComponentId,
-                        principalTable: "Components",
-                        principalColumn: "Id",
-                        onDelete: ReferentialAction.Cascade);
-                    table.ForeignKey(
-                        name: "FK_SushiComponents_Sushis_SushiId",
-                        column: x => x.SushiId,
-                        principalTable: "Sushis",
-                        principalColumn: "Id",
-                        onDelete: ReferentialAction.Cascade);
-                });
-
-            migrationBuilder.CreateIndex(
-                name: "IX_Orders_ClientId",
-                table: "Orders",
-                column: "ClientId");
-
-            migrationBuilder.CreateIndex(
-                name: "IX_Orders_SushiId",
-                table: "Orders",
-                column: "SushiId");
-
-            migrationBuilder.CreateIndex(
-                name: "IX_ShopSushis_ShopId",
-                table: "ShopSushis",
-                column: "ShopId");
-
-            migrationBuilder.CreateIndex(
-                name: "IX_ShopSushis_SushiId",
-                table: "ShopSushis",
-                column: "SushiId");
-
-            migrationBuilder.CreateIndex(
-                name: "IX_SushiComponents_ComponentId",
-                table: "SushiComponents",
-                column: "ComponentId");
-
-            migrationBuilder.CreateIndex(
-                name: "IX_SushiComponents_SushiId",
-                table: "SushiComponents",
-                column: "SushiId");
-        }
-
-        /// <inheritdoc />
-        protected override void Down(MigrationBuilder migrationBuilder)
-        {
-            migrationBuilder.DropTable(
-                name: "Orders");
-
-            migrationBuilder.DropTable(
-                name: "ShopSushis");
-
-            migrationBuilder.DropTable(
-                name: "SushiComponents");
-
-            migrationBuilder.DropTable(
-<<<<<<<< HEAD:SushiBar/SushiBarDatabaseImplement/Migrations/20240420142132_InitialCreate.cs
-                name: "Clients");
-========
-                name: "Shops");
->>>>>>>> Lab_4_Hard:SushiBar/SushiBarDatabaseImplement/Migrations/20240424121819_InitCreate.cs
-
-            migrationBuilder.DropTable(
-                name: "Components");
-
-            migrationBuilder.DropTable(
-                name: "Sushis");
-        }
-    }
-}

SushiBar/SushiBarDatabaseImplement/Migrations/20240424121819_InitCreate.Designer.cs

@@ -1,296 +0,0 @@
-// <auto-generated />
-using System;
-using Microsoft.EntityFrameworkCore;
-using Microsoft.EntityFrameworkCore.Infrastructure;
-using Microsoft.EntityFrameworkCore.Metadata;
-using Microsoft.EntityFrameworkCore.Migrations;
-using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
-using SushiBarDatabaseImplement;
-
-#nullable disable
-
-namespace SushiBarDatabaseImplement.Migrations
-{
-    [DbContext(typeof(SushiBarDatabase))]
-<<<<<<<< HEAD:SushiBar/SushiBarDatabaseImplement/Migrations/20240420142132_InitialCreate.Designer.cs
-    [Migration("20240420142132_InitialCreate")]
-    partial class InitialCreate
-========
-    [Migration("20240424121819_InitCreate")]
-    partial class InitCreate
->>>>>>>> Lab_4_Hard:SushiBar/SushiBarDatabaseImplement/Migrations/20240424121819_InitCreate.Designer.cs
-    {
-        /// <inheritdoc />
-        protected override void BuildTargetModel(ModelBuilder modelBuilder)
-        {
-#pragma warning disable 612, 618
-            modelBuilder
-                .HasAnnotation("ProductVersion", "7.0.17")
-                .HasAnnotation("Relational:MaxIdentifierLength", 128);
-
-            SqlServerModelBuilderExtensions.UseIdentityColumns(modelBuilder);
-
-            modelBuilder.Entity("SushiBarDatabaseImplement.Models.Client", b =>
-                {
-                    b.Property<int>("Id")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("int");
-
-                    SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property<int>("Id"));
-
-                    b.Property<string>("ClientFIO")
-                        .IsRequired()
-                        .HasColumnType("nvarchar(max)");
-
-                    b.Property<string>("Email")
-                        .IsRequired()
-                        .HasColumnType("nvarchar(max)");
-
-                    b.Property<string>("Password")
-                        .IsRequired()
-                        .HasColumnType("nvarchar(max)");
-
-                    b.HasKey("Id");
-
-                    b.ToTable("Clients");
-                });
-
-            modelBuilder.Entity("SushiBarDatabaseImplement.Models.Component", b =>
-                {
-                    b.Property<int>("Id")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("int");
-
-                    SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property<int>("Id"));
-
-                    b.Property<string>("ComponentName")
-                        .IsRequired()
-                        .HasColumnType("nvarchar(max)");
-
-                    b.Property<double>("Cost")
-                        .HasColumnType("float");
-
-                    b.HasKey("Id");
-
-                    b.ToTable("Components");
-                });
-
-            modelBuilder.Entity("SushiBarDatabaseImplement.Models.Order", b =>
-                {
-                    b.Property<int>("Id")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("int");
-
-                    SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property<int>("Id"));
-
-                    b.Property<int>("ClientId")
-                        .HasColumnType("int");
-
-                    b.Property<int>("Count")
-                        .HasColumnType("int");
-
-                    b.Property<DateTime>("DateCreate")
-                        .HasColumnType("datetime2");
-
-                    b.Property<DateTime?>("DateImplement")
-                        .HasColumnType("datetime2");
-
-                    b.Property<int>("Status")
-                        .HasColumnType("int");
-
-                    b.Property<double>("Sum")
-                        .HasColumnType("float");
-
-                    b.Property<int>("SushiId")
-                        .HasColumnType("int");
-
-                    b.HasKey("Id");
-
-                    b.HasIndex("ClientId");
-
-                    b.HasIndex("SushiId");
-
-                    b.ToTable("Orders");
-                });
-
-            modelBuilder.Entity("SushiBarDatabaseImplement.Models.Shop", b =>
-                {
-                    b.Property<int>("Id")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("int");
-
-                    SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property<int>("Id"));
-
-                    b.Property<string>("Adress")
-                        .IsRequired()
-                        .HasColumnType("nvarchar(max)");
-
-                    b.Property<DateTime>("OpeningDate")
-                        .HasColumnType("datetime2");
-
-                    b.Property<string>("ShopName")
-                        .IsRequired()
-                        .HasColumnType("nvarchar(max)");
-
-                    b.Property<int>("SushiMaxCount")
-                        .HasColumnType("int");
-
-                    b.HasKey("Id");
-
-                    b.ToTable("Shops");
-                });
-
-            modelBuilder.Entity("SushiBarDatabaseImplement.Models.ShopSushis", b =>
-                {
-                    b.Property<int>("Id")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("int");
-
-                    SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property<int>("Id"));
-
-                    b.Property<int>("Count")
-                        .HasColumnType("int");
-
-                    b.Property<int>("ShopId")
-                        .HasColumnType("int");
-
-                    b.Property<int>("SushiId")
-                        .HasColumnType("int");
-
-                    b.HasKey("Id");
-
-                    b.HasIndex("ShopId");
-
-                    b.HasIndex("SushiId");
-
-                    b.ToTable("ShopSushis");
-                });
-
-            modelBuilder.Entity("SushiBarDatabaseImplement.Models.Sushi", b =>
-                {
-                    b.Property<int>("Id")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("int");
-
-                    SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property<int>("Id"));
-
-                    b.Property<double>("Price")
-                        .HasColumnType("float");
-
-                    b.Property<string>("SushiName")
-                        .IsRequired()
-                        .HasColumnType("nvarchar(max)");
-
-                    b.HasKey("Id");
-
-                    b.ToTable("Sushis");
-                });
-
-            modelBuilder.Entity("SushiBarDatabaseImplement.Models.SushiComponent", b =>
-                {
-                    b.Property<int>("Id")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("int");
-
-                    SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property<int>("Id"));
-
-                    b.Property<int>("ComponentId")
-                        .HasColumnType("int");
-
-                    b.Property<int>("Count")
-                        .HasColumnType("int");
-
-                    b.Property<int>("SushiId")
-                        .HasColumnType("int");
-
-                    b.HasKey("Id");
-
-                    b.HasIndex("ComponentId");
-
-                    b.HasIndex("SushiId");
-
-                    b.ToTable("SushiComponents");
-                });
-
-            modelBuilder.Entity("SushiBarDatabaseImplement.Models.Order", b =>
-                {
-                    b.HasOne("SushiBarDatabaseImplement.Models.Client", "Client")
-                        .WithMany("Orders")
-                        .HasForeignKey("ClientId")
-                        .OnDelete(DeleteBehavior.Cascade)
-                        .IsRequired();
-
-                    b.HasOne("SushiBarDatabaseImplement.Models.Sushi", "Sushi")
-                        .WithMany("Orders")
-                        .HasForeignKey("SushiId")
-                        .OnDelete(DeleteBehavior.Cascade)
-                        .IsRequired();
-
-                    b.Navigation("Client");
-
-                    b.Navigation("Sushi");
-                });
-
-            modelBuilder.Entity("SushiBarDatabaseImplement.Models.ShopSushis", b =>
-                {
-                    b.HasOne("SushiBarDatabaseImplement.Models.Shop", "Shop")
-                        .WithMany("Sushis")
-                        .HasForeignKey("ShopId")
-                        .OnDelete(DeleteBehavior.Cascade)
-                        .IsRequired();
-
-                    b.HasOne("SushiBarDatabaseImplement.Models.Sushi", "Sushi")
-                        .WithMany()
-                        .HasForeignKey("SushiId")
-                        .OnDelete(DeleteBehavior.Cascade)
-                        .IsRequired();
-
-                    b.Navigation("Shop");
-
-                    b.Navigation("Sushi");
-                });
-
-            modelBuilder.Entity("SushiBarDatabaseImplement.Models.SushiComponent", b =>
-                {
-                    b.HasOne("SushiBarDatabaseImplement.Models.Component", "Component")
-                        .WithMany("SushiComponents")
-                        .HasForeignKey("ComponentId")
-                        .OnDelete(DeleteBehavior.Cascade)
-                        .IsRequired();
-
-                    b.HasOne("SushiBarDatabaseImplement.Models.Sushi", "Sushi")
-                        .WithMany("Components")
-                        .HasForeignKey("SushiId")
-                        .OnDelete(DeleteBehavior.Cascade)
-                        .IsRequired();
-
-                    b.Navigation("Component");
-
-                    b.Navigation("Sushi");
-                });
-
-            modelBuilder.Entity("SushiBarDatabaseImplement.Models.Client", b =>
-                {
-                    b.Navigation("Orders");
-                });
-
-            modelBuilder.Entity("SushiBarDatabaseImplement.Models.Component", b =>
-                {
-                    b.Navigation("SushiComponents");
-                });
-
-            modelBuilder.Entity("SushiBarDatabaseImplement.Models.Shop", b =>
-                {
-                    b.Navigation("Sushis");
-                });
-
-            modelBuilder.Entity("SushiBarDatabaseImplement.Models.Sushi", b =>
-                {
-                    b.Navigation("Components");
-
-                    b.Navigation("Orders");
-                });
-#pragma warning restore 612, 618
-        }
-    }
-}

SushiBar/SushiBarDatabaseImplement/Migrations/20240508132013_InitCreate.Designer.cs

@@ -1,291 +0,0 @@
-// <auto-generated />
-using System;
-using Microsoft.EntityFrameworkCore;
-using Microsoft.EntityFrameworkCore.Infrastructure;
-using Microsoft.EntityFrameworkCore.Metadata;
-using Microsoft.EntityFrameworkCore.Migrations;
-using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
-using SushiBarDatabaseImplement;
-
-#nullable disable
-
-namespace SushiBarDatabaseImplement.Migrations
-{
-    [DbContext(typeof(SushiBarDatabase))]
-    [Migration("20240508132013_InitCreate")]
-    partial class InitCreate
-    {
-        /// <inheritdoc />
-        protected override void BuildTargetModel(ModelBuilder modelBuilder)
-        {
-#pragma warning disable 612, 618
-            modelBuilder
-                .HasAnnotation("ProductVersion", "7.0.17")
-                .HasAnnotation("Relational:MaxIdentifierLength", 128);
-
-            SqlServerModelBuilderExtensions.UseIdentityColumns(modelBuilder);
-
-            modelBuilder.Entity("SushiBarDatabaseImplement.Models.Client", b =>
-                {
-                    b.Property<int>("Id")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("int");
-
-                    SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property<int>("Id"));
-
-                    b.Property<string>("ClientFIO")
-                        .IsRequired()
-                        .HasColumnType("nvarchar(max)");
-
-                    b.Property<string>("Email")
-                        .IsRequired()
-                        .HasColumnType("nvarchar(max)");
-
-                    b.Property<string>("Password")
-                        .IsRequired()
-                        .HasColumnType("nvarchar(max)");
-
-                    b.HasKey("Id");
-
-                    b.ToTable("Clients");
-                });
-
-            modelBuilder.Entity("SushiBarDatabaseImplement.Models.Component", b =>
-                {
-                    b.Property<int>("Id")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("int");
-
-                    SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property<int>("Id"));
-
-                    b.Property<string>("ComponentName")
-                        .IsRequired()
-                        .HasColumnType("nvarchar(max)");
-
-                    b.Property<double>("Cost")
-                        .HasColumnType("float");
-
-                    b.HasKey("Id");
-
-                    b.ToTable("Components");
-                });
-
-            modelBuilder.Entity("SushiBarDatabaseImplement.Models.Order", b =>
-                {
-                    b.Property<int>("Id")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("int");
-
-                    SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property<int>("Id"));
-
-                    b.Property<int>("ClientId")
-                        .HasColumnType("int");
-
-                    b.Property<int>("Count")
-                        .HasColumnType("int");
-
-                    b.Property<DateTime>("DateCreate")
-                        .HasColumnType("datetime2");
-
-                    b.Property<DateTime?>("DateImplement")
-                        .HasColumnType("datetime2");
-
-                    b.Property<int>("Status")
-                        .HasColumnType("int");
-
-                    b.Property<double>("Sum")
-                        .HasColumnType("float");
-
-                    b.Property<int>("SushiId")
-                        .HasColumnType("int");
-
-                    b.HasKey("Id");
-
-                    b.HasIndex("ClientId");
-
-                    b.HasIndex("SushiId");
-
-                    b.ToTable("Orders");
-                });
-
-            modelBuilder.Entity("SushiBarDatabaseImplement.Models.Shop", b =>
-                {
-                    b.Property<int>("Id")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("int");
-
-                    SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property<int>("Id"));
-
-                    b.Property<string>("Adress")
-                        .IsRequired()
-                        .HasColumnType("nvarchar(max)");
-
-                    b.Property<DateTime>("OpeningDate")
-                        .HasColumnType("datetime2");
-
-                    b.Property<string>("ShopName")
-                        .IsRequired()
-                        .HasColumnType("nvarchar(max)");
-
-                    b.Property<int>("SushiMaxCount")
-                        .HasColumnType("int");
-
-                    b.HasKey("Id");
-
-                    b.ToTable("Shops");
-                });
-
-            modelBuilder.Entity("SushiBarDatabaseImplement.Models.ShopSushis", b =>
-                {
-                    b.Property<int>("Id")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("int");
-
-                    SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property<int>("Id"));
-
-                    b.Property<int>("Count")
-                        .HasColumnType("int");
-
-                    b.Property<int>("ShopId")
-                        .HasColumnType("int");
-
-                    b.Property<int>("SushiId")
-                        .HasColumnType("int");
-
-                    b.HasKey("Id");
-
-                    b.HasIndex("ShopId");
-
-                    b.HasIndex("SushiId");
-
-                    b.ToTable("ShopSushis");
-                });
-
-            modelBuilder.Entity("SushiBarDatabaseImplement.Models.Sushi", b =>
-                {
-                    b.Property<int>("Id")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("int");
-
-                    SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property<int>("Id"));
-
-                    b.Property<double>("Price")
-                        .HasColumnType("float");
-
-                    b.Property<string>("SushiName")
-                        .IsRequired()
-                        .HasColumnType("nvarchar(max)");
-
-                    b.HasKey("Id");
-
-                    b.ToTable("Sushis");
-                });
-
-            modelBuilder.Entity("SushiBarDatabaseImplement.Models.SushiComponent", b =>
-                {
-                    b.Property<int>("Id")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("int");
-
-                    SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property<int>("Id"));
-
-                    b.Property<int>("ComponentId")
-                        .HasColumnType("int");
-
-                    b.Property<int>("Count")
-                        .HasColumnType("int");
-
-                    b.Property<int>("SushiId")
-                        .HasColumnType("int");
-
-                    b.HasKey("Id");
-
-                    b.HasIndex("ComponentId");
-
-                    b.HasIndex("SushiId");
-
-                    b.ToTable("SushiComponents");
-                });
-
-            modelBuilder.Entity("SushiBarDatabaseImplement.Models.Order", b =>
-                {
-                    b.HasOne("SushiBarDatabaseImplement.Models.Client", "Client")
-                        .WithMany("Orders")
-                        .HasForeignKey("ClientId")
-                        .OnDelete(DeleteBehavior.Cascade)
-                        .IsRequired();
-
-                    b.HasOne("SushiBarDatabaseImplement.Models.Sushi", "Sushi")
-                        .WithMany("Orders")
-                        .HasForeignKey("SushiId")
-                        .OnDelete(DeleteBehavior.Cascade)
-                        .IsRequired();
-
-                    b.Navigation("Client");
-
-                    b.Navigation("Sushi");
-                });
-
-            modelBuilder.Entity("SushiBarDatabaseImplement.Models.ShopSushis", b =>
-                {
-                    b.HasOne("SushiBarDatabaseImplement.Models.Shop", "Shop")
-                        .WithMany("Sushis")
-                        .HasForeignKey("ShopId")
-                        .OnDelete(DeleteBehavior.Cascade)
-                        .IsRequired();
-
-                    b.HasOne("SushiBarDatabaseImplement.Models.Sushi", "Sushi")
-                        .WithMany()
-                        .HasForeignKey("SushiId")
-                        .OnDelete(DeleteBehavior.Cascade)
-                        .IsRequired();
-
-                    b.Navigation("Shop");
-
-                    b.Navigation("Sushi");
-                });
-
-            modelBuilder.Entity("SushiBarDatabaseImplement.Models.SushiComponent", b =>
-                {
-                    b.HasOne("SushiBarDatabaseImplement.Models.Component", "Component")
-                        .WithMany("SushiComponents")
-                        .HasForeignKey("ComponentId")
-                        .OnDelete(DeleteBehavior.Cascade)
-                        .IsRequired();
-
-                    b.HasOne("SushiBarDatabaseImplement.Models.Sushi", "Sushi")
-                        .WithMany("Components")
-                        .HasForeignKey("SushiId")
-                        .OnDelete(DeleteBehavior.Cascade)
-                        .IsRequired();
-
-                    b.Navigation("Component");
-
-                    b.Navigation("Sushi");
-                });
-
-            modelBuilder.Entity("SushiBarDatabaseImplement.Models.Client", b =>
-                {
-                    b.Navigation("Orders");
-                });
-
-            modelBuilder.Entity("SushiBarDatabaseImplement.Models.Component", b =>
-                {
-                    b.Navigation("SushiComponents");
-                });
-
-            modelBuilder.Entity("SushiBarDatabaseImplement.Models.Shop", b =>
-                {
-                    b.Navigation("Sushis");
-                });
-
-            modelBuilder.Entity("SushiBarDatabaseImplement.Models.Sushi", b =>
-                {
-                    b.Navigation("Components");
-
-                    b.Navigation("Orders");
-                });
-#pragma warning restore 612, 618
-        }
-    }
-}

SushiBar/SushiBarDatabaseImplement/Migrations/20240508132013_InitCreate.cs

@@ -1,214 +0,0 @@
-using System;
-using Microsoft.EntityFrameworkCore.Migrations;
-
-#nullable disable
-
-namespace SushiBarDatabaseImplement.Migrations
-{
-    /// <inheritdoc />
-    public partial class InitCreate : Migration
-    {
-        /// <inheritdoc />
-        protected override void Up(MigrationBuilder migrationBuilder)
-        {
-            migrationBuilder.CreateTable(
-                name: "Clients",
-                columns: table => new
-                {
-                    Id = table.Column<int>(type: "int", nullable: false)
-                        .Annotation("SqlServer:Identity", "1, 1"),
-                    ClientFIO = table.Column<string>(type: "nvarchar(max)", nullable: false),
-                    Email = table.Column<string>(type: "nvarchar(max)", nullable: false),
-                    Password = table.Column<string>(type: "nvarchar(max)", nullable: false)
-                },
-                constraints: table =>
-                {
-                    table.PrimaryKey("PK_Clients", x => x.Id);
-                });
-
-            migrationBuilder.CreateTable(
-                name: "Components",
-                columns: table => new
-                {
-                    Id = table.Column<int>(type: "int", nullable: false)
-                        .Annotation("SqlServer:Identity", "1, 1"),
-                    ComponentName = table.Column<string>(type: "nvarchar(max)", nullable: false),
-                    Cost = table.Column<double>(type: "float", nullable: false)
-                },
-                constraints: table =>
-                {
-                    table.PrimaryKey("PK_Components", x => x.Id);
-                });
-
-            migrationBuilder.CreateTable(
-                name: "Shops",
-                columns: table => new
-                {
-                    Id = table.Column<int>(type: "int", nullable: false)
-                        .Annotation("SqlServer:Identity", "1, 1"),
-                    ShopName = table.Column<string>(type: "nvarchar(max)", nullable: false),
-                    Adress = table.Column<string>(type: "nvarchar(max)", nullable: false),
-                    OpeningDate = table.Column<DateTime>(type: "datetime2", nullable: false),
-                    SushiMaxCount = table.Column<int>(type: "int", nullable: false)
-                },
-                constraints: table =>
-                {
-                    table.PrimaryKey("PK_Shops", x => x.Id);
-                });
-
-            migrationBuilder.CreateTable(
-                name: "Sushis",
-                columns: table => new
-                {
-                    Id = table.Column<int>(type: "int", nullable: false)
-                        .Annotation("SqlServer:Identity", "1, 1"),
-                    SushiName = table.Column<string>(type: "nvarchar(max)", nullable: false),
-                    Price = table.Column<double>(type: "float", nullable: false)
-                },
-                constraints: table =>
-                {
-                    table.PrimaryKey("PK_Sushis", x => x.Id);
-                });
-
-            migrationBuilder.CreateTable(
-                name: "Orders",
-                columns: table => new
-                {
-                    Id = table.Column<int>(type: "int", nullable: false)
-                        .Annotation("SqlServer:Identity", "1, 1"),
-                    ClientId = table.Column<int>(type: "int", nullable: false),
-                    SushiId = table.Column<int>(type: "int", nullable: false),
-                    Count = table.Column<int>(type: "int", nullable: false),
-                    Sum = table.Column<double>(type: "float", nullable: false),
-                    Status = table.Column<int>(type: "int", nullable: false),
-                    DateCreate = table.Column<DateTime>(type: "datetime2", nullable: false),
-                    DateImplement = table.Column<DateTime>(type: "datetime2", nullable: true)
-                },
-                constraints: table =>
-                {
-                    table.PrimaryKey("PK_Orders", x => x.Id);
-                    table.ForeignKey(
-                        name: "FK_Orders_Clients_ClientId",
-                        column: x => x.ClientId,
-                        principalTable: "Clients",
-                        principalColumn: "Id",
-                        onDelete: ReferentialAction.Cascade);
-                    table.ForeignKey(
-                        name: "FK_Orders_Sushis_SushiId",
-                        column: x => x.SushiId,
-                        principalTable: "Sushis",
-                        principalColumn: "Id",
-                        onDelete: ReferentialAction.Cascade);
-                });
-
-            migrationBuilder.CreateTable(
-                name: "ShopSushis",
-                columns: table => new
-                {
-                    Id = table.Column<int>(type: "int", nullable: false)
-                        .Annotation("SqlServer:Identity", "1, 1"),
-                    SushiId = table.Column<int>(type: "int", nullable: false),
-                    ShopId = table.Column<int>(type: "int", nullable: false),
-                    Count = table.Column<int>(type: "int", nullable: false)
-                },
-                constraints: table =>
-                {
-                    table.PrimaryKey("PK_ShopSushis", x => x.Id);
-                    table.ForeignKey(
-                        name: "FK_ShopSushis_Shops_ShopId",
-                        column: x => x.ShopId,
-                        principalTable: "Shops",
-                        principalColumn: "Id",
-                        onDelete: ReferentialAction.Cascade);
-                    table.ForeignKey(
-                        name: "FK_ShopSushis_Sushis_SushiId",
-                        column: x => x.SushiId,
-                        principalTable: "Sushis",
-                        principalColumn: "Id",
-                        onDelete: ReferentialAction.Cascade);
-                });
-
-            migrationBuilder.CreateTable(
-                name: "SushiComponents",
-                columns: table => new
-                {
-                    Id = table.Column<int>(type: "int", nullable: false)
-                        .Annotation("SqlServer:Identity", "1, 1"),
-                    SushiId = table.Column<int>(type: "int", nullable: false),
-                    ComponentId = table.Column<int>(type: "int", nullable: false),
-                    Count = table.Column<int>(type: "int", nullable: false)
-                },
-                constraints: table =>
-                {
-                    table.PrimaryKey("PK_SushiComponents", x => x.Id);
-                    table.ForeignKey(
-                        name: "FK_SushiComponents_Components_ComponentId",
-                        column: x => x.ComponentId,
-                        principalTable: "Components",
-                        principalColumn: "Id",
-                        onDelete: ReferentialAction.Cascade);
-                    table.ForeignKey(
-                        name: "FK_SushiComponents_Sushis_SushiId",
-                        column: x => x.SushiId,
-                        principalTable: "Sushis",
-                        principalColumn: "Id",
-                        onDelete: ReferentialAction.Cascade);
-                });
-
-            migrationBuilder.CreateIndex(
-                name: "IX_Orders_ClientId",
-                table: "Orders",
-                column: "ClientId");
-
-            migrationBuilder.CreateIndex(
-                name: "IX_Orders_SushiId",
-                table: "Orders",
-                column: "SushiId");
-
-            migrationBuilder.CreateIndex(
-                name: "IX_ShopSushis_ShopId",
-                table: "ShopSushis",
-                column: "ShopId");
-
-            migrationBuilder.CreateIndex(
-                name: "IX_ShopSushis_SushiId",
-                table: "ShopSushis",
-                column: "SushiId");
-
-            migrationBuilder.CreateIndex(
-                name: "IX_SushiComponents_ComponentId",
-                table: "SushiComponents",
-                column: "ComponentId");
-
-            migrationBuilder.CreateIndex(
-                name: "IX_SushiComponents_SushiId",
-                table: "SushiComponents",
-                column: "SushiId");
-        }
-
-        /// <inheritdoc />
-        protected override void Down(MigrationBuilder migrationBuilder)
-        {
-            migrationBuilder.DropTable(
-                name: "Orders");
-
-            migrationBuilder.DropTable(
-                name: "ShopSushis");
-
-            migrationBuilder.DropTable(
-                name: "SushiComponents");
-
-            migrationBuilder.DropTable(
-                name: "Clients");
-
-            migrationBuilder.DropTable(
-                name: "Shops");
-
-            migrationBuilder.DropTable(
-                name: "Components");
-
-            migrationBuilder.DropTable(
-                name: "Sushis");
-        }
-    }
-}

SushiBar/SushiBarDatabaseImplement/Migrations/20240617141624_InitCreate.Designer.cs

@@ -1,375 +0,0 @@
-// <auto-generated />
-using System;
-using Microsoft.EntityFrameworkCore;
-using Microsoft.EntityFrameworkCore.Infrastructure;
-using Microsoft.EntityFrameworkCore.Metadata;
-using Microsoft.EntityFrameworkCore.Migrations;
-using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
-using SushiBarDatabaseImplement;
-
-#nullable disable
-
-namespace SushiBarDatabaseImplement.Migrations
-{
-    [DbContext(typeof(SushiBarDatabase))]
-    [Migration("20240617141624_InitCreate")]
-    partial class InitCreate
-    {
-        /// <inheritdoc />
-        protected override void BuildTargetModel(ModelBuilder modelBuilder)
-        {
-#pragma warning disable 612, 618
-            modelBuilder
-                .HasAnnotation("ProductVersion", "7.0.17")
-                .HasAnnotation("Relational:MaxIdentifierLength", 128);
-
-            SqlServerModelBuilderExtensions.UseIdentityColumns(modelBuilder);
-
-            modelBuilder.Entity("SushiBarDataModels.Models.Implementer", b =>
-                {
-                    b.Property<int>("Id")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("int");
-
-                    SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property<int>("Id"));
-
-                    b.Property<string>("ImplementerFIO")
-                        .IsRequired()
-                        .HasColumnType("nvarchar(max)");
-
-                    b.Property<string>("Password")
-                        .IsRequired()
-                        .HasColumnType("nvarchar(max)");
-
-                    b.Property<int>("Qualification")
-                        .HasColumnType("int");
-
-                    b.Property<int>("WorkExperience")
-                        .HasColumnType("int");
-
-                    b.HasKey("Id");
-
-                    b.ToTable("Implementers");
-                });
-
-            modelBuilder.Entity("SushiBarDatabaseImplement.Models.Client", b =>
-                {
-                    b.Property<int>("Id")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("int");
-
-                    SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property<int>("Id"));
-
-                    b.Property<string>("ClientFIO")
-                        .IsRequired()
-                        .HasColumnType("nvarchar(max)");
-
-                    b.Property<string>("Email")
-                        .IsRequired()
-                        .HasColumnType("nvarchar(max)");
-
-                    b.Property<string>("Password")
-                        .IsRequired()
-                        .HasColumnType("nvarchar(max)");
-
-                    b.HasKey("Id");
-
-                    b.ToTable("Clients");
-                });
-
-            modelBuilder.Entity("SushiBarDatabaseImplement.Models.Component", b =>
-                {
-                    b.Property<int>("Id")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("int");
-
-                    SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property<int>("Id"));
-
-                    b.Property<string>("ComponentName")
-                        .IsRequired()
-                        .HasColumnType("nvarchar(max)");
-
-                    b.Property<double>("Cost")
-                        .HasColumnType("float");
-
-                    b.HasKey("Id");
-
-                    b.ToTable("Components");
-                });
-
-            modelBuilder.Entity("SushiBarDatabaseImplement.Models.MessageInfo", b =>
-                {
-                    b.Property<string>("MessageId")
-                        .HasColumnType("nvarchar(450)");
-
-                    b.Property<string>("Body")
-                        .IsRequired()
-                        .HasColumnType("nvarchar(max)");
-
-                    b.Property<int?>("ClientId")
-                        .HasColumnType("int");
-
-                    b.Property<DateTime>("DateDelivery")
-                        .HasColumnType("datetime2");
-
-                    b.Property<string>("SenderName")
-                        .IsRequired()
-                        .HasColumnType("nvarchar(max)");
-
-                    b.Property<string>("Subject")
-                        .IsRequired()
-                        .HasColumnType("nvarchar(max)");
-
-                    b.HasKey("MessageId");
-
-                    b.HasIndex("ClientId");
-
-                    b.ToTable("MessageInfos");
-                });
-
-            modelBuilder.Entity("SushiBarDatabaseImplement.Models.Order", b =>
-                {
-                    b.Property<int>("Id")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("int");
-
-                    SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property<int>("Id"));
-
-                    b.Property<int>("ClientId")
-                        .HasColumnType("int");
-
-                    b.Property<int>("Count")
-                        .HasColumnType("int");
-
-                    b.Property<DateTime>("DateCreate")
-                        .HasColumnType("datetime2");
-
-                    b.Property<DateTime?>("DateImplement")
-                        .HasColumnType("datetime2");
-
-                    b.Property<int?>("ImplementerId")
-                        .HasColumnType("int");
-
-                    b.Property<int>("Status")
-                        .HasColumnType("int");
-
-                    b.Property<double>("Sum")
-                        .HasColumnType("float");
-
-                    b.Property<int>("SushiId")
-                        .HasColumnType("int");
-
-                    b.HasKey("Id");
-
-                    b.HasIndex("ClientId");
-
-                    b.HasIndex("ImplementerId");
-
-                    b.HasIndex("SushiId");
-
-                    b.ToTable("Orders");
-                });
-
-            modelBuilder.Entity("SushiBarDatabaseImplement.Models.Shop", b =>
-                {
-                    b.Property<int>("Id")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("int");
-
-                    SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property<int>("Id"));
-
-                    b.Property<string>("Adress")
-                        .IsRequired()
-                        .HasColumnType("nvarchar(max)");
-
-                    b.Property<DateTime>("OpeningDate")
-                        .HasColumnType("datetime2");
-
-                    b.Property<string>("ShopName")
-                        .IsRequired()
-                        .HasColumnType("nvarchar(max)");
-
-                    b.Property<int>("SushiMaxCount")
-                        .HasColumnType("int");
-
-                    b.HasKey("Id");
-
-                    b.ToTable("Shops");
-                });
-
-            modelBuilder.Entity("SushiBarDatabaseImplement.Models.ShopSushis", b =>
-                {
-                    b.Property<int>("Id")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("int");
-
-                    SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property<int>("Id"));
-
-                    b.Property<int>("Count")
-                        .HasColumnType("int");
-
-                    b.Property<int>("ShopId")
-                        .HasColumnType("int");
-
-                    b.Property<int>("SushiId")
-                        .HasColumnType("int");
-
-                    b.HasKey("Id");
-
-                    b.HasIndex("ShopId");
-
-                    b.HasIndex("SushiId");
-
-                    b.ToTable("ShopSushis");
-                });
-
-            modelBuilder.Entity("SushiBarDatabaseImplement.Models.Sushi", b =>
-                {
-                    b.Property<int>("Id")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("int");
-
-                    SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property<int>("Id"));
-
-                    b.Property<double>("Price")
-                        .HasColumnType("float");
-
-                    b.Property<string>("SushiName")
-                        .IsRequired()
-                        .HasColumnType("nvarchar(max)");
-
-                    b.HasKey("Id");
-
-                    b.ToTable("Sushis");
-                });
-
-            modelBuilder.Entity("SushiBarDatabaseImplement.Models.SushiComponent", b =>
-                {
-                    b.Property<int>("Id")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("int");
-
-                    SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property<int>("Id"));
-
-                    b.Property<int>("ComponentId")
-                        .HasColumnType("int");
-
-                    b.Property<int>("Count")
-                        .HasColumnType("int");
-
-                    b.Property<int>("SushiId")
-                        .HasColumnType("int");
-
-                    b.HasKey("Id");
-
-                    b.HasIndex("ComponentId");
-
-                    b.HasIndex("SushiId");
-
-                    b.ToTable("SushiComponents");
-                });
-
-            modelBuilder.Entity("SushiBarDatabaseImplement.Models.MessageInfo", b =>
-                {
-                    b.HasOne("SushiBarDatabaseImplement.Models.Client", "Client")
-                        .WithMany("ClientMessages")
-                        .HasForeignKey("ClientId");
-
-                    b.Navigation("Client");
-                });
-
-            modelBuilder.Entity("SushiBarDatabaseImplement.Models.Order", b =>
-                {
-                    b.HasOne("SushiBarDatabaseImplement.Models.Client", "Client")
-                        .WithMany("ClientOrders")
-                        .HasForeignKey("ClientId")
-                        .OnDelete(DeleteBehavior.Cascade)
-                        .IsRequired();
-
-                    b.HasOne("SushiBarDataModels.Models.Implementer", "Implementer")
-                        .WithMany("Order")
-                        .HasForeignKey("ImplementerId");
-
-                    b.HasOne("SushiBarDatabaseImplement.Models.Sushi", "Sushi")
-                        .WithMany("Orders")
-                        .HasForeignKey("SushiId")
-                        .OnDelete(DeleteBehavior.Cascade)
-                        .IsRequired();
-
-                    b.Navigation("Client");
-
-                    b.Navigation("Implementer");
-
-                    b.Navigation("Sushi");
-                });
-
-            modelBuilder.Entity("SushiBarDatabaseImplement.Models.ShopSushis", b =>
-                {
-                    b.HasOne("SushiBarDatabaseImplement.Models.Shop", "Shop")
-                        .WithMany("Sushis")
-                        .HasForeignKey("ShopId")
-                        .OnDelete(DeleteBehavior.Cascade)
-                        .IsRequired();
-
-                    b.HasOne("SushiBarDatabaseImplement.Models.Sushi", "Sushi")
-                        .WithMany()
-                        .HasForeignKey("SushiId")
-                        .OnDelete(DeleteBehavior.Cascade)
-                        .IsRequired();
-
-                    b.Navigation("Shop");
-
-                    b.Navigation("Sushi");
-                });
-
-            modelBuilder.Entity("SushiBarDatabaseImplement.Models.SushiComponent", b =>
-                {
-                    b.HasOne("SushiBarDatabaseImplement.Models.Component", "Component")
-                        .WithMany("SushiComponents")
-                        .HasForeignKey("ComponentId")
-                        .OnDelete(DeleteBehavior.Cascade)
-                        .IsRequired();
-
-                    b.HasOne("SushiBarDatabaseImplement.Models.Sushi", "Sushi")
-                        .WithMany("Components")
-                        .HasForeignKey("SushiId")
-                        .OnDelete(DeleteBehavior.Cascade)
-                        .IsRequired();
-
-                    b.Navigation("Component");
-
-                    b.Navigation("Sushi");
-                });
-
-            modelBuilder.Entity("SushiBarDataModels.Models.Implementer", b =>
-                {
-                    b.Navigation("Order");
-                });
-
-            modelBuilder.Entity("SushiBarDatabaseImplement.Models.Client", b =>
-                {
-                    b.Navigation("ClientMessages");
-
-                    b.Navigation("ClientOrders");
-                });
-
-            modelBuilder.Entity("SushiBarDatabaseImplement.Models.Component", b =>
-                {
-                    b.Navigation("SushiComponents");
-                });
-
-            modelBuilder.Entity("SushiBarDatabaseImplement.Models.Shop", b =>
-                {
-                    b.Navigation("Sushis");
-                });
-
-            modelBuilder.Entity("SushiBarDatabaseImplement.Models.Sushi", b =>
-                {
-                    b.Navigation("Components");
-
-                    b.Navigation("Orders");
-                });
-#pragma warning restore 612, 618
-        }
-    }
-}

SushiBar/SushiBarDatabaseImplement/Migrations/20240617141624_InitCreate.cs

@@ -1,273 +0,0 @@
-using System;
-using Microsoft.EntityFrameworkCore.Migrations;
-
-#nullable disable
-
-namespace SushiBarDatabaseImplement.Migrations
-{
-    /// <inheritdoc />
-    public partial class InitCreate : Migration
-    {
-        /// <inheritdoc />
-        protected override void Up(MigrationBuilder migrationBuilder)
-        {
-            migrationBuilder.CreateTable(
-                name: "Clients",
-                columns: table => new
-                {
-                    Id = table.Column<int>(type: "int", nullable: false)
-                        .Annotation("SqlServer:Identity", "1, 1"),
-                    ClientFIO = table.Column<string>(type: "nvarchar(max)", nullable: false),
-                    Email = table.Column<string>(type: "nvarchar(max)", nullable: false),
-                    Password = table.Column<string>(type: "nvarchar(max)", nullable: false)
-                },
-                constraints: table =>
-                {
-                    table.PrimaryKey("PK_Clients", x => x.Id);
-                });
-
-            migrationBuilder.CreateTable(
-                name: "Components",
-                columns: table => new
-                {
-                    Id = table.Column<int>(type: "int", nullable: false)
-                        .Annotation("SqlServer:Identity", "1, 1"),
-                    ComponentName = table.Column<string>(type: "nvarchar(max)", nullable: false),
-                    Cost = table.Column<double>(type: "float", nullable: false)
-                },
-                constraints: table =>
-                {
-                    table.PrimaryKey("PK_Components", x => x.Id);
-                });
-
-            migrationBuilder.CreateTable(
-                name: "Implementers",
-                columns: table => new
-                {
-                    Id = table.Column<int>(type: "int", nullable: false)
-                        .Annotation("SqlServer:Identity", "1, 1"),
-                    ImplementerFIO = table.Column<string>(type: "nvarchar(max)", nullable: false),
-                    Password = table.Column<string>(type: "nvarchar(max)", nullable: false),
-                    WorkExperience = table.Column<int>(type: "int", nullable: false),
-                    Qualification = table.Column<int>(type: "int", nullable: false)
-                },
-                constraints: table =>
-                {
-                    table.PrimaryKey("PK_Implementers", x => x.Id);
-                });
-
-            migrationBuilder.CreateTable(
-                name: "Shops",
-                columns: table => new
-                {
-                    Id = table.Column<int>(type: "int", nullable: false)
-                        .Annotation("SqlServer:Identity", "1, 1"),
-                    ShopName = table.Column<string>(type: "nvarchar(max)", nullable: false),
-                    Adress = table.Column<string>(type: "nvarchar(max)", nullable: false),
-                    OpeningDate = table.Column<DateTime>(type: "datetime2", nullable: false),
-                    SushiMaxCount = table.Column<int>(type: "int", nullable: false)
-                },
-                constraints: table =>
-                {
-                    table.PrimaryKey("PK_Shops", x => x.Id);
-                });
-
-            migrationBuilder.CreateTable(
-                name: "Sushis",
-                columns: table => new
-                {
-                    Id = table.Column<int>(type: "int", nullable: false)
-                        .Annotation("SqlServer:Identity", "1, 1"),
-                    SushiName = table.Column<string>(type: "nvarchar(max)", nullable: false),
-                    Price = table.Column<double>(type: "float", nullable: false)
-                },
-                constraints: table =>
-                {
-                    table.PrimaryKey("PK_Sushis", x => x.Id);
-                });
-
-            migrationBuilder.CreateTable(
-                name: "MessageInfos",
-                columns: table => new
-                {
-                    MessageId = table.Column<string>(type: "nvarchar(450)", nullable: false),
-                    ClientId = table.Column<int>(type: "int", nullable: true),
-                    SenderName = table.Column<string>(type: "nvarchar(max)", nullable: false),
-                    DateDelivery = table.Column<DateTime>(type: "datetime2", nullable: false),
-                    Subject = table.Column<string>(type: "nvarchar(max)", nullable: false),
-                    Body = table.Column<string>(type: "nvarchar(max)", nullable: false)
-                },
-                constraints: table =>
-                {
-                    table.PrimaryKey("PK_MessageInfos", x => x.MessageId);
-                    table.ForeignKey(
-                        name: "FK_MessageInfos_Clients_ClientId",
-                        column: x => x.ClientId,
-                        principalTable: "Clients",
-                        principalColumn: "Id");
-                });
-
-            migrationBuilder.CreateTable(
-                name: "Orders",
-                columns: table => new
-                {
-                    Id = table.Column<int>(type: "int", nullable: false)
-                        .Annotation("SqlServer:Identity", "1, 1"),
-                    ClientId = table.Column<int>(type: "int", nullable: false),
-                    SushiId = table.Column<int>(type: "int", nullable: false),
-                    Count = table.Column<int>(type: "int", nullable: false),
-                    Sum = table.Column<double>(type: "float", nullable: false),
-                    Status = table.Column<int>(type: "int", nullable: false),
-                    DateCreate = table.Column<DateTime>(type: "datetime2", nullable: false),
-                    DateImplement = table.Column<DateTime>(type: "datetime2", nullable: true),
-                    ImplementerId = table.Column<int>(type: "int", nullable: true)
-                },
-                constraints: table =>
-                {
-                    table.PrimaryKey("PK_Orders", x => x.Id);
-                    table.ForeignKey(
-                        name: "FK_Orders_Clients_ClientId",
-                        column: x => x.ClientId,
-                        principalTable: "Clients",
-                        principalColumn: "Id",
-                        onDelete: ReferentialAction.Cascade);
-                    table.ForeignKey(
-                        name: "FK_Orders_Implementers_ImplementerId",
-                        column: x => x.ImplementerId,
-                        principalTable: "Implementers",
-                        principalColumn: "Id");
-                    table.ForeignKey(
-                        name: "FK_Orders_Sushis_SushiId",
-                        column: x => x.SushiId,
-                        principalTable: "Sushis",
-                        principalColumn: "Id",
-                        onDelete: ReferentialAction.Cascade);
-                });
-
-            migrationBuilder.CreateTable(
-                name: "ShopSushis",
-                columns: table => new
-                {
-                    Id = table.Column<int>(type: "int", nullable: false)
-                        .Annotation("SqlServer:Identity", "1, 1"),
-                    SushiId = table.Column<int>(type: "int", nullable: false),
-                    ShopId = table.Column<int>(type: "int", nullable: false),
-                    Count = table.Column<int>(type: "int", nullable: false)
-                },
-                constraints: table =>
-                {
-                    table.PrimaryKey("PK_ShopSushis", x => x.Id);
-                    table.ForeignKey(
-                        name: "FK_ShopSushis_Shops_ShopId",
-                        column: x => x.ShopId,
-                        principalTable: "Shops",
-                        principalColumn: "Id",
-                        onDelete: ReferentialAction.Cascade);
-                    table.ForeignKey(
-                        name: "FK_ShopSushis_Sushis_SushiId",
-                        column: x => x.SushiId,
-                        principalTable: "Sushis",
-                        principalColumn: "Id",
-                        onDelete: ReferentialAction.Cascade);
-                });
-
-            migrationBuilder.CreateTable(
-                name: "SushiComponents",
-                columns: table => new
-                {
-                    Id = table.Column<int>(type: "int", nullable: false)
-                        .Annotation("SqlServer:Identity", "1, 1"),
-                    SushiId = table.Column<int>(type: "int", nullable: false),
-                    ComponentId = table.Column<int>(type: "int", nullable: false),
-                    Count = table.Column<int>(type: "int", nullable: false)
-                },
-                constraints: table =>
-                {
-                    table.PrimaryKey("PK_SushiComponents", x => x.Id);
-                    table.ForeignKey(
-                        name: "FK_SushiComponents_Components_ComponentId",
-                        column: x => x.ComponentId,
-                        principalTable: "Components",
-                        principalColumn: "Id",
-                        onDelete: ReferentialAction.Cascade);
-                    table.ForeignKey(
-                        name: "FK_SushiComponents_Sushis_SushiId",
-                        column: x => x.SushiId,
-                        principalTable: "Sushis",
-                        principalColumn: "Id",
-                        onDelete: ReferentialAction.Cascade);
-                });
-
-            migrationBuilder.CreateIndex(
-                name: "IX_MessageInfos_ClientId",
-                table: "MessageInfos",
-                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_SushiId",
-                table: "Orders",
-                column: "SushiId");
-
-            migrationBuilder.CreateIndex(
-                name: "IX_ShopSushis_ShopId",
-                table: "ShopSushis",
-                column: "ShopId");
-
-            migrationBuilder.CreateIndex(
-                name: "IX_ShopSushis_SushiId",
-                table: "ShopSushis",
-                column: "SushiId");
-
-            migrationBuilder.CreateIndex(
-                name: "IX_SushiComponents_ComponentId",
-                table: "SushiComponents",
-                column: "ComponentId");
-
-            migrationBuilder.CreateIndex(
-                name: "IX_SushiComponents_SushiId",
-                table: "SushiComponents",
-                column: "SushiId");
-        }
-
-        /// <inheritdoc />
-        protected override void Down(MigrationBuilder migrationBuilder)
-        {
-            migrationBuilder.DropTable(
-                name: "MessageInfos");
-
-            migrationBuilder.DropTable(
-                name: "Orders");
-
-            migrationBuilder.DropTable(
-                name: "ShopSushis");
-
-            migrationBuilder.DropTable(
-                name: "SushiComponents");
-
-            migrationBuilder.DropTable(
-                name: "Clients");
-
-            migrationBuilder.DropTable(
-                name: "Implementers");
-
-            migrationBuilder.DropTable(
-                name: "Shops");
-
-            migrationBuilder.DropTable(
-                name: "Components");
-
-            migrationBuilder.DropTable(
-                name: "Sushis");
-        }
-    }
-}

SushiBar/SushiBarDatabaseImplement/Migrations/SushiBarDatabaseModelSnapshot.cs

@@ -22,6 +22,33 @@ namespace SushiBarDatabaseImplement.Migrations
 
             SqlServerModelBuilderExtensions.UseIdentityColumns(modelBuilder);
 
+            modelBuilder.Entity("SushiBarDataModels.Models.Implementer", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("int");
+
+                    SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property<int>("Id"));
+
+                    b.Property<string>("ImplementerFIO")
+                        .IsRequired()
+                        .HasColumnType("nvarchar(max)");
+
+                    b.Property<string>("Password")
+                        .IsRequired()
+                        .HasColumnType("nvarchar(max)");
+
+                    b.Property<int>("Qualification")
+                        .HasColumnType("int");
+
+                    b.Property<int>("WorkExperience")
+                        .HasColumnType("int");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("Implementers");
+                });
+
             modelBuilder.Entity("SushiBarDatabaseImplement.Models.Client", b =>
                 {
                     b.Property<int>("Id")
@@ -67,6 +94,47 @@ namespace SushiBarDatabaseImplement.Migrations
                     b.ToTable("Components");
                 });
 
+            modelBuilder.Entity("SushiBarDatabaseImplement.Models.MessageInfo", b =>
+                {
+                    b.Property<string>("MessageId")
+                        .HasColumnType("nvarchar(450)");
+
+                    b.Property<string>("Body")
+                        .IsRequired()
+                        .HasColumnType("nvarchar(max)");
+
+                    b.Property<int?>("ClientId")
+                        .HasColumnType("int");
+
+                    b.Property<DateTime>("DateDelivery")
+                        .HasColumnType("datetime2");
+
+                    b.Property<bool>("IsReaded")
+                        .HasColumnType("bit");
+
+                    b.Property<bool>("IsReply")
+                        .HasColumnType("bit");
+
+                    b.Property<string>("ReplyMessageId")
+                        .HasColumnType("nvarchar(450)");
+
+                    b.Property<string>("SenderName")
+                        .IsRequired()
+                        .HasColumnType("nvarchar(max)");
+
+                    b.Property<string>("Subject")
+                        .IsRequired()
+                        .HasColumnType("nvarchar(max)");
+
+                    b.HasKey("MessageId");
+
+                    b.HasIndex("ClientId");
+
+                    b.HasIndex("ReplyMessageId");
+
+                    b.ToTable("MessageInfos");
+                });
+
             modelBuilder.Entity("SushiBarDatabaseImplement.Models.Order", b =>
                 {
                     b.Property<int>("Id")
@@ -87,6 +155,9 @@ namespace SushiBarDatabaseImplement.Migrations
                     b.Property<DateTime?>("DateImplement")
                         .HasColumnType("datetime2");
 
+                    b.Property<int?>("ImplementerId")
+                        .HasColumnType("int");
+
                     b.Property<int>("Status")
                         .HasColumnType("int");
 
@@ -100,6 +171,8 @@ namespace SushiBarDatabaseImplement.Migrations
 
                     b.HasIndex("ClientId");
 
+                    b.HasIndex("ImplementerId");
+
                     b.HasIndex("SushiId");
 
                     b.ToTable("Orders");
@@ -204,14 +277,33 @@ namespace SushiBarDatabaseImplement.Migrations
                     b.ToTable("SushiComponents");
                 });
 
+            modelBuilder.Entity("SushiBarDatabaseImplement.Models.MessageInfo", b =>
+                {
+                    b.HasOne("SushiBarDatabaseImplement.Models.Client", "Client")
+                        .WithMany("ClientMessages")
+                        .HasForeignKey("ClientId");
+
+                    b.HasOne("SushiBarDatabaseImplement.Models.MessageInfo", "Reply")
+                        .WithMany()
+                        .HasForeignKey("ReplyMessageId");
+
+                    b.Navigation("Client");
+
+                    b.Navigation("Reply");
+                });
+
             modelBuilder.Entity("SushiBarDatabaseImplement.Models.Order", b =>
                 {
                     b.HasOne("SushiBarDatabaseImplement.Models.Client", "Client")
-                        .WithMany("Orders")
+                        .WithMany("ClientOrders")
                         .HasForeignKey("ClientId")
                         .OnDelete(DeleteBehavior.Cascade)
                         .IsRequired();
 
+                    b.HasOne("SushiBarDataModels.Models.Implementer", "Implementer")
+                        .WithMany("Order")
+                        .HasForeignKey("ImplementerId");
+
                     b.HasOne("SushiBarDatabaseImplement.Models.Sushi", "Sushi")
                         .WithMany("Orders")
                         .HasForeignKey("SushiId")
@@ -220,6 +312,8 @@ namespace SushiBarDatabaseImplement.Migrations
 
                     b.Navigation("Client");
 
+                    b.Navigation("Implementer");
+
                     b.Navigation("Sushi");
                 });
 
@@ -261,9 +355,16 @@ namespace SushiBarDatabaseImplement.Migrations
                     b.Navigation("Sushi");
                 });
 
+            modelBuilder.Entity("SushiBarDataModels.Models.Implementer", b =>
+                {
+                    b.Navigation("Order");
+                });
+
             modelBuilder.Entity("SushiBarDatabaseImplement.Models.Client", b =>
                 {
-                    b.Navigation("Orders");
+                    b.Navigation("ClientMessages");
+
+                    b.Navigation("ClientOrders");
                 });
 
             modelBuilder.Entity("SushiBarDatabaseImplement.Models.Component", b =>

SushiBar/SushiBarDatabaseImplement/Models/Client.cs

@@ -9,24 +9,35 @@ using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations;
 using System.ComponentModel.DataAnnotations.Schema;
 using System.Linq;
+using System.Runtime.Serialization;
 using System.Text;
 using System.Threading.Tasks;
 
 namespace SushiBarDatabaseImplement.Models
 {
+	[DataContract]
 	public class Client : IClientModel
 	{
+		[DataMember]
 		public int Id { get; private set; }
 
+		[DataMember]
 		[Required]
 		public string ClientFIO { get; set; } = string.Empty;
+
+		[DataMember]
 		[Required]
 		public string Email { get; set; } = string.Empty;
+
+		[DataMember]
 		[Required]
 		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)
 		{
@@ -73,4 +84,4 @@ namespace SushiBarDatabaseImplement.Models
 			Password = Password
 		};
 	}
-}
+}

SushiBar/SushiBarDatabaseImplement/Models/Component.cs

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

SushiBar/SushiBarDatabaseImplement/Models/Implementer.cs

@@ -0,0 +1,73 @@
+using System;
+using System.Collections.Generic;
+using System.ComponentModel.DataAnnotations.Schema;
+using System.ComponentModel.DataAnnotations;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using SushiBarContracts.BindingModels;
+using SushiBarDatabaseImplement.Models;
+using SushiBarContracts.ViewModels;
+using System.Runtime.Serialization;
+
+namespace SushiBarDataModels.Models
+{
+	[DataContract]
+	public class Implementer : IImplementerModel
+    {
+		[DataMember]
+		public int Id { get; set; }
+		[DataMember]
+		[Required]
+        public string ImplementerFIO { get; set; } = string.Empty;
+		[DataMember]
+		[Required]
+        public string Password { get; set; } = string.Empty;
+		[DataMember]
+		[Required]
+        public int WorkExperience { get; set; }
+		[DataMember]
+		[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
+        };
+    }
+}

SushiBar/SushiBarDatabaseImplement/Models/MessageInfo.cs

@@ -0,0 +1,132 @@
+using SushiBarContracts.BindingModels;
+using SushiBarContracts.ViewModels;
+using SushiBarDataModels.Models;
+using System;
+using System.Collections.Generic;
+using System.ComponentModel.DataAnnotations.Schema;
+using System.ComponentModel.DataAnnotations;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Runtime.Serialization;
+
+namespace SushiBarDatabaseImplement.Models
+{
+	public class MessageInfo : IMessageInfoModel
+	{
+		[NotMapped]
+		public int Id { get; private set; }
+
+		[DataMember]
+		[Key]
+		[DatabaseGenerated(DatabaseGeneratedOption.None)]
+		public string MessageId { get; set; } = string.Empty;
+
+		[DataMember]
+		public int? ClientId { get; set; }
+
+		public virtual Client? Client { get; set; }
+
+		[DataMember]
+		[Required]
+		public string SenderName { get; set; } = string.Empty;
+
+		[DataMember]
+		[Required]
+		public DateTime DateDelivery { get; set; }
+
+		[DataMember]
+		[Required]
+		public string Subject { get; set; } = string.Empty;
+
+		[DataMember]
+		[Required]
+		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,
+		[Required]
+		public bool IsReaded { get; set; }
+
+		public string? ReplyMessageId { get; set; }
+
+		[ForeignKey("ReplyMessageId")]
+		public virtual MessageInfo? Reply { get; set; }
+
+		[Required]
+		public bool IsReply { get; set; }
+
+		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,
+				IsReaded = model.IsReaded,
+				ReplyMessageId = model.ReplyMessageId,
+				IsReply = model.IsReply
+			};
+		}
+
+			};
+		}
+		public void Update(SushiBarDatabase context, MessageInfoBindingModel model)
+		{
+			if (model == null)
+			{
+				return;
+			}
+			IsReaded = model.IsReaded;
+			ReplyMessageId = model.ReplyMessageId;
+			if (!string.IsNullOrEmpty(ReplyMessageId))
+			{
+				Reply = context.MessageInfos.First(x => x.MessageId == ReplyMessageId);
+			}
+		}
+
+		public MessageInfoViewModel GetViewModel => new()
+		{
+			MessageId = MessageId,
+			ClientId = ClientId,
+			SenderName = SenderName,
+			DateDelivery = DateDelivery,
+			Subject = Subject,
+			Body = Body
+		};
+	}
+}
+		public MessageInfoViewModel GetViewModel => new()
+		{
+			MessageId = MessageId,
+			ClientId = ClientId,
+			SenderName = SenderName,
+			DateDelivery = DateDelivery,
+			Subject = Subject,
+			Body = Body,
+			IsReaded = IsReaded,
+			ReplyMessageId = ReplyMessageId,
+			Reply = Reply,
+			IsReply = IsReply
+		};
+	}
+}

SushiBar/SushiBarDatabaseImplement/Models/Order.cs

@@ -6,36 +6,49 @@ using System;
 using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations;
 using System.Linq;
+using System.Runtime.Serialization;
 using System.Text;
 using System.Threading.Tasks;
 
 namespace SushiBarDatabaseImplement.Models
 {
-    public class Order : IOrderModel
+	[DataContract]
+	public class Order : IOrderModel
     {
-        public int Id { get; private set; }
-
-        [Required]
+		[DataMember]
+		public int Id { get; private set; }
+		[DataMember]
+		[Required]
         public int ClientId { get; private set; }
         public virtual Client Client { get; private set; } = new();
-        [Required]
+		[DataMember]
+		[Required]
         public int SushiId { get; private set; }
 
         public virtual Sushi Sushi { get; set; } = new();
 
-        [Required]
+		[DataMember]
+		[Required]
         public int Count { get; private set; }
 
-        [Required]
+		[DataMember]
+		[Required]
         public double Sum { get; private set; }
 
-        [Required]
+		[DataMember]
+		[Required]
         public OrderStatus Status { get; private set; } = OrderStatus.Неизвестен;
 
-        [Required]
+		[DataMember]
+		[Required]
         public DateTime DateCreate { get; private set; } = DateTime.Now;
 
-        public DateTime? DateImplement { get; private set; }
+		[DataMember]
+		public DateTime? DateImplement { get; private set; }
+		[DataMember]
+		public int? ImplementerId { get; private set; }
+
+        public virtual Implementer? Implementer { get; set; } = new();
 
         public static Order Create(SushiBarDatabase context, OrderBindingModel model)
         {
@@ -46,6 +59,8 @@ namespace SushiBarDatabaseImplement.Models
                 Client = context.Clients.First(x => x.Id == model.ClientId),
                 SushiId = model.SushiId,
                 Sushi = context.Sushis.First(x => x.Id == model.SushiId),
+                ImplementerId = model.ImplementerId,
+                Implementer = model.ImplementerId.HasValue ? context.Implementers.First(x => x.Id == model.ImplementerId) : null,
                 Count = model.Count,
                 Sum = model.Sum,
                 Status = model.Status,
@@ -54,7 +69,7 @@ namespace SushiBarDatabaseImplement.Models
             };
         }
 
-        public void Update(OrderBindingModel? model)
+        public void Update(SushiBarDatabase context, OrderBindingModel? model)
         {
             if (model == null)
             {
@@ -62,6 +77,8 @@ namespace SushiBarDatabaseImplement.Models
             }
             Status = model.Status;
             DateImplement = model.DateImplement;
+            ImplementerId = model.ImplementerId;
+            Implementer = model.ImplementerId.HasValue ? context.Implementers.First(x => x.Id == model.ImplementerId) : null;
         }
 
         public OrderViewModel GetViewModel => new()
@@ -69,8 +86,11 @@ namespace SushiBarDatabaseImplement.Models
             Id = Id,
             ClientId = ClientId,
             ClientFIO = Client.ClientFIO,
+            ClientEmail = Client.Email,
             SushiId = SushiId,
             SushiName = Sushi.SushiName,
+            ImplementerId = ImplementerId,
+            ImplementerFIO = Implementer != null ? Implementer.ImplementerFIO : null,
             Count = Count,
             Sum = Sum,
             Status = Status,

SushiBar/SushiBarDatabaseImplement/Models/Sushi.cs

@@ -8,19 +8,27 @@ using System.Text;
 using System.Threading.Tasks;
 using SushiBarContracts.BindingModels;
 using SushiBarContracts.ViewModels;
+using System.Runtime.Serialization;
 
 namespace SushiBarDatabaseImplement.Models
 {
-    public class Sushi : ISushiModel
+	[DataContract]
+	public class Sushi : ISushiModel
     {
-        public int Id { get; set; }
-        [Required]
+		[DataMember]
+		public int Id { get; set; }
+		[DataMember]
+		[Required]
         public string SushiName { get; set; } = string.Empty;
-        [Required]
+		[DataMember]
+		[Required]
         public double Price { get; set; }
 
+
+
         private Dictionary<int, (IComponentModel, int)>? _sushiComponents = null;
-        [NotMapped]
+		[DataMember]
+		[NotMapped]
         public Dictionary<int, (IComponentModel, int)> SushiComponents
         {
             get

SushiBar/SushiBarDatabaseImplement/SushiBarDatabaseImplement.csproj

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

SushiBar/SushiBarDatabaseImplement/SushiBarDatatbase.cs

@@ -5,6 +5,7 @@ using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 using SushiBarDatabaseImplement.Models;
+using SushiBarDataModels.Models;
 
 namespace SushiBarDatabaseImplement
 {
@@ -23,7 +24,9 @@ namespace SushiBarDatabaseImplement
         public virtual DbSet<SushiComponent> SushiComponents { set; get; }
         public virtual DbSet<Order> Orders { set; get; }
         public virtual DbSet<Client> Clients { set; get; }
+        public virtual DbSet<Implementer> Implementers { set; get; }
         public virtual DbSet<Shop> Shops { get; set; }
         public virtual DbSet<ShopSushis> ShopSushis { get; set; }
+        public virtual DbSet<MessageInfo> MessageInfos { set; get; }
     }
 }

SushiBar/SushiBarFileImplement/DataFileSingleton.cs

@@ -15,11 +15,15 @@ namespace SushiBarFileImplement
         private readonly string OrderFileName = "Order.xml";
         private readonly string SushiFileName = "Sushi.xml";
         private readonly string ClientFileName = "Client.xml";
+        private readonly string ImplementerFileName = "Implementer.xml";
         private readonly string ShopFileName = "Shop.xml";
+        private readonly string MessageInfoFileName = "MessageInfo.xml";
         public List<Component> Components { get; private set; }
         public List<Order> Orders { get; private set; }
         public List<Sushi> Sushis { get; private set; }
         public List<Client> Clients { get; private set; }
+        public List<Implementer> Implementers { get; private set; }
+        public List<MessageInfo> Messages { get; private set; }
         public List<Shop> Shops { get; private set; }
 
         public static DataFileSingleton GetInstance()
@@ -35,7 +39,9 @@ namespace SushiBarFileImplement
         public void SaveSushis() => SaveData(Sushis, SushiFileName, "Sushis", x => x.GetXElement);
         public void SaveOrders() => SaveData(Orders, OrderFileName, "Orders", 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 SaveShops() => SaveData(Shops, ShopFileName, "Shops", x => x.GetXElement);
+        public void SaveMessages() => SaveData(Orders, ImplementerFileName, "Messages", x => x.GetXElement);
 
         private DataFileSingleton()
         {
@@ -43,6 +49,8 @@ namespace SushiBarFileImplement
             Sushis = LoadData(SushiFileName, "Sushi", x => Sushi.Create(x)!)!;
             Orders = LoadData(OrderFileName, "Order", x => Order.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)!)!;
             Shops = LoadData(ShopFileName, "Shop", x => Shop.Create(x)!)!;
         }
 

SushiBar/SushiBarFileImplement/ImplementationExtension.cs

@@ -0,0 +1,29 @@
+using SushiBar.StoragesContracts;
+using SushiBarContracts.DI;
+using SushiBarContracts.StoragesContracts;
+
+using SushiBarFileImplement.Implements;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace SushiBarFileImplement
+{
+	public class ImplementationExtension : IImplementationExtension
+	{
+		public int Priority => 1;
+
+		public void RegisterServices()
+		{
+			//TODO DependencyManager.Instance.RegisterType<IClientStorage, ClientStorage>();
+			DependencyManager.Instance.RegisterType<IComponentStorage, ComponentStorage>();
+			DependencyManager.Instance.RegisterType<IImplementerStorage, ImplementerStorage>();
+			DependencyManager.Instance.RegisterType<IMessageInfoStorage, MessageInfoStorage>();
+			DependencyManager.Instance.RegisterType<IOrderStorage, OrderStorage>();
+			DependencyManager.Instance.RegisterType<ISushiStorage, SushiStorage>();
+			DependencyManager.Instance.RegisterType<IBackUpInfo, BackUpInfo>();
+		}
+	}
+}

SushiBar/SushiBarFileImplement/Implements/BackUpInfo.cs

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

SushiBar/SushiBarFileImplement/Implements/ImplementerStorage.cs

@@ -0,0 +1,99 @@
+using SushiBarContracts.BindingModels;
+using SushiBarContracts.SearchModels;
+using SushiBarContracts.StoragesContracts;
+using SushiBarContracts.ViewModels;
+using SushiBarFileImplement.Models;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace SushiBarFileImplement.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;
+        }
+    }
+}

SushiBar/SushiBarFileImplement/Implements/MessageInfoStorage.cs

@@ -0,0 +1,71 @@
+using SushiBarContracts.BindingModels;
+using SushiBarContracts.SearchModels;
+using SushiBarContracts.StoragesContracts;
+using SushiBarContracts.ViewModels;
+using SushiBarFileImplement.Models;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace SushiBarFileImplement.Implements
+{
+	public class MessageInfoStorage : IMessageInfoStorage
+	{
+		private readonly DataFileSingleton _source;
+		public MessageInfoStorage()
+		{
+			_source = DataFileSingleton.GetInstance();
+		}
+
+		public MessageInfoViewModel? GetElement(MessageInfoSearchModel model)
+		{
+			if (model.MessageId != null)
+			{
+				return _source.Messages.FirstOrDefault(x => x.MessageId == model.MessageId)?.GetViewModel;
+			}
+			return null;
+		}
+
+		public List<MessageInfoViewModel> GetFilteredList(MessageInfoSearchModel model)
+		{
+			var res = _source.Messages.Where(x => !model.ClientId.HasValue || x.ClientId == model.ClientId).Select(x => x.GetViewModel);
+			if (!(model.PageIndex.HasValue && model.PageLength.HasValue))
+			{
+				return res.ToList();
+			}
+			return res.Skip((model.PageIndex.Value - 1) * model.PageLength.Value).Take(model.PageLength.Value).ToList();
+		}
+
+		public List<MessageInfoViewModel> GetFullList()
+		{
+			return _source.Messages
+				.Select(x => x.GetViewModel)
+				.ToList();
+		}
+
+		public MessageInfoViewModel? Insert(MessageInfoBindingModel model)
+		{
+			var newMessage = MessageInfo.Create(model);
+			if (newMessage == null)
+			{
+				return null;
+			}
+			_source.Messages.Add(newMessage);
+			_source.SaveMessages();
+			return newMessage.GetViewModel;
+		}
+
+		public MessageInfoViewModel? Update(MessageInfoBindingModel model)
+		{
+			var res = _source.Messages.FirstOrDefault(x => x.MessageId.Equals(model.MessageId));
+			if (res != null)
+			{
+				res.Update(model);
+				_source.SaveMessages();
+			}
+			return res?.GetViewModel;
+		}
+	}
+}

SushiBar/SushiBarFileImplement/Implements/OrderStorage.cs

@@ -33,7 +33,11 @@ namespace SushiBarFileImplement.Implements
             {
                 return source.Orders.Where(x => x.ClientId == model.ClientId).Select(x => x.GetViewModel).ToList();
             }
+            if (!model.ImplementerId.HasValue && !model.Id.HasValue)
+            {
+                return source.Orders.Where(x => x.ImplementerId == model.ImplementerId).Select(x => x.GetViewModel).ToList();
 
+            }
             if (model.Id.HasValue)
             {
                 return source.Orders.Where(x => x.Id.Equals(model.Id)).Select(x => GetViewModel(x)).ToList();
@@ -43,6 +47,10 @@ namespace SushiBarFileImplement.Implements
 
         public OrderViewModel? GetElement(OrderSearchModel model)
         {
+            if (model.ImplementerId.HasValue)
+            {
+                return source.Orders.FirstOrDefault(x => x.ImplementerId == model.ImplementerId)?.GetViewModel;
+            }
             if (!model.Id.HasValue)
             {
                 return new();

SushiBar/SushiBarFileImplement/Models/Implementer.cs

@@ -0,0 +1,87 @@
+using SushiBarContracts.BindingModels;
+using SushiBarContracts.ViewModels;
+using SushiBarDataModels.Models;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Xml.Linq;
+
+namespace SushiBarFileImplement.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(XElement element)
+        {
+            if (element == null)
+            {
+                return null;
+            }
+            return new()
+            {
+                ImplementerFIO = element.Element("FIO")!.Value,
+                Password = element.Element("Password")!.Value,
+                Id = Convert.ToInt32(element.Attribute("Id")!.Value),
+                Qualification = Convert.ToInt32(element.Element("Qualification")!.Value),
+                WorkExperience = Convert.ToInt32(element.Element("WorkExperience")!.Value),
+            };
+        }
+
+        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,
+        };
+
+        public XElement GetXElement => new("Client",
+            new XAttribute("Id", Id),
+            new XElement("Password", Password),
+            new XElement("FIO", ImplementerFIO),
+            new XElement("Qualification", Qualification),
+            new XElement("WorkExperience", WorkExperience)
+            );
+    }
+}

SushiBar/SushiBarFileImplement/Models/MessageInfo.cs

@@ -0,0 +1,105 @@
+using SushiBarContracts.BindingModels;
+using SushiBarContracts.ViewModels;
+using SushiBarDataModels.Models;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Xml.Linq;
+
+namespace SushiBarFileImplement.Models
+{
+    public class MessageInfo : IMessageInfoModel
+    {
+		public string MessageId { get; private set; } = string.Empty;
+
+		public int? ClientId { get; private set; }
+
+		public string SenderName { get; private set; } = string.Empty;
+
+		public DateTime DateDelivery { get; private set; } = DateTime.Now;
+
+		public string Subject { get; private set; } = string.Empty;
+
+		public string Body { get; private set; } = string.Empty;
+		public bool IsReaded { get; private set; }
+		public bool IsReply { get; private set; }
+		public string? ReplyMessageId { get; private set; } = string.Empty;
+
+		public static MessageInfo? Create(MessageInfoBindingModel model)
+		{
+			if (model == null)
+			{
+				return null;
+			}
+			return new()
+			{
+				Body = model.Body,
+				IsReply = model.IsReply,
+				IsReaded = model.IsReaded,
+				Subject = model.Subject,
+				ClientId = model.ClientId,
+				MessageId = model.MessageId,
+				SenderName = model.SenderName,
+				DateDelivery = model.DateDelivery,
+				ReplyMessageId = model.ReplyMessageId,
+			};
+		}
+
+		public static MessageInfo? Create(XElement element)
+		{
+			if (element == null)
+			{
+				return null;
+			}
+			return new()
+			{
+				Body = element.Attribute("Body")!.Value,
+				IsReply = Convert.ToBoolean(element.Attribute("IsReply")!.Value),
+				IsReaded = Convert.ToBoolean(element.Attribute("HasRead")!.Value),
+				Subject = element.Attribute("Subject")!.Value,
+				ClientId = Convert.ToInt32(element.Attribute("ClientId")!.Value),
+				MessageId = element.Attribute("MessageId")!.Value,
+				ReplyMessageId = element.Attribute("ReplyMessageId")!.Value,
+				SenderName = element.Attribute("SenderName")!.Value,
+				DateDelivery = Convert.ToDateTime(element.Attribute("DateDelivery")!.Value),
+			};
+		}
+
+		public void Update(MessageInfoBindingModel model)
+		{
+			if (model == null)
+			{
+				return;
+			}
+			IsReply = model.IsReply;
+			IsReaded = model.IsReaded;
+		}
+
+		public MessageInfoViewModel GetViewModel => new()
+		{
+			Body = Body,
+			IsReply = IsReply,
+			IsReaded = IsReaded,
+			Subject = Subject,
+			ClientId = ClientId,
+			MessageId = MessageId,
+			SenderName = SenderName,
+			DateDelivery = DateDelivery,
+			ReplyMessageId = ReplyMessageId,
+		};
+
+		public XElement GetXElement => new("MessageInfo",
+			new XAttribute("Body", Body),
+			new XAttribute("IsReply", IsReply),
+			new XAttribute("IsReaded", IsReaded),
+			new XAttribute("Subject", Subject),
+			new XAttribute("ClientId", ClientId),
+			new XAttribute("MessageId", MessageId),
+			new XAttribute("ReplyMessageId", ReplyMessageId),
+			new XAttribute("SenderName", SenderName),
+			new XAttribute("DateDelivery", DateDelivery)
+			);
+	}
+}

SushiBar/SushiBarFileImplement/Models/Order.cs

@@ -15,6 +15,7 @@ namespace SushiBarFileImplement.Models
     {
         public int Id { get; private set; }
         public int ClientId { get; private set; }
+        public int? ImplementerId { get; set; }
         public int SushiId { get; private set; }
         public int Count { get; private set; }
         public double Sum { get; private set; }
@@ -33,6 +34,7 @@ namespace SushiBarFileImplement.Models
                 Id = model.Id,
                 SushiId = model.SushiId,
                 ClientId = model.ClientId,
+                ImplementerId = model.ImplementerId,
                 Count = model.Count,
                 Sum = model.Sum,
                 Status = model.Status,
@@ -53,6 +55,7 @@ namespace SushiBarFileImplement.Models
                 Id = Convert.ToInt32(element.Attribute("Id")!.Value),
                 SushiId = Convert.ToInt32(element.Element("SushiId")!.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)),
@@ -77,6 +80,7 @@ namespace SushiBarFileImplement.Models
             Id = Id,
             SushiId = SushiId,
             ClientId = ClientId,
+            ImplementerId = ImplementerId,
             Count = Count,
             Sum = Sum,
             Status = Status,
@@ -88,6 +92,7 @@ namespace SushiBarFileImplement.Models
            new XAttribute("Id", Id),
            new XElement("SushiId", SushiId.ToString()),
            new XElement("ClientId", ClientId.ToString()),
+            new XElement("ImplementerId", ImplementerId),
            new XElement("Count", Count.ToString()),
            new XElement("Sum", Sum.ToString()),
            new XElement("Status", Status.ToString()),

SushiBar/SushiBarFileImplement/SushiBarFileImplement.csproj

@@ -17,6 +17,7 @@
 
   <ItemGroup>
     <ProjectReference Include="..\SushiBarContracts\SushiBarContracts.csproj" />
+    <ProjectReference Include="..\SushiBarDatabaseImplement\SushiBarDatabaseImplement.csproj" />
     <ProjectReference Include="..\SushiBarDataModels\SushiBarDataModels.csproj" />
   </ItemGroup>
 

SushiBar/SushiBarListImplement_/DataListSingleton.cs

@@ -14,6 +14,8 @@ namespace SushiBarListImplement
         public List<Order> Orders { get; set; }
         public List<Sushi> Sushis { get; set; }
         public List<Client> Clients { get; set; }
+        public List<Implementer> Implementers { get; set; }
+        public List<MessageInfo> Messages { get; set; }
         public List<Shop> Shops { get; set; }
         private DataListSingleton()
         {
@@ -21,6 +23,8 @@ namespace SushiBarListImplement
             Orders = new List<Order>();
             Sushis = new List<Sushi>();
             Clients = new List<Client>();
+            Implementers = new List<Implementer>();
+            Messages = new List<MessageInfo>();
             Shops = new List<Shop>();
         }
         public static DataListSingleton GetInstance()

SushiBar/SushiBarListImplement_/Implements/ImplementerStorage.cs

@@ -0,0 +1,123 @@
+using SushiBarContracts.BindingModels;
+using SushiBarContracts.SearchModels;
+using SushiBarContracts.StoragesContracts;
+using SushiBarContracts.ViewModels;
+using SushiBarListImplement.Models;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace SushiBarListImplement.Implements
+{
+    public class ImplementerStorage : IImplementerStorage
+    {
+        private readonly DataListSingleton _source;
+        public ImplementerStorage()
+        {
+            _source = DataListSingleton.GetInstance();
+        }
+
+        public ImplementerViewModel? Delete(ImplementerBindingModel model)
+        {
+            for (int i = 0; i < _source.Implementers.Count; ++i)
+            {
+                if (_source.Implementers[i].Id == model.Id)
+                {
+                    var element = _source.Implementers[i];
+                    _source.Implementers.RemoveAt(i);
+                    return element.GetViewModel;
+                }
+            }
+            return null;
+        }
+
+        public ImplementerViewModel? GetElement(ImplementerSearchModel model)
+        {
+            foreach (var x in _source.Implementers)
+            {
+                if (model.Id.HasValue && x.Id == model.Id)
+                {
+                    return x.GetViewModel;
+                }
+                if (model.ImplementerFIO != null && model.Password != null && x.ImplementerFIO.Equals(model.ImplementerFIO) && x.Password.Equals(model.Password))
+                {
+                    return x.GetViewModel;
+                }
+                if (model.ImplementerFIO != null && x.ImplementerFIO.Equals(model.ImplementerFIO))
+                {
+                    return x.GetViewModel;
+                }
+            }
+            return null;
+        }
+
+        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();
+            }
+
+            List<ImplementerViewModel> result = new();
+            if (model.ImplementerFIO != null)
+            {
+                foreach (var implementer in _source.Implementers)
+                {
+                    if (implementer.ImplementerFIO.Equals(model.ImplementerFIO))
+                    {
+                        result.Add(implementer.GetViewModel);
+                    }
+                }
+            }
+            return result;
+        }
+
+        public List<ImplementerViewModel> GetFullList()
+        {
+            var result = new List<ImplementerViewModel>();
+            foreach (var implementer in _source.Implementers)
+            {
+                result.Add(implementer.GetViewModel);
+            }
+            return result;
+        }
+
+        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 res = Implementer.Create(model);
+            if (res != null)
+            {
+                _source.Implementers.Add(res);
+            }
+            return res?.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;
+        }
+    }
+}

SushiBar/SushiBarListImplement_/Implements/MessageInfoStorage.cs

@@ -0,0 +1,95 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using SushiBar.StoragesContracts;
+using SushiBarContracts.BindingModels;
+using SushiBarContracts.BusinessLogicsContracts;
+using SushiBarContracts.SearchModels;
+using SushiBarContracts.StoragesContracts;
+using SushiBarContracts.ViewModels;
+using SushiBarListImplement.Models;
+
+namespace SushiBarListImplement.Implements
+{
+	public class MessageInfoStorage : IMessageInfoStorage
+	{
+		private readonly DataListSingleton _source;
+		public MessageInfoStorage()
+		{
+			_source = DataListSingleton.GetInstance();
+		}
+
+		public MessageInfoViewModel? GetElement(MessageInfoSearchModel model)
+		{
+			foreach (var message in _source.Messages)
+			{
+				if (model.MessageId != null && model.MessageId.Equals(message.MessageId))
+					return message.GetViewModel;
+			}
+			return null;
+		}
+
+		public List<MessageInfoViewModel> GetFilteredList(MessageInfoSearchModel model)
+		{
+			List<MessageInfoViewModel> result = new();
+			foreach (var item in _source.Messages)
+			{
+				if (item.ClientId.HasValue && item.ClientId == model.ClientId)
+				{
+					result.Add(item.GetViewModel);
+				}
+			}
+
+			if (!(model.PageIndex.HasValue && model.PageLength.HasValue))
+			{
+				return result;
+			}
+			if (model.PageIndex * model.PageLength >= result.Count)
+			{
+				return null;
+			}
+			List<MessageInfoViewModel> filteredResult = new();
+			for (var i = (model.PageIndex.Value - 1) * model.PageLength.Value; i < model.PageIndex.Value * model.PageLength.Value; i++)
+			{
+				filteredResult.Add(result[i]);
+			}
+			return filteredResult;
+		}
+
+		public List<MessageInfoViewModel> GetFullList()
+		{
+			List<MessageInfoViewModel> result = new();
+			foreach (var item in _source.Messages)
+			{
+				result.Add(item.GetViewModel);
+			}
+			return result;
+		}
+
+		public MessageInfoViewModel? Insert(MessageInfoBindingModel model)
+		{
+			var newMessage = MessageInfo.Create(model);
+			if (newMessage == null)
+			{
+				return null;
+			}
+			_source.Messages.Add(newMessage);
+			return newMessage.GetViewModel;
+		}
+
+		public MessageInfoViewModel? Update(MessageInfoBindingModel model)
+		{
+			foreach (var message in _source.Messages)
+			{
+				if (message.MessageId.Equals(model.MessageId))
+				{
+					message.Update(model);
+					return message.GetViewModel;
+				}
+			}
+			return null;
+		}
+	}
+}

SushiBar/SushiBarListImplement_/Implements/OrderStorage.cs

@@ -54,6 +54,16 @@ namespace SushiBarListImplement.Implements
                     }
                 }
             }
+            else if (model.ImplementerId.HasValue && !model.Id.HasValue)
+            {
+                foreach (var order in _source.Orders)
+                {
+                    if (order.ImplementerId == model.ImplementerId)
+                    {
+                        result.Add(GetViewModel(order));
+                    }
+                }
+            }
             else if (model.Id.HasValue)
             {
                 foreach (var order in _source.Orders)
@@ -79,6 +89,10 @@ namespace SushiBarListImplement.Implements
                 {
                     return AttachSushiName(order.GetViewModel);
                 }
+                else if (model.ImplementerId.HasValue && model.ImplementerId == order.ImplementerId)
+                {
+                    return GetViewModel(order);
+                }
             }
             return null;
         }

SushiBar/SushiBarListImplement_/Models/Implementer.cs

@@ -0,0 +1,60 @@
+using SushiBarContracts.BindingModels;
+using SushiBarContracts.ViewModels;
+using SushiBarDataModels.Models;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace SushiBarListImplement.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,
+        };
+    }
+}

SushiBar/SushiBarListImplement_/Models/MessageInfo.cs

@@ -0,0 +1,72 @@
+using SushiBarContracts.BindingModels;
+using SushiBarContracts.ViewModels;
+using SushiBarDataModels.Models;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace SushiBarListImplement.Models
+{
+    public class MessageInfo : IMessageInfoModel
+    {
+		public string MessageId { get; private set; } = string.Empty;
+
+		public int? ClientId { get; private set; }
+
+		public string SenderName { get; private set; } = string.Empty;
+
+		public DateTime DateDelivery { get; private set; } = DateTime.Now;
+
+		public string Subject { get; private set; } = string.Empty;
+
+		public string Body { get; private set; } = string.Empty;
+		public bool IsReaded { get; private set; }
+		public bool IsReply { get; private set; }
+		public string? ReplyMessageId { get; private set; }
+
+		public static MessageInfo? Create(MessageInfoBindingModel model)
+		{
+			if (model == null)
+			{
+				return null;
+			}
+			return new()
+			{
+				Body = model.Body,
+				IsReply = model.IsReply,
+				IsReaded = model.IsReaded,
+				Subject = model.Subject,
+				ClientId = model.ClientId,
+				MessageId = model.MessageId,
+				SenderName = model.SenderName,
+				DateDelivery = model.DateDelivery,
+				ReplyMessageId = model.ReplyMessageId,
+			};
+		}
+
+		public void Update(MessageInfoBindingModel model)
+		{
+			if (model == null)
+			{
+				return;
+			}
+			IsReply = model.IsReply;
+			IsReaded = model.IsReaded;
+		}
+
+		public MessageInfoViewModel GetViewModel => new()
+		{
+			Body = Body,
+			IsReply = IsReply,
+			IsReaded = IsReaded,
+			Subject = Subject,
+			ClientId = ClientId,
+			MessageId = MessageId,
+			SenderName = SenderName,
+			DateDelivery = DateDelivery,
+			ReplyMessageId = ReplyMessageId,
+		};
+	}
+}

SushiBar/SushiBarListImplement_/Models/Order.cs

@@ -20,6 +20,7 @@ namespace SushiBarListImplement.Models
         public OrderStatus Status { get; private set; } = OrderStatus.Неизвестен;
         public DateTime DateCreate { get; private set; } = DateTime.Now;
         public DateTime? DateImplement { get; private set; }
+        public int? ImplementerId { get; private set; }
 
         public static Order? Create(OrderBindingModel? model)
         {
@@ -32,6 +33,7 @@ namespace SushiBarListImplement.Models
                 Id = model.Id,
                 SushiId = model.SushiId,
                 ClientId = model.ClientId,
+                ImplementerId = model.ImplementerId,
                 Count = model.Count,
                 Sum = model.Sum,
                 Status = model.Status,
@@ -55,6 +57,7 @@ namespace SushiBarListImplement.Models
             Id = Id,
             SushiId = SushiId,
             ClientId = ClientId,
+            ImplementerId = ImplementerId,
             Count = Count,
             Sum = Sum,
             Status = Status,

SushiBar/SushiBarRestApi/Controllers/ClientController.cs

@@ -3,65 +3,94 @@ using SushiBar.BindingModels;
 using SushiBar.BusinessLogicsContracts;
 using SushiBar.SearchModels;
 using SushiBar.ViewModels;
+using SushiBarContracts.BusinessLogicsContracts;
+using SushiBarContracts.SearchModels;
+using SushiBarContracts.ViewModels;
+using System.Net;
+
 
 namespace SushiBarRestApi.Controllers
 {
-        [Route("api/[controller]/[action]")]
-        [ApiController]
-        public class ClientController : Controller
-        {
-            private readonly ILogger _logger;
-            private readonly IClientLogic _logic;
-            public ClientController(IClientLogic logic, ILogger<ClientController>
-           logger)
-            {
-                _logger = logger;
-                _logic = logic;
-            }
-            [HttpGet]
-            public ClientViewModel? Login(string login, string password)
-            {
-                try
-                {
-                    return _logic.ReadElement(new ClientSearchModel
-                    {
-                        Email = login,
-                        Password = password
-                    });
-                }
-                catch (Exception ex)
-                {
-                    _logger.LogError(ex, "Ошибка входа в систему");
-                    throw;
-                }
-            }
-            [HttpPost]
-            public void Register(ClientBindingModel model)
-            {
-                try
-                {
-                    _logic.Create(model);
-                }
-                catch (Exception ex)
-                {
-                    _logger.LogError(ex, "Ошибка регистрации");
-                    throw;
-                }
-            }
-            [HttpPost]
-            public void UpdateData(ClientBindingModel model)
-            {
-                try
-                {
-                    _logic.Update(model);
-                }
-                catch (Exception ex)
-                {
-                    _logger.LogError(ex, "Ошибка обновления данных");
-                    throw;
-                }
-            }
+	[Route("api/[controller]/[action]")]
+	[ApiController]
+	public class ClientController : Controller
+	{
+		private readonly ILogger _logger;
 
-        }
-    }
+		private readonly IClientLogic _logic;
 
+		private readonly IMessageInfoLogic _mailLogic;
+
+		public ClientController(IClientLogic logic, ILogger<ClientController> logger, IMessageInfoLogic mailLogic)
+		{
+			_logger = logger;
+			_logic = logic;
+			_mailLogic = mailLogic;
+		}
+
+		[HttpGet]
+		public ClientViewModel? Login(string login, string password)
+		{
+			try
+			{
+				return _logic.ReadElement(new ClientSearchModel
+				{
+					Email = login,
+					Password = password
+				});
+			}
+			catch (Exception ex)
+			{
+				_logger.LogError(ex, "Ошибка входа в систему");
+				throw;
+			}
+		}
+
+		[HttpPost]
+		public void Register(ClientBindingModel model)
+		{
+			try
+			{
+				_logic.Create(model);
+			}
+			catch (Exception ex)
+			{
+				_logger.LogError(ex, "Ошибка регистрации");
+				Response.StatusCode = (int)HttpStatusCode.NotAcceptable;
+			}
+		}
+
+		[HttpPost]
+		public void UpdateData(ClientBindingModel model)
+		{
+			try
+			{
+				_logic.Update(model);
+			}
+			catch (Exception ex)
+			{
+				_logger.LogError(ex, "Ошибка обновления данных");
+				throw;
+			}
+		}
+
+		[HttpGet]
+		public List<MessageInfoViewModel>? GetMessages(int clientId, int page, int pagesize = 1)
+		{
+			try
+			{
+				return _mailLogic.ReadList(new MessageInfoSearchModel
+				{
+					ClientId = clientId,
+					PageLength = pagesize,
+					PageIndex = page
+				});
+			}
+			catch (Exception ex)
+			{
+				_logger.LogError(ex, "Ошибка получения писем клиента");
+				throw;
+			}
+		}
+	}
+}

SushiBar/SushiBarRestApi/Controllers/ImplementerController .cs

@@ -0,0 +1,107 @@
+using Microsoft.AspNetCore.Mvc;
+using SushiBarContracts.BindingModels;
+using SushiBarContracts.BusinessLogicsContracts;
+using SushiBarContracts.SearchModels;
+using SushiBarContracts.ViewModels;
+using SushiBarDataModels.Enums;
+
+namespace SushiBarRestApi.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.Принят
+                });
+            }
+            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;
+            }
+        }
+    }
+}

SushiBar/SushiBarRestApi/Program.cs

@@ -1,11 +1,14 @@
 using Microsoft.OpenApi.Models;
 using SushiBar.BusinessLogicsContracts;
 using SushiBar.StoragesContracts;
+using SushiBarBusinessLogic;
 using SushiBarBusinessLogic.BusinessLogics;
 using SushiBarContracts.BusinessLogicsContracts;
 using SushiBarContracts.StoragesContracts;
 using SushiBarDatabaseImplement.Implements;
 using SushiBarRestApi;
+using SushiBarBusinessLogic.MailWorker;
+using SushiBarContracts.BindingModels;
 
 var builder = WebApplication.CreateBuilder(args);
 
@@ -19,6 +22,11 @@ builder.Services.AddTransient<IOrderLogic, OrderLogic>();
 builder.Services.AddTransient<IClientLogic, ClientLogic>();
 builder.Services.AddTransient<ISushiLogic, SushiLogic>();
 builder.Services.AddTransient<IShopLogic, ShopLogic>();
+builder.Services.AddTransient<IImplementerStorage, ImplementerStorage>();
+builder.Services.AddTransient<IImplementerLogic, ImplementerLogic>();
+builder.Services.AddTransient<IMessageInfoStorage, MessageInfoStorage>();
+builder.Services.AddTransient<IMessageInfoLogic, MessageInfoLogic>();
+builder.Services.AddSingleton<AbstractMailWorker, MailKitWorker>();
 
 builder.Services.AddControllers();
 // Learn more about configuring Swagger/OpenAPI at https://aka.ms/aspnetcore/swashbuckle
@@ -33,7 +41,16 @@ builder.Services.AddSwaggerGen(c =>
     });
 });
 var app = builder.Build();
-APIConfig.LoadData(builder.Configuration);
+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())
+});
 // Configure the HTTP request pipeline.
 if (app.Environment.IsDevelopment())
 {

SushiBar/SushiBarRestApi/appsettings.json

@@ -6,6 +6,10 @@
     }
   },
   "AllowedHosts": "*",
-  
-  "ShopAPIPassword": "123456"
+  "SmtpClientHost": "smtp.gmail.com",
+  "SmtpClientPort": "587",
+  "PopHost": "pop.gmail.com",
+  "PopPort": "995",
+  "MailLogin": "valanuni04@gmail.com",
+  "MailPassword": "bpkm pnxf rbvi sroc"
 }

SushiBar/SushiBarView/App.config

@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<configuration>
+	<appSettings>
+		<add key="SmtpClientHost" value="smtp.gmail.com" />
+		<add key="SmtpClientPort" value="587" />
+		<add key="PopHost" value="pop.gmail.com" />
+		<add key="PopPort" value="995" />
+		<add key="MailLogin" value="valanuni04@gmail.com" />
+		<add key="MailPassword" value="bpkm pnxf rbvi sroc" />
+	</appSettings>
+</configuration>

SushiBar/SushiBarView/DataGridViewExtension.cs

@@ -0,0 +1,51 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using SushiBarContracts.Attributes;
+
+namespace SushiBarView
+{
+	internal static class DataGridViewExtension
+	{
+		public static void FillAndConfigGrid<T>(this DataGridView grid, List<T>? data)
+		{
+			if (data == null)
+			{
+				return;
+			}
+			grid.DataSource = data;
+
+			var type = typeof(T);
+			var properties = type.GetProperties();
+			foreach (DataGridViewColumn column in grid.Columns)
+			{
+				var property = properties.FirstOrDefault(x => x.Name == column.Name);
+				if (property == null)
+				{
+					throw new InvalidOperationException($"В типе {type.Name} не найдено свойство с именем {column.Name}");
+				}
+				var attribute = property.GetCustomAttributes(typeof(ColumnAttribute), true)?.SingleOrDefault();
+				if (attribute == null)
+				{
+					throw new InvalidOperationException($"Не найден атрибут типа ColumnAttribute для свойства {property.Name}");
+				}
+
+				if (attribute is ColumnAttribute columnAttr)
+				{
+					column.HeaderText = columnAttr.Title;
+					column.Visible = columnAttr.Visible;
+					if (columnAttr.IsUseAutoSize)
+					{
+						column.AutoSizeMode = (DataGridViewAutoSizeColumnMode)Enum.Parse(typeof(DataGridViewAutoSizeColumnMode), columnAttr.GridViewAutoSize.ToString());
+					}
+					else
+					{
+						column.Width = columnAttr.Width;
+					}
+				}
+			}
+		}
+	}
+}

SushiBar/SushiBarView/FormClients.cs

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

SushiBar/SushiBarView/FormComponents.cs

@@ -10,6 +10,7 @@ using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 using System.Windows.Forms;
+using SushiBarContracts.DI;
 
 namespace SushiBarView
 {
@@ -57,31 +58,24 @@ namespace SushiBarView
 
         private void ButtonAdd_Click(object sender, EventArgs e)
         {
-            var service = Program.ServiceProvider?.GetService(typeof(FormComponent));
-            if (service is FormComponent form)
-            {
-                if (form.ShowDialog() == DialogResult.OK)
-                {
-                    LoadData();
-                }
-            }
+			var form = DependencyManager.Instance.Resolve<FormComponent>();
+			if (form.ShowDialog() == DialogResult.OK)
+			{
+				LoadData();
+			}
         }
 
         private void ButtonUpd_Click(object sender, EventArgs e)
         {
             if (dataGridView.SelectedRows.Count == 1)
             {
-                var service =
-               Program.ServiceProvider?.GetService(typeof(FormComponent));
-                if (service is FormComponent form)
-                {
-                    form.Id =
-                   Convert.ToInt32(dataGridView.SelectedRows[0].Cells["Id"].Value);
-                    if (form.ShowDialog() == DialogResult.OK)
-                    {
-                    LoadData();
-                    }
-                }
+				var form = DependencyManager.Instance.Resolve<FormComponent>();
+
+				form.Id = Convert.ToInt32(dataGridView.SelectedRows[0].Cells["Id"].Value);
+				if (form.ShowDialog() == DialogResult.OK)
+				{
+					LoadData();
+				}
             }
         }
         private void ButtonDel_Click(object sender, EventArgs e)