миграции и редактирование представлений

.gitignore

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

SushiBar/SushiBarBusinessLogic_/BusinessLogics/OrderLogic.cs

@@ -0,0 +1,144 @@
+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,7 +4,6 @@ using SushiBar.BusinessLogicsContracts;
 using SushiBar.SearchModels;
 using SushiBar.StoragesContracts;
 using SushiBar.ViewModels;
-using System.Text.RegularExpressions;
 
 namespace SushiBarBusinessLogic.BusinessLogics
 {
@@ -97,18 +96,17 @@ namespace SushiBarBusinessLogic.BusinessLogics
             {
                 throw new ArgumentNullException("Нет ФИО пользователя", nameof(model.ClientFIO));
             }
-            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.Email))
+            {
+                throw new ArgumentNullException("Нет почты пользователя", nameof(model.Email));
             }
-            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
+            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
             {
                 ClientFIO = model.ClientFIO
             });

SushiBar/SushiBarBusinessLogic_/ImplementerLogic.cs

@@ -1,130 +0,0 @@
-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

@@ -1,133 +0,0 @@
-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

@@ -1,104 +0,0 @@
-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

@@ -1,125 +0,0 @@
-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

@@ -1,213 +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;
-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,7 +16,6 @@
     </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

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

SushiBar/SushiBarClientApp/Views/Home/Index.cshtml

@@ -1,75 +1,68 @@
 @using SushiBarContracts.ViewModels
 
-@model List<OrderViewModel>
+@model List<ShopViewModel>
 
 @{
 	ViewData["Title"] = "Home Page";
 }
 
 <div class="text-center">
-	<h1 class="display-4">Заказы</h1>
+    <h1 class="display-4">Магазины</h1>
 </div>
 
 
-<div class="text-center">
-	@{
-		if (Model == null)
-		{
-					<h3 class="display-4">Авторизируйтесь</h3>
-			return;
-		}
+<div class="text-center ">
+    <p>
+        <a asp-action="Create">Создать магазин</a>
+    </p>
 
-			<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>
-	}
+    <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>
 </div>

SushiBar/SushiBarClientApp/Views/Home/Mails.cshtml

@@ -1,74 +0,0 @@
-@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">SushiBarShopsApi</a>
+                <a class="navbar-brand" asp-area="" asp-controller="Home" asp-action="Index">PizzeriaShopsApi</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,17 +25,7 @@
                             <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="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> *@
+                            <a class="nav-link text-dark" asp-area="" asp-controller="Home" asp-action="Supply">Поставка</a>
                         </li>
                     </ul>
                 </div>

SushiBar/SushiBarContracts/BindingModels/ImplementerBindingModel.cs

@@ -1,18 +0,0 @@
-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

@@ -1,18 +0,0 @@
-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

@@ -1,13 +0,0 @@
-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

@@ -1,15 +0,0 @@
-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

@@ -1,22 +0,0 @@
-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; }
-	}
-}

SushiBar/SushiBarContracts/BindingModels/OrderBindingModel.cs

@@ -13,7 +13,6 @@ 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/IImplementerLogic.cs

@@ -1,20 +0,0 @@
-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

@@ -1,19 +0,0 @@
-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,6 +16,5 @@ namespace SushiBarContracts.BusinessLogicsContracts
         bool TakeOrderInWork(OrderBindingModel model);
         bool FinishOrder(OrderBindingModel model);
         bool DeliveryOrder(OrderBindingModel model);
-        OrderViewModel? ReadElement(OrderSearchModel model);
     }
 }

SushiBar/SushiBarContracts/BusinessLogicsContracts/IWorkProcess.cs

@@ -1,13 +0,0 @@
-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/SearchModels/ImplementerSearchModel.cs

@@ -1,15 +0,0 @@
-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

@@ -1,16 +0,0 @@
-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,5 +1,4 @@
-using SushiBarDataModels.Enums;
-using System;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
@@ -13,7 +12,5 @@ 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/IImplementerStorage.cs

@@ -1,21 +0,0 @@
-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

@@ -1,20 +0,0 @@
-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/ImplementerViewModel.cs

@@ -1,27 +0,0 @@
-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
-    {
-        public int Id { get; set; }
-
-        [DisplayName("ФИО исполнителя")]
-        public string ImplementerFIO { get; set; } = string.Empty;
-
-        [DisplayName("Пароль")]
-        public string Password { get; set; } = string.Empty;
-
-        [DisplayName("Стаж работы")]
-        public int WorkExperience { get; set; }
-
-        [DisplayName("Квалификация")]
-        public int Qualification { get; set; }
-    }
-}

SushiBar/SushiBarContracts/ViewModels/MessageInfoViewModel.cs

@@ -1,38 +0,0 @@
-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
-	{
-		public string MessageId { get; set; } = string.Empty;
-
-		public int? ClientId { get; set; }
-
-		[DisplayName("Отправитель")]
-		public string SenderName { get; set; } = string.Empty;
-
-		[DisplayName("Дата письма")]
-		public DateTime DateDelivery { get; set; }
-
-		[DisplayName("Заголовок")]
-		public string Subject { get; set; } = string.Empty;
-
-		[DisplayName("Текст")]
-		public string Body { get; set; } = string.Empty;
-
-		[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

@@ -13,12 +13,9 @@ namespace SushiBarContracts.ViewModels
     {
         [DisplayName("Номер")]
         public int Id { get; set; }
-        public int? ImplementerId { get; set; }
-        [DisplayName("Исполнитель")]
-        public string? ImplementerFIO { get; set; } = null;
+
         public int SushiId { get; set; }
         public int ClientId { get; set; }
-        public string ClientEmail { get; set; } = string.Empty;
 
         [DisplayName("ФИО клиента")]
         public string ClientFIO { get; set; } = string.Empty;

SushiBar/SushiBarDataModels/Enums/OrderStatus.cs

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

SushiBar/SushiBarDataModels/Models/IImplementerModel.cs

@@ -1,19 +0,0 @@
-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

@@ -1,21 +0,0 @@
-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,6 +16,5 @@ namespace SushiBarDataModels.Models
         OrderStatus Status { get; }
         DateTime DateCreate { get; }
         DateTime? DateImplement { get; }
-        int? ImplementerId { get; }
     }
 }

SushiBar/SushiBarDatabaseImplement/Implements/ClientStorage.cs

@@ -36,9 +36,10 @@ namespace SushiBarDatabaseImplement.Implements
                 return null;
             }
             using var context = new SushiBarDatabase();
-            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;
+            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;
         }
 
         public ClientViewModel? Insert(ClientBindingModel model)

SushiBar/SushiBarDatabaseImplement/Implements/ImplementerStorage.cs

@@ -1,84 +0,0 @@
-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

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

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

@@ -12,7 +12,7 @@ using SushiBarDatabaseImplement;
 namespace SushiBarDatabaseImplement.Migrations
 {
     [DbContext(typeof(SushiBarDatabase))]
-    [Migration("20240620075442_InitCreate")]
+    [Migration("20240508132013_InitCreate")]
     partial class InitCreate
     {
         /// <inheritdoc />
@@ -25,33 +25,6 @@ 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")
@@ -97,47 +70,6 @@ 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")
@@ -158,9 +90,6 @@ namespace SushiBarDatabaseImplement.Migrations
                     b.Property<DateTime?>("DateImplement")
                         .HasColumnType("datetime2");
 
-                    b.Property<int?>("ImplementerId")
-                        .HasColumnType("int");
-
                     b.Property<int>("Status")
                         .HasColumnType("int");
 
@@ -174,8 +103,6 @@ namespace SushiBarDatabaseImplement.Migrations
 
                     b.HasIndex("ClientId");
 
-                    b.HasIndex("ImplementerId");
-
                     b.HasIndex("SushiId");
 
                     b.ToTable("Orders");
@@ -280,33 +207,14 @@ 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("ClientOrders")
+                        .WithMany("Orders")
                         .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")
@@ -315,8 +223,6 @@ namespace SushiBarDatabaseImplement.Migrations
 
                     b.Navigation("Client");
 
-                    b.Navigation("Implementer");
-
                     b.Navigation("Sushi");
                 });
 
@@ -358,16 +264,9 @@ namespace SushiBarDatabaseImplement.Migrations
                     b.Navigation("Sushi");
                 });
 
-            modelBuilder.Entity("SushiBarDataModels.Models.Implementer", b =>
-                {
-                    b.Navigation("Order");
-                });
-
             modelBuilder.Entity("SushiBarDatabaseImplement.Models.Client", b =>
                 {
-                    b.Navigation("ClientMessages");
-
-                    b.Navigation("ClientOrders");
+                    b.Navigation("Orders");
                 });
 
             modelBuilder.Entity("SushiBarDatabaseImplement.Models.Component", b =>

SushiBar/SushiBarDatabaseImplement/Migrations/20240508132013_InitCreate.cs

@@ -40,22 +40,6 @@ namespace SushiBarDatabaseImplement.Migrations
                     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
@@ -86,35 +70,6 @@ namespace SushiBarDatabaseImplement.Migrations
                     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),
-                    IsReaded = table.Column<bool>(type: "bit", nullable: false),
-                    ReplyMessageId = table.Column<string>(type: "nvarchar(450)", nullable: true),
-                    IsReply = table.Column<bool>(type: "bit", 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");
-                    table.ForeignKey(
-                        name: "FK_MessageInfos_MessageInfos_ReplyMessageId",
-                        column: x => x.ReplyMessageId,
-                        principalTable: "MessageInfos",
-                        principalColumn: "MessageId");
-                });
-
             migrationBuilder.CreateTable(
                 name: "Orders",
                 columns: table => new
@@ -127,8 +82,7 @@ namespace SushiBarDatabaseImplement.Migrations
                     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)
+                    DateImplement = table.Column<DateTime>(type: "datetime2", nullable: true)
                 },
                 constraints: table =>
                 {
@@ -139,11 +93,6 @@ namespace SushiBarDatabaseImplement.Migrations
                         principalTable: "Clients",
                         principalColumn: "Id",
                         onDelete: ReferentialAction.Cascade);
-                    table.ForeignKey(
-                        name: "FK_Orders_Implementers_ImplementerId",
-                        column: x => x.ImplementerId,
-                        principalTable: "Implementers",
-                        principalColumn: "Id");
                     table.ForeignKey(
                         name: "FK_Orders_Sushis_SushiId",
                         column: x => x.SushiId,
@@ -206,26 +155,11 @@ namespace SushiBarDatabaseImplement.Migrations
                         onDelete: ReferentialAction.Cascade);
                 });
 
-            migrationBuilder.CreateIndex(
-                name: "IX_MessageInfos_ClientId",
-                table: "MessageInfos",
-                column: "ClientId");
-
-            migrationBuilder.CreateIndex(
-                name: "IX_MessageInfos_ReplyMessageId",
-                table: "MessageInfos",
-                column: "ReplyMessageId");
-
             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",
@@ -255,9 +189,6 @@ namespace SushiBarDatabaseImplement.Migrations
         /// <inheritdoc />
         protected override void Down(MigrationBuilder migrationBuilder)
         {
-            migrationBuilder.DropTable(
-                name: "MessageInfos");
-
             migrationBuilder.DropTable(
                 name: "Orders");
 
@@ -270,9 +201,6 @@ namespace SushiBarDatabaseImplement.Migrations
             migrationBuilder.DropTable(
                 name: "Clients");
 
-            migrationBuilder.DropTable(
-                name: "Implementers");
-
             migrationBuilder.DropTable(
                 name: "Shops");
 

SushiBar/SushiBarDatabaseImplement/Migrations/SushiBarDatabaseModelSnapshot.cs

@@ -22,33 +22,6 @@ 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")
@@ -94,47 +67,6 @@ 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")
@@ -155,9 +87,6 @@ namespace SushiBarDatabaseImplement.Migrations
                     b.Property<DateTime?>("DateImplement")
                         .HasColumnType("datetime2");
 
-                    b.Property<int?>("ImplementerId")
-                        .HasColumnType("int");
-
                     b.Property<int>("Status")
                         .HasColumnType("int");
 
@@ -171,8 +100,6 @@ namespace SushiBarDatabaseImplement.Migrations
 
                     b.HasIndex("ClientId");
 
-                    b.HasIndex("ImplementerId");
-
                     b.HasIndex("SushiId");
 
                     b.ToTable("Orders");
@@ -277,33 +204,14 @@ 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("ClientOrders")
+                        .WithMany("Orders")
                         .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")
@@ -312,8 +220,6 @@ namespace SushiBarDatabaseImplement.Migrations
 
                     b.Navigation("Client");
 
-                    b.Navigation("Implementer");
-
                     b.Navigation("Sushi");
                 });
 
@@ -355,16 +261,9 @@ namespace SushiBarDatabaseImplement.Migrations
                     b.Navigation("Sushi");
                 });
 
-            modelBuilder.Entity("SushiBarDataModels.Models.Implementer", b =>
-                {
-                    b.Navigation("Order");
-                });
-
             modelBuilder.Entity("SushiBarDatabaseImplement.Models.Client", b =>
                 {
-                    b.Navigation("ClientMessages");
-
-                    b.Navigation("ClientOrders");
+                    b.Navigation("Orders");
                 });
 
             modelBuilder.Entity("SushiBarDatabaseImplement.Models.Component", b =>

SushiBar/SushiBarDatabaseImplement/Models/Client.cs

@@ -26,12 +26,9 @@ namespace SushiBarDatabaseImplement.Models
 		public string Password { get; set; } = string.Empty;
 
 		[ForeignKey("ClientId")]
-        public virtual List<Order> ClientOrders { get; set; } = new();
+		public virtual List<Order> Orders { get; set; } = new();
 
-        [ForeignKey("ClientId")]
-        public virtual List<MessageInfo> ClientMessages { get; set; } = new();
-
-        public static Client? Create(ClientBindingModel model)
+		public static Client? Create(ClientBindingModel model)
 		{
 			if (model == null)
 			{

SushiBar/SushiBarDatabaseImplement/Models/Implementer.cs

@@ -1,70 +0,0 @@
-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;
-
-namespace SushiBarDataModels.Models
-{
-    public class Implementer : IImplementerModel
-    {
-        public int Id { get; set; }
-
-        [Required]
-        public string ImplementerFIO { get; set; } = string.Empty;
-
-        [Required]
-        public string Password { get; set; } = string.Empty;
-
-        [Required]
-        public int WorkExperience { get; set; }
-
-        [Required]
-        public int Qualification { get; set; }
-
-        [ForeignKey("ImplementerId")]
-        public virtual List<Order> Order { get; set; } = new();
-
-        public static Implementer? Create(ImplementerBindingModel? model)
-        {
-            if (model == null)
-            {
-                return null;
-            }
-            return new Implementer()
-            {
-                Id = model.Id,
-                ImplementerFIO = model.ImplementerFIO,
-                Password = model.Password,
-                WorkExperience = model.WorkExperience,
-                Qualification = model.Qualification
-            };
-        }
-
-        public void Update(ImplementerBindingModel model)
-        {
-            if (model == null)
-            {
-                return;
-            }
-            ImplementerFIO = model.ImplementerFIO;
-            Password = model.Password;
-            WorkExperience = model.WorkExperience;
-            Qualification = model.Qualification;
-        }
-
-        public ImplementerViewModel GetViewModel => new()
-        {
-            Id = Id,
-            ImplementerFIO = ImplementerFIO,
-            Password = Password,
-            WorkExperience = WorkExperience,
-            Qualification = Qualification
-        };
-    }
-}

SushiBar/SushiBarDatabaseImplement/Models/MessageInfo.cs

@@ -1,95 +0,0 @@
-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;
-
-namespace SushiBarDatabaseImplement.Models
-{
-	public class MessageInfo : IMessageInfoModel
-	{
-		[Key]
-		[DatabaseGenerated(DatabaseGeneratedOption.None)]
-		public string MessageId { get; set; } = string.Empty;
-
-		public int? ClientId { get; set; }
-
-		public virtual Client? Client { get; set; }
-
-		[Required]
-		public string SenderName { get; set; } = string.Empty;
-
-		[Required]
-		public DateTime DateDelivery { get; set; }
-
-		[Required]
-		public string Subject { get; set; } = string.Empty;
-
-		[Required]
-		public string Body { get; set; } = string.Empty;
-
-		[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,
-			IsReaded = IsReaded,
-			ReplyMessageId = ReplyMessageId,
-			Reply = Reply,
-			IsReply = IsReply
-		};
-	}
-}

SushiBar/SushiBarDatabaseImplement/Models/Order.cs

@@ -36,9 +36,6 @@ namespace SushiBarDatabaseImplement.Models
         public DateTime DateCreate { get; private set; } = DateTime.Now;
 
         public DateTime? DateImplement { get; private set; }
-        public int? ImplementerId { get; private set; }
-
-        public virtual Implementer? Implementer { get; set; } = new();
 
         public static Order Create(SushiBarDatabase context, OrderBindingModel model)
         {
@@ -49,8 +46,6 @@ 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,
@@ -59,7 +54,7 @@ namespace SushiBarDatabaseImplement.Models
             };
         }
 
-        public void Update(SushiBarDatabase context, OrderBindingModel? model)
+        public void Update(OrderBindingModel? model)
         {
             if (model == null)
             {
@@ -67,8 +62,6 @@ 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()
@@ -76,11 +69,8 @@ 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/SushiBarDatatbase.cs

@@ -5,7 +5,6 @@ using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 using SushiBarDatabaseImplement.Models;
-using SushiBarDataModels.Models;
 
 namespace SushiBarDatabaseImplement
 {
@@ -24,9 +23,7 @@ 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,15 +15,11 @@ 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()
@@ -39,9 +35,7 @@ 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()
         {
@@ -49,8 +43,6 @@ 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/Implements/ImplementerStorage.cs

@@ -1,99 +0,0 @@
-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

@@ -1,71 +0,0 @@
-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,11 +33,7 @@ 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();
@@ -47,10 +43,6 @@ 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

@@ -1,87 +0,0 @@
-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

@@ -1,105 +0,0 @@
-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,7 +15,6 @@ 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; }
@@ -34,7 +33,6 @@ namespace SushiBarFileImplement.Models
                 Id = model.Id,
                 SushiId = model.SushiId,
                 ClientId = model.ClientId,
-                ImplementerId = model.ImplementerId,
                 Count = model.Count,
                 Sum = model.Sum,
                 Status = model.Status,
@@ -55,7 +53,6 @@ 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)),
@@ -80,7 +77,6 @@ namespace SushiBarFileImplement.Models
             Id = Id,
             SushiId = SushiId,
             ClientId = ClientId,
-            ImplementerId = ImplementerId,
             Count = Count,
             Sum = Sum,
             Status = Status,
@@ -92,7 +88,6 @@ 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/SushiBarListImplement_/DataListSingleton.cs

@@ -14,8 +14,6 @@ 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()
         {
@@ -23,8 +21,6 @@ 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

@@ -1,123 +0,0 @@
-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

@@ -1,95 +0,0 @@
-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,16 +54,6 @@ 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)
@@ -89,10 +79,6 @@ 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

@@ -1,60 +0,0 @@
-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

@@ -1,72 +0,0 @@
-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,7 +20,6 @@ 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)
         {
@@ -33,7 +32,6 @@ namespace SushiBarListImplement.Models
                 Id = model.Id,
                 SushiId = model.SushiId,
                 ClientId = model.ClientId,
-                ImplementerId = model.ImplementerId,
                 Count = model.Count,
                 Sum = model.Sum,
                 Status = model.Status,
@@ -57,7 +55,6 @@ namespace SushiBarListImplement.Models
             Id = Id,
             SushiId = SushiId,
             ClientId = ClientId,
-            ImplementerId = ImplementerId,
             Count = Count,
             Sum = Sum,
             Status = Status,

SushiBar/SushiBarRestApi/Controllers/ClientController.cs

@@ -3,94 +3,65 @@ 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;
+        [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;
+                }
+            }
 
-		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

@@ -1,107 +0,0 @@
-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,14 +1,11 @@
 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);
 
@@ -22,11 +19,6 @@ 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
@@ -41,16 +33,7 @@ builder.Services.AddSwaggerGen(c =>
     });
 });
 var app = builder.Build();
-var mailSender = app.Services.GetService<AbstractMailWorker>();
-mailSender?.MailConfig(new MailConfigBindingModel
-{
-    MailLogin = builder.Configuration?.GetSection("MailLogin")?.Value?.ToString() ?? string.Empty,
-    MailPassword = builder.Configuration?.GetSection("MailPassword")?.Value?.ToString() ?? string.Empty,
-    SmtpClientHost = builder.Configuration?.GetSection("SmtpClientHost")?.Value?.ToString() ?? string.Empty,
-    SmtpClientPort = Convert.ToInt32(builder.Configuration?.GetSection("SmtpClientPort")?.Value?.ToString()),
-    PopHost = builder.Configuration?.GetSection("PopHost")?.Value?.ToString() ?? string.Empty,
-    PopPort = Convert.ToInt32(builder.Configuration?.GetSection("PopPort")?.Value?.ToString())
-});
+APIConfig.LoadData(builder.Configuration);
 // Configure the HTTP request pipeline.
 if (app.Environment.IsDevelopment())
 {

SushiBar/SushiBarRestApi/appsettings.json

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

SushiBar/SushiBarView/App.config

@@ -1,11 +0,0 @@
-<?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/FormImplementer.Designer.cs

@@ -1,167 +0,0 @@
-namespace SushiBarView
-{
-    partial class FormImplementer
-    {
-        /// <summary>
-        /// Required designer variable.
-        /// </summary>
-        private System.ComponentModel.IContainer components = null;
-
-        /// <summary>
-        /// Clean up any resources being used.
-        /// </summary>
-        /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
-        protected override void Dispose(bool disposing)
-        {
-            if (disposing && (components != null))
-            {
-                components.Dispose();
-            }
-            base.Dispose(disposing);
-        }
-
-        #region Windows Form Designer generated code
-
-        /// <summary>
-        /// Required method for Designer support - do not modify
-        /// the contents of this method with the code editor.
-        /// </summary>
-        private void InitializeComponent()
-        {
-            this.textBoxFIO = new System.Windows.Forms.TextBox();
-            this.labelFIO = new System.Windows.Forms.Label();
-            this.textBoxPassword = new System.Windows.Forms.TextBox();
-            this.labelPassword = new System.Windows.Forms.Label();
-            this.labelWorkExperience = new System.Windows.Forms.Label();
-            this.numericUpDownWorkExperience = new System.Windows.Forms.NumericUpDown();
-            this.numericUpDownQualification = new System.Windows.Forms.NumericUpDown();
-            this.labelQualification = new System.Windows.Forms.Label();
-            this.buttonCancel = new System.Windows.Forms.Button();
-            this.buttonSave = new System.Windows.Forms.Button();
-            ((System.ComponentModel.ISupportInitialize)(this.numericUpDownWorkExperience)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.numericUpDownQualification)).BeginInit();
-            this.SuspendLayout();
-            // 
-            // textBoxFIO
-            // 
-            this.textBoxFIO.Location = new System.Drawing.Point(157, 12);
-            this.textBoxFIO.Name = "textBoxFIO";
-            this.textBoxFIO.Size = new System.Drawing.Size(382, 27);
-            this.textBoxFIO.TabIndex = 3;
-            // 
-            // labelFIO
-            // 
-            this.labelFIO.AutoSize = true;
-            this.labelFIO.Location = new System.Drawing.Point(12, 15);
-            this.labelFIO.Name = "labelFIO";
-            this.labelFIO.Size = new System.Drawing.Size(139, 20);
-            this.labelFIO.TabIndex = 2;
-            this.labelFIO.Text = "ФИО исполнителя:";
-            // 
-            // textBoxPassword
-            // 
-            this.textBoxPassword.Location = new System.Drawing.Point(157, 50);
-            this.textBoxPassword.Name = "textBoxPassword";
-            this.textBoxPassword.Size = new System.Drawing.Size(205, 27);
-            this.textBoxPassword.TabIndex = 5;
-            // 
-            // labelPassword
-            // 
-            this.labelPassword.AutoSize = true;
-            this.labelPassword.Location = new System.Drawing.Point(12, 53);
-            this.labelPassword.Name = "labelPassword";
-            this.labelPassword.Size = new System.Drawing.Size(65, 20);
-            this.labelPassword.TabIndex = 4;
-            this.labelPassword.Text = "Пароль:";
-            // 
-            // labelWorkExperience
-            // 
-            this.labelWorkExperience.AutoSize = true;
-            this.labelWorkExperience.Location = new System.Drawing.Point(12, 99);
-            this.labelWorkExperience.Name = "labelWorkExperience";
-            this.labelWorkExperience.Size = new System.Drawing.Size(105, 20);
-            this.labelWorkExperience.TabIndex = 6;
-            this.labelWorkExperience.Text = "Опыт работы:";
-            // 
-            // numericUpDownWorkExperience
-            // 
-            this.numericUpDownWorkExperience.Location = new System.Drawing.Point(157, 97);
-            this.numericUpDownWorkExperience.Name = "numericUpDownWorkExperience";
-            this.numericUpDownWorkExperience.Size = new System.Drawing.Size(124, 27);
-            this.numericUpDownWorkExperience.TabIndex = 8;
-            // 
-            // numericUpDownQualification
-            // 
-            this.numericUpDownQualification.Location = new System.Drawing.Point(157, 142);
-            this.numericUpDownQualification.Name = "numericUpDownQualification";
-            this.numericUpDownQualification.Size = new System.Drawing.Size(124, 27);
-            this.numericUpDownQualification.TabIndex = 10;
-            // 
-            // labelQualification
-            // 
-            this.labelQualification.AutoSize = true;
-            this.labelQualification.Location = new System.Drawing.Point(12, 144);
-            this.labelQualification.Name = "labelQualification";
-            this.labelQualification.Size = new System.Drawing.Size(114, 20);
-            this.labelQualification.TabIndex = 9;
-            this.labelQualification.Text = "Квалификация:";
-            // 
-            // buttonCancel
-            // 
-            this.buttonCancel.Location = new System.Drawing.Point(422, 203);
-            this.buttonCancel.Name = "buttonCancel";
-            this.buttonCancel.Size = new System.Drawing.Size(136, 40);
-            this.buttonCancel.TabIndex = 12;
-            this.buttonCancel.Text = "Отмена";
-            this.buttonCancel.UseVisualStyleBackColor = true;
-            this.buttonCancel.Click += new System.EventHandler(this.buttonCancel_Click);
-            // 
-            // buttonSave
-            // 
-            this.buttonSave.Location = new System.Drawing.Point(265, 203);
-            this.buttonSave.Name = "buttonSave";
-            this.buttonSave.Size = new System.Drawing.Size(130, 40);
-            this.buttonSave.TabIndex = 11;
-            this.buttonSave.Text = "Сохранить";
-            this.buttonSave.UseVisualStyleBackColor = true;
-            this.buttonSave.Click += new System.EventHandler(this.buttonSave_Click);
-            // 
-            // FormImplementer
-            // 
-            this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 20F);
-            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.ClientSize = new System.Drawing.Size(570, 255);
-            this.Controls.Add(this.buttonCancel);
-            this.Controls.Add(this.buttonSave);
-            this.Controls.Add(this.numericUpDownQualification);
-            this.Controls.Add(this.labelQualification);
-            this.Controls.Add(this.numericUpDownWorkExperience);
-            this.Controls.Add(this.labelWorkExperience);
-            this.Controls.Add(this.textBoxPassword);
-            this.Controls.Add(this.labelPassword);
-            this.Controls.Add(this.textBoxFIO);
-            this.Controls.Add(this.labelFIO);
-            this.Name = "FormImplementer";
-            this.Text = "Исполнитель";
-            this.Load += new System.EventHandler(this.FormImplementer_Load);
-            ((System.ComponentModel.ISupportInitialize)(this.numericUpDownWorkExperience)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.numericUpDownQualification)).EndInit();
-            this.ResumeLayout(false);
-            this.PerformLayout();
-
-        }
-
-        #endregion
-
-        private TextBox textBoxFIO;
-        private Label labelFIO;
-        private TextBox textBoxPassword;
-        private Label labelPassword;
-        private Label labelWorkExperience;
-        private NumericUpDown numericUpDownWorkExperience;
-        private NumericUpDown numericUpDownQualification;
-        private Label labelQualification;
-        private Button buttonCancel;
-        private Button buttonSave;
-    }
-}

SushiBar/SushiBarView/FormImplementer.cs

@@ -1,95 +0,0 @@
-using Microsoft.Extensions.Logging;
-using SushiBarContracts.BindingModels;
-using SushiBarContracts.BusinessLogicsContracts;
-using SushiBarContracts.SearchModels;
-using SushiBarDataModels.Models;
-
-namespace SushiBarView
-{
-    public partial class FormImplementer : Form
-    {
-        private readonly ILogger _logger;
-        private readonly IImplementerLogic _logic;
-        private int? _id;
-        public int Id { set { _id = value; } }
-
-        public FormImplementer(ILogger<FormImplementer> logger, IImplementerLogic logic)
-        {
-            InitializeComponent();
-            _logger = logger;
-            _logic = logic;
-        }
-
-        private void FormImplementer_Load(object sender, EventArgs e)
-        {
-            if (_id.HasValue)
-            {
-                try
-                {
-                    _logger.LogInformation("Получение исполнителя");
-                    var view = _logic.ReadElement(new ImplementerSearchModel
-                    {
-                        Id = _id.Value
-                    });
-                    if (view != null)
-                    {
-                        textBoxFIO.Text = view.ImplementerFIO;
-                        textBoxPassword.Text = view.Password;
-                        numericUpDownWorkExperience.Value = view.WorkExperience;
-                        numericUpDownQualification.Value = view.Qualification;
-                    }
-                }
-                catch (Exception ex)
-                {
-                    _logger.LogError(ex, "Ошибка получения исполнителя");
-                    MessageBox.Show(ex.Message, "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error);
-                }
-            }
-        }
-
-        private void buttonSave_Click(object sender, EventArgs e)
-        {
-            if (string.IsNullOrEmpty(textBoxFIO.Text))
-            {
-                MessageBox.Show("Заполните ФИО", "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error);
-                return;
-            }
-            if (string.IsNullOrEmpty(textBoxPassword.Text))
-            {
-                MessageBox.Show("Заполните пароль", "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error);
-                return;
-            }
-            _logger.LogInformation("Сохранение исполнителя");
-            try
-            {
-                var model = new ImplementerBindingModel
-                {
-                    Id = _id ?? 0,
-                    ImplementerFIO = textBoxFIO.Text,
-                    Password = textBoxPassword.Text,
-                    WorkExperience = (int)numericUpDownWorkExperience.Value,
-                    Qualification = (int)numericUpDownQualification.Value
-                };
-                var operationResult = _id.HasValue ? _logic.Update(model) : _logic.Create(model);
-                if (!operationResult)
-                {
-                    throw new Exception("Ошибка при создании или обновлении. Дополнительная информация в логах.");
-                }
-                MessageBox.Show("Сохранение прошло успешно", "Сообщение", MessageBoxButtons.OK, MessageBoxIcon.Information);
-                DialogResult = DialogResult.OK;
-                Close();
-            }
-            catch (Exception ex)
-            {
-                _logger.LogError(ex, "Ошибка сохранения исполнителя");
-                MessageBox.Show(ex.Message, "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error);
-            }
-        }
-
-        private void buttonCancel_Click(object sender, EventArgs e)
-        {
-            DialogResult = DialogResult.Cancel;
-            Close();
-        }
-    }
-}

SushiBar/SushiBarView/FormImplementer.resx

@@ -1,120 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<root>
-  <!-- 
-    Microsoft ResX Schema 
-    
-    Version 2.0
-    
-    The primary goals of this format is to allow a simple XML format 
-    that is mostly human readable. The generation and parsing of the 
-    various data types are done through the TypeConverter classes 
-    associated with the data types.
-    
-    Example:
-    
-    ... ado.net/XML headers & schema ...
-    <resheader name="resmimetype">text/microsoft-resx</resheader>
-    <resheader name="version">2.0</resheader>
-    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
-    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
-    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
-    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
-    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
-        <value>[base64 mime encoded serialized .NET Framework object]</value>
-    </data>
-    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
-        <comment>This is a comment</comment>
-    </data>
-                
-    There are any number of "resheader" rows that contain simple 
-    name/value pairs.
-    
-    Each data row contains a name, and value. The row also contains a 
-    type or mimetype. Type corresponds to a .NET class that support 
-    text/value conversion through the TypeConverter architecture. 
-    Classes that don't support this are serialized and stored with the 
-    mimetype set.
-    
-    The mimetype is used for serialized objects, and tells the 
-    ResXResourceReader how to depersist the object. This is currently not 
-    extensible. For a given mimetype the value must be set accordingly:
-    
-    Note - application/x-microsoft.net.object.binary.base64 is the format 
-    that the ResXResourceWriter will generate, however the reader can 
-    read any of the formats listed below.
-    
-    mimetype: application/x-microsoft.net.object.binary.base64
-    value   : The object must be serialized with 
-            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
-            : and then encoded with base64 encoding.
-    
-    mimetype: application/x-microsoft.net.object.soap.base64
-    value   : The object must be serialized with 
-            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
-            : and then encoded with base64 encoding.
-
-    mimetype: application/x-microsoft.net.object.bytearray.base64
-    value   : The object must be serialized into a byte array 
-            : using a System.ComponentModel.TypeConverter
-            : and then encoded with base64 encoding.
-    -->
-  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
-    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
-    <xsd:element name="root" msdata:IsDataSet="true">
-      <xsd:complexType>
-        <xsd:choice maxOccurs="unbounded">
-          <xsd:element name="metadata">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" />
-              </xsd:sequence>
-              <xsd:attribute name="name" use="required" type="xsd:string" />
-              <xsd:attribute name="type" type="xsd:string" />
-              <xsd:attribute name="mimetype" type="xsd:string" />
-              <xsd:attribute ref="xml:space" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="assembly">
-            <xsd:complexType>
-              <xsd:attribute name="alias" type="xsd:string" />
-              <xsd:attribute name="name" type="xsd:string" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="data">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
-              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
-              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
-              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
-              <xsd:attribute ref="xml:space" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="resheader">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" use="required" />
-            </xsd:complexType>
-          </xsd:element>
-        </xsd:choice>
-      </xsd:complexType>
-    </xsd:element>
-  </xsd:schema>
-  <resheader name="resmimetype">
-    <value>text/microsoft-resx</value>
-  </resheader>
-  <resheader name="version">
-    <value>2.0</value>
-  </resheader>
-  <resheader name="reader">
-    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </resheader>
-  <resheader name="writer">
-    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </resheader>
-</root>

SushiBar/SushiBarView/FormImplementers.Designer.cs

@@ -1,130 +0,0 @@
-namespace SushiBarView
-{
-    partial class FormImplementers
-    {
-        /// <summary>
-        /// Required designer variable.
-        /// </summary>
-        private System.ComponentModel.IContainer components = null;
-
-        /// <summary>
-        /// Clean up any resources being used.
-        /// </summary>
-        /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
-        protected override void Dispose(bool disposing)
-        {
-            if (disposing && (components != null))
-            {
-                components.Dispose();
-            }
-            base.Dispose(disposing);
-        }
-
-        #region Windows Form Designer generated code
-
-        /// <summary>
-        /// Required method for Designer support - do not modify
-        /// the contents of this method with the code editor.
-        /// </summary>
-        private void InitializeComponent()
-        {
-            this.ToolsPanel = new System.Windows.Forms.Panel();
-            this.buttonRef = new System.Windows.Forms.Button();
-            this.buttonDel = new System.Windows.Forms.Button();
-            this.buttonUpd = new System.Windows.Forms.Button();
-            this.buttonAdd = new System.Windows.Forms.Button();
-            this.dataGridView = new System.Windows.Forms.DataGridView();
-            this.ToolsPanel.SuspendLayout();
-            ((System.ComponentModel.ISupportInitialize)(this.dataGridView)).BeginInit();
-            this.SuspendLayout();
-            // 
-            // ToolsPanel
-            // 
-            this.ToolsPanel.Controls.Add(this.buttonRef);
-            this.ToolsPanel.Controls.Add(this.buttonDel);
-            this.ToolsPanel.Controls.Add(this.buttonUpd);
-            this.ToolsPanel.Controls.Add(this.buttonAdd);
-            this.ToolsPanel.Location = new System.Drawing.Point(608, 12);
-            this.ToolsPanel.Name = "ToolsPanel";
-            this.ToolsPanel.Size = new System.Drawing.Size(180, 426);
-            this.ToolsPanel.TabIndex = 3;
-            // 
-            // buttonRef
-            // 
-            this.buttonRef.Location = new System.Drawing.Point(31, 206);
-            this.buttonRef.Name = "buttonRef";
-            this.buttonRef.Size = new System.Drawing.Size(126, 36);
-            this.buttonRef.TabIndex = 3;
-            this.buttonRef.Text = "Обновить";
-            this.buttonRef.UseVisualStyleBackColor = true;
-            this.buttonRef.Click += new System.EventHandler(this.buttonRef_Click);
-            // 
-            // buttonDel
-            // 
-            this.buttonDel.Location = new System.Drawing.Point(31, 142);
-            this.buttonDel.Name = "buttonDel";
-            this.buttonDel.Size = new System.Drawing.Size(126, 36);
-            this.buttonDel.TabIndex = 2;
-            this.buttonDel.Text = "Удалить";
-            this.buttonDel.UseVisualStyleBackColor = true;
-            this.buttonDel.Click += new System.EventHandler(this.buttonDel_Click);
-            // 
-            // buttonUpd
-            // 
-            this.buttonUpd.Location = new System.Drawing.Point(31, 76);
-            this.buttonUpd.Name = "buttonUpd";
-            this.buttonUpd.Size = new System.Drawing.Size(126, 36);
-            this.buttonUpd.TabIndex = 1;
-            this.buttonUpd.Text = "Изменить";
-            this.buttonUpd.UseVisualStyleBackColor = true;
-            this.buttonUpd.Click += new System.EventHandler(this.buttonUpd_Click);
-            // 
-            // buttonAdd
-            // 
-            this.buttonAdd.Location = new System.Drawing.Point(31, 16);
-            this.buttonAdd.Name = "buttonAdd";
-            this.buttonAdd.Size = new System.Drawing.Size(126, 36);
-            this.buttonAdd.TabIndex = 0;
-            this.buttonAdd.Text = "Добавить";
-            this.buttonAdd.UseVisualStyleBackColor = true;
-            this.buttonAdd.Click += new System.EventHandler(this.buttonAdd_Click);
-            // 
-            // dataGridView
-            // 
-            this.dataGridView.AllowUserToAddRows = false;
-            this.dataGridView.AllowUserToDeleteRows = false;
-            this.dataGridView.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
-            this.dataGridView.Location = new System.Drawing.Point(12, 12);
-            this.dataGridView.Name = "dataGridView";
-            this.dataGridView.ReadOnly = true;
-            this.dataGridView.RowHeadersWidth = 51;
-            this.dataGridView.RowTemplate.Height = 29;
-            this.dataGridView.Size = new System.Drawing.Size(590, 426);
-            this.dataGridView.TabIndex = 2;
-            // 
-            // FormImplementers
-            // 
-            this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 20F);
-            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.ClientSize = new System.Drawing.Size(800, 450);
-            this.Controls.Add(this.ToolsPanel);
-            this.Controls.Add(this.dataGridView);
-            this.Name = "FormImplementers";
-            this.Text = "Исполнители";
-            this.Load += new System.EventHandler(this.FormImplementers_Load);
-            this.ToolsPanel.ResumeLayout(false);
-            ((System.ComponentModel.ISupportInitialize)(this.dataGridView)).EndInit();
-            this.ResumeLayout(false);
-
-        }
-
-        #endregion
-
-        private Panel ToolsPanel;
-        private Button buttonRef;
-        private Button buttonDel;
-        private Button buttonUpd;
-        private Button buttonAdd;
-        private DataGridView dataGridView;
-    }
-}

SushiBar/SushiBarView/FormImplementers.cs

@@ -1,118 +0,0 @@
-using Microsoft.Extensions.Logging;
-using SushiBar;
-using SushiBarContracts.BindingModels;
-using SushiBarContracts.BusinessLogicsContracts;
-using System;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.Data;
-using System.Drawing;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using System.Windows.Forms;
-
-namespace SushiBarView
-{
-    public partial class FormImplementers : Form
-    {
-        private readonly ILogger _logger;
-        private readonly IImplementerLogic _logic;
-
-        public FormImplementers(ILogger<FormImplementers> logger, IImplementerLogic implementerLogic)
-        {
-            InitializeComponent();
-            _logger = logger;
-            _logic = implementerLogic;
-        }
-
-        private void LoadData()
-        {
-            try
-            {
-                var list = _logic.ReadList(null);
-                if (list != null)
-                {
-                    dataGridView.DataSource = list;
-                    dataGridView.Columns["Id"].Visible = false;
-                    dataGridView.Columns["ImplementerFIO"].AutoSizeMode =
-                    DataGridViewAutoSizeColumnMode.Fill;
-                }
-                _logger.LogInformation("Загрузка исполнителей");
-            }
-            catch (Exception ex)
-            {
-                _logger.LogError(ex, "Ошибка загрузки исполнителей");
-                MessageBox.Show(ex.Message, "Ошибка", MessageBoxButtons.OK,
-                MessageBoxIcon.Error);
-            }
-        }
-
-        private void FormImplementers_Load(object sender, EventArgs e)
-        {
-            LoadData();
-        }
-
-        private void buttonAdd_Click(object sender, EventArgs e)
-        {
-            var service = Program.ServiceProvider?.GetService(typeof(FormImplementer));
-            if (service is FormImplementer form)
-            {
-                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(FormImplementer));
-                if (service is FormImplementer form)
-                {
-                    form.Id = Convert.ToInt32(dataGridView.SelectedRows[0].Cells["Id"].Value);
-                    if (form.ShowDialog() == DialogResult.OK)
-                    {
-                        LoadData();
-                    }
-                }
-            }
-        }
-
-        private void buttonDel_Click(object sender, EventArgs e)
-        {
-            if (dataGridView.SelectedRows.Count == 1)
-            {
-                if (MessageBox.Show("Удалить запись?", "Вопрос",
-                MessageBoxButtons.YesNo, MessageBoxIcon.Question) == DialogResult.Yes)
-                {
-                    int id = Convert.ToInt32(dataGridView.SelectedRows[0].Cells["Id"].Value);
-                    _logger.LogInformation("Удаление исполнителя");
-                    try
-                    {
-                        if (!_logic.Delete(new ImplementerBindingModel
-                        {
-                            Id = id
-                        }))
-                        {
-                            throw new Exception("Ошибка при удалении. Дополнительная информация в логах.");
-                        }
-                        LoadData();
-                    }
-                    catch (Exception ex)
-                    {
-                        _logger.LogError(ex, "Ошибка удаления исполнителя");
-                        MessageBox.Show(ex.Message, "Ошибка",
-                        MessageBoxButtons.OK, MessageBoxIcon.Error);
-                    }
-                }
-            }
-        }
-        private void buttonRef_Click(object sender, EventArgs e)
-        {
-            LoadData();
-        }
-    }
-}

SushiBar/SushiBarView/FormImplementers.resx

@@ -1,120 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<root>
-  <!-- 
-    Microsoft ResX Schema 
-    
-    Version 2.0
-    
-    The primary goals of this format is to allow a simple XML format 
-    that is mostly human readable. The generation and parsing of the 
-    various data types are done through the TypeConverter classes 
-    associated with the data types.
-    
-    Example:
-    
-    ... ado.net/XML headers & schema ...
-    <resheader name="resmimetype">text/microsoft-resx</resheader>
-    <resheader name="version">2.0</resheader>
-    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
-    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
-    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
-    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
-    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
-        <value>[base64 mime encoded serialized .NET Framework object]</value>
-    </data>
-    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
-        <comment>This is a comment</comment>
-    </data>
-                
-    There are any number of "resheader" rows that contain simple 
-    name/value pairs.
-    
-    Each data row contains a name, and value. The row also contains a 
-    type or mimetype. Type corresponds to a .NET class that support 
-    text/value conversion through the TypeConverter architecture. 
-    Classes that don't support this are serialized and stored with the 
-    mimetype set.
-    
-    The mimetype is used for serialized objects, and tells the 
-    ResXResourceReader how to depersist the object. This is currently not 
-    extensible. For a given mimetype the value must be set accordingly:
-    
-    Note - application/x-microsoft.net.object.binary.base64 is the format 
-    that the ResXResourceWriter will generate, however the reader can 
-    read any of the formats listed below.
-    
-    mimetype: application/x-microsoft.net.object.binary.base64
-    value   : The object must be serialized with 
-            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
-            : and then encoded with base64 encoding.
-    
-    mimetype: application/x-microsoft.net.object.soap.base64
-    value   : The object must be serialized with 
-            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
-            : and then encoded with base64 encoding.
-
-    mimetype: application/x-microsoft.net.object.bytearray.base64
-    value   : The object must be serialized into a byte array 
-            : using a System.ComponentModel.TypeConverter
-            : and then encoded with base64 encoding.
-    -->
-  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
-    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
-    <xsd:element name="root" msdata:IsDataSet="true">
-      <xsd:complexType>
-        <xsd:choice maxOccurs="unbounded">
-          <xsd:element name="metadata">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" />
-              </xsd:sequence>
-              <xsd:attribute name="name" use="required" type="xsd:string" />
-              <xsd:attribute name="type" type="xsd:string" />
-              <xsd:attribute name="mimetype" type="xsd:string" />
-              <xsd:attribute ref="xml:space" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="assembly">
-            <xsd:complexType>
-              <xsd:attribute name="alias" type="xsd:string" />
-              <xsd:attribute name="name" type="xsd:string" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="data">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
-              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
-              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
-              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
-              <xsd:attribute ref="xml:space" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="resheader">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" use="required" />
-            </xsd:complexType>
-          </xsd:element>
-        </xsd:choice>
-      </xsd:complexType>
-    </xsd:element>
-  </xsd:schema>
-  <resheader name="resmimetype">
-    <value>text/microsoft-resx</value>
-  </resheader>
-  <resheader name="version">
-    <value>2.0</value>
-  </resheader>
-  <resheader name="reader">
-    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </resheader>
-  <resheader name="writer">
-    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </resheader>
-</root>

SushiBar/SushiBarView/FormLetter.Designer.cs

@@ -1,182 +0,0 @@
-namespace SushiBarView
-{
-    partial class FormLetter
-    {
-        /// <summary>
-        /// Required designer variable.
-        /// </summary>
-        private System.ComponentModel.IContainer components = null;
-
-        /// <summary>
-        /// Clean up any resources being used.
-        /// </summary>
-        /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
-        protected override void Dispose(bool disposing)
-        {
-            if (disposing && (components != null))
-            {
-                components.Dispose();
-            }
-            base.Dispose(disposing);
-        }
-
-        #region Windows Form Designer generated code
-
-        /// <summary>
-        /// Required method for Designer support - do not modify
-        /// the contents of this method with the code editor.
-        /// </summary>
-        private void InitializeComponent()
-        {
-            this.textBoxEmail = new System.Windows.Forms.TextBox();
-            this.labelAdress = new System.Windows.Forms.Label();
-            this.labelSubject = new System.Windows.Forms.Label();
-            this.textBoxSubject = new System.Windows.Forms.TextBox();
-            this.labelBody = new System.Windows.Forms.Label();
-            this.textBoxBody = new System.Windows.Forms.TextBox();
-            this.buttonClose = new System.Windows.Forms.Button();
-            this.buttonReply = new System.Windows.Forms.Button();
-            this.labelDate = new System.Windows.Forms.Label();
-            this.textBoxDate = new System.Windows.Forms.TextBox();
-            this.buttonSend = new System.Windows.Forms.Button();
-            this.SuspendLayout();
-            // 
-            // textBoxEmail
-            // 
-            this.textBoxEmail.Location = new System.Drawing.Point(72, 6);
-            this.textBoxEmail.Name = "textBoxEmail";
-            this.textBoxEmail.ReadOnly = true;
-            this.textBoxEmail.Size = new System.Drawing.Size(186, 27);
-            this.textBoxEmail.TabIndex = 0;
-            // 
-            // labelAdress
-            // 
-            this.labelAdress.AutoSize = true;
-            this.labelAdress.Location = new System.Drawing.Point(12, 9);
-            this.labelAdress.Name = "labelAdress";
-            this.labelAdress.Size = new System.Drawing.Size(54, 20);
-            this.labelAdress.TabIndex = 1;
-            this.labelAdress.Text = "Адрес:";
-            // 
-            // labelSubject
-            // 
-            this.labelSubject.AutoSize = true;
-            this.labelSubject.Location = new System.Drawing.Point(12, 55);
-            this.labelSubject.Name = "labelSubject";
-            this.labelSubject.Size = new System.Drawing.Size(47, 20);
-            this.labelSubject.TabIndex = 2;
-            this.labelSubject.Text = "Тема:";
-            // 
-            // textBoxSubject
-            // 
-            this.textBoxSubject.Location = new System.Drawing.Point(72, 52);
-            this.textBoxSubject.Name = "textBoxSubject";
-            this.textBoxSubject.ReadOnly = true;
-            this.textBoxSubject.Size = new System.Drawing.Size(552, 27);
-            this.textBoxSubject.TabIndex = 3;
-            // 
-            // labelBody
-            // 
-            this.labelBody.AutoSize = true;
-            this.labelBody.Location = new System.Drawing.Point(12, 96);
-            this.labelBody.Name = "labelBody";
-            this.labelBody.Size = new System.Drawing.Size(104, 20);
-            this.labelBody.TabIndex = 4;
-            this.labelBody.Text = "Текст письма:";
-            // 
-            // textBoxBody
-            // 
-            this.textBoxBody.Location = new System.Drawing.Point(12, 119);
-            this.textBoxBody.Multiline = true;
-            this.textBoxBody.Name = "textBoxBody";
-            this.textBoxBody.ReadOnly = true;
-            this.textBoxBody.Size = new System.Drawing.Size(612, 186);
-            this.textBoxBody.TabIndex = 5;
-            // 
-            // buttonClose
-            // 
-            this.buttonClose.Location = new System.Drawing.Point(491, 326);
-            this.buttonClose.Name = "buttonClose";
-            this.buttonClose.Size = new System.Drawing.Size(111, 39);
-            this.buttonClose.TabIndex = 6;
-            this.buttonClose.Text = "Закрыть";
-            this.buttonClose.UseVisualStyleBackColor = true;
-            this.buttonClose.Click += new System.EventHandler(this.buttonClose_Click);
-            // 
-            // buttonReply
-            // 
-            this.buttonReply.Location = new System.Drawing.Point(290, 326);
-            this.buttonReply.Name = "buttonReply";
-            this.buttonReply.Size = new System.Drawing.Size(177, 39);
-            this.buttonReply.TabIndex = 7;
-            this.buttonReply.Text = "Ответить";
-            this.buttonReply.UseVisualStyleBackColor = true;
-            this.buttonReply.Click += new System.EventHandler(this.buttonReply_Click);
-            // 
-            // labelDate
-            // 
-            this.labelDate.AutoSize = true;
-            this.labelDate.Location = new System.Drawing.Point(278, 9);
-            this.labelDate.Name = "labelDate";
-            this.labelDate.Size = new System.Drawing.Size(127, 20);
-            this.labelDate.TabIndex = 8;
-            this.labelDate.Text = "Дата получения: ";
-            // 
-            // textBoxDate
-            // 
-            this.textBoxDate.Location = new System.Drawing.Point(411, 6);
-            this.textBoxDate.Name = "textBoxDate";
-            this.textBoxDate.ReadOnly = true;
-            this.textBoxDate.Size = new System.Drawing.Size(213, 27);
-            this.textBoxDate.TabIndex = 9;
-            // 
-            // buttonSend
-            // 
-            this.buttonSend.Location = new System.Drawing.Point(149, 326);
-            this.buttonSend.Name = "buttonSend";
-            this.buttonSend.Size = new System.Drawing.Size(109, 39);
-            this.buttonSend.TabIndex = 10;
-            this.buttonSend.Text = "Отправить";
-            this.buttonSend.UseVisualStyleBackColor = true;
-            this.buttonSend.Visible = false;
-            this.buttonSend.Click += new System.EventHandler(this.buttonSend_Click);
-            // 
-            // FormLetter
-            // 
-            this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 20F);
-            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.ClientSize = new System.Drawing.Size(636, 377);
-            this.Controls.Add(this.buttonSend);
-            this.Controls.Add(this.textBoxDate);
-            this.Controls.Add(this.labelDate);
-            this.Controls.Add(this.buttonReply);
-            this.Controls.Add(this.buttonClose);
-            this.Controls.Add(this.textBoxBody);
-            this.Controls.Add(this.labelBody);
-            this.Controls.Add(this.textBoxSubject);
-            this.Controls.Add(this.labelSubject);
-            this.Controls.Add(this.labelAdress);
-            this.Controls.Add(this.textBoxEmail);
-            this.Name = "FormLetter";
-            this.Text = "Письмо";
-            this.Load += new System.EventHandler(this.FormLetter_Load);
-            this.ResumeLayout(false);
-            this.PerformLayout();
-
-        }
-
-        #endregion
-
-        private TextBox textBoxEmail;
-        private Label labelAdress;
-        private Label labelSubject;
-        private TextBox textBoxSubject;
-        private Label labelBody;
-        private TextBox textBoxBody;
-        private Button buttonClose;
-        private Button buttonReply;
-        private Label labelDate;
-        private TextBox textBoxDate;
-        private Button buttonSend;
-    }
-}

SushiBar/SushiBarView/FormLetter.cs

@@ -1,152 +0,0 @@
-using Microsoft.Extensions.Logging;
-using SushiBar;
-using SushiBarBusinessLogic.MailWorker;
-using SushiBarContracts.BindingModels;
-using SushiBarContracts.BusinessLogicsContracts;
-using SushiBarContracts.SearchModels;
-using SushiBarContracts.ViewModels;
-using System;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.Data;
-using System.Drawing;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using System.Windows.Forms;
-using System.Windows.Forms.VisualStyles;
-
-namespace SushiBarView
-{
-    public partial class FormLetter : Form
-    {
-        private readonly ILogger _logger;
-        private readonly IMessageInfoLogic _logic;
-        private readonly AbstractMailWorker _worker;
-
-        public MessageInfoViewModel? model;
-        public string? messageId;
-
-        public FormLetter(ILogger<FormLetter> logger, IMessageInfoLogic logic, AbstractMailWorker worker)
-        {
-            InitializeComponent();
-            _logger = logger;
-            _logic = logic;
-            _worker = worker;
-        }
-
-        private void FormLetter_Load(object sender, EventArgs e)
-        {
-            if (!string.IsNullOrEmpty(messageId))
-            {
-                ReloadLetter();
-                return;
-            }
-            else if (model != null)
-            {
-                ConfigurateToCreateAnsver();
-                return;
-            }
-            _logger.LogError("Для формы не переданно сведений о письме, на которое отвечаем!");
-            DialogResult = DialogResult.Abort;
-            Close();
-            return;
-        }
-
-        private void ReloadLetter()
-        {
-            _logger.LogInformation("Загрузка существующего письма с id:{}", messageId);
-            model = _logic.ReadElement(new MessageInfoSearchModel
-            {
-                MessageId = messageId
-            });
-            if (model != null)
-            {
-                _logger.LogInformation("Письмо найдено");
-                textBoxEmail.Text = model.SenderName;
-                textBoxDate.Text = model.DateDelivery.ToString();
-                textBoxSubject.Text = model.Subject;
-                textBoxBody.Text = model.Body;
-
-
-                if (model.IsReply)
-                {
-                    _logger.LogInformation("Письмо само и есть ответ");
-                    buttonReply.Visible = false;
-                }
-                else
-                {
-                    if (!string.IsNullOrEmpty(model.ReplyMessageId))
-                    {
-                        _logger.LogInformation("У письма есть ответ.");
-                        buttonReply.Text = "Прочитать ответ";
-                    }
-                }
-                return;
-            }
-            _logger.LogWarning("Письмо с таким id не удалось найти");
-            DialogResult = DialogResult.Abort;
-            Close();
-            return;
-        }
-
-        private void ConfigurateToCreateAnsver()
-        {
-            textBoxEmail.Text = model.SenderName;
-            labelDate.Visible = false;
-            textBoxDate.Visible = false;
-            textBoxSubject.Text = $"re: {model.Subject}";
-            textBoxBody.ReadOnly = false;
-            buttonReply.Visible = false;
-            buttonSend.Visible = true;
-            _logger.LogInformation("Запущена форма создания нового письма - ответа");
-        }
-
-        private void buttonClose_Click(object sender, EventArgs e)
-        {
-            DialogResult = DialogResult.Cancel;
-            Close();
-        }
-
-        private void buttonReply_Click(object sender, EventArgs e)
-        {
-            var service = Program.ServiceProvider?.GetService(typeof(FormLetter));
-            if (service is FormLetter form)
-            {
-                if (!string.IsNullOrEmpty(model.ReplyMessageId))
-                {
-                    form.messageId = model.ReplyMessageId;
-                }
-                else
-                {
-                    form.model = model;
-                }
-
-                if (form.ShowDialog() != DialogResult.Cancel)
-                {
-                    buttonReply.Visible = false;
-                }
-            }
-        }
-
-        private void buttonSend_Click(object sender, EventArgs e)
-        {
-            if (model == null)
-            {
-                return;
-            }
-            string subject = textBoxSubject.Text;
-            string text = textBoxBody.Text;
-
-            Task.Run(() => _worker.MailSendReplyAsync(new MailReplySendInfoBindingModel
-            {
-                MailAddress = model.SenderName,
-                Subject = subject,
-                Text = text,
-                ParentMessageId = model.MessageId,
-            }));
-            DialogResult = DialogResult.OK;
-            Close();
-        }
-    }
-}

SushiBar/SushiBarView/FormLetter.resx

@@ -1,120 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<root>
-  <!-- 
-    Microsoft ResX Schema 
-    
-    Version 2.0
-    
-    The primary goals of this format is to allow a simple XML format 
-    that is mostly human readable. The generation and parsing of the 
-    various data types are done through the TypeConverter classes 
-    associated with the data types.
-    
-    Example:
-    
-    ... ado.net/XML headers & schema ...
-    <resheader name="resmimetype">text/microsoft-resx</resheader>
-    <resheader name="version">2.0</resheader>
-    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
-    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
-    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
-    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
-    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
-        <value>[base64 mime encoded serialized .NET Framework object]</value>
-    </data>
-    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
-        <comment>This is a comment</comment>
-    </data>
-                
-    There are any number of "resheader" rows that contain simple 
-    name/value pairs.
-    
-    Each data row contains a name, and value. The row also contains a 
-    type or mimetype. Type corresponds to a .NET class that support 
-    text/value conversion through the TypeConverter architecture. 
-    Classes that don't support this are serialized and stored with the 
-    mimetype set.
-    
-    The mimetype is used for serialized objects, and tells the 
-    ResXResourceReader how to depersist the object. This is currently not 
-    extensible. For a given mimetype the value must be set accordingly:
-    
-    Note - application/x-microsoft.net.object.binary.base64 is the format 
-    that the ResXResourceWriter will generate, however the reader can 
-    read any of the formats listed below.
-    
-    mimetype: application/x-microsoft.net.object.binary.base64
-    value   : The object must be serialized with 
-            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
-            : and then encoded with base64 encoding.
-    
-    mimetype: application/x-microsoft.net.object.soap.base64
-    value   : The object must be serialized with 
-            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
-            : and then encoded with base64 encoding.
-
-    mimetype: application/x-microsoft.net.object.bytearray.base64
-    value   : The object must be serialized into a byte array 
-            : using a System.ComponentModel.TypeConverter
-            : and then encoded with base64 encoding.
-    -->
-  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
-    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
-    <xsd:element name="root" msdata:IsDataSet="true">
-      <xsd:complexType>
-        <xsd:choice maxOccurs="unbounded">
-          <xsd:element name="metadata">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" />
-              </xsd:sequence>
-              <xsd:attribute name="name" use="required" type="xsd:string" />
-              <xsd:attribute name="type" type="xsd:string" />
-              <xsd:attribute name="mimetype" type="xsd:string" />
-              <xsd:attribute ref="xml:space" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="assembly">
-            <xsd:complexType>
-              <xsd:attribute name="alias" type="xsd:string" />
-              <xsd:attribute name="name" type="xsd:string" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="data">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
-              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
-              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
-              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
-              <xsd:attribute ref="xml:space" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="resheader">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" use="required" />
-            </xsd:complexType>
-          </xsd:element>
-        </xsd:choice>
-      </xsd:complexType>
-    </xsd:element>
-  </xsd:schema>
-  <resheader name="resmimetype">
-    <value>text/microsoft-resx</value>
-  </resheader>
-  <resheader name="version">
-    <value>2.0</value>
-  </resheader>
-  <resheader name="reader">
-    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </resheader>
-  <resheader name="writer">
-    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </resheader>
-</root>

SushiBar/SushiBarView/FormMail.Designer.cs

@@ -1,133 +0,0 @@
-namespace SushiBarView
-{
-    partial class FormMail
-    {
-        /// <summary>
-        /// Required designer variable.
-        /// </summary>
-        private System.ComponentModel.IContainer components = null;
-
-        /// <summary>
-        /// Clean up any resources being used.
-        /// </summary>
-        /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
-        protected override void Dispose(bool disposing)
-        {
-            if (disposing && (components != null))
-            {
-                components.Dispose();
-            }
-            base.Dispose(disposing);
-        }
-
-        #region Windows Form Designer generated code
-
-        /// <summary>
-        /// Required method for Designer support - do not modify
-        /// the contents of this method with the code editor.
-        /// </summary>
-        private void InitializeComponent()
-        {
-            this.panel1 = new System.Windows.Forms.Panel();
-            this.dataGridView = new System.Windows.Forms.DataGridView();
-            this.buttonOpen = new System.Windows.Forms.Button();
-            this.numericUpDownPage = new System.Windows.Forms.NumericUpDown();
-            this.buttonPreveous = new System.Windows.Forms.Button();
-            this.buttonNext = new System.Windows.Forms.Button();
-            this.panel1.SuspendLayout();
-            ((System.ComponentModel.ISupportInitialize)(this.dataGridView)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.numericUpDownPage)).BeginInit();
-            this.SuspendLayout();
-            // 
-            // panel1
-            // 
-            this.panel1.Controls.Add(this.dataGridView);
-            this.panel1.Location = new System.Drawing.Point(3, 1);
-            this.panel1.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
-            this.panel1.Name = "panel1";
-            this.panel1.Size = new System.Drawing.Size(795, 431);
-            this.panel1.TabIndex = 0;
-            // 
-            // dataGridView
-            // 
-            this.dataGridView.AllowUserToAddRows = false;
-            this.dataGridView.AllowUserToDeleteRows = false;
-            this.dataGridView.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
-            this.dataGridView.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.dataGridView.Location = new System.Drawing.Point(0, 0);
-            this.dataGridView.Name = "dataGridView";
-            this.dataGridView.ReadOnly = true;
-            this.dataGridView.RowHeadersWidth = 51;
-            this.dataGridView.RowTemplate.Height = 29;
-            this.dataGridView.Size = new System.Drawing.Size(795, 431);
-            this.dataGridView.TabIndex = 2;
-            // 
-            // buttonOpen
-            // 
-            this.buttonOpen.Location = new System.Drawing.Point(806, 80);
-            this.buttonOpen.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
-            this.buttonOpen.Name = "buttonOpen";
-            this.buttonOpen.Size = new System.Drawing.Size(107, 31);
-            this.buttonOpen.TabIndex = 1;
-            this.buttonOpen.Text = "Прочитать";
-            this.buttonOpen.UseVisualStyleBackColor = true;
-            this.buttonOpen.Click += new System.EventHandler(this.buttonOpen_Click);
-            // 
-            // numericUpDownPage
-            // 
-            this.numericUpDownPage.Location = new System.Drawing.Point(825, 287);
-            this.numericUpDownPage.Name = "numericUpDownPage";
-            this.numericUpDownPage.Size = new System.Drawing.Size(85, 27);
-            this.numericUpDownPage.TabIndex = 4;
-            this.numericUpDownPage.ValueChanged += new System.EventHandler(this.numericUpDownPage_ValueChanged);
-            // 
-            // buttonPreveous
-            // 
-            this.buttonPreveous.Location = new System.Drawing.Point(825, 323);
-            this.buttonPreveous.Name = "buttonPreveous";
-            this.buttonPreveous.Size = new System.Drawing.Size(39, 29);
-            this.buttonPreveous.TabIndex = 5;
-            this.buttonPreveous.Text = "<-";
-            this.buttonPreveous.UseVisualStyleBackColor = true;
-            this.buttonPreveous.Click += new System.EventHandler(this.buttonPreveous_Click);
-            // 
-            // buttonNext
-            // 
-            this.buttonNext.Location = new System.Drawing.Point(872, 323);
-            this.buttonNext.Name = "buttonNext";
-            this.buttonNext.Size = new System.Drawing.Size(39, 29);
-            this.buttonNext.TabIndex = 6;
-            this.buttonNext.Text = "->";
-            this.buttonNext.UseVisualStyleBackColor = true;
-            this.buttonNext.Click += new System.EventHandler(this.buttonNext_Click);
-            // 
-            // FormMail
-            // 
-            this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 20F);
-            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.ClientSize = new System.Drawing.Size(925, 428);
-            this.Controls.Add(this.buttonNext);
-            this.Controls.Add(this.buttonPreveous);
-            this.Controls.Add(this.numericUpDownPage);
-            this.Controls.Add(this.buttonOpen);
-            this.Controls.Add(this.panel1);
-            this.Name = "FormMail";
-            this.Text = "Письма";
-            this.Load += new System.EventHandler(this.FormMail_Load);
-            this.panel1.ResumeLayout(false);
-            ((System.ComponentModel.ISupportInitialize)(this.dataGridView)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.numericUpDownPage)).EndInit();
-            this.ResumeLayout(false);
-
-        }
-
-        #endregion
-
-        private Panel panel1;
-        private DataGridView dataGridView;
-        private Button buttonOpen;
-        private NumericUpDown numericUpDownPage;
-        private Button buttonPreveous;
-        private Button buttonNext;
-    }
-}

SushiBar/SushiBarView/FormMail.cs

@@ -1,115 +0,0 @@
-using DocumentFormat.OpenXml.Spreadsheet;
-using Microsoft.Extensions.Logging;
-using SushiBar;
-using SushiBarBusinessLogic.BusinessLogics;
-using SushiBarContracts.BindingModels;
-using SushiBarContracts.BusinessLogicsContracts;
-using SushiBarContracts.SearchModels;
-using System;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.Data;
-using System.Drawing;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using System.Windows.Forms;
-
-namespace SushiBarView
-{
-    public partial class FormMail : Form
-    {
-        private readonly ILogger _logger;
-        private readonly IMessageInfoLogic _logic;
-        private int currentPage = 1;
-        private int pageLength = 2;
-
-        public FormMail(ILogger<FormMail> logger, IMessageInfoLogic logic)
-        {
-            InitializeComponent();
-            _logger = logger;
-            _logic = logic;
-        }
-
-        private void LoadData()
-        {
-            try
-            {
-                var list = _logic.ReadList(new MessageInfoSearchModel()
-                {
-                    PageLength = pageLength,
-                    PageIndex = currentPage
-
-                });
-                numericUpDownPage.Value = pageLength;
-                if (list != null)
-                {
-                    dataGridView.DataSource = list;
-                    dataGridView.Columns["MessageId"].Visible = false;
-                    dataGridView.Columns["ClientId"].Visible = false;
-                    dataGridView.Columns["ReplyMessageId"].Visible = false;
-                    dataGridView.Columns["Reply"].Visible = false;
-                    dataGridView.Columns["IsReply"].Visible = false;
-                    dataGridView.Columns["Body"].AutoSizeMode =
-                    DataGridViewAutoSizeColumnMode.Fill;
-                }
-                _logger.LogInformation("Загрузка почтовых собщений");
-            }
-            catch (Exception ex)
-            {
-                _logger.LogError(ex, "Ошибка загрузки почтовых сообщений");
-                MessageBox.Show(ex.Message, "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error);
-            }
-        }
-
-        private void FormMail_Load(object sender, EventArgs e)
-        {
-            LoadData();
-        }
-
-        private void buttonOpen_Click(object sender, EventArgs e)
-        {
-            if (dataGridView.SelectedRows.Count <= 0)
-                return;
-
-            var service = Program.ServiceProvider?.GetService(typeof(FormLetter));
-            if (service is FormLetter form)
-            {
-                string? messageId = dataGridView.SelectedRows[0].Cells["MessageId"].Value.ToString();
-                if (messageId == null) return;
-                form.messageId = messageId;
-
-                if (!Convert.ToBoolean(dataGridView.SelectedRows[0].Cells["IsReaded"].Value))
-                {
-                    _logic.Update(new MessageInfoBindingModel
-                    {
-                        MessageId = messageId,
-                        IsReaded = true,
-                        ReplyMessageId = dataGridView.SelectedRows[0].Cells["ReplyMessageId"].Value?.ToString()
-                    });
-                }
-
-                form.ShowDialog();
-                LoadData();
-            }
-        }
-
-        private void buttonPreveous_Click(object sender, EventArgs e)
-        {
-            currentPage = Math.Max(1, currentPage - 1);
-            LoadData();
-        }
-
-        private void buttonNext_Click(object sender, EventArgs e)
-        {
-            currentPage++;
-            LoadData();
-        }
-
-        private void numericUpDownPage_ValueChanged(object sender, EventArgs e)
-        {
-            pageLength = Math.Max(1, (int)numericUpDownPage.Value);
-            LoadData();
-        }
-    }
-}

SushiBar/SushiBarView/FormMail.resx

@@ -1,120 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<root>
-  <!-- 
-    Microsoft ResX Schema 
-    
-    Version 2.0
-    
-    The primary goals of this format is to allow a simple XML format 
-    that is mostly human readable. The generation and parsing of the 
-    various data types are done through the TypeConverter classes 
-    associated with the data types.
-    
-    Example:
-    
-    ... ado.net/XML headers & schema ...
-    <resheader name="resmimetype">text/microsoft-resx</resheader>
-    <resheader name="version">2.0</resheader>
-    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
-    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
-    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
-    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
-    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
-        <value>[base64 mime encoded serialized .NET Framework object]</value>
-    </data>
-    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
-        <comment>This is a comment</comment>
-    </data>
-                
-    There are any number of "resheader" rows that contain simple 
-    name/value pairs.
-    
-    Each data row contains a name, and value. The row also contains a 
-    type or mimetype. Type corresponds to a .NET class that support 
-    text/value conversion through the TypeConverter architecture. 
-    Classes that don't support this are serialized and stored with the 
-    mimetype set.
-    
-    The mimetype is used for serialized objects, and tells the 
-    ResXResourceReader how to depersist the object. This is currently not 
-    extensible. For a given mimetype the value must be set accordingly:
-    
-    Note - application/x-microsoft.net.object.binary.base64 is the format 
-    that the ResXResourceWriter will generate, however the reader can 
-    read any of the formats listed below.
-    
-    mimetype: application/x-microsoft.net.object.binary.base64
-    value   : The object must be serialized with 
-            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
-            : and then encoded with base64 encoding.
-    
-    mimetype: application/x-microsoft.net.object.soap.base64
-    value   : The object must be serialized with 
-            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
-            : and then encoded with base64 encoding.
-
-    mimetype: application/x-microsoft.net.object.bytearray.base64
-    value   : The object must be serialized into a byte array 
-            : using a System.ComponentModel.TypeConverter
-            : and then encoded with base64 encoding.
-    -->
-  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
-    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
-    <xsd:element name="root" msdata:IsDataSet="true">
-      <xsd:complexType>
-        <xsd:choice maxOccurs="unbounded">
-          <xsd:element name="metadata">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" />
-              </xsd:sequence>
-              <xsd:attribute name="name" use="required" type="xsd:string" />
-              <xsd:attribute name="type" type="xsd:string" />
-              <xsd:attribute name="mimetype" type="xsd:string" />
-              <xsd:attribute ref="xml:space" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="assembly">
-            <xsd:complexType>
-              <xsd:attribute name="alias" type="xsd:string" />
-              <xsd:attribute name="name" type="xsd:string" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="data">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
-              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
-              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
-              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
-              <xsd:attribute ref="xml:space" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="resheader">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" use="required" />
-            </xsd:complexType>
-          </xsd:element>
-        </xsd:choice>
-      </xsd:complexType>
-    </xsd:element>
-  </xsd:schema>
-  <resheader name="resmimetype">
-    <value>text/microsoft-resx</value>
-  </resheader>
-  <resheader name="version">
-    <value>2.0</value>
-  </resheader>
-  <resheader name="reader">
-    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </resheader>
-  <resheader name="writer">
-    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </resheader>
-</root>

SushiBar/SushiBarView/FormMain.Designer.cs

@@ -37,15 +37,12 @@
             toolStripMenuItem1 = new ToolStripMenuItem();
             componentsToolStripMenuItemToolStripMenuItem = new ToolStripMenuItem();
             sushiToolStripMenuItemToolStripMenuItem = new ToolStripMenuItem();
-            ClientToolStripMenuItem = new ToolStripMenuItem();
-            employersToolStripMenuItem = new ToolStripMenuItem();
-            начатьРаботуToolStripMenuItem = new ToolStripMenuItem();
             отчётыToolStripMenuItem = new ToolStripMenuItem();
             componentsToolStripMenuItem1 = new ToolStripMenuItem();
             //componentSushiToolStripMenuItem1 = new ToolStripMenuItem();
             ordersToolStripMenuItem = new ToolStripMenuItem();
             dataGridView = new DataGridView();
-            gToolStripMenuItem = new ToolStripMenuItem();
+            ClientToolStripMenuItem = new ToolStripMenuItem();
             menuStrip.SuspendLayout();
             ((System.ComponentModel.ISupportInitialize)dataGridView).BeginInit();
             SuspendLayout();
@@ -144,7 +141,7 @@
             // 
             // toolStripMenuItem1
             // 
-            toolStripMenuItem1.DropDownItems.AddRange(new ToolStripItem[] { componentsToolStripMenuItemToolStripMenuItem, sushiToolStripMenuItemToolStripMenuItem, ClientToolStripMenuItem, employersToolStripMenuItem, начатьРаботуToolStripMenuItem, gToolStripMenuItem });
+            toolStripMenuItem1.DropDownItems.AddRange(new ToolStripItem[] { componentsToolStripMenuItemToolStripMenuItem, sushiToolStripMenuItemToolStripMenuItem, ClientToolStripMenuItem });
             toolStripMenuItem1.Name = "toolStripMenuItem1";
             toolStripMenuItem1.Size = new Size(94, 20);
             toolStripMenuItem1.Text = "Справочники";
@@ -175,27 +172,6 @@
             sushiToolStripMenuItemToolStripMenuItem.Text = "Суши";
             sushiToolStripMenuItemToolStripMenuItem.Click += sushiToolStripMenuItem_Click;
             // 
-            // ClientToolStripMenuItem
-            // 
-            ClientToolStripMenuItem.Name = "ClientToolStripMenuItem";
-            ClientToolStripMenuItem.Size = new Size(180, 22);
-            ClientToolStripMenuItem.Text = "Клиенты";
-            ClientToolStripMenuItem.Click += ClientToolStripMenuItem_Click;
-            // 
-            // employersToolStripMenuItem
-            // 
-            employersToolStripMenuItem.Name = "employersToolStripMenuItem";
-            employersToolStripMenuItem.Size = new Size(180, 22);
-            employersToolStripMenuItem.Text = "Исполнители";
-            employersToolStripMenuItem.Click += employersToolStripMenuItem_Click;
-            // 
-            // начатьРаботуToolStripMenuItem
-            // 
-            начатьРаботуToolStripMenuItem.Name = "начатьРаботуToolStripMenuItem";
-            начатьРаботуToolStripMenuItem.Size = new Size(180, 22);
-            начатьРаботуToolStripMenuItem.Text = "Начать работу";
-            начатьРаботуToolStripMenuItem.Click += startWorkToolStripMenuItem_Click;
-            // 
             // магазиныToolStripMenuItem
             // 
             магазиныToolStripMenuItem.Name = "магазиныToolStripMenuItem";
@@ -261,23 +237,8 @@
             dataGridView.Size = new Size(647, 344);
             dataGridView.TabIndex = 6;
             // 
-            // gToolStripMenuItem
+            // ClientToolStripMenuItem
             // 
-            gToolStripMenuItem.Name = "gToolStripMenuItem";
-            gToolStripMenuItem.Size = new Size(180, 22);
-            gToolStripMenuItem.Text = "Почта";
-            gToolStripMenuItem.Click += mailToolStripMenuItem_Click;
-            employersToolStripMenuItem.Name = "employersToolStripMenuItem";
-            employersToolStripMenuItem.Size = new Size(180, 22);
-            employersToolStripMenuItem.Text = "Исполнители";
-            employersToolStripMenuItem.Click += employersToolStripMenuItem_Click;
-            // 
-            // начатьРаботуToolStripMenuItem
-            // 
-            начатьРаботуToolStripMenuItem.Name = "начатьРаботуToolStripMenuItem";
-            начатьРаботуToolStripMenuItem.Size = new Size(180, 22);
-            начатьРаботуToolStripMenuItem.Text = "Начать работу";
-            начатьРаботуToolStripMenuItem.Click += startWorkToolStripMenuItem_Click;
             ClientToolStripMenuItem.Name = "ClientToolStripMenuItem";
             ClientToolStripMenuItem.Size = new Size(180, 22);
             ClientToolStripMenuItem.Text = "Клиенты";
@@ -393,9 +354,6 @@
         private ToolStripMenuItem componentsToolStripMenuItem1;
         private ToolStripMenuItem ordersToolStripMenuItem;
         private ToolStripMenuItem ClientToolStripMenuItem;
-        private ToolStripMenuItem employersToolStripMenuItem;
-        private ToolStripMenuItem начатьРаботуToolStripMenuItem;
-        private ToolStripMenuItem gToolStripMenuItem;
         private ToolStripMenuItem магазиныToolStripMenuItem;
         private ToolStripMenuItem списокСушиToolStripMenuItem;
         private ToolStripMenuItem сушиСИнгрToolStripMenuItem;

SushiBar/SushiBarView/FormMain.cs

@@ -36,14 +36,12 @@ namespace SushiBarView
         private readonly ILogger _logger;
         private readonly IOrderLogic _orderLogic;
         private readonly IReportLogic _reportLogic;
-        private readonly IWorkProcess _workProcess;
-        public FormMain(ILogger<FormMain> logger, IOrderLogic orderLogic, IReportLogic reportLogic, IWorkProcess workProcess)
+        public FormMain(ILogger<FormMain> logger, IOrderLogic orderLogic, IReportLogic reportLogic)
         {
             InitializeComponent();
             _logger = logger;
             _orderLogic = orderLogic;
             _reportLogic = reportLogic;
-            _workProcess = workProcess;
         }
         private void FormMain_Load(object sender, EventArgs e)
         {
@@ -60,10 +58,8 @@ namespace SushiBarView
                     dataGridView.DataSource = list;
                     dataGridView.Columns["SushiId"].Visible = false;
                     dataGridView.Columns["ClientId"].Visible = false;
-                    dataGridView.Columns["ClientEmail"].Visible = false;
-					dataGridView.Columns["ClientEmail"].Visible = false;
-					dataGridView.Columns["ImplementerId"].Visible = false;
-				}
+
+                }
                 _logger.LogInformation("Загрузка заказов");
             }
             catch (Exception ex)
@@ -80,8 +76,6 @@ namespace SushiBarView
                 form.ShowDialog();
             }
         }
-
-
         private void sushiToolStripMenuItem_Click(object sender, EventArgs e)
         {
             var service = Program.ServiceProvider?.GetService(typeof(FormSushis));
@@ -215,29 +209,6 @@ namespace SushiBarView
                 form.ShowDialog();
             }
         }
-
-        private void employersToolStripMenuItem_Click(object sender, EventArgs e)
-        {
-            var service = Program.ServiceProvider?.GetService(typeof(FormImplementers));
-            if (service is FormImplementers form)
-            {
-                form.ShowDialog();
-            }
-        }
-
-        private void startWorkToolStripMenuItem_Click(object sender, EventArgs e)
-        {
-            _workProcess.DoWork((Program.ServiceProvider?.GetService(typeof(IImplementerLogic)) as IImplementerLogic)!, _orderLogic);
-            MessageBox.Show("Процесс обработки запущен", "Сообщение", MessageBoxButtons.OK, MessageBoxIcon.Information);
-        }
-        private void mailToolStripMenuItem_Click(object sender, EventArgs e)
-        {
-            var service = Program.ServiceProvider?.GetService(typeof(FormMail));
-            if (service is FormMail form)
-            {
-                form.ShowDialog();
-            }
-        }
         private void shopsToolStripMenuItem_Click(object sender, EventArgs e)
         {
             var service = Program.ServiceProvider?.GetService(typeof(FormShops));

SushiBar/SushiBarView/Program.cs

@@ -15,9 +15,6 @@ using Microsoft.EntityFrameworkCore.Design;
 using SushiBar.BusinessLogicsContracts;
 using NLog.Extensions.Logging;
 using SushiBarView;
-using SushiBarBusinessLogic;
-using SushiBarBusinessLogic.MailWorker;
-using SushiBarContracts.BindingModels;
 
 namespace SushiBarView
 {
@@ -35,26 +32,6 @@ namespace SushiBarView
             var services = new ServiceCollection();
             ConfigureServices(services);
             _serviceProvider = services.BuildServiceProvider();
-            try
-            {
-                var mailSender = _serviceProvider.GetService<AbstractMailWorker>();
-                mailSender?.MailConfig(new MailConfigBindingModel
-                {
-                    MailLogin = System.Configuration.ConfigurationManager.AppSettings["MailLogin"] ?? string.Empty,
-                    MailPassword = System.Configuration.ConfigurationManager.AppSettings["MailPassword"] ?? string.Empty,
-                    SmtpClientHost = System.Configuration.ConfigurationManager.AppSettings["SmtpClientHost"] ?? string.Empty,
-                    SmtpClientPort = Convert.ToInt32(System.Configuration.ConfigurationManager.AppSettings["SmtpClientPort"]),
-                    PopHost = System.Configuration.ConfigurationManager.AppSettings["PopHost"] ?? string.Empty,
-                    PopPort = Convert.ToInt32(System.Configuration.ConfigurationManager.AppSettings["PopPort"])
-                });
-
-                var timer = new System.Threading.Timer(new TimerCallback(MailCheck!), null, 0, 100000);
-            }
-            catch (Exception ex)
-            {
-                var logger = _serviceProvider.GetService<ILogger>();
-                logger?.LogError(ex, "Mails Problem");
-            }
             Application.Run(_serviceProvider.GetRequiredService<FormMain>());
         }
         private static void ConfigureServices(ServiceCollection services)
@@ -68,19 +45,12 @@ namespace SushiBarView
             services.AddTransient<IOrderStorage, OrderStorage>();
             services.AddTransient<ISushiStorage, SushiStorage>();
             services.AddTransient<IClientStorage, ClientStorage>();
-            services.AddTransient<IImplementerStorage, ImplementerStorage>();
-            services.AddTransient<IMessageInfoStorage, MessageInfoStorage>();
 
             services.AddTransient<IShopStorage, ShopStorage>();
             services.AddTransient<IComponentLogic, ComponentLogic>();
             services.AddTransient<IOrderLogic, OrderLogic>();
             services.AddTransient<ISushiLogic, SushiLogic>();
             services.AddTransient<IClientLogic, ClientLogic>();
-            services.AddTransient<IComponentLogic, ComponentLogic>();
-            services.AddTransient<IImplementerLogic, ImplementerLogic>();
-            services.AddTransient<IMessageInfoLogic, MessageInfoLogic>();
-            services.AddTransient<IWorkProcess, WorkModeling>();
-            services.AddSingleton<AbstractMailWorker, MailKitWorker>();
 
             services.AddTransient<FormMain>();
             services.AddTransient<FormComponent>();
@@ -91,11 +61,8 @@ namespace SushiBarView
             services.AddTransient<FormSushi>();
             services.AddTransient<FormReportOrders>();
             services.AddTransient<FormReportSushiComponents>();
-            services.AddTransient<FormImplementers>();
-            services.AddTransient<FormImplementer>();
             services.AddTransient<IReportLogic, ReportLogic>();
             services.AddTransient<FormClients>();
-            services.AddTransient<FormMail>();
             services.AddTransient<EntityFrameworkDesignServicesBuilder>();
             services.AddTransient<IShopLogic, ShopLogic>();
 
@@ -114,8 +81,6 @@ namespace SushiBarView
             services.AddTransient<FormReportOrders>();
             services.AddTransient<FormReportShop>();
             services.AddTransient<FormReportGroupedOrders>();
-			services.AddTransient<FormLetter>();
-		}
-        private static void MailCheck(object obj) => ServiceProvider?.GetService<AbstractMailWorker>()?.MailCheck();
+        }
     }
 }