SushiBar/SushiBar/App.config

@@ -5,7 +5,7 @@
 		<add key="SmtpClientPort" value="587" />
 		<add key="PopHost" value="pop.gmail.com" />
 		<add key="PopPort" value="995" />
-		<add key="MailLogin" value="89176335310x@gmail.com" />
-		<add key="MailPassword" value="wmbu qrgy ocwl tadm" />
+		<add key="MailLogin" value="allresourcesforlab@gmail.com" />
+		<add key="MailPassword" value="eypt yuxk tylv dnpa" />
 	</appSettings>
 </configuration>

SushiBar/SushiBar/FormMain.Designer.cs

@@ -45,6 +45,7 @@
             buttonSetToWork = new Button();
             buttonCreateOrder = new Button();
             dataGridView = new DataGridView();
+            письмаToolStripMenuItem = new ToolStripMenuItem();
             menuStrip.SuspendLayout();
             ((System.ComponentModel.ISupportInitialize)dataGridView).BeginInit();
             SuspendLayout();
@@ -68,41 +69,41 @@
             // ингредиентыToolStripMenuItem
             // 
             ингредиентыToolStripMenuItem.Name = "ингредиентыToolStripMenuItem";
-            ингредиентыToolStripMenuItem.Size = new Size(180, 22);
+            ингредиентыToolStripMenuItem.Size = new Size(154, 22);
             ингредиентыToolStripMenuItem.Text = "Ингредиенты";
             ингредиентыToolStripMenuItem.Click += IngredientsToolStripMenuItem_Click;
             // 
             // сушиToolStripMenuItem
             // 
             сушиToolStripMenuItem.Name = "сушиToolStripMenuItem";
-            сушиToolStripMenuItem.Size = new Size(180, 22);
+            сушиToolStripMenuItem.Size = new Size(154, 22);
             сушиToolStripMenuItem.Text = "Суши";
             сушиToolStripMenuItem.Click += SushiToolStripMenuItem_Click;
             // 
             // клиентыToolStripMenuItem
             // 
             клиентыToolStripMenuItem.Name = "клиентыToolStripMenuItem";
-            клиентыToolStripMenuItem.Size = new Size(180, 22);
+            клиентыToolStripMenuItem.Size = new Size(154, 22);
             клиентыToolStripMenuItem.Text = "Клиенты";
             клиентыToolStripMenuItem.Click += клиентыToolStripMenuItem_Click;
             // 
             // исполнителиToolStripMenuItem
             // 
             исполнителиToolStripMenuItem.Name = "исполнителиToolStripMenuItem";
-            исполнителиToolStripMenuItem.Size = new Size(180, 22);
+            исполнителиToolStripMenuItem.Size = new Size(154, 22);
             исполнителиToolStripMenuItem.Text = "Исполнители";
             исполнителиToolStripMenuItem.Click += employersToolStripMenuItem_Click;
             // 
             // начатьРаботуToolStripMenuItem
             // 
             начатьРаботуToolStripMenuItem.Name = "начатьРаботуToolStripMenuItem";
-            начатьРаботуToolStripMenuItem.Size = new Size(180, 22);
+            начатьРаботуToolStripMenuItem.Size = new Size(154, 22);
             начатьРаботуToolStripMenuItem.Text = "Начать работу";
             начатьРаботуToolStripMenuItem.Click += startWorkToolStripMenuItem_Click;
             // 
             // отчетыToolStripMenuItem
             // 
-            отчетыToolStripMenuItem.DropDownItems.AddRange(new ToolStripItem[] { списокСушиToolStripMenuItem, сушиСИнгредиентамиToolStripMenuItem, списокЗаказовToolStripMenuItem });
+            отчетыToolStripMenuItem.DropDownItems.AddRange(new ToolStripItem[] { списокСушиToolStripMenuItem, сушиСИнгредиентамиToolStripMenuItem, списокЗаказовToolStripMenuItem, письмаToolStripMenuItem });
             отчетыToolStripMenuItem.Name = "отчетыToolStripMenuItem";
             отчетыToolStripMenuItem.Size = new Size(60, 20);
             отчетыToolStripMenuItem.Text = "Отчеты";
@@ -200,6 +201,13 @@
             dataGridView.Size = new Size(919, 426);
             dataGridView.TabIndex = 7;
             // 
+            // письмаToolStripMenuItem
+            // 
+            письмаToolStripMenuItem.Name = "письмаToolStripMenuItem";
+            письмаToolStripMenuItem.Size = new Size(203, 22);
+            письмаToolStripMenuItem.Text = "Письма";
+            письмаToolStripMenuItem.Click += письмаToolStripMenuItem_Click;
+            // 
             // FormMain
             // 
             AutoScaleDimensions = new SizeF(7F, 15F);
@@ -242,5 +250,6 @@
         private ToolStripMenuItem клиентыToolStripMenuItem;
         private ToolStripMenuItem исполнителиToolStripMenuItem;
         private ToolStripMenuItem начатьРаботуToolStripMenuItem;
+        private ToolStripMenuItem письмаToolStripMenuItem;
     }
 }

SushiBar/SushiBar/FormMain.cs

@@ -34,7 +34,8 @@ namespace SushiBarView
                 {
                     dataGridView.DataSource = list;
                     dataGridView.Columns["SushiId"].Visible = false;
-                    dataGridView.Columns["Implementerid"].Visible=false;
+                    dataGridView.Columns["Implementerid"].Visible = false;
+                    dataGridView.Columns["ClientEmail"].Visible = false;
                 }
                 _logger.LogInformation("Загрузка заказов");
             }
@@ -199,5 +200,14 @@ namespace SushiBarView
             _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(FormViewMail));
+            if (service is FormViewMail form)
+            {
+                form.ShowDialog();
+            }
+        }
     }
 }

SushiBar/SushiBar/FormViewMail.Designer.cs

@@ -0,0 +1,61 @@
+namespace SushiBarView
+{
+    partial class FormViewMail
+    {
+        /// <summary>
+        /// Required designer variable.
+        /// </summary>
+        private System.ComponentModel.IContainer components = null;
+
+        /// <summary>
+        /// Clean up any resources being used.
+        /// </summary>
+        /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
+        protected override void Dispose(bool disposing)
+        {
+            if (disposing && (components != null))
+            {
+                components.Dispose();
+            }
+            base.Dispose(disposing);
+        }
+
+        #region Windows Form Designer generated code
+
+        /// <summary>
+        /// Required method for Designer support - do not modify
+        /// the contents of this method with the code editor.
+        /// </summary>
+        private void InitializeComponent()
+        {
+            dataGridView = new DataGridView();
+            ((System.ComponentModel.ISupportInitialize)dataGridView).BeginInit();
+            SuspendLayout();
+            // 
+            // dataGridView
+            // 
+            dataGridView.ColumnHeadersHeightSizeMode = DataGridViewColumnHeadersHeightSizeMode.AutoSize;
+            dataGridView.Dock = DockStyle.Fill;
+            dataGridView.Location = new Point(0, 0);
+            dataGridView.Name = "dataGridView";
+            dataGridView.Size = new Size(800, 450);
+            dataGridView.TabIndex = 0;
+            // 
+            // FormViewMail
+            // 
+            AutoScaleDimensions = new SizeF(7F, 15F);
+            AutoScaleMode = AutoScaleMode.Font;
+            ClientSize = new Size(800, 450);
+            Controls.Add(dataGridView);
+            Name = "FormViewMail";
+            Text = "FormViewMail";
+            Load += FormViewMail_Load;
+            ((System.ComponentModel.ISupportInitialize)dataGridView).EndInit();
+            ResumeLayout(false);
+        }
+
+        #endregion
+
+        private DataGridView dataGridView;
+    }
+}

SushiBar/SushiBar/FormViewMail.cs

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

SushiBar/SushiBar/FormViewMail.resx

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

SushiBar/SushiBar/Program.cs

@@ -88,6 +88,7 @@ namespace SushiBarView
             services.AddTransient<FormReportOrders>(); 
             services.AddTransient<FormImplementers>();
             services.AddTransient<FormImplementer>();
+            services.AddTransient<FormViewMail>();
 
 
             services.AddTransient<AbstractSaveToExcel, SaveToExcel>();

SushiBar/SushiBar/SushiBarView.csproj

@@ -29,4 +29,10 @@
     <ProjectReference Include="..\SushiBarListImplement\SushiBarListImplement.csproj" />
   </ItemGroup>
 
+  <ItemGroup>
+    <None Update="App.config">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </None>
+  </ItemGroup>
+
 </Project>

SushiBar/SushiBarBusinessLogic/BusinessLogics/MessageInfoLogic.cs

@@ -59,15 +59,10 @@ namespace SushiBarBusinessLogic
 			{
 				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
 			{

SushiBar/SushiBarBusinessLogic/MailWorker/MailKitWorker.cs

@@ -32,7 +32,7 @@ namespace SushiBarBusinessLogic.MailWorker
                 objSmtpClient.DeliveryMethod = SmtpDeliveryMethod.Network;
                 objSmtpClient.Credentials = new NetworkCredential(_mailLogin, _mailPassword);
 
-                await Task.Run(() => objSmtpClient.Send(objMailMessage));
+                await Task.Run(() => objSmtpClient.Send(objMailMessage));////// вот тут выдаёт ошибку
             }
             catch (Exception)
             {

SushiBar/SushiBarDatabaseImplement/Implements/MessageInfoStorage.cs

@@ -23,17 +23,13 @@ namespace SushiBarDatabaseImplement.Implements
         {
             using var context = new SushiBarDatabase();
             return context.Messages
-                .Where(x => x.ClientId == model.ClientId)
-                .Select(x => x.GetViewModel)
-                .ToList();
+                .Where(x => x.ClientId == model.ClientId).Select(x => x.GetViewModel).ToList();
         }
 
         public List<MessageInfoViewModel> GetFullList()
         {
             using var context = new SushiBarDatabase();
-            return context.Messages
-                .Select(x => x.GetViewModel)
-                .ToList();
+            return context.Messages.Select(x => x.GetViewModel).ToList();
         }
 
         public MessageInfoViewModel? Insert(MessageInfoBindingModel model)

SushiBar/SushiBarDatabaseImplement/Models/MessageInfo.cs

@@ -11,7 +11,7 @@ namespace SushiBarDatabaseImplement.Models
         [Key]
         public string MessageId { get; private set; } = string.Empty;
 
-        public int? ClientId { get; private set; } 
+        public int? ClientId { get; private set; }
 
         public string SenderName { get; private set; } = string.Empty;
 

SushiBar/SushiBarRestApi/appsettings.json

@@ -10,6 +10,6 @@
   "SmtpClientPort": "587",
   "PopHost": "pop.gmail.com",
   "PopPort": "995",
-  "MailLogin": "89176335310x@gmail.com",
-  "MailPassword": "wmbu qrgy ocwl tadm"
+  "MailLogin": "allresourcesforlab@gmail.com",
+  "MailPassword": "eypt yuxk tylv dnpa"
 }