TravelCompany/TravelCompany/FormMain.Designer.cs

@@ -33,19 +33,17 @@
             toolStripDropDownButton1 = new ToolStripDropDownButton();
             компонентыToolStripMenuItem = new ToolStripMenuItem();
             ПутёвкиToolStripMenuItem = new ToolStripMenuItem();
-            клиентыToolStripMenuItem = new ToolStripMenuItem();
             отчетыToolStripMenuItem = new ToolStripMenuItem();
             списокКомпонентовToolStripMenuItem = new ToolStripMenuItem();
             компонентыПоПутёвкамToolStripMenuItem = new ToolStripMenuItem();
             списокЗаказовToolStripMenuItem = new ToolStripMenuItem();
-            запускРаботToolStripMenuItem = new ToolStripMenuItem();
             buttonCreateOrder = new Button();
             buttonTakeOrderInWork = new Button();
             buttonOrderReady = new Button();
             buttonIssuedOrder = new Button();
             buttonRef = new Button();
             dataGridView = new DataGridView();
-            исполнителиToolStripMenuItem = new ToolStripMenuItem();
+            клиентыToolStripMenuItem = new ToolStripMenuItem();
             toolStrip1.SuspendLayout();
             ((System.ComponentModel.ISupportInitialize)dataGridView).BeginInit();
             SuspendLayout();
@@ -53,7 +51,7 @@
             // toolStrip1
             // 
             toolStrip1.ImageScalingSize = new Size(20, 20);
-            toolStrip1.Items.AddRange(new ToolStripItem[] { toolStripDropDownButton1, отчетыToolStripMenuItem, запускРаботToolStripMenuItem });
+            toolStrip1.Items.AddRange(new ToolStripItem[] { toolStripDropDownButton1, отчетыToolStripMenuItem });
             toolStrip1.Location = new Point(0, 0);
             toolStrip1.Name = "toolStrip1";
             toolStrip1.Size = new Size(969, 25);
@@ -63,7 +61,7 @@
             // toolStripDropDownButton1
             // 
             toolStripDropDownButton1.DisplayStyle = ToolStripItemDisplayStyle.Text;
-            toolStripDropDownButton1.DropDownItems.AddRange(new ToolStripItem[] { компонентыToolStripMenuItem, ПутёвкиToolStripMenuItem, клиентыToolStripMenuItem, исполнителиToolStripMenuItem });
+            toolStripDropDownButton1.DropDownItems.AddRange(new ToolStripItem[] { компонентыToolStripMenuItem, ПутёвкиToolStripMenuItem, клиентыToolStripMenuItem });
             toolStripDropDownButton1.Image = (Image)resources.GetObject("toolStripDropDownButton1.Image");
             toolStripDropDownButton1.ImageTransparentColor = Color.Magenta;
             toolStripDropDownButton1.Name = "toolStripDropDownButton1";
@@ -84,13 +82,6 @@
             ПутёвкиToolStripMenuItem.Text = "Туристич. путёвки";
             ПутёвкиToolStripMenuItem.Click += консервыToolStripMenuItem_Click;
             // 
-            // клиентыToolStripMenuItem
-            // 
-            клиентыToolStripMenuItem.Name = "клиентыToolStripMenuItem";
-            клиентыToolStripMenuItem.Size = new Size(180, 22);
-            клиентыToolStripMenuItem.Text = "Клиенты";
-            клиентыToolStripMenuItem.Click += клиентыToolStripMenuItem_Click;
-            // 
             // отчетыToolStripMenuItem
             // 
             отчетыToolStripMenuItem.DropDownItems.AddRange(new ToolStripItem[] { списокКомпонентовToolStripMenuItem, компонентыПоПутёвкамToolStripMenuItem, списокЗаказовToolStripMenuItem });
@@ -119,13 +110,6 @@
             списокЗаказовToolStripMenuItem.Text = "Список заказов";
             списокЗаказовToolStripMenuItem.Click += списокЗаказовToolStripMenuItem_Click;
             // 
-            // запускРаботToolStripMenuItem
-            // 
-            запускРаботToolStripMenuItem.Name = "запускРаботToolStripMenuItem";
-            запускРаботToolStripMenuItem.Size = new Size(92, 25);
-            запускРаботToolStripMenuItem.Text = "Запуск работ";
-            запускРаботToolStripMenuItem.Click += запускРаботToolStripMenuItem_Click;
-            // 
             // buttonCreateOrder
             // 
             buttonCreateOrder.Location = new Point(800, 56);
@@ -188,12 +172,12 @@
             dataGridView.Size = new Size(763, 435);
             dataGridView.TabIndex = 6;
             // 
-            // исполнителиToolStripMenuItem
+            // клиентыToolStripMenuItem
             // 
-            исполнителиToolStripMenuItem.Name = "исполнителиToolStripMenuItem";
+            клиентыToolStripMenuItem.Name = "клиентыToolStripMenuItem";
-            исполнителиToolStripMenuItem.Size = new Size(180, 22);
+            клиентыToolStripMenuItem.Size = new Size(180, 22);
-            исполнителиToolStripMenuItem.Text = "Исполнители";
+            клиентыToolStripMenuItem.Text = "Клиенты";
-            исполнителиToolStripMenuItem.Click += исполнителиToolStripMenuItem_Click;
+            клиентыToolStripMenuItem.Click += клиентыToolStripMenuItem_Click;
             // 
             // FormMain
             // 
@@ -234,7 +218,5 @@
         private ToolStripMenuItem компонентыПоПутёвкамToolStripMenuItem;
         private ToolStripMenuItem списокЗаказовToolStripMenuItem;
         private ToolStripMenuItem клиентыToolStripMenuItem;
-        private ToolStripMenuItem запускРаботToolStripMenuItem;
-        private ToolStripMenuItem исполнителиToolStripMenuItem;
     }
 }

TravelCompany/TravelCompany/FormMain.cs

@@ -19,14 +19,12 @@ namespace TravelCompany.Forms
         private readonly ILogger _logger;
         private readonly IOrderLogic _orderLogic;
         private readonly IReportLogic _reportLogic;
-        private readonly IWorkProcess _workProcess;
+        public FormMain(ILogger<FormMain> logger, IOrderLogic orderLogic, IReportLogic reportLogic)
-        public FormMain(ILogger<FormMain> logger, IOrderLogic orderLogic, IReportLogic reportLogic, IWorkProcess workProcess)
         {
             InitializeComponent();
             _logger = logger;
             _orderLogic = orderLogic;
             _reportLogic = reportLogic;
-            _workProcess = workProcess;
         }
         private void FormMain_Load(object sender, EventArgs e)
         {
@@ -43,8 +41,6 @@ namespace TravelCompany.Forms
                 {
                     dataGridView.DataSource = list;
                     dataGridView.Columns["TravelId"].Visible = false;
-                    dataGridView.Columns["ClientId"].Visible = false;
-                    dataGridView.Columns["ImplementerId"].Visible = false;
                     dataGridView.Columns["TravelName"].AutoSizeMode = DataGridViewAutoSizeColumnMode.Fill;
                 }
 
@@ -202,23 +198,5 @@ Program.ServiceProvider?.GetService(typeof(FormClients));
                 form.ShowDialog();
             }
         }
-
-        private void запускРаботToolStripMenuItem_Click(object sender, EventArgs e)
-        {
-            _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(ImplementersForm));
-            if (service is ImplementersForm form)
-            {
-                form.ShowDialog();
-            }
-        }
     }
 }

TravelCompany/TravelCompany/ImplementerForm.Designer.cs

@@ -1,162 +0,0 @@
-namespace TravelCompany.Forms
-{
-	partial class ImplementerForm
-	{
-		/// <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()
-		{
-			FIOTextBox = new TextBox();
-			PasswordTextBox = new TextBox();
-			QualificationTextBox = new TextBox();
-			WorkExperienceTextBox = new TextBox();
-			label1 = new Label();
-			label2 = new Label();
-			label3 = new Label();
-			label4 = new Label();
-			SaveButton = new Button();
-			CancelButton = new Button();
-			SuspendLayout();
-			// 
-			// FIOTextBox
-			// 
-			FIOTextBox.Location = new Point(124, 19);
-			FIOTextBox.Name = "FIOTextBox";
-			FIOTextBox.Size = new Size(411, 27);
-			FIOTextBox.TabIndex = 0;
-			// 
-			// PasswordTextBox
-			// 
-			PasswordTextBox.Location = new Point(124, 52);
-			PasswordTextBox.Name = "PasswordTextBox";
-			PasswordTextBox.Size = new Size(411, 27);
-			PasswordTextBox.TabIndex = 1;
-			// 
-			// QualificationTextBox
-			// 
-			QualificationTextBox.Location = new Point(124, 85);
-			QualificationTextBox.Name = "QualificationTextBox";
-			QualificationTextBox.Size = new Size(411, 27);
-			QualificationTextBox.TabIndex = 2;
-			// 
-			// WorkExperienceTextBox
-			// 
-			WorkExperienceTextBox.Location = new Point(124, 118);
-			WorkExperienceTextBox.Name = "WorkExperienceTextBox";
-			WorkExperienceTextBox.Size = new Size(411, 27);
-			WorkExperienceTextBox.TabIndex = 3;
-			// 
-			// label1
-			// 
-			label1.AutoSize = true;
-			label1.Location = new Point(9, 19);
-			label1.Name = "label1";
-			label1.Size = new Size(42, 20);
-			label1.TabIndex = 4;
-			label1.Text = "ФИО";
-			// 
-			// label2
-			// 
-			label2.AutoSize = true;
-			label2.Location = new Point(9, 52);
-			label2.Name = "label2";
-			label2.Size = new Size(62, 20);
-			label2.TabIndex = 5;
-			label2.Text = "Пароль";
-			// 
-			// label3
-			// 
-			label3.AutoSize = true;
-			label3.Location = new Point(9, 85);
-			label3.Name = "label3";
-			label3.Size = new Size(111, 20);
-			label3.TabIndex = 6;
-			label3.Text = "Квалификация";
-			// 
-			// label4
-			// 
-			label4.AutoSize = true;
-			label4.Location = new Point(9, 118);
-			label4.Name = "label4";
-			label4.Size = new Size(99, 20);
-			label4.TabIndex = 7;
-			label4.Text = "Стаж работы";
-			// 
-			// SaveButton
-			// 
-			SaveButton.Location = new Point(341, 151);
-			SaveButton.Name = "SaveButton";
-			SaveButton.Size = new Size(94, 29);
-			SaveButton.TabIndex = 8;
-			SaveButton.Text = "Сохранить";
-			SaveButton.UseVisualStyleBackColor = true;
-			SaveButton.Click += SaveButton_Click;
-			// 
-			// CancelButton
-			// 
-			CancelButton.Location = new Point(441, 151);
-			CancelButton.Name = "CancelButton";
-			CancelButton.Size = new Size(94, 29);
-			CancelButton.TabIndex = 9;
-			CancelButton.Text = "Отмена";
-			CancelButton.UseVisualStyleBackColor = true;
-			CancelButton.Click += CancelButton_Click;
-			// 
-			// ImplementerForm
-			// 
-			AutoScaleDimensions = new SizeF(8F, 20F);
-			AutoScaleMode = AutoScaleMode.Font;
-			ClientSize = new Size(548, 186);
-			Controls.Add(CancelButton);
-			Controls.Add(SaveButton);
-			Controls.Add(label4);
-			Controls.Add(label3);
-			Controls.Add(label2);
-			Controls.Add(label1);
-			Controls.Add(WorkExperienceTextBox);
-			Controls.Add(QualificationTextBox);
-			Controls.Add(PasswordTextBox);
-			Controls.Add(FIOTextBox);
-			Name = "ImplementerForm";
-			Text = "Исполнитель";
-			Load += ImplementerForm_Load;
-			ResumeLayout(false);
-			PerformLayout();
-		}
-
-		#endregion
-
-		private TextBox FIOTextBox;
-		private TextBox PasswordTextBox;
-		private TextBox QualificationTextBox;
-		private TextBox WorkExperienceTextBox;
-		private Label label1;
-		private Label label2;
-		private Label label3;
-		private Label label4;
-		private Button SaveButton;
-		private Button CancelButton;
-	}
-}

TravelCompany/TravelCompany/ImplementerForm.cs

@@ -1,109 +0,0 @@
-using TravelCompanyContracts.BindingModels;
-using TravelCompanyContracts.BusinessLogicsContracts;
-using TravelCompanyContracts.SearchModels;
-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 TravelCompany.Forms
-{
-	public partial class ImplementerForm : Form
-	{
-		private readonly ILogger _logger;
-		private readonly IImplementerLogic _logic;
-		private int? _id;
-		public int Id { set { _id = value; } }
-		public ImplementerForm(ILogger<ImplementerForm> logger, IImplementerLogic logic)
-		{
-			InitializeComponent();
-			_logger = logger;
-			_logic = logic;
-		}
-
-		private void ImplementerForm_Load(object sender, EventArgs e)
-		{
-			if (_id.HasValue)
-			{
-				try
-				{
-					_logger.LogInformation("Получение исполнителя");
-					var view = _logic.ReadElement(new ImplementerSearchModel
-					{
-						Id =
-				   _id.Value
-					});
-					if (view != null)
-					{
-						FIOTextBox.Text = view.ImplementerFIO;
-						PasswordTextBox.Text = view.Password;
-						QualificationTextBox.Text = view.Qualification.ToString();
-						WorkExperienceTextBox.Text = view.WorkExperience.ToString();
-					}
-				}
-				catch (Exception ex)
-				{
-					_logger.LogError(ex, "Ошибка получения исполнителя");
-					MessageBox.Show(ex.Message, "Ошибка", MessageBoxButtons.OK,
-					MessageBoxIcon.Error);
-				}
-			}
-		}
-
-		private void SaveButton_Click(object sender, EventArgs e)
-		{
-			if (string.IsNullOrEmpty(FIOTextBox.Text))
-			{
-				MessageBox.Show("Заполните ФИО", "Ошибка",
-			   MessageBoxButtons.OK, MessageBoxIcon.Error);
-				return;
-			}
-			if (string.IsNullOrEmpty(PasswordTextBox.Text))
-			{
-				MessageBox.Show("Заполните пароль", "Ошибка",
-			   MessageBoxButtons.OK, MessageBoxIcon.Error);
-				return;
-			}
-			_logger.LogInformation("Сохранение компонента");
-			try
-			{
-				var model = new ImplementerBindingModel
-				{
-					Id = _id ?? 0,
-					ImplementerFIO = FIOTextBox.Text,
-					Password = PasswordTextBox.Text,
-					Qualification = Convert.ToInt32(QualificationTextBox.Text),
-					WorkExperience = Convert.ToInt32(WorkExperienceTextBox.Text),
-				};
-				var operationResult = _id.HasValue ? _logic.Update(model) :
-			   _logic.Create(model);
-				if (!operationResult)
-				{
-					throw new Exception("Ошибка при сохранении. Дополнительная информация в логах.");
-				}
-				MessageBox.Show("Сохранение прошло успешно", "Сообщение",
-			   MessageBoxButtons.OK, MessageBoxIcon.Information);
-				DialogResult = DialogResult.OK;
-				Close();
-			}
-			catch (Exception ex)
-			{
-				_logger.LogError(ex, "Ошибка сохранения исполнителя");
-				MessageBox.Show(ex.Message, "Ошибка", MessageBoxButtons.OK,
-			   MessageBoxIcon.Error);
-			}
-		}
-
-		private void CancelButton_Click(object sender, EventArgs e)
-		{
-			DialogResult = DialogResult.Cancel;
-			Close();
-		}
-	}
-}

TravelCompany/TravelCompany/ImplementerForm.resx

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

TravelCompany/TravelCompany/ImplementersForm.Designer.cs

@@ -1,114 +0,0 @@
-namespace TravelCompany.Forms
-{
-	partial class ImplementersForm
-	{
-		/// <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()
-		{
-			dataGridView1 = new DataGridView();
-			CreateButton = new Button();
-			ChangeButton = new Button();
-			DeleteButton = new Button();
-			RefreshButton = new Button();
-			((System.ComponentModel.ISupportInitialize)dataGridView1).BeginInit();
-			SuspendLayout();
-			// 
-			// dataGridView1
-			// 
-			dataGridView1.ColumnHeadersHeightSizeMode = DataGridViewColumnHeadersHeightSizeMode.AutoSize;
-			dataGridView1.Location = new Point(12, 12);
-			dataGridView1.Name = "dataGridView1";
-			dataGridView1.RowHeadersWidth = 51;
-			dataGridView1.RowTemplate.Height = 29;
-			dataGridView1.Size = new Size(565, 426);
-			dataGridView1.TabIndex = 0;
-			// 
-			// CreateButton
-			// 
-			CreateButton.Location = new Point(583, 12);
-			CreateButton.Name = "CreateButton";
-			CreateButton.Size = new Size(205, 29);
-			CreateButton.TabIndex = 1;
-			CreateButton.Text = "Создать";
-			CreateButton.UseVisualStyleBackColor = true;
-			CreateButton.Click += CreateButton_Click;
-			// 
-			// ChangeButton
-			// 
-			ChangeButton.Location = new Point(583, 47);
-			ChangeButton.Name = "ChangeButton";
-			ChangeButton.Size = new Size(205, 29);
-			ChangeButton.TabIndex = 2;
-			ChangeButton.Text = "Изменить";
-			ChangeButton.UseVisualStyleBackColor = true;
-			ChangeButton.Click += ChangeButton_Click;
-			// 
-			// DeleteButton
-			// 
-			DeleteButton.Location = new Point(583, 82);
-			DeleteButton.Name = "DeleteButton";
-			DeleteButton.Size = new Size(205, 29);
-			DeleteButton.TabIndex = 3;
-			DeleteButton.Text = "Удалить";
-			DeleteButton.UseVisualStyleBackColor = true;
-			DeleteButton.Click += DeleteButton_Click;
-			// 
-			// RefreshButton
-			// 
-			RefreshButton.Location = new Point(583, 117);
-			RefreshButton.Name = "RefreshButton";
-			RefreshButton.Size = new Size(205, 29);
-			RefreshButton.TabIndex = 4;
-			RefreshButton.Text = "Обновить";
-			RefreshButton.UseVisualStyleBackColor = true;
-			RefreshButton.Click += RefreshButton_Click;
-			// 
-			// ImplementersForm
-			// 
-			AutoScaleDimensions = new SizeF(8F, 20F);
-			AutoScaleMode = AutoScaleMode.Font;
-			ClientSize = new Size(800, 450);
-			Controls.Add(RefreshButton);
-			Controls.Add(DeleteButton);
-			Controls.Add(ChangeButton);
-			Controls.Add(CreateButton);
-			Controls.Add(dataGridView1);
-			Name = "ImplementersForm";
-			Text = "Исполнители";
-			Load += ImplementersForm_Load;
-			((System.ComponentModel.ISupportInitialize)dataGridView1).EndInit();
-			ResumeLayout(false);
-		}
-
-		#endregion
-
-		private DataGridView dataGridView1;
-		private Button CreateButton;
-		private Button ChangeButton;
-		private Button DeleteButton;
-		private Button RefreshButton;
-	}
-}

TravelCompany/TravelCompany/ImplementersForm.cs

@@ -1,125 +0,0 @@
-using TravelCompanyContracts.BindingModels;
-using TravelCompanyContracts.BusinessLogicsContracts;
-using Microsoft.Extensions.Logging;
-using System;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.Data;
-using System.Drawing;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using System.Windows.Forms;
-
-namespace TravelCompany.Forms
-{
-	public partial class ImplementersForm : Form
-	{
-		private readonly ILogger _logger;
-		private readonly IImplementerLogic _logic;
-		public ImplementersForm(ILogger<ImplementersForm> logger, IImplementerLogic logic)
-		{
-			InitializeComponent();
-			_logger = logger;
-			_logic = logic;
-		}
-
-		private void ImplementersForm_Load(object sender, EventArgs e)
-		{
-			LoadData();
-		}
-
-		private void LoadData()
-		{
-			try
-			{
-				var list = _logic.ReadList(null);
-				if (list != null)
-				{
-					dataGridView1.DataSource = list;
-					dataGridView1.Columns["Id"].Visible = false;
-					dataGridView1.Columns["ImplementerFIO"].AutoSizeMode =
-				   DataGridViewAutoSizeColumnMode.Fill;
-					dataGridView1.Columns["Password"].AutoSizeMode =
-				   DataGridViewAutoSizeColumnMode.Fill;
-					dataGridView1.Columns["Qualification"].AutoSizeMode =
-				   DataGridViewAutoSizeColumnMode.Fill;
-					dataGridView1.Columns["WorkExperience"].AutoSizeMode =
-				   DataGridViewAutoSizeColumnMode.Fill;
-				}
-				_logger.LogInformation("Загрузка компонентов");
-			}
-			catch (Exception ex)
-			{
-				_logger.LogError(ex, "Ошибка загрузки исполнителей");
-				MessageBox.Show(ex.Message, "Ошибка", MessageBoxButtons.OK,
-			   MessageBoxIcon.Error);
-			}
-		}
-		private void CreateButton_Click(object sender, EventArgs e)
-		{
-			var service = Program.ServiceProvider?.GetService(typeof(ImplementerForm));
-			if (service is ImplementerForm form)
-			{
-				if (form.ShowDialog() == DialogResult.OK)
-				{
-					LoadData();
-				}
-			}
-		}
-
-		private void ChangeButton_Click(object sender, EventArgs e)
-		{
-			if (dataGridView1.SelectedRows.Count == 1)
-			{
-				var service =
-			   Program.ServiceProvider?.GetService(typeof(ImplementerForm));
-				if (service is ImplementerForm form)
-				{
-					form.Id =
-				   Convert.ToInt32(dataGridView1.SelectedRows[0].Cells["Id"].Value);
-					if (form.ShowDialog() == DialogResult.OK)
-					{
-						LoadData();
-					}
-				}
-			}
-		}
-
-		private void DeleteButton_Click(object sender, EventArgs e)
-		{
-			if (dataGridView1.SelectedRows.Count == 1)
-			{
-				if (MessageBox.Show("Удалить запись?", "Вопрос",
-			   MessageBoxButtons.YesNo, MessageBoxIcon.Question) == DialogResult.Yes)
-				{
-					int id =
-				   Convert.ToInt32(dataGridView1.SelectedRows[0].Cells["Id"].Value);
-					_logger.LogInformation("Удаление компонента");
-					try
-					{
-						if (!_logic.Delete(new ImplementerBindingModel
-						{
-							Id = id
-						}))
-						{
-							throw new Exception("Ошибка при удалении. Дополнительная информация в логах.");
-						}
-						LoadData();
-					}
-					catch (Exception ex)
-					{
-						_logger.LogError(ex, "Ошибка удаления исполнителя");
-						MessageBox.Show(ex.Message, "Ошибка",
-					   MessageBoxButtons.OK, MessageBoxIcon.Error);
-					}
-				}
-			}
-		}
-
-		private void RefreshButton_Click(object sender, EventArgs e)
-		{
-			LoadData();
-		}
-	}
-}

TravelCompany/TravelCompany/ImplementersForm.resx

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

TravelCompany/TravelCompany/Program.cs

@@ -47,9 +47,6 @@ namespace TravelCompany.Forms
             services.AddTransient<IReportLogic, ReportLogic>();
             services.AddTransient<IClientLogic, ClientLogic>();
             services.AddTransient<IClientStorage, ClientStorage>();
-            services.AddTransient<IImplementerLogic, ImplementerLogic>();
-            services.AddTransient<IImplementerStorage, ImplementerStorage>();
-            services.AddTransient<IWorkProcess, WorkModeling>();
 
             services.AddTransient<FormMain>();
             services.AddTransient<FormComponent>();
@@ -64,8 +61,6 @@ namespace TravelCompany.Forms
             services.AddTransient<AbstractSaveToWord, SaveToWord>();
             services.AddTransient<AbstractSaveToPdf, SaveToPdf>();
             services.AddTransient<FormClients>();
-            services.AddTransient<ImplementersForm>();
-            services.AddTransient<ImplementerForm>();
 
         }
     }

TravelCompany/TravelCompanyBusinessLogic/BusinessLogic/ImplementerLogic.cs

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

TravelCompany/TravelCompanyBusinessLogic/BusinessLogic/OrderLogic.cs

@@ -15,9 +15,12 @@ namespace TravelCompanyBusinessLogic.BusinessLogic
 {
     public class OrderLogic : IOrderLogic
     {
+        //Класс с логикой для заказов будет отвечать за получение списка заказов,
+        //создания заказа и смены его статусов. Следует учитывать, что у заказа можно
+        //менять статус на новый, если его текущий статус предшествует новому
+
         private readonly ILogger _logger;
         private readonly IOrderStorage _orderStorage;
-        static readonly object locker = new object();
 
         public OrderLogic(ILogger<OrderLogic> logger, IOrderStorage orderStorage)
         {
@@ -25,23 +28,6 @@ namespace TravelCompanyBusinessLogic.BusinessLogic
             _orderStorage = orderStorage;
         }
 
-        public OrderViewModel? ReadElement(OrderSearchModel model)
-        {
-            if (model == null)
-            {
-                throw new ArgumentNullException(nameof(model));
-            }
-            _logger.LogInformation("ReadElement. Id:{ Id}", model.Id);
-            var element = _orderStorage.GetElement(model);
-            if (element == null)
-            {
-                _logger.LogWarning("ReadElement element not found");
-                return null;
-            }
-            _logger.LogInformation("ReadElement find. Id:{Id}", element.Id);
-            return element;
-        }
-
         public List<OrderViewModel>? ReadList(OrderSearchModel? model)
         {
             _logger.LogInformation("ReadList. OrderId:{Id}", model?.Id);
@@ -65,6 +51,7 @@ namespace TravelCompanyBusinessLogic.BusinessLogic
 
             if (_orderStorage.Insert(model) == null)
             {
+                model.Status = OrderStatus.Неизвестен;
                 _logger.LogWarning("Insert operation failed");
                 return false;
             }
@@ -73,10 +60,7 @@ namespace TravelCompanyBusinessLogic.BusinessLogic
 
         public bool TakeOrderInWork(OrderBindingModel model)
         {
-            lock (locker)
+            return ToNextStatus(model, OrderStatus.Выполняется);
-            {
-                return ToNextStatus(model, OrderStatus.Выполняется);
-            }
         }
 
         public bool FinishOrder(OrderBindingModel model)
@@ -92,22 +76,40 @@ namespace TravelCompanyBusinessLogic.BusinessLogic
         public bool ToNextStatus(OrderBindingModel model, OrderStatus orderStatus)
         {
             CheckModel(model, false);
-            var element = _orderStorage.GetElement(new OrderSearchModel { Id = model.Id });
+            var element = _orderStorage.GetElement(new OrderSearchModel()
+            {
+                Id = model.Id
+            });
             if (element == null)
             {
-                _logger.LogWarning("Read operation failed");
+                throw new ArgumentNullException(nameof(element));
+            }
+
+            model.TravelId = element.TravelId;
+            model.DateCreate = element.DateCreate;
+            model.DateImplement = element.DateImplement;
+            model.Status = element.Status;
+            model.Count = element.Count;
+            model.Sum = element.Sum;
+
+            if (model.Status != orderStatus - 1)
+            {
+                _logger.LogWarning("Status update to " + orderStatus + " operation failed");
                 return false;
             }
-            if (element.Status != orderStatus - 1)
-            {
-                _logger.LogWarning("Status change operation failed");
-                throw new InvalidOperationException("Текущий статус заказа не может быть переведен в выбранный");
-            }
             model.Status = orderStatus;
-            if (model.Status == OrderStatus.Готов) model.DateImplement = DateTime.Now;
+
-            if (element.ImplementerId.HasValue)
+            if (model.Status == OrderStatus.Выдан)
-                model.ImplementerId = element.ImplementerId;
+            {
-            _orderStorage.Update(model);
+                model.DateImplement = DateTime.Now;
+            }
+
+            if (_orderStorage.Update(model) == null)
+            {
+                model.Status--;
+                _logger.LogWarning("Changing status operation faled");
+                return false;
+            }
             return true;
         }
 
@@ -128,6 +130,10 @@ namespace TravelCompanyBusinessLogic.BusinessLogic
             if (model.Sum <= 0)
             {
                 throw new ArgumentNullException("Цена заказа должна быть больше 0", nameof(model.Sum));
+            }
+            if (model.DateImplement.HasValue && model.DateImplement < model.DateCreate)
+            {
+                throw new ArithmeticException($"Дата выдачи заказа {model.DateImplement} должна быть позже даты его создания {model.DateCreate}");
             }
                 _logger.LogInformation("Travel. TravelId:{TravelId}.Count:{Count}.Sum:{Sum}Id:{Id}", model.TravelId, model.Count, model.Sum, model.Id);
         }

TravelCompany/TravelCompanyBusinessLogic/BusinessLogic/WorkModeling.cs

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

TravelCompany/TravelCompanyContracts/BindingModels/ImplementerBindingModel.cs

@@ -1,18 +0,0 @@
-using TravelCompanyDataModels;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace TravelCompanyContracts.BindingModels
-{
-	public class ImplementerBindingModel : IImplementerModel
-	{
-		public int Id { get; set; }
-		public string ImplementerFIO { get; set; } = string.Empty;
-		public int WorkExperience { get; set; } = 0;
-		public int Qualification { get; set; } = 0;
-		public string Password { get; set; } = string.Empty;
-	}
-}

TravelCompany/TravelCompanyContracts/BindingModels/OrderBindingModel.cs

@@ -12,7 +12,6 @@ namespace TravelCompanyContracts.BindingModels
     {
         public int Id { get; set; }
         public int TravelId { get; set; }
-        public int? ImplementerId { get; set; } = null;
         public int ClientId { get; set; }
         public int Count { get; set; }
         public double Sum {  get; set; }

TravelCompany/TravelCompanyContracts/BusinessLogicsContracts/IImplementerLogic.cs

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

TravelCompany/TravelCompanyContracts/BusinessLogicsContracts/IOrderLogic.cs

@@ -12,10 +12,19 @@ namespace TravelCompanyContracts.BusinessLogicsContracts
     public interface IOrderLogic
     {
         List<OrderViewModel>? ReadList(OrderSearchModel? model);
-        OrderViewModel? ReadElement(OrderSearchModel model);
         bool CreateOrder(OrderBindingModel model);
         bool TakeOrderInWork(OrderBindingModel model);
+        /// <summary>
+        /// Готов
+        /// </summary>
+        /// <param name="model"></param>
+        /// <returns></returns>
         bool FinishOrder(OrderBindingModel model);
+        /// <summary>
+        /// Доставлен
+        /// </summary>
+        /// <param name="model"></param>
+        /// <returns></returns>
         bool DeliveryOrder(OrderBindingModel model);
     }
 }

TravelCompany/TravelCompanyContracts/BusinessLogicsContracts/IWorkProcess.cs

@@ -1,13 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace TravelCompanyContracts.BusinessLogicsContracts
-{
-	public interface IWorkProcess
-	{
-		void DoWork(IImplementerLogic implementerLogic, IOrderLogic orderLogic);
-	}
-}

TravelCompany/TravelCompanyContracts/SearchModels/ImplementerSearchModel.cs

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

TravelCompany/TravelCompanyContracts/SearchModels/OrderSearchModel.cs

@@ -3,7 +3,6 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
-using TravelCompanyDataModels.Enums;
 
 namespace TravelCompanyContracts.SearchModels
 {
@@ -11,8 +10,6 @@ namespace TravelCompanyContracts.SearchModels
     {
         public int? Id { get; set; }
         public int? ClientId { get; set; }
-        public int? ImplementerId { get; set; }
-        public OrderStatus? Status { get; set; }
         public DateTime? DateFrom { get; set; }
         public DateTime? DateTo { get; set; }
     }

TravelCompany/TravelCompanyContracts/StoragesContracts/IImplementerStorage.cs

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

TravelCompany/TravelCompanyContracts/ViewModels/ImplementerViewModel.cs

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

TravelCompany/TravelCompanyContracts/ViewModels/OrderViewModel.cs

@@ -18,13 +18,10 @@ namespace TravelCompanyContracts.ViewModels
         public int Id { get; set; }
         public int TravelId { get; set; }
         public int ClientId { get; set; }
-        public int? ImplementerId { get; set; } = null;
         [DisplayName("Клиент")]
         public string ClientFIO { get; set; } = string.Empty;
         [DisplayName("Путёвка")]
         public string TravelName { get; set; } = string.Empty;
-        [DisplayName("Исполнитель")]
-        public string ImplementerFIO { get; set; } = string.Empty;
         [DisplayName("Количество")]
         public int Count { get; set; }
         [DisplayName("Сумма")]

TravelCompany/TravelCompanyDataModels/Models/IImplementerModel.cs

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

TravelCompany/TravelCompanyDataModels/Models/IOrderModel.cs

@@ -6,7 +6,6 @@ namespace TravelCompanyDataModels.Models
     {
         int TravelId { get; }
         int ClientId { get; }
-        int? ImplementerId { get; }
         int Count { get; }
         double Sum { get; }
         OrderStatus Status { get; }

TravelCompany/TravelCompanyDatabaseImplement/Implements/ImplementerStorage.cs

@@ -1,87 +0,0 @@
-using TravelCompanyContracts.BindingModels;
-using TravelCompanyContracts.SearchModels;
-using TravelCompanyContracts.StoragesContracts;
-using TravelCompanyContracts.ViewModels;
-using TravelCompanyDatabaseImplement.Models;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace TravelCompanyDatabaseImplement.Implements
-{
-	public class ImplementerStorage : IImplementerStorage
-	{
-		public ImplementerViewModel? Delete(ImplementerBindingModel model)
-		{
-			using var context = new TravelCompanyDataBase();
-			var res = context.Implementers.FirstOrDefault(x => x.Id == model.Id);
-			if (res != null)
-			{
-				context.Implementers.Remove(res);
-				context.SaveChanges();
-			}
-			return res?.GetViewModel;
-		}
-
-		public ImplementerViewModel? GetElement(ImplementerSearchModel model)
-		{
-			if (string.IsNullOrEmpty(model.ImplementerFIO) && string.IsNullOrEmpty(model.Password) &&
-			   !model.Id.HasValue)
-			{
-				return null;
-			}
-			using var context = new TravelCompanyDataBase();
-			return context.Implementers
-			.FirstOrDefault(x => (string.IsNullOrEmpty(model.ImplementerFIO) || x.ImplementerFIO == model.ImplementerFIO) &&
-								 (!model.Id.HasValue || x.Id == model.Id) &&
-								 (string.IsNullOrEmpty(model.Password) || x.Password == model.Password))
-			?.GetViewModel;
-		}
-
-		public List<ImplementerViewModel> GetFilteredList(ImplementerSearchModel model)
-		{
-			if (model == null)
-			{
-				return new();
-			}
-			if (model.Id.HasValue)
-			{
-				var res = GetElement(model);
-				return res != null ? new() { res } : new();
-			}
-			return new();
-		}
-
-		public List<ImplementerViewModel> GetFullList()
-		{
-			using var context = new TravelCompanyDataBase();
-			return context.Implementers.Select(x => x.GetViewModel).ToList();
-		}
-
-		public ImplementerViewModel? Insert(ImplementerBindingModel model)
-		{
-			using var context = new TravelCompanyDataBase();
-			var res = Implementer.Create(model);
-			if (res != null)
-			{
-				context.Implementers.Add(res);
-				context.SaveChanges();
-			}
-			return res?.GetViewModel;
-		}
-
-		public ImplementerViewModel? Update(ImplementerBindingModel model)
-		{
-			using var context = new TravelCompanyDataBase();
-			var res = context.Implementers.FirstOrDefault(x => x.Id == model.Id);
-			if (res != null)
-			{
-				res.Update(model);
-				context.SaveChanges();
-			}
-			return res?.GetViewModel;
-		}
-	}
-}

TravelCompany/TravelCompanyDatabaseImplement/Implements/OrderStorage.cs

@@ -18,7 +18,7 @@ namespace TravelCompanyDatabaseImplement.Implements
         {
             using var context = new TravelCompanyDataBase();
             return context.Orders.Include(x => x.Travel)
-            .Include(x => x.Client).Include(x => x.Implementer).Select(x => x.GetViewModel)
+            .Include(x => x.Client).Select(x => x.GetViewModel)
            .ToList();
         }
         public List<OrderViewModel> GetFilteredList(OrderSearchModel model)
@@ -27,14 +27,12 @@ namespace TravelCompanyDatabaseImplement.Implements
             using var context = new TravelCompanyDataBase();
             return context.Orders
             .Include(x => x.Travel)
-                .Include(x => x.Client).Include(x => x.Implementer).Where(x => (
+                .Include(x => x.Client).Where(x => (
                         (!model.Id.HasValue || x.Id == model.Id) &&
                         (!model.DateFrom.HasValue || x.DateCreate >= model.DateFrom) &&
                         (!model.DateTo.HasValue || x.DateCreate <= model.DateTo)
                         &&
                         (!model.ClientId.HasValue || x.ClientId == model.ClientId)
-                        &&
-                        (!model.Status.HasValue || x.Status == model.Status)
                     )
                 )
            .Select(x => x.GetViewModel)
@@ -42,11 +40,12 @@ namespace TravelCompanyDatabaseImplement.Implements
         }
         public OrderViewModel? GetElement(OrderSearchModel model)
         {
+            if (!model.Id.HasValue)
+            {
+                return null;
+            }
             using var context = new TravelCompanyDataBase();
-            return context.Orders.Include(x => x.Travel).Include(x => x.Client).Include(x => x.Implementer).FirstOrDefault(
+            return context.Orders.Include(x => x.Travel).Include(x => x.Client).FirstOrDefault(x => x.Id == model.Id)?.GetViewModel;
-                x => ((model.Id.HasValue && x.Id == model.Id) ||
-                (model.ImplementerId.HasValue && model.Status.HasValue &&
-                x.ImplementerId == model.ImplementerId && x.Status == model.Status)))?.GetViewModel;
         }
         public OrderViewModel? Insert(OrderBindingModel model)
         {
@@ -63,7 +62,7 @@ namespace TravelCompanyDatabaseImplement.Implements
         public OrderViewModel? Update(OrderBindingModel model)
         {
             using var context = new TravelCompanyDataBase();
-            var order = context.Orders.Include(x => x.Travel).Include(x => x.Client).Include(x => x.Implementer).FirstOrDefault(x => x.Id ==
+            var order = context.Orders.Include(x => x.Travel).Include(x => x.Client).FirstOrDefault(x => x.Id ==
            model.Id);
             if (order == null)
             {

TravelCompany/TravelCompanyDatabaseImplement/Migrations/20240418113410_InitialCreate.Designer.cs

@@ -12,7 +12,7 @@ using TravelCompanyDatabaseImplement;
 namespace TravelCompanyDatabaseImplement.Migrations
 {
     [DbContext(typeof(TravelCompanyDataBase))]
-    [Migration("20240502101530_Initial-Create")]
+    [Migration("20240418113410_InitialCreate")]
     partial class InitialCreate
     {
         /// <inheritdoc />
@@ -70,33 +70,6 @@ namespace TravelCompanyDatabaseImplement.Migrations
                     b.ToTable("Components");
                 });
 
-            modelBuilder.Entity("TravelCompanyDatabaseImplement.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("TravelCompanyDatabaseImplement.Models.Order", b =>
                 {
                     b.Property<int>("Id")
@@ -117,9 +90,6 @@ namespace TravelCompanyDatabaseImplement.Migrations
                     b.Property<DateTime?>("DateImplement")
                         .HasColumnType("datetime2");
 
-                    b.Property<int?>("ImplementerId")
-                        .HasColumnType("int");
-
                     b.Property<int>("Status")
                         .HasColumnType("int");
 
@@ -133,8 +103,6 @@ namespace TravelCompanyDatabaseImplement.Migrations
 
                     b.HasIndex("ClientId");
 
-                    b.HasIndex("ImplementerId");
-
                     b.HasIndex("TravelId");
 
                     b.ToTable("Orders");
@@ -194,10 +162,6 @@ namespace TravelCompanyDatabaseImplement.Migrations
                         .OnDelete(DeleteBehavior.Cascade)
                         .IsRequired();
 
-                    b.HasOne("TravelCompanyDatabaseImplement.Models.Implementer", "Implementer")
-                        .WithMany("Orders")
-                        .HasForeignKey("ImplementerId");
-
                     b.HasOne("TravelCompanyDatabaseImplement.Models.Travel", "Travel")
                         .WithMany("Orders")
                         .HasForeignKey("TravelId")
@@ -206,8 +170,6 @@ namespace TravelCompanyDatabaseImplement.Migrations
 
                     b.Navigation("Client");
 
-                    b.Navigation("Implementer");
-
                     b.Navigation("Travel");
                 });
 
@@ -240,11 +202,6 @@ namespace TravelCompanyDatabaseImplement.Migrations
                     b.Navigation("TravelComponents");
                 });
 
-            modelBuilder.Entity("TravelCompanyDatabaseImplement.Models.Implementer", b =>
-                {
-                    b.Navigation("Orders");
-                });
-
             modelBuilder.Entity("TravelCompanyDatabaseImplement.Models.Travel", b =>
                 {
                     b.Navigation("Components");

TravelCompany/TravelCompanyDatabaseImplement/Migrations/20240418113410_InitialCreate.cs

@@ -40,22 +40,6 @@ namespace TravelCompanyDatabaseImplement.Migrations
                     table.PrimaryKey("PK_Components", x => x.Id);
                 });
 
-            migrationBuilder.CreateTable(
-                name: "Implementers",
-                columns: table => new
-                {
-                    Id = table.Column<int>(type: "int", nullable: false)
-                        .Annotation("SqlServer:Identity", "1, 1"),
-                    ImplementerFIO = table.Column<string>(type: "nvarchar(max)", nullable: false),
-                    Password = table.Column<string>(type: "nvarchar(max)", nullable: false),
-                    Qualification = table.Column<int>(type: "int", nullable: false),
-                    WorkExperience = table.Column<int>(type: "int", nullable: false)
-                },
-                constraints: table =>
-                {
-                    table.PrimaryKey("PK_Implementers", x => x.Id);
-                });
-
             migrationBuilder.CreateTable(
                 name: "Travels",
                 columns: table => new
@@ -82,8 +66,7 @@ namespace TravelCompanyDatabaseImplement.Migrations
                     DateCreate = table.Column<DateTime>(type: "datetime2", nullable: false),
                     DateImplement = table.Column<DateTime>(type: "datetime2", nullable: true),
                     TravelId = table.Column<int>(type: "int", nullable: false),
-                    ClientId = table.Column<int>(type: "int", nullable: false),
+                    ClientId = table.Column<int>(type: "int", nullable: false)
-                    ImplementerId = table.Column<int>(type: "int", nullable: true)
                 },
                 constraints: table =>
                 {
@@ -94,11 +77,6 @@ namespace TravelCompanyDatabaseImplement.Migrations
                         principalTable: "Clients",
                         principalColumn: "Id",
                         onDelete: ReferentialAction.Cascade);
-                    table.ForeignKey(
-                        name: "FK_Orders_Implementers_ImplementerId",
-                        column: x => x.ImplementerId,
-                        principalTable: "Implementers",
-                        principalColumn: "Id");
                     table.ForeignKey(
                         name: "FK_Orders_Travels_TravelId",
                         column: x => x.TravelId,
@@ -139,11 +117,6 @@ namespace TravelCompanyDatabaseImplement.Migrations
                 table: "Orders",
                 column: "ClientId");
 
-            migrationBuilder.CreateIndex(
-                name: "IX_Orders_ImplementerId",
-                table: "Orders",
-                column: "ImplementerId");
-
             migrationBuilder.CreateIndex(
                 name: "IX_Orders_TravelId",
                 table: "Orders",
@@ -172,9 +145,6 @@ namespace TravelCompanyDatabaseImplement.Migrations
             migrationBuilder.DropTable(
                 name: "Clients");
 
-            migrationBuilder.DropTable(
-                name: "Implementers");
-
             migrationBuilder.DropTable(
                 name: "Components");
 

TravelCompany/TravelCompanyDatabaseImplement/Migrations/TravelCompanyDataBaseModelSnapshot.cs

@@ -67,33 +67,6 @@ namespace TravelCompanyDatabaseImplement.Migrations
                     b.ToTable("Components");
                 });
 
-            modelBuilder.Entity("TravelCompanyDatabaseImplement.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("TravelCompanyDatabaseImplement.Models.Order", b =>
                 {
                     b.Property<int>("Id")
@@ -114,9 +87,6 @@ namespace TravelCompanyDatabaseImplement.Migrations
                     b.Property<DateTime?>("DateImplement")
                         .HasColumnType("datetime2");
 
-                    b.Property<int?>("ImplementerId")
-                        .HasColumnType("int");
-
                     b.Property<int>("Status")
                         .HasColumnType("int");
 
@@ -130,8 +100,6 @@ namespace TravelCompanyDatabaseImplement.Migrations
 
                     b.HasIndex("ClientId");
 
-                    b.HasIndex("ImplementerId");
-
                     b.HasIndex("TravelId");
 
                     b.ToTable("Orders");
@@ -191,10 +159,6 @@ namespace TravelCompanyDatabaseImplement.Migrations
                         .OnDelete(DeleteBehavior.Cascade)
                         .IsRequired();
 
-                    b.HasOne("TravelCompanyDatabaseImplement.Models.Implementer", "Implementer")
-                        .WithMany("Orders")
-                        .HasForeignKey("ImplementerId");
-
                     b.HasOne("TravelCompanyDatabaseImplement.Models.Travel", "Travel")
                         .WithMany("Orders")
                         .HasForeignKey("TravelId")
@@ -203,8 +167,6 @@ namespace TravelCompanyDatabaseImplement.Migrations
 
                     b.Navigation("Client");
 
-                    b.Navigation("Implementer");
-
                     b.Navigation("Travel");
                 });
 
@@ -237,11 +199,6 @@ namespace TravelCompanyDatabaseImplement.Migrations
                     b.Navigation("TravelComponents");
                 });
 
-            modelBuilder.Entity("TravelCompanyDatabaseImplement.Models.Implementer", b =>
-                {
-                    b.Navigation("Orders");
-                });
-
             modelBuilder.Entity("TravelCompanyDatabaseImplement.Models.Travel", b =>
                 {
                     b.Navigation("Components");

TravelCompany/TravelCompanyDatabaseImplement/Models/Implementer.cs

@@ -1,65 +0,0 @@
-using TravelCompanyContracts.BindingModels;
-using TravelCompanyContracts.ViewModels;
-using TravelCompanyDataModels;
-using System;
-using System.Collections.Generic;
-using System.ComponentModel.DataAnnotations.Schema;
-using System.ComponentModel.DataAnnotations;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace TravelCompanyDatabaseImplement.Models
-{
-	public class Implementer : IImplementerModel
-	{
-		public int Id { get; private set; }
-		[Required]
-		public string ImplementerFIO { get; private set; } = string.Empty;
-		[Required]
-		public string Password { get; set; } = string.Empty;
-		[Required]
-		public int Qualification { get; set; } = 0;
-		[Required]
-		public int WorkExperience { get; set; } = 0;
-		[ForeignKey("ImplementerId")]
-		public virtual List<Order> Orders { get; set; } =
-	   new();
-		public static Implementer? Create(ImplementerBindingModel model)
-		{
-			if (model == null)
-			{
-				return null;
-			}
-			return new()
-			{
-				Id = model.Id,
-				Password = model.Password,
-				Qualification = model.Qualification,
-				ImplementerFIO = model.ImplementerFIO,
-				WorkExperience = model.WorkExperience,
-			};
-		}
-
-		public void Update(ImplementerBindingModel model)
-		{
-			if (model == null)
-			{
-				return;
-			}
-			Password = model.Password;
-			Qualification = model.Qualification;
-			ImplementerFIO = model.ImplementerFIO;
-			WorkExperience = model.WorkExperience;
-		}
-
-		public ImplementerViewModel GetViewModel => new()
-		{
-			Id = Id,
-			Password = Password,
-			Qualification = Qualification,
-			ImplementerFIO = ImplementerFIO,
-			WorkExperience = WorkExperience,
-		};
-	}
-}

TravelCompany/TravelCompanyDatabaseImplement/Models/Order.cs

@@ -26,8 +26,6 @@ namespace TravelCompanyDatabaseImplement.Models
         [Required]
         public int ClientId { get; private set; }
         public virtual Client Client { get; private set; }
-        public int? ImplementerId { get; private set; } = null;
-        public virtual Implementer? Implementer { get; private set; }
         public static Order? Create(TravelCompanyDataBase context, OrderBindingModel model)
         {
             if (model == null)
@@ -46,9 +44,6 @@ namespace TravelCompanyDatabaseImplement.Models
                 Travel = context.Travels.FirstOrDefault(x => x.Id == model.TravelId),
                 ClientId = model.ClientId,
                 Client = context.Clients.FirstOrDefault(x => x.Id == model.ClientId),
-                ImplementerId = model.ImplementerId,
-                Implementer = (model.ImplementerId.HasValue ? context.Implementers.FirstOrDefault(x => x.Id == model.ImplementerId)
-                : null),
             };
         }
 
@@ -60,14 +55,12 @@ namespace TravelCompanyDatabaseImplement.Models
             }
             Status = model.Status;
             DateImplement = model.DateImplement;
-            ImplementerId = model.ImplementerId;
         }
 
         public OrderViewModel GetViewModel => new()
         {
             TravelId = TravelId,
             ClientId = ClientId,
-            ImplementerId = ImplementerId,
             Count = Count,
             Sum = Sum,
             Status = Status,
@@ -75,9 +68,7 @@ namespace TravelCompanyDatabaseImplement.Models
             DateImplement = DateImplement,
             TravelName = Travel.TravelName,
             Id = Id,
-            ClientFIO = Client.ClientFIO,
+            ClientFIO = Client.ClientFIO
-            ImplementerFIO = (Implementer != null ? Implementer.ImplementerFIO : string.Empty)
-
         };
 
     }

TravelCompany/TravelCompanyDatabaseImplement/TravelCompanyDataBase.cs

@@ -16,7 +16,7 @@ optionsBuilder)
         {
             if (optionsBuilder.IsConfigured == false)
             {
-                optionsBuilder.UseSqlServer(@"Data Source=DESKTOP-D5A5OOG\GOLDFEST;Initial Catalog=TravelCompanyDatabase1;Integrated Security=True;MultipleActiveResultSets=True;;TrustServerCertificate=True");
+                optionsBuilder.UseSqlServer(@"Data Source=DESKTOP-D5A5OOG\GOLDFEST;Initial Catalog=TravelCompanyDatabase;Integrated Security=True;MultipleActiveResultSets=True;;TrustServerCertificate=True");
             }
             base.OnConfiguring(optionsBuilder);
         }
@@ -25,7 +25,6 @@ optionsBuilder)
         public virtual DbSet<TravelComponent> TravelComponents { set; get; }
         public virtual DbSet<Order> Orders { set; get; }
         public virtual DbSet<Client> Clients { set; get; }
-        public virtual DbSet<Implementer> Implementers { set; get; }
 
     }
 }

TravelCompany/TravelCompanyFileImplement/DataFileSingleton.cs

@@ -15,14 +15,10 @@ namespace TravelCompanyFileImplement
         private readonly string OrderFileName = "Order.xml";
         private readonly string TravelFileName = "Travel.xml";
         private readonly string ClientFileName = "Client.xml";
-        private readonly string ImplementerFileName = "Implementer.xml";
-
         public List<Component> Components { get; private set; }
         public List<Order> Orders { get; private set; }
         public List<Travel> Travels { get; private set; }
         public List<Client> Clients { get; private set; }
-        public List<Implementer> Implementers { get; private set; }
-
         public static DataFileSingleton GetInstance()
         {
             if (instance == null)
@@ -36,8 +32,6 @@ namespace TravelCompanyFileImplement
         public void SaveOrders() => SaveData(Orders, OrderFileName, "Orders", x => x.GetXElement);
         public void SaveClients() => SaveData(Clients, ClientFileName,
 "Clients", x => x.GetXElement);
-        public void SaveImplementers() => SaveData(Implementers, ImplementerFileName,
-"Implementers", x => x.GetXElement);
         private DataFileSingleton()
         {
             Components = LoadData(ComponentFileName, "Component", x => Component.Create(x)!)!;
@@ -45,8 +39,6 @@ namespace TravelCompanyFileImplement
             Orders = LoadData(OrderFileName, "Order", x => Order.Create(x)!)!;
             Clients = LoadData(ClientFileName, "Client", x =>
            Client.Create(x)!)!;
-            Implementers = LoadData(ImplementerFileName, "Implementer", x =>
-Implementer.Create(x)!)!;
         }
         private static List<T>? LoadData<T>(string filename, string xmlNodeName, Func<XElement, T> selectFunction)
         {

TravelCompany/TravelCompanyFileImplement/Implements/ImplementerStorage.cs

@@ -1,83 +0,0 @@
-using TravelCompanyContracts.BindingModels;
-using TravelCompanyContracts.SearchModels;
-using TravelCompanyContracts.StoragesContracts;
-using TravelCompanyContracts.ViewModels;
-using TravelCompanyFileImplement.Models;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace TravelCompanyFileImplement.Implements
-{
-	public class ImplementerStorage : IImplementerStorage
-	{
-		private readonly DataFileSingleton source;
-		public ImplementerStorage()
-		{
-			source = DataFileSingleton.GetInstance();
-		}
-		public List<ImplementerViewModel> GetFullList()
-		{
-			return source.Implementers
-			.Select(x => x.GetViewModel)
-		   .ToList();
-		}
-		public List<ImplementerViewModel> GetFilteredList(ImplementerSearchModel
-	   model)
-		{
-			if (string.IsNullOrEmpty(model.ImplementerFIO) && string.IsNullOrEmpty(model.Password))
-			{
-				return new();
-			}
-			return source.Implementers
-			.Where(x => (string.IsNullOrEmpty(model.ImplementerFIO) || x.ImplementerFIO.Contains(model.ImplementerFIO)) &&
-			(string.IsNullOrEmpty(model.Password) || x.Password.Contains(model.Password)))
-		   .Select(x => x.GetViewModel)
-		   .ToList();
-		}
-		public ImplementerViewModel? GetElement(ImplementerSearchModel model)
-		{
-			return source.Implementers
-			.FirstOrDefault(x => (string.IsNullOrEmpty(model.ImplementerFIO) || x.ImplementerFIO == model.ImplementerFIO) &&
-								 (!model.Id.HasValue || x.Id == model.Id) && (string.IsNullOrEmpty(model.Password) || x.Password == model.Password))
-			?.GetViewModel;
-		}
-		public ImplementerViewModel? Insert(ImplementerBindingModel model)
-		{
-			model.Id = source.Implementers.Count > 0 ? source.Implementers.Max(x =>
-		   x.Id) + 1 : 1;
-			var newImplementer = Implementer.Create(model);
-			if (newImplementer == null)
-			{
-				return null;
-			}
-			source.Implementers.Add(newImplementer);
-			source.SaveImplementers();
-			return newImplementer.GetViewModel;
-		}
-		public ImplementerViewModel? Update(ImplementerBindingModel model)
-		{
-			var implementer = source.Implementers.FirstOrDefault(x => x.Id == model.Id);
-			if (implementer == null)
-			{
-				return null;
-			}
-			implementer.Update(model);
-			source.SaveImplementers();
-			return implementer.GetViewModel;
-		}
-		public ImplementerViewModel? Delete(ImplementerBindingModel model)
-		{
-			var element = source.Implementers.FirstOrDefault(rec => rec.Id == model.Id);
-			if (element != null)
-			{
-				source.Implementers.Remove(element);
-				source.SaveImplementers();
-				return element.GetViewModel;
-			}
-			return null;
-		}
-	}
-}

TravelCompany/TravelCompanyFileImplement/Models/Implementer.cs

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

TravelCompany/TravelCompanyFileImplement/Models/Order.cs

@@ -15,7 +15,7 @@ namespace TravelCompanyFileImplement.Models
     {
         public int TravelId { get; private set; }
         public int ClientId { get; private set; }
-        public int? ImplementerId { get; private set; } = null;
+
         public int Count { get; private set; }
 
         public double Sum { get; private set; }
@@ -43,9 +43,7 @@ namespace TravelCompanyFileImplement.Models
                 Sum = model.Sum,
                 Status = model.Status,
                 DateCreate = model.DateCreate,
-                DateImplement = model.DateImplement,
+                DateImplement = model.DateImplement
-                ImplementerId = model.ImplementerId,
-
             };
         }
 
@@ -60,7 +58,6 @@ namespace TravelCompanyFileImplement.Models
                 Id = Convert.ToInt32(element.Attribute("Id")!.Value),
                 TravelId = Convert.ToInt32(element.Element("TravelId")!.Value),
                 ClientId = Convert.ToInt32(element.Element("ClientId")!.Value),
-                ImplementerId = Convert.ToInt32(element.Element("ImplementerId")!.Value),
                 Count = Convert.ToInt32(element.Element("Count")!.Value),
                 Sum = Convert.ToDouble(element.Element("Sum")!.Value),
                 Status = (OrderStatus)Enum.Parse(typeof(OrderStatus), element.Element("Status")!.Value.ToString()),
@@ -84,7 +81,6 @@ namespace TravelCompanyFileImplement.Models
             Id = Id,
             TravelId = TravelId,
             ClientId = ClientId,
-            ImplementerId = ImplementerId,
             Count = Count,
             Sum = Sum,
             Status = Status,

TravelCompany/TravelCompanyListImplement/DataListSingleton.cs

@@ -14,16 +14,12 @@ namespace TravelCompanyListImplement
         public List<Order> Orders { get; set; }
         public List<Travel> Travels { get; set; }
         public List<Client> Clients { get; set; }
-        public List<Implementer> Implementers { get; set; }
-
         private DataListSingleton()
         {
             Components = new List<Component>();
             Orders = new List<Order>();
             Travels = new List<Travel>();
             Clients = new List<Client>();
-            Implementers = new List<Implementer>();
-
         }
         public static DataListSingleton GetInstance()
         {

TravelCompany/TravelCompanyListImplement/Implements/ImplementerStorage.cs

@@ -1,103 +0,0 @@
-using TravelCompanyContracts.BindingModels;
-using TravelCompanyContracts.SearchModels;
-using TravelCompanyContracts.StoragesContracts;
-using TravelCompanyContracts.ViewModels;
-using TravelCompanyListImplement.Models;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace TravelCompanyListImplement.Implements
-{
-	public class ImplementerStorage : IImplementerStorage
-	{
-		private readonly DataListSingleton _source;
-		public ImplementerStorage()
-		{
-			_source = DataListSingleton.GetInstance();
-		}
-		public List<ImplementerViewModel> GetFullList()
-		{
-			var result = new List<ImplementerViewModel>();
-			foreach (var implementer in _source.Implementers)
-			{
-				result.Add(implementer.GetViewModel);
-			}
-			return result;
-		}
-		public List<ImplementerViewModel> GetFilteredList(ImplementerSearchModel
-	   model)
-		{
-			var result = new List<ImplementerViewModel>();
-			if (string.IsNullOrEmpty(model.ImplementerFIO) && string.IsNullOrEmpty(model.Password))
-			{
-				return result;
-			}
-			foreach (var implementer in _source.Implementers)
-			{
-				if (implementer.ImplementerFIO.Contains(model.ImplementerFIO))
-				{
-					result.Add(implementer.GetViewModel);
-				}
-			}
-			return result;
-		}
-		public ImplementerViewModel? GetElement(ImplementerSearchModel model)
-		{
-			foreach (var implementer in _source.Implementers)
-			{
-				if ((string.IsNullOrEmpty(model.ImplementerFIO) || implementer.ImplementerFIO == model.ImplementerFIO) &&
-								 (!model.Id.HasValue || implementer.Id == model.Id) && (string.IsNullOrEmpty(model.Password) || implementer.Password == model.Password))
-				{
-					return implementer.GetViewModel;
-				}
-			}
-			return null;
-		}
-		public ImplementerViewModel? Insert(ImplementerBindingModel model)
-		{
-			model.Id = 1;
-			foreach (var implementer in _source.Implementers)
-			{
-				if (model.Id <= implementer.Id)
-				{
-					model.Id = implementer.Id + 1;
-				}
-			}
-			var newImplementer = Implementer.Create(model);
-			if (newImplementer == null)
-			{
-				return null;
-			}
-			_source.Implementers.Add(newImplementer);
-			return newImplementer.GetViewModel;
-		}
-		public ImplementerViewModel? Update(ImplementerBindingModel model)
-		{
-			foreach (var implementer in _source.Implementers)
-			{
-				if (model.Id == implementer.Id)
-				{
-					implementer.Update(model);
-					return implementer.GetViewModel;
-				}
-			}
-			return null;
-		}
-		public ImplementerViewModel? Delete(ImplementerBindingModel model)
-		{
-			for (int i = 0; i < _source.Implementers.Count; ++i)
-			{
-				if (_source.Implementers[i].Id == model.Id)
-				{
-					var element = _source.Implementers[i];
-					_source.Implementers.RemoveAt(i);
-					return element.GetViewModel;
-				}
-			}
-			return null;
-		}
-	}
-}

TravelCompany/TravelCompanyListImplement/Implements/OrderStorage.cs

@@ -23,7 +23,7 @@ namespace TravelCompanyListImplement.Implements
             var result = new List<OrderViewModel>();
             foreach (var order in _source.Orders)
             {
-                result.Add(AccessStorage(order.GetViewModel));
+                result.Add(AccessTravelStorage(order.GetViewModel));
             }
             return result;
         }
@@ -38,7 +38,7 @@ namespace TravelCompanyListImplement.Implements
                         (!model.DateTo.HasValue || order.DateCreate <= model.DateTo) &&
                         (!model.ClientId.HasValue || order.ClientId == model.ClientId)) ;
                 {
-                    result.Add(AccessStorage(order.GetViewModel));
+                    result.Add(AccessTravelStorage(order.GetViewModel));
                 }
             }
             return result;
@@ -51,11 +51,9 @@ namespace TravelCompanyListImplement.Implements
             }
             foreach (var order in _source.Orders)
             {
-                if ((model.Id.HasValue && order.Id == model.Id) ||
+                if (model.Id.HasValue && order.Id == model.Id)
-                (model.ImplementerId.HasValue && model.Status.HasValue &&
-                order.ImplementerId == model.ImplementerId && order.Status == model.Status))
                 {
-                    return AccessStorage(order.GetViewModel);
+                    return order.GetViewModel;
                 }
             }
             return null;
@@ -104,22 +102,28 @@ namespace TravelCompanyListImplement.Implements
             return null;
         }
 
-        public OrderViewModel AccessStorage(OrderViewModel model)
+        public OrderViewModel AccessTravelStorage(OrderViewModel model)
         {
-            if (model == null)
+            foreach (var Travel in _source.Travels)
-                return null;
+            {
-            var travel = _source.Travels.FirstOrDefault(x => x.Id == model.Id);
+                if (Travel.Id == model.TravelId)
-            var client = _source.Clients.FirstOrDefault(x => x.Id == model.Id);
+                {
-            var implementer = _source.Implementers.FirstOrDefault(x => x.Id == model.ImplementerId);
+                    model.TravelName = Travel.TravelName;
-            if (travel != null)
+                    break;
-                model.TravelName = travel.TravelName;
+                }
-            if (client != null)
+            }
-                model.ClientFIO = client.ClientFIO;
-            if (implementer != null)
-                model.ImplementerFIO = implementer.ImplementerFIO;
             return model;
         }
 
+        public OrderViewModel AccessClientStorage(OrderViewModel model)
+        {
+            var client = _source.Clients.FirstOrDefault(x => x.Id == model.ClientId);
+            if (client != null)
+                model.ClientFIO = client.ClientFIO;
+            return model;
+        }
+
+
     }
 
 }

TravelCompany/TravelCompanyListImplement/Models/Implementer.cs

@@ -1,54 +0,0 @@
-using TravelCompanyContracts.BindingModels;
-using TravelCompanyContracts.ViewModels;
-using TravelCompanyDataModels;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace TravelCompanyListImplement.Models
-{
-	public class Implementer : IImplementerModel
-	{
-		public int Id { get; private set; }
-		public string ImplementerFIO { get; private set; } = string.Empty;
-		public string Password { get; set; } = string.Empty;
-		public int WorkExperience { get; set; } = 0;
-		public int Qualification { get; set; } = 0;
-		public static Implementer? Create(ImplementerBindingModel model)
-		{
-			if (model == null)
-			{
-				return null;
-			}
-			return new Implementer()
-			{
-				Id = model.Id,
-				ImplementerFIO = model.ImplementerFIO,
-				Password = model.Password,
-				WorkExperience = model.WorkExperience, 
-				Qualification = model.Qualification
-			};
-		}
-		public void Update(ImplementerBindingModel model)
-		{
-			if (model == null)
-			{
-				return;
-			}
-			ImplementerFIO = model.ImplementerFIO;
-			Password = model.Password;
-			WorkExperience = model.WorkExperience;
-			Qualification = model.Qualification;
-		}
-		public ImplementerViewModel GetViewModel => new()
-		{
-			Id = Id,
-			ImplementerFIO = ImplementerFIO,
-			Password = Password,
-			WorkExperience = WorkExperience,
-			Qualification = Qualification
-		};
-	}
-}

TravelCompany/TravelCompanyListImplement/Models/Order.cs

@@ -16,7 +16,6 @@ namespace TravelCompanyListImplement.Models
         public int Id { get; private set; }
         public int TravelId { get; private set; }
         public int ClientId { get; private set; }
-        public int? ImplementerId { get; private set; }
         public int Count { get; private set; }
         public double Sum { get; private set; }
         public OrderStatus Status { get; private set; }
@@ -38,7 +37,6 @@ namespace TravelCompanyListImplement.Models
                 Status = model.Status,
                 DateCreate = model.DateCreate,
                 DateImplement = model.DateImplement,
-                ImplementerId = model.ImplementerId
             };
         }
         public void Update(OrderBindingModel? model)
@@ -54,14 +52,12 @@ namespace TravelCompanyListImplement.Models
             Status = model.Status;
             DateCreate = model.DateCreate;
             DateImplement = model.DateImplement;
-            ImplementerId = model.ImplementerId;
         }
         public OrderViewModel GetViewModel => new()
         {
             Id = Id,
             TravelId = TravelId,
             ClientId = ClientId,
-            ImplementerId = ImplementerId,
             Count = Count,
             Sum = Sum,
             Status = Status,

TravelCompany/TravelCompanyRestApi/Controllers/ImplementerController.cs

@@ -1,105 +0,0 @@
-using DocumentFormat.OpenXml.Office2010.Excel;
-using TravelCompanyContracts.BindingModels;
-using TravelCompanyContracts.BusinessLogicsContracts;
-using TravelCompanyContracts.SearchModels;
-using TravelCompanyContracts.ViewModels;
-using TravelCompanyDataModels.Enums;
-using Microsoft.AspNetCore.Http;
-using Microsoft.AspNetCore.Mvc;
-
-namespace TravelCompanyRestApi.Controllers
-{
-	[Route("api/[controller]/[action]")]
-	[ApiController]
-	public class ImplementerController : ControllerBase
-	{
-		private readonly ILogger _logger;
-		private readonly IOrderLogic _order;
-		private readonly IImplementerLogic _logic;
-		public ImplementerController(IOrderLogic order, IImplementerLogic logic,
-	   ILogger<ImplementerController> logger)
-		{
-			_logger = logger;
-			_order = order;
-			_logic = logic;
-		}
-		[HttpGet]
-		public ImplementerViewModel? Login(string login, string password)
-		{
-			try
-			{
-				return _logic.ReadElement(new ImplementerSearchModel
-				{
-					ImplementerFIO = login,
-					Password = password
-				});
-			}
-			catch (Exception ex)
-			{
-				_logger.LogError(ex, "Ошибка авторизации сотрудника");
-				throw;
-			}
-		}
-		[HttpGet]
-		public List<OrderViewModel>? GetNewOrders()
-		{
-			try
-			{
-				return _order.ReadList(new OrderSearchModel
-				{
-					Status = OrderStatus.Принят
-				});
-			}
-			catch (Exception ex)
-			{
-				_logger.LogError(ex, "Ошибка получения новых заказов");
-				throw;
-			}
-		}
-		[HttpGet]
-		public OrderViewModel? GetImplementerOrder(int implementerId)
-		{
-			try
-			{
-				return _order.ReadElement(new OrderSearchModel
-				{
-					ImplementerId = implementerId
-				});
-			}
-			catch (Exception ex)
-			{
-				_logger.LogError(ex, "Ошибка получения текущего заказа исполнителя");
-
-				throw;
-			}
-		}
-
-		[HttpPost]
-		public void TakeOrderInWork(OrderBindingModel model)
-		{
-			try
-			{
-				_order.TakeOrderInWork(model);
-			}
-			catch (Exception ex)
-			{
-				_logger.LogError(ex, "Ошибка перевода заказа с №{Id} в работу",
-			   model.Id);
-				throw;
-			}
-		}
-		[HttpPost]
-		public void FinishOrder(OrderBindingModel model)
-		{
-			try
-			{
-				_order.FinishOrder(model);
-			}
-			catch (Exception ex)
-			{
-				_logger.LogError(ex, "Ошибка отметки о готовности заказа с №{ Id}", model.Id);
-		    throw;
-			}
-		}
-	}
-}