LawFirm/LawFirm/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="ulstulabs4me@gmail.com" />
-		<add key="MailPassword" value="fmir rydi kqvu lklv" />
-	</appSettings>
-</configuration>

LawFirm/LawFirm/FormMails.Designer.cs

@@ -1,62 +0,0 @@
-namespace LawFirmView
-{
-	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.ColumnHeadersHeightSizeMode = DataGridViewColumnHeadersHeightSizeMode.AutoSize;
-			dataGridView.Location = new Point(12, 12);
-			dataGridView.Name = "dataGridView";
-			dataGridView.RowHeadersWidth = 51;
-			dataGridView.RowTemplate.Height = 29;
-			dataGridView.Size = new Size(776, 426);
-			dataGridView.TabIndex = 0;
-			// 
-			// FormMails
-			// 
-			AutoScaleDimensions = new SizeF(8F, 20F);
-			AutoScaleMode = AutoScaleMode.Font;
-			ClientSize = new Size(800, 450);
-			Controls.Add(dataGridView);
-			Name = "FormMails";
-			Text = "Письма";
-			Load += FormMails_Load;
-			((System.ComponentModel.ISupportInitialize)dataGridView).EndInit();
-			ResumeLayout(false);
-		}
-
-		#endregion
-
-		private DataGridView dataGridView;
-	}
-}

LawFirm/LawFirm/FormMails.cs

@@ -1,49 +0,0 @@
-using LawFirmContracts.BusinessLogicContracts;
-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 LawFirmView
-{
-	public partial class FormMails : Form
-	{
-		private readonly ILogger _logger;
-		private readonly IMessageInfoLogic _logic;
-
-		public FormMails(ILogger<FormMails> logger, IMessageInfoLogic logic)
-		{
-			InitializeComponent();
-			_logger = logger;
-			_logic = logic;
-		}
-
-		private void FormMails_Load(object sender, EventArgs e)
-		{
-			try
-			{
-				var list = _logic.ReadList(null);
-				if (list != null)
-				{
-					dataGridView.DataSource = list;
-					dataGridView.Columns["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);
-			}
-		}
-	}
-}

LawFirm/LawFirm/FormMails.resx

@@ -1,60 +0,0 @@
-<root>
-  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
-    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
-    <xsd:element name="root" msdata:IsDataSet="true">
-      <xsd:complexType>
-        <xsd:choice maxOccurs="unbounded">
-          <xsd:element name="metadata">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" />
-              </xsd:sequence>
-              <xsd:attribute name="name" use="required" type="xsd:string" />
-              <xsd:attribute name="type" type="xsd:string" />
-              <xsd:attribute name="mimetype" type="xsd:string" />
-              <xsd:attribute ref="xml:space" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="assembly">
-            <xsd:complexType>
-              <xsd:attribute name="alias" type="xsd:string" />
-              <xsd:attribute name="name" type="xsd:string" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="data">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
-              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
-              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
-              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
-              <xsd:attribute ref="xml:space" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="resheader">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" use="required" />
-            </xsd:complexType>
-          </xsd:element>
-        </xsd:choice>
-      </xsd:complexType>
-    </xsd:element>
-  </xsd:schema>
-  <resheader name="resmimetype">
-    <value>text/microsoft-resx</value>
-  </resheader>
-  <resheader name="version">
-    <value>2.0</value>
-  </resheader>
-  <resheader name="reader">
-    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </resheader>
-  <resheader name="writer">
-    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </resheader>
-</root>

LawFirm/LawFirm/FormMain.Designer.cs

@@ -28,172 +28,175 @@
         /// </summary>
         private void InitializeComponent()
         {
-			menuStrip = new MenuStrip();
+			this.menuStrip = new System.Windows.Forms.MenuStrip();
-			справочникиToolStripMenuItem = new ToolStripMenuItem();
+			this.справочникиToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-			бланкиToolStripMenuItem = new ToolStripMenuItem();
+			this.бланкиToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-			документыToolStripMenuItem = new ToolStripMenuItem();
+			this.документыToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-			клиентыToolStripMenuItem = new ToolStripMenuItem();
+			this.клиентыToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-			исполнителиToolStripMenuItem = new ToolStripMenuItem();
+			this.исполнителиToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-			отчетыToolStripMenuItem = new ToolStripMenuItem();
+			this.отчетыToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-			списокДокументовToolStripMenuItem = new ToolStripMenuItem();
+			this.списокДокументовToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-			бланкиПоДокументамToolStripMenuItem = new ToolStripMenuItem();
+			this.бланкиПоДокументамToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-			списокЗаказовToolStripMenuItem = new ToolStripMenuItem();
+			this.списокЗаказовToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-			запускРаботToolStripMenuItem = new ToolStripMenuItem();
+			this.запускРаботToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-			dataGridView = new DataGridView();
+			this.dataGridView = new System.Windows.Forms.DataGridView();
-			buttonCreateOrder = new Button();
+			this.buttonCreateOrder = new System.Windows.Forms.Button();
-			buttonSetToFinish = new Button();
+			this.buttonSetToFinish = new System.Windows.Forms.Button();
-			buttonUpdate = new Button();
+			this.buttonUpdate = new System.Windows.Forms.Button();
-			письмаToolStripMenuItem = new ToolStripMenuItem();
+			this.menuStrip.SuspendLayout();
-			menuStrip.SuspendLayout();
+			((System.ComponentModel.ISupportInitialize)(this.dataGridView)).BeginInit();
-			((System.ComponentModel.ISupportInitialize)dataGridView).BeginInit();
+			this.SuspendLayout();
-			SuspendLayout();
 			// 
 			// menuStrip
 			// 
-			menuStrip.ImageScalingSize = new Size(20, 20);
+			this.menuStrip.ImageScalingSize = new System.Drawing.Size(20, 20);
-			menuStrip.Items.AddRange(new ToolStripItem[] { справочникиToolStripMenuItem, отчетыToolStripMenuItem, запускРаботToolStripMenuItem });
+			this.menuStrip.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
-			menuStrip.Location = new Point(0, 0);
+            this.справочникиToolStripMenuItem,
-			menuStrip.Name = "menuStrip";
+            this.отчетыToolStripMenuItem,
-			menuStrip.Size = new Size(1139, 28);
+            this.запускРаботToolStripMenuItem});
-			menuStrip.TabIndex = 0;
+			this.menuStrip.Location = new System.Drawing.Point(0, 0);
-			menuStrip.Text = "Справочники";
+			this.menuStrip.Name = "menuStrip";
+			this.menuStrip.Size = new System.Drawing.Size(1139, 28);
+			this.menuStrip.TabIndex = 0;
+			this.menuStrip.Text = "Справочники";
 			// 
 			// справочникиToolStripMenuItem
 			// 
-			справочникиToolStripMenuItem.DropDownItems.AddRange(new ToolStripItem[] { бланкиToolStripMenuItem, документыToolStripMenuItem, клиентыToolStripMenuItem, исполнителиToolStripMenuItem, письмаToolStripMenuItem });
+			this.справочникиToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
-			справочникиToolStripMenuItem.Name = "справочникиToolStripMenuItem";
+            this.бланкиToolStripMenuItem,
-			справочникиToolStripMenuItem.Size = new Size(117, 24);
+            this.документыToolStripMenuItem,
-			справочникиToolStripMenuItem.Text = "Справочники";
+            this.клиентыToolStripMenuItem,
+            this.исполнителиToolStripMenuItem});
+			this.справочникиToolStripMenuItem.Name = "справочникиToolStripMenuItem";
+			this.справочникиToolStripMenuItem.Size = new System.Drawing.Size(117, 24);
+			this.справочникиToolStripMenuItem.Text = "Справочники";
 			// 
 			// бланкиToolStripMenuItem
 			// 
-			бланкиToolStripMenuItem.Name = "бланкиToolStripMenuItem";
+			this.бланкиToolStripMenuItem.Name = "бланкиToolStripMenuItem";
-			бланкиToolStripMenuItem.Size = new Size(224, 26);
+			this.бланкиToolStripMenuItem.Size = new System.Drawing.Size(185, 26);
-			бланкиToolStripMenuItem.Text = "Бланки";
+			this.бланкиToolStripMenuItem.Text = "Бланки";
-			бланкиToolStripMenuItem.Click += бланкиToolStripMenuItem_Click;
+			this.бланкиToolStripMenuItem.Click += new System.EventHandler(this.бланкиToolStripMenuItem_Click);
 			// 
 			// документыToolStripMenuItem
 			// 
-			документыToolStripMenuItem.Name = "документыToolStripMenuItem";
+			this.документыToolStripMenuItem.Name = "документыToolStripMenuItem";
-			документыToolStripMenuItem.Size = new Size(224, 26);
+			this.документыToolStripMenuItem.Size = new System.Drawing.Size(185, 26);
-			документыToolStripMenuItem.Text = "Документы";
+			this.документыToolStripMenuItem.Text = "Документы";
-			документыToolStripMenuItem.Click += документыToolStripMenuItem_Click;
+			this.документыToolStripMenuItem.Click += new System.EventHandler(this.документыToolStripMenuItem_Click);
 			// 
 			// клиентыToolStripMenuItem
 			// 
-			клиентыToolStripMenuItem.Name = "клиентыToolStripMenuItem";
+			this.клиентыToolStripMenuItem.Name = "клиентыToolStripMenuItem";
-			клиентыToolStripMenuItem.Size = new Size(224, 26);
+			this.клиентыToolStripMenuItem.Size = new System.Drawing.Size(185, 26);
-			клиентыToolStripMenuItem.Text = "Клиенты";
+			this.клиентыToolStripMenuItem.Text = "Клиенты";
-			клиентыToolStripMenuItem.Click += клиентыToolStripMenuItem_Click;
+			this.клиентыToolStripMenuItem.Click += new System.EventHandler(this.клиентыToolStripMenuItem_Click);
 			// 
 			// исполнителиToolStripMenuItem
 			// 
-			исполнителиToolStripMenuItem.Name = "исполнителиToolStripMenuItem";
+			this.исполнителиToolStripMenuItem.Name = "исполнителиToolStripMenuItem";
-			исполнителиToolStripMenuItem.Size = new Size(224, 26);
+			this.исполнителиToolStripMenuItem.Size = new System.Drawing.Size(185, 26);
-			исполнителиToolStripMenuItem.Text = "Исполнители";
+			this.исполнителиToolStripMenuItem.Text = "Исполнители";
-			исполнителиToolStripMenuItem.Click += исполнителиToolStripMenuItem_Click;
+			this.исполнителиToolStripMenuItem.Click += new System.EventHandler(this.исполнителиToolStripMenuItem_Click);
 			// 
 			// отчетыToolStripMenuItem
 			// 
-			отчетыToolStripMenuItem.DropDownItems.AddRange(new ToolStripItem[] { списокДокументовToolStripMenuItem, бланкиПоДокументамToolStripMenuItem, списокЗаказовToolStripMenuItem });
+			this.отчетыToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
-			отчетыToolStripMenuItem.Name = "отчетыToolStripMenuItem";
+            this.списокДокументовToolStripMenuItem,
-			отчетыToolStripMenuItem.Size = new Size(73, 24);
+            this.бланкиПоДокументамToolStripMenuItem,
-			отчетыToolStripMenuItem.Text = "Отчеты";
+            this.списокЗаказовToolStripMenuItem});
+			this.отчетыToolStripMenuItem.Name = "отчетыToolStripMenuItem";
+			this.отчетыToolStripMenuItem.Size = new System.Drawing.Size(73, 24);
+			this.отчетыToolStripMenuItem.Text = "Отчеты";
 			// 
 			// списокДокументовToolStripMenuItem
 			// 
-			списокДокументовToolStripMenuItem.Name = "списокДокументовToolStripMenuItem";
+			this.списокДокументовToolStripMenuItem.Name = "списокДокументовToolStripMenuItem";
-			списокДокументовToolStripMenuItem.Size = new Size(252, 26);
+			this.списокДокументовToolStripMenuItem.Size = new System.Drawing.Size(252, 26);
-			списокДокументовToolStripMenuItem.Text = "Список документов";
+			this.списокДокументовToolStripMenuItem.Text = "Список документов";
-			списокДокументовToolStripMenuItem.Click += списокДокументовToolStripMenuItem_Click;
+			this.списокДокументовToolStripMenuItem.Click += new System.EventHandler(this.списокДокументовToolStripMenuItem_Click);
 			// 
 			// бланкиПоДокументамToolStripMenuItem
 			// 
-			бланкиПоДокументамToolStripMenuItem.Name = "бланкиПоДокументамToolStripMenuItem";
+			this.бланкиПоДокументамToolStripMenuItem.Name = "бланкиПоДокументамToolStripMenuItem";
-			бланкиПоДокументамToolStripMenuItem.Size = new Size(252, 26);
+			this.бланкиПоДокументамToolStripMenuItem.Size = new System.Drawing.Size(252, 26);
-			бланкиПоДокументамToolStripMenuItem.Text = "Бланки по документам";
+			this.бланкиПоДокументамToolStripMenuItem.Text = "Бланки по документам";
-			бланкиПоДокументамToolStripMenuItem.Click += бланкиПоДокументамToolStripMenuItem_Click;
+			this.бланкиПоДокументамToolStripMenuItem.Click += new System.EventHandler(this.бланкиПоДокументамToolStripMenuItem_Click);
 			// 
 			// списокЗаказовToolStripMenuItem
 			// 
-			списокЗаказовToolStripMenuItem.Name = "списокЗаказовToolStripMenuItem";
+			this.списокЗаказовToolStripMenuItem.Name = "списокЗаказовToolStripMenuItem";
-			списокЗаказовToolStripMenuItem.Size = new Size(252, 26);
+			this.списокЗаказовToolStripMenuItem.Size = new System.Drawing.Size(252, 26);
-			списокЗаказовToolStripMenuItem.Text = "Список заказов";
+			this.списокЗаказовToolStripMenuItem.Text = "Список заказов";
-			списокЗаказовToolStripMenuItem.Click += списокЗаказовToolStripMenuItem_Click;
+			this.списокЗаказовToolStripMenuItem.Click += new System.EventHandler(this.списокЗаказовToolStripMenuItem_Click);
 			// 
 			// запускРаботToolStripMenuItem
 			// 
-			запускРаботToolStripMenuItem.Name = "запускРаботToolStripMenuItem";
+			this.запускРаботToolStripMenuItem.Name = "запускРаботToolStripMenuItem";
-			запускРаботToolStripMenuItem.Size = new Size(114, 24);
+			this.запускРаботToolStripMenuItem.Size = new System.Drawing.Size(114, 24);
-			запускРаботToolStripMenuItem.Text = "Запуск работ";
+			this.запускРаботToolStripMenuItem.Text = "Запуск работ";
-			запускРаботToolStripMenuItem.Click += запускРаботToolStripMenuItem_Click;
+			this.запускРаботToolStripMenuItem.Click += new System.EventHandler(this.запускРаботToolStripMenuItem_Click);
 			// 
 			// dataGridView
 			// 
-			dataGridView.ColumnHeadersHeightSizeMode = DataGridViewColumnHeadersHeightSizeMode.AutoSize;
+			this.dataGridView.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
-			dataGridView.Location = new Point(12, 31);
+			this.dataGridView.Location = new System.Drawing.Point(12, 31);
-			dataGridView.Name = "dataGridView";
+			this.dataGridView.Name = "dataGridView";
-			dataGridView.RowHeadersWidth = 51;
+			this.dataGridView.RowHeadersWidth = 51;
-			dataGridView.RowTemplate.Height = 29;
+			this.dataGridView.RowTemplate.Height = 29;
-			dataGridView.Size = new Size(915, 407);
+			this.dataGridView.Size = new System.Drawing.Size(915, 407);
-			dataGridView.TabIndex = 1;
+			this.dataGridView.TabIndex = 1;
 			// 
 			// buttonCreateOrder
 			// 
-			buttonCreateOrder.Location = new Point(933, 45);
+			this.buttonCreateOrder.Location = new System.Drawing.Point(933, 45);
-			buttonCreateOrder.Name = "buttonCreateOrder";
+			this.buttonCreateOrder.Name = "buttonCreateOrder";
-			buttonCreateOrder.Size = new Size(194, 29);
+			this.buttonCreateOrder.Size = new System.Drawing.Size(194, 29);
-			buttonCreateOrder.TabIndex = 2;
+			this.buttonCreateOrder.TabIndex = 2;
-			buttonCreateOrder.Text = "Создать заказ";
+			this.buttonCreateOrder.Text = "Создать заказ";
-			buttonCreateOrder.UseVisualStyleBackColor = true;
+			this.buttonCreateOrder.UseVisualStyleBackColor = true;
-			buttonCreateOrder.Click += buttonCreateOrder_Click;
+			this.buttonCreateOrder.Click += new System.EventHandler(this.buttonCreateOrder_Click);
 			// 
 			// buttonSetToFinish
 			// 
-			buttonSetToFinish.Location = new Point(933, 80);
+			this.buttonSetToFinish.Location = new System.Drawing.Point(933, 80);
-			buttonSetToFinish.Name = "buttonSetToFinish";
+			this.buttonSetToFinish.Name = "buttonSetToFinish";
-			buttonSetToFinish.Size = new Size(194, 29);
+			this.buttonSetToFinish.Size = new System.Drawing.Size(194, 29);
-			buttonSetToFinish.TabIndex = 5;
+			this.buttonSetToFinish.TabIndex = 5;
-			buttonSetToFinish.Text = "Заказ выдан";
+			this.buttonSetToFinish.Text = "Заказ выдан";
-			buttonSetToFinish.UseVisualStyleBackColor = true;
+			this.buttonSetToFinish.UseVisualStyleBackColor = true;
-			buttonSetToFinish.Click += buttonSetToFinish_Click;
+			this.buttonSetToFinish.Click += new System.EventHandler(this.buttonSetToFinish_Click);
 			// 
 			// buttonUpdate
 			// 
-			buttonUpdate.Location = new Point(933, 410);
+			this.buttonUpdate.Location = new System.Drawing.Point(933, 410);
-			buttonUpdate.Name = "buttonUpdate";
+			this.buttonUpdate.Name = "buttonUpdate";
-			buttonUpdate.Size = new Size(194, 29);
+			this.buttonUpdate.Size = new System.Drawing.Size(194, 29);
-			buttonUpdate.TabIndex = 6;
+			this.buttonUpdate.TabIndex = 6;
-			buttonUpdate.Text = "Обновить";
+			this.buttonUpdate.Text = "Обновить";
-			buttonUpdate.UseVisualStyleBackColor = true;
+			this.buttonUpdate.UseVisualStyleBackColor = true;
-			buttonUpdate.Click += buttonUpdate_Click;
+			this.buttonUpdate.Click += new System.EventHandler(this.buttonUpdate_Click);
-			// 
-			// письмаToolStripMenuItem
-			// 
-			письмаToolStripMenuItem.Name = "письмаToolStripMenuItem";
-			письмаToolStripMenuItem.Size = new Size(224, 26);
-			письмаToolStripMenuItem.Text = "Письма";
-			письмаToolStripMenuItem.Click += письмаToolStripMenuItem_Click;
 			// 
 			// FormMain
 			// 
-			AutoScaleDimensions = new SizeF(8F, 20F);
+			this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 20F);
-			AutoScaleMode = AutoScaleMode.Font;
+			this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-			ClientSize = new Size(1139, 450);
+			this.ClientSize = new System.Drawing.Size(1139, 450);
-			Controls.Add(buttonUpdate);
+			this.Controls.Add(this.buttonUpdate);
-			Controls.Add(buttonSetToFinish);
+			this.Controls.Add(this.buttonSetToFinish);
-			Controls.Add(buttonCreateOrder);
+			this.Controls.Add(this.buttonCreateOrder);
-			Controls.Add(dataGridView);
+			this.Controls.Add(this.dataGridView);
-			Controls.Add(menuStrip);
+			this.Controls.Add(this.menuStrip);
-			MainMenuStrip = menuStrip;
+			this.MainMenuStrip = this.menuStrip;
-			Name = "FormMain";
+			this.Name = "FormMain";
-			Text = "Юридическая компания";
+			this.Text = "Юридическая компания";
-			Load += FormMain_Load;
+			this.Load += new System.EventHandler(this.FormMain_Load);
-			menuStrip.ResumeLayout(false);
+			this.menuStrip.ResumeLayout(false);
-			menuStrip.PerformLayout();
+			this.menuStrip.PerformLayout();
-			((System.ComponentModel.ISupportInitialize)dataGridView).EndInit();
+			((System.ComponentModel.ISupportInitialize)(this.dataGridView)).EndInit();
-			ResumeLayout(false);
+			this.ResumeLayout(false);
-			PerformLayout();
+			this.PerformLayout();
+
         }
 
         #endregion
@@ -213,6 +216,5 @@
         private ToolStripMenuItem клиентыToolStripMenuItem;
         private ToolStripMenuItem исполнителиToolStripMenuItem;
         private ToolStripMenuItem запускРаботToolStripMenuItem;
-		private ToolStripMenuItem письмаToolStripMenuItem;
     }
 }

LawFirm/LawFirm/FormMain.cs

@@ -174,14 +174,5 @@ namespace LawFirmView
             MessageBox.Show("Процесс обработки запущен", "Сообщение", MessageBoxButtons.OK, MessageBoxIcon.Information);
 
         }
-
-		private void письмаToolStripMenuItem_Click(object sender, EventArgs e)
-		{
-			var service = Program.ServiceProvider?.GetService(typeof(FormMails));
-			if (service is FormMails form)
-			{
-				form.ShowDialog();
-			}
-		}
     }
 }

LawFirm/LawFirm/LawFirmView.csproj

@@ -8,14 +8,6 @@
     <ImplicitUsings>enable</ImplicitUsings>
   </PropertyGroup>
 
-  <ItemGroup>
-    <None Remove="App.config" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <Content Include="App.config" />
-  </ItemGroup>
-
   <ItemGroup>
     <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="7.0.3">
       <PrivateAssets>all</PrivateAssets>

LawFirm/LawFirm/Program.cs

@@ -1,8 +1,6 @@
 using LawFirmBusinessLogic.BusinessLogics;
-using LawFirmBusinessLogic.MailWorker;
 using LawFirmBusinessLogic.OfficePackage;
 using LawFirmBusinessLogic.OfficePackage.Implements;
-using LawFirmContracts.BindingModels;
 using LawFirmContracts.BusinessLogicContracts;
 using LawFirmContracts.StorageContracts;
 using LawFirmDatabaseImplement.Implements;
@@ -32,32 +30,9 @@ namespace LawFirm
             ConfigureServices(services);
             _serviceProvider = services.BuildServiceProvider();
 
-			try
-			{
-				var mailSender = _serviceProvider.GetService<AbstractMailWorker>();
-				mailSender?.MailConfig(new MailConfigBindingModel
-				{
-					MailLogin = System.Configuration.ConfigurationManager.AppSettings["MailLogin"] ?? string.Empty,
-					MailPassword = System.Configuration.ConfigurationManager.AppSettings["MailPassword"] ?? string.Empty,
-					SmtpClientHost =System.Configuration.ConfigurationManager.AppSettings["SmtpClientHost"] ?? string.Empty,
-					SmtpClientPort = Convert.ToInt32(System.Configuration.ConfigurationManager.AppSettings["SmtpClientPort"]),
-				    PopHost = System.Configuration.ConfigurationManager.AppSettings["PopHost"] ?? string.Empty,
-				    PopPort = Convert.ToInt32(System.Configuration.ConfigurationManager.AppSettings["PopPort"])
-				});
-				// ñîçäàåì òàéìåð
-				var timer = new System.Threading.Timer(new TimerCallback(MailCheck!), null, 0, 100000);
-			}
-			catch (Exception ex)
-			{
-				var logger = _serviceProvider.GetService<ILogger>();
-				logger?.LogError(ex, "Îøèáêà ðàáîòû ñ ïî÷òîé");
-			}
-
             Application.Run(_serviceProvider.GetRequiredService<FormMain>());
         }
 
-		private static void MailCheck(object obj) => ServiceProvider?.GetService<AbstractMailWorker>()?.MailCheck();
-
         private static void ConfigureServices(ServiceCollection services)
         {
             services.AddLogging(option =>
@@ -70,7 +45,6 @@ namespace LawFirm
             services.AddTransient<IDocumentStorage, DocumentStorage>();
             services.AddTransient<IClientStorage, ClientStorage>();
             services.AddTransient<IImplementerStorage, ImplementerStorage>();
-			services.AddTransient<IMessageInfoStorage, MessageInfoStorage>();
 
             services.AddTransient<IBlankLogic, BlankLogic>();
             services.AddTransient<IOrderLogic, OrderLogic>();
@@ -79,14 +53,11 @@ namespace LawFirm
             services.AddTransient<IClientLogic, ClientLogic>();
             services.AddTransient<IImplementerLogic, ImplementerLogic>();
             services.AddTransient<IWorkProcess, WorkModeling>();
-			services.AddTransient<IMessageInfoLogic, MessageInfoLogic>();
 
             services.AddTransient<AbstractSaveToWord, SaveToWord>();
             services.AddTransient<AbstractSaveToExcel, SaveToExcel>();
             services.AddTransient<AbstractSaveToPdf, SaveToPdf>();
 
-			services.AddSingleton<AbstractMailWorker, MailKitWorker>();
-
             services.AddTransient<FormMain>();
             services.AddTransient<FormBlank>();
             services.AddTransient<FormBlanks>();
@@ -99,8 +70,6 @@ namespace LawFirm
             services.AddTransient<FormClients>();
             services.AddTransient<FormImplementers>();
             services.AddTransient<FormImplementer>();
-			services.AddTransient<FormMails>();
-    
         }
 
     }

LawFirm/LawFirmBusinessLogic/BusinessLogics/ClientLogic.cs

@@ -8,7 +8,6 @@ using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
-using System.Text.RegularExpressions;
 using System.Threading.Tasks;
 
 namespace LawFirmBusinessLogic.BusinessLogics
@@ -103,14 +102,6 @@ namespace LawFirmBusinessLogic.BusinessLogics
             if (string.IsNullOrEmpty(model.Email))
             {
                 throw new ArgumentNullException("Нет логина(почты) клиента", nameof(model.Email));
-            }
-			if (!Regex.IsMatch(model.Email, @"^[\w-\.]+@([\w-]+\.)+[\w-]{2,4}$"))
-			{
-				throw new ArgumentException("Некорретно введен email клиента", nameof(model.Email));
-			}
-			if (!Regex.IsMatch(model.Password, @"^(?=.*\d)(?=.*\W)(?=.*[^\d\s]).+$"))
-			{
-				throw new ArgumentException("Некорректно введен пароль клиента", nameof(model.Password));
             }
             _logger.LogInformation("Client. Id: {Id}, FIO: {fio}, email: {email}", model.Id, model.ClientFIO, model.Email);
             var element = _clientStorage.GetElement(new ClientSearchModel

LawFirm/LawFirmBusinessLogic/BusinessLogics/MessageInfoLogic.cs

@@ -1,48 +0,0 @@
-using LawFirmContracts.BindingModels;
-using LawFirmContracts.BusinessLogicContracts;
-using LawFirmContracts.SearchModels;
-using LawFirmContracts.StorageContracts;
-using LawFirmContracts.ViewModels;
-using Microsoft.Extensions.Logging;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace LawFirmBusinessLogic.BusinessLogics
-{
-	public class MessageInfoLogic : IMessageInfoLogic
-	{
-		private readonly ILogger _logger;
-		private readonly IMessageInfoStorage _messageInfoStorage;
-		public MessageInfoLogic(ILogger<MessageInfoLogic> logger, IMessageInfoStorage MessageInfoStorage)
-		{
-			_logger = logger;
-			_messageInfoStorage = MessageInfoStorage;
-		}
-
-		public bool Create(MessageInfoBindingModel model)
-		{
-			if (_messageInfoStorage.Insert(model) == null)
-			{
-				_logger.LogWarning("Insert operation failed");
-				return false;
-			}
-			return true;
-		}
-
-		public List<MessageInfoViewModel>? ReadList(MessageInfoSearchModel? model)
-		{
-			_logger.LogInformation("ReadList. MessageId:{MessageId}.ClientId:{ClientId} ", model?.MessageId, model?.ClientId);
-			var list = (model == null) ? _messageInfoStorage.GetFullList() : _messageInfoStorage.GetFilteredList(model);
-			if (list == null)
-			{
-				_logger.LogWarning("ReadList return null list");
-				return null;
-			}
-			_logger.LogInformation("ReadList. Count:{Count}", list.Count);
-			return list;
-		}
-	}
-}

LawFirm/LawFirmBusinessLogic/BusinessLogics/OrderLogic.cs

@@ -1,5 +1,4 @@
-using LawFirmBusinessLogic.MailWorker;
+using LawFirmContracts.BindingModels;
-using LawFirmContracts.BindingModels;
 using LawFirmContracts.BusinessLogicContracts;
 using LawFirmContracts.SearchModels;
 using LawFirmContracts.StorageContracts;
@@ -18,15 +17,11 @@ namespace LawFirmBusinessLogic.BusinessLogics
     {
         private readonly ILogger _logger;
         private readonly IOrderStorage _orderStorage;
-		private readonly AbstractMailWorker _mailWorker;
-		private readonly IClientLogic _clientLogic;
 
-		public OrderLogic(ILogger<OrderLogic> logger, IOrderStorage orderStorage, AbstractMailWorker mailWorker, IClientLogic clientLogic)
+        public OrderLogic(ILogger<OrderLogic> logger, IOrderStorage orderStorage)
         {
             _logger = logger;
             _orderStorage = orderStorage;
-			_mailWorker = mailWorker;
-			_clientLogic = clientLogic;
         }
 
         public bool CreateOrder(OrderBindingModel model)
@@ -38,14 +33,12 @@ namespace LawFirmBusinessLogic.BusinessLogics
                 return false;
             }
             model.Status = OrderStatus.Принят;
-            var result = _orderStorage.Insert(model);
+            if (_orderStorage.Insert(model) == null)
-			if (result == null)
             {
                 model.Status = OrderStatus.Неизвестен;
                 _logger.LogWarning("Insert operation failed");
                 return false;
             }
-			SendOrderStatusMail(result.ClientId, $"Новый заказ создан. Номер заказа #{result.Id}", $"Заказ #{result.Id} от {result.DateCreate} на сумму {result.Sum:0.00} принят");
             return true;
         }
 
@@ -85,14 +78,12 @@ namespace LawFirmBusinessLogic.BusinessLogics
             }
             model.Status = newStatus;
             if (model.Status == OrderStatus.Выдан) model.DateImplement = DateTime.Now;
-            var result = _orderStorage.Update(model);
+            if (_orderStorage.Update(model) == null)
-            if (result == null)
             {
                 model.Status--;
                 _logger.LogWarning("Update operation failed");
                 return false;
             }
-			SendOrderStatusMail(result.ClientId, $"Изменен статус заказа #{result.Id}", $"Заказ #{result.Id} изменен статус на {result.Status}");
             return true;
         }
 
@@ -140,22 +131,6 @@ namespace LawFirmBusinessLogic.BusinessLogics
             return element;
         }
 
-		private bool SendOrderStatusMail(int clientId, string subject, string text)
-		{
-			var client = _clientLogic.ReadElement(new() { Id = clientId });
-			if (client == null)
-			{
-				return false;
-			}
-			_mailWorker.MailSendAsync(new()
-			{
-				MailAddress = client.Email,
-				Subject = subject,
-				Text = text
-			});
-			return true;
-		}
-
         private void CheckModel(OrderBindingModel model, bool withParams = true)
         {
             if (model == null)

LawFirm/LawFirmBusinessLogic/LawFirmBusinessLogic.csproj

@@ -8,7 +8,6 @@
 
   <ItemGroup>
     <PackageReference Include="DocumentFormat.OpenXml" Version="2.19.0" />
-    <PackageReference Include="MailKit" Version="4.0.0" />
     <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="7.0.0" />
     <PackageReference Include="NLog.Extensions.Logging" Version="5.2.1" />
     <PackageReference Include="PdfSharp.MigraDoc.Standard" Version="1.51.15" />

LawFirm/LawFirmBusinessLogic/MailWorker/AbstractMailWorker.cs

@@ -1,83 +0,0 @@
-using LawFirmContracts.BindingModels;
-using LawFirmContracts.BusinessLogicContracts;
-using Microsoft.Extensions.Logging;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace LawFirmBusinessLogic.MailWorker
-{
-	public abstract class AbstractMailWorker
-	{
-		protected string _mailLogin = string.Empty;
-		protected string _mailPassword = string.Empty;
-		protected string _smtpClientHost = string.Empty;
-		protected int _smtpClientPort;
-		protected string _popHost = string.Empty;
-		protected int _popPort;
-		private readonly IMessageInfoLogic _messageInfoLogic;
-		private readonly IClientLogic _clientLogic;
-		private readonly ILogger _logger;
-		public AbstractMailWorker(ILogger<AbstractMailWorker> logger, IMessageInfoLogic messageInfoLogic, IClientLogic clientLogic)
-		{
-			_logger = logger;
-			_messageInfoLogic = messageInfoLogic;
-			_clientLogic = clientLogic;
-		}
-		public void MailConfig(MailConfigBindingModel config)
-		{
-			_mailLogin = config.MailLogin;
-			_mailPassword = config.MailPassword;
-			_smtpClientHost = config.SmtpClientHost;
-			_smtpClientPort = config.SmtpClientPort;
-			_popHost = config.PopHost;
-			_popPort = config.PopPort;
-			_logger.LogDebug("Config: {login}, {password}, {clientHost},{ clientPOrt}, { popHost}, { popPort}", _mailLogin, _mailPassword, _smtpClientHost, _smtpClientPort, _popHost, _popPort);
-		}
-		public async void MailSendAsync(MailSendInfoBindingModel info)
-		{
-			if (string.IsNullOrEmpty(_mailLogin) || string.IsNullOrEmpty(_mailPassword))
-			{
-				return;
-			}
-			if (string.IsNullOrEmpty(_smtpClientHost) || _smtpClientPort == 0)
-			{
-				return;
-			}
-			if (string.IsNullOrEmpty(info.MailAddress) || string.IsNullOrEmpty(info.Subject) || string.IsNullOrEmpty(info.Text))
-			{
-				return;
-			}
-			_logger.LogDebug("Send Mail: {To}, {Subject}", info.MailAddress, info.Subject);
-			await SendMailAsync(info);
-		}
-		public async void MailCheck()
-		{
-			if (string.IsNullOrEmpty(_mailLogin) || string.IsNullOrEmpty(_mailPassword))
-			{
-				return;
-			}
-			if (string.IsNullOrEmpty(_popHost) || _popPort == 0)
-			{
-				return;
-			}
-			if (_messageInfoLogic == null)
-			{
-				return;
-			}
-			var list = await ReceiveMailAsync();
-			_logger.LogDebug("Check Mail: {Count} new mails", list.Count);
-			foreach (var mail in list)
-			{
-				mail.ClientId = _clientLogic.ReadElement(new() { Email = mail.SenderName })?.Id;
-				_messageInfoLogic.Create(mail);
-			}
-		}
-		protected abstract Task SendMailAsync(MailSendInfoBindingModel info);
-		protected abstract Task<List<MessageInfoBindingModel>>
-		ReceiveMailAsync();
-
-	}
-}

LawFirm/LawFirmBusinessLogic/MailWorker/MailKitWorker.cs

@@ -1,81 +0,0 @@
-using LawFirmContracts.BindingModels;
-using LawFirmContracts.BusinessLogicContracts;
-using MailKit.Net.Pop3;
-using MailKit.Security;
-using Microsoft.Extensions.Logging;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Net;
-using System.Net.Mail;
-using System.Security.Authentication;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace LawFirmBusinessLogic.MailWorker
-{
-	public class MailKitWorker : AbstractMailWorker
-	{
-		public MailKitWorker(ILogger<MailKitWorker> logger, IMessageInfoLogic messageInfoLogic, IClientLogic clientLogic) : base(logger, messageInfoLogic, clientLogic) { }
-		protected override async Task SendMailAsync(MailSendInfoBindingModel info)
-		{
-			using var objMailMessage = new MailMessage();
-			using var objSmtpClient = new SmtpClient(_smtpClientHost, _smtpClientPort);
-			try
-			{
-				objMailMessage.From = new MailAddress(_mailLogin);
-				objMailMessage.To.Add(new MailAddress(info.MailAddress));
-				objMailMessage.Subject = info.Subject;
-				objMailMessage.Body = info.Text;
-				objMailMessage.SubjectEncoding = Encoding.UTF8;
-				objMailMessage.BodyEncoding = Encoding.UTF8;
-				objSmtpClient.UseDefaultCredentials = false;
-				objSmtpClient.EnableSsl = true;
-				objSmtpClient.DeliveryMethod = SmtpDeliveryMethod.Network;
-				objSmtpClient.Credentials = new NetworkCredential(_mailLogin, _mailPassword);
-				await Task.Run(() => objSmtpClient.Send(objMailMessage));
-			}
-			catch (Exception)
-			{
-				throw;
-			}
-		}
-		protected override async Task<List<MessageInfoBindingModel>>
-	   ReceiveMailAsync()
-		{
-			var list = new List<MessageInfoBindingModel>();
-			using var client = new Pop3Client();
-			await Task.Run(() =>
-			{
-				try
-				{
-					client.Connect(_popHost, _popPort, SecureSocketOptions.SslOnConnect);
-					client.Authenticate(_mailLogin, _mailPassword);
-					for (int i = 0; i < client.Count; i++)
-					{
-						var message = client.GetMessage(i);
-						foreach (var mail in message.From.Mailboxes)
-						{
-							list.Add(new MessageInfoBindingModel
-							{
-								DateDelivery = message.Date.DateTime,
-								MessageId = message.MessageId,
-								SenderName = mail.Address,
-								Subject = message.Subject,
-								Body = message.TextBody
-							});
-						}
-					}
-				}
-				catch (MailKit.Security.AuthenticationException)
-				{ }
-				finally
-				{
-					client.Disconnect(true);
-				}
-			});
-			return list;
-		}
-
-	}
-}

LawFirm/LawFirmClientApp/Controllers/HomeController.cs

@@ -2,7 +2,6 @@
 using LawFirmContracts.BindingModels;
 using LawFirmContracts.ViewModels;
 using Microsoft.AspNetCore.Mvc;
-using Microsoft.Extensions.Logging;
 using System.Diagnostics;
 
 namespace LawFirmClientApp.Controllers
@@ -136,16 +135,5 @@ namespace LawFirmClientApp.Controllers
             return count * (doc?.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}"));
-        }
-
-
     }
 }

LawFirm/LawFirmClientApp/LawFirmClientApp.csproj

@@ -14,12 +14,4 @@
     <ProjectReference Include="..\LawFirmContracts\LawFirmContracts.csproj" />
   </ItemGroup>
 
-  <ItemGroup>
-    <UpToDateCheckInput Remove="Views\Home\Mails.cshtml" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <_ContentIncludedByDefault Remove="Views\Home\Mails.cshtml" />
-  </ItemGroup>
-
 </Project>

LawFirm/LawFirmClientApp/Views/Home/Mails.cshtml

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

LawFirm/LawFirmClientApp/Views/Shared/_Layout.cshtml

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

LawFirm/LawFirmContracts/BindingModels/MailConfigBindingModel.cs

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

LawFirm/LawFirmContracts/BindingModels/MailSendInfoBindingModel.cs

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

LawFirm/LawFirmContracts/BindingModels/MessageInfoBindingModel.cs

@@ -1,24 +0,0 @@
-using LawFirmDataModels.Models;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace LawFirmContracts.BindingModels
-{
-	public class MessageInfoBindingModel : IMessageInfoModel
-	{
-		public string MessageId { get; set; } = string.Empty;
-
-		public int? ClientId { get; set; }
-
-		public string SenderName { get; set; } = string.Empty;
-
-		public DateTime DateDelivery { get; set; }
-
-		public string Subject { get; set; } = string.Empty;
-
-		public string Body { get; set; } = string.Empty;
-	}
-}

LawFirm/LawFirmContracts/BusinessLogicContracts/IMessageInfoLogic.cs

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

LawFirm/LawFirmContracts/SearchModels/MessageInfoSearchModel.cs

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

LawFirm/LawFirmContracts/StorageContracts/IMessageInfoStorage.cs

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

LawFirm/LawFirmContracts/ViewModels/MessageInfoViewModel.cs

@@ -1,25 +0,0 @@
-using LawFirmDataModels.Models;
-using System;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace LawFirmContracts.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;
-	}
-}

LawFirm/LawFirmDataModels/Models/IMessageInfoModel.cs

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

LawFirm/LawFirmDatabaseImplement/Implements/MessageInfoStorage .cs

@@ -1,57 +0,0 @@
-using LawFirmContracts.BindingModels;
-using LawFirmContracts.SearchModels;
-using LawFirmContracts.StorageContracts;
-using LawFirmContracts.ViewModels;
-using LawFirmDatabaseImplement.Models;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace LawFirmDatabaseImplement.Implements
-{
-	public class MessageInfoStorage : IMessageInfoStorage
-	{
-
-		public MessageInfoViewModel? GetElement(MessageInfoSearchModel model)
-		{
-			using var context = new LawFirmDatabase();
-			if (model.MessageId != null)
-			{
-				return context.Messages.FirstOrDefault(x => x.MessageId == model.MessageId)?.GetViewModel;
-			}
-			return null;
-		}
-
-		public List<MessageInfoViewModel> GetFilteredList(MessageInfoSearchModel model)
-		{
-			using var context = new LawFirmDatabase();
-			return context.Messages
-				.Where(x => x.ClientId == model.ClientId)
-				.Select(x => x.GetViewModel)
-				.ToList();
-		}
-
-		public List<MessageInfoViewModel> GetFullList()
-		{
-			using var context = new LawFirmDatabase();
-			return context.Messages
-				.Select(x => x.GetViewModel)
-				.ToList();
-		}
-
-		public MessageInfoViewModel? Insert(MessageInfoBindingModel model)
-		{
-			using var context = new LawFirmDatabase();
-			var newMessage = MessageInfo.Create(model);
-			if (newMessage == null || context.Messages.Any(x => x.MessageId.Equals(model.MessageId)))
-			{
-				return null;
-			}
-			context.Messages.Add(newMessage);
-			context.SaveChanges();
-			return newMessage.GetViewModel;
-		}
-	}
-}

LawFirm/LawFirmDatabaseImplement/LawFirmDatabase.cs

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

LawFirm/LawFirmDatabaseImplement/Migrations/20230418164528_fixmessages.Designer.cs

@@ -1,298 +0,0 @@
-// <auto-generated />
-using System;
-using LawFirmDatabaseImplement;
-using Microsoft.EntityFrameworkCore;
-using Microsoft.EntityFrameworkCore.Infrastructure;
-using Microsoft.EntityFrameworkCore.Metadata;
-using Microsoft.EntityFrameworkCore.Migrations;
-using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
-
-#nullable disable
-
-namespace LawFirmDatabaseImplement.Migrations
-{
-    [DbContext(typeof(LawFirmDatabase))]
-    [Migration("20230418164528_fixmessages")]
-    partial class fixmessages
-    {
-        /// <inheritdoc />
-        protected override void BuildTargetModel(ModelBuilder modelBuilder)
-        {
-#pragma warning disable 612, 618
-            modelBuilder
-                .HasAnnotation("ProductVersion", "7.0.3")
-                .HasAnnotation("Relational:MaxIdentifierLength", 128);
-
-            SqlServerModelBuilderExtensions.UseIdentityColumns(modelBuilder);
-
-            modelBuilder.Entity("LawFirmDatabaseImplement.Models.Blank", b =>
-                {
-                    b.Property<int>("Id")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("int");
-
-                    SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property<int>("Id"));
-
-                    b.Property<string>("BlankName")
-                        .IsRequired()
-                        .HasColumnType("nvarchar(max)");
-
-                    b.Property<double>("Cost")
-                        .HasColumnType("float");
-
-                    b.HasKey("Id");
-
-                    b.ToTable("Blanks");
-                });
-
-            modelBuilder.Entity("LawFirmDatabaseImplement.Models.Client", b =>
-                {
-                    b.Property<int>("Id")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("int");
-
-                    SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property<int>("Id"));
-
-                    b.Property<string>("ClientFIO")
-                        .IsRequired()
-                        .HasColumnType("nvarchar(max)");
-
-                    b.Property<string>("Email")
-                        .IsRequired()
-                        .HasColumnType("nvarchar(max)");
-
-                    b.Property<string>("Password")
-                        .IsRequired()
-                        .HasColumnType("nvarchar(max)");
-
-                    b.HasKey("Id");
-
-                    b.ToTable("Clients");
-                });
-
-            modelBuilder.Entity("LawFirmDatabaseImplement.Models.Document", b =>
-                {
-                    b.Property<int>("Id")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("int");
-
-                    SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property<int>("Id"));
-
-                    b.Property<string>("DocumentName")
-                        .IsRequired()
-                        .HasColumnType("nvarchar(max)");
-
-                    b.Property<double>("Price")
-                        .HasColumnType("float");
-
-                    b.HasKey("Id");
-
-                    b.ToTable("Documents");
-                });
-
-            modelBuilder.Entity("LawFirmDatabaseImplement.Models.DocumentBlank", b =>
-                {
-                    b.Property<int>("Id")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("int");
-
-                    SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property<int>("Id"));
-
-                    b.Property<int>("BlankId")
-                        .HasColumnType("int");
-
-                    b.Property<int>("Count")
-                        .HasColumnType("int");
-
-                    b.Property<int>("DocumentId")
-                        .HasColumnType("int");
-
-                    b.HasKey("Id");
-
-                    b.HasIndex("BlankId");
-
-                    b.HasIndex("DocumentId");
-
-                    b.ToTable("DocumentBlanks");
-                });
-
-            modelBuilder.Entity("LawFirmDatabaseImplement.Models.Implementer", b =>
-                {
-                    b.Property<int>("Id")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("int");
-
-                    SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property<int>("Id"));
-
-                    b.Property<string>("ImplementerFIO")
-                        .IsRequired()
-                        .HasColumnType("nvarchar(max)");
-
-                    b.Property<string>("Password")
-                        .IsRequired()
-                        .HasColumnType("nvarchar(max)");
-
-                    b.Property<int>("Qualification")
-                        .HasColumnType("int");
-
-                    b.Property<int>("WorkExperience")
-                        .HasColumnType("int");
-
-                    b.HasKey("Id");
-
-                    b.ToTable("Implementers");
-                });
-
-            modelBuilder.Entity("LawFirmDatabaseImplement.Models.MessageInfo", b =>
-                {
-                    b.Property<string>("MessageId")
-                        .HasColumnType("nvarchar(450)");
-
-                    b.Property<string>("Body")
-                        .IsRequired()
-                        .HasColumnType("nvarchar(max)");
-
-                    b.Property<int?>("ClientId")
-                        .HasColumnType("int");
-
-                    b.Property<DateTime>("DateDelivery")
-                        .HasColumnType("datetime2");
-
-                    b.Property<string>("SenderName")
-                        .IsRequired()
-                        .HasColumnType("nvarchar(max)");
-
-                    b.Property<string>("Subject")
-                        .IsRequired()
-                        .HasColumnType("nvarchar(max)");
-
-                    b.HasKey("MessageId");
-
-                    b.HasIndex("ClientId");
-
-                    b.ToTable("Messages");
-                });
-
-            modelBuilder.Entity("LawFirmDatabaseImplement.Models.Order", b =>
-                {
-                    b.Property<int>("Id")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("int");
-
-                    SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property<int>("Id"));
-
-                    b.Property<int>("ClientId")
-                        .HasColumnType("int");
-
-                    b.Property<int>("Count")
-                        .HasColumnType("int");
-
-                    b.Property<DateTime>("DateCreate")
-                        .HasColumnType("datetime2");
-
-                    b.Property<DateTime?>("DateImplement")
-                        .HasColumnType("datetime2");
-
-                    b.Property<int>("DocumentId")
-                        .HasColumnType("int");
-
-                    b.Property<int?>("ImplementerId")
-                        .HasColumnType("int");
-
-                    b.Property<int>("Status")
-                        .HasColumnType("int");
-
-                    b.Property<double>("Sum")
-                        .HasColumnType("float");
-
-                    b.HasKey("Id");
-
-                    b.HasIndex("ClientId");
-
-                    b.HasIndex("DocumentId");
-
-                    b.HasIndex("ImplementerId");
-
-                    b.ToTable("Orders");
-                });
-
-            modelBuilder.Entity("LawFirmDatabaseImplement.Models.DocumentBlank", b =>
-                {
-                    b.HasOne("LawFirmDatabaseImplement.Models.Blank", "Blank")
-                        .WithMany("DocumentBlanks")
-                        .HasForeignKey("BlankId")
-                        .OnDelete(DeleteBehavior.Cascade)
-                        .IsRequired();
-
-                    b.HasOne("LawFirmDatabaseImplement.Models.Document", "Document")
-                        .WithMany("Blanks")
-                        .HasForeignKey("DocumentId")
-                        .OnDelete(DeleteBehavior.Cascade)
-                        .IsRequired();
-
-                    b.Navigation("Blank");
-
-                    b.Navigation("Document");
-                });
-
-            modelBuilder.Entity("LawFirmDatabaseImplement.Models.MessageInfo", b =>
-                {
-                    b.HasOne("LawFirmDatabaseImplement.Models.Client", "Client")
-                        .WithMany("Messages")
-                        .HasForeignKey("ClientId");
-
-                    b.Navigation("Client");
-                });
-
-            modelBuilder.Entity("LawFirmDatabaseImplement.Models.Order", b =>
-                {
-                    b.HasOne("LawFirmDatabaseImplement.Models.Client", "Client")
-                        .WithMany("Orders")
-                        .HasForeignKey("ClientId")
-                        .OnDelete(DeleteBehavior.Cascade)
-                        .IsRequired();
-
-                    b.HasOne("LawFirmDatabaseImplement.Models.Document", "Document")
-                        .WithMany("Orders")
-                        .HasForeignKey("DocumentId")
-                        .OnDelete(DeleteBehavior.Cascade)
-                        .IsRequired();
-
-                    b.HasOne("LawFirmDatabaseImplement.Models.Implementer", "Implementer")
-                        .WithMany("Orders")
-                        .HasForeignKey("ImplementerId");
-
-                    b.Navigation("Client");
-
-                    b.Navigation("Document");
-
-                    b.Navigation("Implementer");
-                });
-
-            modelBuilder.Entity("LawFirmDatabaseImplement.Models.Blank", b =>
-                {
-                    b.Navigation("DocumentBlanks");
-                });
-
-            modelBuilder.Entity("LawFirmDatabaseImplement.Models.Client", b =>
-                {
-                    b.Navigation("Messages");
-
-                    b.Navigation("Orders");
-                });
-
-            modelBuilder.Entity("LawFirmDatabaseImplement.Models.Document", b =>
-                {
-                    b.Navigation("Blanks");
-
-                    b.Navigation("Orders");
-                });
-
-            modelBuilder.Entity("LawFirmDatabaseImplement.Models.Implementer", b =>
-                {
-                    b.Navigation("Orders");
-                });
-#pragma warning restore 612, 618
-        }
-    }
-}

LawFirm/LawFirmDatabaseImplement/Migrations/20230418164528_fixmessages.cs

@@ -1,48 +0,0 @@
-using System;
-using Microsoft.EntityFrameworkCore.Migrations;
-
-#nullable disable
-
-namespace LawFirmDatabaseImplement.Migrations
-{
-    /// <inheritdoc />
-    public partial class fixmessages : Migration
-    {
-        /// <inheritdoc />
-        protected override void Up(MigrationBuilder migrationBuilder)
-        {
-            migrationBuilder.CreateTable(
-                name: "Messages",
-                columns: table => new
-                {
-                    MessageId = table.Column<string>(type: "nvarchar(450)", nullable: false),
-                    ClientId = table.Column<int>(type: "int", nullable: true),
-                    SenderName = table.Column<string>(type: "nvarchar(max)", nullable: false),
-                    DateDelivery = table.Column<DateTime>(type: "datetime2", nullable: false),
-                    Subject = table.Column<string>(type: "nvarchar(max)", nullable: false),
-                    Body = table.Column<string>(type: "nvarchar(max)", nullable: false)
-                },
-                constraints: table =>
-                {
-                    table.PrimaryKey("PK_Messages", x => x.MessageId);
-                    table.ForeignKey(
-                        name: "FK_Messages_Clients_ClientId",
-                        column: x => x.ClientId,
-                        principalTable: "Clients",
-                        principalColumn: "Id");
-                });
-
-            migrationBuilder.CreateIndex(
-                name: "IX_Messages_ClientId",
-                table: "Messages",
-                column: "ClientId");
-        }
-
-        /// <inheritdoc />
-        protected override void Down(MigrationBuilder migrationBuilder)
-        {
-            migrationBuilder.DropTable(
-                name: "Messages");
-        }
-    }
-}

LawFirm/LawFirmDatabaseImplement/Migrations/LawFirmDatabaseModelSnapshot.cs

@@ -140,36 +140,6 @@ namespace LawFirmDatabaseImplement.Migrations
                     b.ToTable("Implementers");
                 });
 
-            modelBuilder.Entity("LawFirmDatabaseImplement.Models.MessageInfo", b =>
-                {
-                    b.Property<string>("MessageId")
-                        .HasColumnType("nvarchar(450)");
-
-                    b.Property<string>("Body")
-                        .IsRequired()
-                        .HasColumnType("nvarchar(max)");
-
-                    b.Property<int?>("ClientId")
-                        .HasColumnType("int");
-
-                    b.Property<DateTime>("DateDelivery")
-                        .HasColumnType("datetime2");
-
-                    b.Property<string>("SenderName")
-                        .IsRequired()
-                        .HasColumnType("nvarchar(max)");
-
-                    b.Property<string>("Subject")
-                        .IsRequired()
-                        .HasColumnType("nvarchar(max)");
-
-                    b.HasKey("MessageId");
-
-                    b.HasIndex("ClientId");
-
-                    b.ToTable("Messages");
-                });
-
             modelBuilder.Entity("LawFirmDatabaseImplement.Models.Order", b =>
                 {
                     b.Property<int>("Id")
@@ -232,15 +202,6 @@ namespace LawFirmDatabaseImplement.Migrations
                     b.Navigation("Document");
                 });
 
-            modelBuilder.Entity("LawFirmDatabaseImplement.Models.MessageInfo", b =>
-                {
-                    b.HasOne("LawFirmDatabaseImplement.Models.Client", "Client")
-                        .WithMany("Messages")
-                        .HasForeignKey("ClientId");
-
-                    b.Navigation("Client");
-                });
-
             modelBuilder.Entity("LawFirmDatabaseImplement.Models.Order", b =>
                 {
                     b.HasOne("LawFirmDatabaseImplement.Models.Client", "Client")
@@ -273,8 +234,6 @@ namespace LawFirmDatabaseImplement.Migrations
 
             modelBuilder.Entity("LawFirmDatabaseImplement.Models.Client", b =>
                 {
-                    b.Navigation("Messages");
-
                     b.Navigation("Orders");
                 });
 

LawFirm/LawFirmDatabaseImplement/Models/Client.cs

@@ -26,8 +26,6 @@ namespace LawFirmDatabaseImplement.Models
 
         [ForeignKey("ClientId")]
         public virtual List<Order> Orders { get; set; } = new();
-		[ForeignKey("ClientId")]
-		public virtual List<MessageInfo> Messages { get; set; } = new();
 
         public static Client? Create(ClientBindingModel model)
         {

LawFirm/LawFirmDatabaseImplement/Models/MessageInfo.cs

@@ -1,58 +0,0 @@
-using LawFirmContracts.BindingModels;
-using LawFirmContracts.ViewModels;
-using LawFirmDataModels.Models;
-using System;
-using System.Collections.Generic;
-using System.ComponentModel.DataAnnotations;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace LawFirmDatabaseImplement.Models
-{
-	public class MessageInfo : IMessageInfoModel
-	{
-		[Key]
-		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 virtual Client? Client { get; private set; }
-
-		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,
-		};
-
-	}
-}

LawFirm/LawFirmFileImplement/DataFileSingleton.cs

@@ -17,13 +17,11 @@ namespace LawFirmFileImplement
         private readonly string DocumentFileName = "Document.xml";
         private readonly string ClientFileName = "Client.xml";
         private readonly string ImplementerFileName = "Implementer.xml";
-		private readonly string MessageInfoFileName = "MessageInfo.xml";
         public List<Blank> Blanks { get; private set; }
         public List<Order> Orders { get; private set; }
         public List<Document> Documents { 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)
@@ -37,7 +35,6 @@ namespace LawFirmFileImplement
         public void SaveOrders() => SaveData(Orders, OrderFileName, "Orders", x => x.GetXElement);
         public void SaveClients() => SaveData(Clients, ClientFileName, "Clients", x => x.GetXElement);
         public void SaveImplementers() => SaveData(Orders, ImplementerFileName, "Implementers", x => x.GetXElement);
-		public void SaveMessages() => SaveData(Orders, ImplementerFileName, "Messages", x => x.GetXElement);
         private DataFileSingleton()
         {
             Blanks = LoadData(BlankFileName, "Blank", x => Blank.Create(x)!)!;
@@ -45,7 +42,6 @@ namespace LawFirmFileImplement
             Orders = LoadData(OrderFileName, "Order", x => Order.Create(x)!)!;
             Clients = LoadData(ClientFileName, "Client", x => Client.Create(x)!)!;
             Implementers = LoadData(ImplementerFileName, "Impleneter", 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)
         {

LawFirm/LawFirmFileImplement/Implements/MessageInfoStorage.cs

@@ -1,58 +0,0 @@
-using LawFirmContracts.BindingModels;
-using LawFirmContracts.SearchModels;
-using LawFirmContracts.StorageContracts;
-using LawFirmContracts.ViewModels;
-using LawFirmFileImplement.Models;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace LawFirmFileImplement.Implements
-{
-	public class MessageInfoStorage : IMessageInfoStorage
-	{
-		private readonly DataFileSingleton _source;
-		public MessageInfoStorage()
-		{
-			_source = DataFileSingleton.GetInstance();
-		}
-
-		public MessageInfoViewModel? GetElement(MessageInfoSearchModel model)
-		{
-			if (model.MessageId != null)
-			{
-				return _source.Messages.FirstOrDefault(x => x.MessageId == model.MessageId)?.GetViewModel;
-			}
-			return null;
-		}
-
-		public List<MessageInfoViewModel> GetFilteredList(MessageInfoSearchModel model)
-		{
-			return _source.Messages
-				.Where(x => x.ClientId == model.ClientId)
-				.Select(x => x.GetViewModel)
-				.ToList();
-		}
-
-		public List<MessageInfoViewModel> GetFullList()
-		{
-			return _source.Messages
-				.Select(x => x.GetViewModel)
-				.ToList();
-		}
-
-		public MessageInfoViewModel? Insert(MessageInfoBindingModel model)
-		{
-			var newMessage = MessageInfo.Create(model);
-			if (newMessage == null)
-			{
-				return null;
-			}
-			_source.Messages.Add(newMessage);
-			_source.SaveMessages();
-			return newMessage.GetViewModel;
-		}
-	}
-}

LawFirm/LawFirmFileImplement/Models/MessageInfo.cs

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

LawFirm/LawFirmListImplements/DataListSingleton.cs

@@ -16,7 +16,6 @@ namespace LawFirmListImplements
         public List<Document> Documents { get; set; }
         public List<Client> Clients { get; set; }
         public List<Implementer> Implementers { get; set; }
-		public List<MessageInfo> Messages { get; set; }
         private DataListSingleton()
         {
             Blanks = new List<Blank>();
@@ -24,7 +23,6 @@ namespace LawFirmListImplements
             Documents = new List<Document>();
             Clients= new List<Client>();
             Implementers = new List<Implementer>();
-			Messages = new List<MessageInfo>();
         }
         public static DataListSingleton GetInstance()
         {

LawFirm/LawFirmListImplements/Implements/MessageInfoStorage.cs

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

LawFirm/LawFirmListImplements/Models/MessageInfo.cs

@@ -1,54 +0,0 @@
-using LawFirmContracts.BindingModels;
-using LawFirmContracts.ViewModels;
-using LawFirmDataModels.Models;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace LawFirmListImplements.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,
-		};
-
-	}
-}

LawFirm/LawFirmRestApi/Controllers/ClientController.cs

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

LawFirm/LawFirmRestApi/Controllers/ImplementerController.cs

@@ -48,7 +48,7 @@ namespace LawFirmRestApi.Controllers
             {
                 return _order.ReadList(new OrderSearchModel
                 {
-                    Status = OrderStatus.Принят 
+                    Statuses = new() { OrderStatus.Принят }
                 }) ;
             }
             catch (Exception ex)

LawFirm/LawFirmRestApi/Program.cs

@@ -1,6 +1,4 @@
 using LawFirmBusinessLogic.BusinessLogics;
-using LawFirmBusinessLogic.MailWorker;
-using LawFirmContracts.BindingModels;
 using LawFirmContracts.BusinessLogicContracts;
 using LawFirmContracts.StorageContracts;
 using LawFirmDatabaseImplement.Implements;
@@ -14,13 +12,9 @@ builder.Logging.AddLog4Net("log4net.config");
 builder.Services.AddTransient<IClientStorage, ClientStorage>();
 builder.Services.AddTransient<IOrderStorage, OrderStorage>();
 builder.Services.AddTransient<IDocumentStorage, DocumentStorage>();
-builder.Services.AddTransient<IMessageInfoStorage, MessageInfoStorage>();
-
 builder.Services.AddTransient<IOrderLogic, OrderLogic>();
 builder.Services.AddTransient<IClientLogic, ClientLogic>();
 builder.Services.AddTransient<IDocumentLogic, DocumentLogic>();
-builder.Services.AddSingleton<AbstractMailWorker, MailKitWorker>();
-builder.Services.AddTransient<IMessageInfoLogic, MessageInfoLogic>();
 
 builder.Services.AddControllers();
 // Learn more about configuring Swagger/OpenAPI at https://aka.ms/aspnetcore/swashbuckle
@@ -36,17 +30,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())
 {

LawFirm/LawFirmRestApi/appsettings.json

@@ -5,13 +5,5 @@
       "Microsoft.AspNetCore": "Warning"
     }
   },
-  "AllowedHosts": "*",
+  "AllowedHosts": "*"
-
-  "SmtpClientHost": "smtp.gmail.com",
-  "SmtpClientPort": "587",
-  "PopHost": "pop.gmail.com",
-  "PopPort": "995",
-  "MailLogin": "ulstulabs4me@gmail.com",
-  "MailPassword": "fmir rydi kqvu lklv"
-
 }