Confectionery/Confectionery/App.config

@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<configuration>
-	<appSettings>
-		<add key="SmtpClientHost" value="smtp.gmail.com" />
-		<add key="SmtpClientPort" value="587" />
-		<add key="PopHost" value="pop.gmail.com" />
-		<add key="PopPort" value="995" />
-		<add key="MailLogin" value="rpplab7@gmail.com" />
-		<add key="MailPassword" value="edjc dmsf pqne gxwy" />
-	</appSettings>
-</configuration>

Confectionery/Confectionery/Confectionery.csproj

@@ -57,9 +57,6 @@
   </ItemGroup>
 
   <ItemGroup>
-    <None Update="App.config">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </None>
     <None Update="ReportOrders.rdlc">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </None>

Confectionery/Confectionery/FormMails.Designer.cs

@@ -1,67 +0,0 @@
-namespace Confectionery
-{
-    partial class FormMails
-    {
-        /// <summary>
-        /// Required designer variable.
-        /// </summary>
-        private System.ComponentModel.IContainer components = null;
-
-        /// <summary>
-        /// Clean up any resources being used.
-        /// </summary>
-        /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
-        protected override void Dispose(bool disposing)
-        {
-            if (disposing && (components != null))
-            {
-                components.Dispose();
-            }
-            base.Dispose(disposing);
-        }
-
-        #region Windows Form Designer generated code
-
-        /// <summary>
-        /// Required method for Designer support - do not modify
-        /// the contents of this method with the code editor.
-        /// </summary>
-        private void InitializeComponent()
-        {
-            this.dataGridView = new System.Windows.Forms.DataGridView();
-            ((System.ComponentModel.ISupportInitialize)(this.dataGridView)).BeginInit();
-            this.SuspendLayout();
-            // 
-            // dataGridView
-            // 
-            this.dataGridView.BackgroundColor = System.Drawing.Color.White;
-            this.dataGridView.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
-            this.dataGridView.Location = new System.Drawing.Point(2, 1);
-            this.dataGridView.MultiSelect = false;
-            this.dataGridView.Name = "dataGridView";
-            this.dataGridView.RowHeadersVisible = false;
-            this.dataGridView.RowHeadersWidth = 51;
-            this.dataGridView.RowTemplate.Height = 29;
-            this.dataGridView.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect;
-            this.dataGridView.Size = new System.Drawing.Size(809, 292);
-            this.dataGridView.TabIndex = 6;
-            // 
-            // FormMails
-            // 
-            this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 20F);
-            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.ClientSize = new System.Drawing.Size(812, 298);
-            this.Controls.Add(this.dataGridView);
-            this.Name = "FormMails";
-            this.Text = "Письма";
-            this.Load += new System.EventHandler(this.FormMails_Load);
-            ((System.ComponentModel.ISupportInitialize)(this.dataGridView)).EndInit();
-            this.ResumeLayout(false);
-
-        }
-
-        #endregion
-
-        private DataGridView dataGridView;
-    }
-}

Confectionery/Confectionery/FormMails.cs

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

Confectionery/Confectionery/FormMails.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/Confectionery/FormMain.Designer.cs

@@ -43,7 +43,6 @@
             this.buttonCreateOrder = new System.Windows.Forms.Button();
             this.buttonIssuedOrder = new System.Windows.Forms.Button();
             this.buttonRef = new System.Windows.Forms.Button();
-            this.письмаToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
             this.menuStrip1.SuspendLayout();
             ((System.ComponentModel.ISupportInitialize)(this.dataGridView)).BeginInit();
             this.SuspendLayout();
@@ -54,8 +53,7 @@
             this.menuStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
             this.справочникиToolStripMenuItem,
             this.отчётыToolStripMenuItem,
-            this.запускРаботToolStripMenuItem,
+            this.запускРаботToolStripMenuItem});
-            this.письмаToolStripMenuItem});
             this.menuStrip1.Location = new System.Drawing.Point(0, 0);
             this.menuStrip1.Name = "menuStrip1";
             this.menuStrip1.Size = new System.Drawing.Size(1703, 28);
@@ -182,13 +180,6 @@
             this.buttonRef.UseVisualStyleBackColor = true;
             this.buttonRef.Click += new System.EventHandler(this.buttonRef_Click);
             // 
-            // письмаToolStripMenuItem
-            // 
-            this.письмаToolStripMenuItem.Name = "письмаToolStripMenuItem";
-            this.письмаToolStripMenuItem.Size = new System.Drawing.Size(77, 24);
-            this.письмаToolStripMenuItem.Text = "Письма";
-            this.письмаToolStripMenuItem.Click += new System.EventHandler(this.письмаToolStripMenuItem_Click);
-            // 
             // FormMain
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 20F);
@@ -228,6 +219,5 @@
         private ToolStripMenuItem клиентыToolStripMenuItem;
         private ToolStripMenuItem исполнителиToolStripMenuItem;
         private ToolStripMenuItem запускРаботToolStripMenuItem;
-        private ToolStripMenuItem письмаToolStripMenuItem;
     }
 }

Confectionery/Confectionery/FormMain.cs

@@ -49,7 +49,6 @@ namespace Confectionery
                     dataGridView.Columns["ClientFIO"].AutoSizeMode = DataGridViewAutoSizeColumnMode.Fill;
                     dataGridView.Columns["ImplementerFIO"].AutoSizeMode = DataGridViewAutoSizeColumnMode.Fill;
                     dataGridView.Columns["ClientId"].Visible = false;
-                    dataGridView.Columns["ClientEmail"].Visible = false;
                     dataGridView.Columns["ImplementerId"].Visible = false;
                 }
             }
@@ -214,14 +213,5 @@ namespace Confectionery
             _workProcess.DoWork((Program.ServiceProvider?.GetService(typeof(IImplementerLogic)) as IImplementerLogic)!, _orderLogic);
             MessageBox.Show("Процесс обработки запущен", "Сообщение", MessageBoxButtons.OK, MessageBoxIcon.Information);
         }
-
-        private void письмаToolStripMenuItem_Click(object sender, EventArgs e)
-        {
-            var service = Program.ServiceProvider?.GetService(typeof(FormMails));
-            if (service is FormMails form)
-            {
-                form.ShowDialog();
-            }
-        }
     }
 }

Confectionery/Confectionery/Program.cs

@@ -7,8 +7,6 @@ using ConfectioneryDataBaseImplement.Implements;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Logging;
 using NLog.Extensions.Logging;
-using ConfectioneryBusinessLogic.MailWorker;
-using ConfectioneryContracts.BindingModels;
 
 namespace Confectionery
 {
@@ -29,30 +27,7 @@ namespace Confectionery
             var services = new ServiceCollection();
             ConfigureServices(services);
             _serviceProvider = services.BuildServiceProvider();
-            try
-            {
-                var mailSender = _serviceProvider.GetService<AbstractMailWorker>();
-                mailSender?.MailConfig(new MailConfigBindingModel
-                {
-                    MailLogin = System.Configuration.ConfigurationManager.AppSettings["MailLogin"] ?? string.Empty,
-                    MailPassword = System.Configuration.ConfigurationManager.AppSettings["MailPassword"] ?? string.Empty,
-                    SmtpClientHost = System.Configuration.ConfigurationManager.AppSettings["SmtpClientHost"] ?? string.Empty,
-                    SmtpClientPort = Convert.ToInt32(System.Configuration.ConfigurationManager.AppSettings["SmtpClientPort"]),
-                    PopHost = System.Configuration.ConfigurationManager.AppSettings["PopHost"] ?? string.Empty,
-                    PopPort = Convert.ToInt32(System.Configuration.ConfigurationManager.AppSettings["PopPort"])
-                });
-
-                // ñîçäàåì òàéìåð
-                var timer = new System.Threading.Timer(new TimerCallback(MailCheck!), null, 0, 100000);
-            }
-            catch (Exception ex)
-            {
-                var logger = _serviceProvider.GetService<ILogger>();
-                logger?.LogError(ex, "Îøèáêà ðàáîòû ñ ïî÷òîé");
-            }
             Application.Run(_serviceProvider.GetRequiredService<FormMain>());
-
-            
         }
 
         private static void ConfigureServices(ServiceCollection services)
@@ -67,19 +42,16 @@ namespace Confectionery
             services.AddTransient<IPastryStorage, PastryStorage>();
             services.AddTransient<IClientStorage, ClientStorage>();
             services.AddTransient<IImplementerStorage, ImplementerStorage>();
-            services.AddTransient<IMessageInfoStorage, MessageInfoStorage>();
             services.AddTransient<IIngredientLogic, IngredientLogic>();
             services.AddTransient<IOrderLogic, OrderLogic>();
             services.AddTransient<IPastryLogic, PastryLogic>();
             services.AddTransient<IReportLogic, ReportLogic>();
             services.AddTransient<IClientLogic, ClientLogic>();
-            services.AddTransient<IMessageInfoLogic, MessageInfoLogic>();
             services.AddTransient<IWorkProcess, WorkModeling>();
             services.AddTransient<IImplementerLogic, ImplementerLogic>();
             services.AddTransient<AbstractSaveToExcel, SaveToExcel>();
             services.AddTransient<AbstractSaveToWord, SaveToWord>();
             services.AddTransient<AbstractSaveToPdf, SaveToPdf>();
-            services.AddSingleton<AbstractMailWorker, MailKitWorker>();
             services.AddTransient<FormMain>();
             services.AddTransient<FormIngredient>();
             services.AddTransient<FormIngredients>();
@@ -92,9 +64,6 @@ namespace Confectionery
             services.AddTransient<FormClients>();
             services.AddTransient<FormImplementers>();
             services.AddTransient<FormImplementer>();
-            services.AddTransient<FormMails>();
         }
-
-        private static void MailCheck(object obj) => ServiceProvider?.GetService<AbstractMailWorker>()?.MailCheck();
     }
 }

Confectionery/ConfectioneryBusinessLogic/BusinessLogics/ClientLogic.cs

@@ -8,7 +8,6 @@ using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
-using System.Text.RegularExpressions;
 using System.Threading.Tasks;
 
 namespace ConfectioneryBusinessLogic.BusinessLogics
@@ -17,8 +16,6 @@ namespace ConfectioneryBusinessLogic.BusinessLogics
     {
         private readonly ILogger _logger;
         private readonly IClientStorage _clientStorage;
-        private Regex validateEmailRegex = new Regex("^[a-z0-9!#$%&'*+/=?^_`{|}~-]+(?:\\.[a-z0-9!#$%&'*+/=?^_`{|}~-]+)*@(?:[a-z0-9](?:[a-z0-9-]*[a-z0-9])?\\.)+[a-z0-9](?:[a-z0-9-]*[a-z0-9])?$");
-        private Regex validatePasswordRegex = new Regex("^(?=.*?[A-Z])(?=.*?[a-z])(?=.*?[0-9]).(?=.*?[#?!@$%^&*-]).{10,50}$");
 
         public ClientLogic(ILogger<ClientLogic> logger, IClientStorage clientStorage)
         {
@@ -111,14 +108,6 @@ namespace ConfectioneryBusinessLogic.BusinessLogics
             {
                 throw new ArgumentNullException("Нет электронной почты клиента", nameof(model.Email));
             }
-            if (!validateEmailRegex.IsMatch(model.Email))
-            {
-                throw new InvalidOperationException("Почта введена некорректно!");
-            }
-            if (!validatePasswordRegex.IsMatch(model.Password))
-            {
-                throw new InvalidOperationException("Пароль не удовлетворяет требованиям");
-            }
             _logger.LogInformation("Client. ClientFIO:{ClientFIO}. Password:{Password}. Email:{Email}. Id:{Id}", model.ClientFIO, model.Password, model.Email, model.Id);
             var element = _clientStorage.GetElement(new ClientSearchModel
             {

Confectionery/ConfectioneryBusinessLogic/BusinessLogics/MessageInfoLogic.cs

@@ -1,82 +0,0 @@
-using ConfectioneryContracts.BindingModels;
-using ConfectioneryContracts.BusinessLogicsContracts;
-using ConfectioneryContracts.SearchModels;
-using ConfectioneryContracts.StoragesContracts;
-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.BusinessLogics
-{
-    public class MessageInfoLogic : IMessageInfoLogic
-    {
-        private readonly ILogger _logger;
-        private readonly IMessageInfoStorage _messageStorage;
-        private readonly IClientLogic _clientLogic;
-
-        public MessageInfoLogic(ILogger<MessageInfoLogic> logger, IMessageInfoStorage logic, IClientLogic clientLogic)
-        {
-            _logger = logger;
-            _messageStorage = logic;
-            _clientLogic = clientLogic;
-        }
-
-        public List<MessageInfoViewModel>? ReadList(MessageInfoSearchModel? model)
-        {
-            _logger.LogInformation("ReadList. MessageId:{MessageId}. ClientId:{ClientId}.", model?.MessageId, model?.ClientId);
-            var list = model == null ? _messageStorage.GetFullList() : _messageStorage.GetFilteredList(model);
-            if (list == null)
-            {
-                _logger.LogWarning("ReadList return null list");
-                return null;
-            }
-            _logger.LogInformation("ReadList. Count:{Count}", list.Count);
-            return list;
-        }
-
-        public bool Create(MessageInfoBindingModel model)
-        {
-            CheckModel(model);
-            model.ClientId = _clientLogic.ReadElement(new ClientSearchModel() { Email = model.SenderName })?.Id;
-            if (_messageStorage.Insert(model) == null)
-            {
-                _logger.LogWarning("Insert operation failed");
-                return false;
-            }
-            return true;
-        }
-
-        private void CheckModel(MessageInfoBindingModel model, bool withParams = true)
-        {
-            if (model == null)
-            {
-                throw new ArgumentNullException(nameof(model));
-            }
-            if (!withParams)
-            {
-                return;
-            }
-            if (string.IsNullOrEmpty(model.MessageId))
-            {
-                throw new ArgumentNullException("Нет id письма", nameof(model.MessageId));
-            }
-            if (string.IsNullOrEmpty(model.SenderName))
-            {
-                throw new ArgumentNullException("Нет отправителя", nameof(model.SenderName));
-            }
-            if (string.IsNullOrEmpty(model.Subject))
-            {
-                throw new ArgumentNullException("Нет темы", nameof(model.Subject));
-            }
-            if (string.IsNullOrEmpty(model.Body))
-            {
-                throw new ArgumentNullException("Нет текста письма", nameof(model.Subject));
-            }
-            _logger.LogInformation("MessageInfo. MessageId:{MessageId}. SenderName:{SenderName}. Subject:{Subject}. Body:{Body}", model.MessageId, model.SenderName, model.Subject, model.Body);
-        }
-    }
-}

Confectionery/ConfectioneryBusinessLogic/BusinessLogics/OrderLogic.cs

@@ -1,5 +1,4 @@
-using ConfectioneryBusinessLogic.MailWorker;
+using ConfectioneryContracts.BindingModels;
-using ConfectioneryContracts.BindingModels;
 using ConfectioneryContracts.BusinessLogicsContracts;
 using ConfectioneryContracts.SearchModels;
 using ConfectioneryContracts.StoragesContracts;
@@ -18,14 +17,12 @@ namespace ConfectioneryBusinessLogic.BusinessLogics
     {
         private readonly ILogger _logger;
         private readonly IOrderStorage _orderStorage;
-        private readonly AbstractMailWorker _mailWorker;
         static readonly object _lock = new object();
 
-        public OrderLogic(ILogger<OrderLogic> logger, IOrderStorage orderStorage, AbstractMailWorker mailWorker)
+        public OrderLogic(ILogger<OrderLogic> logger, IOrderStorage orderStorage)
         {
             _logger = logger;
             _orderStorage = orderStorage;
-            _mailWorker = mailWorker;
         }
 
         public bool CreateOrder(OrderBindingModel model)
@@ -33,19 +30,11 @@ namespace ConfectioneryBusinessLogic.BusinessLogics
             CheckModel(model);
             if (model.Status != OrderStatus.Неизвестен) return false;
             model.Status = OrderStatus.Принят;
-            var order = _orderStorage.Insert(model);
+            if (_orderStorage.Insert(model) == null)
-            if (order == null)
             {
                 _logger.LogWarning("Insert operation failed");
                 return false;
             }
-            _mailWorker.MailSendAsync(new MailSendInfoBindingModel()
-            {
-                MailAddress = order.ClientEmail,
-                Subject = "Создан заказ №" + order.Id,
-                Text = $"Создан заказ №{order.Id} от {order.DateCreate} на кондитерское изделие {order.PastryName} в количестве {order.Count} шт. Сумма заказа: {order.Sum}."
-
-            });
             return true;
         }
 
@@ -67,14 +56,7 @@ namespace ConfectioneryBusinessLogic.BusinessLogics
                 throw new InvalidOperationException("Заказ должен быть переведен в статус готовности перед выдачей!");
             }
             model.Status = OrderStatus.Выдан;
-            var order = _orderStorage.Update(model);
+            _orderStorage.Update(model);
-            _mailWorker.MailSendAsync(new MailSendInfoBindingModel()
-            {
-                MailAddress = order.ClientEmail,
-                Subject = $"Заказ №{order.Id}. Статус изменен на Выдан",
-                Text = $"Выдан заказ №{order.Id} от {order.DateCreate} на кондитерское изделие {order.PastryName} в количестве {order.Count} шт. Сумма заказа: {order.Sum}."
-
-            });
             return true;
         }
 
@@ -97,14 +79,7 @@ namespace ConfectioneryBusinessLogic.BusinessLogics
             }
             model.Status = OrderStatus.Готов;
             model.DateImplement = DateTime.Now;
-            var order = _orderStorage.Update(model);
+            _orderStorage.Update(model);
-            _mailWorker.MailSendAsync(new MailSendInfoBindingModel()
-            {
-                MailAddress = order.ClientEmail,
-                Subject = $"Заказ №{order.Id}. Статус изменен на Готов",
-                Text = $"Готов заказ №{order.Id} от {order.DateCreate} на кондитерское изделие {order.PastryName} в количестве {order.Count} шт. Сумма заказа: {order.Sum}."
-
-            });
             return true;
         }
 
@@ -158,14 +133,7 @@ namespace ConfectioneryBusinessLogic.BusinessLogics
                     throw new InvalidOperationException("Заказ должен быть переведен в статус принятого перед его выполнением!");
                 }
                 model.Status = OrderStatus.Выполняется;
-                var order = _orderStorage.Update(model);
+                _orderStorage.Update(model);
-                _mailWorker.MailSendAsync(new MailSendInfoBindingModel()
-                {
-                    MailAddress = order.ClientEmail,
-                    Subject = $"Заказ №{order.Id}. Статус изменен на Выполняется",
-                    Text = $"Выполняется заказ №{order.Id} от {order.DateCreate} на кондитерское изделие {order.PastryName} в количестве {order.Count} шт. Сумма заказа: {order.Sum}."
-
-                });
                 return true;
             }
         }

Confectionery/ConfectioneryBusinessLogic/ConfectioneryBusinessLogic.csproj

@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
     <TargetFramework>net6.0</TargetFramework>
@@ -8,7 +8,6 @@
 
   <ItemGroup>
     <PackageReference Include="DocumentFormat.OpenXml" Version="2.19.0" />
-    <PackageReference Include="MailKit" Version="4.0.0" />
     <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="7.0.0" />
     <PackageReference Include="PdfSharp.MigraDoc.Standard" Version="1.51.15" />
   </ItemGroup>

Confectionery/ConfectioneryBusinessLogic/MailWorker/AbstractMailWorker.cs

@@ -1,97 +0,0 @@
-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 ILogger _logger;
-
-        public AbstractMailWorker(ILogger<AbstractMailWorker> logger, IMessageInfoLogic messageInfoLogic)
-        {
-            _logger = logger;
-            _messageInfoLogic = messageInfoLogic;
-        }
-
-        public void MailConfig(MailConfigBindingModel config)
-        {
-            _mailLogin = config.MailLogin;
-            _mailPassword = config.MailPassword;
-            _smtpClientHost = config.SmtpClientHost;
-            _smtpClientPort = config.SmtpClientPort;
-            _popHost = config.PopHost;
-            _popPort = config.PopPort;
-            _logger.LogDebug("Config: {login}, {password}, {clientHost}, {clientPOrt}, {popHost}, {popPort}", _mailLogin, _mailPassword, _smtpClientHost, _smtpClientPort, _popHost, _popPort);
-        }
-
-        public async void MailSendAsync(MailSendInfoBindingModel info)
-        {
-            if (string.IsNullOrEmpty(_mailLogin) || string.IsNullOrEmpty(_mailPassword))
-            {
-                return;
-            }
-
-            if (string.IsNullOrEmpty(_smtpClientHost) || _smtpClientPort == 0)
-            {
-                return;
-            }
-
-            if (string.IsNullOrEmpty(info.MailAddress) || string.IsNullOrEmpty(info.Subject) || string.IsNullOrEmpty(info.Text))
-            {
-                return;
-            }
-
-            _logger.LogDebug("Send Mail: {To}, {Subject}", info.MailAddress, info.Subject);
-            await SendMailAsync(info);
-        }
-
-        public async void MailCheck()
-        {
-            if (string.IsNullOrEmpty(_mailLogin) || string.IsNullOrEmpty(_mailPassword))
-            {
-                return;
-            }
-
-            if (string.IsNullOrEmpty(_popHost) || _popPort == 0)
-            {
-                return;
-            }
-
-            if (_messageInfoLogic == null)
-            {
-                return;
-            }
-
-            var list = await ReceiveMailAsync();
-            _logger.LogDebug("Check Mail: {Count} new mails", list.Count);
-            foreach (var mail in list)
-            {
-                _messageInfoLogic.Create(mail);
-            }
-        }
-
-        protected abstract Task SendMailAsync(MailSendInfoBindingModel info);
-
-        protected abstract Task<List<MessageInfoBindingModel>> ReceiveMailAsync();
-    }
-}

Confectionery/ConfectioneryBusinessLogic/MailWorker/MailKitWorker.cs

@@ -1,82 +0,0 @@
-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) : base(logger, messageInfoLogic) { }
-
-        protected override async Task SendMailAsync(MailSendInfoBindingModel info)
-        {
-            using var objMailMessage = new MailMessage();
-            using var objSmtpClient = new SmtpClient(_smtpClientHost, _smtpClientPort);
-            try
-            {
-                objMailMessage.From = new MailAddress(_mailLogin);
-                objMailMessage.To.Add(new MailAddress(info.MailAddress));
-                objMailMessage.Subject = info.Subject;
-                objMailMessage.Body = info.Text;
-                objMailMessage.SubjectEncoding = Encoding.UTF8;
-                objMailMessage.BodyEncoding = Encoding.UTF8;
-
-                objSmtpClient.UseDefaultCredentials = false;
-                objSmtpClient.EnableSsl = true;
-                objSmtpClient.DeliveryMethod = SmtpDeliveryMethod.Network;
-                objSmtpClient.Credentials = new NetworkCredential(_mailLogin, _mailPassword);
-
-                await Task.Run(() => objSmtpClient.Send(objMailMessage));
-            }
-            catch (Exception)
-            {
-                throw;
-            }
-        }
-
-        protected override async Task<List<MessageInfoBindingModel>> ReceiveMailAsync()
-        {
-            var list = new List<MessageInfoBindingModel>();
-            using var client = new Pop3Client();
-            await Task.Run(() =>
-            {
-                try
-                {
-                    client.Connect(_popHost, _popPort, SecureSocketOptions.SslOnConnect);
-                    client.Authenticate(_mailLogin, _mailPassword);
-                    for (int i = 0; i < client.Count; i++)
-                    {
-                        var message = client.GetMessage(i);
-                        foreach (var mail in message.From.Mailboxes)
-                        {
-                            list.Add(new MessageInfoBindingModel
-                            {
-                                DateDelivery = message.Date.DateTime,
-                                MessageId = message.MessageId,
-                                SenderName = mail.Address,
-                                Subject = message.Subject,
-                                Body = message.TextBody
-                            });
-                        }
-                    }
-                }
-                catch (AuthenticationException)
-                { }
-                finally
-                {
-                    client.Disconnect(true);
-                }
-            });
-            return list;
-        }
-    }
-}

Confectionery/ConfectioneryClientApp/Controllers/HomeController.cs

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

Confectionery/ConfectioneryClientApp/Views/Home/Mails.cshtml

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

Confectionery/ConfectioneryClientApp/Views/Shared/_Layout.cshtml

@@ -26,9 +26,6 @@
                         <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>

Confectionery/ConfectioneryContracts/BindingModels/MailConfigBindingModel.cs

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

Confectionery/ConfectioneryContracts/BindingModels/MailSendInfoBindingModel.cs

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

Confectionery/ConfectioneryContracts/BindingModels/MessageInfoBindingModel.cs

@@ -1,19 +0,0 @@
-using ConfectioneryDataModels.Models;
-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 DateTime DateDelivery { get; set; }
-        public string Subject { get; set; } = string.Empty;
-        public string Body { get; set; } = string.Empty;
-    }
-}

Confectionery/ConfectioneryContracts/BusinessLogicsContracts/IMessageInfoLogic.cs

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

Confectionery/ConfectioneryContracts/SearchModels/MessageInfoSearchModel.cs

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

Confectionery/ConfectioneryContracts/StoragesContracts/IMessageInfoStorage.cs

@@ -1,19 +0,0 @@
-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.StoragesContracts
-{
-    public interface IMessageInfoStorage
-    {
-        List<MessageInfoViewModel> GetFullList();
-        List<MessageInfoViewModel> GetFilteredList(MessageInfoSearchModel model);
-        MessageInfoViewModel? GetElement(MessageInfoSearchModel model);
-        MessageInfoViewModel? Insert(MessageInfoBindingModel model);
-    }
-}

Confectionery/ConfectioneryContracts/ViewModels/MessageInfoViewModel.cs

@@ -1,24 +0,0 @@
-using ConfectioneryDataModels.Models;
-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;
-    }
-}

Confectionery/ConfectioneryContracts/ViewModels/OrderViewModel.cs

@@ -22,7 +22,6 @@ namespace ConfectioneryContracts.ViewModels
         public int ClientId { get; set; }
         [DisplayName("ФИО клиента")]
         public string ClientFIO { get; set; } = string.Empty;
-        public string ClientEmail { get; set; } = string.Empty;
         [DisplayName("Количество")]
         public int Count { get; set; }
         [DisplayName("Сумма")]

Confectionery/ConfectioneryDataBaseImplement/ConfectioneryDatabase.cs

@@ -25,6 +25,5 @@ namespace ConfectioneryDataBaseImplement
         public virtual DbSet<Order> Orders { set; get; }
         public virtual DbSet<Client> Clients { set; get; }
         public virtual DbSet<Implementer> Implementers { set; get; }
-        public virtual DbSet<MessageInfo> MessageInfos { set; get; }
     }
 }

Confectionery/ConfectioneryDataBaseImplement/Implements/MessageInfoStorage.cs

@@ -1,59 +0,0 @@
-using ConfectioneryContracts.BindingModels;
-using ConfectioneryContracts.SearchModels;
-using ConfectioneryContracts.StoragesContracts;
-using ConfectioneryContracts.ViewModels;
-using ConfectioneryDataBaseImplement.Models;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace ConfectioneryDataBaseImplement.Implements
-{
-    public class MessageInfoStorage : IMessageInfoStorage
-    {
-        public List<MessageInfoViewModel> GetFullList()
-        {
-            using var context = new ConfectioneryDatabase();
-            return context.MessageInfos
-            .Select(x => x.GetViewModel)
-            .ToList();
-        }
-        public List<MessageInfoViewModel> GetFilteredList(MessageInfoSearchModel model)
-        {
-            if (string.IsNullOrEmpty(model.MessageId) && !model.ClientId.HasValue)
-            {
-                return new();
-            }
-            using var context = new ConfectioneryDatabase();
-            return context.MessageInfos
-                .Where(x => x.ClientId == model.ClientId)
-                .Select(x => x.GetViewModel)
-                .ToList();
-        }
-        public MessageInfoViewModel? GetElement(MessageInfoSearchModel model)
-        {
-            if (string.IsNullOrEmpty(model.MessageId) && !model.ClientId.HasValue)
-            {
-                return new();
-            }
-            using var context = new ConfectioneryDatabase();
-            return context.MessageInfos
-            .FirstOrDefault(x => x.MessageId.Equals(model.MessageId) && x.ClientId == model.ClientId)
-            ?.GetViewModel;
-        }
-        public MessageInfoViewModel? Insert(MessageInfoBindingModel model)
-        {
-            var newMessageInfo = MessageInfo.Create(model);
-            if (newMessageInfo == null)
-            {
-                return null;
-            }
-            using var context = new ConfectioneryDatabase();
-            context.MessageInfos.Add(newMessageInfo);
-            context.SaveChanges();
-            return newMessageInfo.GetViewModel;
-        }
-    }
-}

Confectionery/ConfectioneryDataBaseImplement/Implements/OrderStorage.cs

@@ -96,7 +96,7 @@ namespace ConfectioneryDataBaseImplement.Implements
         public OrderViewModel? Update(OrderBindingModel model)
         {
             using var context = new ConfectioneryDatabase();
-            var order = context.Orders.Include(x => x.Client).FirstOrDefault(x => x.Id == model.Id);
+            var order = context.Orders.FirstOrDefault(x => x.Id == model.Id);
             if (order == null)
             {
                 return null;

Confectionery/ConfectioneryDataBaseImplement/Migrations/20230427212057_AddMessageInfos.Designer.cs

@@ -1,278 +0,0 @@
-// <auto-generated />
-using System;
-using ConfectioneryDataBaseImplement;
-using Microsoft.EntityFrameworkCore;
-using Microsoft.EntityFrameworkCore.Infrastructure;
-using Microsoft.EntityFrameworkCore.Metadata;
-using Microsoft.EntityFrameworkCore.Migrations;
-using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
-
-#nullable disable
-
-namespace ConfectioneryDataBaseImplement.Migrations
-{
-    [DbContext(typeof(ConfectioneryDatabase))]
-    [Migration("20230427212057_AddMessageInfos")]
-    partial class AddMessageInfos
-    {
-        /// <inheritdoc />
-        protected override void BuildTargetModel(ModelBuilder modelBuilder)
-        {
-#pragma warning disable 612, 618
-            modelBuilder
-                .HasAnnotation("ProductVersion", "7.0.3")
-                .HasAnnotation("Relational:MaxIdentifierLength", 128);
-
-            SqlServerModelBuilderExtensions.UseIdentityColumns(modelBuilder);
-
-            modelBuilder.Entity("ConfectioneryDataBaseImplement.Models.Client", b =>
-                {
-                    b.Property<int>("Id")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("int");
-
-                    SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property<int>("Id"));
-
-                    b.Property<string>("ClientFIO")
-                        .IsRequired()
-                        .HasColumnType("nvarchar(max)");
-
-                    b.Property<string>("Email")
-                        .IsRequired()
-                        .HasColumnType("nvarchar(max)");
-
-                    b.Property<string>("Password")
-                        .IsRequired()
-                        .HasColumnType("nvarchar(max)");
-
-                    b.HasKey("Id");
-
-                    b.ToTable("Clients");
-                });
-
-            modelBuilder.Entity("ConfectioneryDataBaseImplement.Models.Implementer", b =>
-                {
-                    b.Property<int>("Id")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("int");
-
-                    SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property<int>("Id"));
-
-                    b.Property<string>("ImplementerFIO")
-                        .IsRequired()
-                        .HasColumnType("nvarchar(max)");
-
-                    b.Property<string>("Password")
-                        .IsRequired()
-                        .HasColumnType("nvarchar(max)");
-
-                    b.Property<int>("Qualification")
-                        .HasColumnType("int");
-
-                    b.Property<int>("WorkExperience")
-                        .HasColumnType("int");
-
-                    b.HasKey("Id");
-
-                    b.ToTable("Implementers");
-                });
-
-            modelBuilder.Entity("ConfectioneryDataBaseImplement.Models.Ingredient", b =>
-                {
-                    b.Property<int>("Id")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("int");
-
-                    SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property<int>("Id"));
-
-                    b.Property<double>("Cost")
-                        .HasColumnType("float");
-
-                    b.Property<string>("IngredientName")
-                        .IsRequired()
-                        .HasColumnType("nvarchar(max)");
-
-                    b.HasKey("Id");
-
-                    b.ToTable("Ingredients");
-                });
-
-            modelBuilder.Entity("ConfectioneryDataBaseImplement.Models.MessageInfo", b =>
-                {
-                    b.Property<string>("MessageId")
-                        .HasColumnType("nvarchar(450)");
-
-                    b.Property<string>("Body")
-                        .IsRequired()
-                        .HasColumnType("nvarchar(max)");
-
-                    b.Property<int?>("ClientId")
-                        .HasColumnType("int");
-
-                    b.Property<DateTime>("DateDelivery")
-                        .HasColumnType("datetime2");
-
-                    b.Property<string>("SenderName")
-                        .IsRequired()
-                        .HasColumnType("nvarchar(max)");
-
-                    b.Property<string>("Subject")
-                        .IsRequired()
-                        .HasColumnType("nvarchar(max)");
-
-                    b.HasKey("MessageId");
-
-                    b.ToTable("MessageInfos");
-                });
-
-            modelBuilder.Entity("ConfectioneryDataBaseImplement.Models.Order", b =>
-                {
-                    b.Property<int>("Id")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("int");
-
-                    SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property<int>("Id"));
-
-                    b.Property<int>("ClientId")
-                        .HasColumnType("int");
-
-                    b.Property<int>("Count")
-                        .HasColumnType("int");
-
-                    b.Property<DateTime>("DateCreate")
-                        .HasColumnType("datetime2");
-
-                    b.Property<DateTime?>("DateImplement")
-                        .HasColumnType("datetime2");
-
-                    b.Property<int?>("ImplementerId")
-                        .HasColumnType("int");
-
-                    b.Property<int>("PastryId")
-                        .HasColumnType("int");
-
-                    b.Property<int>("Status")
-                        .HasColumnType("int");
-
-                    b.Property<double>("Sum")
-                        .HasColumnType("float");
-
-                    b.HasKey("Id");
-
-                    b.HasIndex("ClientId");
-
-                    b.HasIndex("ImplementerId");
-
-                    b.HasIndex("PastryId");
-
-                    b.ToTable("Orders");
-                });
-
-            modelBuilder.Entity("ConfectioneryDataBaseImplement.Models.Pastry", b =>
-                {
-                    b.Property<int>("Id")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("int");
-
-                    SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property<int>("Id"));
-
-                    b.Property<string>("PastryName")
-                        .IsRequired()
-                        .HasColumnType("nvarchar(max)");
-
-                    b.Property<double>("Price")
-                        .HasColumnType("float");
-
-                    b.HasKey("Id");
-
-                    b.ToTable("Pastrys");
-                });
-
-            modelBuilder.Entity("ConfectioneryDataBaseImplement.Models.PastryIngredient", b =>
-                {
-                    b.Property<int>("Id")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("int");
-
-                    SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property<int>("Id"));
-
-                    b.Property<int>("Count")
-                        .HasColumnType("int");
-
-                    b.Property<int>("IngredientId")
-                        .HasColumnType("int");
-
-                    b.Property<int>("PastryId")
-                        .HasColumnType("int");
-
-                    b.HasKey("Id");
-
-                    b.HasIndex("IngredientId");
-
-                    b.HasIndex("PastryId");
-
-                    b.ToTable("PastryIngredients");
-                });
-
-            modelBuilder.Entity("ConfectioneryDataBaseImplement.Models.Order", b =>
-                {
-                    b.HasOne("ConfectioneryDataBaseImplement.Models.Client", "Client")
-                        .WithMany()
-                        .HasForeignKey("ClientId")
-                        .OnDelete(DeleteBehavior.Cascade)
-                        .IsRequired();
-
-                    b.HasOne("ConfectioneryDataBaseImplement.Models.Implementer", "Implementer")
-                        .WithMany("Orders")
-                        .HasForeignKey("ImplementerId");
-
-                    b.HasOne("ConfectioneryDataBaseImplement.Models.Pastry", null)
-                        .WithMany("Orders")
-                        .HasForeignKey("PastryId")
-                        .OnDelete(DeleteBehavior.Cascade)
-                        .IsRequired();
-
-                    b.Navigation("Client");
-
-                    b.Navigation("Implementer");
-                });
-
-            modelBuilder.Entity("ConfectioneryDataBaseImplement.Models.PastryIngredient", b =>
-                {
-                    b.HasOne("ConfectioneryDataBaseImplement.Models.Ingredient", "Ingredient")
-                        .WithMany("PastryIgredients")
-                        .HasForeignKey("IngredientId")
-                        .OnDelete(DeleteBehavior.Cascade)
-                        .IsRequired();
-
-                    b.HasOne("ConfectioneryDataBaseImplement.Models.Pastry", "Pastry")
-                        .WithMany("Ingredients")
-                        .HasForeignKey("PastryId")
-                        .OnDelete(DeleteBehavior.Cascade)
-                        .IsRequired();
-
-                    b.Navigation("Ingredient");
-
-                    b.Navigation("Pastry");
-                });
-
-            modelBuilder.Entity("ConfectioneryDataBaseImplement.Models.Implementer", b =>
-                {
-                    b.Navigation("Orders");
-                });
-
-            modelBuilder.Entity("ConfectioneryDataBaseImplement.Models.Ingredient", b =>
-                {
-                    b.Navigation("PastryIgredients");
-                });
-
-            modelBuilder.Entity("ConfectioneryDataBaseImplement.Models.Pastry", b =>
-                {
-                    b.Navigation("Ingredients");
-
-                    b.Navigation("Orders");
-                });
-#pragma warning restore 612, 618
-        }
-    }
-}

Confectionery/ConfectioneryDataBaseImplement/Migrations/20230427212057_AddMessageInfos.cs

@@ -1,38 +0,0 @@
-using System;
-using Microsoft.EntityFrameworkCore.Migrations;
-
-#nullable disable
-
-namespace ConfectioneryDataBaseImplement.Migrations
-{
-    /// <inheritdoc />
-    public partial class AddMessageInfos : Migration
-    {
-        /// <inheritdoc />
-        protected override void Up(MigrationBuilder migrationBuilder)
-        {
-            migrationBuilder.CreateTable(
-                name: "MessageInfos",
-                columns: table => new
-                {
-                    MessageId = table.Column<string>(type: "nvarchar(450)", nullable: false),
-                    ClientId = table.Column<int>(type: "int", nullable: true),
-                    SenderName = table.Column<string>(type: "nvarchar(max)", nullable: false),
-                    DateDelivery = table.Column<DateTime>(type: "datetime2", nullable: false),
-                    Subject = table.Column<string>(type: "nvarchar(max)", nullable: false),
-                    Body = table.Column<string>(type: "nvarchar(max)", nullable: false)
-                },
-                constraints: table =>
-                {
-                    table.PrimaryKey("PK_MessageInfos", x => x.MessageId);
-                });
-        }
-
-        /// <inheritdoc />
-        protected override void Down(MigrationBuilder migrationBuilder)
-        {
-            migrationBuilder.DropTable(
-                name: "MessageInfos");
-        }
-    }
-}

Confectionery/ConfectioneryDataBaseImplement/Migrations/ConfectioneryDatabaseModelSnapshot.cs

@@ -94,34 +94,6 @@ namespace ConfectioneryDataBaseImplement.Migrations
                     b.ToTable("Ingredients");
                 });
 
-            modelBuilder.Entity("ConfectioneryDataBaseImplement.Models.MessageInfo", b =>
-                {
-                    b.Property<string>("MessageId")
-                        .HasColumnType("nvarchar(450)");
-
-                    b.Property<string>("Body")
-                        .IsRequired()
-                        .HasColumnType("nvarchar(max)");
-
-                    b.Property<int?>("ClientId")
-                        .HasColumnType("int");
-
-                    b.Property<DateTime>("DateDelivery")
-                        .HasColumnType("datetime2");
-
-                    b.Property<string>("SenderName")
-                        .IsRequired()
-                        .HasColumnType("nvarchar(max)");
-
-                    b.Property<string>("Subject")
-                        .IsRequired()
-                        .HasColumnType("nvarchar(max)");
-
-                    b.HasKey("MessageId");
-
-                    b.ToTable("MessageInfos");
-                });
-
             modelBuilder.Entity("ConfectioneryDataBaseImplement.Models.Order", b =>
                 {
                     b.Property<int>("Id")

Confectionery/ConfectioneryDataBaseImplement/Models/MessageInfo.cs

@@ -1,56 +0,0 @@
-using ConfectioneryContracts.BindingModels;
-using ConfectioneryContracts.ViewModels;
-using ConfectioneryDataModels.Models;
-using System;
-using System.Collections.Generic;
-using System.ComponentModel.DataAnnotations;
-using System.ComponentModel.DataAnnotations.Schema;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace ConfectioneryDataBaseImplement.Models
-{
-    public class MessageInfo : IMessageInfoModel
-    {
-        [Key]
-        [DatabaseGenerated(DatabaseGeneratedOption.None)]
-        public string MessageId { get; set; } = string.Empty;
-        public int? ClientId { get; set; }
-        [Required]
-        public string SenderName { get; set; } = string.Empty;
-        [Required]
-        public DateTime DateDelivery { get; set; }
-        [Required]
-        public string Subject { get; set; } = string.Empty;
-        [Required]
-        public string Body { get; set; } = string.Empty;
-
-        public static MessageInfo? Create(MessageInfoBindingModel model)
-        {
-            if (model == null)
-            {
-                return null;
-            }
-            return new MessageInfo()
-            {
-                MessageId = model.MessageId,
-                ClientId = model.ClientId,
-                SenderName = model.SenderName,
-                Body = model.Body,
-                Subject = model.Subject,
-                DateDelivery = model.DateDelivery
-            };
-        }
-
-        public MessageInfoViewModel GetViewModel => new()
-        {
-            MessageId = MessageId,
-            ClientId = ClientId,
-            SenderName = SenderName,
-            Body = Body,
-            Subject = Subject,
-            DateDelivery = DateDelivery
-        };
-    }
-}

Confectionery/ConfectioneryDataBaseImplement/Models/Order.cs

@@ -68,7 +68,6 @@ namespace ConfectioneryDataBaseImplement.Models
             PastryId = PastryId,
             ClientId = ClientId,
             ClientFIO = Client.ClientFIO,
-            ClientEmail = Client.Email,
             Count = Count,
             Sum = Sum,
             Status = Status,

Confectionery/ConfectioneryDataModels/Models/IMessageInfoModel.cs

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

Confectionery/ConfectioneryFileImplements/DataFileSingleton.cs

@@ -17,13 +17,11 @@ namespace ConfectioneryFileImplement
         private readonly string PastryFileName = "Pastry.xml";
         private readonly string ClientFileName = "Client.xml";
         private readonly string ImplementerFileName = "Client.xml";
-        private readonly string MessageInfoFileName = "MessageInfo.xml";
         public List<Ingredient> Ingredients { 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<Implementer> Implementers { get; private set; }
-        public List<MessageInfo> MessageInfos { get; private set; }
         public static DataFileSingleton GetInstance()
         {
             if (instance == null)
@@ -37,7 +35,6 @@ namespace ConfectioneryFileImplement
         public void SaveOrders() => SaveData(Orders, OrderFileName, "Orders", x => x.GetXElement);
         public void SaveClients() => SaveData(Clients, ClientFileName, "Clients", x => x.GetXElement);
         public void SaveImplementers() => SaveData(Implementers, ImplementerFileName, "Implementers", x => x.GetXElement);
-        public void SaveMessageInfos() => SaveData(MessageInfos, MessageInfoFileName, "MessageInfos", x => x.GetXElement);
         private DataFileSingleton()
         {
             Ingredients = LoadData(IngredientFileName, "Ingredient", x => Ingredient.Create(x)!)!;
@@ -45,7 +42,6 @@ namespace ConfectioneryFileImplement
             Orders = LoadData(OrderFileName, "Order", x => Order.Create(x)!)!;
             Clients = LoadData(ClientFileName, "Client", x => Client.Create(x)!)!;
             Implementers = LoadData(ImplementerFileName, "Implementer", x => Implementer.Create(x)!)!;
-            MessageInfos = LoadData(MessageInfoFileName, "MessageInfo", x => MessageInfo.Create(x)!)!;
         }
         private static List<T>? LoadData<T>(string filename, string xmlNodeName, Func<XElement, T> selectFunction)
         {

Confectionery/ConfectioneryFileImplements/Implements/MessageInfoStorage.cs

@@ -1,61 +0,0 @@
-using ConfectioneryContracts.BindingModels;
-using ConfectioneryContracts.SearchModels;
-using ConfectioneryContracts.StoragesContracts;
-using ConfectioneryContracts.ViewModels;
-using ConfectioneryFileImplement.Models;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace ConfectioneryFileImplement.Implements
-{
-    public class MessageInfoStorage : IMessageInfoStorage
-    {
-        private readonly DataFileSingleton source;
-        public MessageInfoStorage()
-        {
-            source = DataFileSingleton.GetInstance();
-        }
-        public List<MessageInfoViewModel> GetFullList()
-        {
-            return source.MessageInfos
-            .Select(x => x.GetViewModel)
-            .ToList();
-        }
-        public List<MessageInfoViewModel> GetFilteredList(MessageInfoSearchModel model)
-        {
-            if (string.IsNullOrEmpty(model.MessageId) && !model.ClientId.HasValue)
-            {
-                return new();
-            }
-            return source.MessageInfos
-                .Where(x => x.ClientId == model.ClientId)
-                .Select(x => x.GetViewModel)
-                .ToList();
-        }
-        public MessageInfoViewModel? GetElement(MessageInfoSearchModel model)
-        {
-            if (string.IsNullOrEmpty(model.MessageId) && !model.ClientId.HasValue)
-            {
-                return new();
-            }
-            return source.MessageInfos
-            .FirstOrDefault(x => x.MessageId.Equals(model.MessageId) && x.ClientId == model.ClientId)
-            ?.GetViewModel;
-        }
-
-        public MessageInfoViewModel? Insert(MessageInfoBindingModel model)
-        {
-            var newMessageInfo = MessageInfo.Create(model);
-            if (newMessageInfo == null)
-            {
-                return null;
-            }
-            source.MessageInfos.Add(newMessageInfo);
-            source.SaveMessageInfos();
-            return newMessageInfo.GetViewModel;
-        }
-    }
-}

Confectionery/ConfectioneryFileImplements/Models/MessageInfo.cs

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

Confectionery/ConfectioneryListImplement/DataListSingleton.cs

@@ -16,7 +16,6 @@ namespace ConfectioneryListImplement
         public List<Pastry> Pastries { get; set; }
         public List<Client> Clients { get; set; }
         public List<Implementer> Implementers { get; set; }
-        public List<MessageInfo> MessageInfos { get; set; }
         private DataListSingleton()
         {
             Ingredients = new List<Ingredient>();
@@ -24,7 +23,6 @@ namespace ConfectioneryListImplement
             Pastries = new List<Pastry>();
             Clients = new List<Client>();
             Implementers = new List<Implementer>();
-            MessageInfos = new List<MessageInfo>();
         }
         public static DataListSingleton GetInstance()
         {

Confectionery/ConfectioneryListImplement/Implements/MessageInfoStorage.cs

@@ -1,77 +0,0 @@
-using ConfectioneryContracts.BindingModels;
-using ConfectioneryContracts.SearchModels;
-using ConfectioneryContracts.StoragesContracts;
-using ConfectioneryContracts.ViewModels;
-using ConfectioneryListImplement.Models;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace ConfectioneryListImplement.Implements
-{
-    public class MessageInfoStorage : IMessageInfoStorage
-    {
-        private readonly DataListSingleton _source;
-
-        public MessageInfoStorage(DataListSingleton source)
-        {
-            _source = source;
-        }
-
-        public List<MessageInfoViewModel> GetFullList()
-        {
-            var result = new List<MessageInfoViewModel>();
-            foreach (var messageInfo in _source.MessageInfos)
-            {
-                result.Add(messageInfo.GetViewModel);
-            }
-            return result;
-        }
-
-        public List<MessageInfoViewModel> GetFilteredList(MessageInfoSearchModel model)
-        {
-            var result = new List<MessageInfoViewModel>();
-            if (string.IsNullOrEmpty(model.MessageId) && !model.ClientId.HasValue)
-            {
-                return result;
-            }
-            foreach (var messageInfo in _source.MessageInfos)
-            {
-                if (messageInfo.ClientId == model.ClientId)
-                {
-                    result.Add(messageInfo.GetViewModel);
-                }
-            }
-            return result;
-        }
-
-        public MessageInfoViewModel? GetElement(MessageInfoSearchModel model)
-        {
-            if (string.IsNullOrEmpty(model.MessageId) && !model.ClientId.HasValue)
-            {
-                return null;
-            }
-            foreach (var messageInfo in _source.MessageInfos)
-            {
-                if (!string.IsNullOrEmpty(model.MessageId) && model.ClientId.HasValue && messageInfo.MessageId == model.MessageId && messageInfo.ClientId == model.ClientId)
-                {
-                    return messageInfo.GetViewModel;
-                }
-            }
-            return null;
-        }
-
-        public MessageInfoViewModel? Insert(MessageInfoBindingModel model)
-        {
-            var newMessageInfo = MessageInfo.Create(model);
-            if (newMessageInfo == null)
-            {
-                return null;
-            }
-            _source.MessageInfos.Add(newMessageInfo);
-            return newMessageInfo.GetViewModel;
-        }
-    }
-}

Confectionery/ConfectioneryListImplement/Models/MessageInfo.cs

@@ -1,48 +0,0 @@
-using ConfectioneryContracts.BindingModels;
-using ConfectioneryContracts.ViewModels;
-using ConfectioneryDataModels.Models;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace ConfectioneryListImplement.Models
-{
-    public class MessageInfo : IMessageInfoModel
-    {
-        public string MessageId { get; set; } = string.Empty;
-        public int? ClientId { get; set; }
-        public string SenderName { get; set; } = string.Empty;
-        public DateTime DateDelivery { get; set; }
-        public string Subject { get; set; } = string.Empty;
-        public string Body { get; set; } = string.Empty;
-
-        public static MessageInfo? Create(MessageInfoBindingModel model)
-        {
-            if (model == null)
-            {
-                return null;
-            }
-            return new MessageInfo()
-            {
-                MessageId = model.MessageId,
-                ClientId = model.ClientId,
-                SenderName = model.SenderName,
-                Body = model.Body,
-                Subject = model.Subject,
-                DateDelivery = model.DateDelivery
-            };
-        }
-
-        public MessageInfoViewModel GetViewModel => new()
-        {
-            MessageId = MessageId,
-            ClientId = ClientId,
-            SenderName = SenderName,
-            Body = Body,
-            Subject = Subject,
-            DateDelivery = DateDelivery
-        };
-    }
-}

Confectionery/ConfectioneryRestApi/ConfectioneryRestApi.csproj

@@ -16,10 +16,4 @@
     <ProjectReference Include="..\ConfectioneryDataBaseImplement\ConfectioneryDataBaseImplement.csproj" />
   </ItemGroup>
 
-  <ItemGroup>
-    <Content Update="appsettings.json">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </Content>
-  </ItemGroup>
-
 </Project>

Confectionery/ConfectioneryRestApi/Controllers/ClientController.cs

@@ -13,13 +13,11 @@ namespace ConfectioneryRestApi.Controllers
         private readonly ILogger _logger;
 
         private readonly IClientLogic _logic;
-        private readonly IMessageInfoLogic _mailLogic;
 
-        public ClientController(IClientLogic logic, ILogger<ClientController> logger, IMessageInfoLogic mailLogic)
+        public ClientController(IClientLogic logic, ILogger<ClientController> logger)
         {
             _logger = logger;
             _logic = logic;
-            _mailLogic = mailLogic;
         }
 
         [HttpGet]
@@ -67,21 +65,5 @@ namespace ConfectioneryRestApi.Controllers
                 throw;
             }
         }
-        [HttpGet]
-        public List<MessageInfoViewModel>? GetMessages(int clientId)
-        {
-            try
-            {
-                return _mailLogic.ReadList(new MessageInfoSearchModel
-                {
-                    ClientId = clientId
-                });
-            }
-            catch (Exception ex)
-            {
-                _logger.LogError(ex, "Ошибка получения писем клиента");
-                throw;
-            }
-        }
     }
 }

Confectionery/ConfectioneryRestApi/Program.cs

@@ -1,6 +1,4 @@
 using ConfectioneryBusinessLogic.BusinessLogics;
-using ConfectioneryBusinessLogic.MailWorker;
-using ConfectioneryContracts.BindingModels;
 using ConfectioneryContracts.BusinessLogicsContracts;
 using ConfectioneryContracts.StoragesContracts;
 using ConfectioneryDataBaseImplement.Implements;
@@ -14,16 +12,11 @@ builder.Services.AddTransient<IClientStorage, ClientStorage>();
 builder.Services.AddTransient<IOrderStorage, OrderStorage>();
 builder.Services.AddTransient<IPastryStorage, PastryStorage>();
 builder.Services.AddTransient<IImplementerStorage, ImplementerStorage>();
-builder.Services.AddTransient<IMessageInfoStorage, MessageInfoStorage>();
 
 builder.Services.AddTransient<IOrderLogic, OrderLogic>();
 builder.Services.AddTransient<IClientLogic, ClientLogic>();
 builder.Services.AddTransient<IPastryLogic, PastryLogic>();
 builder.Services.AddTransient<IImplementerLogic, ImplementerLogic>();
-builder.Services.AddTransient<IMessageInfoLogic, MessageInfoLogic>();
-
-builder.Services.AddSingleton<AbstractMailWorker, MailKitWorker>();
-
 builder.Services.AddControllers();
 // Learn more about configuring Swagger/OpenAPI at https://aka.ms/aspnetcore/swashbuckle
 builder.Services.AddEndpointsApiExplorer();
@@ -33,16 +26,7 @@ builder.Services.AddSwaggerGen(c =>
 });
 
 var app = builder.Build();
-var mailSender = app.Services.GetService<AbstractMailWorker>();
+
-mailSender?.MailConfig(new MailConfigBindingModel
-{
-    MailLogin = builder.Configuration?.GetSection("MailLogin")?.Value?.ToString() ?? string.Empty,
-    MailPassword = builder.Configuration?.GetSection("MailPassword")?.Value?.ToString() ?? string.Empty,
-    SmtpClientHost = builder.Configuration?.GetSection("SmtpClientHost")?.Value?.ToString() ?? string.Empty,
-    SmtpClientPort = Convert.ToInt32(builder.Configuration?.GetSection("SmtpClientPort")?.Value?.ToString()),
-    PopHost = builder.Configuration?.GetSection("PopHost")?.Value?.ToString() ?? string.Empty,
-    PopPort = Convert.ToInt32(builder.Configuration?.GetSection("PopPort")?.Value?.ToString())
-});
 // Configure the HTTP request pipeline.
 if (app.Environment.IsDevelopment())
 {

Confectionery/ConfectioneryRestApi/appsettings.json

@@ -5,11 +5,5 @@
       "Microsoft.AspNetCore": "Warning"
     }
   },
-  "AllowedHosts": "*",
+  "AllowedHosts": "*"
-  "SmtpClientHost": "smtp.gmail.com",
-  "SmtpClientPort": "587",
-  "PopHost": "pop.gmail.com",
-  "PopPort": "995",
-  "MailLogin": "rpplab7@gmail.com",
-  "MailPassword": "edjc dmsf pqne gxwy"
 }