FishFactory/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="labwork7cacawa@gmail.com" />
-		<add key="MailPassword" value="123" />
-	</appSettings>
-</configuration>

FishFactory/Forms/FormMails.Designer.cs

@@ -1,64 +0,0 @@
-namespace FishFactory.Forms
-{
-    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()
-        {
-            dataGridView = new DataGridView();
-            ((System.ComponentModel.ISupportInitialize)dataGridView).BeginInit();
-            SuspendLayout();
-            // 
-            // dataGridView
-            // 
-            dataGridView.Anchor = AnchorStyles.Top | AnchorStyles.Bottom | AnchorStyles.Left | AnchorStyles.Right;
-            dataGridView.ColumnHeadersHeightSizeMode = DataGridViewColumnHeadersHeightSizeMode.AutoSize;
-            dataGridView.Location = new Point(-2, -1);
-            dataGridView.Margin = new Padding(3, 4, 3, 4);
-            dataGridView.Name = "dataGridView";
-            dataGridView.ReadOnly = true;
-            dataGridView.RowHeadersWidth = 51;
-            dataGridView.RowTemplate.Height = 24;
-            dataGridView.Size = new Size(931, 517);
-            dataGridView.TabIndex = 10;
-            // 
-            // FormMails
-            // 
-            AutoScaleDimensions = new SizeF(8F, 19F);
-            AutoScaleMode = AutoScaleMode.Font;
-            ClientSize = new Size(929, 515);
-            Controls.Add(dataGridView);
-            Name = "FormMails";
-            Text = "FormMails";
-            Load += FormMail_Load;
-            ((System.ComponentModel.ISupportInitialize)dataGridView).EndInit();
-            ResumeLayout(false);
-        }
-
-        #endregion
-        private DataGridView dataGridView;
-    }
-}

FishFactory/Forms/FormMails.cs

@@ -1,58 +0,0 @@
-using FishFactoryContracts.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 FishFactory.Forms
-{
-    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 LoadData()
-        {
-            try
-            {
-                var list = _logic.ReadList(null);
-                if (list != null)
-                {
-                    dataGridView.DataSource = list;
-                    dataGridView.Columns["MessageId"].Visible = false;
-                    dataGridView.Columns["ClientId"].Visible = false;
-                    dataGridView.Columns["Body"].AutoSizeMode = DataGridViewAutoSizeColumnMode.Fill;
-                }
-                _logger.LogInformation("Загрузка почтовых собщений");
-            }
-            catch (Exception ex)
-            {
-                _logger.LogError(ex, "Ошибка загрузки почтовых сообщений");
-                MessageBox.Show(ex.Message, "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error);
-            }
-        }
-
-        private void FormMail_Load(object sender, EventArgs e)
-        {
-            LoadData();
-        }
-
-        private void buttonRef_Click(object sender, EventArgs e)
-        {
-            LoadData();
-        }
-    }
-}

FishFactory/Forms/FormMails.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>

FishFactory/Forms/FormMain.Designer.cs

@@ -44,7 +44,6 @@
             buttonIssuedOrder = new Button();
             buttonRef = new Button();
             dataGridView = new DataGridView();
-            ПисьмаtoolStripLabel = new ToolStripLabel();
             toolStrip1.SuspendLayout();
             ((System.ComponentModel.ISupportInitialize)dataGridView).BeginInit();
             SuspendLayout();
@@ -52,7 +51,7 @@
             // toolStrip1
             // 
             toolStrip1.ImageScalingSize = new Size(20, 20);
-            toolStrip1.Items.AddRange(new ToolStripItem[] { toolStripDropDownButton1, toolStripDropDownButton2, ЗапускРаботToolStripLabel, ПисьмаtoolStripLabel });
+            toolStrip1.Items.AddRange(new ToolStripItem[] { toolStripDropDownButton1, toolStripDropDownButton2, ЗапускРаботToolStripLabel });
             toolStrip1.Location = new Point(0, 0);
             toolStrip1.Name = "toolStrip1";
             toolStrip1.Size = new Size(1265, 26);
@@ -185,13 +184,6 @@
             dataGridView.Size = new Size(1054, 559);
             dataGridView.TabIndex = 6;
             // 
-            // ПисьмаtoolStripLabel
-            // 
-            ПисьмаtoolStripLabel.Name = "ПисьмаtoolStripLabel";
-            ПисьмаtoolStripLabel.Size = new Size(128, 23);
-            ПисьмаtoolStripLabel.Text = "Письма (призрака)";
-            ПисьмаtoolStripLabel.Click += ПисьмаtoolStripLabel_Click;
-            // 
             // FormMain
             // 
             AutoScaleDimensions = new SizeF(8F, 19F);
@@ -230,6 +222,5 @@
         private ToolStripMenuItem клиентыToolStripMenuItem;
         private ToolStripLabel ЗапускРаботToolStripLabel;
         private ToolStripMenuItem исполнителиToolStripMenuItem;
-        private ToolStripLabel ПисьмаtoolStripLabel;
     }
 }

FishFactory/Forms/FormMain.cs

@@ -9,16 +9,15 @@ namespace FishFactory.Forms
         private readonly ILogger _logger;
         private readonly IOrderLogic _orderLogic;
         private readonly IReportLogic _reportLogic;
-        private readonly IWorkProcess _workProcess;
+        private IWorkProcess _workProcess;
 
-        public FormMain(ILogger<FormMain> logger, IOrderLogic orderLogic, IReportLogic reportLogic, IWorkProcess workProcess)
+        public FormMain(ILogger<FormMain> logger, IOrderLogic orderLogic, IReportLogic reportLogic)
         {
             InitializeComponent();
             _logger = logger;
             _orderLogic = orderLogic;
             _reportLogic = reportLogic;
-			_workProcess = workProcess;
+        }
-		}
         private void FormMain_Load(object sender, EventArgs e)
         {
             LoadData();
@@ -74,7 +73,7 @@ namespace FishFactory.Forms
                 form.ShowDialog();
             }
         }
-
+        
         private void исполнителиToolStripMenuItem_Click(object sender, EventArgs e)
         {
             var service = Program.ServiceProvider?.GetService(typeof(FormImplementers));
@@ -163,14 +162,5 @@ namespace FishFactory.Forms
             _workProcess.DoWork((Program.ServiceProvider?.GetService(typeof(IImplementerLogic)) as IImplementerLogic)!, _orderLogic);
             MessageBox.Show("Процесс обработки запущен", "Сообщение", MessageBoxButtons.OK, MessageBoxIcon.Information);
         }
-
-        private void ПисьмаtoolStripLabel_Click(object sender, EventArgs e)
-        {
-            var service = Program.ServiceProvider?.GetService(typeof(FormMails));
-            if (service is FormMails form)
-            {
-                form.ShowDialog();
-            }
-        }
     }
 }

FishFactory/Program.cs

@@ -8,8 +8,6 @@ using Microsoft.Extensions.Logging;
 using NLog.Extensions.Logging;
 using FishFactoryBusinessLogic.OfficePackage;
 using FishFactoryBusinessLogic.OfficePackage.Implements;
-using FishFactoryBusinessLogic.MailWorker;
-using FishFactoryContracts.BindingModels;
 
 namespace FishFactory
 {
@@ -30,27 +28,6 @@ namespace FishFactory
             ConfigureServices(services);
             _serviceProvider = services.BuildServiceProvider();
 
-			var mailSender = _serviceProvider.GetService<AbstractMailWorker>();
-			try
-            {
-                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)
@@ -65,18 +42,14 @@ namespace FishFactory
             services.AddTransient<ICannedStorage, CannedStorage>();
             services.AddTransient<IClientStorage, ClientStorage>();
             services.AddTransient<IImplementerStorage, ImplementerStorage>();
-            services.AddTransient<IMessageInfoStorage, MessageInfoStorage>();
 
             services.AddTransient<IComponentLogic, ComponentLogic>();
             services.AddTransient<IOrderLogic, OrderLogic>();
             services.AddTransient<ICannedLogic, CannedLogic>();
             services.AddTransient<IClientLogic, ClientLogic>();
             services.AddTransient<IImplementerLogic, ImplementerLogic>();
-            services.AddTransient<IMessageInfoLogic, MessageInfoLogic>();
-
             services.AddTransient<IReportLogic, ReportLogic>();
             services.AddTransient<IWorkProcess, WorkModeling>();
-            services.AddSingleton<AbstractMailWorker, MailKitWorker>();
 
             services.AddTransient<AbstractSaveToWord, SaveToWord>();
             services.AddTransient<AbstractSaveToExcel, SaveToExcel>();
@@ -87,7 +60,6 @@ namespace FishFactory
             services.AddTransient<FormComponents>();
             services.AddTransient<FormClients>();
             services.AddTransient<FormImplementers>();
-            services.AddTransient<FormMails>();
 
             services.AddTransient<FormCanned>();
             services.AddTransient<FormComponent>();
@@ -98,6 +70,5 @@ namespace FishFactory
             services.AddTransient<FormReportOrders>();
             services.AddTransient<FormReportCannedComponents>();
         }
-        private static void MailCheck(object obj) => ServiceProvider?.GetService<AbstractMailWorker>()?.MailCheck();
     }
 }

FishFactoryBusinessLogic/BusinessLogic/ClientLogic.cs

@@ -5,7 +5,6 @@ using FishFactoryContracts.SearchModels;
 using FishFactoryContracts.StoragesContracts;
 using FishFactoryContracts.ViewModels;
 using Microsoft.Extensions.Logging;
-using System.Text.RegularExpressions;
 
 namespace FishFactoryBusinessLogic.BusinessLogic
 {
@@ -97,14 +96,14 @@ namespace FishFactoryBusinessLogic.BusinessLogic
             {
                 throw new ArgumentNullException("Нет ФИО пользователя", nameof(model.ClientFIO));
             }
-			if (string.IsNullOrEmpty(model.Email) || !Regex.IsMatch(model.Email, @"^[a-z0-9._%+-]+\@([a-z0-9-]+\.)+[a-z]{2,4}$"))
+            if (string.IsNullOrEmpty(model.Email))
-			{
+            {
-				throw new ArgumentException("Почта не соответствует требованиям", nameof(model.Email));
+                throw new ArgumentNullException("Нет логина пользователя", nameof(model.Email));
-			}
+            }
-			if (string.IsNullOrEmpty(model.Password) || !Regex.IsMatch(model.Password, @"^(?=.*[A-Za-z])(?=.*\d)(?=.*[^A-Za-z0-9\n]).{10,50}$"))
+            if (string.IsNullOrEmpty(model.Password))
-			{
+            {
-				throw new ArgumentNullException("Пароль не соответствует требованиям", nameof(model.Password));
+                throw new ArgumentNullException("Нет пароля пользователя", nameof(model.Password));
-			}
+            }
             _logger.LogInformation("Client. ClientFIO:{ClientFIO}. Email:{Email}. Id:{Id}", model.ClientFIO, model.Email, model.Id);
             var element = _ClientStorage.GetElement(new ClientSearchModel
             {

FishFactoryBusinessLogic/BusinessLogic/MessageInfoLogic.cs

@@ -1,85 +0,0 @@
-using FishFactoryContracts.BindingModels;
-using FishFactoryContracts.BusinessLogicsContracts;
-using FishFactoryContracts.SearchModels;
-using FishFactoryContracts.StoragesContracts;
-using FishFactoryContracts.ViewModels;
-using Microsoft.Extensions.Logging;
-
-namespace FishFactoryBusinessLogic.BusinessLogic
-{
-    public class MessageInfoLogic : IMessageInfoLogic
-    {
-        private readonly ILogger _logger;
-        private readonly IMessageInfoStorage _messageInfoStorage;
-        private readonly IClientStorage _clientStorage;
-        public MessageInfoLogic(ILogger<MessageInfoLogic> logger, IMessageInfoStorage messageInfoStorage, IClientStorage clientStorage)
-        {
-            _logger = logger;
-            _messageInfoStorage = messageInfoStorage;
-            _clientStorage = clientStorage;
-        }
-        public List<MessageInfoViewModel>? ReadList(MessageInfoSearchModel? model)
-        {
-            _logger.LogInformation("ReadList. MessageId:{MessageId}.ClientId:{ClientId}", model?.MessageId, model?.ClientId);
-            var list = model == null ? _messageInfoStorage.GetFullList() : _messageInfoStorage.GetFilteredList(model);
-            if (list == null)
-            {
-                _logger.LogWarning("ReadList return null list");
-                return null;
-            }
-            _logger.LogInformation("ReadList. Count:{Count}", list.Count);
-            return list;
-        }
-        public bool Create(MessageInfoBindingModel model)
-        {
-            CheckModel(model);
-            if (_messageInfoStorage.Insert(model) == null)
-            {
-                _logger.LogWarning("Insert operation failed");
-                return false;
-            }
-            return true;
-        }
-        private void CheckModel(MessageInfoBindingModel model, bool withParams = true)
-        {
-            if (model == null)
-            {
-                throw new ArgumentNullException(nameof(model));
-            }
-            if (!withParams)
-            {
-                return;
-            }
-            if (string.IsNullOrEmpty(model.MessageId))
-            {
-                throw new ArgumentNullException("Не указан id сообщения", nameof(model.MessageId));
-            }
-            if (string.IsNullOrEmpty(model.SenderName))
-            {
-                throw new ArgumentNullException("Не указана почта", nameof(model.SenderName));
-            }
-            if (string.IsNullOrEmpty(model.Subject))
-            {
-                throw new ArgumentNullException("Не указана тема", nameof(model.Subject));
-            }
-            if (string.IsNullOrEmpty(model.Body))
-            {
-                throw new ArgumentNullException("Не указан текст сообщения", nameof(model.Subject));
-            }
-
-            _logger.LogInformation("MessageInfo. MessageId:{MessageId}.SenderName:{SenderName}.Subject:{Subject}.Body:{Body}", model.MessageId, model.SenderName, model.Subject, model.Body);
-            var element = _clientStorage.GetElement(new ClientSearchModel
-            {
-                Email = model.SenderName
-            });
-            if (element == null)
-            {
-                _logger.LogWarning("Не удалоссь найти клиента, отправившего письмо с адреса:{Email}", model.SenderName);
-            }
-            else
-            {
-                model.ClientId = element.Id;
-            }
-        }
-    }
-}

FishFactoryBusinessLogic/BusinessLogic/OrderLogic.cs

@@ -1,5 +1,4 @@
-using FishFactoryBusinessLogic.MailWorker;
+using FishFactoryContracts.BindingModels;
-using FishFactoryContracts.BindingModels;
 using FishFactoryContracts.BusinessLogicsContracts;
 using FishFactoryContracts.SearchModels;
 using FishFactoryContracts.StoragesContracts;
@@ -13,13 +12,11 @@ namespace FishFactoryBusinessLogic.BusinessLogic
     {
         private readonly ILogger _logger;
         private readonly IOrderStorage _orderStorage;
-		private readonly AbstractMailWorker _mailWorker;
 
-		public OrderLogic(ILogger<OrderLogic> logger, IOrderStorage orderStorage, AbstractMailWorker mailWorker)
+        public OrderLogic(ILogger<OrderLogic> logger, IOrderStorage orderStorage)
         {
             _logger = logger;
             _orderStorage = orderStorage;
-            _mailWorker = mailWorker;
         }
 
         public List<OrderViewModel>? ReadList(OrderSearchModel? model)
@@ -59,23 +56,14 @@ namespace FishFactoryBusinessLogic.BusinessLogic
 
             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;
-			}
-
-			Task.Run(() => _mailWorker.MailSendAsync(new MailSendInfoBindingModel
             {
-                MailAddress = order.ClientEmail,
+                model.Status = OrderStatus.Неизвестен;
-                Subject = $"Новый заказ создан. Номер заказа - {order.Id}",
+                _logger.LogWarning("Insert operation failed");
-                Text = $"Ваш заказ номер {order.Id} на текстиль {order.CannedName} от {order.DateCreate} на сумму {order.Sum} принят."
+                return false;
-            }));
+            }
-
             return true;
         }
 
@@ -113,6 +101,10 @@ namespace FishFactoryBusinessLogic.BusinessLogic
             model.Status = element.Status;
             model.Count = element.Count;
             model.Sum = element.Sum;
+            if (!model.ImplementerId.HasValue)
+            {
+                model.ImplementerId = element.ImplementerId;
+            }
 
             if (model.Status != orderStatus - 1)
             {
@@ -121,7 +113,7 @@ namespace FishFactoryBusinessLogic.BusinessLogic
             }
             model.Status = orderStatus;
 
-            if (model.Status == OrderStatus.Готов)
+            if (model.Status == OrderStatus.Выдан)
             {
                 model.DateImplement = DateTime.Now;
             }
@@ -132,14 +124,6 @@ namespace FishFactoryBusinessLogic.BusinessLogic
                 _logger.LogWarning("Changing status operation faled");
                 return false;
             }
-
-            Task.Run(() => _mailWorker.MailSendAsync(new MailSendInfoBindingModel
-            {
-                MailAddress = element.ClientEmail,
-                Subject = $"Изменение статуса заказа номер {element.Id}",
-                Text = $"У заказа номер {element.Id} изменен статус на {orderStatus}"
-            }));
-
             return true;
         }
 

FishFactoryBusinessLogic/FishFactoryBusinessLogic.csproj

@@ -9,7 +9,6 @@
 
   <ItemGroup>
     <PackageReference Include="DocumentFormat.OpenXml" Version="2.19.0" />
-    <PackageReference Include="MailKit" Version="4.0.0" />
     <PackageReference Include="Microsoft.Extensions.Logging" Version="8.0.0" />
     <PackageReference Include="Microsoft.Extensions.Logging.Console" Version="8.0.0" />
     <PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="8.0.0" />

FishFactoryBusinessLogic/MailWorker/AbstractMailWorker.cs

@@ -1,80 +0,0 @@
-using FishFactoryBusinessLogic.BusinessLogic;
-using FishFactoryContracts.BindingModels;
-using FishFactoryContracts.BusinessLogicsContracts;
-using Microsoft.Extensions.Logging;
-
-namespace FishFactoryBusinessLogic.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();
-    }
-}

FishFactoryBusinessLogic/MailWorker/MailKitWorker.cs

@@ -1,77 +0,0 @@
-using FishFactoryContracts.BindingModels;
-using FishFactoryContracts.BusinessLogicsContracts;
-using System.Net.Mail;
-using System.Net;
-using System.Text;
-using MailKit.Net.Pop3;
-using MailKit.Security;
-using Microsoft.Extensions.Logging;
-
-namespace FishFactoryBusinessLogic.MailWorker
-{
-    public class MailKitWorker : AbstractMailWorker
-    {
-        public MailKitWorker(ILogger<MailKitWorker> logger, IMessageInfoLogic messageInfoLogic) : base(logger, messageInfoLogic) { }
-
-        //отправка письма
-        protected override async Task SendMailAsync(MailSendInfoBindingModel info)
-        {
-            using var objMailMessage = new MailMessage();
-            using var objSmtpClient = new SmtpClient(_smtpClientHost, _smtpClientPort);
-            try
-            {
-                objMailMessage.From = new MailAddress(_mailLogin);
-                objMailMessage.To.Add(new MailAddress(info.MailAddress));
-                objMailMessage.Subject = info.Subject;
-                objMailMessage.Body = info.Text;
-                objMailMessage.SubjectEncoding = Encoding.UTF8;
-                objMailMessage.BodyEncoding = Encoding.UTF8;
-                objSmtpClient.UseDefaultCredentials = false;
-                objSmtpClient.EnableSsl = true;
-                objSmtpClient.DeliveryMethod = SmtpDeliveryMethod.Network;
-                objSmtpClient.Credentials = new NetworkCredential(_mailLogin, _mailPassword);
-                await Task.Run(() => objSmtpClient.Send(objMailMessage));
-            }
-            catch (Exception)
-            {
-                throw;
-            }
-        }
-
-        //получение письма
-        protected override async Task<List<MessageInfoBindingModel>> ReceiveMailAsync()
-        {
-            var list = new List<MessageInfoBindingModel>();
-            using var client = new Pop3Client();
-            await Task.Run(() =>
-            {
-                try
-                {
-                    client.Connect(_popHost, _popPort, SecureSocketOptions.SslOnConnect);
-                    client.Authenticate(_mailLogin, _mailPassword);
-                    for (int i = 0; i < client.Count; i++)
-                    {
-                        var message = client.GetMessage(i);
-                        foreach (var mail in message.From.Mailboxes)
-                        {
-                            list.Add(new MessageInfoBindingModel
-                            {
-                                DateDelivery = message.Date.DateTime,
-                                MessageId = message.MessageId,
-                                SenderName = mail.Address,
-                                Subject = message.Subject,
-                                Body = message.TextBody
-                            });
-                        }
-                    }
-                }
-                catch (MailKit.Security.AuthenticationException) { }
-                finally
-                {
-                    client.Disconnect(true);
-                }
-            });
-            return list;
-        }
-    }
-}

FishFactoryClientApp/Controllers/ClientController.cs

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

FishFactoryClientApp/Controllers/HomeController.cs

@@ -130,15 +130,5 @@ namespace AbstractShowClientApp.Controllers
 			var prod = APIClient.GetRequest<CannedViewModel>($"api/main/getcanned?cannedId={canned}");
 			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}"));
-		}
 	}
 }

FishFactoryClientApp/Views/Home/Mails.cshtml

@@ -1,48 +0,0 @@
-@using FishFactoryContracts.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>

FishFactoryClientApp/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>

FishFactoryContracts/BindingModels/MailConfigBindingModel.cs

@@ -1,12 +0,0 @@
-namespace FishFactoryContracts.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; }
-    }
-}

FishFactoryContracts/BindingModels/MailSendInfoBindingModel.cs

@@ -1,9 +0,0 @@
-namespace FishFactoryContracts.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;
-    }
-}

FishFactoryContracts/BindingModels/MessageInfoBindingModel.cs

@@ -1,14 +0,0 @@
-using FishFactoryDataModel.Models;
-
-namespace FishFactoryContracts.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; }
-    }
-}

FishFactoryContracts/BusinessLogicsContracts/IMessageInfoLogic.cs

@@ -1,12 +0,0 @@
-using FishFactoryContracts.BindingModels;
-using FishFactoryContracts.SearchModels;
-using FishFactoryContracts.ViewModels;
-
-namespace FishFactoryContracts.BusinessLogicsContracts
-{
-    public interface IMessageInfoLogic
-    {
-        List<MessageInfoViewModel>? ReadList(MessageInfoSearchModel? model);
-        bool Create(MessageInfoBindingModel model);
-    }
-}

FishFactoryContracts/BusinessLogicsContracts/IOrderLogic.cs

@@ -15,7 +15,17 @@ namespace FishFactoryContracts.BusinessLogicsContracts
         OrderViewModel? ReadElement(OrderSearchModel model);
         bool CreateOrder(OrderBindingModel model);
         bool TakeOrderInWork(OrderBindingModel model);
+        /// <summary>
+        /// Готов
+        /// </summary>
+        /// <param name="model"></param>
+        /// <returns></returns>
         bool FinishOrder(OrderBindingModel model);
+        /// <summary>
+        /// Доставлен
+        /// </summary>
+        /// <param name="model"></param>
+        /// <returns></returns>
         bool DeliveryOrder(OrderBindingModel model);
     }
 }

FishFactoryContracts/SearchModels/MessageInfoSearchModel.cs

@@ -1,8 +0,0 @@
-namespace FishFactoryContracts.SearchModels
-{
-    public class MessageInfoSearchModel
-    {
-        public int? ClientId { get; set; }
-        public string? MessageId { get; set; }
-    }
-}

FishFactoryContracts/StoragesContracts/IMessageInfoStorage.cs

@@ -1,14 +0,0 @@
-using FishFactoryContracts.BindingModels;
-using FishFactoryContracts.SearchModels;
-using FishFactoryContracts.ViewModels;
-
-namespace FishFactoryContracts.StoragesContracts
-{
-    public interface IMessageInfoStorage
-    {
-        List<MessageInfoViewModel> GetFullList();
-        List<MessageInfoViewModel> GetFilteredList(MessageInfoSearchModel model);
-        MessageInfoViewModel? GetElement(MessageInfoSearchModel model);
-        MessageInfoViewModel? Insert(MessageInfoBindingModel model);
-    }
-}

FishFactoryContracts/ViewModels/MessageInfoViewModel.cs

@@ -1,24 +0,0 @@
-using FishFactoryDataModel.Models;
-using System.ComponentModel;
-
-namespace FishFactoryContracts.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;
-    }
-}

FishFactoryContracts/ViewModels/OrderViewModel.cs

@@ -1,5 +1,10 @@
 using FishFactoryDataModel.Enums;
+using System;
+using System.Collections.Generic;
 using System.ComponentModel;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
 
 namespace FishFactoryContracts.ViewModels
 {
@@ -10,11 +15,9 @@ namespace FishFactoryContracts.ViewModels
 		public int ClientId { get; set; }
         [DisplayName("Клиент")]
         public string ClientFIO { get; set; } = string.Empty;
-		[DisplayName("Почта клиента")]
+        public int? ImplementerId { get; set; }
-		public string ClientEmail { get; set; } = string.Empty;
-	    public int? ImplementerId { get; set; }
         [DisplayName("Исполнитель")]
-        public string? ImplementerFIO { get; set; } = null;
+        public string? ImplementerFIO { get; set; } = string.Empty;
         public int CannedId { get; set; }
 		[DisplayName("Изделие")]
         public string CannedName { get; set; } = string.Empty;

FishFactoryDataModels/Models/IImplementerModel.cs

@@ -1,6 +1,6 @@
 namespace FishFactoryDataModel.Models
 {
-    public interface IImplementerModel : IId
+    public interface IImplementerModel
     {
         string ImplementerFIO { get; }
         string Password { get; }

FishFactoryDataModels/Models/IMessageInfoModel.cs

@@ -1,12 +0,0 @@
-namespace FishFactoryDataModel.Models
-{
-    public interface IMessageInfoModel
-    {
-        string MessageId { get; }
-        int? ClientId { get; }
-        string SenderName { get; }
-        DateTime DateDelivery { get; }
-        string Subject { get; }
-        string Body { get; }
-    }
-}

FishFactoryDatabaseImplement/FishFactoryDatabase.cs

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

FishFactoryDatabaseImplement/Implements/ClientStorage.cs

@@ -16,11 +16,7 @@ namespace FishFactoryDatabaseImplement.Implements
 
         public List<ClientViewModel> GetFilteredList(ClientSearchModel model)
         {
-			if (string.IsNullOrEmpty(model.Email))
+            using var context = new FishFactoryDatabase();
-			{
-				return new();
-			}
-			using var context = new FishFactoryDatabase();
             return context.Clients.Where(c =>
                 (!model.Id.HasValue || c.Id == model.Id) &&
                 (string.IsNullOrEmpty(model.Email) || c.Email.Contains(model.Email)) &&

FishFactoryDatabaseImplement/Implements/ImplementerStorage.cs

@@ -26,9 +26,8 @@ namespace FishFactoryDatabaseImplement.Implements
 
         public ImplementerViewModel? GetElement(ImplementerSearchModel model)
         {
-			if (string.IsNullOrEmpty(model.ImplementerFIO) && string.IsNullOrEmpty(model.Password) &&
+            if (string.IsNullOrEmpty(model.ImplementerFIO) && !model.Id.HasValue)
-			   !model.Id.HasValue)
+            {
-			{
                 return null;
             }
             using var context = new FishFactoryDatabase();

FishFactoryDatabaseImplement/Implements/MessageInfoStorage.cs

@@ -1,50 +0,0 @@
-using FishFactoryContracts.BindingModels;
-using FishFactoryContracts.SearchModels;
-using FishFactoryContracts.StoragesContracts;
-using FishFactoryContracts.ViewModels;
-using FishFactoryDatabaseImplement.Models;
-
-namespace FishFactoryDatabaseImplement.Implements
-{
-    public class MessageInfoStorage : IMessageInfoStorage
-    {
-        public List<MessageInfoViewModel> GetFullList()
-        {
-            using var context = new FishFactoryDatabase();
-            return context.MessageInfos.Select(x => x.GetViewModel).ToList();
-        }
-
-        public List<MessageInfoViewModel> GetFilteredList(MessageInfoSearchModel model)
-        {
-            if (!model.ClientId.HasValue)
-            {
-                return new();
-            }
-            using var context = new FishFactoryDatabase();
-            return context.MessageInfos.Where(x => x.ClientId.HasValue && x.ClientId == model.ClientId).Select(x => x.GetViewModel).ToList();
-        }
-
-        public MessageInfoViewModel? GetElement(MessageInfoSearchModel model)
-        {
-            if (string.IsNullOrEmpty(model.MessageId))
-            {
-                return new();
-            }
-            using var context = new FishFactoryDatabase();
-            return context.MessageInfos.FirstOrDefault(x => x.MessageId == model.MessageId)?.GetViewModel;
-        }
-
-        public MessageInfoViewModel? Insert(MessageInfoBindingModel model)
-        {
-            var newMessage = MessageInfo.Create(model);
-            if (newMessage == null)
-            {
-                return null;
-            }
-            using var context = new FishFactoryDatabase();
-            context.MessageInfos.Add(newMessage);
-            context.SaveChanges();
-            return newMessage.GetViewModel;
-        }
-    }
-}

FishFactoryDatabaseImplement/Implements/OrderStorage.cs

@@ -38,12 +38,12 @@ namespace FishFactoryDatabaseImplement.Implements
         }
         public OrderViewModel? GetElement(OrderSearchModel model)
         {
-			if (!model.Id.HasValue && (!model.ImplementerId.HasValue || !model.Status.HasValue))
+            if (!model.Id.HasValue)
-			{
+            {
-				return null;
+                return new();
-			}
+            }
-			using var context = new FishFactoryDatabase();
+            using var context = new FishFactoryDatabase();
-			return context.Orders
+            return context.Orders
                 .Include(x => x.Canned)
                 .Include(x => x.Client)
                 .Include(x => x.Implementer)

FishFactoryDatabaseImplement/Migrations/20240514161521_implementer2.Designer.cs

@@ -1,291 +0,0 @@
-// <auto-generated />
-using System;
-using FishFactoryDatabaseImplement;
-using Microsoft.EntityFrameworkCore;
-using Microsoft.EntityFrameworkCore.Infrastructure;
-using Microsoft.EntityFrameworkCore.Migrations;
-using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
-using Npgsql.EntityFrameworkCore.PostgreSQL.Metadata;
-
-#nullable disable
-
-namespace FishFactoryDatabaseImplement.Migrations
-{
-    [DbContext(typeof(FishFactoryDatabase))]
-    [Migration("20240514161521_implementer2")]
-    partial class implementer2
-    {
-        /// <inheritdoc />
-        protected override void BuildTargetModel(ModelBuilder modelBuilder)
-        {
-#pragma warning disable 612, 618
-            modelBuilder
-                .HasAnnotation("ProductVersion", "7.0.16")
-                .HasAnnotation("Relational:MaxIdentifierLength", 63);
-
-            NpgsqlModelBuilderExtensions.UseIdentityByDefaultColumns(modelBuilder);
-
-            modelBuilder.Entity("FishFactoryDatabaseImplement.Models.Canned", b =>
-                {
-                    b.Property<int>("Id")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("integer");
-
-                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
-
-                    b.Property<string>("CannedName")
-                        .IsRequired()
-                        .HasColumnType("text");
-
-                    b.Property<double>("Price")
-                        .HasColumnType("double precision");
-
-                    b.HasKey("Id");
-
-                    b.ToTable("Canneds");
-                });
-
-            modelBuilder.Entity("FishFactoryDatabaseImplement.Models.CannedComponent", b =>
-                {
-                    b.Property<int>("Id")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("integer");
-
-                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
-
-                    b.Property<int>("CannedId")
-                        .HasColumnType("integer");
-
-                    b.Property<int>("ComponentId")
-                        .HasColumnType("integer");
-
-                    b.Property<int>("Count")
-                        .HasColumnType("integer");
-
-                    b.HasKey("Id");
-
-                    b.HasIndex("CannedId");
-
-                    b.HasIndex("ComponentId");
-
-                    b.ToTable("CannedComponents");
-                });
-
-            modelBuilder.Entity("FishFactoryDatabaseImplement.Models.Client", b =>
-                {
-                    b.Property<int>("Id")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("integer");
-
-                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
-
-                    b.Property<string>("ClientFIO")
-                        .IsRequired()
-                        .HasColumnType("text");
-
-                    b.Property<string>("Email")
-                        .IsRequired()
-                        .HasColumnType("text");
-
-                    b.Property<string>("Password")
-                        .IsRequired()
-                        .HasColumnType("text");
-
-                    b.HasKey("Id");
-
-                    b.ToTable("Clients");
-                });
-
-            modelBuilder.Entity("FishFactoryDatabaseImplement.Models.Component", b =>
-                {
-                    b.Property<int>("Id")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("integer");
-
-                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
-
-                    b.Property<string>("ComponentName")
-                        .IsRequired()
-                        .HasColumnType("text");
-
-                    b.Property<double>("Cost")
-                        .HasColumnType("double precision");
-
-                    b.HasKey("Id");
-
-                    b.ToTable("Components");
-                });
-
-            modelBuilder.Entity("FishFactoryDatabaseImplement.Models.Implementer", b =>
-                {
-                    b.Property<int>("Id")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("integer");
-
-                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
-
-                    b.Property<string>("ImplementerFIO")
-                        .IsRequired()
-                        .HasColumnType("text");
-
-                    b.Property<string>("Password")
-                        .IsRequired()
-                        .HasColumnType("text");
-
-                    b.Property<int>("Qualification")
-                        .HasColumnType("integer");
-
-                    b.Property<int>("WorkExperience")
-                        .HasColumnType("integer");
-
-                    b.HasKey("Id");
-
-                    b.ToTable("Implementers");
-                });
-
-            modelBuilder.Entity("FishFactoryDatabaseImplement.Models.MessageInfo", b =>
-                {
-                    b.Property<string>("MessageId")
-                        .HasColumnType("text");
-
-                    b.Property<string>("Body")
-                        .IsRequired()
-                        .HasColumnType("text");
-
-                    b.Property<int?>("ClientId")
-                        .HasColumnType("integer");
-
-                    b.Property<DateTime>("DateDelivery")
-                        .HasColumnType("timestamp without time zone");
-
-                    b.Property<string>("SenderName")
-                        .IsRequired()
-                        .HasColumnType("text");
-
-                    b.Property<string>("Subject")
-                        .IsRequired()
-                        .HasColumnType("text");
-
-                    b.HasKey("MessageId");
-
-                    b.HasIndex("ClientId");
-
-                    b.ToTable("MessageInfos");
-                });
-
-            modelBuilder.Entity("FishFactoryDatabaseImplement.Models.Order", b =>
-                {
-                    b.Property<int>("Id")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("integer");
-
-                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
-
-                    b.Property<int>("CannedId")
-                        .HasColumnType("integer");
-
-                    b.Property<int>("ClientId")
-                        .HasColumnType("integer");
-
-                    b.Property<int>("Count")
-                        .HasColumnType("integer");
-
-                    b.Property<DateTime>("DateCreate")
-                        .HasColumnType("timestamp without time zone");
-
-                    b.Property<DateTime?>("DateImplement")
-                        .HasColumnType("timestamp without time zone");
-
-                    b.Property<int?>("ImplementerId")
-                        .HasColumnType("integer");
-
-                    b.Property<int>("Status")
-                        .HasColumnType("integer");
-
-                    b.Property<double>("Sum")
-                        .HasColumnType("double precision");
-
-                    b.HasKey("Id");
-
-                    b.HasIndex("CannedId");
-
-                    b.HasIndex("ClientId");
-
-                    b.HasIndex("ImplementerId");
-
-                    b.ToTable("Orders");
-                });
-
-            modelBuilder.Entity("FishFactoryDatabaseImplement.Models.CannedComponent", b =>
-                {
-                    b.HasOne("FishFactoryDatabaseImplement.Models.Canned", "Canned")
-                        .WithMany("Components")
-                        .HasForeignKey("CannedId")
-                        .OnDelete(DeleteBehavior.Cascade)
-                        .IsRequired();
-
-                    b.HasOne("FishFactoryDatabaseImplement.Models.Component", "Component")
-                        .WithMany("CannedComponents")
-                        .HasForeignKey("ComponentId")
-                        .OnDelete(DeleteBehavior.Cascade)
-                        .IsRequired();
-
-                    b.Navigation("Canned");
-
-                    b.Navigation("Component");
-                });
-
-            modelBuilder.Entity("FishFactoryDatabaseImplement.Models.MessageInfo", b =>
-                {
-                    b.HasOne("FishFactoryDatabaseImplement.Models.Client", "Client")
-                        .WithMany()
-                        .HasForeignKey("ClientId");
-
-                    b.Navigation("Client");
-                });
-
-            modelBuilder.Entity("FishFactoryDatabaseImplement.Models.Order", b =>
-                {
-                    b.HasOne("FishFactoryDatabaseImplement.Models.Canned", "Canned")
-                        .WithMany("Orders")
-                        .HasForeignKey("CannedId")
-                        .OnDelete(DeleteBehavior.Cascade)
-                        .IsRequired();
-
-                    b.HasOne("FishFactoryDatabaseImplement.Models.Client", "Client")
-                        .WithMany()
-                        .HasForeignKey("ClientId")
-                        .OnDelete(DeleteBehavior.Cascade)
-                        .IsRequired();
-
-                    b.HasOne("FishFactoryDatabaseImplement.Models.Implementer", "Implementer")
-                        .WithMany("Order")
-                        .HasForeignKey("ImplementerId");
-
-                    b.Navigation("Canned");
-
-                    b.Navigation("Client");
-
-                    b.Navigation("Implementer");
-                });
-
-            modelBuilder.Entity("FishFactoryDatabaseImplement.Models.Canned", b =>
-                {
-                    b.Navigation("Components");
-
-                    b.Navigation("Orders");
-                });
-
-            modelBuilder.Entity("FishFactoryDatabaseImplement.Models.Component", b =>
-                {
-                    b.Navigation("CannedComponents");
-                });
-
-            modelBuilder.Entity("FishFactoryDatabaseImplement.Models.Implementer", b =>
-                {
-                    b.Navigation("Order");
-                });
-#pragma warning restore 612, 618
-        }
-    }
-}

FishFactoryDatabaseImplement/Migrations/20240514161521_implementer2.cs

@@ -1,48 +0,0 @@
-using System;
-using Microsoft.EntityFrameworkCore.Migrations;
-
-#nullable disable
-
-namespace FishFactoryDatabaseImplement.Migrations
-{
-    /// <inheritdoc />
-    public partial class implementer2 : Migration
-    {
-        /// <inheritdoc />
-        protected override void Up(MigrationBuilder migrationBuilder)
-        {
-            migrationBuilder.CreateTable(
-                name: "MessageInfos",
-                columns: table => new
-                {
-                    MessageId = table.Column<string>(type: "text", nullable: false),
-                    ClientId = table.Column<int>(type: "integer", nullable: true),
-                    SenderName = table.Column<string>(type: "text", nullable: false),
-                    DateDelivery = table.Column<DateTime>(type: "timestamp without time zone", nullable: false),
-                    Subject = table.Column<string>(type: "text", nullable: false),
-                    Body = table.Column<string>(type: "text", nullable: false)
-                },
-                constraints: table =>
-                {
-                    table.PrimaryKey("PK_MessageInfos", x => x.MessageId);
-                    table.ForeignKey(
-                        name: "FK_MessageInfos_Clients_ClientId",
-                        column: x => x.ClientId,
-                        principalTable: "Clients",
-                        principalColumn: "Id");
-                });
-
-            migrationBuilder.CreateIndex(
-                name: "IX_MessageInfos_ClientId",
-                table: "MessageInfos",
-                column: "ClientId");
-        }
-
-        /// <inheritdoc />
-        protected override void Down(MigrationBuilder migrationBuilder)
-        {
-            migrationBuilder.DropTable(
-                name: "MessageInfos");
-        }
-    }
-}

FishFactoryDatabaseImplement/Migrations/FishFactoryDatabaseModelSnapshot.cs

@@ -140,36 +140,6 @@ namespace FishFactoryDatabaseImplement.Migrations
                     b.ToTable("Implementers");
                 });
 
-            modelBuilder.Entity("FishFactoryDatabaseImplement.Models.MessageInfo", b =>
-                {
-                    b.Property<string>("MessageId")
-                        .HasColumnType("text");
-
-                    b.Property<string>("Body")
-                        .IsRequired()
-                        .HasColumnType("text");
-
-                    b.Property<int?>("ClientId")
-                        .HasColumnType("integer");
-
-                    b.Property<DateTime>("DateDelivery")
-                        .HasColumnType("timestamp without time zone");
-
-                    b.Property<string>("SenderName")
-                        .IsRequired()
-                        .HasColumnType("text");
-
-                    b.Property<string>("Subject")
-                        .IsRequired()
-                        .HasColumnType("text");
-
-                    b.HasKey("MessageId");
-
-                    b.HasIndex("ClientId");
-
-                    b.ToTable("MessageInfos");
-                });
-
             modelBuilder.Entity("FishFactoryDatabaseImplement.Models.Order", b =>
                 {
                     b.Property<int>("Id")
@@ -232,15 +202,6 @@ namespace FishFactoryDatabaseImplement.Migrations
                     b.Navigation("Component");
                 });
 
-            modelBuilder.Entity("FishFactoryDatabaseImplement.Models.MessageInfo", b =>
-                {
-                    b.HasOne("FishFactoryDatabaseImplement.Models.Client", "Client")
-                        .WithMany()
-                        .HasForeignKey("ClientId");
-
-                    b.Navigation("Client");
-                });
-
             modelBuilder.Entity("FishFactoryDatabaseImplement.Models.Order", b =>
                 {
                     b.HasOne("FishFactoryDatabaseImplement.Models.Canned", "Canned")

FishFactoryDatabaseImplement/Models/Client.cs

@@ -1,7 +1,6 @@
 using FishFactoryContracts.BindingModels;
 using FishFactoryContracts.ViewModels;
 using FishFactoryDataModel.Models;
-using System.ComponentModel.DataAnnotations.Schema;
 using System.Xml.Linq;
 
 namespace FishFactoryDatabaseImplement.Models
@@ -12,10 +11,8 @@ namespace FishFactoryDatabaseImplement.Models
         public string ClientFIO { get; set; } = string.Empty;
         public string Password { get; set; } = string.Empty;
         public string Email { get; set; } = string.Empty;
-		[ForeignKey("ClientId")]
-		public virtual List<MessageInfo> ClientMessages { get; set; } = new();
 
-		public static Client? Create(ClientBindingModel? model)
+        public static Client? Create(ClientBindingModel? model)
         {
             if (model == null)
             {

FishFactoryDatabaseImplement/Models/Implementer.cs

@@ -13,9 +13,9 @@ namespace FishFactoryDatabaseImplement.Models
 
         public string Password { get; private set; } = string.Empty;
 
-        public int WorkExperience { get; private set; } = 0;
+        public int WorkExperience { get; private set; }
 
-        public int Qualification { get; private set; } = 0;
+        public int Qualification { get; private set; }
         [ForeignKey("ImplementerId")]
         public virtual List<Order> Order { get; set; } = new();
 

FishFactoryDatabaseImplement/Models/MessageInfo.cs

@@ -1,57 +0,0 @@
-using FishFactoryContracts.BindingModels;
-using FishFactoryContracts.ViewModels;
-using FishFactoryDataModel.Models;
-using System.ComponentModel.DataAnnotations;
-
-namespace FishFactoryDatabaseImplement.Models
-{
-    public class MessageInfo : IMessageInfoModel
-    {
-        [Key]
-        public string MessageId { get; set; } = string.Empty;
-
-        public int? ClientId { get; set; }
-
-        public virtual Client? Client { get; set; }
-
-        [Required]
-        public string SenderName { get; set; } = string.Empty;
-
-        [Required]
-        public DateTime DateDelivery { get; set; }
-
-        [Required]
-        public string Subject { get; set; } = string.Empty;
-
-        [Required]
-        public string Body { get; set; } = string.Empty;
-
-        public static MessageInfo? Create(MessageInfoBindingModel? model)
-        {
-            if (model == null)
-            {
-                return null;
-            }
-            return new()
-            {
-                MessageId = model.MessageId,
-                ClientId = model.ClientId,
-                SenderName = model.SenderName,
-                DateDelivery = model.DateDelivery,
-                Subject = model.Subject,
-                Body = model.Body,
-
-            };
-        }
-
-        public MessageInfoViewModel GetViewModel => new()
-        {
-            MessageId = MessageId,
-            ClientId = ClientId,
-            SenderName = SenderName,
-            DateDelivery = DateDelivery,
-            Subject = Subject,
-            Body = Body
-        };
-    }
-}

FishFactoryDatabaseImplement/Models/Order.cs

@@ -39,8 +39,8 @@ namespace FishFactoryDatabaseImplement.Models
 				ClientId = model.ClientId,
                 Client = context.Clients.First(x => x.Id == model.ClientId),
                 ImplementerId = model.ImplementerId,
-				Implementer = model.ImplementerId == null ? null : context.Implementers.First(i => i.Id == model.ImplementerId),
+                Implementer = model.ImplementerId.HasValue ? context.Implementers.First(x => x.Id == model.ImplementerId) : null,
-				Count = model.Count,
+                Count = model.Count,
                 Sum = model.Sum,
                 Status = model.Status,
                 DateCreate = model.DateCreate,
@@ -72,9 +72,8 @@ namespace FishFactoryDatabaseImplement.Models
             CannedName = Canned.CannedName,
 			ClientId = ClientId,
             ClientFIO = Client.ClientFIO,
-			ClientEmail = Client.Email,
+            ImplementerId = ImplementerId,
-			ImplementerId = ImplementerId,
+            ImplementerFIO = Implementer?.ImplementerFIO,
-			ImplementerFIO = Implementer == null ? string.Empty : Implementer.ImplementerFIO,
 			Count = Count,
             Sum = Sum,
             Status = Status,

FishFactoryFileImplement/DataFileSingleton.cs

@@ -12,13 +12,11 @@ namespace FishFactoryFileImplement
         private readonly string CannedFileName = "Canned.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<Canned> Canneds { get; private set; }
         public List<Client> Clients { get; private set; }
         public List<Implementer> Implementers { get; private set; }
-        public List<MessageInfo> Messages { get; private set; }
         public static DataFileSingleton GetInstance()
         {
             if (instance == null)
@@ -32,7 +30,6 @@ namespace FishFactoryFileImplement
         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, "Implementer", x => x.GetXElement);
-        public void SaveMessages() => SaveData(Orders, ImplementerFileName, "Messages", x => x.GetXElement);
         private DataFileSingleton()
         {
             Components = LoadData(ComponentFileName, "Component", x => Component.Create(x)!)!;
@@ -40,7 +37,6 @@ namespace FishFactoryFileImplement
             Orders = LoadData(OrderFileName, "Order", x => Order.Create(x)!)!;
             Clients = LoadData(ClientFileName, "Client", x => Client.Create(x)!)!;
             Implementers = LoadData(ImplementerFileName, "Implementer", x => Implementer.Create(x)!)!;
-            Messages = LoadData(MessageInfoFileName, "MessageInfo", x => MessageInfo.Create(x)!)!;
         }
         private static List<T>? LoadData<T>(string filename, string xmlNodeName, Func<XElement, T> selectFunction)
         {

FishFactoryFileImplement/Implements/MessageInfoStorage.cs

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

FishFactoryFileImplement/Models/MessageInfo.cs

@@ -1,66 +0,0 @@
-using FishFactoryContracts.BindingModels;
-using FishFactoryContracts.ViewModels;
-using FishFactoryDataModel.Models;
-using System.Xml.Linq;
-
-namespace FishFactoryFileImplement.Models
-{
-    public class MessageInfo : IMessageInfoModel
-    {
-        public string MessageId { get; private set; } = string.Empty;
-
-        public int? ClientId { get; private set; }
-
-        public string SenderName { get; private set; } = string.Empty;
-
-        public DateTime DateDelivery { get; private set; } = DateTime.Now;
-
-        public string Subject { get; private set; } = string.Empty;
-
-        public string Body { get; private set; } = string.Empty;
-
-        public static MessageInfo? Create(MessageInfoBindingModel model)
-        {
-            if (model == null)
-            {
-                return null;
-            }
-            return new()
-            {
-                Body = model.Body,
-                Subject = model.Subject,
-                ClientId = model.ClientId,
-                MessageId = model.MessageId,
-                SenderName = model.SenderName,
-                DateDelivery = model.DateDelivery,
-            };
-        }
-
-		public static MessageInfo? Create(XElement element)
-		{
-			if (element == null)
-			{
-				return null;
-			}
-			return new()
-			{
-				Body = element.Attribute("Body")!.Value,
-				Subject = element.Attribute("Subject")!.Value,
-				ClientId = Convert.ToInt32(element.Attribute("ClientId")!.Value),
-				MessageId = element.Attribute("MessageId")!.Value,
-				SenderName = element.Attribute("SenderName")!.Value,
-				DateDelivery = Convert.ToDateTime(element.Attribute("DateDelivery")!.Value),
-			};
-		}
-
-		public MessageInfoViewModel GetViewModel => new()
-        {
-            Body = Body,
-            Subject = Subject,
-            ClientId = ClientId,
-            MessageId = MessageId,
-            SenderName = SenderName,
-            DateDelivery = DateDelivery,
-        };
-    }
-}

FishFactoryListImplement/DataListSingleton.cs

@@ -10,7 +10,6 @@ namespace FishFactoryListImplement
         public List<Canned> Canneds { get; set; }
 		public List<Client> Clients { get; set; }
         public List<Implementer> Implementers { get; set; }
-        public List<MessageInfo> Messages { get; set; }
         private DataListSingleton()
         {
             Components = new List<Component>();
@@ -18,7 +17,6 @@ namespace FishFactoryListImplement
             Canneds = new List<Canned>();
 			Clients = new List<Client>();
             Implementers = new List<Implementer>();
-            Messages = new List<MessageInfo>();
         }
         public static DataListSingleton GetInstance()
         {

FishFactoryListImplement/Implements/MessageInfoStorage.cs

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

FishFactoryListImplement/Models/MessageInfo.cs

@@ -1,48 +0,0 @@
-using FishFactoryContracts.BindingModels;
-using FishFactoryContracts.ViewModels;
-using FishFactoryDataModel.Models;
-
-namespace FishFactoryListImplement.Models
-{
-    public class MessageInfo : IMessageInfoModel
-    {
-        public string MessageId { get; private set; } = string.Empty;
-
-        public int? ClientId { get; private set; }
-
-        public string SenderName { get; private set; } = string.Empty;
-
-        public DateTime DateDelivery { get; private set; } = DateTime.Now;
-
-        public string Subject { get; private set; } = string.Empty;
-
-        public string Body { get; private set; } = string.Empty;
-
-        public static MessageInfo? Create(MessageInfoBindingModel model)
-        {
-            if (model == null)
-            {
-                return null;
-            }
-            return new()
-            {
-                Body = model.Body,
-                Subject = model.Subject,
-                ClientId = model.ClientId,
-                MessageId = model.MessageId,
-                SenderName = model.SenderName,
-                DateDelivery = model.DateDelivery,
-            };
-        }
-
-        public MessageInfoViewModel GetViewModel => new()
-        {
-            Body = Body,
-            Subject = Subject,
-            ClientId = ClientId,
-            MessageId = MessageId,
-            SenderName = SenderName,
-            DateDelivery = DateDelivery,
-        };
-    }
-}

FishFactoryRestApi/Controllers/ClientController.cs

@@ -2,6 +2,7 @@
 using FishFactoryContracts.BusinessLogicsContracts;
 using FishFactoryContracts.SearchModels;
 using FishFactoryContracts.ViewModels;
+using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Mvc;
 
 namespace FishFactoryRestApi.Controllers
@@ -12,12 +13,11 @@ namespace FishFactoryRestApi.Controllers
     {
         private readonly ILogger _logger;
         private readonly IClientLogic _logic;
-        private readonly IMessageInfoLogic _mailLogic;
+        public ClientController(IClientLogic logic, ILogger<ClientController>
-        public ClientController(IClientLogic logic, ILogger<ClientController> logger, IMessageInfoLogic mailLogic)
+       logger)
         {
             _logger = logger;
             _logic = logic;
-            _mailLogic = mailLogic;
         }
         [HttpGet]
         public ClientViewModel? Login(string login, string password)
@@ -62,21 +62,5 @@ namespace FishFactoryRestApi.Controllers
                 throw;
             }
         }
-        [HttpGet]
-        public List<MessageInfoViewModel>? GetMessages(int clientId)
-        {
-            try
-            {
-                return _mailLogic.ReadList(new MessageInfoSearchModel
-                {
-                    ClientId = clientId
-                });
-            }
-            catch (Exception ex)
-            {
-                _logger.LogError(ex, "Îøèáêà ïîëó÷åíèÿ ïèñåì êëèåíòà");
-                throw;
-            }
-        }
     }
 }

FishFactoryRestApi/Program.cs

@@ -1,6 +1,4 @@
 using FishFactoryBusinessLogic.BusinessLogic;
-using FishFactoryBusinessLogic.MailWorker;
-using FishFactoryContracts.BindingModels;
 using FishFactoryContracts.BusinessLogicsContracts;
 using FishFactoryContracts.StoragesContracts;
 using FishFactoryDatabaseImplement.Implements;
@@ -15,17 +13,9 @@ builder.Logging.AddLog4Net("log4net.config");
 builder.Services.AddTransient<IClientStorage, ClientStorage>();
 builder.Services.AddTransient<IOrderStorage, OrderStorage>();
 builder.Services.AddTransient<ICannedStorage, CannedStorage>();
-builder.Services.AddTransient<IImplementerStorage, ImplementerStorage>();
-builder.Services.AddTransient<IMessageInfoStorage, MessageInfoStorage>();
-
 builder.Services.AddTransient<IOrderLogic, OrderLogic>();
 builder.Services.AddTransient<IClientLogic, ClientLogic>();
 builder.Services.AddTransient<ICannedLogic, CannedLogic>();
-builder.Services.AddTransient<IImplementerLogic, ImplementerLogic>();
-builder.Services.AddTransient<IMessageInfoLogic, MessageInfoLogic>();
-
-builder.Services.AddTransient<AbstractMailWorker, MailKitWorker>();
-
 builder.Services.AddControllers();
 
 builder.Services.AddEndpointsApiExplorer();
@@ -38,16 +28,6 @@ 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())
 {

FishFactoryRestApi/appsettings.json

@@ -5,12 +5,5 @@
       "Microsoft.AspNetCore": "Warning"
     }
   },
-  "AllowedHosts": "*",
+  "AllowedHosts": "*"
-
-  "SmtpClientHost": "smtp.gmail.com",
-  "SmtpClientPort": "587",
-  "PopHost": "pop.gmail.com",
-  "PopPort": "995",
-  "MailLogin": "labwork7cacawa@gmail.com",
-  "MailPassword": "123"
 }