Merge branch 'Lab6_Base' into Lab7_Base

⣿⣿⣿⣻⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿ ⣿⣿⣿⣵⣿⣿⣿⠿⡟⣛⣧⣿⣯⣿⣝⡻⢿⣿⣿⣿⣿⣿⣿⣿ ⣿⣿⣿⣿⣿⠋⠁⣴⣶⣿⣿⣿⣿⣿⣿⣿⣦⣍⢿⣿⣿⣿⣿⣿ ⣿⣿⣿⣿⢷⠄⣾⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣏⢼⣿⣿⣿⣿ ⢹⣿⣿⢻⠎⠔⣛⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⡏⣿⣿⣿⣿ ⢸⣿⣿⠇⡶⠄⣿⣿⠿⠟⡛⠛⠻⣿⡿⠿⠿⣿⣗⢣⣿⣿⣿⣿ ⠐⣿⣿⡿⣷⣾⣿⣿⣿⣾⣶⣶⣶⣿⣁⣔⣤⣀⣼⢲⣿⣿⣿⣿ ⠄⣿⣿⣿⣿⣾⣟⣿⣿⣿⣿⣿⣿⣿⡿⣿⣿⣿⢟⣾⣿⣿⣿⣿ ⠄⣟⣿⣿⣿⡷⣿⣿⣿⣿⣿⣮⣽⠛⢻⣽⣿⡇⣾⣿⣿⣿⣿⣿ ⠄⢻⣿⣿⣿⡷⠻⢻⡻⣯⣝⢿⣟⣛⣛⣛⠝⢻⣿⣿⣿⣿⣿⣿ ⠄⠸⣿⣿⡟⣹⣦⠄⠋⠻⢿⣶⣶⣶⡾⠃⡂⢾⣿⣿⣿⣿⣿⣿ ⠄⠄⠟⠋⠄⢻⣿⣧⣲⡀⡀⠄⠉⠱⣠⣾⡇⠄⠉⠛⢿⣿⣿⣿ ⠄⠄⠄⠄⠄⠈⣿⣿⣿⣷⣿⣿⢾⣾⣿⣿⣇⠄⠄⠄⠄⠄⠉⠉ ⠄⠄⠄⠄⠄⠄⠸⣿⣿⠟⠃⠄⠄⢈⣻⣿⣿⠄⠄⠄⠄⠄⠄⠄ ⠄⠄⠄⠄⠄⠄⠄⢿⣿⣾⣷⡄⠄⢾⣿⣿⣿⡄⠄⠄⠄⠄⠄⠄ ⠄⠄⠄⠄⠄⠄⠄⠸⣿⣿⣿⠃⠄⠈⢿⣿⣿⠄⠄⠄⠄⠄

ConfectionaryBusinessLogic/ClientLogic.cs

@@ -1,10 +1,12 @@
-using ConfectioneryBusinessLogic.BusinessLogics;
+using System.Text.RegularExpressions;
+using ConfectioneryBusinessLogic.BusinessLogics;
 using ConfectioneryContracts.BindingModels;
 using ConfectioneryContracts.BusinessLogicsContracts;
 using ConfectioneryContracts.SearchModels;
 using ConfectioneryContracts.StoragesContract;
 using ConfectioneryContracts.ViewModels;
 using Microsoft.Extensions.Logging;
+// ReSharper disable All
 
 namespace ConfectioneryBusinessLogic
 {
@@ -102,6 +104,16 @@ namespace ConfectioneryBusinessLogic
             {
                 throw new ArgumentNullException("Нет логина клиента", nameof(model.Email));
             }
+            if (!Regex.IsMatch(model.Email, @"^[\w-\.]+@([\w-]+\.)+[\w-]{2,4}$"))
+            {
+	            throw new ArgumentException("Некорретно введенный email", nameof(model.Email));
+            }
+			// Запасной (вероятно более правильный): ^((\w+\d+\W+)|(\w+\W+\d+)|(\d+\w+\W+)|(\d+\W+\w+)|(\W+\w+\d+)|(\W+\d+\w+))+$
+            // Просматриваем наперед последовательность (де-факто оператор &&) цифр, небуквенных символов и букв (не цифр и не пробельных символов)
+            if (!Regex.IsMatch(model.Password, @"^(?=.*\d)(?=.*\W)(?=.*[^\d\s]).+$"))
+            {
+	            throw new ArgumentException("Некорректно  введенный пароль. Пароль должен содержать хотя бы одну букву, цифру и не буквенный символ", nameof(model.Password));
+            }
             _logger.LogInformation("Client. Id: {Id}, FIO: {fio}, email: {email}", model.Id, model.ClientFIO, model.Email );
             var element = _clientStorage.GetElement(new ClientSearchModel
             {

ConfectionaryBusinessLogic/ConfectioneryBusinessLogic.csproj

@@ -8,6 +8,7 @@
 
   <ItemGroup>
     <PackageReference Include="DocumentFormat.OpenXml" Version="2.19.0" />
+	<PackageReference Include="MailKit" Version="3.5.0" />
     <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="7.0.0" />
     <PackageReference Include="PDFsharp-MigraDoc-GDI" Version="1.50.5147" />
   </ItemGroup>

ConfectionaryBusinessLogic/ImplementerLogic.cs

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

ConfectionaryBusinessLogic/MailWorker/AbstractMailWorker.cs

@@ -0,0 +1,100 @@
+using ConfectioneryContracts.BindingModels;
+using ConfectioneryContracts.BusinessLogicsContracts;
+using Microsoft.Extensions.Logging;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace ConfectioneryBusinessLogic.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 IClientLogic _clientLogic;
+
+		private readonly ILogger _logger;
+
+		public AbstractMailWorker(ILogger<AbstractMailWorker> logger, IMessageInfoLogic messageInfoLogic, IClientLogic clientLogic)
+		{
+			_logger = logger;
+			_messageInfoLogic = messageInfoLogic;
+			_clientLogic = clientLogic;
+		}
+
+		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, _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)
+			{
+				mail.ClientId = _clientLogic.ReadElement(new() { Email = mail.SenderName })?.Id;
+				_messageInfoLogic.Create(mail);
+			}
+		}
+
+		protected abstract Task SendMailAsync(MailSendInfoBindingModel info);
+
+		protected abstract Task<List<MessageInfoBindingModel>> ReceiveMailAsync();
+	}
+}

ConfectionaryBusinessLogic/MailWorker/MailKitWorker.cs

@@ -0,0 +1,82 @@
+using ConfectioneryContracts.BindingModels;
+using ConfectioneryContracts.BusinessLogicsContracts;
+using MailKit.Net.Pop3;
+using MailKit.Security;
+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;
+
+namespace ConfectioneryBusinessLogic.MailWorker
+{
+	public class MailKitWorker : AbstractMailWorker
+	{
+		public MailKitWorker(ILogger<MailKitWorker> logger, IMessageInfoLogic messageInfoLogic, IClientLogic clientLogic) : base(logger, messageInfoLogic, clientLogic) { }
+
+		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 (AuthenticationException)
+				{ }
+				finally
+				{
+					client.Disconnect(true);
+				}
+			});
+			return list;
+		}
+	}
+}

ConfectionaryBusinessLogic/MessageInfoLogic.cs

@@ -0,0 +1,48 @@
+using ConfectioneryContracts.BindingModels;
+using ConfectioneryContracts.BusinessLogicsContracts;
+using ConfectioneryContracts.SearchModels;
+using ConfectioneryContracts.StoragesContract;
+using ConfectioneryContracts.ViewModels;
+using Microsoft.Extensions.Logging;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace ConfectioneryBusinessLogic
+{
+	public class MessageInfoLogic : IMessageInfoLogic
+	{
+		private readonly ILogger _logger;
+		private readonly IMessageInfoStorage _messageInfoStorage;
+		public MessageInfoLogic(ILogger<MessageInfoLogic> logger, IMessageInfoStorage MessageInfoStorage)
+		{
+			_logger = logger;
+			_messageInfoStorage = MessageInfoStorage;
+		}
+
+		public bool Create(MessageInfoBindingModel model)
+		{
+			if (_messageInfoStorage.Insert(model) == null)
+			{
+				_logger.LogWarning("Insert operation failed");
+				return false;
+			}
+			return true;
+		}
+
+		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;
+		}
+	}
+}

ConfectionaryBusinessLogic/OfficePackage/AbstractSaveToExcel.cs

@@ -14,7 +14,7 @@ namespace ConfectioneryBusinessLogic.OfficePackage
         /// Создание отчета
         /// </summary>
         /// <param name="info"></param>
-        public void CreateReportShop(ExcelInfo info)
+        public void CreateReport(ExcelInfo info)
         {
             CreateExcel(info);
 
@@ -32,92 +32,6 @@ namespace ConfectioneryBusinessLogic.OfficePackage
                 CellToName = "C1"
             });
 
-            uint rowIndex = 2;
-            foreach (var pc in info.ShopPastries)
-            {
-                InsertCellInWorksheet(new ExcelCellParameters
-                {
-                    ColumnName = "A",
-                    RowIndex = rowIndex,
-                    Text = pc.ShopName,
-                    StyleInfo = ExcelStyleInfoType.Text
-                });
-                rowIndex++;
-
-                foreach (var (Shop, Count) in pc.Pastries)
-                {
-                    InsertCellInWorksheet(new ExcelCellParameters
-                    {
-                        ColumnName = "B",
-                        RowIndex = rowIndex,
-                        Text = Shop,
-                        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 = pc.TotalCount.ToString(),
-                    StyleInfo = ExcelStyleInfoType.Text
-                });
-                rowIndex++;
-                InsertCellInWorksheet(new ExcelCellParameters
-                {
-                    ColumnName = "A",
-                    RowIndex = rowIndex,
-                    Text = "Загруженность",
-                    StyleInfo = ExcelStyleInfoType.Text
-                });
-                InsertCellInWorksheet(new ExcelCellParameters
-                {
-                    ColumnName = "C",
-                    RowIndex = rowIndex,
-                    Text = pc.Workload.ToString(),
-                    StyleInfo = ExcelStyleInfoType.Text
-                });
-                rowIndex++;
-            }
-
-            SaveExcel(info);
-        }
-
-        public void CreateReportPastry(ExcelInfoPastry info)
-        {
-            CreateExcel(new() { FileName = info.FileName });
-
-            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 pc in info.PastryComponents)
             {
@@ -168,7 +82,7 @@ namespace ConfectioneryBusinessLogic.OfficePackage
                 rowIndex++;
             }
 
-            SaveExcel(new());
+            SaveExcel(info);
         }
 
         /// <summary>

ConfectionaryBusinessLogic/OfficePackage/AbstractSaveToPdf.cs

@@ -18,40 +18,6 @@ namespace ConfectioneryBusinessLogic.OfficePackage
                 Text = $"с {info.DateFrom.ToShortDateString()} по {info.DateTo.ToShortDateString()}", Style = "Normal", 
                 ParagraphAlignment = PdfParagraphAlignmentType.Center });
 
-            CreateTable(new List<string> { "3cm", "4cm", "5cm" });
-
-            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.Date.ToShortDateString(), order.Count.ToString(), 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 CreateDocOrders(PdfInfoOrders 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", "4cm", "3cm" });
 
             CreateRow(new PdfRowParameters

ConfectionaryBusinessLogic/OfficePackage/AbstractSaveToWord.cs

@@ -10,41 +10,9 @@ namespace ConfectioneryBusinessLogic.OfficePackage
 {
     public abstract class AbstractSaveToWord
     {
-        public void CreateDocTable(WordInfoTable 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() 
-            {
-                ("Название", 3000), 
-                ("Дата", null), 
-                ("Адрес открытия", 4500),
-            },
-            info.Shops
-            .Select(x => new List<string>
-            {
-                x.Name,
-                Convert.ToString(x.DateOpening),
-                x.Address,
-            })
-            .ToList());
-
-            SaveWord(info);
-        }
-
         public void CreateDoc(WordInfo info)
         {
-            CreateWord(new() { FileName = info.FileName });
+            CreateWord(info);
 
             CreateParagraph(new WordParagraph
             {
@@ -60,8 +28,8 @@ namespace ConfectioneryBusinessLogic.OfficePackage
             {
                 CreateParagraph(new WordParagraph
                 {
-                    Texts = new List<(string, WordTextProperties)>
-                    {
+                    Texts = new List<(string, WordTextProperties)> 
+                    { 
                         (pastry.PastryName      , new WordTextProperties { Size = "24", Bold = true}),
                         (" - цена: " + pastry.Price.ToString(), new WordTextProperties { Size = "24" })
                     },
@@ -73,14 +41,14 @@ namespace ConfectioneryBusinessLogic.OfficePackage
                 });
             }
 
-            SaveWord(new());
+            SaveWord(info);
         }
 
         /// <summary>
 		/// Создание doc-файла
 		/// </summary>
 		/// <param name="info"></param>
-        protected abstract void CreateWord(WordInfoTable info);
+        protected abstract void CreateWord(WordInfo info);
 
         /// <summary>
         /// Создание абзаца с текстом
@@ -89,17 +57,10 @@ namespace ConfectioneryBusinessLogic.OfficePackage
         /// <returns></returns>
         protected abstract void CreateParagraph(WordParagraph paragraph);
 
-        /// <summary>
-        /// Создание таблицы в файле
-        /// </summary>
-        /// <param name="nameAndWidthColumns">Строчка заголовок таблицы, определяет текст и ширину каждого столбца</param>
-        /// <param name="rows">The rows.</param>
-        protected abstract void CreateTable(List<(string, int?)> nameAndWidthColumns, List<List<string>> rows);
-
         /// <summary>
 		/// Сохранение файла
 		/// </summary>
 		/// <param name="info"></param>
-        protected abstract void SaveWord(WordInfoTable info);
+        protected abstract void SaveWord(WordInfo info);
     }
 }

ConfectionaryBusinessLogic/OfficePackage/HelperModels/ExcelInfo.cs

@@ -6,7 +6,7 @@ namespace ConfectioneryBusinessLogic.OfficePackage.HelperModels
     {
         public string FileName { get; set; } = string.Empty;
         public string Title { get; set; } = string.Empty;
-        public List<ReportShopPastrytViewModel> ShopPastries
+        public List<ReportPastryComponentViewModel> PastryComponents
         {
             get;
             set;

ConfectionaryBusinessLogic/OfficePackage/HelperModels/ExcelInfoPastry.cs

@@ -1,20 +0,0 @@
-using ConfectioneryContracts.ViewModels;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace ConfectioneryBusinessLogic.OfficePackage.HelperModels
-{
-    public class ExcelInfoPastry
-    {
-        public string FileName { get; set; } = string.Empty;
-        public string Title { get; set; } = string.Empty;
-        public List<ReportPastryComponentViewModel> PastryComponents
-        {
-            get;
-            set;
-        } = new();
-    }
-}

ConfectionaryBusinessLogic/OfficePackage/HelperModels/PdfInfo.cs

@@ -13,6 +13,6 @@ namespace ConfectioneryBusinessLogic.OfficePackage.HelperModels
         public string Title { get; set; } = string.Empty;
         public DateTime DateFrom { get; set; }
         public DateTime DateTo { get; set; }
-        public List<ReportGroupOrdersViewModel> Orders { get; set; } = new();
+        public List<ReportOrdersViewModel> Orders { get; set; } = new();
     }
 }

ConfectionaryBusinessLogic/OfficePackage/HelperModels/PdfInfoOrders.cs

@@ -1,29 +0,0 @@
-using ConfectioneryContracts.ViewModels;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace ConfectioneryBusinessLogic.OfficePackage.HelperModels
-{
-    public class PdfInfoOrders
-    {
-        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<ReportOrdersViewModel> Orders { get; set; } = new();
-
-        public static implicit operator PdfInfo(PdfInfoOrders orders)
-        {
-            return new PdfInfo() 
-            { 
-                DateFrom = orders.DateFrom, 
-                DateTo = orders.DateTo, 
-                FileName = orders.FileName, 
-                Title = orders.Title 
-            };
-        }
-    }
-}

ConfectionaryBusinessLogic/OfficePackage/HelperModels/WordInfo.cs

@@ -1,4 +1,9 @@
 using ConfectioneryContracts.ViewModels;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
 
 namespace ConfectioneryBusinessLogic.OfficePackage.HelperModels
 {
@@ -7,6 +12,5 @@ namespace ConfectioneryBusinessLogic.OfficePackage.HelperModels
         public string FileName { get; set; } = string.Empty;
         public string Title { get; set; } = string.Empty;
         public List<PastryViewModel> Pastries { get; set; } = new();
-        public List<ShopViewModel> Shops { get; set; } = new();
     }
 }

ConfectionaryBusinessLogic/OfficePackage/HelperModels/WordInfoTable.cs

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

ConfectionaryBusinessLogic/OfficePackage/Implements/SaveToWord.cs

@@ -81,7 +81,7 @@ namespace ConfectioneryBusinessLogic.OfficePackage.Implements
             return properties;
         }
 
-        protected override void CreateWord(WordInfoTable info)
+        protected override void CreateWord(WordInfo info)
         {
             _wordDocument = WordprocessingDocument.Create(info.FileName, WordprocessingDocumentType.Document);
             MainDocumentPart mainPart = _wordDocument.AddMainDocumentPart();
@@ -119,7 +119,7 @@ namespace ConfectioneryBusinessLogic.OfficePackage.Implements
             _docBody.AppendChild(docParagraph);
         }
 
-        protected override void SaveWord(WordInfoTable info)
+        protected override void SaveWord(WordInfo info)
         {
             if (_docBody == null || _wordDocument == null)
             {
@@ -131,45 +131,5 @@ namespace ConfectioneryBusinessLogic.OfficePackage.Implements
 
             _wordDocument.Close();
         }
-
-        private static TableCell GetTableCell(string text, int? widthCell = null)
-        {
-
-            TableCell cell = new(new Paragraph(new Run(new Text(text))));
-            if (widthCell != null)
-            {
-                cell.Append(new TableCellProperties()
-                {
-                    TableCellWidth = new() { Width = widthCell.ToString() }
-                });
-            }
-            return cell;
-        }
-
-        protected override void CreateTable(List<(string, int?)> nameAndWidthColumns, List<List<string>> rows)
-        {
-            if (_docBody == null)
-            {
-                return;
-            }
-            Table table = new();
-            TableProperties tblProp = new TableProperties(
-            new TableBorders(
-                    new TopBorder() { Val = new EnumValue<BorderValues>(BorderValues.BasicBlackDashes), Size = 3 },
-                    new BottomBorder() { Val = new EnumValue<BorderValues>(BorderValues.BasicBlackDashes), Size = 3 },
-                    new LeftBorder() { Val = new EnumValue<BorderValues>(BorderValues.BasicBlackDashes), Size = 3 },
-                    new RightBorder() { Val = new EnumValue<BorderValues>(BorderValues.BasicBlackDashes), Size = 3 },
-                    new InsideHorizontalBorder() { Val = new EnumValue<BorderValues>(BorderValues.BasicBlackDashes), Size = 3 },
-                    new InsideVerticalBorder() { Val = new EnumValue<BorderValues>(BorderValues.BasicBlackDashes), Size = 3 }
-                )
-            );
-            table.AppendChild(tblProp);
-
-            table.Append(new TableRow(nameAndWidthColumns.Select(x => GetTableCell(x.Item1, x.Item2))));
-            
-            table.Append(rows.Select(x => new TableRow(x.Select(y => GetTableCell(y)))));
-
-            _docBody.Append(table);
-        }
     }
 }

ConfectionaryBusinessLogic/OrderLogic.cs

@@ -1,4 +1,5 @@
-using ConfectioneryContracts.BindingModels;
+using ConfectioneryBusinessLogic.MailWorker;
+using ConfectioneryContracts.BindingModels;
 using ConfectioneryContracts.BusinessLogicsContracts;
 using ConfectioneryContracts.SearchModels;
 using ConfectioneryContracts.StoragesContract;
@@ -12,15 +13,15 @@ namespace ConfectioneryBusinessLogic.BusinessLogics
     {
         private readonly ILogger _logger;
         private readonly IOrderStorage _orderStorage;
-        private readonly IPastryStorage _pastryStorage;
-        private readonly IShopLogic _shopLogic;
+        private readonly AbstractMailWorker _mailWorker;
+        private readonly IClientLogic _clientLogic;
 
-        public OrderLogic(ILogger<OrderLogic> logger, IOrderStorage orderStorage, IPastryStorage pastryStorage, IShopLogic shopLogic)
+        public OrderLogic(ILogger<OrderLogic> logger, IOrderStorage orderStorage, AbstractMailWorker mailWorker, IClientLogic clientLogic)
         {
             _logger = logger;
-            _shopLogic = shopLogic;
-            _pastryStorage = pastryStorage;
             _orderStorage = orderStorage;
+            _mailWorker = mailWorker;
+            _clientLogic = clientLogic;
         }
 
         public bool CreateOrder(OrderBindingModel model)
@@ -33,11 +34,13 @@ namespace ConfectioneryBusinessLogic.BusinessLogics
             }
             model.Status = OrderStatus.Принят;
             model.DateCreate = DateTime.Now;
-            if (_orderStorage.Insert(model) == null)
+            var result = _orderStorage.Insert(model);
+			if (result == null)
             {
                 _logger.LogWarning("Insert operation failed");
                 return false;
             }
+            SendOrderStatusMail(result.ClientId, $"Новый заказ создан. Номер заказа #{result.Id}", $"Заказ #{result.Id} от {result.DateCreate} на сумму {result.Sum:0.00} принят");
             return true;
         }
 
@@ -94,34 +97,61 @@ namespace ConfectioneryBusinessLogic.BusinessLogics
             }
             if ((int)vmodel.Status + 1 != (int)orderStatus)
             {
-                throw new ArgumentException($"Попытка перевести заказ не в следующий статус: " +
+                throw new InvalidOperationException($"Попытка перевести заказ не в следующий статус: " +
                     $"Текущий статус: {vmodel.Status} \n" +
                     $"Планируемый статус: {orderStatus} \n" +
-                    $"Доступный статус: {(OrderStatus)((int)vmodel.Status + 1)}", 
-                    nameof(vmodel));
-            }
-            if (orderStatus == OrderStatus.Готов)
-            {
-                var vpastry = _pastryStorage.GetElement(new() { Id = vmodel.PastryId });
-
-                if (vpastry == null || !_shopLogic.AddPastriesInShops(vpastry, vmodel.Count)) 
-                {
-                    throw new Exception($"Не удалось заполнить магазины изделием '{vpastry?.PastryName ?? string.Empty}' из заказа {vmodel.Id}");
-                }
+                    $"Доступный статус: {(OrderStatus)((int)vmodel.Status + 1)}");
             }
             model.Status = orderStatus;
             model.DateCreate = vmodel.DateCreate;
             if (model.DateImplement == null)
                 model.DateImplement = vmodel.DateImplement;
+            if (vmodel.ImplementerId.HasValue)
+                model.ImplementerId = vmodel.ImplementerId;
             model.PastryId = vmodel.PastryId;
             model.Sum = vmodel.Sum;
             model.Count= vmodel.Count;
-            if (_orderStorage.Update(model) == null)
+            var result = _orderStorage.Update(model);
+			if (result == null)
             {
                 _logger.LogWarning("Update operation failed");
                 return false;
             }
+			SendOrderStatusMail(result.ClientId, $"Изменен статус заказа #{result.Id}", $"Заказ #{model.Id} изменен статус на {result.Status}");
+			return true;
+        }
+
+		public OrderViewModel? ReadElement(OrderSearchModel model)
+		{
+			if (model == null)
+			{
+				throw new ArgumentNullException(nameof(model));
+			}
+			_logger.LogInformation("ReadElement. Id:{ Id}", 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;
+		}
+
+        private bool SendOrderStatusMail(int clientId, string subject, string text)
+        {
+            var client = _clientLogic.ReadElement(new() { Id = clientId });
+            if (client == null)
+            {
+                return false;
+            }
+            _mailWorker.MailSendAsync(new()
+            {
+                MailAddress = client.Email,
+                Subject = subject,
+                Text = text
+            });
             return true;
         }
-    }
+	}
 }

ConfectionaryBusinessLogic/ReportLogic.cs

@@ -5,72 +5,40 @@ using ConfectioneryContracts.BusinessLogicsContracts;
 using ConfectioneryContracts.SearchModels;
 using ConfectioneryContracts.StoragesContract;
 using ConfectioneryContracts.ViewModels;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
 
 namespace ConfectioneryBusinessLogic
 {
     public class ReportLogic : IReportLogic
     {
+        private readonly IComponentStorage _componentStorage;
+
         private readonly IPastryStorage _pastryStorage;
 
         private readonly IOrderStorage _orderStorage;
 
-        private readonly IShopStorage _shopStorage;
-        private readonly IComponentStorage _componentStorage;
-
         private readonly AbstractSaveToExcel _saveToExcel;
 
         private readonly AbstractSaveToWord _saveToWord;
 
         private readonly AbstractSaveToPdf _saveToPdf;
 
-        public ReportLogic(IPastryStorage PastryStorage, IOrderStorage orderStorage, IShopStorage shopStorage, IComponentStorage componentStorage,
+        public ReportLogic(IPastryStorage PastryStorage, IComponentStorage componentStorage, IOrderStorage orderStorage,
             AbstractSaveToExcel saveToExcel, AbstractSaveToWord saveToWord, AbstractSaveToPdf saveToPdf)
         {
-            _componentStorage = componentStorage;
             _pastryStorage = PastryStorage;
+            _componentStorage = componentStorage;
             _orderStorage = orderStorage;
-            _shopStorage = shopStorage;
 
             _saveToExcel = saveToExcel;
             _saveToWord = saveToWord;
             _saveToPdf = saveToPdf;
         }
 
-        /// <summary>
-        /// Получение списка магазинов с изделиями
-        /// </summary>
-        /// <returns></returns>
-        public List<ReportShopPastrytViewModel> GetShopPastries()
-        {
-            var shops = _shopStorage.GetFullList();
-
-            var pastries = _pastryStorage.GetFullList();
-
-            var list = new List<ReportShopPastrytViewModel>();
-
-            foreach (var shop in shops)
-            {
-                var record = new ReportShopPastrytViewModel
-                {
-                    ShopName = shop.Name,
-                    Pastries = new List<Tuple<string, int>>(),
-                    TotalCount = 0
-                };
-                foreach (var pastry in pastries)
-                {
-                    if (shop.Pastries.ContainsKey(pastry.Id))
-                    {
-                        record.Pastries.Add(new(pastry.PastryName, shop.Pastries[pastry.Id].Item2));
-                        record.TotalCount += shop.Pastries[pastry.Id].Item2;
-                    }
-                }
-                record.Workload = record.TotalCount / (double)shop.MaxCountPastries;
-                list.Add(record);
-            }
-
-            return list;
-        }
-
         /// <summary>
         /// Получение списка компонент с указанием, в каких изделиях используются
         /// </summary>
@@ -126,37 +94,9 @@ namespace ConfectioneryBusinessLogic
         }
 
         /// <summary>
-        /// Получение списка заказов за определенный период
+        /// Сохранение изделий в файл-Word
         /// </summary>
         /// <param name="model"></param>
-        /// <returns></returns>
-        public List<ReportGroupOrdersViewModel> GetGroupOrders(ReportBindingModel model)
-        {
-            return _orderStorage.GetFullList()
-                .GroupBy(x => x.DateCreate.Date)
-                .Select(x => new ReportGroupOrdersViewModel 
-                { 
-                    Date = x.Key,
-                    Count = x.Count(),
-                    Sum = x.Sum(y => y.Sum)
-                }).ToList();
-
-        }
-
-        /// <summary>
-        /// Сохранение магазинов в файл-Word
-        /// </summary>
-        /// <param name="model"></param>
-        public void SaveShopsTableToWordFile(ReportBindingModel model)
-        {
-            _saveToWord.CreateDocTable(new WordInfoTable
-            {
-                FileName = model.FileName,
-                Title = "Список магазинов",
-                Shops = _shopStorage.GetFullList()
-            });
-        }
-
         public void SavePastriesToWordFile(ReportBindingModel model)
         {
             _saveToWord.CreateDoc(new WordInfo
@@ -167,62 +107,34 @@ namespace ConfectioneryBusinessLogic
             });
         }
 
-
-
         /// <summary>
-        /// Сохранение магазинов с указаеним продуктов в файл-Excel
+        /// Сохранение изделий с указаеним продуктов в файл-Excel
         /// </summary>
         /// <param name="model"></param>
-        public void SaveShopPastryToExcelFile(ReportBindingModel model)
-        {
-            _saveToExcel.CreateReportShop(new ExcelInfo
-            {
-                FileName = model.FileName,
-                Title = "Список магазинов",
-                ShopPastries = GetShopPastries()
-            });
-        }
-
         public void SavePastryComponentToExcelFile(ReportBindingModel model)
         {
-            _saveToExcel.CreateReportPastry(new ExcelInfoPastry
+            _saveToExcel.CreateReport(new ExcelInfo
             {
                 FileName = model.FileName,
-                Title = "Список изделий по компонентам",
-                PastryComponents = GetPastryComponent(),
+                Title = "Список изделий",
+                PastryComponents = GetPastryComponent()
             });
         }
 
-        /// <summary>
-        /// Сохранение заказов в файл-Pdf
-        /// </summary>
-        /// <param name="model"></param>
-        public void SaveGroupOrdersToPdfFile(ReportBindingModel model)
-        {
-            _saveToPdf.CreateDoc(new PdfInfo
-            {
-                FileName = model.FileName,
-                Title = "Список сгруппированных заказов по датам",
-                DateFrom = model.DateFrom!.Value,
-                DateTo = model.DateTo!.Value,
-                Orders = GetGroupOrders(model)
-            });
-        }
         /// <summary>
         /// Сохранение заказов в файл-Pdf
         /// </summary>
         /// <param name="model"></param>
         public void SaveOrdersToPdfFile(ReportBindingModel model)
         {
-            _saveToPdf.CreateDocOrders(new PdfInfoOrders
+            _saveToPdf.CreateDoc(new PdfInfo
             {
                 FileName = model.FileName,
                 Title = "Список заказов",
                 DateFrom = model.DateFrom!.Value,
                 DateTo = model.DateTo!.Value,
-                Orders = GetOrders(model),
+                Orders = GetOrders(model)
             });
         }
-
     }
 }

ConfectionaryBusinessLogic/ShopLogic.cs

@@ -1,211 +0,0 @@
-using ConfectioneryBusinessLogic.BusinessLogics;
-using ConfectioneryContracts.BindingModels;
-using ConfectioneryContracts.BusinessLogicsContracts;
-using ConfectioneryContracts.SearchModels;
-using ConfectioneryContracts.StoragesContract;
-using ConfectioneryContracts.ViewModels;
-using ConfectioneryDataModels.Models;
-using Microsoft.Extensions.Logging;
-
-namespace ConfectioneryBusinessLogic
-{
-    public class ShopLogic : IShopLogic
-    { 
-        private readonly ILogger _logger;
-        private readonly IShopStorage _shopStorage;
-        public ShopLogic(ILogger<ShopLogic> logger, IShopStorage shopStorage)
-        {
-            _logger = logger;
-            _shopStorage = shopStorage;
-        }
-        public List<ShopViewModel>? ReadList(ShopSearchModel? model)
-        {
-            _logger.LogInformation("ReadList. ShopName:{ShopName}.Id:{ Id} ",
-                model?.Name, 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.Name, 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);
-            model.Pastries = new();
-            if (_shopStorage.Insert(model) == null)
-            {
-                _logger.LogWarning("Insert operation failed");
-                return false;
-            }
-            return true;
-        }
-        public bool Update(ShopBindingModel model)
-        {
-            CheckModel(model, false);
-            if (string.IsNullOrEmpty(model.Name))
-            {
-                throw new ArgumentNullException("Нет названия магазина",
-                nameof(model.Name));
-            }
-            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;
-        }
-        private void CheckModel(ShopBindingModel model, bool withParams = true)
-        {
-            if (model == null)
-            {
-                throw new ArgumentNullException(nameof(model));
-            }
-            if (!withParams)
-            {
-                return;
-            }
-            if (string.IsNullOrEmpty(model.Name))
-            {
-                throw new ArgumentNullException("Нет названия магазина",
-                nameof(model.Name));
-            }
-            if (model.MaxCountPastries < 0)
-            {
-                throw new ArgumentException(
-                    "Максимальное количество изделий в магазине не должно быть отрицательным",
-                    nameof(model.MaxCountPastries));
-            }
-
-            _logger.LogInformation("Shop. ShopName:{0}.Address:{1}. Id: {2}",
-                model.Name, model.Address, model.Id);
-            var element = _shopStorage.GetElement(new ShopSearchModel
-            {
-                Name = model.Name
-            });
-            if (element != null && element.Id != model.Id && element.Name == model.Name)
-            {
-                throw new InvalidOperationException("Магазин с таким названием уже есть");
-            }
-        }
-
-        public bool AddPastry(ShopSearchModel model, IPastryModel pastry, int count)
-        {
-            if (model == null)
-            {
-                throw new ArgumentNullException(nameof(model));
-            }
-            if (count <= 0)
-            {
-                throw new ArgumentException("Количество добавляемого изделия должно быть больше 0", nameof(count));
-            }
-            _logger.LogInformation("AddPastryInShop. ShopName:{ShopName}.Id:{ Id}",
-                model.Name, model.Id);
-            var element = _shopStorage.GetElement(model);
-            if (element == null)
-            {
-                _logger.LogWarning("AddPastryInShop element not found");
-                return false;
-            }
-            _logger.LogInformation("AddPastryInShop find. Id:{Id}", element.Id);
-
-
-            var prevCount = element.Pastries.GetValueOrDefault(pastry.Id, (pastry, 0)).Item2;
-            element.Pastries[pastry.Id] = (pastry, prevCount + count);
-            _logger.LogInformation(
-                    "AddPastryInShop. Has been added {count} {pastry} in {ShopName}",
-                    count, pastry.PastryName, element.Name);
-
-            _shopStorage.Update(new()
-            {
-                Id = element.Id,
-                Address = element.Address,
-                Name = element.Name,
-                DateOpening = element.DateOpening,
-                Pastries = element.Pastries
-            });
-            return true;
-        }
-
-
-        public int GetFreePlacesWithPastriesInShops(int countPastries)
-        {
-            // Сумма разностей между максимальный кол-вом изделий и суммой всех изделий в магазине
-            return _shopStorage.GetFullList()
-                .Select(x => x.MaxCountPastries - x.Pastries
-                    .Select(p => p.Value.Item2).Sum())
-                .Sum() - countPastries;
-        }
-
-        public bool AddPastriesInShops(IPastryModel pastry, int count)
-        {
-            if (count <= 0)
-            {
-                _logger.LogWarning("AddPastriesInShops. Количество добавляемых изделий должно быть больше 0. Количество - {count}", count);
-                return false;
-            }
-            var freePlaces = GetFreePlacesWithPastriesInShops(count);
-            if (freePlaces < 0)
-            {
-                _logger.LogInformation("AddPastriesInShops. Не удалось добавить изделия в магазины, поскольку они переполнены." +
-                    "Освободите магазины на {places} изделий", -freePlaces);
-                return false;
-            }
-            foreach (var shop in _shopStorage.GetFullList())
-            {
-                var cnt = Math.Min(count, shop.MaxCountPastries - shop.Pastries.Select(x => x.Value.Item2).Sum());
-                if (cnt <= 0)
-                {
-                    continue;
-                }
-                if (!AddPastry(new() { Id = shop.Id }, pastry, cnt))
-                {
-                    _logger.LogWarning("При добавления изделий во все магазины произошла ошибка");
-                    return false;
-                }
-                count -= cnt;
-                if (count == 0)
-                {
-                    return true;
-                }
-            }
-            return true;
-        }
-
-        public bool SellPastries(IPastryModel pastry, int needCount)
-        {
-            return _shopStorage.SellPastries(pastry, needCount);
-        }
-    }
-}

ConfectionaryBusinessLogic/WorkModeling.cs

@@ -0,0 +1,148 @@
+using ConfectioneryContracts.BindingModels;
+using ConfectioneryContracts.BusinessLogicsContracts;
+using ConfectioneryContracts.SearchModels;
+using ConfectioneryContracts.ViewModels;
+using ConfectioneryDataModels.Enums;
+using Microsoft.Extensions.Logging;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace ConfectioneryBusinessLogic
+{
+	public class WorkModeling : IWorkProcess
+	{
+		private readonly ILogger _logger;
+
+		private readonly Random _rnd;
+
+		private IOrderLogic? _orderLogic;
+
+		public WorkModeling(ILogger<WorkModeling> logger)
+		{
+			_logger = logger;
+			_rnd = new Random(1000);
+		}
+
+		public void DoWork(IImplementerLogic implementerLogic, IOrderLogic orderLogic)
+		{
+			_orderLogic = orderLogic;
+			var implementers = implementerLogic.ReadList(null);
+			if (implementers == null)
+			{
+				_logger.LogWarning("DoWork. Implementers is null");
+				return;
+			}
+			// Поскольку у нас могут быть заказы в работе мы не дожны заканчивать работы, если нет Принятых заказов
+			// Поэтому находим заказы в работе и продолжаем работу, если они есть
+			var orders = _orderLogic.ReadList(new OrderSearchModel { Statusses = new() { OrderStatus.Принят, OrderStatus.Выполняется } });
+			if (orders == null || orders.Count == 0)
+			{
+				_logger.LogWarning("DoWork. Orders is null or empty");
+				return;
+			}
+			_logger.LogDebug("DoWork for {Count} orders", orders.Count);
+			foreach (var implementer in implementers)
+			{
+				Task.Run(() => WorkerWorkAsync(implementer, orders));
+			}
+		}
+
+		/// <summary>
+		/// Иммитация работы исполнителя
+		/// </summary>
+		/// <param name="implementer"></param>
+		/// <param name="orders"></param>
+		private async Task WorkerWorkAsync(ImplementerViewModel implementer, List<OrderViewModel> orders)
+		{
+			if (_orderLogic == null || implementer == null)
+			{
+				return;
+			}
+			await RunOrderInWork(implementer, orders);
+
+			await Task.Run(() =>
+			{
+				foreach (var order in orders)
+				{
+					try
+					{
+						_logger.LogDebug("DoWork. Worker {Id} try get order {Order}", implementer.Id, order.Id);
+						// пытаемся назначить заказ на исполнителя
+						_orderLogic.TakeOrderInWork(new OrderBindingModel
+						{
+							Id = order.Id,
+							ImplementerId = implementer.Id
+						});
+						// делаем работу
+						Thread.Sleep(implementer.WorkExperience * _rnd.Next(100, 1000) * order.Count);
+						_logger.LogDebug("DoWork. Worker {Id} finish order {Order}", implementer.Id, order.Id);
+						_orderLogic.FinishOrder(new OrderBindingModel
+						{
+							Id = order.Id
+						});
+						// отдыхаем
+						Thread.Sleep(implementer.Qualification * _rnd.Next(10, 100));
+					}
+					// кто-то мог уже перехватить заказ, игнорируем ошибку
+					catch (InvalidOperationException ex)
+					{
+						_logger.LogWarning(ex, "Error try get work");
+					}
+					// заканчиваем выполнение имитации в случае иной ошибки
+					catch (Exception ex)
+					{
+						_logger.LogError(ex, "Error while do work");
+						throw;
+					}
+				}
+			});
+		}
+
+		/// <summary>
+		/// Ищем заказ, которые уже в работе (вдруг исполнителя прервали)
+		/// </summary>
+		/// <param name="implementer"></param>
+		/// <returns></returns>
+		private async Task RunOrderInWork(ImplementerViewModel implementer, List<OrderViewModel> allOrders)
+		{
+			if (_orderLogic == null || implementer == null || allOrders == null || allOrders.Count == 0)
+			{
+				return;
+			}
+			try
+			{
+				// Выбираем из всех заказов тот, который выполняется данным исполнителем
+				var runOrder = await Task.Run(() => allOrders.FirstOrDefault(x => x.ImplementerId == implementer.Id && x.Status == OrderStatus.Выполняется));
+				if (runOrder == null)
+				{
+					return;
+				}
+
+				_logger.LogDebug("DoWork. Worker {Id} back to order {Order}", implementer.Id, runOrder.Id);
+				// доделываем работу
+				Thread.Sleep(implementer.WorkExperience * _rnd.Next(100, 300) * runOrder.Count);
+				_logger.LogDebug("DoWork. Worker {Id} finish order {Order}", implementer.Id, runOrder.Id);
+				_orderLogic.FinishOrder(new OrderBindingModel
+				{
+					Id = runOrder.Id
+				});
+				// отдыхаем
+				Thread.Sleep(implementer.Qualification * _rnd.Next(10, 100));
+			}
+			// заказа может не быть, просто игнорируем ошибку
+			catch (InvalidOperationException ex)
+			{
+				_logger.LogWarning(ex, "Error try get work");
+			}
+			// а может возникнуть иная ошибка, тогда просто заканчиваем выполнение имитации
+			catch (Exception ex)
+			{
+				_logger.LogError(ex, "Error while do work");
+				throw;
+			}
+		}
+	}
+}

ConfectionaryFileImplement/DataFileSingleton.cs

@@ -9,13 +9,15 @@ namespace ConfectioneryFileImplement
         private readonly string ComponentFileName = "Component.xml";
         private readonly string OrderFileName = "Order.xml";
         private readonly string PastryFileName = "Pastry.xml";
-        private readonly string ShopFileName = "Shop.xml";
         private readonly string ClientFileName = "Client.xml";
+        private readonly string ImplementerFileName = "Implementer.xml";
+        private readonly string MessageInfoFileName = "MessageInfo.xml";
         public List<Component> Components { get; private set; }
         public List<Order> Orders { get; private set; }
         public List<Pastry> Pastries { get; private set; }
         public List<Client> Clients { get; private set; }
-        public List<Shop> Shops { get; private set; }
+        public List<Implementer> Implementers { get; private set; }
+        public List<MessageInfo> Messages { get; private set; }
 
         public static DataFileSingleton GetInstance()
         {
@@ -29,7 +31,8 @@ namespace ConfectioneryFileImplement
         public void SavePastries() => SaveData(Pastries, PastryFileName, "Pastries", x => x.GetXElement);
         public void SaveOrders() => SaveData(Orders, OrderFileName, "Orders", x => x.GetXElement);
         public void SaveClients() => SaveData(Clients, OrderFileName, "Clients", x => x.GetXElement);
-        public void SaveShops() => SaveData(Shops, ShopFileName, "Shops", x => x.GetXElement);
+        public void SaveImplementers() => SaveData(Orders, ImplementerFileName, "Implementers", x => x.GetXElement);
+        public void SaveMessages() => SaveData(Orders, ImplementerFileName, "Messages", x => x.GetXElement);
 
         private DataFileSingleton()
         {
@@ -37,7 +40,8 @@ namespace ConfectioneryFileImplement
             Pastries = LoadData(PastryFileName, "Pastry", x => Pastry.Create(x)!)!;
             Orders = LoadData(OrderFileName, "Order", x => Order.Create(x)!)!;
             Clients = LoadData(ClientFileName, "Client", x => Client.Create(x)!)!;
-            Shops = LoadData(ShopFileName, "Shop", x => Shop.Create(x)!)!;
+            Implementers = LoadData(ImplementerFileName, "Implementer", x => Implementer.Create(x)!)!;
+            Messages = LoadData(MessageInfoFileName, "MessageInfo", x => MessageInfo.Create(x)!)!;
         }
         private static List<T>? LoadData<T>(string filename, string xmlNodeName, Func<XElement, T> selectFunction)
         {

ConfectionaryFileImplement/Implementer.cs

@@ -0,0 +1,88 @@
+using ConfectioneryContracts.BindingModels;
+using ConfectioneryContracts.ViewModels;
+using ConfectioneryDataModels;
+using System;
+using System.Collections.Generic;
+using System.Data;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Xml.Linq;
+
+namespace ConfectioneryFileImplement
+{
+	public class Implementer : IImplementerModel
+	{
+		public int Id { get; private set; }
+
+		public string ImplementerFIO { get; private set; } = string.Empty;
+
+		public string Password { get; private set; } = string.Empty;
+
+		public int WorkExperience { get; private set; }
+
+		public int Qualification { get; private set; }
+
+		public static Implementer? Create(XElement element)
+		{
+			if (element == null)
+			{
+				return null;
+			}
+			return new()
+			{
+				ImplementerFIO = element.Element("FIO")!.Value,
+				Password       = element.Element("Password")!.Value,
+				Id             = Convert.ToInt32(element.Attribute("Id")!.Value),
+				Qualification  = Convert.ToInt32(element.Element("Qualification")!.Value),
+				WorkExperience = Convert.ToInt32(element.Element("WorkExperience")!.Value),
+			};
+		}
+
+		public static Implementer? Create(ImplementerBindingModel model)
+		{
+			if (model == null)
+			{
+				return null;
+			}
+			return new()
+			{ 
+				Id = model.Id,
+				Password = model.Password,
+				Qualification = model.Qualification,
+				ImplementerFIO = model.ImplementerFIO,
+				WorkExperience = model.WorkExperience,
+			};
+		}
+
+
+
+		public void Update(ImplementerBindingModel model)
+		{
+			if (model == null)
+			{
+				return;
+			}
+			Password = model.Password;
+			Qualification = model.Qualification;
+			ImplementerFIO = model.ImplementerFIO;
+			WorkExperience = model.WorkExperience;
+		}
+
+		public ImplementerViewModel GetViewModel => new()
+		{ 
+			Id = Id, 
+			Password = Password, 
+			Qualification = Qualification, 
+			ImplementerFIO = ImplementerFIO, 
+		};
+
+		public XElement GetXElement => new("Client",
+			new XAttribute("Id", Id),
+			new XElement("Password", Password),
+			new XElement("FIO", ImplementerFIO),
+			new XElement("Qualification", Qualification),
+			new XElement("WorkExperience", WorkExperience)
+			);
+	}
+}

ConfectionaryFileImplement/ImplementerStorage.cs

@@ -0,0 +1,90 @@
+using ConfectioneryContracts.BindingModels;
+using ConfectioneryContracts.SearchModels;
+using ConfectioneryContracts.StoragesContract;
+using ConfectioneryContracts.ViewModels;
+
+namespace ConfectioneryFileImplement
+{
+	public class ImplementerStorage : IImplementerStorage
+	{
+		private readonly DataFileSingleton _source;
+		public ImplementerStorage()
+		{
+			_source = DataFileSingleton.GetInstance();
+		}
+
+		public ImplementerViewModel? Delete(ImplementerBindingModel model)
+		{
+			var res = _source.Implementers.FirstOrDefault(x => x.Id == model.Id);
+			if (res != null)
+			{
+				_source.Implementers.Remove(res);
+				_source.SaveImplementers();
+			}
+			return res?.GetViewModel;
+		}
+
+		public ImplementerViewModel? GetElement(ImplementerSearchModel model)
+		{
+			if (model.Id.HasValue)
+				return _source.Implementers.FirstOrDefault(x => x.Id == model.Id)?.GetViewModel;
+			if (model.ImplementerFIO != null && model.Password != null)
+				return _source.Implementers
+					.FirstOrDefault(x => x.ImplementerFIO.Equals(model.ImplementerFIO)
+									  && x.Password.Equals(model.Password))
+					?.GetViewModel;
+			if (model.ImplementerFIO != null)
+				return _source.Implementers.FirstOrDefault(x => x.ImplementerFIO.Equals(model.ImplementerFIO))?.GetViewModel;
+			return null;
+		}
+
+		public List<ImplementerViewModel> GetFilteredList(ImplementerSearchModel model)
+		{
+			if (model == null)
+			{
+				return new();
+			}
+			if (model.Id.HasValue)
+			{
+				var res = GetElement(model);
+				return res != null ? new() { res } : new();
+			}
+			if (model.ImplementerFIO != null) // На случай если фио не будет уникальным (по заданию оно уникально)
+			{
+				return _source.Implementers
+					.Where(x => x.ImplementerFIO.Equals(model.ImplementerFIO))
+					.Select(x => x.GetViewModel)
+					.ToList();
+			}
+			return new();
+		}
+
+		public List<ImplementerViewModel> GetFullList()
+		{
+			return _source.Implementers.Select(x => x.GetViewModel).ToList();
+		}
+
+		public ImplementerViewModel? Insert(ImplementerBindingModel model)
+		{
+			model.Id = _source.Implementers.Count > 0 ? _source.Implementers.Max(x => x.Id) + 1 : 1;
+			var res = Implementer.Create(model);
+			if (res != null)
+			{
+				_source.Implementers.Add(res);
+				_source.SaveImplementers();
+			}
+			return res?.GetViewModel;	
+		}
+
+		public ImplementerViewModel? Update(ImplementerBindingModel model)
+		{
+			var res = _source.Implementers.FirstOrDefault(x => x.Id == model.Id);
+			if (res != null)
+			{
+				res.Update(model);
+				_source.SaveImplementers();
+			}
+			return res?.GetViewModel;
+		}
+	}
+}

ConfectionaryFileImplement/MessageInfo.cs

@@ -0,0 +1,82 @@
+using ConfectioneryContracts.BindingModels;
+using ConfectioneryContracts.ViewModels;
+using ConfectioneryDataModels;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Xml.Linq;
+
+namespace ConfectioneryFileImplement.Models
+{
+	// Update в этой сущности не нужен, поскольку в логике мы не изменяем никакие поля после создания письма
+	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)
+			);
+	}
+
+}

ConfectionaryFileImplement/MessageInfoStorage.cs

@@ -0,0 +1,54 @@
+using ConfectioneryContracts.BindingModels;
+using ConfectioneryContracts.SearchModels;
+using ConfectioneryContracts.StoragesContract;
+using ConfectioneryContracts.ViewModels;
+using ConfectioneryFileImplement.Models;
+using System.Reflection;
+
+namespace ConfectioneryFileImplement
+{
+	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;
+		}
+	}
+}

ConfectionaryFileImplement/Order.cs

@@ -14,6 +14,7 @@ namespace ConfectioneryFileImplement.Models
 
         public int ClientId { get; set; }
 
+        public int? ImplementerId { get; set; }
 
         public int Count { get; private set; }
 
@@ -40,7 +41,8 @@ namespace ConfectioneryFileImplement.Models
                 Status = model.Status,
                 DateCreate = model.DateCreate,
                 DateImplement = model.DateImplement,
-                Id = model.Id,
+			ImplementerId = model.ImplementerId,
+				Id = model.Id,
             };
         }
         public static Order? Create(XElement element)
@@ -59,6 +61,7 @@ namespace ConfectioneryFileImplement.Models
                 PastryId      = Convert.ToInt32(element.Element("PastryId")!.Value),
                 ClientId      = Convert.ToInt32(element.Element("ClientId")!.Value),
                 DateCreate    = Convert.ToDateTime(element.Element("DateCreate")!.Value),
+                ImplementerId = Convert.ToInt32(element.Element("ImplementerId")!.Value),
                 DateImplement = string.IsNullOrEmpty(dateImplement) ? null : Convert.ToDateTime(dateImplement),
             };
         }
@@ -74,20 +77,23 @@ namespace ConfectioneryFileImplement.Models
             Sum = model.Sum;
             Status = model.Status;
             DateCreate = model.DateCreate;
+			ImplementerId = model.ImplementerId;
             DateImplement = model.DateImplement;
-            Id = model.Id;
+			Id = model.Id;
         }
         public OrderViewModel GetViewModel => new()
         {
+			ImplementerFIO = DataFileSingleton.GetInstance().Implementers.FirstOrDefault(x => x.Id == ImplementerId)?.ImplementerFIO ?? string.Empty,
             PastryName = DataFileSingleton.GetInstance().Pastries.FirstOrDefault(x => x.Id == PastryId)?.PastryName ?? string.Empty,
             ClientFIO = DataFileSingleton.GetInstance().Clients.FirstOrDefault(x => x.Id == ClientId)?.ClientFIO ?? string.Empty,
-            PastryId = PastryId,
+			PastryId = PastryId,
             ClientId = ClientId,
             Count = Count,
             Sum = Sum,
             Status = Status,
             DateCreate = DateCreate,
             DateImplement = DateImplement,
+			ImplementerId = ImplementerId,
             Id = Id,
         };
         public XElement GetXElement => new("Order",
@@ -98,7 +104,8 @@ namespace ConfectioneryFileImplement.Models
             new XElement("Sum", Sum.ToString()),
             new XElement("Status", (int)Status),
             new XElement("DateCreate", DateCreate),
-            new XElement("DateImplement", DateImplement)
+            new XElement("DateImplement", DateImplement),
+            new XElement("ImplementerId", ImplementerId)
         );
     }
 }

ConfectionaryFileImplement/OrderStorage.cs

@@ -28,11 +28,22 @@ namespace ConfectioneryFileImplement
 
         public OrderViewModel? GetElement(OrderSearchModel model)
         {
-            if (!model.Id.HasValue)
+            if (model.ImplementerId.HasValue && model.Statusses != null)
             {
-                return null;
-            }
-            return _source.Orders.FirstOrDefault(x => model.Id.HasValue && x.Id == model.Id)?.GetViewModel;
+				return _source.Orders
+                    .FirstOrDefault(x => x.ImplementerId == model.ImplementerId && 
+                                         model.Statusses.Contains(x.Status))
+                    ?.GetViewModel;
+			}
+			if (model.ImplementerId.HasValue)
+			{
+				return _source.Orders.FirstOrDefault(x => x.ImplementerId == model.ImplementerId)?.GetViewModel;
+			}
+			if (!model.Id.HasValue)
+			{
+				return null;
+			}
+			return _source.Orders.FirstOrDefault(x => model.Id.HasValue && x.Id == model.Id)?.GetViewModel;
         }
 
         public List<OrderViewModel> GetFilteredList(OrderSearchModel model)
@@ -51,7 +62,14 @@ namespace ConfectioneryFileImplement
                     .Select(x => x.GetViewModel)
                     .ToList();
             }
-            var result = GetElement(model);
+			if (!model.Id.HasValue && model.Statusses != null)
+			{
+				return _source.Orders
+					.Where(x => model.Statusses.Contains(x.Status))
+					.Select(x => x.GetViewModel)
+					.ToList();
+			}
+			var result = GetElement(model);
             return result != null ? new() { result } : new();
         }
 

ConfectionaryFileImplement/Shop.cs

@@ -1,109 +0,0 @@
-using ConfectioneryContracts.BindingModels;
-using ConfectioneryContracts.ViewModels;
-using ConfectioneryDataModels;
-using ConfectioneryDataModels.Models;
-using System.Xml.Linq;
-
-namespace ConfectioneryFileImplement
-{
-    public class Shop : IShopModel
-    {
-        public string Name { get; private set; } = string.Empty;
-
-        public string Address { get; private set; } = string.Empty;
-
-        public int MaxCountPastries { get; private set; }
-
-        public DateTime DateOpening { get; private set; }
-
-        public Dictionary<int, int> CountPastries { get; private set; } = new();
-
-        private Dictionary<int, (IPastryModel, int)>? _cachedPastries = null;
-        public  Dictionary<int, (IPastryModel, int)> Pastries
-        {
-            get
-            {
-                if (_cachedPastries == null)
-                {
-                    var source = DataFileSingleton.GetInstance();
-                    _cachedPastries = CountPastries
-                        .ToDictionary(x => x.Key, x => (source.Pastries
-                        .FirstOrDefault(y => y.Id == x.Key)! as IPastryModel, x.Value));
-                }
-                return _cachedPastries;
-            }
-        }
-
-        public int Id { get; private set; }
-
-        public static Shop? Create(ShopBindingModel? model)
-        {
-            if (model == null)
-            {
-                return null;
-            }
-            return new Shop()
-            {
-                Id = model.Id,
-                Name = model.Name,
-                Address = model.Address,
-                DateOpening = model.DateOpening,
-                MaxCountPastries = model.MaxCountPastries,
-                CountPastries = new()
-            };
-        }
-        public static Shop? Create(XElement element)
-        {
-            if (element == null)
-            {
-                return null;
-            }
-            return new()
-            {
-                Id               = Convert.ToInt32(element.Attribute("Id")!.Value),
-                Name             = element.Element("Name")!.Value,
-                Address          = element.Element("Address")!.Value,
-                DateOpening      = Convert.ToDateTime(element.Element("DateOpening")!.Value),
-                MaxCountPastries = Convert.ToInt32(element.Element("MaxCountPastries")!.Value),
-                CountPastries    = element.Element("CountPastries")!.Elements("CountPastry")
-                    .ToDictionary(
-                        x => Convert.ToInt32(x.Element("Key")?.Value),
-                        x => Convert.ToInt32(x.Element("Value")?.Value)
-                    )
-            };   
-        }
-        public void Update(ShopBindingModel? model)
-        {
-            if (model == null)
-            {
-                return;
-            }
-            Name = model.Name;
-            Address = model.Address;
-            DateOpening = model.DateOpening;
-            CountPastries = model.Pastries.ToDictionary(x => x.Key, x => x.Value.Item2);
-            _cachedPastries = null;
-        }
-        public ShopViewModel GetViewModel => new()
-        {
-            Id = Id,
-            Name = Name,
-            Address = Address,
-            Pastries = Pastries,
-            DateOpening = DateOpening,
-            MaxCountPastries = MaxCountPastries,
-        };
-        public XElement GetXElement => new("Shop",
-             new XAttribute("Id", Id),
-             new XElement("Name", Name),
-             new XElement("Address", Address),
-             new XElement("DateOpening", DateOpening),
-             new XElement("MaxCountPastries", MaxCountPastries),
-             new XElement("CountPastries", CountPastries
-                 .Select(x => new XElement("CountPastry",
-                     new XElement("Key", x.Key),
-                     new XElement("Value", x.Value))
-                 ))
-         );
-    }
-}

ConfectionaryFileImplement/ShopStorage.cs

@@ -1,114 +0,0 @@
-using ConfectioneryContracts.BindingModels;
-using ConfectioneryContracts.SearchModels;
-using ConfectioneryContracts.StoragesContract;
-using ConfectioneryContracts.ViewModels;
-using ConfectioneryDataModels;
-using ConfectioneryDataModels.Models;
-
-namespace ConfectioneryFileImplement
-{
-    public class ShopStorage : IShopStorage
-    {
-        private readonly DataFileSingleton _source;
-        public ShopStorage()
-        {
-            _source = DataFileSingleton.GetInstance();
-        }
-
-        public ShopViewModel? Delete(ShopBindingModel model)
-        {
-            var element = _source.Shops.FirstOrDefault(x => x.Id == model.Id);
-            if (element != null)
-            {
-                _source.Shops.Remove(element);
-                _source.SaveShops();
-                return element.GetViewModel;
-            }
-            return null;
-        }
-
-        public ShopViewModel? GetElement(ShopSearchModel model)
-        {
-            if (!model.Id.HasValue)
-            {
-                return null;
-            }
-            return _source.Shops.FirstOrDefault(x => model.Id.HasValue && x.Id == model.Id)?.GetViewModel;
-        }
-
-        public List<ShopViewModel> GetFilteredList(ShopSearchModel model)
-        {
-            if (string.IsNullOrEmpty(model.Name))
-            {
-                return new();
-            }
-            return _source.Shops
-                .Select(x => x.GetViewModel)
-                .Where(x => x.Name.Contains(model.Name ?? string.Empty))
-                .ToList();
-        }
-
-        public List<ShopViewModel> GetFullList()
-        {
-            return _source.Shops
-                .Select(shop => shop.GetViewModel)
-                .ToList();
-        }
-
-        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 bool HasNeedPastries(IPastryModel pastry, int needCount)
-        {
-            var resultCount = _source.Shops
-                .Select(shop => shop.Pastries
-                    .FirstOrDefault(x => x.Key == pastry.Id).Value.Item2)
-                .Sum();
-            return resultCount >= needCount;
-        }
-
-        public bool SellPastries(IPastryModel pastry, int needCount)
-        {
-            if (!HasNeedPastries(pastry, needCount))
-            {
-                return false;
-            }
-            foreach (var shop in _source.Shops.Where(shop => shop.Pastries.ContainsKey(pastry.Id)))
-            {
-                var tuple = shop.Pastries[pastry.Id];
-                var diff = Math.Min(tuple.Item2, needCount);
-                shop.Pastries[pastry.Id] = (tuple.Item1, tuple.Item2 - diff);
-                
-                needCount -= diff;
-                if (needCount <= 0)
-                {
-                    return true;
-                }
-            }
-                
-            return true;
-        }
-    }
-}

ConfectionaryListImplement/DataListSingleton.cs

@@ -9,15 +9,17 @@ namespace ConfectioneryListImplement
         public List<Order> Orders { get; set; }
         public List<Pastry> Pastry { get; set; }
         public List<Client> Clients { get; set; }
+        public List<Implementer> Implementers { get; set; }
+        public List<MessageInfo> Messages { get; set; }
 
-        public List<Shop> Shops { get; set; }
         private DataListSingleton()
         {
             Components = new List<Component>();
             Orders = new List<Order>();
             Pastry = new List<Pastry>();
             Clients = new List<Client>();
-            Shops = new List<Shop>();
+            Implementers = new List<Implementer>();
+            Messages = new List<MessageInfo>();
         }
         public static DataListSingleton GetInstance()
         {

ConfectionaryListImplement/Implementer.cs

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

ConfectionaryListImplement/ImplementerStorage.cs

@@ -0,0 +1,114 @@
+using ConfectioneryContracts.BindingModels;
+using ConfectioneryContracts.SearchModels;
+using ConfectioneryContracts.StoragesContract;
+using ConfectioneryContracts.ViewModels;
+using System.Collections.Generic;
+
+namespace ConfectioneryListImplement
+{
+	public class ImplementerStorage : IImplementerStorage
+	{
+		private readonly DataListSingleton _source;
+		public ImplementerStorage()
+		{
+			_source = DataListSingleton.GetInstance();
+		}
+
+		public ImplementerViewModel? Delete(ImplementerBindingModel model)
+		{
+			for (int i = 0; i < _source.Implementers.Count; ++i)
+			{
+				if (_source.Implementers[i].Id == model.Id)
+				{
+					var element = _source.Implementers[i];
+					_source.Implementers.RemoveAt(i);
+					return element.GetViewModel;
+				}
+			}
+			return null;
+		}
+
+		public ImplementerViewModel? GetElement(ImplementerSearchModel model)
+		{
+			foreach (var x in _source.Implementers)
+			{
+				if (model.Id.HasValue && x.Id == model.Id)
+					return x.GetViewModel;
+				if (model.ImplementerFIO != null && model.Password != null &&
+					x.ImplementerFIO.Equals(model.ImplementerFIO) && x.Password.Equals(model.Password))
+					return x.GetViewModel;
+				if (model.ImplementerFIO != null && x.ImplementerFIO.Equals(model.ImplementerFIO))
+					return x.GetViewModel;
+			}
+			return null;
+		}
+
+		public List<ImplementerViewModel> GetFilteredList(ImplementerSearchModel model)
+		{
+			if (model == null)
+			{
+				return new();
+			}
+			if (model.Id.HasValue)
+			{
+				var res = GetElement(model);
+				return res != null ? new() { res } : new();
+			}
+			// На случай если при расширении проекта фио не будет уникальным
+			// (по заданию оно уникально)
+			List<ImplementerViewModel> result = new();
+			if (model.ImplementerFIO != null) 
+			{
+				foreach (var implementer in _source.Implementers)
+				{
+					if (implementer.ImplementerFIO.Equals(model.ImplementerFIO))
+					{
+						result.Add(implementer.GetViewModel);
+					}
+				}
+			}
+			return result;
+		}
+
+		public List<ImplementerViewModel> GetFullList()
+		{
+			var result = new List<ImplementerViewModel>();
+			foreach (var implementer in _source.Implementers)
+			{
+				result.Add(implementer.GetViewModel);
+			}
+			return result;
+		}
+
+		public ImplementerViewModel? Insert(ImplementerBindingModel model)
+		{
+			model.Id = 1;
+			foreach (var implementer in _source.Implementers)
+			{
+				if (model.Id <= implementer.Id)
+				{
+					model.Id = implementer.Id + 1;
+				}
+			}
+			var res = Implementer.Create(model);
+			if (res != null)
+			{
+				_source.Implementers.Add(res);
+			}
+			return res?.GetViewModel;
+		}
+
+		public ImplementerViewModel? Update(ImplementerBindingModel model)
+		{
+			foreach (var implementer in _source.Implementers)
+			{
+				if (implementer.Id == model.Id)
+				{
+					implementer.Update(model);
+					return implementer.GetViewModel;
+				}
+			}
+			return null;
+		}
+	}
+}

ConfectionaryListImplement/MessageInfo.cs

@@ -0,0 +1,56 @@
+using ConfectioneryContracts.BindingModels;
+using ConfectioneryContracts.ViewModels;
+using ConfectioneryDataModels;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace ConfectioneryListImplement.Models
+{
+	// Update в этой сущности не нужен, поскольку в логике мы не изменяем никакие поля после создания письма
+	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,
+		};
+
+	}
+
+}

ConfectionaryListImplement/MessageInfoStorage.cs

@@ -0,0 +1,61 @@
+using ConfectioneryContracts.BindingModels;
+using ConfectioneryContracts.SearchModels;
+using ConfectioneryContracts.StoragesContract;
+using ConfectioneryContracts.ViewModels;
+using ConfectioneryListImplement.Models;
+
+namespace ConfectioneryListImplement
+{
+	public class MessageInfoStorage : IMessageInfoStorage
+	{
+		private readonly DataListSingleton _source;
+		public MessageInfoStorage()
+		{
+			_source = DataListSingleton.GetInstance();
+		}
+
+		public MessageInfoViewModel? GetElement(MessageInfoSearchModel model)
+		{
+			foreach (var message in _source.Messages)
+			{
+				if (model.MessageId != null && model.MessageId.Equals(message.MessageId))
+					return message.GetViewModel;
+			}
+			return null;
+		}
+
+		public List<MessageInfoViewModel> GetFilteredList(MessageInfoSearchModel model)
+		{
+			List<MessageInfoViewModel> result = new();
+			foreach (var item in _source.Messages)
+			{
+				if (item.ClientId.HasValue && item.ClientId == model.ClientId)
+				{
+					result.Add(item.GetViewModel);
+				}
+			}
+			return result;
+		}
+
+		public List<MessageInfoViewModel> GetFullList()
+		{
+			List<MessageInfoViewModel> result = new();
+			foreach (var item in _source.Messages) 
+			{
+				result.Add(item.GetViewModel);
+			}
+			return result;
+		}
+
+		public MessageInfoViewModel? Insert(MessageInfoBindingModel model)
+		{
+			var newMessage = MessageInfo.Create(model);
+			if (newMessage == null)
+			{
+				return null;
+			}
+			_source.Messages.Add(newMessage);
+			return newMessage.GetViewModel;
+		}
+	}
+}

ConfectionaryListImplement/Order.cs

@@ -13,6 +13,8 @@ namespace ConfectioneryListImplement.Models
 
         public int ClientId { get; private set; }
 
+        public int? ImplementerId { get; private set; }
+
         public int Count { get; private set; }
 
         public double Sum { get; private set; }
@@ -38,6 +40,7 @@ namespace ConfectioneryListImplement.Models
                 Status = model.Status,
                 DateCreate = model.DateCreate,
                 DateImplement = model.DateImplement,
+                ImplementerId = model.ImplementerId,
                 Id = model.Id,
             };
         }
@@ -53,13 +56,16 @@ namespace ConfectioneryListImplement.Models
             Status = model.Status;
             DateCreate = model.DateCreate;
             DateImplement = model.DateImplement;
+            ImplementerId = model.ImplementerId;
             Id = model.Id;
         }
         public OrderViewModel GetViewModel => new()
         {
             PastryId =  PastryId,
             ClientId = ClientId,
-            Count = Count,
+            ImplementerId = ImplementerId,
+			ImplementerFIO = DataListSingleton.GetInstance().Implementers.FirstOrDefault(x => x.Id == ImplementerId)?.ImplementerFIO ?? string.Empty,
+			Count = Count,
             Sum = Sum,
             Status = Status,
             DateCreate = DateCreate,

ConfectionaryListImplement/OrderStorage.cs

@@ -41,6 +41,15 @@ namespace ConfectioneryListImplement
                 {
                     return GetViewModel(order);
                 }
+                else if (model.ImplementerId.HasValue && model.Statusses != null &&
+					order.ImplementerId == model.ImplementerId && model.Statusses.Contains(order.Status))
+                {
+                    return GetViewModel(order);
+                }
+                else if (model.ImplementerId.HasValue && model.ImplementerId == order.ImplementerId)
+                {
+                    return GetViewModel(order);
+                }
             }
             return null;
         }
@@ -64,6 +73,14 @@ namespace ConfectioneryListImplement
                 {
                     result.Add(GetViewModel(order));
                 }
+                else if (model.ImplementerId.HasValue && order.ImplementerId == model.ImplementerId)
+                {
+                    result.Add(GetViewModel(order));
+                }
+                else if (model.Statusses != null && model.Statusses.Contains(order.Status))
+                {
+					result.Add(GetViewModel(order));
+				}
             }
             return result;
         }

ConfectionaryListImplement/Shop.cs

@@ -1,64 +0,0 @@
-using ConfectioneryContracts.BindingModels;
-using ConfectioneryContracts.ViewModels;
-using ConfectioneryDataModels;
-using ConfectioneryDataModels.Models;
-
-namespace ConfectioneryListImplement
-{
-    public class Shop : IShopModel
-    {
-        public string Name { get; private set; } = string.Empty;
-
-        public string Address { get; private set; } = string.Empty;
-
-        public int MaxCountPastries { get; private set; }
-
-        public DateTime DateOpening { get; private set; }
-
-        public Dictionary<int, (IPastryModel, int)> Pastries
-        {
-            get;
-            private set;
-        } = new();
-
-        public int Id { get; private set; }
-
-        public static Shop? Create(ShopBindingModel? model)
-        {
-            if (model == null)
-            {
-                return null;
-            }
-            return new Shop()
-            {
-                Id = model.Id,
-                Name = model.Name,
-                Address = model.Address,
-                DateOpening = model.DateOpening,
-                MaxCountPastries = model.MaxCountPastries,
-                Pastries = new()
-            };
-        }
-        public void Update(ShopBindingModel? model)
-        {
-            if (model == null)
-            {
-                return;
-            }
-            Name = model.Name;
-            Address = model.Address;
-            DateOpening = model.DateOpening;
-            MaxCountPastries = model.MaxCountPastries;
-            Pastries = model.Pastries;
-        }
-        public ShopViewModel GetViewModel => new()
-        {
-            Id = Id,
-            Name = Name,
-            Address = Address,
-            Pastries = Pastries,
-            DateOpening = DateOpening,
-            MaxCountPastries = MaxCountPastries,
-        };
-    }
-}

ConfectionaryListImplement/ShopStorage.cs

@@ -1,118 +0,0 @@
-using ConfectioneryContracts.BindingModels;
-using ConfectioneryContracts.SearchModels;
-using ConfectioneryContracts.StoragesContract;
-using ConfectioneryContracts.ViewModels;
-using ConfectioneryDataModels.Models;
-
-namespace ConfectioneryListImplement
-{
-    public class ShopStorage : IShopStorage
-    {
-        private readonly DataListSingleton _source;
-        public ShopStorage()
-        {
-            _source = DataListSingleton.GetInstance();
-        }
-
-        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 ShopViewModel? GetElement(ShopSearchModel model)
-        {
-            if (string.IsNullOrEmpty(model.Name) && !model.Id.HasValue)
-            {
-                return null;
-            }
-            foreach (var shop in _source.Shops)
-            {
-                if ((!string.IsNullOrEmpty(model.Name) &&
-                shop.Name == model.Name) ||
-                (model.Id.HasValue && shop.Id == model.Id))
-                {
-                    return shop.GetViewModel;
-                }
-            }
-            return null;
-        }
-
-        public List<ShopViewModel> GetFilteredList(ShopSearchModel model)
-        {
-            var result = new List<ShopViewModel>();
-            if (string.IsNullOrEmpty(model.Name))
-            {
-                return result;
-            }
-            foreach (var shop in _source.Shops)
-            {
-                if (shop.Name.Contains(model.Name ?? string.Empty))
-                {
-                    result.Add(shop.GetViewModel);
-                }
-            }
-            return result;
-        }
-
-        public List<ShopViewModel> GetFullList()
-        {
-            var result = new List<ShopViewModel>();
-            foreach (var shop in _source.Shops)
-            {
-                result.Add(shop.GetViewModel);
-            }
-            return result;
-        }
-
-        public bool HasNeedPastries(IPastryModel pastry, int needCount)
-        {
-            throw new NotImplementedException();
-        }
-
-        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 bool SellPastries(IPastryModel pastry, int needCount)
-        {
-            throw new NotImplementedException();
-        }
-
-        public ShopViewModel? Update(ShopBindingModel model)
-        {
-            foreach (var shop in _source.Shops)
-            {
-                if (shop.Id == model.Id)
-                {
-                    shop.Update(model);
-                    return shop.GetViewModel;
-                }
-            }
-            return null;
-        }
-    }
-}

Confectionery.sln

@@ -17,11 +17,9 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ConfectioneryFileImplement"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ConfectioneryDatabaseImplement", "ConfectioneryDatabaseImplement\ConfectioneryDatabaseImplement.csproj", "{2BB59FBD-AA9F-4005-8B0B-6E5176EED6A1}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ConfectioneryRestApi", "ConfectioneryRestApi\ConfectioneryRestApi.csproj", "{044CCE68-E866-4957-88D2-4A4D97634808}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ConfectioneryRestApi", "ConfectioneryRestApi\ConfectioneryRestApi.csproj", "{044CCE68-E866-4957-88D2-4A4D97634808}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ConfectioneryClientApp", "ConfectioneryClientApp\ConfectioneryClientApp.csproj", "{3D0CAD8C-7002-453B-9588-7D78B4B72B7B}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ConfectioneryShopApp", "ConfectioneryShopApp\ConfectioneryShopApp.csproj", "{60897789-2C2F-4AB8-BAF0-3BB4A7CE01CF}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ConfectioneryClientApp", "ConfectioneryClientApp\ConfectioneryClientApp.csproj", "{3D0CAD8C-7002-453B-9588-7D78B4B72B7B}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -65,10 +63,6 @@ Global
 		{3D0CAD8C-7002-453B-9588-7D78B4B72B7B}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{3D0CAD8C-7002-453B-9588-7D78B4B72B7B}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{3D0CAD8C-7002-453B-9588-7D78B4B72B7B}.Release|Any CPU.Build.0 = Release|Any CPU
-		{60897789-2C2F-4AB8-BAF0-3BB4A7CE01CF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{60897789-2C2F-4AB8-BAF0-3BB4A7CE01CF}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{60897789-2C2F-4AB8-BAF0-3BB4A7CE01CF}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{60897789-2C2F-4AB8-BAF0-3BB4A7CE01CF}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

Confectionery/App.config

@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<configuration>
+	<appSettings>
+		<add key="SmtpClientHost" value="smtp.mail.ru" />
+		<add key="SmtpClientPort" value="587" />
+		<add key="PopHost" value="pop.mail.ru" />
+		<add key="PopPort" value="995" />
+		<add key="MailLogin" value="ordersender228@mail.ru" />
+		<add key="MailPassword" value="v8czsQ8zztJc5wEHxKPN" />
+	</appSettings>
+</configuration>

Confectionery/ConfectioneryView.csproj

@@ -30,11 +30,14 @@
     <Compile Update="FormViewClients.cs">
       <SubType>Form</SubType>
     </Compile>
+    <Compile Update="FormViewImplementers.cs">
+      <SubType>Form</SubType>
+    </Compile>
   </ItemGroup>
 
   <ItemGroup>
-    <None Update="ReportGroupOrders.rdlc">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    <None Update="App.config">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </None>
     <None Update="ReportOrders.rdlc">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>

Confectionery/FormAddPastryInShop.Designer.cs

@@ -1,151 +0,0 @@
-namespace ConfectioneryView
-{
-    partial class FormAddPastryInShop
-    {
-        /// <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.label1 = new System.Windows.Forms.Label();
-            this.label2 = new System.Windows.Forms.Label();
-            this.label3 = new System.Windows.Forms.Label();
-            this.comboBoxPastry = new System.Windows.Forms.ComboBox();
-            this.numericUpDownCount = new System.Windows.Forms.NumericUpDown();
-            this.buttonSave = new System.Windows.Forms.Button();
-            this.buttonCancel = new System.Windows.Forms.Button();
-            ((System.ComponentModel.ISupportInitialize)(this.numericUpDownCount)).BeginInit();
-            this.SuspendLayout();
-            // 
-            // comboBoxShop
-            // 
-            this.comboBoxShop.FormattingEnabled = true;
-            this.comboBoxShop.Location = new System.Drawing.Point(214, 17);
-            this.comboBoxShop.Name = "comboBoxShop";
-            this.comboBoxShop.Size = new System.Drawing.Size(222, 23);
-            this.comboBoxShop.TabIndex = 3;
-            // 
-            // label1
-            // 
-            this.label1.AutoSize = true;
-            this.label1.Location = new System.Drawing.Point(84, 20);
-            this.label1.Name = "label1";
-            this.label1.Size = new System.Drawing.Size(124, 15);
-            this.label1.TabIndex = 2;
-            this.label1.Text = "Выбранный магазин:";
-            // 
-            // label2
-            // 
-            this.label2.AutoSize = true;
-            this.label2.Location = new System.Drawing.Point(12, 47);
-            this.label2.Name = "label2";
-            this.label2.Size = new System.Drawing.Size(196, 15);
-            this.label2.TabIndex = 4;
-            this.label2.Text = "Изделие которое нужно добавить:";
-            // 
-            // label3
-            // 
-            this.label3.AutoSize = true;
-            this.label3.Location = new System.Drawing.Point(133, 73);
-            this.label3.Name = "label3";
-            this.label3.Size = new System.Drawing.Size(75, 15);
-            this.label3.TabIndex = 5;
-            this.label3.Text = "Количество:";
-            // 
-            // comboBoxPastry
-            // 
-            this.comboBoxPastry.FormattingEnabled = true;
-            this.comboBoxPastry.Location = new System.Drawing.Point(214, 44);
-            this.comboBoxPastry.Name = "comboBoxPastry";
-            this.comboBoxPastry.Size = new System.Drawing.Size(222, 23);
-            this.comboBoxPastry.TabIndex = 6;
-            // 
-            // numericUpDownCount
-            // 
-            this.numericUpDownCount.Location = new System.Drawing.Point(215, 71);
-            this.numericUpDownCount.Maximum = new decimal(new int[] {
-            1410065408,
-            2,
-            0,
-            0});
-            this.numericUpDownCount.Name = "numericUpDownCount";
-            this.numericUpDownCount.Size = new System.Drawing.Size(221, 23);
-            this.numericUpDownCount.TabIndex = 7;
-            // 
-            // buttonSave
-            // 
-            this.buttonSave.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
-            this.buttonSave.Location = new System.Drawing.Point(280, 123);
-            this.buttonSave.Name = "buttonSave";
-            this.buttonSave.Size = new System.Drawing.Size(75, 23);
-            this.buttonSave.TabIndex = 8;
-            this.buttonSave.Text = "Сохранить";
-            this.buttonSave.UseVisualStyleBackColor = true;
-            this.buttonSave.Click += new System.EventHandler(this.ButtonSave_Click);
-            // 
-            // buttonCancel
-            // 
-            this.buttonCancel.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
-            this.buttonCancel.Location = new System.Drawing.Point(361, 123);
-            this.buttonCancel.Name = "buttonCancel";
-            this.buttonCancel.Size = new System.Drawing.Size(75, 23);
-            this.buttonCancel.TabIndex = 9;
-            this.buttonCancel.Text = "Отмена";
-            this.buttonCancel.UseVisualStyleBackColor = true;
-            this.buttonCancel.Click += new System.EventHandler(this.ButtonCancel_Click);
-            // 
-            // FormAddPastryInShop
-            // 
-            this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 15F);
-            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.ClientSize = new System.Drawing.Size(448, 158);
-            this.Controls.Add(this.buttonCancel);
-            this.Controls.Add(this.buttonSave);
-            this.Controls.Add(this.numericUpDownCount);
-            this.Controls.Add(this.comboBoxPastry);
-            this.Controls.Add(this.label3);
-            this.Controls.Add(this.label2);
-            this.Controls.Add(this.comboBoxShop);
-            this.Controls.Add(this.label1);
-            this.Name = "FormAddPastryInShop";
-            this.Text = "FormAddPastryInShop";
-            ((System.ComponentModel.ISupportInitialize)(this.numericUpDownCount)).EndInit();
-            this.ResumeLayout(false);
-            this.PerformLayout();
-
-        }
-
-        #endregion
-
-        private ComboBox comboBoxShop;
-        private Label label1;
-        private Label label2;
-        private Label label3;
-        private ComboBox comboBoxPastry;
-        private NumericUpDown numericUpDownCount;
-        private Button buttonSave;
-        private Button buttonCancel;
-    }
-}

Confectionery/FormAddPastryInShop.cs

@@ -1,101 +0,0 @@
-using ConfectioneryContracts.BindingModels;
-using ConfectioneryContracts.BusinessLogicsContracts;
-using ConfectioneryContracts.ViewModels;
-using Microsoft.Extensions.Logging;
-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;
-
-namespace ConfectioneryView
-{
-    public partial class FormAddPastryInShop : Form
-    {
-        private readonly ILogger _logger;
-        private readonly IShopLogic _shopLogic;
-        private readonly IPastryLogic _pastryLogic;
-        private readonly List<ShopViewModel>? _listShops;
-        private readonly List<PastryViewModel>? _listPastries;
-
-        public FormAddPastryInShop(ILogger<FormAddPastryInShop> logger, IShopLogic shopLogic, IPastryLogic pastryLogic)
-        {
-            InitializeComponent();
-            _shopLogic = shopLogic;
-            _pastryLogic = pastryLogic;
-            _logger = logger;
-            _listShops = shopLogic.ReadList(null);
-            if (_listShops != null)
-            {
-                comboBoxShop.DisplayMember = "Name";
-                comboBoxShop.ValueMember = "Id";
-                comboBoxShop.DataSource = _listShops;
-                comboBoxShop.SelectedItem = null;
-            }
-
-            _listPastries = pastryLogic.ReadList(null);
-            if (_listPastries != null)
-            {
-                comboBoxPastry.DisplayMember = "PastryName";
-                comboBoxPastry.ValueMember= "Id";
-                comboBoxPastry.DataSource = _listPastries;
-                comboBoxPastry.SelectedItem = null;
-            }
-        }
-
-        private void ButtonSave_Click(object sender, EventArgs e)
-        {
-            if (comboBoxShop.SelectedValue == null)
-            {
-                MessageBox.Show("Выберите магазин", "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error);
-                return;
-            }
-            if (comboBoxPastry.SelectedValue == null)
-            {
-                MessageBox.Show("Выберите изделие", "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error);
-                return;
-            }
-            _logger.LogInformation("Добавление изделия в магазин");
-            try
-            {
-                var pastry = _pastryLogic.ReadElement(new() 
-                { 
-                    Id = (int)comboBoxPastry.SelectedValue 
-                });
-                if (pastry == null) 
-                {
-                    throw new Exception("Не найдено изделие. Дополнительная информация в логах.");
-                }
-                var resultOperation = _shopLogic.AddPastry(
-                     model: new() { Id = (int)comboBoxShop.SelectedValue },
-                    pastry: pastry,
-                     count: (int)numericUpDownCount.Value
-                );
-                if (!resultOperation)
-                {
-                    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();
-        }
-    }
-}

Confectionery/FormComponent.cs

@@ -27,8 +27,7 @@ namespace ConfectioneryView
                     _logger.LogInformation("Получение компонента");
                     var view = _logic.ReadElement(new ComponentSearchModel
                     {
-                        Id =
-                    _id.Value
+                        Id = _id.Value
                     });
                     if (view != null)
                     {

Confectionery/FormImplementer.Designer.cs

@@ -0,0 +1,173 @@
+namespace ConfectioneryView
+{
+	partial class FormImplementer
+	{
+		/// <summary>
+		/// Required designer variable.
+		/// </summary>
+		private System.ComponentModel.IContainer components = null;
+
+		/// <summary>
+		/// Clean up any resources being used.
+		/// </summary>
+		/// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
+		protected override void Dispose(bool disposing)
+		{
+			if (disposing && (components != null))
+			{
+				components.Dispose();
+			}
+			base.Dispose(disposing);
+		}
+
+		#region Windows Form Designer generated code
+
+		/// <summary>
+		/// Required method for Designer support - do not modify
+		/// the contents of this method with the code editor.
+		/// </summary>
+		private void InitializeComponent()
+		{
+			label1 = new Label();
+			label2 = new Label();
+			label3 = new Label();
+			label4 = new Label();
+			textBoxFio = new TextBox();
+			textBoxPassword = new TextBox();
+			numericUpDownWorkExperience = new NumericUpDown();
+			numericUpDownQualification = new NumericUpDown();
+			buttonCancel = new Button();
+			buttonSave = new Button();
+			((System.ComponentModel.ISupportInitialize)numericUpDownWorkExperience).BeginInit();
+			((System.ComponentModel.ISupportInitialize)numericUpDownQualification).BeginInit();
+			SuspendLayout();
+			// 
+			// label1
+			// 
+			label1.AutoSize = true;
+			label1.Location = new Point(79, 12);
+			label1.Name = "label1";
+			label1.Size = new Size(37, 15);
+			label1.TabIndex = 0;
+			label1.Text = "ФИО:";
+			// 
+			// label2
+			// 
+			label2.AutoSize = true;
+			label2.Location = new Point(69, 41);
+			label2.Name = "label2";
+			label2.Size = new Size(52, 15);
+			label2.TabIndex = 1;
+			label2.Text = "Пароль:";
+			// 
+			// label3
+			// 
+			label3.AutoSize = true;
+			label3.Location = new Point(78, 68);
+			label3.Name = "label3";
+			label3.Size = new Size(38, 15);
+			label3.TabIndex = 2;
+			label3.Text = "Стаж:";
+			// 
+			// label4
+			// 
+			label4.AutoSize = true;
+			label4.Location = new Point(25, 97);
+			label4.Name = "label4";
+			label4.Size = new Size(91, 15);
+			label4.TabIndex = 3;
+			label4.Text = "Квалификация:";
+			// 
+			// textBoxFio
+			// 
+			textBoxFio.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right;
+			textBoxFio.Location = new Point(127, 9);
+			textBoxFio.Name = "textBoxFio";
+			textBoxFio.Size = new Size(271, 23);
+			textBoxFio.TabIndex = 4;
+			// 
+			// textBoxPassword
+			// 
+			textBoxPassword.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right;
+			textBoxPassword.Location = new Point(127, 38);
+			textBoxPassword.Name = "textBoxPassword";
+			textBoxPassword.PasswordChar = '*';
+			textBoxPassword.Size = new Size(271, 23);
+			textBoxPassword.TabIndex = 5;
+			// 
+			// numericUpDownWorkExperience
+			// 
+			numericUpDownWorkExperience.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right;
+			numericUpDownWorkExperience.Location = new Point(127, 66);
+			numericUpDownWorkExperience.Name = "numericUpDownWorkExperience";
+			numericUpDownWorkExperience.Size = new Size(271, 23);
+			numericUpDownWorkExperience.TabIndex = 6;
+			// 
+			// numericUpDownQualification
+			// 
+			numericUpDownQualification.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right;
+			numericUpDownQualification.Location = new Point(127, 95);
+			numericUpDownQualification.Name = "numericUpDownQualification";
+			numericUpDownQualification.Size = new Size(271, 23);
+			numericUpDownQualification.TabIndex = 7;
+			// 
+			// buttonCancel
+			// 
+			buttonCancel.Anchor = AnchorStyles.Bottom | AnchorStyles.Right;
+			buttonCancel.Location = new Point(309, 138);
+			buttonCancel.Name = "buttonCancel";
+			buttonCancel.Size = new Size(89, 33);
+			buttonCancel.TabIndex = 8;
+			buttonCancel.Text = "Отмена";
+			buttonCancel.UseVisualStyleBackColor = true;
+			buttonCancel.Click += ButtonCancel_Click;
+			// 
+			// buttonSave
+			// 
+			buttonSave.Anchor = AnchorStyles.Bottom | AnchorStyles.Right;
+			buttonSave.Location = new Point(214, 138);
+			buttonSave.Name = "buttonSave";
+			buttonSave.Size = new Size(89, 33);
+			buttonSave.TabIndex = 9;
+			buttonSave.Text = "Сохранить";
+			buttonSave.UseVisualStyleBackColor = true;
+			buttonSave.Click += ButtonSave_Click;
+			// 
+			// FormImplementer
+			// 
+			AutoScaleDimensions = new SizeF(7F, 15F);
+			AutoScaleMode = AutoScaleMode.Font;
+			ClientSize = new Size(410, 183);
+			Controls.Add(buttonSave);
+			Controls.Add(buttonCancel);
+			Controls.Add(numericUpDownQualification);
+			Controls.Add(numericUpDownWorkExperience);
+			Controls.Add(textBoxPassword);
+			Controls.Add(textBoxFio);
+			Controls.Add(label4);
+			Controls.Add(label3);
+			Controls.Add(label2);
+			Controls.Add(label1);
+			Name = "FormImplementer";
+			Text = "Добавление / Редактирование исполнителя";
+			Load += FormImplementer_Load;
+			((System.ComponentModel.ISupportInitialize)numericUpDownWorkExperience).EndInit();
+			((System.ComponentModel.ISupportInitialize)numericUpDownQualification).EndInit();
+			ResumeLayout(false);
+			PerformLayout();
+		}
+
+		#endregion
+
+		private Label label1;
+		private Label label2;
+		private Label label3;
+		private Label label4;
+		private TextBox textBoxFio;
+		private TextBox textBoxPassword;
+		private NumericUpDown numericUpDownWorkExperience;
+		private NumericUpDown numericUpDownQualification;
+		private Button buttonCancel;
+		private Button buttonSave;
+	}
+}

Confectionery/FormImplementer.cs

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

Confectionery/FormMain.Designer.cs

@@ -22,109 +22,89 @@
 
 		#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()
-        {
-            menuStrip1 = new MenuStrip();
-            справочникиToolStripMenuItem = new ToolStripMenuItem();
-            pastryToolStripMenuItem = new ToolStripMenuItem();
-            componentToolStripMenuItem = new ToolStripMenuItem();
-            ShopsToolStripMenuItem = new ToolStripMenuItem();
-            reportsToolStripMenuItem = new ToolStripMenuItem();
-            reportShopsToolStripMenuItem = new ToolStripMenuItem();
-            ShopPastriesToolStripMenuItem = new ToolStripMenuItem();
-			groupOrdersToolStripMenuItem = new ToolStripMenuItem();
+		/// <summary>
+		///  Required method for Designer support - do not modify
+		///  the contents of this method with the code editor.
+		/// </summary>
+		private void InitializeComponent()
+		{
+			menuStrip1 = new MenuStrip();
+			справочникиToolStripMenuItem = new ToolStripMenuItem();
+			pastryToolStripMenuItem = new ToolStripMenuItem();
+			componentToolStripMenuItem = new ToolStripMenuItem();
+			clientsToolStripMenuItem = new ToolStripMenuItem();
+			ImplementersToolStripMenuItem = new ToolStripMenuItem();
+			reportsToolStripMenuItem = new ToolStripMenuItem();
 			pastriesToolStripMenuItem = new ToolStripMenuItem();
 			pastryComponentsToolStripMenuItem = new ToolStripMenuItem();
 			ordersToolStripMenuItem = new ToolStripMenuItem();
-            dataGridView = new DataGridView();
-            buttonCreateOrder = new Button();
-            buttonTakeOrderInWork = new Button();
-            button2 = new Button();
-            button3 = new Button();
-            button4 = new Button();
-            buttonAddPastryInShop = new Button();
-            buttonSellPastry = new Button();
-            clientsToolStripMenuItem = new ToolStripMenuItem();
-            menuStrip1.SuspendLayout();
-            ((System.ComponentModel.ISupportInitialize)dataGridView).BeginInit();
-            SuspendLayout();
-            // 
-            // menuStrip1
-            // 
-            menuStrip1.Items.AddRange(new ToolStripItem[] { справочникиToolStripMenuItem, reportsToolStripMenuItem });
-            menuStrip1.Location = new Point(0, 0);
-            menuStrip1.Name = "menuStrip1";
-            menuStrip1.Size = new Size(783, 24);
-            menuStrip1.TabIndex = 0;
-            menuStrip1.Text = "menuStrip1";
-            // 
-            // справочникиToolStripMenuItem
-            // 
-            справочникиToolStripMenuItem.DropDownItems.AddRange(new ToolStripItem[] { pastryToolStripMenuItem, componentToolStripMenuItem, ShopsToolStripMenuItem });
-            справочникиToolStripMenuItem.DropDownItems.AddRange(new ToolStripItem[] { pastryToolStripMenuItem, componentToolStripMenuItem, clientsToolStripMenuItem });
-            справочникиToolStripMenuItem.Name = "справочникиToolStripMenuItem";
-            справочникиToolStripMenuItem.Size = new Size(94, 20);
-            справочникиToolStripMenuItem.Text = "Справочники";
-            // 
-            // pastryToolStripMenuItem
-            // 
-            pastryToolStripMenuItem.Name = "pastryToolStripMenuItem";
-            pastryToolStripMenuItem.Size = new Size(180, 22);
-            pastryToolStripMenuItem.Text = "Изделия";
-            pastryToolStripMenuItem.Click += PastryToolStripMenuItem_Click;
-            // 
-            // componentToolStripMenuItem
-            // 
-            componentToolStripMenuItem.Name = "componentToolStripMenuItem";
-            componentToolStripMenuItem.Size = new Size(180, 22);
-            componentToolStripMenuItem.Text = "Компоненты";
-            componentToolStripMenuItem.Click += ComponentsToolStripMenuItem_Click;
-            // 
-            // ShopsToolStripMenuItem
-            // 
-            ShopsToolStripMenuItem.Name = "ShopsToolStripMenuItem";
-            ShopsToolStripMenuItem.Size = new Size(145, 22);
-            ShopsToolStripMenuItem.Text = "Магазины";
-            ShopsToolStripMenuItem.Click += ShopsToolStripMenuItem_Click;
-            // 
-            // reportsToolStripMenuItem
-            // 
-            reportsToolStripMenuItem.DropDownItems.AddRange(new ToolStripItem[] { reportShopsToolStripMenuItem, ShopPastriesToolStripMenuItem, groupOrdersToolStripMenuItem, pastriesToolStripMenuItem, pastryComponentsToolStripMenuItem, ordersToolStripMenuItem });
-            reportsToolStripMenuItem.Name = "reportsToolStripMenuItem";
-            reportsToolStripMenuItem.Size = new Size(60, 20);
-            reportsToolStripMenuItem.Text = "Отчеты";
-            // 
-            // reportShopsToolStripMenuItem
-            // 
-            reportShopsToolStripMenuItem.Name = "reportShopsToolStripMenuItem";
-            reportShopsToolStripMenuItem.Size = new Size(202, 22);
-            reportShopsToolStripMenuItem.Text = "Список магазинов";
-            reportShopsToolStripMenuItem.Click += ReportShopsToolStripMenuItem_Click;
-            // 
-            // ShopPastriesToolStripMenuItem
-            // 
-            ShopPastriesToolStripMenuItem.Name = "ShopPastriesToolStripMenuItem";
-            ShopPastriesToolStripMenuItem.Size = new Size(202, 22);
-            ShopPastriesToolStripMenuItem.Text = "Магазины с изделиями";
-            ShopPastriesToolStripMenuItem.Click += ShopPastriesToolStripMenuItem_Click;
+			DoWorkToolStripMenuItem = new ToolStripMenuItem();
+			mailToolStripMenuItem = new ToolStripMenuItem();
+			dataGridView = new DataGridView();
+			buttonCreateOrder = new Button();
+			button4 = new Button();
+			button3 = new Button();
+			menuStrip1.SuspendLayout();
+			((System.ComponentModel.ISupportInitialize)dataGridView).BeginInit();
+			SuspendLayout();
 			// 
-			// groupOrdersToolStripMenuItem
+			// menuStrip1
 			// 
-			groupOrdersToolStripMenuItem.Name = "groupOrdersToolStripMenuItem";
-			groupOrdersToolStripMenuItem.Size = new Size(215, 22);
-			groupOrdersToolStripMenuItem.Text = "Список групп заказов";
-			groupOrdersToolStripMenuItem.Click += GroupOrdersToolStripMenuItem_Click;
+			menuStrip1.Items.AddRange(new ToolStripItem[] { справочникиToolStripMenuItem, reportsToolStripMenuItem, DoWorkToolStripMenuItem, mailToolStripMenuItem });
+			menuStrip1.Location = new Point(0, 0);
+			menuStrip1.Name = "menuStrip1";
+			menuStrip1.Size = new Size(783, 24);
+			menuStrip1.TabIndex = 0;
+			menuStrip1.Text = "menuStrip1";
+			// 
+			// справочникиToolStripMenuItem
+			// 
+			справочникиToolStripMenuItem.DropDownItems.AddRange(new ToolStripItem[] { pastryToolStripMenuItem, componentToolStripMenuItem, clientsToolStripMenuItem, ImplementersToolStripMenuItem });
+			справочникиToolStripMenuItem.Name = "справочникиToolStripMenuItem";
+			справочникиToolStripMenuItem.Size = new Size(94, 20);
+			справочникиToolStripMenuItem.Text = "Справочники";
+			// 
+			// pastryToolStripMenuItem
+			// 
+			pastryToolStripMenuItem.Name = "pastryToolStripMenuItem";
+			pastryToolStripMenuItem.Size = new Size(149, 22);
+			pastryToolStripMenuItem.Text = "Изделия";
+			pastryToolStripMenuItem.Click += PastryToolStripMenuItem_Click;
+			// 
+			// componentToolStripMenuItem
+			// 
+			componentToolStripMenuItem.Name = "componentToolStripMenuItem";
+			componentToolStripMenuItem.Size = new Size(149, 22);
+			componentToolStripMenuItem.Text = "Компоненты";
+			componentToolStripMenuItem.Click += ComponentsToolStripMenuItem_Click;
+			// 
+			// clientsToolStripMenuItem
+			// 
+			clientsToolStripMenuItem.Name = "clientsToolStripMenuItem";
+			clientsToolStripMenuItem.Size = new Size(149, 22);
+			clientsToolStripMenuItem.Text = "Клиенты";
+			clientsToolStripMenuItem.Click += ClientsToolStripMenuItem_Click;
+			// 
+			// ImplementersToolStripMenuItem
+			// 
+			ImplementersToolStripMenuItem.Name = "ImplementersToolStripMenuItem";
+			ImplementersToolStripMenuItem.Size = new Size(149, 22);
+			ImplementersToolStripMenuItem.Text = "Исполнители";
+			ImplementersToolStripMenuItem.Click += ImplementersToolStripMenuItem_Click;
+			// 
+			// reportsToolStripMenuItem
+			// 
+			reportsToolStripMenuItem.DropDownItems.AddRange(new ToolStripItem[] { pastriesToolStripMenuItem, pastryComponentsToolStripMenuItem, ordersToolStripMenuItem });
+			reportsToolStripMenuItem.Name = "reportsToolStripMenuItem";
+			reportsToolStripMenuItem.Size = new Size(60, 20);
+			reportsToolStripMenuItem.Text = "Отчеты";
 			// 
 			// pastriesToolStripMenuItem
 			// 
 			pastriesToolStripMenuItem.Name = "pastriesToolStripMenuItem";
 			pastriesToolStripMenuItem.Size = new Size(215, 22);
 			pastriesToolStripMenuItem.Text = "Список изделий";
-			pastriesToolStripMenuItem.Click += PastriesToolStripMenuItem_Click;
+			pastriesToolStripMenuItem.Click += PastriesToolStripMenuItem_Click_1;
 			// 
 			// pastryComponentsToolStripMenuItem
 			// 
@@ -136,151 +116,105 @@
 			// ordersToolStripMenuItem
 			// 
 			ordersToolStripMenuItem.Name = "ordersToolStripMenuItem";
-            ordersToolStripMenuItem.Size = new Size(202, 22);
-            ordersToolStripMenuItem.Text = "Список заказов";
-            ordersToolStripMenuItem.Click += OrdersToolStripMenuItem_Click;
-            // 
-            // dataGridView
-            // 
-            dataGridView.Anchor = AnchorStyles.Top | AnchorStyles.Bottom | AnchorStyles.Left | AnchorStyles.Right;
-            dataGridView.ColumnHeadersHeightSizeMode = DataGridViewColumnHeadersHeightSizeMode.AutoSize;
-            dataGridView.Location = new Point(12, 27);
-            dataGridView.Name = "dataGridView";
-            dataGridView.RowTemplate.Height = 25;
-            dataGridView.Size = new Size(606, 399);
-            dataGridView.TabIndex = 1;
-            // 
-            // buttonCreateOrder
-            // 
-            buttonCreateOrder.Anchor = AnchorStyles.Top | AnchorStyles.Right;
-            buttonCreateOrder.Location = new Point(624, 39);
-            buttonCreateOrder.Name = "buttonCreateOrder";
-            buttonCreateOrder.Size = new Size(147, 32);
-            buttonCreateOrder.TabIndex = 2;
-            buttonCreateOrder.Text = "Создать заказ";
-            buttonCreateOrder.UseVisualStyleBackColor = true;
-            buttonCreateOrder.Click += ButtonCreateOrder_Click;
-            // 
-            // buttonTakeOrderInWork
-            // 
-            buttonTakeOrderInWork.Anchor = AnchorStyles.Top | AnchorStyles.Right;
-            buttonTakeOrderInWork.Location = new Point(624, 98);
-            buttonTakeOrderInWork.Name = "buttonTakeOrderInWork";
-            buttonTakeOrderInWork.Size = new Size(147, 32);
-            buttonTakeOrderInWork.TabIndex = 3;
-            buttonTakeOrderInWork.Text = "Отдать на выполнение";
-            buttonTakeOrderInWork.UseVisualStyleBackColor = true;
-            buttonTakeOrderInWork.Click += ButtonTakeOrderInWork_Click;
-            // 
-            // button2
-            // 
-            button2.Anchor = AnchorStyles.Top | AnchorStyles.Right;
-            button2.Location = new Point(624, 157);
-            button2.Name = "button2";
-            button2.Size = new Size(147, 32);
-            button2.TabIndex = 4;
-            button2.Text = "Заказ готов";
-            button2.UseVisualStyleBackColor = true;
-            button2.Click += ButtonOrderReady_Click;
-            // 
-            // button3
-            // 
-            button3.Anchor = AnchorStyles.Top | AnchorStyles.Right;
-            button3.Location = new Point(624, 215);
-            button3.Name = "button3";
-            button3.Size = new Size(147, 32);
-            button3.TabIndex = 5;
-            button3.Text = "Заказ выдан";
-            button3.UseVisualStyleBackColor = true;
-            button3.Click += ButtonIssuedOrder_Click;
-            // 
-            // button4
-            // 
-            button4.Anchor = AnchorStyles.Top | AnchorStyles.Right;
-            button4.Location = new Point(624, 274);
-            button4.Name = "button4";
-            button4.Size = new Size(147, 32);
-            button4.TabIndex = 6;
-            button4.Text = "Обновить список";
-            button4.UseVisualStyleBackColor = true;
-            button4.Click += ButtonRef_Click;
-            // 
-            // buttonAddPastryInShop
-            // 
-            buttonAddPastryInShop.Anchor = AnchorStyles.Bottom | AnchorStyles.Right;
-            buttonAddPastryInShop.Location = new Point(624, 384);
-            buttonAddPastryInShop.Name = "buttonAddPastryInShop";
-            buttonAddPastryInShop.Size = new Size(147, 31);
-            buttonAddPastryInShop.TabIndex = 7;
-            buttonAddPastryInShop.Text = "Пополнение магазина";
-            buttonAddPastryInShop.UseVisualStyleBackColor = true;
-            buttonAddPastryInShop.Click += ButtonAddPastryInShop_Click;
-            // 
-            // buttonSellPastry
-            // 
-            buttonSellPastry.Anchor = AnchorStyles.Top | AnchorStyles.Right;
-            buttonSellPastry.Location = new Point(624, 331);
-            buttonSellPastry.Name = "buttonSellPastry";
-            buttonSellPastry.Size = new Size(147, 31);
-            buttonSellPastry.TabIndex = 8;
-            buttonSellPastry.Text = "Продать изделие";
-            buttonSellPastry.UseVisualStyleBackColor = true;
-            buttonSellPastry.Click += ButtonSellPastry_Click;
-            // 
-            // clientsToolStripMenuItem
-            // 
-            clientsToolStripMenuItem.Name = "clientsToolStripMenuItem";
-            clientsToolStripMenuItem.Size = new Size(180, 22);
-            clientsToolStripMenuItem.Text = "Клиенты";
-            clientsToolStripMenuItem.Click += ClientsToolStripMenuItem_Click;
-            // 
-            // FormMain
-            // 
-            AutoScaleDimensions = new SizeF(7F, 15F);
-            AutoScaleMode = AutoScaleMode.Font;
-            ClientSize = new Size(783, 438);
-            Controls.Add(buttonSellPastry);
-            Controls.Add(buttonAddPastryInShop);
-            Controls.Add(button4);
-            Controls.Add(button3);
-            Controls.Add(button2);
-            Controls.Add(buttonTakeOrderInWork);
-            Controls.Add(buttonCreateOrder);
-            Controls.Add(dataGridView);
-            Controls.Add(menuStrip1);
-            MainMenuStrip = menuStrip1;
-            Name = "FormMain";
-            Text = "Кондитерская";
-            Load += FormMain_Load;
-            menuStrip1.ResumeLayout(false);
-            menuStrip1.PerformLayout();
-            ((System.ComponentModel.ISupportInitialize)dataGridView).EndInit();
-            ResumeLayout(false);
-            PerformLayout();
-        }
+			ordersToolStripMenuItem.Size = new Size(215, 22);
+			ordersToolStripMenuItem.Text = "Список заказов";
+			ordersToolStripMenuItem.Click += OrdersToolStripMenuItem_Click;
+			// 
+			// DoWorkToolStripMenuItem
+			// 
+			DoWorkToolStripMenuItem.Name = "DoWorkToolStripMenuItem";
+			DoWorkToolStripMenuItem.Size = new Size(92, 20);
+			DoWorkToolStripMenuItem.Text = "Запуск работ";
+			DoWorkToolStripMenuItem.Click += DoWorkToolStripMenuItem_Click;
+			// 
+			// mailToolStripMenuItem
+			// 
+			mailToolStripMenuItem.Name = "mailToolStripMenuItem";
+			mailToolStripMenuItem.Size = new Size(62, 20);
+			mailToolStripMenuItem.Text = "Письма";
+			mailToolStripMenuItem.Click += MailToolStripMenuItem_Click;
+			// 
+			// dataGridView
+			// 
+			dataGridView.Anchor = AnchorStyles.Top | AnchorStyles.Bottom | AnchorStyles.Left | AnchorStyles.Right;
+			dataGridView.ColumnHeadersHeightSizeMode = DataGridViewColumnHeadersHeightSizeMode.AutoSize;
+			dataGridView.Location = new Point(12, 27);
+			dataGridView.Name = "dataGridView";
+			dataGridView.RowTemplate.Height = 25;
+			dataGridView.Size = new Size(606, 341);
+			dataGridView.TabIndex = 1;
+			// 
+			// buttonCreateOrder
+			// 
+			buttonCreateOrder.Anchor = AnchorStyles.Top | AnchorStyles.Right;
+			buttonCreateOrder.Location = new Point(624, 39);
+			buttonCreateOrder.Name = "buttonCreateOrder";
+			buttonCreateOrder.Size = new Size(147, 32);
+			buttonCreateOrder.TabIndex = 2;
+			buttonCreateOrder.Text = "Создать заказ";
+			buttonCreateOrder.UseVisualStyleBackColor = true;
+			buttonCreateOrder.Click += ButtonCreateOrder_Click;
+			// 
+			// button4
+			// 
+			button4.Anchor = AnchorStyles.Top | AnchorStyles.Right;
+			button4.Location = new Point(624, 157);
+			button4.Name = "button4";
+			button4.Size = new Size(147, 32);
+			button4.TabIndex = 6;
+			button4.Text = "Обновить список";
+			button4.UseVisualStyleBackColor = true;
+			button4.Click += ButtonRef_Click;
+			// 
+			// button3
+			// 
+			button3.Anchor = AnchorStyles.Top | AnchorStyles.Right;
+			button3.Location = new Point(624, 98);
+			button3.Name = "button3";
+			button3.Size = new Size(147, 32);
+			button3.TabIndex = 5;
+			button3.Text = "Заказ выдан";
+			button3.UseVisualStyleBackColor = true;
+			button3.Click += ButtonIssuedOrder_Click;
+			// 
+			// FormMain
+			// 
+			AutoScaleDimensions = new SizeF(7F, 15F);
+			AutoScaleMode = AutoScaleMode.Font;
+			ClientSize = new Size(783, 380);
+			Controls.Add(button4);
+			Controls.Add(button3);
+			Controls.Add(buttonCreateOrder);
+			Controls.Add(dataGridView);
+			Controls.Add(menuStrip1);
+			MainMenuStrip = menuStrip1;
+			Name = "FormMain";
+			Text = "Кондитерская";
+			Load += FormMain_Load;
+			menuStrip1.ResumeLayout(false);
+			menuStrip1.PerformLayout();
+			((System.ComponentModel.ISupportInitialize)dataGridView).EndInit();
+			ResumeLayout(false);
+			PerformLayout();
+		}
 
 		#endregion
 
-        private MenuStrip menuStrip1;
-        private ToolStripMenuItem справочникиToolStripMenuItem;
-        private DataGridView dataGridView;
-        private Button buttonCreateOrder;
-        private Button buttonTakeOrderInWork;
-        private Button button2;
-        private Button button3;
-        private Button button4;
-        private ToolStripMenuItem pastryToolStripMenuItem;
-        private ToolStripMenuItem componentToolStripMenuItem;
-        private ToolStripMenuItem reportsToolStripMenuItem;
-        private ToolStripMenuItem reportShopsToolStripMenuItem;
-        private ToolStripMenuItem ShopPastriesToolStripMenuItem;
-        private ToolStripMenuItem groupOrdersToolStripMenuItem;
-        private ToolStripMenuItem ShopsToolStripMenuItem;
+		private MenuStrip menuStrip1;
+		private ToolStripMenuItem справочникиToolStripMenuItem;
+		private DataGridView dataGridView;
+		private Button buttonCreateOrder;
+		private Button button4;
+		private ToolStripMenuItem pastryToolStripMenuItem;
+		private ToolStripMenuItem componentToolStripMenuItem;
+		private ToolStripMenuItem reportsToolStripMenuItem;
 		private ToolStripMenuItem pastriesToolStripMenuItem;
 		private ToolStripMenuItem pastryComponentsToolStripMenuItem;
 		private ToolStripMenuItem ordersToolStripMenuItem;
 		private ToolStripMenuItem clientsToolStripMenuItem;
-        private Button buttonAddPastryInShop;
-        private Button buttonSellPastry;
+		private ToolStripMenuItem ImplementersToolStripMenuItem;
+		private ToolStripMenuItem DoWorkToolStripMenuItem;
+		private Button button3;
+		private ToolStripMenuItem mailToolStripMenuItem;
 	}
 }

Confectionery/FormMain.cs

@@ -12,62 +12,67 @@ namespace ConfectioneryView
 		private readonly ILogger _logger;
 		private readonly IOrderLogic _orderLogic;
 		private readonly IReportLogic _reportLogic;
+		private readonly IWorkProcess _workProcess;
 
-        public FormMain(ILogger<FormMain> logger, IOrderLogic orderLogic, IReportLogic reportLogic)
-        {
-            InitializeComponent();
-            _logger = logger;
-            _orderLogic = orderLogic;
-            _reportLogic = reportLogic;
-        }
-        private void FormMain_Load(object sender, EventArgs e)
-        {
-            LoadData();
-        }
-        private void LoadData()
-        {
-            try
-            {
-                var list = _orderLogic.ReadList(null);
-                if (list != null)
-                {
-                    dataGridView.DataSource = list;
-                    dataGridView.Columns["Id"].HeaderText = "<22><><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>";
-                    dataGridView.Columns["PastryId"].Visible = false;
-                    dataGridView.Columns["ClientId"].Visible = false;
-                    dataGridView.Columns["PastryName"].AutoSizeMode = DataGridViewAutoSizeColumnMode.Fill;
-                    dataGridView.Columns["ClientFIO"].AutoSizeMode = DataGridViewAutoSizeColumnMode.Fill;
-                }
-                _logger.LogInformation("<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>");
-            }
-            catch (Exception ex)
-            {
-                _logger.LogError(ex, "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>");
-                MessageBox.Show(ex.Message, "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>", MessageBoxButtons.OK,
-                MessageBoxIcon.Error);
-            }
-        }
-        private void ComponentsToolStripMenuItem_Click(object sender, EventArgs
-        e)
-        {
-            var service = Program.ServiceProvider?.GetService(typeof(FormComponents));
-            if (service is FormComponents form)
-            {
-                form.ShowDialog();
-            }
-        }
-        private void PastryToolStripMenuItem_Click(object sender, EventArgs e)
-        {
-            var service = Program.ServiceProvider?.GetService(typeof(FormViewPastry));
-            if (service is FormViewPastry form)
-            {
-                form.ShowDialog();
-            }
-        }
+		public FormMain(ILogger<FormMain> logger, IOrderLogic orderLogic, IReportLogic reportLogic, IWorkProcess workProcess)
+		{
+			InitializeComponent();
+			_logger = logger;
+			_orderLogic = orderLogic;
+			_reportLogic = reportLogic;
+			_workProcess = workProcess;
+		}
+		private void FormMain_Load(object sender, EventArgs e)
+		{
+			LoadData();
+		}
+		private void LoadData()
+		{
+			try
+			{
+				var list = _orderLogic.ReadList(null);
+				if (list != null)
+				{
+					dataGridView.DataSource = list;
+					dataGridView.Columns["Id"].HeaderText = "<22><><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>";
+					dataGridView.Columns["PastryId"].Visible = false;
+					dataGridView.Columns["ClientId"].Visible = false;
+					dataGridView.Columns["ImplementerId"].Visible = false;
+					dataGridView.Columns["PastryName"].AutoSizeMode = DataGridViewAutoSizeColumnMode.Fill;
+					dataGridView.Columns["ClientFIO"].AutoSizeMode = DataGridViewAutoSizeColumnMode.Fill;
+					dataGridView.Columns["ImplementerFIO"].AutoSizeMode = DataGridViewAutoSizeColumnMode.Fill;
+				}
+				_logger.LogInformation("<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>");
+			}
+			catch (Exception ex)
+			{
+				_logger.LogError(ex, "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>");
+				MessageBox.Show(ex.Message, "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>", MessageBoxButtons.OK,
+				MessageBoxIcon.Error);
+			}
+		}
+		private void ComponentsToolStripMenuItem_Click(object sender, EventArgs
+		e)
+		{
+			var service = Program.ServiceProvider?.GetService(typeof(FormComponents));
+			if (service is FormComponents form)
+			{
+				form.ShowDialog();
+			}
+		}
+		private void PastryToolStripMenuItem_Click(object sender, EventArgs e)
+		{
+			var service = Program.ServiceProvider?.GetService(typeof(FormViewPastry));
+			if (service is FormViewPastry form)
+			{
+				form.ShowDialog();
+			}
+		}
 
 		private void ButtonCreateOrder_Click(object sender, EventArgs e)
 		{
-			var service = Program.ServiceProvider?.GetService(typeof(FormCreateOrder));
+			var service =
+			Program.ServiceProvider?.GetService(typeof(FormCreateOrder));
 			if (service is FormCreateOrder form)
 			{
 				form.ShowDialog();
@@ -157,17 +162,7 @@ namespace ConfectioneryView
 			LoadData();
 		}
 
-		private void ReportShopsToolStripMenuItem_Click(object sender, EventArgs e)
-		{
-			using var dialog = new SaveFileDialog { Filter = "docx|*.docx" };
-			if (dialog.ShowDialog() == DialogResult.OK)
-			{
-				_reportLogic.SaveShopsTableToWordFile(new ReportBindingModel { FileName = dialog.FileName });
-				MessageBox.Show("<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>", "<22><><EFBFBD><EFBFBD><EFBFBD>", MessageBoxButtons.OK, MessageBoxIcon.Information);
-			}
-		}
-
-		private void PastriesToolStripMenuItem_Click(object sender, EventArgs e)
+		private void PastriesToolStripMenuItem_Click_1(object sender, EventArgs e)
 		{
 			using var dialog = new SaveFileDialog { Filter = "docx|*.docx" };
 			if (dialog.ShowDialog() == DialogResult.OK)
@@ -177,15 +172,6 @@ namespace ConfectioneryView
 			}
 		}
 
-		private void ShopPastriesToolStripMenuItem_Click(object sender, EventArgs e)
-		{
-			var service = Program.ServiceProvider?.GetService(typeof(FormReportShopPastries));
-			if (service is FormReportShopPastries form)
-			{
-				form.ShowDialog();
-			}
-		}
-
 		private void PastryComponentsToolStripMenuItem_Click(object sender, EventArgs e)
 		{
 			var service = Program.ServiceProvider?.GetService(typeof(FormReportPastryComponents));
@@ -195,15 +181,6 @@ namespace ConfectioneryView
 			}
 		}
 
-		private void GroupOrdersToolStripMenuItem_Click(object sender, EventArgs e)
-		{
-			var service = Program.ServiceProvider?.GetService(typeof(FormReportGroupOrders));
-			if (service is FormReportGroupOrders form)
-			{
-				form.ShowDialog();
-			}
-		}
-
 		private void OrdersToolStripMenuItem_Click(object sender, EventArgs e)
 		{
 			var service = Program.ServiceProvider?.GetService(typeof(FormReportOrders));
@@ -213,40 +190,40 @@ namespace ConfectioneryView
 			}
 		}
 
-		private void ShopsToolStripMenuItem_Click(object sender, EventArgs e)
+		private void ClientsToolStripMenuItem_Click(object sender, EventArgs e)
 		{
-			var service = Program.ServiceProvider?.GetService(typeof(FormViewShops));
-			if (service is FormViewShops form)
+			var service = Program.ServiceProvider?.GetService(typeof(FormViewClients));
+			if (service is FormViewClients form)
 			{
 				form.ShowDialog();
 			}
 		}
 
-		private void ButtonAddPastryInShop_Click(object sender, EventArgs e)
+		private void ImplementersToolStripMenuItem_Click(object sender, EventArgs e)
 		{
-			var service = Program.ServiceProvider?.GetService(typeof(FormAddPastryInShop));
-			if (service is FormAddPastryInShop form)
+			var service = Program.ServiceProvider?.GetService(typeof(FormViewImplementers));
+			if (service is FormViewImplementers form)
 			{
 				form.ShowDialog();
 			}
 		}
 
-        private void ButtonSellPastry_Click(object sender, EventArgs e)
-        {
-            var service = Program.ServiceProvider?.GetService(typeof(FormSellPastry));
-            if (service is FormSellPastry form)
-            {
-                form.ShowDialog();
-            }
-        }
+		private void DoWorkToolStripMenuItem_Click(object sender, EventArgs e)
+		{
+			_workProcess.DoWork((
+				Program.ServiceProvider?.GetService(typeof(IImplementerLogic)) as IImplementerLogic)!,
+				_orderLogic);
+			MessageBox.Show("<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>", "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>",
+			MessageBoxButtons.OK, MessageBoxIcon.Information);
+		}
 
-        private void ClientsToolStripMenuItem_Click(object sender, EventArgs e)
-        {
-            var service = Program.ServiceProvider?.GetService(typeof(FormViewClients));
-            if (service is FormViewClients form)
-            {
-                form.ShowDialog();
-            }
-        }
-    }
+		private void MailToolStripMenuItem_Click(object sender, EventArgs e)
+		{
+			var service = Program.ServiceProvider?.GetService(typeof(FormViewMail));
+			if (service is FormViewMail form)
+			{
+				form.ShowDialog();
+			}
+		}
+	}
 }

Confectionery/FormReportGroupOrders.Designer.cs

@@ -1,141 +0,0 @@
-namespace ConfectioneryView
-{
-    partial class FormReportGroupOrders
-    {
-        /// <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.dateTimePickerTo = new System.Windows.Forms.DateTimePicker();
-            this.labelTo = new System.Windows.Forms.Label();
-            this.dateTimePickerFrom = new System.Windows.Forms.DateTimePicker();
-            this.labelFrom = new System.Windows.Forms.Label();
-            this.panel.SuspendLayout();
-            this.SuspendLayout();
-            // 
-            // panel
-            // 
-            this.panel.Controls.Add(this.buttonToPdf);
-            this.panel.Controls.Add(this.buttonMake);
-            this.panel.Controls.Add(this.dateTimePickerTo);
-            this.panel.Controls.Add(this.labelTo);
-            this.panel.Controls.Add(this.dateTimePickerFrom);
-            this.panel.Controls.Add(this.labelFrom);
-            this.panel.Dock = System.Windows.Forms.DockStyle.Top;
-            this.panel.Location = new System.Drawing.Point(0, 0);
-            this.panel.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3);
-            this.panel.Name = "panel";
-            this.panel.Size = new System.Drawing.Size(1031, 40);
-            this.panel.TabIndex = 0;
-            // 
-            // buttonToPdf
-            // 
-            this.buttonToPdf.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
-            this.buttonToPdf.Location = new System.Drawing.Point(878, 8);
-            this.buttonToPdf.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3);
-            this.buttonToPdf.Name = "buttonToPdf";
-            this.buttonToPdf.Size = new System.Drawing.Size(139, 27);
-            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(476, 8);
-            this.buttonMake.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3);
-            this.buttonMake.Name = "buttonMake";
-            this.buttonMake.Size = new System.Drawing.Size(139, 27);
-            this.buttonMake.TabIndex = 4;
-            this.buttonMake.Text = "Сформировать";
-            this.buttonMake.UseVisualStyleBackColor = true;
-            this.buttonMake.Click += new System.EventHandler(this.ButtonMake_Click);
-            // 
-            // dateTimePickerTo
-            // 
-            this.dateTimePickerTo.Location = new System.Drawing.Point(237, 7);
-            this.dateTimePickerTo.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3);
-            this.dateTimePickerTo.Name = "dateTimePickerTo";
-            this.dateTimePickerTo.Size = new System.Drawing.Size(163, 23);
-            this.dateTimePickerTo.TabIndex = 3;
-            // 
-            // labelTo
-            // 
-            this.labelTo.AutoSize = true;
-            this.labelTo.Location = new System.Drawing.Point(208, 10);
-            this.labelTo.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
-            this.labelTo.Name = "labelTo";
-            this.labelTo.Size = new System.Drawing.Size(21, 15);
-            this.labelTo.TabIndex = 2;
-            this.labelTo.Text = "по";
-            // 
-            // dateTimePickerFrom
-            // 
-            this.dateTimePickerFrom.Location = new System.Drawing.Point(37, 7);
-            this.dateTimePickerFrom.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3);
-            this.dateTimePickerFrom.Name = "dateTimePickerFrom";
-            this.dateTimePickerFrom.Size = new System.Drawing.Size(163, 23);
-            this.dateTimePickerFrom.TabIndex = 1;
-            // 
-            // labelFrom
-            // 
-            this.labelFrom.AutoSize = true;
-            this.labelFrom.Location = new System.Drawing.Point(14, 10);
-            this.labelFrom.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
-            this.labelFrom.Name = "labelFrom";
-            this.labelFrom.Size = new System.Drawing.Size(15, 15);
-            this.labelFrom.TabIndex = 0;
-            this.labelFrom.Text = "С";
-            // 
-            // FormReportOrders
-            // 
-            this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 15F);
-            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.ClientSize = new System.Drawing.Size(1031, 647);
-            this.Controls.Add(this.panel);
-            this.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3);
-            this.Name = "FormReportOrders";
-            this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen;
-            this.Text = "Заказы";
-            this.panel.ResumeLayout(false);
-            this.panel.PerformLayout();
-            this.ResumeLayout(false);
-
-        }
-
-        #endregion
-
-        private System.Windows.Forms.Panel panel;
-        private System.Windows.Forms.Button buttonToPdf;
-        private System.Windows.Forms.Button buttonMake;
-        private System.Windows.Forms.DateTimePicker dateTimePickerTo;
-        private System.Windows.Forms.Label labelTo;
-        private System.Windows.Forms.DateTimePicker dateTimePickerFrom;
-        private System.Windows.Forms.Label labelFrom;
-    }
-}

Confectionery/FormReportGroupOrders.cs

@@ -1,91 +0,0 @@
-using ConfectioneryContracts.BindingModels;
-using ConfectioneryContracts.BusinessLogicsContracts;
-using Microsoft.Extensions.Logging;
-using Microsoft.Reporting.WinForms;
-
-namespace ConfectioneryView
-{
-    public partial class FormReportGroupOrders : Form
-    {
-        private readonly ReportViewer reportViewer;
-
-        private readonly ILogger _logger;
-
-        private readonly IReportLogic _logic;
-
-        public FormReportGroupOrders(ILogger<FormReportGroupOrders> logger, IReportLogic logic)
-        {
-            InitializeComponent();
-            _logger = logger;
-            _logic = logic;
-            reportViewer = new ReportViewer
-            {
-                Dock = DockStyle.Fill
-            };
-            reportViewer.LocalReport.LoadReportDefinition(new FileStream("ReportGroupOrders.rdlc", FileMode.Open));
-            Controls.Clear();
-            Controls.Add(reportViewer);
-            Controls.Add(panel);
-        }
-
-        private void ButtonMake_Click(object sender, EventArgs e)
-        {
-            if (dateTimePickerFrom.Value.Date >= dateTimePickerTo.Value.Date)
-            {
-                MessageBox.Show("Дата начала должна быть меньше даты окончания", "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error);
-                return;
-            }
-            try
-            {
-                var dataSource = _logic.GetGroupOrders(new ReportBindingModel
-                {
-                    DateFrom = dateTimePickerFrom.Value,
-                    DateTo = dateTimePickerTo.Value
-                });
-                var source = new ReportDataSource("DataSetOrders", dataSource);
-                reportViewer.LocalReport.DataSources.Clear();
-                reportViewer.LocalReport.DataSources.Add(source);
-                var parameters = new[] {  new ReportParameter("ReportParameterPeriod",
-                                            $"c {dateTimePickerFrom.Value.ToShortDateString()} по {dateTimePickerTo.Value.ToShortDateString()}") };
-                reportViewer.LocalReport.SetParameters(parameters);
-
-                reportViewer.RefreshReport();
-                _logger.LogInformation("Загрузка списка заказов на период {From}-{To}", dateTimePickerFrom.Value.ToShortDateString(), dateTimePickerTo.Value.ToShortDateString());
-            }
-            catch (Exception ex)
-            {
-                _logger.LogError(ex, "Ошибка загрузки списка заказов на период");
-                MessageBox.Show(ex.Message, "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error);
-            }
-        }
-
-        private void ButtonToPdf_Click(object sender, EventArgs e)
-        {
-            if (dateTimePickerFrom.Value.Date >= dateTimePickerTo.Value.Date)
-            {
-                MessageBox.Show("Дата начала должна быть меньше даты окончания", "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error);
-                return;
-            }
-            using var dialog = new SaveFileDialog { Filter = "pdf|*.pdf" };
-            if (dialog.ShowDialog() == DialogResult.OK)
-            {
-                try
-                {
-                    _logic.SaveOrdersToPdfFile(new ReportBindingModel
-                    {
-                        FileName = dialog.FileName,
-                        DateFrom = dateTimePickerFrom.Value,
-                        DateTo = dateTimePickerTo.Value
-                    });
-                    _logger.LogInformation("Сохранение списка заказов на период {From}-{To}", dateTimePickerFrom.Value.ToShortDateString(), dateTimePickerTo.Value.ToShortDateString());
-                    MessageBox.Show("Выполнено", "Успех", MessageBoxButtons.OK, MessageBoxIcon.Information);
-                }
-                catch (Exception ex)
-                {
-                    _logger.LogError(ex, "Ошибка сохранения списка заказов на период");
-                    MessageBox.Show(ex.Message, "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error);
-                }
-            }
-        }
-    }
-}

Confectionery/FormReportGroupOrders.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>

Confectionery/FormReportShopPastries.Designer.cs

@@ -1,113 +0,0 @@
-namespace ConfectioneryView
-{
-    partial class FormReportShopPastries
-    {
-        /// <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()
-        {
-            dataGridView = new DataGridView();
-            buttonSaveToExcel = new Button();
-            ColumnShop = new DataGridViewTextBoxColumn();
-            ColumnPastry = new DataGridViewTextBoxColumn();
-            ColumnCount = new DataGridViewTextBoxColumn();
-            ((System.ComponentModel.ISupportInitialize)dataGridView).BeginInit();
-            SuspendLayout();
-            // 
-            // dataGridView
-            // 
-            dataGridView.AllowUserToAddRows = false;
-            dataGridView.AllowUserToDeleteRows = false;
-            dataGridView.AllowUserToOrderColumns = true;
-            dataGridView.AllowUserToResizeColumns = false;
-            dataGridView.AllowUserToResizeRows = false;
-            dataGridView.BackgroundColor = SystemColors.ControlLightLight;
-            dataGridView.ColumnHeadersHeightSizeMode = DataGridViewColumnHeadersHeightSizeMode.AutoSize;
-            dataGridView.Columns.AddRange(new DataGridViewColumn[] { ColumnShop, ColumnPastry, ColumnCount });
-            dataGridView.Dock = DockStyle.Bottom;
-            dataGridView.Location = new Point(0, 47);
-            dataGridView.Margin = new Padding(4, 3, 4, 3);
-            dataGridView.MultiSelect = false;
-            dataGridView.Name = "dataGridView";
-            dataGridView.ReadOnly = true;
-            dataGridView.RowHeadersVisible = false;
-            dataGridView.Size = new Size(616, 510);
-            dataGridView.TabIndex = 0;
-            // 
-            // buttonSaveToExcel
-            // 
-            buttonSaveToExcel.Location = new Point(14, 14);
-            buttonSaveToExcel.Margin = new Padding(4, 3, 4, 3);
-            buttonSaveToExcel.Name = "buttonSaveToExcel";
-            buttonSaveToExcel.Size = new Size(186, 27);
-            buttonSaveToExcel.TabIndex = 1;
-            buttonSaveToExcel.Text = "Сохранить в Excel";
-            buttonSaveToExcel.UseVisualStyleBackColor = true;
-            buttonSaveToExcel.Click += ButtonSaveToExcel_Click;
-            // 
-            // ColumnShop
-            // 
-            ColumnShop.HeaderText = "Магазин";
-            ColumnShop.Name = "ColumnShop";
-            ColumnShop.ReadOnly = true;
-            ColumnShop.Width = 200;
-            // 
-            // ColumnPastry
-            // 
-            ColumnPastry.HeaderText = "Изделие";
-            ColumnPastry.Name = "ColumnPastry";
-            ColumnPastry.ReadOnly = true;
-            ColumnPastry.Width = 200;
-            // 
-            // ColumnCount
-            // 
-            ColumnCount.HeaderText = "Количество";
-            ColumnCount.Name = "ColumnCount";
-            ColumnCount.ReadOnly = true;
-            // 
-            // FormReportShopPastries
-            // 
-            AutoScaleDimensions = new SizeF(7F, 15F);
-            AutoScaleMode = AutoScaleMode.Font;
-            ClientSize = new Size(616, 557);
-            Controls.Add(buttonSaveToExcel);
-            Controls.Add(dataGridView);
-            Margin = new Padding(4, 3, 4, 3);
-            Name = "FormReportShopPastries";
-            Text = "Изделия с компонентами";
-            Load += FormReportShopPastry_Load;
-            ((System.ComponentModel.ISupportInitialize)dataGridView).EndInit();
-            ResumeLayout(false);
-        }
-
-        #endregion
-
-        private System.Windows.Forms.DataGridView dataGridView;
-        private System.Windows.Forms.Button buttonSaveToExcel;
-        private DataGridViewTextBoxColumn ColumnShop;
-        private DataGridViewTextBoxColumn ColumnPastry;
-        private DataGridViewTextBoxColumn ColumnCount;
-    }
-}

Confectionery/FormReportShopPastries.cs

@@ -1,80 +0,0 @@
-using ConfectioneryContracts.BindingModels;
-using ConfectioneryContracts.BusinessLogicsContracts;
-using Microsoft.Extensions.Logging;
-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 ConfectioneryView
-{
-    public partial class FormReportShopPastries : Form
-    {
-        private readonly ILogger _logger;
-
-        private readonly IReportLogic _logic;
-
-        public FormReportShopPastries(ILogger<FormReportShopPastries> logger, IReportLogic logic)
-        {
-            InitializeComponent();
-            _logger = logger;
-            _logic = logic;
-        }
-
-        private void FormReportShopPastry_Load(object sender, EventArgs e)
-        {
-            try
-            {
-                var dict = _logic.GetShopPastries();
-                if (dict != null)
-                {
-                    dataGridView.Rows.Clear();
-                    foreach (var elem in dict)
-                    {
-                        dataGridView.Rows.Add(new object[] { elem.ShopName, "", "" });
-                        foreach (var listElem in elem.Pastries)
-                        {
-                            dataGridView.Rows.Add(new object[] { "", listElem.Item1, listElem.Item2 });
-                        }
-                        dataGridView.Rows.Add(new object[] { "Итого", "", elem.TotalCount });
-                        dataGridView.Rows.Add(new object[] { "Загруженность", "", Math.Round(elem.Workload * 100, 2).ToString() + "%" });
-                        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.SaveShopPastryToExcelFile(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);
-                }
-            }
-        }
-    }
-}

Confectionery/FormSellPastry.Designer.cs

@@ -1,133 +0,0 @@
-namespace ConfectioneryView
-{
-    partial class FormSellPastry
-    {
-        /// <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.comboBoxPastry = new System.Windows.Forms.ComboBox();
-            this.label1 = new System.Windows.Forms.Label();
-            this.label2 = new System.Windows.Forms.Label();
-            this.numericUpDownCount = new System.Windows.Forms.NumericUpDown();
-            this.buttonSell = new System.Windows.Forms.Button();
-            this.buttonCancel = new System.Windows.Forms.Button();
-            ((System.ComponentModel.ISupportInitialize)(this.numericUpDownCount)).BeginInit();
-            this.SuspendLayout();
-            // 
-            // comboBoxPastry
-            // 
-            this.comboBoxPastry.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 
-            | System.Windows.Forms.AnchorStyles.Right)));
-            this.comboBoxPastry.FormattingEnabled = true;
-            this.comboBoxPastry.Location = new System.Drawing.Point(141, 12);
-            this.comboBoxPastry.Name = "comboBoxPastry";
-            this.comboBoxPastry.Size = new System.Drawing.Size(121, 23);
-            this.comboBoxPastry.TabIndex = 0;
-            // 
-            // label1
-            // 
-            this.label1.AutoSize = true;
-            this.label1.Location = new System.Drawing.Point(12, 15);
-            this.label1.Name = "label1";
-            this.label1.Size = new System.Drawing.Size(123, 15);
-            this.label1.TabIndex = 1;
-            this.label1.Text = "Изделие на продажу:";
-            // 
-            // label2
-            // 
-            this.label2.AutoSize = true;
-            this.label2.Location = new System.Drawing.Point(60, 46);
-            this.label2.Name = "label2";
-            this.label2.Size = new System.Drawing.Size(75, 15);
-            this.label2.TabIndex = 2;
-            this.label2.Text = "Количество:";
-            // 
-            // numericUpDownCount
-            // 
-            this.numericUpDownCount.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 
-            | System.Windows.Forms.AnchorStyles.Right)));
-            this.numericUpDownCount.Location = new System.Drawing.Point(142, 46);
-            this.numericUpDownCount.Maximum = new decimal(new int[] {
-            10000000,
-            0,
-            0,
-            0});
-            this.numericUpDownCount.Name = "numericUpDownCount";
-            this.numericUpDownCount.RightToLeft = System.Windows.Forms.RightToLeft.No;
-            this.numericUpDownCount.Size = new System.Drawing.Size(120, 23);
-            this.numericUpDownCount.TabIndex = 3;
-            // 
-            // buttonSell
-            // 
-            this.buttonSell.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
-            this.buttonSell.Location = new System.Drawing.Point(12, 90);
-            this.buttonSell.Name = "buttonSell";
-            this.buttonSell.Size = new System.Drawing.Size(123, 23);
-            this.buttonSell.TabIndex = 4;
-            this.buttonSell.Text = "Продать";
-            this.buttonSell.UseVisualStyleBackColor = true;
-            this.buttonSell.Click += new System.EventHandler(this.ButtonSell_Click);
-            // 
-            // buttonCancel
-            // 
-            this.buttonCancel.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
-            this.buttonCancel.Location = new System.Drawing.Point(142, 90);
-            this.buttonCancel.Name = "buttonCancel";
-            this.buttonCancel.Size = new System.Drawing.Size(123, 23);
-            this.buttonCancel.TabIndex = 5;
-            this.buttonCancel.Text = "Отмена";
-            this.buttonCancel.UseVisualStyleBackColor = true;
-            this.buttonCancel.Click += new System.EventHandler(this.ButtonCancel_Click);
-            // 
-            // FormSellPastry
-            // 
-            this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 15F);
-            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.ClientSize = new System.Drawing.Size(277, 122);
-            this.Controls.Add(this.buttonCancel);
-            this.Controls.Add(this.buttonSell);
-            this.Controls.Add(this.numericUpDownCount);
-            this.Controls.Add(this.label2);
-            this.Controls.Add(this.label1);
-            this.Controls.Add(this.comboBoxPastry);
-            this.Name = "FormSellPastry";
-            this.Text = "Продажа изделия";
-            ((System.ComponentModel.ISupportInitialize)(this.numericUpDownCount)).EndInit();
-            this.ResumeLayout(false);
-            this.PerformLayout();
-
-        }
-
-        #endregion
-
-        private ComboBox comboBoxPastry;
-        private Label label1;
-        private Label label2;
-        private NumericUpDown numericUpDownCount;
-        private Button buttonSell;
-        private Button buttonCancel;
-    }
-}

Confectionery/FormSellPastry.cs

@@ -1,67 +0,0 @@
-using ConfectioneryContracts.BusinessLogicsContracts;
-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;
-
-namespace ConfectioneryView
-{
-    public partial class FormSellPastry : Form
-    {
-        private readonly IShopLogic _shopLogic; 
-        private readonly IPastryLogic _pastryLogic; 
-
-        public FormSellPastry(IPastryLogic logic, IShopLogic shopLogic)
-        {
-            InitializeComponent();
-            _pastryLogic = logic;
-            _shopLogic = shopLogic;
-            var list = logic.ReadList(null);
-            if (list != null)
-            {
-                comboBoxPastry.DisplayMember = "PastryName";
-                comboBoxPastry.ValueMember = "Id";
-                comboBoxPastry.DataSource = list;
-                comboBoxPastry.SelectedItem = null;
-            }
-        }
-
-        private void ButtonSell_Click(object sender, EventArgs e)
-        {
-            if (comboBoxPastry.SelectedValue == null)
-            {
-                MessageBox.Show("Выберите изделие", "Ошибка",
-                MessageBoxButtons.OK, MessageBoxIcon.Error);
-                return;
-            }
-            if (numericUpDownCount.Value <= 0)
-            {
-                MessageBox.Show("Количество должно быть больше нуля", "Ошибка",
-                MessageBoxButtons.OK, MessageBoxIcon.Error);
-                return;
-            }
-            var count = (int)numericUpDownCount.Value;
-            var pastry = _pastryLogic.ReadElement(new() { Id = (int)comboBoxPastry.SelectedValue });
-            if (pastry == null || !_shopLogic.SellPastries(pastry, count))
-            {
-                MessageBox.Show("Не удалось продать изделия. Информацию смотрите в логах", "Ошибка",
-                MessageBoxButtons.OK, MessageBoxIcon.Error);
-                return;
-            }
-            DialogResult = DialogResult.OK;
-            Close();
-        }
-
-        private void ButtonCancel_Click(object sender, EventArgs e)
-        {
-            DialogResult = DialogResult.Cancel;
-            Close();
-        }
-    }
-}

Confectionery/FormShop.Designer.cs

@@ -1,217 +0,0 @@
-namespace ConfectioneryView
-{
-    partial class FormShop
-    {
-        /// <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.label1 = new System.Windows.Forms.Label();
-            this.comboBoxShop = new System.Windows.Forms.ComboBox();
-            this.dataGridView = new System.Windows.Forms.DataGridView();
-            this.PastryName = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.Price = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.Count = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.label2 = new System.Windows.Forms.Label();
-            this.label3 = new System.Windows.Forms.Label();
-            this.textBoxAddress = new System.Windows.Forms.TextBox();
-            this.textBoxDateOpening = new System.Windows.Forms.TextBox();
-            this.buttonCancel = new System.Windows.Forms.Button();
-            this.buttonSave = new System.Windows.Forms.Button();
-            this.label4 = new System.Windows.Forms.Label();
-            this.numericUpDownMaxPastry = new System.Windows.Forms.NumericUpDown();
-            ((System.ComponentModel.ISupportInitialize)(this.dataGridView)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.numericUpDownMaxPastry)).BeginInit();
-            this.SuspendLayout();
-            // 
-            // label1
-            // 
-            this.label1.AutoSize = true;
-            this.label1.Location = new System.Drawing.Point(12, 9);
-            this.label1.Name = "label1";
-            this.label1.Size = new System.Drawing.Size(116, 15);
-            this.label1.TabIndex = 0;
-            this.label1.Text = "Название магазина:";
-            // 
-            // comboBoxShop
-            // 
-            this.comboBoxShop.FormattingEnabled = true;
-            this.comboBoxShop.Location = new System.Drawing.Point(12, 27);
-            this.comboBoxShop.Name = "comboBoxShop";
-            this.comboBoxShop.Size = new System.Drawing.Size(141, 23);
-            this.comboBoxShop.TabIndex = 1;
-            this.comboBoxShop.SelectedIndexChanged += new System.EventHandler(this.ComboBoxShop_SelectedIndexChanged);
-            // 
-            // dataGridView
-            // 
-            this.dataGridView.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
-            | System.Windows.Forms.AnchorStyles.Left) 
-            | System.Windows.Forms.AnchorStyles.Right)));
-            this.dataGridView.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
-            this.dataGridView.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] {
-            this.PastryName,
-            this.Price,
-            this.Count});
-            this.dataGridView.Location = new System.Drawing.Point(12, 64);
-            this.dataGridView.Name = "dataGridView";
-            this.dataGridView.RowTemplate.Height = 25;
-            this.dataGridView.Size = new System.Drawing.Size(640, 213);
-            this.dataGridView.TabIndex = 2;
-            // 
-            // PastryName
-            // 
-            this.PastryName.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.Fill;
-            this.PastryName.HeaderText = "Имя изделия";
-            this.PastryName.Name = "PastryName";
-            // 
-            // Price
-            // 
-            this.Price.HeaderText = "Цена";
-            this.Price.Name = "Price";
-            // 
-            // Count
-            // 
-            this.Count.HeaderText = "Количество";
-            this.Count.Name = "Count";
-            // 
-            // label2
-            // 
-            this.label2.AutoSize = true;
-            this.label2.Location = new System.Drawing.Point(159, 9);
-            this.label2.Name = "label2";
-            this.label2.Size = new System.Drawing.Size(97, 15);
-            this.label2.TabIndex = 3;
-            this.label2.Text = "Адрес магазина:";
-            // 
-            // label3
-            // 
-            this.label3.AutoSize = true;
-            this.label3.Location = new System.Drawing.Point(366, 9);
-            this.label3.Name = "label3";
-            this.label3.Size = new System.Drawing.Size(100, 15);
-            this.label3.TabIndex = 4;
-            this.label3.Text = "Время открытия:";
-            // 
-            // textBoxAddress
-            // 
-            this.textBoxAddress.Location = new System.Drawing.Point(159, 27);
-            this.textBoxAddress.Name = "textBoxAddress";
-            this.textBoxAddress.Size = new System.Drawing.Size(201, 23);
-            this.textBoxAddress.TabIndex = 5;
-            // 
-            // textBoxDateOpening
-            // 
-            this.textBoxDateOpening.Location = new System.Drawing.Point(366, 27);
-            this.textBoxDateOpening.Name = "textBoxDateOpening";
-            this.textBoxDateOpening.Size = new System.Drawing.Size(160, 23);
-            this.textBoxDateOpening.TabIndex = 6;
-            // 
-            // buttonCancel
-            // 
-            this.buttonCancel.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
-            this.buttonCancel.Location = new System.Drawing.Point(549, 283);
-            this.buttonCancel.Name = "buttonCancel";
-            this.buttonCancel.Size = new System.Drawing.Size(103, 23);
-            this.buttonCancel.TabIndex = 7;
-            this.buttonCancel.Text = "Отмена";
-            this.buttonCancel.UseVisualStyleBackColor = true;
-            this.buttonCancel.Click += new System.EventHandler(this.ButtonCancel_Click);
-            // 
-            // buttonSave
-            // 
-            this.buttonSave.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
-            this.buttonSave.Location = new System.Drawing.Point(423, 284);
-            this.buttonSave.Name = "buttonSave";
-            this.buttonSave.Size = new System.Drawing.Size(120, 22);
-            this.buttonSave.TabIndex = 8;
-            this.buttonSave.Text = "Сохранить";
-            this.buttonSave.UseVisualStyleBackColor = true;
-            this.buttonSave.Click += new System.EventHandler(this.ButtonSave_Click);
-            // 
-            // label4
-            // 
-            this.label4.AutoSize = true;
-            this.label4.Location = new System.Drawing.Point(530, 9);
-            this.label4.Name = "label4";
-            this.label4.Size = new System.Drawing.Size(118, 15);
-            this.label4.TabIndex = 9;
-            this.label4.Text = "Максимум изделий:";
-            // 
-            // numericUpDownMaxPastry
-            // 
-            this.numericUpDownMaxPastry.Location = new System.Drawing.Point(532, 27);
-            this.numericUpDownMaxPastry.Maximum = new decimal(new int[] {
-            10000000,
-            0,
-            0,
-            0});
-            this.numericUpDownMaxPastry.Name = "numericUpDownMaxPastry";
-            this.numericUpDownMaxPastry.Size = new System.Drawing.Size(120, 23);
-            this.numericUpDownMaxPastry.TabIndex = 10;
-            // 
-            // FormShop
-            // 
-            this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 15F);
-            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.ClientSize = new System.Drawing.Size(664, 317);
-            this.Controls.Add(this.numericUpDownMaxPastry);
-            this.Controls.Add(this.label4);
-            this.Controls.Add(this.buttonSave);
-            this.Controls.Add(this.buttonCancel);
-            this.Controls.Add(this.textBoxDateOpening);
-            this.Controls.Add(this.textBoxAddress);
-            this.Controls.Add(this.label3);
-            this.Controls.Add(this.label2);
-            this.Controls.Add(this.dataGridView);
-            this.Controls.Add(this.comboBoxShop);
-            this.Controls.Add(this.label1);
-            this.Name = "FormShop";
-            this.Text = "Просмотр изделий магазина";
-            this.Load += new System.EventHandler(this.FormShop_Load);
-            ((System.ComponentModel.ISupportInitialize)(this.dataGridView)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.numericUpDownMaxPastry)).EndInit();
-            this.ResumeLayout(false);
-            this.PerformLayout();
-
-        }
-
-        #endregion
-
-        private Label label1;
-        private ComboBox comboBoxShop;
-        private DataGridView dataGridView;
-        private Label label2;
-        private Label label3;
-        private TextBox textBoxAddress;
-        private TextBox textBoxDateOpening;
-        private Button buttonCancel;
-        private Button buttonSave;
-        private DataGridViewTextBoxColumn PastryName;
-        private DataGridViewTextBoxColumn Price;
-        private DataGridViewTextBoxColumn Count;
-        private Label label4;
-        private NumericUpDown numericUpDownMaxPastry;
-    }
-}

Confectionery/FormShop.cs

@@ -1,159 +0,0 @@
-using ConfectioneryContracts.BindingModels;
-using ConfectioneryContracts.BusinessLogicsContracts;
-using ConfectioneryContracts.ViewModels;
-using ConfectioneryDataModels;
-using ConfectioneryDataModels.Models;
-using Microsoft.Extensions.Logging;
-using System;
-using System.Collections;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.Data;
-using System.Drawing;
-using System.Linq;
-using System.Security.Cryptography;
-using System.Text;
-using System.Threading.Tasks;
-using System.Windows.Forms;
-
-namespace ConfectioneryView
-{
-    public partial class FormShop : Form
-    {
-        private readonly List<ShopViewModel>? _listShops;
-        private readonly IShopLogic _logic;
-        private readonly ILogger _logger;
-
-        public int Id
-        {
-            get; set;
-        }
-
-        private IShopModel? GetShop(int id)
-        {
-            if (_listShops == null)
-            {
-                return null;
-            }
-            foreach (var elem in _listShops)
-            {
-                if (elem.Id == id)
-                {
-                    return elem;
-                }
-            }
-            return null;
-        }
-
-        public FormShop(ILogger<FormShop> logger, IShopLogic logic)
-        {
-            InitializeComponent();
-            _logger = logger;
-            _listShops = logic.ReadList(null);
-            _logic = logic;
-            if (_listShops != null)
-            {
-                comboBoxShop.DisplayMember = "Name";
-                comboBoxShop.ValueMember = "Id";
-                comboBoxShop.DataSource = _listShops;
-                comboBoxShop.SelectedItem = null;
-            }
-        }
-
-        private void LoadData(bool extendDate = true)
-        {
-            try
-            {
-                var model = GetShop(extendDate ? Id : Convert.ToInt32(comboBoxShop.SelectedValue));
-                if (model != null)
-                {
-                    numericUpDownMaxPastry.Value = model.MaxCountPastries;
-                    comboBoxShop.Text = model.Name;
-                    textBoxAddress.Text = model.Address;
-                    textBoxDateOpening.Text = Convert.ToString(model.DateOpening);
-                    dataGridView.Rows.Clear();
-                    foreach (var el in model.Pastries.Values)
-                    {
-                        dataGridView.Rows.Add(new object[]{el.Item1.PastryName, el.Item1.Price, el.Item2 });
-                    }
-                }
-                _logger.LogInformation("Загрузка магазинов");
-            }
-            catch (Exception ex)
-            {
-                _logger.LogError(ex, "Ошибка загрузки магазинов");
-                MessageBox.Show(ex.Message, "Ошибка", MessageBoxButtons.OK,
-                MessageBoxIcon.Error);
-            }
-        }
-
-        private void ComboBoxShop_SelectedIndexChanged(object sender, EventArgs e)
-        {
-            LoadData(false);
-        }
-
-        private void ButtonSave_Click(object sender, EventArgs e)
-        {
-            if (string.IsNullOrEmpty(comboBoxShop.Text))
-            {
-                MessageBox.Show("Заполните название", "Ошибка",
-                MessageBoxButtons.OK, MessageBoxIcon.Error);
-                return;
-            }
-            if (string.IsNullOrEmpty(textBoxAddress.Text))
-            {
-                MessageBox.Show("Заполните адрес", "Ошибка", MessageBoxButtons.OK,
-                MessageBoxIcon.Error);
-                return;
-            }
-            _logger.LogInformation("Сохранение изделия");
-            try
-            {
-                DateTime.TryParse(textBoxDateOpening.Text, out var dateTime);
-                ShopBindingModel model = new()
-                {
-                    Name = comboBoxShop.Text,
-                    Address = textBoxAddress.Text,
-                    DateOpening = dateTime,
-                    MaxCountPastries = (int)numericUpDownMaxPastry.Value,
-                };
-                var vmodel = GetShop(Id);
-                bool operationResult = false;
-
-                if (vmodel != null)
-                {
-                    model.Id = vmodel.Id;
-                    operationResult = _logic.Update(model);
-                }
-                else
-                {
-                    operationResult = _logic.Create(model);
-                }
-                if (!operationResult)
-                {
-                    throw new Exception("Ошибка при сохранении. Дополнительная информация в логах.");
-                }
-                MessageBox.Show("Сохранение прошло успешно", "Сообщение",
-                MessageBoxButtons.OK, MessageBoxIcon.Information);
-                DialogResult = DialogResult.OK;
-                Close();
-            }
-            catch (Exception ex)
-            {
-                _logger.LogError(ex, "Ошибка сохранения изделия");
-                MessageBox.Show(ex.Message, "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error);
-            }
-        }
-
-        private void ButtonCancel_Click(object sender, EventArgs e)
-        {
-            DialogResult = DialogResult.Cancel;
-            Close();
-        }
-
-        private void FormShop_Load(object sender, EventArgs e)
-        {
-            LoadData();
-        }
-    }
-}

Confectionery/FormShop.resx

@@ -1,78 +0,0 @@
-<root>
-  <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>
-  <metadata name="PastryName.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </metadata>
-  <metadata name="Price.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </metadata>
-  <metadata name="Count.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </metadata>
-  <metadata name="PastryName.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </metadata>
-  <metadata name="Price.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </metadata>
-  <metadata name="Count.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </metadata>
-</root>

Confectionery/FormViewImplementers.Designer.cs

@@ -0,0 +1,118 @@
+namespace ConfectioneryView
+{
+	partial class FormViewImplementers
+	{
+		/// <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()
+		{
+			buttonRef = new Button();
+			buttonDel = new Button();
+			buttonUpd = new Button();
+			buttonAdd = new Button();
+			dataGridView = new DataGridView();
+			((System.ComponentModel.ISupportInitialize)dataGridView).BeginInit();
+			SuspendLayout();
+			// 
+			// buttonRef
+			// 
+			buttonRef.Anchor = AnchorStyles.Top | AnchorStyles.Right;
+			buttonRef.Location = new Point(626, 202);
+			buttonRef.Name = "buttonRef";
+			buttonRef.Size = new Size(90, 37);
+			buttonRef.TabIndex = 9;
+			buttonRef.Text = "Обновить";
+			buttonRef.UseVisualStyleBackColor = true;
+			buttonRef.Click += ButtonRef_Click;
+			// 
+			// buttonDel
+			// 
+			buttonDel.Anchor = AnchorStyles.Top | AnchorStyles.Right;
+			buttonDel.Location = new Point(626, 151);
+			buttonDel.Name = "buttonDel";
+			buttonDel.Size = new Size(90, 33);
+			buttonDel.TabIndex = 8;
+			buttonDel.Text = "Удалить";
+			buttonDel.UseVisualStyleBackColor = true;
+			buttonDel.Click += ButtonDel_Click;
+			// 
+			// buttonUpd
+			// 
+			buttonUpd.Anchor = AnchorStyles.Top | AnchorStyles.Right;
+			buttonUpd.Location = new Point(626, 102);
+			buttonUpd.Name = "buttonUpd";
+			buttonUpd.Size = new Size(90, 34);
+			buttonUpd.TabIndex = 7;
+			buttonUpd.Text = "Изменить";
+			buttonUpd.UseVisualStyleBackColor = true;
+			buttonUpd.Click += ButtonUpd_Click;
+			// 
+			// buttonAdd
+			// 
+			buttonAdd.Anchor = AnchorStyles.Top | AnchorStyles.Right;
+			buttonAdd.Location = new Point(626, 57);
+			buttonAdd.Name = "buttonAdd";
+			buttonAdd.Size = new Size(90, 30);
+			buttonAdd.TabIndex = 6;
+			buttonAdd.Text = "Добавить";
+			buttonAdd.UseVisualStyleBackColor = true;
+			buttonAdd.Click += ButtonAdd_Click;
+			// 
+			// dataGridView
+			// 
+			dataGridView.Anchor = AnchorStyles.Top | AnchorStyles.Bottom | AnchorStyles.Left | AnchorStyles.Right;
+			dataGridView.ColumnHeadersHeightSizeMode = DataGridViewColumnHeadersHeightSizeMode.AutoSize;
+			dataGridView.Location = new Point(12, 12);
+			dataGridView.Name = "dataGridView";
+			dataGridView.RowTemplate.Height = 25;
+			dataGridView.Size = new Size(553, 302);
+			dataGridView.TabIndex = 5;
+			// 
+			// FormViewImplementers
+			// 
+			AutoScaleDimensions = new SizeF(7F, 15F);
+			AutoScaleMode = AutoScaleMode.Font;
+			ClientSize = new Size(722, 319);
+			Controls.Add(buttonRef);
+			Controls.Add(buttonDel);
+			Controls.Add(buttonUpd);
+			Controls.Add(buttonAdd);
+			Controls.Add(dataGridView);
+			Name = "FormViewImplementers";
+			Text = "Просмотр списка исполнителей";
+			Load += FormViewImplementers_Load;
+			((System.ComponentModel.ISupportInitialize)dataGridView).EndInit();
+			ResumeLayout(false);
+		}
+
+		#endregion
+
+		private Button buttonRef;
+		private Button buttonDel;
+		private Button buttonUpd;
+		private Button buttonAdd;
+		private DataGridView dataGridView;
+	}
+}

Confectionery/FormViewImplementers.cs

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

Confectionery/FormViewMail.Designer.cs

@@ -0,0 +1,62 @@
+namespace ConfectioneryView
+{
+	partial class FormViewMail
+	{
+		/// <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()
+		{
+			dataGridView = new DataGridView();
+			((System.ComponentModel.ISupportInitialize)dataGridView).BeginInit();
+			SuspendLayout();
+			// 
+			// dataGridView
+			// 
+			dataGridView.ColumnHeadersHeightSizeMode = DataGridViewColumnHeadersHeightSizeMode.AutoSize;
+			dataGridView.Dock = DockStyle.Fill;
+			dataGridView.Location = new Point(0, 0);
+			dataGridView.Name = "dataGridView";
+			dataGridView.RowTemplate.Height = 25;
+			dataGridView.Size = new Size(803, 450);
+			dataGridView.TabIndex = 0;
+			// 
+			// FormViewMail
+			// 
+			AutoScaleDimensions = new SizeF(7F, 15F);
+			AutoScaleMode = AutoScaleMode.Font;
+			ClientSize = new Size(800, 450);
+			Controls.Add(dataGridView);
+			Name = "FormViewMail";
+			Text = "Письма";
+			Load += FormViewMail_Load;
+			((System.ComponentModel.ISupportInitialize)dataGridView).EndInit();
+			ResumeLayout(false);
+		}
+
+		#endregion
+
+		private DataGridView dataGridView;
+	}
+}

Confectionery/FormViewMail.cs

@@ -0,0 +1,50 @@
+using ConfectioneryBusinessLogic.MailWorker;
+using ConfectioneryContracts.BusinessLogicsContracts;
+using Microsoft.Extensions.Logging;
+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 ConfectioneryView
+{
+	public partial class FormViewMail : Form
+	{
+		private readonly ILogger _logger;
+		private readonly IMessageInfoLogic _logic;
+
+		public FormViewMail(ILogger<FormViewMail> logger, IMessageInfoLogic logic)
+		{
+			InitializeComponent();
+			_logger = logger;
+			_logic = logic;
+		}
+
+		private void FormViewMail_Load(object sender, EventArgs e)
+		{
+			try
+			{
+				var list = _logic.ReadList(null);
+				if (list != null)
+				{
+					dataGridView.DataSource = list;
+					dataGridView.Columns["ClientId"].Visible = false;
+					dataGridView.Columns["MessageId"].Visible = false;
+					dataGridView.Columns["Body"].AutoSizeMode = DataGridViewAutoSizeColumnMode.Fill;
+				}
+				_logger.LogInformation("Загрузка списка писем");
+			}
+			catch (Exception ex)
+			{
+				_logger.LogError(ex, "Ошибка загрузки писем");
+				MessageBox.Show(ex.Message, "Ошибка", MessageBoxButtons.OK,
+				MessageBoxIcon.Error);
+			}
+		}
+	}
+}

Confectionery/FormViewShops.Designer.cs

@@ -1,121 +0,0 @@
-namespace ConfectioneryView
-{
-    partial class FormViewShops
-    {
-        /// <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.buttonRef = new System.Windows.Forms.Button();
-            this.buttonDel = new System.Windows.Forms.Button();
-            this.buttonUpd = new System.Windows.Forms.Button();
-            this.buttonAdd = new System.Windows.Forms.Button();
-            this.dataGridView = new System.Windows.Forms.DataGridView();
-            ((System.ComponentModel.ISupportInitialize)(this.dataGridView)).BeginInit();
-            this.SuspendLayout();
-            // 
-            // buttonRef
-            // 
-            this.buttonRef.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
-            this.buttonRef.Location = new System.Drawing.Point(685, 202);
-            this.buttonRef.Name = "buttonRef";
-            this.buttonRef.Size = new System.Drawing.Size(90, 37);
-            this.buttonRef.TabIndex = 14;
-            this.buttonRef.Text = "Обновить";
-            this.buttonRef.UseVisualStyleBackColor = true;
-            this.buttonRef.Click += new System.EventHandler(this.ButtonRef_Click);
-            // 
-            // buttonDel
-            // 
-            this.buttonDel.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
-            this.buttonDel.Location = new System.Drawing.Point(685, 151);
-            this.buttonDel.Name = "buttonDel";
-            this.buttonDel.Size = new System.Drawing.Size(90, 33);
-            this.buttonDel.TabIndex = 13;
-            this.buttonDel.Text = "Удалить";
-            this.buttonDel.UseVisualStyleBackColor = true;
-            this.buttonDel.Click += new System.EventHandler(this.ButtonDel_Click);
-            // 
-            // buttonUpd
-            // 
-            this.buttonUpd.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
-            this.buttonUpd.Location = new System.Drawing.Point(685, 102);
-            this.buttonUpd.Name = "buttonUpd";
-            this.buttonUpd.Size = new System.Drawing.Size(90, 34);
-            this.buttonUpd.TabIndex = 12;
-            this.buttonUpd.Text = "Изменить";
-            this.buttonUpd.UseVisualStyleBackColor = true;
-            this.buttonUpd.Click += new System.EventHandler(this.ButtonUpd_Click);
-            // 
-            // buttonAdd
-            // 
-            this.buttonAdd.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
-            this.buttonAdd.Location = new System.Drawing.Point(685, 57);
-            this.buttonAdd.Name = "buttonAdd";
-            this.buttonAdd.Size = new System.Drawing.Size(90, 30);
-            this.buttonAdd.TabIndex = 11;
-            this.buttonAdd.Text = "Добавить";
-            this.buttonAdd.UseVisualStyleBackColor = true;
-            this.buttonAdd.Click += new System.EventHandler(this.ButtonAdd_Click);
-            // 
-            // dataGridView
-            // 
-            this.dataGridView.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
-            | System.Windows.Forms.AnchorStyles.Left) 
-            | System.Windows.Forms.AnchorStyles.Right)));
-            this.dataGridView.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
-            this.dataGridView.Location = new System.Drawing.Point(12, 12);
-            this.dataGridView.Name = "dataGridView";
-            this.dataGridView.RowTemplate.Height = 25;
-            this.dataGridView.Size = new System.Drawing.Size(540, 379);
-            this.dataGridView.TabIndex = 10;
-            // 
-            // FormViewShops
-            // 
-            this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 15F);
-            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.ClientSize = new System.Drawing.Size(787, 403);
-            this.Controls.Add(this.buttonRef);
-            this.Controls.Add(this.buttonDel);
-            this.Controls.Add(this.buttonUpd);
-            this.Controls.Add(this.buttonAdd);
-            this.Controls.Add(this.dataGridView);
-            this.Name = "FormViewShops";
-            this.Text = "Просмотр магазинов";
-            this.Load += new System.EventHandler(this.FormShops_Load);
-            ((System.ComponentModel.ISupportInitialize)(this.dataGridView)).EndInit();
-            this.ResumeLayout(false);
-
-        }
-
-        #endregion
-
-        private Button buttonRef;
-        private Button buttonDel;
-        private Button buttonUpd;
-        private Button buttonAdd;
-        private DataGridView dataGridView;
-    }
-}

Confectionery/FormViewShops.cs

@@ -1,105 +0,0 @@
-using ConfectioneryContracts.BindingModels;
-using ConfectioneryContracts.BusinessLogicsContracts;
-using Microsoft.Extensions.Logging;
-
-namespace ConfectioneryView
-{
-    public partial class FormViewShops : Form
-    {
-        private readonly ILogger _logger;
-        private readonly IShopLogic _logic;
-        public FormViewShops(ILogger<FormViewShops> logger, IShopLogic logic)
-        {
-            InitializeComponent();
-            _logger = logger;
-            _logic = logic;
-        }
-        private void FormShops_Load(object sender, EventArgs e)
-        {
-            LoadData();
-        }
-        private void LoadData()
-        {
-            try
-            {
-                var list = _logic.ReadList(null);
-                if (list != null)
-                {
-                    dataGridView.DataSource = list;
-                    
-                    dataGridView.Columns["Id"].Visible = false;
-                    dataGridView.Columns["Pastries"].Visible = false;
-                    dataGridView.Columns["Name"].AutoSizeMode =
-                    DataGridViewAutoSizeColumnMode.Fill;
-                }
-                _logger.LogInformation("Загрузка магазинов");
-            }
-            catch (Exception ex)
-            {
-                _logger.LogError(ex, "Ошибка загрузки магазинов");
-                MessageBox.Show(ex.Message, "Ошибка", MessageBoxButtons.OK,
-                MessageBoxIcon.Error);
-            }
-        }
-        private void ButtonAdd_Click(object sender, EventArgs e)
-        {
-            var service = Program.ServiceProvider?.GetService(typeof(FormShop));
-            if (service is FormShop form)
-            {
-                if (form.ShowDialog() == DialogResult.OK)
-                {
-                    LoadData();
-                }
-            }
-        }
-        private void ButtonUpd_Click(object sender, EventArgs e)
-        {
-            if (dataGridView.SelectedRows.Count == 1)
-            {
-                var service = Program.ServiceProvider?.GetService(typeof(FormShop));
-                if (service is FormShop form)
-                {
-                    form.Id = Convert.ToInt32(dataGridView.SelectedRows[0].Cells["Id"].Value);
-                    if (form.ShowDialog() == DialogResult.OK)
-                    {
-                        LoadData();
-                    }
-                }
-            }
-        }
-        private void ButtonDel_Click(object sender, EventArgs e)
-        {
-            if (dataGridView.SelectedRows.Count == 1)
-            {
-                if (MessageBox.Show("Удалить запись?", "Вопрос",
-                MessageBoxButtons.YesNo, MessageBoxIcon.Question) == DialogResult.Yes)
-                {
-                    int id =
-                    Convert.ToInt32(dataGridView.SelectedRows[0].Cells["Id"].Value);
-                    _logger.LogInformation("Удаление магазина");
-                    try
-                    {
-                        if (!_logic.Delete(new ShopBindingModel
-                        {
-                            Id = id
-                        }))
-                        {
-                            throw new Exception("Ошибка при удалении. Дополнительная информация в логах.");
-                        }
-                        LoadData();
-                    }
-                    catch (Exception ex)
-                    {
-                        _logger.LogError(ex, "Ошибка удаления магазина");
-                        MessageBox.Show(ex.Message, "Ошибка",
-                        MessageBoxButtons.OK, MessageBoxIcon.Error);
-                    }
-                }
-            }
-        }
-        private void ButtonRef_Click(object sender, EventArgs e)
-        {
-            LoadData();
-        }
-    }
-}

Confectionery/FormViewShops.resx

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

Confectionery/Program.cs

@@ -9,6 +9,8 @@ using NLog.Extensions.Logging;
 using ConfectioneryBusinessLogic;
 using ConfectioneryBusinessLogic.OfficePackage.Implements;
 using ConfectioneryBusinessLogic.OfficePackage;
+using ConfectioneryBusinessLogic.MailWorker;
+using ConfectioneryContracts.BindingModels;
 
 namespace ConfectioneryView
 {
@@ -28,7 +30,30 @@ namespace ConfectioneryView
             var services = new ServiceCollection();
             ConfigureServices(services);
             _serviceProvider = services.BuildServiceProvider();
-            Application.Run(_serviceProvider.GetRequiredService<FormMain>());
+
+			try
+			{
+				var mailSender = _serviceProvider.GetService<AbstractMailWorker>();
+				mailSender?.MailConfig(new MailConfigBindingModel
+				{
+					MailLogin = System.Configuration.ConfigurationManager.AppSettings["MailLogin"] ?? string.Empty,
+					MailPassword = System.Configuration.ConfigurationManager.AppSettings["MailPassword"] ?? string.Empty,
+					SmtpClientHost = System.Configuration.ConfigurationManager.AppSettings["SmtpClientHost"] ?? string.Empty,
+					SmtpClientPort = Convert.ToInt32(System.Configuration.ConfigurationManager.AppSettings["SmtpClientPort"]),
+					PopHost = System.Configuration.ConfigurationManager.AppSettings["PopHost"] ?? string.Empty,
+					PopPort = Convert.ToInt32(System.Configuration.ConfigurationManager.AppSettings["PopPort"])
+				});
+
+				// <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
+				var timer = new System.Threading.Timer(new TimerCallback(MailCheck!), null, 0, 100000);
+			}
+			catch (Exception ex)
+			{
+				var logger = _serviceProvider.GetService<ILogger>();
+				logger?.LogError(ex, "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>");
+			}
+
+			Application.Run(_serviceProvider.GetRequiredService<FormMain>());
         }
         private static void ConfigureServices(ServiceCollection services)
         {
@@ -41,15 +66,21 @@ namespace ConfectioneryView
             services.AddTransient<IOrderStorage, OrderStorage>();
             services.AddTransient<IPastryStorage, PastryStorage>();
             services.AddTransient<IClientStorage, ClientStorage>();
-            services.AddTransient<IShopStorage, ShopStorage>();
-            services.AddTransient<IComponentLogic, ComponentLogic>();
+            services.AddTransient<IImplementerStorage, ImplementerStorage>();
+			services.AddTransient<IMessageInfoStorage, MessageInfoStorage>();
+
+			services.AddTransient<IComponentLogic, ComponentLogic>();
             services.AddTransient<IOrderLogic, OrderLogic>();
             services.AddTransient<IPastryLogic, PastryLogic>();
             services.AddTransient<IReportLogic, ReportLogic>();
             services.AddTransient<IClientLogic, ClientLogic>();
-            services.AddTransient<IShopLogic, ShopLogic>();
+            services.AddTransient<IImplementerLogic, ImplementerLogic>();
+			services.AddTransient<IMessageInfoLogic, MessageInfoLogic>();
+            services.AddTransient<IWorkProcess, WorkModeling>();
 
-            services.AddTransient<AbstractSaveToExcel, SaveToExcel>();
+			services.AddSingleton<AbstractMailWorker, MailKitWorker>();
+
+			services.AddTransient<AbstractSaveToExcel, SaveToExcel>();
             services.AddTransient<AbstractSaveToWord, SaveToWord>();
             services.AddTransient<AbstractSaveToPdf, SaveToPdf>();
 
@@ -60,15 +91,14 @@ namespace ConfectioneryView
             services.AddTransient<FormPastry>();
             services.AddTransient<FormPastryComponent>();
             services.AddTransient<FormViewPastry>();
-            services.AddTransient<FormAddPastryInShop>();
-            services.AddTransient<FormViewShops>();
-            services.AddTransient<FormShop>();
-            services.AddTransient<FormSellPastry>();
-            services.AddTransient<FormReportShopPastries>();
             services.AddTransient<FormReportPastryComponents>();
-            services.AddTransient<FormReportGroupOrders>();
             services.AddTransient<FormReportOrders>();
             services.AddTransient<FormViewClients>();
+            services.AddTransient<FormViewImplementers>();
+            services.AddTransient<FormImplementer>();
+            services.AddTransient<FormViewMail>();
         }
-    }
+
+		private static void MailCheck(object obj) => ServiceProvider?.GetService<AbstractMailWorker>()?.MailCheck();
+	}
 }

Confectionery/ReportGroupOrders.rdlc

@@ -1,463 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Report xmlns="http://schemas.microsoft.com/sqlserver/reporting/2016/01/reportdefinition" xmlns:rd="http://schemas.microsoft.com/SQLServer/reporting/reportdesigner">
-  <AutoRefresh>0</AutoRefresh>
-  <DataSources>
-    <DataSource Name="ConfectioneryContractsViewModels">
-      <ConnectionProperties>
-        <DataProvider>System.Data.DataSet</DataProvider>
-        <ConnectString>/* Local Connection */</ConnectString>
-      </ConnectionProperties>
-      <rd:DataSourceID>10791c83-cee8-4a38-bbd0-245fc17cefb3</rd:DataSourceID>
-    </DataSource>
-  </DataSources>
-  <DataSets>
-    <DataSet Name="DataSetOrders">
-      <Query>
-        <DataSourceName>ConfectioneryContractsViewModels</DataSourceName>
-        <CommandText>/* Local Query */</CommandText>
-      </Query>
-      <Fields>
-        <Field Name="Id">
-          <DataField>Id</DataField>
-          <rd:TypeName>System.Int32</rd:TypeName>
-        </Field>
-        <Field Name="Date">
-          <DataField>Date</DataField>
-          <rd:TypeName>System.DateTime</rd:TypeName>
-        </Field>
-        <Field Name="Count">
-          <DataField>Count</DataField>
-          <rd:TypeName>System.Int32</rd:TypeName>
-        </Field>
-        <Field Name="Sum">
-          <DataField>Sum</DataField>
-          <rd:TypeName>System.Double</rd:TypeName>
-        </Field>
-      </Fields>
-      <rd:DataSetInfo>
-        <rd:DataSetName>ConfectioneryContracts.ViewModels</rd:DataSetName>
-        <rd:TableName>ReportOrdersViewModel</rd:TableName>
-        <rd:ObjectDataSourceType>ConfectioneryContracts.ViewModels.ReportOrdersViewModel, ConfectioneryContracts, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null</rd:ObjectDataSourceType>
-      </rd:DataSetInfo>
-    </DataSet>
-  </DataSets>
-  <ReportSections>
-    <ReportSection>
-      <Body>
-        <ReportItems>
-          <Textbox Name="ReportParameterPeriod">
-            <CanGrow>true</CanGrow>
-            <KeepTogether>true</KeepTogether>
-            <Paragraphs>
-              <Paragraph>
-                <TextRuns>
-                  <TextRun>
-                    <Value>=Parameters!ReportParameterPeriod.Value</Value>
-                    <Style>
-                      <FontSize>14pt</FontSize>
-                      <FontWeight>Bold</FontWeight>
-                    </Style>
-                  </TextRun>
-                </TextRuns>
-                <Style>
-                  <TextAlign>Center</TextAlign>
-                </Style>
-              </Paragraph>
-            </Paragraphs>
-            <rd:DefaultName>ReportParameterPeriod</rd:DefaultName>
-            <Top>1cm</Top>
-            <Height>1cm</Height>
-            <Width>12.40104cm</Width>
-            <Style>
-              <Border>
-                <Style>None</Style>
-              </Border>
-              <VerticalAlign>Middle</VerticalAlign>
-              <PaddingLeft>2pt</PaddingLeft>
-              <PaddingRight>2pt</PaddingRight>
-              <PaddingTop>2pt</PaddingTop>
-              <PaddingBottom>2pt</PaddingBottom>
-            </Style>
-          </Textbox>
-          <Textbox Name="TextboxTitle">
-            <CanGrow>true</CanGrow>
-            <KeepTogether>true</KeepTogether>
-            <Paragraphs>
-              <Paragraph>
-                <TextRuns>
-                  <TextRun>
-                    <Value>Заказы</Value>
-                    <Style>
-                      <FontSize>16pt</FontSize>
-                      <FontWeight>Bold</FontWeight>
-                    </Style>
-                  </TextRun>
-                </TextRuns>
-                <Style>
-                  <TextAlign>Center</TextAlign>
-                </Style>
-              </Paragraph>
-            </Paragraphs>
-            <Height>1cm</Height>
-            <Width>12.40104cm</Width>
-            <ZIndex>1</ZIndex>
-            <Style>
-              <Border>
-                <Style>None</Style>
-              </Border>
-              <VerticalAlign>Middle</VerticalAlign>
-              <PaddingLeft>2pt</PaddingLeft>
-              <PaddingRight>2pt</PaddingRight>
-              <PaddingTop>2pt</PaddingTop>
-              <PaddingBottom>2pt</PaddingBottom>
-            </Style>
-          </Textbox>
-          <Tablix Name="Tablix1">
-            <TablixBody>
-              <TablixColumns>
-                <TablixColumn>
-                  <Width>3.21438cm</Width>
-                </TablixColumn>
-                <TablixColumn>
-                  <Width>3.53188cm</Width>
-                </TablixColumn>
-                <TablixColumn>
-                  <Width>4.35209cm</Width>
-                </TablixColumn>
-              </TablixColumns>
-              <TablixRows>
-                <TablixRow>
-                  <Height>0.6cm</Height>
-                  <TablixCells>
-                    <TablixCell>
-                      <CellContents>
-                        <Textbox Name="Textbox1">
-                          <CanGrow>true</CanGrow>
-                          <KeepTogether>true</KeepTogether>
-                          <Paragraphs>
-                            <Paragraph>
-                              <TextRuns>
-                                <TextRun>
-                                  <Value>Дата создания</Value>
-                                  <Style>
-                                    <FontWeight>Bold</FontWeight>
-                                  </Style>
-                                </TextRun>
-                              </TextRuns>
-                              <Style />
-                            </Paragraph>
-                          </Paragraphs>
-                          <rd:DefaultName>Textbox1</rd:DefaultName>
-                          <Style>
-                            <Border>
-                              <Color>LightGrey</Color>
-                              <Style>Solid</Style>
-                            </Border>
-                            <PaddingLeft>2pt</PaddingLeft>
-                            <PaddingRight>2pt</PaddingRight>
-                            <PaddingTop>2pt</PaddingTop>
-                            <PaddingBottom>2pt</PaddingBottom>
-                          </Style>
-                        </Textbox>
-                      </CellContents>
-                    </TablixCell>
-                    <TablixCell>
-                      <CellContents>
-                        <Textbox Name="Textbox3">
-                          <CanGrow>true</CanGrow>
-                          <KeepTogether>true</KeepTogether>
-                          <Paragraphs>
-                            <Paragraph>
-                              <TextRuns>
-                                <TextRun>
-                                  <Value>Количество заказов</Value>
-                                  <Style>
-                                    <FontWeight>Bold</FontWeight>
-                                  </Style>
-                                </TextRun>
-                              </TextRuns>
-                              <Style />
-                            </Paragraph>
-                          </Paragraphs>
-                          <rd:DefaultName>Textbox3</rd:DefaultName>
-                          <Style>
-                            <Border>
-                              <Color>LightGrey</Color>
-                              <Style>Solid</Style>
-                            </Border>
-                            <PaddingLeft>2pt</PaddingLeft>
-                            <PaddingRight>2pt</PaddingRight>
-                            <PaddingTop>2pt</PaddingTop>
-                            <PaddingBottom>2pt</PaddingBottom>
-                          </Style>
-                        </Textbox>
-                      </CellContents>
-                    </TablixCell>
-                    <TablixCell>
-                      <CellContents>
-                        <Textbox Name="Textbox7">
-                          <CanGrow>true</CanGrow>
-                          <KeepTogether>true</KeepTogether>
-                          <Paragraphs>
-                            <Paragraph>
-                              <TextRuns>
-                                <TextRun>
-                                  <Value>Сумма</Value>
-                                  <Style>
-                                    <FontWeight>Bold</FontWeight>
-                                  </Style>
-                                </TextRun>
-                              </TextRuns>
-                              <Style />
-                            </Paragraph>
-                          </Paragraphs>
-                          <rd:DefaultName>Textbox7</rd:DefaultName>
-                          <Style>
-                            <Border>
-                              <Color>LightGrey</Color>
-                              <Style>Solid</Style>
-                            </Border>
-                            <PaddingLeft>2pt</PaddingLeft>
-                            <PaddingRight>2pt</PaddingRight>
-                            <PaddingTop>2pt</PaddingTop>
-                            <PaddingBottom>2pt</PaddingBottom>
-                          </Style>
-                        </Textbox>
-                      </CellContents>
-                    </TablixCell>
-                  </TablixCells>
-                </TablixRow>
-                <TablixRow>
-                  <Height>0.6cm</Height>
-                  <TablixCells>
-                    <TablixCell>
-                      <CellContents>
-                        <Textbox Name="Date">
-                          <CanGrow>true</CanGrow>
-                          <KeepTogether>true</KeepTogether>
-                          <Paragraphs>
-                            <Paragraph>
-                              <TextRuns>
-                                <TextRun>
-                                  <Value>=Fields!Date.Value</Value>
-                                  <Style>
-                                    <Format>d</Format>
-                                  </Style>
-                                </TextRun>
-                              </TextRuns>
-                              <Style />
-                            </Paragraph>
-                          </Paragraphs>
-                          <rd:DefaultName>Date</rd:DefaultName>
-                          <Style>
-                            <Border>
-                              <Color>LightGrey</Color>
-                              <Style>Solid</Style>
-                            </Border>
-                            <PaddingLeft>2pt</PaddingLeft>
-                            <PaddingRight>2pt</PaddingRight>
-                            <PaddingTop>2pt</PaddingTop>
-                            <PaddingBottom>2pt</PaddingBottom>
-                          </Style>
-                        </Textbox>
-                      </CellContents>
-                    </TablixCell>
-                    <TablixCell>
-                      <CellContents>
-                        <Textbox Name="Count">
-                          <CanGrow>true</CanGrow>
-                          <KeepTogether>true</KeepTogether>
-                          <Paragraphs>
-                            <Paragraph>
-                              <TextRuns>
-                                <TextRun>
-                                  <Value>=Fields!Count.Value</Value>
-                                  <Style />
-                                </TextRun>
-                              </TextRuns>
-                              <Style />
-                            </Paragraph>
-                          </Paragraphs>
-                          <rd:DefaultName>Count</rd:DefaultName>
-                          <Style>
-                            <Border>
-                              <Color>LightGrey</Color>
-                              <Style>Solid</Style>
-                            </Border>
-                            <PaddingLeft>2pt</PaddingLeft>
-                            <PaddingRight>2pt</PaddingRight>
-                            <PaddingTop>2pt</PaddingTop>
-                            <PaddingBottom>2pt</PaddingBottom>
-                          </Style>
-                        </Textbox>
-                      </CellContents>
-                    </TablixCell>
-                    <TablixCell>
-                      <CellContents>
-                        <Textbox Name="Sum">
-                          <CanGrow>true</CanGrow>
-                          <KeepTogether>true</KeepTogether>
-                          <Paragraphs>
-                            <Paragraph>
-                              <TextRuns>
-                                <TextRun>
-                                  <Value>=Fields!Sum.Value</Value>
-                                  <Style />
-                                </TextRun>
-                              </TextRuns>
-                              <Style />
-                            </Paragraph>
-                          </Paragraphs>
-                          <rd:DefaultName>Sum</rd:DefaultName>
-                          <Style>
-                            <Border>
-                              <Color>LightGrey</Color>
-                              <Style>Solid</Style>
-                            </Border>
-                            <PaddingLeft>2pt</PaddingLeft>
-                            <PaddingRight>2pt</PaddingRight>
-                            <PaddingTop>2pt</PaddingTop>
-                            <PaddingBottom>2pt</PaddingBottom>
-                          </Style>
-                        </Textbox>
-                      </CellContents>
-                    </TablixCell>
-                  </TablixCells>
-                </TablixRow>
-              </TablixRows>
-            </TablixBody>
-            <TablixColumnHierarchy>
-              <TablixMembers>
-                <TablixMember />
-                <TablixMember />
-                <TablixMember />
-              </TablixMembers>
-            </TablixColumnHierarchy>
-            <TablixRowHierarchy>
-              <TablixMembers>
-                <TablixMember>
-                  <KeepWithGroup>After</KeepWithGroup>
-                </TablixMember>
-                <TablixMember>
-                  <Group Name="Подробности" />
-                </TablixMember>
-              </TablixMembers>
-            </TablixRowHierarchy>
-            <DataSetName>DataSetOrders</DataSetName>
-            <Top>2.48391cm</Top>
-            <Left>0.55245cm</Left>
-            <Height>1.2cm</Height>
-            <Width>11.09835cm</Width>
-            <ZIndex>2</ZIndex>
-            <Style>
-              <Border>
-                <Style>Double</Style>
-              </Border>
-            </Style>
-          </Tablix>
-          <Textbox Name="TextboxTotalSum">
-            <CanGrow>true</CanGrow>
-            <KeepTogether>true</KeepTogether>
-            <Paragraphs>
-              <Paragraph>
-                <TextRuns>
-                  <TextRun>
-                    <Value>Итого:</Value>
-                    <Style>
-                      <FontWeight>Bold</FontWeight>
-                    </Style>
-                  </TextRun>
-                </TextRuns>
-                <Style>
-                  <TextAlign>Right</TextAlign>
-                </Style>
-              </Paragraph>
-            </Paragraphs>
-            <Top>4cm</Top>
-            <Left>6.6508cm</Left>
-            <Height>0.6cm</Height>
-            <Width>2.5cm</Width>
-            <ZIndex>3</ZIndex>
-            <Style>
-              <Border>
-                <Style>None</Style>
-              </Border>
-              <PaddingLeft>2pt</PaddingLeft>
-              <PaddingRight>2pt</PaddingRight>
-              <PaddingTop>2pt</PaddingTop>
-              <PaddingBottom>2pt</PaddingBottom>
-            </Style>
-          </Textbox>
-          <Textbox Name="SumTotal">
-            <CanGrow>true</CanGrow>
-            <KeepTogether>true</KeepTogether>
-            <Paragraphs>
-              <Paragraph>
-                <TextRuns>
-                  <TextRun>
-                    <Value>=Sum(Fields!Sum.Value, "DataSetOrders")</Value>
-                    <Style>
-                      <FontWeight>Bold</FontWeight>
-                    </Style>
-                  </TextRun>
-                </TextRuns>
-                <Style>
-                  <TextAlign>Right</TextAlign>
-                </Style>
-              </Paragraph>
-            </Paragraphs>
-            <Top>4cm</Top>
-            <Left>9.1508cm</Left>
-            <Height>0.6cm</Height>
-            <Width>2.5cm</Width>
-            <ZIndex>4</ZIndex>
-            <Style>
-              <Border>
-                <Style>None</Style>
-              </Border>
-              <PaddingLeft>2pt</PaddingLeft>
-              <PaddingRight>2pt</PaddingRight>
-              <PaddingTop>2pt</PaddingTop>
-              <PaddingBottom>2pt</PaddingBottom>
-            </Style>
-          </Textbox>
-        </ReportItems>
-        <Height>5.72875cm</Height>
-        <Style />
-      </Body>
-      <Width>12.40104cm</Width>
-      <Page>
-        <PageHeight>29.7cm</PageHeight>
-        <PageWidth>21cm</PageWidth>
-        <LeftMargin>2cm</LeftMargin>
-        <RightMargin>2cm</RightMargin>
-        <TopMargin>2cm</TopMargin>
-        <BottomMargin>2cm</BottomMargin>
-        <ColumnSpacing>0.13cm</ColumnSpacing>
-        <Style />
-      </Page>
-    </ReportSection>
-  </ReportSections>
-  <ReportParameters>
-    <ReportParameter Name="ReportParameterPeriod">
-      <DataType>String</DataType>
-      <Nullable>true</Nullable>
-      <Prompt>ReportParameter1</Prompt>
-    </ReportParameter>
-  </ReportParameters>
-  <ReportParametersLayout>
-    <GridLayoutDefinition>
-      <NumberOfColumns>4</NumberOfColumns>
-      <NumberOfRows>2</NumberOfRows>
-      <CellDefinitions>
-        <CellDefinition>
-          <ColumnIndex>0</ColumnIndex>
-          <RowIndex>0</RowIndex>
-          <ParameterName>ReportParameterPeriod</ParameterName>
-        </CellDefinition>
-      </CellDefinitions>
-    </GridLayoutDefinition>
-  </ReportParametersLayout>
-  <rd:ReportUnitType>Cm</rd:ReportUnitType>
-  <rd:ReportID>2de0031a-4d17-449d-922d-d9fc54572312</rd:ReportID>
-</Report>

ConfectioneryClientApp/Controllers/HomeController.cs

@@ -144,5 +144,15 @@ namespace ConfectioneryClientApp.Controllers
 			var prod = APIClient.GetRequest<PastryViewModel>($"api/main/getpastry?pastryId={pastry}");
 			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}"));
+		}
 	}
 }

ConfectioneryClientApp/Views/Home/Mails.cshtml

@@ -0,0 +1,54 @@
+@using ConfectioneryContracts.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>

ConfectioneryClientApp/Views/Shared/_Layout.cshtml

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

ConfectioneryContracts/BindingModels/ImplementerBindingModel.cs

@@ -0,0 +1,25 @@
+using ConfectioneryDataModels;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace ConfectioneryContracts.BindingModels
+{
+	/// <summary>
+	/// Исполнитель, выполняющий заказы
+	/// </summary>
+	public class ImplementerBindingModel : IImplementerModel
+	{
+		public int Id { get; set; }
+
+		public string ImplementerFIO { get; set; } = string.Empty;
+
+		public string Password { get; set; } = string.Empty;
+
+		public int WorkExperience { get; set; }
+
+		public int Qualification { get; set; }
+	}
+}

ConfectioneryContracts/BindingModels/MailConfigBindingModel.cs

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

ConfectioneryContracts/BindingModels/MailSendInfoBindingModel.cs

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

ConfectioneryContracts/BindingModels/MessageInfoBindingModel.cs

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

ConfectioneryContracts/BindingModels/OrderBindingModel.cs

@@ -8,6 +8,7 @@ namespace ConfectioneryContracts.BindingModels
         public int Id { get; set; }
         public int PastryId { get; set; }
         public int ClientId { get; set; }
+        public int? ImplementerId { get; set; }
         public int Count { get; set; }
         public double Sum { get; set; }
         public OrderStatus Status { get; set; } = OrderStatus.Неизвестен;

ConfectioneryContracts/BindingModels/ShopBindingModel.cs

@@ -1,24 +0,0 @@
-using ConfectioneryDataModels;
-using ConfectioneryDataModels.Models;
-
-namespace ConfectioneryContracts.BindingModels
-{
-    public class ShopBindingModel : IShopModel
-    {
-        public string Name { get; set; } = string.Empty;
-
-        public string Address { get; set; } = string.Empty;
-
-        public int MaxCountPastries { get; set; }
-
-        public DateTime DateOpening { get; set; } = DateTime.Now;
-
-        public Dictionary<int, (IPastryModel, int)> Pastries
-        {
-            get;
-            set;
-        } = new();
-
-        public int Id { get; set; }
-    }
-}

ConfectioneryContracts/BusinessLogicsContracts/IImplementerLogic.cs

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

ConfectioneryContracts/BusinessLogicsContracts/IMessageInfoLogic.cs

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

ConfectioneryContracts/BusinessLogicsContracts/IOrderLogic.cs

@@ -7,7 +7,8 @@ namespace ConfectioneryContracts.BusinessLogicsContracts
     public interface IOrderLogic
     {
         List<OrderViewModel>? ReadList(OrderSearchModel? model);
-        bool CreateOrder(OrderBindingModel model);
+        OrderViewModel? ReadElement(OrderSearchModel model);
+		bool CreateOrder(OrderBindingModel model);
         bool TakeOrderInWork(OrderBindingModel model);
         bool FinishOrder(OrderBindingModel model);
         bool DeliveryOrder(OrderBindingModel model);

ConfectioneryContracts/BusinessLogicsContracts/IReportLogic.cs

@@ -11,50 +11,30 @@ namespace ConfectioneryContracts.BusinessLogicsContracts
     public interface IReportLogic
     {
         /// <summary>
-        /// Получение списка магазинов с указанием, в каких изделиях используются
+        /// Получение списка компонент с указанием, в каких изделиях используются
         /// </summary>
         /// <returns></returns>
-        List<ReportShopPastrytViewModel> GetShopPastries();
-
-		/// <summary>
-		/// Получение списка компонент с указанием, в каких изделиях используются
-		/// </summary>
-		/// <returns></returns>
-		public List<ReportPastryComponentViewModel> GetPastryComponent();
-
-		/// <summary>
-		/// Получение списка заказов за определенный период
-		/// </summary>
-		/// <param name="model"></param>
-		/// <returns></returns>
-		List<ReportGroupOrdersViewModel> GetGroupOrders(ReportBindingModel model);
-
+        List<ReportPastryComponentViewModel> GetPastryComponent();
         /// <summary>
         /// Получение списка заказов за определенный период
         /// </summary>
-        public List<ReportOrdersViewModel> GetOrders(ReportBindingModel model);
-
-		/// <summary>
-		/// Сохранение компонент в файл-Word
-		/// </summary>
-		/// <param name="model"></param>
-		void SaveShopsTableToWordFile(ReportBindingModel model);
-
+        /// <param name="model"></param>
+        /// <returns></returns>
+        List<ReportOrdersViewModel> GetOrders(ReportBindingModel model);
+        /// <summary>
+        /// Сохранение компонент в файл-Word
+        /// </summary>
+        /// <param name="model"></param>
         void SavePastriesToWordFile(ReportBindingModel model);
-
-        void SavePastryComponentToExcelFile(ReportBindingModel model);
-
-        void SaveOrdersToPdfFile(ReportBindingModel model);
-
         /// <summary>
         /// Сохранение компонент с указаеним продуктов в файл-Excel
         /// </summary>
         /// <param name="model"></param>
-        void SaveShopPastryToExcelFile(ReportBindingModel model);
+        void SavePastryComponentToExcelFile(ReportBindingModel model);
         /// <summary>
         /// Сохранение заказов в файл-Pdf
         /// </summary>
         /// <param name="model"></param>
-        void SaveGroupOrdersToPdfFile(ReportBindingModel model);
+        void SaveOrdersToPdfFile(ReportBindingModel model);
     }
 }

ConfectioneryContracts/BusinessLogicsContracts/IShopLogic.cs

@@ -1,20 +0,0 @@
-using ConfectioneryContracts.BindingModels;
-using ConfectioneryContracts.SearchModels;
-using ConfectioneryContracts.ViewModels;
-using ConfectioneryDataModels.Models;
-
-namespace ConfectioneryContracts.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 AddPastry(ShopSearchModel model, IPastryModel pastry, int count);
-        int GetFreePlacesWithPastriesInShops(int countPastries);
-        bool AddPastriesInShops(IPastryModel pastry, int count);
-        public bool SellPastries(IPastryModel pastry, int needCount);
-    }
-}

ConfectioneryContracts/BusinessLogicsContracts/IWorkProcess.cs

@@ -0,0 +1,10 @@
+namespace ConfectioneryContracts.BusinessLogicsContracts
+{
+	public interface IWorkProcess
+	{
+		/// <summary>
+		/// Запуск работ
+		/// </summary>
+		void DoWork(IImplementerLogic implementerLogic, IOrderLogic orderLogic);
+	}
+}

ConfectioneryContracts/SearchModels/ImplementerSearchModel.cs

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

ConfectioneryContracts/SearchModels/MessageInfoSearchModel.cs

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

ConfectioneryContracts/SearchModels/OrderSearchModel.cs

@@ -1,4 +1,6 @@
-namespace ConfectioneryContracts.SearchModels
+using ConfectioneryDataModels.Enums;
+
+namespace ConfectioneryContracts.SearchModels
 {
     public class OrderSearchModel
     {
@@ -9,5 +11,9 @@
         public DateTime? DateTo { get; set; }
 
         public int? ClientId { get; set; }
+
+        public int? ImplementerId { get; set; }
+
+        public List<OrderStatus>? Statusses { get; set; }
     }
 }

ConfectioneryContracts/SearchModels/ShopSearchModel.cs

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

ConfectioneryContracts/StoragesContract/IImplementerStorage.cs

@@ -0,0 +1,26 @@
+using ConfectioneryContracts.BindingModels;
+using ConfectioneryContracts.SearchModels;
+using ConfectioneryContracts.ViewModels;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace ConfectioneryContracts.StoragesContract
+{
+	public interface IImplementerStorage
+	{
+		List<ImplementerViewModel> GetFullList();
+
+		List<ImplementerViewModel> GetFilteredList(ImplementerSearchModel model);
+
+		ImplementerViewModel? GetElement(ImplementerSearchModel model);
+
+		ImplementerViewModel? Insert(ImplementerBindingModel model);
+
+		ImplementerViewModel? Update(ImplementerBindingModel model);
+
+		ImplementerViewModel? Delete(ImplementerBindingModel model);
+	}
+}

ConfectioneryContracts/StoragesContract/IMessageInfoStorage.cs

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

ConfectioneryContracts/StoragesContract/IShopStorage.cs

@@ -1,20 +0,0 @@
-using ConfectioneryContracts.BindingModels;
-using ConfectioneryContracts.SearchModels;
-using ConfectioneryContracts.ViewModels;
-using ConfectioneryDataModels.Models;
-
-namespace ConfectioneryContracts.StoragesContract
-{
-    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 HasNeedPastries(IPastryModel pastry, int needCount);
-        public bool SellPastries(IPastryModel pastry, int needCount);
-    }
-}

ConfectioneryContracts/ViewModels/ImplementerViewModel.cs

@@ -0,0 +1,30 @@
+using ConfectioneryDataModels;
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace ConfectioneryContracts.ViewModels
+{
+	/// <summary>
+	/// Исполнитель, выполняющий заказы
+	/// </summary>
+	public class ImplementerViewModel : IImplementerModel
+	{
+		public int Id { get; set; }
+
+		[DisplayName("ФИО исполнителя")]
+		public string ImplementerFIO { get; set; } = string.Empty;
+
+		[DisplayName("Пароль")]
+		public string Password { get; set; } = string.Empty;
+
+		[DisplayName("Стаж работы")]
+		public int WorkExperience { get; set; }
+
+		[DisplayName("Квалификация")]
+		public int Qualification { get; set; }
+	}
+}

ConfectioneryContracts/ViewModels/MessageInfoViewModel.cs

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

ConfectioneryContracts/ViewModels/OrderViewModel.cs

@@ -17,10 +17,15 @@ namespace ConfectioneryContracts.ViewModels
 
         public int ClientId { get; set; }
 
-        [DisplayName("Фамилия клиента")]
+		public int? ImplementerId { get; set; }
+
+		[DisplayName("Фамилия клиента")]
         public string ClientFIO { get; set; } = string.Empty;
 
-        [DisplayName("Изделие")]
+		[DisplayName("Фамилия исполнителя")]
+		public string ImplementerFIO { get; set; } = string.Empty;
+
+		[DisplayName("Изделие")]
         public string PastryName { get; set; } = string.Empty;
 
         [DisplayName("Количество")]

ConfectioneryContracts/ViewModels/ReportGroupOrdersViewModel.cs

@@ -1,17 +0,0 @@
-using ConfectioneryDataModels.Enums;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace ConfectioneryContracts.ViewModels
-{
-    public class ReportGroupOrdersViewModel
-    {
-        public int Id { get; set; }
-        public DateTime Date { get; set; }
-        public int Count { get; set; }
-        public double Sum { get; set; }
-    }
-}

ConfectioneryContracts/ViewModels/ReportOrdersViewModel.cs

@@ -15,4 +15,4 @@ namespace ConfectioneryContracts.ViewModels
         public string OrderStatus { get; set; } = string.Empty;
         public double Sum { get; set; }
     }
-}
+}

ConfectioneryContracts/ViewModels/ReportShopPastrytViewModel.cs

@@ -1,16 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace ConfectioneryContracts.ViewModels
-{
-    public class ReportShopPastrytViewModel
-    {
-        public string ShopName { get; set; } = string.Empty;
-        public int TotalCount { get; set; }
-        public List<Tuple<string, int>> Pastries { get; set; } = new();
-        public double Workload { get; set; }
-    }
-}

ConfectioneryContracts/ViewModels/ShopViewModel.cs

@@ -1,30 +0,0 @@
-using ConfectioneryDataModels;
-using ConfectioneryDataModels.Models;
-using System.ComponentModel;
-
-namespace ConfectioneryContracts.ViewModels
-{
-    public class ShopViewModel : IShopModel
-    {
-        [DisplayName("Название магазина")]
-        public string Name { get; set; } = string.Empty;
-
-        [DisplayName("Адрес магазина")]
-        public string Address { get; set; } = string.Empty;
-
-        [DisplayName("Максимальное количество изделий в магазине")]
-        public int MaxCountPastries { get; set; }
-
-        [DisplayName("Время открытия")]
-        public DateTime DateOpening { get; set; } = DateTime.Now;
-
-        public Dictionary<int, (IPastryModel, int)> Pastries
-        {
-            get;
-            set;
-        } = new();
-
-        public int Id { get; set; }
-
-    }
-}

ConfectioneryDataModels/IImplementerModel.cs

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