сдача

.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

@@ -1,194 +0,0 @@
-using Microsoft.Extensions.Logging;
-using SushiBarContracts.BindingModels;
-using SushiBarContracts.BusinessLogicsContracts;
-using SushiBarContracts.SearchModels;
-using SushiBarContracts.StoragesContracts;
-using SushiBarContracts.ViewModels;
-using SushiBarDataModels.Enums;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace SushiBarBusinessLogic.BusinessLogics
-{
-	public class OrderLogic : IOrderLogic
-	{
-
-			private readonly ILogger _logger;
-			private readonly IOrderStorage _orderStorage;
-			static readonly object _locker = new object();
-			private readonly IShopStorage _shopStorage;
-
-			public OrderLogic(ILogger<OrderLogic> logger, IOrderStorage orderStorage, IShopStorage shopStorage)
-			{
-				_logger = logger;
-				_orderStorage = orderStorage;
-				_shopStorage = shopStorage;
-			}
-
-			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.Принят;
-				if (_orderStorage.Insert(model) == null)
-				{
-					_logger.LogWarning("Insert operation failed");
-					return false;
-				}
-				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 = 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.Ожидает)
-					{
-						model.Status = OrderStatus.Ожидает;
-						return UpdateOrder(model);
-					}
-					}
-					model.Status = OrderStatus.Выдан;
-					return UpdateOrder(model);
-				}
-			}
-
-			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 = FillOrderBindingModel(model);
-
-				if (requiredStatus - model.Status == 1)
-				{
-					model.Status = requiredStatus;
-					if (model.Status == OrderStatus.Готов)
-						model.DateImplement = DateTime.Now;
-					return UpdateOrder(model);
-				}
-				_logger.LogWarning("Changing status operation faled: Current-{Status}:required-{requiredStatus}.", model.Status, requiredStatus);
-				throw new InvalidOperationException($"Невозможно приствоить статус {requiredStatus} заказу с текущим статусом {model.Status}");
-			}
-
-			private OrderBindingModel 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;
-			}
-
-			private bool UpdateOrder(OrderBindingModel model)
-			{
-				if (_orderStorage.Update(model) == null)
-				{
-					_logger.LogWarning("Update operation failed");
-					return false;
-				}
-				_logger.LogWarning("Update operation sucsess");
-				return true;
-			}
-		}
-	}

SushiBar/SushiBarBusinessLogic_/BusinessLogics/ShopLogic.cs

@@ -1,186 +0,0 @@
-using Microsoft.Extensions.Logging;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using SushiBarContracts.BindingModels;
-using SushiBarContracts.BusinessLogicsContracts;
-using SushiBarContracts.SearchModels;
-using SushiBarContracts.StoragesContracts;
-using SushiBarContracts.ViewModels;
-
-namespace SushiBarBusinessLogic.BusinessLogics
-{
-    public class ShopLogic : IShopLogic
-    {
-        private readonly ILogger _logger;
-        private readonly IShopStorage _shopStorage;
-        private readonly ISushiStorage _sushiStorage;
-
-        public ShopLogic(ILogger<ShopLogic> logger, IShopStorage shopStorage, ISushiStorage sushiStorage)
-        {
-            _logger = logger;
-            _shopStorage = shopStorage;
-            _sushiStorage = sushiStorage;
-        }
-
-        public List<ShopViewModel>? ReadList(ShopSearchModel? model)
-        {
-            _logger.LogInformation("ReadList. ShopName:{ShopName}.Id:{ Id}", model?.ShopName, model?.Id);
-            var list = model == null ? _shopStorage.GetFullList() : _shopStorage.GetFilteredList(model);
-            if (list == null)
-            {
-                _logger.LogWarning("ReadList return null list");
-                return null;
-            }
-            _logger.LogInformation("ReadList. Count:{Count}", list.Count);
-            return list;
-        }
-
-        public ShopViewModel? ReadElement(ShopSearchModel model)
-        {
-            if (model == null)
-            {
-                throw new ArgumentNullException(nameof(model));
-            }
-            _logger.LogInformation("ReadElement. ShopName:{ShopName}.Id:{ Id}", model.ShopName, model.Id);
-            var element = _shopStorage.GetElement(model);
-            if (element == null)
-            {
-                _logger.LogWarning("ReadElement element not found");
-                return null;
-            }
-            _logger.LogInformation("ReadElement find. Id:{Id}", element.Id);
-            return element;
-        }
-
-        public bool Create(ShopBindingModel model)
-        {
-            CheckModel(model);
-            if (_shopStorage.Insert(model) == null)
-            {
-                _logger.LogWarning("Insert operation failed");
-                return false;
-            }
-            return true;
-        }
-
-        public bool Update(ShopBindingModel model)
-        {
-            CheckModel(model);
-            if (_shopStorage.Update(model) == null)
-            {
-                _logger.LogWarning("Update operation failed");
-                return false;
-            }
-            return true;
-        }
-
-        public bool Delete(ShopBindingModel model)
-        {
-            CheckModel(model, false);
-            _logger.LogInformation("Delete. Id:{Id}", model.Id);
-            if (_shopStorage.Delete(model) == null)
-            {
-                _logger.LogWarning("Delete operation failed");
-                return false;
-            }
-            return true;
-        }
-
-        public bool MakeSupply(SupplyBindingModel model)
-        {
-            if (model == null)
-            {
-                throw new ArgumentNullException(nameof(model));
-            }
-            if (model.Count <= 0)
-            {
-                throw new ArgumentException("Количество изделий должно быть больше 0");
-            }
-            var shop = _shopStorage.GetElement(new ShopSearchModel
-            {
-                Id = model.ShopId
-            });
-            if (shop == null)
-            {
-                throw new ArgumentException("Магазина не существует");
-            }
-            if (shop.ShopSushis.ContainsKey(model.SushiId))
-            {
-                var oldValue = shop.ShopSushis[model.SushiId];
-                oldValue.Item2 += model.Count;
-                shop.ShopSushis[model.SushiId] = oldValue;
-            }
-            else
-            {
-                var sushi = _sushiStorage.GetElement(new SushiSearchModel
-                {
-                    Id = model.SushiId
-                });
-                if (sushi == null)
-                {
-                    throw new ArgumentException($"Поставка: Товар с id:{model.SushiId} не найденн");
-                }
-                shop.ShopSushis.Add(model.SushiId, (sushi, model.Count));
-            }
-
-            _shopStorage.Update(new ShopBindingModel()
-            {
-                Id = shop.Id,
-                ShopName = shop.ShopName,
-                Adress = shop.Adress,
-                OpeningDate = shop.OpeningDate,
-                ShopSushis = shop.ShopSushis,
-                SushiMaxCount = shop.SushiMaxCount,
-            });
-            return true;
-        }
-
-        private void CheckModel(ShopBindingModel model, bool withParams = true)
-        {
-            if (model == null)
-            {
-                throw new ArgumentNullException(nameof(model));
-            }
-            if (!withParams)
-            {
-                return;
-            }
-            if (string.IsNullOrEmpty(model.Adress))
-            {
-                throw new ArgumentException("Адрес магазина длжен быть заполнен", nameof(model.Adress));
-            }
-            if (string.IsNullOrEmpty(model.ShopName))
-            {
-                throw new ArgumentException("Название магазина должно быть заполнено", nameof(model.ShopName));
-            }
-            _logger.LogInformation("Shop. ShopName:{ShopName}.Adres:{Adres}.OpeningDate:{OpeningDate}.Id:{ Id}", model.ShopName, model.Adress, model.OpeningDate, model.Id);
-            var element = _shopStorage.GetElement(new ShopSearchModel
-            {
-                ShopName = model.ShopName
-            });
-            if (element != null && element.Id != model.Id)
-            {
-                throw new InvalidOperationException("Магазин с таким названием уже есть");
-            }
-        }
-
-        public bool Sale(SupplySearchModel model)
-        {
-            if (!model.SushiId.HasValue || !model.Count.HasValue)
-            {
-                return false;
-            }
-            _logger.LogInformation("Check sushi count in all shops");
-            if (_shopStorage.Sale(model))
-            {
-                _logger.LogInformation("Selling sucsess");
-                return true;
-            }
-            _logger.LogInformation("Selling failed");
-            return false;
-        }
-    }
-}

SushiBar/SushiBarBusinessLogic_/ClientLogic.cs

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

SushiBar/SushiBarBusinessLogic_/MailWorker/AbstractMailWorker.cs

@@ -0,0 +1,89 @@
+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);
+			}
+		}
+		protected abstract Task SendMailAsync(MailSendInfoBindingModel info);
+		protected abstract Task<List<MessageInfoBindingModel>> ReceiveMailAsync();
+	}
+}

SushiBar/SushiBarBusinessLogic_/MailWorker/MailKitWorker.cs

@@ -0,0 +1,83 @@
+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 SendMailAsync(MailSendInfoBindingModel info)
+		{
+			using var objMailMessage = new MailMessage();
+			using var objSmtpClient = new SmtpClient(_smtpClientHost, _smtpClientPort);
+			try
+			{
+				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;
+				
+
+				objSmtpClient.UseDefaultCredentials = false;
+				objSmtpClient.EnableSsl = true;
+				objSmtpClient.DeliveryMethod = SmtpDeliveryMethod.Network;
+				objSmtpClient.Credentials = new NetworkCredential(_mailLogin, _mailPassword);
+
+				await Task.Run(() => objSmtpClient.Send(objMailMessage));
+			}
+			catch (Exception)
+			{
+				throw;
+			}
+		}
+
+		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;
+		}
+	}
+}

SushiBar/SushiBarBusinessLogic_/MessageInfoLogic.cs

@@ -0,0 +1,93 @@
+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)
+		{
+			_logger.LogInformation("ReadList. MessageId:{MessageId}.ClientId:{ClientId}", model?.MessageId, model?.ClientId);
+			var list = model == null ? _messageInfoStorage.GetFullList() : _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);
+			if (_messageInfoStorage.Insert(model) == null)
+			{
+				_logger.LogWarning("Insert operation failed");
+				return false;
+			}
+			return true;
+		}
+		private void CheckModel(MessageInfoBindingModel model, bool withParams = true)
+		{
+			if (model == null)
+			{
+				throw new ArgumentNullException(nameof(model));
+			}
+			if (!withParams)
+			{
+				return;
+			}
+			if (string.IsNullOrEmpty(model.MessageId))
+			{
+				throw new ArgumentNullException("Не указан id сообщения", nameof(model.MessageId));
+			}
+			if (string.IsNullOrEmpty(model.SenderName))
+			{
+				throw new ArgumentNullException("Не указао почта", nameof(model.SenderName));
+			}
+			if (string.IsNullOrEmpty(model.Subject))
+			{
+				throw new ArgumentNullException("Не указана тема", nameof(model.Subject));
+			}
+			if (string.IsNullOrEmpty(model.Body))
+			{
+				throw new ArgumentNullException("Не указан текст сообщения", nameof(model.Subject));
+			}
+
+			_logger.LogInformation("MessageInfo. MessageId:{MessageId}.SenderName:{SenderName}.Subject:{Subject}.Body:{Body}", model.MessageId, model.SenderName, model.Subject, model.Body);
+			var element = _clientStorage.GetElement(new ClientSearchModel
+			{
+				Email = model.SenderName
+			});
+			if (element == null)
+			{
+				_logger.LogWarning("Не удалоссь найти клиента, отправившего письмо с адреса Email:{Email}", model.SenderName);
+			}
+			else
+			{
+				model.ClientId = element.Id;
+			}
+		}
+	}
+}

SushiBar/SushiBarBusinessLogic_/OfficePackage/AbstractSaveToExcel.cs

@@ -13,7 +13,6 @@ namespace SushiBarBusinessLogic.OfficePackage
         public void CreateReport(ExcelInfo info)
         {
             CreateExcel(info);
-
             InsertCellInWorksheet(new ExcelCellParameters
             {
                 ColumnName = "A",
@@ -21,46 +20,40 @@ namespace SushiBarBusinessLogic.OfficePackage
                 Text = info.Title,
                 StyleInfo = ExcelStyleInfoType.Title
             });
-
             MergeCells(new ExcelMergeParameters
             {
                 CellFromName = "A1",
                 CellToName = "C1"
             });
-
             uint rowIndex = 2;
-            foreach (var pc in info.SushiComponents)
+            foreach (var sc in info.SushiComponents)
             {
                 InsertCellInWorksheet(new ExcelCellParameters
                 {
                     ColumnName = "A",
                     RowIndex = rowIndex,
-                    Text = pc.SushiName,
+                    Text = sc.SushiName,
                     StyleInfo = ExcelStyleInfoType.Text
                 });
                 rowIndex++;
-
-                foreach (var (Component, Count) in pc.Components)
+                foreach (var component in sc.Components)
                 {
                     InsertCellInWorksheet(new ExcelCellParameters
                     {
                         ColumnName = "B",
                         RowIndex = rowIndex,
-                        Text = Component,
+                        Text = component.Item1,
                         StyleInfo = ExcelStyleInfoType.TextWithBroder
                     });
-
                     InsertCellInWorksheet(new ExcelCellParameters
                     {
                         ColumnName = "C",
                         RowIndex = rowIndex,
-                        Text = Count.ToString(),
+                        Text = component.Item2.ToString(),
                         StyleInfo = ExcelStyleInfoType.TextWithBroder
                     });
-
                     rowIndex++;
                 }
-
                 InsertCellInWorksheet(new ExcelCellParameters
                 {
                     ColumnName = "A",
@@ -72,90 +65,33 @@ namespace SushiBarBusinessLogic.OfficePackage
                 {
                     ColumnName = "C",
                     RowIndex = rowIndex,
-                    Text = pc.TotalCount.ToString(),
+                    Text = sc.TotalCount.ToString(),
                     StyleInfo = ExcelStyleInfoType.Text
                 });
                 rowIndex++;
             }
-
             SaveExcel(info);
         }
-
-        public void CreateShopSushisReport(ExcelShop info)
-        {
-            CreateExcel(info);
-
-            InsertCellInWorksheet(new ExcelCellParameters
-            {
-                ColumnName = "A",
-                RowIndex = 1,
-                Text = info.Title,
-                StyleInfo = ExcelStyleInfoType.Title
-            });
-
-            MergeCells(new ExcelMergeParameters
-            {
-                CellFromName = "A1",
-                CellToName = "C1"
-            });
-
-            uint rowIndex = 2;
-            foreach (var sr in info.ShopSushis)
-            {
-                InsertCellInWorksheet(new ExcelCellParameters
-                {
-                    ColumnName = "A",
-                    RowIndex = rowIndex,
-                    Text = sr.ShopName,
-                    StyleInfo = ExcelStyleInfoType.Text
-                });
-                rowIndex++;
-
-                foreach (var (Sushi, Count) in sr.Sushis)
-                {
-                    InsertCellInWorksheet(new ExcelCellParameters
-                    {
-                        ColumnName = "B",
-                        RowIndex = rowIndex,
-                        Text = Sushi,
-                        StyleInfo = ExcelStyleInfoType.TextWithBroder
-                    });
-
-
-                    InsertCellInWorksheet(new ExcelCellParameters
-                    {
-                        ColumnName = "C",
-                        RowIndex = rowIndex,
-                        Text = Count.ToString(),
-                        StyleInfo = ExcelStyleInfoType.TextWithBroder
-                    });
-
-                    rowIndex++;
-                }
-
-                InsertCellInWorksheet(new ExcelCellParameters
-                {
-                    ColumnName = "A",
-                    RowIndex = rowIndex,
-                    Text = "Итого",
-                    StyleInfo = ExcelStyleInfoType.Text
-                });
-                InsertCellInWorksheet(new ExcelCellParameters
-                {
-                    ColumnName = "C",
-                    RowIndex = rowIndex,
-                    Text = sr.TotalCount.ToString(),
-                    StyleInfo = ExcelStyleInfoType.Text
-                });
-                rowIndex++;
-            }
-
-            SaveExcel(info);
-        }
-
-        protected abstract void CreateExcel(IDocument info);
-        protected abstract void InsertCellInWorksheet(ExcelCellParameters excelParams);
+        /// <summary>
+        /// Создание excel-файла
+        /// </summary>
+        /// <param name="info"></param>
+        protected abstract void CreateExcel(ExcelInfo info);
+        /// <summary>
+        /// Добавляем новую ячейку в лист
+        /// </summary>
+        /// <param name="cellParameters"></param>
+        protected abstract void InsertCellInWorksheet(ExcelCellParameters
+        excelParams);
+        /// <summary>
+        /// Объединение ячеек
+        /// </summary>
+        /// <param name="mergeParameters"></param>
         protected abstract void MergeCells(ExcelMergeParameters excelParams);
-        protected abstract void SaveExcel(IDocument info);
+        /// <summary>
+        /// Сохранение файла
+        /// </summary>
+        /// <param name="info"></param>
+        protected abstract void SaveExcel(ExcelInfo info);
     }
 }

SushiBar/SushiBarBusinessLogic_/OfficePackage/AbstractSaveToPdf.cs

@@ -13,65 +13,67 @@ namespace SushiBarBusinessLogic.OfficePackage
         public void CreateDoc(PdfInfo info)
         {
             CreatePdf(info);
-            CreateParagraph(new PdfParagraph { Text = info.Title, Style = "NormalTitle", ParagraphAlignment = PdfParagraphAlignmentType.Center });
-            CreateParagraph(new PdfParagraph { Text = $"с {info.DateFrom.ToShortDateString()} по {info.DateTo.ToShortDateString()}", Style = "Normal", ParagraphAlignment = PdfParagraphAlignmentType.Center });
-
-            CreateTable(new List<string> { "2cm", "3cm", "6cm", "3cm", "3cm" });
-
-            CreateRow(new PdfRowParameters
+            CreateParagraph(new PdfParagraph
             {
-                Texts = new List<string> { "Номер", "Дата заказа", "Пицца", "Статус", "Сумма" },
+                Text = info.Title,
+                Style = "NormalTitle",
+                ParagraphAlignment = PdfParagraphAlignmentType.Center
+            });
+            CreateParagraph(new PdfParagraph
+            {
+                Text = $"с { info.DateFrom.ToShortDateString() } по { info.DateTo.ToShortDateString() }", Style = "Normal",
+                ParagraphAlignment = PdfParagraphAlignmentType.Center
+            });
+            CreateTable(new List<string> { "1cm", "3cm", "4cm", "6cm", "3cm" });
+            CreateRow(new PdfRowParameters
+            {
+                Texts = new List<string> { "Номер", "Дата заказа", "Статус", "Изделие", "Сумма" },
                 Style = "NormalTitle",
                 ParagraphAlignment = PdfParagraphAlignmentType.Center
             });
-
             foreach (var order in info.Orders)
             {
                 CreateRow(new PdfRowParameters
                 {
-                    Texts = new List<string> { order.Id.ToString(), order.DateCreate.ToShortDateString(), order.SushiName, order.Status.ToString(), order.Sum.ToString() },
+                    Texts = new List<string> { order.Id.ToString(), order.DateCreate.ToShortDateString(), order.Status.ToString(), order.SushiName, order.Sum.ToString() },
                     Style = "Normal",
                     ParagraphAlignment = PdfParagraphAlignmentType.Left
                 });
             }
-            CreateParagraph(new PdfParagraph { Text = $"Итого: {info.Orders.Sum(x => x.Sum)}\t", Style = "Normal", ParagraphAlignment = PdfParagraphAlignmentType.Rigth });
-
-            SavePdf(info);
-        }
-
-        public void CreateGroupedOrdersDoc(PdfGroupedOrdersInfo info)
-        {
-            CreatePdf(info);
-            CreateParagraph(new PdfParagraph { Text = info.Title, Style = "NormalTitle", ParagraphAlignment = PdfParagraphAlignmentType.Center });
-
-            CreateTable(new List<string> { "4cm", "3cm", "2cm" });
-            CreateRow(new PdfRowParameters
+            CreateParagraph(new PdfParagraph
             {
-                Texts = new List<string> { "Дата заказа", "Кол-во", "Сумма" },
-                Style = "NormalTitle",
-                ParagraphAlignment = PdfParagraphAlignmentType.Center
+                Text = $"Итого: {info.Orders.Sum(x => x.Sum)}\t",
+                Style = "Normal",
+                ParagraphAlignment = PdfParagraphAlignmentType.Rigth
             });
-
-
-            foreach (var groupedOrder in info.GroupedOrders)
-            {
-                CreateRow(new PdfRowParameters
-                {
-                    Texts = new List<string> { groupedOrder.Date.ToShortDateString(), groupedOrder.OrdersCount.ToString(), groupedOrder.OrdersSum.ToString() },
-                    Style = "Normal",
-                    ParagraphAlignment = PdfParagraphAlignmentType.Left
-                });
-            }
-
-            CreateParagraph(new PdfParagraph { Text = $"Итого: {info.GroupedOrders.Sum(x => x.OrdersSum)}\t", Style = "Normal", ParagraphAlignment = PdfParagraphAlignmentType.Center });
-
             SavePdf(info);
         }
-
-        protected abstract void CreatePdf(IDocument info);
+        /// <summary>
+        /// Создание doc-файла
+        /// </summary>
+        /// <param name="info"></param>
+        protected abstract void CreatePdf(PdfInfo info);
+        /// <summary>
+        /// Создание параграфа с текстом
+        /// </summary>
+        /// <param name="title"></param>
+        /// <param name="style"></param>
         protected abstract void CreateParagraph(PdfParagraph paragraph);
+        /// <summary>
+        /// Создание таблицы
+        /// </summary>
+        /// <param name="title"></param>
+        /// <param name="style"></param>
         protected abstract void CreateTable(List<string> columns);
+        /// <summary>
+        /// Создание и заполнение строки
+        /// </summary>
+        /// <param name="rowParameters"></param>
         protected abstract void CreateRow(PdfRowParameters rowParameters);
-        protected abstract void SavePdf(IDocument info);
+        /// <summary>
+        /// Сохранение файла
+        /// </summary>
+        /// <param name="info"></param>
+        protected abstract void SavePdf(PdfInfo info);
     }
 }

SushiBar/SushiBarBusinessLogic_/OfficePackage/AbstractSaveToWord.cs

@@ -38,52 +38,21 @@ namespace SushiBarBusinessLogic.OfficePackage
             }
             SaveWord(info);
         }
-
-        public void CreateShopsDoc(WordShopInfo info)
-        {
-            CreateWord(info);
-            CreateParagraph(new WordParagraph
-            {
-                Texts = new List<(string, WordTextProperties)> { (info.Title, new WordTextProperties { Bold = true, Size = "24", }) },
-                TextProperties = new WordTextProperties
-                {
-                    Size = "24",
-                    JustificationType = WordJustificationType.Center
-                }
-            });
-
-            CreateTable(new List<string> { "3000", "3000", "3000" });
-            CreateRow(new WordRowParameters
-            {
-                Texts = new List<string> { "Название", "Адрес", "Дата открытия" },
-                TextProperties = new WordTextProperties
-                {
-                    Size = "24",
-                    Bold = true,
-                    JustificationType = WordJustificationType.Center
-                }
-            });
-
-            foreach (var shop in info.Shops)
-            {
-                CreateRow(new WordRowParameters
-                {
-                    Texts = new List<string> { shop.ShopName, shop.Adress, shop.OpeningDate.ToString() },
-                    TextProperties = new WordTextProperties
-                    {
-                        Size = "22",
-                        JustificationType = WordJustificationType.Both
-                    }
-                });
-            }
-
-            SaveWord(info);
-        }
-
-        protected abstract void CreateWord(IDocument info);
+        /// <summary>
+        /// Создание doc-файла
+        /// </summary>
+        /// <param name="info"></param>
+        protected abstract void CreateWord(WordInfo info);
+        /// <summary>
+        /// Создание абзаца с текстом
+        /// </summary>
+        /// <param name="paragraph"></param>
+        /// <returns></returns>
         protected abstract void CreateParagraph(WordParagraph paragraph);
-        protected abstract void SaveWord(IDocument info);
-        protected abstract void CreateTable(List<string> colums);
-        protected abstract void CreateRow(WordRowParameters rowParameters);
+        /// <summary>
+        /// Сохранение файла
+        /// </summary>
+        /// <param name="info"></param>
+        protected abstract void SaveWord(WordInfo info);
     }
 }

SushiBar/SushiBarBusinessLogic_/OfficePackage/HelperModels/ExcelInfo.cs

@@ -2,7 +2,7 @@
 
 namespace SushiBarBusinessLogic.OfficePackage.HelperModels
 {
-    public class ExcelInfo : IDocument
+    public class ExcelInfo
     {
         public string FileName { get; set; } = string.Empty;
         public string Title { get; set; } = string.Empty;

SushiBar/SushiBarBusinessLogic_/OfficePackage/HelperModels/ExcelShop.cs

@@ -1,16 +0,0 @@
-using SushiBarContracts.ViewModels;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace SushiBarBusinessLogic.OfficePackage.HelperModels
-{
-    public class ExcelShop : IDocument
-    {
-        public string FileName { get; set; } = string.Empty;
-        public string Title { get; set; } = string.Empty;
-        public List<ReportShopsViewModel> ShopSushis { get; set; } = new();
-    }
-}

SushiBar/SushiBarBusinessLogic_/OfficePackage/HelperModels/PdfGroupedOrdersInfo.cs

@@ -1,18 +0,0 @@
-using SushiBarContracts.ViewModels;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace SushiBarBusinessLogic.OfficePackage.HelperModels
-{
-    public class PdfGroupedOrdersInfo : IDocument
-    {
-        public string FileName { get; set; } = string.Empty;
-        public string Title { get; set; } = string.Empty;
-        public DateTime DateFrom { get; set; }
-        public DateTime DateTo { get; set; }
-        public List<ReportGroupOrdersViewModel> GroupedOrders { get; set; } = new();
-    }
-}

SushiBar/SushiBarBusinessLogic_/OfficePackage/HelperModels/PdfInfo.cs

@@ -8,7 +8,7 @@ using System.Threading.Tasks;
 
 namespace SushiBarBusinessLogic.OfficePackage.HelperModels
 {
-    public class PdfInfo : IDocument
+    public class PdfInfo
     {
         public string FileName { get; set; } = string.Empty;
         public string Title { get; set; } = string.Empty;

SushiBar/SushiBarBusinessLogic_/OfficePackage/HelperModels/WordInfo.cs

@@ -2,7 +2,7 @@
 
 namespace SushiBarBusinessLogic.OfficePackage.HelperModels
 {
-    public class WordInfo : IDocument
+    public class WordInfo
     {
         public string FileName { get; set; } = string.Empty;
         public string Title { get; set; } = string.Empty;

SushiBar/SushiBarBusinessLogic_/OfficePackage/HelperModels/WordRowParameters.cs

@@ -1,14 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace SushiBarBusinessLogic.OfficePackage.HelperModels
-{
-    public class WordRowParameters
-    {
-        public List<string> Texts { get; set; } = new();
-        public WordTextProperties TextProperties { get; set; } = new();
-    }
-}

SushiBar/SushiBarBusinessLogic_/OfficePackage/HelperModels/WordShopInfo.cs

@@ -1,16 +0,0 @@
-using SushiBarContracts.ViewModels;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace SushiBarBusinessLogic.OfficePackage.HelperModels
-{
-    public class WordShopInfo : IDocument
-    {
-        public string FileName { get; set; } = string.Empty;
-        public string Title { get; set; } = string.Empty;
-        public List<ShopViewModel> Shops { get; set; } = new();
-    }
-}

SushiBar/SushiBarBusinessLogic_/OfficePackage/IDocument.cs

@@ -1,14 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace SushiBarBusinessLogic.OfficePackage
-{
-    public interface IDocument 
-    {
-        public string FileName { get; set; }
-        public string Title { get; set; }
-    }
-}

SushiBar/SushiBarBusinessLogic_/OfficePackage/Implements/SaveToExcel.cs

@@ -14,110 +14,167 @@ namespace SushiBarBusinessLogic.OfficePackage.Implements
         private SpreadsheetDocument? _spreadsheetDocument;
         private SharedStringTablePart? _shareStringPart;
         private Worksheet? _worksheet;
-
+        /// <summary>
+        /// Настройка стилей для файла
+        /// </summary>
+        /// <param name="workbookpart"></param>
         private static void CreateStyles(WorkbookPart workbookpart)
         {
             var sp = workbookpart.AddNewPart<WorkbookStylesPart>();
             sp.Stylesheet = new Stylesheet();
-
             var fonts = new Fonts() { Count = 2U, KnownFonts = true };
-
             var fontUsual = new Font();
             fontUsual.Append(new FontSize() { Val = 12D });
-            fontUsual.Append(new DocumentFormat.OpenXml.Office2010.Excel.Color() { Theme = 1U });
+            fontUsual.Append(new DocumentFormat.OpenXml.Office2010.Excel.Color()
+            { Theme = 1U });
             fontUsual.Append(new FontName() { Val = "Times New Roman" });
             fontUsual.Append(new FontFamilyNumbering() { Val = 2 });
             fontUsual.Append(new FontScheme() { Val = FontSchemeValues.Minor });
-
             var fontTitle = new Font();
             fontTitle.Append(new Bold());
             fontTitle.Append(new FontSize() { Val = 14D });
-            fontTitle.Append(new DocumentFormat.OpenXml.Office2010.Excel.Color() { Theme = 1U });
+            fontTitle.Append(new DocumentFormat.OpenXml.Office2010.Excel.Color()
+            { Theme = 1U });
             fontTitle.Append(new FontName() { Val = "Times New Roman" });
             fontTitle.Append(new FontFamilyNumbering() { Val = 2 });
             fontTitle.Append(new FontScheme() { Val = FontSchemeValues.Minor });
-
             fonts.Append(fontUsual);
             fonts.Append(fontTitle);
-
             var fills = new Fills() { Count = 2U };
-
             var fill1 = new Fill();
             fill1.Append(new PatternFill() { PatternType = PatternValues.None });
-
             var fill2 = new Fill();
-            fill2.Append(new PatternFill() { PatternType = PatternValues.Gray125 });
-
+            fill2.Append(new PatternFill()
+            {
+                PatternType = PatternValues.Gray125
+            });
             fills.Append(fill1);
             fills.Append(fill2);
-
             var borders = new Borders() { Count = 2U };
-
             var borderNoBorder = new Border();
             borderNoBorder.Append(new LeftBorder());
             borderNoBorder.Append(new RightBorder());
             borderNoBorder.Append(new TopBorder());
             borderNoBorder.Append(new BottomBorder());
             borderNoBorder.Append(new DiagonalBorder());
-
             var borderThin = new Border();
-
             var leftBorder = new LeftBorder() { Style = BorderStyleValues.Thin };
-            leftBorder.Append(new DocumentFormat.OpenXml.Office2010.Excel.Color() { Indexed = 64U });
-
-            var rightBorder = new RightBorder() { Style = BorderStyleValues.Thin };
-            rightBorder.Append(new DocumentFormat.OpenXml.Office2010.Excel.Color() { Indexed = 64U });
-
+            leftBorder.Append(new DocumentFormat.OpenXml.Office2010.Excel.Color()
+            { Indexed = 64U });
+            var rightBorder = new RightBorder()
+            {
+                Style = BorderStyleValues.Thin
+            };
+            rightBorder.Append(new
+           DocumentFormat.OpenXml.Office2010.Excel.Color()
+            { Indexed = 64U });
             var topBorder = new TopBorder() { Style = BorderStyleValues.Thin };
-            topBorder.Append(new DocumentFormat.OpenXml.Office2010.Excel.Color() { Indexed = 64U });
-
-            var bottomBorder = new BottomBorder() { Style = BorderStyleValues.Thin };
-            bottomBorder.Append(new DocumentFormat.OpenXml.Office2010.Excel.Color() { Indexed = 64U });
-
+            topBorder.Append(new DocumentFormat.OpenXml.Office2010.Excel.Color()
+            { Indexed = 64U });
+            var bottomBorder = new BottomBorder()
+            {
+                Style =
+           BorderStyleValues.Thin
+            };
+            bottomBorder.Append(new
+           DocumentFormat.OpenXml.Office2010.Excel.Color()
+            { Indexed = 64U });
             borderThin.Append(leftBorder);
             borderThin.Append(rightBorder);
             borderThin.Append(topBorder);
             borderThin.Append(bottomBorder);
             borderThin.Append(new DiagonalBorder());
-
             borders.Append(borderNoBorder);
             borders.Append(borderThin);
-
             var cellStyleFormats = new CellStyleFormats() { Count = 1U };
-            var cellFormatStyle = new CellFormat() { NumberFormatId = 0U, FontId = 0U, FillId = 0U, BorderId = 0U };
-
+            var cellFormatStyle = new CellFormat()
+            {
+                NumberFormatId = 0U,
+                FontId
+           = 0U,
+                FillId = 0U,
+                BorderId = 0U
+            };
             cellStyleFormats.Append(cellFormatStyle);
-
             var cellFormats = new CellFormats() { Count = 3U };
-            var cellFormatFont = new CellFormat() { NumberFormatId = 0U, FontId = 0U, FillId = 0U, BorderId = 0U, FormatId = 0U, ApplyFont = true };
-            var cellFormatFontAndBorder = new CellFormat() { NumberFormatId = 0U, FontId = 0U, FillId = 0U, BorderId = 1U, FormatId = 0U, ApplyFont = true, ApplyBorder = true };
-            var cellFormatTitle = new CellFormat() { NumberFormatId = 0U, FontId = 1U, FillId = 0U, BorderId = 0U, FormatId = 0U, Alignment = new Alignment() { Vertical = VerticalAlignmentValues.Center, WrapText = true, Horizontal = HorizontalAlignmentValues.Center }, ApplyFont = true };
-
+            var cellFormatFont = new CellFormat()
+            {
+                NumberFormatId = 0U,
+                FontId =
+           0U,
+                FillId = 0U,
+                BorderId = 0U,
+                FormatId = 0U,
+                ApplyFont = true
+            };
+            var cellFormatFontAndBorder = new CellFormat()
+            {
+                NumberFormatId = 0U,
+                FontId = 0U,
+                FillId = 0U,
+                BorderId = 1U,
+                FormatId = 0U,
+                ApplyFont = true,
+                ApplyBorder = true
+            };
+            var cellFormatTitle = new CellFormat()
+            {
+                NumberFormatId = 0U,
+                FontId
+           = 1U,
+                FillId = 0U,
+                BorderId = 0U,
+                FormatId = 0U,
+                Alignment = new Alignment()
+                {
+                    Vertical = VerticalAlignmentValues.Center,
+                    WrapText = true,
+                    Horizontal =
+           HorizontalAlignmentValues.Center
+                },
+                ApplyFont = true
+            };
             cellFormats.Append(cellFormatFont);
             cellFormats.Append(cellFormatFontAndBorder);
             cellFormats.Append(cellFormatTitle);
-
             var cellStyles = new CellStyles() { Count = 1U };
+            cellStyles.Append(new CellStyle()
+            {
+                Name = "Normal",
+                FormatId = 0U,
+                BuiltinId = 0U
+            });
+            var differentialFormats = new
+           DocumentFormat.OpenXml.Office2013.Excel.DifferentialFormats()
+            { Count = 0U };
 
-            cellStyles.Append(new CellStyle() { Name = "Normal", FormatId = 0U, BuiltinId = 0U });
-
-            var differentialFormats = new DocumentFormat.OpenXml.Office2013.Excel.DifferentialFormats() { Count = 0U };
-
-            var tableStyles = new TableStyles() { Count = 0U, DefaultTableStyle = "TableStyleMedium2", DefaultPivotStyle = "PivotStyleLight16" };
-
+            var tableStyles = new TableStyles()
+            {
+                Count = 0U,
+                DefaultTableStyle = "TableStyleMedium2",
+                DefaultPivotStyle = "PivotStyleLight16"
+            };
             var stylesheetExtensionList = new StylesheetExtensionList();
-
-            var stylesheetExtension1 = new StylesheetExtension() { Uri = "{EB79DEF2-80B8-43e5-95BD-54CBDDF9020C}" };
+            var stylesheetExtension1 = new StylesheetExtension()
+            {
+                Uri = "{EB79DEF2-80B8-43e5-95BD-54CBDDF9020C}"
+            };
             stylesheetExtension1.AddNamespaceDeclaration("x14", "http://schemas.microsoft.com/office/spreadsheetml/2009/9/main");
-            stylesheetExtension1.Append(new SlicerStyles() { DefaultSlicerStyle = "SlicerStyleLight1" });
-
-            var stylesheetExtension2 = new StylesheetExtension() { Uri = "{9260A510-F301-46a8-8635-F512D64BE5F5}" };
+            stylesheetExtension1.Append(new SlicerStyles()
+            {
+                DefaultSlicerStyle = "SlicerStyleLight1"
+            });
+            var stylesheetExtension2 = new StylesheetExtension()
+            {
+                Uri = "{9260A510-F301-46a8-8635-F512D64BE5F5}"
+            };
             stylesheetExtension2.AddNamespaceDeclaration("x15", "http://schemas.microsoft.com/office/spreadsheetml/2010/11/main");
-            stylesheetExtension2.Append(new TimelineStyles() { DefaultTimelineStyle = "TimeSlicerStyleLight1" });
-
+            stylesheetExtension2.Append(new TimelineStyles()
+            {
+                DefaultTimelineStyle = "TimeSlicerStyleLight1"
+            });
             stylesheetExtensionList.Append(stylesheetExtension1);
             stylesheetExtensionList.Append(stylesheetExtension2);
-
             sp.Stylesheet.Append(fonts);
             sp.Stylesheet.Append(fills);
             sp.Stylesheet.Append(borders);
@@ -128,7 +185,11 @@ namespace SushiBarBusinessLogic.OfficePackage.Implements
             sp.Stylesheet.Append(tableStyles);
             sp.Stylesheet.Append(stylesheetExtensionList);
         }
-
+        /// <summary>
+        /// Получение номера стиля из типа
+        /// </summary>
+        /// <param name="styleInfo"></param>
+        /// <returns></returns>
         private static uint GetStyleValue(ExcelStyleInfoType styleInfo)
         {
             return styleInfo switch
@@ -139,44 +200,40 @@ namespace SushiBarBusinessLogic.OfficePackage.Implements
                 _ => 0U,
             };
         }
-
-        protected override void CreateExcel(IDocument info)
+        protected override void CreateExcel(ExcelInfo info)
         {
-            _spreadsheetDocument = SpreadsheetDocument.Create(info.FileName, SpreadsheetDocumentType.Workbook);
-            // Создаем книгу (в ней хранятся листы)
+            _spreadsheetDocument = SpreadsheetDocument.Create(info.FileName,
+           SpreadsheetDocumentType.Workbook);
             var workbookpart = _spreadsheetDocument.AddWorkbookPart();
             workbookpart.Workbook = new Workbook();
-
             CreateStyles(workbookpart);
-
-            // Получаем/создаем хранилище текстов для книги
-            _shareStringPart = _spreadsheetDocument.WorkbookPart!.GetPartsOfType<SharedStringTablePart>().Any()
-                ? _spreadsheetDocument.WorkbookPart.GetPartsOfType<SharedStringTablePart>().First()
-                : _spreadsheetDocument.WorkbookPart.AddNewPart<SharedStringTablePart>();
-
+            _shareStringPart =
+           _spreadsheetDocument.WorkbookPart!.GetPartsOfType<SharedStringTablePart>().Any()
+            ?
+           _spreadsheetDocument.WorkbookPart.GetPartsOfType<SharedStringTablePart>().First()
+            :
+           _spreadsheetDocument.WorkbookPart.AddNewPart<SharedStringTablePart>();
             // Создаем SharedStringTable, если его нет
             if (_shareStringPart.SharedStringTable == null)
             {
                 _shareStringPart.SharedStringTable = new SharedStringTable();
             }
-
             // Создаем лист в книгу
             var worksheetPart = workbookpart.AddNewPart<WorksheetPart>();
             worksheetPart.Worksheet = new Worksheet(new SheetData());
-
             // Добавляем лист в книгу
-            var sheets = _spreadsheetDocument.WorkbookPart.Workbook.AppendChild(new Sheets());
+            var sheets =
+           _spreadsheetDocument.WorkbookPart.Workbook.AppendChild(new Sheets());
             var sheet = new Sheet()
             {
-                Id = _spreadsheetDocument.WorkbookPart.GetIdOfPart(worksheetPart),
+                Id =
+           _spreadsheetDocument.WorkbookPart.GetIdOfPart(worksheetPart),
                 SheetId = 1,
                 Name = "Лист"
             };
             sheets.Append(sheet);
-
             _worksheet = worksheetPart.Worksheet;
         }
-
         protected override void InsertCellInWorksheet(ExcelCellParameters excelParams)
         {
             if (_worksheet == null || _shareStringPart == null)
@@ -188,7 +245,6 @@ namespace SushiBarBusinessLogic.OfficePackage.Implements
             {
                 return;
             }
-
             // Ищем строку, либо добавляем ее
             Row row;
             if (sheetData.Elements<Row>().Where(r => r.RowIndex! == excelParams.RowIndex).Any())
@@ -200,8 +256,7 @@ namespace SushiBarBusinessLogic.OfficePackage.Implements
                 row = new Row() { RowIndex = excelParams.RowIndex };
                 sheetData.Append(row);
             }
-
-            // Ищем нужную ячейку  
+            // Ищем нужную ячейку 
             Cell cell;
             if (row.Elements<Cell>().Where(c => c.CellReference!.Value == excelParams.CellReference).Any())
             {
@@ -220,22 +275,20 @@ namespace SushiBarBusinessLogic.OfficePackage.Implements
                         break;
                     }
                 }
-
-                var newCell = new Cell() { CellReference = excelParams.CellReference };
+                var newCell = new Cell()
+                {
+                    CellReference = excelParams.CellReference
+                };
                 row.InsertBefore(newCell, refCell);
-
                 cell = newCell;
             }
-
             // вставляем новый текст
             _shareStringPart.SharedStringTable.AppendChild(new SharedStringItem(new Text(excelParams.Text)));
             _shareStringPart.SharedStringTable.Save();
-
             cell.CellValue = new CellValue((_shareStringPart.SharedStringTable.Elements<SharedStringItem>().Count() - 1).ToString());
             cell.DataType = new EnumValue<CellValues>(CellValues.SharedString);
             cell.StyleIndex = GetStyleValue(excelParams.StyleInfo);
         }
-
         protected override void MergeCells(ExcelMergeParameters excelParams)
         {
             if (_worksheet == null)
@@ -243,7 +296,6 @@ namespace SushiBarBusinessLogic.OfficePackage.Implements
                 return;
             }
             MergeCells mergeCells;
-
             if (_worksheet.Elements<MergeCells>().Any())
             {
                 mergeCells = _worksheet.Elements<MergeCells>().First();
@@ -251,25 +303,24 @@ namespace SushiBarBusinessLogic.OfficePackage.Implements
             else
             {
                 mergeCells = new MergeCells();
-
                 if (_worksheet.Elements<CustomSheetView>().Any())
                 {
-                    _worksheet.InsertAfter(mergeCells, _worksheet.Elements<CustomSheetView>().First());
+                    _worksheet.InsertAfter(mergeCells,
+                   _worksheet.Elements<CustomSheetView>().First());
                 }
                 else
                 {
-                    _worksheet.InsertAfter(mergeCells, _worksheet.Elements<SheetData>().First());
+                    _worksheet.InsertAfter(mergeCells,
+                   _worksheet.Elements<SheetData>().First());
                 }
             }
-
             var mergeCell = new MergeCell()
             {
                 Reference = new StringValue(excelParams.Merge)
             };
             mergeCells.Append(mergeCell);
         }
-
-        protected override void SaveExcel(IDocument info)
+        protected override void SaveExcel(ExcelInfo info)
         {
             if (_spreadsheetDocument == null)
             {

SushiBar/SushiBarBusinessLogic_/OfficePackage/Implements/SaveToPdf.cs

@@ -11,7 +11,6 @@ namespace SushiBarBusinessLogic.OfficePackage.Implements
         private Document? _document;
         private Section? _section;
         private Table? _table;
-
         private static ParagraphAlignment GetParagraphAlignment(PdfParagraphAlignmentType type)
         {
             return type switch
@@ -22,25 +21,24 @@ namespace SushiBarBusinessLogic.OfficePackage.Implements
                 _ => ParagraphAlignment.Justify,
             };
         }
-
+        /// <summary>
+        /// Создание стилей для документа
+        /// </summary>
+        /// <param name="document"></param>
         private static void DefineStyles(Document document)
         {
             var style = document.Styles["Normal"];
             style.Font.Name = "Times New Roman";
             style.Font.Size = 14;
-
             style = document.Styles.AddStyle("NormalTitle", "Normal");
             style.Font.Bold = true;
         }
-
-        protected override void CreatePdf(IDocument info)
+        protected override void CreatePdf(PdfInfo info)
         {
             _document = new Document();
             DefineStyles(_document);
-
             _section = _document.AddSection();
         }
-
         protected override void CreateParagraph(PdfParagraph pdfParagraph)
         {
             if (_section == null)
@@ -52,7 +50,6 @@ namespace SushiBarBusinessLogic.OfficePackage.Implements
             paragraph.Format.Alignment = GetParagraphAlignment(pdfParagraph.ParagraphAlignment);
             paragraph.Style = pdfParagraph.Style;
         }
-
         protected override void CreateTable(List<string> columns)
         {
             if (_document == null)
@@ -60,13 +57,11 @@ namespace SushiBarBusinessLogic.OfficePackage.Implements
                 return;
             }
             _table = _document.LastSection.AddTable();
-
             foreach (var elem in columns)
             {
                 _table.AddColumn(elem);
             }
         }
-
         protected override void CreateRow(PdfRowParameters rowParameters)
         {
             if (_table == null)
@@ -77,25 +72,20 @@ namespace SushiBarBusinessLogic.OfficePackage.Implements
             for (int i = 0; i < rowParameters.Texts.Count; ++i)
             {
                 row.Cells[i].AddParagraph(rowParameters.Texts[i]);
-
                 if (!string.IsNullOrEmpty(rowParameters.Style))
                 {
                     row.Cells[i].Style = rowParameters.Style;
                 }
-
                 Unit borderWidth = 0.5;
-
                 row.Cells[i].Borders.Left.Width = borderWidth;
                 row.Cells[i].Borders.Right.Width = borderWidth;
                 row.Cells[i].Borders.Top.Width = borderWidth;
                 row.Cells[i].Borders.Bottom.Width = borderWidth;
-
                 row.Cells[i].Format.Alignment = GetParagraphAlignment(rowParameters.ParagraphAlignment);
                 row.Cells[i].VerticalAlignment = VerticalAlignment.Center;
             }
         }
-
-        protected override void SavePdf(IDocument info)
+        protected override void SavePdf(PdfInfo info)
         {
             var renderer = new PdfDocumentRenderer(true)
             {
@@ -105,4 +95,4 @@ namespace SushiBarBusinessLogic.OfficePackage.Implements
             renderer.PdfDocument.Save(info.FileName);
         }
     }
-}
+} 

SushiBar/SushiBarBusinessLogic_/OfficePackage/Implements/SaveToWord.cs

@@ -11,8 +11,13 @@ namespace SushiBarBusinessLogic.OfficePackage.Implements
     {
         private WordprocessingDocument? _wordDocument;
         private Body? _docBody;
-
-        private static JustificationValues GetJustificationValues(WordJustificationType type)
+        /// <summary>
+        /// Получение типа выравнивания
+        /// </summary>
+        /// <param name="type"></param>
+        /// <returns></returns>
+        private static JustificationValues
+       GetJustificationValues(WordJustificationType type)
         {
             return type switch
             {
@@ -21,60 +26,59 @@ namespace SushiBarBusinessLogic.OfficePackage.Implements
                 _ => JustificationValues.Left,
             };
         }
-
+        /// <summary>
+        /// Настройки страницы
+        /// </summary>
+        /// <returns></returns>
         private static SectionProperties CreateSectionProperties()
         {
             var properties = new SectionProperties();
-
             var pageSize = new PageSize
             {
                 Orient = PageOrientationValues.Portrait
             };
-
             properties.AppendChild(pageSize);
-
             return properties;
         }
-
+        /// <summary>
+        /// Задание форматирования для абзаца
+        /// </summary>
+        /// <param name="paragraphProperties"></param>
+        /// <returns></returns>
         private static ParagraphProperties? CreateParagraphProperties(WordTextProperties? paragraphProperties)
         {
             if (paragraphProperties == null)
             {
                 return null;
             }
-
             var properties = new ParagraphProperties();
-
             properties.AppendChild(new Justification()
             {
                 Val = GetJustificationValues(paragraphProperties.JustificationType)
             });
-
             properties.AppendChild(new SpacingBetweenLines
             {
                 LineRule = LineSpacingRuleValues.Auto
             });
-
             properties.AppendChild(new Indentation());
-
             var paragraphMarkRunProperties = new ParagraphMarkRunProperties();
             if (!string.IsNullOrEmpty(paragraphProperties.Size))
             {
-                paragraphMarkRunProperties.AppendChild(new FontSize { Val = paragraphProperties.Size });
+                paragraphMarkRunProperties.AppendChild(new FontSize
+                {
+                    Val = paragraphProperties.Size
+                });
             }
             properties.AppendChild(paragraphMarkRunProperties);
-
             return properties;
         }
-
-        protected override void CreateWord(IDocument info)
+        protected override void CreateWord(WordInfo info)
         {
             _wordDocument = WordprocessingDocument.Create(info.FileName, WordprocessingDocumentType.Document);
             MainDocumentPart mainPart = _wordDocument.AddMainDocumentPart();
             mainPart.Document = new Document();
             _docBody = mainPart.Document.AppendChild(new Body());
         }
-
         protected override void CreateParagraph(WordParagraph paragraph)
         {
             if (_docBody == null || paragraph == null)
@@ -84,11 +88,9 @@ namespace SushiBarBusinessLogic.OfficePackage.Implements
             var docParagraph = new Paragraph();
 
             docParagraph.AppendChild(CreateParagraphProperties(paragraph.TextProperties));
-
             foreach (var run in paragraph.Texts)
             {
                 var docRun = new Run();
-
                 var properties = new RunProperties();
                 properties.AppendChild(new FontSize { Val = run.Item2.Size });
                 if (run.Item2.Bold)
@@ -96,97 +98,24 @@ namespace SushiBarBusinessLogic.OfficePackage.Implements
                     properties.AppendChild(new Bold());
                 }
                 docRun.AppendChild(properties);
-
-                docRun.AppendChild(new Text { Text = run.Item1, Space = SpaceProcessingModeValues.Preserve });
-
+                docRun.AppendChild(new Text
+                {
+                    Text = run.Item1, 
+                    Space = SpaceProcessingModeValues.Preserve
+                });
                 docParagraph.AppendChild(docRun);
             }
-
             _docBody.AppendChild(docParagraph);
         }
-
-        protected override void SaveWord(IDocument info)
+        protected override void SaveWord(WordInfo info)
         {
             if (_docBody == null || _wordDocument == null)
             {
                 return;
             }
             _docBody.AppendChild(CreateSectionProperties());
-
             _wordDocument.MainDocumentPart!.Document.Save();
             _wordDocument.Dispose();
         }
-
-        private Table? _lastTable;
-        protected override void CreateTable(List<string> columns)
-        {
-            if (_docBody == null)
-                return;
-
-            _lastTable = new Table();
-
-            var tableProp = new TableProperties();
-            tableProp.AppendChild(new TableLayout { Type = TableLayoutValues.Fixed });
-            tableProp.AppendChild(new TableBorders(
-                    new TopBorder() { Val = new EnumValue<BorderValues>(BorderValues.Single), Size = 4 },
-                    new LeftBorder() { Val = new EnumValue<BorderValues>(BorderValues.Single), Size = 4 },
-                    new RightBorder() { Val = new EnumValue<BorderValues>(BorderValues.Single), Size = 4 },
-                    new BottomBorder() { Val = new EnumValue<BorderValues>(BorderValues.Single), Size = 4 },
-                    new InsideHorizontalBorder() { Val = new EnumValue<BorderValues>(BorderValues.Single), Size = 4 },
-                    new InsideVerticalBorder() { Val = new EnumValue<BorderValues>(BorderValues.Single), Size = 4 }
-                ));
-            tableProp.AppendChild(new TableWidth { Type = TableWidthUnitValues.Auto });
-            _lastTable.AppendChild(tableProp);
-
-            TableGrid tableGrid = new TableGrid();
-            foreach (var column in columns)
-            {
-                tableGrid.AppendChild(new GridColumn() { Width = column });
-            }
-            _lastTable.AppendChild(tableGrid);
-
-            _docBody.AppendChild(_lastTable);
-        }
-
-        protected override void CreateRow(WordRowParameters rowParameters)
-        {
-            if (_docBody == null || _lastTable == null)
-                return;
-
-            TableRow docRow = new TableRow();
-            foreach (var column in rowParameters.Texts)
-            {
-                var docParagraph = new Paragraph();
-                WordParagraph paragraph = new WordParagraph
-                {
-                    Texts = new List<(string, WordTextProperties)> { (column, rowParameters.TextProperties) },
-                    TextProperties = rowParameters.TextProperties
-                };
-
-                docParagraph.AppendChild(CreateParagraphProperties(paragraph.TextProperties));
-
-                foreach (var run in paragraph.Texts)
-                {
-                    var docRun = new Run();
-
-                    var properties = new RunProperties();
-                    properties.AppendChild(new FontSize { Val = run.Item2.Size });
-                    if (run.Item2.Bold)
-                    {
-                        properties.AppendChild(new Bold());
-                    }
-                    docRun.AppendChild(properties);
-
-                    docRun.AppendChild(new Text { Text = run.Item1, Space = SpaceProcessingModeValues.Preserve });
-
-                    docParagraph.AppendChild(docRun);
-                }
-
-                TableCell docCell = new TableCell();
-                docCell.AppendChild(docParagraph);
-                docRow.AppendChild(docCell);
-            }
-            _lastTable.AppendChild(docRow);
-        }
     }
 }

SushiBar/SushiBarBusinessLogic_/OrderLogic.cs

@@ -0,0 +1,174 @@
+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();
+		public OrderLogic(ILogger<OrderLogic> logger, IOrderStorage orderStorage, AbstractMailWorker mailWorker)
+		{
+            _logger = logger;
+            _orderStorage = orderStorage;
+			_mailWorker = mailWorker;
+		}
+        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)
+        {
+            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 InvalidOperationException(nameof(element));
+            }
+            model.DateCreate = element.DateCreate;
+            model.SushiId = element.SushiId;
+            model.DateImplement = element.DateImplement;
+            model.ClientId = element.ClientId;
+            if (!model.ImplementerId.HasValue)
+            {
+                model.ImplementerId = element.ImplementerId;
+            }
+            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;
+                }
+				string DateInfo = model.DateImplement.HasValue ? $"Дата выполнения {model.DateImplement}" : "";
+				Task.Run(() => _mailWorker.MailSendAsync(new MailSendInfoBindingModel
+				{
+					MailAddress = element.ClientEmail,
+					Subject = $"Изменение статуса заказа номер {element.Id}",
+					Text = $"Ваш заказ номер {element.Id} на суши {element.SushiName} от {element.DateCreate} на сумму {element.Sum} {model.Status}. {DateInfo}"
+				}));
+				return true;
+            }
+            _logger.LogWarning("Changing status operation faled: Current-{Status}:required-{requiredStatus}.", model.Status, requiredStatus);
+            throw new InvalidOperationException($"Невозможно приствоить статус {requiredStatus} заказу с текущим статусом {model.Status}");
+        
+        }
+
+        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;
+        }
+    }
+}

SushiBar/SushiBarBusinessLogic_/ReportLogic.cs

@@ -11,25 +11,24 @@ using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 
-namespace SushiBarBusinessLogic.BusinessLogics
+namespace SushiBarBusinessLogic
 {
     public class ReportLogic : IReportLogic
     {
         private readonly IComponentStorage _componentStorage;
         private readonly ISushiStorage _SushiStorage;
         private readonly IOrderStorage _orderStorage;
-        private readonly IShopStorage _shopStorage;
         private readonly AbstractSaveToExcel _saveToExcel;
         private readonly AbstractSaveToWord _saveToWord;
         private readonly AbstractSaveToPdf _saveToPdf;
 
-        public ReportLogic(ISushiStorage SushiStorage, IComponentStorage componentStorage, IOrderStorage orderStorage, IShopStorage shopStorage,
+        public ReportLogic(ISushiStorage SushiStorage, IComponentStorage componentStorage, IOrderStorage orderStorage,
             AbstractSaveToExcel saveToExcel, AbstractSaveToWord saveToWord, AbstractSaveToPdf saveToPdf)
         {
             _SushiStorage = SushiStorage;
             _componentStorage = componentStorage;
             _orderStorage = orderStorage;
-            _shopStorage = shopStorage;
+
             _saveToExcel = saveToExcel;
             _saveToWord = saveToWord;
             _saveToPdf = saveToPdf;
@@ -90,55 +89,5 @@ namespace SushiBarBusinessLogic.BusinessLogics
                 Orders = GetOrders(model)
             });
         }
-
-        public List<ReportShopsViewModel> GetShops()
-        {
-            return _shopStorage.GetFullList().Select(x => new ReportShopsViewModel
-            {
-                ShopName = x.ShopName,
-                Sushis = x.ShopSushis.Select(x => (x.Value.Item1.SushiName, x.Value.Item2)).ToList(),
-                TotalCount = x.ShopSushis.Select(x => x.Value.Item2).Sum()
-            }).ToList();
-        }
-
-        public List<ReportGroupOrdersViewModel> GetGroupedOrders()
-        {
-            return _orderStorage.GetFullList().GroupBy(x => x.DateCreate.Date).Select(x => new ReportGroupOrdersViewModel
-            {
-                Date = x.Key,
-                OrdersCount = x.Count(),
-                OrdersSum = x.Select(y => y.Sum).Sum()
-            }).ToList();
-        }
-
-        public void SaveShopsToWordFile(ReportBindingModel model)
-        {
-            _saveToWord.CreateShopsDoc(new WordShopInfo
-            {
-                FileName = model.FileName,
-                Title = "Список магазинов",
-                Shops = _shopStorage.GetFullList()
-            });
-        }
-
-        public void SaveShopsToExcelFile(ReportBindingModel model)
-        {
-            _saveToExcel.CreateShopSushisReport(new ExcelShop
-            {
-                FileName = model.FileName,
-                Title = "Наполненость магазинов",
-                ShopSushis = GetShops()
-            });
-        }
-
-        public void SaveGroupedOrdersToPdfFile(ReportBindingModel model)
-        {
-            _saveToPdf.CreateGroupedOrdersDoc(new PdfGroupedOrdersInfo
-            {
-                FileName = model.FileName,
-                Title = "Список заказов сгруппированных по дате заказов",
-                GroupedOrders = GetGroupedOrders()
-            });
-        }
     }
 }

SushiBar/SushiBarBusinessLogic_/SushiBarBusinessLogic.csproj

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

SushiBar/SushiBarBusinessLogic_/SushiLogic.cs

@@ -92,11 +92,11 @@ namespace SushiBarBusinessLogic.BusinessLogics
             }
             if (string.IsNullOrEmpty(model.SushiName))
             {
-                throw new ArgumentNullException("Нет названия суши", nameof(model.SushiName));
+                throw new ArgumentNullException("Нет названия пиццы", nameof(model.SushiName));
             }
             if (model.Price <= 0)
             {
-                throw new ArgumentNullException("Цена суши должна быть больше 0", nameof(model.Price));
+                throw new ArgumentNullException("Цена пиццы должна быть больше 0", nameof(model.Price));
             }
             if (model.SushiComponents == null || model.SushiComponents.Count == 0)
             {
@@ -109,7 +109,7 @@ namespace SushiBarBusinessLogic.BusinessLogics
             });
             if (element != null && element.Id != model.Id)
             {
-                throw new InvalidOperationException("Суши с таким названием уже есть");
+                throw new InvalidOperationException("Пицца с таким названием уже есть");
             }
         }
     }

SushiBar/SushiBarBusinessLogic_/WorkModeling .cs

@@ -36,8 +36,7 @@ namespace SushiBarBusinessLogic
                 return;
             }
             var orders = _orderLogic.ReadList(new OrderSearchModel { Status = OrderStatus.Принят });
-			
-			if (orders == null )
+            if (orders == null || orders.Count == 0)
             {
                 _logger.LogWarning("DoWork. Orders is null or empty");
                 return;
@@ -55,8 +54,7 @@ namespace SushiBarBusinessLogic
             {
                 return;
             }
-			await DeliverWaitingOrder(implementer);
-			await RunOrderInWork(implementer);
+            await RunOrderInWork(implementer);
 
             await Task.Run(() =>
             {
@@ -78,8 +76,7 @@ namespace SushiBarBusinessLogic
                         {
                             Id = order.Id
                         });
-						_orderLogic.DeliveryOrder(new OrderBindingModel { Id = order.Id });
-					}
+                    }
                     // кто-то мог уже перехватить заказ, игнорируем ошибку
                     catch (InvalidOperationException ex)
                     {
@@ -138,47 +135,5 @@ namespace SushiBarBusinessLogic
                 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

@@ -10,16 +10,14 @@ namespace SushiBarClientApp
     public class APIClient
     {
         private static readonly HttpClient _client = new();
-
-        public static string? Password { get; set; }
-        
+        public static ClientViewModel? Client { get; set; } = null;
         public static void Connect(IConfiguration configuration)
         {
             _client.BaseAddress = new Uri(configuration["IPAddress"]);
             _client.DefaultRequestHeaders.Accept.Clear();
-            _client.DefaultRequestHeaders.Accept.Add(new MediaTypeWithQualityHeaderValue("application/json"));
+            _client.DefaultRequestHeaders.Accept.Add(new
+           MediaTypeWithQualityHeaderValue("application/json"));
         }
-
         public static T? GetRequest<T>(string requestUrl)
         {
             var response = _client.GetAsync(requestUrl);
@@ -33,24 +31,12 @@ namespace SushiBarClientApp
                 throw new Exception(result);
             }
         }
-
         public static void PostRequest<T>(string requestUrl, T model)
         {
             var json = JsonConvert.SerializeObject(model);
-            var data = new StringContent(json, Encoding.UTF8, "application/json");
-
+            var data = new StringContent(json, Encoding.UTF8,
+           "application/json");
             var response = _client.PostAsync(requestUrl, data);
-
-            var result = response.Result.Content.ReadAsStringAsync().Result;
-            if (!response.Result.IsSuccessStatusCode)
-            {
-                throw new Exception(result);
-            }
-        }
-
-        public static void DeleteRequest(string requestUrl)
-        {
-            var response = _client.DeleteAsync(requestUrl);
             var result = response.Result.Content.ReadAsStringAsync().Result;
             if (!response.Result.IsSuccessStatusCode)
             {
@@ -58,5 +44,5 @@ namespace SushiBarClientApp
             }
         }
     }
-}
 
+}

SushiBar/SushiBarClientApp/Controllers/HomeController.cs

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

SushiBar/SushiBarClientApp/Views/Home/Index.cshtml

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

SushiBar/SushiBarClientApp/Views/Home/Mails.cshtml

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

SushiBar/SushiBarClientApp/Views/Home/Shop.cshtml

@@ -1,74 +0,0 @@
-@using SushiBarDataModels.Models;
-@using SushiBarContracts.ViewModels;
- @model ShopSushiViewModel
-
-@{
-	ViewData["Title"] = "Shop";
-}
-
-<div class="text-center">
-	@{
-		if (Model == null)
-		{
-			<h2 class="display-4">Создание магазина</h2>
-		}
-		else
-		{
-			<h2 class="display-4">Изменение магазина</h2>
-		}
-	}
-</div>
-
-<form method="post">
-	<div class="mb-3">
-		<label class="form-label">Название</label>
-		<input type="text" class="form-control" name="shopname" id="shopname" value="@(Model==null ? "" : Model.Shop?.ShopName)" />
-	</div>
-	<div class="mb-3">
-		<label class="form-label">Адрес</label>
-		<input type="text" class="form-control" name="adress" id="adress" value="@(Model==null ? "" : Model.Shop?.Adress)" />
-	</div>
-	<div class="mb-3">
-		<label for="startDate">Дата открытия</label>
-		<input class="form-control" type="date" name="openingdate" id="openingdate" value="@(Model==null ? "" : Model.Shop?.OpeningDate.ToString("yyyy-MM-dd"))" />
-	</div>
-	<div class="mb-3">
-		<label class="form-label">Вместимость</label>
-		<input type="number" min="0" step="1" pattern="[0-9]" class="form-control" name="maxcount" id="maxcount" value="@(Model==null ? "" : Model.Shop?.SushiMaxCount)" />
-	</div>
-	<div class="mb-3 ">
-		<input class="btn btn-primary" type="submit" value="Сохранить">
-		@{
-			if (Model != null && Model.Shop != null)
-			{
-				<input class="btn btn-danger" asp-action="Delete" type="submit" value="Удалить" asp-route-Id="@(Model==null ? 0 : Model.Shop.Id.ToString())">
-			}
-		}
-	</div>
-</form>
-@{
-	if (Model != null && Model.Shop != null)
-	{
-		<div>
-			<h6>Содержимое магазина</h6>
-		</div>
-		<table class="table">
-			<thead>
-				<tr>
-					<th>Название</th>
-					<th>Количество</th>
-				</tr>
-			</thead>
-			<tbody>
-				@foreach (var item in Model.ShopSushi)
-				{
-					<tr>
-						<td>@Html.DisplayFor(modelItem => item.Value.Sushi.SushiName)</td>
-						<td>@Html.DisplayFor(modelItem => item.Value.Count)</td>
-					</tr>
-				}
-			</tbody>
-
-		</table>
-	}
-}

SushiBar/SushiBarClientApp/Views/Home/Supply.cshtml

@@ -1,22 +0,0 @@
-@{
-    ViewData["Title"] = "Supply";
-}
-<div class="text-center">
-    <h2 class="display-4">Создание поставки</h2>
-</div>
-<form method="post">
-    <div class="mb-3">
-        <label class="form-label">Магазин</label>
-        <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>
-        <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">
-        <label class="form-label">Колличество</label>
-        <input type="number" min="0" step="1" pattern="[0-9]" class="form-control" name="count" id="count">
-    </div>
-    <input class="btn btn-success" type="submit" value="Создать поставку">
-    <a class="btn btn-primary" href="./Index" role="button">Отмена</a>
-</form>

SushiBar/SushiBarClientApp/Views/Shared/_Layout.cshtml

@@ -14,18 +14,27 @@
     <header>
         <nav class="navbar navbar-expand-sm navbar-toggleable-sm navbar-light bg-white border-bottom box-shadow mb-3">
             <div class="container-fluid">
-                <a class="navbar-brand" asp-area="" asp-controller="Home" asp-action="Index">PizzeriaShopsApi</a>
-                <button class="navbar-toggler" type="button" data-bs-toggle="collapse" data-bs-target=".navbar-collapse" aria-controls="navbarSupportedContent"
+                <a class="navbar-brand" asp-area="" asp-controller="Home" asp-action="Index">Суши-Бар</a>
+                <button class="navbar-toggler" type="button" data-toggle="collapse" data-target=".navbar-collapse" aria-controls="navbarSupportedContent"
                         aria-expanded="false" aria-label="Toggle navigation">
                     <span class="navbar-toggler-icon"></span>
                 </button>
-                <div class="navbar-collapse collapse d-sm-inline-flex justify-content-between">
+                <div class="navbar-collapse collapse d-sm-inline-flex flex-sm-row-reverse">
                     <ul class="navbar-nav flex-grow-1">
                         <li class="nav-item">
-                            <a class="nav-link text-dark" asp-area="" asp-controller="Home" asp-action="Index">Главная</a>
+                            <a class="nav-link text-dark" asp-area="" asp-controller="Home" asp-action="Index">Заказы</a>
                         </li>
                         <li class="nav-item">
-                            <a class="nav-link text-dark" asp-area="" asp-controller="Home" asp-action="Supply">Поставка</a>
+                            <a class="nav-link text-dark" asp-area="" asp-controller="Home" asp-action="Privacy">Личные данные</a>
+                        </li>
+                        <li class="nav-item">
+                            <a class="nav-link text-dark" asp-area="" asp-controller="Home" asp-action="Mails">Письма</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>
                         </li>
                     </ul>
                 </div>
@@ -40,7 +49,7 @@
 
     <footer class="border-top footer text-muted">
         <div class="container">
-            &copy; 2024 - SushiBarShopApp - <a asp-area="" asp-controller="Home" asp-action="Index">Главная</a>
+            &copy; 2024 - SushiBarClientApp - <a asp-area="" asp-controller="Home" asp-action="Privacy">Privacy</a>
         </div>
     </footer>
     <script src="~/lib/jquery/dist/jquery.min.js"></script>

SushiBar/SushiBarContracts/BindingModels/MailConfigBindingModel.cs

@@ -0,0 +1,18 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace SushiBarContracts.BindingModels
+{
+	public class MailConfigBindingModel
+	{
+		public string MailLogin { get; set; } = string.Empty;
+		public string MailPassword { get; set; } = string.Empty;
+		public string SmtpClientHost { get; set; } = string.Empty;
+		public int SmtpClientPort { get; set; }
+		public string PopHost { get; set; } = string.Empty;
+		public int PopPort { get; set; }
+	}
+}

SushiBar/SushiBarContracts/BindingModels/MailSendInfoBindingModel.cs

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

SushiBar/SushiBarContracts/BindingModels/MessageInfoBindingModel.cs

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

SushiBar/SushiBarContracts/BindingModels/ShopBindingModel.cs

@@ -1,19 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using SushiBarDataModels.Models;
-
-namespace SushiBarContracts.BindingModels
-{
-    public class ShopBindingModel : IShopModel
-    {
-        public int Id { get; set; }
-        public string ShopName { get; set; } = string.Empty;
-        public string Adress { get; set; } = string.Empty;
-        public DateTime OpeningDate { get; set; } = DateTime.Now;
-        public Dictionary<int, (ISushiModel, int)> ShopSushis { get; set; } = new();
-        public int SushiMaxCount { get; set; }
-    }
-}

SushiBar/SushiBarContracts/BindingModels/SupplyBindingModel.cs

@@ -1,16 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using SushiBarDataModels.Models;
-
-namespace SushiBarContracts.BindingModels
-{
-    public class SupplyBindingModel : ISupplyModel
-    {
-        public int ShopId { get; set; }
-        public int SushiId { get; set; }
-        public int Count { get; set; }
-    }
-}

SushiBar/SushiBarContracts/BusinessLogicsContracts/IMessageInfoLogic.cs

@@ -0,0 +1,17 @@
+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);
+		bool Create(MessageInfoBindingModel model);
+	}
+}

SushiBar/SushiBarContracts/BusinessLogicsContracts/IReportLogic.cs

@@ -7,13 +7,8 @@ namespace SushiBarContracts.BusinessLogicsContracts
     {
         List<ReportSushiComponentViewModel> GetSushiComponents();
         List<ReportOrdersViewModel> GetOrders(ReportBindingModel model);
-        List<ReportShopsViewModel> GetShops();
-        List<ReportGroupOrdersViewModel> GetGroupedOrders();
         void SaveSushisToWordFile(ReportBindingModel model);
         void SaveSushiComponentToExcelFile(ReportBindingModel model);
         void SaveOrdersToPdfFile(ReportBindingModel model);
-        void SaveShopsToWordFile(ReportBindingModel model);
-        void SaveShopsToExcelFile(ReportBindingModel model);
-        void SaveGroupedOrdersToPdfFile(ReportBindingModel model);
     }
 }

SushiBar/SushiBarContracts/BusinessLogicsContracts/IShopLogic.cs

@@ -1,22 +0,0 @@
-using SushiBarContracts.BindingModels;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using SushiBarContracts.SearchModels;
-using SushiBarContracts.ViewModels;
-
-namespace SushiBarContracts.BusinessLogicsContracts
-{
-    public interface IShopLogic
-    {
-        List<ShopViewModel>? ReadList(ShopSearchModel? model);
-        ShopViewModel? ReadElement(ShopSearchModel model);
-        bool Create(ShopBindingModel model);
-        bool Update(ShopBindingModel model);
-        bool Delete(ShopBindingModel model);
-        bool MakeSupply(SupplyBindingModel model);
-        bool Sale(SupplySearchModel model);
-    }
-}

SushiBar/SushiBarContracts/SearchModels/MessageInfoSearchModel.cs

@@ -6,9 +6,9 @@ using System.Threading.Tasks;
 
 namespace SushiBarContracts.SearchModels
 {
-    public class ShopSearchModel
-    {
-        public int? Id { get; set; }
-        public string? ShopName { get; set; }
-    }
+	public class MessageInfoSearchModel
+	{
+		public int? ClientId { get; set; }
+		public string? MessageId { get; set; }
+	}
 }

SushiBar/SushiBarContracts/SearchModels/SupplySearchModel.cs

@@ -1,14 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace SushiBarContracts.SearchModels
-{
-    public class SupplySearchModel
-    {
-        public int? SushiId { get; set; }
-        public int? Count { get; set; }
-    }
-}

SushiBar/SushiBarContracts/StoragesContracts/IMessageInfoStorage.cs

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

SushiBar/SushiBarContracts/StoragesContracts/IShopStorage.cs

@@ -1,23 +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 IShopStorage
-    {
-        List<ShopViewModel> GetFullList();
-        List<ShopViewModel> GetFilteredList(ShopSearchModel model);
-        ShopViewModel? GetElement(ShopSearchModel model);
-        ShopViewModel? Insert(ShopBindingModel model);
-        ShopViewModel? Update(ShopBindingModel model);
-        ShopViewModel? Delete(ShopBindingModel model);
-        bool Sale(SupplySearchModel model);
-        bool RestockingShops(SupplyBindingModel model);
-    }
-}

SushiBar/SushiBarContracts/ViewModels/MessageInfoViewModel.cs

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

SushiBar/SushiBarContracts/ViewModels/OrderViewModel.cs

@@ -18,6 +18,7 @@ namespace SushiBarContracts.ViewModels
         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/SushiBarContracts/ViewModels/ReportGroupOrdersViewModel.cs

@@ -1,15 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace SushiBarContracts.ViewModels
-{
-    public class ReportGroupOrdersViewModel
-    {
-        public DateTime Date { get; set; } = DateTime.Now;
-        public int OrdersCount { get; set; }
-        public double OrdersSum { get; set; }
-    }
-}

SushiBar/SushiBarContracts/ViewModels/ReportShopsViewModel.cs

@@ -1,15 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace SushiBarContracts.ViewModels
-{
-    public class ReportShopsViewModel
-    {
-        public string ShopName { get; set; } = string.Empty;
-        public int TotalCount { get; set; }
-        public List<(string Sushi, int count)> Sushis { get; set; } = new();
-    }
-}

SushiBar/SushiBarContracts/ViewModels/ShopSushiViewModel.cs

@@ -1,14 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace SushiBarContracts.ViewModels
-{
-    public class ShopSushiViewModel
-    {
-        public ShopViewModel Shop { get; set; } = new();
-        public Dictionary<int, SushiCount> ShopSushi { get; set; } = new();
-    }
-}

SushiBar/SushiBarContracts/ViewModels/ShopViewModel.cs

@@ -1,25 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using SushiBarDataModels.Models;
-using SushiBarContracts.ViewModels;
-
-namespace SushiBarContracts.ViewModels
-{
-    public class ShopViewModel : IShopModel
-    {
-        public int Id { get; set; }
-        [DisplayName("Название")]
-        public string ShopName { get; set; } = string.Empty;
-        [DisplayName("Адрес")]
-        public string Adress { get; set; } = string.Empty;
-        [DisplayName("Дата открытия")]
-        public DateTime OpeningDate { get; set; }
-        public Dictionary<int, (ISushiModel, int)> ShopSushis { get; set; } = new();
-        [DisplayName("Вместимость")]
-        public int SushiMaxCount { get; set; }
-    }
-}

SushiBar/SushiBarContracts/ViewModels/SushiCount.cs

@@ -1,14 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace SushiBarContracts.ViewModels
-{
-    public class SushiCount
-    {
-        public SushiViewModel Sushi { get; set; }
-        public int Count { get; set; } = new();
-    }
-}

SushiBar/SushiBarDataModels/Enums/OrderStatus.cs

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

SushiBar/SushiBarDataModels/Models/IMessageInfoModel.cs

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

SushiBar/SushiBarDataModels/Models/IShopModel.cs

@@ -1,17 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace SushiBarDataModels.Models
-{
-    public interface IShopModel : IId
-    {
-        string ShopName { get; }
-        string Adress { get; }
-        DateTime OpeningDate { get; }
-        Dictionary<int, (ISushiModel, int)> ShopSushis { get; }
-        public int SushiMaxCount { get; }
-    }
-}

SushiBar/SushiBarDataModels/Models/ISupplyModel.cs

@@ -1,15 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace SushiBarDataModels.Models
-{
-    public interface ISupplyModel
-    {
-        int ShopId { get; }
-        int SushiId { get; }
-        int Count { get; }
-    }
-}

SushiBar/SushiBarDatabaseImplement/Implements/ClientStorage.cs

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

SushiBar/SushiBarDatabaseImplement/Implements/MessageInfoStorage.cs

@@ -0,0 +1,52 @@
+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)
+            {
+                return new();
+            }
+            using var context = new SushiBarDatabase();
+            return context.MessageInfos.Where(x => x.ClientId.HasValue && x.ClientId == model.ClientId).Select(x => x.GetViewModel).ToList();
+        }
+        public MessageInfoViewModel? GetElement(MessageInfoSearchModel model)
+        {
+            if (string.IsNullOrEmpty(model.MessageId))
+            {
+                return 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();
+            context.MessageInfos.Add(newMessage);
+            context.SaveChanges();
+            return newMessage.GetViewModel;
+        }
+    }
+}

SushiBar/SushiBarDatabaseImplement/Implements/ShopStorage.cs

@@ -1,186 +0,0 @@
-using Microsoft.EntityFrameworkCore;
-using SushiBarContracts.BindingModels;
-using SushiBarContracts.SearchModels;
-using SushiBarContracts.StoragesContracts;
-using SushiBarContracts.ViewModels;
-using SushiBarDatabaseImplement.Models;
-
-
-namespace SushiBarDatabaseImplement.Implements
-{
-    public class ShopStorage : IShopStorage
-    {
-        public List<ShopViewModel> GetFullList()
-        {
-            using var context = new SushiBarDatabase();
-            return context.Shops.Include(x => x.Sushis).ThenInclude(x => x.Sushi).ToList().
-                Select(x => x.GetViewModel).ToList();
-        }
-
-        public List<ShopViewModel> GetFilteredList(ShopSearchModel model)
-        {
-            if (string.IsNullOrEmpty(model.ShopName))
-            {
-                return new();
-            }
-            using var context = new SushiBarDatabase();
-            return context.Shops.Include(x => x.Sushis).ThenInclude(x => x.Sushi).Where(x => x.ShopName.Contains(model.ShopName)).
-                ToList().Select(x => x.GetViewModel).ToList();
-        }
-
-        public ShopViewModel? GetElement(ShopSearchModel model)
-        {
-            if (string.IsNullOrEmpty(model.ShopName) && !model.Id.HasValue)
-            {
-                return new();
-            }
-            using var context = new SushiBarDatabase();
-            return context.Shops.Include(x => x.Sushis).ThenInclude(x => x.Sushi)
-                .FirstOrDefault(x =>
-                (!string.IsNullOrEmpty(model.ShopName) && x.ShopName == model.ShopName) ||
-                (model.Id.HasValue && x.Id == model.Id))?.GetViewModel;
-        }
-
-        public ShopViewModel? Insert(ShopBindingModel model)
-        {
-            using var context = new SushiBarDatabase();
-            var newShop = Shop.Create(context, model);
-            if (newShop == null)
-            {
-                return null;
-            }
-            context.Shops.Add(newShop);
-            context.SaveChanges();
-            return newShop.GetViewModel;
-        }
-
-        public ShopViewModel? Update(ShopBindingModel model)
-        {
-            using var context = new SushiBarDatabase();
-            using var transaction = context.Database.BeginTransaction();
-            try
-            {
-                var shop = context.Shops.FirstOrDefault(x => x.Id == model.Id);
-                if (shop == null)
-                {
-                    return null;
-                }
-                shop.Update(model);
-                context.SaveChanges();
-                shop.UpdateSushis(context, model);
-                transaction.Commit();
-                return shop.GetViewModel;
-            }
-            catch
-            {
-                transaction.Rollback();
-                throw;
-            }
-        }
-
-        public ShopViewModel? Delete(ShopBindingModel model)
-        {
-            using var context = new SushiBarDatabase();
-            var shop = context.Shops.Include(x => x.Sushis).FirstOrDefault(x => x.Id == model.Id);
-            if (shop != null)
-            {
-                context.Shops.Remove(shop);
-                context.SaveChanges();
-                return shop.GetViewModel;
-            }
-            return null;
-        }
-
-        public bool RestockingShops(SupplyBindingModel model)
-        {
-            using var context = new SushiBarDatabase();
-            var transaction = context.Database.BeginTransaction();
-            var Shops = context.Shops.Include(x => x.Sushis).ThenInclude(x => x.Sushi).ToList().
-                Where(x => x.SushiMaxCount > x.ShopSushis.Select(x => x.Value.Item2).Sum()).ToList();
-            if (model == null)
-            {
-                return false;
-            }
-            try
-            {
-                foreach (Shop shop in Shops)
-                {
-                    int difference = shop.SushiMaxCount - shop.ShopSushis.Select(x => x.Value.Item2).Sum();
-                    int refill = Math.Min(difference, model.Count);
-                    model.Count -= refill;
-                    if (shop.ShopSushis.ContainsKey(model.SushiId))
-                    {
-                        var datePair = shop.ShopSushis[model.SushiId];
-                        datePair.Item2 += refill;
-                        shop.ShopSushis[model.SushiId] = datePair;
-                    }
-                    else
-                    {
-                        var sushi = context.Sushis.First(x => x.Id == model.SushiId);
-                        shop.ShopSushis.Add(model.SushiId, (sushi, refill));
-                    }
-                    shop.SushisDictionatyUpdate(context);
-                    if (model.Count == 0)
-                    {
-                        transaction.Commit();
-                        return true;
-                    }
-                }
-                transaction.Rollback();
-                return false;
-            }
-            catch
-            {
-                transaction.Rollback();
-                throw;
-            }
-        }
-
-        public bool Sale(SupplySearchModel model)
-        {
-            using var context = new SushiBarDatabase();
-            var transaction = context.Database.BeginTransaction();
-            try
-            {
-                var shops = context.Shops.Include(x => x.Sushis).ThenInclude(x => x.Sushi).ToList().
-                    Where(x => x.ShopSushis.ContainsKey(model.SushiId.Value)).OrderByDescending(x => x.ShopSushis[model.SushiId.Value].Item2).ToList();
-
-                foreach (var shop in shops)
-                {
-                    int residue = model.Count.Value - shop.ShopSushis[model.SushiId.Value].Item2;
-                    if (residue > 0)
-                    {
-                        shop.ShopSushis.Remove(model.SushiId.Value);
-                        shop.SushisDictionatyUpdate(context);
-                        context.SaveChanges();
-                        model.Count = residue;
-
-                    }
-                    else
-                    {
-                        if (residue == 0)
-                            shop.ShopSushis.Remove(model.SushiId.Value);
-                        else
-                        {
-                            var dataPair = shop.ShopSushis[model.SushiId.Value];
-                            dataPair.Item2 = -residue;
-                            shop.ShopSushis[model.SushiId.Value] = dataPair;
-                        }
-
-                        shop.SushisDictionatyUpdate(context);
-                        transaction.Commit();
-                        return true;
-                    }
-                }
-                transaction.Rollback();
-                return false;
-            }
-            catch
-            {
-                transaction.Rollback();
-                throw;
-            }
-        }
-
-    }
-}

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

@@ -12,7 +12,7 @@ using SushiBarDatabaseImplement;
 namespace SushiBarDatabaseImplement.Migrations
 {
     [DbContext(typeof(SushiBarDatabase))]
-    [Migration("20240522094128_InitCreate")]
+    [Migration("20240508104959_InitCreate")]
     partial class InitCreate
     {
         /// <inheritdoc />
@@ -97,6 +97,36 @@ 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<string>("SenderName")
+                        .IsRequired()
+                        .HasColumnType("nvarchar(max)");
+
+                    b.Property<string>("Subject")
+                        .IsRequired()
+                        .HasColumnType("nvarchar(max)");
+
+                    b.HasKey("MessageId");
+
+                    b.HasIndex("ClientId");
+
+                    b.ToTable("MessageInfos");
+                });
+
             modelBuilder.Entity("SushiBarDatabaseImplement.Models.Order", b =>
                 {
                     b.Property<int>("Id")
@@ -140,59 +170,6 @@ namespace SushiBarDatabaseImplement.Migrations
                     b.ToTable("Orders");
                 });
 
-            modelBuilder.Entity("SushiBarDatabaseImplement.Models.Shop", b =>
-                {
-                    b.Property<int>("Id")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("int");
-
-                    SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property<int>("Id"));
-
-                    b.Property<string>("Adress")
-                        .IsRequired()
-                        .HasColumnType("nvarchar(max)");
-
-                    b.Property<DateTime>("OpeningDate")
-                        .HasColumnType("datetime2");
-
-                    b.Property<string>("ShopName")
-                        .IsRequired()
-                        .HasColumnType("nvarchar(max)");
-
-                    b.Property<int>("SushiMaxCount")
-                        .HasColumnType("int");
-
-                    b.HasKey("Id");
-
-                    b.ToTable("Shops");
-                });
-
-            modelBuilder.Entity("SushiBarDatabaseImplement.Models.ShopSushis", b =>
-                {
-                    b.Property<int>("Id")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("int");
-
-                    SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property<int>("Id"));
-
-                    b.Property<int>("Count")
-                        .HasColumnType("int");
-
-                    b.Property<int>("ShopId")
-                        .HasColumnType("int");
-
-                    b.Property<int>("SushiId")
-                        .HasColumnType("int");
-
-                    b.HasKey("Id");
-
-                    b.HasIndex("ShopId");
-
-                    b.HasIndex("SushiId");
-
-                    b.ToTable("ShopSushis");
-                });
-
             modelBuilder.Entity("SushiBarDatabaseImplement.Models.Sushi", b =>
                 {
                     b.Property<int>("Id")
@@ -239,10 +216,19 @@ namespace SushiBarDatabaseImplement.Migrations
                     b.ToTable("SushiComponents");
                 });
 
+            modelBuilder.Entity("SushiBarDatabaseImplement.Models.MessageInfo", b =>
+                {
+                    b.HasOne("SushiBarDatabaseImplement.Models.Client", "Client")
+                        .WithMany("ClientMessages")
+                        .HasForeignKey("ClientId");
+
+                    b.Navigation("Client");
+                });
+
             modelBuilder.Entity("SushiBarDatabaseImplement.Models.Order", b =>
                 {
                     b.HasOne("SushiBarDatabaseImplement.Models.Client", "Client")
-                        .WithMany("Orders")
+                        .WithMany("ClientOrders")
                         .HasForeignKey("ClientId")
                         .OnDelete(DeleteBehavior.Cascade)
                         .IsRequired();
@@ -264,25 +250,6 @@ namespace SushiBarDatabaseImplement.Migrations
                     b.Navigation("Sushi");
                 });
 
-            modelBuilder.Entity("SushiBarDatabaseImplement.Models.ShopSushis", b =>
-                {
-                    b.HasOne("SushiBarDatabaseImplement.Models.Shop", "Shop")
-                        .WithMany("Sushis")
-                        .HasForeignKey("ShopId")
-                        .OnDelete(DeleteBehavior.Cascade)
-                        .IsRequired();
-
-                    b.HasOne("SushiBarDatabaseImplement.Models.Sushi", "Sushi")
-                        .WithMany()
-                        .HasForeignKey("SushiId")
-                        .OnDelete(DeleteBehavior.Cascade)
-                        .IsRequired();
-
-                    b.Navigation("Shop");
-
-                    b.Navigation("Sushi");
-                });
-
             modelBuilder.Entity("SushiBarDatabaseImplement.Models.SushiComponent", b =>
                 {
                     b.HasOne("SushiBarDatabaseImplement.Models.Component", "Component")
@@ -309,7 +276,9 @@ namespace SushiBarDatabaseImplement.Migrations
 
             modelBuilder.Entity("SushiBarDatabaseImplement.Models.Client", b =>
                 {
-                    b.Navigation("Orders");
+                    b.Navigation("ClientMessages");
+
+                    b.Navigation("ClientOrders");
                 });
 
             modelBuilder.Entity("SushiBarDatabaseImplement.Models.Component", b =>
@@ -317,11 +286,6 @@ namespace SushiBarDatabaseImplement.Migrations
                     b.Navigation("SushiComponents");
                 });
 
-            modelBuilder.Entity("SushiBarDatabaseImplement.Models.Shop", b =>
-                {
-                    b.Navigation("Sushis");
-                });
-
             modelBuilder.Entity("SushiBarDatabaseImplement.Models.Sushi", b =>
                 {
                     b.Navigation("Components");

SushiBar/SushiBarDatabaseImplement/Migrations/20240508104959_InitCreate.cs

@@ -56,22 +56,6 @@ namespace SushiBarDatabaseImplement.Migrations
                     table.PrimaryKey("PK_Implementers", x => x.Id);
                 });
 
-            migrationBuilder.CreateTable(
-                name: "Shops",
-                columns: table => new
-                {
-                    Id = table.Column<int>(type: "int", nullable: false)
-                        .Annotation("SqlServer:Identity", "1, 1"),
-                    ShopName = table.Column<string>(type: "nvarchar(max)", nullable: false),
-                    Adress = table.Column<string>(type: "nvarchar(max)", nullable: false),
-                    OpeningDate = table.Column<DateTime>(type: "datetime2", nullable: false),
-                    SushiMaxCount = table.Column<int>(type: "int", nullable: false)
-                },
-                constraints: table =>
-                {
-                    table.PrimaryKey("PK_Shops", x => x.Id);
-                });
-
             migrationBuilder.CreateTable(
                 name: "Sushis",
                 columns: table => new
@@ -86,6 +70,27 @@ 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)
+                },
+                constraints: table =>
+                {
+                    table.PrimaryKey("PK_MessageInfos", x => x.MessageId);
+                    table.ForeignKey(
+                        name: "FK_MessageInfos_Clients_ClientId",
+                        column: x => x.ClientId,
+                        principalTable: "Clients",
+                        principalColumn: "Id");
+                });
+
             migrationBuilder.CreateTable(
                 name: "Orders",
                 columns: table => new
@@ -123,33 +128,6 @@ namespace SushiBarDatabaseImplement.Migrations
                         onDelete: ReferentialAction.Cascade);
                 });
 
-            migrationBuilder.CreateTable(
-                name: "ShopSushis",
-                columns: table => new
-                {
-                    Id = table.Column<int>(type: "int", nullable: false)
-                        .Annotation("SqlServer:Identity", "1, 1"),
-                    SushiId = table.Column<int>(type: "int", nullable: false),
-                    ShopId = table.Column<int>(type: "int", nullable: false),
-                    Count = table.Column<int>(type: "int", nullable: false)
-                },
-                constraints: table =>
-                {
-                    table.PrimaryKey("PK_ShopSushis", x => x.Id);
-                    table.ForeignKey(
-                        name: "FK_ShopSushis_Shops_ShopId",
-                        column: x => x.ShopId,
-                        principalTable: "Shops",
-                        principalColumn: "Id",
-                        onDelete: ReferentialAction.Cascade);
-                    table.ForeignKey(
-                        name: "FK_ShopSushis_Sushis_SushiId",
-                        column: x => x.SushiId,
-                        principalTable: "Sushis",
-                        principalColumn: "Id",
-                        onDelete: ReferentialAction.Cascade);
-                });
-
             migrationBuilder.CreateTable(
                 name: "SushiComponents",
                 columns: table => new
@@ -177,6 +155,11 @@ namespace SushiBarDatabaseImplement.Migrations
                         onDelete: ReferentialAction.Cascade);
                 });
 
+            migrationBuilder.CreateIndex(
+                name: "IX_MessageInfos_ClientId",
+                table: "MessageInfos",
+                column: "ClientId");
+
             migrationBuilder.CreateIndex(
                 name: "IX_Orders_ClientId",
                 table: "Orders",
@@ -192,16 +175,6 @@ namespace SushiBarDatabaseImplement.Migrations
                 table: "Orders",
                 column: "SushiId");
 
-            migrationBuilder.CreateIndex(
-                name: "IX_ShopSushis_ShopId",
-                table: "ShopSushis",
-                column: "ShopId");
-
-            migrationBuilder.CreateIndex(
-                name: "IX_ShopSushis_SushiId",
-                table: "ShopSushis",
-                column: "SushiId");
-
             migrationBuilder.CreateIndex(
                 name: "IX_SushiComponents_ComponentId",
                 table: "SushiComponents",
@@ -217,10 +190,10 @@ namespace SushiBarDatabaseImplement.Migrations
         protected override void Down(MigrationBuilder migrationBuilder)
         {
             migrationBuilder.DropTable(
-                name: "Orders");
+                name: "MessageInfos");
 
             migrationBuilder.DropTable(
-                name: "ShopSushis");
+                name: "Orders");
 
             migrationBuilder.DropTable(
                 name: "SushiComponents");
@@ -231,9 +204,6 @@ namespace SushiBarDatabaseImplement.Migrations
             migrationBuilder.DropTable(
                 name: "Implementers");
 
-            migrationBuilder.DropTable(
-                name: "Shops");
-
             migrationBuilder.DropTable(
                 name: "Components");
 

SushiBar/SushiBarDatabaseImplement/Migrations/SushiBarDatabaseModelSnapshot.cs

@@ -94,6 +94,36 @@ 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<string>("SenderName")
+                        .IsRequired()
+                        .HasColumnType("nvarchar(max)");
+
+                    b.Property<string>("Subject")
+                        .IsRequired()
+                        .HasColumnType("nvarchar(max)");
+
+                    b.HasKey("MessageId");
+
+                    b.HasIndex("ClientId");
+
+                    b.ToTable("MessageInfos");
+                });
+
             modelBuilder.Entity("SushiBarDatabaseImplement.Models.Order", b =>
                 {
                     b.Property<int>("Id")
@@ -137,59 +167,6 @@ namespace SushiBarDatabaseImplement.Migrations
                     b.ToTable("Orders");
                 });
 
-            modelBuilder.Entity("SushiBarDatabaseImplement.Models.Shop", b =>
-                {
-                    b.Property<int>("Id")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("int");
-
-                    SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property<int>("Id"));
-
-                    b.Property<string>("Adress")
-                        .IsRequired()
-                        .HasColumnType("nvarchar(max)");
-
-                    b.Property<DateTime>("OpeningDate")
-                        .HasColumnType("datetime2");
-
-                    b.Property<string>("ShopName")
-                        .IsRequired()
-                        .HasColumnType("nvarchar(max)");
-
-                    b.Property<int>("SushiMaxCount")
-                        .HasColumnType("int");
-
-                    b.HasKey("Id");
-
-                    b.ToTable("Shops");
-                });
-
-            modelBuilder.Entity("SushiBarDatabaseImplement.Models.ShopSushis", b =>
-                {
-                    b.Property<int>("Id")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("int");
-
-                    SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property<int>("Id"));
-
-                    b.Property<int>("Count")
-                        .HasColumnType("int");
-
-                    b.Property<int>("ShopId")
-                        .HasColumnType("int");
-
-                    b.Property<int>("SushiId")
-                        .HasColumnType("int");
-
-                    b.HasKey("Id");
-
-                    b.HasIndex("ShopId");
-
-                    b.HasIndex("SushiId");
-
-                    b.ToTable("ShopSushis");
-                });
-
             modelBuilder.Entity("SushiBarDatabaseImplement.Models.Sushi", b =>
                 {
                     b.Property<int>("Id")
@@ -236,10 +213,19 @@ namespace SushiBarDatabaseImplement.Migrations
                     b.ToTable("SushiComponents");
                 });
 
+            modelBuilder.Entity("SushiBarDatabaseImplement.Models.MessageInfo", b =>
+                {
+                    b.HasOne("SushiBarDatabaseImplement.Models.Client", "Client")
+                        .WithMany("ClientMessages")
+                        .HasForeignKey("ClientId");
+
+                    b.Navigation("Client");
+                });
+
             modelBuilder.Entity("SushiBarDatabaseImplement.Models.Order", b =>
                 {
                     b.HasOne("SushiBarDatabaseImplement.Models.Client", "Client")
-                        .WithMany("Orders")
+                        .WithMany("ClientOrders")
                         .HasForeignKey("ClientId")
                         .OnDelete(DeleteBehavior.Cascade)
                         .IsRequired();
@@ -261,25 +247,6 @@ namespace SushiBarDatabaseImplement.Migrations
                     b.Navigation("Sushi");
                 });
 
-            modelBuilder.Entity("SushiBarDatabaseImplement.Models.ShopSushis", b =>
-                {
-                    b.HasOne("SushiBarDatabaseImplement.Models.Shop", "Shop")
-                        .WithMany("Sushis")
-                        .HasForeignKey("ShopId")
-                        .OnDelete(DeleteBehavior.Cascade)
-                        .IsRequired();
-
-                    b.HasOne("SushiBarDatabaseImplement.Models.Sushi", "Sushi")
-                        .WithMany()
-                        .HasForeignKey("SushiId")
-                        .OnDelete(DeleteBehavior.Cascade)
-                        .IsRequired();
-
-                    b.Navigation("Shop");
-
-                    b.Navigation("Sushi");
-                });
-
             modelBuilder.Entity("SushiBarDatabaseImplement.Models.SushiComponent", b =>
                 {
                     b.HasOne("SushiBarDatabaseImplement.Models.Component", "Component")
@@ -306,7 +273,9 @@ namespace SushiBarDatabaseImplement.Migrations
 
             modelBuilder.Entity("SushiBarDatabaseImplement.Models.Client", b =>
                 {
-                    b.Navigation("Orders");
+                    b.Navigation("ClientMessages");
+
+                    b.Navigation("ClientOrders");
                 });
 
             modelBuilder.Entity("SushiBarDatabaseImplement.Models.Component", b =>
@@ -314,11 +283,6 @@ namespace SushiBarDatabaseImplement.Migrations
                     b.Navigation("SushiComponents");
                 });
 
-            modelBuilder.Entity("SushiBarDatabaseImplement.Models.Shop", b =>
-                {
-                    b.Navigation("Sushis");
-                });
-
             modelBuilder.Entity("SushiBarDatabaseImplement.Models.Sushi", b =>
                 {
                     b.Navigation("Components");

SushiBar/SushiBarDatabaseImplement/Models/Client.cs

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

SushiBar/SushiBarDatabaseImplement/Models/MessageInfo.cs

@@ -0,0 +1,64 @@
+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;
+
+        public static MessageInfo? Create(MessageInfoBindingModel? model)
+        {
+            if (model == null)
+            {
+                return null;
+            }
+            return new()
+            {
+                MessageId = model.MessageId,
+                ClientId = model.ClientId,
+                SenderName = model.SenderName,
+                DateDelivery = model.DateDelivery,
+                Subject = model.Subject,
+                Body = model.Body,
+
+            };
+        }
+
+        public MessageInfoViewModel GetViewModel => new()
+        {
+            MessageId = MessageId,
+            ClientId = ClientId,
+            SenderName = SenderName,
+            DateDelivery = DateDelivery,
+            Subject = Subject,
+            Body = Body
+        };
+    }
+}

SushiBar/SushiBarDatabaseImplement/Models/Order.cs

@@ -76,6 +76,7 @@ namespace SushiBarDatabaseImplement.Models
             Id = Id,
             ClientId = ClientId,
             ClientFIO = Client.ClientFIO,
+            ClientEmail = Client.Email,
             SushiId = SushiId,
             SushiName = Sushi.SushiName,
             ImplementerId = ImplementerId,

SushiBar/SushiBarDatabaseImplement/Models/Shop.cs

@@ -1,119 +0,0 @@
-using SushiBarContracts.BindingModels;
-using SushiBarContracts.ViewModels;
-using SushiBarDataModels.Models;
-using System;
-using System.Collections.Generic;
-using System.ComponentModel.DataAnnotations.Schema;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace SushiBarDatabaseImplement.Models
-{
-    public class Shop : IShopModel
-    {
-        public int Id { get; set; }
-        public string ShopName { get; set; } = string.Empty;
-
-        public string Adress { get; set; } = string.Empty;
-
-        public DateTime OpeningDate { get; set; }
-
-        public int SushiMaxCount { get; set; }
-
-        private Dictionary<int, (ISushiModel, int)>? _shopSushis = null;
-
-        public Dictionary<int, (ISushiModel, int)> ShopSushis
-        {
-            get
-            {
-                if (_shopSushis == null)
-                {
-                    if (_shopSushis == null)
-                    {
-                        _shopSushis = Sushis
-                                .ToDictionary(recSP => recSP.SushiId, recSP => (recSP.Sushi as ISushiModel, recSP.Count));
-                    }
-                    return _shopSushis;
-                }
-                return _shopSushis;
-            }
-        }
-
-        [ForeignKey("ShopId")]
-        public List<ShopSushis> Sushis { get; set; } = new();
-
-        public static Shop Create(SushiBarDatabase context, ShopBindingModel model)
-        {
-            return new Shop()
-            {
-                Id = model.Id,
-                ShopName = model.ShopName,
-                Adress = model.Adress,
-                OpeningDate = model.OpeningDate,
-                Sushis = model.ShopSushis.Select(x => new ShopSushis
-                {
-                    Sushi = context.Sushis.First(y => y.Id == x.Key),
-                    Count = x.Value.Item2
-                }).ToList(),
-                SushiMaxCount = model.SushiMaxCount
-            };
-        }
-
-        public void Update(ShopBindingModel model)
-        {
-            ShopName = model.ShopName;
-            Adress = model.Adress;
-            OpeningDate = model.OpeningDate;
-            SushiMaxCount = model.SushiMaxCount;
-        }
-
-        public ShopViewModel GetViewModel => new()
-        {
-            Id = Id,
-            ShopName = ShopName,
-            Adress = Adress,
-            OpeningDate = OpeningDate,
-            ShopSushis = ShopSushis,
-            SushiMaxCount = SushiMaxCount
-        };
-
-        public void UpdateSushis(SushiBarDatabase context, ShopBindingModel model)
-        {
-            var ShopSushis = context.ShopSushis.Where(rec => rec.ShopId == model.Id).ToList();
-            if (ShopSushis != null && ShopSushis.Count > 0)
-            {
-                context.ShopSushis.RemoveRange(ShopSushis.Where(rec => !model.ShopSushis.ContainsKey(rec.SushiId)));
-                context.SaveChanges();
-                ShopSushis = context.ShopSushis.Where(rec => rec.ShopId == model.Id).ToList();
-                foreach (var updateSushi in ShopSushis)
-                {
-                    updateSushi.Count = model.ShopSushis[updateSushi.SushiId].Item2;
-                    model.ShopSushis.Remove(updateSushi.SushiId);
-                }
-                context.SaveChanges();
-            }
-            var shop = context.Shops.First(x => x.Id == Id);
-            foreach (var ar in model.ShopSushis)
-            {
-                context.ShopSushis.Add(new ShopSushis
-                {
-                    Shop = shop,
-                    Sushi = context.Sushis.First(x => x.Id == ar.Key),
-                    Count = ar.Value.Item2
-                });
-                context.SaveChanges();
-            }
-            _shopSushis = null;
-        }
-
-        public void SushisDictionatyUpdate(SushiBarDatabase context)
-        {
-            UpdateSushis(context, new ShopBindingModel
-            {
-                Id = Id,
-                ShopSushis = ShopSushis,
-            });
-        }
-    }
-}

SushiBar/SushiBarDatabaseImplement/Models/ShopSushis.cs

@@ -1,28 +0,0 @@
-using SushiBarDatabaseImplement.Models;
-using System;
-using System.Collections.Generic;
-using System.ComponentModel.DataAnnotations;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace SushiBarDatabaseImplement.Models
-{
-    public class ShopSushis
-    {
-        public int Id { get; set; }
-
-        [Required]
-        public int SushiId { get; set; }
-
-        [Required]
-        public int ShopId { get; set; }
-
-        [Required]
-        public int Count { get; set; }
-
-        public virtual Shop Shop { get; set; } = new();
-
-        public virtual Sushi Sushi { get; set; } = new();
-    }
-}

SushiBar/SushiBarDatabaseImplement/SushiBarDatabaseImplement.csproj

@@ -19,7 +19,6 @@
     <ProjectReference Include="..\SushiBarContracts\SushiBarContracts.csproj" />
     <ProjectReference Include="..\SushiBarDataModels\SushiBarDataModels.csproj" />
     <ProjectReference Include="..\SushiBarListImplement_\SushiBarListImplement.csproj" />
-    <ProjectReference Include="..\SushiBarFileImplement\SushiBarFileImplement.csproj" />
   </ItemGroup>
 
 </Project>

SushiBar/SushiBarDatabaseImplement/SushiBarDatatbase.cs

@@ -25,7 +25,6 @@ namespace SushiBarDatabaseImplement
         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

@@ -16,13 +16,13 @@ namespace SushiBarFileImplement
         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<Shop> Shops { get; private set; }
+        public List<MessageInfo> Messages { get; private set; }
 
         public static DataFileSingleton GetInstance()
         {
@@ -38,7 +38,7 @@ namespace SushiBarFileImplement
         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()
         {
@@ -47,7 +47,7 @@ namespace SushiBarFileImplement
             Orders = LoadData(OrderFileName, "Order", x => Order.Create(x)!)!;
             Clients = LoadData(ClientFileName, "Client", x => Client.Create(x)!)!;
             Implementers = LoadData(ImplementerFileName, "Implementer", x => Implementer.Create(x)!)!;
-            Shops = LoadData(ShopFileName, "Shop", x => Shop.Create(x)!)!;
+            Messages = LoadData(MessageInfoFileName, "MessageInfo", x => MessageInfo.Create(x)!)!;
         }
 
         private static List<T>? LoadData<T>(string filename, string xmlNodeName, Func<XElement, T> selectFunction)

SushiBar/SushiBarFileImplement/Implements/MessageInfoStorage.cs

@@ -0,0 +1,58 @@
+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)
+        {
+            return _source.Messages
+                .Where(x => x.ClientId == model.ClientId)
+                .Select(x => x.GetViewModel)
+                .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;
+        }
+    }
+}

SushiBar/SushiBarFileImplement/Implements/ShopStorage.cs

@@ -1,154 +0,0 @@
-using SushiBarContracts.BindingModels;
-using SushiBarContracts.SearchModels;
-using SushiBarContracts.StoragesContracts;
-using SushiBarContracts.ViewModels;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using SushiBarFileImplement.Models;
-
-namespace SushiBarFileImplement.Implements
-{
-    public class ShopStorage : IShopStorage
-    {
-        private readonly DataFileSingleton source;
-
-        public ShopStorage()
-        {
-            source = DataFileSingleton.GetInstance();
-        }
-
-        public List<ShopViewModel> GetFullList()
-        {
-            return source.Shops.Select(x => x.GetViewModel).ToList();
-        }
-
-        public List<ShopViewModel> GetFilteredList(ShopSearchModel model)
-        {
-            if (string.IsNullOrEmpty(model.ShopName))
-            {
-                return new();
-            }
-            return source.Shops.Where(x => x.ShopName.Contains(model.ShopName)).Select(x => x.GetViewModel).ToList();
-        }
-
-        public ShopViewModel? GetElement(ShopSearchModel model)
-        {
-            if (string.IsNullOrEmpty(model.ShopName) && !model.Id.HasValue)
-            {
-                return null;
-            }
-            return source.Shops.FirstOrDefault(x =>
-            (!string.IsNullOrEmpty(model.ShopName) && x.ShopName == model.ShopName) ||
-            (model.Id.HasValue && x.Id == model.Id))?.GetViewModel;
-        }
-
-        public ShopViewModel? Insert(ShopBindingModel model)
-        {
-            model.Id = source.Shops.Count > 0 ? source.Shops.Max(x => x.Id) + 1 : 1;
-            var newShop = Shop.Create(model);
-            if (newShop == null)
-            {
-                return null;
-            }
-            source.Shops.Add(newShop);
-            source.SaveShops();
-            return newShop.GetViewModel;
-        }
-
-        public ShopViewModel? Update(ShopBindingModel model)
-        {
-            var shop = source.Shops.FirstOrDefault(x => x.Id == model.Id);
-            if (shop == null)
-            {
-                return null;
-            }
-            shop.Update(model);
-            source.SaveShops();
-            return shop.GetViewModel;
-        }
-
-        public ShopViewModel? Delete(ShopBindingModel model)
-        {
-            var shop = source.Shops.FirstOrDefault(x => x.Id == model.Id);
-            if (shop != null)
-            {
-                source.Shops.Remove(shop);
-                source.SaveShops();
-                return shop.GetViewModel;
-            }
-            return null;
-        }
-
-        public bool Sale(SupplySearchModel model)
-        {
-            if (model == null || !model.SushiId.HasValue || !model.Count.HasValue)
-                return false;
-            int remainingSpace = source.Shops.Select(x => x.Sushis.ContainsKey(model.SushiId.Value) ? x.Sushis[model.SushiId.Value] : 0).Sum();
-            if (remainingSpace < model.Count)
-            {
-                return false;
-            }
-            var shops = source.Shops.Where(x => x.Sushis.ContainsKey(model.SushiId.Value)).OrderByDescending(x => x.Sushis[model.SushiId.Value]).ToList();
-            foreach (var shop in shops)
-            {
-                int residue = model.Count.Value - shop.Sushis[model.SushiId.Value];
-                if (residue > 0)
-                {
-                    shop.Sushis.Remove(model.SushiId.Value);
-                    shop.SushisUpdate();
-                    model.Count = residue;
-                }
-                else
-                {
-                    if (residue == 0)
-                    {
-                        shop.Sushis.Remove(model.SushiId.Value);
-                    }
-                    else
-                    {
-                        shop.Sushis[model.SushiId.Value] = -residue;
-                    }
-                    shop.SushisUpdate();
-                    source.SaveShops();
-                    return true;
-                }
-            }
-            source.SaveShops();
-            return false;
-        }
-
-        public bool RestockingShops(SupplyBindingModel model)
-        {
-            if (model == null || source.Shops.Select(x => x.SushiMaxCount - x.ShopSushis.Select(y => y.Value.Item2).Sum()).Sum() < model.Count)
-            {
-                return false;
-            }
-            foreach (Shop shop in source.Shops)
-            {
-                int free_places = shop.SushiMaxCount - shop.ShopSushis.Select(x => x.Value.Item2).Sum();
-                if (free_places <= 0)
-                    continue;
-                free_places = Math.Min(free_places, model.Count);
-                model.Count -= free_places;
-                if (shop.Sushis.ContainsKey(model.SushiId))
-                {
-                    shop.Sushis[model.SushiId] += free_places;
-                }
-                else
-                {
-                    shop.Sushis.Add(model.SushiId, free_places);
-                }
-                shop.SushisUpdate();
-                if (model.Count == 0)
-                {
-                    source.SaveShops();
-                    return true;
-                }
-            }
-            return false;
-        }
-    }
-}

SushiBar/SushiBarFileImplement/Models/MessageInfo.cs

@@ -0,0 +1,80 @@
+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 static MessageInfo? Create(MessageInfoBindingModel model)
+        {
+            if (model == null)
+            {
+                return null;
+            }
+            return new()
+            {
+                Body = model.Body,
+                Subject = model.Subject,
+                ClientId = model.ClientId,
+                MessageId = model.MessageId,
+                SenderName = model.SenderName,
+                DateDelivery = model.DateDelivery,
+            };
+        }
+
+        public static MessageInfo? Create(XElement element)
+        {
+            if (element == null)
+            {
+                return null;
+            }
+            return new()
+            {
+                Body = element.Attribute("Body")!.Value,
+                Subject = element.Attribute("Subject")!.Value,
+                ClientId = Convert.ToInt32(element.Attribute("ClientId")!.Value),
+                MessageId = element.Attribute("MessageId")!.Value,
+                SenderName = element.Attribute("SenderName")!.Value,
+                DateDelivery = Convert.ToDateTime(element.Attribute("DateDelivery")!.Value),
+            };
+        }
+
+        public MessageInfoViewModel GetViewModel => new()
+        {
+            Body = Body,
+            Subject = Subject,
+            ClientId = ClientId,
+            MessageId = MessageId,
+            SenderName = SenderName,
+            DateDelivery = DateDelivery,
+        };
+
+        public XElement GetXElement => new("MessageInfo",
+            new XAttribute("Body", Body),
+            new XAttribute("Subject", Subject),
+            new XAttribute("ClientId", ClientId),
+            new XAttribute("MessageId", MessageId),
+            new XAttribute("SenderName", SenderName),
+            new XAttribute("DateDelivery", DateDelivery)
+            );
+    }
+}

SushiBar/SushiBarFileImplement/Models/Shop.cs

@@ -1,112 +0,0 @@
-using SushiBarDataModels.Models;
-using SushiBarContracts.BindingModels;
-using SushiBarContracts.ViewModels;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using System.Xml.Linq;
-using SushiBarFileImplement;
-
-namespace SushiBarFileImplement.Models
-{
-    public class Shop : IShopModel
-    {
-        public int Id { get; private set; }
-        public string ShopName { get; private set; } = string.Empty;
-        public string Adress { get; private set; } = string.Empty;
-        public DateTime OpeningDate { get; private set; }
-        public Dictionary<int, int> Sushis { get; private set; } = new();
-        private Dictionary<int, (ISushiModel, int)>? _shopSushis = null;
-
-        public Dictionary<int, (ISushiModel, int)> ShopSushis
-        {
-            get
-            {
-                if (_shopSushis == null)
-                {
-                    var source = DataFileSingleton.GetInstance();
-                    _shopSushis = Sushis.ToDictionary(x => x.Key, y => ((source.Sushis.FirstOrDefault(z => z.Id == y.Key) as ISushiModel)!, y.Value));
-                }
-                return _shopSushis;
-            }
-        }
-
-        public int SushiMaxCount { get; private set; }
-
-        public static Shop? Create(ShopBindingModel? model)
-        {
-            if (model == null)
-            {
-                return null;
-            }
-            return new Shop()
-            {
-                Id = model.Id,
-                ShopName = model.ShopName,
-                Adress = model.Adress,
-                OpeningDate = model.OpeningDate,
-                Sushis = model.ShopSushis.ToDictionary(x => x.Key, x => x.Value.Item2),
-                SushiMaxCount = model.SushiMaxCount
-            };
-        }
-
-        public static Shop? Create(XElement element)
-        {
-            if (element == null)
-            {
-                return null;
-            }
-            return new()
-            {
-                Id = Convert.ToInt32(element.Attribute("Id")!.Value),
-                ShopName = element.Element("ShopName")!.Value,
-                Adress = element.Element("Adress")!.Value,
-                OpeningDate = Convert.ToDateTime(element.Element("OpeningDate")!.Value),
-                Sushis = element.Element("ShopSushis")!.Elements("ShopSushi")!.ToDictionary(x => Convert.ToInt32(x.Element("Key")?.Value),
-                x => Convert.ToInt32(x.Element("Value")?.Value)),
-                SushiMaxCount = Convert.ToInt32(element.Element("SushiMaxCount")!.Value)
-            };
-        }
-
-        public void Update(ShopBindingModel? model)
-        {
-            if (model == null)
-            {
-                return;
-            }
-            ShopName = model.ShopName;
-            Adress = model.Adress;
-            OpeningDate = model.OpeningDate;
-            SushiMaxCount = model.SushiMaxCount;
-            Sushis = model.ShopSushis.ToDictionary(x => x.Key, x => x.Value.Item2);
-            _shopSushis = null;
-        }
-
-        public ShopViewModel GetViewModel => new()
-        {
-            Id = Id,
-            ShopName = ShopName,
-            Adress = Adress,
-            OpeningDate = OpeningDate,
-            ShopSushis = ShopSushis,
-            SushiMaxCount = SushiMaxCount
-        };
-
-        public XElement GetXElement => new("Shop",
-            new XAttribute("Id", Id),
-            new XElement("ShopName", ShopName),
-            new XElement("Adress", Adress),
-            new XElement("OpeningDate", OpeningDate.ToString()),
-            new XElement("ShopSushis", Sushis.Select(
-                x => new XElement("ShopSushi", new XElement("Key", x.Key), new XElement("Value", x.Value))).ToArray()),
-            new XElement("SushiMaxCount", SushiMaxCount.ToString())
-            );
-
-        public void SushisUpdate()
-        {
-            _shopSushis = null;
-        }
-    }
-}

SushiBar/SushiBarListImplement_/DataListSingleton.cs

@@ -15,7 +15,7 @@ namespace SushiBarListImplement
         public List<Sushi> Sushis { get; set; }
         public List<Client> Clients { get; set; }
         public List<Implementer> Implementers { get; set; }
-        public List<Shop> Shops { get; set; }
+        public List<MessageInfo> Messages { get; set; }
         private DataListSingleton()
         {
             Components = new List<Component>();
@@ -23,7 +23,7 @@ namespace SushiBarListImplement
             Sushis = new List<Sushi>();
             Clients = new List<Client>();
             Implementers = new List<Implementer>();
-            Shops = new List<Shop>();
+            Messages = new List<MessageInfo>();
         }
         public static DataListSingleton GetInstance()
         {

SushiBar/SushiBarListImplement_/Implements/MessageInfoStorage.cs

@@ -0,0 +1,70 @@
+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 List<MessageInfoViewModel> GetFullList()
+        {
+            List<MessageInfoViewModel> result = new();
+            foreach (var item in _source.Messages)
+            {
+                result.Add(item.GetViewModel);
+            }
+            return result;
+        }
+
+        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);
+                }
+            }
+            return result;
+        }
+
+        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 MessageInfoViewModel? Insert(MessageInfoBindingModel model)
+        {
+            var newMessage = MessageInfo.Create(model);
+            if (newMessage == null)
+            {
+                return null;
+            }
+            _source.Messages.Add(newMessage);
+            return newMessage.GetViewModel;
+        }
+    }
+}

SushiBar/SushiBarListImplement_/Implements/ShopStorage.cs

@@ -1,123 +0,0 @@
-using SushiBarContracts.BindingModels;
-using SushiBarContracts.SearchModels;
-using SushiBarContracts.StoragesContracts;
-using SushiBarContracts.ViewModels;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using SushiBarListImplement.Models;
-
-namespace SushiBarListImplement.Implements
-{
-    public class ShopStorage : IShopStorage
-    {
-        private readonly DataListSingleton _source;
-
-        public ShopStorage()
-        {
-            _source = DataListSingleton.GetInstance();
-        }
-
-        public List<ShopViewModel> GetFullList()
-        {
-            var result = new List<ShopViewModel>();
-            foreach (var shop in _source.Shops)
-            {
-                result.Add(shop.GetViewModel);
-            }
-            return result;
-        }
-
-        public List<ShopViewModel> GetFilteredList(ShopSearchModel model)
-        {
-            var result = new List<ShopViewModel>();
-            if (string.IsNullOrEmpty(model.ShopName))
-            {
-                return result;
-            }
-            foreach (var shop in _source.Shops)
-            {
-                if (shop.ShopName.Contains(model.ShopName))
-                {
-                    result.Add(shop.GetViewModel);
-                }
-            }
-            return result;
-        }
-
-        public ShopViewModel? GetElement(ShopSearchModel model)
-        {
-            if (string.IsNullOrEmpty(model.ShopName) && !model.Id.HasValue)
-            {
-                return null;
-            }
-            foreach (var shop in _source.Shops)
-            {
-                if ((!string.IsNullOrEmpty(model.ShopName) && shop.ShopName == model.ShopName) ||
-                    (model.Id.HasValue && shop.Id == model.Id))
-                {
-                    return shop.GetViewModel;
-                }
-            }
-            return null;
-        }
-
-        public ShopViewModel? Insert(ShopBindingModel model)
-        {
-            model.Id = 1;
-            foreach (var shop in _source.Shops)
-            {
-                if (model.Id <= shop.Id)
-                {
-                    model.Id = shop.Id + 1;
-                }
-            }
-            var newShop = Shop.Create(model);
-            if (newShop == null)
-            {
-                return null;
-            }
-            _source.Shops.Add(newShop);
-            return newShop.GetViewModel;
-        }
-
-        public ShopViewModel? Update(ShopBindingModel model)
-        {
-            foreach (var shop in _source.Shops)
-            {
-                if (shop.Id == model.Id)
-                {
-                    shop.Update(model);
-                    return shop.GetViewModel;
-                }
-            }
-            return null;
-        }
-
-        public ShopViewModel? Delete(ShopBindingModel model)
-        {
-            for (int i = 0; i < _source.Shops.Count; ++i)
-            {
-                if (_source.Shops[i].Id == model.Id)
-                {
-                    var element = _source.Shops[i];
-                    _source.Shops.RemoveAt(i);
-                    return element.GetViewModel;
-                }
-            }
-            return null;
-        }
-
-        public bool Sale(SupplySearchModel model)
-        {
-            throw new NotImplementedException();
-        }
-
-        public bool RestockingShops(SupplyBindingModel model)
-        {
-            throw new NotImplementedException();
-        }
-    }
-}

SushiBar/SushiBarListImplement_/Models/MessageInfo.cs

@@ -0,0 +1,53 @@
+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 static MessageInfo? Create(MessageInfoBindingModel model)
+        {
+            if (model == null)
+            {
+                return null;
+            }
+            return new()
+            {
+                Body = model.Body,
+                Subject = model.Subject,
+                ClientId = model.ClientId,
+                MessageId = model.MessageId,
+                SenderName = model.SenderName,
+                DateDelivery = model.DateDelivery,
+            };
+        }
+
+        public MessageInfoViewModel GetViewModel => new()
+        {
+            Body = Body,
+            Subject = Subject,
+            ClientId = ClientId,
+            MessageId = MessageId,
+            SenderName = SenderName,
+            DateDelivery = DateDelivery,
+        };
+    }
+}

SushiBar/SushiBarListImplement_/Models/Shop.cs

@@ -1,59 +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 Shop : IShopModel
-    {
-        public int Id { get; private set; }
-    public string ShopName { get; private set; } = string.Empty;
-    public string Adress { get; private set; } = string.Empty;
-    public DateTime OpeningDate { get; private set; }
-    public Dictionary<int, (ISushiModel, int)> ShopSushis { get; private set; } = new();
-    public int SushiMaxCount { get; private set; }
-
-    public static Shop? Create(ShopBindingModel? model)
-    {
-        if (model == null)
-        {
-            return null;
-        }
-        return new Shop()
-        {
-            Id = model.Id,
-            ShopName = model.ShopName,
-            Adress = model.Adress,
-            OpeningDate = model.OpeningDate,
-            SushiMaxCount = model.SushiMaxCount,
-        };
-    }
-
-    public void Update(ShopBindingModel? model)
-    {
-        if (model == null)
-        {
-            return;
-        }
-        ShopName = model.ShopName;
-        Adress = model.Adress;
-        OpeningDate = model.OpeningDate;
-        SushiMaxCount = model.SushiMaxCount;
-    }
-
-    public ShopViewModel GetViewModel => new()
-    {
-        Id = Id,
-        ShopName = ShopName,
-        Adress = Adress,
-        OpeningDate = OpeningDate,
-        ShopSushis = ShopSushis,
-        SushiMaxCount = SushiMaxCount,
-    };
-}
-}

SushiBar/SushiBarRestApi/APIConfig.cs

@@ -1,12 +0,0 @@
-namespace SushiBarRestApi
-{
-    public class APIConfig
-    {
-        public static string? ShopPassword;
-
-        public static void LoadData(IConfiguration configuration)
-        {
-            ShopPassword = configuration["ShopAPIPassword"];
-        }
-    }
-}

SushiBar/SushiBarRestApi/Controllers/ClientController.cs

@@ -3,6 +3,11 @@ 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
 {
@@ -12,13 +17,15 @@ namespace SushiBarRestApi.Controllers
         {
             private readonly ILogger _logger;
             private readonly IClientLogic _logic;
-            public ClientController(IClientLogic logic, ILogger<ClientController>
-           logger)
-            {
-                _logger = logger;
-                _logic = logic;
-            }
-            [HttpGet]
+        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
@@ -45,8 +52,8 @@ namespace SushiBarRestApi.Controllers
                 catch (Exception ex)
                 {
                     _logger.LogError(ex, "Ошибка регистрации");
-                    throw;
-                }
+                    Response.StatusCode = (int)HttpStatusCode.NotAcceptable;
+            }
             }
             [HttpPost]
             public void UpdateData(ClientBindingModel model)
@@ -61,7 +68,23 @@ namespace SushiBarRestApi.Controllers
                     throw;
                 }
             }
-
+        [HttpGet]
+        public List<MessageInfoViewModel>? GetMessages(int clientId)
+        {
+            try
+            {
+                return _mailLogic.ReadList(new MessageInfoSearchModel
+                {
+                    ClientId = clientId
+                });
+            }
+            catch (Exception ex)
+            {
+                _logger.LogError(ex, "Ошибка получения писем клиента");
+                throw;
+            }
         }
+
+    }
     }
 

SushiBar/SushiBarRestApi/Controllers/ShopController.cs

@@ -1,156 +0,0 @@
-using Microsoft.AspNetCore.Mvc;
-using SushiBarContracts.BindingModels;
-using SushiBarContracts.BusinessLogicsContracts;
-using SushiBarContracts.SearchModels;
-using SushiBarContracts.ViewModels;
-
-namespace SushiBarRestApi.Controllers
-{
-    [Route("api/[controller]/[action]")]
-    [ApiController]
-    public class ShopController : Controller
-    {
-        private readonly ILogger _logger;
-        private readonly IShopLogic _shopLogic;
-
-        public ShopController(ILogger<ShopController> logger, IShopLogic shopLogic)
-        {
-            _logger = logger;
-            _shopLogic = shopLogic;
-        }
-
-        [HttpGet]
-        public bool Authentication(string password)
-        {
-            return CheckPassword(password);
-        }
-
-        [HttpGet]
-        public List<ShopViewModel>? GetShopList(string password)
-        {
-            if (!CheckPassword(password))
-            {
-                return null;
-            }
-            try
-            {
-                return _shopLogic.ReadList(null);
-            }
-            catch (Exception ex)
-            {
-                _logger.LogError(ex, "Ошибка получения списка магазинов");
-                throw;
-            }
-        }
-
-        [HttpGet]
-        public ShopSushiViewModel? GetShop(int shopId, string password)
-        {
-            if (!CheckPassword(password))
-            {
-                return null;
-            }
-            try
-            {
-                var shop = _shopLogic.ReadElement(new ShopSearchModel { Id = shopId });
-                return new ShopSushiViewModel
-                {
-                    Shop = shop,
-                    ShopSushi = shop.ShopSushis.ToDictionary(x => x.Key, x => new SushiCount
-                    {
-                        Sushi = new SushiViewModel()
-                        {
-                            Id = x.Value.Item1.Id,
-                            SushiName = x.Value.Item1.SushiName,
-                            SushiComponents = x.Value.Item1.SushiComponents,
-                            Price = x.Value.Item1.Price,
-                        },
-                        Count = x.Value.Item2
-                    })
-                };
-            }
-            catch (Exception ex)
-            {
-                _logger.LogError(ex, "Ошибка получения магазина");
-                throw;
-            }
-        }
-
-        [HttpPost]
-        public void CreateShop(ShopBindingModel model, string password)
-        {
-            if (!CheckPassword(password))
-            {
-                return;
-            }
-            try
-            {
-                _shopLogic.Create(model);
-            }
-            catch (Exception ex)
-            {
-                _logger.LogError(ex, "Ошибка создания магазина");
-                throw;
-            }
-        }
-
-        [HttpPost]
-        public void UpdateShop(ShopBindingModel model, string password)
-        {
-            if (!CheckPassword(password))
-            {
-                return;
-            }
-            try
-            {
-                _shopLogic.Update(model);
-            }
-            catch (Exception ex)
-            {
-                _logger.LogError(ex, "Ошибка обновления магазина");
-                throw;
-            }
-        }
-
-        [HttpDelete]
-        public void DeleteShop(int shopId, string password)
-        {
-            if (!CheckPassword(password))
-            {
-                return;
-            }
-            try
-            {
-                _shopLogic.Delete(new ShopBindingModel { Id = shopId });
-            }
-            catch (Exception ex)
-            {
-                _logger.LogError(ex, "Ошибка удаления магазина");
-                throw;
-            }
-        }
-
-        [HttpPost]
-        public void MakeSypply(SupplyBindingModel model, string password)
-        {
-            if (!CheckPassword(password))
-            {
-                return;
-            }
-            try
-            {
-                _shopLogic.MakeSupply(model);
-            }
-            catch (Exception ex)
-            {
-                _logger.LogError(ex, "Ошибка создания поставки в магазин");
-                throw;
-            }
-        }
-
-        private bool CheckPassword(string password)
-        {
-            return APIConfig.ShopPassword == password;
-        }
-    }
-}

SushiBar/SushiBarRestApi/Program.cs

@@ -6,22 +6,24 @@ 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);
 
 // Add services to the container.
 
 builder.Services.AddTransient<IClientStorage, ClientStorage>();
-builder.Services.AddTransient<IShopStorage, ShopStorage>();
 builder.Services.AddTransient<IOrderStorage, OrderStorage>();
 builder.Services.AddTransient<ISushiStorage, SushiStorage>();
 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
@@ -36,7 +38,16 @@ builder.Services.AddSwaggerGen(c =>
     });
 });
 var app = builder.Build();
-APIConfig.LoadData(builder.Configuration);
+var mailSender = app.Services.GetService<AbstractMailWorker>();
+mailSender?.MailConfig(new MailConfigBindingModel
+{
+    MailLogin = builder.Configuration?.GetSection("MailLogin")?.Value?.ToString() ?? string.Empty,
+    MailPassword = builder.Configuration?.GetSection("MailPassword")?.Value?.ToString() ?? string.Empty,
+    SmtpClientHost = builder.Configuration?.GetSection("SmtpClientHost")?.Value?.ToString() ?? string.Empty,
+    SmtpClientPort = Convert.ToInt32(builder.Configuration?.GetSection("SmtpClientPort")?.Value?.ToString()),
+    PopHost = builder.Configuration?.GetSection("PopHost")?.Value?.ToString() ?? string.Empty,
+    PopPort = Convert.ToInt32(builder.Configuration?.GetSection("PopPort")?.Value?.ToString())
+});
 // Configure the HTTP request pipeline.
 if (app.Environment.IsDevelopment())
 {

SushiBar/SushiBarRestApi/appsettings.json

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

SushiBar/SushiBarView/App.config

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

SushiBar/SushiBarView/FormCreateSupply.Designer.cs

@@ -1,143 +0,0 @@
-namespace SushiBarView
-{
-    partial class FormCreateSupply
-    {
-        /// <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.comboBoxShop = new System.Windows.Forms.ComboBox();
-            this.labelShop = new System.Windows.Forms.Label();
-            this.labelSushi = new System.Windows.Forms.Label();
-            this.comboBoxSushi = new System.Windows.Forms.ComboBox();
-            this.labelCount = new System.Windows.Forms.Label();
-            this.textBoxCount = new System.Windows.Forms.TextBox();
-            this.buttonCancel = new System.Windows.Forms.Button();
-            this.buttonSave = new System.Windows.Forms.Button();
-            this.SuspendLayout();
-            // 
-            // comboBoxShop
-            // 
-            this.comboBoxShop.FormattingEnabled = true;
-            this.comboBoxShop.Location = new System.Drawing.Point(115, 12);
-            this.comboBoxShop.Name = "comboBoxShop";
-            this.comboBoxShop.Size = new System.Drawing.Size(344, 28);
-            this.comboBoxShop.TabIndex = 0;
-            // 
-            // labelShop
-            // 
-            this.labelShop.AutoSize = true;
-            this.labelShop.Location = new System.Drawing.Point(12, 15);
-            this.labelShop.Name = "labelShop";
-            this.labelShop.Size = new System.Drawing.Size(76, 20);
-            this.labelShop.TabIndex = 1;
-            this.labelShop.Text = "Магазин: ";
-            // 
-            // labelSushi
-            // 
-            this.labelSushi.AutoSize = true;
-            this.labelSushi.Location = new System.Drawing.Point(12, 49);
-            this.labelSushi.Name = "labelSushi";
-            this.labelSushi.Size = new System.Drawing.Size(75, 20);
-            this.labelSushi.TabIndex = 2;
-            this.labelSushi.Text = "Изделие: ";
-            // 
-            // comboBoxSushi
-            // 
-            this.comboBoxSushi.FormattingEnabled = true;
-            this.comboBoxSushi.Location = new System.Drawing.Point(115, 46);
-            this.comboBoxSushi.Name = "comboBoxSushi";
-            this.comboBoxSushi.Size = new System.Drawing.Size(344, 28);
-            this.comboBoxSushi.TabIndex = 3;
-            // 
-            // labelCount
-            // 
-            this.labelCount.AutoSize = true;
-            this.labelCount.Location = new System.Drawing.Point(12, 83);
-            this.labelCount.Name = "labelCount";
-            this.labelCount.Size = new System.Drawing.Size(97, 20);
-            this.labelCount.TabIndex = 4;
-            this.labelCount.Text = "Количество: ";
-            // 
-            // textBoxCount
-            // 
-            this.textBoxCount.Location = new System.Drawing.Point(115, 80);
-            this.textBoxCount.Name = "textBoxCount";
-            this.textBoxCount.Size = new System.Drawing.Size(344, 27);
-            this.textBoxCount.TabIndex = 5;
-            // 
-            // buttonCancel
-            // 
-            this.buttonCancel.Location = new System.Drawing.Point(300, 113);
-            this.buttonCancel.Name = "buttonCancel";
-            this.buttonCancel.Size = new System.Drawing.Size(116, 39);
-            this.buttonCancel.TabIndex = 6;
-            this.buttonCancel.Text = "Отмена";
-            this.buttonCancel.UseVisualStyleBackColor = true;
-            this.buttonCancel.Click += new System.EventHandler(this.ButtonCancel_Click);
-            // 
-            // buttonSave
-            // 
-            this.buttonSave.Location = new System.Drawing.Point(168, 113);
-            this.buttonSave.Name = "buttonSave";
-            this.buttonSave.Size = new System.Drawing.Size(116, 39);
-            this.buttonSave.TabIndex = 7;
-            this.buttonSave.Text = "Сохранить";
-            this.buttonSave.UseVisualStyleBackColor = true;
-            this.buttonSave.Click += new System.EventHandler(this.ButtonSave_Click);
-            // 
-            // FormCreateSupply
-            // 
-            this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 20F);
-            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.ClientSize = new System.Drawing.Size(471, 164);
-            this.Controls.Add(this.buttonSave);
-            this.Controls.Add(this.buttonCancel);
-            this.Controls.Add(this.textBoxCount);
-            this.Controls.Add(this.labelCount);
-            this.Controls.Add(this.comboBoxSushi);
-            this.Controls.Add(this.labelSushi);
-            this.Controls.Add(this.labelShop);
-            this.Controls.Add(this.comboBoxShop);
-            this.Name = "FormCreateSupply";
-            this.Text = "Создание поставки";
-            this.Load += new System.EventHandler(this.FormCreateSupply_Load);
-            this.ResumeLayout(false);
-            this.PerformLayout();
-
-        }
-
-        #endregion
-
-        private ComboBox comboBoxShop;
-        private Label labelShop;
-        private Label labelSushi;
-        private ComboBox comboBoxSushi;
-        private Label labelCount;
-        private TextBox textBoxCount;
-        private Button buttonCancel;
-        private Button buttonSave;
-    }
-}

SushiBar/SushiBarView/FormCreateSupply.cs

@@ -1,99 +0,0 @@
-using Microsoft.Extensions.Logging;
-using SushiBarContracts.BindingModels;
-using SushiBarContracts.BusinessLogicsContracts;
-using SushiBarContracts.ViewModels;
-using System;
-using System.Collections;
-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 static System.Windows.Forms.VisualStyles.VisualStyleElement;
-
-namespace SushiBarView
-{
-    public partial class FormCreateSupply : Form
-    {
-        private readonly ILogger _logger;
-        private readonly ISushiLogic _logicP;
-        private readonly IShopLogic _logicS;
-        private List<ShopViewModel> _shopList = new List<ShopViewModel>();
-        private List<SushiViewModel> _sushiList = new List<SushiViewModel>();
-
-        public FormCreateSupply(ILogger<FormCreateSupply> logger, ISushiLogic logicP, IShopLogic logicS)
-        {
-            InitializeComponent();
-            _logger = logger;
-            _logicP = logicP;
-            _logicS = logicS;
-        }
-
-        private void FormCreateSupply_Load(object sender, EventArgs e)
-        {
-            _shopList = _logicS.ReadList(null);
-            _sushiList = _logicP.ReadList(null);
-            if (_shopList != null)
-            {
-                comboBoxShop.DisplayMember = "ShopName";
-                comboBoxShop.ValueMember = "Id";
-                comboBoxShop.DataSource = _shopList;
-                comboBoxShop.SelectedItem = null;
-                _logger.LogInformation("Загрузка магазинов для поставок");
-            }
-            if (_sushiList != null)
-            {
-                comboBoxSushi.DisplayMember = "SushiName";
-                comboBoxSushi.ValueMember = "Id";
-                comboBoxSushi.DataSource = _sushiList;
-                comboBoxSushi.SelectedItem = null;
-                _logger.LogInformation("Загрузка суши для поставок");
-            }
-        }
-
-        private void ButtonSave_Click(object sender, EventArgs e)
-        {
-            if (comboBoxShop.SelectedValue == null)
-            {
-                MessageBox.Show("Выберите магазин", "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error);
-                return;
-            }
-            if (comboBoxSushi.SelectedValue == null)
-            {
-                MessageBox.Show("Выберите изделие", "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error);
-                return;
-            }
-            _logger.LogInformation("Создание поставки");
-            try
-            {
-                var operationResult = _logicS.MakeSupply(new SupplyBindingModel
-                {
-                    ShopId = Convert.ToInt32(comboBoxShop.SelectedValue),
-                    SushiId = Convert.ToInt32(comboBoxSushi.SelectedValue),
-                    Count = Convert.ToInt32(textBoxCount.Text)
-                });
-                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/FormMail.Designer.cs

@@ -0,0 +1,67 @@
+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.dataGridView = new System.Windows.Forms.DataGridView();
+            ((System.ComponentModel.ISupportInitialize)(this.dataGridView)).BeginInit();
+            this.SuspendLayout();
+            // 
+            // 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(786, 270);
+            this.dataGridView.TabIndex = 0;
+            // 
+            // FormMail
+            // 
+            this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 20F);
+            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+            this.ClientSize = new System.Drawing.Size(786, 270);
+            this.Controls.Add(this.dataGridView);
+            this.Name = "FormMail";
+            this.Text = "Письма";
+            this.Load += new System.EventHandler(this.FormMail_Load);
+            ((System.ComponentModel.ISupportInitialize)(this.dataGridView)).EndInit();
+            this.ResumeLayout(false);
+
+        }
+
+        #endregion
+
+        private DataGridView dataGridView;
+    }
+}

SushiBar/SushiBarView/FormMail.cs

@@ -0,0 +1,54 @@
+using Microsoft.Extensions.Logging;
+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 FormMail : Form
+    {
+        private readonly ILogger _logger;
+        private readonly IMessageInfoLogic _logic;
+
+        public FormMail(ILogger<FormMail> logger, IMessageInfoLogic logic)
+        {
+            InitializeComponent();
+            _logger = logger;
+            _logic = logic;
+        }
+
+        private void LoadData()
+        {
+            try
+            {
+                var list = _logic.ReadList(null);
+                if (list != null)
+                {
+                    dataGridView.DataSource = list;
+                    dataGridView.Columns["MessageId"].Visible = false;
+                    dataGridView.Columns["ClientId"].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();
+        }
+    }
+}

SushiBar/SushiBarView/FormMain.Designer.cs

@@ -38,40 +38,14 @@
             componentsToolStripMenuItemToolStripMenuItem = new ToolStripMenuItem();
             sushiToolStripMenuItemToolStripMenuItem = new ToolStripMenuItem();
             ClientToolStripMenuItem = new ToolStripMenuItem();
-            отчётыToolStripMenuItem = new ToolStripMenuItem();
-            componentsToolStripMenuItem1 = new ToolStripMenuItem();
-            //componentSushiToolStripMenuItem1 = new ToolStripMenuItem();
-            ordersToolStripMenuItem = new ToolStripMenuItem();
-            dataGridView = new DataGridView();
             employersToolStripMenuItem = new ToolStripMenuItem();
             начатьРаботуToolStripMenuItem = new ToolStripMenuItem();
-            menuStrip.SuspendLayout();
-            ((System.ComponentModel.ISupportInitialize)dataGridView).BeginInit();
-            SuspendLayout();
-            ButtonCreateOrder = new Button();
-            ButtonOrderReady = new Button();
-            ButtonRef = new Button();
-            ButtonIssuedOrder = new Button();
-            ButtonTakeOrderInWork = new Button();
-            menuStrip = new MenuStrip();
-            toolStripMenuItem1 = new ToolStripMenuItem();
-            componentsToolStripMenuItemToolStripMenuItem = new ToolStripMenuItem();
-            sushiToolStripMenuItemToolStripMenuItem = new ToolStripMenuItem();
-            магазиныToolStripMenuItem = new ToolStripMenuItem();
             отчётыToolStripMenuItem = new ToolStripMenuItem();
             componentsToolStripMenuItem1 = new ToolStripMenuItem();
-            списокСушиToolStripMenuItem = new ToolStripMenuItem();
-            сушиСИнгрToolStripMenuItem = new ToolStripMenuItem();
+            componentSushiToolStripMenuItem1 = new ToolStripMenuItem();
             ordersToolStripMenuItem = new ToolStripMenuItem();
-            заказыToolStripMenuItem = new ToolStripMenuItem();
-            заказыПоГруппамToolStripMenuItem = new ToolStripMenuItem();
-            магазиныToolStripMenuItem1 = new ToolStripMenuItem();
-            информацияToolStripMenuItem = new ToolStripMenuItem();
-            загруженностьToolStripMenuItem = new ToolStripMenuItem();
-            операцииToolStripMenuItem = new ToolStripMenuItem();
-            поставкаToolStripMenuItem = new ToolStripMenuItem();
-            продажаToolStripMenuItem = new ToolStripMenuItem();
             dataGridView = new DataGridView();
+            gToolStripMenuItem = new ToolStripMenuItem();
             menuStrip.SuspendLayout();
             ((System.ComponentModel.ISupportInitialize)dataGridView).BeginInit();
             SuspendLayout();
@@ -134,20 +108,10 @@
             menuStrip.Size = new Size(922, 24);
             menuStrip.TabIndex = 5;
             menuStrip.Text = "menuStrip1";
-            menuStrip.Items.AddRange(new ToolStripItem[] { toolStripMenuItem1, отчётыToolStripMenuItem, операцииToolStripMenuItem });
-            menuStrip.Location = new Point(0, 0);
-            menuStrip.Name = "menuStrip";
-            menuStrip.Size = new Size(922, 24);
-            menuStrip.TabIndex = 5;
-            menuStrip.Text = "menuStrip1";
             // 
             // toolStripMenuItem1
             // 
-            toolStripMenuItem1.DropDownItems.AddRange(new ToolStripItem[] { componentsToolStripMenuItemToolStripMenuItem, sushiToolStripMenuItemToolStripMenuItem, ClientToolStripMenuItem, employersToolStripMenuItem, начатьРаботуToolStripMenuItem });
-            toolStripMenuItem1.Name = "toolStripMenuItem1";
-            toolStripMenuItem1.Size = new Size(94, 20);
-            toolStripMenuItem1.Text = "Справочники";
-            toolStripMenuItem1.DropDownItems.AddRange(new ToolStripItem[] { componentsToolStripMenuItemToolStripMenuItem, sushiToolStripMenuItemToolStripMenuItem, магазиныToolStripMenuItem });
+            toolStripMenuItem1.DropDownItems.AddRange(new ToolStripItem[] { componentsToolStripMenuItemToolStripMenuItem, sushiToolStripMenuItemToolStripMenuItem, ClientToolStripMenuItem, employersToolStripMenuItem, начатьРаботуToolStripMenuItem, gToolStripMenuItem });
             toolStripMenuItem1.Name = "toolStripMenuItem1";
             toolStripMenuItem1.Size = new Size(94, 20);
             toolStripMenuItem1.Text = "Справочники";
@@ -158,10 +122,6 @@
             componentsToolStripMenuItemToolStripMenuItem.Size = new Size(180, 22);
             componentsToolStripMenuItemToolStripMenuItem.Text = "Компоненты";
             componentsToolStripMenuItemToolStripMenuItem.Click += componentsToolStripMenuItem_Click;
-            componentsToolStripMenuItemToolStripMenuItem.Name = "componentsToolStripMenuItemToolStripMenuItem";
-            componentsToolStripMenuItemToolStripMenuItem.Size = new Size(145, 22);
-            componentsToolStripMenuItemToolStripMenuItem.Text = "Компоненты";
-            componentsToolStripMenuItemToolStripMenuItem.Click += componentsToolStripMenuItem_Click;
             // 
             // sushiToolStripMenuItemToolStripMenuItem
             // 
@@ -169,10 +129,6 @@
             sushiToolStripMenuItemToolStripMenuItem.Size = new Size(180, 22);
             sushiToolStripMenuItemToolStripMenuItem.Text = "Суши";
             sushiToolStripMenuItemToolStripMenuItem.Click += sushiToolStripMenuItem_Click;
-            sushiToolStripMenuItemToolStripMenuItem.Name = "sushiToolStripMenuItemToolStripMenuItem";
-            sushiToolStripMenuItemToolStripMenuItem.Size = new Size(145, 22);
-            sushiToolStripMenuItemToolStripMenuItem.Text = "Суши";
-            sushiToolStripMenuItemToolStripMenuItem.Click += sushiToolStripMenuItem_Click;
             // 
             // ClientToolStripMenuItem
             // 
@@ -181,20 +137,23 @@
             ClientToolStripMenuItem.Text = "Клиенты";
             ClientToolStripMenuItem.Click += ClientToolStripMenuItem_Click;
             // 
-            // магазиныToolStripMenuItem
+            // employersToolStripMenuItem
             // 
-            магазиныToolStripMenuItem.Name = "магазиныToolStripMenuItem";
-            магазиныToolStripMenuItem.Size = new Size(145, 22);
-            магазиныToolStripMenuItem.Text = "Магазины";
-            магазиныToolStripMenuItem.Click += shopsToolStripMenuItem_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;
             // 
             // отчётыToolStripMenuItem
             // 
-            отчётыToolStripMenuItem.DropDownItems.AddRange(new ToolStripItem[] { componentsToolStripMenuItem1, ordersToolStripMenuItem });
-            отчётыToolStripMenuItem.Name = "отчётыToolStripMenuItem";
-            отчётыToolStripMenuItem.Size = new Size(60, 20);
-            отчётыToolStripMenuItem.Text = "Отчёты";
-            отчётыToolStripMenuItem.DropDownItems.AddRange(new ToolStripItem[] { componentsToolStripMenuItem1, ordersToolStripMenuItem, магазиныToolStripMenuItem1 });
+            отчётыToolStripMenuItem.DropDownItems.AddRange(new ToolStripItem[] { componentsToolStripMenuItem1, componentSushiToolStripMenuItem1, ordersToolStripMenuItem });
             отчётыToolStripMenuItem.Name = "отчётыToolStripMenuItem";
             отчётыToolStripMenuItem.Size = new Size(60, 20);
             отчётыToolStripMenuItem.Text = "Отчёты";
@@ -205,29 +164,13 @@
             componentsToolStripMenuItem1.Size = new Size(201, 22);
             componentsToolStripMenuItem1.Text = "Суши";
             componentsToolStripMenuItem1.Click += ComponentsToolStripMenuItem_Click;
-            componentsToolStripMenuItem1.DropDownItems.AddRange(new ToolStripItem[] { списокСушиToolStripMenuItem, сушиСИнгрToolStripMenuItem });
-            componentsToolStripMenuItem1.Name = "componentsToolStripMenuItem1";
-            componentsToolStripMenuItem1.Size = new Size(180, 22);
-            componentsToolStripMenuItem1.Text = "Суши";
-            componentsToolStripMenuItem1.Click += ComponentsToolStripMenuItem_Click;
             // 
-            // списокСушиToolStripMenuItem
+            // componentSushiToolStripMenuItem1
             // 
-            списокСушиToolStripMenuItem.Name = "списокСушиToolStripMenuItem";
-            списокСушиToolStripMenuItem.Size = new Size(201, 22);
-            списокСушиToolStripMenuItem.Text = "Список суши";
-            списокСушиToolStripMenuItem.Click += ComponentsToolStripMenuItem_Click;
-            // 
-            // сушиСИнгрToolStripMenuItem
-            // 
-           /* componentSushiToolStripMenuItem1.Name = "componentSushiToolStripMenuItem1";
+            componentSushiToolStripMenuItem1.Name = "componentSushiToolStripMenuItem1";
             componentSushiToolStripMenuItem1.Size = new Size(201, 22);
             componentSushiToolStripMenuItem1.Text = "Суши с компонентами";
             componentSushiToolStripMenuItem1.Click += ComponentSushiToolStripMenuItem_Click;
-            сушиСИнгрToolStripMenuItem.Name = "сушиСИнгрToolStripMenuItem";
-            сушиСИнгрToolStripMenuItem.Size = new Size(201, 22);
-            сушиСИнгрToolStripMenuItem.Text = "Суши с компонентами";
-            сушиСИнгрToolStripMenuItem.Click += ComponentSushiToolStripMenuItem_Click;*/
             // 
             // ordersToolStripMenuItem
             // 
@@ -246,94 +189,12 @@
             dataGridView.Size = new Size(647, 344);
             dataGridView.TabIndex = 6;
             // 
-            // employersToolStripMenuItem
+            // gToolStripMenuItem
             // 
-            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 = "Клиенты";
-            ClientToolStripMenuItem.Click += ClientToolStripMenuItem_Click;
-            ordersToolStripMenuItem.DropDownItems.AddRange(new ToolStripItem[] { заказыToolStripMenuItem, заказыПоГруппамToolStripMenuItem });
-            ordersToolStripMenuItem.Name = "ordersToolStripMenuItem";
-            ordersToolStripMenuItem.Size = new Size(180, 22);
-            ordersToolStripMenuItem.Text = "Заказы";
-            ordersToolStripMenuItem.Click += OrdersToolStripMenuItem_Click;
-            // 
-            // заказыToolStripMenuItem
-            // 
-            заказыToolStripMenuItem.Name = "заказыToolStripMenuItem";
-            заказыToolStripMenuItem.Size = new Size(180, 22);
-            заказыToolStripMenuItem.Text = "Заказы";
-            заказыToolStripMenuItem.Click += OrdersToolStripMenuItem_Click;
-            // 
-            // заказыПоГруппамToolStripMenuItem
-            // 
-            заказыПоГруппамToolStripMenuItem.Name = "заказыПоГруппамToolStripMenuItem";
-            заказыПоГруппамToolStripMenuItem.Size = new Size(180, 22);
-            заказыПоГруппамToolStripMenuItem.Text = "Заказы по группам";
-            заказыПоГруппамToolStripMenuItem.Click += GroupOrdersToolStripMenuItem_Click;
-            // 
-            // магазиныToolStripMenuItem1
-            // 
-            магазиныToolStripMenuItem1.DropDownItems.AddRange(new ToolStripItem[] { информацияToolStripMenuItem, загруженностьToolStripMenuItem });
-            магазиныToolStripMenuItem1.Name = "магазиныToolStripMenuItem1";
-            магазиныToolStripMenuItem1.Size = new Size(180, 22);
-            магазиныToolStripMenuItem1.Text = "Магазины";
-            // 
-            // информацияToolStripMenuItem
-            // 
-            информацияToolStripMenuItem.Name = "информацияToolStripMenuItem";
-            информацияToolStripMenuItem.Size = new Size(180, 22);
-            информацияToolStripMenuItem.Text = "Информация ";
-            информацияToolStripMenuItem.Click += InfoToolStripMenuItem_Click;
-            // 
-            // загруженностьToolStripMenuItem
-            // 
-            загруженностьToolStripMenuItem.Name = "загруженностьToolStripMenuItem";
-            загруженностьToolStripMenuItem.Size = new Size(180, 22);
-            загруженностьToolStripMenuItem.Text = "Загруженность";
-            загруженностьToolStripMenuItem.Click += BusyShopsToolStripMenuItem_Click;
-            // 
-            // операцииToolStripMenuItem
-            // 
-            операцииToolStripMenuItem.DropDownItems.AddRange(new ToolStripItem[] { поставкаToolStripMenuItem, продажаToolStripMenuItem });
-            операцииToolStripMenuItem.Name = "операцииToolStripMenuItem";
-            операцииToolStripMenuItem.Size = new Size(75, 20);
-            операцииToolStripMenuItem.Text = "Операции";
-            // 
-            // поставкаToolStripMenuItem
-            // 
-            поставкаToolStripMenuItem.Name = "поставкаToolStripMenuItem";
-            поставкаToolStripMenuItem.Size = new Size(125, 22);
-            поставкаToolStripMenuItem.Text = "Поставка";
-            поставкаToolStripMenuItem.Click += transactionToolStripMenuItem_Click;
-            // 
-            // продажаToolStripMenuItem
-            // 
-            продажаToolStripMenuItem.Name = "продажаToolStripMenuItem";
-            продажаToolStripMenuItem.Size = new Size(125, 22);
-            продажаToolStripMenuItem.Text = "Продажа";
-            продажаToolStripMenuItem.Click += SellToolStripMenuItem_Click;
-            // 
-            // dataGridView
-            // 
-            dataGridView.BackgroundColor = Color.White;
-            dataGridView.ColumnHeadersHeightSizeMode = DataGridViewColumnHeadersHeightSizeMode.AutoSize;
-            dataGridView.Location = new Point(12, 27);
-            dataGridView.Name = "dataGridView";
-            dataGridView.RowTemplate.Height = 25;
-            dataGridView.Size = new Size(647, 344);
-            dataGridView.TabIndex = 6;
+            gToolStripMenuItem.Name = "gToolStripMenuItem";
+            gToolStripMenuItem.Size = new Size(180, 22);
+            gToolStripMenuItem.Text = "Почта";
+            gToolStripMenuItem.Click += mailToolStripMenuItem_Click;
             // 
             // FormMain
             // 
@@ -372,20 +233,11 @@
         private DataGridView dataGridView;
         private ToolStripMenuItem отчётыToolStripMenuItem;
         private ToolStripMenuItem componentsToolStripMenuItem1;
+        private ToolStripMenuItem componentSushiToolStripMenuItem1;
         private ToolStripMenuItem ordersToolStripMenuItem;
         private ToolStripMenuItem ClientToolStripMenuItem;
         private ToolStripMenuItem employersToolStripMenuItem;
         private ToolStripMenuItem начатьРаботуToolStripMenuItem;
-        private ToolStripMenuItem магазиныToolStripMenuItem;
-        private ToolStripMenuItem списокСушиToolStripMenuItem;
-        private ToolStripMenuItem сушиСИнгрToolStripMenuItem;
-        private ToolStripMenuItem заказыToolStripMenuItem;
-        private ToolStripMenuItem заказыПоГруппамToolStripMenuItem;
-        private ToolStripMenuItem магазиныToolStripMenuItem1;
-        private ToolStripMenuItem информацияToolStripMenuItem;
-        private ToolStripMenuItem загруженностьToolStripMenuItem;
-        private ToolStripMenuItem операцииToolStripMenuItem;
-        private ToolStripMenuItem поставкаToolStripMenuItem;
-        private ToolStripMenuItem продажаToolStripMenuItem;
+        private ToolStripMenuItem gToolStripMenuItem;
     }
 }

SushiBar/SushiBarView/FormMain.cs

@@ -60,6 +60,7 @@ namespace SushiBarView
                     dataGridView.DataSource = list;
                     dataGridView.Columns["SushiId"].Visible = false;
                     dataGridView.Columns["ClientId"].Visible = false;
+                    dataGridView.Columns["ClientEmail"].Visible = false;
                     dataGridView.Columns["ImplementerId"].Visible = false;
                 }
                 _logger.LogInformation("Загрузка заказов");
@@ -226,56 +227,10 @@ namespace SushiBarView
             _workProcess.DoWork((Program.ServiceProvider?.GetService(typeof(IImplementerLogic)) as IImplementerLogic)!, _orderLogic);
             MessageBox.Show("Процесс обработки запущен", "Сообщение", MessageBoxButtons.OK, MessageBoxIcon.Information);
         }
-        private void shopsToolStripMenuItem_Click(object sender, EventArgs e)
+        private void mailToolStripMenuItem_Click(object sender, EventArgs e)
         {
-            var service = Program.ServiceProvider?.GetService(typeof(FormShops));
-            if (service is FormShops form)
-            {
-                form.ShowDialog();
-            }
-        }
-
-        private void transactionToolStripMenuItem_Click(object sender, EventArgs e)
-        {
-            var service = Program.ServiceProvider?.GetService(typeof(FormCreateSupply));
-            if (service is FormCreateSupply form)
-            {
-                form.ShowDialog();
-            }
-        }
-
-        private void SellToolStripMenuItem_Click(object sender, EventArgs e)
-        {
-            var service = Program.ServiceProvider?.GetService(typeof(FormSellSushi));
-            if (service is FormSellSushi form)
-            {
-                form.ShowDialog();
-            }
-        }
-
-        private void InfoToolStripMenuItem_Click(object sender, EventArgs e)
-        {
-            using var dialog = new SaveFileDialog { Filter = "docx|*.docx" };
-            if (dialog.ShowDialog() == DialogResult.OK)
-            {
-                _reportLogic.SaveShopsToWordFile(new ReportBindingModel { FileName = dialog.FileName });
-                MessageBox.Show("Выполнено", "Успех", MessageBoxButtons.OK, MessageBoxIcon.Information);
-            }
-        }
-
-        private void BusyShopsToolStripMenuItem_Click(object sender, EventArgs e)
-        {
-            var service = Program.ServiceProvider?.GetService(typeof(FormReportShop));
-            if (service is FormReportShop form)
-            {
-                form.ShowDialog();
-            }
-        }
-
-        private void GroupOrdersToolStripMenuItem_Click(object sender, EventArgs e)
-        {
-            var service = Program.ServiceProvider?.GetService(typeof(FormReportGroupedOrders));
-            if (service is FormReportGroupedOrders form)
+            var service = Program.ServiceProvider?.GetService(typeof(FormMail));
+            if (service is FormMail form)
             {
                 form.ShowDialog();
             }

SushiBar/SushiBarView/FormReportGroupedOrders.Designer.cs

@@ -1,86 +0,0 @@
-namespace SushiBarView
-{
-    partial class FormReportGroupedOrders
-    {
-        /// <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.panel = new System.Windows.Forms.Panel();
-            this.buttonToPDF = new System.Windows.Forms.Button();
-            this.buttonMake = new System.Windows.Forms.Button();
-            this.panel.SuspendLayout();
-            this.SuspendLayout();
-            // 
-            // panel
-            // 
-            this.panel.Controls.Add(this.buttonToPDF);
-            this.panel.Controls.Add(this.buttonMake);
-            this.panel.Dock = System.Windows.Forms.DockStyle.Top;
-            this.panel.Location = new System.Drawing.Point(0, 0);
-            this.panel.Name = "panel";
-            this.panel.Size = new System.Drawing.Size(970, 52);
-            this.panel.TabIndex = 1;
-            // 
-            // buttonToPDF
-            // 
-            this.buttonToPDF.Location = new System.Drawing.Point(486, 12);
-            this.buttonToPDF.Name = "buttonToPDF";
-            this.buttonToPDF.Size = new System.Drawing.Size(411, 29);
-            this.buttonToPDF.TabIndex = 5;
-            this.buttonToPDF.Text = "В PDF";
-            this.buttonToPDF.UseVisualStyleBackColor = true;
-            this.buttonToPDF.Click += new System.EventHandler(this.buttonToPDF_Click);
-            // 
-            // buttonMake
-            // 
-            this.buttonMake.Location = new System.Drawing.Point(49, 12);
-            this.buttonMake.Name = "buttonMake";
-            this.buttonMake.Size = new System.Drawing.Size(377, 29);
-            this.buttonMake.TabIndex = 4;
-            this.buttonMake.Text = "Сформировать";
-            this.buttonMake.UseVisualStyleBackColor = true;
-            this.buttonMake.Click += new System.EventHandler(this.ButtonMake_Click);
-            // 
-            // FormReportGroupedOrders
-            // 
-            this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 20F);
-            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.ClientSize = new System.Drawing.Size(970, 450);
-            this.Controls.Add(this.panel);
-            this.Name = "FormReportGroupedOrders";
-            this.Text = "Отчёт по группированным заказам ";
-            this.panel.ResumeLayout(false);
-            this.ResumeLayout(false);
-
-        }
-
-        #endregion
-
-        private Panel panel;
-        private Button buttonToPDF;
-        private Button buttonMake;
-    }
-}

SushiBar/SushiBarView/FormReportGroupedOrders.cs

@@ -1,80 +0,0 @@
-using Microsoft.Extensions.Logging;
-using Microsoft.Reporting.WinForms;
-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 FormReportGroupedOrders : Form
-    {
-        private readonly ReportViewer reportViewer;
-        private readonly ILogger _logger;
-        private readonly IReportLogic _logic;
-
-        public FormReportGroupedOrders(ILogger<FormReportGroupedOrders> logger, IReportLogic logic)
-        {
-            InitializeComponent();
-            _logger = logger;
-            _logic = logic;
-            reportViewer = new ReportViewer
-            {
-                Dock = DockStyle.Fill
-            };
-            reportViewer.LocalReport.LoadReportDefinition(new FileStream("ReportGroupedOrders.rdlc", FileMode.Open));
-            Controls.Clear();
-            Controls.Add(reportViewer);
-            Controls.Add(panel);
-        }
-
-        private void ButtonMake_Click(object sender, EventArgs e)
-        {
-            try
-            {
-                var dataSource = _logic.GetGroupedOrders();
-                var source = new ReportDataSource("DataSetGroupedOrders", dataSource);
-                reportViewer.LocalReport.DataSources.Clear();
-                reportViewer.LocalReport.DataSources.Add(source);
-
-                reportViewer.RefreshReport();
-                _logger.LogInformation("Загрузка списка группированных заказов");
-            }
-            catch (Exception ex)
-            {
-                _logger.LogError(ex, "Ошибка загрузки списка группированных заказов на период");
-                MessageBox.Show(ex.Message, "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error);
-            }
-        }
-
-
-        private void buttonToPDF_Click(object sender, EventArgs e)
-        {
-            using var dialog = new SaveFileDialog { Filter = "pdf|*.pdf" };
-            if (dialog.ShowDialog() == DialogResult.OK)
-            {
-                try
-                {
-                    _logic.SaveGroupedOrdersToPdfFile(new ReportBindingModel
-                    {
-                        FileName = dialog.FileName,
-                    });
-                    _logger.LogInformation("Сохранение списка группированных заказов");
-                    MessageBox.Show("Выполнено", "Успех", MessageBoxButtons.OK, MessageBoxIcon.Information);
-                }
-                catch (Exception ex)
-                {
-                    _logger.LogError(ex, "Ошибка сохранения списка группированных заказов");
-                    MessageBox.Show(ex.Message, "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error);
-                }
-            }
-        }
-    }
-}

SushiBar/SushiBarView/FormReportGroupedOrders.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/FormReportShop.Designer.cs

@@ -1,116 +0,0 @@
-namespace SushiBarView
-{
-    partial class FormReportShop
-    {
-        /// <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.buttonSaveToExcel = new System.Windows.Forms.Button();
-            this.dataGridView = new System.Windows.Forms.DataGridView();
-            this.ColumnShop = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.ColumnSushi = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.ColumnCount = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            ((System.ComponentModel.ISupportInitialize)(this.dataGridView)).BeginInit();
-            this.SuspendLayout();
-            // 
-            // buttonSaveToExcel
-            // 
-            this.buttonSaveToExcel.Location = new System.Drawing.Point(0, 6);
-            this.buttonSaveToExcel.Name = "buttonSaveToExcel";
-            this.buttonSaveToExcel.Size = new System.Drawing.Size(223, 29);
-            this.buttonSaveToExcel.TabIndex = 3;
-            this.buttonSaveToExcel.Text = "Сохранить в Excel";
-            this.buttonSaveToExcel.UseVisualStyleBackColor = true;
-            this.buttonSaveToExcel.Click += new System.EventHandler(this.ButtonSaveToExcel_Click);
-            // 
-            // dataGridView
-            // 
-            this.dataGridView.AllowUserToAddRows = false;
-            this.dataGridView.AllowUserToDeleteRows = false;
-            this.dataGridView.AllowUserToOrderColumns = true;
-            this.dataGridView.AutoSizeColumnsMode = System.Windows.Forms.DataGridViewAutoSizeColumnsMode.Fill;
-            this.dataGridView.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
-            this.dataGridView.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] {
-            this.ColumnShop,
-            this.ColumnSushi,
-            this.ColumnCount});
-            this.dataGridView.Dock = System.Windows.Forms.DockStyle.Bottom;
-            this.dataGridView.Location = new System.Drawing.Point(0, 47);
-            this.dataGridView.Name = "dataGridView";
-            this.dataGridView.ReadOnly = true;
-            this.dataGridView.RowHeadersWidth = 51;
-            this.dataGridView.RowTemplate.Height = 29;
-            this.dataGridView.Size = new System.Drawing.Size(598, 403);
-            this.dataGridView.TabIndex = 2;
-            // 
-            // ColumnShop
-            // 
-            this.ColumnShop.FillWeight = 130F;
-            this.ColumnShop.HeaderText = "Магазин";
-            this.ColumnShop.MinimumWidth = 6;
-            this.ColumnShop.Name = "ColumnShop";
-            this.ColumnShop.ReadOnly = true;
-            // 
-            // ColumnSushi
-            // 
-            this.ColumnSushi.FillWeight = 140F;
-            this.ColumnSushi.HeaderText = "Пицца";
-            this.ColumnSushi.MinimumWidth = 6;
-            this.ColumnSushi.Name = "ColumnSushi";
-            this.ColumnSushi.ReadOnly = true;
-            // 
-            // ColumnCount
-            // 
-            this.ColumnCount.FillWeight = 90F;
-            this.ColumnCount.HeaderText = "Количество";
-            this.ColumnCount.MinimumWidth = 6;
-            this.ColumnCount.Name = "ColumnCount";
-            this.ColumnCount.ReadOnly = true;
-            // 
-            // FormReportShop
-            // 
-            this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 20F);
-            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.ClientSize = new System.Drawing.Size(598, 450);
-            this.Controls.Add(this.buttonSaveToExcel);
-            this.Controls.Add(this.dataGridView);
-            this.Name = "FormReportShop";
-            this.Text = "Наполненость магазинов";
-            this.Load += new System.EventHandler(this.FormReportShop_Load);
-            ((System.ComponentModel.ISupportInitialize)(this.dataGridView)).EndInit();
-            this.ResumeLayout(false);
-
-        }
-
-        #endregion
-
-        private Button buttonSaveToExcel;
-        private DataGridView dataGridView;
-        private DataGridViewTextBoxColumn ColumnShop;
-        private DataGridViewTextBoxColumn ColumnSushi;
-        private DataGridViewTextBoxColumn ColumnCount;
-    }
-}

SushiBar/SushiBarView/FormReportShop.cs

@@ -1,78 +0,0 @@
-using Microsoft.Extensions.Logging;
-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 FormReportShop : Form
-    {
-        private readonly ILogger _logger;
-        private readonly IReportLogic _logic;
-
-        public FormReportShop(ILogger<FormReportShop> logger, IReportLogic logic)
-        {
-            InitializeComponent();
-            _logger = logger;
-            _logic = logic;
-        }
-
-        private void FormReportShop_Load(object sender, EventArgs e)
-        {
-            try
-            {
-                var dict = _logic.GetShops();
-                if (dict != null)
-                {
-                    dataGridView.Rows.Clear();
-                    foreach (var elem in dict)
-                    {
-                        dataGridView.Rows.Add(new object[] { elem.ShopName, "", "" });
-                        foreach (var listElem in elem.Sushis)
-                        {
-                            dataGridView.Rows.Add(new object[] { "", listElem.Item1, listElem.Item2 });
-                        }
-                        dataGridView.Rows.Add(new object[] { "Итого", "", elem.TotalCount });
-                        dataGridView.Rows.Add(Array.Empty<object>());
-                    }
-                }
-                _logger.LogInformation("Загрузка списка пицц по магазинам");
-            }
-            catch (Exception ex)
-            {
-                _logger.LogError(ex, "Ошибка загрузки списка пицц по магазинам");
-                MessageBox.Show(ex.Message, "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error);
-            }
-        }
-
-        private void ButtonSaveToExcel_Click(object sender, EventArgs e)
-        {
-            using var dialog = new SaveFileDialog { Filter = "xlsx|*.xlsx" };
-            if (dialog.ShowDialog() == DialogResult.OK)
-            {
-                try
-                {
-                    _logic.SaveShopsToExcelFile(new ReportBindingModel
-                    {
-                        FileName = dialog.FileName
-                    });
-                    _logger.LogInformation("Сохранение списка пицц по магазинам");
-                    MessageBox.Show("Выполнено", "Успех", MessageBoxButtons.OK, MessageBoxIcon.Information);
-                }
-                catch (Exception ex)
-                {
-                    _logger.LogError(ex, "Ошибка сохранения списка пицц по магазинам");
-                    MessageBox.Show(ex.Message, "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error);
-                }
-            }
-        }
-    }
-}

SushiBar/SushiBarView/FormReportShop.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/FormSellSushi.Designer.cs

@@ -1,120 +0,0 @@
-namespace SushiBarView
-{
-    partial class FormSellSushi
-    {
-        /// <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.labelSushi = new System.Windows.Forms.Label();
-            this.comboBoxSushi = new System.Windows.Forms.ComboBox();
-            this.labelCount = new System.Windows.Forms.Label();
-            this.textBoxCount = new System.Windows.Forms.TextBox();
-            this.buttonSell = new System.Windows.Forms.Button();
-            this.buttonCancel = new System.Windows.Forms.Button();
-            this.SuspendLayout();
-            // 
-            // labelSushi
-            // 
-            this.labelSushi.AutoSize = true;
-            this.labelSushi.Location = new System.Drawing.Point(12, 14);
-            this.labelSushi.Name = "labelSushi";
-            this.labelSushi.Size = new System.Drawing.Size(75, 20);
-            this.labelSushi.TabIndex = 0;
-            this.labelSushi.Text = "Суши: ";
-            // 
-            // comboBoxSushi
-            // 
-            this.comboBoxSushi.FormattingEnabled = true;
-            this.comboBoxSushi.Location = new System.Drawing.Point(115, 11);
-            this.comboBoxSushi.Name = "comboBoxSushi";
-            this.comboBoxSushi.Size = new System.Drawing.Size(239, 28);
-            this.comboBoxSushi.TabIndex = 1;
-            // 
-            // labelCount
-            // 
-            this.labelCount.AutoSize = true;
-            this.labelCount.Location = new System.Drawing.Point(12, 55);
-            this.labelCount.Name = "labelCount";
-            this.labelCount.Size = new System.Drawing.Size(97, 20);
-            this.labelCount.TabIndex = 2;
-            this.labelCount.Text = "Количество: ";
-            // 
-            // textBoxCount
-            // 
-            this.textBoxCount.Location = new System.Drawing.Point(115, 52);
-            this.textBoxCount.Name = "textBoxCount";
-            this.textBoxCount.Size = new System.Drawing.Size(239, 27);
-            this.textBoxCount.TabIndex = 3;
-            // 
-            // buttonSell
-            // 
-            this.buttonSell.Location = new System.Drawing.Point(128, 99);
-            this.buttonSell.Name = "buttonSell";
-            this.buttonSell.Size = new System.Drawing.Size(94, 29);
-            this.buttonSell.TabIndex = 4;
-            this.buttonSell.Text = "Продать";
-            this.buttonSell.UseVisualStyleBackColor = true;
-            this.buttonSell.Click += new System.EventHandler(this.ButtonSell_Click);
-            // 
-            // buttonCancel
-            // 
-            this.buttonCancel.Location = new System.Drawing.Point(242, 99);
-            this.buttonCancel.Name = "buttonCancel";
-            this.buttonCancel.Size = new System.Drawing.Size(94, 29);
-            this.buttonCancel.TabIndex = 5;
-            this.buttonCancel.Text = "Отмена";
-            this.buttonCancel.UseVisualStyleBackColor = true;
-            this.buttonCancel.Click += new System.EventHandler(this.ButtonCancel_Click);
-            // 
-            // FormSellSushi
-            // 
-            this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 20F);
-            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.ClientSize = new System.Drawing.Size(366, 140);
-            this.Controls.Add(this.buttonCancel);
-            this.Controls.Add(this.buttonSell);
-            this.Controls.Add(this.textBoxCount);
-            this.Controls.Add(this.labelCount);
-            this.Controls.Add(this.comboBoxSushi);
-            this.Controls.Add(this.labelSushi);
-            this.Name = "FormSellSushi";
-            this.Text = "Продажа суши";
-            this.Load += new System.EventHandler(this.FormSellingSushi_Load);
-            this.ResumeLayout(false);
-            this.PerformLayout();
-
-        }
-
-        #endregion
-
-        private Label labelSushi;
-        private ComboBox comboBoxSushi;
-        private Label labelCount;
-        private TextBox textBoxCount;
-        private Button buttonSell;
-        private Button buttonCancel;
-    }
-}